diff --git a/.agents/skills/jobs-define-job/SKILL.md b/.agents/skills/jobs-define-job/SKILL.md
new file mode 100644
index 00000000000..36388828d89
--- /dev/null
+++ b/.agents/skills/jobs-define-job/SKILL.md
@@ -0,0 +1,130 @@
+---
+name: jobs-define-job
+description: Add or migrate background jobs with defineJob, register them in jobLoaders, and dispatch via job.dispatch/dispatchBatch instead of qstash.publishJSON to a cron URL. Use when adding a QStash worker, converting a POST /api/cron route into a job, or when the user mentions defineJob, job handlers, /api/jobs/process, or background jobs.
+---
+
+# Background jobs: use defineJob
+
+Payload-driven QStash work goes through `defineJob`. Do **not** add a new HTTP route under `/api/jobs` — every job is executed by the existing [`apps/web/app/api/jobs/process/[jobName]/route.ts`](apps/web/app/api/jobs/process/[jobName]/route.ts).
+
+Keep using `withCron` for Vercel GET schedules and for cron scanners that have no job envelope. See the `cron-use-with-cron` skill for those.
+
+## File layout
+
+```
+apps/web/lib/jobs/
+├── index.ts                 # defineJob — do not edit unless changing the framework
+├── registry.ts              # jobLoaders — register every new job here
+├── send-jobs.ts             # envelope + QStash request builder
+└── handlers/
+    └── {name}-job.ts        # one file per job
+```
+
+## 1. Create the handler
+
+Add `apps/web/lib/jobs/handlers/{name}-job.ts`. The `name` must be kebab-case and end in `-job` (enforced by `jobNameSchema`: `/^[a-z][a-z0-9]*(-[a-z0-9]+)*-job$/`).
+
+```ts
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  programId: z.string(),
+  partnerId: z.string(),
+});
+
+export const unbanPartnerJob = defineJob({
+  name: "unban-partner-job",
+  schema: inputSchema,
+  defaults: {
+    retries: 3, // optional; QStash retries on 5xx
+    // queue: "unban-partner", // optional; named QStash queue
+    // flowControl: { key: "unban-partner", parallelism: 20 },
+  },
+  async handle(input) {
+    // skip (permanent / not found) → return (process route returns 2xx, QStash does not retry)
+    // transient failure → throw (process route returns 500, QStash retries)
+  },
+});
+```
+
+Export the const as camelCase `{name}Job` matching the kebab `name`.
+
+Reference handlers:
+
+- Simple skip/work: `unban-partner-job.ts`, `create-tremendous-campaign-job.ts`
+- Self-pagination: `folder-deleted-job.ts`, `domain-deleted-job.ts`, `partner-search-sync-job.ts`
+- `defaults.flowControl`: `partner-search-sync-job.ts`
+
+## 2. Register it
+
+Add a **static** `import()` in [`apps/web/lib/jobs/registry.ts`](apps/web/lib/jobs/registry.ts) `jobLoaders`. The object key must equal `defineJob({ name })`. Webpack code-splits each handler.
+
+```ts
+"unban-partner-job": () =>
+  import("./handlers/unban-partner-job").then((m) => m.unbanPartnerJob),
+```
+
+Do not register by editing the process route. `loadJob` throws if `job.name !==` the registry key.
+
+## 3. Dispatch from call sites
+
+Import the handler (not `qstash`) and call `dispatch` / `dispatchBatch`:
+
+```ts
+import { unbanPartnerJob } from "@/lib/jobs/handlers/unban-partner-job";
+
+await unbanPartnerJob.dispatch(
+  { workspaceId, programId, partnerId },
+  { label: partnerId },
+);
+
+await folderDeletedJob.dispatchBatch(
+  folderIds.map((folderId) => ({ folderId })),
+  ({ folderId }) => ({ label: folderId }),
+);
+```
+
+Per-dispatch options merge over `defaults`: `delay`, `notBefore`, `deduplicationId`, `retries`, `queue`, `flowControl`, `label`.
+
+Failed QStash publish is persisted to the jobs outbox automatically — do not catch-and-swallow unless even the outbox persist failing must not fail the source mutation (see `queue-partner-search-sync.ts`).
+
+Self-pagination: call `theJob.dispatch(nextPayload, { delay: 1 })` from `handle` (see `folder-deleted-job`, `partner-search-sync-job`).
+
+Do not call `job.execute` from app code. That is only for the process route (and cron drain shims below).
+
+## 4. Convert an existing cron worker
+
+1. Move the `withCron` body into `handle`. Replace `logAndRespond("skip…")` with `console.info` / `console.error` + `return`.
+2. Register + switch every `qstash.publishJSON` / `enqueueJSON` / `enqueueBatchJobs` targeting that cron URL to `job.dispatch` / `dispatchBatch`.
+3. Keep a thin POST shim at the old `/api/cron/...` URL that parses the **old** body (not the job envelope) and calls `job.execute(payload)`. That drains in-flight QStash messages. Do not add a shim for brand-new jobs.
+4. Delete cron-only helpers that moved with the handler.
+
+## Handle semantics
+
+| Outcome | What to do | HTTP from process route | QStash |
+| --- | --- | --- | --- |
+| Work done | `return` | 200 | stop |
+| Skip (not found, already done, env not configured) | `console.*` + `return` | 200 | stop |
+| Bad payload | throw `ZodError` (schema.parse) | 200 | stop (non-retryable) |
+| Transient failure | `throw` | 500 | retry |
+
+Unknown job names and invalid envelopes also return 2xx so QStash does not retry forever.
+
+## Do not use defineJob for
+
+- Vercel GET crons in `apps/web/vercel.json`
+- Scanners that only fan out work (the worker they enqueue can be a job)
+- Importers that republish continuation state to the same URL
+- `/api/cron/queue/retry` (job replay infrastructure)
+- Path-param identity (`/api/cron/links/[linkId]/…`) unless the id moves into the payload
+- Outbound webhook forwarding and postbacks
+
+## Do not
+
+- Add a new `/api/jobs/...` route or a new `/api/cron/...` POST worker for payload-driven work.
+- Call `qstash.publishJSON` / `enqueueJSON` / `enqueueBatchJobs` with `/api/jobs/process/...` — use `dispatch`.
+- Register jobs with a dynamic `import()` that webpack cannot statically analyze, or a key that differs from `defineJob({ name })`.
+- Name a job without the `-job` suffix.
+- Use `job.execute` at dispatch call sites.
+- Run `pnpm build` after adding a job.
diff --git a/.agents/skills/playwright-api-tests/SKILL.md b/.agents/skills/playwright-api-tests/SKILL.md
index 63f6005cc5e..d21668ff3c7 100644
--- a/.agents/skills/playwright-api-tests/SKILL.md
+++ b/.agents/skills/playwright-api-tests/SKILL.md
@@ -54,10 +54,6 @@ import { expect } from "@playwright/test";
 import { randomName } from "../../utils";
 import { test, type ApiClient } from "../fixtures";
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 async function createThing(
   api: ApiClient,
   overrides: Record<string, unknown> = {},
@@ -98,7 +94,7 @@ test("POST /things", async ({ api }) => {
 | Rule                                            | Detail                                                                                                        |
 | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
 | Import `test` from `../fixtures`                | Provides `api`, `workspace`, and `program`                                                                    |
-| `test.describe.configure({ mode: "parallel" })` | At top of every API spec file                                                                                 |
+| Serial only when tests share state              | API project is `fullyParallel: true`. Do not add `mode: "parallel"`. Use `test.describe.configure({ mode: "serial" })` only when tests in a file/describe share state (e.g. domains, seeded pagination) |
 | Cleanup in `finally`                            | Create → assert → always delete created rows                                                                  |
 | Unique names/ids                                | Use `randomName` / `randomCustomer` / `randomPartnerEmail` from `../../utils` — never fixed colliding names   |
 | Assert status + body                            | Prefer `toStrictEqual` / `toEqual` on full shapes; use `expect.any(String)` for ids/timestamps                |
diff --git a/.gitignore b/.gitignore
index 898bef49661..64759ecd647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,5 @@ packages/stripe-app/.build/*
 playwright-report/
 **/playwright/.auth/
 test-results/
-blob-report/
\ No newline at end of file
+blob-report/
+.pnpm-store
diff --git a/apps/web/.env.example b/apps/web/.env.example
index b43adfd90b6..5c26914520c 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -5,8 +5,12 @@
 # Generate secrets with: node -e "console.log(require('crypto').randomBytes(32).toString('base64'))"
 NEXTAUTH_SECRET=
 NEXTAUTH_URL=http://localhost:8888 # (only needed for localhost)
-# Secret for Vercel cron jobs (https://vercel.com/docs/cron-jobs/manage-cron-jobs#securing-cron-jobs)
+
+# Secret for Vercel cron jobs + sync-embeddings
 CRON_SECRET=
+# Shared with the LoopWork demo. Mints geo-accurate clicks via POST /api/demo/click
+# and backdated commissions via POST /api/demo/commission
+DEMO_CLICK_SECRET=
 # Encryption key (AES-256-GCM) for encrypting sensitive data in the database
 ENCRYPTION_KEY=
 # Email unsubscribe token secret (optional, falls back to NEXTAUTH_SECRET)
@@ -23,6 +27,10 @@ PLANETSCALE_DATABASE_URL="http://root:unused@localhost:3900/planetscale"
 UPSTASH_REDIS_REST_URL=
 UPSTASH_REDIS_REST_TOKEN=
 
+# Full-text partner search. Unset falls back to the database search path.
+TURBOPUFFER_API_KEY=
+PARTNER_SEARCH_READ_ENABLED=
+
 # Upstash QStash – required for queues and background jobs
 # Get your QStash Token here: https://upstash.com/docs/qstash/overall/getstarted
 QSTASH_URL="https://qstash-us-east-1.upstash.io"
@@ -108,6 +116,9 @@ STORAGE_BASE_URL=
 STORAGE_PUBLIC_BUCKET=
 STORAGE_PRIVATE_BUCKET=
 
+# Shared secret for Cloudflare Workers that call Next.js webhooks
+CLOUDFLARE_WORKER_WEBHOOK_SECRET=
+
 # Used for internal monitoring & paging
 # You can remove this by removing `DUB_SLACK_HOOK_CRON` and `DUB_SLACK_HOOK_LINKS` from the codebase
 DUB_SLACK_HOOK_CRON=
@@ -121,6 +132,7 @@ DUB_SLACK_ASSISTANT_BOT_TOKEN=
 NEXT_PUBLIC_NGROK_URL=
 
 # For AI features
+AI_GATEWAY_API_KEY=
 ANTHROPIC_API_KEY=
 
 # Axiom – used for logging and monitoring
@@ -195,4 +207,9 @@ E2E_PARTNER_PASSWORD=
 
 # Veriff (Identity Verification)
 VERIFF_API_KEY=
-VERIFF_SHARED_SECRET=
\ No newline at end of file
+VERIFF_SHARED_SECRET=
+
+# Domain Connect (auto-configure DNS for custom domains)
+# Generate key: openssl genrsa -out private.pem 2048
+# Get public key: openssl rsa -in private.pem -pubout -outform DER | base64 | tr -d '\n'
+DOMAIN_CONNECT_PRIVATE_KEY=
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx
index c29c7c299e6..e59618b380f 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/commissions/page.tsx
@@ -43,6 +43,19 @@ function CommissionsPageClient() {
   const { queryParams, getQueryString, searchParamsObj } = useRouterStuff();
   const { interval, start, end, programId } = searchParamsObj;
 
+  const { data: { programs: allPrograms } = {} } = useSWR<AdminCommissionsData>(
+    `/api/admin/commissions${getQueryString(
+      {
+        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      },
+      { exclude: ["programId"] },
+    )}`,
+    fetcher,
+    {
+      keepPreviousData: true,
+    },
+  );
+
   const { data: { programs, timeseries } = {}, isLoading } =
     useSWR<AdminCommissionsData>(
       `/api/admin/commissions${getQueryString({
@@ -62,7 +75,7 @@ function CommissionsPageClient() {
         icon: GridIcon,
         label: "Program",
         options:
-          programs?.map((program) => ({
+          allPrograms?.map((program) => ({
             value: program.id,
             label: program.name,
             icon: (
@@ -72,6 +85,7 @@ function CommissionsPageClient() {
                 className="size-4 rounded-full"
               />
             ),
+            right: currencyFormatter(program.commissions),
           })) ?? null,
       },
     ],
@@ -279,8 +293,8 @@ function CommissionsPageClient() {
   });
 
   return (
-    <div className="mx-auto grid w-full max-w-screen-xl gap-5 p-3 lg:px-10">
-      <div className="flex flex-col gap-3 md:flex-row md:items-center">
+    <div className="mx-auto grid w-full min-w-0 max-w-screen-xl gap-3 overflow-x-hidden p-3 lg:px-10">
+      <div className="flex min-w-0 flex-col gap-3 md:flex-row md:items-center">
         <Filter.Select
           className="w-full md:w-fit"
           filters={filters}
@@ -294,18 +308,16 @@ function CommissionsPageClient() {
         />
       </div>
       {activeFilters.length > 0 && (
-        <div>
-          <Filter.List
-            filters={filters}
-            activeFilters={activeFilters}
-            onSelect={onSelect}
-            onRemove={onRemove}
-            onRemoveAll={onRemoveAll}
-          />
-        </div>
+        <Filter.List
+          filters={filters}
+          activeFilters={activeFilters}
+          onSelect={onSelect}
+          onRemove={onRemove}
+          onRemoveAll={onRemoveAll}
+        />
       )}
-      <div className="flex flex-col divide-y divide-neutral-200 rounded-lg border border-neutral-200 bg-white">
-        <div className="scrollbar-hide grid w-full grid-cols-2 divide-x overflow-y-hidden sm:grid-cols-3">
+      <div className="flex min-w-0 flex-col divide-y divide-neutral-200 overflow-hidden rounded-lg border border-neutral-200 bg-white">
+        <div className="scrollbar-hide grid w-full grid-cols-1 divide-y overflow-hidden sm:grid-cols-2 sm:divide-x sm:divide-y-0">
           {tabs.map(({ id, label, colorClassName, disabled }) => {
             return (
               <button
@@ -317,7 +329,7 @@ function CommissionsPageClient() {
                   });
                 }}
                 className={cn(
-                  "border-box relative block h-full w-full flex-none px-4 py-3 sm:px-8 sm:py-6",
+                  "border-box relative block h-full min-w-0 w-full flex-none overflow-hidden px-4 py-3 sm:px-8 sm:py-6",
                   "ring-inset ring-neutral-500 focus-visible:ring-1 sm:first:rounded-tl-xl",
                   disabled
                     ? "cursor-not-allowed"
@@ -334,17 +346,17 @@ function CommissionsPageClient() {
                 <div className="flex items-center gap-2.5 text-sm text-neutral-600">
                   <div
                     className={cn(
-                      "h-2 w-2 rounded-sm bg-current shadow-[inset_0_0_0_1px_#00000019]",
+                      "h-2 w-2 shrink-0 rounded-sm bg-current shadow-[inset_0_0_0_1px_#00000019]",
                       colorClassName,
                     )}
                   />
                   <span>{label}</span>
                 </div>
-                <div className="mt-1 flex h-12 items-center">
+                <div className="mt-1 flex h-12 min-w-0 items-center">
                   {(totals[id] || totals[id] === 0) && !isLoading ? (
                     <NumberFlow
                       value={(totals[id] ?? 0) / 100}
-                      className="text-xl font-medium sm:text-3xl"
+                      className="truncate text-xl font-medium sm:text-3xl"
                       format={{
                         style: "currency",
                         currency: "USD",
@@ -360,8 +372,8 @@ function CommissionsPageClient() {
             );
           })}
         </div>
-        <div className="p-5 sm:p-10">
-          <div className="flex h-96 w-full items-center justify-center">
+        <div className="min-w-0 overflow-hidden p-5 sm:p-10">
+          <div className="flex h-96 w-full min-w-0 items-center justify-center">
             {chartData ? (
               chartData.length > 0 ? (
                 <TimeSeriesChart
@@ -419,7 +431,12 @@ function CommissionsPageClient() {
                   />
                   <YAxis
                     showGridLines
-                    tickFormat={(value) => currencyFormatter(value)}
+                    tickFormat={(value) =>
+                      currencyFormatter(value, {
+                        notation: "compact",
+                        maximumFractionDigits: 1,
+                      })
+                    }
                   />
                 </TimeSeriesChart>
               ) : (
@@ -433,7 +450,7 @@ function CommissionsPageClient() {
           </div>
         </div>
       </div>
-      <div className="w-full">
+      <div className="w-full min-w-0 overflow-x-auto">
         <Table {...tableProps} table={table} />
       </div>
     </div>
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-user.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-user.tsx
index bfcd7c17689..fb144e7cadd 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-user.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-user.tsx
@@ -5,7 +5,7 @@ import { cn } from "@dub/utils";
 import { useState } from "react";
 import { useFormStatus } from "react-dom";
 import { toast } from "sonner";
-import UserInfo, { UserInfoProps } from "./user-info";
+import UserInfo, { UserInfoProps, UserInfoSkeleton } from "./user-info";
 
 export function ImpersonateUser() {
   const [data, setData] = useState<UserInfoProps | null>(null);
@@ -18,7 +18,7 @@ export function ImpersonateUser() {
           await fetch("/api/admin/impersonate", {
             method: "POST",
             body: JSON.stringify({
-              email: formData.get("email"),
+              query: formData.get("query"),
             }),
           }).then(async (res) => {
             if (res.ok) {
@@ -33,7 +33,7 @@ export function ImpersonateUser() {
       >
         <Form />
       </form>
-      {data && (
+      {data ? (
         <form
           action={async () => {
             const emailDomain = data.email.split("@")[1];
@@ -78,6 +78,8 @@ export function ImpersonateUser() {
             <BanButton />
           </div>
         </form>
+      ) : (
+        <UserInfoSkeleton />
       )}
     </div>
   );
@@ -89,9 +91,9 @@ const Form = () => {
   return (
     <div className="relative flex w-full rounded-md shadow-sm">
       <input
-        name="email"
-        id="email"
-        type="email"
+        name="query"
+        id="query"
+        type="text"
         required
         disabled={pending}
         autoComplete="off"
@@ -100,16 +102,21 @@ const Form = () => {
           pending && "bg-neutral-100",
         )}
         onPaste={(e: React.ClipboardEvent<HTMLInputElement>) => {
-          // remove mailto: on paste
           e.preventDefault();
-          const text = e.clipboardData.getData("text/plain");
-          if (text.startsWith("mailto:")) {
-            e.currentTarget.value = text.replace("mailto:", "");
-          } else {
-            e.currentTarget.value = text;
+          let text = e.clipboardData.getData("text/plain").trim();
+          if (text.toLowerCase().startsWith("mailto:")) {
+            text = text.slice(7);
           }
+          const stripeCustomerId = text.match(/cus_[a-zA-Z0-9]+/)?.[0];
+          if (
+            stripeCustomerId &&
+            (text.startsWith("cus_") || text.includes("stripe.com"))
+          ) {
+            text = stripeCustomerId;
+          }
+          e.currentTarget.value = text;
         }}
-        placeholder="panic@thedis.co"
+        placeholder="panic@thedis.co, acme, acme.com, or cus_"
         aria-invalid="true"
       />
       {pending && (
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-workspace.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-workspace.tsx
deleted file mode 100644
index 4eaeec08c96..00000000000
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/impersonate-workspace.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-"use client";
-
-import { LoadingSpinner } from "@dub/ui";
-import { cn } from "@dub/utils";
-import { useState } from "react";
-import { useFormStatus } from "react-dom";
-import { toast } from "sonner";
-import UserInfo, { UserInfoProps } from "./user-info";
-
-export function ImpersonateWorkspace() {
-  const [data, setData] = useState<UserInfoProps | null>(null);
-
-  return (
-    <div className="flex flex-col space-y-5">
-      <form
-        action={async (formData) => {
-          await fetch("/api/admin/impersonate", {
-            method: "POST",
-            body: JSON.stringify({
-              slug: formData.get("slug"),
-            }),
-          }).then(async (res) => {
-            if (res.ok) {
-              setData(await res.json());
-            } else {
-              const error = await res.text();
-              toast.error(error);
-            }
-          });
-        }}
-      >
-        <Form />
-      </form>
-      {data && <UserInfo data={data} />}
-    </div>
-  );
-}
-
-const Form = () => {
-  const { pending } = useFormStatus();
-
-  return (
-    <div className="relative flex w-full rounded-md shadow-sm">
-      <span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-5 text-neutral-500 sm:text-sm">
-        app.dub.co
-      </span>
-      <input
-        name="slug"
-        id="slug"
-        type="text"
-        required
-        disabled={pending}
-        autoComplete="off"
-        className={cn(
-          "block w-full rounded-r-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-          pending && "bg-neutral-100",
-        )}
-        placeholder="owd"
-        aria-invalid="true"
-      />
-      {pending && (
-        <LoadingSpinner className="absolute inset-y-0 right-2 my-auto h-full w-5 text-neutral-400" />
-      )}
-    </div>
-  );
-};
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/user-info.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/user-info.tsx
index 9bb9830b8cc..e2128bb9ffc 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/user-info.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/components/user-info.tsx
@@ -1,7 +1,26 @@
 "use client";
+
 import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
-import { Badge, Copy, StatusBadge, Tick, useCopyToClipboard } from "@dub/ui";
-import { capitalize, currencyFormatter, nFormatter } from "@dub/utils";
+import {
+  Badge,
+  Copy,
+  CopyButton,
+  StatusBadge,
+  Tick,
+  useCopyToClipboard,
+} from "@dub/ui";
+import { ArrowUpRight2 } from "@dub/ui/icons";
+import {
+  APP_DOMAIN,
+  capitalize,
+  cn,
+  currencyFormatter,
+  formatDate,
+  getPrettyUrl,
+  isSafeLinkHref,
+  isWorkspaceBillingTrialActive,
+  nFormatter,
+} from "@dub/utils";
 import { toast } from "sonner";
 
 export interface UserInfoProps {
@@ -11,10 +30,16 @@ export interface UserInfoProps {
     name: string;
     slug: string;
     plan: string;
-    clicks: number;
+    planPeriod: string | null;
+    trialEndsAt: string | Date | null;
+    events: number;
     links: number;
-    totalClicks: number;
-    totalLinks: number;
+    statsInterval: "30d" | "all";
+    program: {
+      url: string;
+      partners: number;
+      commissions: number;
+    } | null;
   }[];
   programs: {
     id: string;
@@ -33,24 +58,20 @@ export interface UserInfoProps {
   };
 }
 
-const workspaceItems = [
-  { id: "clicks", label: "Clicks" },
-  { id: "links", label: "Links" },
-  { id: "totalClicks", label: "Total Clicks" },
-  { id: "totalLinks", label: "Total Links" },
-];
-
-const programItems = [
-  { id: "totalClicks", label: "Total Clicks" },
-  { id: "totalLeads", label: "Total Leads" },
-  { id: "totalConversions", label: "Total Conversions" },
-  { id: "totalSaleAmount", label: "Total Sales", isCurrency: true },
-  { id: "totalCommissions", label: "Total Commissions", isCurrency: true },
-];
+const programHighlightItems = [
+  { id: "totalSaleAmount", label: "Revenue" },
+  { id: "totalCommissions", label: "Commissions" },
+] as const;
+
+const programDetailItems = [
+  { id: "totalClicks", label: "Clicks" },
+  { id: "totalLeads", label: "Leads" },
+  { id: "totalConversions", label: "Conversions" },
+] as const;
 
 export default function UserInfo({ data }: { data: UserInfoProps }) {
   return (
-    <div className="grid gap-4">
+    <div className="grid gap-5">
       <LoginLinkCopyButton text={data.email} url={data.email} />
       <LoginLinkCopyButton
         text="app.dub.co login link"
@@ -62,120 +83,308 @@ export default function UserInfo({ data }: { data: UserInfoProps }) {
       />
 
       {data.workspaces.length > 0 && (
-        <div>
-          <h3 className="mb-2 text-sm font-semibold text-neutral-900">
+        <section>
+          <h3 className="mb-2.5 text-sm font-semibold text-neutral-900">
             Workspaces
           </h3>
-          <div className="grid grid-cols-2 gap-4">
+          <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
             {data.workspaces.map((workspace) => (
-              <div
-                key={workspace.slug}
-                className="flex flex-col space-y-2 rounded-lg border border-neutral-200 p-2"
-              >
-                <div className="flex items-center space-x-2">
-                  <p className="font-semibold">{workspace.name}</p>
-                  <Badge className="lowercase">{workspace.slug}</Badge>
-                </div>
-                <div className="flex justify-between text-sm">
-                  <span className="font-medium text-neutral-700">ID</span>
-                  <span className="text-neutral-500">{workspace.id}</span>
-                </div>
-                <div className="flex justify-between text-sm">
-                  <span className="font-medium text-neutral-700">Plan</span>
-                  <span className="text-neutral-500">
-                    {capitalize(workspace.plan)}
-                  </span>
-                </div>
-                {workspaceItems.map((item) => (
-                  <div key={item.id} className="flex justify-between text-sm">
-                    <span className="font-medium text-neutral-700">
-                      {item.label}
-                    </span>
-                    <span className="text-neutral-500">
-                      {nFormatter(workspace[item.id], { full: true })}
-                    </span>
-                  </div>
-                ))}
-              </div>
+              <WorkspaceCard key={workspace.id} workspace={workspace} />
             ))}
           </div>
-        </div>
-      )}
-
-      {data.workspaces.length > 0 && data.programs.length > 0 && (
-        <div className="my-2 border-b border-neutral-200" />
+        </section>
       )}
 
       {data.programs.length > 0 && (
-        <div>
-          <h3 className="mb-2 text-sm font-semibold text-neutral-900">
-            Programs
+        <section>
+          <h3 className="mb-2.5 text-sm font-semibold text-neutral-900">
+            Partner programs
           </h3>
-          <div className="grid grid-cols-2 gap-4">
+          <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
             {data.programs.map((program) => (
-              <div
-                key={program.id}
-                className="flex flex-col space-y-2 rounded-lg border border-neutral-200 p-2"
-              >
-                <div className="flex items-center space-x-2">
-                  <p className="font-semibold">{program.name}</p>
-                  <Badge className="lowercase">{program.slug}</Badge>
-                </div>
-                <div className="flex justify-between text-sm">
-                  <span className="font-medium text-neutral-700">ID</span>
-                  <span className="text-neutral-500">{program.id}</span>
-                </div>
-                <div className="flex justify-between text-sm">
-                  <span className="font-medium text-neutral-700">Status</span>
-                  <StatusBadge
-                    variant={PartnerStatusBadges[program.status].variant}
-                  >
-                    {PartnerStatusBadges[program.status].label}
-                  </StatusBadge>
-                </div>
-                {programItems.map((item) => (
-                  <div key={item.id} className="flex justify-between text-sm">
-                    <span className="font-medium text-neutral-700">
-                      {item.label}
-                    </span>
-                    <span className="text-neutral-500">
-                      {item.isCurrency
-                        ? currencyFormatter(program[item.id])
-                        : nFormatter(program[item.id], { full: true })}
-                    </span>
-                  </div>
-                ))}
-              </div>
+              <ProgramCard key={program.id} program={program} />
             ))}
           </div>
+        </section>
+      )}
+    </div>
+  );
+}
+
+export function UserInfoSkeleton() {
+  return (
+    <div className="grid gap-5">
+      <LoginLinkCopyButton text="Enter a value to show results" />
+      <LoginLinkCopyButton text="Enter a value to show results" />
+      <LoginLinkCopyButton text="Enter a value to show results" />
+
+      <section>
+        <h3 className="mb-2.5 text-sm font-semibold text-neutral-900">
+          Workspaces
+        </h3>
+        <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+          <WorkspaceCardSkeleton />
+        </div>
+      </section>
+    </div>
+  );
+}
+
+function WorkspaceCardSkeleton() {
+  return (
+    <div className="flex min-w-0 flex-col overflow-hidden rounded-xl border border-neutral-200 bg-white">
+      <div className="flex items-start justify-between gap-2 px-3.5 py-3">
+        <div className="min-w-0">
+          <p className="font-semibold text-neutral-400">Workspace</p>
+          <p className="mt-0.5 truncate text-xs text-neutral-400">slug</p>
+        </div>
+        <Badge variant="gray">Plan</Badge>
+      </div>
+
+      <div className="grid grid-cols-2 gap-px border-y border-neutral-100 bg-neutral-100">
+        <StatTile label="Events" value="—" hint="Last 30 days" />
+        <StatTile label="Links" value="—" hint="Last 30 days" />
+      </div>
+
+      <MetaRow label="ID" value="—" />
+
+      <div className="space-y-0.5 border-t border-neutral-100 bg-neutral-50/80 py-1">
+        <MetaRow label="Program URL" value="—" />
+        <MetaRow label="Partners" value="—" />
+        <MetaRow label="Commissions (30d)" value="—" />
+      </div>
+    </div>
+  );
+}
+
+function WorkspaceCard({
+  workspace,
+}: {
+  workspace: UserInfoProps["workspaces"][number];
+}) {
+  const trialActive = isWorkspaceBillingTrialActive(workspace.trialEndsAt);
+  const planLabel = workspace.planPeriod
+    ? `${capitalize(workspace.plan)} (${workspace.planPeriod})`
+    : capitalize(workspace.plan);
+  const statsLabel =
+    workspace.statsInterval === "30d" ? "Last 30 days" : "All-time";
+  const programUrl = workspace.program
+    ? getPrettyUrl(workspace.program.url)
+    : null;
+
+  return (
+    <div className="flex min-w-0 flex-col overflow-hidden rounded-xl border border-neutral-200 bg-white">
+      <div className="flex items-start justify-between gap-2 px-3.5 py-3">
+        <div className="min-w-0">
+          <a
+            href={`${APP_DOMAIN}/${workspace.slug}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="group flex items-center gap-1 font-semibold text-neutral-900"
+          >
+            <span className="truncate">{workspace.name}</span>
+            <ArrowUpRight2 className="size-3.5 shrink-0 text-neutral-400 transition-colors group-hover:text-neutral-700" />
+          </a>
+          <p className="mt-0.5 truncate text-xs text-neutral-500">
+            {workspace.slug}
+          </p>
+        </div>
+        <div className="flex shrink-0 flex-col items-end gap-1">
+          <Badge variant="gray">{planLabel}</Badge>
+          {trialActive && workspace.trialEndsAt && (
+            <Badge variant="amber">
+              Trial ends {formatDate(workspace.trialEndsAt, { month: "short" })}
+            </Badge>
+          )}
+        </div>
+      </div>
+
+      <div className="grid grid-cols-2 gap-px border-y border-neutral-100 bg-neutral-100">
+        <StatTile
+          label="Events"
+          value={nFormatter(workspace.events, { full: true })}
+          hint={statsLabel}
+        />
+        <StatTile
+          label="Links"
+          value={nFormatter(workspace.links, { full: true })}
+          hint={statsLabel}
+        />
+      </div>
+
+      <MetaRow label="ID" value={workspace.id} copyValue={workspace.id} mono />
+
+      {workspace.program && (
+        <div className="space-y-0.5 border-t border-neutral-100 bg-neutral-50/80 py-1">
+          <MetaRow
+            label="Program URL"
+            value={programUrl || "—"}
+            href={
+              workspace.program.url && isSafeLinkHref(workspace.program.url)
+                ? workspace.program.url
+                : undefined
+            }
+          />
+          <MetaRow
+            label="Partners"
+            value={nFormatter(workspace.program.partners, { full: true })}
+          />
+          <MetaRow
+            label="Commissions (30d)"
+            value={currencyFormatter(workspace.program.commissions)}
+          />
         </div>
       )}
     </div>
   );
 }
 
-const LoginLinkCopyButton = ({ text, url }: { text: string; url: string }) => {
+function ProgramCard({
+  program,
+}: {
+  program: UserInfoProps["programs"][number];
+}) {
+  const status = PartnerStatusBadges[program.status];
+
+  return (
+    <div className="flex min-w-0 flex-col overflow-hidden rounded-xl border border-neutral-200 bg-white">
+      <div className="flex items-start justify-between gap-2 px-3.5 py-3">
+        <div className="min-w-0">
+          <p className="truncate font-semibold text-neutral-900">
+            {program.name}
+          </p>
+          <p className="mt-0.5 truncate text-xs text-neutral-500">
+            {program.slug}
+          </p>
+        </div>
+        {status && (
+          <StatusBadge variant={status.variant}>{status.label}</StatusBadge>
+        )}
+      </div>
+
+      <div className="grid grid-cols-2 gap-px border-y border-neutral-100 bg-neutral-100">
+        {programHighlightItems.map((item) => (
+          <StatTile
+            key={item.id}
+            label={item.label}
+            value={currencyFormatter(program[item.id])}
+          />
+        ))}
+      </div>
+
+      <div className="py-1">
+        <MetaRow label="ID" value={program.id} copyValue={program.id} mono />
+        {programDetailItems.map((item) => (
+          <MetaRow
+            key={item.id}
+            label={item.label}
+            value={nFormatter(program[item.id], { full: true })}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function StatTile({
+  label,
+  value,
+  hint,
+}: {
+  label: string;
+  value: string;
+  hint?: string;
+}) {
+  return (
+    <div className="bg-white px-3.5 py-2.5">
+      <p className="text-[11px] font-medium uppercase tracking-wide text-neutral-400">
+        {label}
+      </p>
+      <p className="mt-0.5 text-lg font-semibold tabular-nums tracking-tight text-neutral-900">
+        {value}
+      </p>
+      {hint && <p className="text-[11px] text-neutral-400">{hint}</p>}
+    </div>
+  );
+}
+
+function MetaRow({
+  label,
+  value,
+  copyValue,
+  href,
+  mono,
+}: {
+  label: string;
+  value: string;
+  copyValue?: string;
+  href?: string;
+  mono?: boolean;
+}) {
+  return (
+    <div className="flex items-center justify-between gap-2 px-3.5 py-1.5">
+      <span className="shrink-0 text-xs font-medium text-neutral-500">
+        {label}
+      </span>
+      <span className="flex min-w-0 items-center justify-end gap-0.5">
+        {href ? (
+          <a
+            href={href}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="truncate text-xs text-neutral-700 underline decoration-neutral-300 underline-offset-2 hover:text-neutral-900"
+          >
+            {value}
+          </a>
+        ) : (
+          <span
+            className={`truncate text-xs text-neutral-700 ${mono ? "font-mono" : ""}`}
+          >
+            {value}
+          </span>
+        )}
+        {copyValue && <CopyButton value={copyValue} className="shrink-0" />}
+      </span>
+    </div>
+  );
+}
+
+const LoginLinkCopyButton = ({
+  text,
+  url,
+}: {
+  text: string;
+  url?: string;
+}) => {
   const [copied, copyToClipboard] = useCopyToClipboard();
+  const isPlaceholder = !url;
 
   return (
-    <div className="flex w-full items-center space-x-3">
-      <div className="w-full rounded-md border border-neutral-300 px-4 py-2 text-sm text-neutral-900">
+    <div className="flex w-full items-center space-x-2">
+      <div
+        className={cn(
+          "w-full rounded-lg border border-neutral-200 bg-neutral-50 px-3.5 py-2 text-sm",
+          isPlaceholder ? "text-neutral-400" : "text-neutral-900",
+        )}
+      >
         {text}
       </div>
       <button
         type="button"
+        disabled={isPlaceholder}
         onClick={() =>
-          toast.promise(copyToClipboard(url), {
+          toast.promise(copyToClipboard(url!), {
             success: "Copied to clipboard",
           })
         }
-        className="rounded-md border border-neutral-300 p-2"
-      >
-        {copied ? (
-          <Tick className="h-5 w-5 text-neutral-500" />
-        ) : (
-          <Copy className="h-5 w-5 text-neutral-500" />
+        className={cn(
+          "rounded-lg border border-neutral-200 p-2 text-neutral-500 transition-colors",
+          isPlaceholder
+            ? "cursor-not-allowed opacity-50"
+            : "hover:bg-neutral-50 hover:text-neutral-800",
         )}
+      >
+        {copied ? <Tick className="h-4 w-4" /> : <Copy className="h-4 w-4" />}
       </button>
     </div>
   );
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/page.tsx
index a407e8d4aff..5cb4f96b7da 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/page.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/page.tsx
@@ -2,7 +2,6 @@ import { BanLink } from "./components/ban-link";
 import { DeletePartnerAccount } from "./components/delete-partner-account";
 import { DisableRestoreWorkspace } from "./components/disable-restore-workspace";
 import { ImpersonateUser } from "./components/impersonate-user";
-import { ImpersonateWorkspace } from "./components/impersonate-workspace";
 import { ResetLoginAttempts } from "./components/reset-login-attempts";
 import { SlackSupportInvite } from "./components/slack-support-invite";
 
@@ -10,19 +9,14 @@ export default function AdminPage() {
   return (
     <div className="mx-auto flex w-full max-w-screen-sm flex-col divide-y divide-neutral-200 overflow-auto bg-white">
       <div className="flex flex-col space-y-4 px-5 py-10">
-        <h2 className="text-xl font-semibold">Impersonate User/Partner</h2>
+        <h2 className="text-xl font-semibold">Impersonate User</h2>
         <p className="text-sm text-neutral-500">
-          Get a login link for a user email (or partner email)
+          Get a login link by user/partner email, workspace slug, domain, or
+          Stripe customer ID. Workspace, domain, and Stripe lookups impersonate
+          the main owner.
         </p>
         <ImpersonateUser />
       </div>
-      <div className="flex flex-col space-y-4 px-5 py-10">
-        <h2 className="text-xl font-semibold">Impersonate Workspace</h2>
-        <p className="text-sm text-neutral-500">
-          Get a login link for the owner of a workspace
-        </p>
-        <ImpersonateWorkspace />
-      </div>
       <div className="flex flex-col space-y-4 px-5 py-10">
         <h2 className="text-xl font-semibold">Ban Link</h2>
         <p className="text-sm text-neutral-500">Ban a dub.sh link</p>
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/page.tsx
index aa41bc0ee46..28c0bd781ca 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/page.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/partners/fraud/page.tsx
@@ -3,6 +3,7 @@
 import { adminFraudAlertSchema } from "@/lib/zod/schemas/admin";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
 import {
+  Button,
   Filter,
   StatusBadge,
   Table,
@@ -12,9 +13,16 @@ import {
   useTable,
 } from "@dub/ui";
 import { CircleDotted, GridIcon } from "@dub/ui/icons";
-import { fetcher, formatDate, formatDateTime, OG_AVATAR_URL } from "@dub/utils";
+import {
+  fetcher,
+  formatDate,
+  formatDateTime,
+  OG_AVATAR_URL,
+  pluralize,
+} from "@dub/utils";
 import { FraudAlertStatus } from "@prisma/client";
 import { Suspense, useCallback, useMemo, useState } from "react";
+import { toast } from "sonner";
 import useSWR from "swr";
 import * as z from "zod/v4";
 import { ReviewFraudAlertSheet } from "./review-fraud-alert-sheet";
@@ -45,6 +53,7 @@ function FraudAlertsPageClient() {
   const [selectedAlert, setSelectedAlert] = useState<AdminFraudAlert | null>(
     null,
   );
+  const [isBulkConfirming, setIsBulkConfirming] = useState(false);
 
   const {
     data: { fraudAlerts, total } = {},
@@ -57,6 +66,75 @@ function FraudAlertsPageClient() {
     keepPreviousData: true,
   });
 
+  const handleBulkConfirm = async (
+    alerts: AdminFraudAlert[],
+    resetSelection: () => void,
+  ) => {
+    // Confirming an alert confirms all pending alerts for that partner, so
+    // dedupe by partner before looping the existing PATCH endpoint.
+    const pendingAlerts = [
+      ...new Map(
+        alerts
+          .filter((alert) => alert.status === "pending")
+          .map((alert) => [alert.partner.id, alert]),
+      ).values(),
+    ];
+
+    if (pendingAlerts.length === 0) {
+      toast.error("No pending fraud alerts selected.");
+      return;
+    }
+
+    if (
+      !window.confirm(
+        `Are you sure you want to confirm ${pendingAlerts.length} fraud ${pluralize("alert", pendingAlerts.length)}?`,
+      )
+    ) {
+      return;
+    }
+
+    setIsBulkConfirming(true);
+
+    try {
+      let succeeded = 0;
+      let failed = 0;
+
+      for (const alert of pendingAlerts) {
+        try {
+          const response = await fetch(`/api/admin/fraud-alerts/${alert.id}`, {
+            method: "PATCH",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ status: "confirmed" }),
+          });
+
+          // 409 means the partner's pending alerts were already confirmed
+          if (response.ok || response.status === 409) {
+            succeeded++;
+          } else {
+            failed++;
+          }
+        } catch {
+          failed++;
+        }
+      }
+
+      if (failed > 0) {
+        toast.error(
+          `Confirmed ${succeeded} ${pluralize("alert", succeeded)}, ${failed} failed.`,
+        );
+      } else {
+        toast.success(
+          `Confirmed ${succeeded} fraud ${pluralize("alert", succeeded)}.`,
+        );
+      }
+
+      resetSelection();
+      await mutate();
+    } finally {
+      setIsBulkConfirming(false);
+    }
+  };
+
   // Extract unique programs from fraud alerts for filter options
   const programs = useMemo(() => {
     if (!fraudAlerts) return [];
@@ -241,6 +319,37 @@ function FraudAlertsPageClient() {
     resourceName: (plural) => `fraud alert${plural ? "s" : ""}`,
     rowCount: total ?? 0,
     loading: isLoading,
+    thClassName: (id) => (id === "partner" ? "pl-4" : ""),
+    tdClassName: (id) => (id === "partner" ? "pl-4" : ""),
+    getRowId: (row) => row.id,
+    selectionControls: (tableInstance) => {
+      const selectedAlerts = tableInstance
+        .getSelectedRowModel()
+        .rows.map((row) => row.original);
+      const pendingCount = selectedAlerts.filter(
+        (alert) => alert.status === "pending",
+      ).length;
+
+      return (
+        <Button
+          variant="danger"
+          text="Confirm Fraud"
+          className="h-7 w-fit rounded-lg px-2.5"
+          loading={isBulkConfirming}
+          disabled={pendingCount === 0}
+          disabledTooltip={
+            pendingCount === 0
+              ? "Only pending fraud alerts can be confirmed."
+              : undefined
+          }
+          onClick={() =>
+            handleBulkConfirm(selectedAlerts, () =>
+              tableInstance.resetRowSelection(),
+            )
+          }
+        />
+      );
+    },
   });
 
   return (
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/programs-nav-tabs.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/programs-nav-tabs.tsx
index f516b8c499f..08f70c246e1 100644
--- a/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/programs-nav-tabs.tsx
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/programs-nav-tabs.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { PageNavTabs } from "@/ui/layout/page-nav-tabs";
-import { CrownSmall, GridIcon } from "@dub/ui";
+import { CrownSmall, GridIcon, History } from "@dub/ui";
 import { useMemo } from "react";
 
 export function ProgramsNavTabs() {
@@ -12,6 +12,11 @@ export function ProgramsNavTabs() {
         label: "Marketplace",
         icon: GridIcon,
       },
+      {
+        id: "recent",
+        label: "Recent programs",
+        icon: History,
+      },
       {
         id: "sales",
         label: "Top programs by sales",
diff --git a/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/recent/page.tsx b/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/recent/page.tsx
new file mode 100644
index 00000000000..4fafab7f639
--- /dev/null
+++ b/apps/web/app/(ee)/admin.dub.co/(dashboard)/programs/recent/page.tsx
@@ -0,0 +1,383 @@
+"use client";
+
+import { PlanProps, plans } from "@/lib/types";
+import {
+  ADMIN_RECENT_PROGRAMS_PAGE_SIZE,
+  adminRecentProgramSchema,
+} from "@/lib/zod/schemas/admin";
+import { useConfirmModal } from "@/ui/modals/confirm-modal";
+import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";
+import PlanBadge from "@/ui/workspaces/plan-badge";
+import {
+  CreditCard,
+  Filter,
+  GridIcon,
+  Table,
+  TimestampTooltip,
+  Tooltip,
+  usePagination,
+  useRouterStuff,
+  useTable,
+} from "@dub/ui";
+import {
+  capitalize,
+  cn,
+  currencyFormatter,
+  fetcher,
+  formatDateSmart,
+  getDomainWithoutWWW,
+  isSafeLinkHref,
+  nFormatter,
+  OG_AVATAR_URL,
+  PARTNERS_DOMAIN,
+} from "@dub/utils";
+import { Suspense, useCallback, useMemo, useState } from "react";
+import { toast } from "sonner";
+import useSWR from "swr";
+import * as z from "zod/v4";
+
+type AdminRecentProgram = z.infer<typeof adminRecentProgramSchema>;
+
+export default function RecentProgramsPage() {
+  return (
+    <Suspense>
+      <RecentProgramsPageClient />
+    </Suspense>
+  );
+}
+
+function RecentProgramsPageClient() {
+  const { queryParams, getQueryString, searchParamsObj } = useRouterStuff();
+  const { plan } = searchParamsObj;
+  const { pagination, setPagination } = usePagination(
+    ADMIN_RECENT_PROGRAMS_PAGE_SIZE,
+  );
+  const [programToAdd, setProgramToAdd] = useState<AdminRecentProgram | null>(
+    null,
+  );
+
+  const filters = useMemo(
+    () => [
+      {
+        key: "plan",
+        icon: CreditCard,
+        label: "Plan",
+        singleSelect: true,
+        options: plans.map((value) => ({
+          value,
+          label: capitalize(value) ?? value,
+        })),
+      },
+    ],
+    [],
+  );
+
+  const activeFilters = useMemo(
+    () => [...(plan ? [{ key: "plan", value: plan }] : [])],
+    [plan],
+  );
+
+  const onSelect = useCallback(
+    (key: string, value: any) =>
+      queryParams({
+        set: { [key]: value },
+        del: "page",
+      }),
+    [queryParams],
+  );
+
+  const onRemove = useCallback(
+    (key: string) =>
+      queryParams({
+        del: [key, "page"],
+      }),
+    [queryParams],
+  );
+
+  const onRemoveAll = useCallback(
+    () =>
+      queryParams({
+        del: ["plan", "page"],
+      }),
+    [queryParams],
+  );
+
+  const {
+    data: { programs, total } = {},
+    isLoading,
+    mutate,
+  } = useSWR<{
+    programs: AdminRecentProgram[];
+    total: number;
+  }>(`/api/admin/programs/recent${getQueryString()}`, fetcher, {
+    keepPreviousData: true,
+  });
+
+  const { setShowConfirmModal, confirmModal } = useConfirmModal({
+    title: "Add marketplace program",
+    description: programToAdd ? (
+      <>
+        Add{" "}
+        <span className="font-medium text-neutral-900">
+          {programToAdd.name}
+        </span>{" "}
+        to marketplace listings? This will make it visible to all partners on{" "}
+        <a
+          href="https://dub.co/marketplace"
+          target="_blank"
+          className="font-medium text-neutral-900 underline decoration-neutral-300 decoration-dotted underline-offset-2"
+        >
+          dub.co/marketplace
+        </a>
+      </>
+    ) : null,
+    confirmText: "Add",
+    cancelText: "Cancel",
+    onCancel: () => setProgramToAdd(null),
+    onConfirm: async () => {
+      if (!programToAdd) return;
+
+      const res = await fetch("/api/admin/programs", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          programSlug: programToAdd.slug,
+        }),
+      });
+
+      if (!res.ok) {
+        const message = await res.text();
+        toast.error(message || "Failed to add program.");
+        throw new Error(message);
+      }
+
+      await mutate();
+      toast.success("Program added to marketplace.");
+      setProgramToAdd(null);
+    },
+  });
+
+  const { table, ...tableProps } = useTable({
+    data: programs ?? [],
+    columns: [
+      {
+        id: "program",
+        header: "Program",
+        minSize: 280,
+        cell: ({ row }) => (
+          <ProgramCell
+            program={row.original}
+            onAddToMarketplace={() => {
+              setProgramToAdd(row.original);
+              setShowConfirmModal(true);
+            }}
+          />
+        ),
+      },
+      {
+        id: "plan",
+        header: "Plan",
+        minSize: 140,
+        cell: ({ row }) => (
+          <a
+            href={`https://dashboard.stripe.com/customers/${row.original.workspace.stripeId}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="hover:cursor-alias"
+          >
+            <PlanBadge plan={row.original.workspace.plan as PlanProps} />
+          </a>
+        ),
+        meta: {
+          filterParams: ({ row }) => ({
+            plan: row.original.workspace.plan,
+          }),
+        },
+      },
+      {
+        id: "partners",
+        header: "Partners",
+        minSize: 120,
+        cell: ({ row }) => (
+          <span className="tabular-nums">
+            {nFormatter(row.original.partners, { full: true })}
+          </span>
+        ),
+      },
+      {
+        id: "commissions",
+        header: "Commissions (30D)",
+        minSize: 160,
+        cell: ({ row }) => (
+          <span className="tabular-nums">
+            {currencyFormatter(row.original.commissions, {
+              trailingZeroDisplay: "stripIfInteger",
+            })}
+          </span>
+        ),
+      },
+      {
+        id: "createdAt",
+        header: "Created",
+        minSize: 140,
+        cell: ({ row }) => (
+          <TimestampTooltip
+            timestamp={row.original.createdAt}
+            rows={["local", "utc", "unix"]}
+            side="left"
+          >
+            <span className="cursor-default whitespace-nowrap tabular-nums text-neutral-600 underline decoration-neutral-300 decoration-dotted underline-offset-2">
+              {formatDateSmart(row.original.createdAt, { month: "short" })}
+            </span>
+          </TimestampTooltip>
+        ),
+      },
+    ],
+    pagination,
+    onPaginationChange: setPagination,
+    resourceName: (plural) => `program${plural ? "s" : ""}`,
+    rowCount: total ?? 0,
+    loading: isLoading,
+    thClassName: "border-l-0",
+    tdClassName: "border-l-0",
+    cellRight: (cell) => {
+      const meta = cell.column.columnDef.meta as
+        | {
+            filterParams?: any;
+          }
+        | undefined;
+
+      return (
+        meta?.filterParams && (
+          <FilterButtonTableRow set={meta.filterParams(cell)} />
+        )
+      );
+    },
+  });
+
+  return (
+    <>
+      {confirmModal}
+      <div className="flex flex-col gap-3">
+        <Filter.Select
+          className="w-full md:w-fit"
+          filters={filters}
+          activeFilters={activeFilters}
+          onSelect={onSelect}
+          onRemove={onRemove}
+        />
+        {activeFilters.length > 0 && (
+          <Filter.List
+            filters={filters}
+            activeFilters={activeFilters}
+            onSelect={onSelect}
+            onRemove={onRemove}
+            onRemoveAll={onRemoveAll}
+          />
+        )}
+        <Table {...tableProps} table={table} />
+      </div>
+    </>
+  );
+}
+
+function ProgramCell({
+  program,
+  onAddToMarketplace,
+}: {
+  program: AdminRecentProgram;
+  onAddToMarketplace: () => void;
+}) {
+  const programUrl =
+    program.url && isSafeLinkHref(program.url)
+      ? program.url
+      : `${PARTNERS_DOMAIN}/${program.slug}`;
+  const listedAt = program.addedToMarketplaceAt;
+
+  const marketplaceIcon = (
+    <GridIcon className="size-3.5 shrink-0" aria-hidden />
+  );
+
+  return (
+    <div className="flex min-w-0 items-center gap-1.5 text-sm font-medium">
+      <img
+        src={program.logo || `${OG_AVATAR_URL}${program.name}`}
+        alt={program.name}
+        width={20}
+        height={20}
+        className="size-4 rounded-full"
+      />
+      <a
+        className="truncate text-sm font-medium decoration-dotted underline-offset-2 hover:cursor-alias hover:text-neutral-900 hover:underline"
+        href={`https://partners.dub.co/${program.slug}`}
+        target="_blank"
+      >
+        {program.name}
+      </a>
+      •
+      <a
+        className="truncate text-sm font-medium text-neutral-500 decoration-dotted underline-offset-2 transition-colors hover:cursor-alias hover:text-neutral-800 hover:underline"
+        href={programUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {getDomainWithoutWWW(programUrl)}
+      </a>
+      {listedAt ? (
+        <Tooltip
+          content={
+            <div className="max-w-[220px] px-3 py-2.5 text-center">
+              <p className="text-sm font-medium text-neutral-900">
+                Dub Marketplace
+              </p>
+              <p className="mt-1 text-xs leading-snug text-neutral-500">
+                Listed since{" "}
+                {new Intl.DateTimeFormat("en-US", {
+                  month: "short",
+                  day: "numeric",
+                  year: "numeric",
+                }).format(new Date(listedAt))}
+              </p>
+              <p className="mt-2 text-xs font-medium text-teal-700">
+                Click to open listing ↗
+              </p>
+            </div>
+          }
+        >
+          <a
+            href={`https://partners.dub.co/marketplace/${program.slug}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={cn(
+              "ml-1 inline-flex size-6 shrink-0 items-center justify-center rounded-md",
+              "border border-teal-200/90 bg-gradient-to-br from-white to-teal-50/90",
+              "text-teal-700 shadow-sm ring-1 ring-inset ring-white",
+              "transition-[box-shadow,transform] duration-150 hover:shadow-md active:scale-[0.97]",
+              "outline-none focus-visible:ring-2 focus-visible:ring-teal-400/35 focus-visible:ring-offset-2 focus-visible:ring-offset-white",
+            )}
+            aria-label={`View ${program.name} on Dub Marketplace (opens in new tab)`}
+          >
+            {marketplaceIcon}
+          </a>
+        </Tooltip>
+      ) : (
+        <button
+          type="button"
+          onClick={onAddToMarketplace}
+          className={cn(
+            "ml-1 inline-flex size-6 shrink-0 items-center justify-center rounded-md",
+            "border border-neutral-200 bg-white text-neutral-400",
+            "transition-[box-shadow,transform,color] duration-150",
+            "hover:bg-neutral-50 hover:text-neutral-600 hover:shadow-sm active:scale-[0.97]",
+            "outline-none focus-visible:ring-2 focus-visible:ring-neutral-400/35 focus-visible:ring-offset-2 focus-visible:ring-offset-white",
+          )}
+          aria-label={`Add ${program.name} to Dub Marketplace`}
+        >
+          {marketplaceIcon}
+        </button>
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.ts b/apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.ts
new file mode 100644
index 00000000000..6b69665ba29
--- /dev/null
+++ b/apps/web/app/(ee)/api/admin/ban/delete-workspace-admin.ts
@@ -0,0 +1,112 @@
+import { linkCache } from "@/lib/api/links/cache";
+import { qstash } from "@/lib/cron";
+import { prisma } from "@/lib/prisma";
+import { storage } from "@/lib/storage";
+import { stripe } from "@/lib/stripe";
+import { cancelSubscription } from "@/lib/stripe/cancel-subscription";
+import { WorkspaceProps } from "@/lib/types";
+import {
+  APP_DOMAIN_WITH_NGROK,
+  DUB_DOMAINS_ARRAY,
+  LEGAL_USER_ID,
+  LEGAL_WORKSPACE_ID,
+  R2_URL,
+} from "@dub/utils";
+import { addToStripeFraudValueLists } from "app/(ee)/api/stripe/webhook/utils/add-to-stripe-fraud-value-lists";
+import Stripe from "stripe";
+
+export async function deleteWorkspaceAdmin(
+  workspace: Pick<WorkspaceProps, "id" | "slug" | "logo" | "stripeId">,
+) {
+  while (true) {
+    const defaultDomainLinks = await prisma.link.findMany({
+      where: {
+        projectId: workspace.id,
+        domain: {
+          in: DUB_DOMAINS_ARRAY,
+        },
+      },
+      select: {
+        id: true,
+        domain: true,
+        key: true,
+      },
+      take: 100,
+    });
+
+    if (defaultDomainLinks.length === 0) {
+      break;
+    }
+
+    const [redisRes, prismaRes] = await Promise.allSettled([
+      linkCache.expireMany(defaultDomainLinks),
+      prisma.link.updateMany({
+        where: {
+          id: {
+            in: defaultDomainLinks.map((link) => link.id),
+          },
+        },
+        data: {
+          projectId: LEGAL_WORKSPACE_ID,
+          userId: LEGAL_USER_ID,
+        },
+      }),
+    ]);
+
+    console.log(
+      `Banned ${defaultDomainLinks.length} default domain links for ${workspace.slug}`,
+      redisRes,
+      prismaRes,
+    );
+  }
+
+  const deleteWorkspaceResponse = await Promise.allSettled([
+    // delete workspace logo if it's a custom logo stored in R2
+    workspace.logo &&
+      workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`) &&
+      storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") }),
+
+    // if they have a Stripe subscription, cancel it + add to fraud value lists
+    workspace.stripeId &&
+      cancelSubscription({
+        customerId: workspace.stripeId,
+        immediateCancellation: true,
+        reason: "Customer was banned from Dub",
+      }).then(async (res) => {
+        console.log("Cancelled Stripe subscription", res);
+
+        const stripeCustomer = (await stripe.customers.retrieve(
+          workspace.stripeId!,
+          {
+            expand: ["invoice_settings.default_payment_method"],
+          },
+        )) as Stripe.Customer;
+
+        const defaultPaymentMethod =
+          stripeCustomer.invoice_settings?.default_payment_method;
+
+        await addToStripeFraudValueLists({
+          customerId: workspace.stripeId!,
+          customerEmail: stripeCustomer.email,
+          cardFingerprint:
+            defaultPaymentMethod && typeof defaultPaymentMethod !== "string"
+              ? defaultPaymentMethod.card?.fingerprint
+              : undefined,
+        });
+      }),
+
+    // Queue the workspace for deletion
+    qstash.publishJSON({
+      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,
+      body: {
+        workspaceId: workspace.id,
+      },
+    }),
+  ]);
+
+  console.log(`Deleted workspace ${workspace.slug}`, deleteWorkspaceResponse);
+
+  return {
+    deleteWorkspaceResponse,
+  };
+}
diff --git a/apps/web/app/(ee)/api/admin/ban/route.ts b/apps/web/app/(ee)/api/admin/ban/route.ts
index a8c325233cf..9b3b206c41c 100644
--- a/apps/web/app/(ee)/api/admin/ban/route.ts
+++ b/apps/web/app/(ee)/api/admin/ban/route.ts
@@ -1,4 +1,3 @@
-import { deleteWorkspaceAdmin } from "@/lib/api/workspaces/delete-workspace";
 import { withAdmin } from "@/lib/auth";
 import { updateConfig } from "@/lib/edge-config";
 import { extractEmailDomain } from "@/lib/email/extract-email-domain";
@@ -7,6 +6,7 @@ import { isStored, storage } from "@/lib/storage";
 import { R2_URL } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
+import { deleteWorkspaceAdmin } from "./delete-workspace-admin";
 
 // POST /api/admin/ban
 export const POST = withAdmin(
@@ -41,6 +41,20 @@ export const POST = withAdmin(
 
     const emailDomain = extractEmailDomain(email);
 
+    // block email in edge config first so that no feedback emails are sent
+    await Promise.all([
+      updateConfig({
+        key: "emails",
+        value: email,
+      }),
+      blockEmailDomain &&
+        emailDomain &&
+        updateConfig({
+          key: "emailDomainTerms",
+          value: emailDomain,
+        }),
+    ]);
+
     console.log(
       `Found user ${user.email} with ${user.projects.length} workspaces`,
     );
@@ -49,28 +63,18 @@ export const POST = withAdmin(
       Promise.allSettled(
         user.projects.map(({ project }) => deleteWorkspaceAdmin(project)),
       ).then(async () => {
-        await Promise.all([
-          user.image &&
-            isStored(user.image) &&
-            storage.delete({ key: user.image.replace(`${R2_URL}/`, "") }),
-          updateConfig({
-            key: "emails",
-            value: email,
-          }),
-          blockEmailDomain &&
-            emailDomain &&
-            updateConfig({
-              key: "emailDomainTerms",
-              value: emailDomain,
-            }),
-        ]);
-
-        // delete user
+        // delete user after all workspaces are deleted
         await prisma.user.delete({
           where: {
             id: user.id,
           },
         });
+        console.log(`Deleted user ${user.email}`);
+
+        if (user.image && isStored(user.image)) {
+          await storage.delete({ key: user.image.replace(`${R2_URL}/`, "") });
+          console.log(`Deleted user image ${user.image}`);
+        }
       }),
     );
 
diff --git a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
index 24e3f71dbad..66074095810 100644
--- a/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
+++ b/apps/web/app/(ee)/api/admin/commissions/get-commissions-timeseries.ts
@@ -1,7 +1,7 @@
 import { sqlGranularityMap } from "@/lib/planetscale/granularity";
 import { prisma } from "@/lib/prisma";
 import { TZDate } from "@date-fns/tz";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 import { Prisma } from "@prisma/client";
 import { format } from "date-fns";
 
@@ -35,7 +35,7 @@ export async function getCommissionsTimeseries({
           createdAt >= ${startDate}
           AND createdAt < ${endDate}
           AND status IN ("pending", "processed", "paid")
-          AND ${programId ? Prisma.sql`programId = ${programId}` : Prisma.sql`programId != ${ACME_PROGRAM_ID}`}
+          AND ${programId ? Prisma.sql`programId = ${programId}` : Prisma.sql`programId NOT IN (${ACME_PROGRAM_ID}, ${DEMO_PROGRAM_ID})`}
         GROUP BY start
         ORDER BY start ASC;`;
 
diff --git a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
index 5d6163a638f..41251e8efb3 100644
--- a/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
+++ b/apps/web/app/(ee)/api/admin/commissions/get-top-program-by-commissions.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@/lib/prisma";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 
 export async function getTopProgramsByCommissions({
   programId,
@@ -24,7 +24,14 @@ export async function getTopProgramsByCommissions({
         in: ["pending", "processed", "paid"],
       },
       programId: programId || {
-        not: ACME_PROGRAM_ID,
+        notIn: [ACME_PROGRAM_ID, DEMO_PROGRAM_ID],
+      },
+      NOT: {
+        program: {
+          slug: {
+            endsWith: "-staging",
+          },
+        },
       },
     },
     orderBy: {
@@ -40,11 +47,6 @@ export async function getTopProgramsByCommissions({
       id: {
         in: programCommissions.map(({ programId }) => programId),
       },
-      NOT: {
-        slug: {
-          endsWith: "-staging",
-        },
-      },
     },
     include: {
       workspace: {
diff --git a/apps/web/app/(ee)/api/admin/fraud-alerts/[id]/route.ts b/apps/web/app/(ee)/api/admin/fraud-alerts/[fraudAlertId]/route.ts
similarity index 81%
rename from apps/web/app/(ee)/api/admin/fraud-alerts/[id]/route.ts
rename to apps/web/app/(ee)/api/admin/fraud-alerts/[fraudAlertId]/route.ts
index 957f78a6db9..eaf3de57cb1 100644
--- a/apps/web/app/(ee)/api/admin/fraud-alerts/[id]/route.ts
+++ b/apps/web/app/(ee)/api/admin/fraud-alerts/[fraudAlertId]/route.ts
@@ -3,7 +3,6 @@ import { withAdmin } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { MAX_FRAUD_REASON_LENGTH } from "@/lib/zod/schemas/partners";
 import { Prisma } from "@prisma/client";
-import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -12,17 +11,17 @@ const reviewSchema = z.object({
   reviewNote: z.string().trim().max(MAX_FRAUD_REASON_LENGTH).optional(),
 });
 
-// PATCH /api/admin/fraud-alerts/[id]
+// PATCH /api/admin/fraud-alerts/[fraudAlertId]
 export const PATCH = withAdmin(
   async ({ req, params, session }) => {
-    const { id } = params;
+    const { fraudAlertId } = params;
     const { status: newStatus, reviewNote } = reviewSchema.parse(
       await req.json(),
     );
 
     const fraudAlert = await prisma.fraudAlert.findUnique({
       where: {
-        id,
+        id: fraudAlertId,
       },
       select: {
         partnerId: true,
@@ -42,7 +41,7 @@ export const PATCH = withAdmin(
     if (newStatus === "dismissed") {
       const { count } = await prisma.fraudAlert.updateMany({
         where: {
-          id,
+          id: fraudAlertId,
           status: "pending",
         },
         data: {
@@ -104,19 +103,17 @@ export const PATCH = withAdmin(
       },
     });
 
-    waitUntil(
-      Promise.allSettled(
-        pendingFraudAlerts.map(({ programEnrollment, createdAt }) =>
-          reportNetworkLevelBan({
-            partnerId: programEnrollment.partnerId,
-            programId: programEnrollment.programId,
-            bannedReason: programEnrollment.bannedReason ?? "fraud",
-            bannedAt:
-              programEnrollment.bannedAt ??
-              programEnrollment.application?.reviewedAt ??
-              createdAt,
-          }),
-        ),
+    await Promise.allSettled(
+      pendingFraudAlerts.map(({ programEnrollment, createdAt }) =>
+        reportNetworkLevelBan({
+          partnerId: programEnrollment.partnerId,
+          programId: programEnrollment.programId,
+          bannedReason: programEnrollment.bannedReason ?? "fraud",
+          bannedAt:
+            programEnrollment.bannedAt ??
+            programEnrollment.application?.reviewedAt ??
+            createdAt,
+        }),
       ),
     );
 
diff --git a/apps/web/app/(ee)/api/admin/impersonate/route.ts b/apps/web/app/(ee)/api/admin/impersonate/route.ts
index 8341d7c3ec9..6dfa6ef0e8d 100644
--- a/apps/web/app/(ee)/api/admin/impersonate/route.ts
+++ b/apps/web/app/(ee)/api/admin/impersonate/route.ts
@@ -1,123 +1,212 @@
+import { getAnalytics } from "@/lib/analytics/get-analytics";
+import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { normalizeDomainInput } from "@/lib/api/domains/normalize-domain-input";
 import { hashToken, withAdmin } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN, PARTNERS_DOMAIN } from "@dub/utils";
+import { getWorkspaceUsage } from "@/lib/tinybird/get-workspace-usage";
+import { emailSchema } from "@/lib/zod/schemas/auth";
+import {
+  APP_DOMAIN,
+  isAppHostname,
+  PARTNERS_DOMAIN,
+  validDomainRegex,
+  validSlugRegex,
+} from "@dub/utils";
+import { Prisma } from "@prisma/client";
 import { randomBytes } from "crypto";
 import { NextResponse } from "next/server";
 
-// POST /api/admin/impersonate
-export const POST = withAdmin(async ({ req }) => {
-  const { email, slug } = await req.json();
-
-  let userEmails: string[] = [];
-  if (email) {
-    userEmails.push(email);
-    const partner = await prisma.partner.findUnique({
-      where: {
-        email,
-      },
-      select: {
-        users: {
-          select: {
-            user: {
-              select: {
-                email: true,
-              },
-            },
-          },
-          take: 1,
-        },
-      },
-    });
-    if (partner?.users && partner.users.length > 0) {
-      userEmails.push(...partner.users.map((user) => user.user.email || ""));
-    }
-  }
-
-  const response = await prisma.user.findFirst({
-    where:
-      userEmails.length > 0
-        ? {
-            email: {
-              in: userEmails,
-            },
-          }
-        : {
-            projects: {
-              some: {
-                project: {
-                  slug,
-                },
-                role: "owner",
-              },
-            },
-          },
+const userSelect = {
+  email: true,
+  projects: {
     select: {
-      email: true,
-      projects: {
+      project: {
         select: {
-          project: {
+          id: true,
+          name: true,
+          slug: true,
+          plan: true,
+          planPeriod: true,
+          trialEndsAt: true,
+          defaultProgramId: true,
+          partnersUsage: true,
+          totalClicks: true,
+          totalLinks: true,
+          programs: {
             select: {
               id: true,
-              name: true,
               slug: true,
-              plan: true,
-              usage: true,
-              linksUsage: true,
-              totalClicks: true,
-              totalLinks: true,
+              url: true,
             },
           },
         },
-        orderBy: {
-          project: {
-            totalClicks: "desc",
-          },
-        },
       },
-      partners: {
+    },
+    orderBy: {
+      project: {
+        totalClicks: "desc",
+      },
+    },
+  },
+  partners: {
+    select: {
+      partner: {
         select: {
-          partner: {
+          programs: {
             select: {
-              programs: {
+              program: {
                 select: {
-                  program: {
-                    select: {
-                      id: true,
-                      name: true,
-                      slug: true,
-                    },
-                  },
-                  status: true,
-                  totalClicks: true,
-                  totalLeads: true,
-                  totalConversions: true,
-                  totalSaleAmount: true,
-                  totalCommissions: true,
-                },
-                orderBy: {
-                  totalCommissions: "desc",
+                  id: true,
+                  name: true,
+                  slug: true,
                 },
               },
+              status: true,
+              totalClicks: true,
+              totalLeads: true,
+              totalConversions: true,
+              totalSaleAmount: true,
+              totalCommissions: true,
+            },
+            orderBy: {
+              totalCommissions: "desc",
             },
           },
         },
       },
     },
-  });
+  },
+} satisfies Prisma.UserSelect;
+
+const ownerSelect = {
+  users: {
+    where: {
+      role: {
+        in: ["owner", "billing"], // in cases of disabled workspaces, the billing user is the owner
+      },
+      user: {
+        email: {
+          not: null,
+        },
+      },
+    },
+    orderBy: {
+      createdAt: "asc",
+    },
+    take: 1,
+    select: {
+      user: {
+        select: userSelect,
+      },
+    },
+  },
+} satisfies Prisma.ProjectSelect;
+
+type ImpersonateIdentifier =
+  | { type: "email"; email: string }
+  | { type: "slug"; slug: string }
+  | { type: "domain"; domain: string }
+  | { type: "stripeCustomerId"; stripeCustomerId: string };
+
+const STRIPE_CUSTOMER_ID_REGEX = /cus_[a-zA-Z0-9]+/;
 
-  if (!response?.email) {
+function parseImpersonateQuery(
+  raw: unknown,
+): ImpersonateIdentifier | { error: string } {
+  if (typeof raw !== "string" || !raw.trim()) {
+    return {
+      error:
+        "Enter a user email, workspace slug, domain, or Stripe customer ID",
+    };
+  }
+
+  let query = raw.trim();
+  if (query.toLowerCase().startsWith("mailto:")) {
+    query = query.slice(7).trim();
+  }
+
+  if (query.includes("@")) {
+    const parsed = emailSchema.safeParse(query);
+    if (!parsed.success) {
+      return { error: "Invalid email" };
+    }
+    return { type: "email", email: parsed.data };
+  }
+
+  const stripeCustomerId = query.match(STRIPE_CUSTOMER_ID_REGEX)?.[0];
+  if (
+    stripeCustomerId &&
+    (query.startsWith("cus_") || query.includes("stripe.com"))
+  ) {
+    return { type: "stripeCustomerId", stripeCustomerId };
+  }
+
+  let hostname: string | undefined;
+  let pathname: string | undefined;
+  try {
+    const url = query.includes("://")
+      ? new URL(query)
+      : query.includes("/")
+        ? new URL(`https://${query}`)
+        : undefined;
+    if (url) {
+      hostname = url.hostname.toLowerCase();
+      pathname = url.pathname;
+    }
+  } catch {
+    // keep the raw query
+  }
+
+  if (hostname && isAppHostname(hostname)) {
+    const slug = pathname?.split("/").filter(Boolean)[0];
+    if (slug && validSlugRegex.test(slug)) {
+      return { type: "slug", slug: slug.toLowerCase() };
+    }
+  }
+
+  const domain = normalizeDomainInput(hostname ?? query);
+  if (validDomainRegex.test(domain)) {
+    return { type: "domain", domain };
+  }
+
+  const slug = query.toLowerCase();
+  if (validSlugRegex.test(slug)) {
+    return { type: "slug", slug };
+  }
+
+  return {
+    error: "Enter a user email, workspace slug, domain, or Stripe customer ID",
+  };
+}
+
+// POST /api/admin/impersonate
+export const POST = withAdmin(async ({ req }) => {
+  const { query, email, slug, domain, stripeCustomerId } = await req.json();
+  const parsed = parseImpersonateQuery(
+    query ?? email ?? slug ?? domain ?? stripeCustomerId,
+  );
+
+  if ("error" in parsed) {
+    return new Response(parsed.error, { status: 400 });
+  }
+
+  const result = await findUser(parsed);
+
+  if ("error" in result) {
+    return new Response(result.error, { status: 404 });
+  }
+
+  const { user: response } = result;
+
+  if (!response.email) {
     return new Response("User not found", { status: 404 });
   }
 
   const data = {
     email: response.email,
-    workspaces: response.projects.map(({ project }) => ({
-      ...project,
-      clicks: project.usage,
-      links: project.linksUsage,
-      totalClicks: project.totalClicks,
-      totalLinks: project.totalLinks,
-    })),
+    workspaces: await serializeWorkspaces(
+      response.projects.map(({ project }) => project),
+    ),
     programs:
       response.partners.length > 0
         ? response.partners[0].partner.programs.map(({ program, ...rest }) => ({
@@ -131,6 +220,252 @@ export const POST = withAdmin(async ({ req }) => {
   return NextResponse.json(data);
 });
 
+type ImpersonateProject = Prisma.UserGetPayload<{
+  select: typeof userSelect;
+}>["projects"][number]["project"];
+
+async function serializeWorkspaces(projects: ImpersonateProject[]) {
+  const useLast30DaysStats = projects.length <= 2;
+  const programIds = projects
+    .map((project) => project.defaultProgramId)
+    .filter((id): id is string => Boolean(id));
+
+  const { startDate } = getStartEndDates({ interval: "30d" });
+
+  const [statsByWorkspaceId, commissionsByProgramId] = await Promise.all([
+    useLast30DaysStats
+      ? getLast30DayWorkspaceStats(projects)
+      : Promise.resolve(new Map<string, { clicks: number; links: number }>()),
+    programIds.length > 0
+      ? prisma.commission
+          .groupBy({
+            by: ["programId"],
+            where: {
+              programId: {
+                in: programIds,
+              },
+              status: {
+                in: ["pending", "processed", "paid"],
+              },
+              createdAt: {
+                gte: startDate,
+              },
+            },
+            _sum: {
+              earnings: true,
+            },
+          })
+          .then(
+            (rows) =>
+              new Map(
+                rows.map((row) => [row.programId, row._sum.earnings ?? 0]),
+              ),
+          )
+      : Promise.resolve(new Map<string, number>()),
+  ]);
+
+  return projects.map((project) => {
+    const stats = statsByWorkspaceId.get(project.id);
+    const program = project.defaultProgramId
+      ? project.programs.find((item) => item.id === project.defaultProgramId) ??
+        project.programs[0]
+      : null;
+
+    return {
+      id: project.id,
+      name: project.name,
+      slug: project.slug,
+      plan: project.plan,
+      planPeriod: project.planPeriod,
+      trialEndsAt: project.trialEndsAt,
+      events: stats?.clicks ?? project.totalClicks,
+      links: stats?.links ?? project.totalLinks,
+      statsInterval: useLast30DaysStats ? ("30d" as const) : ("all" as const),
+      program: program
+        ? {
+            url: program.url ?? `${PARTNERS_DOMAIN}/${program.slug}`,
+            partners: project.partnersUsage,
+            commissions: commissionsByProgramId.get(program.id) ?? 0,
+          }
+        : null,
+    };
+  });
+}
+
+async function getLast30DayWorkspaceStats(projects: ImpersonateProject[]) {
+  const entries = await Promise.all(
+    projects.map(async (project) => {
+      try {
+        const [analytics, linksUsage] = await Promise.all([
+          getAnalytics({
+            workspaceId: project.id,
+            event: "clicks",
+            groupBy: "count",
+            interval: "30d",
+          }),
+          getWorkspaceUsage({
+            workspaceId: project.id,
+            resource: "links",
+            interval: "30d",
+          }),
+        ]);
+
+        const clicks =
+          analytics &&
+          typeof analytics === "object" &&
+          "clicks" in analytics &&
+          typeof analytics.clicks === "number"
+            ? analytics.clicks
+            : project.totalClicks;
+
+        const links = linksUsage.reduce(
+          (acc, curr) => acc + (curr.value ?? 0),
+          0,
+        );
+
+        return [project.id, { clicks, links }] as const;
+      } catch (error) {
+        console.error(
+          `Failed to fetch 30d stats for workspace ${project.slug}:`,
+          error,
+        );
+        return [
+          project.id,
+          { clicks: project.totalClicks, links: project.totalLinks },
+        ] as const;
+      }
+    }),
+  );
+
+  return new Map(entries);
+}
+
+async function findUser(identifier: ImpersonateIdentifier) {
+  if (identifier.type === "email") {
+    const userEmails = [identifier.email];
+    const partner = await prisma.partner.findUnique({
+      where: {
+        email: identifier.email,
+      },
+      select: {
+        users: {
+          select: {
+            user: {
+              select: {
+                email: true,
+              },
+            },
+          },
+          take: 1,
+        },
+      },
+    });
+    if (partner?.users && partner.users.length > 0) {
+      userEmails.push(...partner.users.map((user) => user.user.email || ""));
+    }
+
+    const user = await prisma.user.findFirst({
+      where: {
+        email: {
+          in: userEmails,
+        },
+      },
+      select: userSelect,
+    });
+
+    if (!user?.email) {
+      return { error: "User not found" };
+    }
+
+    return { user };
+  }
+
+  if (identifier.type === "domain") {
+    const domainRecord = await prisma.domain.findUnique({
+      where: {
+        slug: identifier.domain,
+      },
+      select: {
+        project: {
+          select: ownerSelect,
+        },
+      },
+    });
+
+    if (!domainRecord) {
+      return { error: "Domain not found" };
+    }
+
+    if (!domainRecord.project) {
+      return { error: "Domain is not attached to a workspace" };
+    }
+
+    const user = domainRecord.project.users[0]?.user;
+    if (!user?.email) {
+      return { error: "Workspace owner not found" };
+    }
+
+    return { user };
+  }
+
+  if (identifier.type === "stripeCustomerId") {
+    const project = await prisma.project.findUnique({
+      where: {
+        stripeId: identifier.stripeCustomerId,
+      },
+      select: ownerSelect,
+    });
+
+    if (project) {
+      const user = project.users[0]?.user;
+      if (!user?.email) {
+        return { error: "Workspace owner not found" };
+      }
+      return { user };
+    }
+
+    const customer = await prisma.customer.findUnique({
+      where: {
+        stripeCustomerId: identifier.stripeCustomerId,
+      },
+      select: {
+        project: {
+          select: ownerSelect,
+        },
+      },
+    });
+
+    if (!customer?.project) {
+      return { error: "Workspace not found for this Stripe customer ID" };
+    }
+
+    const user = customer.project.users[0]?.user;
+    if (!user?.email) {
+      return { error: "Workspace owner not found" };
+    }
+
+    return { user };
+  }
+
+  const project = await prisma.project.findUnique({
+    where: {
+      slug: identifier.slug,
+    },
+    select: ownerSelect,
+  });
+
+  if (!project) {
+    return { error: "Workspace not found" };
+  }
+
+  const user = project.users[0]?.user;
+  if (!user?.email) {
+    return { error: "Workspace owner not found" };
+  }
+
+  return { user };
+}
+
 async function getImpersonateUrl(email: string) {
   const token = randomBytes(32).toString("hex");
 
diff --git a/apps/web/app/(ee)/api/admin/partners/[partnerId]/platforms/route.ts b/apps/web/app/(ee)/api/admin/partners/[partnerId]/platforms/route.ts
index 3698b3c7266..8585d051bf7 100644
--- a/apps/web/app/(ee)/api/admin/partners/[partnerId]/platforms/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/[partnerId]/platforms/route.ts
@@ -1,9 +1,11 @@
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getLinkedInPost } from "@/lib/api/scrape-creators/get-linkedin-post";
 import { getSocialProfile } from "@/lib/api/scrape-creators/get-social-profile";
 import { withAdmin } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { sanitizeSocialHandle, sanitizeWebsite } from "@/lib/social-utils";
 import { PlatformType } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -127,6 +129,9 @@ export const POST = withAdmin(
       },
     });
 
+    // Queue an index update because an admin corrected the searchable platform identifier
+    waitUntil(queuePartnerSearchSync({ partnerIds: [partnerId] }));
+
     return NextResponse.json({
       platform: {
         ...updated,
diff --git a/apps/web/app/(ee)/api/admin/partners/[partnerId]/route.ts b/apps/web/app/(ee)/api/admin/partners/[partnerId]/route.ts
index 55b158e69c4..8d7e001cf0a 100644
--- a/apps/web/app/(ee)/api/admin/partners/[partnerId]/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/[partnerId]/route.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { withAdmin } from "@/lib/auth";
 import { qstash } from "@/lib/cron";
 import { prisma } from "@/lib/prisma";
@@ -159,6 +160,9 @@ export const PATCH = withAdmin(async ({ params, req }) => {
     },
   });
 
+  // Queue an index update because an admin corrected the partner country (filterable field)
+  waitUntil(queuePartnerSearchSync({ partnerIds: [partner.id] }));
+
   // if there was an existing veriff session, trigger a country change verification
   if (partner.identityVerifiedAt) {
     waitUntil(
diff --git a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
index 1d9f29f5bee..b3d91aeb85e 100644
--- a/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
+++ b/apps/web/app/(ee)/api/admin/partners/delete-account/route.ts
@@ -1,4 +1,5 @@
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { withAdmin } from "@/lib/auth";
 import { conn } from "@/lib/planetscale";
 import { prisma } from "@/lib/prisma";
@@ -19,6 +20,9 @@ export const POST = withAdmin(
         commissions: true,
         programs: {
           select: {
+            // Needed to clear these enrollments from the search index once they
+            // are gone, since nothing can resolve their IDs afterwards.
+            id: true,
             program: true,
             links: true,
             groupId: true,
@@ -130,6 +134,11 @@ export const POST = withAdmin(
         console.log(
           `Deleted ${partner.programs.length} program enrollments for partner ${partner.email} (${partner.id})`,
         );
+
+        // Queue an index update because the partner's enrollments were deleted.
+        await queuePartnerSearchSync({
+          enrollmentIds: partner.programs.map(({ id }) => id),
+        });
       }
 
       await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partner.id]);
diff --git a/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts b/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts
index e28dd94d373..7c8eb411a37 100644
--- a/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts
+++ b/apps/web/app/(ee)/api/admin/payouts/get-payouts-timeseries.ts
@@ -1,6 +1,6 @@
 import { conn } from "@/lib/planetscale/connection";
 import { sqlGranularityMap } from "@/lib/planetscale/granularity";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 import { InvoiceStatus } from "@prisma/client";
 import { format } from "date-fns";
 
@@ -47,8 +47,8 @@ export async function getPayoutsTimeseries({
     whereClauses.unshift("programId = ?");
     queryParams.unshift(programId);
   } else {
-    whereClauses.unshift("programId != ?");
-    queryParams.unshift(ACME_PROGRAM_ID);
+    whereClauses.unshift("programId NOT IN (?, ?)");
+    queryParams.unshift(ACME_PROGRAM_ID, DEMO_PROGRAM_ID);
   }
 
   if (status) {
diff --git a/apps/web/app/(ee)/api/admin/payouts/route.ts b/apps/web/app/(ee)/api/admin/payouts/route.ts
index 1e6dc1b2341..73a891ba519 100644
--- a/apps/web/app/(ee)/api/admin/payouts/route.ts
+++ b/apps/web/app/(ee)/api/admin/payouts/route.ts
@@ -3,7 +3,7 @@ import { withAdmin } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { analyticsQuerySchema } from "@/lib/zod/schemas/analytics";
 import { getPaginationQuerySchema } from "@/lib/zod/schemas/misc";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 import { InvoiceStatus, Prisma } from "@prisma/client";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
@@ -46,12 +46,18 @@ export const GET = withAdmin(async ({ searchParams }) => {
           AND: [
             {
               programId: {
-                not: ACME_PROGRAM_ID,
+                notIn: [ACME_PROGRAM_ID, DEMO_PROGRAM_ID],
               },
             },
             {
               program: {
-                isNot: null,
+                is: {
+                  NOT: {
+                    slug: {
+                      endsWith: "-staging",
+                    },
+                  },
+                },
               },
             },
           ],
diff --git a/apps/web/app/(ee)/api/admin/programs/[programId]/route.ts b/apps/web/app/(ee)/api/admin/programs/[programId]/route.ts
index 7928a9f02f0..638a7cb67e0 100644
--- a/apps/web/app/(ee)/api/admin/programs/[programId]/route.ts
+++ b/apps/web/app/(ee)/api/admin/programs/[programId]/route.ts
@@ -1,3 +1,4 @@
+import { revalidateExternalMarketplacePages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { withAdmin } from "@/lib/auth";
 import { MAX_PROGRAM_CATEGORIES } from "@/lib/constants/program";
 import { prisma } from "@/lib/prisma";
@@ -68,6 +69,8 @@ export const PATCH = withAdmin(
       },
     });
 
+    revalidateExternalMarketplacePages();
+
     return NextResponse.json({
       ...updatedProgram,
       categories: updatedProgram.categories.map(({ category }) => category),
@@ -108,6 +111,8 @@ export const DELETE = withAdmin(
       },
     });
 
+    revalidateExternalMarketplacePages();
+
     return NextResponse.json({ ok: true });
   },
   {
diff --git a/apps/web/app/(ee)/api/admin/programs/recent/route.ts b/apps/web/app/(ee)/api/admin/programs/recent/route.ts
new file mode 100644
index 00000000000..849f471bf7f
--- /dev/null
+++ b/apps/web/app/(ee)/api/admin/programs/recent/route.ts
@@ -0,0 +1,114 @@
+import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
+import { withAdmin } from "@/lib/auth";
+import { prisma } from "@/lib/prisma";
+import {
+  adminRecentProgramSchema,
+  adminRecentProgramsQuerySchema,
+} from "@/lib/zod/schemas/admin";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
+import { Prisma } from "@prisma/client";
+import { NextResponse } from "next/server";
+
+// GET /api/admin/programs/recent
+export const GET = withAdmin(async ({ searchParams }) => {
+  const {
+    page = 1,
+    pageSize,
+    plan,
+  } = adminRecentProgramsQuerySchema.parse(searchParams);
+
+  const where = {
+    id: {
+      notIn: [ACME_PROGRAM_ID, DEMO_PROGRAM_ID],
+    },
+    deactivatedAt: null,
+    NOT: {
+      slug: {
+        endsWith: "-staging",
+      },
+    },
+    workspace: {
+      stripeId: {
+        not: null,
+      },
+      ...(plan && {
+        plan,
+      }),
+    },
+  } satisfies Prisma.ProgramWhereInput;
+
+  const { startDate, endDate } = getStartEndDates({ interval: "30d" });
+
+  const [programs, total] = await Promise.all([
+    prisma.program.findMany({
+      where,
+      orderBy: {
+        createdAt: "desc",
+      },
+      skip: (page - 1) * pageSize,
+      take: pageSize,
+      select: {
+        id: true,
+        name: true,
+        slug: true,
+        logo: true,
+        url: true,
+        createdAt: true,
+        addedToMarketplaceAt: true,
+        workspace: true,
+      },
+    }),
+    prisma.program.count({ where }),
+  ]);
+
+  const programIds = programs.map((program) => program.id);
+
+  const [partnerCounts, commissionRows] =
+    programIds.length === 0
+      ? [[], []]
+      : await Promise.all([
+          prisma.programEnrollment.groupBy({
+            by: ["programId"],
+            where: {
+              programId: {
+                in: programIds,
+              },
+              status: "approved",
+            },
+            _count: true,
+          }),
+          // Drive from the page's program IDs so MySQL uses
+          // Commission(programId, status, createdAt) instead of scanning
+          // 30d of all commissions via (createdAt, status, programId).
+          prisma.$queryRaw<{ programId: string; earnings: bigint | number }[]>`
+            SELECT
+              c.programId,
+              SUM(c.earnings) AS earnings
+            FROM Program p
+            STRAIGHT_JOIN Commission c ON c.programId = p.id
+            WHERE p.id IN (${Prisma.join(programIds)})
+              AND c.status IN ('pending', 'processed', 'paid')
+              AND c.createdAt >= ${startDate}
+              AND c.createdAt <= ${endDate}
+            GROUP BY c.programId
+          `,
+        ]);
+
+  const partnersByProgramId = new Map(
+    partnerCounts.map((row) => [row.programId, row._count]),
+  );
+  const commissionsByProgramId = new Map(
+    commissionRows.map((row) => [row.programId, Number(row.earnings ?? 0)]),
+  );
+
+  return NextResponse.json({
+    programs: adminRecentProgramSchema.array().parse(
+      programs.map((program) => ({
+        ...program,
+        partners: partnersByProgramId.get(program.id) ?? 0,
+        commissions: commissionsByProgramId.get(program.id) ?? 0,
+      })),
+    ),
+    total,
+  });
+});
diff --git a/apps/web/app/(ee)/api/admin/programs/route.ts b/apps/web/app/(ee)/api/admin/programs/route.ts
index 5ddbd6431cf..e7552849176 100644
--- a/apps/web/app/(ee)/api/admin/programs/route.ts
+++ b/apps/web/app/(ee)/api/admin/programs/route.ts
@@ -1,3 +1,4 @@
+import { revalidateExternalMarketplacePages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { withAdmin } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { anthropic } from "@ai-sdk/anthropic";
@@ -160,6 +161,8 @@ export const POST = withAdmin(
       },
     });
 
+    revalidateExternalMarketplacePages();
+
     return NextResponse.json(updatedProgram);
   },
   {
@@ -221,6 +224,10 @@ export const PATCH = withAdmin(
       ),
     );
 
+    if (updatesToApply.length > 0) {
+      revalidateExternalMarketplacePages();
+    }
+
     return NextResponse.json({
       ok: true,
       updated: updatesToApply.length,
diff --git a/apps/web/app/(ee)/api/admin/programs/sales/get-top-programs-by-sales.ts b/apps/web/app/(ee)/api/admin/programs/sales/get-top-programs-by-sales.ts
index 9e6d75cef68..18903517105 100644
--- a/apps/web/app/(ee)/api/admin/programs/sales/get-top-programs-by-sales.ts
+++ b/apps/web/app/(ee)/api/admin/programs/sales/get-top-programs-by-sales.ts
@@ -1,7 +1,7 @@
 import { formatUTCDateTimeClickhouse } from "@/lib/analytics/utils/format-utc-datetime-clickhouse";
 import { prisma } from "@/lib/prisma";
 import { tb } from "@/lib/tinybird";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 import * as z from "zod/v4";
 
 export async function getTopProgramsBySales({
@@ -29,7 +29,7 @@ export async function getTopProgramsBySales({
 
   const programIds = topProgramsData
     .map((item) => item.programId)
-    .filter((id) => id !== ACME_PROGRAM_ID);
+    .filter((id) => id !== ACME_PROGRAM_ID && id !== DEMO_PROGRAM_ID);
 
   const programs = await prisma.program.findMany({
     where: {
diff --git a/apps/web/app/(ee)/api/admin/workspaces/disable/route.ts b/apps/web/app/(ee)/api/admin/workspaces/disable/route.ts
index 3367a3b1884..606631ea2c3 100644
--- a/apps/web/app/(ee)/api/admin/workspaces/disable/route.ts
+++ b/apps/web/app/(ee)/api/admin/workspaces/disable/route.ts
@@ -64,6 +64,15 @@ export const POST = withAdmin(
 
     console.log(`Updated ${updatedMembers.count} members to viewer role`);
 
+    await prisma.project.update({
+      where: {
+        id: project.id,
+      },
+      data: {
+        disabledAt: new Date(),
+      },
+    });
+
     const owners = project.users.map(({ user }) => user.email);
 
     if (owners.length > 0) {
diff --git a/apps/web/app/(ee)/api/admin/workspaces/restore/route.ts b/apps/web/app/(ee)/api/admin/workspaces/restore/route.ts
index 96b0944ea1b..a5430f8e624 100644
--- a/apps/web/app/(ee)/api/admin/workspaces/restore/route.ts
+++ b/apps/web/app/(ee)/api/admin/workspaces/restore/route.ts
@@ -76,6 +76,15 @@ export const POST = withAdmin(
 
     console.log(`Reverted ${updatedMembers.count} viewers to member role`);
 
+    await prisma.project.update({
+      where: {
+        id: project.id,
+      },
+      data: {
+        disabledAt: null,
+      },
+    });
+
     return NextResponse.json({ success: true });
   },
   {
diff --git a/apps/web/app/(ee)/api/appsflyer/webhook/route.ts b/apps/web/app/(ee)/api/appsflyer/webhook/route.ts
index 0b71af6abfa..139a7317090 100644
--- a/apps/web/app/(ee)/api/appsflyer/webhook/route.ts
+++ b/apps/web/app/(ee)/api/appsflyer/webhook/route.ts
@@ -12,7 +12,7 @@ import { prisma } from "@/lib/prisma";
 import { trackLeadRequestSchema } from "@/lib/zod/schemas/leads";
 import { trackSaleRequestSchema } from "@/lib/zod/schemas/sales";
 import { APPSFLYER_INTEGRATION_ID, getSearchParams } from "@dub/utils";
-import { Project } from "@prisma/client";
+import { CommissionSource, Project } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../cron/utils";
@@ -109,6 +109,7 @@ export const GET = withAxiom(async (req) => {
         mode: undefined,
         metadata: null,
         workspace,
+        commissionSource: CommissionSource.appsflyer,
       });
 
       response = JSON.stringify(leadResponse);
@@ -133,6 +134,7 @@ export const GET = withAxiom(async (req) => {
         leadEventName: undefined,
         metadata: null,
         workspace,
+        commissionSource: CommissionSource.appsflyer,
       });
 
       response = JSON.stringify(saleResponse);
diff --git a/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts b/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
index 93d2af7eb1e..d8a5ea2111a 100644
--- a/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
+++ b/apps/web/app/(ee)/api/bounties/[bountyId]/route.ts
@@ -3,6 +3,7 @@ import { DubApiError } from "@/lib/api/errors";
 import { throwIfInvalidGroupIds } from "@/lib/api/groups/throw-if-invalid-group-ids";
 import { throwIfInvalidPartnerTagIds } from "@/lib/api/partner-tags/throw-if-invalid-partner-tag-ids";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { parseRequestBody } from "@/lib/api/utils";
 import { WorkflowCondition } from "@/lib/api/workflows/types";
 import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";
@@ -360,6 +361,8 @@ export const PATCH = withWorkspace(
       archivedAt: data.archivedAt,
     });
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -450,21 +453,25 @@ export const DELETE = withWorkspace(
 
     const deletedBounty = BountySchema.parse(transformBounty(bounty));
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
-      recordAuditLog({
-        workspaceId: workspace.id,
-        programId,
-        action: "bounty.deleted",
-        description: `Bounty ${bountyId} deleted`,
-        actor: session?.user,
-        targets: [
-          {
-            type: "bounty",
-            id: bountyId,
-            metadata: deletedBounty,
-          },
-        ],
-      }),
+      Promise.allSettled([
+        recordAuditLog({
+          workspaceId: workspace.id,
+          programId,
+          action: "bounty.deleted",
+          description: `Bounty ${bountyId} deleted`,
+          actor: session?.user,
+          targets: [
+            {
+              type: "bounty",
+              id: bountyId,
+              metadata: deletedBounty,
+            },
+          ],
+        }),
+      ]),
     );
 
     return NextResponse.json({ id: bountyId });
diff --git a/apps/web/app/(ee)/api/bounties/route.ts b/apps/web/app/(ee)/api/bounties/route.ts
index a5e55e24bf4..a3f4206d220 100644
--- a/apps/web/app/(ee)/api/bounties/route.ts
+++ b/apps/web/app/(ee)/api/bounties/route.ts
@@ -5,6 +5,7 @@ import { throwIfInvalidGroupIds } from "@/lib/api/groups/throw-if-invalid-group-
 import { throwIfInvalidPartnerTagIds } from "@/lib/api/partner-tags/throw-if-invalid-partner-tag-ids";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { parseRequestBody } from "@/lib/api/utils";
 import { WorkflowAction } from "@/lib/api/workflows/types";
 import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";
@@ -328,6 +329,8 @@ export const POST = withWorkspace(
       canSendEmailCampaigns &&
       bounty.startMode !== BountyStartMode.relative;
 
+    revalidateProgramPublicPages(programId);
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
index 8c1ab4febef..e8b2fb01509 100644
--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/preview/route.ts
@@ -11,8 +11,10 @@ import {
 } from "@/lib/email/parse-campaign-from-address";
 import { TiptapNode } from "@/lib/types";
 import {
-  CampaignSchema,
   campaignFromSchema,
+  CampaignSchema,
+  EMAIL_TEMPLATE_VARIABLE_INFO,
+  EMAIL_TEMPLATE_VARIABLES,
 } from "@/lib/zod/schemas/campaigns";
 import { sendBatchEmail } from "@dub/email";
 import CampaignEmail from "@dub/email/templates/campaign-email";
@@ -102,16 +104,12 @@ export const POST = withWorkspace(
             preview,
             body: renderCampaignEmailHTML({
               content: bodyJson as unknown as TiptapNode,
-              variables: {
-                PartnerName: "Partner",
-                PartnerEmail: "partner@acme.com",
-                PartnerLink: "https://acme.com/partner",
-                SaleReward: "30% per sale for 6 months",
-                LeadReward: "$10 per lead",
-                ClickReward: "$0.50 per click",
-                ReferralReward:
-                  "10% per referred partner's commission for 1 year",
-              },
+              variables: Object.fromEntries(
+                EMAIL_TEMPLATE_VARIABLES.map((key) => [
+                  key,
+                  EMAIL_TEMPLATE_VARIABLE_INFO[key].example,
+                ]),
+              ),
             }),
           },
         }),
diff --git a/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts b/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
index a5ded7839a0..288cf9d3d6b 100644
--- a/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
+++ b/apps/web/app/(ee)/api/campaigns/[campaignId]/route.ts
@@ -1,8 +1,5 @@
 import { getCampaignOrThrow } from "@/lib/api/campaigns/get-campaign-or-throw";
-import {
-  deleteCampaignSchedule,
-  scheduleCampaign,
-} from "@/lib/api/campaigns/schedule-campaigns";
+import { shouldEnqueueDueMarketingBroadcast } from "@/lib/api/campaigns/marketing-campaign-broadcast";
 import {
   campaignEligibilityIncludes,
   transformCampaign,
@@ -14,12 +11,13 @@ import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-progr
 import { parseRequestBody } from "@/lib/api/utils";
 import { validateWorkflowConditions } from "@/lib/api/workflows/validate-workflow-conditions";
 import { withWorkspace } from "@/lib/auth";
+import { qstash } from "@/lib/cron";
 import { prisma } from "@/lib/prisma";
 import {
   CampaignSchema,
   updateCampaignSchema,
 } from "@/lib/zod/schemas/campaigns";
-import { arrayEqual, pluck } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, arrayEqual, pluck } from "@dub/utils";
 import { PartnerGroup } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
@@ -191,12 +189,25 @@ export const PATCH = withWorkspace(
       });
     });
 
-    waitUntil(
-      scheduleCampaign({
-        campaign,
-        updatedCampaign,
-      }),
-    );
+    if (
+      shouldEnqueueDueMarketingBroadcast({
+        previous: campaign,
+        next: updatedCampaign,
+      })
+    ) {
+      waitUntil(
+        qstash.publishJSON({
+          url: `${APP_DOMAIN_WITH_NGROK}/api/cron/campaigns/broadcast`,
+          flowControl: {
+            key: `broadcast-marketing-campaign-${campaignId}`,
+            parallelism: 1,
+          },
+          body: {
+            campaignId,
+          },
+        }),
+      );
+    }
 
     return NextResponse.json(
       CampaignSchema.parse(transformCampaign(updatedCampaign)),
@@ -217,15 +228,6 @@ export const DELETE = withWorkspace(
     const campaign = await getCampaignOrThrow({
       programId,
       campaignId,
-      include: {
-        workflow: {
-          select: {
-            id: true,
-            actions: true,
-            triggerConditions: true,
-          },
-        },
-      },
     });
 
     await prisma.$transaction(async (tx) => {
@@ -244,8 +246,6 @@ export const DELETE = withWorkspace(
       }
     });
 
-    waitUntil(deleteCampaignSchedule(campaign));
-
     return NextResponse.json({ id: campaignId });
   },
   {
diff --git a/apps/web/app/(ee)/api/cloudflare/webhook/r2-object-created/route.ts b/apps/web/app/(ee)/api/cloudflare/webhook/r2-object-created/route.ts
new file mode 100644
index 00000000000..cbbec374522
--- /dev/null
+++ b/apps/web/app/(ee)/api/cloudflare/webhook/r2-object-created/route.ts
@@ -0,0 +1,62 @@
+import { assertEnv } from "@/lib/assert-env";
+import { logger, toErrorFields } from "@/lib/axiom/server";
+import {
+  processR2ObjectCreated,
+  r2ObjectCreatedNotificationSchema,
+} from "@/lib/storage/process-r2-object-created";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
+import { toErrorMessage } from "@dub/utils";
+import { logAndRespond } from "app/(ee)/api/cron/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+export const dynamic = "force-dynamic";
+
+const r2ObjectCreatedWebhookBodySchema = z.object({
+  notification: r2ObjectCreatedNotificationSchema,
+});
+
+function verifyWorkerSecret(req: Request) {
+  const webhookSecret = assertEnv("CLOUDFLARE_WORKER_WEBHOOK_SECRET");
+
+  const auth = req.headers.get("authorization") || "";
+  const token = auth.startsWith("Bearer ") ? auth.slice("Bearer ".length) : "";
+
+  return timingSafeCompare(token, webhookSecret);
+}
+
+// POST /api/cloudflare/webhook/r2-object-created
+// Called by the Cloudflare queue consumer Worker (thin forwarder).
+export async function POST(req: Request) {
+  try {
+    if (!verifyWorkerSecret(req)) {
+      return NextResponse.json(
+        {
+          error: "Unauthorized",
+        },
+        {
+          status: 401,
+        },
+      );
+    }
+
+    const { notification } = r2ObjectCreatedWebhookBodySchema.parse(
+      await req.json(),
+    );
+
+    const result = await processR2ObjectCreated(notification);
+
+    return logAndRespond(result);
+  } catch (error) {
+    logger.error("storage.r2_validate_failed", {
+      ...toErrorFields(error),
+    });
+
+    return NextResponse.json(
+      {
+        error: toErrorMessage(error, "Internal server error"),
+      },
+      { status: 500 },
+    );
+  }
+}
diff --git a/apps/web/app/(ee)/api/commissions/route.ts b/apps/web/app/(ee)/api/commissions/route.ts
index 3e130c3a795..d23d65fe924 100644
--- a/apps/web/app/(ee)/api/commissions/route.ts
+++ b/apps/web/app/(ee)/api/commissions/route.ts
@@ -90,15 +90,18 @@ export const POST = withWorkspace(
 
     console.timeEnd("createManualCommissions");
 
-    return NextResponse.json(
-      createCommissionResponseSchema.parse({
-        success: true,
-        message: "Your commissions are being created and will appear shortly.",
-      }),
-      {
-        status: 202,
-      },
-    );
+    const isClawback = body.type === "custom" && body.amount < 0;
+
+    const response = createCommissionResponseSchema.parse({
+      success: true,
+      message: isClawback
+        ? "A clawback has been queued for the partner!"
+        : "Your commissions are being created and will appear shortly.",
+    });
+
+    return NextResponse.json(response, {
+      status: 202,
+    });
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],
diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.ts b/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.ts
deleted file mode 100644
index 10509b2d713..00000000000
--- a/apps/web/app/(ee)/api/cron/aggregate-clicks/process/route.ts
+++ /dev/null
@@ -1,356 +0,0 @@
-import { createId } from "@/lib/api/create-id";
-import { serializeReward } from "@/lib/api/partners/serialize-reward";
-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
-import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-window";
-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
-import { withCron } from "@/lib/cron/with-cron";
-import { getRewardAmount } from "@/lib/partners/get-reward-amount";
-import { prisma } from "@/lib/prisma";
-import { getTopLinksByCountries } from "@/lib/tinybird/get-top-links-by-countries";
-import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
-import { buildCommissionDescription } from "@/ui/partners/program-reward-spend-limit";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  currencyFormatter,
-  getPrettyUrl,
-} from "@dub/utils";
-import { CommissionType, EventType, Prisma, Reward } from "@prisma/client";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-import { resolveClickReward } from "../resolve-click-reward-amount";
-
-export const dynamic = "force-dynamic";
-
-const inputSchema = z.object({
-  clickRewardId: z.string(),
-  startDate: z.coerce.date(),
-  endDate: z.coerce.date(),
-  startingAfter: z.string().optional(),
-});
-
-const BATCH_SIZE = 200;
-
-type LinkEarnings = {
-  clicks: number;
-  earnings: number;
-  partnerId: string;
-};
-
-// POST /api/cron/aggregate-clicks/process
-// Process a batch of links for a given click reward
-export const POST = withCron(async ({ rawBody }) => {
-  const { clickRewardId, startDate, endDate, startingAfter } =
-    inputSchema.parse(JSON.parse(rawBody));
-
-  const clickReward = await prisma.reward.findUnique({
-    where: {
-      id: clickRewardId,
-    },
-  });
-
-  if (!clickReward) {
-    return logAndRespond(`Reward not found for ${clickRewardId}. Skipping...`);
-  }
-
-  // When soft deleted
-  if (!clickReward.programId) {
-    return logAndRespond(
-      `Reward ${clickRewardId} is not associated with a program. Skipping...`,
-    );
-  }
-
-  if (clickReward.event !== EventType.click) {
-    return logAndRespond(
-      `Reward ${clickRewardId} is not a click reward. Skipping...`,
-    );
-  }
-
-  const links = await prisma.link.findMany({
-    where: {
-      programEnrollment: {
-        status: {
-          in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,
-        },
-        clickRewardId,
-      },
-      clicks: {
-        gt: 0,
-      },
-      lastClicked: {
-        gte: startDate, // links that were clicked on after the start date
-      },
-    },
-    select: {
-      id: true,
-      shortLink: true,
-      programId: true,
-      partnerId: true,
-    },
-    ...(startingAfter && {
-      skip: 1,
-      cursor: {
-        id: startingAfter,
-      },
-    }),
-    orderBy: {
-      id: "asc",
-    },
-    take: BATCH_SIZE,
-  });
-
-  if (links.length === 0) {
-    return logAndRespond(
-      `No more links found for ${clickRewardId}. Skipping...`,
-    );
-  }
-
-  const clicksByCountries = await getTopLinksByCountries({
-    linkIds: links.map(({ id }) => id),
-    start: startDate,
-    end: endDate,
-  });
-
-  // Group clicks by link
-  const clicksByLinkId = new Map<string, typeof clicksByCountries>();
-
-  for (const click of clicksByCountries) {
-    const existing = clicksByLinkId.get(click.link_id) || [];
-    existing.push(click);
-    clicksByLinkId.set(click.link_id, existing);
-  }
-
-  // Calculate earnings per link considering geo CPC
-  const linkEarningsMap = new Map<string, LinkEarnings>();
-
-  for (const { id: linkId, shortLink, programId, partnerId } of links) {
-    if (!programId || !partnerId) {
-      console.log(`No click reward for link ${linkId}.`);
-      continue;
-    }
-
-    const linkClicksByCountry = clicksByLinkId.get(linkId) || [];
-
-    // Calculate earnings per country for each link
-    for (const { country, clicks } of linkClicksByCountry) {
-      const finalReward = resolveClickReward({
-        reward: clickReward,
-        country,
-      });
-
-      const existing = linkEarningsMap.get(linkId) || {
-        clicks: 0,
-        earnings: 0,
-      };
-
-      const amountInCents = getRewardAmount(serializeReward(finalReward));
-
-      linkEarningsMap.set(linkId, {
-        clicks: existing.clicks + clicks,
-        earnings: existing.earnings + amountInCents * clicks,
-        partnerId,
-      });
-
-      if (clickReward.modifiers) {
-        console.log(
-          `Earnings for link ${getPrettyUrl(shortLink)} for ${country}: ${currencyFormatter(amountInCents)} * ${clicks} = ${currencyFormatter(
-            amountInCents * clicks,
-          )}`,
-        );
-      }
-    }
-  }
-
-  // Apply reward spend limit
-  const uniquePartners = new Set(
-    Array.from(linkEarningsMap.values(), ({ partnerId }) => partnerId),
-  );
-
-  const historicalEarningsByPartner = await getHistoricalEarnings({
-    clickReward,
-    partnerIds: Array.from(uniquePartners),
-    aggregationStartDate: startDate,
-  });
-
-  const aggregationDate = startDate.toISOString().split("T")[0];
-  const usedSpendLimitByPartner = new Map<string, number>();
-  let commissionsToCreate: Prisma.CommissionCreateManyInput[] = [];
-
-  // Create commissions for each link
-  commissionsToCreate = links
-    .map(({ id: linkId, programId, partnerId }) => {
-      if (!programId || !partnerId) {
-        return null;
-      }
-
-      const linkEarnings = linkEarningsMap.get(linkId);
-
-      if (!linkEarnings) {
-        return null;
-      }
-
-      let { clicks, earnings } = linkEarnings;
-
-      if (clicks === 0 || earnings === 0) {
-        return null;
-      }
-
-      let description: string | null = null;
-
-      // Cap earnings to spend limit
-      if (clickReward.spendLimitAmount && clickReward.spendLimitInterval) {
-        const usedThisBatch = usedSpendLimitByPartner.get(partnerId) ?? 0;
-        const historicalEarnings =
-          historicalEarningsByPartner.get(partnerId) ?? 0;
-
-        const remainingSpendLimit =
-          clickReward.spendLimitAmount - historicalEarnings - usedThisBatch;
-
-        const cappedEarnings = Math.max(
-          0,
-          Math.min(earnings, remainingSpendLimit),
-        );
-
-        if (cappedEarnings === 0) {
-          console.log(`Reached spend limit for partner ${partnerId}.`);
-          return null;
-        }
-
-        usedSpendLimitByPartner.set(partnerId, usedThisBatch + cappedEarnings);
-
-        description = buildCommissionDescription({
-          earnings,
-          cappedEarnings,
-          reward: serializeReward(clickReward),
-        });
-
-        earnings = cappedEarnings;
-      }
-
-      return {
-        id: createId({ prefix: "cm_" }),
-        programId,
-        partnerId,
-        rewardId: clickReward.id,
-        linkId,
-        quantity: clicks,
-        type: CommissionType.click,
-        amount: 0,
-        earnings,
-        description,
-        createdAt: endDate,
-        invoiceId: `${linkId}-${aggregationDate}`, // used as a idempotency key
-      };
-    })
-    .filter((c): c is NonNullable<typeof c> => c !== null);
-
-  const { count } = await prisma.commission.createMany({
-    data: commissionsToCreate,
-    skipDuplicates: true,
-  });
-
-  console.log(
-    `Created ${count} commissions for click reward ${clickRewardId}.`,
-  );
-
-  if (count > 0) {
-    console.table(commissionsToCreate);
-
-    // Sync total commissions for each partner that we created commissions for
-    for (const { partnerId, programId } of commissionsToCreate) {
-      await syncTotalCommissions({
-        partnerId,
-        programId,
-      });
-    }
-
-    console.log(
-      `Synced total commissions count for ${commissionsToCreate.length} partners`,
-    );
-  }
-
-  // Schedule next batch if we have more links to process
-  if (links.length === BATCH_SIZE) {
-    const nextStartingAfter = links[links.length - 1].id;
-
-    await enqueueBatchJobs([
-      {
-        queueName: "aggregate-clicks",
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/aggregate-clicks/process`,
-        body: {
-          clickRewardId: clickReward.id,
-          startDate,
-          endDate,
-          startingAfter: nextStartingAfter,
-        },
-      },
-    ]);
-
-    return logAndRespond(
-      `Enqueued next batch for aggregate clicks cron (startingAfter: ${nextStartingAfter}).`,
-    );
-  }
-
-  return logAndRespond("Aggregate clicks job processed successfully.");
-});
-
-async function getHistoricalEarnings({
-  clickReward,
-  partnerIds,
-  aggregationStartDate,
-}: {
-  clickReward: Pick<
-    Reward,
-    "spendLimitAmount" | "spendLimitInterval" | "programId"
-  >;
-  partnerIds: string[];
-  aggregationStartDate: Date;
-}) {
-  if (
-    !clickReward.spendLimitAmount ||
-    !clickReward.spendLimitInterval ||
-    !clickReward.programId
-  ) {
-    return new Map<string, number>();
-  }
-
-  const { startDate, endDate } = getRewardSpendLimitWindow({
-    spendLimitInterval: clickReward.spendLimitInterval,
-    referenceDate: aggregationStartDate,
-  });
-
-  const commissions = await prisma.commission.groupBy({
-    by: ["programId", "partnerId"],
-    where: {
-      programId: clickReward.programId,
-      partnerId: {
-        in: partnerIds,
-      },
-      type: CommissionType.click,
-      status: {
-        in: ["pending", "processed", "paid"],
-      },
-      ...(startDate && endDate
-        ? {
-            createdAt: {
-              gte: startDate,
-              lte: endDate,
-            },
-          }
-        : {}),
-    },
-    _sum: {
-      earnings: true,
-    },
-  });
-
-  const historicalEarningsByPartner = new Map<string, number>();
-
-  for (const commission of commissions) {
-    historicalEarningsByPartner.set(
-      commission.partnerId,
-      commission._sum.earnings ?? 0,
-    );
-  }
-
-  return historicalEarningsByPartner;
-}
diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts
index a7ea03bc662..5d38cb3829e 100644
--- a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts
+++ b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts
@@ -1,63 +1,73 @@
-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
 import { withCron } from "@/lib/cron/with-cron";
-import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK, chunk } from "@dub/utils";
-import { EventType } from "@prisma/client";
+import { aggregateClicksJob } from "@/lib/jobs/handlers/aggregate-clicks-job";
+import { getClickRewardEnrollments } from "@/lib/rewards/get-click-reward-enrollments";
 import { logAndRespond } from "../utils";
 
 export const dynamic = "force-dynamic";
 
+const BATCH_SIZE = 50;
+
 // This route is used aggregate clicks events on daily basis for Program links and add to the Commission table
 // Runs every day at 00:00 (0 0 * * *)
 // POST /api/cron/aggregate-clicks
 export const POST = withCron(async () => {
-  const clickRewards = await prisma.reward.findMany({
-    where: {
-      event: EventType.click,
-      clickEnrollments: {
-        some: {},
-      },
-      programId: {
-        not: null,
-      },
-    },
-    select: {
-      id: true,
-    },
-  });
-
-  if (clickRewards.length === 0) {
-    return logAndRespond("No click rewards found. Skipping...");
-  }
-
   const now = new Date();
 
-  // set 'start' to the beginning of the previous day (00:00:00)
+  // Set 'start' to the beginning of the previous day (00:00:00)
   const startDate = new Date(now);
   startDate.setDate(startDate.getDate() - 1);
   startDate.setHours(0, 0, 0, 0);
 
-  // set 'end' to the end of the previous day (23:59:59)
+  // Set 'end' to the end of the previous day (23:59:59)
   const endDate = new Date(now);
   endDate.setDate(endDate.getDate() - 1);
   endDate.setHours(23, 59, 59, 999);
 
-  for (const clickRewardsChunk of chunk(clickRewards, 50)) {
-    await enqueueBatchJobs(
-      clickRewardsChunk.map((clickReward) => ({
-        queueName: "aggregate-clicks",
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/aggregate-clicks/process`,
-        deduplicationId: `aggregate-clicks-${clickReward.id}`,
-        body: {
-          clickRewardId: clickReward.id,
-          startDate,
-          endDate,
-        },
+  let startingAfterId: string | undefined;
+  let enqueued = 0;
+
+  while (true) {
+    const programEnrollments = await getClickRewardEnrollments({
+      startDate,
+      startingAfterId,
+      take: BATCH_SIZE,
+    });
+
+    if (programEnrollments.length === 0) {
+      break;
+    }
+
+    const { published } = await aggregateClicksJob.dispatchBatch(
+      programEnrollments.map(({ programId, partnerId }) => ({
+        partnerId,
+        programId,
+        startDate,
+        endDate,
       })),
+      ({ partnerId }, index) => ({
+        label: partnerId,
+        deduplicationId: `aggregate-clicks-${programEnrollments[index].id}`,
+        flowControl: {
+          key: "aggregate-clicks",
+          parallelism: 10,
+        },
+      }),
     );
+
+    enqueued += published;
+
+    if (programEnrollments.length < BATCH_SIZE) {
+      break;
+    }
+
+    startingAfterId = programEnrollments[programEnrollments.length - 1].id;
+  }
+
+  if (enqueued === 0) {
+    return logAndRespond("No program enrollments found. Skipping...");
   }
 
   return logAndRespond(
-    `Enqueued aggregate clicks jobs for ${clickRewards.length} click rewards.`,
+    `Enqueued aggregate clicks jobs for ${enqueued} enrollments.`,
   );
 });
diff --git a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
index ced6b7dd481..9cae722a3b5 100644
--- a/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
+++ b/apps/web/app/(ee)/api/cron/campaigns/broadcast/route.ts
@@ -3,7 +3,7 @@ import { renderCampaignEmailHTML } from "@/lib/api/campaigns/render-campaign-ema
 import { campaignEligibilityIncludes } from "@/lib/api/campaigns/transform-campaign";
 import { validateCampaignFromAddress } from "@/lib/api/campaigns/validate-campaign";
 import { createId } from "@/lib/api/create-id";
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { qstash } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { resolveCampaignFromAddress } from "@/lib/email/parse-campaign-from-address";
@@ -13,9 +13,13 @@ import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { sendBatchEmail } from "@dub/email";
 import CampaignEmail from "@dub/email/templates/campaign-email";
 import { APP_DOMAIN_WITH_NGROK, chunk, log, pluck } from "@dub/utils";
-import { NotificationEmailType } from "@prisma/client";
+import {
+  Campaign,
+  CampaignStatus,
+  EmailDomain,
+  NotificationEmailType,
+} from "@prisma/client";
 import { differenceInMinutes } from "date-fns";
-import { headers } from "next/headers";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../utils";
 
@@ -102,46 +106,44 @@ export async function POST(req: Request) {
       }
     }
 
-    // This is a safety check to ensure the campaign broadcast is not "initiated" multiple times
-    const headersList = await headers();
-    const upstashMessageId = headersList.get("Upstash-Message-Id");
-
-    if (
-      !startingAfter && // First run
-      campaign.qstashMessageId &&
-      upstashMessageId !== campaign.qstashMessageId
-    ) {
-      return logAndRespond(
-        `Campaign ${campaignId} broadcast was skipped because it is not the current message being processed.`,
-      );
-    }
-
     const program = campaign.program;
 
-    // TODO: We should make the from address required. There are existing campaign without from address
-    if (campaign.from) {
-      validateCampaignFromAddress({
-        campaign,
-        emailDomains: program.emailDomains,
+    // Claim the first run so leftover delayed messages / scanner retries
+    // cannot start a second broadcast. A QStash retry of the claiming
+    // message (matching qstashMessageId) is allowed to continue.
+    if (!startingAfter) {
+      const messageId = req.headers.get("Upstash-Message-Id");
+
+      const claimed = await prisma.campaign.updateMany({
+        where: {
+          id: campaignId,
+          status: CampaignStatus.scheduled,
+          OR: [{ scheduledAt: null }, { scheduledAt: { lte: new Date() } }],
+        },
+        data: {
+          status: CampaignStatus.sending,
+          qstashMessageId: messageId,
+        },
       });
-    }
 
-    // Mark the campaign as sending (if it's in scheduled status)
-    if (campaign.status === "scheduled") {
-      try {
-        await prisma.campaign.update({
-          where: {
-            id: campaignId,
-          },
-          data: {
-            status: "sending",
-          },
-        });
-      } catch (error) {
-        //
+      if (claimed.count === 0) {
+        if (!messageId || campaign.qstashMessageId !== messageId) {
+          return logAndRespond(
+            `Campaign ${campaignId} broadcast already initiated. Skipping...`,
+          );
+        }
       }
     }
 
+    const invalidFromResponse = await cancelCampaignIfInvalidFromAddress({
+      campaign,
+      emailDomains: program.emailDomains,
+    });
+
+    if (invalidFromResponse) {
+      return invalidFromResponse;
+    }
+
     const campaignGroupIds = pluck(campaign.groups, "groupId");
     const campaignPartnerTagIds = pluck(campaign.partnerTags, "partnerTagId");
 
@@ -376,3 +378,47 @@ export async function POST(req: Request) {
     return handleAndReturnErrorResponse(error);
   }
 }
+
+async function cancelCampaignIfInvalidFromAddress({
+  campaign,
+  emailDomains,
+}: {
+  campaign: Pick<Campaign, "id" | "from" | "programId">;
+  emailDomains: Pick<EmailDomain, "slug" | "status">[];
+}) {
+  if (!campaign.from) {
+    return;
+  }
+
+  try {
+    validateCampaignFromAddress({
+      campaign,
+      emailDomains,
+    });
+  } catch (error) {
+    if (!(error instanceof DubApiError)) {
+      throw error;
+    }
+
+    await prisma.campaign.updateMany({
+      where: {
+        id: campaign.id,
+        status: {
+          in: [CampaignStatus.scheduled, CampaignStatus.sending],
+        },
+      },
+      data: {
+        status: CampaignStatus.canceled,
+      },
+    });
+
+    await log({
+      type: "errors",
+      message: `Campaign ${campaign.id} canceled: ${error.message}`,
+    });
+
+    return logAndRespond(
+      `Campaign ${campaign.id} canceled: invalid from address.`,
+    );
+  }
+}
diff --git a/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts b/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts
new file mode 100644
index 00000000000..f9f93be5b09
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/campaigns/queue-scheduled/route.ts
@@ -0,0 +1,178 @@
+import { isScheduledWorkflow } from "@/lib/api/workflows/utils";
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
+import { withCron } from "@/lib/cron/with-cron";
+import { prisma } from "@/lib/prisma";
+import {
+  APP_DOMAIN_WITH_NGROK,
+  isRejected,
+  log,
+  serializeError,
+} from "@dub/utils";
+import { CampaignStatus, CampaignType } from "@prisma/client";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+export const maxDuration = 600;
+
+// GET /api/cron/campaigns/queue-scheduled
+// Fans out due marketing broadcasts and (on the 12h tick) scheduled transactional workflows.
+export const GET = withCron(async () => {
+  const now = new Date();
+
+  const [transactional, marketing] = await Promise.allSettled([
+    queueTransactionalCampaigns(now),
+    queueMarketingCampaigns(now),
+  ]);
+
+  const failures: string[] = [];
+
+  if (isRejected(transactional)) {
+    failures.push(`transactional: ${serializeError(transactional.reason)}`);
+  }
+
+  if (isRejected(marketing)) {
+    failures.push(`marketing: ${serializeError(marketing.reason)}`);
+  }
+
+  if (failures.length > 0) {
+    const message = `Campaign queueing partially failed: ${failures.join("; ")}`;
+    await log({ type: "errors", message });
+    return logAndRespond(message, { logLevel: "error" });
+  }
+
+  const transactionalQueued =
+    transactional.status === "fulfilled" ? transactional.value : 0;
+  const marketingQueued =
+    marketing.status === "fulfilled" ? marketing.value : 0;
+
+  if (transactionalQueued + marketingQueued === 0) {
+    return logAndRespond("No campaigns to queue.");
+  }
+
+  return logAndRespond(
+    `Queued ${marketingQueued} marketing and ${transactionalQueued} transactional campaigns.`,
+  );
+});
+
+// First 5 minutes of 00:00/12:00 UTC. QStash dedup lasts 10 minutes, so this
+// absorbs Vercel cron jitter without leaking a second publish after expiry.
+function isTransactionalTick(now: Date) {
+  return now.getUTCHours() % 12 === 0 && now.getUTCMinutes() < 5;
+}
+
+async function queueTransactionalCampaigns(now: Date) {
+  // Matches the 12h enrollment window in executeSendCampaignWorkflow.
+  // 5-minute window absorbs Vercel cron jitter; QStash dedup (10 min) collapses extra publishes.
+  if (!isTransactionalTick(now)) {
+    return 0;
+  }
+
+  let queued = 0;
+  let lastCampaignId: string | undefined;
+
+  while (true) {
+    const campaigns = await prisma.campaign.findMany({
+      where: {
+        type: CampaignType.transactional,
+        status: CampaignStatus.active,
+        workflow: {
+          disabledAt: null,
+        },
+        ...(lastCampaignId && { id: { gt: lastCampaignId } }),
+      },
+      select: {
+        id: true,
+        workflow: {
+          select: {
+            id: true,
+            triggerConditions: true,
+            actions: true,
+          },
+        },
+      },
+      take: CRON_BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (campaigns.length === 0) {
+      break;
+    }
+
+    const scheduledWorkflows = campaigns.flatMap((campaign) =>
+      campaign.workflow && isScheduledWorkflow(campaign.workflow)
+        ? [campaign.workflow]
+        : [],
+    );
+
+    if (scheduledWorkflows.length > 0) {
+      await enqueueBatchJobs(
+        scheduledWorkflows.map((workflow) => ({
+          url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workflows/${workflow.id}`,
+          deduplicationId: workflow.id,
+          label: "execute-scheduled-workflow",
+          flowControl: {
+            key: "execute-scheduled-workflow",
+            parallelism: 10,
+          },
+          body: {},
+        })),
+      );
+
+      queued += scheduledWorkflows.length;
+    }
+
+    lastCampaignId = campaigns[campaigns.length - 1].id;
+  }
+
+  return queued;
+}
+
+async function queueMarketingCampaigns(now: Date) {
+  let queued = 0;
+  let lastCampaignId: string | undefined;
+
+  while (true) {
+    const campaigns = await prisma.campaign.findMany({
+      where: {
+        type: CampaignType.marketing,
+        // Do not reclaim `sending` campaigns; failures Slack-alert and we resume them manually.
+        status: CampaignStatus.scheduled,
+        OR: [{ scheduledAt: null }, { scheduledAt: { lte: now } }],
+        ...(lastCampaignId && { id: { gt: lastCampaignId } }),
+      },
+      select: {
+        id: true,
+      },
+      take: CRON_BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (campaigns.length === 0) {
+      break;
+    }
+
+    await enqueueBatchJobs(
+      campaigns.map((campaign) => ({
+        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/campaigns/broadcast`,
+        label: "broadcast-marketing-campaign",
+        flowControl: {
+          key: `broadcast-marketing-campaign-${campaign.id}`,
+          parallelism: 1,
+        },
+        body: {
+          campaignId: campaign.id,
+        },
+      })),
+    );
+
+    queued += campaigns.length;
+    lastCampaignId = campaigns[campaigns.length - 1].id;
+  }
+
+  return queued;
+}
diff --git a/apps/web/app/(ee)/api/cron/cleanup/declined-invites/route.ts b/apps/web/app/(ee)/api/cron/cleanup/declined-invites/route.ts
index 6c54a798c09..477dae5b978 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/declined-invites/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/declined-invites/route.ts
@@ -1,4 +1,5 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { prisma } from "@/lib/prisma";
@@ -51,6 +52,11 @@ export async function POST(req: Request) {
       console.log(
         `Deleted ${deletedRes.count} declined programEnrollments that are older than 90 days`,
       );
+
+      // Queue an index update because the declined enrollments were deleted.
+      await queuePartnerSearchSync({
+        enrollmentIds: declinedProgramEnrollments.map(({ id }) => id),
+      });
     }
 
     return NextResponse.json({ status: "OK" });
diff --git a/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts b/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
index cc33df417cd..cfbed775c70 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/link-retention/route.ts
@@ -3,7 +3,7 @@ import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
 import { qstash } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, sleep } from "@dub/utils";
 import { Domain } from "@prisma/client";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
@@ -106,7 +106,7 @@ async function deleteOldLinks(
     ++processedBatches;
 
     // sleep for 250ms
-    await new Promise((resolve) => setTimeout(resolve, 250));
+    await sleep(250);
   }
 
   // Only schedule another run if we hit the batch limit AND we found a full batch
diff --git a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts b/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts
deleted file mode 100644
index 744bce718ba..00000000000
--- a/apps/web/app/(ee)/api/cron/cleanup/orphaned-rewards/route.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { withCron } from "@/lib/cron/with-cron";
-import { prisma } from "@/lib/prisma";
-import { subMinutes } from "date-fns";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-// The rewards/process cron normally hard-deletes once enrollments are cleared, but a newer
-// reward change for the same group + event type can bump the version and skip stale jobs
-// (e.g. delete then create), leaving the old row behind. This job is a safety net for those orphans.
-
-// POST /api/cron/cleanup/orphaned-rewards
-export const POST = withCron(async () => {
-  const rewards = await prisma.reward.findMany({
-    where: {
-      programId: null,
-      updatedAt: {
-        lt: subMinutes(new Date(), 30), // only look for rewards older than 30 minutes ago
-      },
-    },
-    select: {
-      id: true,
-      clickPartnerGroup: true,
-      leadPartnerGroup: true,
-      salePartnerGroup: true,
-      referralPartnerGroup: true,
-      _count: {
-        select: {
-          clickEnrollments: true,
-          leadEnrollments: true,
-          saleEnrollments: true,
-          referralEnrollments: true,
-        },
-      },
-    },
-    orderBy: {
-      updatedAt: "asc",
-    },
-    take: 100,
-  });
-
-  if (rewards.length === 0) {
-    return logAndRespond("No orphaned rewards found.");
-  }
-
-  const rewardsToDelete = rewards.filter((reward) => {
-    return (
-      reward.clickPartnerGroup === null &&
-      reward.leadPartnerGroup === null &&
-      reward.salePartnerGroup === null &&
-      reward.referralPartnerGroup === null &&
-      reward._count.clickEnrollments === 0 &&
-      reward._count.leadEnrollments === 0 &&
-      reward._count.saleEnrollments === 0 &&
-      reward._count.referralEnrollments === 0
-    );
-  });
-
-  console.log(
-    `Found ${rewardsToDelete.length} rewards to delete out of ${rewards.length} rewards (some of them are referenced by partner groups or program enrollments).`,
-  );
-
-  if (rewardsToDelete.length === 0) {
-    return logAndRespond("No rewards to delete, skipping...");
-  }
-
-  const deletedRewards = await prisma.reward.deleteMany({
-    where: {
-      id: {
-        in: rewardsToDelete.map((reward) => reward.id),
-      },
-    },
-  });
-
-  return logAndRespond(
-    `Finished deleting orphaned rewards (${deletedRewards.count} rewards deleted).`,
-  );
-});
diff --git a/apps/web/app/(ee)/api/cron/cleanup/orphaned/route.ts b/apps/web/app/(ee)/api/cron/cleanup/orphaned/route.ts
new file mode 100644
index 00000000000..d24c83c0746
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/cleanup/orphaned/route.ts
@@ -0,0 +1,48 @@
+import { deleteOrphanedDefaultLinks } from "@/lib/api/groups/delete-orphaned-default-links";
+import { withCron } from "@/lib/cron/with-cron";
+import { deleteOrphanedDiscounts } from "@/lib/discounts/delete-orphaned-discounts";
+import { deleteEmptyLinkRewards } from "@/lib/rewards/delete-empty-link-rewards";
+import { deleteOrphanedRewards } from "@/lib/rewards/delete-orphaned-rewards";
+import { subMinutes } from "date-fns";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+
+const STALE_AFTER_MINUTES = 60; // 1 hour
+
+// Hard-deletes leftover rows after request-path soft-deletes / unassigns:
+// - Rewards: rewards/process clears enrollments on delete; this cron hard-deletes
+//   once nothing still references the soft-deleted reward (programId null).
+// - Discounts: detach-discount remaps codes first; this cron hard-deletes once
+//   nothing still references the soft-deleted discount (programId null).
+// - LinkReward: update-partner-link nulls override IDs instead of deleting the row.
+//   Discount deletes SetNull LinkReward.discountId the same way.
+// - PartnerGroupDefaultLink: group delete soft-deletes (groupId null) so in-flight
+//   remap keeps partnerGroupDefaultLinkId; this cron hard-deletes once no links
+//   still reference the row.
+
+// POST /api/cron/cleanup/orphaned
+export const POST = withCron(async () => {
+  const cutoff = subMinutes(new Date(), STALE_AFTER_MINUTES);
+
+  const [
+    deletedRewardsCount,
+    deletedDiscountsCount,
+    deletedDefaultLinksCount,
+    deletedLinkRewardsCount,
+  ] = await Promise.all([
+    deleteOrphanedRewards(cutoff),
+    deleteOrphanedDiscounts(cutoff),
+    deleteOrphanedDefaultLinks(cutoff),
+    deleteEmptyLinkRewards(),
+  ]);
+
+  console.log({
+    deletedRewardsCount,
+    deletedDiscountsCount,
+    deletedDefaultLinksCount,
+    deletedLinkRewardsCount,
+  });
+
+  return logAndRespond("OK");
+});
diff --git a/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts b/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
index 172cf75a155..c6be2fa1f40 100644
--- a/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
+++ b/apps/web/app/(ee)/api/cron/cleanup/rejected-applications/route.ts
@@ -1,4 +1,5 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { prisma } from "@/lib/prisma";
@@ -59,6 +60,11 @@ export async function POST(req: Request) {
         `Deleted ${deletedProgramEnrollments.count} rejected programEnrollments that are older than 30 days`,
       );
 
+      // Queue an index update because the rejected enrollments were deleted.
+      await queuePartnerSearchSync({
+        enrollmentIds: rejectedProgramEnrollments.map(({ id }) => id),
+      });
+
       totalDeletedProgramEnrollments += deletedProgramEnrollments.count;
     }
 
diff --git a/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts b/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts
deleted file mode 100644
index cfb9461ed88..00000000000
--- a/apps/web/app/(ee)/api/cron/discount-codes/create/queue-batches/route.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { CRON_BATCH_SIZE, qstash } from "@/lib/cron";
-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
-import { withCron } from "@/lib/cron/with-cron";
-import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";
-import { getDiscountProvider } from "@/lib/discounts/discount-provider";
-import { prisma } from "@/lib/prisma";
-import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../../utils";
-
-export const dynamic = "force-dynamic";
-
-const inputSchema = z.object({
-  discountId: z.string(),
-  startingAfter: z.string().optional(),
-});
-
-// POST /api/cron/discount-codes/create/queue-batches
-export const POST = withCron(async ({ rawBody }) => {
-  const { discountId, startingAfter } = inputSchema.parse(JSON.parse(rawBody));
-
-  const discount = await prisma.discount.findUnique({
-    where: {
-      id: discountId,
-    },
-    include: {
-      program: {
-        select: {
-          id: true,
-          workspace: {
-            select: {
-              id: true,
-              stripeConnectId: true,
-              shopifyStoreId: true,
-            },
-          },
-        },
-      },
-    },
-  });
-
-  if (!discount) {
-    return logAndRespond(`Discount ${discountId} not found. Skipping...`);
-  }
-
-  if (!discount.autoProvisionEnabledAt) {
-    return logAndRespond(
-      `Discount ${discountId} does not have auto-provision enabled. Skipping...`,
-    );
-  }
-
-  const { program } = discount;
-
-  const discountProvider = getDiscountProvider(discount.provider);
-
-  try {
-    await discountProvider.assertDiscountIntegration({
-      workspace: program.workspace,
-    });
-  } catch (error) {
-    if (isNonRecoverableDiscountError(error)) {
-      return logAndRespond(error.message, { logLevel: "warn" });
-    }
-
-    throw error;
-  }
-
-  const programEnrollments = await prisma.programEnrollment.findMany({
-    where: {
-      programId: program.id,
-      discountId: discount.id,
-      status: {
-        in: ACTIVE_ENROLLMENT_STATUSES,
-      },
-    },
-    select: {
-      id: true,
-      partnerId: true,
-      discountId: true,
-      links: {
-        select: {
-          id: true,
-        },
-        where: {
-          discountCode: null,
-          partnerGroupDefaultLinkId: {
-            not: null,
-          },
-        },
-      },
-    },
-    ...(startingAfter && {
-      skip: 1,
-      cursor: {
-        id: startingAfter,
-      },
-    }),
-    orderBy: {
-      id: "asc",
-    },
-    take: CRON_BATCH_SIZE,
-  });
-
-  if (programEnrollments.length === 0) {
-    return logAndRespond(
-      `No more program enrollments found for discount ${discountId}.`,
-    );
-  }
-
-  const links = programEnrollments.flatMap(({ links }) => links);
-
-  if (links.length > 0) {
-    await enqueueBatchJobs(
-      links.map((link) => ({
-        queueName: "create-discount-code",
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create`,
-        deduplicationId: `${discountId}-${link.id}`,
-        body: {
-          linkId: link.id,
-        },
-      })),
-    );
-  }
-
-  if (programEnrollments.length === CRON_BATCH_SIZE) {
-    const startingAfter = programEnrollments[programEnrollments.length - 1].id;
-
-    await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,
-      method: "POST",
-      body: {
-        discountId,
-        startingAfter,
-      },
-    });
-
-    return logAndRespond(
-      `Queued next batch for discount ${discountId} (startingAfter: ${startingAfter}).`,
-    );
-  }
-
-  return logAndRespond(`Finished queuing jobs for discount ${discountId}.`);
-});
diff --git a/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts b/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts
index 4888d4eafe4..4790a5c170d 100644
--- a/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts
+++ b/apps/web/app/(ee)/api/cron/discount-codes/create/route.ts
@@ -1,101 +1,13 @@
 import { withCron } from "@/lib/cron/with-cron";
-import { createDiscountCode } from "@/lib/discounts/create-discount-code";
-import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";
-import { prisma } from "@/lib/prisma";
-import * as z from "zod/v4";
+import { createDiscountCodeForLinkJob } from "@/lib/jobs/handlers/create-discount-code-for-link-job";
 import { logAndRespond } from "../../utils";
 
 export const dynamic = "force-dynamic";
 
-const inputSchema = z.object({
-  linkId: z
-    .string()
-    .describe("The ID of the link to create a discount code for."),
-});
-
 // POST /api/cron/discount-codes/create
+// Drain shim for in-flight QStash messages; new work uses create-discount-code-for-link-job.
+// TODO: Remove this route after in-flight QStash messages to this URL have drained.
 export const POST = withCron(async ({ rawBody }) => {
-  const { linkId } = inputSchema.parse(JSON.parse(rawBody));
-
-  const link = await prisma.link.findUnique({
-    where: {
-      id: linkId,
-    },
-    select: {
-      id: true,
-      discountCode: true,
-      partnerGroupDefaultLinkId: true,
-      programEnrollment: {
-        select: {
-          discount: true,
-          partner: {
-            select: {
-              id: true,
-              name: true,
-            },
-          },
-          program: {
-            select: {
-              id: true,
-            },
-          },
-        },
-      },
-      project: {
-        select: {
-          id: true,
-          stripeConnectId: true,
-          shopifyStoreId: true,
-        },
-      },
-    },
-  });
-
-  if (!link || !link.project) {
-    return logAndRespond(`Link ${linkId} not found. Skipping...`);
-  }
-
-  if (link.discountCode) {
-    return logAndRespond(
-      `Link ${linkId} already has a discount code. Skipping...`,
-    );
-  }
-
-  if (link.partnerGroupDefaultLinkId === null) {
-    return logAndRespond(`Link ${linkId} is not a default link. Skipping...`);
-  }
-
-  if (!link.programEnrollment) {
-    return logAndRespond(
-      `Link ${linkId} is not associated with a program enrollment. Skipping...`,
-    );
-  }
-
-  const {
-    project: workspace,
-    programEnrollment: { program, partner, discount },
-  } = link;
-
-  if (!discount) {
-    return logAndRespond(
-      `Partner ${partner.id} does not have a discount with program ${program.id}. Skipping...`,
-    );
-  }
-
-  try {
-    await createDiscountCode({
-      workspace,
-      partner,
-      link,
-      discount,
-    });
-  } catch (error) {
-    if (isNonRecoverableDiscountError(error)) {
-      return logAndRespond(error.message, { logLevel: "warn" });
-    }
-
-    throw error;
-  }
-
-  return logAndRespond(`Discount code created for link ${linkId}.`);
+  await createDiscountCodeForLinkJob.execute(JSON.parse(rawBody));
+  return logAndRespond("Successfully processed discount code creation.");
 });
diff --git a/apps/web/app/(ee)/api/cron/domains/renewal-succeeded/route.ts b/apps/web/app/(ee)/api/cron/domains/renewal-succeeded/route.ts
index 38ad0f352b1..0aa8d917598 100644
--- a/apps/web/app/(ee)/api/cron/domains/renewal-succeeded/route.ts
+++ b/apps/web/app/(ee)/api/cron/domains/renewal-succeeded/route.ts
@@ -4,7 +4,7 @@ import { setRenewOption } from "@/lib/dynadot/set-renew-option";
 import { prisma } from "@/lib/prisma";
 import { sendBatchEmail } from "@dub/email";
 import DomainRenewed from "@dub/email/templates/domain-renewed";
-import { chunk, log, pluralize } from "@dub/utils";
+import { chunk, log, pluralize, sleep } from "@dub/utils";
 import { RegisteredDomain } from "@prisma/client";
 import { addDays, startOfDay } from "date-fns";
 import * as z from "zod/v4";
@@ -128,7 +128,7 @@ export const POST = withCron(async ({ rawBody }) => {
       });
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 500));
+    await sleep(500);
   }
 
   for (const updateChunk of chunk(succeeded, BATCH_SIZE)) {
diff --git a/apps/web/app/(ee)/api/cron/domains/transfer/route.ts b/apps/web/app/(ee)/api/cron/domains/transfer/route.ts
index f49daa064c5..62d2049da61 100644
--- a/apps/web/app/(ee)/api/cron/domains/transfer/route.ts
+++ b/apps/web/app/(ee)/api/cron/domains/transfer/route.ts
@@ -4,7 +4,7 @@ import { qstash } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { prisma } from "@/lib/prisma";
 import { recordLink } from "@/lib/tinybird";
-import { APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, log, sleep } from "@dub/utils";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 import { sendDomainTransferredEmail } from "./utils";
@@ -103,7 +103,7 @@ export async function POST(req: Request) {
       ]);
 
       // wait 500 ms before making another request
-      await new Promise((resolve) => setTimeout(resolve, 500));
+      await sleep(500);
 
       await qstash.publishJSON({
         url: `${APP_DOMAIN_WITH_NGROK}/api/cron/domains/transfer`,
diff --git a/apps/web/app/(ee)/api/cron/domains/update/route.ts b/apps/web/app/(ee)/api/cron/domains/update/route.ts
index 651219e6528..4453848210c 100644
--- a/apps/web/app/(ee)/api/cron/domains/update/route.ts
+++ b/apps/web/app/(ee)/api/cron/domains/update/route.ts
@@ -43,7 +43,12 @@ export async function POST(req: Request) {
     const linksToUpdate = await prisma.link.findMany({
       where: {
         domain: oldDomain,
-        ...(programId && { programId }),
+        ...(programId && {
+          programId,
+          key: {
+            not: "_root", // edge case, but don't update the root link (since there's already a link for it)
+          },
+        }),
       },
       take: LINK_BATCH_SIZE,
       ...(startingAfter && {
@@ -65,20 +70,18 @@ export async function POST(req: Request) {
 
     const linkIdsToUpdate = linksToUpdate.map((link) => link.id);
 
-    try {
-      await prisma.link.updateMany({
-        where: {
-          id: {
-            in: linkIdsToUpdate,
-          },
-        },
-        data: {
-          domain: newDomain,
+    const { count } = await prisma.link.updateMany({
+      where: {
+        id: {
+          in: linkIdsToUpdate,
         },
-      });
-    } catch (error) {
-      console.error(error);
-    }
+      },
+      data: {
+        domain: newDomain,
+      },
+    });
+
+    console.log(`Updated ${count} links for domain ${oldDomain}`);
 
     const updatedLinks = await prisma.link.findMany({
       where: {
diff --git a/apps/web/app/(ee)/api/cron/domains/verify/utils.ts b/apps/web/app/(ee)/api/cron/domains/verify/utils.ts
index 3b69f08f3ec..9ac25201a77 100644
--- a/apps/web/app/(ee)/api/cron/domains/verify/utils.ts
+++ b/apps/web/app/(ee)/api/cron/domains/verify/utils.ts
@@ -19,10 +19,7 @@ export const handleDomainUpdates = async ({
   changed: boolean;
 }) => {
   if (changed) {
-    await log({
-      message: `Domain *${domain}* changed status to *${verified}*`,
-      type: "cron",
-    });
+    console.log(`Domain *${domain}* changed status to *${verified}*`);
   }
 
   if (verified) return;
@@ -184,11 +181,10 @@ const sendDomainInvalidEmail = async ({
   emails: string[];
   type: "first" | "second";
 }) => {
+  console.log(
+    `Domain *${domain}* is invalid for ${invalidDays} days, email sent.`,
+  );
   return await Promise.allSettled([
-    log({
-      message: `Domain *${domain}* is invalid for ${invalidDays} days, email sent.`,
-      type: "cron",
-    }),
     sendBatchEmail(
       emails.map((email) => ({
         subject: `Your domain ${domain} needs to be configured`,
diff --git a/apps/web/app/(ee)/api/cron/email-domains/verify/route.ts b/apps/web/app/(ee)/api/cron/email-domains/verify/route.ts
index 022cff88c57..a99ff776d80 100644
--- a/apps/web/app/(ee)/api/cron/email-domains/verify/route.ts
+++ b/apps/web/app/(ee)/api/cron/email-domains/verify/route.ts
@@ -4,11 +4,18 @@ import { prisma } from "@/lib/prisma";
 import { sendBatchEmail } from "@dub/email";
 import { resend } from "@dub/email/resend/client";
 import EmailDomainStatusChanged from "@dub/email/templates/email-domain-status-changed";
-import { EmailDomain } from "@prisma/client";
+import { EmailDomain, EmailDomainStatus } from "@prisma/client";
 import { logAndRespond } from "../../utils";
 
 export const dynamic = "force-dynamic";
 
+const EMAIL_DOMAIN_STATUS_SUBJECT: Partial<Record<EmailDomainStatus, string>> =
+  {
+    verified: "Your email domain has been verified",
+    failed: "Your email domain verification has failed",
+    partially_failed: "Your email domain verification has failed",
+  };
+
 // GET /api/cron/email-domains/verify
 // Runs every hour (0 * * * *)
 export const GET = withCron(async () => {
@@ -96,11 +103,8 @@ async function verifyEmailDomain(domain: EmailDomain) {
   }
 
   const subject =
-    updatedDomain.status === "verified"
-      ? "Your email domain has been verified"
-      : updatedDomain.status === "failed"
-        ? "Your email domain verification has failed"
-        : "Your email domain status has changed";
+    EMAIL_DOMAIN_STATUS_SUBJECT[updatedDomain.status] ??
+    "Your email domain status has changed";
 
   const resendResponse = await sendBatchEmail(
     users.map((user) => ({
diff --git a/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts b/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts
new file mode 100644
index 00000000000..4b357bb3bf6
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/export/customers/partner/route.ts
@@ -0,0 +1,155 @@
+import { convertToCSV } from "@/lib/analytics/utils/convert-to-csv";
+import { createDownloadableExport } from "@/lib/api/create-downloadable-export";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { generateExportFilename } from "@/lib/api/utils/generate-export-filename";
+import { generateRandomString } from "@/lib/api/utils/generate-random-string";
+import { CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
+import { withCron } from "@/lib/cron/with-cron";
+import { formatPartnerCustomersForExport } from "@/lib/customers/api/format-partner-customers-export";
+import { prisma, sanitizeFullTextSearch } from "@/lib/prisma";
+import { partnerCustomersExportCronInputSchema } from "@/lib/zod/schemas/partner-profile";
+import { sendEmail } from "@dub/email";
+import ExportReady from "@dub/email/templates/export-ready";
+import { CommissionType } from "@prisma/client";
+import { logAndRespond } from "../../../utils";
+
+const MAX_CUSTOMERS_EXPORT_LIMIT = 100_000;
+const PAGE_SIZE = 1000;
+
+export const dynamic = "force-dynamic";
+
+// POST /api/cron/export/customers/partner - QStash worker for processing large partner customer exports
+export const POST = withCron(async ({ rawBody }) => {
+  const parsedFilters = partnerCustomersExportCronInputSchema.parse(
+    JSON.parse(rawBody),
+  );
+
+  const {
+    partnerId,
+    programId,
+    userId,
+    columns,
+    search,
+    country,
+    linkId,
+    sortBy,
+    sortOrder,
+  } = parsedFilters;
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: userId,
+    },
+    select: {
+      email: true,
+    },
+  });
+
+  if (!user) {
+    return logAndRespond(`User ${userId} not found.`);
+  }
+
+  if (!user.email) {
+    return logAndRespond(`User ${userId} has no email.`);
+  }
+
+  const { program, customerDataSharingEnabledAt } =
+    await getProgramEnrollmentOrThrow({
+      partnerId,
+      programId,
+      include: {
+        program: true,
+      },
+    });
+
+  const ltvExcluded = CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id);
+
+  const where = {
+    partnerId,
+    programId: program.id,
+    projectId: program.workspaceId,
+    ...(country && { country }),
+    ...(linkId && { linkId }),
+    ...(search && customerDataSharingEnabledAt
+      ? search.includes("@")
+        ? { email: search }
+        : {
+            email: { search: sanitizeFullTextSearch(search) },
+            name: { search: sanitizeFullTextSearch(search) },
+          }
+      : {}),
+  };
+
+  const allRows: Record<string, string | number>[] = [];
+  let page = 1;
+
+  while (allRows.length < MAX_CUSTOMERS_EXPORT_LIMIT) {
+    const customers = await prisma.customer.findMany({
+      where,
+      include: {
+        link: true,
+        commissions: {
+          where: {
+            partnerId,
+            type: CommissionType.sale,
+          },
+          take: 1,
+          orderBy: {
+            createdAt: "asc",
+          },
+        },
+      },
+      orderBy: [{ [sortBy]: sortOrder }, { id: "asc" }],
+      skip: (page - 1) * PAGE_SIZE,
+      take: PAGE_SIZE,
+    });
+
+    if (customers.length === 0) {
+      break;
+    }
+
+    const formatted = formatPartnerCustomersForExport(customers, columns, {
+      customerDataSharingEnabledAt,
+      ltvExcluded,
+    });
+    const remaining = MAX_CUSTOMERS_EXPORT_LIMIT - allRows.length;
+    allRows.push(...formatted.slice(0, remaining));
+
+    if (customers.length < PAGE_SIZE) {
+      break;
+    }
+
+    page++;
+  }
+
+  const csvData = convertToCSV(allRows);
+
+  const { downloadUrl } = await createDownloadableExport({
+    fileKey: `exports/customers/partner/${generateRandomString(16)}.csv`,
+    fileName: generateExportFilename("customers"),
+    body: csvData,
+    contentType: "text/csv",
+  });
+
+  await sendEmail({
+    to: user.email,
+    subject: "Your customers export is ready",
+    react: ExportReady({
+      email: user.email,
+      exportType: "customers",
+      downloadUrl,
+      program: {
+        name: program.name,
+      },
+    }),
+  });
+
+  const capped =
+    allRows.length >= MAX_CUSTOMERS_EXPORT_LIMIT
+      ? ` (capped at ${MAX_CUSTOMERS_EXPORT_LIMIT})`
+      : "";
+
+  return logAndRespond(
+    `Export (${allRows.length} customers${capped}) generated and email sent to user.`,
+  );
+});
diff --git a/apps/web/app/(ee)/api/cron/export/links/route.ts b/apps/web/app/(ee)/api/cron/export/links/route.ts
index 808a871e4a5..6cd61b0fa3a 100644
--- a/apps/web/app/(ee)/api/cron/export/links/route.ts
+++ b/apps/web/app/(ee)/api/cron/export/links/route.ts
@@ -82,7 +82,7 @@ export async function POST(req: Request) {
 
     const { folderIds } = await validateLinksQueryFilters({
       ...filters,
-      userId,
+      sessionUserId: userId,
       workspace: {
         ...workspace,
         plan: workspace.plan as PlanProps,
diff --git a/apps/web/app/(ee)/api/cron/groups/create-default-links/route.ts b/apps/web/app/(ee)/api/cron/groups/create-default-links/route.ts
index c542e3a7472..c4101be741d 100644
--- a/apps/web/app/(ee)/api/cron/groups/create-default-links/route.ts
+++ b/apps/web/app/(ee)/api/cron/groups/create-default-links/route.ts
@@ -1,7 +1,7 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { bulkCreateLinks } from "@/lib/api/links";
 import { generatePartnerLink } from "@/lib/api/partners/generate-partner-link";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { qstash } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import { loadAppsFlyerParameters } from "@/lib/integrations/appsflyer/apply-parameters";
@@ -9,12 +9,7 @@ import { AppsFlyerSettings } from "@/lib/integrations/appsflyer/schema";
 import { isAppsFlyerTrackingUrl } from "@/lib/middleware/utils/is-appsflyer-tracking-url";
 import { prisma } from "@/lib/prisma";
 import { WorkspaceProps } from "@/lib/types";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  constructURLFromUTMParams,
-  isFulfilled,
-  log,
-} from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, isFulfilled, log } from "@dub/utils";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../utils";
 export const dynamic = "force-dynamic";
@@ -133,8 +128,8 @@ export async function POST(req: Request) {
       // Create a new defaultLink for each partner in the group
       const processedLinks = (
         await Promise.allSettled(
-          programEnrollments.map(({ partner, ...programEnrollment }) =>
-            generatePartnerLink({
+          programEnrollments.map(async ({ partner, ...programEnrollment }) => {
+            const processedLink = await generatePartnerLink({
               workspace: {
                 id: workspace.id,
                 plan: workspace.plan as WorkspaceProps["plan"],
@@ -151,18 +146,20 @@ export async function POST(req: Request) {
               },
               link: {
                 domain: defaultLink.domain,
-                url: constructURLFromUTMParams(
-                  defaultLink.url,
-                  extractUtmParams(group.utmTemplate),
-                ),
-                ...extractUtmParams(group.utmTemplate, { excludeRef: true }),
+                url: defaultLink.url,
                 tenantId: programEnrollment.tenantId ?? undefined,
                 partnerGroupDefaultLinkId: defaultLink.id,
               },
               userId,
               appsFlyerParameters,
-            }),
-          ),
+            });
+
+            return applyGroupUtmToLink({
+              link: processedLink,
+              utmTemplate: group.utmTemplate,
+              partnerName: partner.name,
+            });
+          }),
         )
       )
         .filter(isFulfilled)
diff --git a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
index 85d0a7548f2..5ee1cfb19c7 100644
--- a/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
+++ b/apps/web/app/(ee)/api/cron/groups/remap-default-links/route.ts
@@ -1,20 +1,17 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { bulkCreateLinks } from "@/lib/api/links";
 import { generatePartnerLink } from "@/lib/api/partners/generate-partner-link";
-import { qstash } from "@/lib/cron";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { syncDiscountCodes } from "@/lib/discounts/sync-discount-codes";
 import { loadAppsFlyerParameters } from "@/lib/integrations/appsflyer/apply-parameters";
 import { AppsFlyerSettings } from "@/lib/integrations/appsflyer/schema";
+import { syncGroupUtmJob } from "@/lib/jobs/handlers/sync-group-utm-job";
 import { isAppsFlyerTrackingUrl } from "@/lib/middleware/utils/is-appsflyer-tracking-url";
 import { prisma } from "@/lib/prisma";
 import { WorkspaceProps } from "@/lib/types";
 import { MAX_DEFAULT_LINKS_PER_GROUP } from "@/lib/zod/schemas/groups";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  isFulfilled,
-  log,
-  prettyPrint,
-} from "@dub/utils";
+import { isFulfilled, log } from "@dub/utils";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../utils";
 import { remapPartnerGroupDefaultLinks } from "./utils";
@@ -25,7 +22,6 @@ const schema = z.object({
   groupId: z.string(),
   partnerIds: z.array(z.string()),
   userId: z.string().nullish(),
-  isGroupDeleted: z.boolean().optional(),
 });
 
 /**
@@ -37,9 +33,9 @@ const schema = z.object({
     2. for the ones that don't match, set partnerGroupDefaultLinkId to null (linksToRemoveMapping)
     3. for the new group's default links that don't exist in the old group, create them (linksToCreate)
 
-    This runs when:
-    1. partners are moved to a group
-    2. a group is deleted and partners need to be moved to the default group
+    This runs when partners are moved to a group. If the emptied source group is
+    deleted before remap finishes, its default links are soft-deleted (groupId
+    null) so partnerGroupDefaultLinkId stays set until this job remaps them.
  */
 
 // POST /api/cron/groups/remap-default-links
@@ -48,8 +44,9 @@ export async function POST(req: Request) {
     const rawBody = await req.text();
     await verifyQstashSignature({ req, rawBody });
 
-    const { programId, groupId, partnerIds, userId, isGroupDeleted } =
-      schema.parse(JSON.parse(rawBody));
+    const { programId, groupId, partnerIds, userId } = schema.parse(
+      JSON.parse(rawBody),
+    );
 
     if (partnerIds.length === 0) {
       return logAndRespond(
@@ -88,17 +85,11 @@ export async function POST(req: Request) {
           partner: true,
           partnerGroup: true,
           links: {
-            // if this was invoked from the DELETE /groups/[groupId] route, the partnerGroupDefaultLinkId will be null
-            // due to Prisma cascade SetNull on delete – therefore we should take all links and remap them instead.
-            ...(isGroupDeleted
-              ? {}
-              : {
-                  where: {
-                    partnerGroupDefaultLinkId: {
-                      not: null,
-                    },
-                  },
-                }),
+            where: {
+              partnerGroupDefaultLinkId: {
+                not: null,
+              },
+            },
             orderBy: {
               createdAt: "asc",
             },
@@ -158,14 +149,14 @@ export async function POST(req: Request) {
 
       const processedLinks = (
         await Promise.allSettled(
-          linksToCreate.map((link) => {
+          linksToCreate.map(async (link) => {
             const programEnrollment = programEnrollments.find(
               (p) => p.partner.id === link.partnerId,
             );
 
             const partner = programEnrollment?.partner;
 
-            return generatePartnerLink({
+            const processedLink = await generatePartnerLink({
               workspace: {
                 id: program.workspace.id,
                 plan: program.workspace.plan as WorkspaceProps["plan"],
@@ -189,6 +180,12 @@ export async function POST(req: Request) {
               userId: userId ?? undefined,
               appsFlyerParameters,
             });
+
+            return applyGroupUtmToLink({
+              link: processedLink,
+              utmTemplate: partnerGroup.utmTemplate,
+              partnerName: partner?.name,
+            });
           }),
         )
       )
@@ -251,32 +248,16 @@ export async function POST(req: Request) {
       );
     }
 
-    const syncUtmJob = await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/sync-utm`,
-      body: {
-        groupId,
-        partnerIds,
-      },
+    await syncGroupUtmJob.dispatch({
+      groupId,
+      partnerIds,
     });
 
-    console.log(
-      `Scheduled sync-utm job for group ${groupId}: ${prettyPrint(syncUtmJob)}`,
-    );
-
-    const remapDiscountCodesJob = await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-discount-codes`,
-      body: {
-        programId,
-        partnerIds,
-        groupId,
-        isGroupDeleted,
-      },
+    await syncDiscountCodes({
+      programId,
+      partnerIds,
     });
 
-    console.log(
-      `Scheduled remap-discount-codes job for group ${groupId}: ${prettyPrint(remapDiscountCodesJob)}`,
-    );
-
     return logAndRespond(`Finished creating default links for the partners.`);
   } catch (error) {
     await log({
diff --git a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts b/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts
deleted file mode 100644
index a49f8dd9f68..00000000000
--- a/apps/web/app/(ee)/api/cron/groups/remap-discount-codes/route.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import { withCron } from "@/lib/cron/with-cron";
-import { createDiscountCode } from "@/lib/discounts/create-discount-code";
-import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
-import { isDiscountProviderError } from "@/lib/discounts/discount-error";
-import { isDiscountEquivalent } from "@/lib/discounts/is-discount-equivalent";
-import { prisma } from "@/lib/prisma";
-import { Discount, DiscountCode } from "@prisma/client";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-const inputSchema = z.object({
-  programId: z.string(),
-  groupId: z.string(),
-  partnerIds: z.array(z.string()),
-  isGroupDeleted: z.boolean().optional(),
-});
-
-// POST /api/cron/groups/remap-discount-codes
-export const POST = withCron(async ({ rawBody }) => {
-  const { programId, partnerIds, groupId, isGroupDeleted } = inputSchema.parse(
-    JSON.parse(rawBody),
-  );
-
-  if (partnerIds.length === 0) {
-    return logAndRespond("No partner IDs provided.");
-  }
-
-  const programEnrollments = await prisma.programEnrollment.findMany({
-    where: {
-      partnerId: {
-        in: partnerIds,
-      },
-      programId,
-    },
-    include: {
-      discountCodes: {
-        include: {
-          discount: true,
-        },
-      },
-    },
-  });
-
-  const oldDiscount = programEnrollments[0]?.discountCodes[0]?.discount;
-
-  if (programEnrollments.length === 0) {
-    return logAndRespond("No program enrollments found.");
-  }
-
-  const group = await prisma.partnerGroup.findUnique({
-    where: {
-      id: groupId,
-    },
-    include: {
-      discount: true,
-    },
-  });
-
-  if (!group) {
-    return logAndRespond("Group not found.");
-  }
-
-  const discountCodes = programEnrollments.flatMap(
-    ({ discountCodes }) => discountCodes,
-  );
-
-  // Find the discount codes to update and remove
-  const discountCodesToUpdate: DiscountCode[] = [];
-  const discountCodesToRemove: (DiscountCode & {
-    discount: Pick<Discount, "provider"> | null;
-  })[] = [];
-
-  for (const discountCode of discountCodes) {
-    const keepDiscountCode = isDiscountEquivalent(
-      group.discount,
-      discountCode.discount,
-    );
-
-    if (keepDiscountCode) {
-      discountCodesToUpdate.push(discountCode);
-    } else {
-      discountCodesToRemove.push(discountCode);
-    }
-  }
-
-  // Update the discount codes to use the new discount if they are equivalent
-  if (discountCodesToUpdate.length > 0) {
-    console.log(
-      `Found ${discountCodesToUpdate.length} discount codes equivalent to the new group's discount. Updating them.`,
-    );
-
-    await prisma.discountCode.updateMany({
-      where: {
-        id: {
-          in: discountCodesToUpdate.map(({ id }) => id),
-        },
-      },
-      data: {
-        discountId: group.discount?.id,
-      },
-    });
-  }
-
-  // Remove the previous discount codes
-  if (discountCodesToRemove.length > 0) {
-    console.log(
-      `Found ${discountCodesToRemove.length} discount codes not equivalent to the new group's discount. Deleting them.`,
-    );
-
-    await deleteDiscountCodes(discountCodesToRemove);
-  }
-
-  if (group.discount?.autoProvisionEnabledAt) {
-    // Find the partner default links that don't have a discount code yet
-    const links = await prisma.link.findMany({
-      where: {
-        partnerId: {
-          in: partnerIds,
-        },
-        programId,
-        partnerGroupDefaultLinkId: {
-          not: null,
-        },
-        discountCode: {
-          is: null,
-        },
-      },
-      select: {
-        id: true,
-        programEnrollment: {
-          select: {
-            partner: {
-              select: {
-                id: true,
-                name: true,
-              },
-            },
-          },
-        },
-      },
-    });
-
-    if (links.length > 0) {
-      const workspace = await prisma.project.findUniqueOrThrow({
-        where: {
-          defaultProgramId: programId,
-        },
-        select: {
-          id: true,
-          stripeConnectId: true,
-          shopifyStoreId: true,
-        },
-      });
-
-      // Create discount code for the partner default links
-      for (const link of links) {
-        try {
-          await createDiscountCode({
-            workspace,
-            partner: link.programEnrollment!.partner,
-            link,
-            discount: group.discount,
-          });
-        } catch (error) {
-          if (isDiscountProviderError(error)) {
-            if (
-              error.providerCode === "INTEGRATION_NOT_AVAILABLE" ||
-              error.providerCode === "AUTH_EXPIRED" ||
-              error.providerCode === "PERMISSIONS_REQUIRED" ||
-              error.providerCode === "COUPON_NOT_FOUND"
-            ) {
-              console.warn(
-                `${error.message} Skipping remaining discount code creation for remap.`,
-              );
-              break;
-            }
-          }
-          throw error;
-        }
-      }
-    }
-  }
-
-  // if the group is deleted, need to check if there are any remaining discount codes, if not, delete the discount
-  if (isGroupDeleted && oldDiscount) {
-    const remainingDiscountCodes = await prisma.discountCode.count({
-      where: {
-        discountId: oldDiscount.id,
-      },
-    });
-    if (remainingDiscountCodes === 0) {
-      await prisma.discount.deleteMany({
-        where: {
-          id: oldDiscount.id,
-        },
-      });
-      console.log(
-        `Deleted discount ${oldDiscount.id} because it has no remaining discount codes.`,
-      );
-    }
-  }
-
-  return logAndRespond("Finished remapping discount codes for the group.");
-});
diff --git a/apps/web/app/(ee)/api/cron/groups/sync-utm/route.ts b/apps/web/app/(ee)/api/cron/groups/sync-utm/route.ts
deleted file mode 100644
index 9d30e7c5b78..00000000000
--- a/apps/web/app/(ee)/api/cron/groups/sync-utm/route.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { linkCache } from "@/lib/api/links/cache";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
-import { qstash } from "@/lib/cron";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { prisma } from "@/lib/prisma";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  constructURLFromUTMParams,
-  log,
-} from "@dub/utils";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-export const dynamic = "force-dynamic";
-
-const PAGE_SIZE = 50;
-
-const schema = z.object({
-  groupId: z.string(),
-  partnerIds: z.array(z.string()).optional(),
-  startAfterProgramEnrollmentId: z.string().optional(),
-});
-
-/**
-    Syncs the UTM parameter settings for a given group (whether there is a UTM template or not)
-
-    This job is triggered when:
-    1. a UTM template is created for a group
-    2. a UTM template is updated
-    3. in groups/remap-default-links cron
- */
-
-// POST /api/cron/groups/sync-utm
-export async function POST(req: Request) {
-  try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
-    const { groupId, partnerIds, startAfterProgramEnrollmentId } = schema.parse(
-      JSON.parse(rawBody),
-    );
-
-    // Find the UTM template
-    const group = await prisma.partnerGroup.findUnique({
-      where: {
-        id: groupId,
-      },
-      include: {
-        utmTemplate: true,
-      },
-    });
-
-    if (!group) {
-      return logAndRespond(
-        `Group ${groupId} not found for groups/sync-utm cron. Skipping...`,
-        {
-          logLevel: "error",
-        },
-      );
-    }
-
-    const { utmTemplate } = group;
-
-    // Find partners in the group
-    const programEnrollments = await prisma.programEnrollment.findMany({
-      where: {
-        groupId: group.id,
-        ...(partnerIds && {
-          partnerId: {
-            in: partnerIds,
-          },
-        }),
-        ...(startAfterProgramEnrollmentId && {
-          id: {
-            gt: startAfterProgramEnrollmentId,
-          },
-        }),
-      },
-      take: PAGE_SIZE,
-      orderBy: {
-        id: "asc",
-      },
-      include: {
-        links: true,
-      },
-    });
-
-    if (programEnrollments.length === 0) {
-      return logAndRespond(`No program enrollments found. Skipping...`);
-    }
-
-    // extract links from program enrollments
-    const linksToUpdate = programEnrollments.flatMap((enrollment) =>
-      enrollment.links.map((link) => link),
-    );
-    // group links by the same url
-    const groupedLinksToUpdate = linksToUpdate.reduce(
-      (acc, link) => {
-        acc[link.url] = acc[link.url] || [];
-        acc[link.url].push(link.id);
-        return acc;
-      },
-      {} as Record<string, string[]>,
-    );
-
-    // Update the UTM for each partner links in the group
-    for (const [url, linkIds] of Object.entries(groupedLinksToUpdate)) {
-      const payload = {
-        url: constructURLFromUTMParams(url, extractUtmParams(utmTemplate)),
-        ...extractUtmParams(utmTemplate, { excludeRef: true }),
-      };
-
-      const updatedLinks = await prisma.link.updateMany({
-        where: {
-          id: {
-            in: linkIds,
-          },
-        },
-        data: payload,
-      });
-      console.log(
-        `Updated ${updatedLinks.count} links with URL: ${payload.url}`,
-      );
-    }
-
-    const redisRes = await linkCache.expireMany(linksToUpdate);
-    console.log(`Updated Redis cache: ${JSON.stringify(redisRes, null, 2)}`);
-
-    if (programEnrollments.length === PAGE_SIZE) {
-      await qstash.publishJSON({
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/sync-utm`,
-        method: "POST",
-        body: {
-          groupId,
-          partnerIds,
-          startAfterProgramEnrollmentId:
-            programEnrollments[programEnrollments.length - 1].id,
-        },
-      });
-    }
-
-    return logAndRespond(
-      `Finished syncing UTM settings for ${programEnrollments.length} partners in the ${group.name} group (${group.id}).`,
-    );
-  } catch (error) {
-    await log({
-      message: `Error syncing UTM settings: ${error.message}.`,
-      type: "errors",
-    });
-
-    return handleAndReturnErrorResponse(error);
-  }
-}
diff --git a/apps/web/app/(ee)/api/cron/groups/update-default-links/route.ts b/apps/web/app/(ee)/api/cron/groups/update-default-links/route.ts
index c49ee264f46..cb29d945a45 100644
--- a/apps/web/app/(ee)/api/cron/groups/update-default-links/route.ts
+++ b/apps/web/app/(ee)/api/cron/groups/update-default-links/route.ts
@@ -1,6 +1,6 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { linkCache } from "@/lib/api/links/cache";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { qstash } from "@/lib/cron";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
 import {
@@ -10,11 +10,8 @@ import {
 import { AppsFlyerSettings } from "@/lib/integrations/appsflyer/schema";
 import { isAppsFlyerTrackingUrl } from "@/lib/middleware/utils/is-appsflyer-tracking-url";
 import { prisma } from "@/lib/prisma";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  constructURLFromUTMParams,
-  log,
-} from "@dub/utils";
+import { ProcessedLinkProps } from "@/lib/types";
+import { APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
 import { Link } from "@prisma/client";
 import * as z from "zod/v4";
 import { logAndRespond } from "../../utils";
@@ -121,6 +118,9 @@ export async function POST(req: Request) {
           url: true,
           domain: true,
           key: true,
+          // Needed to re-index the owners after the URL changes below.
+          programId: true,
+          partnerId: true,
           partner: {
             select: {
               name: true,
@@ -136,6 +136,7 @@ export async function POST(req: Request) {
 
       const linksToUpdate: {
         id: string;
+        owner: { programId: string | null; partnerId: string | null };
         link: Pick<
           Link,
           | "url"
@@ -148,10 +149,24 @@ export async function POST(req: Request) {
       }[] = [];
 
       for (const defaultPartnerLink of defaultPartnerLinks) {
-        let url = constructURLFromUTMParams(
-          defaultLink.url,
-          extractUtmParams(group.utmTemplate),
-        );
+        const utmContext = {
+          partnerName:
+            defaultPartnerLink.partner?.name || defaultPartnerLink.key,
+          partnerLinkKey: defaultPartnerLink.key,
+        };
+
+        const linkWithUtm = applyGroupUtmToLink({
+          link: {
+            domain: defaultPartnerLink.domain,
+            key: defaultPartnerLink.key,
+            url: defaultLink.url,
+            projectId: defaultLink.program.workspaceId,
+          } as ProcessedLinkProps,
+          utmTemplate: group.utmTemplate,
+          partnerName: defaultPartnerLink.partner?.name,
+        });
+
+        let url = linkWithUtm.url;
 
         // Inject AppsFlyer parameters with resolved macros
         if (
@@ -161,19 +176,23 @@ export async function POST(req: Request) {
           url = applyAppsFlyerParameters({
             url,
             parameters: appsFlyerParameters,
-            context: {
-              partnerName:
-                defaultPartnerLink.partner?.name || defaultPartnerLink.key,
-              partnerLinkKey: defaultPartnerLink.key,
-            },
+            context: utmContext,
           });
         }
 
         linksToUpdate.push({
           id: defaultPartnerLink.id,
+          owner: {
+            programId: defaultPartnerLink.programId,
+            partnerId: defaultPartnerLink.partnerId,
+          },
           link: {
             url,
-            ...extractUtmParams(group.utmTemplate, { excludeRef: true }),
+            utm_source: linkWithUtm.utm_source ?? null,
+            utm_medium: linkWithUtm.utm_medium ?? null,
+            utm_campaign: linkWithUtm.utm_campaign ?? null,
+            utm_term: linkWithUtm.utm_term ?? null,
+            utm_content: linkWithUtm.utm_content ?? null,
           },
         });
       }
diff --git a/apps/web/app/(ee)/api/cron/import/lemonsqueezy/route.ts b/apps/web/app/(ee)/api/cron/import/lemonsqueezy/route.ts
new file mode 100644
index 00000000000..e392cc124db
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/import/lemonsqueezy/route.ts
@@ -0,0 +1,26 @@
+import { withCron } from "@/lib/cron/with-cron";
+import { importCommissions } from "@/lib/lemonsqueezy/import-commissions";
+import { importCustomers } from "@/lib/lemonsqueezy/import-customers";
+import { importPartners } from "@/lib/lemonsqueezy/import-partners";
+import { lemonSqueezyImportPayloadSchema } from "@/lib/lemonsqueezy/schemas";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+
+export const POST = withCron(async ({ rawBody }) => {
+  const payload = lemonSqueezyImportPayloadSchema.parse(JSON.parse(rawBody));
+
+  switch (payload.action) {
+    case "import-partners":
+      await importPartners(payload);
+      break;
+    case "import-customers":
+      await importCustomers(payload);
+      break;
+    case "import-commissions":
+      await importCommissions(payload);
+      break;
+  }
+
+  return logAndRespond("OK");
+});
diff --git a/apps/web/app/(ee)/api/cron/import/rebrandly/utils.ts b/apps/web/app/(ee)/api/cron/import/rebrandly/utils.ts
index b1e60d6fab9..eeb6dd01585 100644
--- a/apps/web/app/(ee)/api/cron/import/rebrandly/utils.ts
+++ b/apps/web/app/(ee)/api/cron/import/rebrandly/utils.ts
@@ -6,7 +6,11 @@ import { redis } from "@/lib/upstash";
 import { randomBadgeColor } from "@/ui/links/tag-badge";
 import { sendEmail } from "@dub/email";
 import LinksImported from "@dub/email/templates/links-imported";
-import { APP_DOMAIN_WITH_NGROK, linkConstructorSimple } from "@dub/utils";
+import {
+  APP_DOMAIN_WITH_NGROK,
+  linkConstructorSimple,
+  sleep,
+} from "@dub/utils";
 
 export const importTagsFromRebrandly = async ({
   workspaceId,
@@ -52,7 +56,7 @@ export const importTagsFromRebrandly = async ({
   });
 
   // wait 500 ms before making another request
-  await new Promise((resolve) => setTimeout(resolve, 500));
+  await sleep(500);
 
   return await importTagsFromRebrandly({
     workspaceId,
@@ -249,7 +253,7 @@ export const importLinksFromRebrandly = async ({
     });
 
     // wait 500 ms before making another request
-    await new Promise((resolve) => setTimeout(resolve, 500));
+    await sleep(500);
 
     return await qstash.publishJSON({
       url: `${APP_DOMAIN_WITH_NGROK}/api/cron/import/rebrandly`,
diff --git a/apps/web/app/(ee)/api/cron/import/short/utils.ts b/apps/web/app/(ee)/api/cron/import/short/utils.ts
index 542281bf3f6..72d83c272b6 100644
--- a/apps/web/app/(ee)/api/cron/import/short/utils.ts
+++ b/apps/web/app/(ee)/api/cron/import/short/utils.ts
@@ -6,7 +6,11 @@ import { redis } from "@/lib/upstash";
 import { randomBadgeColor } from "@/ui/links/tag-badge";
 import { sendEmail } from "@dub/email";
 import LinksImported from "@dub/email/templates/links-imported";
-import { APP_DOMAIN_WITH_NGROK, linkConstructorSimple } from "@dub/utils";
+import {
+  APP_DOMAIN_WITH_NGROK,
+  linkConstructorSimple,
+  sleep,
+} from "@dub/utils";
 
 export const importLinksFromShort = async ({
   workspaceId,
@@ -168,7 +172,7 @@ export const importLinksFromShort = async ({
   });
 
   // wait 500 ms before making another request
-  await new Promise((resolve) => setTimeout(resolve, 500));
+  await sleep(500);
 
   if (!nextPageToken) {
     const workspace = await prisma.project.findUnique({
diff --git a/apps/web/app/(ee)/api/cron/invoices/retry-failed/route.ts b/apps/web/app/(ee)/api/cron/invoices/retry-failed/route.ts
index 1c2320ec4d0..746876cbe67 100644
--- a/apps/web/app/(ee)/api/cron/invoices/retry-failed/route.ts
+++ b/apps/web/app/(ee)/api/cron/invoices/retry-failed/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { prisma } from "@/lib/prisma";
 import { createPaymentIntent } from "@/lib/stripe/create-payment-intent";
 import { ACME_WORKSPACE_ID, DUB_WORKSPACE_ID } from "@dub/utils";
@@ -12,93 +11,82 @@ const schema = z.object({
 });
 
 // POST /api/cron/invoices/retry-failed
-export async function POST(req: Request) {
-  try {
-    const rawBody = await req.text();
-
-    await verifyQstashSignature({
-      req,
-      rawBody,
-    });
-
-    const { invoiceId } = schema.parse(JSON.parse(rawBody));
-
-    const invoice = await prisma.invoice.findUnique({
-      where: {
-        id: invoiceId,
-      },
-      select: {
-        id: true,
-        type: true,
-        status: true,
-        total: true,
-        failedAttempts: true,
-        workspace: {
-          select: {
-            id: true,
-            stripeId: true,
-          },
+export const POST = withCron(async ({ rawBody }) => {
+  const { invoiceId } = schema.parse(JSON.parse(rawBody));
+
+  const invoice = await prisma.invoice.findUnique({
+    where: {
+      id: invoiceId,
+    },
+    select: {
+      id: true,
+      type: true,
+      status: true,
+      total: true,
+      failedAttempts: true,
+      workspace: {
+        select: {
+          id: true,
+          stripeId: true,
         },
       },
-    });
+    },
+  });
 
-    if (!invoice) {
-      console.log(`Invoice ${invoiceId} not found.`);
-      return new Response(`Invoice ${invoiceId} not found.`);
-    }
+  if (!invoice) {
+    console.log(`Invoice ${invoiceId} not found.`);
+    return new Response(`Invoice ${invoiceId} not found.`);
+  }
 
-    if (invoice.status !== "failed") {
-      console.log(`Invoice ${invoiceId} is not failed.`);
-      return new Response(`Invoice ${invoiceId} is not failed.`);
-    }
+  if (invoice.status !== "failed") {
+    console.log(`Invoice ${invoiceId} is not failed.`);
+    return new Response(`Invoice ${invoiceId} is not failed.`);
+  }
 
-    if (invoice.failedAttempts >= 3) {
-      console.log(`Invoice ${invoiceId} has reached max failed attempts of 3.`);
-      return new Response(
-        `Invoice ${invoiceId} has reached max failed attempts of 3.`,
-      );
-    }
+  if (invoice.failedAttempts >= 3) {
+    console.log(`Invoice ${invoiceId} has reached max failed attempts of 3.`);
+    return new Response(
+      `Invoice ${invoiceId} has reached max failed attempts of 3.`,
+    );
+  }
 
-    if (invoice.type !== "domainRenewal") {
-      console.log(`Only domain renewals can be retried at this time.`);
-      return new Response(`Only domain renewals can be retried at this time.`);
-    }
+  if (invoice.type !== "domainRenewal") {
+    console.log(`Only domain renewals can be retried at this time.`);
+    return new Response(`Only domain renewals can be retried at this time.`);
+  }
 
-    let { workspace } = invoice;
+  let { workspace } = invoice;
 
-    // If Acme workspace, use Dub workspace stripeId
-    if (workspace.id === ACME_WORKSPACE_ID) {
-      const dubWorkspace = await prisma.project.findUniqueOrThrow({
-        where: {
-          id: DUB_WORKSPACE_ID,
-        },
-        select: {
-          stripeId: true,
-        },
-      });
+  // If Acme workspace, use Dub workspace stripeId
+  if (workspace.id === ACME_WORKSPACE_ID) {
+    const dubWorkspace = await prisma.project.findUniqueOrThrow({
+      where: {
+        id: DUB_WORKSPACE_ID,
+      },
+      select: {
+        stripeId: true,
+      },
+    });
 
-      workspace = {
-        ...workspace,
-        stripeId: dubWorkspace.stripeId,
-      };
-    }
+    workspace = {
+      ...workspace,
+      stripeId: dubWorkspace.stripeId,
+    };
+  }
 
-    if (!workspace.stripeId) {
-      console.log(`Workspace ${workspace.id} has no stripeId.`);
-      return new Response(`Workspace ${workspace.id} has no stripeId.`);
-    }
+  if (!workspace.stripeId) {
+    console.log(`Workspace ${workspace.id} has no stripeId.`);
+    return new Response(`Workspace ${workspace.id} has no stripeId.`);
+  }
 
-    await createPaymentIntent({
-      stripeId: workspace.stripeId,
-      amount: invoice.total,
-      invoiceId: invoice.id,
-      statementDescriptor: "DUB.CO DOMAIN RENEWAL",
-      description: `Domain renewal invoice (${invoice.id})`,
-      idempotencyKey: `${invoice.id}-${invoice.failedAttempts}`,
-    });
+  await createPaymentIntent({
+    stripeId: workspace.stripeId,
+    amount: invoice.total,
+    invoiceId: invoice.id,
+    statementDescriptor: "DUB.CO DOMAIN RENEWAL",
+    description: `Domain renewal invoice (${invoice.id})`,
+    idempotencyKey: `${invoice.id}-${invoice.failedAttempts}`,
+  });
 
-    return new Response(`Retrying invoice charge ${invoice.id}...`);
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
-  }
-}
+  return new Response(`Retrying invoice charge ${invoice.id}...`);
+});
diff --git a/apps/web/app/(ee)/api/cron/links/invalidate-for-discounts/route.ts b/apps/web/app/(ee)/api/cron/links/invalidate-for-discounts/route.ts
deleted file mode 100644
index 667ea3ac67c..00000000000
--- a/apps/web/app/(ee)/api/cron/links/invalidate-for-discounts/route.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { linkCache } from "@/lib/api/links/cache";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { prisma } from "@/lib/prisma";
-import { chunk } from "@dub/utils";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-const schema = z.object({
-  groupId: z.string(),
-  partnerIds: z
-    .array(z.string())
-    .optional()
-    .describe(
-      "If provided, only invalidate the cache for the given partner ids.",
-    ),
-});
-
-// This route is used to invalidate the partnerlink cache when a discount is created/updated/deleted.
-// POST /api/cron/links/invalidate-for-discounts
-export async function POST(req: Request) {
-  try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
-    const { groupId, partnerIds } = schema.parse(JSON.parse(rawBody));
-
-    // Find the group
-    const group = await prisma.partnerGroup.findUnique({
-      where: {
-        id: groupId,
-      },
-    });
-
-    if (!group) {
-      return logAndRespond(`Group ${groupId} not found.`, {
-        logLevel: "error",
-      });
-    }
-
-    // Find all the links of the partners in the group
-    const programEnrollments = await prisma.programEnrollment.findMany({
-      where: {
-        groupId,
-        ...(partnerIds && {
-          partnerId: {
-            in: partnerIds,
-          },
-        }),
-      },
-      select: {
-        links: {
-          select: {
-            domain: true,
-            key: true,
-          },
-        },
-      },
-    });
-
-    if (programEnrollments.length === 0) {
-      return logAndRespond(
-        `No program enrollments found for group ${groupId}.`,
-      );
-    }
-
-    const links = programEnrollments.flatMap((enrollment) => enrollment.links);
-
-    if (links.length === 0) {
-      return logAndRespond(
-        `No links found for partners in the group ${groupId}.`,
-      );
-    }
-
-    const linkChunks = chunk(links, 100);
-
-    // Expire the cache for the links
-    for (const linkChunk of linkChunks) {
-      const toExpire = linkChunk.map(({ domain, key }) => ({ domain, key }));
-      await linkCache.expireMany(toExpire);
-    }
-
-    return logAndRespond(`Expired cache for ${links.length} links.`);
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
-  }
-}
diff --git a/apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts b/apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts
index d7eb2191b59..1b2cb5cb4da 100644
--- a/apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts
+++ b/apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts
@@ -168,7 +168,7 @@ export async function POST(req: Request) {
   } catch (error) {
     await log({
       message: `Error notifying partner of new messages: ${error.message}`,
-      type: "alerts",
+      type: "errors",
     });
 
     return handleAndReturnErrorResponse(error);
diff --git a/apps/web/app/(ee)/api/cron/messages/notify-program/route.ts b/apps/web/app/(ee)/api/cron/messages/notify-program/route.ts
index b862b30e100..dd9297844a4 100644
--- a/apps/web/app/(ee)/api/cron/messages/notify-program/route.ts
+++ b/apps/web/app/(ee)/api/cron/messages/notify-program/route.ts
@@ -165,7 +165,7 @@ export async function POST(req: Request) {
   } catch (error) {
     await log({
       message: `Error notifying program users of new messages: ${error.message}`,
-      type: "alerts",
+      type: "errors",
     });
 
     return handleAndReturnErrorResponse(error);
diff --git a/apps/web/app/(ee)/api/cron/partner-platforms/youtube/route.ts b/apps/web/app/(ee)/api/cron/partner-platforms/youtube/route.ts
index 523e7c4fec6..a8fa3db6e52 100644
--- a/apps/web/app/(ee)/api/cron/partner-platforms/youtube/route.ts
+++ b/apps/web/app/(ee)/api/cron/partner-platforms/youtube/route.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { qstash } from "@/lib/cron";
 import { withCron } from "@/lib/cron/with-cron";
 import { prisma } from "@/lib/prisma";
@@ -99,13 +100,18 @@ export const POST = withCron(async ({ rawBody }) => {
             }),
           };
 
+          // Broken out because it is the only change here the search index
+          // cares about. The rest are stats, which the document does not carry.
+          const identifierChanged =
+            "identifier" in newStats &&
+            partnerPlatform.identifier !== newStats.identifier;
+
           const hasChanges =
             partnerPlatform.subscribers !== BigInt(newStats.subscribers) ||
             partnerPlatform.posts !== BigInt(newStats.posts) ||
             partnerPlatform.views !== BigInt(newStats.views) ||
             partnerPlatform.avatarUrl !== newStats.avatarUrl ||
-            ("identifier" in newStats &&
-              partnerPlatform.identifier !== newStats.identifier);
+            identifierChanged;
 
           if (!hasChanges) {
             console.log(
@@ -124,6 +130,14 @@ export const POST = withCron(async ({ rawBody }) => {
             },
           });
 
+          if (identifierChanged) {
+            // Queue an index update because the platform identifier moved. The
+            // stats above are not indexed.
+            await queuePartnerSearchSync({
+              partnerIds: [partnerPlatform.partnerId],
+            });
+          }
+
           console.log(
             `Updated YouTube stats for @${partnerPlatform.identifier}`,
             newStats,
diff --git a/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts b/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts
deleted file mode 100644
index 2cb8e45ece0..00000000000
--- a/apps/web/app/(ee)/api/cron/partner-program-summary/process/route.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import { getAnalytics } from "@/lib/analytics/get-analytics";
-import { qstash } from "@/lib/cron";
-import { withCron } from "@/lib/cron/with-cron";
-import { prisma } from "@/lib/prisma";
-import { sendBatchEmail } from "@dub/email";
-import PartnerProgramSummary from "@dub/email/templates/partner-program-summary";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
-import { Prisma } from "@prisma/client";
-import { endOfMonth, format, startOfMonth, subMonths } from "date-fns";
-import * as z from "zod/v4";
-import { logAndRespond } from "../../utils";
-
-export const dynamic = "force-dynamic";
-
-const PARTNER_BATCH_SIZE = 100;
-
-const queue = qstash.queue({
-  queueName: "send-partner-summary",
-});
-
-const schema = z.object({
-  programId: z.string(),
-  startingAfter: z.string().nullish(),
-  batchNumber: z.number().nullish(),
-});
-
-interface AnalyticsResponse {
-  partnerId: string;
-  clicks: number;
-  leads: number;
-  sales: number;
-  saleAmount: number;
-}
-
-type PartnerProgramSummaryMonthMetrics = {
-  earnings: number;
-  clicks: number;
-  leads: number;
-  sales: number;
-};
-
-function monthHasNoActivity(m: PartnerProgramSummaryMonthMetrics) {
-  return m.earnings === 0 && m.clicks === 0 && m.leads === 0 && m.sales === 0;
-}
-
-// This route processes partner program summary emails for a specific program.
-// Called by the main route after enqueuing jobs for each program.
-// POST /api/cron/partner-program-summary/process
-export const POST = withCron(async ({ rawBody }) => {
-  const result = schema.parse(JSON.parse(rawBody));
-
-  let { programId, startingAfter, batchNumber } = result;
-
-  const previousMonth = startOfMonth(subMonths(new Date(), 2));
-  const currentMonth = startOfMonth(subMonths(new Date(), 1));
-
-  const program = await prisma.program.findUnique({
-    where: {
-      id: programId,
-    },
-    select: {
-      id: true,
-      name: true,
-      logo: true,
-      slug: true,
-      supportEmail: true,
-      workspaceId: true,
-    },
-  });
-
-  if (!program) {
-    return logAndRespond(`Program ${programId} not found.`);
-  }
-
-  console.info(`Sending program summary for ${program.slug}`, {
-    previousMonth,
-    currentMonth,
-  });
-
-  // Find the clicks, leads, sales analytics
-  const [previousMonthAnalytics, currentMonthAnalytics] = await Promise.all([
-    // 2 months ago
-    getAnalytics({
-      event: "composite",
-      groupBy: "top_partners",
-      workspaceId: program.workspaceId,
-      programId: program.id,
-      start: previousMonth,
-      end: endOfMonth(previousMonth),
-    }),
-
-    // 1 month ago
-    getAnalytics({
-      event: "composite",
-      groupBy: "top_partners",
-      workspaceId: program.workspaceId,
-      programId: program.id,
-      start: currentMonth,
-      end: endOfMonth(currentMonth),
-    }),
-  ]);
-
-  const programEnrollments = await prisma.programEnrollment.findMany({
-    where: {
-      programId: program.id,
-      status: "approved",
-      totalLeads: {
-        gt: 0,
-      },
-      partner: {
-        users: {
-          some: {
-            notificationPreferences: {
-              monthlyProgramSummary: true,
-            },
-          },
-        },
-      },
-    },
-    select: {
-      id: true,
-      partner: {
-        select: {
-          id: true,
-          email: true,
-          createdAt: true,
-        },
-      },
-      links: {
-        select: {
-          clicks: true,
-          leads: true,
-          sales: true,
-        },
-      },
-    },
-    ...(startingAfter && {
-      skip: 1,
-      cursor: {
-        id: startingAfter,
-      },
-    }),
-    orderBy: {
-      id: "desc",
-    },
-    take: PARTNER_BATCH_SIZE,
-  });
-
-  console.info(
-    `Found ${programEnrollments.length} active partners that have signed up for partners.dub.co and have links with at least 1 total lead.`,
-  );
-
-  if (programEnrollments.length === 0) {
-    return logAndRespond(
-      `No more active partners found for program ${program.id}.`,
-    );
-  }
-
-  // Find the earnings
-  const partners = programEnrollments.map(({ partner }) => partner);
-
-  const commissionWhere: Prisma.CommissionWhereInput = {
-    earnings: {
-      gt: 0,
-    },
-    programId: program.id,
-    partnerId: {
-      in: partners.map((partner) => partner.id),
-    },
-    status: {
-      in: ["pending", "processed", "paid"],
-    },
-  };
-
-  const [previousMonthEarnings, currentMonthEarnings, lifetimeEarnings] =
-    await Promise.all([
-      // Earnings 2 months ago (to compare with previous month)
-      prisma.commission.groupBy({
-        by: ["partnerId"],
-        where: {
-          ...commissionWhere,
-          createdAt: {
-            gte: previousMonth,
-            lte: endOfMonth(previousMonth),
-          },
-        },
-        _sum: {
-          earnings: true,
-        },
-      }),
-
-      // Earnings 1 month ago,
-      prisma.commission.groupBy({
-        by: ["partnerId"],
-        where: {
-          ...commissionWhere,
-          createdAt: {
-            gte: currentMonth,
-            lte: endOfMonth(currentMonth),
-          },
-        },
-        _sum: {
-          earnings: true,
-        },
-      }),
-
-      // All-time earnings
-      prisma.commission.groupBy({
-        by: ["partnerId"],
-        where: {
-          ...commissionWhere,
-        },
-        _sum: {
-          earnings: true,
-        },
-      }),
-    ]);
-
-  const previousEarningsMap = new Map(
-    previousMonthEarnings.map((e) => [e.partnerId, e]),
-  );
-
-  const currentEarningsMap = new Map(
-    currentMonthEarnings.map((e) => [e.partnerId, e]),
-  );
-
-  const lifetimeEarningsMap = new Map(
-    lifetimeEarnings.map((e) => [e.partnerId, e]),
-  );
-
-  const previousAnalyticsMap: Map<string, AnalyticsResponse> = new Map(
-    previousMonthAnalytics.map((a: AnalyticsResponse) => [a.partnerId, a]),
-  );
-
-  const currentAnalyticsMap: Map<string, AnalyticsResponse> = new Map(
-    currentMonthAnalytics.map((a: AnalyticsResponse) => [a.partnerId, a]),
-  );
-
-  const summary = partners.map((partner) => {
-    // Get previous and current month analytics from Tinybird
-    const _previousMonthAnalytics = previousAnalyticsMap.get(partner.id);
-    const _currentMonthAnalytics = currentAnalyticsMap.get(partner.id);
-
-    // Get lifetime analytics from MySQL
-    const _lifetimeAnalytics = programEnrollments
-      .find((enrollment) => enrollment.partner.id === partner.id)
-      ?.links.reduce(
-        (acc, link) => ({
-          clicks: acc.clicks + link.clicks,
-          leads: acc.leads + link.leads,
-          sales: acc.sales + link.sales,
-        }),
-        { clicks: 0, leads: 0, sales: 0 },
-      );
-
-    // Get earnings data from MySQL
-    const _previousMonthEarnings = previousEarningsMap.get(partner.id);
-    const _currentMonthEarnings = currentEarningsMap.get(partner.id);
-    const _lifetimeEarnings = lifetimeEarningsMap.get(partner.id);
-
-    return {
-      partner,
-      previousMonth: {
-        earnings: _previousMonthEarnings?._sum.earnings ?? 0,
-        clicks: _previousMonthAnalytics?.clicks ?? 0,
-        leads: _previousMonthAnalytics?.leads ?? 0,
-        sales: _previousMonthAnalytics?.sales ?? 0,
-      },
-      currentMonth: {
-        earnings: _currentMonthEarnings?._sum.earnings ?? 0,
-        clicks: _currentMonthAnalytics?.clicks ?? 0,
-        leads: _currentMonthAnalytics?.leads ?? 0,
-        sales: _currentMonthAnalytics?.sales ?? 0,
-      },
-      lifetime: {
-        earnings: _lifetimeEarnings?._sum.earnings ?? 0,
-        clicks: _lifetimeAnalytics?.clicks ?? 0,
-        leads: _lifetimeAnalytics?.leads ?? 0,
-        sales: _lifetimeAnalytics?.sales ?? 0,
-      },
-    };
-  });
-
-  console.table(
-    summary.map((s) => ({
-      partner: s.partner.email,
-      program: program.name,
-      currentEarnings: s.currentMonth.earnings,
-      currentClicks: s.currentMonth.clicks,
-      currentLeads: s.currentMonth.leads,
-      currentSales: s.currentMonth.sales,
-      lifetimeEarnings: s.lifetime.earnings,
-      lifetimeClicks: s.lifetime.clicks,
-      lifetimeLeads: s.lifetime.leads,
-      lifetimeSales: s.lifetime.sales,
-    })),
-  );
-
-  const reportingMonth = format(currentMonth, "MMM yyyy");
-  batchNumber = batchNumber || 1;
-
-  const summaryToSend = summary.filter(
-    (s) =>
-      !(
-        monthHasNoActivity(s.previousMonth) &&
-        monthHasNoActivity(s.currentMonth)
-      ),
-  );
-
-  const skippedEmpty = summary.length - summaryToSend.length;
-  if (skippedEmpty > 0) {
-    console.info(
-      `Skipped ${skippedEmpty} partner program summary email(s) with no activity in both reporting months.`,
-    );
-  }
-
-  await sendBatchEmail(
-    summaryToSend.map(({ partner, ...rest }) => ({
-      variant: "notifications",
-      subject: `Your ${reportingMonth} performance report for ${program.name} program`,
-      to: partner.email!,
-      replyTo: program.supportEmail || "noreply",
-      react: PartnerProgramSummary({
-        program,
-        partner,
-        ...rest,
-        reportingPeriod: {
-          month: reportingMonth,
-          start: currentMonth.toISOString(),
-          end: endOfMonth(currentMonth).toISOString(),
-        },
-      }),
-    })),
-    {
-      idempotencyKey: `partner-program-summary-${reportingMonth}-${program.id}-${batchNumber}`,
-    },
-  );
-
-  // Schedule the next batch if there are more partners to process
-  if (programEnrollments.length === PARTNER_BATCH_SIZE) {
-    startingAfter = programEnrollments[programEnrollments.length - 1].id;
-    batchNumber++;
-
-    const response = await queue.enqueueJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partner-program-summary/process`,
-      method: "POST",
-      body: {
-        ...result,
-        startingAfter,
-        batchNumber,
-      },
-    });
-
-    return logAndRespond(
-      `Enqueued partner program summary jobs for the next batch ${response.messageId}`,
-    );
-  }
-
-  return logAndRespond(
-    `Finished processing all partners for program ${program.id}.`,
-  );
-});
diff --git a/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts b/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
index 2bb9edf714d..d1be1a2f130 100644
--- a/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
+++ b/apps/web/app/(ee)/api/cron/partner-program-summary/route.ts
@@ -1,55 +1,26 @@
-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
 import { withCron } from "@/lib/cron/with-cron";
-import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { queuePartnerProgramSummaryJob } from "@/lib/jobs/handlers/queue-partner-program-summary-job";
 import { format, startOfMonth, subMonths } from "date-fns";
 import { logAndRespond } from "../utils";
 
 export const dynamic = "force-dynamic";
 
-const PROGRAM_BATCH_SIZE = 50;
-
-// This route handles the monthly partner program summary emails for partners.
+// This route kicks off the monthly partner program summary emails.
 // Scheduled to run at 1 PM UTC on the 1st day of every month to send the previous month's summary.
 // GET /api/cron/partner-program-summary
 export const GET = withCron(async () => {
-  const currentMonth = startOfMonth(subMonths(new Date(), 1));
-  const yearMonth = format(currentMonth, "yyyy-MM");
-
-  let page = 0;
-
-  while (true) {
-    const programs = await prisma.program.findMany({
-      where: { deactivatedAt: null },
-      select: {
-        id: true,
-      },
-      take: PROGRAM_BATCH_SIZE,
-      skip: page * PROGRAM_BATCH_SIZE,
-      orderBy: {
-        id: "asc",
-      },
-    });
-
-    if (programs.length === 0) {
-      break;
-    }
-
-    await enqueueBatchJobs(
-      programs.map((program) => ({
-        queueName: "send-partner-summary",
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partner-program-summary/process`,
-        deduplicationId: `partner-program-summary-${yearMonth}-${program.id}`,
-        body: {
-          programId: program.id,
-        },
-      })),
-    );
-
-    page++;
-  }
+  const yearMonth = format(startOfMonth(subMonths(new Date(), 1)), "yyyy-MM");
+
+  await queuePartnerProgramSummaryJob.dispatch(
+    {
+      yearMonth,
+    },
+    {
+      deduplicationId: `queue-program-summary-${yearMonth}`,
+    },
+  );
 
   return logAndRespond(
-    `Enqueued partner program summary jobs for ${yearMonth}.`,
+    `Enqueued partner program summary queue job for ${yearMonth}.`,
   );
 });
diff --git a/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts b/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts
index fcde9a4217b..33650185b50 100644
--- a/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/auto-approve/route.ts
@@ -1,132 +1,11 @@
-import { getPartnerApplicationRisks } from "@/lib/api/fraud/get-partner-application-risks";
-import { approvePartner } from "@/lib/api/partners/applications/approve-partner";
 import { withCron } from "@/lib/cron/with-cron";
-import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
-import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import { prisma } from "@/lib/prisma";
-import * as z from "zod/v4";
+import { autoApprovePartnerJob } from "@/lib/jobs/handlers/auto-approve-partner-job";
 import { logAndRespond } from "../../utils";
 
 export const dynamic = "force-dynamic";
 
-const schema = z.object({
-  programId: z.string(),
-  partnerId: z.string(),
-});
-
 // POST /api/cron/partners/auto-approve
-// This route is used to auto-approve a partner enrolled in a program
 export const POST = withCron(async ({ rawBody }) => {
-  const { programId, partnerId } = schema.parse(JSON.parse(rawBody));
-
-  const programEnrollment = await prisma.programEnrollment.findUnique({
-    where: {
-      partnerId_programId: {
-        partnerId,
-        programId,
-      },
-    },
-    include: {
-      partnerGroup: true,
-      partner: {
-        include: {
-          platforms: true,
-        },
-      },
-    },
-  });
-
-  if (!programEnrollment) {
-    return logAndRespond(
-      `Partner ${partnerId} not found in program ${programId}. Skipping auto-approval.`,
-    );
-  }
-
-  const group = programEnrollment.partnerGroup;
-
-  if (!group) {
-    return logAndRespond(
-      `Group not found for partner ${partnerId} in program ${programId}. Skipping auto-approval.`,
-    );
-  }
-
-  if (!group.autoApprovePartnersEnabledAt) {
-    return logAndRespond(
-      `Group ${group.id} does not have auto-approval enabled. Skipping auto-approval.`,
-    );
-  }
-
-  if (programEnrollment.status !== "pending") {
-    return logAndRespond(
-      `${partnerId} is in ${programEnrollment.status} status. Skipping auto-approval.`,
-    );
-  }
-
-  // Check if the workspace plan has fraud event management capabilities
-  // If enabled, we'll evaluate risk signals before auto-approving
-  const program = await prisma.program.findUniqueOrThrow({
-    where: {
-      id: programId,
-    },
-    include: {
-      workspace: {
-        include: {
-          users: {
-            where: {
-              role: "owner",
-            },
-            take: 1,
-          },
-        },
-      },
-    },
-  });
-
-  const { canManageFraudEvents } = getPlanCapabilities(program.workspace.plan);
-
-  if (canManageFraudEvents) {
-    const { riskSeverity } = await getPartnerApplicationRisks({
-      program,
-      partner: programEnrollment.partner,
-    });
-
-    if (riskSeverity === "high") {
-      return logAndRespond(
-        `Partner ${partnerId} has high risk. Skipping auto-approval.`,
-      );
-    }
-  }
-
-  const result = evaluateApplicationRequirements({
-    applicationRequirements: program.applicationRequirements,
-    context: {
-      country: programEnrollment.partner.country,
-      email: programEnrollment.partner.email,
-    },
-  });
-
-  if (!result.valid) {
-    switch (result.reason) {
-      case "invalidRequirements":
-        return logAndRespond(
-          `Invalid applicationRequirements for program ${programId}. Skipping auto-approval.`,
-        );
-
-      case "requirementsNotMet":
-        return logAndRespond(
-          `Partner ${partnerId} does not meet eligibility requirements. Skipping auto-approval.`,
-        );
-    }
-  }
-
-  await approvePartner({
-    programId,
-    partnerId,
-    userId: program.workspace.users[0].userId,
-    groupId: programEnrollment.groupId,
-  });
-
-  return logAndRespond(
-    `Successfully auto-approved partner ${partnerId} in program ${programId}.`,
-  );
+  await autoApprovePartnerJob.execute(JSON.parse(rawBody));
+  return logAndRespond("Successfully auto-approved partner.");
 });
diff --git a/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts b/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts
index 8dda919d85e..44878feb62f 100644
--- a/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/auto-reject/route.ts
@@ -1,169 +1,11 @@
-import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
-import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
 import { withCron } from "@/lib/cron/with-cron";
-import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
-import { prisma } from "@/lib/prisma";
-import { sendEmail } from "@dub/email";
-import PartnerApplicationRejected from "@dub/email/templates/partner-application-rejected";
-import {
-  ProgramApplicationRejectionReason,
-  ProgramEnrollmentStatus,
-} from "@prisma/client";
-import * as z from "zod/v4";
+import { autoRejectPartnerJob } from "@/lib/jobs/handlers/auto-reject-partner-job";
 import { logAndRespond } from "../../utils";
 
 export const dynamic = "force-dynamic";
 
-const inputSchema = z.object({
-  programId: z.string(),
-  partnerId: z.string(),
-});
-
 // POST /api/cron/partners/auto-reject
-// This route is used to auto-reject a partner enrollment (e.g. when eligibility requirements are not met)
 export const POST = withCron(async ({ rawBody }) => {
-  const { programId, partnerId } = inputSchema.parse(JSON.parse(rawBody));
-
-  const programEnrollment = await prisma.programEnrollment.findUnique({
-    where: {
-      partnerId_programId: {
-        partnerId,
-        programId,
-      },
-    },
-    include: {
-      partner: {
-        select: {
-          id: true,
-          name: true,
-          email: true,
-          country: true,
-        },
-      },
-      program: {
-        select: {
-          id: true,
-          name: true,
-          slug: true,
-          supportEmail: true,
-          applicationRequirements: true,
-        },
-      },
-    },
-  });
-
-  if (!programEnrollment) {
-    return logAndRespond(
-      `Partner ${partnerId} not found in program ${programId}. Skipping auto-reject.`,
-    );
-  }
-
-  if (programEnrollment.status !== "pending") {
-    return logAndRespond(
-      `Partner ${partnerId} is in ${programEnrollment.status} status. Skipping auto-reject.`,
-    );
-  }
-
-  const result = evaluateApplicationRequirements({
-    applicationRequirements: programEnrollment.program.applicationRequirements,
-    context: {
-      country: programEnrollment.partner.country,
-      email: programEnrollment.partner.email,
-    },
-  });
-
-  if (result.reason !== "requirementsNotMet") {
-    return logAndRespond(
-      `Partner ${partnerId} now meets requirements for program ${programId} (reason: ${result.reason}). Skipping auto-reject.`,
-    );
-  }
-
-  const { skipped } = await prisma.$transaction(async (tx) => {
-    const { count } = await tx.programEnrollment.updateMany({
-      where: {
-        id: programEnrollment.id,
-        status: ProgramEnrollmentStatus.pending,
-      },
-      data: {
-        status: ProgramEnrollmentStatus.rejected,
-        clickRewardId: null,
-        leadRewardId: null,
-        saleRewardId: null,
-        referralRewardId: null,
-        discountId: null,
-      },
-    });
-
-    if (count === 0) {
-      return {
-        skipped: true,
-      };
-    }
-
-    if (programEnrollment.applicationId) {
-      await tx.programApplication.update({
-        where: {
-          id: programEnrollment.applicationId,
-        },
-        data: {
-          reviewedAt: new Date(),
-          rejectionReason:
-            ProgramApplicationRejectionReason.doesNotMeetRequirements,
-          rejectionNote: null,
-        },
-      });
-    }
-
-    return {
-      skipped: false,
-    };
-  });
-
-  if (skipped) {
-    return logAndRespond(
-      `Partner ${partnerId} is no longer pending in program ${programId}. Skipping auto-reject.`,
-    );
-  }
-
-  const { partner, program } = programEnrollment;
-
-  await Promise.allSettled([
-    resolveFraudGroups({
-      where: {
-        programId,
-        partnerId,
-      },
-      resolutionReason:
-        "Resolved automatically because the partner application was automatically rejected.",
-    }),
-
-    trackApplicationEvents({
-      event: "rejected",
-      programId,
-      partnerIds: [partnerId],
-    }),
-
-    partner.email &&
-      sendEmail({
-        to: partner.email,
-        subject: `Your application to ${program.name} was not approved`,
-        variant: "notifications",
-        replyTo: program.supportEmail || "noreply",
-        react: PartnerApplicationRejected({
-          partner: {
-            name: partner.name ?? "there",
-            email: partner.email,
-          },
-          program: {
-            name: program.name,
-            slug: program.slug,
-            supportEmail: program.supportEmail ?? undefined,
-          },
-        }),
-      }),
-  ]);
-
-  return logAndRespond(
-    `Successfully auto-rejected partner ${partnerId} in program ${programId}.`,
-  );
+  await autoRejectPartnerJob.execute(JSON.parse(rawBody));
+  return logAndRespond("Successfully auto-rejected partner.");
 });
diff --git a/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts b/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts
index 021051173c6..6c06f40e342 100644
--- a/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts
+++ b/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts
@@ -1,5 +1,6 @@
 import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
 
 // Mark the commissions as canceled
 export async function cancelCommissions({
@@ -84,7 +85,7 @@ export async function cancelCommissions({
       }
 
       // Wait a bit before retrying the same batch
-      await new Promise((resolve) => setTimeout(resolve, 1000));
+      await sleep(1000);
     }
   }
 
diff --git a/apps/web/app/(ee)/api/cron/partners/ban/route.ts b/apps/web/app/(ee)/api/cron/partners/ban/route.ts
index 89ac41c8851..d566eaec7b7 100644
--- a/apps/web/app/(ee)/api/cron/partners/ban/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/ban/route.ts
@@ -40,11 +40,7 @@ export const POST = withCron(async ({ rawBody }) => {
         },
         discountCodes: {
           include: {
-            discount: {
-              select: {
-                provider: true,
-              },
-            },
+            discount: true,
           },
         },
       },
diff --git a/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts b/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts
index 2658f91a608..be34948bac2 100644
--- a/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/deactivate/route.ts
@@ -39,11 +39,7 @@ export const POST = withCron(async ({ rawBody }) => {
       links: true,
       discountCodes: {
         include: {
-          discount: {
-            select: {
-              provider: true,
-            },
-          },
+          discount: true,
         },
       },
     },
diff --git a/apps/web/app/(ee)/api/cron/partners/delete/route.ts b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
index 32155f84c8a..744ebddc58a 100644
--- a/apps/web/app/(ee)/api/cron/partners/delete/route.ts
+++ b/apps/web/app/(ee)/api/cron/partners/delete/route.ts
@@ -1,6 +1,7 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
 import { includeTags } from "@/lib/api/links/include-tags";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { withCron } from "@/lib/cron/with-cron";
 import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
 import { canDeletePartner } from "@/lib/partners/utils";
@@ -157,6 +158,9 @@ export const POST = withCron(async ({ rawBody }) => {
     }),
   ]);
 
+  // Queue an index update because the enrollment was deleted.
+  await queuePartnerSearchSync({ enrollmentIds: [enrollment.id] });
+
   await recordAuditLog({
     workspaceId,
     programId,
diff --git a/apps/web/app/(ee)/api/cron/partners/merge-accounts/route.ts b/apps/web/app/(ee)/api/cron/partners/merge-accounts/route.ts
deleted file mode 100644
index f0d85d09160..00000000000
--- a/apps/web/app/(ee)/api/cron/partners/merge-accounts/route.ts
+++ /dev/null
@@ -1,488 +0,0 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
-import { linkCache } from "@/lib/api/links/cache";
-import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
-import { includeTags } from "@/lib/api/links/include-tags";
-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
-import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { conn } from "@/lib/planetscale";
-import { prisma } from "@/lib/prisma";
-import { storage } from "@/lib/storage";
-import { recordLink } from "@/lib/tinybird";
-import { redis } from "@/lib/upstash";
-import { sendBatchEmail } from "@dub/email";
-import PartnerAccountMerged from "@dub/email/templates/partner-account-merged";
-import { log, prettyPrint, R2_URL } from "@dub/utils";
-import { FraudRuleType } from "@prisma/client";
-import * as z from "zod/v4";
-
-export const dynamic = "force-dynamic";
-
-const schema = z.object({
-  userId: z.string(),
-  sourceEmail: z.string(),
-  targetEmail: z.string(),
-});
-
-const CACHE_KEY_PREFIX = "merge-partner-accounts";
-
-// POST /api/cron/partners/merge-accounts
-// This route is used to merge a partner account into another account
-export async function POST(req: Request) {
-  let userId: string | null = null;
-
-  try {
-    const rawBody = await req.text();
-
-    await verifyQstashSignature({
-      req,
-      rawBody,
-    });
-
-    const {
-      userId: parsedUserId,
-      sourceEmail,
-      targetEmail,
-    } = schema.parse(JSON.parse(rawBody));
-
-    userId = parsedUserId;
-
-    console.log({
-      userId,
-      sourceEmail,
-      targetEmail,
-    });
-
-    const partnerAccounts = await prisma.partner.findMany({
-      where: {
-        email: {
-          in: [sourceEmail, targetEmail],
-        },
-      },
-      select: {
-        id: true,
-        email: true,
-        image: true,
-        programs: {
-          select: {
-            programId: true,
-            tenantId: true,
-            status: true,
-          },
-        },
-        users: {
-          select: {
-            userId: true,
-          },
-        },
-      },
-    });
-
-    if (partnerAccounts.length === 0) {
-      return new Response("Partner accounts not found.");
-    }
-
-    const sourceAccount = partnerAccounts.find(
-      ({ email }) => email?.toLowerCase() === sourceEmail.toLowerCase(),
-    );
-
-    const targetAccount = partnerAccounts.find(
-      ({ email }) => email?.toLowerCase() === targetEmail.toLowerCase(),
-    );
-
-    if (!sourceAccount) {
-      return new Response(
-        `Partner account with email ${sourceEmail} not found.`,
-      );
-    }
-
-    if (!targetAccount) {
-      return new Response(
-        `Partner account with email ${targetEmail} not found.`,
-      );
-    }
-
-    if (sourceAccount.id === targetAccount.id) {
-      return new Response(
-        `Source and target partner accounts must be different. Source account: ${sourceAccount.email} (${sourceAccount.id}), Target account: ${targetAccount.email} (${targetAccount.id})`,
-      );
-    }
-
-    const {
-      id: sourcePartnerId,
-      users: sourcePartnerUsers,
-      programs: sourcePartnerEnrollments,
-    } = sourceAccount;
-
-    const { id: targetPartnerId, programs: targetPartnerEnrollments } =
-      targetAccount;
-
-    const programIdsToTransfer = sourcePartnerEnrollments.map(
-      ({ programId }) => programId,
-    );
-
-    const updateManyPayload = {
-      where: {
-        programId: {
-          in: programIdsToTransfer,
-        },
-        partnerId: sourcePartnerId,
-      },
-      data: {
-        partnerId: targetPartnerId,
-      },
-    };
-
-    if (programIdsToTransfer.length > 0) {
-      // update links and payouts
-      const [updatedLinksRes, updatedPayoutsRes] = await Promise.all([
-        prisma.link.updateMany(updateManyPayload),
-        prisma.payout.updateMany(updateManyPayload),
-      ]);
-      console.log(
-        `Updated ${updatedLinksRes.count} links, and ${updatedPayoutsRes.count} payouts`,
-      );
-
-      // for commissions / customers, we need to update them in batches of PRISMA_UPDATEMANY_LIMIT cause there can be a lot of them
-      while (true) {
-        const { count } = await prisma.commission.updateMany({
-          ...updateManyPayload,
-          limit: PRISMA_UPDATEMANY_LIMIT,
-        });
-        console.log(`Updated ${count} commissions`);
-        if (count < PRISMA_UPDATEMANY_LIMIT) break;
-      }
-
-      while (true) {
-        const { count } = await prisma.customer.updateMany({
-          ...updateManyPayload,
-          limit: PRISMA_UPDATEMANY_LIMIT,
-        });
-        console.log(`Updated ${count} customers`);
-        if (count < PRISMA_UPDATEMANY_LIMIT) break;
-      }
-
-      // update discount codes, notification emails, messages, and partner comments
-      const [
-        updatedDiscountCodesRes,
-        updatedNotificationEmailsRes,
-        updatedMessagesRes,
-        updatedPartnerCommentsRes,
-      ] = await Promise.all([
-        prisma.discountCode.updateMany(updateManyPayload),
-        prisma.notificationEmail.updateMany(updateManyPayload),
-        prisma.message.updateMany(updateManyPayload),
-        prisma.partnerComment.updateMany(updateManyPayload),
-      ]);
-      console.log(
-        `Updated ${updatedDiscountCodesRes.count} discount codes, ${updatedNotificationEmailsRes.count} notification emails, ${updatedMessagesRes.count} messages, and ${updatedPartnerCommentsRes.count} partner comments`,
-      );
-
-      const updatedLinks = await prisma.link.findMany({
-        where: {
-          programId: {
-            in: programIdsToTransfer,
-          },
-          partnerId: targetPartnerId,
-        },
-        include: {
-          ...includeTags,
-          ...includeProgramEnrollment,
-        },
-      });
-
-      // only transfer bounty submissions if the target partner has no submissions for the same bounty
-      const bountySubmissionStats = await prisma.bountySubmission.groupBy({
-        by: ["bountyId"],
-        where: {
-          partnerId: {
-            in: [sourcePartnerId, targetPartnerId],
-          },
-        },
-        _count: {
-          partnerId: true,
-        },
-      });
-      const bountiesToTransfer = bountySubmissionStats
-        .filter(({ _count }) => _count.partnerId === 1)
-        .map(({ bountyId }) => bountyId);
-
-      if (bountiesToTransfer.length > 0) {
-        const updatedBountySubmissions =
-          await prisma.bountySubmission.updateMany({
-            where: {
-              bountyId: { in: bountiesToTransfer },
-              partnerId: sourcePartnerId,
-            },
-            data: {
-              partnerId: targetPartnerId,
-            },
-          });
-        console.log(
-          `Transferred ${updatedBountySubmissions.count} bounty submissions`,
-        );
-      }
-
-      const res = await Promise.allSettled([
-        // update link metadata in Tinybird
-        recordLink(updatedLinks),
-        // expire link cache in Redis
-        linkCache.expireMany(updatedLinks),
-        // Sync total commissions for the target partner in each program
-        ...programIdsToTransfer.map((programId) =>
-          syncTotalCommissions({
-            partnerId: targetPartnerId,
-            programId,
-          }),
-        ),
-      ]);
-      console.log(prettyPrint(res));
-    }
-
-    // Update program enrollments – we do this last to avoid relational updates on Commission, Customer, etc. from running into transaction limits
-    // First, we start with new enrollments (enrollments that are not duplicate in both source and target)
-    const newEnrollments = sourcePartnerEnrollments.filter(
-      ({ programId }) =>
-        !targetPartnerEnrollments.some(
-          ({ programId: targetProgramId }) => programId === targetProgramId,
-        ),
-    );
-    if (newEnrollments.length > 0) {
-      await prisma.programEnrollment.updateMany({
-        where: {
-          programId: {
-            in: newEnrollments.map(({ programId }) => programId),
-          },
-          partnerId: sourcePartnerId,
-        },
-        data: {
-          partnerId: targetPartnerId,
-        },
-      });
-    }
-
-    // Then, we transfer existing enrollments (enrollments that are duplicate in both source and target) – needs to be handled delicately via a for loop
-    const existingEnrollments = sourcePartnerEnrollments.filter(
-      ({ programId }) =>
-        targetPartnerEnrollments.some(
-          ({ programId: targetProgramId }) => programId === targetProgramId,
-        ),
-    );
-
-    if (existingEnrollments.length > 0) {
-      for (const sourceEnrollment of existingEnrollments) {
-        const targetEnrollment = targetPartnerEnrollments.find(
-          ({ programId }) => programId === sourceEnrollment.programId,
-        );
-
-        await prisma.$transaction(async (tx) => {
-          if (
-            targetEnrollment &&
-            sourceEnrollment.status === "approved" &&
-            ["pending", "invited"].includes(targetEnrollment.status)
-          ) {
-            await tx.programEnrollment.update({
-              where: {
-                partnerId_programId: {
-                  partnerId: targetPartnerId,
-                  programId: sourceEnrollment.programId,
-                },
-              },
-              data: { status: "approved" },
-            });
-          }
-
-          await tx.programEnrollment.delete({
-            where: {
-              partnerId_programId: {
-                partnerId: sourcePartnerId,
-                programId: sourceEnrollment.programId,
-              },
-            },
-          });
-
-          // update target enrollment with source enrollment's tenantId if target enrollment does not have a tenantId
-          if (sourceEnrollment.tenantId && !targetEnrollment?.tenantId) {
-            await tx.programEnrollment.update({
-              where: {
-                partnerId_programId: {
-                  partnerId: targetPartnerId,
-                  programId: sourceEnrollment.programId,
-                },
-              },
-              data: {
-                tenantId: sourceEnrollment.tenantId,
-              },
-            });
-          }
-        });
-        console.log(
-          `Deleted old source enrollment for program ${sourceEnrollment.programId}.${sourceEnrollment.tenantId ? ` Since there was a tenantId, we updated the target enrollment with the same tenantId: ${sourceEnrollment.tenantId}` : ""}`,
-        );
-      }
-    }
-
-    // Remove the user if there are no workspaces left
-    // TODO: we need to handle deleting multiple users when we allow partners to invite their team members in the future
-    const sourcePartnerUser = sourcePartnerUsers[0];
-
-    if (sourcePartnerUser) {
-      const workspaceCount = await prisma.projectUsers.count({
-        where: {
-          userId: sourcePartnerUser.userId,
-        },
-      });
-
-      if (workspaceCount === 0) {
-        try {
-          const deletedUser = await prisma.user.delete({
-            where: {
-              id: sourcePartnerUser.userId,
-            },
-            select: {
-              id: true,
-              email: true,
-              image: true,
-            },
-          });
-          console.log(`Deleted user ${deletedUser.email} (${deletedUser.id})`);
-
-          if (deletedUser.image) {
-            await storage.delete({
-              key: deletedUser.image.replace(`${R2_URL}/`, ""),
-            });
-          }
-        } catch (error) {
-          console.error(
-            `Error deleting user ${sourcePartnerUser.userId}: ${error.message}`,
-          );
-        }
-      }
-    }
-
-    const fraudEventsToDelete = await prisma.fraudEvent.findMany({
-      where: {
-        partnerId: sourcePartnerId,
-        fraudEventGroup: {
-          type: FraudRuleType.partnerDuplicateAccount,
-        },
-      },
-      include: {
-        fraudEventGroup: {
-          select: {
-            id: true,
-            _count: {
-              select: {
-                fraudEvents: true,
-              },
-            },
-          },
-        },
-      },
-    });
-
-    if (fraudEventsToDelete.length > 0) {
-      await prisma.fraudEvent.deleteMany({
-        where: {
-          id: { in: fraudEventsToDelete.map((e) => e.id) },
-        },
-      });
-    }
-
-    const fraudEventGroupsToResolve = fraudEventsToDelete.filter(
-      // this is the count pre-deletion the fraud event, so if there are 2 fraud events
-      // that means post-deletion will leave 1 fraud event in the group (no additional duplicates), hence can be resolved
-      (e) => e.fraudEventGroup._count.fraudEvents === 2,
-    );
-
-    await resolveFraudGroups({
-      where: {
-        OR: [
-          {
-            partnerId: sourcePartnerId,
-          },
-          ...(fraudEventGroupsToResolve.length > 0
-            ? [
-                {
-                  id: {
-                    in: fraudEventGroupsToResolve.map(
-                      (e) => e.fraudEventGroup.id,
-                    ),
-                  },
-                },
-              ]
-            : []),
-        ],
-        type: FraudRuleType.partnerDuplicateAccount,
-      },
-      resolutionReason:
-        "Automatically resolved because partners with duplicate payout methods were merged. No other partners share this payout method.",
-    });
-
-    try {
-      // Finally, delete the partner account
-      await conn.execute(`DELETE FROM Partner WHERE id = ?`, [sourcePartnerId]);
-      console.log(
-        `Deleted partner ${sourceAccount.email} (${sourceAccount.id})`,
-      );
-
-      if (sourceAccount.image) {
-        await storage.delete({
-          key: sourceAccount.image.replace(`${R2_URL}/`, ""),
-        });
-      }
-    } catch (error) {
-      console.error(
-        `Error deleting partner ${sourcePartnerId}: ${error.message}`,
-      );
-    }
-
-    // Make sure the cache is cleared
-    await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
-
-    const resendBatchEmailRes = await sendBatchEmail(
-      [
-        {
-          variant: "notifications",
-          to: sourceEmail,
-          subject: "Your Dub partner accounts are now merged",
-          react: PartnerAccountMerged({
-            email: sourceEmail,
-            sourceEmail,
-            targetEmail,
-          }),
-        },
-        {
-          variant: "notifications",
-          to: targetEmail,
-          subject: "Your Dub partner accounts are now merged",
-          react: PartnerAccountMerged({
-            email: targetEmail,
-            sourceEmail,
-            targetEmail,
-          }),
-        },
-      ],
-      {
-        idempotencyKey: `${CACHE_KEY_PREFIX}/${userId}`,
-      },
-    );
-    console.log(prettyPrint(resendBatchEmailRes));
-
-    return new Response(
-      `Partner account ${sourceEmail} merged into ${targetEmail}.`,
-    );
-  } catch (error) {
-    if (userId) {
-      await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
-    }
-
-    await log({
-      message: `Error merging partner accounts: ${error.message}`,
-      type: "alerts",
-    });
-
-    return handleAndReturnErrorResponse(error);
-  }
-}
diff --git a/apps/web/app/(ee)/api/cron/payouts/balance-available/route.ts b/apps/web/app/(ee)/api/cron/payouts/balance-available/route.ts
index 4b5cff4bdeb..11bd0c59a87 100644
--- a/apps/web/app/(ee)/api/cron/payouts/balance-available/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/balance-available/route.ts
@@ -1,7 +1,6 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { BANK_ACCOUNT_STATUS_DESCRIPTIONS } from "@/lib/constants/payouts";
 import { qstash } from "@/lib/cron";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { getPartnerBankAccount } from "@/lib/partners/get-partner-bank-account";
 import { prisma } from "@/lib/prisma";
 import { stripe } from "@/lib/stripe";
@@ -24,11 +23,8 @@ const payloadSchema = z.object({
 });
 
 // POST /api/cron/payouts/balance-available
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
     const { stripeAccount } = payloadSchema.parse(JSON.parse(rawBody));
 
     const partner = await prisma.partner.findUnique({
@@ -64,8 +60,14 @@ export async function POST(req: Request) {
 
     let { amount: availableBalance, currency } = balance.available[0];
 
-    // if available balance is 0, check if there's any pending balance
-    if (availableBalance === 0) {
+    if (["huf", "twd"].includes(currency)) {
+      // Stripe requires HUF/TWD payouts to be evenly divisible by 100
+      availableBalance = Math.floor(availableBalance / 100) * 100;
+    }
+
+    // Stripe requires payout amount >= 1; skip dust (e.g. HUF/TWD rounded down)
+    // and negatives (refunds/reversals). Requeue if funds are still pending.
+    if (availableBalance < 1) {
       const pendingBalance = balance.pending?.[0]?.amount ?? 0;
 
       // if there's a pending balance, schedule another check in 1 hour
@@ -87,7 +89,7 @@ export async function POST(req: Request) {
       }
 
       return logAndRespond(
-        `Partner ${partner.email} (${stripeAccount})'s available balance is 0. Skipping...`,
+        `Partner ${partner.email} (${stripeAccount}) has no payable available balance (${currencyFormatter(availableBalance, { currency })}). Skipping...`,
       );
     }
 
@@ -129,12 +131,6 @@ export async function POST(req: Request) {
       );
     }
 
-    if (["huf", "twd"].includes(currency)) {
-      // For HUF and TWD, Stripe requires payout amounts to be evenly divisible by 100
-      // We need to round down to the nearest 100 units
-      availableBalance = Math.floor(availableBalance / 100) * 100;
-    }
-
     const stripePayout = await stripe.payouts.create(
       {
         amount: availableBalance,
@@ -222,6 +218,6 @@ export async function POST(req: Request) {
       type: "errors",
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
index 965173ada8a..0d939de3518 100644
--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/queue-external-payouts.ts
@@ -14,13 +14,17 @@ export async function queueExternalPayouts(
 ) {
   // All payouts are processed internally, hence no need to queue external payouts
   if (invoice.payoutMode === "internal") {
-    console.log(`Invoice ${invoice.id} is paid internally. Skipping...`);
+    console.log(
+      `Invoice ${invoice.id} is paid internally. Skipping external payouts...`,
+    );
     return;
   }
 
   // should never happen, but just in case
   if (!invoice.programId) {
-    console.log(`Invoice ${invoice.id} has no program ID. Skipping...`);
+    console.log(
+      `Invoice ${invoice.id} has no program ID. Skipping external payouts...`,
+    );
     return;
   }
 
diff --git a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts
index 3498b1b2538..37b5e0af77b 100644
--- a/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/charge-succeeded/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { prisma } from "@/lib/prisma";
 import { log } from "@dub/utils";
 import { PartnerPayoutMethod } from "@prisma/client";
@@ -21,11 +20,8 @@ const payloadSchema = z.object({
 // POST /api/cron/payouts/charge-succeeded
 // This route is used to process the charge-succeeded event from Stripe.
 // We're intentionally offloading this to a cron job so we can return a 200 to Stripe immediately.
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
     const { invoiceId } = payloadSchema.parse(JSON.parse(rawBody));
 
     const invoice = await prisma.invoice.findUnique({
@@ -131,6 +127,6 @@ export async function POST(req: Request) {
       type: "cron",
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/payout-failed/route.ts b/apps/web/app/(ee)/api/cron/payouts/payout-failed/route.ts
index f7a0a144f51..5c2c2957c89 100644
--- a/apps/web/app/(ee)/api/cron/payouts/payout-failed/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/payout-failed/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { getPartnerBankAccount } from "@/lib/partners/get-partner-bank-account";
 import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
@@ -19,11 +18,8 @@ const payloadSchema = z.object({
 });
 
 // POST /api/cron/payouts/payout-failed
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
     const { stripeAccount, stripePayout } = payloadSchema.parse(
       JSON.parse(rawBody),
     );
@@ -86,6 +82,6 @@ export async function POST(req: Request) {
       type: "errors",
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/payout-paid/route.ts b/apps/web/app/(ee)/api/cron/payouts/payout-paid/route.ts
index e9ed1d10a48..9c97d263eed 100644
--- a/apps/web/app/(ee)/api/cron/payouts/payout-paid/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/payout-paid/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import PartnerPayoutWithdrawalCompleted from "@dub/email/templates/partner-payout-withdrawal-completed";
@@ -19,11 +18,8 @@ const payloadSchema = z.object({
 });
 
 // POST /api/cron/payouts/payout-paid
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
     const { stripeAccount, stripePayout } = payloadSchema.parse(
       JSON.parse(rawBody),
     );
@@ -83,6 +79,6 @@ export async function POST(req: Request) {
       type: "errors",
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
index ba3385a3119..f056f55494f 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { CUTOFF_PERIOD_ENUM } from "@/lib/partners/cutoff-period";
 import { prisma } from "@/lib/prisma";
 import { log } from "@dub/utils";
@@ -24,12 +23,8 @@ const processPayoutsCronSchema = z.object({
 // POST /api/cron/payouts/process
 // This route is used to process payouts for a given invoice
 // we're intentionally offloading this to a cron job to avoid blocking the main thread
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-
-    await verifyQstashSignature({ req, rawBody });
-
     const {
       workspaceId,
       userId,
@@ -101,12 +96,17 @@ export async function POST(req: Request) {
 
     return logAndRespond(`Processed payouts for program ${program.name}.`);
   } catch (error) {
+    const errorMessage =
+      error instanceof Error ? error.message : "Unknown error";
+
     await log({
-      message: `Error confirming payouts for program: ${error.message}`,
+      message: `Error confirming payouts for program: ${errorMessage}`,
       type: "errors",
       mention: true,
     });
 
-    return handleAndReturnErrorResponse(error);
+    return logAndRespond(
+      `Error processing payouts for program: ${errorMessage}`,
+    );
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts b/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
index 443c83aed8f..493ee08354e 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/updates/route.ts
@@ -1,7 +1,6 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { qstash } from "@/lib/cron";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { prisma } from "@/lib/prisma";
 import { sendBatchEmail } from "@dub/email";
 import PartnerPayoutConfirmed from "@dub/email/templates/partner-payout-confirmed";
@@ -20,15 +19,8 @@ const BATCH_SIZE = 100;
 
 // POST /api/cron/payouts/process/updates
 // Recursive cron job to handle side effects of the `cron/payouts/process` job (recordAuditLog, sendBatchEmails)
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-
-    await verifyQstashSignature({
-      req,
-      rawBody,
-    });
-
     const { invoiceId, startingAfter } = payloadSchema.parse(
       JSON.parse(rawBody),
     );
@@ -144,11 +136,11 @@ export async function POST(req: Request) {
     const errorMessage = error instanceof Error ? error.message : String(error);
 
     await log({
-      message: `Error sending Stripe payout: ${errorMessage}`,
+      message: `Error running payouts/process/updates cron job: ${errorMessage}`,
       type: "errors",
       mention: true,
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/payouts/reminders/partners/route.ts b/apps/web/app/(ee)/api/cron/payouts/reminders/partners/route.ts
index 419dade28f5..e977318d9ce 100644
--- a/apps/web/app/(ee)/api/cron/payouts/reminders/partners/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/reminders/partners/route.ts
@@ -1,213 +1,18 @@
-import { MIN_PAYOUT_AMOUNT_FOR_REMINDERS } from "@/lib/constants/misc";
-import { PAYOUT_SUPPORTED_COUNTRIES } from "@/lib/constants/payouts-supported-countries";
-import { qstash } from "@/lib/cron";
 import { withCron } from "@/lib/cron/with-cron";
-import { queueBatchEmail } from "@/lib/email/queue-batch-email";
-import { prisma } from "@/lib/prisma";
-import ConnectPayoutReminder from "@dub/email/templates/connect-payout-reminder";
-import { ACME_PROGRAM_ID, APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { sendConnectPayoutRemindersJob } from "@/lib/jobs/handlers/send-connect-payout-reminders-job";
 import { logAndRespond } from "../../../utils";
 
 export const dynamic = "force-dynamic";
 
-const BATCH_SIZE = 1000;
-
 // This route is used to send reminders to partners who have pending payouts
 // but haven't configured payouts yet.
-// Runs once a day at 7AM PST but only notifies partners every 3 days
-// + calls itself recursively to process all partners in batches
-// GET/POST /api/cron/payouts/reminders/partners
-
+// Runs once a day at 7AM PST but only notifies partners every 3 days.
+// Further batches are dispatched by sendConnectPayoutRemindersJob.
+// GET /api/cron/payouts/reminders/partners
 export const GET = withCron(async () => {
-  // Get unsent payouts grouped by partner and program, ordered by amount desc
-  const unsentPayouts = await prisma.payout.groupBy({
-    by: ["partnerId", "programId"],
-    where: {
-      status: {
-        in: ["pending", "processing", "processed", "failed"],
-      },
-      programId: {
-        notIn: [
-          ACME_PROGRAM_ID,
-          // programs that are in the migration process
-          "prog_1KPAZMF49X9A1WEWRBM55KZY7",
-        ],
-      },
-      partner: {
-        payoutsEnabledAt: null,
-        country: {
-          in: PAYOUT_SUPPORTED_COUNTRIES.map((c) => c.code),
-        },
-        OR: [
-          { connectPayoutsLastRemindedAt: null },
-          {
-            connectPayoutsLastRemindedAt: {
-              lte: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000), // Last notified was at least 3 days ago
-            },
-          },
-        ],
-      },
-      amount: {
-        gte: MIN_PAYOUT_AMOUNT_FOR_REMINDERS,
-      },
-    },
-    _sum: {
-      amount: true,
-    },
-    orderBy: {
-      _sum: {
-        amount: "desc",
-      },
-    },
-    take: BATCH_SIZE,
-  });
-
-  if (!unsentPayouts.length) {
-    return logAndRespond("No action needed.");
-  }
-
-  const hasMoreToProcess = unsentPayouts.length === BATCH_SIZE;
-
-  console.log(
-    `Found ${unsentPayouts.length} partner-program combinations needing reminders${hasMoreToProcess ? " (more to process)" : ""}`,
-  );
-
-  const [partnerData, programData] = await Promise.all([
-    prisma.partner.findMany({
-      where: {
-        id: {
-          in: unsentPayouts.map((payout) => payout.partnerId),
-        },
-        OR: [
-          {
-            users: {
-              none: {},
-            },
-          },
-          {
-            users: {
-              some: {
-                notificationPreferences: {
-                  connectPayoutReminder: true,
-                },
-              },
-            },
-          },
-        ],
-      },
-    }),
-
-    prisma.program.findMany({
-      where: {
-        id: {
-          in: unsentPayouts.map((payout) => payout.programId),
-        },
-      },
-    }),
-  ]);
-
-  const partnerProgramMap = new Map<
-    string,
-    {
-      partner: {
-        id: string;
-        name: string;
-        email: string;
-      };
-      programs: {
-        id: string;
-        name: string;
-        logo: string;
-        amount: number;
-      }[];
-    }
-  >();
-
-  for (const payout of unsentPayouts) {
-    const { partnerId, programId } = payout;
-    const { amount } = payout._sum;
-
-    const partner = partnerData.find((p) => p.id === partnerId);
-    const program = programData.find((p) => p.id === programId);
-
-    if (!partner?.email || !program) {
-      continue;
-    }
-
-    if (!partnerProgramMap.has(partnerId)) {
-      partnerProgramMap.set(partnerId, {
-        partner: {
-          id: partner.id,
-          name: partner.name,
-          email: partner.email,
-        },
-        programs: [],
-      });
-    }
-
-    partnerProgramMap.get(partnerId)!.programs.push({
-      id: program.id,
-      name: program.name,
-      logo: program.logo!,
-      amount: amount ?? 0,
-    });
-  }
-
-  const partnerPrograms = Array.from(partnerProgramMap.values());
-  const connectPayoutsLastRemindedAt = new Date();
-
-  console.log(
-    `Processing ConnectPayoutReminder for ${partnerPrograms.length} partners`,
-  );
-
-  await queueBatchEmail<typeof ConnectPayoutReminder>(
-    partnerPrograms.map(({ partner, programs }) => ({
-      variant: "notifications",
-      to: partner.email,
-      subject: "Connect your payout details on Dub Partners",
-      templateName: "ConnectPayoutReminder",
-      templateProps: {
-        email: partner.email,
-        programs,
-      },
-    })),
-  );
-
-  console.log(
-    `Queued ConnectPayoutReminder emails for ${partnerPrograms.length} partners`,
-  );
-
-  await prisma.partner.updateMany({
-    where: {
-      id: {
-        in: partnerPrograms.map(({ partner }) => partner.id),
-      },
-    },
-    data: {
-      connectPayoutsLastRemindedAt,
-    },
+  await sendConnectPayoutRemindersJob.dispatch({
+    batchNumber: 1,
   });
 
-  if (hasMoreToProcess) {
-    console.log("More partners need reminders, scheduling next batch...");
-
-    const qstashResponse = await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/payouts/reminders/partners`,
-      body: {},
-    });
-
-    if (!qstashResponse.messageId) {
-      throw new Error(
-        `Error sending message to Qstash to schedule next batch of payout reminders: ${JSON.stringify(qstashResponse)}`,
-      );
-    }
-
-    return logAndRespond(
-      "Finished sending payout reminders for current batch. Scheduling next batch...",
-    );
-  }
-
-  return logAndRespond("Finished sending payout reminders for all batches.");
+  return logAndRespond("Enqueued connect payout reminders job.");
 });
-
-export const POST = GET;
diff --git a/apps/web/app/(ee)/api/cron/payouts/reminders/program-owners/route.ts b/apps/web/app/(ee)/api/cron/payouts/reminders/program-owners/route.ts
index fad0e2537bd..f9705603c40 100644
--- a/apps/web/app/(ee)/api/cron/payouts/reminders/program-owners/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/reminders/program-owners/route.ts
@@ -115,14 +115,14 @@ export const GET = withCron(async () => {
 
   // only send notifications for programs that:
   // - have a total payout amount greater than or equal to $10 (INVOICE_MIN_PAYOUT_AMOUNT_CENTS)
-  // - have not paid out any invoices in the last 2 weeks
+  // -  AND have not paid out any invoices in the last 2 weeks
   const payoutsToNotify = pendingPayouts.filter((p) => {
     const invoiceTotal = p._sum?.amount ?? 0;
     const recentPaidInvoicesForProgram = recentPaidInvoices.filter(
       (i) => i.programId === p.programId,
     );
     return (
-      invoiceTotal >= INVOICE_MIN_PAYOUT_AMOUNT_CENTS ||
+      invoiceTotal >= INVOICE_MIN_PAYOUT_AMOUNT_CENTS &&
       recentPaidInvoicesForProgram.length === 0
     );
   });
diff --git a/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts b/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts
index d84321d36fd..5520cab723c 100644
--- a/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/send-stripe-payout/route.ts
@@ -1,5 +1,4 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
+import { withCron } from "@/lib/cron/with-cron";
 import { createStablecoinPayout } from "@/lib/partners/create-stablecoin-payout";
 import { createStripeTransfer } from "@/lib/partners/create-stripe-transfer";
 import { prisma } from "@/lib/prisma";
@@ -16,15 +15,8 @@ const payloadSchema = z.object({
 });
 
 // POST /api/cron/payouts/send-stripe-payout
-export async function POST(req: Request) {
+export const POST = withCron(async ({ rawBody }) => {
   try {
-    const rawBody = await req.text();
-
-    await verifyQstashSignature({
-      req,
-      rawBody,
-    });
-
     const { partnerId, invoiceId, chargeId } = payloadSchema.parse(
       JSON.parse(rawBody),
     );
@@ -76,6 +68,6 @@ export async function POST(req: Request) {
       mention: true,
     });
 
-    return handleAndReturnErrorResponse(error);
+    throw error;
   }
-}
+});
diff --git a/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts b/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts
index 4d3ec48888f..8a028d9eee4 100644
--- a/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts
+++ b/apps/web/app/(ee)/api/cron/programs/reactivate/route.ts
@@ -1,7 +1,7 @@
 import { bulkReactivatePartners } from "@/lib/api/partners/bulk-reactivate-partners";
 import { CRON_BATCH_SIZE, qstash } from "@/lib/cron";
-import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
 import { withCron } from "@/lib/cron/with-cron";
+import { publishDiscountCodesCreationJob } from "@/lib/jobs/handlers/publish-discount-codes-creation-job";
 import { prisma } from "@/lib/prisma";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import * as z from "zod/v4";
@@ -95,15 +95,13 @@ export const POST = withCron(async ({ rawBody }) => {
   });
 
   if (discounts.length > 0) {
-    await enqueueBatchJobs(
+    await publishDiscountCodesCreationJob.dispatchBatch(
       discounts.map((discount) => ({
-        queueName: "create-discount-code",
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,
-        deduplicationId: `reactivate-discount-${discount.id}`,
-        body: {
-          discountId: discount.id,
-        },
+        discountId: discount.id,
       })),
+      ({ discountId }) => ({
+        label: discountId,
+      }),
     );
 
     console.log(
diff --git a/apps/web/app/(ee)/api/cron/queue/retry/route.ts b/apps/web/app/(ee)/api/cron/queue/retry/route.ts
index 1c1af54078c..f0f09985b48 100644
--- a/apps/web/app/(ee)/api/cron/queue/retry/route.ts
+++ b/apps/web/app/(ee)/api/cron/queue/retry/route.ts
@@ -1,24 +1,18 @@
-import { logger } from "@/lib/axiom/server";
-import { qstash } from "@/lib/cron";
 import { withCron } from "@/lib/cron/with-cron";
-import { buildReplayRequest, isPublishSuccess } from "@/lib/jobs";
-import { prisma } from "@/lib/prisma";
+import { publishPendingJobs } from "@/lib/jobs/outbox";
 import { redis } from "@/lib/upstash/redis";
 import { logAndRespond } from "../../utils";
 
 export const dynamic = "force-dynamic";
 
-const MAX_ATTEMPTS = 10;
-const BATCH_SIZE = 100;
-
 // Lock for the cron job. TTL must be ≥ cron maxDuration (600s in vercel.json)
 // so the lock cannot expire while a run is still alive and allow a concurrent
 // minute-cron invocation
 const LOCK_KEY = "lock:queue-retry";
 const LOCK_TTL_SECONDS = 600;
 
-// GET /api/cron/queue/retry – republish background jobs that failed to
-// publish to QStash at dispatch time; rows are deleted on successful publish
+// GET /api/cron/queue/retry – republish jobs that failed to publish to QStash
+// at dispatch time; rows are deleted on successful publish
 export const GET = withCron(async () => {
   const acquired = await redis.set(LOCK_KEY, "1", {
     nx: true,
@@ -32,135 +26,20 @@ export const GET = withCron(async () => {
   }
 
   try {
-    const jobs = await prisma.job.findMany({
-      where: {
-        attempts: {
-          lt: MAX_ATTEMPTS,
-        },
-      },
-      orderBy: {
-        createdAt: "asc",
-      },
-      take: BATCH_SIZE,
-    });
+    const { attempted, published, failed } = await publishPendingJobs();
 
-    if (jobs.length === 0) {
+    if (attempted === 0) {
       return logAndRespond("No background jobs to retry.");
     }
 
-    const now = new Date();
-    const entries = jobs.map((job) => buildReplayRequest(job, now));
-    const jobIds = jobs.map(({ id }) => id);
-    let responses: unknown[];
-
-    try {
-      responses = await qstash.batchJSON(entries);
-    } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-
-      await prisma.job.updateMany({
-        where: {
-          id: {
-            in: jobIds,
-          },
-        },
-        data: {
-          attempts: {
-            increment: 1,
-          },
-          lastError: errorMessage.slice(0, 1000),
-        },
-      });
-
-      logger.error("jobs.retry_failed", {
-        jobCount: jobs.length,
-        errorMessage,
-      });
-
-      // Jobs that just ran out of attempts are excluded from future runs by the
-      // MAX_ATTEMPTS filter and need manual intervention
-      const exhaustedJobs = jobs.filter(
-        (backgroundJob) => backgroundJob.attempts + 1 >= MAX_ATTEMPTS,
-      );
-
-      if (exhaustedJobs.length > 0) {
-        logger.error("jobs.retry_exhausted", {
-          jobs: exhaustedJobs.map(({ id, name }) => ({ id, name })),
-        });
-      }
-
-      await logger.flush();
-
+    if (failed === 0) {
       return logAndRespond(
-        `Failed to republish ${jobs.length} background jobs to QStash.`,
+        `Republished ${published} background jobs to QStash.`,
       );
     }
 
-    const publishedJobIds: string[] = [];
-    const failedJobs: typeof jobs = [];
-
-    jobs.forEach((job, index) => {
-      if (isPublishSuccess(responses[index])) {
-        publishedJobIds.push(job.id);
-      } else {
-        failedJobs.push(job);
-      }
-    });
-
-    if (publishedJobIds.length > 0) {
-      await prisma.job.deleteMany({
-        where: {
-          id: {
-            in: publishedJobIds,
-          },
-        },
-      });
-    }
-
-    if (failedJobs.length === 0) {
-      return logAndRespond(
-        `Republished ${jobs.length} background jobs to QStash.`,
-      );
-    }
-
-    const errorMessage = "QStash batch publish did not return a messageId";
-
-    await prisma.job.updateMany({
-      where: {
-        id: {
-          in: failedJobs.map(({ id }) => id),
-        },
-      },
-      data: {
-        attempts: {
-          increment: 1,
-        },
-        lastError: errorMessage,
-      },
-    });
-
-    logger.error("jobs.retry_failed", {
-      jobCount: failedJobs.length,
-      errorMessage,
-    });
-
-    // Jobs that just ran out of attempts are excluded from future runs by the
-    // MAX_ATTEMPTS filter and need manual intervention
-    const exhaustedJobs = failedJobs.filter(
-      (backgroundJob) => backgroundJob.attempts + 1 >= MAX_ATTEMPTS,
-    );
-
-    if (exhaustedJobs.length > 0) {
-      logger.error("jobs.retry_exhausted", {
-        jobs: exhaustedJobs.map(({ id, name }) => ({ id, name })),
-      });
-    }
-
-    await logger.flush();
-
     return logAndRespond(
-      `Republished ${publishedJobIds.length} background jobs to QStash; failed to republish ${failedJobs.length}.`,
+      `Republished ${published} background jobs to QStash; failed to republish ${failed}.`,
     );
   } finally {
     await redis.del(LOCK_KEY);
diff --git a/apps/web/app/(ee)/api/cron/rewards/process/route.ts b/apps/web/app/(ee)/api/cron/rewards/process/route.ts
index 3d45341538a..47a6b7a531f 100644
--- a/apps/web/app/(ee)/api/cron/rewards/process/route.ts
+++ b/apps/web/app/(ee)/api/cron/rewards/process/route.ts
@@ -10,7 +10,10 @@ import {
   ACTIVE_ENROLLMENT_STATUSES,
   INACTIVE_ENROLLMENT_STATUSES,
 } from "@/lib/zod/schemas/partners";
-import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";
+import {
+  REWARD_EVENT_COLUMN_MAPPING,
+  REWARD_EVENT_RELATION_MAPPING,
+} from "@/lib/zod/schemas/rewards";
 import { Prisma } from "@prisma/client";
 import { logAndRespond } from "../../utils";
 
@@ -52,6 +55,11 @@ export const POST = withCron(async ({ rawBody }) => {
     },
     select: {
       id: true,
+      clickRewardId: true,
+      leadRewardId: true,
+      saleRewardId: true,
+      referralRewardId: true,
+      customRewardId: true,
       program: {
         select: {
           id: true,
@@ -68,20 +76,34 @@ export const POST = withCron(async ({ rawBody }) => {
     return logAndRespond(`Group ${groupId} not found. Skipping...`);
   }
 
+  const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[reward.event];
+  const rewardRelation = REWARD_EVENT_RELATION_MAPPING[reward.event];
+
+  // reward-created jobs assign this reward only to enrollments that still
+  // inherit "no reward" or a soft-deleted reward (custom overrides stay).
+  // Skip if it's no longer the group's default for this event
+  if (event === "reward-created") {
+    if (rewardId !== group[rewardIdColumn]) {
+      return logAndRespond(
+        `Reward ${rewardId} is not the default reward for the group ${groupId}. Skipping...`,
+      );
+    }
+  }
+
   const isStaleVersion = await isStaleRewardVersion({
     version,
     groupId,
     event: rewardSnapshot.event,
   });
 
-  if (isStaleVersion) {
+  // Always unassign on reward-deleted even if a newer group-default create
+  // made this version stale — otherwise inheritors stay on the soft-deleted id.
+  if (event !== "reward-deleted" && isStaleVersion) {
     return logAndRespond(
       "Reward changed while processing. Skipping stale reward evaluation.",
     );
   }
 
-  const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[reward.event];
-
   let startingAfter = startAfterProgramEnrollmentId;
   let where: Prisma.ProgramEnrollmentWhereInput | undefined = undefined;
   let data: Prisma.ProgramEnrollmentUpdateManyArgs["data"] | undefined =
@@ -89,6 +111,14 @@ export const POST = withCron(async ({ rawBody }) => {
 
   switch (event) {
     case "reward-created":
+      // Assign only inheritors: no reward yet, or still pointing at a
+      // soft-deleted default (programId null).
+      where = {
+        OR: [
+          { [rewardIdColumn]: null },
+          { [rewardRelation]: { is: { programId: null } } },
+        ],
+      };
       data = { [rewardIdColumn]: reward.id };
       break;
 
@@ -97,16 +127,21 @@ export const POST = withCron(async ({ rawBody }) => {
       break;
 
     case "reward-deleted":
-      data = { [rewardIdColumn]: null };
+      where = { [rewardIdColumn]: reward.id };
+      data = { [rewardIdColumn]: group[rewardIdColumn] ?? null };
       break;
   }
 
   const programEnrollments = await prisma.programEnrollment.findMany({
     where: {
       groupId: group.id,
-      status: {
-        notIn: INACTIVE_ENROLLMENT_STATUSES,
-      },
+      // reward-deleted must also clear banned/deactivated/rejected enrollments.
+      // Those FKs block orphan hard-delete. Notifications stay active-only below.
+      ...(event !== "reward-deleted" && {
+        status: {
+          notIn: INACTIVE_ENROLLMENT_STATUSES,
+        },
+      }),
       ...(startAfterProgramEnrollmentId && {
         id: {
           gt: startAfterProgramEnrollmentId,
@@ -152,6 +187,7 @@ export const POST = withCron(async ({ rawBody }) => {
     if (data) {
       const { count } = await prisma.programEnrollment.updateMany({
         where: {
+          ...where,
           id: {
             in: programEnrollments.map(({ id }) => id),
           },
@@ -164,7 +200,7 @@ export const POST = withCron(async ({ rawBody }) => {
       shouldNotify = count > 0;
     }
 
-    if (shouldNotify) {
+    if (shouldNotify && !isStaleVersion) {
       const users = programEnrollments
         .filter(({ status }) => ACTIVE_ENROLLMENT_STATUSES.includes(status))
         .flatMap(({ partner }) => partner.users.map(({ user }) => user));
@@ -193,24 +229,6 @@ export const POST = withCron(async ({ rawBody }) => {
     );
   }
 
-  // No more program enrollments found, hard delete the reward
-  if (event === "reward-deleted") {
-    try {
-      await prisma.reward.delete({
-        where: {
-          id: reward.id,
-        },
-      });
-    } catch (error) {
-      // Treat already-deleted reward as success so retries can resend the notification
-      if (!(error.code === "P2025")) {
-        throw new Error(
-          `Failed to hard delete reward ${reward.id}: ${error instanceof Error ? error.message : String(error)}`,
-        );
-      }
-    }
-  }
-
   return logAndRespond(
     `Finished processing reward ${rewardId} for the group ${groupId}.`,
   );
diff --git a/apps/web/app/(ee)/api/cron/rewards/queue-custom-commissions/route.ts b/apps/web/app/(ee)/api/cron/rewards/queue-custom-commissions/route.ts
new file mode 100644
index 00000000000..27a69a35159
--- /dev/null
+++ b/apps/web/app/(ee)/api/cron/rewards/queue-custom-commissions/route.ts
@@ -0,0 +1,40 @@
+import { getUtcPeriodDate } from "@/lib/api/rewards/custom-reward-utils";
+import { findDueCustomRewards } from "@/lib/api/rewards/find-due-custom-rewards";
+import { withCron } from "@/lib/cron/with-cron";
+import { createCustomCommissionJob } from "@/lib/jobs/handlers/create-custom-commission-job";
+import { logAndRespond } from "../../utils";
+
+export const dynamic = "force-dynamic";
+export const maxDuration = 600;
+
+// GET /api/cron/rewards/queue-custom-commissions
+// Fans out create-custom-commission-job for each due custom reward (daily UTC).
+export const GET = withCron(async () => {
+  const periodDate = getUtcPeriodDate();
+  const dueRewards = await findDueCustomRewards({ periodDate });
+
+  if (dueRewards.length === 0) {
+    return logAndRespond(
+      `No due custom rewards for period ${periodDate}. Skipping...`,
+    );
+  }
+
+  await createCustomCommissionJob.dispatchBatch(
+    dueRewards.map((reward) => ({
+      rewardId: reward.id,
+      periodDate,
+    })),
+    ({ rewardId }) => ({
+      label: rewardId,
+      deduplicationId: `custom-commission-${rewardId}-${periodDate}`,
+      flowControl: {
+        key: "create-custom-commission",
+        parallelism: 5,
+      },
+    }),
+  );
+
+  return logAndRespond(
+    `Queued create-custom-commission-job for ${dueRewards.length} custom rewards (period ${periodDate}).`,
+  );
+});
diff --git a/apps/web/app/(ee)/api/cron/shopify/order-paid/route.ts b/apps/web/app/(ee)/api/cron/shopify/order-paid/route.ts
deleted file mode 100644
index b0418895417..00000000000
--- a/apps/web/app/(ee)/api/cron/shopify/order-paid/route.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { processOrder } from "@/lib/integrations/shopify/process-order";
-import { redis } from "@/lib/upstash";
-import * as z from "zod/v4";
-
-export const dynamic = "force-dynamic";
-
-const schema = z.object({
-  workspaceId: z.string(),
-  checkoutToken: z.string(),
-});
-
-// POST /api/cron/shopify/order-paid
-export async function POST(req: Request) {
-  try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
-    const { workspaceId, checkoutToken } = schema.parse(JSON.parse(rawBody));
-
-    // Find Shopify order
-    const event = await redis.hget(
-      `shopify:checkout:${checkoutToken}`,
-      "order",
-    );
-
-    if (!event) {
-      return new Response(
-        `[Shopify] Order with checkout token ${checkoutToken} not found. Skipping...`,
-      );
-    }
-
-    const clickId = await redis.hget<string>(
-      `shopify:checkout:${checkoutToken}`,
-      "clickId",
-    );
-
-    // clickId is empty, order is not from a Dub link
-    if (clickId === "") {
-      // set key to expire in 24 hours
-      await redis.expire(`shopify:checkout:${checkoutToken}`, 60 * 60 * 24);
-
-      return new Response(
-        `[Shopify] Order is not from a Dub link. Skipping...`,
-      );
-    }
-
-    // clickId is found, process the order for the new customer
-    else if (clickId) {
-      await processOrder({
-        event,
-        workspaceId,
-        clickId,
-      });
-
-      return new Response("[Shopify] Order event processed successfully.");
-    }
-
-    // Wait for the click event to come from Shopify pixel
-    else {
-      throw new DubApiError({
-        code: "bad_request",
-        message:
-          "[Shopify] Click event not found. Waiting for Shopify pixel event...",
-      });
-    }
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
-  }
-}
diff --git a/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts b/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
index 46588bf01ca..96eeb1c8df8 100644
--- a/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
+++ b/apps/web/app/(ee)/api/cron/streams/update-click-stats/route.ts
@@ -312,7 +312,7 @@ const maybeAlertOnBacklog = async (streamInfo: {
 
   await log({
     message: `Click stats stream backlog alert: length=${streamInfo.length}, oldestAgeMs=${ageMs ?? "unknown"}, firstEntryId=${streamInfo.firstEntryId ?? "none"}`,
-    type: "alerts",
+    type: "errors",
   });
 };
 
diff --git a/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts b/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
index c08e7a2e75a..b3438844a02 100644
--- a/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
+++ b/apps/web/app/(ee)/api/cron/streams/update-workspace-links-usage/route.ts
@@ -274,11 +274,12 @@ const processWorkspaceLinksUsageBatch = () =>
                   type: emailType,
                   slackWebhookUrl: slackWebhookByWorkspace.get(workspace.id),
                 }),
-                log({
-                  message: `*${workspace.slug}* has used ${percentage.toString()}% of its links limit for the month.`,
-                  type: workspace.plan === "free" ? "cron" : "alerts",
-                  mention: workspace.plan !== "free",
-                }),
+                workspace.plan !== "free" &&
+                  log({
+                    message: `*${workspace.slug}* has used ${percentage.toString()}% of its links limit for the month.`,
+                    type: "cron",
+                    mention: true,
+                  }),
               ]);
 
               return { skipped: false };
diff --git a/apps/web/app/(ee)/api/cron/usage/utils.ts b/apps/web/app/(ee)/api/cron/usage/utils.ts
index da93360ad76..f5bb94ad867 100644
--- a/apps/web/app/(ee)/api/cron/usage/utils.ts
+++ b/apps/web/app/(ee)/api/cron/usage/utils.ts
@@ -16,6 +16,7 @@ import {
   getAdjustedBillingCycleStart,
   log,
 } from "@dub/utils";
+import { waitUntil } from "@vercel/functions";
 import { getMonth, getYear } from "date-fns";
 
 const limit = 100;
@@ -236,15 +237,6 @@ export const updateUsage = async () => {
         const emails = users.map((user) => user.user.email) as string[];
         const slackWebhookUrl = slackWebhookByWorkspace.get(workspace.id);
 
-        await log({
-          message: `*${slug}* is over their *${capitalize(
-            plan,
-          )} Plan* usage limit. Usage: ${usage}, Limit: ${usageLimit}, Email: ${emails.join(
-            ", ",
-          )}`,
-          type: "cron",
-          mention: plan !== "free",
-        });
         const firstUsageLimitEmail = sentEmails.find(
           (email) => email.type === "firstUsageLimitEmail",
         );
@@ -275,6 +267,18 @@ export const updateUsage = async () => {
             }
           }
         }
+
+        waitUntil(
+          log({
+            message: `*${slug}* is over their *${capitalize(
+              plan,
+            )} Plan* usage limit. Usage: ${usage}, Limit: ${usageLimit}, Email: ${emails.join(
+              ", ",
+            )}`,
+            type: "cron",
+            mention: plan !== "free",
+          }),
+        );
       }),
     );
   }
diff --git a/apps/web/app/(ee)/api/cron/welcome-user/route.ts b/apps/web/app/(ee)/api/cron/welcome-user/route.ts
index 20defda49eb..16974e01c1a 100644
--- a/apps/web/app/(ee)/api/cron/welcome-user/route.ts
+++ b/apps/web/app/(ee)/api/cron/welcome-user/route.ts
@@ -1,108 +1,11 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { generateUnsubscribeToken } from "@/lib/email/unsubscribe-token";
-import { prisma } from "@/lib/prisma";
-import { sendEmail } from "@dub/email";
-import WelcomeEmail from "@dub/email/templates/welcome-email";
-import WelcomeEmailPartner from "@dub/email/templates/welcome-email-partner";
-import { APP_DOMAIN, PARTNERS_DOMAIN } from "@dub/utils";
+import { withCron } from "@/lib/cron/with-cron";
+import { welcomeUserJob } from "@/lib/jobs/handlers/welcome-user-job";
+import { logAndRespond } from "../utils";
 
 export const dynamic = "force-dynamic";
 
-/*
-    This route is used to send a welcome email to new users + subscribe them to the corresponding Resend audience
-    It is called by QStash 45 minutes after a user is created.
-
-    Trial sequence: users who later start a paid-plan trial also receive marketing emails from
-    `/api/cron/trial-emails` when due; that flow is additive (this welcome is not skipped).
-*/
-export async function POST(req: Request) {
-  try {
-    const rawBody = await req.text();
-    await verifyQstashSignature({ req, rawBody });
-
-    const { userId } = JSON.parse(rawBody);
-
-    const user = await prisma.user.findUnique({
-      where: {
-        id: userId,
-      },
-      select: {
-        name: true,
-        email: true,
-        partners: true,
-        projects: {
-          select: {
-            project: {
-              select: {
-                slug: true,
-                name: true,
-                logo: true,
-                plan: true,
-                trialEndsAt: true,
-                defaultProgramId: true,
-              },
-            },
-          },
-          orderBy: {
-            createdAt: "asc",
-          },
-          take: 1,
-        },
-      },
-    });
-
-    if (!user) {
-      return new Response("User not found. Skipping...", { status: 200 });
-    }
-
-    // this shouldn't happen but just in case
-    if (!user.email) {
-      return new Response("User email not found. Skipping...", { status: 200 });
-    }
-
-    const isPartner = user.partners.length > 0;
-
-    const unsubscribeUrl = `${isPartner ? PARTNERS_DOMAIN : APP_DOMAIN}/unsubscribe/${generateUnsubscribeToken(user.email)}`;
-
-    if (isPartner) {
-      await sendEmail({
-        to: user.email,
-        replyTo: "steven.tey@dub.co",
-        subject: "Welcome to Dub Partners!",
-        react: WelcomeEmailPartner({
-          email: user.email,
-          name: user.name,
-          unsubscribeUrl,
-        }),
-        variant: "marketing",
-      });
-
-      // only send WelcomeEmail if the user has a workspace that:
-      // - is not in a trial
-      // - hasn't created a program yet
-    } else if (
-      user.projects.length > 0 &&
-      user.projects[0].project.trialEndsAt === null &&
-      user.projects[0].project.defaultProgramId === null
-    ) {
-      await sendEmail({
-        to: user.email,
-        replyTo: "steven.tey@dub.co",
-        subject: "Welcome to Dub!",
-        react: WelcomeEmail({
-          email: user.email,
-          workspace: user.projects[0].project,
-          unsubscribeUrl,
-        }),
-        variant: "marketing",
-      });
-    }
-
-    return new Response("Welcome email sent and user subscribed.", {
-      status: 200,
-    });
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
-  }
-}
+// POST /api/cron/welcome-user
+export const POST = withCron(async ({ rawBody }) => {
+  await welcomeUserJob.execute(JSON.parse(rawBody));
+  return logAndRespond("Welcome email sent and user subscribed.");
+});
diff --git a/apps/web/app/(ee)/api/customers/[id]/reattribute/route.ts b/apps/web/app/(ee)/api/customers/[id]/reattribute/route.ts
new file mode 100644
index 00000000000..5d74f7c5ed1
--- /dev/null
+++ b/apps/web/app/(ee)/api/customers/[id]/reattribute/route.ts
@@ -0,0 +1,238 @@
+import { isFirstConversion } from "@/lib/analytics/is-first-conversion";
+import { createId } from "@/lib/api/create-id";
+import { getCustomerOrThrow } from "@/lib/api/customers/get-customer-or-throw";
+import {
+  CUSTOMER_REATTRIBUTION_EVENTS_LIMIT,
+  getCustomerReattributeEvents,
+  isReattributedCustomerStub,
+  recreateCustomerForReattribution,
+  rollbackCustomerRecreation,
+} from "@/lib/api/customers/reattribute-customer";
+import { transformCustomer } from "@/lib/api/customers/transform-customer";
+import { DubApiError } from "@/lib/api/errors";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withWorkspace } from "@/lib/auth";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
+import { prisma } from "@/lib/prisma";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import {
+  CustomerEnrichedSchema,
+  reattributeCustomerBodySchema,
+} from "@/lib/zod/schemas/customers";
+import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { ACME_WORKSPACE_ID, nanoid } from "@dub/utils";
+import { NextResponse } from "next/server";
+
+// POST /api/customers/:id/reattribute – Reattribute a customer to a different partner
+export const POST = withWorkspace(
+  async ({ workspace, params, req }) => {
+    const { id } = params;
+    const programId = getDefaultProgramIdOrThrow(workspace);
+    const { partnerId, linkId, createClawback } =
+      reattributeCustomerBodySchema.parse(await parseRequestBody(req));
+
+    if (workspace.id !== ACME_WORKSPACE_ID) {
+      await assertRateLimit({
+        policy: RATELIMIT_POLICIES.reattributeCustomer,
+        identifier: workspace.id,
+      });
+    }
+
+    const customer = await getCustomerOrThrow(
+      {
+        id,
+        workspaceId: workspace.id,
+      },
+      {
+        includeExpandedFields: true,
+      },
+    );
+
+    if (isReattributedCustomerStub(customer)) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `Customer "${customer.id}" was already reattributed. Use the new customer ID instead.`,
+      });
+    }
+
+    if (customer.partnerId === partnerId) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `Customer "${customer.id}" is already attributed to the partner "${partnerId}".`,
+      });
+    }
+
+    const enrollment = await getProgramEnrollmentOrThrow({
+      partnerId,
+      programId,
+      include: {},
+    });
+
+    if (INACTIVE_ENROLLMENT_STATUSES.includes(enrollment.status)) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message: "This partner is not eligible to receive customers.",
+      });
+    }
+
+    const link = await prisma.link.findUnique({
+      where: {
+        id: linkId,
+      },
+    });
+
+    if (
+      !link ||
+      link.projectId !== workspace.id ||
+      link.programId !== programId ||
+      link.partnerId !== partnerId
+    ) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message:
+          "The selected referral link does not belong to this partner in the program.",
+      });
+    }
+
+    const [events, commissionCount] = await Promise.all([
+      getCustomerReattributeEvents(customer.id),
+      prisma.commission.count({
+        where: {
+          customerId: customer.id,
+        },
+      }),
+    ]);
+
+    if (events.length >= CUSTOMER_REATTRIBUTION_EVENTS_LIMIT) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message: `This customer has too many events to reattribute (limit ${CUSTOMER_REATTRIBUTION_EVENTS_LIMIT}).`,
+      });
+    }
+
+    if (
+      events.length === 0 &&
+      commissionCount === 0 &&
+      !customer.clickId &&
+      customer.sales === 0
+    ) {
+      const updatedCustomer = await prisma.customer.update({
+        where: {
+          id: customer.id,
+        },
+        data: {
+          partnerId: link.partnerId,
+          linkId: link.id,
+          programId: link.programId,
+        },
+        include: {
+          link: {
+            include: {
+              linkReward: {
+                select: {
+                  discount: true,
+                },
+              },
+            },
+          },
+          programEnrollment: {
+            include: {
+              partner: true,
+              discount: true,
+            },
+          },
+        },
+      });
+
+      return NextResponse.json(
+        CustomerEnrichedSchema.parse(transformCustomer(updatedCustomer)),
+      );
+    }
+
+    const newCustomerId = createId({ prefix: "cus_" });
+    const newClickId = nanoid(16);
+    const incrementConversions =
+      customer.sales > 0 && isFirstConversion({ customer, linkId: link.id });
+    const decrementConversions = customer.sales > 0 && Boolean(customer.linkId);
+
+    await recreateCustomerForReattribution({
+      customer,
+      link,
+      newCustomerId,
+      newClickId,
+    });
+
+    const workflow = await dispatchWorkflows({
+      name: "reattribute-customer-workflow",
+      payload: {
+        workspaceId: workspace.id,
+        programId,
+        oldCustomerId: customer.id,
+        newCustomerId,
+        oldLinkId: customer.linkId,
+        newLinkId: link.id,
+        oldPartnerId: customer.partnerId,
+        newPartnerId: partnerId,
+        oldClickId: customer.clickId,
+        newClickId,
+        createClawback,
+        incrementConversions,
+        decrementConversions,
+      },
+      options: {
+        deduplicationId: `${customer.id}:${newCustomerId}`,
+        flowControl: {
+          key: workspace.id,
+          parallelism: 1,
+        },
+        label: customer.id,
+      },
+    });
+
+    if (workflow.failed > 0) {
+      await rollbackCustomerRecreation({
+        customer,
+        newCustomerId,
+      });
+
+      const failedJobIds = workflow.results
+        .filter((result) => result.status === "failed")
+        .map((result) => result.id);
+
+      if (failedJobIds.length > 0) {
+        await prisma.job.deleteMany({
+          where: {
+            id: { in: failedJobIds },
+          },
+        });
+      }
+
+      throw new DubApiError({
+        code: "internal_server_error",
+        message:
+          "Customer reattribution failed to start. Please try again in a moment.",
+      });
+    }
+
+    const newCustomer = await getCustomerOrThrow(
+      {
+        id: newCustomerId,
+        workspaceId: workspace.id,
+      },
+      {
+        includeExpandedFields: true,
+      },
+    );
+
+    return NextResponse.json(
+      CustomerEnrichedSchema.parse(transformCustomer(newCustomer)),
+    );
+  },
+  {
+    requiredPlan: ["business", "advanced", "enterprise"],
+    requiredRoles: ["owner", "member"],
+  },
+);
diff --git a/apps/web/app/(ee)/api/customers/[id]/route.ts b/apps/web/app/(ee)/api/customers/[id]/route.ts
index 0d50c27a706..e0de9bd847c 100644
--- a/apps/web/app/(ee)/api/customers/[id]/route.ts
+++ b/apps/web/app/(ee)/api/customers/[id]/route.ts
@@ -50,8 +50,15 @@ export const PATCH = withWorkspace(
     const { includeExpandedFields } =
       getCustomersQuerySchema.parse(searchParams);
 
-    const { name, email, avatar, externalId, stripeCustomerId } =
-      updateCustomerBodySchema.parse(await parseRequestBody(req));
+    const {
+      name,
+      email,
+      avatar,
+      externalId,
+      stripeCustomerId,
+      country,
+      subscriptionCanceledAt,
+    } = updateCustomerBodySchema.parse(await parseRequestBody(req));
 
     const customer = await getCustomerOrThrow(
       {
@@ -84,6 +91,8 @@ export const PATCH = withWorkspace(
           avatar: finalCustomerAvatar,
           externalId,
           stripeCustomerId,
+          country,
+          subscriptionCanceledAt,
         },
       });
 
diff --git a/apps/web/app/(ee)/api/demo/click/route.ts b/apps/web/app/(ee)/api/demo/click/route.ts
new file mode 100644
index 00000000000..63cdfbac2f3
--- /dev/null
+++ b/apps/web/app/(ee)/api/demo/click/route.ts
@@ -0,0 +1,80 @@
+import { assertDemoLink, verifyDemoSecret } from "@/lib/api/demo/guard";
+import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withAxiom } from "@/lib/axiom/server";
+import { getLinkWithPartner } from "@/lib/planetscale/get-link-with-partner";
+import { recordFakeClick } from "@/lib/tinybird/record-fake-click";
+import { parseDateSchema } from "@/lib/zod/schemas/utils";
+import { COUNTRY_CODES, getDomainWithoutWWW } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const demoClickSchema = z.object({
+  domain: z.preprocess(
+    (val) => getDomainWithoutWWW(val as string),
+    z.string({ error: "domain is required." }),
+  ),
+  key: z.string({ error: "key is required." }),
+  country: z.enum(COUNTRY_CODES),
+  region: z.string().nullish(),
+  city: z.string().nullish(),
+  continent: z.string().nullish(),
+  referrer: z.string().nullish(),
+  userAgent: z.string().nullish(),
+  timestamp: parseDateSchema.nullish(),
+});
+
+// POST /api/demo/click – mint a geo-accurate click for the LoopWork demo workspace only
+export const POST = withAxiom(async (req) => {
+  try {
+    verifyDemoSecret(req);
+
+    const {
+      domain,
+      key,
+      country,
+      region,
+      city,
+      continent,
+      referrer,
+      userAgent,
+      timestamp,
+    } = demoClickSchema.parse(await parseRequestBody(req));
+
+    const link = await getLinkWithPartner({ domain, key });
+
+    if (!link) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Link not found for domain: ${domain} and key: ${key}.`,
+      });
+    }
+
+    assertDemoLink(link);
+
+    const clickEvent = await recordFakeClick({
+      link: {
+        id: link.id,
+        url: link.url,
+        domain: link.domain,
+        key: link.key,
+        projectId: link.projectId,
+        programId: link.programId,
+        partnerId: link.partnerId,
+      },
+      customer: {
+        country,
+        region,
+        city,
+        continent,
+      },
+      referrer,
+      userAgent,
+      ...(timestamp && { timestamp: timestamp.toISOString() }),
+    });
+
+    return NextResponse.json({ clickId: clickEvent.click_id });
+  } catch (error) {
+    return handleAndReturnErrorResponse(error);
+  }
+});
diff --git a/apps/web/app/(ee)/api/demo/commission/route.ts b/apps/web/app/(ee)/api/demo/commission/route.ts
new file mode 100644
index 00000000000..62c37bfe5ba
--- /dev/null
+++ b/apps/web/app/(ee)/api/demo/commission/route.ts
@@ -0,0 +1,82 @@
+import { createDemoCommission } from "@/lib/api/demo/create-demo-commission";
+import { assertDemoLink, verifyDemoSecret } from "@/lib/api/demo/guard";
+import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withAxiom } from "@/lib/axiom/server";
+import { getLinkWithPartner } from "@/lib/planetscale/get-link-with-partner";
+import { centsSchema, parseDateSchema } from "@/lib/zod/schemas/utils";
+import { COUNTRY_CODES, getDomainWithoutWWW } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const demoCommissionSchema = z
+  .object({
+    domain: z.preprocess(
+      (val) => getDomainWithoutWWW(val as string),
+      z.string({ error: "domain is required." }),
+    ),
+    key: z.string({ error: "key is required." }),
+    date: parseDateSchema,
+    type: z.enum(["lead", "sale"]),
+    country: z.enum(COUNTRY_CODES),
+    region: z.string().nullish(),
+    city: z.string().nullish(),
+    continent: z.string().nullish(),
+    referrer: z.string().nullish(),
+    userAgent: z.string().nullish(),
+    customer: z.object({
+      name: z.string().nullish(),
+      email: z.string().nullish(),
+      externalId: z.string(),
+      country: z.enum(COUNTRY_CODES),
+    }),
+    sale: z
+      .object({
+        amount: centsSchema.pipe(z.number().int().min(0)),
+        invoiceId: z.string().nullish(),
+        eventName: z.string().nullish(),
+      })
+      .nullish(),
+  })
+  .refine((data) => data.type !== "sale" || data.sale?.amount != null, {
+    message: "sale.amount is required when type is sale.",
+    path: ["sale", "amount"],
+  });
+
+// POST /api/demo/commission – backdated click + lead/sale + commission for the LoopWork demo only
+export const POST = withAxiom(async (req) => {
+  try {
+    verifyDemoSecret(req);
+
+    const body = demoCommissionSchema.parse(await parseRequestBody(req));
+    const { domain, key, date, ...rest } = body;
+
+    const link = await getLinkWithPartner({ domain, key });
+
+    if (!link) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Link not found for domain: ${domain} and key: ${key}.`,
+      });
+    }
+
+    assertDemoLink(link);
+
+    if (!date) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Invalid date.",
+      });
+    }
+
+    const result = await createDemoCommission({
+      link,
+      date,
+      ...rest,
+    });
+
+    return NextResponse.json(result);
+  } catch (error) {
+    return handleAndReturnErrorResponse(error);
+  }
+});
diff --git a/apps/web/app/(ee)/api/discount-codes/[discountCodeId]/route.ts b/apps/web/app/(ee)/api/discount-codes/[idOrCode]/route.ts
similarity index 77%
rename from apps/web/app/(ee)/api/discount-codes/[discountCodeId]/route.ts
rename to apps/web/app/(ee)/api/discount-codes/[idOrCode]/route.ts
index 091e0984604..8a0d07b5b3a 100644
--- a/apps/web/app/(ee)/api/discount-codes/[discountCodeId]/route.ts
+++ b/apps/web/app/(ee)/api/discount-codes/[idOrCode]/route.ts
@@ -7,42 +7,38 @@ import { prisma } from "@/lib/prisma";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
-// DELETE /api/discount-codes/[discountCodeId] - soft delete a discount code
+// DELETE /api/discount-codes/[idOrCode] - delete a discount code
 export const DELETE = withWorkspace(
   async ({ workspace, params, session }) => {
-    const { discountCodeId } = params;
+    const { idOrCode } = params;
     const programId = getDefaultProgramIdOrThrow(workspace);
 
     const discountCode = await prisma.discountCode.findUnique({
-      where: {
-        id: discountCodeId,
-      },
+      where: idOrCode.startsWith("dcode_")
+        ? { id: idOrCode }
+        : { programId_code: { programId, code: idOrCode } },
       include: {
-        discount: {
-          select: {
-            provider: true,
-          },
-        },
+        discount: true,
       },
     });
 
     if (!discountCode || !discountCode.discount) {
       throw new DubApiError({
-        message: `Discount code (${discountCodeId}) not found.`,
-        code: "bad_request",
+        code: "not_found",
+        message: `Discount code (${idOrCode}) not found.`,
       });
     }
 
     if (discountCode.programId !== programId) {
       throw new DubApiError({
-        message: `Discount code (${discountCodeId}) is not associated with the program.`,
-        code: "bad_request",
+        code: "not_found",
+        message: `Discount code (${idOrCode}) not found.`,
       });
     }
 
     await prisma.discountCode.update({
       where: {
-        id: discountCodeId,
+        id: discountCode.id,
       },
       data: {
         discountId: null,
diff --git a/apps/web/app/(ee)/api/discount-codes/route.ts b/apps/web/app/(ee)/api/discount-codes/route.ts
index c8504df0af1..69d556b1ffd 100644
--- a/apps/web/app/(ee)/api/discount-codes/route.ts
+++ b/apps/web/app/(ee)/api/discount-codes/route.ts
@@ -1,40 +1,67 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { DubApiError } from "@/lib/api/errors";
+import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import { createDiscountCode } from "@/lib/discounts/create-discount-code";
+import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";
 import { prisma } from "@/lib/prisma";
 import {
   createDiscountCodeSchema,
   DiscountCodeSchema,
   getDiscountCodesQuerySchema,
+  restrictedDiscountCodeSchema,
 } from "@/lib/zod/schemas/discount";
 import { APP_DOMAIN } from "@dub/utils";
+import { DiscountProvider } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
-// GET /api/discount-codes - get all discount codes for a partner
+// GET /api/discount-codes - list discount codes
 export const GET = withWorkspace(
   async ({ workspace, searchParams }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId } = getDiscountCodesQuerySchema.parse(searchParams);
-
-    const programEnrollment = await getProgramEnrollmentOrThrow({
+    const {
       partnerId,
-      programId,
-      include: {
-        discountCodes: true,
+      discountId,
+      code,
+      page = 1,
+      pageSize,
+    } = getDiscountCodesQuerySchema.parse(searchParams);
+
+    if (discountId) {
+      await getDiscountOrThrow({
+        discountId,
+        programId,
+      });
+    }
+
+    if (partnerId) {
+      await getProgramEnrollmentOrThrow({
+        partnerId,
+        programId,
+        include: {},
+      });
+    }
+
+    const discountCodes = await prisma.discountCode.findMany({
+      where: {
+        programId,
+        ...(partnerId && { partnerId }),
+        ...(discountId && { discountId }),
+        ...(code && { code }),
       },
+      orderBy: {
+        createdAt: "desc",
+      },
+      take: pageSize,
+      skip: (page - 1) * pageSize,
     });
 
-    const response = DiscountCodeSchema.array().parse(
-      programEnrollment.discountCodes,
-    );
-
-    return NextResponse.json(response);
+    return NextResponse.json(DiscountCodeSchema.array().parse(discountCodes));
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],
@@ -46,17 +73,35 @@ export const POST = withWorkspace(
   async ({ workspace, req, session }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId, linkId, code } = createDiscountCodeSchema.parse(
-      await parseRequestBody(req),
-    );
+    const body = await parseRequestBody(req);
+
+    if (typeof body.code === "string" && body.code.trim() === "") {
+      delete body.code;
+    }
+
+    const { partnerId, linkId, code } = createDiscountCodeSchema.parse(body);
 
     const programEnrollment = await getProgramEnrollmentOrThrow({
       partnerId,
       programId,
       include: {
-        links: true,
         discount: true,
-        discountCodes: true,
+        links: {
+          select: {
+            id: true,
+            linkReward: {
+              select: {
+                discount: true,
+              },
+            },
+          },
+        },
+        discountCodes: {
+          select: {
+            code: true,
+            linkId: true,
+          },
+        },
         partner: {
           select: {
             id: true,
@@ -66,7 +111,7 @@ export const POST = withWorkspace(
       },
     });
 
-    const { links, discount } = programEnrollment;
+    const { links, discount: enrollmentDiscount } = programEnrollment;
 
     const link = links.find((link) => link.id === linkId);
 
@@ -77,11 +122,41 @@ export const POST = withWorkspace(
       });
     }
 
+    // Prefer the link discount if it exists, otherwise use the enrollment discount
+    const discount = link.linkReward?.discount ?? enrollmentDiscount;
+
     if (!discount) {
       throw new DubApiError({
         code: "bad_request",
         message:
-          "No discount is assigned to this partner group. Please add a discount before proceeding.",
+          "No discount is assigned to this partner or link. Please add a discount before proceeding.",
+      });
+    }
+
+    if (isDiscountDeleted(discount)) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Discount ${discount.id} not found.`,
+      });
+    }
+
+    if (
+      code &&
+      (discount.provider === DiscountProvider.stripe ||
+        discount.provider === DiscountProvider.shopify)
+    ) {
+      restrictedDiscountCodeSchema.parse({ code });
+    }
+
+    // A link can have only one discount code
+    const duplicateByLink = programEnrollment.discountCodes.find(
+      (discountCode) => discountCode.linkId === linkId,
+    );
+
+    if (duplicateByLink) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
       });
     }
 
@@ -90,7 +165,7 @@ export const POST = withWorkspace(
       const duplicateByCode = await prisma.discountCode.findUnique({
         where: {
           programId_code: {
-            programId: discount.programId,
+            programId: discount.programId!,
             code,
           },
         },
@@ -107,18 +182,6 @@ export const POST = withWorkspace(
       }
     }
 
-    // A link can have only one discount code
-    const duplicateByLink = programEnrollment.discountCodes.find(
-      (discountCode) => discountCode.linkId === linkId,
-    );
-
-    if (duplicateByLink) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: `This link already has a discount code (${duplicateByLink.code}) assigned.`,
-      });
-    }
-
     const discountCode = await createDiscountCode({
       workspace,
       partner: programEnrollment.partner,
diff --git a/apps/web/app/(ee)/api/discounts/route.ts b/apps/web/app/(ee)/api/discounts/route.ts
new file mode 100644
index 00000000000..1d0e6c93cb3
--- /dev/null
+++ b/apps/web/app/(ee)/api/discounts/route.ts
@@ -0,0 +1,21 @@
+import {
+  getDiscountsQuerySchema,
+  listDiscounts,
+  listDiscountsResponseSchema,
+} from "@/lib/api/discounts/list-discounts";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { NextResponse } from "next/server";
+
+// GET /api/discounts - get all discounts for a program
+export const GET = withWorkspace(async ({ workspace, searchParams }) => {
+  const programId = getDefaultProgramIdOrThrow(workspace);
+  const { groupId } = getDiscountsQuerySchema.parse(searchParams);
+
+  const discounts = await listDiscounts({
+    programId,
+    groupId,
+  });
+
+  return NextResponse.json(listDiscountsResponseSchema.parse(discounts));
+});
diff --git a/apps/web/app/(ee)/api/e2e/enrollments/route.ts b/apps/web/app/(ee)/api/e2e/enrollments/route.ts
deleted file mode 100644
index a9518b40c5f..00000000000
--- a/apps/web/app/(ee)/api/e2e/enrollments/route.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { createId } from "@/lib/api/create-id";
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { parseRequestBody } from "@/lib/api/utils";
-import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { NextResponse } from "next/server";
-import * as z from "zod/v4";
-import { assertE2EWorkspace } from "../guard";
-
-const bodySchema = z.object({
-  partnerId: z.string(),
-  createdAt: z.string().optional(),
-  // Set Link.leads on the partner's first program link (used by send-campaign AND conditions)
-  leads: z.number().int().min(0).optional(),
-  // Create a User + PartnerUser from the partner email so campaign emails have a recipient
-  createUser: z.boolean().optional(),
-});
-
-// PATCH /api/e2e/enrollments - Update enrollment (e.g., backdate createdAt)
-export const PATCH = withWorkspace(
-  async ({ req, workspace }) => {
-    assertE2EWorkspace(workspace);
-
-    const programId = getDefaultProgramIdOrThrow(workspace);
-    const { partnerId, createdAt, leads, createUser } = bodySchema.parse(
-      await parseRequestBody(req),
-    );
-
-    if (createUser) {
-      const partner = await prisma.partner.findUnique({
-        where: { id: partnerId },
-        select: { email: true, name: true },
-      });
-
-      if (partner?.email) {
-        const user = await prisma.user.create({
-          data: {
-            id: createId({ prefix: "user_" }),
-            email: partner.email,
-            name: partner.name,
-            emailVerified: new Date(),
-            defaultPartnerId: partnerId,
-          },
-        });
-
-        await prisma.partnerUser.create({
-          data: {
-            userId: user.id,
-            partnerId,
-            role: "owner",
-            notificationPreferences: {
-              create: {},
-            },
-          },
-        });
-      }
-    }
-
-    if (typeof leads === "number") {
-      const link = await prisma.link.findFirst({
-        where: {
-          partnerId,
-          programId,
-        },
-        orderBy: {
-          id: "asc",
-        },
-        select: {
-          id: true,
-        },
-      });
-
-      if (link) {
-        await prisma.link.update({
-          where: {
-            id: link.id,
-          },
-          data: {
-            leads,
-          },
-        });
-      }
-    }
-
-    const enrollment = await prisma.programEnrollment.update({
-      where: {
-        partnerId_programId: {
-          partnerId,
-          programId,
-        },
-      },
-      data: {
-        ...(createdAt && { createdAt: new Date(createdAt) }),
-        ...(typeof leads === "number" && { totalLeads: leads }),
-      },
-      select: {
-        partnerId: true,
-        programId: true,
-        createdAt: true,
-        totalLeads: true,
-      },
-    });
-
-    return NextResponse.json(enrollment);
-  },
-  {
-    requiredPermissions: ["workspaces.write"],
-  },
-);
diff --git a/apps/web/app/(ee)/api/e2e/notification-emails/route.ts b/apps/web/app/(ee)/api/e2e/notification-emails/route.ts
deleted file mode 100644
index 4100229abae..00000000000
--- a/apps/web/app/(ee)/api/e2e/notification-emails/route.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { createId } from "@/lib/api/create-id";
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { NextResponse } from "next/server";
-import { assertE2EWorkspace } from "../guard";
-
-// GET /api/e2e/notification-emails - Find notification emails
-export const GET = withWorkspace(async ({ workspace, searchParams }) => {
-  assertE2EWorkspace(workspace);
-
-  const { campaignId, partnerId } = searchParams;
-
-  const emails = await prisma.notificationEmail.findMany({
-    where: {
-      ...(campaignId && { campaignId }),
-      ...(partnerId && { partnerId }),
-      type: "Campaign",
-    },
-  });
-
-  return NextResponse.json(emails);
-});
-
-// POST /api/e2e/notification-emails - Create a notification email (for test setup)
-export const POST = withWorkspace(
-  async ({ req, workspace }) => {
-    assertE2EWorkspace(workspace);
-
-    const programId = getDefaultProgramIdOrThrow(workspace);
-    const body = await req.json();
-
-    const email = await prisma.notificationEmail.create({
-      data: {
-        id: createId({ prefix: "em_" }),
-        type: "Campaign",
-        emailId: body.emailId || `e2e_${Date.now()}`,
-        campaignId: body.campaignId,
-        programId,
-        partnerId: body.partnerId,
-        recipientUserId: body.recipientUserId,
-      },
-    });
-
-    return NextResponse.json(email);
-  },
-  {
-    requiredPermissions: ["workspaces.write"],
-  },
-);
-
-// DELETE /api/e2e/notification-emails - Delete notification emails (cleanup)
-export const DELETE = withWorkspace(
-  async ({ workspace, searchParams }) => {
-    assertE2EWorkspace(workspace);
-
-    const { campaignId } = searchParams;
-
-    if (!campaignId) {
-      return NextResponse.json(
-        { error: "campaignId is required" },
-        { status: 400 },
-      );
-    }
-
-    const result = await prisma.notificationEmail.deleteMany({
-      where: {
-        campaignId,
-        type: "Campaign",
-      },
-    });
-
-    return NextResponse.json({ deleted: result.count });
-  },
-  {
-    requiredPermissions: ["workspaces.write"],
-  },
-);
diff --git a/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts
new file mode 100644
index 00000000000..8d34775671f
--- /dev/null
+++ b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts
@@ -0,0 +1,77 @@
+import { DubApiError } from "@/lib/api/errors";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withWorkspace } from "@/lib/auth";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
+import { prisma } from "@/lib/prisma";
+import { ACME_PROGRAM_ID, nanoid } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+import { assertE2EWorkspace } from "../guard";
+
+const bodySchema = z.object({
+  sourceEmail: z.email(),
+  targetEmail: z.email(),
+});
+
+// POST /api/e2e/trigger-merge-accounts
+export const POST = withWorkspace(
+  async ({ req, workspace }) => {
+    assertE2EWorkspace(workspace);
+
+    const { sourceEmail, targetEmail } = bodySchema.parse(
+      await parseRequestBody(req),
+    );
+
+    if (sourceEmail.toLowerCase() === targetEmail.toLowerCase()) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Source and target emails must be different.",
+      });
+    }
+
+    const partners = await prisma.partner.findMany({
+      where: {
+        email: { in: [sourceEmail, targetEmail] },
+        programs: { some: { programId: ACME_PROGRAM_ID } },
+      },
+      select: { email: true },
+    });
+
+    const enrolledEmails = new Set(partners.map((p) => p.email?.toLowerCase()));
+
+    if (
+      !enrolledEmails.has(sourceEmail.toLowerCase()) ||
+      !enrolledEmails.has(targetEmail.toLowerCase())
+    ) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "Both partners must exist and be enrolled in the Acme test program.",
+      });
+    }
+
+    const userId = `e2e-merge-${nanoid()}`;
+
+    const res = await dispatchWorkflows({
+      name: "merge-partner-accounts-workflow",
+      payload: {
+        userId,
+        sourceEmail,
+        targetEmail,
+        skipEmailNotification: true,
+      },
+      options: {
+        flowControl: {
+          key: userId,
+          parallelism: 1,
+        },
+        label: userId,
+      },
+    });
+
+    return NextResponse.json(res);
+  },
+  {
+    requiredPermissions: ["workspaces.write"],
+  },
+);
diff --git a/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts b/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts
deleted file mode 100644
index ee68fdda5cd..00000000000
--- a/apps/web/app/(ee)/api/e2e/trigger-workflow/[workflowId]/route.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { parseWorkflowConfig } from "@/lib/api/workflows/parse-workflow-config";
-import { executeSendCampaignWorkflow } from "@/lib/api/workflows/send-campaign/execute";
-import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";
-import { ACME_PROGRAM_ID } from "@dub/utils";
-import { NextResponse } from "next/server";
-import { assertE2EWorkspace } from "../../guard";
-
-// POST /api/e2e/trigger-workflow/[workflowId]
-// Executes a workflow directly with API token auth (no QStash signature needed).
-export const POST = withWorkspace(async ({ workspace, params }) => {
-  assertE2EWorkspace(workspace);
-
-  const { workflowId } = params;
-
-  try {
-    const workflow = await prisma.workflow.findUnique({
-      where: { id: workflowId, programId: ACME_PROGRAM_ID },
-    });
-
-    if (!workflow) {
-      return NextResponse.json({
-        message: `Workflow ${workflowId} not found. Skipping...`,
-      });
-    }
-
-    if (workflow.disabledAt) {
-      return NextResponse.json({
-        message: `Workflow ${workflowId} is disabled. Skipping...`,
-      });
-    }
-
-    const workflowConfig = parseWorkflowConfig(workflow);
-
-    if (workflowConfig.action.type === WORKFLOW_ACTION_TYPES.SendCampaign) {
-      await executeSendCampaignWorkflow({ workflow });
-    }
-
-    return NextResponse.json({
-      message: `Finished executing workflow ${workflowId}.`,
-    });
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
-  }
-});
diff --git a/apps/web/app/(ee)/api/e2e/workflows/route.ts b/apps/web/app/(ee)/api/e2e/workflows/route.ts
index be4e7d18dfe..ddcff81db93 100644
--- a/apps/web/app/(ee)/api/e2e/workflows/route.ts
+++ b/apps/web/app/(ee)/api/e2e/workflows/route.ts
@@ -4,19 +4,18 @@ import { prisma } from "@/lib/prisma";
 import { NextResponse } from "next/server";
 import { assertE2EWorkspace } from "../guard";
 
-// GET /api/e2e/workflows - Find workflow by bountyId, campaignId, or groupId
+// GET /api/e2e/workflows - Find workflow by bountyId or groupId
 export const GET = withWorkspace(async ({ workspace, searchParams }) => {
   assertE2EWorkspace(workspace);
 
   const programId = getDefaultProgramIdOrThrow(workspace);
 
-  const { bountyId, campaignId, groupId } = searchParams;
+  const { bountyId, groupId } = searchParams;
 
   const workflow = await prisma.workflow.findFirst({
     where: {
       programId,
       ...(bountyId && { bounty: { id: bountyId } }),
-      ...(campaignId && { campaign: { id: campaignId } }),
       ...(groupId && { partnerGroup: { id: groupId } }),
     },
     select: {
diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.ts
new file mode 100644
index 00000000000..c72ea8e4e92
--- /dev/null
+++ b/apps/web/app/(ee)/api/email-domains/[domain]/domain-connect/apply/route.ts
@@ -0,0 +1,146 @@
+import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";
+import { DubApiError } from "@/lib/api/errors";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { assertEnv } from "@/lib/assert-env";
+import { withWorkspace } from "@/lib/auth";
+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";
+import {
+  DEFAULT_DC_SERVICE_EMAIL,
+  DOMAIN_CONNECT_KEY_HOST,
+} from "@/lib/domain-connect/constants";
+import { discoverDomainConnect } from "@/lib/domain-connect/discover";
+import { mapResendRecordsToEmailDomainConnectParams } from "@/lib/domain-connect/map-email-domain-records";
+import { buildSignedApplyUrl } from "@/lib/domain-connect/sign-apply-url";
+import { resend } from "@dub/email/resend";
+import { APP_DOMAIN, getApexDomain } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const bodySchema = z.object({
+  returnTo: z.string().max(512).optional(),
+});
+
+// POST /api/email-domains/[domain]/domain-connect/apply
+export const POST = withWorkspace(
+  async ({ req, workspace, params }) => {
+    const privateKeyPem = assertEnv("DOMAIN_CONNECT_PRIVATE_KEY")
+      .trim()
+      .replace(/\\n/g, "\n");
+
+    if (!resend) {
+      throw new DubApiError({
+        code: "internal_server_error",
+        message: "Resend is not configured.",
+      });
+    }
+
+    const programId = getDefaultProgramIdOrThrow(workspace);
+    const emailDomain = await getEmailDomainOrThrow({
+      programId,
+      domain: params.domain,
+    });
+
+    if (!emailDomain.resendDomainId) {
+      throw new DubApiError({
+        code: "internal_server_error",
+        message: "Resend domain ID is not found for this domain.",
+      });
+    }
+
+    const body = bodySchema.parse(await req.json().catch(() => ({})));
+
+    const domainResponse = await resend.domains.get(emailDomain.resendDomainId);
+    if (domainResponse.error || !domainResponse.data) {
+      throw new DubApiError({
+        code: "internal_server_error",
+        message:
+          domainResponse.error?.message ||
+          "Could not retrieve DNS records for this email domain.",
+      });
+    }
+
+    if (domainResponse.data.status === "verified") {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "This email domain is already verified.",
+      });
+    }
+
+    const apex = getApexDomain(`https://${emailDomain.slug}`);
+    const discovery = await discoverDomainConnect(apex);
+    if (!discovery) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "Auto configure is only available for Vercel or Cloudflare DNS zones.",
+      });
+    }
+
+    if (!isAllowedSyncUXOrigin(discovery.urlSyncUX)) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Invalid Domain Connect provider URL.",
+      });
+    }
+
+    const mapped = mapResendRecordsToEmailDomainConnectParams({
+      records: domainResponse.data.records ?? [],
+      emailSlug: emailDomain.slug,
+      apex,
+    });
+
+    if (!mapped) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "Could not build DNS auto-configure parameters from this domain's records. Try again or configure manually.",
+      });
+    }
+
+    const returnPath =
+      body.returnTo &&
+      body.returnTo.startsWith(`/${workspace.slug}/`) &&
+      !body.returnTo.includes("://")
+        ? body.returnTo
+        : `/${workspace.slug}/settings/domains/email`;
+
+    const redirectUrl = new URL(returnPath, APP_DOMAIN);
+    redirectUrl.searchParams.set("domain_connect", "callback");
+    const redirectUri = redirectUrl.toString();
+
+    const queryParams: Record<string, string> = {
+      domain: apex,
+      groupId: mapped.groupId,
+      redirect_uri: redirectUri,
+      mxHost: mapped.mxHost,
+      mxValue: mapped.mxValue,
+      spfTxtHost: mapped.spfTxtHost,
+      spfTxtValue: mapped.spfTxtValue,
+      dkimSelector: mapped.dkimSelector,
+      dkimTxtValue: mapped.dkimTxtValue,
+    };
+
+    if (mapped.host) {
+      queryParams.host = mapped.host;
+    }
+
+    if (mapped.dkim2Selector && mapped.dkim2TxtValue) {
+      queryParams.dkim2Selector = mapped.dkim2Selector;
+      queryParams.dkim2TxtValue = mapped.dkim2TxtValue;
+    }
+
+    const applyUrl = buildSignedApplyUrl({
+      urlSyncUX: discovery.urlSyncUX,
+      serviceId: DEFAULT_DC_SERVICE_EMAIL,
+      privateKeyPem,
+      keyHost: DOMAIN_CONNECT_KEY_HOST,
+      queryParams,
+    });
+
+    return NextResponse.json({ applyUrl });
+  },
+  {
+    requiredPlan: ["advanced", "enterprise"],
+    requiredPermissions: ["domains.write"],
+  },
+);
diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.ts
new file mode 100644
index 00000000000..8f343439b79
--- /dev/null
+++ b/apps/web/app/(ee)/api/email-domains/[domain]/forward-instructions/route.ts
@@ -0,0 +1,98 @@
+import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";
+import { DubApiError } from "@/lib/api/errors";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { mapResendRecordsToForwardRows } from "@/lib/domain-connect/map-email-domain-records";
+import { assertEmailSent } from "@/lib/email/assert-email-sent";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { sendEmail } from "@dub/email";
+import { resend } from "@dub/email/resend";
+import DomainDnsInstructions from "@dub/email/templates/domain-dns-instructions";
+import { getApexDomain } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const bodySchema = z.object({
+  email: z.email(),
+});
+
+// POST /api/email-domains/[domain]/forward-instructions
+export const POST = withWorkspace(
+  async ({ req, workspace, params, session }) => {
+    const programId = getDefaultProgramIdOrThrow(workspace);
+    const emailDomain = await getEmailDomainOrThrow({
+      programId,
+      domain: params.domain,
+    });
+
+    const { email } = bodySchema.parse(await req.json());
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.forwardDnsInstructions,
+      identifier: [workspace.id, session.user.id],
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.forwardDnsInstructionsTarget,
+      identifier: email.toLowerCase(),
+    });
+
+    if (!resend) {
+      throw new DubApiError({
+        code: "internal_server_error",
+        message: "Resend is not configured.",
+      });
+    }
+
+    if (!emailDomain.resendDomainId) {
+      throw new DubApiError({
+        code: "internal_server_error",
+        message: "Resend domain ID is not found for this domain.",
+      });
+    }
+
+    const domainResponse = await resend.domains.get(emailDomain.resendDomainId);
+    if (domainResponse.error || !domainResponse.data) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Could not retrieve DNS records for this email domain.",
+      });
+    }
+
+    const apex = getApexDomain(`https://${emailDomain.slug}`);
+    const resendRecords = domainResponse.data.records ?? [];
+
+    if (resendRecords.length === 0) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "No DNS records available to forward for this domain.",
+      });
+    }
+
+    const records = mapResendRecordsToForwardRows({
+      records: resendRecords,
+      emailSlug: emailDomain.slug,
+      apex,
+    });
+
+    const result = await sendEmail({
+      subject: `DNS instructions for ${emailDomain.slug}`,
+      to: email,
+      react: DomainDnsInstructions({
+        email,
+        domain: emailDomain.slug,
+        records,
+        senderEmail: session.user.email,
+      }),
+    });
+
+    assertEmailSent(result);
+
+    return NextResponse.json({ ok: true });
+  },
+  {
+    requiredPlan: ["advanced", "enterprise"],
+    requiredPermissions: ["domains.write"],
+  },
+);
diff --git a/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts b/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts
index 84e562be400..6ff22fcb207 100644
--- a/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts
+++ b/apps/web/app/(ee)/api/email-domains/[domain]/verify/route.ts
@@ -1,9 +1,13 @@
 import { getEmailDomainOrThrow } from "@/lib/api/domains/get-email-domain-or-throw";
 import { DubApiError } from "@/lib/api/errors";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { assertEnv } from "@/lib/assert-env";
 import { withWorkspace } from "@/lib/auth";
+import { discoverDomainConnect } from "@/lib/domain-connect/discover";
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
 import { prisma } from "@/lib/prisma";
 import { resend } from "@dub/email/resend";
+import { getApexDomain } from "@dub/utils";
 import { NextResponse } from "next/server";
 
 // GET /api/email-domains/[domain]/verify - verify an email domain
@@ -26,39 +30,63 @@ export const GET = withWorkspace(
 
     if (!emailDomain.resendDomainId) {
       throw new DubApiError({
-        code: "not_found",
+        code: "internal_server_error",
         message: "Resend domain ID is not found for this domain.",
       });
     }
 
-    const [verificationResponse, domainResponse] = await Promise.all([
-      resend.domains.verify(emailDomain.resendDomainId),
-      resend.domains.get(emailDomain.resendDomainId),
-    ]);
+    const { data: domainData, error: domainError } = await resend.domains.get(
+      emailDomain.resendDomainId,
+    );
 
-    if (verificationResponse.error || domainResponse.error) {
+    if (domainError || !domainData) {
       throw new DubApiError({
         code: "internal_server_error",
         message:
-          verificationResponse.error?.message ||
-          domainResponse.error?.message ||
-          "Failed to verify email domain. Please try again later.",
+          domainError?.message ||
+          "Failed to retrieve email domain. Please try again later.",
       });
     }
 
-    if (emailDomain.status !== domainResponse.data.status) {
+    // Calling verify temporarily marks the domain as pending, so skip if already verified.
+    if (domainData.status !== "verified") {
+      const { error: verificationError } = await resend.domains.verify(
+        emailDomain.resendDomainId,
+      );
+
+      if (verificationError) {
+        throw new DubApiError({
+          code: "internal_server_error",
+          message:
+            verificationError.message ||
+            "Failed to verify email domain. Please try again later.",
+        });
+      }
+    }
+
+    if (emailDomain.status !== domainData.status) {
       await prisma.emailDomain.update({
         where: {
           id: emailDomain.id,
         },
         data: {
-          status: domainResponse.data.status,
+          status: domainData.status,
           lastChecked: new Date(),
         },
       });
     }
 
-    return NextResponse.json(domainResponse.data);
+    let domainConnect: DomainConnectDiscovery | null = null;
+    if (domainData.status !== "verified") {
+      assertEnv("DOMAIN_CONNECT_PRIVATE_KEY");
+      const apex = getApexDomain(`https://${emailDomain.slug}`);
+      domainConnect = await discoverDomainConnect(apex);
+    }
+
+    return NextResponse.json({
+      ...domainData,
+      domainConnect,
+    });
   },
   {
     requiredPlan: ["advanced", "enterprise"],
diff --git a/apps/web/app/(ee)/api/embed/referrals/bounties/[bountyId]/upload/route.ts b/apps/web/app/(ee)/api/embed/referrals/bounties/[bountyId]/upload/route.ts
index 8a42cbf9777..63ed7b15e64 100644
--- a/apps/web/app/(ee)/api/embed/referrals/bounties/[bountyId]/upload/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/bounties/[bountyId]/upload/route.ts
@@ -2,13 +2,13 @@ import { parseRequestBody } from "@/lib/api/utils";
 import { getBountySubmissionUploadUrl } from "@/lib/bounty/api/get-bounty-submission-upload-url";
 import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
 import { prisma } from "@/lib/prisma";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
 const bodySchema = z.object({
   fileName: z.string().trim().min(1),
-  contentType: z.string().trim().min(1),
-  contentLength: z.number().int().positive(),
+  ...signedUploadInputSchema.shape,
 });
 
 // POST /api/embed/referrals/bounties/[bountyId]/upload – get a signed R2 upload URL for a bounty submission
diff --git a/apps/web/app/(ee)/api/embed/referrals/links/[linkId]/route.ts b/apps/web/app/(ee)/api/embed/referrals/links/[linkId]/route.ts
index a6340df3fc8..0a691180053 100644
--- a/apps/web/app/(ee)/api/embed/referrals/links/[linkId]/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/links/[linkId]/route.ts
@@ -2,6 +2,7 @@ import { DubApiError, ErrorCodes } from "@/lib/api/errors";
 import { processLink, updateLink } from "@/lib/api/links";
 import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { parseRequestBody } from "@/lib/api/utils";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
 import { prisma } from "@/lib/prisma";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
@@ -61,6 +62,25 @@ export const PATCH = withReferralsEmbedToken(
 
     validatePartnerLinkUrl({ group, url });
 
+    const [groupUtmTemplate, partner] = await Promise.all([
+      group.utmTemplateId
+        ? prisma.utmTemplate.findUnique({
+            where: {
+              id: group.utmTemplateId,
+            },
+          })
+        : null,
+
+      prisma.partner.findUnique({
+        where: {
+          id: programEnrollment.partnerId,
+        },
+        select: {
+          name: true,
+        },
+      }),
+    ]);
+
     // if domain and key are the same, we don't need to check if the key exists
     const skipKeyChecks = link.key.toLowerCase() === key?.toLowerCase();
 
@@ -94,13 +114,21 @@ export const PATCH = withReferralsEmbedToken(
       });
     }
 
+    const linkWithUtm = applyGroupUtmToLink({
+      link: processedLink,
+      utmTemplate: groupUtmTemplate,
+      partnerName: partner?.name,
+    });
+
     const partnerLink = await updateLink({
       oldLink: {
         domain: link.domain,
         key: link.key,
         image: link.image,
+        programId: link.programId,
+        partnerId: link.partnerId,
       },
-      updatedLink: processedLink,
+      updatedLink: linkWithUtm,
     });
 
     waitUntil(
@@ -114,6 +142,7 @@ export const PATCH = withReferralsEmbedToken(
             webhookEnabled: true,
           },
         });
+
         if (workspace) {
           await sendWorkspaceWebhook({
             trigger: "link.updated",
diff --git a/apps/web/app/(ee)/api/embed/referrals/links/route.ts b/apps/web/app/(ee)/api/embed/referrals/links/route.ts
index f6156114fd8..385ca73aeb0 100644
--- a/apps/web/app/(ee)/api/embed/referrals/links/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/links/route.ts
@@ -2,7 +2,7 @@ import { DubApiError, ErrorCodes } from "@/lib/api/errors";
 import { createLink, processLink } from "@/lib/api/links";
 import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { parseRequestBody } from "@/lib/api/utils";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
 import { prisma } from "@/lib/prisma";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
@@ -12,7 +12,6 @@ import {
   createPartnerLinkSchema,
 } from "@/lib/zod/schemas/partners";
 import { ReferralsEmbedLinkSchema } from "@/lib/zod/schemas/referrals-embed";
-import { getUTMParamsFromURL } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
@@ -55,7 +54,7 @@ export const POST = withReferralsEmbedToken(
 
     validatePartnerLinkUrl({ group, url });
 
-    const [workspaceOwner, partnerGroup] = await Promise.all([
+    const [workspaceOwner, partnerGroup, partner] = await Promise.all([
       prisma.projectUsers.findFirst({
         where: {
           projectId: program.workspaceId,
@@ -83,6 +82,15 @@ export const POST = withReferralsEmbedToken(
           utmTemplate: true,
         },
       }),
+
+      prisma.partner.findUnique({
+        where: {
+          id: programEnrollment.partnerId,
+        },
+        select: {
+          name: true,
+        },
+      }),
     ]);
 
     // shouldn't happen but just in case
@@ -99,12 +107,6 @@ export const POST = withReferralsEmbedToken(
       payload: {
         key: key || undefined,
         url: linkUrl,
-        ...(partnerGroup.utmTemplate
-          ? {
-              ...extractUtmParams(partnerGroup.utmTemplate),
-              ...getUTMParamsFromURL(linkUrl),
-            }
-          : {}),
         domain: program.domain,
         programId: program.id,
         folderId: program.defaultFolderId,
@@ -130,7 +132,13 @@ export const POST = withReferralsEmbedToken(
       });
     }
 
-    const partnerLink = await createLink(link);
+    const linkWithUtm = applyGroupUtmToLink({
+      link,
+      utmTemplate: partnerGroup.utmTemplate,
+      partnerName: partner?.name,
+    });
+
+    const partnerLink = await createLink(linkWithUtm);
 
     // this should always be present but just in case
     const workspace = workspaceOwner?.project;
diff --git a/apps/web/app/(ee)/api/embed/referrals/tremendous/send-otp/route.ts b/apps/web/app/(ee)/api/embed/referrals/tremendous/send-otp/route.ts
index 2364e85afbd..346c15dcedf 100644
--- a/apps/web/app/(ee)/api/embed/referrals/tremendous/send-otp/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/tremendous/send-otp/route.ts
@@ -5,11 +5,10 @@ import { EMAIL_OTP_EXPIRY_IN } from "@/lib/auth/constants";
 import { extractEmailDomain } from "@/lib/email/extract-email-domain";
 import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
 import { prisma } from "@/lib/prisma";
-import {
-  TREMENDOUS_ENABLED_PROGRAM_IDS,
-  TREMENDOUS_PROHIBITED_TOP_LEVEL_DOMAINS,
-} from "@/lib/tremendous/constants";
-import { ratelimit, redis } from "@/lib/upstash";
+import { TREMENDOUS_PROHIBITED_TOP_LEVEL_DOMAINS } from "@/lib/tremendous/constants";
+import { redis } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { emailSchema } from "@/lib/zod/schemas/auth";
 import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { sendEmail } from "@dub/email";
@@ -33,26 +32,13 @@ export const POST = withReferralsEmbedToken(
       });
     }
 
-    if (!TREMENDOUS_ENABLED_PROGRAM_IDS.includes(programEnrollment.programId)) {
-      throw new DubApiError({
-        code: "forbidden",
-        message: "Gift card payouts are not available for this program.",
-      });
-    }
-
     const { email } = sendOtpSchema.parse(await parseRequestBody(req));
     const { partnerId } = programEnrollment;
 
-    const { success } = await ratelimit(10, "24 h").limit(
-      `tremendous-send-otp:${partnerId}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many requests. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.tremendousSendOtp,
+      identifier: partnerId,
+    });
 
     const emailDomain = extractEmailDomain(email)!;
 
diff --git a/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts b/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
index 0591fa3088d..b07f3c2e350 100644
--- a/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
+++ b/apps/web/app/(ee)/api/embed/referrals/tremendous/verify-otp/route.ts
@@ -3,11 +3,10 @@ import { parseRequestBody } from "@/lib/api/utils";
 import { extractEmailDomain } from "@/lib/email/extract-email-domain";
 import { withReferralsEmbedToken } from "@/lib/embed/referrals/auth";
 import { prisma } from "@/lib/prisma";
-import {
-  TREMENDOUS_ENABLED_PROGRAM_IDS,
-  TREMENDOUS_PROHIBITED_TOP_LEVEL_DOMAINS,
-} from "@/lib/tremendous/constants";
-import { ratelimit, redis } from "@/lib/upstash";
+import { TREMENDOUS_PROHIBITED_TOP_LEVEL_DOMAINS } from "@/lib/tremendous/constants";
+import { redis } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { emailSchema } from "@/lib/zod/schemas/auth";
 import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { TREMENDOUS_SUPPORTED_COUNTRIES } from "@dub/utils";
@@ -31,26 +30,13 @@ export const POST = withReferralsEmbedToken(
       });
     }
 
-    if (!TREMENDOUS_ENABLED_PROGRAM_IDS.includes(programEnrollment.programId)) {
-      throw new DubApiError({
-        code: "forbidden",
-        message: "Gift card payouts are not available for this program.",
-      });
-    }
-
     const { email, code } = verifyOtpSchema.parse(await parseRequestBody(req));
     const { partnerId } = programEnrollment;
 
-    const { success } = await ratelimit(10, "24 h").limit(
-      `tremendous-verify-otp:${partnerId}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many requests. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.tremendousVerifyOtp,
+      identifier: partnerId,
+    });
 
     const emailDomain = extractEmailDomain(email)!;
 
diff --git a/apps/web/app/(ee)/api/google-ads/conversion-actions/route.ts b/apps/web/app/(ee)/api/google-ads/conversion-actions/route.ts
index 58e335cf0b6..6605dd76640 100644
--- a/apps/web/app/(ee)/api/google-ads/conversion-actions/route.ts
+++ b/apps/web/app/(ee)/api/google-ads/conversion-actions/route.ts
@@ -2,7 +2,7 @@ import { DubApiError } from "@/lib/api/errors";
 import { withWorkspace } from "@/lib/auth";
 import {
   GoogleAdsApi,
-  inferLoginCustomerId,
+  getLoginCustomerIdCandidates,
 } from "@/lib/integrations/google-ads/api";
 import { googleAdsOAuthProvider } from "@/lib/integrations/google-ads/oauth";
 import { googleAdsSettingsSchema } from "@/lib/integrations/google-ads/schema";
@@ -54,23 +54,48 @@ export const GET = withWorkspace(
       });
     }
 
-    const loginCustomerId = inferLoginCustomerId({
+    const candidates = getLoginCustomerIdCandidates({
       customers: currentSettings.customers,
       selectedCustomerId: customerId,
+      loginCustomerId: currentSettings.loginCustomerId,
     });
 
-    const googleAdsApi = new GoogleAdsApi({
-      accessToken: token.access_token,
-      loginCustomerId,
-      customerId,
-    });
+    let lastError: unknown;
+
+    for (const loginCustomerId of candidates) {
+      try {
+        const googleAdsApi = new GoogleAdsApi({
+          accessToken: token.access_token,
+          loginCustomerId,
+          customerId,
+        });
+
+        const conversionActions =
+          await googleAdsApi.listUploadClickConversionActions(customerId);
+
+        return NextResponse.json({
+          conversionActions,
+          loginCustomerId,
+        });
+      } catch (error) {
+        lastError = error;
 
-    const conversionActions =
-      await googleAdsApi.listUploadClickConversionActions(customerId);
+        const message = error instanceof Error ? error.message : String(error);
+
+        if (!message.includes("USER_PERMISSION_DENIED")) {
+          throw error;
+        }
+      }
+    }
+
+    if (lastError instanceof Error) {
+      throw lastError;
+    }
 
-    return NextResponse.json({
-      conversionActions,
-      loginCustomerId,
+    throw new DubApiError({
+      code: "forbidden",
+      message:
+        "The Google Ads user does not have permission to access this account.",
     });
   },
   {
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default-links/[defaultLinkId]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default-links/[defaultLinkId]/route.ts
index 52a46c11bab..7269d355fa9 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default-links/[defaultLinkId]/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default-links/[defaultLinkId]/route.ts
@@ -1,4 +1,4 @@
-import { queueDomainUpdate } from "@/lib/api/domains/queue-domain-update";
+import { updateProgramDomain } from "@/lib/api/domains/update-program-domain";
 import { DubApiError } from "@/lib/api/errors";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
@@ -70,34 +70,11 @@ export const PATCH = withWorkspace(
     // - Update all default links across groups to use the new domain
     // - Update all partner links to use the new domain (via cron job)
     if (domain !== defaultLink.domain) {
-      await prisma.$transaction([
-        prisma.program.update({
-          where: {
-            id: programId,
-          },
-          data: {
-            domain,
-          },
-        }),
-
-        prisma.partnerGroupDefaultLink.updateMany({
-          where: {
-            programId,
-          },
-          data: {
-            domain,
-          },
-        }),
-      ]);
-
-      // Queue domain update for all partner links
-      waitUntil(
-        queueDomainUpdate({
-          newDomain: domain,
-          oldDomain: defaultLink.domain,
-          programId,
-        }),
-      );
+      await updateProgramDomain({
+        programId,
+        oldDomain: defaultLink.domain,
+        newDomain: domain,
+      });
     }
 
     if (url !== defaultLink.url) {
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
index 53cd17877d1..b0cf1d956fa 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
@@ -1,13 +1,12 @@
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { withWorkspace } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { DEFAULT_PARTNER_GROUP, GroupSchema } from "@/lib/zod/schemas/groups";
 import { RESOURCE_COLORS } from "@/ui/colors";
 import { nanoid, randomValue } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
-import { waitUntil } from "@vercel/functions";
-import { revalidatePath } from "next/cache";
 import { NextResponse } from "next/server";
 
 // POST /api/groups/[groupIdOrSlug]/default – set a group as default
@@ -27,13 +26,6 @@ export const POST = withWorkspace(
             slug: DEFAULT_PARTNER_GROUP.slug,
           },
         },
-        include: {
-          program: {
-            select: {
-              slug: true,
-            },
-          },
-        },
       }),
     ]);
 
@@ -92,16 +84,7 @@ export const POST = withWorkspace(
       });
     });
 
-    const programSlug = currentDefaultGroup.program.slug;
-
-    // need to revalidate the program's cached public pages
-    waitUntil(
-      Promise.allSettled([
-        revalidatePath(`/partners.dub.co/${programSlug}`),
-        revalidatePath(`/partners.dub.co/${programSlug}/apply`),
-        revalidatePath(`/partners.dub.co/${programSlug}/apply/success`),
-      ]),
-    );
+    revalidateProgramPublicPages(programId);
 
     return NextResponse.json(GroupSchema.parse(updatedGroup));
   },
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
index 28541b2c3cf..81300bccd06 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/partners/route.ts
@@ -1,4 +1,3 @@
-import { DubApiError } from "@/lib/api/errors";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { movePartnersToGroup } from "@/lib/api/groups/move-partners-to-group";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
@@ -23,19 +22,10 @@ export const POST = withWorkspace(
       includeExpandedFields: true,
     });
 
-    let { partnerIds, groupMoveDisabledAt } = addPartnersToGroupSchema.parse(
+    const { partnerIds, groupMoveDisabledAt } = addPartnersToGroupSchema.parse(
       await parseRequestBody(req),
     );
 
-    partnerIds = [...new Set(partnerIds)];
-
-    if (partnerIds.length === 0) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: "At least one partner ID is required.",
-      });
-    }
-
     const count = await movePartnersToGroup({
       workspaceId: workspace.id,
       programId,
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
index 5b8a8fc5d55..c48e1e8cc98 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/route.ts
@@ -1,14 +1,13 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { DubApiError } from "@/lib/api/errors";
+import { deletePartnerGroup } from "@/lib/api/groups/delete-group";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
-import { movePartnersToGroup } from "@/lib/api/groups/move-partners-to-group";
-import { removeGroupIdFromMoveRules } from "@/lib/api/groups/remove-group-id-from-move-rules";
 import { upsertGroupMoveRules } from "@/lib/api/groups/upsert-group-move-rules";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
 import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
 import { withWorkspace } from "@/lib/auth";
-import { qstash } from "@/lib/cron";
+import { syncGroupUtmJob } from "@/lib/jobs/handlers/sync-group-utm-job";
 import { prisma } from "@/lib/prisma";
 import { GroupWithProgramSchema } from "@/lib/zod/schemas/group-with-program";
 import {
@@ -17,7 +16,7 @@ import {
   sanitizeAdditionalLinks,
   updateGroupSchema,
 } from "@/lib/zod/schemas/groups";
-import { APP_DOMAIN_WITH_NGROK, constructURLFromUTMParams } from "@dub/utils";
+import { constructURLFromUTMParams } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
@@ -160,6 +159,7 @@ export const PATCH = withWorkspace(
           leadReward: true,
           saleReward: true,
           referralReward: true,
+          customReward: true,
           discount: true,
         },
       }),
@@ -241,11 +241,8 @@ export const PATCH = withWorkspace(
           }),
 
           group.utmTemplateId !== updatedGroup.utmTemplateId &&
-            qstash.publishJSON({
-              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/sync-utm`,
-              body: {
-                groupId: group.id,
-              },
+            syncGroupUtmJob.dispatch({
+              groupId: group.id,
             }),
         ]);
       })(),
@@ -265,31 +262,20 @@ export const DELETE = withWorkspace(
     const programId = getDefaultProgramIdOrThrow(workspace);
     const { groupIdOrSlug } = params;
 
-    const [group, defaultGroup] = await Promise.all([
-      prisma.partnerGroup.findUniqueOrThrow({
-        where: {
-          ...(groupIdOrSlug.startsWith("grp_")
-            ? {
-                id: groupIdOrSlug,
-              }
-            : {
-                programId_slug: {
-                  programId,
-                  slug: groupIdOrSlug,
-                },
-              }),
-        },
-      }),
-
-      prisma.partnerGroup.findUniqueOrThrow({
-        where: {
-          programId_slug: {
-            programId,
-            slug: DEFAULT_PARTNER_GROUP.slug,
-          },
-        },
-      }),
-    ]);
+    const group = await prisma.partnerGroup.findUniqueOrThrow({
+      where: {
+        ...(groupIdOrSlug.startsWith("grp_")
+          ? {
+              id: groupIdOrSlug,
+            }
+          : {
+              programId_slug: {
+                programId,
+                slug: groupIdOrSlug,
+              },
+            }),
+      },
+    });
 
     if (group.programId !== programId) {
       throw new DubApiError({
@@ -298,120 +284,28 @@ export const DELETE = withWorkspace(
       });
     }
 
-    if (group.slug === DEFAULT_PARTNER_GROUP.slug) {
-      throw new DubApiError({
-        code: "forbidden",
-        message: "You cannot delete the default group of your program.",
-      });
-    }
+    await deletePartnerGroup(group);
 
-    while (true) {
-      const programEnrollments = await prisma.programEnrollment.findMany({
-        where: {
-          groupId: group.id,
-        },
-        take: 100,
-      });
-      if (programEnrollments.length === 0) {
-        break;
-      }
-      const count = await movePartnersToGroup({
+    waitUntil(
+      recordAuditLog({
         workspaceId: workspace.id,
         programId,
-        partnerIds: programEnrollments.map(({ partnerId }) => partnerId),
-        userId: session.user.id,
-        group: defaultGroup,
-        isGroupDeleted: true,
-      });
-      console.log(`Moved ${count} partners to the default group`);
-    }
-
-    let shouldDeleteGroupRewards = false;
-
-    const groupRewardIds = [
-      group.clickRewardId,
-      group.leadRewardId,
-      group.saleRewardId,
-      group.referralRewardId,
-    ].filter(Boolean) as string[];
-
-    if (groupRewardIds.length > 0) {
-      const groupRewardCommissions = await prisma.commission.count({
-        where: {
-          programId,
-          rewardId: {
-            in: groupRewardIds,
-          },
-        },
-        take: 100,
-      });
-      if (groupRewardCommissions === 0) {
-        shouldDeleteGroupRewards = true;
-      }
-    }
-
-    const deletedGroup = await prisma.$transaction(async (tx) => {
-      // 1. Delete the group's rewards (if no commissions are associated with the rewards)
-      if (shouldDeleteGroupRewards) {
-        await tx.reward.deleteMany({
-          where: {
-            id: {
-              in: groupRewardIds,
-            },
+        action: "group.deleted",
+        description: `Group ${group.name} (${group.id}) deleted`,
+        actor: session.user,
+        targets: [
+          {
+            type: "group",
+            id: group.id,
+            metadata: group,
           },
-        });
-      }
-
-      // Note: we can't delete this group's discount yet because it is needed
-      // for `remap-discount-codes` that runs in movePartnersToGroup
-      // but we will delete the Discount in `remap-discount-codes` once there are no remaining discount codes.
-
-      // 2. Delete the group move workflow
-      if (group.workflowId) {
-        await tx.workflow.delete({
-          where: {
-            id: group.workflowId,
-          },
-        });
-      }
-
-      // 3. Delete the group
-      await tx.partnerGroup.delete({
-        where: {
-          id: group.id,
-        },
-      });
+        ],
+      }),
+    );
 
-      return true;
+    return NextResponse.json({
+      id: group.id,
     });
-
-    if (deletedGroup) {
-      waitUntil(
-        Promise.allSettled([
-          recordAuditLog({
-            workspaceId: workspace.id,
-            programId,
-            action: "group.deleted",
-            description: `Group ${group.name} (${group.id}) deleted`,
-            actor: session.user,
-            targets: [
-              {
-                type: "group",
-                id: group.id,
-                metadata: group,
-              },
-            ],
-          }),
-
-          removeGroupIdFromMoveRules({
-            programId,
-            groupId: group.id,
-          }),
-        ]),
-      );
-    }
-
-    return NextResponse.json({ id: group.id });
   },
   {
     requiredPermissions: ["groups.write"],
diff --git a/apps/web/app/(ee)/api/groups/route.ts b/apps/web/app/(ee)/api/groups/route.ts
index 9bbb4547bca..dda6423b7f1 100644
--- a/apps/web/app/(ee)/api/groups/route.ts
+++ b/apps/web/app/(ee)/api/groups/route.ts
@@ -151,6 +151,7 @@ export const POST = withWorkspace(
           leadReward: true,
           saleReward: true,
           referralReward: true,
+          customReward: true,
           discount: true,
         },
       });
diff --git a/apps/web/app/(ee)/api/hubspot/webhook/route.ts b/apps/web/app/(ee)/api/hubspot/webhook/route.ts
index 7e2b4f49b77..1f1f814d93b 100644
--- a/apps/web/app/(ee)/api/hubspot/webhook/route.ts
+++ b/apps/web/app/(ee)/api/hubspot/webhook/route.ts
@@ -1,6 +1,7 @@
 import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { withAxiom } from "@/lib/axiom/server";
 import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import crypto from "crypto";
 import { logAndRespond } from "../../cron/utils";
@@ -35,8 +36,8 @@ export const POST = withAxiom(async (req) => {
       .update(sourceString)
       .digest("hex");
 
-    // Compare with provided signature
-    if (signature !== expectedHash) {
+    // Compare with provided signature using constant-time comparison
+    if (!timingSafeCompare(signature, expectedHash)) {
       throw new DubApiError({
         code: "unauthorized",
         message: "Invalid webhook signature.",
diff --git a/apps/web/app/(ee)/api/intercom/webhook/process/conversation-admin-replied.ts b/apps/web/app/(ee)/api/intercom/webhook/process/conversation-admin-replied.ts
index 813187abd00..08903919f43 100644
--- a/apps/web/app/(ee)/api/intercom/webhook/process/conversation-admin-replied.ts
+++ b/apps/web/app/(ee)/api/intercom/webhook/process/conversation-admin-replied.ts
@@ -9,13 +9,13 @@ import {
   IntercomCredentials,
   intercomCredentialsSchema,
 } from "@/lib/integrations/intercom/schema";
-import { PROGRAM_ALLOWED_ATTACHMENT_TYPES } from "@/lib/messages/constants";
 import {
   mapMessageAttachmentsForCreate,
   sanitizeFileName,
 } from "@/lib/messages/utils";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import {
   APP_DOMAIN_WITH_NGROK,
   fetchWithTimeout,
@@ -38,7 +38,7 @@ export async function handleConversationAdminReplied({
   data: z.infer<typeof intercomConversationRepliedSchema>;
   program: Pick<Program, "id" | "workspaceId">;
   installation: Pick<InstalledIntegration, "credentials" | "userId">;
-}): Promise<string> {
+}): Promise<{ message: string; partnersFound: boolean }> {
   const credentials = intercomCredentialsSchema.parse(installation.credentials);
 
   const partners = await identifyPartnersFromContacts({
@@ -48,7 +48,10 @@ export async function handleConversationAdminReplied({
   });
 
   if (partners.length === 0) {
-    return `No partners found for ${pluralize("contact", data.item.contacts.contacts.length)} ${data.item.contacts.contacts.map((contact) => contact.id).join(", ")}. Skipping message forwarding.`;
+    return {
+      message: `No partners found for ${pluralize("contact", data.item.contacts.contacts.length)} ${data.item.contacts.contacts.map((contact) => contact.id).join(", ")}. Skipping message forwarding.`,
+      partnersFound: false,
+    };
   }
 
   const { conversation_parts: conversations } = data.item.conversation_parts;
@@ -154,7 +157,10 @@ export async function handleConversationAdminReplied({
     ),
   );
 
-  return `Message forwarded to ${pluralize("partner", partners.length)}.`;
+  return {
+    message: `Message forwarded to ${pluralize("partner", partners.length)}.`,
+    partnersFound: true,
+  };
 }
 
 async function resolveWorkspaceUser({
@@ -282,9 +288,24 @@ async function uploadIntercomAttachments({
   >[] = [];
 
   const externalAttachments: { name: string; url: string }[] = [];
+  const attachmentPolicy = UPLOAD_POLICIES.programMessageAttachments;
+  const attachmentTypes = attachmentPolicy.contentTypes as readonly string[];
+  const maxBytes = attachmentPolicy.maxBytes;
 
   for (const attachment of attachments) {
     try {
+      if (!attachmentTypes.includes(attachment.content_type)) {
+        throw new Error(
+          `Unsupported attachment type: ${attachment.content_type}`,
+        );
+      }
+
+      if (attachment.filesize > maxBytes) {
+        throw new Error(
+          `Attachment exceeds maximum size of ${maxBytes / 1024 / 1024}MB`,
+        );
+      }
+
       const response = await fetchWithTimeout(
         attachment.url,
         {
@@ -293,22 +314,18 @@ async function uploadIntercomAttachments({
         30000,
       );
 
-      if (
-        !PROGRAM_ALLOWED_ATTACHMENT_TYPES.includes(
-          attachment.content_type as (typeof PROGRAM_ALLOWED_ATTACHMENT_TYPES)[number],
-        )
-      ) {
-        throw new Error(
-          `Unsupported attachment type: ${attachment.content_type}`,
-        );
-      }
-
       if (!response.ok) {
         throw new Error(`Failed to fetch attachment: ${response.status}`);
       }
 
       const blob = await response.blob();
 
+      if (blob.size > maxBytes) {
+        throw new Error(
+          `Attachment exceeds maximum size of ${maxBytes / 1024 / 1024}MB`,
+        );
+      }
+
       const name = (attachment.name.trim() || "attachment").slice(0, 191);
       const storageKey = `messages/${programId}/${nanoid(10)}/${sanitizeFileName(name)}`;
 
@@ -324,7 +341,7 @@ async function uploadIntercomAttachments({
       storedAttachments.push({
         name: attachment.name?.trim() || "attachment",
         type: attachment.content_type,
-        size: attachment.filesize,
+        size: blob.size,
         storageKey,
       });
     } catch (error) {
diff --git a/apps/web/app/(ee)/api/intercom/webhook/process/route.ts b/apps/web/app/(ee)/api/intercom/webhook/process/route.ts
index c597878c685..1fc04254e14 100644
--- a/apps/web/app/(ee)/api/intercom/webhook/process/route.ts
+++ b/apps/web/app/(ee)/api/intercom/webhook/process/route.ts
@@ -80,29 +80,32 @@ export const POST = withAxiom(async (req) => {
       return logAndRespond(`[Intercom] Program ${program.id} is deactivated.`);
     }
 
-    let response: Awaited<ReturnType<typeof handleConversationAdminReplied>> =
-      "";
+    let result:
+      | Awaited<ReturnType<typeof handleConversationAdminReplied>>
+      | undefined;
 
     if (topic === "conversation.admin.replied") {
-      response = await handleConversationAdminReplied({
+      result = await handleConversationAdminReplied({
         data,
         program,
         installation,
       });
     }
 
-    await captureWebhookLog({
-      workspaceId,
-      method: "POST",
-      path: "/intercom/webhook",
-      statusCode: 200,
-      duration: Date.now() - startTime,
-      requestBody: body,
-      responseBody: response,
-      userAgent: req.headers.get("user-agent"),
-    });
+    if (result?.partnersFound) {
+      await captureWebhookLog({
+        workspaceId,
+        method: "POST",
+        path: "/intercom/webhook",
+        statusCode: 200,
+        duration: Date.now() - startTime,
+        requestBody: body,
+        responseBody: result.message,
+        userAgent: req.headers.get("user-agent"),
+      });
+    }
 
-    return logAndRespond(response);
+    return logAndRespond(result?.message ?? "Webhook processed successfully.");
   } catch (error) {
     const response = handleAndReturnErrorResponse(error);
 
diff --git a/apps/web/app/(ee)/api/intercom/webhook/verify-webhook-signature.ts b/apps/web/app/(ee)/api/intercom/webhook/verify-webhook-signature.ts
index eea03538519..9152b0136c8 100644
--- a/apps/web/app/(ee)/api/intercom/webhook/verify-webhook-signature.ts
+++ b/apps/web/app/(ee)/api/intercom/webhook/verify-webhook-signature.ts
@@ -1,4 +1,5 @@
 import { DubApiError } from "@/lib/api/errors";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import crypto from "crypto";
 
 const INTERCOM_CLIENT_SECRET = process.env.INTERCOM_CLIENT_SECRET || "";
@@ -51,22 +52,7 @@ export async function verifyIntercomWebhookSignature(
     });
   }
 
-  const providedBuffer = Buffer.from(providedSignature, "utf8");
-  const expectedBuffer = Buffer.from(expectedSignature, "utf8");
-
-  if (providedBuffer.length !== expectedBuffer.length) {
-    throw new DubApiError({
-      code: "unauthorized",
-      message: "Invalid webhook signature.",
-    });
-  }
-
-  const isSignatureValid = crypto.timingSafeEqual(
-    Uint8Array.from(providedBuffer),
-    Uint8Array.from(expectedBuffer),
-  );
-
-  if (!isSignatureValid) {
+  if (!timingSafeCompare(providedSignature, expectedSignature)) {
     throw new DubApiError({
       code: "unauthorized",
       message: "Invalid webhook signature.",
diff --git a/apps/web/app/(ee)/api/marketplace/programs/counts/route.ts b/apps/web/app/(ee)/api/marketplace/programs/counts/route.ts
new file mode 100644
index 00000000000..91c59fc0597
--- /dev/null
+++ b/apps/web/app/(ee)/api/marketplace/programs/counts/route.ts
@@ -0,0 +1,21 @@
+import { getNetworkProgramCounts } from "@/lib/fetchers/get-network-program-counts";
+import { parsePublicMarketplaceQuery } from "@/lib/marketplace/parse-public-marketplace-query";
+import { NextResponse } from "next/server";
+
+// cache filtered/searched count responses at the edge (public, not partner-scoped)
+export const revalidate = 3600;
+
+// GET /api/marketplace/programs/counts - public marketplace total + filter counts
+export async function GET(req: Request) {
+  const searchParams = Object.fromEntries(new URL(req.url).searchParams);
+  const { category, rewardType, search } =
+    parsePublicMarketplaceQuery(searchParams);
+
+  const counts = await getNetworkProgramCounts({
+    category,
+    rewardType,
+    search,
+  });
+
+  return NextResponse.json(counts);
+}
diff --git a/apps/web/app/(ee)/api/marketplace/programs/route.ts b/apps/web/app/(ee)/api/marketplace/programs/route.ts
new file mode 100644
index 00000000000..fb5361b9270
--- /dev/null
+++ b/apps/web/app/(ee)/api/marketplace/programs/route.ts
@@ -0,0 +1,16 @@
+import { getPublicNetworkPrograms } from "@/lib/fetchers/get-public-network-programs";
+import { parsePublicMarketplaceQuery } from "@/lib/marketplace/parse-public-marketplace-query";
+import { NextResponse } from "next/server";
+
+// cache filtered/searched list responses at the edge (public, not partner-scoped)
+export const revalidate = 3600;
+
+// GET /api/marketplace/programs - public marketplace program list
+export async function GET(req: Request) {
+  const searchParams = Object.fromEntries(new URL(req.url).searchParams);
+  const params = parsePublicMarketplaceQuery(searchParams);
+
+  const programs = await getPublicNetworkPrograms(params);
+
+  return NextResponse.json(programs);
+}
diff --git a/apps/web/app/(ee)/api/network/programs/count/route.ts b/apps/web/app/(ee)/api/network/programs/count/route.ts
index 8c55c42c9e6..1a98bd5a646 100644
--- a/apps/web/app/(ee)/api/network/programs/count/route.ts
+++ b/apps/web/app/(ee)/api/network/programs/count/route.ts
@@ -1,62 +1,23 @@
 import { withPartnerProfile } from "@/lib/auth/partner";
+import { buildNetworkProgramCountWhereSql } from "@/lib/fetchers/get-network-program-counts";
 import { prisma } from "@/lib/prisma";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
 import { getNetworkProgramsCountQuerySchema } from "@/lib/zod/schemas/program-network";
-import { Prisma } from "@prisma/client";
 import { NextResponse } from "next/server";
 
-const rewardTypeMap = {
-  sale: Prisma.sql`pg.saleRewardId IS NOT NULL`,
-  lead: Prisma.sql`pg.leadRewardId IS NOT NULL`,
-  click: Prisma.sql`pg.clickRewardId IS NOT NULL`,
-  discount: Prisma.sql`pg.discountId IS NOT NULL`,
-};
-
 // GET /api/network/programs/count - get the number of available programs in the network
 export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
   const { groupBy, category, rewardType, status, featured, search } =
     getNetworkProgramsCountQuerySchema.parse(searchParams);
 
-  const searchSql = search ? Prisma.sql`CONCAT('%', ${search}, '%')` : null;
-  const commonWhereSql = Prisma.sql`
-    p.addedToMarketplaceAt IS NOT NULL
-    AND EXISTS (
-      SELECT 1 FROM PartnerGroup pg
-      WHERE
-        pg.programId = p.id 
-        AND pg.slug = ${DEFAULT_PARTNER_GROUP.slug}
-        AND pg.applicationFormPublishedAt IS NOT NULL
-        ${
-          rewardType && groupBy !== "rewardType"
-            ? Prisma.sql`
-              AND ${rewardTypeMap[rewardType]}`
-            : Prisma.sql``
-        }
-    )
-    ${
-      category && groupBy !== "category"
-        ? Prisma.sql`
-          AND EXISTS (
-            SELECT 1 FROM ProgramCategory pc
-            WHERE pc.programId = p.id AND pc.category = ${category}
-          )`
-        : Prisma.sql``
-    }
-    ${
-      status !== undefined && groupBy !== "status"
-        ? Prisma.sql`
-          AND ${status === null ? Prisma.sql`NOT` : Prisma.sql``} EXISTS (
-            SELECT 1 FROM ProgramEnrollment pe
-            WHERE
-              pe.programId = p.id 
-              AND pe.partnerId = ${partner.id}
-              ${status === null ? Prisma.sql`` : Prisma.sql`AND pe.status = ${status}`}
-          )`
-        : Prisma.sql``
-    }
-    ${featured !== undefined ? Prisma.sql`AND p.featuredOnMarketplaceAt IS ${featured ? Prisma.sql`NOT` : Prisma.sql``} NULL` : Prisma.sql``}
-    ${searchSql ? Prisma.sql`AND (p.name LIKE ${searchSql} OR p.slug LIKE ${searchSql} OR p.domain LIKE ${searchSql})` : Prisma.sql``}
-  `;
+  const commonWhereSql = buildNetworkProgramCountWhereSql({
+    category: groupBy === "category" ? undefined : category,
+    rewardType: groupBy === "rewardType" ? undefined : rewardType,
+    status: groupBy === "status" ? undefined : status,
+    partnerId: partner.id,
+    featured,
+    search,
+  });
 
   if (groupBy === "category") {
     const categories = (await prisma.$queryRaw`
@@ -97,7 +58,7 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
       SELECT pe.status, COUNT(p.id) AS _count
       FROM Program p
       LEFT JOIN ProgramEnrollment pe ON p.id = pe.programId AND pe.partnerId = ${partner.id}
-      WHERE p.addedToMarketplaceAt IS NOT NULL AND ${commonWhereSql}
+      WHERE ${commonWhereSql}
       GROUP BY pe.status
       ORDER BY _count DESC
     `) as { status: string | null; _count: bigint }[];
diff --git a/apps/web/app/(ee)/api/partner-profile/invites/route.ts b/apps/web/app/(ee)/api/partner-profile/invites/route.ts
index c9e7eafac6f..a5a976e49f1 100644
--- a/apps/web/app/(ee)/api/partner-profile/invites/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/invites/route.ts
@@ -2,10 +2,7 @@ import { DubApiError } from "@/lib/api/errors";
 import { invitePartnerUser } from "@/lib/api/partners/invite-partner-user";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withPartnerProfile } from "@/lib/auth/partner";
-import {
-  MAX_INVITES_PER_REQUEST,
-  MAX_PARTNER_USERS,
-} from "@/lib/constants/partner-profile";
+import { MAX_INVITES_PER_REQUEST } from "@/lib/constants/partner-profile";
 import { prisma } from "@/lib/prisma";
 import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
 import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
@@ -132,11 +129,11 @@ export const POST = withPartnerProfile(
 
     if (
       partnerInvitesCount + partnerUsersCount + invites.length >
-      MAX_PARTNER_USERS
+      partner.usersLimit
     ) {
       throw new DubApiError({
         code: "exceeded_limit",
-        message: `You can only have ${MAX_PARTNER_USERS} members in this partner profile.`,
+        message: `You can only have ${partner.usersLimit} members in this partner profile.`,
       });
     }
 
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
index 090d5dbe154..012f12d60c1 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/export/route.ts
@@ -15,7 +15,8 @@ import {
   LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,
   MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
 } from "@/lib/constants/partner-profile";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
 import { parseFilterValue, toCentsNumber } from "@dub/utils";
 
@@ -24,17 +25,10 @@ export const maxDuration = 300;
 // GET /api/partner-profile/programs/[programId]/analytics/export – get export data for partner profile analytics
 export const GET = withPartnerProfile(
   async ({ partner, params, searchParams }) => {
-    const { success } = await ratelimit(1, "30 s").limit(
-      `analyticsExport:partner:${partner.id}:${params.programId}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "Analytics export is limited to once every 30 seconds. Please try again shortly.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.partnerAnalyticsExport,
+      identifier: [partner.id, params.programId],
+    });
 
     const { program, links, totalCommissions } =
       await getProgramEnrollmentOrThrow({
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
index 442fe0c2baa..bd4945c79e6 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/analytics/route.ts
@@ -9,7 +9,7 @@ import {
   MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING,
 } from "@/lib/constants/partner-profile";
 import { partnerProfileAnalyticsQuerySchema } from "@/lib/zod/schemas/partner-profile";
-import { parseFilterValue, toCentsNumber } from "@dub/utils";
+import { parseFilterValue, serializeError, toCentsNumber } from "@dub/utils";
 import { NextResponse } from "next/server";
 
 // GET /api/partner-profile/programs/[programId]/analytics – get analytics for a program enrollment link
@@ -81,21 +81,34 @@ export const GET = withPartnerProfile(
       };
     }
 
-    const response = await getAnalytics({
-      ...(LARGE_PROGRAM_IDS.includes(program.id) &&
-      toCentsNumber(totalCommissions) <
-        LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
-        ? { event: parsedParams.event, groupBy: "count", interval: "all" }
-        : parsedParams),
-      workspaceId: program.workspaceId,
-      ...(parsedParams.linkId
-        ? { linkId: parsedParams.linkId }
-        : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
-          ? { partnerId: partner.id }
-          : { linkId: parseFilterValue(links.map((link) => link.id)) }),
-      dataAvailableFrom: program.startedAt ?? program.createdAt,
-    });
+    try {
+      const response = await getAnalytics({
+        ...(LARGE_PROGRAM_IDS.includes(program.id) &&
+        toCentsNumber(totalCommissions) <
+          LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
+          ? { event: parsedParams.event, groupBy: "count", interval: "all" }
+          : parsedParams),
+        workspaceId: program.workspaceId,
+        ...(parsedParams.linkId
+          ? { linkId: parsedParams.linkId }
+          : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
+            ? { partnerId: partner.id }
+            : { linkId: parseFilterValue(links.map((link) => link.id)) }),
+        dataAvailableFrom: program.startedAt ?? program.createdAt,
+      });
+
+      return NextResponse.json(response);
+    } catch (error) {
+      // Tinybird times out after 30s on heavy partner queries; return a 400
+      // instead of 500 so the UI can show a retry hint.
+      if (serializeError(error).includes("Timeout exceeded")) {
+        throw new DubApiError({
+          code: "bad_request",
+          message: "Failed to fetch analytics. Refresh the page and try again.",
+        });
+      }
 
-    return NextResponse.json(response);
+      throw error;
+    }
   },
 );
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts
index d824958ddff..91bdd8d062f 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/[customerId]/route.ts
@@ -5,6 +5,7 @@ import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-cust
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { withPartnerProfile } from "@/lib/auth/partner";
 import {
+  CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS,
   LARGE_PROGRAM_IDS,
   LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,
 } from "@/lib/constants/partner-profile";
@@ -66,41 +67,58 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
     });
   }
 
+  const partnerLinkIds = links.map((link) => link.id);
+
   const events = await getCustomerEvents({
     customerId: customer.id,
-    linkIds: links.map((link) => link.id),
+    linkIds: partnerLinkIds,
     includeMetadata: false,
   });
 
-  if (events.length === 0) {
+  // if there are events between the partner-customer, use the last event's link id
+  // else, check if the customer.linkId actually belongs to the partner
+  // if it does, use it, otherwise, throw an error
+  const attributedPartnerLinkId =
+    events.length > 0
+      ? events[events.length - 1].link_id
+      : customer.linkId && partnerLinkIds.includes(customer.linkId)
+        ? customer.linkId
+        : null;
+
+  if (!attributedPartnerLinkId) {
     throw new DubApiError({
       code: "not_found",
       message: "Customer is not attributed to any links by this partner.",
     });
   }
 
-  // get the first partner link that this customer interacted with
-  const firstLinkId = events[events.length - 1].link_id;
-  const link = links.find((link) => link.id === firstLinkId);
+  // get the partner link that this customer interacted with
+  const link = links.find((link) => link.id === attributedPartnerLinkId);
 
   return NextResponse.json(
     PartnerProfileCustomerSchema.extend({
       ...(customerDataSharingEnabledAt && { name: z.string().nullish() }),
-    }).parse({
-      ...transformCustomer({
-        ...customer,
-        firstSaleAt: customer.commissions[0]?.createdAt ?? null,
-        email: customer.email
-          ? customerDataSharingEnabledAt
-            ? customer.email
-            : obfuscateCustomerEmail(customer.email)
-          : customer.name || generateRandomName(),
+    })
+      .omit({
+        ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id) && {
+          saleAmount: true,
+        }),
+      })
+      .parse({
+        ...transformCustomer({
+          ...customer,
+          firstSaleAt: customer.commissions[0]?.createdAt ?? null,
+          email: customer.email
+            ? customerDataSharingEnabledAt
+              ? customer.email
+              : obfuscateCustomerEmail(customer.email)
+            : customer.name || generateRandomName(),
+        }),
+        activity: {
+          ...customer,
+          events,
+          link,
+        },
       }),
-      activity: {
-        ...customer,
-        events,
-        link,
-      },
-    }),
   );
 });
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/export/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/export/route.ts
new file mode 100644
index 00000000000..6519dbff5f6
--- /dev/null
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/export/route.ts
@@ -0,0 +1,121 @@
+import { convertToCSV } from "@/lib/analytics/utils";
+import { DubApiError } from "@/lib/api/errors";
+import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import { withPartnerProfile } from "@/lib/auth/partner";
+import {
+  CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS,
+  LARGE_PROGRAM_IDS,
+  LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,
+} from "@/lib/constants/partner-profile";
+import { qstash } from "@/lib/cron";
+import { formatPartnerCustomersForExport } from "@/lib/customers/api/format-partner-customers-export";
+import { prisma, sanitizeFullTextSearch } from "@/lib/prisma";
+import { partnerCustomersExportQuerySchema } from "@/lib/zod/schemas/partner-profile";
+import { APP_DOMAIN_WITH_NGROK, toCentsNumber } from "@dub/utils";
+import { CommissionType } from "@prisma/client";
+import { NextResponse } from "next/server";
+
+const MAX_CUSTOMERS_TO_EXPORT = 1000;
+
+// GET /api/partner-profile/programs/[programId]/customers/export – export partner customers to CSV
+export const GET = withPartnerProfile(
+  async ({ partner, params, searchParams, session }) => {
+    const filters = partnerCustomersExportQuerySchema.parse(searchParams);
+    const { search, country, linkId, sortBy, sortOrder, columns } = filters;
+
+    const { program, totalCommissions, customerDataSharingEnabledAt } =
+      await getProgramEnrollmentOrThrow({
+        partnerId: partner.id,
+        programId: params.programId,
+        include: {
+          program: true,
+        },
+      });
+
+    if (
+      LARGE_PROGRAM_IDS.includes(program.id) &&
+      toCentsNumber(totalCommissions) <
+        LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS
+    ) {
+      throw new DubApiError({
+        code: "forbidden",
+        message: "This feature is not available for your program.",
+      });
+    }
+
+    const ltvExcluded = CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id);
+
+    if (sortBy === "saleAmount" && ltvExcluded) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "This feature is not available for your program.",
+      });
+    }
+
+    const where = {
+      partnerId: partner.id,
+      programId: program.id,
+      projectId: program.workspaceId,
+      ...(country && { country }),
+      ...(linkId && { linkId }),
+      ...(search && customerDataSharingEnabledAt
+        ? search.includes("@")
+          ? { email: search }
+          : {
+              email: { search: sanitizeFullTextSearch(search) },
+              name: { search: sanitizeFullTextSearch(search) },
+            }
+        : {}),
+    };
+
+    const count = await prisma.customer.count({ where });
+
+    if (count > MAX_CUSTOMERS_TO_EXPORT) {
+      await qstash.publishJSON({
+        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/export/customers/partner`,
+        body: {
+          ...filters,
+          partnerId: partner.id,
+          programId: program.id,
+          userId: session.user.id,
+          columns: columns.join(","),
+        },
+      });
+
+      return NextResponse.json({}, { status: 202 });
+    }
+
+    const customers = await prisma.customer.findMany({
+      where,
+      include: {
+        link: true,
+        commissions: {
+          where: {
+            partnerId: partner.id,
+            type: CommissionType.sale,
+          },
+          take: 1,
+          orderBy: {
+            createdAt: "asc",
+          },
+        },
+      },
+      orderBy: {
+        [sortBy]: sortOrder,
+      },
+      take: MAX_CUSTOMERS_TO_EXPORT,
+    });
+
+    const rows = formatPartnerCustomersForExport(customers, columns, {
+      customerDataSharingEnabledAt,
+      ltvExcluded,
+    });
+
+    return new Response(convertToCSV(rows), {
+      headers: {
+        "Content-Type": "text/csv",
+        "Content-Disposition": "attachment",
+      },
+    });
+  },
+);
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts
index cf3a7b4e726..7171e2a7ef3 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/customers/route.ts
@@ -4,6 +4,7 @@ import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-cust
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { withPartnerProfile } from "@/lib/auth/partner";
 import {
+  CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS,
   LARGE_PROGRAM_IDS,
   LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS,
 } from "@/lib/constants/partner-profile";
@@ -52,6 +53,16 @@ export const GET = withPartnerProfile(
       });
     }
 
+    if (
+      sortBy === "saleAmount" &&
+      CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id)
+    ) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "This feature is not available for your program.",
+      });
+    }
+
     // Get all customers with their first commission date in a single optimized query
     const customers = await prisma.customer.findMany({
       where: {
@@ -94,22 +105,28 @@ export const GET = withPartnerProfile(
     const customersWithData = customers.map((customer) => {
       return PartnerProfileCustomerSchema.extend({
         ...(customerDataSharingEnabledAt && { name: z.string().nullish() }),
-      }).parse({
-        ...transformCustomer({
-          ...customer,
-          firstSaleAt: customer.commissions[0]?.createdAt ?? null,
-          email: customer.email
-            ? customerDataSharingEnabledAt
-              ? customer.email
-              : obfuscateCustomerEmail(customer.email)
-            : customer.name || generateRandomName(),
-        }),
-        activity: {
-          ...customer,
-          events: [],
-          link: customer.link,
-        },
-      });
+      })
+        .omit({
+          ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(program.id) && {
+            saleAmount: true,
+          }),
+        })
+        .parse({
+          ...transformCustomer({
+            ...customer,
+            firstSaleAt: customer.commissions[0]?.createdAt ?? null,
+            email: customer.email
+              ? customerDataSharingEnabledAt
+                ? customer.email
+                : obfuscateCustomerEmail(customer.email)
+              : customer.name || generateRandomName(),
+          }),
+          activity: {
+            ...customer,
+            events: [],
+            link: customer.link,
+          },
+        });
     });
 
     return NextResponse.json(customersWithData);
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts
new file mode 100644
index 00000000000..1e202f8c4be
--- /dev/null
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/default-group/route.ts
@@ -0,0 +1,32 @@
+import { DubApiError } from "@/lib/api/errors";
+import { withPartnerProfile } from "@/lib/auth/partner";
+import { prisma } from "@/lib/prisma";
+import {
+  DEFAULT_PARTNER_GROUP,
+  PartnerProgramGroupSchema,
+} from "@/lib/zod/schemas/groups";
+import { NextResponse } from "next/server";
+
+// GET /api/partner-profile/programs/[programId]/default-group - get information about a program's default group
+export const GET = withPartnerProfile(async ({ params, partner }) => {
+  const { programId } = params;
+
+  const group = await prisma.partnerGroup.findUnique({
+    where: {
+      programId_slug: {
+        programId,
+        slug: DEFAULT_PARTNER_GROUP.slug,
+      },
+    },
+  });
+
+  // should never happen, but just in case
+  if (!group) {
+    throw new DubApiError({
+      code: "not_found",
+      message: `Program "${programId}" does not have a default group.`,
+    });
+  }
+
+  return NextResponse.json(PartnerProgramGroupSchema.parse(group));
+});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
index af6281286f9..d19ec2cdad0 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/events/route.ts
@@ -14,7 +14,7 @@ import {
   PartnerProfileLinkSchema,
   partnerProfileEventsQuerySchema,
 } from "@/lib/zod/schemas/partner-profile";
-import { parseFilterValue, toCentsNumber } from "@dub/utils";
+import { parseFilterValue, serializeError, toCentsNumber } from "@dub/utils";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -97,17 +97,32 @@ export const GET = withPartnerProfile(
       };
     }
 
-    const events = await getEvents({
-      ...parsedParams,
-      workspaceId: program.workspaceId,
-      includeMetadata: false,
-      ...(parsedParams.linkId
-        ? { linkId: parsedParams.linkId }
-        : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
-          ? { partnerId: partner.id }
-          : { linkId: parseFilterValue(links.map((link) => link.id)) }),
-      dataAvailableFrom: program.startedAt ?? program.createdAt,
-    });
+    let events: Awaited<ReturnType<typeof getEvents>> = [];
+
+    try {
+      events = await getEvents({
+        ...parsedParams,
+        workspaceId: program.workspaceId,
+        includeMetadata: false,
+        ...(parsedParams.linkId
+          ? { linkId: parsedParams.linkId }
+          : links.length > MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING
+            ? { partnerId: partner.id }
+            : { linkId: parseFilterValue(links.map((link) => link.id)) }),
+        dataAvailableFrom: program.startedAt ?? program.createdAt,
+      });
+    } catch (error) {
+      // Tinybird times out after 30s on heavy partner queries; return a 400
+      // instead of 500 so the UI can show a retry hint.
+      if (serializeError(error).includes("Timeout exceeded")) {
+        throw new DubApiError({
+          code: "bad_request",
+          message: "Failed to fetch events. Refresh the page and try again.",
+        });
+      }
+
+      throw error;
+    }
 
     const response = events.map((event) => {
       // don't return ip address for partner profile
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts
deleted file mode 100644
index 941b4c130eb..00000000000
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/groups/[groupIdOrSlug]/route.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
-import { withPartnerProfile } from "@/lib/auth/partner";
-import { PartnerProgramGroupSchema } from "@/lib/zod/schemas/groups";
-import { NextResponse } from "next/server";
-
-// GET /api/partner-profile/programs/[programId]/groups/[groupIdOrSlug] - get information about a program's group
-export const GET = withPartnerProfile(async ({ params }) => {
-  const { programId, groupIdOrSlug } = params;
-
-  const group = await getGroupOrThrow({
-    programId,
-    groupId: groupIdOrSlug,
-  });
-
-  return NextResponse.json(PartnerProgramGroupSchema.parse(group));
-});
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
index 0fcfafa048a..6ec011013a6 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/[linkId]/route.ts
@@ -3,7 +3,7 @@ import { deleteLink, processLink, updateLink } from "@/lib/api/links";
 import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withPartnerProfile } from "@/lib/auth/partner";
 import { prisma } from "@/lib/prisma";
 import { NewLinkProps } from "@/lib/types";
@@ -101,7 +101,6 @@ export const PATCH = withPartnerProfile(
     } = await processLink({
       payload: {
         ...link,
-        ...(groupUtmTemplate ? extractUtmParams(groupUtmTemplate) : {}),
         // coerce types
         expiresAt:
           link.expiresAt instanceof Date
@@ -142,13 +141,21 @@ export const PATCH = withPartnerProfile(
       });
     }
 
+    const linkWithUtm = applyGroupUtmToLink({
+      link: processedLink,
+      utmTemplate: groupUtmTemplate,
+      partnerName: partner.name,
+    });
+
     const partnerLink = await updateLink({
       oldLink: {
         domain: link.domain,
         key: link.key,
         image: link.image,
+        programId: link.programId,
+        partnerId: link.partnerId,
       },
-      updatedLink: processedLink,
+      updatedLink: linkWithUtm,
     });
 
     return NextResponse.json(PartnerProfileLinkSchema.parse(partnerLink));
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts
index fb1f32983df..66dde4fd6cb 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/links/route.ts
@@ -3,26 +3,50 @@ import { createLink, processLink } from "@/lib/api/links";
 import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withPartnerProfile } from "@/lib/auth/partner";
 import { prisma } from "@/lib/prisma";
+import { getResolvedPartnerLinkRewards } from "@/lib/rewards/get-resolved-partner-link-rewards";
 import { PartnerProfileLinkSchema } from "@/lib/zod/schemas/partner-profile";
 import {
   createPartnerLinkSchema,
   INACTIVE_ENROLLMENT_STATUSES,
 } from "@/lib/zod/schemas/partners";
-import { getUTMParamsFromURL } from "@dub/utils";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
 // GET /api/partner-profile/programs/[programId]/links - get a partner's links in a program
 export const GET = withPartnerProfile(async ({ partner, params }) => {
-  const { links, discountCodes } = await getProgramEnrollmentOrThrow({
+  const {
+    links,
+    discountCodes,
+    clickReward,
+    leadReward,
+    saleReward,
+    customReward,
+    discount,
+  } = await getProgramEnrollmentOrThrow({
     partnerId: partner.id,
     programId: params.programId,
     include: {
-      links: true,
       discountCodes: true,
+      clickReward: true,
+      leadReward: true,
+      saleReward: true,
+      customReward: true,
+      discount: true,
+      links: {
+        include: {
+          linkReward: {
+            include: {
+              clickReward: true,
+              leadReward: true,
+              saleReward: true,
+              discount: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -31,11 +55,19 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
     discountCodes?.map((discountCode) => [discountCode.linkId, discountCode]),
   );
 
+  const enrollmentRewards = [clickReward, leadReward, saleReward, customReward];
+
   const result = links.map((link) => {
     const discountCode = linksByDiscountCode.get(link.id);
+    const resolvedRewards = getResolvedPartnerLinkRewards({
+      linkReward: link.linkReward,
+      enrollmentRewards,
+      enrollmentDiscount: discount,
+    });
 
     return {
       ...link,
+      ...resolvedRewards,
       discountCode: discountCode?.code,
       discountCodeDisabledAt: discountCode?.disabledAt ?? null,
     };
@@ -115,12 +147,6 @@ export const POST = withPartnerProfile(
         domain: program.domain,
         key: key || undefined,
         url: linkUrl,
-        ...(groupUtmTemplate
-          ? {
-              ...extractUtmParams(groupUtmTemplate),
-              ...getUTMParamsFromURL(linkUrl),
-            }
-          : {}),
         programId: program.id,
         tenantId,
         partnerId: partner.id,
@@ -146,7 +172,13 @@ export const POST = withPartnerProfile(
       });
     }
 
-    const partnerLink = await createLink(link);
+    const linkWithUtm = applyGroupUtmToLink({
+      link,
+      utmTemplate: groupUtmTemplate,
+      partnerName: partner.name,
+    });
+
+    const partnerLink = await createLink(linkWithUtm);
 
     return NextResponse.json(PartnerProfileLinkSchema.parse(partnerLink), {
       status: 201,
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
index 79a0b8fdbc8..ad821028542 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/[programId]/route.ts
@@ -17,6 +17,7 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
       leadReward: true,
       saleReward: true,
       referralReward: true,
+      customReward: true,
       discount: true,
       partnerGroup: true,
       application: {
@@ -34,6 +35,7 @@ export const GET = withPartnerProfile(async ({ partner, params }) => {
     programEnrollment.leadReward,
     programEnrollment.saleReward,
     programEnrollment.referralReward,
+    programEnrollment.customReward,
   ].filter((r): r is Reward => r !== null);
 
   return NextResponse.json(
diff --git a/apps/web/app/(ee)/api/partner-profile/programs/route.ts b/apps/web/app/(ee)/api/partner-profile/programs/route.ts
index 02d150cf934..fef349755d8 100644
--- a/apps/web/app/(ee)/api/partner-profile/programs/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/programs/route.ts
@@ -49,6 +49,7 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
         leadReward: true,
         saleReward: true,
         referralReward: true,
+        customReward: true,
         discount: true,
       }),
     },
@@ -75,6 +76,8 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
             enrollment.clickReward,
             enrollment.leadReward,
             enrollment.saleReward,
+            enrollment.referralReward,
+            enrollment.customReward,
           ].filter((r): r is Reward => r !== null)
         : [],
       application: enrollment.application
diff --git a/apps/web/app/(ee)/api/partner-profile/referrals/route.ts b/apps/web/app/(ee)/api/partner-profile/referrals/route.ts
index 7c1c05b7009..7955b2601e0 100644
--- a/apps/web/app/(ee)/api/partner-profile/referrals/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/referrals/route.ts
@@ -2,7 +2,7 @@ import { createId } from "@/lib/api/create-id";
 import { DubApiError } from "@/lib/api/errors";
 import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-customer-email";
 import { withPartnerProfile } from "@/lib/auth/partner";
-import { triggerQStashWorkflow } from "@/lib/cron/qstash-workflow";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import {
   getNetworkReferralsQuerySchema,
   networkReferralSchema,
@@ -56,14 +56,17 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {
           console.log(
             "Program enrollment created in the last 1 min, most likely it's a new partner",
           );
-          await triggerQStashWorkflow({
-            workflowType: "partner-approved",
-            workflowLabel: partner.id,
-            body: {
+
+          await dispatchWorkflows({
+            name: "partner-approved-workflow",
+            payload: {
               programId: NETWORK_PROGRAM_ID,
               partnerId: partner.id,
               userId: NETWORK_USER_ID,
             },
+            options: {
+              label: partner.id,
+            },
           });
         }
       }),
diff --git a/apps/web/app/(ee)/api/partner-profile/users/route.ts b/apps/web/app/(ee)/api/partner-profile/users/route.ts
index 9108e088b7b..7c5ad928146 100644
--- a/apps/web/app/(ee)/api/partner-profile/users/route.ts
+++ b/apps/web/app/(ee)/api/partner-profile/users/route.ts
@@ -151,6 +151,13 @@ export const DELETE = withPartnerProfile(
               partnerId: partner.id,
             },
           },
+          include: {
+            user: {
+              select: {
+                defaultPartnerId: true,
+              },
+            },
+          },
         }),
 
         tx.partnerUser.count({
@@ -186,11 +193,24 @@ export const DELETE = withPartnerProfile(
         });
       }
 
-      return tx.partnerUser.delete({
+      const deletedPartnerUser = await tx.partnerUser.delete({
         where: {
           id: userToRemove.id,
         },
       });
+
+      if (userToRemove.user.defaultPartnerId === partner.id) {
+        await tx.user.update({
+          where: {
+            id: userId,
+          },
+          data: {
+            defaultPartnerId: null,
+          },
+        });
+      }
+
+      return deletedPartnerUser;
     });
 
     return NextResponse.json(response);
diff --git a/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts b/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
similarity index 88%
rename from apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts
rename to apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
index 59aa8ada4a0..da93b1f3672 100644
--- a/apps/web/app/(ee)/api/partners/[partnerId]/cross-program-summary/route.ts
+++ b/apps/web/app/(ee)/api/partners/[partnerId]/network-activity/route.ts
@@ -4,11 +4,11 @@ import { withWorkspace } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import {
   ACTIVE_ENROLLMENT_STATUSES,
-  partnerCrossProgramSummarySchema,
+  partnerNetworkActivitySummarySchema,
 } from "@/lib/zod/schemas/partners";
 import { NextResponse } from "next/server";
 
-// GET /api/partners/:partnerId/cross-program-summary - get cross-program summary for a partner
+// GET /api/partners/:partnerId/network-activity - get network activity summary for a partner
 export const GET = withWorkspace(
   async ({ workspace, params }) => {
     const { partnerId } = params;
@@ -41,7 +41,7 @@ export const GET = withWorkspace(
         ?._count ?? 0;
 
     return NextResponse.json(
-      partnerCrossProgramSummarySchema.parse({
+      partnerNetworkActivitySummarySchema.parse({
         totalPrograms: activePrograms + bannedPrograms,
         activePrograms,
         bannedPrograms,
diff --git a/apps/web/app/(ee)/api/partners/links/[linkId]/route.ts b/apps/web/app/(ee)/api/partners/links/[linkId]/route.ts
new file mode 100644
index 00000000000..abe611e6a38
--- /dev/null
+++ b/apps/web/app/(ee)/api/partners/links/[linkId]/route.ts
@@ -0,0 +1,31 @@
+import { updatePartnerLink } from "@/lib/api/partners/update-partner-link";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { parseRequestBody } from "@/lib/api/utils";
+import { withWorkspace } from "@/lib/auth";
+import { updatePartnerLinkSchema } from "@/lib/zod/schemas/partners";
+import { ProgramPartnerLinkSchemaInternal } from "@/lib/zod/schemas/programs";
+import { NextResponse } from "next/server";
+
+// PATCH /api/partners/links/[linkId]
+export const PATCH = withWorkspace(
+  async ({ workspace, req, params, session }) => {
+    const programId = getDefaultProgramIdOrThrow(workspace);
+    const { linkId } = params;
+
+    const body = updatePartnerLinkSchema.parse(await parseRequestBody(req));
+
+    const response = await updatePartnerLink({
+      workspace,
+      programId,
+      linkId,
+      userId: session.user.id,
+      ...body,
+    });
+
+    return NextResponse.json(ProgramPartnerLinkSchemaInternal.parse(response));
+  },
+  {
+    requiredPlan: ["business", "advanced", "enterprise"],
+    requiredPermissions: ["links.write"],
+  },
+);
diff --git a/apps/web/app/(ee)/api/partners/links/route.ts b/apps/web/app/(ee)/api/partners/links/route.ts
index 82b8dd71cf5..4f1c89151e3 100644
--- a/apps/web/app/(ee)/api/partners/links/route.ts
+++ b/apps/web/app/(ee)/api/partners/links/route.ts
@@ -1,21 +1,31 @@
+import { trackLinkRewardOverrideLog } from "@/lib/api/activity-log/track-reward-overrides";
 import { DubApiError, ErrorCodes } from "@/lib/api/errors";
 import { createLink, processLink } from "@/lib/api/links";
-import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
+import {
+  hasRewardAssignment,
+  pickDefinedRewardIds,
+  toPartnerLinkRewardIdFields,
+} from "@/lib/api/rewards/reward-overrides";
+import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";
 import { parseRequestBody } from "@/lib/api/utils";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withWorkspace } from "@/lib/auth";
 import { throwIfNoPartnerIdOrTenantId } from "@/lib/partners/throw-if-no-partnerid-tenantid";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { linkEventSchema } from "@/lib/zod/schemas/links";
 import {
-  createPartnerLinkSchema,
-  retrievePartnerLinksSchema,
+  createPartnerLinkSchemaInternal,
+  retrievePartnerLinksSchemaInternal,
 } from "@/lib/zod/schemas/partners";
-import { ProgramPartnerLinkSchema } from "@/lib/zod/schemas/programs";
-import { getUTMParamsFromURL } from "@dub/utils";
+import {
+  ProgramPartnerLinkSchema,
+  ProgramPartnerLinkSchemaInternal,
+} from "@/lib/zod/schemas/programs";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
@@ -25,8 +35,8 @@ export const GET = withWorkspace(
   async ({ workspace, searchParams }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId, tenantId } =
-      retrievePartnerLinksSchema.parse(searchParams);
+    const { partnerId, tenantId, includeRewards } =
+      retrievePartnerLinksSchemaInternal.parse(searchParams);
 
     throwIfNoPartnerIdOrTenantId({ partnerId, tenantId });
 
@@ -45,7 +55,11 @@ export const GET = withWorkspace(
             },
           },
       select: {
-        links: true,
+        links: {
+          include: {
+            linkReward: includeRewards,
+          },
+        },
       },
     });
 
@@ -56,9 +70,19 @@ export const GET = withWorkspace(
       });
     }
 
-    const { links } = programEnrollment;
+    // Not exposing the reward ids to the public API for now
+    const links = includeRewards
+      ? programEnrollment.links.map((link) => ({
+          ...link,
+          ...toPartnerLinkRewardIdFields(link.linkReward),
+        }))
+      : programEnrollment.links;
+
+    const responseSchema = includeRewards
+      ? ProgramPartnerLinkSchemaInternal
+      : ProgramPartnerLinkSchema;
 
-    return NextResponse.json(z.array(ProgramPartnerLinkSchema).parse(links));
+    return NextResponse.json(z.array(responseSchema).parse(links));
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],
@@ -71,8 +95,17 @@ export const POST = withWorkspace(
   async ({ workspace, req, session }) => {
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partnerId, tenantId, url, key, linkProps } =
-      createPartnerLinkSchema.parse(await parseRequestBody(req));
+    const {
+      partnerId,
+      tenantId,
+      url,
+      key,
+      linkProps,
+      clickRewardId,
+      leadRewardId,
+      saleRewardId,
+      discountId,
+    } = createPartnerLinkSchemaInternal.parse(await parseRequestBody(req));
 
     const program = await getProgramOrThrow({
       workspaceId: workspace.id,
@@ -93,7 +126,14 @@ export const POST = withWorkspace(
       where: partnerId
         ? { partnerId_programId: { partnerId, programId } }
         : { tenantId_programId: { tenantId: tenantId!, programId } },
-      include: {
+      select: {
+        tenantId: true,
+        partnerId: true,
+        partner: {
+          select: {
+            name: true,
+          },
+        },
         partnerGroup: {
           include: {
             partnerGroupDefaultLinks: true,
@@ -120,8 +160,6 @@ export const POST = withWorkspace(
       });
     }
 
-    validatePartnerLinkUrl({ group: partnerGroup, url });
-
     const linkUrl = url || partnerGroup.partnerGroupDefaultLinks[0].url;
 
     const { link, error, code } = await processLink({
@@ -130,12 +168,6 @@ export const POST = withWorkspace(
         domain: program.domain,
         key: key || undefined,
         url: linkUrl,
-        ...(partnerGroup.utmTemplate
-          ? {
-              ...extractUtmParams(partnerGroup.utmTemplate),
-              ...getUTMParamsFromURL(linkUrl),
-            }
-          : {}),
         programId: program.id,
         tenantId: partner.tenantId,
         partnerId: partner.partnerId,
@@ -154,17 +186,81 @@ export const POST = withWorkspace(
       });
     }
 
-    const partnerLink = await createLink(link);
+    const linkWithUtm = applyGroupUtmToLink({
+      link,
+      utmTemplate: partnerGroup.utmTemplate,
+      partnerName: partner.partner.name,
+    });
+
+    // Validate link-level rewards. Persist the selected ids as-is, including
+    // the group default — link-level null inherits the partner override.
+    const linkRewardInput = pickDefinedRewardIds({
+      clickRewardId,
+      leadRewardId,
+      saleRewardId,
+      discountId,
+    });
+
+    const hasLinkLevelReward = hasRewardAssignment(linkRewardInput);
+
+    if (
+      hasLinkLevelReward &&
+      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+    ) {
+      throw new DubApiError({
+        code: "forbidden",
+        message: PARTNER_LEVEL_REWARDS_PLAN_ERROR,
+      });
+    }
+
+    await throwIfInvalidRewards({
+      programId,
+      groupId: partnerGroup.id,
+      ...linkRewardInput,
+    });
+
+    const partnerLink = await createLink({
+      ...linkWithUtm,
+      ...(hasLinkLevelReward && { linkReward: linkRewardInput }),
+    });
 
     waitUntil(
-      sendWorkspaceWebhook({
-        trigger: "link.created",
-        workspace,
-        data: linkEventSchema.parse(partnerLink),
-      }),
+      Promise.allSettled([
+        sendWorkspaceWebhook({
+          trigger: "link.created",
+          workspace,
+          data: linkEventSchema.parse(partnerLink),
+        }),
+
+        ...(hasLinkLevelReward
+          ? [
+              trackLinkRewardOverrideLog({
+                workspaceId: workspace.id,
+                programId: program.id,
+                partnerId: partner.partnerId,
+                userId: session.user.id,
+                previous: {
+                  clickRewardId: null,
+                  leadRewardId: null,
+                  saleRewardId: null,
+                  discountId: null,
+                },
+                next: {
+                  clickRewardId: linkRewardInput.clickRewardId ?? null,
+                  leadRewardId: linkRewardInput.leadRewardId ?? null,
+                  saleRewardId: linkRewardInput.saleRewardId ?? null,
+                  discountId: linkRewardInput.discountId ?? null,
+                },
+                link: partnerLink,
+              }),
+            ]
+          : []),
+      ]),
     );
 
-    return NextResponse.json(partnerLink, { status: 201 });
+    return NextResponse.json(partnerLink, {
+      status: 201,
+    });
   },
   {
     requiredPlan: ["business", "advanced", "enterprise"],
diff --git a/apps/web/app/(ee)/api/partners/links/upsert/route.ts b/apps/web/app/(ee)/api/partners/links/upsert/route.ts
index d251d2a19a3..092dc69021f 100644
--- a/apps/web/app/(ee)/api/partners/links/upsert/route.ts
+++ b/apps/web/app/(ee)/api/partners/links/upsert/route.ts
@@ -6,11 +6,10 @@ import {
   updateLink,
 } from "@/lib/api/links";
 import { includeTags } from "@/lib/api/links/include-tags";
-import { validatePartnerLinkUrl } from "@/lib/api/links/validate-partner-link-url";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramOrThrow } from "@/lib/api/programs/get-program-or-throw";
 import { parseRequestBody } from "@/lib/api/utils";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { withWorkspace } from "@/lib/auth";
 import { throwIfNoPartnerIdOrTenantId } from "@/lib/partners/throw-if-no-partnerid-tenantid";
 import { prisma } from "@/lib/prisma";
@@ -18,7 +17,7 @@ import { NewLinkProps } from "@/lib/types";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { linkEventSchema } from "@/lib/zod/schemas/links";
 import { upsertPartnerLinkSchema } from "@/lib/zod/schemas/partners";
-import { deepEqual, getUTMParamsFromURL } from "@dub/utils";
+import { deepEqual } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
@@ -50,6 +49,11 @@ export const PUT = withWorkspace(
         ? { partnerId_programId: { partnerId, programId } }
         : { tenantId_programId: { tenantId: tenantId!, programId } },
       include: {
+        partner: {
+          select: {
+            name: true,
+          },
+        },
         partnerGroup: {
           include: {
             partnerGroupDefaultLinks: true,
@@ -76,11 +80,6 @@ export const PUT = withWorkspace(
       });
     }
 
-    validatePartnerLinkUrl({
-      group: partnerGroup,
-      url,
-    });
-
     const link = await prisma.link.findFirst({
       where: {
         programId,
@@ -164,14 +163,22 @@ export const PUT = withWorkspace(
         });
       }
 
+      const linkWithUtm = applyGroupUtmToLink({
+        link: processedLink,
+        utmTemplate: partnerGroup.utmTemplate,
+        partnerName: partner.partner.name,
+      });
+
       try {
         const response = await updateLink({
           oldLink: {
             domain: link.domain,
             key: link.key,
             image: link.image,
+            programId: link.programId,
+            partnerId: link.partnerId,
           },
-          updatedLink: processedLink,
+          updatedLink: linkWithUtm,
         });
 
         waitUntil(
@@ -201,12 +208,6 @@ export const PUT = withWorkspace(
           domain: program.domain,
           key: key || undefined,
           url: linkUrl,
-          ...(partnerGroup.utmTemplate
-            ? {
-                ...extractUtmParams(partnerGroup.utmTemplate),
-                ...getUTMParamsFromURL(linkUrl),
-              }
-            : {}),
           programId: program.id,
           tenantId: partner.tenantId,
           partnerId: partner.partnerId,
@@ -225,7 +226,13 @@ export const PUT = withWorkspace(
         });
       }
 
-      const partnerLink = await createLink(link);
+      const linkWithUtm = applyGroupUtmToLink({
+        link,
+        utmTemplate: partnerGroup.utmTemplate,
+        partnerName: partner.partner.name,
+      });
+
+      const partnerLink = await createLink(linkWithUtm);
 
       waitUntil(
         sendWorkspaceWebhook({
diff --git a/apps/web/app/(ee)/api/partners/route.ts b/apps/web/app/(ee)/api/partners/route.ts
index cb5ec695c89..fb1b6feb32e 100644
--- a/apps/web/app/(ee)/api/partners/route.ts
+++ b/apps/web/app/(ee)/api/partners/route.ts
@@ -9,7 +9,7 @@ import { polyfillSocialMediaFields } from "@/lib/social-utils";
 import {
   createPartnerSchema,
   EnrolledPartnerSchema,
-  getPartnersQuerySchemaExtended,
+  getPartnersRouteQuerySchema,
   partnerPlatformSchema,
 } from "@/lib/zod/schemas/partners";
 import { parseFilterValue, toCentsNumber } from "@dub/utils";
@@ -51,21 +51,7 @@ export const GET = withWorkspace(
       }),
     };
     const { sortBy: sortByWithOldFields, ...parsedParams } =
-      getPartnersQuerySchemaExtended
-        .extend({
-          // add old fields for backward compatibility
-          sortBy: getPartnersQuerySchemaExtended.shape.sortBy.or(
-            z.enum([
-              "clicks",
-              "leads",
-              "conversions",
-              "sales",
-              "saleAmount",
-              "totalSales",
-            ]),
-          ),
-        })
-        .parse(paramsToParse);
+      getPartnersRouteQuerySchema.parse(paramsToParse);
 
     // get the final sortBy field (replace old fields with new fields)
     const sortBy =
diff --git a/apps/web/app/(ee)/api/paypal/webhook/route.ts b/apps/web/app/(ee)/api/paypal/webhook/route.ts
index 3d7a0a25d7b..12ab8d0ddc6 100644
--- a/apps/web/app/(ee)/api/paypal/webhook/route.ts
+++ b/apps/web/app/(ee)/api/paypal/webhook/route.ts
@@ -1,3 +1,4 @@
+import { withAxiom } from "@/lib/axiom/server";
 import { log } from "@dub/utils";
 import { payoutsItemFailed } from "./payouts-item-failed";
 import { payoutsItemSucceeded } from "./payouts-item-succeeded";
@@ -17,7 +18,7 @@ const relevantEvents = new Set([
 ]);
 
 // POST /api/paypal/webhook – Listen to Paypal webhook events
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const rawBody = await req.text();
   const headers = req.headers;
 
@@ -69,4 +70,4 @@ export const POST = async (req: Request) => {
   }
 
   return new Response("OK");
-};
+});
diff --git a/apps/web/app/(ee)/api/programs/[programId]/discounts/route.ts b/apps/web/app/(ee)/api/programs/[programId]/discounts/route.ts
deleted file mode 100644
index eb1cc96d26f..00000000000
--- a/apps/web/app/(ee)/api/programs/[programId]/discounts/route.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { DiscountSchema } from "@/lib/zod/schemas/discount";
-import { NextResponse } from "next/server";
-import * as z from "zod/v4";
-
-// TODO: Remove once we migrate fully to partner groups
-// GET /api/programs/[programId]/discounts - get all discounts for a program
-export const GET = withWorkspace(async ({ workspace }) => {
-  const programId = getDefaultProgramIdOrThrow(workspace);
-
-  const discounts = await prisma.discount.findMany({
-    where: {
-      programId,
-    },
-    include: {
-      _count: {
-        select: {
-          programEnrollments: true,
-        },
-      },
-    },
-    orderBy: {
-      createdAt: "desc",
-    },
-  });
-
-  const discountsWithPartnersCount = discounts.map((discount) => ({
-    ...discount,
-    partnersCount: discount._count.programEnrollments,
-  }));
-
-  return NextResponse.json(
-    z.array(DiscountSchema).parse(discountsWithPartnersCount),
-  );
-});
diff --git a/apps/web/app/(ee)/api/rewards/[rewardId]/route.ts b/apps/web/app/(ee)/api/rewards/[rewardId]/route.ts
deleted file mode 100644
index a54acc9da0e..00000000000
--- a/apps/web/app/(ee)/api/rewards/[rewardId]/route.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { DubApiError } from "@/lib/api/errors";
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { RewardSchema } from "@/lib/zod/schemas/rewards";
-import { NextResponse } from "next/server";
-
-export const GET = withWorkspace(async ({ workspace, params }) => {
-  const programId = getDefaultProgramIdOrThrow(workspace);
-
-  const reward = await prisma.reward.findUnique({
-    where: {
-      id: params.rewardId,
-      programId,
-    },
-  });
-
-  if (!reward) {
-    throw new DubApiError({
-      code: "not_found",
-      message: "Reward not found.",
-    });
-  }
-
-  return NextResponse.json(RewardSchema.parse(reward));
-});
diff --git a/apps/web/app/(ee)/api/rewards/route.ts b/apps/web/app/(ee)/api/rewards/route.ts
index 663fff3555d..2dce04e10ff 100644
--- a/apps/web/app/(ee)/api/rewards/route.ts
+++ b/apps/web/app/(ee)/api/rewards/route.ts
@@ -1,27 +1,21 @@
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import {
+  getRewardsQuerySchema,
+  listRewards,
+  listRewardsResponseSchema,
+} from "@/lib/api/rewards/list-rewards";
 import { withWorkspace } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { RewardSchema } from "@/lib/zod/schemas/rewards";
 import { NextResponse } from "next/server";
-import * as z from "zod/v4";
 
 // GET /api/rewards - get all rewards for a program
-export const GET = withWorkspace(async ({ workspace }) => {
+export const GET = withWorkspace(async ({ workspace, searchParams }) => {
   const programId = getDefaultProgramIdOrThrow(workspace);
+  const { groupId } = getRewardsQuerySchema.parse(searchParams);
 
-  const rewards = await prisma.reward.findMany({
-    where: {
-      programId,
-    },
-    orderBy: [
-      {
-        event: "desc",
-      },
-      {
-        createdAt: "desc",
-      },
-    ],
+  const rewards = await listRewards({
+    programId,
+    groupId,
   });
 
-  return NextResponse.json(z.array(RewardSchema).parse(rewards));
+  return NextResponse.json(listRewardsResponseSchema.parse(rewards));
 });
diff --git a/apps/web/app/(ee)/api/shopify/integration/webhook/orders-paid.ts b/apps/web/app/(ee)/api/shopify/integration/webhook/orders-paid.ts
index 7d11b20dea6..908594d39d6 100644
--- a/apps/web/app/(ee)/api/shopify/integration/webhook/orders-paid.ts
+++ b/apps/web/app/(ee)/api/shopify/integration/webhook/orders-paid.ts
@@ -1,28 +1,28 @@
-import { qstash } from "@/lib/cron";
-import { createShopifySale } from "@/lib/integrations/shopify/create-sale";
 import {
-  attributeViaDiscountCode,
-  processOrder,
-} from "@/lib/integrations/shopify/process-order";
-import { orderSchema } from "@/lib/integrations/shopify/schema";
+  shopifyCheckoutCache,
+  tryDispatchShopifyOrderJob,
+} from "@/lib/integrations/shopify/checkout-cache";
+import { shopifyOrderSchema } from "@/lib/integrations/shopify/schema";
+import { processShopifyOrderJob } from "@/lib/jobs/handlers/process-shopify-order-job";
 import { prisma } from "@/lib/prisma";
+import { getClickEvent } from "@/lib/tinybird";
 import { WorkspaceProps } from "@/lib/types";
-import { redis } from "@/lib/upstash";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 
 export async function ordersPaid({
   event,
   workspace,
 }: {
   event: any;
-  workspace: Pick<WorkspaceProps, "id" | "defaultProgramId" | "webhookEnabled">;
+  workspace: Pick<WorkspaceProps, "id" | "defaultProgramId">;
 }) {
+  const order = shopifyOrderSchema.parse(event);
   const {
     customer: orderCustomer,
     checkout_token: checkoutToken,
     discount_codes: discountCodes,
-  } = orderSchema.parse(event);
+  } = order;
 
+  // If the order has a customer, try to find the customer in our database
   if (orderCustomer) {
     const { id: externalId } = orderCustomer;
 
@@ -33,17 +33,24 @@ export async function ordersPaid({
           externalId: externalId.toString(),
         },
       },
+      select: {
+        id: true,
+      },
     });
 
-    // customer is found, process the order right away
     if (customer) {
-      await processOrder({
-        event,
-        workspaceId: workspace.id,
-        customerId: customer.id,
-      });
+      await processShopifyOrderJob.dispatch(
+        {
+          order,
+          clickId: null,
+          workspaceId: workspace.id,
+        },
+        {
+          deduplicationId: `shopify-order-${checkoutToken}`,
+        },
+      );
 
-      return "[Shopify] Order event processed successfully.";
+      return `[Shopify] Existing customer ${customer.id} found. Order queued for processing.`;
     }
   }
 
@@ -65,63 +72,54 @@ export async function ordersPaid({
     });
 
     if (programDiscountCodes.length > 0) {
-      const { customer, leadEvent: leadData } = await attributeViaDiscountCode({
-        event,
-        workspace,
-        link: programDiscountCodes[0].link,
-      });
-
-      await createShopifySale({
-        leadData,
-        event,
-        workspaceId: workspace.id,
-        customerId: customer.id,
-      });
+      await processShopifyOrderJob.dispatch(
+        {
+          order,
+          clickId: null,
+          workspaceId: workspace.id,
+        },
+        {
+          deduplicationId: `shopify-order-${checkoutToken}`,
+        },
+      );
 
-      return "[Shopify] Order event processed successfully with discount codes.";
+      return `[Shopify] Partner discount code ${programDiscountCodes[0].code} found. Order queued for processing.`;
     }
   }
 
-  // Check the cache to see the pixel event for this checkout token exist before publishing the event to the queue
-  const clickId = await redis.hget<string>(
-    `shopify:checkout:${checkoutToken}`,
-    "clickId",
-  );
-
-  // clickId is empty, order is not from a Dub link
-  if (clickId === "") {
-    await redis.del(`shopify:checkout:${checkoutToken}`);
+  // At this stage, we know the order has no customer or partner discount code
+  // Prefer dubClickId from note_attributes when present; otherwise wait for the pixel
+  let clickId =
+    order.note_attributes.find(({ name }) => name === "dubClickId")?.value ||
+    undefined;
 
-    return "[Shopify] Order is not from a Dub link. Skipping...";
-  }
+  if (clickId) {
+    const clickEvent = await getClickEvent({ clickId });
 
-  // clickId is found, process the order for the new customer
-  else if (clickId) {
-    await processOrder({
-      event,
-      workspaceId: workspace.id,
-      clickId,
-    });
+    if (!clickEvent) {
+      return "[Shopify] Click event not found. Skipping the order...";
+    }
 
-    return "[Shopify] Order event processed successfully.";
+    if (clickEvent.workspace_id !== workspace.id) {
+      return "[Shopify] Click event not found in the workspace. Skipping the order...";
+    }
   }
 
-  // clickId is not found, we need to wait for the pixel event to come in so that we can decide if the order is from a Dub link or not
-  else {
-    await redis.hset(`shopify:checkout:${checkoutToken}`, {
-      order: event,
-    });
-
-    await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/shopify/order-paid`,
-      body: {
-        checkoutToken,
-        workspaceId: workspace.id,
-      },
-      retries: 5,
-      delay: 3,
-    });
-
-    return "[Shopify] clickId not found, waiting for pixel event to arrive...";
-  }
+  const checkout = await shopifyCheckoutCache.set({
+    checkoutToken,
+    fields: {
+      order,
+      workspaceId: workspace.id,
+      ...(clickId && { clickId }),
+    },
+  });
+
+  const dispatched = await tryDispatchShopifyOrderJob({
+    checkoutToken,
+    checkout,
+  });
+
+  return dispatched
+    ? `[Shopify] Click ID ${checkout.clickId} found. Order queued for processing.`
+    : "[Shopify] Waiting for pixel event to arrive...";
 }
diff --git a/apps/web/app/(ee)/api/shopify/integration/webhook/route.ts b/apps/web/app/(ee)/api/shopify/integration/webhook/route.ts
index 362ae751317..7a41d1def66 100644
--- a/apps/web/app/(ee)/api/shopify/integration/webhook/route.ts
+++ b/apps/web/app/(ee)/api/shopify/integration/webhook/route.ts
@@ -1,8 +1,10 @@
 import { captureWebhookLog } from "@/lib/api-logs/capture-webhook-log";
 import { isLocalDev } from "@/lib/api/environment";
+import { withAxiom } from "@/lib/axiom/server";
 import { prisma } from "@/lib/prisma";
-import { log } from "@dub/utils";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { waitUntil } from "@vercel/functions";
+import { logAndRespond } from "app/(ee)/api/cron/utils";
 import crypto from "crypto";
 import { appUninstalled } from "./app-uninstalled";
 import { customersDataRequest } from "./customers-data-request";
@@ -21,12 +23,18 @@ const relevantTopics = new Set([
 ]);
 
 // POST /api/shopify/integration/webhook – Listen to Shopify webhook events
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const startTime = Date.now();
   const data = await req.text();
   const headers = req.headers;
   const topic = headers.get("x-shopify-topic") || "";
   const signature = headers.get("x-shopify-hmac-sha256") || "";
+  const shopDomain = headers.get("x-shopify-shop-domain") || "";
+
+  console.info("Webhook event", {
+    shopDomain,
+    topic,
+  });
 
   if (!isLocalDev) {
     // Verify signature
@@ -35,20 +43,22 @@ export const POST = async (req: Request) => {
       .update(data, "utf8")
       .digest("base64");
 
-    if (generatedSignature !== signature) {
-      return new Response(`[Shopify] Invalid webhook signature. Skipping...`, {
-        status: 401,
-      });
+    if (!timingSafeCompare(signature, generatedSignature)) {
+      return logAndRespond(
+        "Shopify webhook signature verification failed. Skipping...",
+        {
+          status: 401,
+        },
+      );
     }
   }
 
   // Check if topic is relevant
   if (!relevantTopics.has(topic)) {
-    return new Response(`[Shopify] Unsupported topic: ${topic}. Skipping...`);
+    return logAndRespond(`Unsupported topic: ${topic}. Skipping...`);
   }
 
   const event = JSON.parse(data);
-  const shopDomain = headers.get("x-shopify-shop-domain") || "";
 
   // Find workspace
   const workspace = await prisma.project.findUnique({
@@ -63,11 +73,15 @@ export const POST = async (req: Request) => {
   });
 
   if (!workspace) {
-    return new Response(
-      `[Shopify] Workspace not found for shop: ${shopDomain}. Skipping...`,
+    return logAndRespond(
+      `Workspace not found for shop: ${shopDomain}. Skipping...`,
     );
   }
 
+  console.info("Workspace found", {
+    workspaceId: workspace.id,
+  });
+
   const requestLog = {
     workspaceId: workspace.id,
     method: req.method,
@@ -111,14 +125,7 @@ export const POST = async (req: Request) => {
         break;
     }
   } catch (error) {
-    await log({
-      message: `Shopify webhook failed. Error: ${error.message}`,
-      type: "errors",
-    });
-
-    const response = new Response(
-      `[Shopify] Webhook handler failed. View logs`,
-    );
+    const response = new Response("Webhook handler failed. View logs.");
 
     waitUntil(
       captureWebhookLog({
@@ -132,14 +139,17 @@ export const POST = async (req: Request) => {
     return response;
   }
 
-  waitUntil(
-    captureWebhookLog({
-      ...requestLog,
-      statusCode: 200,
-      duration: Date.now() - startTime,
-      responseBody: response,
-    }),
-  );
+  // orders/paid is logged by processShopifyOrderJob after the order is processed
+  if (topic !== "orders/paid") {
+    waitUntil(
+      captureWebhookLog({
+        ...requestLog,
+        statusCode: 200,
+        duration: Date.now() - startTime,
+        responseBody: response,
+      }),
+    );
+  }
 
   return new Response(response);
-};
+});
diff --git a/apps/web/app/(ee)/api/shopify/pixel/route.ts b/apps/web/app/(ee)/api/shopify/pixel/route.ts
index 7723bd31fa6..8ee49fb18da 100644
--- a/apps/web/app/(ee)/api/shopify/pixel/route.ts
+++ b/apps/web/app/(ee)/api/shopify/pixel/route.ts
@@ -1,24 +1,47 @@
 import { COMMON_CORS_HEADERS } from "@/lib/api/cors";
-import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { parseRequestBody } from "@/lib/api/utils";
+import {
+  shopifyCheckoutCache,
+  tryDispatchShopifyOrderJob,
+} from "@/lib/integrations/shopify/checkout-cache";
 import { getClickEvent } from "@/lib/tinybird";
-import { ratelimit, redis } from "@/lib/upstash";
+import { ratelimit } from "@/lib/upstash";
 import { LOCALHOST_IP } from "@dub/utils";
 import { ipAddress, waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
+import * as z from "zod/v4";
 
-export const runtime = "edge";
+const inputSchema = z.object({
+  clickId: z.string().nullish(),
+  checkoutToken: z.string().nullish(),
+  shopDomain: z.string().nullish(),
+});
 
 // POST /api/shopify/pixel – Handle the Shopify Pixel events
 export const POST = async (req: Request) => {
+  const response = NextResponse.json("OK", {
+    headers: COMMON_CORS_HEADERS,
+  });
+
   try {
-    let { clickId, checkoutToken } = await parseRequestBody(req);
+    const { clickId, checkoutToken, shopDomain } = inputSchema.parse(
+      await parseRequestBody(req),
+    );
+
+    console.info("Shopify pixel event", {
+      clickId,
+      checkoutToken,
+      shopDomain,
+    });
 
     if (!checkoutToken) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: "checkoutToken is required.",
-      });
+      console.error("Missing checkoutToken. Skipping the request...");
+      return response;
+    }
+
+    if (!clickId) {
+      console.error("Missing clickId. Skipping the request...");
+      return response;
     }
 
     // Rate limit the request
@@ -26,32 +49,35 @@ export const POST = async (req: Request) => {
     const { success } = await ratelimit().limit(`shopify-track-pixel:${ip}`);
 
     if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Don't DDoS me pls 🥺",
-      });
+      console.error("Rate limit exceeded. Skipping the request...");
+      return response;
     }
 
-    // Validate the clickId if provided
-    if (clickId) {
-      const clickEvent = await getClickEvent({ clickId });
-
-      if (!clickEvent) {
-        clickId = null;
-      }
+    // Get the click event
+    const clickEvent = await getClickEvent({ clickId });
+    if (!clickEvent) {
+      console.error("Click event not found. Skipping the request...");
+      return response;
     }
 
     waitUntil(
-      redis.hset(`shopify:checkout:${checkoutToken}`, {
-        clickId: clickId || "",
-      }),
+      (async () => {
+        const checkout = await shopifyCheckoutCache.set({
+          checkoutToken,
+          fields: { clickId },
+        });
+
+        await tryDispatchShopifyOrderJob({
+          checkoutToken,
+          checkout,
+        });
+      })(),
     );
 
-    return NextResponse.json("OK", {
-      headers: COMMON_CORS_HEADERS,
-    });
+    return response;
   } catch (error) {
-    return handleAndReturnErrorResponse(error, COMMON_CORS_HEADERS);
+    console.error("Error processing Shopify pixel event", error);
+    return response;
   }
 };
 
diff --git a/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts b/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts
index 2d86f8ea145..0ec807262da 100644
--- a/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts
+++ b/apps/web/app/(ee)/api/stripe/connect/webhook/account-updated.ts
@@ -1,4 +1,5 @@
 import { detectDuplicatePayoutMethodFraud } from "@/lib/api/fraud/detect-duplicate-payout-method-fraud";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { qstash } from "@/lib/cron";
 import { getPartnerBankAccount } from "@/lib/partners/get-partner-bank-account";
 import { recomputePartnerPayoutState } from "@/lib/payouts/recompute-partner-payout-state";
@@ -107,6 +108,11 @@ export async function accountUpdated(event: Stripe.AccountUpdatedEvent) {
     },
   });
 
+  // Queue an index update because the partner country moved (filterable field)
+  if (countryChanged) {
+    await queuePartnerSearchSync({ partnerIds: [partner.id] });
+  }
+
   if (!hasPayoutStateChanged) {
     return `No change in payout state for partner ${partner.email} (${partner.stripeConnectId}), skipping...`;
   }
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
index 0b87fe57161..db03c2187d0 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/checkout-session-completed.ts
@@ -5,6 +5,7 @@ import { getOrCreateCustomer } from "@/lib/api/customers/get-or-create-customer"
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { queueGoogleAdsConversionUpload } from "@/lib/integrations/google-ads/upload-conversion";
 import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
 import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
 import { prisma } from "@/lib/prisma";
@@ -19,13 +20,14 @@ import { redis } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformSaleEventData } from "@/lib/webhook/transform";
 import { nanoid } from "@dub/utils";
-import { Customer } from "@prisma/client";
+import { CommissionSource, Customer, EventType } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
 import { attributeViaPromotionCodeId } from "./utils/attribute-via-promotion-code-id";
 import { getCheckoutSessionProducts } from "./utils/get-checkout-session-products";
 import { getConnectedCustomer } from "./utils/get-connected-customer";
+import { getDubCustomerExternalIdFromMetadata } from "./utils/get-dub-customer-external-id-from-metadata";
 import { incrementLinkLeads } from "./utils/increment-link-leads";
 import { updateCustomerWithStripeCustomerId } from "./utils/update-customer-with-stripe-customer-id";
 
@@ -36,9 +38,9 @@ export async function checkoutSessionCompleted({
   workspace,
 }: WebhookHandlerInput<Stripe.CheckoutSessionCompletedEvent>): Promise<WebhookHandlerResponse> {
   let checkoutSession = event.data.object;
-  let dubCustomerExternalId =
-    checkoutSession.metadata?.dubCustomerExternalId ||
-    checkoutSession.metadata?.dubCustomerId;
+  let dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+    checkoutSession.metadata,
+  );
   const clientReferenceId = checkoutSession.client_reference_id;
   const stripeAccountId = event.account as string;
   const stripeCustomerId = checkoutSession.customer as string;
@@ -72,6 +74,12 @@ export async function checkoutSessionCompleted({
       };
     }
 
+    if (clickEvent.workspace_id !== workspace.id) {
+      return {
+        response: `Link "${clickEvent.link_id}" for click event "${dubClickId}" does not belong to workspace ${workspace.id}, skipping...`,
+      };
+    }
+
     const payload = {
       name: stripeCustomerName,
       email: stripeCustomerEmail,
@@ -250,8 +258,7 @@ export async function checkoutSessionCompleted({
         });
 
         const connectedCustomerDubCustomerExternalId =
-          connectedCustomer?.metadata.dubCustomerExternalId ||
-          connectedCustomer?.metadata.dubCustomerId;
+          getDubCustomerExternalIdFromMetadata(connectedCustomer?.metadata);
 
         if (connectedCustomerDubCustomerExternalId) {
           dubCustomerExternalId = connectedCustomerDubCustomerExternalId;
@@ -498,6 +505,14 @@ export async function checkoutSessionCompleted({
       mode,
     });
 
+    const saleMetadata = checkoutSession.metadata ?? {};
+
+    const commissionMetadata = {
+      client_reference_id: checkoutSession.client_reference_id,
+      products,
+      ...saleMetadata,
+    };
+
     result = await queuePartnerCommissionCreation({
       event: "sale",
       programId: link.programId,
@@ -509,6 +524,8 @@ export async function checkoutSessionCompleted({
       quantity: 1,
       invoiceId,
       currency: saleData.currency,
+      source: CommissionSource.stripe,
+      metadata: commissionMetadata,
       context: {
         customer: {
           country: customer.country,
@@ -517,10 +534,7 @@ export async function checkoutSessionCompleted({
         sale: {
           products,
           amount: saleData.amount,
-          ...(checkoutSession.metadata &&
-          Object.keys(checkoutSession.metadata).length > 0
-            ? { metadata: checkoutSession.metadata }
-            : {}),
+          metadata: saleMetadata,
         },
       },
       clickEvent: {
@@ -573,6 +587,20 @@ export async function checkoutSessionCompleted({
         }),
       }),
 
+      queueGoogleAdsConversionUpload({
+        workspaceId: workspace.id,
+        eventType: EventType.sale,
+        eventName: saleData.event_name,
+        conversionDateTime: new Date().toISOString(),
+        eventId: saleData.event_id,
+        conversionValue: saleData.amount,
+        currencyCode: saleData.currency,
+        click: {
+          id: saleData.click_id,
+          url: saleData.url,
+        },
+      }),
+
       ...(link?.partnerId
         ? [
             sendPartnerPostback({
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
index cedb449c39b..2bcda448d1e 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
@@ -1,10 +1,12 @@
 import { getWorkspaceUsers } from "@/lib/api/get-workspace-users";
-import { qstash } from "@/lib/cron";
+import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import { prisma } from "@/lib/prisma";
 import { sendBatchEmail } from "@dub/email";
 import { VARIANT_TO_FROM_MAP } from "@dub/email/resend/constants";
 import DiscountDeleted from "@dub/email/templates/discount-deleted";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { pluck } from "@dub/utils";
+import { DiscountProvider } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
@@ -19,8 +21,9 @@ export async function couponDeleted({
 >): Promise<WebhookHandlerResponse> {
   const coupon = event.data.object;
   const stripeAccountId = event.account as string;
+  const programId = workspace.defaultProgramId;
 
-  if (!workspace.defaultProgramId) {
+  if (!programId) {
     return {
       response: `Workspace ${workspace.id} for stripe account ${stripeAccountId} has no programs.`,
     };
@@ -28,63 +31,69 @@ export async function couponDeleted({
 
   const discounts = await prisma.discount.findMany({
     where: {
-      programId: workspace.defaultProgramId,
+      programId,
+      provider: DiscountProvider.stripe,
       OR: [{ couponId: coupon.id }, { couponTestId: coupon.id }],
     },
-    include: {
-      partnerGroup: true,
-    },
   });
 
-  if (!discounts.length) {
+  if (discounts.length === 0) {
     return {
       response: `Discount not found for Stripe coupon ${coupon.id}.`,
     };
   }
 
-  const discountIds = discounts.map((d) => d.id);
+  const discountIds = pluck(discounts, "id");
 
   await prisma.$transaction(async (tx) => {
-    if (discountIds.length > 0) {
-      await tx.partnerGroup.updateMany({
-        where: {
-          discountId: {
-            in: discountIds,
-          },
-        },
-        data: {
-          discountId: null,
+    await tx.partnerGroup.updateMany({
+      where: {
+        discountId: {
+          in: discountIds,
         },
-      });
+      },
+      data: {
+        discountId: null,
+      },
+    });
 
-      await tx.programEnrollment.updateMany({
-        where: {
-          discountId: {
-            in: discountIds,
-          },
-        },
-        data: {
-          discountId: null,
+    // Soft delete the discounts
+    await tx.discount.updateMany({
+      where: {
+        id: {
+          in: discountIds,
         },
-      });
+      },
+      data: {
+        programId: null,
+      },
+    });
+  });
 
-      await tx.discountCode.deleteMany({
-        where: {
-          discountId: {
-            in: discountIds,
-          },
-        },
-      });
+  await dispatchWorkflows(
+    discountIds.map((discountId) => ({
+      name: "detach-discount-workflow" as const,
+      payload: {
+        programId,
+        discountId,
+      },
+      options: {
+        label: discountId,
+      },
+    })),
+  );
 
-      await tx.discount.deleteMany({
-        where: {
-          id: {
-            in: discountIds,
-          },
-        },
-      });
-    }
-  });
+  // Expire cached links before async detach — edge ignores soft-deleted rows,
+  // but Redis may still serve the pre-delete discount.
+  await Promise.all(
+    discountIds.map((discountId) =>
+      invalidateLinksForDiscountsJob.dispatch({
+        by: "discount",
+        programId,
+        discountId,
+      }),
+    ),
+  );
 
   waitUntil(
     (async () => {
@@ -93,34 +102,19 @@ export async function couponDeleted({
         role: "owner",
       });
 
-      const groupIds = discounts
-        .map((d) => d.partnerGroup?.id)
-        .filter(Boolean) as string[];
-
-      await Promise.allSettled([
-        ...groupIds.map((groupId) =>
-          qstash.publishJSON({
-            url: `${APP_DOMAIN_WITH_NGROK}/api/cron/links/invalidate-for-discounts`,
-            body: {
-              groupId,
+      await sendBatchEmail(
+        users.map((user) => ({
+          from: VARIANT_TO_FROM_MAP.notifications,
+          to: user.email,
+          subject: "Your discount has been deleted",
+          react: DiscountDeleted({
+            email: user.email,
+            coupon: {
+              id: coupon.id,
             },
           }),
-        ),
-
-        sendBatchEmail(
-          users.map((user) => ({
-            from: VARIANT_TO_FROM_MAP.notifications,
-            to: user.email,
-            subject: "Your discount has been deleted",
-            react: DiscountDeleted({
-              email: user.email,
-              coupon: {
-                id: coupon.id,
-              },
-            }),
-          })),
-        ),
-      ]);
+        })),
+      );
     })(),
   );
 
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/customer-subscription-created.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/customer-subscription-created.ts
index 6c7c288df88..6e2cd5fd9e6 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/customer-subscription-created.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/customer-subscription-created.ts
@@ -2,7 +2,7 @@ import { trackLead } from "@/lib/api/conversions/track-lead";
 import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";
 import { prisma } from "@/lib/prisma";
 import { pick, STRIPE_INTEGRATION_ID } from "@dub/utils";
-import { Customer } from "@prisma/client";
+import { CommissionSource, Customer } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
@@ -128,6 +128,7 @@ export async function customerSubscriptionCreated({
     eventQuantity,
     workspace: pick(workspace, ["id", "stripeConnectId", "webhookEnabled"]),
     source: "trial",
+    commissionSource: CommissionSource.stripe,
   });
 
   return {
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
index 9c03fbd7ad0..c064da88dec 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/invoice-paid.ts
@@ -3,6 +3,7 @@ import { isFirstConversion } from "@/lib/analytics/is-first-conversion";
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { queueGoogleAdsConversionUpload } from "@/lib/integrations/google-ads/upload-conversion";
 import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
 import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
 import { prisma } from "@/lib/prisma";
@@ -13,11 +14,13 @@ import { redis } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformSaleEventData } from "@/lib/webhook/transform";
 import { nanoid } from "@dub/utils";
+import { CommissionSource, EventType } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { WebhookHandlerInput, WebhookHandlerResponse } from "./types";
 import { attributeViaPromotionCodeId } from "./utils/attribute-via-promotion-code-id";
 import { getConnectedCustomer } from "./utils/get-connected-customer";
+import { getDubCustomerExternalIdFromMetadata } from "./utils/get-dub-customer-external-id-from-metadata";
 
 // Handle event "invoice.paid"
 export async function invoicePaid({
@@ -57,9 +60,9 @@ export async function invoicePaid({
       mode,
     });
 
-    const dubCustomerExternalId =
-      connectedCustomer?.metadata.dubCustomerExternalId ||
-      connectedCustomer?.metadata.dubCustomerId;
+    const dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+      connectedCustomer?.metadata,
+    );
 
     if (dubCustomerExternalId) {
       try {
@@ -310,9 +313,19 @@ export async function invoicePaid({
 
         if (!productId) return null;
 
+        // Credit grants sit on the line, not in line.amount — subtract so
+        // productId rewards commission on the portion actually charged.
+        const creditGrantAmount = (line.pretax_credit_amounts ?? []).reduce(
+          (sum, credit) =>
+            credit.type === "credit_balance_transaction"
+              ? sum + credit.amount
+              : sum,
+          0,
+        );
+
         return {
           id: productId,
-          amount: line.amount,
+          amount: Math.max(line.amount - creditGrantAmount, 0),
           quantity: line.quantity ?? 0,
         };
       })
@@ -321,6 +334,11 @@ export async function invoicePaid({
           p !== null && p.quantity !== null,
       );
 
+    const commissionMetadata = {
+      products,
+      ...saleMetadata,
+    };
+
     result = await queuePartnerCommissionCreation({
       event: "sale",
       programId: link.programId,
@@ -332,6 +350,8 @@ export async function invoicePaid({
       quantity: 1,
       invoiceId,
       currency: saleData.currency,
+      source: CommissionSource.stripe,
+      metadata: commissionMetadata,
       context: {
         customer: {
           country: customer.country,
@@ -340,9 +360,7 @@ export async function invoicePaid({
         sale: {
           products,
           amount: saleData.amount,
-          ...(Object.keys(saleMetadata).length > 0
-            ? { metadata: saleMetadata }
-            : {}),
+          metadata: saleMetadata,
         },
       },
       clickEvent: {
@@ -395,6 +413,20 @@ export async function invoicePaid({
         }),
       }),
 
+      queueGoogleAdsConversionUpload({
+        workspaceId: workspace.id,
+        eventType: EventType.sale,
+        eventName: saleData.event_name,
+        conversionDateTime: new Date().toISOString(),
+        eventId: saleData.event_id,
+        conversionValue: saleData.amount,
+        currencyCode: saleData.currency,
+        click: {
+          id: saleData.click_id,
+          url: saleData.url,
+        },
+      }),
+
       ...(link?.partnerId
         ? [
             sendPartnerPostback({
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/attribute-via-promotion-code-id.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/attribute-via-promotion-code-id.ts
index 8d455725c98..48b71259751 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/attribute-via-promotion-code-id.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/attribute-via-promotion-code-id.ts
@@ -2,6 +2,7 @@ import { createId } from "@/lib/api/create-id";
 import { getOrCreateCustomer } from "@/lib/api/customers/get-or-create-customer";
 import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { queueGoogleAdsConversionUpload } from "@/lib/integrations/google-ads/upload-conversion";
 import { generateRandomName } from "@/lib/names";
 import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
 import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
@@ -13,7 +14,7 @@ import { redis } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformLeadEventData } from "@/lib/webhook/transform";
 import { COUNTRIES_TO_CONTINENTS, nanoid } from "@dub/utils";
-import { Project } from "@prisma/client";
+import { CommissionSource, EventType, Project } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { getPromotionCode } from "./get-promotion-code";
@@ -210,6 +211,7 @@ export async function attributeViaPromotionCodeId({
           eventId: leadEvent.event_id,
           customerId: customer.id,
           quantity: 1,
+          source: CommissionSource.stripe,
           context: {
             customer: {
               country: customer.country,
@@ -254,6 +256,19 @@ export async function attributeViaPromotionCodeId({
           }),
         }),
 
+        queueGoogleAdsConversionUpload({
+          workspaceId: workspace.id,
+          eventType: EventType.lead,
+          eventId: leadEvent.event_id,
+          eventName: leadEvent.event_name,
+          conversionDateTime: new Date().toISOString(),
+          conversionCount: 1,
+          click: {
+            id: leadEvent.click_id,
+            url: leadEvent.url,
+          },
+        }),
+
         ...(link.partnerId
           ? [
               sendPartnerPostback({
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts
new file mode 100644
index 00000000000..50d08b46bc3
--- /dev/null
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/get-dub-customer-external-id-from-metadata.ts
@@ -0,0 +1,21 @@
+/**
+ * Resolve Dub customer.externalId from Stripe object metadata.
+ * Precedence:
+ * 1. dubCustomerExternalId
+ * 2. dubCustomerId
+ * 3. user_id (Lemon Squeezy customer id after LS → Stripe migration)
+ */
+export function getDubCustomerExternalIdFromMetadata(
+  metadata?: Record<string, string> | null,
+): string | undefined {
+  if (!metadata) return undefined;
+
+  const value =
+    metadata.dubCustomerExternalId ||
+    metadata.dubCustomerId ||
+    metadata.user_id;
+
+  if (value == null || value === "") return undefined;
+
+  return String(value);
+}
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
index c8023f4ace7..9e8600771a0 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/utils/sync-customer.ts
@@ -3,6 +3,7 @@ import { getOrCreateCustomer } from "@/lib/api/customers/get-or-create-customer"
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { queueGoogleAdsConversionUpload } from "@/lib/integrations/google-ads/upload-conversion";
 import { generateRandomName } from "@/lib/names";
 import { constructWebhookPartner } from "@/lib/partners/constuct-webhook-partner";
 import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
@@ -12,10 +13,11 @@ import { redis } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformLeadEventData } from "@/lib/webhook/transform";
 import { nanoid, pick } from "@dub/utils";
-import { Prisma } from "@prisma/client";
+import { EventType, Prisma } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import type Stripe from "stripe";
 import { WebhookHandlerInput, WebhookHandlerResponse } from "../types";
+import { getDubCustomerExternalIdFromMetadata } from "./get-dub-customer-external-id-from-metadata";
 
 export async function syncCustomer({
   event,
@@ -28,9 +30,9 @@ export async function syncCustomer({
 >): Promise<WebhookHandlerResponse> {
   const stripeCustomer = event.data.object;
   const stripeAccountId = event.account as string;
-  const dubCustomerExternalId =
-    stripeCustomer.metadata?.dubCustomerExternalId ||
-    stripeCustomer.metadata?.dubCustomerId;
+  const dubCustomerExternalId = getDubCustomerExternalIdFromMetadata(
+    stripeCustomer.metadata,
+  );
   const clickId = stripeCustomer.metadata?.dubClickId;
 
   console.log(
@@ -266,18 +268,32 @@ export async function syncCustomer({
         ]);
       }
 
-      await sendWorkspaceWebhook({
-        trigger: "lead.created",
-        workspace,
-        data: transformLeadEventData({
-          ...clickData,
-          eventName,
-          link: linkUpdated,
-          customer,
-          partner: webhookPartner,
-          metadata: null,
+      await Promise.allSettled([
+        sendWorkspaceWebhook({
+          trigger: "lead.created",
+          workspace,
+          data: transformLeadEventData({
+            ...clickData,
+            eventName,
+            link: linkUpdated,
+            customer,
+            partner: webhookPartner,
+            metadata: null,
+          }),
+        }),
+        queueGoogleAdsConversionUpload({
+          workspaceId: workspace.id,
+          eventType: EventType.lead,
+          eventId: leadData.event_id,
+          eventName: leadData.event_name,
+          conversionDateTime: new Date().toISOString(),
+          conversionCount: 1,
+          click: {
+            id: clickData.click_id,
+            url: clickData.url,
+          },
         }),
-      });
+      ]);
     })(),
   );
 
diff --git a/apps/web/app/(ee)/api/stripe/webhook/charge-dispute-created.ts b/apps/web/app/(ee)/api/stripe/webhook/charge-dispute-created.ts
index 02dedfc187f..53b58508f07 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/charge-dispute-created.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/charge-dispute-created.ts
@@ -33,9 +33,13 @@ export async function chargeDisputeCreated(
 
   await disableWorkspaceLinks(workspace.id);
 
+  // Update all users to viewer role except for LEGAL_USER_ID
   const updatedUsers = await prisma.projectUsers.updateMany({
     where: {
       projectId: workspace.id,
+      userId: {
+        not: LEGAL_USER_ID,
+      },
     },
     data: {
       role: "viewer",
@@ -44,17 +48,37 @@ export async function chargeDisputeCreated(
 
   console.log(`Updated ${updatedUsers.count} users to viewer role`);
 
-  await prisma.projectUsers.create({
-    data: {
+  // Add LEGAL_USER_ID as owner
+  await prisma.projectUsers.upsert({
+    where: {
+      userId_projectId: {
+        projectId: workspace.id,
+        userId: LEGAL_USER_ID,
+      },
+    },
+    update: {
+      role: "owner",
+    },
+    create: {
       projectId: workspace.id,
       userId: LEGAL_USER_ID,
       role: "owner",
     },
   });
+
   console.log(
     `Added legal user ${LEGAL_USER_ID} as owner to workspace ${workspace.id}`,
   );
 
+  await prisma.project.update({
+    where: {
+      id: workspace.id,
+    },
+    data: {
+      disabledAt: new Date(),
+    },
+  });
+
   await addToStripeFraudValueLists({
     customerId: customer.id,
     customerEmail: customer.email,
diff --git a/apps/web/app/(ee)/api/stripe/webhook/route.ts b/apps/web/app/(ee)/api/stripe/webhook/route.ts
index 6ca0c1561bf..153ceca9ad7 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/route.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/route.ts
@@ -1,3 +1,4 @@
+import { withAxiom } from "@/lib/axiom/server";
 import { stripe } from "@/lib/stripe";
 import { log } from "@dub/utils";
 import Stripe from "stripe";
@@ -29,13 +30,15 @@ const relevantEvents = new Set([
 ]);
 
 // POST /api/stripe/webhook – listen to Stripe webhooks
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const buf = await req.text();
   const sig = req.headers.get("Stripe-Signature") as string;
   const webhookSecret = process.env.STRIPE_WEBHOOK_SECRET;
   let event: Stripe.Event;
   try {
-    if (!sig || !webhookSecret) return;
+    if (!sig || !webhookSecret) {
+      return logAndRespond("Invalid request", { status: 400 });
+    }
     event = stripe.webhooks.constructEvent(buf, sig, webhookSecret);
   } catch (err: any) {
     console.log(`❌ Error message: ${err.message}`);
@@ -99,4 +102,4 @@ export const POST = async (req: Request) => {
   }
 
   return logAndRespond(`[${event.type}]: ${response}`);
-};
+});
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/detect-and-handle-fraudulent-failed-charge.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/detect-and-handle-fraudulent-failed-charge.ts
index f9b72f4841a..c7989924b8a 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/detect-and-handle-fraudulent-failed-charge.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/detect-and-handle-fraudulent-failed-charge.ts
@@ -100,6 +100,15 @@ export async function detectAndHandleFraudulentFailedCharge(
             );
             // disable workspace links
             await disableWorkspaceLinks(workspace.id);
+
+            await prisma.project.update({
+              where: {
+                id: workspace.id,
+              },
+              data: {
+                disabledAt: new Date(),
+              },
+            });
           } else {
             // if workspace has no links, just delete it
             await prisma.project.delete({
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/send-cancellation-feedback.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/send-cancellation-feedback.ts
index e2035e6db50..ec113188f1b 100644
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/send-cancellation-feedback.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/send-cancellation-feedback.ts
@@ -1,20 +1,11 @@
 import { isBlacklistedEmail } from "@/lib/edge-config";
 import { prisma } from "@/lib/prisma";
+import { STRIPE_CANCELLATION_FEEDBACK_EMAIL_COPY } from "@/lib/stripe/cancellation-feedback";
 import { sendEmail } from "@dub/email";
 import Stripe from "stripe";
 
 export const CANCELLATION_FEEDBACK_EMAIL_TYPE = "cancellationFeedbackEmail";
 
-const cancellationReasonMap = {
-  customer_service: "you had a bad experience with our customer service",
-  low_quality: "the product didn't meet your expectations",
-  missing_features: "you were expecting more features",
-  switched_service: "you switched to a different service",
-  too_complex: "the product was too complex",
-  too_expensive: "the product was too expensive",
-  unused: "you didn't use the product",
-};
-
 export async function sendCancellationFeedback({
   workspace,
   owners,
@@ -59,7 +50,10 @@ export async function sendCancellationFeedback({
     },
   });
 
-  const reasonText = reason ? cancellationReasonMap[reason] : "";
+  const reasonText =
+    reason && reason in STRIPE_CANCELLATION_FEEDBACK_EMAIL_COPY
+      ? STRIPE_CANCELLATION_FEEDBACK_EMAIL_COPY[reason]
+      : "";
 
   return await Promise.all(
     owners.map(
diff --git a/apps/web/app/(ee)/api/track/application/route.ts b/apps/web/app/(ee)/api/track/application/route.ts
index ed5b08b0788..75f1510da55 100644
--- a/apps/web/app/(ee)/api/track/application/route.ts
+++ b/apps/web/app/(ee)/api/track/application/route.ts
@@ -17,7 +17,8 @@ import {
   recordClickZod,
   recordClickZodSchema,
 } from "@/lib/tinybird/record-click-zod";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { publishLinkClickEvent } from "@/lib/upstash/redis-streams/link-click-events";
 import { MARKETPLACE_RESERVED_SLUGS } from "@/ui/program-marketplace/utils/urls";
 import {
@@ -48,16 +49,10 @@ export const POST = withAxiom(async (req) => {
     }
 
     const ip = await getIP();
-    const { success } = await ratelimit(10, "10 s").limit(
-      `track-application:${ip}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many requests. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.trackApplication,
+      identifier: ip,
+    });
 
     const { eventName, url, referrer } = trackApplicationEventSchema.parse(
       await parseRequestBody(req),
diff --git a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
index d64ab12bd1d..aabca257e97 100644
--- a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
+++ b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts
@@ -10,14 +10,17 @@ import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-
 import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
 import { logger } from "@/lib/axiom/server";
-import { getWorkflowConfig } from "@/lib/cron/qstash-workflow";
+import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";
 import { constructWebhookPartner } from "@/lib/partners/constuct-webhook-partner";
-import { determinePartnerRewards } from "@/lib/partners/determine-partner-reward";
+import {
+  determinePartnerRewards,
+  getRewardMaxDurationForContext,
+} from "@/lib/partners/determine-partner-reward";
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
 import { prisma } from "@/lib/prisma";
-import { RewardProps } from "@/lib/types";
+import { RewardConditions, RewardProps } from "@/lib/types";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import {
   CommissionWebhookSchema,
@@ -25,7 +28,6 @@ import {
 } from "@/lib/zod/schemas/commissions";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
 import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
-import { buildCommissionDescription } from "@/ui/partners/program-reward-spend-limit";
 import { currencyFormatter, log, pick, toCentsNumber } from "@dub/utils";
 import {
   Commission,
@@ -82,7 +84,7 @@ const commissionInclude: Prisma.CommissionInclude = {
 export const { POST } = serve<Input>(
   async (context) => {
     const input = context.requestPayload;
-    const { event, partnerId, programId, bountySubmissionId } = input;
+    const { event, partnerId, programId, linkId, bountySubmissionId } = input;
 
     const programEnrollment = await getProgramEnrollmentOrThrow({
       partnerId,
@@ -96,6 +98,15 @@ export const { POST } = serve<Input>(
       },
     });
 
+    if (linkId) {
+      const link = programEnrollment.links.find((link) => link.id === linkId);
+      if (!link) {
+        return logAndReturn({
+          outputLog: `Link "${linkId}" does not belong to partner "${partnerId}" and program "${programId}", skipping commission creation...`,
+        });
+      }
+    }
+
     // Step 1: Create commission
     const { commission, isFirstCommission } = await context.run(
       "create-commission",
@@ -153,11 +164,6 @@ export const { POST } = serve<Input>(
       failResponse,
       failHeaders,
     }) => {
-      const { correlation } = getWorkflowConfig({
-        workflowType: "create-partner-commission",
-        body: context.requestPayload,
-      });
-
       logger.error("workflow.failed", {
         service: "qstash",
         event: "workflow.failed",
@@ -166,7 +172,6 @@ export const { POST } = serve<Input>(
         failStatus,
         failResponse,
         failHeaders,
-        correlation,
       });
 
       await logger.flush();
@@ -185,6 +190,7 @@ async function stepCreateCommission(
     customerId,
     eventId,
     invoiceId,
+    rewardId,
     amount,
     quantity,
     currency,
@@ -192,6 +198,8 @@ async function stepCreateCommission(
     createdAt,
     status,
     userId,
+    source,
+    metadata,
     context,
     programEnrollment,
   } = input;
@@ -221,6 +229,7 @@ async function stepCreateCommission(
 
   let earnings = 0;
   let reward: RewardProps | null = null;
+  let matchedCondition: RewardConditions | null = null;
   let firstCommission: Pick<
     Commission,
     "rewardId" | "status" | "createdAt"
@@ -273,16 +282,18 @@ async function stepCreateCommission(
       };
     }
 
-    const rewards = determinePartnerRewards({
+    const rewards = await determinePartnerRewards({
       event,
       programEnrollment,
       context,
       amount,
       quantity,
+      linkId: linkId ?? null,
     });
 
     if (rewards.length > 0) {
       reward = rewards[0].reward;
+      matchedCondition = rewards[0].matchedCondition;
     }
 
     // if there is no reward, skip commission creation
@@ -327,16 +338,24 @@ async function stepCreateCommission(
             select: {
               id: true,
               maxDuration: true,
+              modifiers: true,
             },
           });
 
+          const originalMaxDuration = originalReward
+            ? getRewardMaxDurationForContext({
+                reward: originalReward,
+                context,
+              })
+            : null;
+
           if (
-            typeof originalReward?.maxDuration === "number" &&
-            originalReward.maxDuration === 0
+            typeof originalMaxDuration === "number" &&
+            originalMaxDuration === 0
           ) {
             return logAndReturn({
               commission: null,
-              outputLog: `Partner ${partnerId} is only eligible for first-sale commissions based on the original reward ${originalReward.id}, skipping commission creation...`,
+              outputLog: `Partner ${partnerId} is only eligible for first-sale commissions based on the original reward ${originalReward?.id}, skipping commission creation...`,
             });
           }
         }
@@ -396,6 +415,8 @@ async function stepCreateCommission(
     });
   }
 
+  let cappedEarnings = earnings;
+
   if (
     customerId &&
     event !== "custom" &&
@@ -403,7 +424,7 @@ async function stepCreateCommission(
     reward.spendLimitAmount &&
     reward.spendLimitInterval
   ) {
-    const cappedEarnings = await clampEarningsToSpendLimit({
+    cappedEarnings = await clampEarningsToSpendLimit({
       reward,
       earnings,
       programId,
@@ -419,16 +440,38 @@ async function stepCreateCommission(
         outputLog: `Partner ${partnerId} has reached spend limit (${currencyFormatter(reward.spendLimitAmount)} ${reward.spendLimitInterval === "allTime" ? "" : `per ${reward.spendLimitInterval}`}) for ${event} event, skipping commission creation...`,
       });
     }
+  }
 
-    if (!description) {
-      description = buildCommissionDescription({
-        earnings,
-        cappedEarnings,
-        reward,
-      });
-    }
+  // Custom reward jobs are queued from a snapshot of eligible enrollments.
+  // Re-check at write time so we don't pay a partner who was banned, deactivated,
+  // or moved off this reward before the workflow ran.
+  // Only jobs that pass rewardId (create-custom-commission) should be gated —
+  // manual commissions and bounty payouts also use event "custom" but have no rewardId.
+  const isCustomRewardCommission = event === "custom" && Boolean(rewardId);
+  const stillOnCustomReward = programEnrollment.customRewardId === rewardId;
+
+  if (
+    isCustomRewardCommission &&
+    (programEnrollment.status !== "approved" || !stillOnCustomReward)
+  ) {
+    return logAndReturn({
+      commission: null,
+      outputLog: `Partner ${partnerId} is no longer eligible for custom reward ${rewardId} (status: ${programEnrollment.status}), skipping commission creation...`,
+    });
+  }
 
-    earnings = cappedEarnings;
+  // Snapshot the applied reward (and matched condition) so the activity log
+  // does not fall back to the live reward after later edits.
+  // Known limitation: when determinePartnerRewards splits Stripe products into
+  // multiple line rewards and we sum earnings, we only describe rewards[0]'s
+  // rate/condition — not every product line.
+  if (!description && reward && event !== "custom") {
+    description = buildCommissionDescription({
+      reward,
+      matchedCondition,
+      earnings,
+      cappedEarnings,
+    });
   }
 
   try {
@@ -437,20 +480,22 @@ async function stepCreateCommission(
         id: createId({ prefix: "cm_" }),
         programId,
         partnerId,
-        rewardId: reward?.id,
+        rewardId: reward?.id ?? rewardId,
         customerId,
         linkId,
         eventId: eventId || null, // empty string should convert to null
         invoiceId: invoiceId || null, // empty string should convert to null
         userId,
+        source,
         quantity,
         amount,
         type: event,
         currency,
-        earnings,
+        earnings: cappedEarnings,
         status,
         description,
         createdAt,
+        metadata: metadata ?? Prisma.DbNull,
       },
     });
 
diff --git a/apps/web/app/(ee)/api/workflows/detach-discount/route.ts b/apps/web/app/(ee)/api/workflows/detach-discount/route.ts
new file mode 100644
index 00000000000..5ee8a29f60b
--- /dev/null
+++ b/apps/web/app/(ee)/api/workflows/detach-discount/route.ts
@@ -0,0 +1,131 @@
+import { logger } from "@/lib/axiom/server";
+import {
+  detachDiscountFromLinkRewards,
+  detachDiscountFromProgramEnrollments,
+  dispatchRemapDiscountCodes,
+} from "@/lib/discounts/detach-discount";
+import { prisma } from "@/lib/prisma";
+import { serve } from "@upstash/workflow/nextjs";
+import * as z from "zod/v4";
+import { logAndReturn } from "../../cron/utils";
+
+const inputSchema = z.object({
+  programId: z.string(),
+  discountId: z.string(),
+});
+
+type Input = z.infer<typeof inputSchema>;
+
+/**
+ * Detach Discount Workflow
+ *
+ * Soft-deleted discounts (programId cleared) are cleaned up as:
+ *
+ * 1. detach-discount-from-enrollments + detach-discount-from-link-rewards (parallel)
+ * 2. remap-discount-codes
+ *
+ * Hard-delete is deferred to /api/cron/cleanup/orphaned once remaps
+ * finish and nothing still references the soft-deleted discount.
+ */
+
+// POST /api/workflows/detach-discount
+export const { POST } = serve<Input>(
+  async (context) => {
+    const input = inputSchema.parse(context.requestPayload);
+    const { programId, discountId } = input;
+
+    const shouldProceed = await context.run("validate-discount", async () => {
+      const discount = await prisma.discount.findUnique({
+        where: {
+          id: discountId,
+        },
+        select: {
+          id: true,
+          programId: true,
+        },
+      });
+
+      if (!discount) {
+        return logAndReturn({
+          proceed: false,
+          outputLog: `Discount ${discountId} not found. Skipping...`,
+        });
+      }
+
+      if (discount.programId !== null) {
+        return logAndReturn({
+          proceed: false,
+          outputLog: `Discount ${discountId} is still associated with a program. Skipping...`,
+        });
+      }
+
+      return logAndReturn({
+        proceed: true,
+        outputLog: `Proceeding with detach discount for ${discountId}`,
+      });
+    });
+
+    if (!shouldProceed.proceed) {
+      return;
+    }
+
+    // Run these in parallel
+    await Promise.all([
+      context.run("detach-discount-from-enrollments", async () => {
+        await detachDiscountFromProgramEnrollments({
+          programId,
+          discountId,
+        });
+
+        return logAndReturn({
+          outputLog: `Detached discount ${discountId} from program enrollments`,
+        });
+      }),
+
+      context.run("detach-discount-from-link-rewards", async () => {
+        await detachDiscountFromLinkRewards({
+          programId,
+          discountId,
+        });
+
+        return logAndReturn({
+          outputLog: `Detached discount ${discountId} from link rewards`,
+        });
+      }),
+    ]);
+
+    // This should run after the enrollments and link rewards are updated
+    await context.run("remap-discount-codes", async () => {
+      await dispatchRemapDiscountCodes({
+        programId,
+        discountId,
+      });
+
+      return logAndReturn({
+        outputLog: `Dispatched remap jobs for discount codes on ${discountId}`,
+      });
+    });
+  },
+  {
+    failureFunction: async ({
+      context,
+      failStatus,
+      failResponse,
+      failHeaders,
+    }) => {
+      logger.error("workflow.failed", {
+        service: "qstash",
+        event: "workflow.failed",
+        workflowType: "detach-discount",
+        workflowRunId: context.workflowRunId,
+        discountId: context.requestPayload?.discountId,
+        programId: context.requestPayload?.programId,
+        failStatus,
+        failResponse,
+        failHeaders,
+      });
+
+      await logger.flush();
+    },
+  },
+);
diff --git a/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
new file mode 100644
index 00000000000..085831fea51
--- /dev/null
+++ b/apps/web/app/(ee)/api/workflows/merge-partner-accounts/route.ts
@@ -0,0 +1,991 @@
+import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
+import { logger } from "@/lib/axiom/server";
+import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
+import { conn } from "@/lib/planetscale";
+import { prisma } from "@/lib/prisma";
+import { storage } from "@/lib/storage";
+import { recordLink } from "@/lib/tinybird";
+import { redis } from "@/lib/upstash";
+import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
+import { partnerMergedWebhookSchema } from "@/lib/zod/schemas/partners";
+import { sendBatchEmail } from "@dub/email";
+import PartnerAccountMerged from "@dub/email/templates/partner-account-merged";
+import { prettyPrint, R2_URL } from "@dub/utils";
+import { FraudRuleType } from "@prisma/client";
+import { serve } from "@upstash/workflow/nextjs";
+import * as z from "zod/v4";
+import { logAndReturn } from "../../cron/utils";
+
+const inputSchema = z.object({
+  userId: z.string(),
+  sourceEmail: z.string(),
+  targetEmail: z.string(),
+  // When true (e.g. e2e tests) skip the email notification
+  skipEmailNotification: z.boolean().optional().default(false),
+});
+
+type Input = z.infer<typeof inputSchema>;
+
+const CACHE_KEY_PREFIX = "merge-partner-accounts";
+
+/**
+ * Steps:
+ * 1. load-merge-plan: resolve + validate accounts, build the ordered list of
+ *    source enrollments to process (overlaps first, then transfers).
+ * 2. merge-enrollment-<id> (one per enrollment): transfer the enrollment's
+ *    program data to the target and either merge into the existing target
+ *    enrollment (overlap) or move the enrollment over (transfer).
+ * 3. finalize-transfers: transfer bounty submissions + sync transferred links
+ *    (Tinybird/cache) and total commissions.
+ * 4. cleanup-source-account: delete the source partner's rewinds, source user,
+ *    duplicate-account fraud events, and finally the source partner itself.
+ * 5. send-merged-emails: clear the verification cache + notify both accounts.
+ */
+
+// POST /api/workflows/merge-partner-accounts
+export const { POST } = serve<Input>(
+  async (context) => {
+    const { userId, sourceEmail, targetEmail, skipEmailNotification } =
+      context.requestPayload;
+
+    // Step 1: Resolve + validate accounts and build the merge plan
+    const plan = await context.run("load-merge-plan", async () => {
+      return await loadMergePlan({ sourceEmail, targetEmail });
+    });
+
+    if (!plan.proceed) {
+      console.log(`Skipping merge: ${plan.reason}`);
+
+      // Clear the verification cache so the user can cleanly retry (sendTokens
+      // rejects a new request while this key is still set).
+      await context.run("clear-cache-after-skip", async () => {
+        await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
+        return logAndReturn({
+          outputLog: `Cleared merge cache after skipped merge: ${plan.reason}`,
+        });
+      });
+
+      return;
+    }
+
+    const {
+      sourcePartnerId,
+      targetPartnerId,
+      sourceImage,
+      sourceUserId,
+      hasRewinds,
+      orderedSourceEnrollmentIds,
+      programIdsToTransfer,
+    } = plan;
+
+    // Step 2: Merge each source enrollment in its own durable step.
+    // Overlaps are ordered first, then transfers. Each step re-fetches the
+    // live enrollment so it is safe to retry after a partial run.
+    for (const enrollmentId of orderedSourceEnrollmentIds) {
+      await context.run(`merge-enrollment-${enrollmentId}`, async () => {
+        return await mergeSingleEnrollment({
+          enrollmentId,
+          sourcePartnerId,
+          targetPartnerId,
+          sourceEmail,
+          targetEmail,
+        });
+      });
+    }
+
+    // Step 3: Finalize the transfers. Both the bounty transfer and the
+    // link/commission sync are idempotent post-transfer reconciliation
+    await context.run("finalize-transfers", async () => {
+      if (programIdsToTransfer.length === 0) {
+        return logAndReturn({ outputLog: "No programs to finalize." });
+      }
+
+      // Transfer bounty submissions
+      const { outputLog: bountyLog } = await transferBountySubmissions({
+        sourcePartnerId,
+        targetPartnerId,
+      });
+
+      // Sync transferred links (Tinybird + cache) and total commissions
+      const { outputLog: syncLog } = await syncLinksAndCommissions({
+        targetPartnerId,
+        programIdsToTransfer,
+      });
+
+      return logAndReturn({ outputLog: `${bountyLog} | ${syncLog}` });
+    });
+
+    // Step 4: Tear down the source account
+    await context.run("cleanup-source-account", async () => {
+      const logs: string[] = [];
+
+      // Delete the source partner's rewinds
+      if (hasRewinds) {
+        const deletedRewinds = await prisma.partnerRewind.deleteMany({
+          where: { partnerId: sourcePartnerId },
+        });
+        logs.push(`Deleted ${deletedRewinds.count} partner rewinds`);
+      }
+
+      // Remove the source user if there are no workspaces left
+      if (sourceUserId) {
+        const { outputLog } = await deleteSourceUser({ sourceUserId });
+        logs.push(outputLog);
+      }
+
+      // Clean up duplicate-account fraud events + resolve their groups
+      const { outputLog: fraudLog } = await cleanupFraudEvents({
+        sourcePartnerId,
+      });
+      logs.push(fraudLog);
+
+      // Delete the source partner account (must be last)
+      const { outputLog: partnerLog } = await deleteSourcePartner({
+        sourcePartnerId,
+        sourceEmail,
+        sourceImage,
+      });
+      logs.push(partnerLog);
+
+      return logAndReturn({ outputLog: logs.join(" | ") });
+    });
+
+    // Step 5: Clear the verification cache and notify both accounts
+    await context.run("send-merged-emails", async () => {
+      await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
+
+      if (skipEmailNotification) {
+        return logAndReturn({
+          outputLog: `Partner account ${sourceEmail} merged into ${targetEmail}. Skipped email notification.`,
+        });
+      }
+
+      const resendBatchEmailRes = await sendBatchEmail(
+        [
+          {
+            variant: "notifications",
+            to: sourceEmail,
+            subject: "Your Dub partner accounts are now merged",
+            react: PartnerAccountMerged({
+              email: sourceEmail,
+              sourceEmail,
+              targetEmail,
+            }),
+          },
+          {
+            variant: "notifications",
+            to: targetEmail,
+            subject: "Your Dub partner accounts are now merged",
+            react: PartnerAccountMerged({
+              email: targetEmail,
+              sourceEmail,
+              targetEmail,
+            }),
+          },
+        ],
+        {
+          idempotencyKey: `${CACHE_KEY_PREFIX}/${userId}`,
+        },
+      );
+
+      return logAndReturn({
+        outputLog: `Partner account ${sourceEmail} merged into ${targetEmail}. ${prettyPrint(resendBatchEmailRes)}`,
+      });
+    });
+  },
+  {
+    initialPayloadParser: (requestPayload) => {
+      return inputSchema.parse(JSON.parse(requestPayload));
+    },
+    failureFunction: async ({
+      context,
+      failStatus,
+      failResponse,
+      failHeaders,
+    }) => {
+      const { userId } = inputSchema.parse(context.requestPayload);
+
+      // Clear the verification cache so the partner can retry from the start
+      await redis.del(`${CACHE_KEY_PREFIX}:${userId}`);
+
+      logger.error("workflow.failed", {
+        service: "qstash",
+        event: "workflow.failed",
+        workflowType: "merge-partner-accounts",
+        workflowRunId: context.workflowRunId,
+        failStatus,
+        failResponse,
+        failHeaders,
+      });
+
+      await logger.flush();
+    },
+  },
+);
+
+type MergePlan =
+  | { proceed: false; reason: string }
+  | {
+      proceed: true;
+      sourcePartnerId: string;
+      targetPartnerId: string;
+      sourceImage: string | null;
+      sourceUserId: string | null;
+      hasRewinds: boolean;
+      orderedSourceEnrollmentIds: string[];
+      programIdsToTransfer: string[];
+    };
+
+async function loadMergePlan({
+  sourceEmail,
+  targetEmail,
+}: {
+  sourceEmail: string;
+  targetEmail: string;
+}): Promise<MergePlan> {
+  const partnerAccounts = await prisma.partner.findMany({
+    where: {
+      email: {
+        in: [sourceEmail, targetEmail],
+      },
+    },
+    select: {
+      id: true,
+      email: true,
+      image: true,
+      users: {
+        select: {
+          userId: true,
+        },
+      },
+      partnerRewinds: true,
+    },
+  });
+
+  if (partnerAccounts.length === 0) {
+    return { proceed: false, reason: "Partner accounts not found." };
+  }
+
+  const sourceAccount = partnerAccounts.find(
+    ({ email }) => email?.toLowerCase() === sourceEmail.toLowerCase(),
+  );
+
+  const targetAccount = partnerAccounts.find(
+    ({ email }) => email?.toLowerCase() === targetEmail.toLowerCase(),
+  );
+
+  if (!sourceAccount) {
+    return {
+      proceed: false,
+      reason: `Partner account with email ${sourceEmail} not found.`,
+    };
+  }
+
+  if (!targetAccount) {
+    return {
+      proceed: false,
+      reason: `Partner account with email ${targetEmail} not found.`,
+    };
+  }
+
+  if (sourceAccount.id === targetAccount.id) {
+    return {
+      proceed: false,
+      reason: `Source and target partner accounts must be different. Source account: ${sourceAccount.email} (${sourceAccount.id}), Target account: ${targetAccount.email} (${targetAccount.id})`,
+    };
+  }
+
+  const sourcePartnerId = sourceAccount.id;
+  const targetPartnerId = targetAccount.id;
+
+  const [sourceEnrollments, targetEnrollments] = await Promise.all([
+    prisma.programEnrollment.findMany({
+      where: { partnerId: sourcePartnerId },
+      select: { id: true, programId: true },
+    }),
+    prisma.programEnrollment.findMany({
+      where: { partnerId: targetPartnerId },
+      select: { programId: true },
+    }),
+  ]);
+
+  const targetProgramIds = new Set(
+    targetEnrollments.map((enrollment) => enrollment.programId),
+  );
+
+  const overlappingEnrollments = sourceEnrollments.filter((enrollment) =>
+    targetProgramIds.has(enrollment.programId),
+  );
+
+  const transferEnrollments = sourceEnrollments.filter(
+    (enrollment) => !targetProgramIds.has(enrollment.programId),
+  );
+
+  // Overlaps first, then transfers (preserves the original processing order).
+  const orderedSourceEnrollmentIds = [
+    ...overlappingEnrollments,
+    ...transferEnrollments,
+  ].map(({ id }) => id);
+
+  return {
+    proceed: true,
+    sourcePartnerId,
+    targetPartnerId,
+    sourceImage: sourceAccount.image,
+    sourceUserId: sourceAccount.users[0]?.userId ?? null,
+    hasRewinds: sourceAccount.partnerRewinds.length > 0,
+    orderedSourceEnrollmentIds,
+    programIdsToTransfer: sourceEnrollments.map(({ programId }) => programId),
+  };
+}
+
+// High-volume resources: move in batches of PRISMA_UPDATEMANY_LIMIT
+async function transferRowsInBatches(
+  updateBatch: () => Promise<number>,
+  {
+    resourceName,
+  }: {
+    resourceName: string;
+  },
+) {
+  while (true) {
+    const count = await updateBatch();
+    console.log(`Transferred ${count} ${resourceName} in batch`);
+    if (count < PRISMA_UPDATEMANY_LIMIT) {
+      break;
+    }
+  }
+}
+
+// Rows unique on (programId, partnerId): move the source row when the target
+// has none, otherwise delete it so rewriting enrollment.partnerId cannot collide.
+async function transferIfNotExistElseDelete({
+  findTarget,
+  transferSource,
+  deleteSource,
+  resourceName,
+}: {
+  findTarget: () => Promise<unknown>;
+  transferSource: () => Promise<number>;
+  deleteSource: () => Promise<number>;
+  resourceName: string;
+}) {
+  if (await findTarget()) {
+    const count = await deleteSource();
+    console.log(
+      `Deleted ${count} source ${resourceName} (target already exists)`,
+    );
+    return;
+  }
+
+  const count = await transferSource();
+  console.log(`Transferred ${count} ${resourceName}`);
+}
+
+async function transferPartnerProgramData({
+  sourcePartnerId,
+  targetPartnerId,
+  programId,
+}: {
+  sourcePartnerId: string;
+  targetPartnerId: string;
+  programId: string;
+}) {
+  const where = {
+    programId,
+    partnerId: sourcePartnerId,
+  };
+  const payload = {
+    where,
+    data: {
+      partnerId: targetPartnerId,
+    },
+  };
+
+  await Promise.all([
+    // High-volume tables: move in batches of PRISMA_UPDATEMANY_LIMIT
+    transferRowsInBatches(
+      async () =>
+        (
+          await prisma.commission.updateMany({
+            ...payload,
+            limit: PRISMA_UPDATEMANY_LIMIT,
+          })
+        ).count,
+      { resourceName: "commission" },
+    ),
+    transferRowsInBatches(
+      async () =>
+        (
+          await prisma.link.updateMany({
+            ...payload,
+            limit: PRISMA_UPDATEMANY_LIMIT,
+          })
+        ).count,
+      { resourceName: "link" },
+    ),
+    transferRowsInBatches(
+      async () =>
+        (
+          await prisma.customer.updateMany({
+            ...payload,
+            limit: PRISMA_UPDATEMANY_LIMIT,
+          })
+        ).count,
+      { resourceName: "customer" },
+    ),
+    // Low-volume tables: single updateMany is fine
+    prisma.payout.updateMany(payload),
+    prisma.discountCode.updateMany(payload),
+    prisma.notificationEmail.updateMany(payload),
+    prisma.message.updateMany(payload),
+    prisma.partnerComment.updateMany(payload),
+    // Unique on (programId, partnerId) — transfer or delete, never rewrite over
+    transferIfNotExistElseDelete({
+      findTarget: () =>
+        prisma.programApplicationEvent.findUnique({
+          where: {
+            programId_partnerId: { programId, partnerId: targetPartnerId },
+          },
+        }),
+      transferSource: async () =>
+        (await prisma.programApplicationEvent.updateMany(payload)).count,
+      deleteSource: async () =>
+        (await prisma.programApplicationEvent.deleteMany({ where })).count,
+      resourceName: "application event",
+    }),
+    transferIfNotExistElseDelete({
+      findTarget: () =>
+        prisma.discoveredPartner.findUnique({
+          where: {
+            programId_partnerId: { programId, partnerId: targetPartnerId },
+          },
+        }),
+      transferSource: async () =>
+        (await prisma.discoveredPartner.updateMany(payload)).count,
+      deleteSource: async () =>
+        (await prisma.discoveredPartner.deleteMany({ where })).count,
+      resourceName: "discovered partner",
+    }),
+  ]);
+
+  // After payouts are moved onto the target partner, fold any duplicate
+  // pending payouts for this program into a single payout.
+  await combinePendingPayouts({
+    partnerId: targetPartnerId,
+    programId,
+  });
+}
+
+async function mergeSingleEnrollment({
+  enrollmentId,
+  sourcePartnerId,
+  targetPartnerId,
+  sourceEmail,
+  targetEmail,
+}: {
+  enrollmentId: string;
+  sourcePartnerId: string;
+  targetPartnerId: string;
+  sourceEmail: string;
+  targetEmail: string;
+}) {
+  const sourceEnrollment = await prisma.programEnrollment.findUnique({
+    where: { id: enrollmentId },
+    include: {
+      program: {
+        select: {
+          workspace: {
+            select: {
+              id: true,
+              webhookEnabled: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!sourceEnrollment) {
+    return logAndReturn({
+      programId: null,
+      action: "skip",
+      outputLog: `Enrollment ${enrollmentId} no longer exists, skipping`,
+    });
+  }
+
+  if (sourceEnrollment.partnerId === targetPartnerId) {
+    return logAndReturn({
+      programId: sourceEnrollment.programId,
+      action: "skip",
+      outputLog: `Enrollment ${enrollmentId} already on target partner, skipping`,
+    });
+  }
+
+  // Another process could have reassigned this enrollment away from the source
+  // partner; only the source partner's own enrollments should be merged.
+  if (sourceEnrollment.partnerId !== sourcePartnerId) {
+    return logAndReturn({
+      programId: sourceEnrollment.programId,
+      action: "skip",
+      outputLog: `Enrollment ${enrollmentId} no longer belongs to ${sourcePartnerId} (now ${sourceEnrollment.partnerId}), skipping`,
+    });
+  }
+
+  const { programId } = sourceEnrollment;
+
+  const targetEnrollment = await prisma.programEnrollment.findUnique({
+    where: {
+      partnerId_programId: {
+        partnerId: targetPartnerId,
+        programId,
+      },
+    },
+  });
+
+  await transferPartnerProgramData({
+    sourcePartnerId,
+    targetPartnerId,
+    programId,
+  });
+
+  let action: "overlap" | "transfer";
+
+  if (targetEnrollment) {
+    await prisma.$transaction(async (tx) => {
+      if (
+        sourceEnrollment.status === "approved" &&
+        ["pending", "invited"].includes(targetEnrollment.status)
+      ) {
+        await tx.programEnrollment.update({
+          where: {
+            partnerId_programId: {
+              partnerId: targetPartnerId,
+              programId,
+            },
+          },
+          data: { status: "approved" },
+        });
+      }
+
+      if (sourceEnrollment.applicationId) {
+        await tx.programEnrollment.updateMany({
+          where: { id: sourceEnrollment.id, partnerId: sourcePartnerId },
+          data: { applicationId: null },
+        });
+      }
+
+      await tx.programEnrollment.deleteMany({
+        where: { id: sourceEnrollment.id, partnerId: sourcePartnerId },
+      });
+
+      const tenantIdToCopy =
+        targetEnrollment.tenantId ?? sourceEnrollment.tenantId;
+
+      if (tenantIdToCopy && tenantIdToCopy !== targetEnrollment.tenantId) {
+        const existingTenantEnrollment = await tx.programEnrollment.findUnique({
+          where: {
+            tenantId_programId: {
+              tenantId: tenantIdToCopy,
+              programId,
+            },
+          },
+        });
+
+        if (!existingTenantEnrollment) {
+          await tx.programEnrollment.update({
+            where: {
+              partnerId_programId: {
+                partnerId: targetPartnerId,
+                programId,
+              },
+            },
+            data: { tenantId: tenantIdToCopy },
+          });
+        }
+      }
+    });
+
+    action = "overlap";
+  } else {
+    // Scope the transfer to the source partner so a concurrent reassignment
+    // can't make us steal another partner's enrollment.
+    const { count } = await prisma.programEnrollment.updateMany({
+      where: { id: sourceEnrollment.id, partnerId: sourcePartnerId },
+      data: { partnerId: targetPartnerId },
+    });
+
+    if (count === 0) {
+      return logAndReturn({
+        programId,
+        action: "skip",
+        outputLog: `Enrollment ${sourceEnrollment.id} no longer owned by ${sourcePartnerId}, skipping transfer`,
+      });
+    }
+
+    action = "transfer";
+  }
+
+  // Queue an index update because the merge either reassigned the source
+  // enrollment to the target partner or deleted it. Passing both sides lets the
+  // job work out which.
+  await queuePartnerSearchSync({
+    enrollmentIds: [
+      sourceEnrollment.id,
+      ...(targetEnrollment ? [targetEnrollment.id] : []),
+    ],
+  });
+
+  await sendWorkspaceWebhook({
+    workspace: sourceEnrollment.program.workspace,
+    trigger: "partner.merged",
+    data: partnerMergedWebhookSchema.parse({
+      sourcePartner: {
+        id: sourcePartnerId,
+        tenantId: sourceEnrollment.tenantId,
+        email: sourceEmail,
+      },
+      targetPartner: {
+        id: targetPartnerId,
+        tenantId: targetEnrollment?.tenantId ?? sourceEnrollment.tenantId,
+        email: targetEmail,
+      },
+      targetAlreadyEnrolled: Boolean(targetEnrollment),
+    }),
+  });
+
+  return logAndReturn({
+    programId,
+    action,
+    outputLog:
+      action === "overlap"
+        ? `Merged overlapping enrollment for program ${programId}: ${sourceEmail} (${sourcePartnerId}) -> ${targetEmail} (${targetPartnerId}).`
+        : `Transferred enrollment for program ${programId}: ${sourceEmail} (${sourcePartnerId}) -> ${targetEmail} (${targetPartnerId}).`,
+  });
+}
+
+async function transferBountySubmissions({
+  sourcePartnerId,
+  targetPartnerId,
+}: {
+  sourcePartnerId: string;
+  targetPartnerId: string;
+}) {
+  const bountySubmissionStats = await prisma.bountySubmission.groupBy({
+    by: ["bountyId"],
+    where: {
+      partnerId: {
+        in: [sourcePartnerId, targetPartnerId],
+      },
+    },
+    _count: {
+      partnerId: true,
+    },
+  });
+
+  // only transfer bounty submissions if the target partner has no submissions for the same bounty
+  const bountiesToTransfer = bountySubmissionStats
+    .filter(({ _count }) => _count.partnerId === 1)
+    .map(({ bountyId }) => bountyId);
+
+  if (bountiesToTransfer.length === 0) {
+    return logAndReturn({ outputLog: "No bounty submissions to transfer." });
+  }
+
+  const updatedBountySubmissions = await prisma.bountySubmission.updateMany({
+    where: {
+      bountyId: { in: bountiesToTransfer },
+      partnerId: sourcePartnerId,
+    },
+    data: {
+      partnerId: targetPartnerId,
+    },
+  });
+
+  return logAndReturn({
+    outputLog: `Transferred ${updatedBountySubmissions.count} bounty submissions`,
+  });
+}
+
+async function combinePendingPayouts({
+  partnerId,
+  programId,
+}: {
+  partnerId: string;
+  programId: string;
+}) {
+  const payoutsToCombine = await prisma.payout.findMany({
+    where: {
+      programId,
+      partnerId,
+      status: "pending",
+    },
+    orderBy: {
+      createdAt: "asc",
+    },
+  });
+
+  if (payoutsToCombine.length < 2) {
+    return;
+  }
+
+  const periodStarts = payoutsToCombine
+    .map((payout) => payout.periodStart)
+    .filter((date): date is Date => date !== null);
+  const periodEnds = payoutsToCombine
+    .map((payout) => payout.periodEnd)
+    .filter((date): date is Date => date !== null);
+
+  const periodStart =
+    periodStarts.length > 0
+      ? new Date(Math.min(...periodStarts.map((date) => date.getTime())))
+      : payoutsToCombine[0].periodStart;
+  const periodEnd =
+    periodEnds.length > 0
+      ? new Date(Math.max(...periodEnds.map((date) => date.getTime())))
+      : payoutsToCombine[0].periodEnd;
+
+  const totalAmount = payoutsToCombine.reduce(
+    (sum, payout) => sum + payout.amount,
+    0,
+  );
+
+  const combinedPayoutId = payoutsToCombine[0].id;
+  const payoutIdsToDelete = payoutsToCombine.slice(1).map((p) => p.id);
+
+  await prisma.payout.update({
+    where: {
+      id: combinedPayoutId,
+    },
+    data: {
+      amount: totalAmount,
+      periodStart,
+      periodEnd,
+    },
+  });
+
+  await transferRowsInBatches(
+    async () =>
+      (
+        await prisma.commission.updateMany({
+          where: {
+            payoutId: {
+              in: payoutIdsToDelete,
+            },
+          },
+          data: {
+            payoutId: combinedPayoutId,
+          },
+          limit: PRISMA_UPDATEMANY_LIMIT,
+        })
+      ).count,
+    { resourceName: "commission" },
+  );
+
+  const deletedPayouts = await prisma.payout.deleteMany({
+    where: {
+      id: {
+        in: payoutIdsToDelete,
+      },
+    },
+  });
+
+  return logAndReturn({
+    outputLog: `Combined ${payoutsToCombine.length} pending payouts for program ${programId} into ${combinedPayoutId} (deleted ${deletedPayouts.count})`,
+  });
+}
+
+async function syncLinksAndCommissions({
+  targetPartnerId,
+  programIdsToTransfer,
+}: {
+  targetPartnerId: string;
+  programIdsToTransfer: string[];
+}) {
+  const updatedLinks = await prisma.link.findMany({
+    where: {
+      programId: {
+        in: programIdsToTransfer,
+      },
+      partnerId: targetPartnerId,
+    },
+    include: {
+      ...includeTags,
+      ...includeProgramEnrollment,
+    },
+  });
+
+  const res = await Promise.allSettled([
+    recordLink(updatedLinks),
+    linkCache.expireMany(updatedLinks),
+    ...programIdsToTransfer.map((programId) =>
+      syncTotalCommissions({
+        partnerId: targetPartnerId,
+        programId,
+      }),
+    ),
+  ]);
+
+  // Fail the step (so QStash retries it) if any sync rejected. All of these
+  // ops are idempotent, so re-running the step is safe.
+  const rejected = res.filter(
+    (result): result is PromiseRejectedResult => result.status === "rejected",
+  );
+
+  if (rejected.length > 0) {
+    throw new Error(
+      `Failed to sync links/commissions: ${prettyPrint(
+        rejected.map(({ reason }) => reason),
+      )}`,
+    );
+  }
+
+  return logAndReturn({
+    outputLog: `Synced ${updatedLinks.length} links and commissions. ${prettyPrint(res)}`,
+  });
+}
+
+async function deleteSourceUser({ sourceUserId }: { sourceUserId: string }) {
+  const workspaceCount = await prisma.projectUsers.count({
+    where: {
+      userId: sourceUserId,
+    },
+  });
+
+  if (workspaceCount > 0) {
+    return logAndReturn({
+      outputLog: `User ${sourceUserId} still has ${workspaceCount} workspace(s), not deleting.`,
+    });
+  }
+
+  try {
+    const deletedUser = await prisma.user.delete({
+      where: {
+        id: sourceUserId,
+      },
+      select: {
+        id: true,
+        email: true,
+        image: true,
+      },
+    });
+
+    if (deletedUser.image) {
+      await storage.delete({
+        key: deletedUser.image.replace(`${R2_URL}/`, ""),
+      });
+    }
+
+    return logAndReturn({
+      outputLog: `Deleted user ${deletedUser.email} (${deletedUser.id})`,
+    });
+  } catch (error) {
+    return logAndReturn({
+      outputLog: `Error deleting user ${sourceUserId}: ${error.message}`,
+    });
+  }
+}
+
+async function cleanupFraudEvents({
+  sourcePartnerId,
+}: {
+  sourcePartnerId: string;
+}) {
+  const fraudEventsToDelete = await prisma.fraudEvent.findMany({
+    where: {
+      partnerId: sourcePartnerId,
+      fraudEventGroup: {
+        type: FraudRuleType.partnerDuplicateAccount,
+      },
+    },
+    include: {
+      fraudEventGroup: {
+        select: {
+          id: true,
+          _count: {
+            select: {
+              fraudEvents: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (fraudEventsToDelete.length > 0) {
+    await prisma.fraudEvent.deleteMany({
+      where: {
+        id: { in: fraudEventsToDelete.map((e) => e.id) },
+      },
+    });
+  }
+
+  const fraudEventGroupsToResolve = fraudEventsToDelete.filter(
+    // this is the count pre-deletion the fraud event, so if there are 2 fraud events
+    // that means post-deletion will leave 1 fraud event in the group (no additional duplicates), hence can be resolved
+    (e) => e.fraudEventGroup._count.fraudEvents === 2,
+  );
+
+  await resolveFraudGroups({
+    where: {
+      OR: [
+        {
+          partnerId: sourcePartnerId,
+        },
+        ...(fraudEventGroupsToResolve.length > 0
+          ? [
+              {
+                id: {
+                  in: fraudEventGroupsToResolve.map(
+                    (e) => e.fraudEventGroup.id,
+                  ),
+                },
+              },
+            ]
+          : []),
+      ],
+      type: FraudRuleType.partnerDuplicateAccount,
+    },
+    resolutionReason:
+      "Automatically resolved because partners with duplicate payout methods were merged. No other partners share this payout method.",
+  });
+
+  return logAndReturn({
+    outputLog: `Deleted ${fraudEventsToDelete.length} duplicate-account fraud events`,
+  });
+}
+
+async function deleteSourcePartner({
+  sourcePartnerId,
+  sourceEmail,
+  sourceImage,
+}: {
+  sourcePartnerId: string;
+  sourceEmail: string;
+  sourceImage: string | null;
+}) {
+  await conn.execute(`DELETE FROM Partner WHERE id = ?`, [sourcePartnerId]);
+
+  if (sourceImage) {
+    try {
+      await storage.delete({
+        key: sourceImage.replace(`${R2_URL}/`, ""),
+      });
+    } catch (error) {
+      logger.error("partner.image_delete_failed", {
+        sourcePartnerId,
+        sourceImage,
+        error,
+      });
+    }
+  }
+
+  return logAndReturn({
+    outputLog: `Deleted partner ${sourceEmail} (${sourcePartnerId})`,
+  });
+}
diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
index 599f02aed11..fef888446fd 100644
--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts
@@ -4,7 +4,6 @@ import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enro
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
 import { logger } from "@/lib/axiom/server";
 import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
-import { getWorkflowConfig } from "@/lib/cron/qstash-workflow";
 import { generateDiscountCodeForPartner } from "@/lib/discounts/generate-discount-code-for-partner";
 import { createReferralCommission } from "@/lib/partner-referrals/create-referral-commission";
 import { prisma } from "@/lib/prisma";
@@ -126,6 +125,9 @@ export const { POST } = serve<Input>(
         select: {
           id: true,
           plan: true,
+          webhookEnabled: true,
+          stripeConnectId: true,
+          shopifyStoreId: true,
         },
       });
 
@@ -172,8 +174,21 @@ export const { POST } = serve<Input>(
 
     // Step 2: Auto-provision discount code if enabled
     await context.run("create-discount-codes", async () => {
+      const workspace = await prisma.project.findUniqueOrThrow({
+        where: {
+          id: program.workspaceId,
+        },
+        select: {
+          id: true,
+          plan: true,
+          webhookEnabled: true,
+          stripeConnectId: true,
+          shopifyStoreId: true,
+        },
+      });
+
       await generateDiscountCodeForPartner({
-        workspaceId: program.workspaceId,
+        workspace,
         partner: {
           id: partner.id,
           name: partner.name,
@@ -335,11 +350,6 @@ export const { POST } = serve<Input>(
       failResponse,
       failHeaders,
     }) => {
-      const { correlation } = getWorkflowConfig({
-        workflowType: "partner-approved",
-        body: context.requestPayload,
-      });
-
       logger.error("workflow.failed", {
         service: "qstash",
         event: "workflow.failed",
@@ -348,7 +358,6 @@ export const { POST } = serve<Input>(
         failStatus,
         failResponse,
         failHeaders,
-        correlation,
       });
 
       await logger.flush();
diff --git a/apps/web/app/(ee)/api/workflows/reattribute-customer/route.ts b/apps/web/app/(ee)/api/workflows/reattribute-customer/route.ts
new file mode 100644
index 00000000000..143ab44de18
--- /dev/null
+++ b/apps/web/app/(ee)/api/workflows/reattribute-customer/route.ts
@@ -0,0 +1,206 @@
+import {
+  applyClawbackAndReplacementCommissions,
+  decrementOldLinkStats,
+  incrementNewLinkStats,
+  loadClawbackPlan,
+  loadReattributeEventPlan,
+  reingestCustomerEvents,
+  transferUnpaidCommissions,
+} from "@/lib/api/customers/reattribute-customer";
+import { logger } from "@/lib/axiom/server";
+import { prisma } from "@/lib/prisma";
+import { deleteTinybirdCustomerEvents } from "@/lib/tinybird/delete-customer-events";
+import { reattributeCustomerWorkflowSchema } from "@/lib/zod/schemas/customers";
+import { WorkflowRetryAfterError } from "@upstash/workflow";
+import { serve } from "@upstash/workflow/nextjs";
+import * as z from "zod/v4";
+import { logAndReturn } from "../../cron/utils";
+
+type Input = z.infer<typeof reattributeCustomerWorkflowSchema>;
+
+/**
+ * Reattribute Customer Workflow
+ *
+ * Moves a customer (and their events/commissions) from one partner link to another.
+ *
+ * 1. load-plan: inspect old/new Tinybird events
+ * 2. reingest-events: copy events onto the new customer + link
+ * 3. increment-new-link-stats
+ * 4. transfer-unpaid-commissions
+ * 5. load-clawback-plan + optional-clawback
+ * 6. delete-old-events
+ * 7. decrement-old-link-stats
+ */
+
+// POST /api/workflows/reattribute-customer
+export const { POST } = serve<Input>(
+  async (context) => {
+    const input = context.requestPayload;
+
+    const plan = await context.run("load-plan", async () => {
+      return await loadReattributeEventPlan({
+        oldCustomerId: input.oldCustomerId,
+        newCustomerId: input.newCustomerId,
+      });
+    });
+
+    await context.run("reingest-events", async () => {
+      const link = await prisma.link.findUniqueOrThrow({
+        where: { id: input.newLinkId },
+        select: {
+          id: true,
+          domain: true,
+          key: true,
+          url: true,
+        },
+      });
+
+      try {
+        return logAndReturn(
+          await reingestCustomerEvents({
+            oldCustomerId: input.oldCustomerId,
+            newCustomerId: input.newCustomerId,
+            newClickId: input.newClickId,
+            link,
+            workspaceId: input.workspaceId,
+          }),
+        );
+      } catch (error) {
+        if (
+          error instanceof z.ZodError ||
+          (error instanceof Error &&
+            error.message.includes("too many events to reattribute"))
+        ) {
+          throw error;
+        }
+
+        throw new WorkflowRetryAfterError(
+          error instanceof Error ? error.message : "Failed to re-ingest events",
+          "5s",
+        );
+      }
+    });
+
+    await context.run("increment-new-link-stats", async () => {
+      return logAndReturn(
+        await incrementNewLinkStats({
+          oldCustomerId: input.oldCustomerId,
+          newLinkId: input.newLinkId,
+          programId: input.programId,
+          partnerId: input.newPartnerId,
+          plan,
+          incrementConversions: input.incrementConversions,
+        }),
+      );
+    });
+
+    await context.run("transfer-unpaid-commissions", async () => {
+      return logAndReturn(
+        await transferUnpaidCommissions({
+          oldCustomerId: input.oldCustomerId,
+          newCustomerId: input.newCustomerId,
+          newPartnerId: input.newPartnerId,
+          newLinkId: input.newLinkId,
+          programId: input.programId,
+          oldPartnerId: input.oldPartnerId,
+        }),
+      );
+    });
+
+    if (input.createClawback) {
+      const newCustomer = await context.run(
+        "load-new-customer-country",
+        async () => {
+          return await prisma.customer.findUnique({
+            where: { id: input.newCustomerId },
+            select: { country: true },
+          });
+        },
+      );
+
+      const clawbackPlan = await context.run("load-clawback-plan", async () => {
+        return await loadClawbackPlan({
+          oldCustomerId: input.oldCustomerId,
+          oldPartnerId: input.oldPartnerId,
+        });
+      });
+
+      if (!clawbackPlan.skipped && input.oldPartnerId) {
+        const oldPartnerId = input.oldPartnerId;
+
+        await context.run("optional-clawback", async () => {
+          return logAndReturn(
+            await applyClawbackAndReplacementCommissions({
+              oldCustomerId: input.oldCustomerId,
+              newCustomerId: input.newCustomerId,
+              oldPartnerId,
+              newPartnerId: input.newPartnerId,
+              newLinkId: input.newLinkId,
+              programId: input.programId,
+              customerCountry: newCustomer?.country ?? null,
+              plan: clawbackPlan,
+            }),
+          );
+        });
+      }
+    }
+
+    await context.run("delete-old-events", async () => {
+      try {
+        await deleteTinybirdCustomerEvents({
+          customerId: input.oldCustomerId,
+        });
+
+        return logAndReturn({ deleted: true });
+      } catch (error) {
+        throw new WorkflowRetryAfterError(
+          error instanceof Error
+            ? error.message
+            : "Failed to delete old Tinybird events",
+          "10s",
+        );
+      }
+    });
+
+    await context.run("decrement-old-link-stats", async () => {
+      return logAndReturn(
+        await decrementOldLinkStats({
+          oldCustomerId: input.oldCustomerId,
+          oldLinkId: input.oldLinkId,
+          oldPartnerId: input.oldPartnerId,
+          programId: input.programId,
+          plan,
+          decrementConversions: input.decrementConversions,
+        }),
+      );
+    });
+  },
+  {
+    initialPayloadParser: (requestPayload) => {
+      const payload =
+        typeof requestPayload === "string"
+          ? JSON.parse(requestPayload)
+          : requestPayload;
+
+      return reattributeCustomerWorkflowSchema.parse(payload);
+    },
+    failureFunction: async ({
+      context,
+      failStatus,
+      failResponse,
+      failHeaders,
+    }) => {
+      logger.error("workflow.failed", {
+        service: "qstash",
+        event: "workflow.failed",
+        workflowType: "reattribute-customer",
+        workflowRunId: context.workflowRunId,
+        failStatus,
+        failResponse,
+        failHeaders,
+      });
+
+      await logger.flush();
+    },
+  },
+);
diff --git a/apps/web/app/(ee)/app.dub.co/(new-program)/[slug]/program/new/form.tsx b/apps/web/app/(ee)/app.dub.co/(new-program)/[slug]/program/new/form.tsx
index 608bb40eb74..4827dbc513a 100644
--- a/apps/web/app/(ee)/app.dub.co/(new-program)/[slug]/program/new/form.tsx
+++ b/apps/web/app/(ee)/app.dub.co/(new-program)/[slug]/program/new/form.tsx
@@ -1,10 +1,12 @@
 "use client";
 
 import { onboardProgramAction } from "@/lib/actions/partners/onboard-program";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { ProgramData } from "@/lib/types";
 import { ProgramLinkConfiguration } from "@/ui/partners/program-link-configuration";
 import { Button, FileUpload, Input, useMediaQuery } from "@dub/ui";
+import { toErrorMessage } from "@dub/utils";
 import { Plus } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
 import { useRouter } from "next/navigation";
@@ -12,6 +14,9 @@ import { useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import { toast } from "sonner";
 
+const { contentTypes, maxBytes } = UPLOAD_POLICIES.programLogos;
+const maxFileSizeMB = maxBytes / (1024 * 1024);
+
 export function Form() {
   const router = useRouter();
   const { isMobile } = useMediaQuery();
@@ -61,14 +66,20 @@ export function Form() {
         `/api/workspaces/${workspaceId}/upload-url`,
         {
           method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
           body: JSON.stringify({
-            folder: "program-logos",
+            folder: "programLogos",
+            contentType: file.type,
+            contentLength: file.size,
           }),
         },
       );
 
       if (!response.ok) {
-        throw new Error("Failed to get signed URL for upload.");
+        const { error } = await response.json();
+        throw new Error(toErrorMessage(error));
       }
 
       const { signedUrl, destinationUrl } = await response.json();
@@ -89,7 +100,7 @@ export function Form() {
       setValue("logo", destinationUrl, { shouldDirty: true });
       toast.success("Program logo uploaded!");
     } catch (e) {
-      toast.error("Failed to upload logo");
+      toast.error(toErrorMessage(e));
     } finally {
       setIsUploading(false);
     }
@@ -138,7 +149,7 @@ export function Form() {
             rules={{ required: true }}
             render={({ field }) => (
               <FileUpload
-                accept="images"
+                acceptedFileTypes={contentTypes}
                 className="size-14 rounded-lg"
                 iconClassName="size-4 text-neutral-800"
                 icon={Plus}
@@ -148,7 +159,7 @@ export function Form() {
                 readFile
                 onChange={({ file }) => handleUpload(file)}
                 content={null}
-                maxFileSizeMB={2}
+                maxFileSizeMB={maxFileSizeMB}
               />
             )}
           />
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-fields.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-fields.tsx
index 4c115764bf8..bcf0a61554b 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-fields.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/bounties/submission-fields.tsx
@@ -6,6 +6,7 @@ import {
   BOUNTY_MAX_SUBMISSION_URLS,
 } from "@/lib/bounty/constants";
 import { resolveBountyDetails } from "@/lib/bounty/utils";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { PartnerBountyProps, PartnerPlatformProps } from "@/lib/types";
 import { evaluateSocialContentRequirements } from "@/ui/partners/bounties/evaluate-social-content-requirements";
 import { X } from "@/ui/shared/icons";
@@ -17,7 +18,7 @@ import {
   LoadingSpinner,
   Trash,
 } from "@dub/ui";
-import { cn, formatDate } from "@dub/utils";
+import { cn, formatDate, toErrorMessage } from "@dub/utils";
 import { AlertTriangle } from "lucide-react";
 import { useEffect, useId, useState } from "react";
 import ReactTextareaAutosize from "react-textarea-autosize";
@@ -85,7 +86,8 @@ export function EmbedImagesField({
       );
 
       if (!uploadUrlRes.ok) {
-        toast.error("Failed to get signed upload URL.");
+        const { error } = await uploadUrlRes.json();
+        toast.error(toErrorMessage(error, "Failed to get signed upload URL."));
         setFiles((prev) => {
           const updated = prev.filter((f) => f.id !== newFile.id);
           onUploadingChange(updated.some((f) => f.uploading));
@@ -106,7 +108,14 @@ export function EmbedImagesField({
       });
 
       if (!uploadResponse.ok) {
-        toast.error("Failed to upload screenshot.");
+        let errorMessage = "Failed to upload screenshot.";
+        try {
+          const res = await uploadResponse.json();
+          errorMessage = toErrorMessage(res.error, errorMessage);
+        } catch {
+          // ignore JSON parse errors; use the default message
+        }
+        toast.error(errorMessage);
         setFiles((prev) => {
           const updated = prev.filter((f) => f.id !== newFile.id);
           onUploadingChange(updated.some((f) => f.uploading));
@@ -125,10 +134,8 @@ export function EmbedImagesField({
         onUploadingChange(updated.some((f) => f.uploading));
         return updated;
       });
-    } catch {
-      toast.error(
-        "An unexpected error occurred while uploading. Please try again.",
-      );
+    } catch (e) {
+      toast.error(toErrorMessage(e));
       setFiles((prev) => {
         const updated = prev.filter((f) => f.id !== newFile.id);
         onUploadingChange(updated.some((f) => f.uploading));
@@ -186,19 +193,21 @@ export function EmbedImagesField({
         ))}
 
         <FileUpload
-          accept="images"
+          acceptedFileTypes={
+            UPLOAD_POLICIES.bountySubmissionImages.contentTypes
+          }
           className={cn(
             "border-border-subtle h-full w-auto rounded-md border",
             files.length > 0 ? "aspect-square" : "aspect-[unset] w-full",
           )}
           iconClassName="size-5 shrink-0"
           variant="plain"
-          content={
-            files.length > 0 ? null : "SVG, JPG, PNG or WEBP\nMax size 5MB"
-          }
+          content={files.length > 0 ? null : "JPG, PNG or WEBP\nMax size 5MB"}
           onChange={async ({ file }) => await handleUpload(file)}
           disabled={files.length >= maxFiles}
-          maxFileSizeMB={5}
+          maxFileSizeMB={
+            UPLOAD_POLICIES.bountySubmissionImages.maxBytes / (1024 * 1024)
+          }
         />
       </div>
     </div>
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts b/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts
index 1c07d048f0e..7d952b94508 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/get-referrals-embed-data.ts
@@ -4,6 +4,7 @@ import { getBountiesForPartner } from "@/lib/bounty/api/get-bounties-for-partner
 import { referralsEmbedToken } from "@/lib/embed/referrals/token-class";
 import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
 import { prisma } from "@/lib/prisma";
+import { getResolvedPartnerLinkRewards } from "@/lib/rewards/get-resolved-partner-link-rewards";
 import { PartnerGroupAdditionalLink } from "@/lib/types";
 import { ReferralsEmbedLinkSchema } from "@/lib/zod/schemas/referrals-embed";
 import { Reward } from "@prisma/client";
@@ -52,12 +53,24 @@ export const getReferralsEmbedData = async (token: string) => {
           resources: true,
         },
       },
-      links: true,
+      links: {
+        include: {
+          linkReward: {
+            include: {
+              clickReward: true,
+              leadReward: true,
+              saleReward: true,
+              discount: true,
+            },
+          },
+        },
+      },
       partnerGroup: true,
       clickReward: true,
       leadReward: true,
       saleReward: true,
       referralReward: true,
+      customReward: true,
       discount: true,
       programPartnerTags: {
         select: {
@@ -80,6 +93,7 @@ export const getReferralsEmbedData = async (token: string) => {
     leadReward,
     saleReward,
     referralReward,
+    customReward,
     partnerGroup: group,
   } = programEnrollment;
 
@@ -119,8 +133,22 @@ export const getReferralsEmbedData = async (token: string) => {
       defaultPayoutMethod: partner.defaultPayoutMethod,
     },
     partnerPlatforms: partner.platforms,
-    links: z.array(ReferralsEmbedLinkSchema).parse(links),
-    rewards: [clickReward, leadReward, saleReward, referralReward]
+    links: z.array(ReferralsEmbedLinkSchema).parse(
+      links.map((link) => ({
+        ...link,
+        ...getResolvedPartnerLinkRewards({
+          linkReward: link.linkReward,
+          enrollmentRewards: [
+            clickReward,
+            leadReward,
+            saleReward,
+            customReward,
+          ],
+          enrollmentDiscount: discount,
+        }),
+      })),
+    ),
+    rewards: [clickReward, leadReward, saleReward, referralReward, customReward]
       .filter((r): r is Reward => r !== null)
       .map((r) => serializeReward(r)),
     discount,
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
index adbc82f108b..eed976fb780 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/page-client.tsx
@@ -2,8 +2,8 @@
 
 import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";
 import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";
-import { TREMENDOUS_ENABLED_PROGRAM_IDS } from "@/lib/tremendous/constants";
 import {
   DiscountProps,
   PartnerBountyProps,
@@ -14,10 +14,13 @@ import {
 import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { programEmbedSchema } from "@/lib/zod/schemas/program-embed";
 import { programResourcesSchema } from "@/lib/zod/schemas/program-resources";
+import { LinkIcon } from "@/ui/links/link-icon";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
 import { HeroBackground } from "@/ui/partners/hero-background";
 import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
-import { ProgramRewardList } from "@/ui/partners/program-reward-list";
-import { ProgramRewardTerms } from "@/ui/partners/program-reward-terms";
+import { ProgramRewardModifiersTooltip } from "@/ui/partners/program-reward-modifiers-tooltip";
+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
 import { ThreeDots } from "@/ui/shared/icons";
 import {
   Button,
@@ -25,6 +28,7 @@ import {
   Combobox,
   Copy,
   Directions,
+  DiscountCode,
   Popover,
   StatusBadge,
   TabSelect,
@@ -32,11 +36,11 @@ import {
   useLocalStorage,
   Wordmark,
 } from "@dub/ui";
-import { ArrowTurnRight2 } from "@dub/ui/icons";
 import {
   cn,
-  getApexDomain,
+  currencyFormatter,
   getPrettyUrl,
+  pluralize,
   TREMENDOUS_SUPPORTED_COUNTRIES,
 } from "@dub/utils";
 import {
@@ -50,6 +54,7 @@ import { AnimatePresence } from "motion/react";
 import {
   createContext,
   CSSProperties,
+  Fragment,
   ReactNode,
   useContext,
   useEffect,
@@ -206,25 +211,11 @@ export function ReferralsEmbedPageClient({
       TREMENDOUS_SUPPORTED_COUNTRIES.includes(partner.country),
   );
 
-  // Show Tremendous payout settings if the partner already uses Tremendous,
+  // Show Tremendous payout settings if the partner already uses Tremendous for payouts,
   // or hasn't selected a payout method yet and is eligible based on country.
   const showSettingsTab =
-    TREMENDOUS_ENABLED_PROGRAM_IDS.includes(program.id) &&
-    (partner.defaultPayoutMethod === "tremendous" ||
-      (!partner.defaultPayoutMethod && isTremendousCountrySupported));
-
-  const customerRewards = useMemo(
-    () => rewards.filter((reward) => reward.event !== "referral"),
-    [rewards],
-  );
-
-  const referralRewards = useMemo(
-    () => rewards.filter((reward) => reward.event === "referral"),
-    [rewards],
-  );
-
-  const showPartnerReferralSection =
-    referralRewards.length > 0 && Boolean(partner.username);
+    partner.defaultPayoutMethod === "tremendous" ||
+    (!partner.defaultPayoutMethod && isTremendousCountrySupported);
 
   const tabs = useMemo(
     () => [
@@ -311,63 +302,12 @@ export function ReferralsEmbedPageClient({
           <div className="border-border-default relative flex flex-col overflow-hidden rounded-lg border p-4 md:p-6">
             <HeroBackground logo={group.logo} color={group.brandColor} embed />
 
-            <ReferralLinkDisplay
+            <EmbedRewardsSection
               termsHref={termsHref}
               onSelectTab={setSelectedTab}
-              hasPartnerReferralReward={showPartnerReferralSection}
+              hideEarningsTerms={Boolean(programEmbedData?.hideEarnings)}
             />
 
-            <div
-              className={cn(
-                "sm:max-w-[50%]",
-                !showPartnerReferralSection && "mt-12",
-              )}
-            >
-              {!showPartnerReferralSection && (
-                <div className="flex items-end justify-between">
-                  <span className="text-content-emphasis text-base font-semibold leading-none">
-                    Rewards
-                  </span>
-                  {termsHref && (
-                    <a
-                      href={termsHref}
-                      target="_blank"
-                      className="text-content-subtle text-xs font-medium leading-none underline-offset-2 hover:underline"
-                    >
-                      View terms ↗
-                    </a>
-                  )}
-                </div>
-              )}
-              <div
-                className={cn(
-                  "text-content-emphasis relative text-lg",
-                  showPartnerReferralSection ? "mt-2" : "mt-4",
-                )}
-              >
-                <ProgramRewardList
-                  rewards={customerRewards}
-                  discount={discount}
-                  className="rounded-lg"
-                />
-
-                <ProgramRewardTerms
-                  minPayoutAmount={
-                    programEmbedData?.hideEarnings ? 0 : program.minPayoutAmount
-                  }
-                  holdingPeriodDays={
-                    programEmbedData?.hideEarnings
-                      ? 0
-                      : group.holdingPeriodDays ?? 0
-                  }
-                />
-              </div>
-            </div>
-
-            {showPartnerReferralSection && (
-              <PartnerReferralLinkDisplay referralRewards={referralRewards} />
-            )}
-
             {!programEmbedData?.hidePoweredByBadge && (
               <div className="mt-4 flex justify-center md:absolute md:bottom-3 md:right-3 md:mt-0">
                 <a
@@ -519,236 +459,382 @@ function ReferralsEmbedUnapproved({
   );
 }
 
-function ReferralLinkDisplay({
-  onSelectTab,
+function EmbedRewardsSection({
   termsHref,
-  hasPartnerReferralReward,
+  onSelectTab,
+  hideEarningsTerms,
 }: {
-  onSelectTab: (tab: string) => void;
   termsHref: string | undefined;
-  hasPartnerReferralReward: boolean;
+  onSelectTab: (tab: string) => void;
+  hideEarningsTerms: boolean;
 }) {
-  const { links, group } = useReferralsEmbedData();
-  const [copied, copyToClipboard] = useCopyToClipboard();
-
+  const { links, group, rewards, partner, program } = useReferralsEmbedData();
   const [selectedLinkId, setSelectedLinkId] = useState<string | null>(
     links[0]?.id ?? null,
   );
 
-  const selectedLink = useMemo(
-    () => links.find((l) => l.id === selectedLinkId) ?? links[0],
-    [links, selectedLinkId],
+  const selectedLink =
+    links.find((link) => link.id === selectedLinkId) ?? links[0] ?? null;
+
+  const referralRewards = rewards.filter(
+    (reward) => reward.event === "referral" && getRewardAmount(reward) >= 0,
   );
+  const hasPartnerReferralReward =
+    referralRewards.length > 0 && Boolean(partner.username);
+
+  const customerRewards = [
+    selectedLink?.clickReward,
+    selectedLink?.leadReward,
+    selectedLink?.saleReward,
+    ...rewards.filter((reward) => reward.event === "custom"),
+  ].filter(
+    (reward): reward is RewardProps =>
+      reward != null && getRewardAmount(reward) >= 0,
+  );
+  const resolvedDiscount = selectedLink?.discount ?? null;
 
   const partnerLink = selectedLink
     ? constructPartnerLink({ group, link: selectedLink })
-    : undefined;
-
-  const options = useMemo(
-    () =>
-      links.map((link) => ({
-        value: link.id,
-        label: getPrettyUrl(constructPartnerLink({ group, link })),
-        meta: {
-          destination: link.url ? getApexDomain(link.url) : null,
-        },
-      })),
-    [links, group],
-  );
+    : "";
+  const hasPartnerLink = Boolean(partnerLink);
 
-  const selectedOption =
-    selectedLink && partnerLink
-      ? {
-          value: selectedLink.id,
-          label: getPrettyUrl(partnerLink),
-          meta: {
-            destination: selectedLink.url
-              ? getApexDomain(selectedLink.url)
-              : null,
-          },
-        }
-      : null;
+  const partnerReferralApplyLink = constructPartnerReferralLink({
+    partner,
+    program,
+  });
 
-  let actionButton: React.ReactNode = null;
+  const linkOptions =
+    links.length > 1
+      ? links.map((link) => {
+          const href = constructPartnerLink({ group, link });
+
+          return {
+            value: link.id,
+            label: href ? getPrettyUrl(href) : getPrettyUrl(link.shortLink),
+            icon: (
+              <LinkIcon
+                url={link.url}
+                domain={link.domain}
+                linkKey={link.key}
+              />
+            ),
+          };
+        })
+      : undefined;
 
-  if (partnerLink) {
-    actionButton = (
-      <Button
-        icon={
-          <div className="relative size-4">
-            <div
-              className={cn(
-                "absolute inset-0 transition-[transform,opacity]",
-                copied && "translate-y-1 opacity-0",
-              )}
-            >
-              <Copy className="size-4" />
-            </div>
-            <div
-              className={cn(
-                "absolute inset-0 transition-[transform,opacity]",
-                !copied && "translate-y-1 opacity-0",
-              )}
-            >
-              <Check className="size-4" />
+  const selectedOption =
+    linkOptions?.find((option) => option.value === selectedLink?.id) ?? null;
+
+  const customerRewardItems = [
+    ...customerRewards.map((reward) => ({
+      id: reward.id,
+      icon: REWARD_EVENT_ICON[reward.event],
+      text: (
+        <>
+          {formatRewardDescription(reward, { includeEarnPrefix: false })}
+          {(!!reward.modifiers?.length ||
+            Boolean(reward.tooltipDescription)) && (
+            <>
+              {" "}
+              <ProgramRewardModifiersTooltip reward={reward} />
+            </>
+          )}
+        </>
+      ),
+    })),
+    ...(resolvedDiscount
+      ? [
+          {
+            id: "discount",
+            icon: DiscountCode,
+            text: formatDiscountDescription(resolvedDiscount),
+          },
+        ]
+      : []),
+  ];
+
+  const showPayoutTerms =
+    !hideEarningsTerms &&
+    (program.minPayoutAmount > 0 || (group.holdingPeriodDays ?? 0) > 0);
+
+  const customerRewardsList =
+    customerRewardItems.length > 0 ? (
+      <div className="border-border-subtle bg-bg-default relative z-[1] space-y-4 rounded-lg border p-3">
+        {customerRewardItems.map((reward) => {
+          const RewardIcon = reward.icon;
+
+          return (
+            <div key={reward.id} className="flex items-center gap-2">
+              <RewardIcon className="text-content-default size-4 shrink-0" />
+              <div className="text-content-default min-w-0 text-sm font-medium leading-5 tracking-tight">
+                {reward.text}
+              </div>
             </div>
-          </div>
-        }
-        text={copied ? "Copied link" : "Copy link"}
-        className="h-10 w-fit shrink-0 rounded-lg"
-        onClick={() => copyToClipboard(partnerLink)}
-      />
-    );
-  } else if (links.length === 0) {
-    actionButton = (
-      <Button
-        text="Create a link"
-        onClick={() => onSelectTab("Links")}
-        className="h-10 w-fit shrink-0 rounded-lg"
-      />
-    );
-  }
+          );
+        })}
+      </div>
+    ) : null;
 
   return (
-    <>
-      <div className="flex items-center justify-between sm:max-w-[50%]">
-        <span className="text-content-emphasis text-base font-semibold">
-          {hasPartnerReferralReward
-            ? "Customer referral rewards"
-            : "Referral link"}
-        </span>
-        {hasPartnerReferralReward && termsHref && (
-          <a
-            href={termsHref}
-            target="_blank"
-            className="text-content-subtle text-xs font-medium leading-none underline-offset-2 hover:underline"
-          >
-            View terms ↗
-          </a>
+    <div className="relative z-10 flex flex-col gap-8 sm:max-w-[50%]">
+      <div className="flex flex-col gap-2">
+        <div className="flex items-center justify-between gap-3">
+          <h3 className="text-content-emphasis text-base font-semibold tracking-tight">
+            {hasPartnerReferralReward
+              ? "Customer referral links"
+              : "Referral link"}
+          </h3>
+          {termsHref && (
+            <a
+              href={termsHref}
+              target="_blank"
+              className="text-content-subtle shrink-0 text-xs font-medium leading-none underline-offset-2 hover:underline"
+            >
+              View terms ↗
+            </a>
+          )}
+        </div>
+
+        <EmbedLinkRow
+          displayText={
+            hasPartnerLink ? getPrettyUrl(partnerLink) : "No referral link"
+          }
+          copyValue={partnerLink}
+          showLinkSelector={Boolean(linkOptions)}
+          linkOptions={linkOptions}
+          selectedOption={selectedOption}
+          onSelectLink={(id) => {
+            setSelectedLinkId(id);
+            const link = links.find((item) => item.id === id);
+            if (!link) return undefined;
+            return constructPartnerLink({ group, link });
+          }}
+          onCreateLink={() => onSelectTab("Links")}
+        />
+
+        {hasPartnerLink && group.linkStructure === "query" && selectedLink && (
+          <QueryLinkStructureHelpText link={selectedLink} />
         )}
-      </div>
 
-      <div className="xs:flex-row xs:items-center relative mt-2 flex flex-col gap-2 sm:max-w-[50%]">
-        {links.length <= 1 ? (
-          <input
-            type="text"
-            readOnly
-            value={partnerLink ? getPrettyUrl(partnerLink) : "No referral link"}
-            className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-10 min-w-0 grow rounded-lg border px-3 text-sm focus:outline-none focus:ring-0"
-          />
-        ) : (
-          <div className="min-w-0 grow">
-            <Combobox
-              selected={selectedOption}
-              setSelected={(option) => {
-                if (!option) return;
-
-                setSelectedLinkId(option.value);
-
-                const link = links.find((l) => l.id === option.value);
-
-                if (link) {
-                  copyToClipboard(constructPartnerLink({ group, link }));
-                }
-              }}
-              options={options}
-              forceDropdown
-              matchTriggerWidth
-              placeholder="No referral link"
-              inputClassName="text-sm h-10"
-              optionDescription={(option) => (
-                <span className="flex min-w-0 items-center gap-1">
-                  <ArrowTurnRight2 className="text-content-muted size-3 shrink-0" />
-                  <span className="text-content-subtle min-w-0 truncate text-xs">
-                    {option.meta.destination}
-                  </span>
-                </span>
-              )}
-              popoverProps={{
-                contentClassName: "rounded-lg border border-border-subtle p-1",
-              }}
-              trigger={
-                <button
-                  type="button"
-                  className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default flex h-10 w-full min-w-0 items-center gap-2 rounded-lg border px-3 text-left text-sm outline-none focus:ring-0"
-                >
-                  <span className="min-w-0 shrink grow truncate">
-                    {partnerLink
-                      ? getPrettyUrl(partnerLink)
-                      : "No referral link"}
-                  </span>
-                  <ChevronDown className="text-content-muted size-4 shrink-0" />
-                </button>
-              }
-            />
+        {(customerRewardsList || showPayoutTerms) && (
+          <div>
+            {customerRewardsList}
+            {showPayoutTerms && (
+              <EmbedPayoutTerms
+                minPayoutAmount={program.minPayoutAmount}
+                holdingPeriodDays={group.holdingPeriodDays ?? 0}
+                tucked={Boolean(customerRewardsList)}
+              />
+            )}
           </div>
         )}
-        {actionButton}
       </div>
 
-      {partnerLink && group.linkStructure === "query" && (
-        <QueryLinkStructureHelpText link={selectedLink} className="mt-1.5" />
+      {hasPartnerReferralReward && (
+        <div className="flex flex-col gap-2">
+          <h3 className="text-content-emphasis text-base font-semibold tracking-tight">
+            Partner referral rewards
+          </h3>
+
+          <EmbedLinkRow
+            displayText={getPrettyUrl(partnerReferralApplyLink)}
+            copyValue={partnerReferralApplyLink}
+          />
+
+          {referralRewards.length > 0 && (
+            <div className="border-border-subtle bg-bg-default space-y-4 rounded-lg border p-3">
+              {referralRewards.map((reward) => {
+                const RewardIcon = REWARD_EVENT_ICON.referral;
+
+                return (
+                  <div key={reward.id} className="flex items-start gap-2">
+                    <div className="flex items-center py-0.5">
+                      <RewardIcon className="text-content-default size-4 shrink-0" />
+                    </div>
+                    <div className="text-content-default min-w-0 text-sm font-medium leading-5 tracking-tight">
+                      {formatRewardDescription(reward)}
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+          )}
+        </div>
       )}
-    </>
+    </div>
   );
 }
 
-function PartnerReferralLinkDisplay({
-  referralRewards,
+function EmbedPayoutTerms({
+  minPayoutAmount,
+  holdingPeriodDays,
+  tucked = false,
 }: {
-  referralRewards: RewardProps[];
+  minPayoutAmount: number;
+  holdingPeriodDays: number;
+  tucked?: boolean;
 }) {
-  const { partner, program } = useReferralsEmbedData();
-  const [copied, copyToClipboard] = useCopyToClipboard();
+  const items = [
+    ...(minPayoutAmount > 0
+      ? [
+          {
+            label: "Minimum payout",
+            value: currencyFormatter(minPayoutAmount, {
+              trailingZeroDisplay: "stripIfInteger",
+            }),
+            href: "https://dub.co/help/article/commissions-payouts#what-does-minimum-payout-amount-mean",
+          },
+        ]
+      : []),
+    ...(holdingPeriodDays > 0
+      ? [
+          {
+            label: "holding period",
+            value: `${holdingPeriodDays} ${pluralize("day", holdingPeriodDays)}`,
+            href: "https://dub.co/help/article/commissions-payouts#what-does-holding-period-mean",
+          },
+        ]
+      : []),
+  ];
 
-  const partnerReferralApplyLink = constructPartnerReferralLink({
-    partner,
-    program,
-  });
+  if (items.length === 0) {
+    return null;
+  }
 
   return (
-    <div className="mt-8 sm:max-w-[50%]">
-      <span className="text-content-emphasis text-base font-semibold leading-none">
-        Partner referral rewards
-      </span>
+    <div
+      className={cn(
+        "border-border-subtle bg-bg-muted text-content-subtle flex flex-wrap items-center gap-1.5 text-xs tracking-tight",
+        tucked
+          ? "-mt-2 rounded-b-lg rounded-t-none border border-t-0 p-1.5 pl-2.5 pt-3.5"
+          : "rounded-lg border px-3 py-2",
+      )}
+    >
+      {items.map((item, index) => (
+        <Fragment key={item.label}>
+          {index > 0 && (
+            <span className="text-content-default font-semibold">•</span>
+          )}
+          <span className="inline-flex items-center gap-0.5">
+            <span className="text-content-default font-semibold">
+              {item.value}
+            </span>
+            <a
+              href={item.href}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="font-medium underline decoration-dotted underline-offset-2"
+            >
+              {item.label}
+            </a>
+          </span>
+        </Fragment>
+      ))}
+    </div>
+  );
+}
+
+function EmbedLinkRow({
+  displayText,
+  copyValue,
+  showLinkSelector,
+  linkOptions,
+  selectedOption,
+  onSelectLink,
+  onCreateLink,
+}: {
+  displayText: string;
+  copyValue: string;
+  showLinkSelector?: boolean;
+  linkOptions?: {
+    value: string;
+    label: string;
+    icon: ReactNode;
+  }[];
+  selectedOption?: {
+    value: string;
+    label: string;
+    icon: ReactNode;
+  } | null;
+  onSelectLink?: (id: string) => string | void | undefined;
+  onCreateLink?: () => void;
+}) {
+  const [copied, copyToClipboard] = useCopyToClipboard();
+  const hasLink = Boolean(copyValue);
 
-      <div className="xs:flex-row xs:items-center relative mt-2 flex flex-col gap-2">
+  return (
+    <div className="flex items-center gap-2">
+      {showLinkSelector ? (
+        <div className="min-w-0 grow">
+          <Combobox
+            selected={selectedOption ?? null}
+            setSelected={(option) => {
+              if (!option) return;
+              const valueToCopy = onSelectLink?.(option.value);
+              if (typeof valueToCopy === "string" && valueToCopy) {
+                copyToClipboard(valueToCopy);
+              }
+            }}
+            options={linkOptions}
+            forceDropdown
+            matchTriggerWidth
+            placeholder="No referral link"
+            inputClassName="text-sm h-9"
+            popoverProps={{
+              contentClassName: "rounded-lg border border-border-subtle p-1",
+            }}
+            trigger={
+              <button
+                type="button"
+                className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default flex h-9 w-full min-w-0 items-center gap-2 rounded-lg border px-3 text-left text-sm outline-none focus:ring-0"
+              >
+                {selectedOption?.icon}
+                <span className="min-w-0 shrink grow truncate font-medium">
+                  {displayText}
+                </span>
+                <ChevronDown className="text-content-muted size-3 shrink-0" />
+              </button>
+            }
+          />
+        </div>
+      ) : (
         <input
           type="text"
           readOnly
-          value={getPrettyUrl(partnerReferralApplyLink)}
-          className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-10 min-w-0 grow rounded-lg border px-3 text-sm focus:outline-none focus:ring-0"
+          value={displayText}
+          className="border-border-default text-content-default focus:border-border-emphasis bg-bg-default h-9 min-w-0 grow rounded-lg border px-3 text-sm font-medium focus:outline-none focus:ring-0"
         />
+      )}
+
+      {hasLink ? (
         <Button
           icon={
-            <div className="relative size-4">
-              <div
+            <span className="relative size-4">
+              <Copy
                 className={cn(
-                  "absolute inset-0 transition-[transform,opacity]",
+                  "absolute inset-0 size-4 transition-[transform,opacity]",
                   copied && "translate-y-1 opacity-0",
                 )}
-              >
-                <Copy className="size-4" />
-              </div>
-              <div
+              />
+              <Check
                 className={cn(
-                  "absolute inset-0 transition-[transform,opacity]",
+                  "absolute inset-0 size-4 transition-[transform,opacity]",
                   !copied && "translate-y-1 opacity-0",
                 )}
-              >
-                <Check className="size-4" />
-              </div>
-            </div>
+              />
+            </span>
           }
-          text={copied ? "Copied link" : "Copy link"}
-          className="h-10 w-fit shrink-0 rounded-lg"
-          onClick={() => copyToClipboard(partnerReferralApplyLink)}
+          text={copied ? "Copied" : "Copy"}
+          className="h-9 w-fit shrink-0 rounded-lg px-4"
+          onClick={() => copyToClipboard(copyValue)}
         />
-      </div>
-
-      <div className="text-content-emphasis relative mt-2 text-lg">
-        <ProgramRewardList rewards={referralRewards} className="rounded-lg" />
-      </div>
+      ) : onCreateLink ? (
+        <Button
+          text="Create a link"
+          onClick={onCreateLink}
+          className="h-9 w-fit shrink-0 rounded-lg px-4"
+        />
+      ) : null}
     </div>
   );
 }
diff --git a/apps/web/app/(ee)/app.dub.co/embed/referrals/quickstart.tsx b/apps/web/app/(ee)/app.dub.co/embed/referrals/quickstart.tsx
index e3841abe92b..230e4bb1b20 100644
--- a/apps/web/app/(ee)/app.dub.co/embed/referrals/quickstart.tsx
+++ b/apps/web/app/(ee)/app.dub.co/embed/referrals/quickstart.tsx
@@ -1,5 +1,4 @@
 import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
-import { TREMENDOUS_ENABLED_PROGRAM_IDS } from "@/lib/tremendous/constants";
 import { programEmbedSchema } from "@/lib/zod/schemas/program-embed";
 import {
   Button,
@@ -140,17 +139,12 @@ export function ReferralsEmbedQuickstart({
                     !partner.country ||
                       TREMENDOUS_SUPPORTED_COUNTRIES.includes(partner.country),
                   );
-
-                  const usesTremendous =
-                    partner.defaultPayoutMethod === "tremendous";
-
-                  // Show Tremendous payout settings if the partner already uses Tremendous,
+                  // Show Tremendous payout settings if the partner already uses Tremendous for payouts,
                   // or hasn't selected a payout method yet and is eligible based on country.
                   const showTremendousSettings =
-                    TREMENDOUS_ENABLED_PROGRAM_IDS.includes(program.id) &&
-                    (usesTremendous ||
-                      (!partner.defaultPayoutMethod &&
-                        isTremendousCountrySupported));
+                    partner.defaultPayoutMethod === "tremendous" ||
+                    (!partner.defaultPayoutMethod &&
+                      isTremendousCountrySupported);
 
                   if (showTremendousSettings) {
                     setSelectedTab("Settings");
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
index 47657b02801..e20e46a3f2c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/page.tsx
@@ -29,8 +29,14 @@ export default async function ApplicationPage(props: {
     !program.group.applicationFormData ||
     !program.group.applicationFormPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is featured on the marketplace (and not deactivated), redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program && program.addedToMarketplaceAt && !program.deactivatedAt) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}/apply`);
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
index 0c444317ec4..69ba021b7e7 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/apply/success/page.tsx
@@ -65,8 +65,14 @@ export default async function SuccessPage(props: {
     !program.group.applicationFormData ||
     !program.group.applicationFormPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is featured on the marketplace (and not deactivated), redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program && program.addedToMarketplaceAt && !program.deactivatedAt) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}/apply`);
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
index 0f0ef770540..2085e7d4b5f 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/page.tsx
@@ -28,8 +28,14 @@ export default async function ApplyPage(props: {
     !program.group.landerData ||
     !program.group.landerPublishedAt
   ) {
-    // throw 404 if it's the default group, else redirect to the default group page
+    // for the default group:
+    // - if the program is featured on the marketplace (and not deactivated), redirect to the marketplace program page
+    // - otherwise, throw 404
+    // for other groups: redirect to the default group variant
     if (partnerGroupSlug === DEFAULT_PARTNER_GROUP.slug) {
+      if (program && program.addedToMarketplaceAt && !program.deactivatedAt) {
+        redirect(`/marketplace/${programSlug}`);
+      }
       notFound();
     } else {
       redirect(`/${programSlug}`);
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
index b30edb049d5..1526bb857c3 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
@@ -62,7 +62,7 @@ export default async function PartnerAuthLayout(props: {
     redirect("/register");
   }
   return (
-    <div className="relative grid min-h-[100dvh] min-h-screen grid-cols-1 min-[900px]:grid-cols-[440px_minmax(0,1fr)] lg:grid-cols-[595px_minmax(0,1fr)]">
+    <div className="relative grid min-h-[100dvh] grid-cols-1 min-[900px]:grid-cols-[440px_minmax(0,1fr)] lg:grid-cols-[595px_minmax(0,1fr)]">
       <PartnerBanner program={program} />
       <SidePanel program={program} />
 
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/login/page.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/login/page.tsx
index 482d47ed0f6..d11d040ead9 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/login/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/login/page.tsx
@@ -1,4 +1,5 @@
 import { SSO_LOGIN_PROGRAMS } from "@/lib/auth/sso-login-programs";
+import { testIds } from "@/lib/e2e/test-ids";
 import { getProgram } from "@/lib/fetchers/get-program";
 import { AuthAlternativeBanner } from "@/ui/auth/auth-alternative-banner";
 import LoginForm from "@/ui/auth/login/login-form";
@@ -10,6 +11,7 @@ import { SSOLoginButton } from "./sso-login-button";
 
 export const metadata = constructMetadata({
   fullTitle: "Login to partners.dub.co",
+  canonicalUrl: "https://partners.dub.co/login",
 });
 
 export default async function LoginPage(props: {
@@ -70,7 +72,10 @@ export default async function LoginPage(props: {
     <div className="relative w-full">
       <AuthLayout showTerms="partners" className={cn(programSlug && "pt-20")}>
         <div className="w-full max-w-sm">
-          <h1 className="text-center text-xl font-semibold">
+          <h1
+            className="text-center text-xl font-semibold"
+            data-testid={testIds.auth.loginHeading}
+          >
             Log in to your Dub Partner account
           </h1>
           <div className="mt-8">
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page-client.tsx
index e8392e0be98..44db26211c9 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page-client.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { emailSchema } from "@/lib/zod/schemas/auth";
 import { ApplicationAnalytics } from "@/ui/application-analytics";
 import { AuthAlternativeBanner } from "@/ui/auth/auth-alternative-banner";
@@ -86,7 +87,10 @@ function Verify() {
     <AuthLayout>
       <div className="w-full max-w-sm">
         <div className="flex flex-col items-center gap-1 text-center">
-          <h3 className="text-center text-xl font-semibold">
+          <h3
+            className="text-center text-xl font-semibold"
+            data-testid={testIds.auth.verifyEmailHeading}
+          >
             Verify your email address
           </h3>
           <p className="text-base font-medium text-neutral-500">
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page.tsx
index 74660c1d852..6093506bc66 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/register/page.tsx
@@ -7,6 +7,7 @@ import RegisterPageClient from "./page-client";
 
 export const metadata = constructMetadata({
   fullTitle: "Create your partners.dub.co account",
+  canonicalUrl: "https://partners.dub.co/register",
 });
 
 export default async function RegisterPage(props: {
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/program-logos.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/program-logos.tsx
index 9d058c8916d..0bd086bae61 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/program-logos.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/program-logos.tsx
@@ -1,10 +1,13 @@
 import { ProgressiveBlur } from "@dub/ui";
 import { cn } from "@dub/utils";
 
-const LOGO_COUNT = 13;
+// Number of logos in the sprite sheet
+const LOGO_COUNT = 23;
+// Logos shown per row (a random subset of the sprite)
+const VISIBLE_PER_ROW = 12;
 const ROW_COUNT = 4;
 
-// Randomly shuffle the logos in each row
+// Randomly shuffle the logos and pick a subset for each row
 const ROWS = [...Array(ROW_COUNT)].map(() => {
   const cols = [...Array(LOGO_COUNT)].map((_, col) => col);
 
@@ -21,7 +24,7 @@ const ROWS = [...Array(ROW_COUNT)].map(() => {
     ];
   }
 
-  return cols;
+  return cols.slice(0, VISIBLE_PER_ROW);
 });
 
 const BLUR_STEPS = 5;
@@ -77,7 +80,7 @@ export function ProgramLogos() {
                             className="size-[4.5rem] rounded-full"
                             style={{
                               backgroundImage:
-                                "url(https://assets.dub.co/misc/partner-auth-logos.png)",
+                                "url(https://assets.dub.co/cms/partner-auth-logo-grid.png)",
                               backgroundSize: `${LOGO_COUNT * 100}%`,
                               backgroundPositionX:
                                 (LOGO_COUNT - (logoIndex % LOGO_COUNT)) * 100 +
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/side-panel.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/side-panel.tsx
index c5bc269e6be..86ef764e89d 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/side-panel.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/side-panel.tsx
@@ -49,16 +49,9 @@ export function SidePanel({
         <>
           <div className="flex flex-col gap-6 px-4 lg:px-10">
             <p className="text-content-default max-w-[370px] text-pretty text-xl font-medium">
-              Join thousands of others who have earned over $10,000,000 on Dub
+              Join thousands of others who have earned over $25,000,000 on Dub
               partnering with world-class companies.
             </p>
-            <Link
-              target="_blank"
-              href="https://dub.co/blog/10m-payouts"
-              className="text-content-emphasis flex h-8 w-fit items-center rounded-lg bg-black/5 px-3 text-sm font-medium transition-[transform,background-color] duration-75 hover:bg-black/10 active:scale-[0.98]"
-            >
-              Read more
-            </Link>
           </div>
 
           <div className="w-full grow basis-0">
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/[[...segments]]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/[[...segments]]/page.tsx
index fbdbd564eb1..76c6bfdc55c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/[[...segments]]/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/[[...segments]]/page.tsx
@@ -1,19 +1,27 @@
+import LayoutLoader from "@/ui/layout/layout-loader";
 import { MarketplaceRouter } from "@/ui/program-marketplace/marketplace-router";
-import {
-  generateMarketplaceProgramStaticParams,
-  revalidate,
-} from "@/ui/program-marketplace/pages/marketplace-program-page";
+import { Suspense } from "react";
 
-export { revalidate };
+export const dynamic = "force-dynamic";
 
-export async function generateStaticParams() {
-  return generateMarketplaceProgramStaticParams();
+export default function MarketplacePage({
+  params,
+}: {
+  params: Promise<{ segments?: string[] }>;
+}) {
+  return (
+    <Suspense fallback={<LayoutLoader />}>
+      <MarketplaceSegments params={params} />
+    </Suspense>
+  );
 }
 
-export default async function MarketplacePage(props: {
+async function MarketplaceSegments({
+  params,
+}: {
   params: Promise<{ segments?: string[] }>;
 }) {
-  const { segments } = await props.params;
+  const { segments = [] } = await params;
 
   return <MarketplaceRouter segments={segments} />;
 }
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/layout.tsx
deleted file mode 100644
index de6b5502415..00000000000
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-"use client";
-
-import { PropsWithChildren } from "react";
-
-export default function MarketplaceLayout({ children }: PropsWithChildren) {
-  return children;
-}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/loading.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/loading.tsx
new file mode 100644
index 00000000000..7ccd211a718
--- /dev/null
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/marketplace/loading.tsx
@@ -0,0 +1 @@
+export { default } from "@/ui/layout/layout-loader";
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
index 1219432b966..5f0b0258210 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/messages/[programSlug]/page.tsx
@@ -1,12 +1,12 @@
 "use client";
 
 import { parseActionError } from "@/lib/actions/parse-action-errors";
-import { PARTNER_ALLOWED_ATTACHMENT_TYPES } from "@/lib/messages/constants";
 import { useProgramMessages } from "@/lib/messages/hooks/use-program-messages";
 import { markProgramMessagesReadAction } from "@/lib/messages/mark-program-messages-read";
 import { messageProgramAction } from "@/lib/messages/message-program";
 import { uploadPartnerMessageAttachmentAction } from "@/lib/messages/upload-partner-message-attachment";
 import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
@@ -177,8 +177,7 @@ export default function PartnerMessagesProgramPage() {
           const result = await uploadAttachment({
             programSlug,
             fileName: file.name,
-            contentType:
-              file.type as (typeof PARTNER_ALLOWED_ATTACHMENT_TYPES)[number],
+            contentType: file.type,
             contentLength: file.size,
           });
 
@@ -304,7 +303,9 @@ export default function PartnerMessagesProgramPage() {
               pendingAttachments={pendingAttachments}
               onAddFiles={handleAddFiles}
               onRemoveAttachment={handleRemoveAttachment}
-              allowedFileTypes={PARTNER_ALLOWED_ATTACHMENT_TYPES}
+              allowedFileTypes={
+                UPLOAD_POLICIES.partnerMessageAttachments.contentTypes
+              }
               {...(shouldShowExternalSupportEmptyState && messages?.length
                 ? {
                     footerSlot: (
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/about-you-form.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/about-you-form.tsx
index 8111a245215..5b58dff685e 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/about-you-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/about-you-form.tsx
@@ -9,6 +9,7 @@ import { PartnerProps } from "@/lib/types";
 import { MAX_PARTNER_DESCRIPTION_LENGTH } from "@/lib/zod/schemas/partners";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
 import { Button, RadioGroup, RadioGroupItem, useEnterSubmit } from "@dub/ui";
+import { Plus } from "@dub/ui/icons";
 import { cn } from "@dub/utils";
 import { IndustryInterest, MonthlyTraffic } from "@prisma/client";
 import { useAction } from "next-safe-action/hooks";
@@ -151,12 +152,40 @@ export function AboutYouForm({ partner }: { partner?: PartnerProps }) {
                           </div>
                         ))
                     : [...Array(3)].map((_, idx) => (
-                        <div
+                        <button
                           key={idx}
+                          type="button"
+                          disabled={disabled}
+                          aria-label="Add industry interest"
+                          onClick={() => setShowIndustryInterestsModal(true)}
                           className={cn(
-                            "border-border-subtle h-11 w-32 rounded-full border border-dashed bg-white",
+                            "relative flex h-11 w-32 items-center justify-center rounded-full bg-white",
+                            !disabled &&
+                              "transition-colors hover:bg-neutral-50/60",
+                            disabled && "cursor-not-allowed",
                           )}
-                        />
+                        >
+                          <svg
+                            className="pointer-events-none absolute inset-0 size-full text-neutral-300"
+                            aria-hidden="true"
+                          >
+                            <rect
+                              x="0.5"
+                              y="0.5"
+                              width="100%"
+                              height="100%"
+                              rx="21.5"
+                              fill="none"
+                              stroke="currentColor"
+                              strokeDasharray="5 5"
+                              style={{
+                                width: "calc(100% - 1px)",
+                                height: "calc(100% - 1px)",
+                              }}
+                            />
+                          </svg>
+                          <Plus className="size-4 text-neutral-700" />
+                        </button>
                       ))}
                 </div>
                 <Button
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page.tsx
deleted file mode 100644
index 1058c9b72b1..00000000000
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { PostbackDetailPageClient } from "./page-client";
-
-export default async function PostbackDetailPage(props: {
-  params: Promise<{ id: string }>;
-}) {
-  const { id } = await props.params;
-
-  return <PostbackDetailPageClient postbackId={id} />;
-}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[postbackId]/page.tsx
similarity index 96%
rename from apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx
rename to apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[postbackId]/page.tsx
index e6f00ec22ff..7f74640d397 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[id]/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/[postbackId]/page.tsx
@@ -15,18 +15,13 @@ import { BackLink } from "@/ui/shared/back-link";
 import { TokenAvatar } from "@/ui/token-avatar";
 import { EmptyState, Webhook } from "@dub/ui";
 import { fetcher } from "@dub/utils";
-import { redirect, useRouter } from "next/navigation";
+import { redirect, useParams, useRouter } from "next/navigation";
 import { useState } from "react";
 import useSWR from "swr";
 
-interface PostbackDetailPageClientProps {
-  postbackId: string;
-}
-
-export function PostbackDetailPageClient({
-  postbackId,
-}: PostbackDetailPageClientProps) {
+export default function PostbackDetailPage() {
   const router = useRouter();
+  const { postbackId } = useParams();
   const [openPopover, setOpenPopover] = useState(false);
 
   const {
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/add-postback-button.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/add-postback-button.tsx
index 8e3f5962b41..86ff7b148dc 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/add-postback-button.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/profile/postbacks/add-postback-button.tsx
@@ -5,10 +5,10 @@ import { Button } from "@dub/ui";
 export function AddPostbackButton({ onClick }: { onClick: () => void }) {
   return (
     <Button
-      className="flex h-10 items-center justify-center whitespace-nowrap rounded-lg border px-4 text-sm"
-      text="Add Postback"
+      className="h-9"
+      text="Create Postback"
       onClick={onClick}
-      aria-label="Add postback"
+      aria-label="Create postback"
     />
   );
 }
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx
deleted file mode 100644
index 1e0edb18e7d..00000000000
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/layout.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-"use client";
-
-import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
-import usePartnerCustomersCount from "@/lib/swr/use-partner-customers-count";
-import { usePartnerSubmittedLeadsCount } from "@/lib/swr/use-partner-submitted-leads-count";
-import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
-import { submittedLeadFormSchema } from "@/lib/zod/schemas/submitted-lead-form";
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { SubmitLeadSheet } from "@/ui/submitted-leads/submit-lead-sheet";
-import { Button, InfoTooltip } from "@dub/ui";
-import { cn, nFormatter } from "@dub/utils";
-import Link from "next/link";
-import { useParams, usePathname } from "next/navigation";
-import { CSSProperties, ReactNode, useMemo, useState } from "react";
-import * as z from "zod/v4";
-
-export default function PartnerProgramCustomersLayout({
-  children,
-}: {
-  children: ReactNode;
-}) {
-  const pathname = usePathname();
-  const { programEnrollment } = useProgramEnrollment();
-  const { programSlug } = useParams<{ programSlug: string }>();
-  const [showLeadSheet, setShowLeadSheet] = useState(false);
-
-  const { data: customersCount } = usePartnerCustomersCount<number>({
-    includeParams: [],
-  });
-
-  const { data: leadsCount } = usePartnerSubmittedLeadsCount<number>({
-    ignoreParams: true,
-  });
-
-  const leadFormDataRaw = programEnrollment?.program?.referralFormData;
-  const programId = programEnrollment?.programId;
-
-  const isEnabled = programId
-    ? SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(programId)
-    : false;
-
-  const leadFormData = useMemo(() => {
-    if (!leadFormDataRaw) {
-      return null;
-    }
-    try {
-      return submittedLeadFormSchema.parse(leadFormDataRaw) as z.infer<
-        typeof submittedLeadFormSchema
-      >;
-    } catch {
-      return null;
-    }
-  }, [leadFormDataRaw]);
-
-  const tabs = useMemo(() => {
-    if (!isEnabled) {
-      return [];
-    }
-
-    return [
-      {
-        label: "Customers",
-        id: "customers",
-        href: "",
-        info: "Shows both your converted and non-converted customers.",
-        count: customersCount,
-      },
-      {
-        label: "Submitted leads",
-        id: "leads",
-        href: "leads",
-        info: "Shows your submitted leads.",
-        count: leadsCount,
-      },
-    ];
-  }, [isEnabled, customersCount, leadsCount]);
-
-  return (
-    <PageContent
-      title="Customers"
-      controls={
-        <>
-          {isEnabled && (
-            <Button
-              text="Submit lead"
-              className="h-9 w-fit rounded-lg"
-              disabled={!leadFormData}
-              disabledTooltip={
-                leadFormData ? undefined : "Submitted leads are not offered."
-              }
-              onClick={() => {
-                setShowLeadSheet(true);
-              }}
-            />
-          )}
-        </>
-      }
-    >
-      {isEnabled && leadFormData && programEnrollment?.programId && (
-        <SubmitLeadSheet
-          isOpen={showLeadSheet}
-          setIsOpen={setShowLeadSheet}
-          programId={programEnrollment.programId}
-          leadFormData={leadFormData}
-        />
-      )}
-
-      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
-        {tabs.length > 0 && (
-          <div
-            className={cn(
-              "grid grid-cols-[repeat(var(--tabs),minmax(0,1fr))] gap-2",
-            )}
-            style={{ "--tabs": tabs.length } as CSSProperties}
-          >
-            {tabs.map((tab) => {
-              const isActive = pathname.endsWith(
-                `/customers${tab.href ? `/${tab.href}` : ""}`,
-              );
-
-              return (
-                <Link
-                  key={tab.id}
-                  href={`/programs/${programSlug}/customers${tab.href ? `/${tab.href}` : ""}`}
-                  className={cn(
-                    "border-border-subtle flex flex-col gap-1 rounded-lg border p-4 text-left transition-colors duration-100",
-                    isActive
-                      ? "border-black ring-1 ring-black"
-                      : "hover:bg-bg-muted",
-                  )}
-                >
-                  <div className="flex items-center gap-2">
-                    <span className="text-content-default text-xs font-semibold">
-                      {tab.label}
-                    </span>
-                    {tab.info && <InfoTooltip content={tab.info} />}
-                  </div>
-                  {tab.count !== undefined ? (
-                    <span className="text-content-emphasis text-base font-semibold">
-                      {nFormatter(tab.count, { full: true })}
-                    </span>
-                  ) : (
-                    <div className="h-6 w-12 animate-pulse rounded-md bg-neutral-200" />
-                  )}
-                </Link>
-              );
-            })}
-          </div>
-        )}
-        {children}
-      </PageWidthWrapper>
-    </PageContent>
-  );
-}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx
index 6b4ba8dcfdd..c755d704c33 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/page.tsx
@@ -1,10 +1,16 @@
 "use client";
 
-import { PARTNER_CUSTOMERS_MAX_PAGE_SIZE } from "@/lib/constants/partner-profile";
+import {
+  CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS,
+  PARTNER_CUSTOMERS_MAX_PAGE_SIZE,
+} from "@/lib/constants/partner-profile";
 import usePartnerCustomers from "@/lib/swr/use-partner-customers";
 import usePartnerCustomersCount from "@/lib/swr/use-partner-customers-count";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
 import { CustomerRowItem } from "@/ui/customers/customer-row-item";
+import { PartnerCustomersMenuPopover } from "@/ui/customers/partner-customers-menu-popover";
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
 import { CountryFlag } from "@/ui/shared/country-flag";
 import { SearchBoxPersisted } from "@/ui/shared/search-box";
@@ -21,7 +27,13 @@ import {
   useTable,
 } from "@dub/ui";
 import { User } from "@dub/ui/icons";
-import { COUNTRIES, formatDate, getApexDomain, getPrettyUrl } from "@dub/utils";
+import {
+  COUNTRIES,
+  currencyFormatter,
+  formatDate,
+  getApexDomain,
+  getPrettyUrl,
+} from "@dub/utils";
 import { useParams, useRouter } from "next/navigation";
 import { useMemo } from "react";
 import { usePartnerCustomerFilters } from "./use-partner-customer-filters";
@@ -60,6 +72,11 @@ export default function PartnerProgramCustomersPage() {
       "country",
       "link",
       "createdAt",
+      ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(
+        programEnrollment?.programId ?? "",
+      )
+        ? []
+        : ["saleAmount"]),
       "firstSaleAt",
       "subscriptionCanceledAt",
     ],
@@ -68,6 +85,11 @@ export default function PartnerProgramCustomersPage() {
       "country",
       "link",
       "createdAt",
+      ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(
+        programEnrollment?.programId ?? "",
+      )
+        ? []
+        : ["saleAmount"]),
       "firstSaleAt",
       "subscriptionCanceledAt",
     ],
@@ -156,6 +178,24 @@ export default function PartnerProgramCustomersPage() {
             </TimestampTooltip>
           ),
         },
+        ...(CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(
+          programEnrollment?.programId ?? "",
+        )
+          ? []
+          : [
+              {
+                id: "saleAmount",
+                header: "LTV",
+                meta: {
+                  headerTooltip:
+                    "The customer's lifetime value (how much revenue the customer has generated over their lifetime).",
+                },
+                accessorKey: "saleAmount",
+                cell: ({ row }) => (
+                  <span>{currencyFormatter(row.original.saleAmount)}</span>
+                ),
+              },
+            ]),
         {
           id: "firstSaleAt",
           header: "Paid",
@@ -238,7 +278,12 @@ export default function PartnerProgramCustomersPage() {
     onPaginationChange: setPagination,
     columnVisibility,
     onColumnVisibilityChange: setColumnVisibility,
-    sortableColumns: ["createdAt", "firstSaleAt", "subscriptionCanceledAt"],
+    sortableColumns: [
+      "createdAt",
+      "firstSaleAt",
+      "saleAmount",
+      "subscriptionCanceledAt",
+    ],
     sortBy,
     sortOrder,
     onSortChange: ({ sortBy, sortOrder }) =>
@@ -263,59 +308,63 @@ export default function PartnerProgramCustomersPage() {
   });
 
   return (
-    <div className="flex flex-col gap-4">
-      <div>
-        <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
-          <Filter.Select
-            className="w-full md:w-fit"
-            filters={filters}
-            activeFilters={activeFilters}
-            onSelect={onSelect}
-            onRemove={onRemove}
-            onSelectedFilterChange={setSelectedFilter}
-          />
-          {Boolean(programEnrollment?.customerDataSharingEnabledAt) && (
-            <SearchBoxPersisted
-              placeholder="Search by email or name"
-              inputClassName="md:w-[16rem]"
-            />
-          )}
-        </div>
-        <AnimatedSizeContainer height>
+    <PageContent title="Customers" controls={<PartnerCustomersMenuPopover />}>
+      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
+        <div className="flex flex-col gap-4">
           <div>
-            {activeFilters.length > 0 && (
-              <div className="pt-3">
-                <Filter.List
-                  filters={filters}
-                  activeFilters={activeFilters}
-                  onSelect={onSelect}
-                  onRemove={onRemove}
-                  onRemoveAll={onRemoveAll}
+            <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+              <Filter.Select
+                className="w-full md:w-fit"
+                filters={filters}
+                activeFilters={activeFilters}
+                onSelect={onSelect}
+                onRemove={onRemove}
+                onSelectedFilterChange={setSelectedFilter}
+              />
+              {Boolean(programEnrollment?.customerDataSharingEnabledAt) && (
+                <SearchBoxPersisted
+                  placeholder="Search by email or name"
+                  inputClassName="md:w-[16rem]"
                 />
+              )}
+            </div>
+            <AnimatedSizeContainer height>
+              <div>
+                {activeFilters.length > 0 && (
+                  <div className="pt-3">
+                    <Filter.List
+                      filters={filters}
+                      activeFilters={activeFilters}
+                      onSelect={onSelect}
+                      onRemove={onRemove}
+                      onRemoveAll={onRemoveAll}
+                    />
+                  </div>
+                )}
               </div>
-            )}
+            </AnimatedSizeContainer>
           </div>
-        </AnimatedSizeContainer>
-      </div>
 
-      {customers?.length !== 0 ? (
-        <Table {...tableProps} table={table} />
-      ) : (
-        <AnimatedEmptyState
-          title={isFiltered ? "No customers found" : "No customers yet"}
-          description={
-            isFiltered
-              ? "No customers found for the selected filters. Adjust your filters to refine your search results."
-              : "No customers have been recorded for this program yet. Once customers start converting through your links, they'll appear here."
-          }
-          cardContent={() => (
-            <>
-              <User className="size-4 text-neutral-700" />
-              <div className="h-2.5 w-24 min-w-0 rounded-sm bg-neutral-200" />
-            </>
+          {customers?.length !== 0 ? (
+            <Table {...tableProps} table={table} />
+          ) : (
+            <AnimatedEmptyState
+              title={isFiltered ? "No customers found" : "No customers yet"}
+              description={
+                isFiltered
+                  ? "No customers found for the selected filters. Adjust your filters to refine your search results."
+                  : "No customers have been recorded for this program yet. Once customers start converting through your links, they'll appear here."
+              }
+              cardContent={() => (
+                <>
+                  <User className="size-4 text-neutral-700" />
+                  <div className="h-2.5 w-24 min-w-0 rounded-sm bg-neutral-200" />
+                </>
+              )}
+            />
           )}
-        />
-      )}
-    </div>
+        </div>
+      </PageWidthWrapper>
+    </PageContent>
   );
 }
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
index 699c7c8b82c..07ddd912d49 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page-client.tsx
@@ -10,10 +10,10 @@ import { CustomerSalesTable } from "@/ui/customers/customer-sales-table";
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { ProgramRewardList } from "@/ui/partners/program-reward-list";
+import { Callout } from "@/ui/shared/callout";
 import { Button, ChevronRight, MoneyBill2, Tooltip, User } from "@dub/ui";
 import { cn, fetcher, formatDate } from "@dub/utils";
 import { addMonths, isBefore } from "date-fns";
-import { AlertCircle } from "lucide-react";
 import Link from "next/link";
 import { redirect, useParams } from "next/navigation";
 import { memo, useMemo } from "react";
@@ -118,14 +118,11 @@ export function ProgramCustomerPageClient() {
                 </div>
                 {rewardPeriodEndDate &&
                   isBefore(rewardPeriodEndDate, new Date()) && (
-                    <div className="flex items-center gap-2 rounded-lg border border-amber-100 bg-amber-50 px-3 py-2">
-                      <AlertCircle className="size-4 shrink-0 text-amber-600" />
-                      <p className="text-sm text-amber-900">
-                        The earning period for this customer has ended as of{" "}
-                        {formatDate(rewardPeriodEndDate)}. No future conversions
-                        will be rewarded.
-                      </p>
-                    </div>
+                    <Callout variant="warn" size={2}>
+                      The earning period for this customer has ended as of{" "}
+                      {formatDate(rewardPeriodEndDate)}. No future conversions
+                      will be rewarded.
+                    </Callout>
                   )}
 
                 <div className="border-border-subtle overflow-hidden rounded-lg border">
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page.tsx
index 10f09a6c1e9..bc0771de58c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/[customerId]/page.tsx
@@ -9,7 +9,7 @@ export default async function PartnerProgramCustomerPage({
   const { programSlug, customerId } = await params;
 
   if (customerId === "referrals") {
-    redirect(`/programs/${programSlug}/customers/leads`);
+    redirect(`/programs/${programSlug}/leads`);
   }
   return <ProgramCustomerPageClient />;
 }
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
index c9efeb85837..e160eec4595 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/earnings/earnings-composite-chart.tsx
@@ -52,7 +52,7 @@ export function EarningsCompositeChart() {
     start,
     end,
     interval = DUB_PARTNERS_ANALYTICS_INTERVAL,
-    groupBy = "linkId",
+    groupBy = "type",
   } = searchParamsObj as {
     start?: string;
     end?: string;
@@ -150,20 +150,20 @@ export function EarningsCompositeChart() {
               {
                 label: (
                   <div className="flex items-center gap-1.5 text-neutral-600">
-                    <Hyperlink className="size-4" />
-                    <span className="text-sm">Link</span>
+                    <Sliders className="size-4" />
+                    <span className="text-sm">Type</span>
                   </div>
                 ),
-                value: "linkId",
+                value: "type",
               },
               {
                 label: (
                   <div className="flex items-center gap-1.5 text-neutral-600">
-                    <Sliders className="size-4" />
-                    <span className="text-sm">Type</span>
+                    <Hyperlink className="size-4" />
+                    <span className="text-sm">Link</span>
                   </div>
                 ),
-                value: "type",
+                value: "linkId",
               },
             ]}
             selected={groupBy}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/leads/page.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/leads/page.tsx
similarity index 66%
rename from apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/leads/page.tsx
rename to apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/leads/page.tsx
index f5ecc6074df..58c36244cb6 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/customers/(index)/leads/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/leads/page.tsx
@@ -1,16 +1,23 @@
 "use client";
 
+import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
 import { usePartnerSubmittedLeads } from "@/lib/swr/use-partner-submitted-leads";
 import { usePartnerSubmittedLeadsCount } from "@/lib/swr/use-partner-submitted-leads-count";
+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
 import { PartnerProfileSubmittedLeadsCountByStatus } from "@/lib/types";
 import { PartnerProfileSubmittedLead } from "@/lib/zod/schemas/partner-profile";
+import { submittedLeadFormSchema } from "@/lib/zod/schemas/submitted-lead-form";
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { SearchBoxPersisted } from "@/ui/shared/search-box";
 import { PartnerProfileSubmittedLeadSheet } from "@/ui/submitted-leads/partner-profile-submitted-lead-sheet";
 import { PartnerProfileSubmittedLeadsEmptyState } from "@/ui/submitted-leads/partner-profile-submitted-leads-empty-state";
+import { SubmitLeadSheet } from "@/ui/submitted-leads/submit-lead-sheet";
 import { SubmittedLeadStatusBadges } from "@/ui/submitted-leads/submitted-lead-status-badges";
 import { getCompanyLogoUrl } from "@/ui/submitted-leads/submitted-lead-utils";
 import {
   AnimatedSizeContainer,
+  Button,
   Filter,
   StatusBadge,
   Table,
@@ -25,10 +32,13 @@ import { cn, formatDate, nFormatter, OG_AVATAR_URL } from "@dub/utils";
 import { SubmittedLeadStatus } from "@prisma/client";
 import { Row } from "@tanstack/react-table";
 import { useEffect, useMemo, useState } from "react";
+import * as z from "zod/v4";
 
 export default function PartnerProgramSubmittedLeadsPage() {
-  const { queryParams, searchParams } = useRouterStuff();
+  const { queryParams, searchParams, searchParamsObj } = useRouterStuff();
   const { pagination, setPagination } = usePagination();
+  const { programEnrollment } = useProgramEnrollment();
+  const [showLeadSheet, setShowLeadSheet] = useState(false);
 
   const leadIdFromUrl = searchParams.get("leadId");
 
@@ -40,10 +50,29 @@ export default function PartnerProgramSubmittedLeadsPage() {
     open: !!leadIdFromUrl,
   });
 
-  const { searchParamsObj } = useRouterStuff();
   const status = searchParamsObj.status as SubmittedLeadStatus | undefined;
   const search = searchParamsObj.search as string | undefined;
 
+  const leadFormDataRaw = programEnrollment?.program?.referralFormData;
+  const programId = programEnrollment?.programId;
+
+  const isEnabled = programId
+    ? SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(programId)
+    : false;
+
+  const leadFormData = useMemo(() => {
+    if (!leadFormDataRaw) {
+      return null;
+    }
+    try {
+      return submittedLeadFormSchema.parse(leadFormDataRaw) as z.infer<
+        typeof submittedLeadFormSchema
+      >;
+    } catch {
+      return null;
+    }
+  }, [leadFormDataRaw]);
+
   const { data: countByStatus } = usePartnerSubmittedLeadsCount<
     PartnerProfileSubmittedLeadsCountByStatus[] | undefined
   >({
@@ -277,77 +306,105 @@ export default function PartnerProgramSubmittedLeadsPage() {
   }, [searchParams, detailsSheetState.leadId]);
 
   return (
-    <div className="flex flex-col gap-3">
-      {detailsSheetState.leadId && currentLead && (
-        <PartnerProfileSubmittedLeadSheet
-          isOpen={detailsSheetState.open}
-          setIsOpen={(open) =>
-            setDetailsSheetState((s) => ({ ...s, open }) as any)
-          }
-          lead={currentLead}
-          onPrevious={
-            previousLeadId
-              ? () => {
-                  queryParams({
-                    set: { leadId: previousLeadId },
-                  });
-                  setDetailsSheetState({
-                    leadId: previousLeadId,
-                    open: true,
-                  });
-                }
-              : undefined
-          }
-          onNext={
-            nextLeadId
-              ? () => {
-                  queryParams({
-                    set: { leadId: nextLeadId },
-                  });
-                  setDetailsSheetState({
-                    leadId: nextLeadId,
-                    open: true,
-                  });
-                }
-              : undefined
-          }
+    <PageContent
+      title="Submitted Leads"
+      controls={
+        isEnabled ? (
+          <Button
+            text="Submit lead"
+            className="h-9 w-fit rounded-lg"
+            disabled={!leadFormData}
+            disabledTooltip={
+              leadFormData ? undefined : "Submitted leads are not offered."
+            }
+            onClick={() => {
+              setShowLeadSheet(true);
+            }}
+          />
+        ) : undefined
+      }
+    >
+      {isEnabled && leadFormData && programEnrollment?.programId && (
+        <SubmitLeadSheet
+          isOpen={showLeadSheet}
+          setIsOpen={setShowLeadSheet}
+          programId={programEnrollment.programId}
+          leadFormData={leadFormData}
         />
       )}
-      <div>
-        <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
-          <Filter.Select
-            className="w-full md:w-fit"
-            filters={filters}
-            activeFilters={activeFilters}
-            onSelect={onSelect}
-            onRemove={onRemove}
-          />
-          <SearchBoxPersisted
-            placeholder="Search by email or name"
-            inputClassName="md:w-[16rem]"
+
+      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
+        {detailsSheetState.leadId && currentLead && (
+          <PartnerProfileSubmittedLeadSheet
+            isOpen={detailsSheetState.open}
+            setIsOpen={(open) =>
+              setDetailsSheetState((s) => ({ ...s, open }) as any)
+            }
+            lead={currentLead}
+            onPrevious={
+              previousLeadId
+                ? () => {
+                    queryParams({
+                      set: { leadId: previousLeadId },
+                    });
+                    setDetailsSheetState({
+                      leadId: previousLeadId,
+                      open: true,
+                    });
+                  }
+                : undefined
+            }
+            onNext={
+              nextLeadId
+                ? () => {
+                    queryParams({
+                      set: { leadId: nextLeadId },
+                    });
+                    setDetailsSheetState({
+                      leadId: nextLeadId,
+                      open: true,
+                    });
+                  }
+                : undefined
+            }
           />
-        </div>
-        <AnimatedSizeContainer height>
-          <div>
-            {activeFilters.length > 0 && (
-              <div className="pt-3">
-                <Filter.List
-                  filters={filters}
-                  activeFilters={activeFilters}
-                  onSelect={onSelect}
-                  onRemove={onRemove}
-                  onRemoveAll={onRemoveAll}
-                />
-              </div>
-            )}
+        )}
+        <div>
+          <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+            <Filter.Select
+              className="w-full md:w-fit"
+              filters={filters}
+              activeFilters={activeFilters}
+              onSelect={onSelect}
+              onRemove={onRemove}
+            />
+            <SearchBoxPersisted
+              placeholder="Search by email or name"
+              inputClassName="md:w-[16rem]"
+            />
           </div>
-        </AnimatedSizeContainer>
-      </div>
-      {leads && leads.length !== 0 ? (
-        <Table {...tableProps} table={table} />
-      ) : !isLoading ? (
-        <PartnerProfileSubmittedLeadsEmptyState />
-      ) : null}
-    </div>
+          <AnimatedSizeContainer height>
+            <div>
+              {activeFilters.length > 0 && (
+                <div className="pt-3">
+                  <Filter.List
+                    filters={filters}
+                    activeFilters={activeFilters}
+                    onSelect={onSelect}
+                    onRemove={onRemove}
+                    onRemoveAll={onRemoveAll}
+                  />
+                </div>
+              )}
+            </div>
+          </AnimatedSizeContainer>
+        </div>
+        {leads && leads.length !== 0 ? (
+          <Table {...tableProps} table={table} />
+        ) : !isLoading ? (
+          <PartnerProfileSubmittedLeadsEmptyState />
+        ) : null}
+      </PageWidthWrapper>
+    </PageContent>
   );
 }
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
index 5132e3823cd..eb54359223a 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/page-client.tsx
@@ -18,7 +18,12 @@ import {
   useRouterStuff,
 } from "@dub/ui";
 import { ChartTooltipSync } from "@dub/ui/charts";
-import { CursorRays, GridIcon, GridLayoutRows, Hyperlink } from "@dub/ui/icons";
+import {
+  CursorRays,
+  GridLayoutRows,
+  Hyperlink,
+  TableRows2,
+} from "@dub/ui/icons";
 import { createContext, useContext, useEffect, useState } from "react";
 import { PartnerLinkCard } from "./partner-link-card";
 
@@ -100,25 +105,19 @@ export function PartnerProgramLinksPageClient() {
         <div className="flex items-center gap-3">
           {!!showDetailedAnalytics && (
             <ToggleGroup
-              className="h-10 rounded-lg px-1"
-              optionClassName="px-2 rounded-md"
-              indicatorClassName="border-0 ring-1 ring-inset ring-neutral-200"
+              className="bg-bg-muted h-10 gap-0 rounded-lg p-0"
+              optionClassName="h-full rounded-md px-2.5 py-0"
+              // Selected pill bleeds 1px outward so its border sits on top of
+              // the track's border instead of doubling up beside it
+              indicatorClassName="bg-bg-default -left-px -top-px h-[calc(100%+2px)] w-[calc(100%+2px)]"
               options={[
                 {
                   value: "full",
-                  label: (
-                    <div className="p-1">
-                      <GridIcon className="size-4" />
-                    </div>
-                  ),
+                  label: <GridLayoutRows className="size-4" />,
                 },
                 {
                   value: "cards",
-                  label: (
-                    <div className="p-1">
-                      <GridLayoutRows className="size-4" />
-                    </div>
-                  ),
+                  label: <TableRows2 className="size-4" />,
                 },
               ]}
               selected={displayOption}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
index 640a9a6e48f..717e5c6f0f3 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-card.tsx
@@ -6,6 +6,7 @@ import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
 import { PartnerProfileLinkProps } from "@/lib/types";
 import { CommentsBadge } from "@/ui/links/comments-badge";
 import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";
+import { DiscountCodeTooltip } from "@/ui/partners/discounts/discount-code-tooltip";
 import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
 import {
   ArrowTurnRight2,
@@ -43,6 +44,12 @@ import {
 } from "react";
 import { usePartnerLinksContext } from "./page-client";
 import { PartnerLinkControls } from "./partner-link-controls";
+import {
+  PartnerLinkRewardsPanel,
+  PartnerLinkRewardsSummary,
+  usePartnerLinkRewards,
+  usePartnerLinkRewardsState,
+} from "./partner-link-rewards";
 
 const CHARTS = [
   {
@@ -69,6 +76,15 @@ const CHARTS = [
 export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
   const { programEnrollment } = useProgramEnrollment();
   const { displayOption } = usePartnerLinksContext();
+  const { showRewards, toggleRewards } = usePartnerLinkRewardsState();
+  const {
+    rewards,
+    discount,
+    primaryReward,
+    primaryText,
+    additionalCount,
+    hasIncentives,
+  } = usePartnerLinkRewards(link);
 
   const partnerLink = constructPartnerLink({
     group: programEnrollment?.group,
@@ -76,10 +92,12 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
   });
 
   const isDeactivated = programEnrollment?.status === "deactivated";
+  const isQueryLinkStructure =
+    programEnrollment?.group?.linkStructure === "query";
 
   const discountCodeSection = link.discountCode ? (
-    <div className="hidden items-center gap-1.5 rounded-xl border border-neutral-200 py-1 pl-2 pr-1 sm:flex">
-      <span className="text-sm leading-none text-neutral-500">
+    <div className="hidden h-8 items-center gap-1.5 rounded-lg border border-neutral-200 pl-2 pr-1.5 sm:flex">
+      <span className="text-xs font-medium leading-none tracking-tight text-neutral-500">
         Discount code
       </span>
       <DiscountCodeBadge
@@ -92,9 +110,10 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
 
   return (
     <CardList.Card
+      outerClassName="overflow-hidden"
       innerClassName={cn("px-0 py-0 group/card", isDeactivated && "opacity-80")}
     >
-      <div className="p-4">
+      <div className="p-4 sm:px-[18px] sm:pr-5">
         <div className="flex items-center justify-between gap-4">
           <div className="flex min-w-0 items-center gap-3">
             <div className="relative hidden shrink-0 items-center justify-center sm:flex">
@@ -110,24 +129,37 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
             </div>
 
             <div className="flex min-w-0 flex-col">
-              <div className="flex flex-col">
+              <div className="flex flex-col gap-0.5">
                 <div className="flex items-center gap-1">
-                  <a
-                    href={isDeactivated ? undefined : partnerLink}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className={cn(
-                      "truncate text-sm font-semibold leading-6 transition-colors",
-                      isDeactivated
-                        ? "cursor-default text-neutral-400"
-                        : "text-neutral-700 hover:text-black",
-                    )}
-                    onClick={
-                      isDeactivated ? (e) => e.preventDefault() : undefined
+                  <Tooltip
+                    content={
+                      <QueryLinkStructureHelpText
+                        link={link}
+                        className="px-3 py-2 first-letter:uppercase"
+                      />
                     }
+                    disabled={!isQueryLinkStructure || isDeactivated}
                   >
-                    {getPrettyUrl(partnerLink)}
-                  </a>
+                    <a
+                      href={isDeactivated ? undefined : partnerLink}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className={cn(
+                        "truncate text-sm font-semibold leading-6 transition-colors",
+                        isDeactivated
+                          ? "cursor-default text-neutral-400"
+                          : "text-neutral-900 hover:text-black",
+                        isQueryLinkStructure &&
+                          !isDeactivated &&
+                          "cursor-copy underline decoration-dotted underline-offset-2",
+                      )}
+                      onClick={
+                        isDeactivated ? (e) => e.preventDefault() : undefined
+                      }
+                    >
+                      {getPrettyUrl(partnerLink)}
+                    </a>
+                  </Tooltip>
                   {!isDeactivated && (
                     <CopyButton value={partnerLink} variant="neutral" />
                   )}
@@ -135,15 +167,18 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
                   {link.comments && <CommentsBadge comments={link.comments} />}
                 </div>
 
-                {/* The max width implementation here is a bit hacky, we should improve in the future */}
-                <div className="flex max-w-[100px] items-center gap-1 py-0 pl-1 pr-1.5 sm:w-fit sm:max-w-[400px]">
-                  <ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />
-                  {programEnrollment?.group?.linkStructure === "query" ? (
-                    <QueryLinkStructureHelpText
-                      link={link}
-                      className="mt-0.5"
-                    />
-                  ) : (
+                {hasIncentives && primaryText ? (
+                  <PartnerLinkRewardsSummary
+                    primaryText={primaryText}
+                    primaryReward={primaryReward}
+                    additionalCount={additionalCount}
+                    showRewards={showRewards}
+                    onToggleRewards={toggleRewards}
+                  />
+                ) : (
+                  /* The max width implementation here is a bit hacky, we should improve in the future */
+                  <div className="flex max-w-[100px] items-center gap-1 py-0 pl-1 pr-1.5 sm:w-fit sm:max-w-[400px]">
+                    <ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />
                     <a
                       href={isDeactivated ? undefined : link.url}
                       target="_blank"
@@ -156,8 +191,8 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
                     >
                       {getPrettyUrl(link.url)}
                     </a>
-                  )}
-                </div>
+                  </div>
+                )}
               </div>
             </div>
           </div>
@@ -179,9 +214,9 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
               (link.discountCodeDisabledAt ? (
                 discountCodeSection
               ) : (
-                <Tooltip content="This program supports discount code tracking. Copy the code to use it in podcasts, videos, etc. [Learn more](https://dub.co/help/article/dual-sided-incentives)">
+                <DiscountCodeTooltip discount={link.discount}>
                   {discountCodeSection}
-                </Tooltip>
+                </DiscountCodeTooltip>
               ))}
             {displayOption === "cards" && <StatsBadge link={link} />}
             <Controls link={link} />
@@ -189,6 +224,12 @@ export function PartnerLinkCard({ link }: { link: PartnerProfileLinkProps }) {
         </div>
       </div>
       {displayOption === "full" && <StatsCharts link={link} />}
+      <PartnerLinkRewardsPanel
+        rewards={rewards}
+        discount={discount}
+        showRewards={showRewards}
+        additionalCount={additionalCount}
+      />
     </CardList.Card>
   );
 }
@@ -199,7 +240,7 @@ const StatsBadge = memo(({ link }: { link: PartnerProfileLinkProps }) => {
   return (
     <As
       href={`/programs/${programEnrollment?.program.slug}/analytics?linkId=${link.id}`}
-      className="flex items-center gap-0.5 rounded-md border border-neutral-200 bg-neutral-50 p-0.5 text-sm text-neutral-600"
+      className="flex h-[30px] items-center gap-[3px] rounded-md border border-neutral-200 bg-white px-1 text-xs font-medium text-neutral-900"
     >
       {[
         {
@@ -226,7 +267,7 @@ const StatsBadge = memo(({ link }: { link: PartnerProfileLinkProps }) => {
         <div
           key={tab}
           className={cn(
-            "flex items-center gap-1 whitespace-nowrap rounded-md px-1 py-px transition-colors",
+            "flex items-center gap-1.5 whitespace-nowrap rounded px-[5px] py-[3px] transition-colors",
             className,
           )}
         >
@@ -301,7 +342,10 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
   }, [timeseries]);
 
   return (
-    <div ref={ref} className="grid grid-cols-1 gap-4 p-4 pt-0 sm:grid-cols-3">
+    <div
+      ref={ref}
+      className="grid grid-cols-1 gap-4 p-4 pt-0 sm:grid-cols-3 sm:gap-5 sm:px-[18px] sm:pb-5"
+    >
       {CHARTS.map((chart) => (
         <Link
           key={chart.key}
@@ -311,7 +355,7 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
               event: chart.key === "saleAmount" ? "sales" : chart.key,
             },
           )}`}
-          className="group/chart relative isolate rounded-lg border border-neutral-200 px-2 py-1.5 lg:px-3"
+          className="group/chart relative isolate flex flex-col gap-4 rounded-lg border border-neutral-200 p-4 lg:p-5"
         >
           <div className="absolute right-2 top-2 overflow-hidden">
             <div className="translate-x-full transition-transform duration-200 group-hover/chart:translate-x-0">
@@ -322,7 +366,7 @@ const StatsCharts = memo(({ link }: { link: PartnerProfileLinkProps }) => {
               />
             </div>
           </div>
-          <div className="flex flex-col gap-1 pl-2 pt-3 lg:pl-1.5">
+          <div className="flex flex-col gap-1">
             <div className="flex items-center gap-1.5">
               <chart.icon
                 className={cn("h-4 w-4 shrink-0", chart.colorClassName)}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx
new file mode 100644
index 00000000000..b172bc221d1
--- /dev/null
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/links/partner-link-rewards.tsx
@@ -0,0 +1,181 @@
+"use client";
+
+import {
+  getPartnerLinkDisplayRewards,
+  getPartnerLinkPrimaryIncentive,
+} from "@/lib/rewards/resolve-partner-link-rewards";
+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
+import { PartnerProfileLinkProps } from "@/lib/types";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
+import { ProgramRewardModifiersTooltip } from "@/ui/partners/program-reward-modifiers-tooltip";
+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
+import { Icon, Tooltip } from "@dub/ui";
+import { DiscountCode, Gift } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
+import { motion } from "motion/react";
+import { type ReactNode, useMemo, useState } from "react";
+
+export function usePartnerLinkRewards(link: PartnerProfileLinkProps) {
+  const { programEnrollment } = useProgramEnrollment();
+
+  return useMemo(() => {
+    const { rewards, discount } = getPartnerLinkDisplayRewards({
+      clickReward: link.clickReward,
+      leadReward: link.leadReward,
+      saleReward: link.saleReward,
+      discount: link.discount,
+      enrollmentRewards: programEnrollment?.rewards ?? [],
+    });
+
+    const { primaryReward, primaryDiscount, additionalCount } =
+      getPartnerLinkPrimaryIncentive({ rewards, discount });
+
+    const primaryText = primaryReward
+      ? formatRewardDescription(primaryReward, { includeEarnPrefix: false })
+      : primaryDiscount
+        ? formatDiscountDescription(primaryDiscount)
+        : null;
+
+    return {
+      rewards,
+      discount,
+      primaryReward,
+      primaryDiscount,
+      primaryText,
+      additionalCount,
+      hasIncentives: rewards.length > 0 || Boolean(discount),
+    };
+  }, [
+    link.clickReward,
+    link.leadReward,
+    link.saleReward,
+    link.discount,
+    programEnrollment?.rewards,
+  ]);
+}
+
+export function usePartnerLinkRewardsState() {
+  const [showRewards, setShowRewards] = useState(false);
+
+  return {
+    showRewards,
+    setShowRewards,
+    toggleRewards: () => setShowRewards((value) => !value),
+  };
+}
+
+export function PartnerLinkRewardsSummary({
+  primaryText,
+  primaryReward,
+  additionalCount,
+  showRewards,
+  onToggleRewards,
+}: {
+  primaryText: string;
+  primaryReward: ReturnType<typeof usePartnerLinkRewards>["primaryReward"];
+  additionalCount: number;
+  showRewards: boolean;
+  onToggleRewards: () => void;
+}) {
+  return (
+    <div className="flex min-w-0 items-center gap-1.5 pl-0.5">
+      <Gift className="size-3.5 shrink-0 text-neutral-500" />
+      <p className="truncate text-sm font-medium tracking-tight text-neutral-500">
+        {primaryText}
+      </p>
+      <ProgramRewardModifiersTooltip reward={primaryReward} />
+      {additionalCount > 0 && (
+        <Tooltip content="View rewards">
+          <button
+            type="button"
+            onClick={onToggleRewards}
+            aria-expanded={showRewards}
+            className={cn(
+              "inline-flex h-4 shrink-0 items-center justify-center rounded-md bg-neutral-100 px-1.5 text-xs font-semibold leading-4 tracking-tight text-neutral-600 transition-colors",
+              showRewards && "bg-blue-100 text-blue-700",
+            )}
+          >
+            +{additionalCount}
+          </button>
+        </Tooltip>
+      )}
+    </div>
+  );
+}
+
+export function PartnerLinkRewardsPanel({
+  rewards,
+  discount,
+  showRewards,
+  additionalCount,
+}: {
+  rewards: ReturnType<typeof usePartnerLinkRewards>["rewards"];
+  discount: ReturnType<typeof usePartnerLinkRewards>["discount"];
+  showRewards: boolean;
+  additionalCount: number;
+}) {
+  if (additionalCount === 0) {
+    return null;
+  }
+
+  const items: {
+    id: string;
+    icon: Icon;
+    text: ReactNode;
+  }[] = [
+    ...rewards.map((reward) => ({
+      id: reward.id,
+      icon: REWARD_EVENT_ICON[reward.event],
+      text: (
+        <>
+          {formatRewardDescription(reward, { includeEarnPrefix: false })}
+          {(!!reward.modifiers?.length ||
+            Boolean(reward.tooltipDescription)) && (
+            <>
+              {" "}
+              <ProgramRewardModifiersTooltip reward={reward} />
+            </>
+          )}
+        </>
+      ),
+    })),
+    ...(discount
+      ? [
+          {
+            id: "discount",
+            icon: DiscountCode,
+            text: formatDiscountDescription(discount),
+          },
+        ]
+      : []),
+  ];
+
+  return (
+    <motion.div
+      initial={false}
+      animate={{ height: showRewards ? "auto" : 0 }}
+      transition={{ duration: 0.2 }}
+      className="overflow-hidden"
+    >
+      <div className="border-t border-neutral-200 bg-neutral-100 p-2">
+        <div className="flex flex-col gap-2 rounded-[10px] border border-neutral-200 bg-white p-3">
+          {items.map((item) => {
+            const ItemIcon = item.icon;
+
+            return (
+              <div key={item.id} className="flex items-center gap-2.5">
+                <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+                  <ItemIcon className="size-4 text-neutral-800" />
+                </div>
+                <div className="min-w-0 text-sm font-semibold leading-5 tracking-tight text-neutral-700">
+                  {item.text}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </motion.div>
+  );
+}
diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
index 84c2a77779f..f6cc7950e47 100644
--- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/programs/[programSlug]/(enrolled)/page-client.tsx
@@ -8,11 +8,16 @@ import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";
 import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import { QueryLinkStructureHelpText } from "@/lib/partners/query-link-structure-help-text";
+import { getPartnerLinkDisplayRewards } from "@/lib/rewards/resolve-partner-link-rewards";
 import usePartnerAnalytics from "@/lib/swr/use-partner-analytics";
 import { usePartnerEarningsTimeseries } from "@/lib/swr/use-partner-earnings-timeseries";
+import usePartnerLinks from "@/lib/swr/use-partner-links";
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
+import { GroupProps, PartnerProfileLinkProps } from "@/lib/types";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";
+import { DiscountCodeTooltip } from "@/ui/partners/discounts/discount-code-tooltip";
 import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
 import { formatRewardDescription } from "@/ui/partners/format-reward-description";
 import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
@@ -22,8 +27,8 @@ import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";
 import {
   Button,
   buttonVariants,
+  Combobox,
   CopyText,
-  Gift,
   Icon,
   LinkLogo,
   StatusBadge,
@@ -42,6 +47,7 @@ import {
   Check,
   Copy,
   CursorRays,
+  DiscountCode,
   InvoiceDollar,
   LoadingSpinner,
   ReferredVia,
@@ -53,10 +59,12 @@ import {
   getApexDomain,
   getPrettyUrl,
   nFormatter,
+  PARTNERS_DOMAIN,
 } from "@dub/utils";
 import NumberFlow, { NumberFlowGroup } from "@number-flow/react";
 import { LinearGradient } from "@visx/gradient";
 import { endOfDay, startOfDay } from "date-fns";
+import { ChevronDown } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
@@ -612,60 +620,112 @@ function RewardsTermsList() {
     return null;
   }
 
+  // Every item ends with a separator; the list is shifted right by one
+  // separator width and clipped, so the separator ending each line (including
+  // the last item's) is hidden when the items wrap
   return (
-    <div className="flex flex-wrap items-center gap-x-1.5 text-xs">
-      {items.map((item, idx) => (
-        <span key={item.label} className="inline-flex items-center gap-1.5">
-          <span>
-            <span className="font-semibold text-neutral-600">{item.value}</span>{" "}
-            <a
-              href={item.href}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="font-medium text-neutral-500 underline decoration-dotted underline-offset-2"
+    <div className="min-w-0 overflow-x-clip">
+      <div className="-mr-4 flex flex-wrap items-center justify-end text-xs">
+        {items.map((item) => (
+          <span key={item.label} className="inline-flex items-center">
+            <span>
+              <span className="font-semibold text-neutral-600">
+                {item.value}
+              </span>{" "}
+              <a
+                href={item.href}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="font-medium text-neutral-500 underline decoration-dotted underline-offset-2"
+              >
+                {item.label}
+              </a>
+            </span>
+            <span
+              aria-hidden="true"
+              className="w-4 text-center font-semibold text-neutral-600"
             >
-              {item.label}
-            </a>
+              •
+            </span>
           </span>
-          {idx < items.length - 1 && (
-            <span className="font-semibold text-neutral-600">•</span>
-          )}
-        </span>
-      ))}
+        ))}
+      </div>
     </div>
   );
 }
 
+function getRewardLinkOptions({
+  links,
+  group,
+}: {
+  links: PartnerProfileLinkProps[];
+  group?: Pick<GroupProps, "linkStructure"> | null;
+}) {
+  if (links.length <= 1) {
+    return undefined;
+  }
+
+  return links.map((link) => {
+    const href = constructPartnerLink({ group, link });
+
+    return {
+      id: link.id,
+      displayText: href ? getPrettyUrl(href) : getPrettyUrl(link.shortLink),
+      apexDomain: getApexDomain(link.url),
+    };
+  });
+}
+
+const LINK_SELECTOR_BOX_CLASSNAME =
+  "h-9 min-w-0 max-w-full rounded-lg pl-1.5 pr-2.5";
+
 function RewardList() {
   const { programEnrollment } = useProgramEnrollment();
   const { partner } = usePartnerProfile();
+  const { links: partnerLinks, loading: partnerLinksLoading } =
+    usePartnerLinks();
+  const [selectedLinkId, setSelectedLinkId] = useState<string | null>(null);
 
   if (!programEnrollment) {
     return null;
   }
 
-  const eligibleRewards = (programEnrollment.rewards ?? []).filter(
-    (r) => getRewardAmount(r) >= 0,
-  );
+  const knownLinkCount =
+    partnerLinks?.length ?? programEnrollment.links?.length;
+  const linkSelectorLoading =
+    partnerLinksLoading && (knownLinkCount === undefined || knownLinkCount > 1);
 
-  const standardRewards = eligibleRewards.filter(
-    (reward) =>
-      reward.event === "click" ||
-      reward.event === "lead" ||
-      reward.event === "sale",
-  );
+  const links = partnerLinks ?? [];
 
-  const referralRewards = eligibleRewards.filter(
-    (reward) => reward.event === "referral",
+  const selectedLink =
+    links.find((link) => link.id === selectedLinkId) ?? links[0] ?? null;
+
+  const enrollmentRewards = programEnrollment.rewards ?? [];
+  const referralRewards = enrollmentRewards.filter(
+    (reward) => reward.event === "referral" && getRewardAmount(reward) >= 0,
   );
+  const { rewards: standardRewards, discount } = selectedLink
+    ? getPartnerLinkDisplayRewards({
+        clickReward: selectedLink.clickReward,
+        leadReward: selectedLink.leadReward,
+        saleReward: selectedLink.saleReward,
+        discount: selectedLink.discount,
+        enrollmentRewards,
+      })
+    : {
+        rewards: enrollmentRewards.filter(
+          (reward) =>
+            reward.event !== "referral" && getRewardAmount(reward) >= 0,
+        ),
+        discount: programEnrollment.discount ?? null,
+      };
 
-  const discount = programEnrollment.discount ?? null;
-  const showReferralRewardCard = referralRewards.length > 0;
+  const hasPartnerReferralReward = referralRewards.length > 0;
 
-  const defaultProgramLink = programEnrollment.links?.[0];
+  const displayLink = selectedLink ?? programEnrollment.links?.[0];
   const partnerLink = constructPartnerLink({
     group: programEnrollment.group,
-    link: defaultProgramLink,
+    link: displayLink ?? undefined,
   });
   const hasPartnerLink = Boolean(partnerLink);
   const isDeactivated = programEnrollment.status === "deactivated";
@@ -675,10 +735,17 @@ function RewardList() {
     program: programEnrollment.program,
   });
 
+  const linkOptions = getRewardLinkOptions({
+    links,
+    group: programEnrollment.group,
+  });
+
   return (
     <div className="flex flex-col gap-2 rounded-xl bg-neutral-100 p-2">
       <RewardListItem
-        title={showReferralRewardCard ? "Customer referral rewards" : "Rewards"}
+        title={
+          hasPartnerReferralReward ? "Customer referral rewards" : "Rewards"
+        }
         titleRight={<RewardsTermsList />}
         isDeactivated={isDeactivated}
         rewards={[
@@ -702,7 +769,7 @@ function RewardList() {
             ? [
                 {
                   id: "discount",
-                  icon: Gift,
+                  icon: DiscountCode,
                   text: formatDiscountDescription(discount),
                 },
               ]
@@ -713,18 +780,25 @@ function RewardList() {
             ? getPrettyUrl(partnerLink)
             : "No link yet",
           copyValue: partnerLink,
-          apexDomain: defaultProgramLink
-            ? getApexDomain(defaultProgramLink.url)
-            : null,
+          apexDomain: displayLink ? getApexDomain(displayLink.url) : null,
         }}
+        linkOptions={linkOptions}
+        linkSelectorLoading={linkSelectorLoading}
+        selectedLinkId={selectedLink?.id}
+        onSelectLink={setSelectedLinkId}
+        discount={discount}
+        discountCode={selectedLink?.discountCode}
+        discountCodeDisabledAt={selectedLink?.discountCodeDisabledAt}
         queryLinkHelpTextLink={
-          hasPartnerLink && programEnrollment.group?.linkStructure === "query"
-            ? defaultProgramLink
+          hasPartnerLink &&
+          programEnrollment.group?.linkStructure === "query" &&
+          displayLink
+            ? displayLink
             : undefined
         }
       />
 
-      {showReferralRewardCard && (
+      {hasPartnerReferralReward && (
         <RewardListItem
           title="Partner referral rewards"
           isDeactivated={isDeactivated}
@@ -754,6 +828,13 @@ function RewardListItem({
   titleRight,
   rewards,
   link,
+  linkOptions,
+  linkSelectorLoading,
+  selectedLinkId,
+  onSelectLink,
+  discount,
+  discountCode,
+  discountCodeDisabledAt,
   queryLinkHelpTextLink,
   isDeactivated,
 }: {
@@ -770,17 +851,100 @@ function RewardListItem({
     copyValue: string;
     apexDomain?: string | null;
   };
-  queryLinkHelpTextLink?: {
-    key: string;
-    url: string;
-    shortLink: string;
-  };
+  linkOptions?: {
+    id: string;
+    displayText: string;
+    apexDomain: string | null;
+  }[];
+  linkSelectorLoading?: boolean;
+  selectedLinkId?: string;
+  onSelectLink?: (id: string) => void;
+  discount?: PartnerProfileLinkProps["discount"];
+  discountCode?: PartnerProfileLinkProps["discountCode"];
+  discountCodeDisabledAt?: PartnerProfileLinkProps["discountCodeDisabledAt"];
+  queryLinkHelpTextLink?: Pick<
+    PartnerProfileLinkProps,
+    "key" | "url" | "shortLink"
+  >;
   isDeactivated?: boolean;
 }) {
   const { programSlug } = useParams<{ programSlug: string }>();
-  const [copied, copyToClipboard] = useCopyToClipboard();
+  const [copied, copyToClipboard] = useCopyToClipboard(1500);
   const copyDisabled =
     isDeactivated || !link.copyValue || link.copyValue.length === 0;
+  const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);
+
+  const queryLinkHelpText = queryLinkHelpTextLink ? (
+    <QueryLinkStructureHelpText
+      link={queryLinkHelpTextLink}
+      className="px-3 py-2 first-letter:uppercase"
+    />
+  ) : null;
+
+  const showLinkSelector =
+    Boolean(linkSelectorLoading) ||
+    Boolean(linkOptions && linkOptions.length > 1);
+
+  const comboboxOptions = linkOptions?.map((option) => ({
+    value: option.id,
+    label: option.displayText,
+    icon: (
+      <LinkLogo
+        apexDomain={option.apexDomain}
+        className="h-4 w-4 shrink-0 sm:h-4 sm:w-4"
+        imageProps={{ width: 16, height: 16 }}
+      />
+    ),
+  }));
+
+  const selectedOption =
+    comboboxOptions?.find((option) => option.value === selectedLinkId) ?? null;
+
+  const discountCodeSection = discountCode ? (
+    <div className="hidden h-8 items-center gap-1.5 rounded-lg border border-neutral-200 pl-2 pr-1.5 sm:flex">
+      <span className="text-sm font-medium leading-5 tracking-tight text-neutral-500">
+        Discount code
+      </span>
+      <DiscountCodeBadge
+        code={discountCode}
+        disabledAt={discountCodeDisabledAt}
+        disabledTooltip={`This discount code was disabled by the program. [Contact the program owner](${PARTNERS_DOMAIN}/messages/${programSlug}) if you need a new code.`}
+      />
+    </div>
+  ) : null;
+
+  const copyButton = isDeactivated ? null : (
+    <Button
+      variant="outline"
+      disabled={copyDisabled}
+      onClick={() => {
+        copyToClipboard(link.copyValue);
+      }}
+      aria-label={copied ? "Copied" : "Copy link"}
+      className={cn(
+        "-my-0.5 size-9 shrink-0 p-0",
+        copyDisabled
+          ? "border-transparent bg-transparent"
+          : "hover:bg-neutral-200/60",
+      )}
+      icon={
+        <span className="relative size-4">
+          <Copy
+            className={cn(
+              "absolute inset-0 size-4 transition-[transform,opacity]",
+              copied && "translate-y-1 opacity-0",
+            )}
+          />
+          <Check
+            className={cn(
+              "absolute inset-0 m-auto size-3.5 transition-[transform,opacity]",
+              !copied && "translate-y-1 opacity-0",
+            )}
+          />
+        </span>
+      }
+    />
+  );
 
   return (
     <div
@@ -789,7 +953,7 @@ function RewardListItem({
         isDeactivated && "opacity-80",
       )}
     >
-      <div className="flex items-center justify-between">
+      <div className="flex items-center justify-between gap-3">
         <h3 className="text-base font-semibold tracking-tight text-neutral-800">
           {title}
         </h3>
@@ -798,68 +962,118 @@ function RewardListItem({
 
       <div className="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50">
         <div className="bg-neutral-50 px-3 py-2.5">
-          <div className="flex items-center justify-between gap-3">
-            <div className="flex min-w-0 flex-1 items-center gap-2.5">
-              <div className="shrink-0 rounded-full border border-neutral-200 bg-white p-1">
-                <LinkLogo
-                  apexDomain={link.apexDomain}
-                  className="size-4.5 sm:size-4.5 shrink-0 rounded-full"
-                  imageProps={{ width: 18, height: 18 }}
-                />
+          <div className="flex items-center justify-between gap-2">
+            {showLinkSelector ? (
+              <div className="-my-0.5 -ml-1.5 flex min-w-0 items-center gap-1">
+                {linkSelectorLoading ? (
+                  <div
+                    role="status"
+                    aria-label="Loading links"
+                    className={cn(
+                      LINK_SELECTOR_BOX_CLASSNAME,
+                      "flex items-center",
+                    )}
+                  >
+                    <LoadingSpinner className="size-4" />
+                  </div>
+                ) : (
+                  <Combobox
+                    selected={selectedOption}
+                    setSelected={(option) => {
+                      if (!option) return;
+                      onSelectLink?.(option.value);
+                    }}
+                    options={comboboxOptions}
+                    open={isLinkSelectorOpen}
+                    onOpenChange={setIsLinkSelectorOpen}
+                    forceDropdown
+                    matchTriggerWidth
+                    placeholder="No link yet"
+                    inputClassName="text-sm h-10"
+                    popoverProps={{
+                      contentClassName:
+                        "sm:w-auto min-w-[var(--radix-popover-trigger-width)] max-w-[min(400px,calc(100vw-16px))] rounded-lg border border-border-subtle p-1",
+                    }}
+                    trigger={
+                      <button
+                        type="button"
+                        className={cn(
+                          LINK_SELECTOR_BOX_CLASSNAME,
+                          "text-content-default flex w-fit items-center gap-2.5 text-left text-sm outline-none transition-colors hover:bg-neutral-200/60 focus-visible:bg-neutral-200/60 data-[state=open]:bg-neutral-200/60",
+                        )}
+                      >
+                        {link.apexDomain && (
+                          <div className="shrink-0 rounded-full border border-neutral-200 bg-white p-1">
+                            <LinkLogo
+                              apexDomain={link.apexDomain}
+                              className="size-4.5 sm:size-4.5 shrink-0 rounded-full"
+                              imageProps={{ width: 18, height: 18 }}
+                            />
+                          </div>
+                        )}
+                        <Tooltip
+                          content={queryLinkHelpText}
+                          disabled={!queryLinkHelpText || isLinkSelectorOpen}
+                        >
+                          <span
+                            className={cn(
+                              "min-w-0 truncate",
+                              queryLinkHelpText &&
+                                "underline decoration-dotted underline-offset-2",
+                            )}
+                          >
+                            {link.displayText}
+                          </span>
+                        </Tooltip>
+                        <ChevronDown className="text-content-muted size-4 shrink-0" />
+                      </button>
+                    }
+                  />
+                )}
+                {copyButton}
               </div>
-
-              <CopyText
-                value={link.copyValue}
-                className="min-w-0 truncate text-sm font-medium -tracking-wider text-neutral-600"
-              >
-                {link.displayText}
-              </CopyText>
-              {queryLinkHelpTextLink && (
-                <>
-                  <span className="hidden text-sm text-neutral-500 sm:block">
-                    →
-                  </span>
-                  <QueryLinkStructureHelpText
-                    link={queryLinkHelpTextLink}
-                    className="hidden sm:block"
+            ) : (
+              <div className="flex min-w-0 items-center gap-2.5">
+                <div className="shrink-0 rounded-full border border-neutral-200 bg-white p-1">
+                  <LinkLogo
+                    apexDomain={link.apexDomain}
+                    className="size-4.5 sm:size-4.5 shrink-0 rounded-full"
+                    imageProps={{ width: 18, height: 18 }}
                   />
-                </>
+                </div>
+                <Tooltip
+                  content={queryLinkHelpText}
+                  disabled={!queryLinkHelpText}
+                >
+                  <CopyText
+                    value={link.copyValue}
+                    className={cn(
+                      "text-content-default min-w-0 truncate text-sm",
+                      queryLinkHelpText && "underline",
+                    )}
+                  >
+                    {link.displayText}
+                  </CopyText>
+                </Tooltip>
+                {copyButton}
+              </div>
+            )}
+
+            <div className="flex shrink-0 items-center gap-2">
+              {discountCodeSection &&
+                (discountCodeDisabledAt ? (
+                  discountCodeSection
+                ) : (
+                  <DiscountCodeTooltip discount={discount}>
+                    {discountCodeSection}
+                  </DiscountCodeTooltip>
+                ))}
+              {isDeactivated && (
+                <StatusBadge variant={PartnerStatusBadges.deactivated.variant}>
+                  {PartnerStatusBadges.deactivated.label}
+                </StatusBadge>
               )}
             </div>
-            {isDeactivated ? (
-              <StatusBadge variant={PartnerStatusBadges.deactivated.variant}>
-                {PartnerStatusBadges.deactivated.label}
-              </StatusBadge>
-            ) : (
-              <Button
-                variant="primary"
-                disabled={copyDisabled}
-                onClick={() => {
-                  copyToClipboard(link.copyValue);
-                }}
-                className={cn(
-                  "h-8 w-auto shrink-0 px-3 transition-opacity",
-                  !copyDisabled && "hover:opacity-90",
-                )}
-                icon={
-                  <span className="relative size-4">
-                    <Copy
-                      className={cn(
-                        "absolute inset-0 size-4 transition-[transform,opacity]",
-                        copied && "translate-y-1 opacity-0",
-                      )}
-                    />
-                    <Check
-                      className={cn(
-                        "absolute inset-0 size-4 transition-[transform,opacity]",
-                        !copied && "translate-y-1 opacity-0",
-                      )}
-                    />
-                  </span>
-                }
-                text={copied ? "Copied" : "Copy"}
-              />
-            )}
           </div>
         </div>
 
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
index 4a60b725e2d..cf8d0b956b5 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/onboarding-form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { parseActionError } from "@/lib/actions/parse-action-errors";
+import { testIds } from "@/lib/e2e/test-ids";
 import { onboardPartnerAction } from "@/lib/actions/partners/onboard-partner";
 import { getValidInternalRedirectPath } from "@/lib/middleware/utils/is-valid-internal-redirect";
 import {
@@ -131,7 +132,10 @@ export function OnboardingForm({
       </label>
 
       <label>
-        <span className="text-sm font-medium text-neutral-800">
+        <span
+          className="text-sm font-medium text-neutral-800"
+          data-testid={testIds.partnerOnboarding.profileImage}
+        >
           Profile image
         </span>
         <div className="flex items-center gap-5">
@@ -164,7 +168,10 @@ export function OnboardingForm({
       </label>
 
       <label>
-        <span className="text-sm font-medium text-neutral-800">
+        <span
+          className="text-sm font-medium text-neutral-800"
+          data-testid={testIds.partnerOnboarding.aboutYou}
+        >
           About you
           <span className="font-normal text-neutral-500"> (optional)</span>
         </span>
@@ -192,7 +199,10 @@ export function OnboardingForm({
 
       <LayoutGroup>
         <div>
-          <span className="text-sm font-medium text-neutral-800">
+          <span
+            className="text-sm font-medium text-neutral-800"
+            data-testid={testIds.partnerOnboarding.profileType}
+          >
             Profile Type
           </span>
           <div className="mt-1.5">
@@ -272,6 +282,7 @@ export function OnboardingForm({
             text="Continue"
             className="mt-1.5"
             loading={isPending || isSubmitting || isSubmitSuccessful}
+            data-testid={testIds.partnerOnboarding.continue}
           />
         </motion.div>
       </LayoutGroup>
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/page.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/page.tsx
index 1533344d573..d4929a8af58 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/page.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { getSession } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { Suspense } from "react";
@@ -6,7 +7,10 @@ import { OnboardingForm } from "./onboarding-form";
 export default function PartnerOnboarding() {
   return (
     <div className="mx-auto flex w-full max-w-[430px] flex-col items-center md:mt-4">
-      <h1 className="animate-slide-up-fade text-center text-xl font-semibold [--offset:8px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]">
+      <h1
+        className="animate-slide-up-fade text-center text-xl font-semibold [--offset:8px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]"
+        data-testid={testIds.partnerOnboarding.profile}
+      >
         Create your partner profile
       </h1>
       <div className="animate-slide-up-fade w-full pt-8 [--offset:10px] [animation-delay:500ms] [animation-duration:1s] [animation-fill-mode:both]">
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/page.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/page.tsx
index 240b9acd600..254e91395d0 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/page.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { getSession } from "@/lib/auth";
 import { getPartnerPayoutMethods } from "@/lib/payouts/get-partner-payout-methods";
 import { prisma } from "@/lib/prisma";
@@ -86,6 +87,7 @@ async function PayoutRSC() {
       />
       <Link
         href="/programs"
+        data-testid={testIds.partnerOnboarding.skip}
         className="mt-6 block text-center text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
       >
         I'll complete this later
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
index fa458669c45..ff4edaad5d6 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/payouts/payout-provider.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { getValidInternalRedirectPath } from "@/lib/middleware/utils/is-valid-internal-redirect";
 import { ConnectPayoutButton } from "@/ui/partners/payouts/connect-payout-button";
 import Link from "next/link";
@@ -63,6 +64,7 @@ export function PayoutProvider({
 
         <Link
           href="/programs"
+          data-testid={testIds.partnerOnboarding.skip}
           className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
         >
           I'll complete this later
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
index 7a4e94d1fe1..34ab3d2987c 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page-client.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { getValidInternalRedirectPath } from "@/lib/middleware/utils/is-valid-internal-redirect";
 import { PartnerProps } from "@/lib/types";
 import { PartnerPlatformsForm } from "@/ui/partners/partner-platforms-form";
@@ -27,6 +28,7 @@ export function OnboardingPlatformsPageClient({
       />
       <Link
         href="/onboarding/payouts"
+        data-testid={testIds.partnerOnboarding.skip}
         className="text-sm font-medium text-neutral-500 transition-colors hover:text-neutral-800"
       >
         I'll complete this later
diff --git a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page.tsx b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page.tsx
index b0350d19d28..a318ca23e1e 100644
--- a/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(onboarding)/onboarding/platforms/page.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { getSession } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 import { buildSocialPlatformLookup } from "@/lib/social-utils";
@@ -12,7 +13,10 @@ import { OnboardingPlatformsPageClient } from "./page-client";
 export default function OnboardingPlatformsPage() {
   return (
     <div className="mx-auto flex w-full max-w-[430px] flex-col text-center md:mt-4">
-      <h1 className="animate-slide-up-fade text-center text-xl font-semibold [--offset:8px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]">
+      <h1
+        className="animate-slide-up-fade text-center text-xl font-semibold [--offset:8px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]"
+        data-testid={testIds.partnerOnboarding.platforms}
+      >
         Your social and web platforms
       </h1>
 
diff --git a/apps/web/app/[domain]/banned/page.tsx b/apps/web/app/[domain]/banned/page.tsx
index 9c67f90270d..2570e5a12c6 100644
--- a/apps/web/app/[domain]/banned/page.tsx
+++ b/apps/web/app/[domain]/banned/page.tsx
@@ -24,7 +24,7 @@ export function generateStaticParams() {
   return [];
 }
 
-export default function BannedPage() {
+export default function BannedLinkPage() {
   return (
     <div>
       <Hero>
diff --git a/apps/web/app/[domain]/disabled/page.tsx b/apps/web/app/[domain]/disabled/page.tsx
new file mode 100644
index 00000000000..5677bfb587f
--- /dev/null
+++ b/apps/web/app/[domain]/disabled/page.tsx
@@ -0,0 +1,75 @@
+import { BubbleIcon } from "@/ui/placeholders/bubble-icon";
+import { ButtonLink } from "@/ui/placeholders/button-link";
+import { CTA } from "@/ui/placeholders/cta";
+import { FeaturesSection } from "@/ui/placeholders/features-section";
+import { Hero } from "@/ui/placeholders/hero";
+import { LearnMoreButton } from "@/ui/placeholders/learn-more-button";
+import { ShieldSlash } from "@dub/ui";
+import { cn, constructMetadata } from "@dub/utils";
+
+export const revalidate = false; // cache indefinitely
+
+export const metadata = constructMetadata({
+  title: "Disabled Link",
+  description:
+    "This link has been disabled. Please contact the owner of this link to get a new one.",
+  noIndex: true,
+});
+
+const UTM_PARAMS = {
+  utm_source: "Disabled Link",
+  utm_medium: "Disabled Link Page",
+};
+
+export function generateStaticParams() {
+  return [];
+}
+
+export default function DisabledLinkPage() {
+  return (
+    <div>
+      <Hero>
+        <div className="relative mx-auto flex w-full max-w-sm flex-col items-center">
+          <BubbleIcon>
+            <ShieldSlash className="size-12" />
+          </BubbleIcon>
+          <h1
+            className={cn(
+              "font-display mt-10 text-center text-4xl font-medium text-neutral-900 sm:text-5xl sm:leading-[1.15]",
+              "animate-slide-up-fade motion-reduce:animate-fade-in [--offset:20px] [animation-duration:1s] [animation-fill-mode:both]",
+            )}
+          >
+            Disabled link
+          </h1>
+          <p
+            className={cn(
+              "mt-5 text-pretty text-base text-neutral-700 sm:text-xl",
+              "animate-slide-up-fade motion-reduce:animate-fade-in [--offset:10px] [animation-delay:200ms] [animation-duration:1s] [animation-fill-mode:both]",
+            )}
+          >
+            This link has been disabled. Please contact the owner of this link
+            to get a new one.
+          </p>
+        </div>
+
+        <div
+          className={cn(
+            "xs:flex-row relative mx-auto mt-8 flex max-w-fit flex-col items-center gap-4",
+            "animate-slide-up-fade motion-reduce:animate-fade-in [--offset:5px] [animation-delay:300ms] [animation-duration:1s] [animation-fill-mode:both]",
+          )}
+        >
+          <ButtonLink variant="primary" href="https://app.dub.co/register">
+            Try Dub today
+          </ButtonLink>
+          <LearnMoreButton utmParams={UTM_PARAMS} />
+        </div>
+      </Hero>
+      <div className="mt-20">
+        <FeaturesSection utmParams={UTM_PARAMS} />
+      </div>
+      <div className="mt-32">
+        <CTA utmParams={UTM_PARAMS} />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/api/analytics/dashboard/route.ts b/apps/web/app/api/analytics/dashboard/route.ts
index 5205fca9686..760dbfb8dbd 100644
--- a/apps/web/app/api/analytics/dashboard/route.ts
+++ b/apps/web/app/api/analytics/dashboard/route.ts
@@ -8,6 +8,7 @@ import { redis } from "@/lib/upstash";
 import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
 import { DUB_DEMO_LINKS, DUB_WORKSPACE_ID, getSearchParams } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
+import { cookies } from "next/headers";
 import { NextResponse } from "next/server";
 
 export const dynamic = "force-dynamic";
@@ -48,7 +49,12 @@ export const GET = async (req: Request) => {
         },
         select: {
           id: true,
-          dashboard: true,
+          dashboard: {
+            select: {
+              id: true,
+              password: true,
+            },
+          },
           projectId: true,
           project: {
             select: {
@@ -80,6 +86,8 @@ export const GET = async (req: Request) => {
         });
       }
 
+      await assertDashboardPassword(folder.dashboard);
+
       workspace = folder.project;
 
       if ("links" in folder && folder.links?.length) link = folder.links[0];
@@ -102,7 +110,12 @@ export const GET = async (req: Request) => {
           },
           select: {
             id: true,
-            dashboard: true,
+            dashboard: {
+              select: {
+                id: true,
+                password: true,
+              },
+            },
             projectId: true,
             project: {
               select: {
@@ -123,6 +136,8 @@ export const GET = async (req: Request) => {
           });
         }
 
+        await assertDashboardPassword(link.dashboard);
+
         workspace = link.project;
       }
     }
@@ -185,3 +200,23 @@ export const GET = async (req: Request) => {
     return handleAndReturnErrorResponse(error);
   }
 };
+
+async function assertDashboardPassword(dashboard: {
+  id: string;
+  password: string | null;
+}) {
+  if (!dashboard.password) {
+    return;
+  }
+
+  const cookiePassword = (await cookies()).get(
+    `dub_password_${dashboard.id}`,
+  )?.value;
+
+  if (cookiePassword !== dashboard.password) {
+    throw new DubApiError({
+      code: "unauthorized",
+      message: "This dashboard is password protected",
+    });
+  }
+}
diff --git a/apps/web/app/api/analytics/export/route.ts b/apps/web/app/api/analytics/export/route.ts
index a144ab8dce5..e5fcabe42d1 100644
--- a/apps/web/app/api/analytics/export/route.ts
+++ b/apps/web/app/api/analytics/export/route.ts
@@ -14,7 +14,8 @@ import { prefixWorkspaceId } from "@/lib/api/workspaces/workspace-id";
 import { withWorkspace } from "@/lib/auth";
 import { verifyFolderAccess } from "@/lib/folder/permissions";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
 
 export const maxDuration = 300;
@@ -22,17 +23,10 @@ export const maxDuration = 300;
 // GET /api/analytics/export – get export data for analytics
 export const GET = withWorkspace(
   async ({ searchParams, workspace, session }) => {
-    const { success } = await ratelimit(1, "30 s").limit(
-      `analyticsExport:${workspace.id}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "Analytics export is limited to once every 30 seconds. Please try again shortly.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.analyticsExport,
+      identifier: workspace.id,
+    });
 
     throwIfClicksUsageExceeded(workspace);
 
diff --git a/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts b/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts
new file mode 100644
index 00000000000..02c40d598cc
--- /dev/null
+++ b/apps/web/app/api/domains/[domain]/domain-connect/apply/route.ts
@@ -0,0 +1,144 @@
+import { getConfigResponse } from "@/lib/api/domains/get-config-response";
+import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
+import { getDomainResponse } from "@/lib/api/domains/get-domain-response";
+import { DubApiError } from "@/lib/api/errors";
+import { assertEnv } from "@/lib/assert-env";
+import { withWorkspace } from "@/lib/auth";
+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";
+import {
+  DEFAULT_DC_SERVICE_APEX,
+  DEFAULT_DC_SERVICE_SUBDOMAIN,
+  DOMAIN_CONNECT_KEY_HOST,
+} from "@/lib/domain-connect/constants";
+import { discoverDomainConnect } from "@/lib/domain-connect/discover";
+import { buildSignedApplyUrl } from "@/lib/domain-connect/sign-apply-url";
+import { APP_DOMAIN, getApexDomain, getSubdomain } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const bodySchema = z.object({
+  returnTo: z.string().max(512).optional(),
+});
+
+// POST /api/domains/[domain]/domain-connect/apply
+export const POST = withWorkspace(
+  async ({ req, workspace, params }) => {
+    const privateKeyPem = assertEnv("DOMAIN_CONNECT_PRIVATE_KEY")
+      .trim()
+      .replace(/\\n/g, "\n");
+
+    const { slug: domain } = await getDomainOrThrow({
+      workspace,
+      domain: params.domain,
+      dubDomainChecks: true,
+    });
+
+    const body = bodySchema.parse(await req.json().catch(() => ({})));
+
+    const [domainJson, configJson] = await Promise.all([
+      getDomainResponse(domain),
+      getConfigResponse(domain),
+    ]);
+
+    if (domainJson?.error?.code === "not_found" || domainJson?.error) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Domain is not available for configuration.",
+      });
+    }
+
+    if (configJson?.conflicts?.length) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Remove conflicting DNS records first, then retry.",
+      });
+    }
+
+    if (domainJson.verified && !configJson.misconfigured) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "This domain is already configured correctly.",
+      });
+    }
+
+    const apex = getApexDomain(`https://${domain}`);
+    const discovery = await discoverDomainConnect(apex);
+    if (!discovery) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "Auto configure is only available for Vercel or Cloudflare DNS zones.",
+      });
+    }
+
+    if (!isAllowedSyncUXOrigin(discovery.urlSyncUX)) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Invalid Domain Connect provider URL.",
+      });
+    }
+
+    const subdomain = getSubdomain(domain.toLowerCase(), apex);
+    const isApex = !subdomain;
+    const serviceId = isApex
+      ? DEFAULT_DC_SERVICE_APEX
+      : DEFAULT_DC_SERVICE_SUBDOMAIN;
+
+    const returnPath =
+      body.returnTo &&
+      body.returnTo.startsWith(`/${workspace.slug}/`) &&
+      !body.returnTo.includes("://")
+        ? body.returnTo
+        : `/${workspace.slug}/settings/domains`;
+
+    const redirectUrl = new URL(returnPath, APP_DOMAIN);
+    redirectUrl.searchParams.set("domain_connect", "callback");
+    const redirectUri = redirectUrl.toString();
+
+    const queryParams: Record<string, string> = {
+      domain: apex,
+      groupId: "subdomain",
+      redirect_uri: redirectUri,
+    };
+
+    if (isApex) {
+      queryParams.groupId = "apex";
+    } else {
+      queryParams.groupId = "subdomain";
+      queryParams.host = (subdomain ?? "www").toLowerCase();
+    }
+
+    const txtVerification = domainJson.verification?.find(
+      (x: { type: string }) => x.type === "TXT",
+    );
+    if (txtVerification) {
+      const txtHostFqdn: string = txtVerification.domain?.toLowerCase() ?? "";
+      const apexSuffix = `.${apex}`;
+      const txtHost = txtHostFqdn.endsWith(apexSuffix)
+        ? txtHostFqdn.slice(0, -apexSuffix.length)
+        : txtHostFqdn === apex
+          ? "@"
+          : txtHostFqdn;
+      const txtValue = txtVerification.value?.trim();
+
+      if (txtHost && txtValue) {
+        queryParams.groupId = queryParams.groupId + ",verification";
+        queryParams.txtHost = txtHost;
+        queryParams.txtValue = txtValue;
+      }
+    }
+
+    const applyUrl = buildSignedApplyUrl({
+      urlSyncUX: discovery.urlSyncUX,
+      serviceId,
+      privateKeyPem,
+      keyHost: DOMAIN_CONNECT_KEY_HOST,
+      queryParams,
+    });
+
+    return NextResponse.json({ applyUrl });
+  },
+  {
+    requiredPermissions: ["domains.write"],
+  },
+);
diff --git a/apps/web/app/api/domains/[domain]/forward-instructions/route.ts b/apps/web/app/api/domains/[domain]/forward-instructions/route.ts
new file mode 100644
index 00000000000..23bc4acbf8d
--- /dev/null
+++ b/apps/web/app/api/domains/[domain]/forward-instructions/route.ts
@@ -0,0 +1,116 @@
+import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
+import { getDomainResponse } from "@/lib/api/domains/get-domain-response";
+import { DubApiError } from "@/lib/api/errors";
+import { withWorkspace } from "@/lib/auth";
+import {
+  DUB_CUSTOM_DOMAIN_A_RECORD,
+  DUB_CUSTOM_DOMAIN_CNAME,
+} from "@/lib/domain-connect/constants";
+import { assertEmailSent } from "@/lib/email/assert-email-sent";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { sendEmail } from "@dub/email";
+import DomainDnsInstructions from "@dub/email/templates/domain-dns-instructions";
+import { getApexDomain, getSubdomain } from "@dub/utils";
+import { NextResponse } from "next/server";
+import * as z from "zod/v4";
+
+const bodySchema = z.object({
+  email: z.email(),
+  recordType: z.enum(["A", "CNAME"]),
+});
+
+type DnsRecord = {
+  type: string;
+  name: string;
+  value: string;
+};
+
+// POST /api/domains/[domain]/forward-instructions
+export const POST = withWorkspace(
+  async ({ req, workspace, params, session }) => {
+    const { slug: domain } = await getDomainOrThrow({
+      workspace,
+      domain: params.domain,
+      dubDomainChecks: true,
+    });
+
+    const { email, recordType } = bodySchema.parse(await req.json());
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.forwardDnsInstructions,
+      identifier: [workspace.id, session.user.id],
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.forwardDnsInstructionsTarget,
+      identifier: email.toLowerCase(),
+    });
+
+    const records: DnsRecord[] = [];
+
+    const domainJson = await getDomainResponse(domain);
+
+    if (domainJson?.error) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Could not retrieve DNS records for this domain.",
+      });
+    }
+
+    const apex = getApexDomain(`https://${domain}`);
+    const subdomain = getSubdomain(
+      domainJson.name?.toLowerCase() ?? domain,
+      domainJson.apexName?.toLowerCase() ?? apex,
+    );
+
+    if (recordType === "A") {
+      records.push({
+        type: "A",
+        name: subdomain ?? "@",
+        value: DUB_CUSTOM_DOMAIN_A_RECORD,
+      });
+    } else {
+      records.push({
+        type: "CNAME",
+        name: subdomain ?? "www",
+        value: DUB_CUSTOM_DOMAIN_CNAME,
+      });
+    }
+
+    const txtVerification = domainJson.verification?.find(
+      (x: { type: string }) => x.type === "TXT",
+    );
+    if (txtVerification) {
+      const txtHostFqdn: string = txtVerification.domain?.toLowerCase() ?? "";
+      const apexSuffix = `.${apex}`;
+      const txtHost = txtHostFqdn.endsWith(apexSuffix)
+        ? txtHostFqdn.slice(0, -apexSuffix.length)
+        : txtHostFqdn === apex
+          ? "@"
+          : txtHostFqdn;
+      const txtValue = txtVerification.value?.trim() ?? "";
+      if ((txtHost || txtHost === "@") && txtValue) {
+        records.push({ type: "TXT", name: txtHost, value: txtValue });
+      }
+    }
+
+    const result = await sendEmail({
+      subject: `DNS instructions for ${domain}`,
+      to: email,
+      react: DomainDnsInstructions({
+        email,
+        domain,
+        records,
+        senderEmail: session.user.email,
+      }),
+    });
+
+    assertEmailSent(result);
+
+    return NextResponse.json({ ok: true });
+  },
+  {
+    requiredPermissions: ["domains.write"],
+  },
+);
diff --git a/apps/web/app/api/domains/[domain]/program/route.ts b/apps/web/app/api/domains/[domain]/program/route.ts
new file mode 100644
index 00000000000..9f317eca5e3
--- /dev/null
+++ b/apps/web/app/api/domains/[domain]/program/route.ts
@@ -0,0 +1,56 @@
+import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
+import { transformDomain } from "@/lib/api/domains/transform-domain";
+import { updateProgramDomain } from "@/lib/api/domains/update-program-domain";
+import { DubApiError } from "@/lib/api/errors";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { withWorkspace } from "@/lib/auth";
+import { prisma } from "@/lib/prisma";
+import { NextResponse } from "next/server";
+
+// POST /api/domains/[domain]/program – set a domain as the program domain
+export const POST = withWorkspace(
+  async ({ headers, workspace, params }) => {
+    const programId = getDefaultProgramIdOrThrow(workspace);
+
+    const domainRecord = await getDomainOrThrow({
+      workspace,
+      domain: params.domain,
+      dubDomainChecks: true,
+    });
+
+    if (domainRecord.archived) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "You cannot set an archived domain as the program domain.",
+      });
+    }
+
+    const program = await prisma.program.findUniqueOrThrow({
+      where: {
+        id: programId,
+      },
+      select: {
+        domain: true,
+      },
+    });
+
+    if (program.domain === domainRecord.slug) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "This domain is already the program domain.",
+      });
+    }
+
+    await updateProgramDomain({
+      programId,
+      oldDomain: program.domain,
+      newDomain: domainRecord.slug,
+    });
+
+    return NextResponse.json(transformDomain(domainRecord), { headers });
+  },
+  {
+    requiredPermissions: ["domains.write"],
+    requiredPlan: ["business", "advanced", "enterprise"],
+  },
+);
diff --git a/apps/web/app/api/domains/[domain]/transfer/route.ts b/apps/web/app/api/domains/[domain]/transfer/route.ts
index 967b8b3ca2a..4ff384c6ea1 100644
--- a/apps/web/app/api/domains/[domain]/transfer/route.ts
+++ b/apps/web/app/api/domains/[domain]/transfer/route.ts
@@ -4,7 +4,8 @@ import { DubApiError } from "@/lib/api/errors";
 import { withWorkspace } from "@/lib/auth";
 import { qstash } from "@/lib/cron";
 import { prisma } from "@/lib/prisma";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { transferDomainBodySchema } from "@/lib/zod/schemas/domains";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { NextResponse } from "next/server";
@@ -35,16 +36,10 @@ export const POST = withWorkspace(
     }
 
     // Allow up to 5 domain transfer per workspace per hour
-    const { success } = await ratelimit(5, "1 h").limit(
-      `domain-transfer:${workspace.id}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many requests. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.domainTransfer,
+      identifier: workspace.id,
+    });
 
     const newWorkspace = await prisma.project.findUnique({
       where: { id: newWorkspaceId },
diff --git a/apps/web/app/api/domains/[domain]/verify/route.ts b/apps/web/app/api/domains/[domain]/verify/route.ts
index d48cb79bbdc..88d150f8fe6 100644
--- a/apps/web/app/api/domains/[domain]/verify/route.ts
+++ b/apps/web/app/api/domains/[domain]/verify/route.ts
@@ -1,10 +1,13 @@
 import { getConfigResponse } from "@/lib/api/domains/get-config-response";
 import { getDomainOrThrow } from "@/lib/api/domains/get-domain-or-throw";
 import { getDomainResponse } from "@/lib/api/domains/get-domain-response";
-import { verifyDomain } from "@/lib/api/domains/verify-domain";
+import { verifyDomainWithRetry } from "@/lib/api/domains/verify-domain";
 import { withWorkspace } from "@/lib/auth";
+import { discoverDomainConnectIfEligible } from "@/lib/domain-connect/discover";
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
 import { prisma } from "@/lib/prisma";
 import { DomainVerificationStatusProps } from "@/lib/types";
+import { getApexDomain } from "@dub/utils";
 import { NextResponse } from "next/server";
 
 export const maxDuration = 30;
@@ -19,6 +22,7 @@ export const GET = withWorkspace(
     });
 
     let status: DomainVerificationStatusProps = "Valid Configuration";
+    const apex = getApexDomain(`https://${domain}`);
 
     const [domainJson, configJson] = await Promise.all([
       getDomainResponse(domain),
@@ -31,12 +35,14 @@ export const GET = withWorkspace(
       return NextResponse.json({
         status,
         response: { configJson, domainJson },
+        domainConnect: null,
       });
     } else if (domainJson.error) {
       status = "Unknown Error";
       return NextResponse.json({
         status,
         response: { configJson, domainJson },
+        domainConnect: null,
       });
     }
 
@@ -48,6 +54,7 @@ export const GET = withWorkspace(
       return NextResponse.json({
         status,
         response: { configJson, domainJson },
+        domainConnect: null,
       });
     }
 
@@ -56,22 +63,53 @@ export const GET = withWorkspace(
      */
     if (!domainJson.verified) {
       status = "Pending Verification";
-      const verificationJson = await verifyDomain(domain);
+      const verificationJson = await verifyDomainWithRetry(domain);
 
-      if (verificationJson && verificationJson.verified) {
-        /**
-         * Domain was just verified
-         */
-        status = "Valid Configuration";
+      if (verificationJson?.verified) {
+        // Re-check config after Vercel ownership verification succeeds
+        const freshConfig = await getConfigResponse(domain);
+        if (freshConfig?.conflicts?.length) {
+          status = "Conflicting DNS Records";
+        } else if (freshConfig?.misconfigured) {
+          status = "Invalid Configuration";
+          await prisma.domain.update({
+            where: { slug: domain },
+            data: { verified: false, lastChecked: new Date() },
+          });
+        } else {
+          status = "Valid Configuration";
+          await prisma.domain.update({
+            where: { slug: domain },
+            data: { verified: true, lastChecked: new Date() },
+          });
+        }
+
+        const domainConnect: DomainConnectDiscovery | null =
+          await discoverDomainConnectIfEligible(apex, status);
+
+        return NextResponse.json({
+          status,
+          response: {
+            configJson: freshConfig,
+            domainJson: { ...domainJson, verified: true },
+            verificationJson,
+          },
+          domainConnect,
+        });
       }
 
+      const domainConnect: DomainConnectDiscovery | null =
+        await discoverDomainConnectIfEligible(apex, status);
+
       return NextResponse.json({
         status,
         response: { configJson, domainJson, verificationJson },
+        domainConnect,
       });
     }
 
     let prismaResponse: any = null;
+    let domainConnect: DomainConnectDiscovery | null = null;
     if (!configJson.misconfigured) {
       prismaResponse = await prisma.domain.update({
         where: {
@@ -84,20 +122,19 @@ export const GET = withWorkspace(
       });
     } else {
       status = "Invalid Configuration";
-      prismaResponse = await prisma.domain.update({
-        where: {
-          slug: domain,
-        },
-        data: {
-          verified: false,
-          lastChecked: new Date(),
-        },
-      });
+      [prismaResponse, domainConnect] = await Promise.all([
+        prisma.domain.update({
+          where: { slug: domain },
+          data: { verified: false, lastChecked: new Date() },
+        }),
+        discoverDomainConnectIfEligible(apex, "Invalid Configuration"),
+      ]);
     }
 
     return NextResponse.json({
       status,
       response: { configJson, domainJson, prismaResponse },
+      domainConnect,
     });
   },
   {
diff --git a/apps/web/app/api/dub/webhook/route.ts b/apps/web/app/api/dub/webhook/route.ts
index 630365f3fc9..7dc78bf3be5 100644
--- a/apps/web/app/api/dub/webhook/route.ts
+++ b/apps/web/app/api/dub/webhook/route.ts
@@ -1,10 +1,12 @@
+import { withAxiom } from "@/lib/axiom/server";
 import { webhookPayloadSchema } from "@/lib/webhook/schemas";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import crypto from "crypto";
 import { leadCreated } from "./lead-created";
 import { saleCreated } from "./sale-created";
 
 // POST /api/dub/webhook - receive webhooks for Dub
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const body = await req.json();
   const { event, data } = webhookPayloadSchema.parse(body);
 
@@ -19,7 +21,7 @@ export const POST = async (req: Request) => {
     .update(JSON.stringify(body))
     .digest("hex");
 
-  if (webhookSignature !== computedSignature) {
+  if (!timingSafeCompare(webhookSignature, computedSignature)) {
     return new Response("Invalid signature", { status: 400 });
   }
 
@@ -35,4 +37,4 @@ export const POST = async (req: Request) => {
   }
 
   return new Response(response);
-};
+});
diff --git a/apps/web/app/api/jobs/process/[jobName]/route.ts b/apps/web/app/api/jobs/process/[jobName]/route.ts
index 57c50019834..3b0e2f46c29 100644
--- a/apps/web/app/api/jobs/process/[jobName]/route.ts
+++ b/apps/web/app/api/jobs/process/[jobName]/route.ts
@@ -1,7 +1,7 @@
 import { handleAndReturnErrorResponse } from "@/lib/api/errors";
 import { logger, withAxiomBodyLog } from "@/lib/axiom/server";
 import { verifyQstashSignature } from "@/lib/cron/verify-qstash";
-import { jobEnvelopeSchema } from "@/lib/jobs";
+import { jobEnvelopeSchema } from "@/lib/jobs/send-jobs";
 import { loadJob } from "@/lib/jobs/registry";
 import * as z from "zod/v4";
 
diff --git a/apps/web/app/api/links/[linkId]/route.ts b/apps/web/app/api/links/[linkId]/route.ts
index b30cb32ff3f..7ea389b30de 100644
--- a/apps/web/app/api/links/[linkId]/route.ts
+++ b/apps/web/app/api/links/[linkId]/route.ts
@@ -175,6 +175,8 @@ export const PATCH = withWorkspace(
           domain: link.domain,
           key: link.key,
           image: link.image,
+          programId: link.programId,
+          partnerId: link.partnerId,
         },
         updatedLink: processedLink,
       });
diff --git a/apps/web/app/api/links/bulk/route.ts b/apps/web/app/api/links/bulk/route.ts
index a5c736069fb..60a917d0a08 100644
--- a/apps/web/app/api/links/bulk/route.ts
+++ b/apps/web/app/api/links/bulk/route.ts
@@ -11,6 +11,7 @@ import { includeProgramEnrollment } from "@/lib/api/links/include-program-enroll
 import { includeTags } from "@/lib/api/links/include-tags";
 import { throwIfLinksUsageExceeded } from "@/lib/api/links/usage-checks";
 import { checkIfLinksHaveFolders } from "@/lib/api/links/utils/check-if-links-have-folders";
+import { checkIfLinksHaveProgramPartners } from "@/lib/api/links/utils/check-if-links-have-program-partners";
 import { isRootDomainLinkKey } from "@/lib/api/links/utils/is-root-domain-link-key";
 import { combineTagIds } from "@/lib/api/tags/combine-tag-ids";
 import { parseRequestBody } from "@/lib/api/utils";
@@ -222,6 +223,55 @@ export const POST = withWorkspace(
       });
     }
 
+    if (checkIfLinksHaveProgramPartners(validLinks)) {
+      const partnerIds = [
+        ...new Set(
+          validLinks.map((link) => link.partnerId).filter(Boolean) as string[],
+        ),
+      ];
+
+      const enrollments =
+        workspace.defaultProgramId && partnerIds.length > 0
+          ? await prisma.programEnrollment.findMany({
+              where: {
+                programId: workspace.defaultProgramId,
+                partnerId: { in: partnerIds },
+              },
+              select: {
+                partnerId: true,
+              },
+            })
+          : [];
+
+      const enrolledPartnerIds = new Set(
+        enrollments.map(({ partnerId }) => partnerId),
+      );
+
+      validLinks = validLinks.filter((link) => {
+        if (link.programId && link.programId !== workspace.defaultProgramId) {
+          errorLinks.push({
+            error: `Invalid programId detected: ${link.programId}`,
+            code: "unprocessable_entity",
+            link,
+          });
+
+          return false;
+        }
+
+        if (link.partnerId && !enrolledPartnerIds.has(link.partnerId)) {
+          errorLinks.push({
+            error: `Invalid partnerId detected: ${link.partnerId}`,
+            code: "unprocessable_entity",
+            link,
+          });
+
+          return false;
+        }
+
+        return true;
+      });
+    }
+
     if (checkIfLinksHaveWebhooks(validLinks)) {
       if (workspace.plan === "free" || workspace.plan === "pro") {
         throw new DubApiError({
@@ -425,6 +475,38 @@ export const PATCH = withWorkspace(
       });
     }
 
+    if (data.programId || data.partnerId) {
+      if (data.programId && data.programId !== workspace.defaultProgramId) {
+        throw new DubApiError({
+          code: "unprocessable_entity",
+          message: `Invalid programId detected: ${data.programId}`,
+        });
+      }
+
+      if (data.partnerId) {
+        const enrollment = workspace.defaultProgramId
+          ? await prisma.programEnrollment.findUnique({
+              where: {
+                partnerId_programId: {
+                  partnerId: data.partnerId,
+                  programId: workspace.defaultProgramId,
+                },
+              },
+              select: {
+                partnerId: true,
+              },
+            })
+          : null;
+
+        if (!enrollment) {
+          throw new DubApiError({
+            code: "unprocessable_entity",
+            message: `Invalid partnerId detected: ${data.partnerId}`,
+          });
+        }
+      }
+    }
+
     const processedLinks = await Promise.all(
       links.map(async (link) =>
         processLink({
diff --git a/apps/web/app/api/links/count/route.ts b/apps/web/app/api/links/count/route.ts
index fdc2309e379..712f169e760 100644
--- a/apps/web/app/api/links/count/route.ts
+++ b/apps/web/app/api/links/count/route.ts
@@ -13,7 +13,7 @@ export const GET = withWorkspace(
     let { folderIds } = await validateLinksQueryFilters({
       ...filters,
       workspace,
-      userId: session.user.id,
+      sessionUserId: session.user.id,
     });
 
     if (
diff --git a/apps/web/app/api/links/export/route.ts b/apps/web/app/api/links/export/route.ts
index d755447e81e..df3dbd332c3 100644
--- a/apps/web/app/api/links/export/route.ts
+++ b/apps/web/app/api/links/export/route.ts
@@ -28,7 +28,7 @@ export const GET = withWorkspace(
     const { folderIds } = await validateLinksQueryFilters({
       ...filters,
       workspace,
-      userId: session.user.id,
+      sessionUserId: session.user.id,
     });
 
     const { interval, start, end } = filters;
diff --git a/apps/web/app/api/links/route.ts b/apps/web/app/api/links/route.ts
index 779d3c305be..3d0393d8128 100644
--- a/apps/web/app/api/links/route.ts
+++ b/apps/web/app/api/links/route.ts
@@ -27,7 +27,7 @@ export const GET = withWorkspace(
     const { folderIds } = await validateLinksQueryFilters({
       ...filters,
       workspace,
-      userId: session.user.id,
+      sessionUserId: session.user.id,
     });
 
     const response = await getLinksForWorkspace({
diff --git a/apps/web/app/api/links/sync/route.ts b/apps/web/app/api/links/sync/route.ts
index 8232d15bc5a..a61c0273779 100644
--- a/apps/web/app/api/links/sync/route.ts
+++ b/apps/web/app/api/links/sync/route.ts
@@ -27,6 +27,7 @@ export const POST = withWorkspace(
               domain: link.domain,
               key: link.key,
             },
+            projectId: null,
             userId: null,
           },
         });
diff --git a/apps/web/app/api/links/upsert/route.ts b/apps/web/app/api/links/upsert/route.ts
index febaa1a2dcd..22f0a9b4064 100644
--- a/apps/web/app/api/links/upsert/route.ts
+++ b/apps/web/app/api/links/upsert/route.ts
@@ -149,6 +149,8 @@ export const PUT = withWorkspace(
             domain: link.domain,
             key: link.key,
             image: link.image,
+            programId: link.programId,
+            partnerId: link.partnerId,
           },
           updatedLink: processedLink,
         });
diff --git a/apps/web/app/api/oauth/authorize/route.ts b/apps/web/app/api/oauth/authorize/route.ts
index 2f01f1125bf..2f092dc0032 100644
--- a/apps/web/app/api/oauth/authorize/route.ts
+++ b/apps/web/app/api/oauth/authorize/route.ts
@@ -5,7 +5,7 @@ import {
 } from "@/lib/api/oauth/can-install-oauth-app";
 import { OAUTH_CONFIG } from "@/lib/api/oauth/constants";
 import { createToken } from "@/lib/api/oauth/utils";
-import { consolidateScopes, getScopesForRole } from "@/lib/api/tokens/scopes";
+import { getGrantedScopesForRole } from "@/lib/api/tokens/scopes";
 import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
@@ -25,19 +25,11 @@ export const POST = withWorkspace(
       code_challenge_method: codeChallengeMethod,
     } = authorizeRequestSchema.parse(await parseRequestBody(req));
 
-    // Check if the user has the required scopes for the workspace selected
-    const userRole = workspace.users[0].role;
-    const scopesForRole = getScopesForRole(userRole);
-    const scopesMissing = consolidateScopes(scope).filter(
-      (scope) => !scopesForRole.includes(scope) && scope !== "user.read",
-    );
-
-    if (scopesMissing.length > 0) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: "You don't have the permission to install this integration.",
-      });
-    }
+    // Grant the subset of requested scopes the user can actually authorize
+    const grantedScopes = getGrantedScopesForRole({
+      scopes: scope,
+      role: workspace.users[0].role,
+    });
 
     const app = await prisma.oAuthApp.findUniqueOrThrow({
       where: {
@@ -113,7 +105,7 @@ export const POST = withWorkspace(
         redirectUri,
         projectId: workspace.id,
         userId: session.user.id,
-        scopes: scope.join(" "),
+        scopes: grantedScopes.join(" "),
         code: createToken({ length: OAUTH_CONFIG.CODE_LENGTH }),
         expiresAt: new Date(Date.now() + OAUTH_CONFIG.CODE_LIFETIME * 1000),
         ...(app.pkce && { codeChallenge, codeChallengeMethod }),
diff --git a/apps/web/app/api/oauth/token/exchange-code-for-token.ts b/apps/web/app/api/oauth/token/exchange-code-for-token.ts
index 97d38373f84..ea3d92aca75 100644
--- a/apps/web/app/api/oauth/token/exchange-code-for-token.ts
+++ b/apps/web/app/api/oauth/token/exchange-code-for-token.ts
@@ -5,6 +5,7 @@ import { hashToken } from "@/lib/auth";
 import { installIntegration } from "@/lib/integrations/install";
 import { generateRandomName } from "@/lib/names";
 import { prisma } from "@/lib/prisma";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { authCodeExchangeSchema } from "@/lib/zod/schemas/oauth";
 import { waitUntil } from "@vercel/functions";
 import { NextRequest } from "next/server";
@@ -100,7 +101,8 @@ export const exchangeAuthCodeForToken = async (
       });
     }
 
-    if (app.hashedClientSecret !== (await hashToken(clientSecret))) {
+    const hashedClientSecret = await hashToken(clientSecret);
+    if (!timingSafeCompare(hashedClientSecret, app.hashedClientSecret)) {
       throw new DubApiError({
         code: "unauthorized",
         message: "Invalid client_secret",
diff --git a/apps/web/app/api/oauth/token/refresh-access-token.ts b/apps/web/app/api/oauth/token/refresh-access-token.ts
index 9a98ce21cad..c19b029a9b8 100644
--- a/apps/web/app/api/oauth/token/refresh-access-token.ts
+++ b/apps/web/app/api/oauth/token/refresh-access-token.ts
@@ -4,6 +4,7 @@ import { createToken } from "@/lib/api/oauth/utils";
 import { hashToken } from "@/lib/auth";
 import { generateRandomName } from "@/lib/names";
 import { prisma } from "@/lib/prisma";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { refreshTokenSchema } from "@/lib/zod/schemas/oauth";
 import { NextRequest } from "next/server";
 import * as z from "zod/v4";
@@ -68,7 +69,8 @@ export const refreshAccessToken = async (
       });
     }
 
-    if (oAuthApp.hashedClientSecret !== (await hashToken(clientSecret))) {
+    const hashedClientSecret = await hashToken(clientSecret);
+    if (!timingSafeCompare(hashedClientSecret, oAuthApp.hashedClientSecret)) {
       throw new DubApiError({
         code: "unauthorized",
         message: "Invalid client_secret",
diff --git a/apps/web/app/api/og/program/categories/route.tsx b/apps/web/app/api/og/program/categories/route.tsx
new file mode 100644
index 00000000000..4567056fc3c
--- /dev/null
+++ b/apps/web/app/api/og/program/categories/route.tsx
@@ -0,0 +1,142 @@
+import { PROGRAM_CATEGORIES } from "@/lib/network/program-categories";
+import { DUB_WORDMARK } from "@dub/utils";
+import { ImageResponse } from "next/og";
+import { NextRequest } from "next/server";
+import { loadGoogleFont } from "../../load-google-font";
+
+const DARK_CELLS = [
+  [2, 3],
+  [5, 3],
+  [56, 7],
+  [53, 1],
+];
+
+// GET /api/og/program/categories?categorySlug=ai
+export async function GET(req: NextRequest) {
+  const categorySlug = req.nextUrl.searchParams.get("categorySlug");
+
+  if (!categorySlug) {
+    return new Response("Missing 'categorySlug' parameter", {
+      status: 400,
+    });
+  }
+
+  const category = PROGRAM_CATEGORIES.find(
+    ({ id }) => id.toLowerCase() === categorySlug.toLowerCase(),
+  );
+
+  if (!category) {
+    return new Response("Category not found", {
+      status: 404,
+    });
+  }
+
+  const interSemibold = await loadGoogleFont("Inter:wght@600");
+
+  return new ImageResponse(
+    (
+      <div
+        tw="flex flex-col bg-white w-full h-full"
+        style={{ fontFamily: "Inter" }}
+      >
+        {/* @ts-ignore */}
+        <svg tw="absolute inset-0 text-black/10" width="1200" height="630">
+          <defs>
+            <pattern
+              id="grid"
+              width={20}
+              height={20}
+              patternUnits="userSpaceOnUse"
+            >
+              <path
+                d={`M 20 0 L 0 0 0 20`}
+                fill="transparent"
+                stroke="currentColor"
+                strokeWidth={1}
+              />
+            </pattern>
+            <pattern
+              id="grid-large"
+              width={160}
+              height={160}
+              patternUnits="userSpaceOnUse"
+            >
+              <path
+                d={`M 160 0 L 0 0 0 160`}
+                fill="transparent"
+                stroke="currentColor"
+                strokeOpacity={0.5}
+                strokeWidth={1}
+              />
+            </pattern>
+            <linearGradient id="gradient" x1="0" y1="0" x2="0" y2="1">
+              <stop offset="0%" stopColor="#fff" stopOpacity={0} />
+              <stop offset="100%" stopColor="#fff" stopOpacity={1} />
+            </linearGradient>
+          </defs>
+          {DARK_CELLS.map(([x, y]) => (
+            <rect
+              key={`${x}-${y}`}
+              x={x * 20 + 1}
+              y={y * 20 + 1}
+              width={19}
+              height={19}
+              fill="black"
+              fillOpacity={0.02}
+            />
+          ))}
+          <rect fill="url(#grid)" width="1200" height="630" />
+          <rect fill="url(#grid-large)" width="1200" height="630" />
+          <rect fill="url(#gradient)" width="1200" height="630" />
+        </svg>
+
+        <div tw="relative flex flex-col mx-auto h-full bg-white w-[920px] px-16 py-20 overflow-hidden">
+          <div tw="flex items-center">
+            <img src={DUB_WORDMARK} height={56} />
+            <div tw="ml-4 h-10 w-px bg-neutral-300" />
+            <div tw="ml-4 text-left uppercase text-2xl text-neutral-500">
+              Program Marketplace
+            </div>
+          </div>
+          <div
+            tw="mt-32 text-5xl font-semibold text-neutral-800"
+            style={{
+              display: "block",
+              lineClamp: 2,
+              textOverflow: "ellipsis",
+              fontFamily: "Inter",
+            }}
+          >
+            {`${category.label} Affiliate Programs`}
+          </div>
+          <div tw="mt-10 flex">
+            <div
+              tw="w-full flex items-center rounded-md bg-neutral-100 border border-neutral-200 p-10 text-3xl"
+              style={{
+                display: "block",
+                lineClamp: 3,
+                textOverflow: "ellipsis",
+              }}
+            >
+              {category.listPageDescription}
+            </div>
+          </div>
+        </div>
+      </div>
+    ),
+    {
+      width: 1200,
+      height: 630,
+      fonts: interSemibold
+        ? [
+            {
+              name: "Inter",
+              data: interSemibold,
+              style: "normal",
+              weight: 600,
+            },
+          ]
+        : [],
+    },
+  );
+}
diff --git a/apps/web/app/api/resend/webhook/route.ts b/apps/web/app/api/resend/webhook/route.ts
index ef479c51372..db8ffb5b864 100644
--- a/apps/web/app/api/resend/webhook/route.ts
+++ b/apps/web/app/api/resend/webhook/route.ts
@@ -1,3 +1,4 @@
+import { withAxiom } from "@/lib/axiom/server";
 import { NextResponse } from "next/server";
 import { Webhook } from "svix";
 import { emailBounced } from "./email-bounced";
@@ -7,7 +8,7 @@ import { emailOpened } from "./email-opened";
 const webhookSecret = process.env.RESEND_WEBHOOK_SECRET!;
 
 // POST /api/resend/webhook – listen to Resend webhooks
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const rawBody = await req.text();
   const webhook = new Webhook(webhookSecret);
 
@@ -33,4 +34,4 @@ export const POST = async (req: Request) => {
   }
 
   return NextResponse.json({ message: "Webhook processed." });
-};
+});
diff --git a/apps/web/app/api/resumes/upload-url/route.ts b/apps/web/app/api/resumes/upload-url/route.ts
index 0adb8290c5c..2f2dbeebd54 100644
--- a/apps/web/app/api/resumes/upload-url/route.ts
+++ b/apps/web/app/api/resumes/upload-url/route.ts
@@ -1,6 +1,10 @@
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
-import { LOCALHOST_IP, nanoid, R2_URL } from "@dub/utils";
+import { handleAndReturnErrorResponse } from "@/lib/api/errors";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { LOCALHOST_IP, nanoid } from "@dub/utils";
 import { ipAddress } from "@vercel/functions";
 import { NextRequest, NextResponse } from "next/server";
 
@@ -17,26 +21,42 @@ export const POST = async (req: NextRequest) => {
     CORS_HEADERS["Access-Control-Allow-Origin"] = origin;
   }
 
-  // Max 5 requests per minute
-  const ip = process.env.VERCEL === "1" ? ipAddress(req) : LOCALHOST_IP;
-  const { success } = await ratelimit(5, "1 m").limit(`upload-resume:${ip}`);
+  try {
+    const { contentType, contentLength } = signedUploadInputSchema.parse(
+      await req.json(),
+    );
 
-  if (!success) {
-    return new Response("Don't DDoS me pls 🥺", { status: 429 });
-  }
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: "resumes",
+    });
+
+    const ip = process.env.VERCEL === "1" ? ipAddress(req) : LOCALHOST_IP;
+
+    if (ip) {
+      await assertRateLimit({
+        policy: RATELIMIT_POLICIES.resumeUpload,
+        identifier: [ip],
+      });
+    }
 
-  const key = `resumes/${nanoid(16)}`;
-  const signedUrl = await storage.getSignedUploadUrl({
-    key,
-    contentType: "application/pdf",
-  });
-
-  return NextResponse.json(
-    {
-      key,
-      signedUrl,
-      destinationUrl: `${R2_URL}/${key}`,
-    },
-    { headers: CORS_HEADERS },
-  );
+    const { signedUrl, destinationUrl } = await createSignedUploadUrl({
+      key: `resumes/${nanoid(10)}`,
+      contentType,
+      contentLength,
+    });
+
+    return NextResponse.json(
+      {
+        signedUrl,
+        destinationUrl,
+      },
+      {
+        headers: CORS_HEADERS,
+      },
+    );
+  } catch (error) {
+    return handleAndReturnErrorResponse(error, CORS_HEADERS);
+  }
 };
diff --git a/apps/web/app/api/route.ts b/apps/web/app/api/route.ts
index 50e1ba7a48d..b3149410a18 100644
--- a/apps/web/app/api/route.ts
+++ b/apps/web/app/api/route.ts
@@ -1,8 +1,14 @@
 import { document } from "@/lib/openapi";
 import { NextResponse } from "next/server";
 
-export const runtime = "edge";
+export const dynamic = "force-static";
 
 export function GET() {
-  return NextResponse.json(document);
+  return NextResponse.json(document, {
+    headers: {
+      // cache indefinitely till next deployment
+      "Vercel-CDN-Cache-Control": "s-maxage=31536000",
+      "Cache-Control": "public, max-age=31536000",
+    },
+  });
 }
diff --git a/apps/web/app/api/tokens/[id]/route.ts b/apps/web/app/api/tokens/[id]/route.ts
index 1aa891bc8b0..750bd194264 100644
--- a/apps/web/app/api/tokens/[id]/route.ts
+++ b/apps/web/app/api/tokens/[id]/route.ts
@@ -21,6 +21,7 @@ export const GET = withWorkspace(
         name: true,
         partialKey: true,
         scopes: true,
+        expires: true,
         lastUsed: true,
         createdAt: true,
         updatedAt: true,
diff --git a/apps/web/app/api/tokens/route.ts b/apps/web/app/api/tokens/route.ts
index 302f3f9fe7b..6890fa207aa 100644
--- a/apps/web/app/api/tokens/route.ts
+++ b/apps/web/app/api/tokens/route.ts
@@ -5,7 +5,8 @@ import { parseRequestBody } from "@/lib/api/utils";
 import { hashToken, withWorkspace } from "@/lib/auth";
 import { generateRandomName } from "@/lib/names";
 import { prisma } from "@/lib/prisma";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { createTokenSchema, tokenSchema } from "@/lib/zod/schemas/token";
 import { sendEmail } from "@dub/email";
 import APIKeyCreated from "@dub/email/templates/api-key-created";
@@ -39,6 +40,7 @@ export const GET = withWorkspace(
         name: true,
         partialKey: true,
         scopes: true,
+        expires: true,
         lastUsed: true,
         createdAt: true,
         updatedAt: true,
@@ -65,16 +67,10 @@ export const GET = withWorkspace(
 // POST /api/tokens – create a new token for a workspace
 export const POST = withWorkspace(
   async ({ req, session, workspace }) => {
-    const { success } = await ratelimit(1, "5 s").limit(
-      `create-tokens:${workspace.id}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many requests. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.createToken,
+      identifier: workspace.id,
+    });
 
     const { name, isMachine, scopes } = createTokenSchema.parse(
       await parseRequestBody(req),
@@ -90,7 +86,7 @@ export const POST = withWorkspace(
       });
     }
 
-    if (!validateScopesForRole(scopes || [], role)) {
+    if (!validateScopesForRole(scopes, role)) {
       throw new DubApiError({
         code: "unprocessable_entity",
         message: "Some of the given scopes are not available for your role.",
@@ -150,10 +146,7 @@ export const POST = withWorkspace(
             partialKey,
             userId: isMachine ? machineUser?.id! : session.user.id,
             projectId: workspace.id,
-            scopes:
-              scopes && scopes.length > 0
-                ? [...new Set(scopes)].join(" ")
-                : null,
+            scopes: [...new Set(scopes)].join(" "),
           },
         });
       },
@@ -172,8 +165,8 @@ export const POST = withWorkspace(
           email: session.user.email,
           token: {
             name,
-            type: scopesToName(scopes || []).name,
-            permissions: scopesToName(scopes || []).description,
+            type: scopesToName(scopes).name,
+            permissions: scopesToName(scopes).description,
           },
           workspace: {
             name: workspace.name,
diff --git a/apps/web/app/api/utm/[id]/route.ts b/apps/web/app/api/utm/[id]/route.ts
index 466faf0dd8d..ae1574f4014 100644
--- a/apps/web/app/api/utm/[id]/route.ts
+++ b/apps/web/app/api/utm/[id]/route.ts
@@ -1,14 +1,10 @@
 import { DubApiError } from "@/lib/api/errors";
 import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
 import { withWorkspace } from "@/lib/auth";
-import { qstash } from "@/lib/cron";
+import { syncGroupUtmJob } from "@/lib/jobs/handlers/sync-group-utm-job";
 import { prisma } from "@/lib/prisma";
 import { updateUTMTemplateBodySchema } from "@/lib/zod/schemas/utm";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  constructURLFromUTMParams,
-  deepEqual,
-} from "@dub/utils";
+import { constructURLFromUTMParams, deepEqual } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { NextResponse } from "next/server";
 
@@ -96,15 +92,9 @@ export const PATCH = withWorkspace(
               }
             }
 
-            const res = await qstash.publishJSON({
-              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/sync-utm`,
-              body: {
-                groupId: partnerGroup.id,
-              },
+            await syncGroupUtmJob.dispatch({
+              groupId: partnerGroup.id,
             });
-            console.log(
-              `Scheduled sync-utm job for template ${template.id}: ${JSON.stringify(res, null, 2)}`,
-            );
           })(),
         );
       }
diff --git a/apps/web/app/api/veriff/webhook/route.ts b/apps/web/app/api/veriff/webhook/route.ts
index 0dd3c215261..54f71df5e31 100644
--- a/apps/web/app/api/veriff/webhook/route.ts
+++ b/apps/web/app/api/veriff/webhook/route.ts
@@ -1,10 +1,12 @@
+import { withAxiom } from "@/lib/axiom/server";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { logAndRespond } from "app/(ee)/api/cron/utils";
 import crypto from "crypto";
 import { handleDecisionEvent } from "./handle-decision-event";
 import { handleSessionEvent } from "./handle-session-event";
 
 // POST /api/veriff/webhook
-export const POST = async (req: Request) => {
+export const POST = withAxiom(async (req: Request) => {
   const rawBody = await req.text();
 
   const signature = req.headers.get("x-hmac-signature");
@@ -17,17 +19,7 @@ export const POST = async (req: Request) => {
 
   const expectedApiKey = process.env.VERIFF_API_KEY;
 
-  if (!expectedApiKey || !authClient) {
-    return logAndRespond("Invalid auth client.", { status: 401 });
-  }
-
-  const authClientBuffer = Uint8Array.from(Buffer.from(authClient));
-  const expectedApiKeyBuffer = Uint8Array.from(Buffer.from(expectedApiKey));
-
-  if (
-    authClientBuffer.length !== expectedApiKeyBuffer.length ||
-    !crypto.timingSafeEqual(authClientBuffer, expectedApiKeyBuffer)
-  ) {
+  if (!expectedApiKey || !timingSafeCompare(authClient, expectedApiKey)) {
     return logAndRespond("Invalid auth client.", { status: 401 });
   }
 
@@ -42,16 +34,7 @@ export const POST = async (req: Request) => {
     .update(rawBody)
     .digest("hex");
 
-  const computedSignatureBuffer = Uint8Array.from(
-    Buffer.from(computedSignature),
-  );
-  const signatureBuffer = Uint8Array.from(Buffer.from(signature));
-
-  const isSignatureValid =
-    computedSignatureBuffer.length === signatureBuffer.length &&
-    crypto.timingSafeEqual(computedSignatureBuffer, signatureBuffer);
-
-  if (!isSignatureValid) {
+  if (!timingSafeCompare(signature, computedSignature)) {
     return logAndRespond("Invalid signature.", { status: 400 });
   }
 
@@ -62,4 +45,4 @@ export const POST = async (req: Request) => {
   } else {
     return await handleSessionEvent(body);
   }
-};
+});
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/cancel/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/cancel/route.ts
index 973929ced01..910678e0510 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/cancel/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/cancel/route.ts
@@ -1,12 +1,15 @@
 import { DubApiError } from "@/lib/api/errors";
+import { parseRequestBody } from "@/lib/api/utils";
 import { withWorkspace } from "@/lib/auth";
 import { stripe } from "@/lib/stripe";
+import { cancelSubscriptionSchema } from "@/lib/stripe/cancellation-feedback";
 import { NextResponse } from "next/server";
 import Stripe from "stripe";
+import * as z from "zod/v4";
 
 // POST /api/workspaces/[idOrSlug]/billing/cancel — toggle cancel-at-period-end on the workspace subscription (Stripe API)
 export const POST = withWorkspace(
-  async ({ workspace }) => {
+  async ({ workspace, req }) => {
     if (!workspace.stripeId) {
       throw new DubApiError({
         code: "bad_request",
@@ -37,15 +40,31 @@ export const POST = withWorkspace(
         });
       }
 
-      const cancelAtPeriodEnd = subscription.cancel_at_period_end ?? false;
+      const subscriptionAlreadyCancelling =
+        subscription.cancel_at_period_end ?? false;
 
-      await stripe.subscriptions.update(subscription.id, {
-        cancel_at_period_end: !cancelAtPeriodEnd,
-      });
+      // If the subscription is already cancelling, we need to resume it
+      if (subscriptionAlreadyCancelling) {
+        await stripe.subscriptions.update(subscription.id, {
+          cancel_at_period_end: false,
+        });
+      } else {
+        const { feedback, comment } = cancelSubscriptionSchema.parse(
+          await parseRequestBody(req),
+        );
+
+        await stripe.subscriptions.update(subscription.id, {
+          cancel_at_period_end: true,
+          cancellation_details: {
+            comment,
+            feedback,
+          },
+        });
+      }
 
       return NextResponse.json({ success: true });
     } catch (error) {
-      if (error instanceof DubApiError) {
+      if (error instanceof DubApiError || error instanceof z.ZodError) {
         throw error;
       }
       throw new DubApiError({
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/manage/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/manage/route.ts
index a2a0dfd1e5c..a94b12c03e1 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/manage/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/manage/route.ts
@@ -22,6 +22,7 @@ export const POST = withWorkspace(
     try {
       const { url } = await stripe.billingPortal.sessions.create({
         customer: workspace.stripeId,
+        configuration: "bpc_1UEvGVAlJJEpqkPVpP38ZUNj", // custom configuration for changing billing info only
         return_url: `${APP_DOMAIN}/${workspace.slug}/settings/billing`,
       });
       return NextResponse.json({ url });
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
index 2de6675303e..1c2bd21f491 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
@@ -5,6 +5,7 @@ import {
   DIRECT_DEBIT_PAYMENT_METHOD_TYPES,
   DIRECT_DEBIT_PAYMENT_TYPES_INFO,
   PAYMENT_METHOD_TYPES,
+  SEPA_ENABLED_WORKSPACE_IDS,
 } from "@/lib/constants/payouts";
 import { stripe } from "@/lib/stripe";
 import {
@@ -134,7 +135,11 @@ export const POST = withWorkspace(
       return NextResponse.json({ url });
     }
 
-    if (method === "sepa_debit" && workspace.plan !== "enterprise") {
+    if (
+      method === "sepa_debit" &&
+      workspace.plan !== "enterprise" &&
+      !SEPA_ENABLED_WORKSPACE_IDS.has(workspace.id)
+    ) {
       throw new DubApiError({
         code: "forbidden",
         message: "SEPA Debit is only available on the Enterprise plan.",
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/upgrade/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/upgrade/route.ts
index 168b086ed5b..283d30874e4 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/upgrade/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/upgrade/route.ts
@@ -26,6 +26,11 @@ export const POST = withWorkspace(
       await req.json(),
     );
 
+    if (workspace.disabledAt) {
+      plan = "advanced";
+      period = "yearly";
+    }
+
     const lookupKey =
       tier > 1 ? `${plan}${tier}_${period}` : `${plan}_${period}`;
 
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
index d5407d17376..270ac14c7a7 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
@@ -4,7 +4,9 @@ import { assertRoleAllowedForPlan } from "@/lib/api/workspaces/assert-role-plan"
 import { withWorkspace } from "@/lib/auth";
 import { exceededLimitError } from "@/lib/exceeded-limit-error";
 import { prisma } from "@/lib/prisma";
-import { ratelimit, redis } from "@/lib/upstash";
+import { redis } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { inviteTeammatesSchema } from "@/lib/zod/schemas/invites";
 import {
   getWorkspaceUsersQuerySchema,
@@ -42,6 +44,7 @@ export const GET = withWorkspace(
   },
   {
     requiredPermissions: ["workspaces.read"],
+    requiredRoles: ["owner", "member", "billing"],
   },
 );
 
@@ -57,17 +60,10 @@ export const POST = withWorkspace(
       });
     }
 
-    const { success } = await ratelimit(1, "1 s").limit(
-      `workspace-invites:${workspace.id}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "You've reached the rate limit for inviting teammates. Please try again later after few seconds.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.workspaceInvite,
+      identifier: workspace.id,
+    });
 
     if (teammates.length > 10) {
       throw new DubApiError({
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/sitemaps/import/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/sitemaps/import/route.ts
index cd38532c95e..ece5044063d 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/sitemaps/import/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/sitemaps/import/route.ts
@@ -8,7 +8,8 @@ import {
   parseTrackedSitemaps,
   replaceTrackedSitemapsInColumn,
 } from "@/lib/sitemaps/site-visit-tracking";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
@@ -43,15 +44,10 @@ export const POST = withWorkspace(
       });
     }
 
-    const rateLimitKey = `sitemap-import:${workspace.id}:${sitemapUrl ?? "all"}`;
-    const { success } = await ratelimit(5, "1 m").limit(rateLimitKey);
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "Sitemap import was requested too recently. Please wait a minute and try again.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.sitemapImport,
+      identifier: [workspace.id, sitemapUrl ?? "all"],
+    });
 
     const selectedDomain = await getSiteLinksDomain(
       workspace.id,
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/support/slack-invite/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/support/slack-invite/route.ts
index 95186bd695e..e960876528e 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/support/slack-invite/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/support/slack-invite/route.ts
@@ -3,7 +3,8 @@ import { withWorkspace } from "@/lib/auth";
 import { SLACK_SUPPORT_INVITE_MAX_EMAILS } from "@/lib/constants/misc";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { requestSlackConnectSupportInvite } from "@/lib/slack/support-invite";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { isWorkspaceBillingTrialActive } from "@dub/utils";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
@@ -72,29 +73,15 @@ export const POST = withWorkspace(
       emails = [email];
     }
 
-    const { success: workspaceSuccess } = await ratelimit(5, "1 d").limit(
-      `slack-support-invite:workspace:${workspace.id}`,
-    );
-
-    if (!workspaceSuccess) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "This workspace has reached the daily limit for Slack invite requests. Please try again tomorrow.",
-      });
-    }
-
-    const { success: userSuccess } = await ratelimit(10, "1 h").limit(
-      `slack-support-invite:${workspace.id}:${session.user.id}`,
-    );
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.slackSupportInviteWorkspace,
+      identifier: workspace.id,
+    });
 
-    if (!userSuccess) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message:
-          "You've requested too many Slack invites recently. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.slackSupportInviteUser,
+      identifier: [workspace.id, session.user.id],
+    });
 
     const { inviteIds } = await requestSlackConnectSupportInvite({
       workspaceSlug: workspace.slug,
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/upload-url/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/upload-url/route.ts
index e10c266d9f7..ce81a31d4c8 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/upload-url/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/upload-url/route.ts
@@ -1,27 +1,52 @@
 import { withWorkspace } from "@/lib/auth";
-import { storage } from "@/lib/storage";
-import { nanoid, R2_URL } from "@dub/utils";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { nanoid } from "@dub/utils";
 import { NextResponse } from "next/server";
 import * as z from "zod/v4";
 
-const schema = z.object({
-  folder: z.enum(["integration-screenshots", "program-logos"]),
+const schema = signedUploadInputSchema.extend({
+  folder: z.enum(["integrationScreenshots", "programLogos"]),
 });
 
 // POST /api/workspaces/[idOrSlug]/upload-url – get a signed URL to upload a file to a workspace
 export const POST = withWorkspace(
-  async ({ req }) => {
-    const { folder } = schema.parse(await req.json());
+  async ({ req, workspace, session }) => {
+    const {
+      folder: policy,
+      contentType,
+      contentLength,
+    } = schema.parse(await req.json());
 
-    const key = `${folder}/${nanoid(16)}`;
-    const signedUrl = await storage.getSignedUploadUrl({
+    const key =
+      policy === "integrationScreenshots"
+        ? `integration-screenshots/${nanoid(10)}`
+        : `program-logos/${nanoid(10)}`;
+
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy,
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.workspaceFileUpload,
+      identifier: [workspace.id, session.user.id],
+    });
+
+    const { signedUrl, destinationUrl } = await createSignedUploadUrl({
       key,
+      contentType,
+      contentLength,
     });
 
     return NextResponse.json({
       key,
       signedUrl,
-      destinationUrl: `${R2_URL}/${key}`,
+      destinationUrl,
     });
   },
   {
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
index 0ab9334632c..df6768b0c3f 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
@@ -49,6 +49,7 @@ export const GET = withWorkspace(
   },
   {
     requiredPermissions: ["workspaces.read"],
+    requiredRoles: ["owner", "member", "billing"],
   },
 );
 
diff --git a/apps/web/app/api/workspaces/route.ts b/apps/web/app/api/workspaces/route.ts
index 4b5800a4677..6e143aa8997 100644
--- a/apps/web/app/api/workspaces/route.ts
+++ b/apps/web/app/api/workspaces/route.ts
@@ -1,3 +1,4 @@
+import { isCI } from "@/lib/api/environment";
 import { DubApiError } from "@/lib/api/errors";
 import { generateRandomString } from "@/lib/api/utils/generate-random-string";
 import { createWorkspaceId } from "@/lib/api/workspaces/create-workspace-id";
@@ -89,7 +90,8 @@ export const POST = withSession(async ({ req, session }) => {
           },
         });
 
-        if (freeWorkspaces >= FREE_WORKSPACES_LIMIT) {
+        // apply free workspaces limit (if not in CI)
+        if (freeWorkspaces >= FREE_WORKSPACES_LIMIT && !isCI) {
           throw new DubApiError({
             code: "exceeded_limit",
             message: `You can only create up to ${FREE_WORKSPACES_LIMIT} free workspaces. Additional workspaces require a paid plan.`,
diff --git a/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-form.tsx b/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-form.tsx
index d4a2658c5b8..06ac770fa0a 100644
--- a/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-form.tsx
+++ b/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-form.tsx
@@ -4,18 +4,17 @@ import {
   canInstallOAuthApp,
   UNVERIFIED_APP_INSTALL_MESSAGE,
 } from "@/lib/api/oauth/can-install-oauth-app";
-import { consolidateScopes, getScopesForRole } from "@/lib/api/tokens/scopes";
 import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspaces from "@/lib/swr/use-workspaces";
 import { WorkspaceProps } from "@/lib/types";
 import { authorizeRequestSchema } from "@/lib/zod/schemas/oauth";
 import { WorkspaceSelector } from "@/ui/workspaces/workspace-selector";
 import { Button } from "@dub/ui";
 import { Integration } from "@prisma/client";
 import { useSession } from "next-auth/react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useState } from "react";
 import { toast } from "sonner";
 import * as z from "zod/v4";
+import { useAuthorizeWorkspace } from "./authorize-workspace-context";
 
 interface AuthorizeFormProps extends z.infer<typeof authorizeRequestSchema> {
   integration: Pick<Integration, "verified" | "projectId" | "userId">;
@@ -32,105 +31,23 @@ export const AuthorizeForm = ({
   integration,
 }: AuthorizeFormProps) => {
   const { data: session } = useSession();
-  const { workspaces, loading: workspacesLoading } = useWorkspaces();
   const [submitting, setSubmitting] = useState(false);
-  const [selectedWorkspace, setSelectedWorkspace] = useState<string | null>(
-    null,
-  );
-
-  const userId = session?.user?.id;
-
-  const isWorkspaceAllowed = useCallback(
-    (workspace: WorkspaceProps) => {
-      if (!userId) {
-        return false;
-      }
-
-      return canInstallOAuthApp({
-        integration,
-        workspace,
-        userId,
-      });
-    },
-    [integration, userId],
-  );
-
-  useEffect(() => {
-    if (!workspaces || workspacesLoading || !userId || selectedWorkspace) {
-      return;
-    }
-
-    const defaultSlug = session?.user?.["defaultWorkspace"] || null;
-    const defaultWorkspace = defaultSlug
-      ? workspaces.find((workspace) => workspace.slug === defaultSlug)
-      : undefined;
-
-    if (defaultWorkspace && isWorkspaceAllowed(defaultWorkspace)) {
-      setSelectedWorkspace(defaultWorkspace.slug);
-      return;
-    }
-
-    const firstAllowed = workspaces.find(isWorkspaceAllowed);
-    setSelectedWorkspace(firstAllowed?.slug ?? defaultSlug);
-  }, [
+  const {
+    selectedWorkspace,
+    setSelectedWorkspace,
     workspaces,
     workspacesLoading,
-    session,
-    userId,
-    selectedWorkspace,
-    isWorkspaceAllowed,
-  ]);
-
-  const authorizeDisabledTooltip = useMemo((): string | undefined => {
-    if (!selectedWorkspace) {
-      return "Please select a workspace to continue";
-    }
-
-    if (workspacesLoading || workspaces === undefined) {
-      return "Loading workspaces...";
-    }
-
-    const workspace = workspaces.find(
-      (workspace) => workspace.slug === selectedWorkspace,
-    );
+  } = useAuthorizeWorkspace();
 
-    if (!workspace) {
-      return "Please select a valid workspace";
-    }
-
-    if (!isWorkspaceAllowed(workspace)) {
-      return UNVERIFIED_APP_INSTALL_MESSAGE;
-    }
-
-    const userRole = workspace.users[0].role;
-
-    const permissionsError = clientAccessCheck({
-      action: "integrations.write",
-      role: userRole,
-      customPermissionDescription: "install this integration",
-    }).error;
-
-    if (typeof permissionsError === "string") {
-      return permissionsError;
-    }
-
-    const missingScopes = consolidateScopes(scope).filter(
-      (scope) =>
-        !getScopesForRole(userRole).includes(scope) && scope !== "user.read",
-    );
-
-    if (missingScopes.length > 0) {
-      return "You don't have the permission to install this integration";
-    }
+  const userId = session?.user?.id;
 
-    return undefined;
-  }, [
+  const authorizeDisabledTooltip = getAuthorizeError({
+    selectedWorkspace,
     workspaces,
     workspacesLoading,
-    selectedWorkspace,
-    scope,
-    isWorkspaceAllowed,
-  ]);
+    integration,
+    userId,
+  });
 
   // Decline the request
   const onDecline = () => {
@@ -151,19 +68,10 @@ export const AuthorizeForm = ({
       return;
     }
 
-    const workspaceId = workspaces?.find(
-      (workspace) => workspace.slug === selectedWorkspace,
-    )?.id;
-
-    if (!workspaceId) {
-      toast.error("Please select a workspace to continue");
-      return;
-    }
-
     setSubmitting(true);
 
     const response = await fetch(
-      `/api/oauth/authorize?workspaceId=${workspaceId}`,
+      `/api/oauth/authorize?workspaceId=${selectedWorkspace.id}`,
       {
         method: "POST",
         body: JSON.stringify(Object.fromEntries(new FormData(e.currentTarget))),
@@ -203,8 +111,12 @@ export const AuthorizeForm = ({
       </p>
       <div className="max-w-md py-2">
         <WorkspaceSelector
-          selectedWorkspace={selectedWorkspace || ""}
-          setSelectedWorkspace={setSelectedWorkspace}
+          selectedWorkspace={selectedWorkspace?.slug || ""}
+          setSelectedWorkspace={(slug) => {
+            setSelectedWorkspace(
+              workspaces?.find((workspace) => workspace.slug === slug) ?? null,
+            );
+          }}
         />
       </div>
       <div className="mt-4 flex justify-between gap-4">
@@ -225,3 +137,44 @@ export const AuthorizeForm = ({
     </form>
   );
 };
+
+const getAuthorizeError = ({
+  selectedWorkspace,
+  workspaces,
+  workspacesLoading,
+  integration,
+  userId,
+}: {
+  selectedWorkspace: WorkspaceProps | null;
+  workspaces: WorkspaceProps[] | undefined;
+  workspacesLoading: boolean;
+  integration: AuthorizeFormProps["integration"];
+  userId: string | undefined;
+}) => {
+  if (!selectedWorkspace) {
+    return "Please select a workspace to continue";
+  }
+
+  if (workspacesLoading || workspaces === undefined) {
+    return "Loading workspaces...";
+  }
+
+  if (
+    !userId ||
+    !canInstallOAuthApp({ integration, workspace: selectedWorkspace, userId })
+  ) {
+    return UNVERIFIED_APP_INSTALL_MESSAGE;
+  }
+
+  const { error: permissionsError } = clientAccessCheck({
+    action: "integrations.write",
+    role: selectedWorkspace.users[0].role,
+    customPermissionDescription: "install this integration",
+  });
+
+  if (typeof permissionsError === "string") {
+    return permissionsError;
+  }
+
+  return undefined;
+};
diff --git a/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-workspace-context.tsx b/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-workspace-context.tsx
new file mode 100644
index 00000000000..29e93ff035e
--- /dev/null
+++ b/apps/web/app/app.dub.co/(auth)/oauth/authorize/authorize-workspace-context.tsx
@@ -0,0 +1,116 @@
+"use client";
+
+import { canInstallOAuthApp } from "@/lib/api/oauth/can-install-oauth-app";
+import useWorkspaces from "@/lib/swr/use-workspaces";
+import { WorkspaceProps } from "@/lib/types";
+import { Integration } from "@prisma/client";
+import { useSession } from "next-auth/react";
+import {
+  createContext,
+  Dispatch,
+  ReactNode,
+  SetStateAction,
+  useContext,
+  useMemo,
+  useState,
+} from "react";
+
+type AuthorizeIntegration = Pick<
+  Integration,
+  "verified" | "projectId" | "userId"
+>;
+
+type AuthorizeWorkspaceContextValue = {
+  selectedWorkspace: WorkspaceProps | null;
+  setSelectedWorkspace: Dispatch<SetStateAction<WorkspaceProps | null>>;
+  workspaces: WorkspaceProps[] | undefined;
+  workspacesLoading: boolean;
+};
+
+const AuthorizeWorkspaceContext =
+  createContext<AuthorizeWorkspaceContextValue | null>(null);
+
+// Shares the selected workspace between the scopes list and the authorize form
+// so missing-scope warnings update when the workspace changes.
+export function AuthorizeWorkspaceProvider({
+  children,
+  integration,
+}: {
+  children: ReactNode;
+  integration: AuthorizeIntegration;
+}) {
+  const { data: session } = useSession();
+  const [selectedWorkspace, setSelectedWorkspace] =
+    useState<WorkspaceProps | null>(null);
+  const { workspaces, loading: workspacesLoading } = useWorkspaces();
+
+  const userId = session?.user?.id;
+  const defaultSlug = session?.user?.["defaultWorkspace"] || null;
+
+  const defaultWorkspace = useMemo(() => {
+    if (!workspaces || !userId) {
+      return null;
+    }
+
+    return getDefaultAuthorizeWorkspace({
+      workspaces,
+      defaultSlug,
+      integration,
+      userId,
+    });
+  }, [workspaces, defaultSlug, integration, userId]);
+
+  return (
+    <AuthorizeWorkspaceContext.Provider
+      value={{
+        selectedWorkspace: selectedWorkspace ?? defaultWorkspace,
+        setSelectedWorkspace,
+        workspaces,
+        workspacesLoading,
+      }}
+    >
+      {children}
+    </AuthorizeWorkspaceContext.Provider>
+  );
+}
+
+export function useAuthorizeWorkspace() {
+  const context = useContext(AuthorizeWorkspaceContext);
+
+  if (!context) {
+    throw new Error(
+      "useAuthorizeWorkspace must be used within AuthorizeWorkspaceProvider",
+    );
+  }
+
+  return context;
+}
+
+function getDefaultAuthorizeWorkspace({
+  workspaces,
+  defaultSlug,
+  integration,
+  userId,
+}: {
+  workspaces: WorkspaceProps[];
+  defaultSlug: string | null;
+  integration: AuthorizeIntegration;
+  userId: string;
+}) {
+  const defaultWorkspace = defaultSlug
+    ? workspaces.find((workspace) => workspace.slug === defaultSlug)
+    : undefined;
+
+  if (
+    defaultWorkspace &&
+    canInstallOAuthApp({ integration, workspace: defaultWorkspace, userId })
+  ) {
+    return defaultWorkspace;
+  }
+
+  const firstAllowed = workspaces.find((workspace) =>
+    canInstallOAuthApp({ integration, workspace, userId }),
+  );
+
+  return firstAllowed ?? defaultWorkspace ?? null;
+}
diff --git a/apps/web/app/app.dub.co/(auth)/oauth/authorize/page.tsx b/apps/web/app/app.dub.co/(auth)/oauth/authorize/page.tsx
index f80f079e725..f47b64a6f70 100644
--- a/apps/web/app/app.dub.co/(auth)/oauth/authorize/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/oauth/authorize/page.tsx
@@ -1,15 +1,17 @@
 import { validateAuthorizeRequest } from "@/lib/api/oauth/actions";
 import { getSession } from "@/lib/auth";
 import { authorizeRequestSchema } from "@/lib/zod/schemas/oauth";
+import { Callout } from "@/ui/shared/callout";
 import EmptyState from "@/ui/shared/empty-state";
 import { BlurImage, Logo } from "@dub/ui";
-import { CircleWarning, CubeSettings } from "@dub/ui/icons";
+import { CubeSettings } from "@dub/ui/icons";
 import { constructMetadata } from "@dub/utils";
 import { ArrowLeftRight } from "lucide-react";
 import { redirect } from "next/navigation";
 import { Suspense } from "react";
 import * as z from "zod/v4";
 import { AuthorizeForm } from "./authorize-form";
+import { AuthorizeWorkspaceProvider } from "./authorize-workspace-context";
 import { ScopesRequested } from "./scopes-requested";
 
 export const metadata = constructMetadata({
@@ -81,9 +83,12 @@ export default async function Authorize(props: {
         </span>
 
         {!integration.verified && (
-          <div className="flex w-full items-start gap-2.5 rounded-lg border border-amber-200 bg-amber-50 p-3 text-left sm:-mx-6 sm:w-auto sm:self-stretch">
-            <CircleWarning className="mt-0.5 size-4 shrink-0 text-amber-600" />
-            <div className="flex flex-col gap-0.5 text-sm text-amber-900">
+          <Callout
+            variant="warn"
+            size={2}
+            className="w-full text-left sm:-mx-6 sm:w-auto sm:self-stretch"
+          >
+            <div className="flex flex-col gap-0.5">
               <p className="font-medium">
                 Dub hasn't verified this integration
               </p>
@@ -92,17 +97,19 @@ export default async function Authorize(props: {
                 workspace.
               </p>
             </div>
-          </div>
+          </Callout>
         )}
       </div>
-      <div className="flex flex-col space-y-3 px-4 py-6 sm:px-10">
-        <ScopesRequested scopes={requestParams.scope} />
-      </div>
-      <div className="flex flex-col space-y-2 border-t border-neutral-200 px-4 py-6 sm:rounded-b-2xl sm:px-10">
-        <Suspense>
-          <AuthorizeForm {...requestParams} integration={integration} />
-        </Suspense>
-      </div>
+      <AuthorizeWorkspaceProvider integration={integration}>
+        <div className="flex flex-col space-y-3 px-4 py-6 sm:px-10">
+          <ScopesRequested scopes={requestParams.scope} />
+        </div>
+        <div className="flex flex-col space-y-2 border-t border-neutral-200 px-4 py-6 sm:rounded-b-2xl sm:px-10">
+          <Suspense>
+            <AuthorizeForm {...requestParams} integration={integration} />
+          </Suspense>
+        </div>
+      </AuthorizeWorkspaceProvider>
     </div>
   );
 }
diff --git a/apps/web/app/app.dub.co/(auth)/oauth/authorize/scopes-requested.tsx b/apps/web/app/app.dub.co/(auth)/oauth/authorize/scopes-requested.tsx
index ba325fd6b16..31be1e2ad7b 100644
--- a/apps/web/app/app.dub.co/(auth)/oauth/authorize/scopes-requested.tsx
+++ b/apps/web/app/app.dub.co/(auth)/oauth/authorize/scopes-requested.tsx
@@ -1,47 +1,54 @@
 "use client";
 
 import { OAUTH_SCOPE_DESCRIPTIONS } from "@/lib/api/oauth/constants";
-import { consolidateScopes } from "@/lib/api/tokens/scopes";
+import { getDisplayedScopesForRole } from "@/lib/api/tokens/scopes";
+import { Tooltip } from "@dub/ui";
+import { LoadingSpinner, TriangleWarning } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
 import { Check } from "lucide-react";
+import { useAuthorizeWorkspace } from "./authorize-workspace-context";
 
-interface ScopesProps {
-  scopes: string[];
-}
+export const ScopesRequested = ({ scopes }: { scopes: string[] }) => {
+  const { selectedWorkspace } = useAuthorizeWorkspace();
 
-export const ScopesRequested = ({ scopes }: ScopesProps) => {
   // Add default scopes if not present
-  if (!scopes.includes("user.read")) {
-    scopes.push("user.read");
-  }
-
-  const scopeWithDescriptions = consolidateScopes(scopes).map((scope) => {
-    return {
-      scope,
-      description: OAUTH_SCOPE_DESCRIPTIONS[scope],
-    };
-  });
+  const requestedScopes = scopes.includes("user.read")
+    ? scopes
+    : [...scopes, "user.read"];
 
-  scopeWithDescriptions.forEach((scope) => {
-    scope.description = scope.description.replace(
-      "Write",
-      "<strong className='font-medium'>Write</strong>",
-    );
+  if (!selectedWorkspace) {
+    return <ScopesRequestedPlaceholder />;
+  }
 
-    scope.description = scope.description.replace(
-      "Read",
-      "<strong className='font-medium'>Read</strong>",
-    );
+  const displayedScopes = getDisplayedScopesForRole({
+    scopes: requestedScopes,
+    role: selectedWorkspace.users[0].role,
   });
 
   return (
     <>
       <span className="text-neutral-600">Grant permissions:</span>
       <ul className="text-md space-y-1">
-        {scopeWithDescriptions.map((scope) => {
+        {displayedScopes.map((scope) => {
+          const catalog = OAUTH_SCOPE_DESCRIPTIONS[scope.scope];
+          // Denied write rows: "Write access to …" (not "Read and Write …")
+          // so granted read can sit beside them without sounding like write still includes read.
+          const description =
+            scope.missing && catalog.startsWith("Read and Write")
+              ? catalog.replace("Read and Write", "Write")
+              : catalog;
+
           return (
             <li className="flex items-center gap-2" key={scope.scope}>
-              <Check className="h-4 w-4 text-green-500" />
-              <div dangerouslySetInnerHTML={{ __html: scope.description }} />
+              {scope.missing ? (
+                <MissingScopeWarning />
+              ) : (
+                <Check className="size-4 shrink-0 text-green-500" />
+              )}
+              <ScopeDescription
+                description={description}
+                missing={scope.missing}
+              />
             </li>
           );
         })}
@@ -49,3 +56,46 @@ export const ScopesRequested = ({ scopes }: ScopesProps) => {
     </>
   );
 };
+
+const ScopesRequestedPlaceholder = () => {
+  return (
+    <>
+      <span className="text-neutral-600">Grant permissions:</span>
+      <div className="flex min-h-24 items-center justify-center">
+        <LoadingSpinner className="size-4" />
+      </div>
+    </>
+  );
+};
+
+const ScopeDescription = ({
+  description,
+  missing,
+}: {
+  description: string;
+  missing: boolean;
+}) => {
+  const parts = description.split(/(Read|Write)/g);
+
+  return (
+    <div className={cn(missing && "text-neutral-500")}>
+      {parts.map((part, index) =>
+        part === "Read" || part === "Write" ? (
+          <strong key={index}>{part}</strong>
+        ) : (
+          part
+        ),
+      )}
+    </div>
+  );
+};
+
+const MissingScopeWarning = () => {
+  return (
+    <Tooltip content="Your role in this workspace doesn't include this permission, so it won't be granted.">
+      <span className="inline-flex shrink-0 cursor-help">
+        <TriangleWarning className="size-4 text-amber-500" variant="fill" />
+      </span>
+    </Tooltip>
+  );
+};
diff --git a/apps/web/app/app.dub.co/(auth-marketing)/customer-carousel.tsx b/apps/web/app/app.dub.co/(auth-marketing)/customer-carousel.tsx
new file mode 100644
index 00000000000..c0836043acd
--- /dev/null
+++ b/apps/web/app/app.dub.co/(auth-marketing)/customer-carousel.tsx
@@ -0,0 +1,169 @@
+"use client";
+
+import { AnimatePresence, motion } from "motion/react";
+import Link from "next/link";
+import { useState } from "react";
+
+const AUTO_ADVANCE_MS = 4000;
+const EASE_OUT = [0.23, 1, 0.32, 1] as const;
+// Logos are dark on assets.dub.co; this filter renders them white
+const WHITE_LOGO = "brightness(0) invert(1)";
+
+const CUSTOMERS: {
+  name: string;
+  slug: string;
+  logo: string;
+  image: string;
+  headline: string;
+  /** Tint color for the bottom gradient */
+  color: string;
+}[] = [
+  {
+    name: "Framer",
+    slug: "framer",
+    logo: "https://assets.dub.co/companies/framer.svg",
+    image: "https://assets.dub.co/cms/framer-thumbnail.jpg",
+    headline:
+      "Learn how Framer manages $900K+ in monthly affiliate payouts with Dub",
+    color: "#0088FF",
+  },
+  {
+    name: "Wispr Flow",
+    slug: "wisprflow",
+    logo: "https://assets.dub.co/companies/wisprflow.svg",
+    image: "https://assets.dub.co/cms/wisprflow-cover.jpg",
+    headline: "Learn how Wispr Flow reached millions more users with Dub",
+    color: "#024F46",
+  },
+  {
+    name: "Chatbase",
+    slug: "chatbase",
+    logo: "https://assets.dub.co/companies/chatbase.svg",
+    image: "https://assets.dub.co/cms/chatbase-cover.jpg",
+    headline:
+      "Learn how Chatbase migrated from Rewardful and increased affiliate revenue by 318%",
+    color: "#D85AC8",
+  },
+  {
+    name: "Tella",
+    slug: "tella",
+    logo: "https://assets.dub.co/companies/tella.svg",
+    image: "https://assets.dub.co/cms/tella-thumbnail.jpg",
+    headline:
+      "Learn how Tella increased affiliate revenue by 38% by switching from Rewardful to Dub",
+    color: "#8278FA",
+  },
+];
+
+export function CustomerCarousel() {
+  const [index, setIndex] = useState(0);
+  const customer = CUSTOMERS[index];
+
+  const goTo = (next: number) => setIndex(next % CUSTOMERS.length);
+
+  return (
+    <div className="relative h-[452px] w-full max-w-[481px] overflow-hidden rounded-xl bg-neutral-900">
+      {/* Photo */}
+      <AnimatePresence initial={false}>
+        <motion.img
+          key={customer.slug}
+          src={customer.image}
+          alt={customer.name}
+          initial={{ opacity: 0, scale: 1.04 }}
+          animate={{ opacity: 1, scale: 1 }}
+          exit={{ opacity: 0 }}
+          transition={{ duration: 0.6, ease: EASE_OUT }}
+          className="absolute inset-x-0 top-0 h-[360px] w-full object-cover"
+        />
+      </AnimatePresence>
+
+      {/* Fade photo into the dark base */}
+      <div className="pointer-events-none absolute inset-x-0 bottom-[102px] h-[171px] bg-gradient-to-b from-neutral-900/0 to-neutral-900" />
+      <div className="pointer-events-none absolute inset-x-0 bottom-0 h-[103px] bg-neutral-900" />
+
+      {/* Customer tint */}
+      <AnimatePresence initial={false}>
+        <motion.div
+          key={customer.slug}
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 0.5 }}
+          exit={{ opacity: 0 }}
+          transition={{ duration: 0.6, ease: EASE_OUT }}
+          className="pointer-events-none absolute -inset-x-16 -bottom-8 h-[300px] -rotate-6 blur-2xl"
+          style={{
+            background: `linear-gradient(to bottom, transparent 20%, ${customer.color})`,
+          }}
+        />
+      </AnimatePresence>
+
+      {/* Copy */}
+      <div className="absolute bottom-[60px] left-6 right-6 flex max-w-[345px] flex-col gap-6">
+        <AnimatePresence initial={false} mode="popLayout">
+          <motion.div key={customer.slug} className="flex flex-col gap-3">
+            <motion.img
+              src={customer.logo}
+              alt={customer.name}
+              initial={{ opacity: 0, y: 12, filter: `${WHITE_LOGO} blur(4px)` }}
+              animate={{ opacity: 1, y: 0, filter: `${WHITE_LOGO} blur(0px)` }}
+              exit={{ opacity: 0, y: -8, filter: `${WHITE_LOGO} blur(4px)` }}
+              transition={{ duration: 0.45, ease: EASE_OUT, delay: 0.04 }}
+              className="h-7 w-auto self-start"
+            />
+            <motion.p
+              initial={{ opacity: 0, y: 12, filter: "blur(4px)" }}
+              animate={{ opacity: 1, y: 0, filter: "blur(0px)" }}
+              exit={{ opacity: 0, y: -8, filter: "blur(4px)" }}
+              transition={{ duration: 0.45, ease: EASE_OUT }}
+              className="text-pretty text-base font-medium leading-6 tracking-[-0.02em] text-white"
+            >
+              {customer.headline}
+            </motion.p>
+          </motion.div>
+        </AnimatePresence>
+
+        <Link
+          href={`https://dub.co/customers/${customer.slug}`}
+          target="_blank"
+          className="text-content-emphasis flex h-7 w-fit items-center rounded-lg border border-neutral-200 bg-white px-2.5 text-sm font-medium hover:bg-neutral-100"
+        >
+          Read more
+        </Link>
+      </div>
+
+      {/* Inner border, painted over the image */}
+      <div className="pointer-events-none absolute inset-0 z-10 rounded-xl border border-white/10" />
+
+      {/* Progress bars */}
+      <div className="absolute inset-x-6 bottom-6 flex items-center gap-3">
+        {CUSTOMERS.map((c, i) => {
+          const isActive = i === index;
+          return (
+            <button
+              key={c.slug}
+              type="button"
+              aria-label={`Show ${c.name}`}
+              aria-current={isActive}
+              onClick={() => goTo(i)}
+              className="group relative h-1 min-w-0 flex-1 cursor-pointer"
+            >
+              <div className="h-full w-full rounded-full bg-white/20 transition-colors group-hover:bg-white/30" />
+              {isActive && (
+                <motion.div
+                  key={index}
+                  initial={{ scaleX: 0 }}
+                  animate={{ scaleX: 1 }}
+                  transition={{
+                    duration: AUTO_ADVANCE_MS / 1000,
+                    ease: "linear",
+                  }}
+                  onAnimationComplete={() => goTo(index + 1)}
+                  className="absolute inset-0 origin-left rounded-full bg-white"
+                />
+              )}
+            </button>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(auth-marketing)/customer-logos.tsx b/apps/web/app/app.dub.co/(auth-marketing)/customer-logos.tsx
index 640c5945ec8..869754aa1a1 100644
--- a/apps/web/app/app.dub.co/(auth-marketing)/customer-logos.tsx
+++ b/apps/web/app/app.dub.co/(auth-marketing)/customer-logos.tsx
@@ -4,32 +4,35 @@ import { cn } from "@dub/utils";
 
 const CUSTOMER_LOGOS: { name: string; src: string; className?: string }[] = [
   {
-    name: "Framer",
-    src: "https://assets.dub.co/companies/framer.svg",
-    className: "h-6",
-  },
-  {
-    name: "Granola",
-    src: "https://assets.dub.co/companies/granola.svg",
+    name: "beehiiv",
+    src: "https://assets.dub.co/companies/beehiiv.svg",
     className: "h-5",
   },
-  { name: "Buffer", src: "https://assets.dub.co/companies/buffer.svg" },
   {
-    name: "Copper",
-    src: "https://assets.dub.co/companies/copper.svg",
+    name: "Wispr Flow",
+    src: "https://assets.dub.co/companies/wisprflow.svg",
     className: "h-4",
   },
+  { name: "Granola", src: "https://assets.dub.co/companies/granola.svg" },
   {
-    name: "Perplexity",
-    src: "https://assets.dub.co/companies/perplexity.svg",
+    name: "Superhuman",
+    src: "https://assets.dub.co/companies/superhuman.svg",
     className: "h-5",
   },
-  { name: "Wispr Flow", src: "https://assets.dub.co/companies/flow.svg" },
+  {
+    name: "Polymarket",
+    src: "https://assets.dub.co/companies/polymarket.svg",
+  },
+  {
+    name: "Viktor",
+    src: "https://assets.dub.co/companies/viktor.svg",
+    className: "h-4",
+  },
 ];
 
 export function CustomerLogos() {
   return (
-    <div className="relative z-10 mx-auto flex max-w-md flex-wrap items-center justify-center gap-x-14 gap-y-8 px-8 pb-12 pt-6 lg:px-10">
+    <div className="relative z-10 mx-auto grid max-w-md grid-cols-3 place-items-center gap-x-12 gap-y-8 px-12 pb-12 pt-6 lg:px-8">
       {CUSTOMER_LOGOS.map((logo, index) => (
         <img
           key={logo.name}
diff --git a/apps/web/app/app.dub.co/(auth-marketing)/layout.tsx b/apps/web/app/app.dub.co/(auth-marketing)/layout.tsx
index 6e509c8240b..047d821f4e7 100644
--- a/apps/web/app/app.dub.co/(auth-marketing)/layout.tsx
+++ b/apps/web/app/app.dub.co/(auth-marketing)/layout.tsx
@@ -1,4 +1,5 @@
 import Toolbar from "@/ui/layout/toolbar/toolbar";
+import { Analytics as DubAnalytics } from "@dub/analytics/react";
 import { Grid, Wordmark } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { ReactNode } from "react";
@@ -11,8 +12,19 @@ export default function AuthMarketingLayout({
 }) {
   return (
     <>
+      <DubAnalytics
+        apiHost="/_proxy/dub"
+        cookieOptions={{
+          domain: process.env.VERCEL === "1" ? ".dub.co" : "localhost",
+        }}
+        domainsConfig={{
+          refer: "refer.dub.co",
+        }}
+        scriptProps={{
+          src: "/_proxy/dub/script.js",
+        }}
+      />
       <Toolbar />
-
       <div className="relative grid min-h-[100dvh] grid-cols-1 min-[900px]:grid-cols-[minmax(0,1fr)_440px] lg:grid-cols-[minmax(0,1fr)_595px]">
         {/* Left: Main auth content */}
         <div className="relative">
@@ -53,7 +65,7 @@ export default function AuthMarketingLayout({
             ))}
           </div>
 
-          <div className="relative flex min-h-[100dvh] min-h-screen w-full justify-center">
+          <div className="relative flex min-h-[100dvh] w-full justify-center">
             <a
               href="https://dub.co"
               target="_blank"
diff --git a/apps/web/app/app.dub.co/(auth-marketing)/register/page-client.tsx b/apps/web/app/app.dub.co/(auth-marketing)/register/page-client.tsx
index 28d3b4c0ff9..b2e37eec39c 100644
--- a/apps/web/app/app.dub.co/(auth-marketing)/register/page-client.tsx
+++ b/apps/web/app/app.dub.co/(auth-marketing)/register/page-client.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { AuthAlternativeBanner } from "@/ui/auth/auth-alternative-banner";
 import {
   RegisterProvider,
@@ -57,7 +58,10 @@ function Verify() {
     <>
       <div className="w-full max-w-sm">
         <div className="flex flex-col items-center gap-1 text-center">
-          <h3 className="text-center text-xl font-semibold">
+          <h3
+            className="text-center text-xl font-semibold"
+            data-testid={testIds.auth.verifyEmailHeading}
+          >
             Verify your email address
           </h3>
           <p className="text-base font-medium text-neutral-500">
diff --git a/apps/web/app/app.dub.co/(auth-marketing)/side-panel.tsx b/apps/web/app/app.dub.co/(auth-marketing)/side-panel.tsx
index a925367ec53..8ef9fbd0dda 100644
--- a/apps/web/app/app.dub.co/(auth-marketing)/side-panel.tsx
+++ b/apps/web/app/app.dub.co/(auth-marketing)/side-panel.tsx
@@ -1,5 +1,5 @@
 import { cn } from "@dub/utils";
-import Link from "next/link";
+import { CustomerCarousel } from "./customer-carousel";
 import { CustomerLogos } from "./customer-logos";
 
 export function SidePanel() {
@@ -26,36 +26,9 @@ export function SidePanel() {
         </div>
       ))}
 
-      {/* Testimonial section - vertically centered */}
+      {/* Customer carousel - vertically centered */}
       <div className="relative flex grow items-center justify-center p-8 lg:p-14">
-        <div className="flex flex-col gap-6">
-          <div className="relative overflow-hidden rounded-xl border border-neutral-900/10">
-            <img
-              src="https://assets.dub.co/cms/framer-thumbnail.jpg"
-              alt="Framer team"
-              className="aspect-[16/12] w-full object-cover"
-            />
-            <div className="pointer-events-none absolute inset-x-0 top-0 h-24 bg-gradient-to-b from-neutral-900 to-transparent opacity-30" />
-            <img
-              src="https://assets.dub.co/companies/framer.svg"
-              alt="Framer"
-              className="absolute left-6 top-6 h-8 w-auto brightness-0 invert"
-            />
-          </div>
-
-          <p className="text-content-default max-w-[370px] text-pretty text-xl font-medium">
-            Learn how Framer manages $900K+ in monthly affiliate payouts with
-            Dub
-          </p>
-
-          <Link
-            href="https://dub.co/customers/framer"
-            target="_blank"
-            className="text-content-emphasis flex h-8 w-fit items-center rounded-lg bg-black/5 px-3 text-sm font-medium transition-[transform,background-color] duration-75 hover:bg-black/10 active:scale-[0.98]"
-          >
-            Read more
-          </Link>
-        </div>
+        <CustomerCarousel />
       </div>
 
       <CustomerLogos />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page-client.tsx
deleted file mode 100644
index 765a7a41f53..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page-client.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-"use client";
-
-import { CUSTOMER_PAGE_EVENTS_LIMIT } from "@/lib/constants/misc";
-import useCustomer from "@/lib/swr/use-customer";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { CommissionResponse, CustomerEnriched } from "@/lib/types";
-import { CustomerPartnerEarningsTable } from "@/ui/customers/customer-partner-earnings-table";
-import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { ArrowUpRight } from "@dub/ui";
-import { fetcher } from "@dub/utils";
-import Link from "next/link";
-import { redirect, useParams } from "next/navigation";
-import { memo } from "react";
-import useSWR from "swr";
-
-export function CustomerEarningsPageClient() {
-  const { customerId } = useParams<{ customerId: string }>();
-
-  const { slug } = useWorkspace();
-  const { data: customer, isLoading } = useCustomer<CustomerEnriched>({
-    customerId,
-    query: { includeExpandedFields: true },
-  });
-
-  if (!customer && !isLoading) redirect(`/${slug}/customers`);
-
-  return !customer || (customer.partner && customer.programId) ? (
-    <section className="flex flex-col gap-4">
-      <h2 className="text-lg font-semibold text-neutral-900">
-        Partner earnings
-      </h2>
-      <div className="border-border-subtle flex flex-col overflow-hidden rounded-lg border">
-        <Link
-          href={`/${slug}/program/partners/${customer?.partner?.id}`}
-          target="_blank"
-          className="group flex items-center justify-between overflow-hidden bg-neutral-100 px-3 py-2.5"
-        >
-          <div className="flex min-w-0 items-center gap-3">
-            {customer?.partner ? (
-              <>
-                <PartnerAvatar partner={customer.partner} className="size-5" />
-                <span className="block min-w-0 truncate text-sm font-medium text-neutral-900">
-                  {customer.partner.name}
-                </span>
-              </>
-            ) : (
-              <>
-                <div className="size-5 animate-pulse rounded-full bg-neutral-200" />
-                <div className="h-5 w-24 animate-pulse rounded bg-neutral-200" />
-              </>
-            )}
-          </div>
-          <ArrowUpRight className="size-3 shrink-0 -translate-x-0.5 translate-y-0.5 opacity-0 transition-[transform,opacity] group-hover:translate-x-0 group-hover:translate-y-0 group-hover:opacity-100" />
-        </Link>
-
-        <div className="border-border-subtle border-t">
-          <PartnerEarningsTable customerId={customerId} />
-        </div>
-      </div>
-    </section>
-  ) : null;
-}
-
-const PartnerEarningsTable = memo(({ customerId }: { customerId: string }) => {
-  const { id: workspaceId, slug } = useWorkspace();
-
-  const { data: commissions, isLoading: isComissionsLoading } = useSWR<
-    CommissionResponse[]
-  >(
-    `/api/commissions?${new URLSearchParams({
-      customerId,
-      workspaceId: workspaceId!,
-      pageSize: CUSTOMER_PAGE_EVENTS_LIMIT.toString(),
-    })}`,
-    fetcher,
-  );
-
-  const { data: totalCommissions, isLoading: isTotalCommissionsLoading } =
-    useSWR<{ all: { count: number } }>(
-      // Only fetch total earnings count if the earnings data is equal to the limit
-      commissions?.length === CUSTOMER_PAGE_EVENTS_LIMIT &&
-        `/api/commissions/count?${new URLSearchParams({
-          customerId,
-          workspaceId: workspaceId!,
-        })}`,
-      fetcher,
-    );
-
-  return (
-    <CustomerPartnerEarningsTable
-      commissions={commissions}
-      totalCommissions={
-        isTotalCommissionsLoading
-          ? undefined
-          : totalCommissions?.all?.count ?? commissions?.length
-      }
-      isLoading={isComissionsLoading}
-    />
-  );
-});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsx
index effdf5c3a79..6c9a612a2dd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/earnings/page.tsx
@@ -1,5 +1,100 @@
-import { CustomerEarningsPageClient } from "./page-client";
+"use client";
+
+import { CUSTOMER_PAGE_EVENTS_LIMIT } from "@/lib/constants/misc";
+import useCustomer from "@/lib/swr/use-customer";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { CommissionResponse, CustomerEnriched } from "@/lib/types";
+import { CustomerPartnerEarningsTable } from "@/ui/customers/customer-partner-earnings-table";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { ArrowUpRight } from "@dub/ui";
+import { fetcher } from "@dub/utils";
+import Link from "next/link";
+import { redirect, useParams } from "next/navigation";
+import { memo } from "react";
+import useSWR from "swr";
 
 export default function CustomerEarningsPage() {
-  return <CustomerEarningsPageClient />;
+  const { customerId } = useParams<{ customerId: string }>();
+
+  const { slug } = useWorkspace();
+  const { data: customer, isLoading } = useCustomer<CustomerEnriched>({
+    customerId,
+    query: { includeExpandedFields: true },
+  });
+
+  if (!customer && !isLoading) redirect(`/${slug}/customers`);
+
+  return !customer || (customer.partner && customer.programId) ? (
+    <section className="flex flex-col gap-4">
+      <h2 className="text-lg font-semibold text-neutral-900">
+        Partner earnings
+      </h2>
+      <div className="border-border-subtle flex flex-col overflow-hidden rounded-lg border">
+        <Link
+          href={`/${slug}/program/partners/${customer?.partner?.id}`}
+          target="_blank"
+          className="group flex items-center justify-between overflow-hidden bg-neutral-100 px-3 py-2.5"
+        >
+          <div className="flex min-w-0 items-center gap-3">
+            {customer?.partner ? (
+              <>
+                <PartnerAvatar partner={customer.partner} className="size-5" />
+                <span className="block min-w-0 truncate text-sm font-medium text-neutral-900">
+                  {customer.partner.name}
+                </span>
+              </>
+            ) : (
+              <>
+                <div className="size-5 animate-pulse rounded-full bg-neutral-200" />
+                <div className="h-5 w-24 animate-pulse rounded bg-neutral-200" />
+              </>
+            )}
+          </div>
+          <ArrowUpRight className="size-3 shrink-0 -translate-x-0.5 translate-y-0.5 opacity-0 transition-[transform,opacity] group-hover:translate-x-0 group-hover:translate-y-0 group-hover:opacity-100" />
+        </Link>
+
+        <div className="border-border-subtle border-t">
+          <PartnerEarningsTable customerId={customerId} />
+        </div>
+      </div>
+    </section>
+  ) : null;
 }
+
+const PartnerEarningsTable = memo(({ customerId }: { customerId: string }) => {
+  const { id: workspaceId, slug } = useWorkspace();
+
+  const { data: commissions, isLoading: isComissionsLoading } = useSWR<
+    CommissionResponse[]
+  >(
+    `/api/commissions?${new URLSearchParams({
+      customerId,
+      workspaceId: workspaceId!,
+      pageSize: CUSTOMER_PAGE_EVENTS_LIMIT.toString(),
+    })}`,
+    fetcher,
+  );
+
+  const { data: totalCommissions, isLoading: isTotalCommissionsLoading } =
+    useSWR<{ all: { count: number } }>(
+      // Only fetch total earnings count if the earnings data is equal to the limit
+      commissions?.length === CUSTOMER_PAGE_EVENTS_LIMIT &&
+        `/api/commissions/count?${new URLSearchParams({
+          customerId,
+          workspaceId: workspaceId!,
+        })}`,
+      fetcher,
+    );
+
+  return (
+    <CustomerPartnerEarningsTable
+      commissions={commissions}
+      totalCommissions={
+        isTotalCommissionsLoading
+          ? undefined
+          : totalCommissions?.all?.count ?? commissions?.length
+      }
+      isLoading={isComissionsLoading}
+    />
+  );
+});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsx
index f1a9b51d06c..6222f01b4ad 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/links/customers/[customerId]/layout.tsx
@@ -83,7 +83,6 @@ export default function CustomerLayout({ children }: { children: ReactNode }) {
               customer={customer}
               customerActivity={customerActivity}
               isCustomerActivityLoading={!customer || isCustomerActivityLoading}
-              workspaceSlug={workspaceSlug}
             />
           </div>
           <div className="@3xl/page:order-1">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
index 86843091acb..c5a2a1aa631 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/[bountyId]/bounty-submission-details-sheet.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { BountySubmissionStatusBadges } from "@/lib/bounty/bounty-submission-status-badges";
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { REJECT_BOUNTY_SUBMISSION_REASONS } from "@/lib/bounty/constants";
 import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";
 import { resolveBountyDetails } from "@/lib/bounty/utils";
@@ -65,7 +66,13 @@ function BountySubmissionDetailsSheetContent({
   setIsOpen,
 }: BountySubmissionDetailsSheetProps) {
   const { bounty } = useBounty();
-  const { slug: workspaceSlug } = useWorkspace();
+  const { slug: workspaceSlug, role } = useWorkspace();
+
+  const permissionsError = clientAccessCheck({
+    action: "bounties.write",
+    role,
+    customPermissionDescription: "review bounty submissions",
+  }).error;
 
   const { setShowRejectModal, RejectBountySubmissionModal } =
     useRejectBountySubmissionModal(submission, onNext);
@@ -131,7 +138,7 @@ function BountySubmissionDetailsSheetContent({
         );
       }
     },
-    { sheet: true },
+    { sheet: true, enabled: !permissionsError },
   );
 
   useKeyboardShortcut(
@@ -141,7 +148,7 @@ function BountySubmissionDetailsSheetContent({
         setShowRejectModal(true);
       }
     },
-    { sheet: true },
+    { sheet: true, enabled: !permissionsError },
   );
 
   const isValidForm = useMemo(() => {
@@ -565,11 +572,13 @@ function BountySubmissionDetailsSheetContent({
                     text="Reject"
                     shortcut="R"
                     disabledTooltip={
-                      submission.status === "draft"
-                        ? "Bounty submission is in progress."
-                        : submission.status === "rejected"
-                          ? "Bounty submission already rejected."
-                          : undefined
+                      permissionsError
+                        ? permissionsError
+                        : submission.status === "draft"
+                          ? "Bounty submission is in progress."
+                          : submission.status === "rejected"
+                            ? "Bounty submission already rejected."
+                            : undefined
                     }
                     disabled={submission.status === "draft"}
                     onClick={() => setShowRejectModal(true)}
@@ -588,9 +597,11 @@ function BountySubmissionDetailsSheetContent({
                       )
                     }
                     disabledTooltip={
-                      submission.status === "draft"
-                        ? "Bounty submission is in progress."
-                        : undefined
+                      permissionsError
+                        ? permissionsError
+                        : submission.status === "draft"
+                          ? "Bounty submission is in progress."
+                          : undefined
                     }
                     disabled={!isValidForm || submission.status === "draft"}
                   />
@@ -601,7 +612,7 @@ function BountySubmissionDetailsSheetContent({
         </div>
       </div>
 
-      <RejectBountySubmissionModal />
+      {RejectBountySubmissionModal}
       {ConfirmApproveBountySubmissionModal}
     </div>
   );
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
index 1e73ff202a0..10c6ef18564 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/add-edit-bounty-sheet.tsx
@@ -256,7 +256,6 @@ function BountySheetContent({ setIsOpen, bounty }: BountySheetProps) {
                     </div>
 
                     <BountyDuration
-                      isEditing={!!bounty}
                       value={bountyTimingValue}
                       onChange={handleTimingChange}
                     />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-duration.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-duration.tsx
index d547ffaa380..113e2f751e6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-duration.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-duration.tsx
@@ -23,6 +23,7 @@ import {
 import { cn, formatDate } from "@dub/utils";
 import { BountyStartMode } from "@prisma/client";
 import { addDays, addMonths, addWeeks } from "date-fns";
+import { useParams } from "next/navigation";
 import { ReactNode, useContext, useEffect, useState } from "react";
 
 type PresetOption<T extends string> = { value: T; label: string };
@@ -388,14 +389,11 @@ function BountyDatePicker<T extends string>({
 interface BountyDurationProps {
   value: BountyTimingInput;
   onChange: (value: BountyTimingInput) => void;
-  isEditing?: boolean;
 }
 
-export function BountyDuration({
-  value,
-  onChange,
-  isEditing = false,
-}: BountyDurationProps) {
+export function BountyDuration({ value, onChange }: BountyDurationProps) {
+  const { bountyId } = useParams();
+  const isEditing = !!bountyId;
   const initialPresets = parsePresetsFromValue(value, isEditing);
 
   const [startPreset, setStartPreset] = useState<StartPreset>(
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-logic.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-logic.tsx
index 7c16729f27f..686cec26e02 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-logic.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/add-edit-bounty/bounty-logic.tsx
@@ -10,9 +10,11 @@ import {
   InlineBadgePopover,
   InlineBadgePopoverMenu,
 } from "@/ui/shared/inline-badge-popover";
+import { DynamicTooltipWrapper } from "@dub/ui";
 import { Trophy } from "@dub/ui/icons";
 import { cn, currencyFormatter, nFormatter } from "@dub/utils";
 import { BountyStartMode } from "@prisma/client";
+import { useParams } from "next/navigation";
 import { Controller } from "react-hook-form";
 import { BountyAmountInput } from "./bounty-amount-input";
 import { useBountyFormContext } from "./bounty-form-context";
@@ -23,6 +25,9 @@ const PERFORMANCE_SCOPE_DESCRIPTIONS = {
 } as const;
 
 export function BountyLogic({ className }: { className?: string }) {
+  const { bountyId } = useParams();
+  const isEditing = !!bountyId;
+
   const { control, watch } = useBountyFormContext();
 
   const [attribute, value, startMode] = watch([
@@ -45,31 +50,45 @@ export function BountyLogic({ className }: { className?: string }) {
             control={control}
             name="performanceScope"
             render={({ field }) => (
-              <InlineBadgePopover
-                text={field.value}
-                invalid={!field.value}
-                align="center"
+              <DynamicTooltipWrapper
+                tooltipProps={
+                  isEditing
+                    ? {
+                        content:
+                          "Performance scope cannot be changed after bounty creation.",
+                      }
+                    : undefined
+                }
               >
-                <InlineBadgePopoverMenu
-                  selectedValue={field.value}
-                  onSelect={field.onChange}
-                  items={[
-                    {
-                      text: "new",
-                      value: "new",
-                      description: PERFORMANCE_SCOPE_DESCRIPTIONS.new,
-                    },
-                    {
-                      text: isRelative
-                        ? "lifetime (not available)"
-                        : "lifetime",
-                      value: "lifetime",
-                      description: `${PERFORMANCE_SCOPE_DESCRIPTIONS.lifetime}${isRelative ? " (not available for relative start dates)" : ""}`,
-                      disabled: isRelative,
-                    },
-                  ]}
-                />
-              </InlineBadgePopover>
+                <span>
+                  <InlineBadgePopover
+                    text={field.value}
+                    invalid={!field.value}
+                    align="center"
+                    disabled={isEditing}
+                  >
+                    <InlineBadgePopoverMenu
+                      selectedValue={field.value}
+                      onSelect={field.onChange}
+                      items={[
+                        {
+                          text: "new",
+                          value: "new",
+                          description: PERFORMANCE_SCOPE_DESCRIPTIONS.new,
+                        },
+                        {
+                          text: isRelative
+                            ? "lifetime (not available)"
+                            : "lifetime",
+                          value: "lifetime",
+                          description: `${PERFORMANCE_SCOPE_DESCRIPTIONS.lifetime}${isRelative ? " (not available for relative start dates)" : ""}`,
+                          disabled: isRelative,
+                        },
+                      ]}
+                    />
+                  </InlineBadgePopover>
+                </span>
+              </DynamicTooltipWrapper>
             )}
           />
           <Controller
@@ -104,7 +123,7 @@ export function BountyLogic({ className }: { className?: string }) {
         {attribute && (
           <>
             {" "}
-            is {AWARD_BOUNTY_OPERATORS.gte.label}{" "}
+            {AWARD_BOUNTY_OPERATORS.gte.label}{" "}
             <InlineBadgePopover
               text={
                 value
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx
index a08cbe8c8eb..b9d4fb94cbe 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/bounty-action-button.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import {
   SubmissionsCountByStatus,
@@ -28,7 +29,13 @@ export function BountyActionButton({
   buttonClassName,
 }: BountyActionButtonProps) {
   const [isOpen, setIsOpen] = useState(false);
-  const { id: workspaceId } = useWorkspace();
+  const { id: workspaceId, role } = useWorkspace();
+
+  const permissionsError = clientAccessCheck({
+    action: "bounties.write",
+    role,
+    customPermissionDescription: "manage bounties",
+  }).error;
   const { setShowCreateBountySheet, BountySheet } = useBountySheet({ bounty });
 
   const { submissionsCount } = useBountySubmissionsCount<
@@ -81,6 +88,7 @@ export function BountyActionButton({
             className="h-9 w-fit rounded-lg"
             icon={<PenWriting className="size-4 shrink-0" />}
             onClick={() => setShowCreateBountySheet(true)}
+            disabledTooltip={permissionsError || undefined}
           />
 
           <Popover
@@ -98,9 +106,11 @@ export function BountyActionButton({
                       setShowDeleteModal(true);
                     }}
                     disabledTooltip={
-                      totalSubmissions > 0
-                        ? "Bounties with submissions cannot be deleted."
-                        : undefined
+                      permissionsError
+                        ? permissionsError
+                        : totalSubmissions > 0
+                          ? "Bounties with submissions cannot be deleted."
+                          : undefined
                     }
                   >
                     Delete bounty
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/create-bounty-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/create-bounty-button.tsx
index 06ab7c6c9fb..9d58a7336e3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/create-bounty-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/bounties/create-bounty-button.tsx
@@ -1,15 +1,26 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
+import useWorkspace from "@/lib/swr/use-workspace";
 import { Button, useKeyboardShortcut, useMediaQuery } from "@dub/ui";
 import { useBountySheet } from "./add-edit-bounty/add-edit-bounty-sheet";
 
 export function CreateBountyButton() {
   const { isMobile } = useMediaQuery();
+  const { role } = useWorkspace();
   const { BountySheet, setShowCreateBountySheet } = useBountySheet({
     nested: false,
   });
 
-  useKeyboardShortcut("c", () => setShowCreateBountySheet(true));
+  const permissionsError = clientAccessCheck({
+    action: "bounties.write",
+    role,
+    customPermissionDescription: "create bounties",
+  }).error;
+
+  useKeyboardShortcut("c", () => setShowCreateBountySheet(true), {
+    enabled: !permissionsError,
+  });
 
   return (
     <>
@@ -20,6 +31,7 @@ export function CreateBountyButton() {
         text={`Create${isMobile ? "" : " bounty"}`}
         shortcut="C"
         className="h-8 px-3 sm:h-9"
+        disabledTooltip={permissionsError || undefined}
       />
     </>
   );
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
index 182eb463bf9..f9e6f08cfa5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-editor.tsx
@@ -1,3 +1,4 @@
+import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { uploadCampaignImageAction } from "@/lib/actions/partners/upload-campaign-image";
 import { CAMPAIGN_READONLY_STATUSES } from "@/lib/api/campaigns/constants";
 import { checkWorkflowConditions } from "@/lib/api/workflows/check-workflow-conditions";
@@ -5,12 +6,16 @@ import {
   formatCampaignFromAddress,
   parseCampaignFromAddress,
 } from "@/lib/email/parse-campaign-from-address";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { useEmailDomains } from "@/lib/swr/use-email-domains";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { Campaign, UpdateCampaignFormData } from "@/lib/types";
-import { EMAIL_TEMPLATE_VARIABLES } from "@/lib/zod/schemas/campaigns";
+import {
+  EMAIL_TEMPLATE_VARIABLE_INFO,
+  EMAIL_TEMPLATE_VARIABLES,
+} from "@/lib/zod/schemas/campaigns";
 import { PageContentWithSidePanel } from "@/ui/layout/page-content/page-content-with-side-panel";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import {
@@ -27,7 +32,7 @@ import {
   TooltipContent,
   useKeyboardShortcut,
 } from "@dub/ui";
-import { capitalize, cn, pluck } from "@dub/utils";
+import { capitalize, cn, pluck, toErrorMessage } from "@dub/utils";
 import { CampaignStatus } from "@prisma/client";
 import slugify from "@sindresorhus/slugify";
 import { motion } from "motion/react";
@@ -178,7 +183,7 @@ function CampaignFromField({
       <input
         type="text"
         placeholder={displayNamePlaceholder}
-        className="text-content-default placeholder:text-content-muted min-w-0 flex-1 border-0 bg-transparent p-0 focus:outline-none focus:ring-0 sm:text-sm"
+        className="text-content-default placeholder:text-content-muted min-w-0 flex-1 cursor-pointer border-0 bg-transparent p-0 focus:outline-none focus:ring-0 disabled:cursor-not-allowed sm:text-sm"
         disabled={disabled}
         value={displayName}
         onChange={(e) => {
@@ -213,7 +218,7 @@ function CampaignFromField({
           type="text"
           placeholder="address"
           style={{ width: Math.max(localPartWidth, 1) }}
-          className="text-content-default placeholder:text-content-muted m-0 max-w-[12rem] border-0 bg-transparent p-0 text-sm leading-none focus:outline-none focus:ring-0"
+          className="text-content-default placeholder:text-content-muted m-0 max-w-[12rem] cursor-pointer border-0 bg-transparent p-0 text-sm leading-none focus:outline-none focus:ring-0 disabled:cursor-not-allowed"
           disabled={disabled}
           value={localPart}
           onChange={(e) => {
@@ -414,6 +419,14 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
   const statusBadge = CAMPAIGN_STATUS_BADGES[campaign.status];
 
   const editorRef = useRef<{ setContent: (content: any) => void }>(null);
+  const subjectInputProps = register("subject");
+
+  // Whether the subject text is clipped by the input's edge (shows a fade when it is)
+  const [subjectOverflows, setSubjectOverflows] = useState(false);
+  const subjectResizeObserverRef = useRef<ResizeObserver | null>(null);
+  const measureSubjectOverflow = (input: HTMLInputElement) =>
+    setSubjectOverflows(input.scrollWidth > input.clientWidth);
+
   const previewInputProps = register("preview", {
     onBlur: (e) => {
       if (!e.target.value) setShowPreviewText(false);
@@ -585,7 +598,16 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
                         value={field.value}
                         onChange={field.onChange}
                         placeholder='E.g. "tomorrow at 5pm" or "in 2 hours"'
-                        className="hover:border-border-subtle mt-0 h-8 min-h-8 border-transparent shadow-none focus-within:border-black/75 focus-within:ring-black/75 hover:cursor-pointer hover:bg-neutral-100"
+                        className={cn(
+                          "hover:border-border-subtle mt-0 h-8 min-h-8 border-transparent shadow-none focus-within:border-black/75 focus-within:ring-black/75 hover:cursor-pointer hover:bg-neutral-100",
+                          // Like the text inputs: only colors animate, so the focus ring appears at once
+                          "transition-colors",
+                          // Keep the focused look (like the text inputs) even while hovered: the hover state
+                          // sticks while the native picker is open, since the page stops getting mouse events
+                          "hover:focus-within:border-black/75 hover:focus-within:bg-white",
+                          // Match the padding and cursor of the other inputs (the forms plugin gives inputs px-3 by default)
+                          "[&_button]:px-1.5 [&_input]:cursor-pointer [&_input]:px-1.5 [&_input]:py-0",
+                        )}
                       />
                     </DisabledInputWrapper>
                   )}
@@ -605,11 +627,40 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
                   placeholder="Enter a subject..."
                   className={cn(
                     inputClassName,
+                    "peer",
                     !isLocked && !showPreviewText && "pr-24",
                   )}
                   disabled={isLocked}
-                  {...register("subject")}
+                  {...subjectInputProps}
+                  ref={(input) => {
+                    subjectInputProps.ref(input);
+
+                    // Re-measure the overflow whenever the input is resized
+                    subjectResizeObserverRef.current?.disconnect();
+                    if (!input) return;
+                    subjectResizeObserverRef.current = new ResizeObserver(() =>
+                      measureSubjectOverflow(input),
+                    );
+                    subjectResizeObserverRef.current.observe(input);
+                  }}
+                  onChange={(e) => {
+                    subjectInputProps.onChange(e);
+                    measureSubjectOverflow(e.currentTarget);
+                  }}
                 />
+                {/* Fades out subject text that is clipped by the input's edge (hidden while editing).
+                    The gradient ends in currentColor so it can transition along with the input's hover background. */}
+                {subjectOverflows && (
+                  <div
+                    aria-hidden
+                    className={cn(
+                      "pointer-events-none absolute inset-y-0 w-12 bg-gradient-to-r from-transparent to-current text-white transition-[color,opacity] duration-150",
+                      "peer-hover:text-neutral-100 peer-focus:opacity-0",
+                      "group-hover/locked:text-neutral-100",
+                      !isLocked && !showPreviewText ? "right-24" : "right-1.5",
+                    )}
+                  />
+                )}
                 {!isLocked && (
                   <div className="absolute right-0 top-1/2 -translate-y-1/2">
                     <button
@@ -690,15 +741,36 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
                     initialValue={field.value}
                     onChange={(editor) => field.onChange(editor.getJSON())}
                     variables={[...EMAIL_TEMPLATE_VARIABLES]}
+                    variableInfo={EMAIL_TEMPLATE_VARIABLE_INFO}
                     editable={!isLocked}
+                    imageAccept={UPLOAD_POLICIES.programCampaignImages.contentTypes.join(
+                      ",",
+                    )}
                     uploadImage={async (file) => {
                       try {
+                        const { maxBytes } =
+                          UPLOAD_POLICIES.programCampaignImages;
+                        const maxFileSizeMB = maxBytes / (1024 * 1024);
+
+                        if (file.size > maxBytes) {
+                          throw new Error(
+                            `File size too big (max ${maxFileSizeMB} MB)`,
+                          );
+                        }
+
                         const result = await executeImageUpload({
                           workspaceId: workspaceId!,
+                          contentType: file.type,
+                          contentLength: file.size,
                         });
 
                         if (!result?.data) {
-                          throw new Error("Failed to get signed upload URL");
+                          throw new Error(
+                            parseActionError(
+                              result ?? {},
+                              "Failed to get signed upload URL",
+                            ),
+                          );
                         }
 
                         const { signedUrl, destinationUrl } = result.data;
@@ -719,7 +791,7 @@ export function CampaignEditor({ campaign }: { campaign: Campaign }) {
                         return destinationUrl;
                       } catch (e) {
                         console.error("Failed to upload image", e);
-                        toast.error("Failed to upload image");
+                        toast.error(toErrorMessage(e));
                       }
 
                       return null;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-recipients-selector.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-recipients-selector.tsx
index b16f204bfcc..d7f7c10bfad 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-recipients-selector.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/campaign-recipients-selector.tsx
@@ -20,14 +20,39 @@ export function CampaignGroupsSelector({
   setSelectedGroupIds: (groupIds: string[] | null) => void;
 }) {
   const hasGroupFilter = Boolean(selectedGroupIds?.length);
-  const { groups: selectedGroups, loading: groupsLoading } = useGroups({
-    query: { groupIds: selectedGroupIds ?? undefined },
+  const [openPopover, setOpenPopover] = useState(false);
+
+  // The popover's list is cached under this same key, so groups picked there resolve
+  // instantly instead of being re-fetched by id on every selection
+  const {
+    groups: allGroups,
+    loading: allGroupsLoading,
+    error: allGroupsError,
+  } = useGroups({
     enabled: hasGroupFilter,
   });
-  const [openPopover, setOpenPopover] = useState(false);
 
-  const isLoading = groupsLoading && hasGroupFilter;
-  const plusCount = Math.max(0, (selectedGroups?.length ?? 0) - MAX_DISPLAYED);
+  // Only fetch by id what the list doesn't include (groups beyond its first page)
+  const missingGroupIds = getMissingIds(
+    selectedGroupIds,
+    allGroups,
+    Boolean(allGroupsError),
+  );
+  const { groups: missingGroups, loading: missingGroupsLoading } = useGroups({
+    query: { groupIds: missingGroupIds },
+    enabled: missingGroupIds.length > 0,
+  });
+
+  const selectedGroups = resolveSelected(
+    selectedGroupIds,
+    allGroups,
+    missingGroups,
+  );
+  const isLoading =
+    hasGroupFilter &&
+    selectedGroups.length === 0 &&
+    (allGroupsLoading || missingGroupsLoading);
+  const plusCount = Math.max(0, selectedGroups.length - MAX_DISPLAYED);
 
   return (
     <CampaignRecipientPopover
@@ -51,7 +76,7 @@ export function CampaignGroupsSelector({
         </RecipientChip>
       ) : (
         <div className="flex min-w-0 flex-1 items-center gap-2">
-          {selectedGroups?.slice(0, MAX_DISPLAYED).map((group) => (
+          {selectedGroups.slice(0, MAX_DISPLAYED).map((group) => (
             <RecipientChip key={group.id} openPopover={openPopover}>
               <GroupColorCircle group={group} />
               <span className="text-content-default min-w-0 truncate text-sm font-medium">
@@ -77,14 +102,38 @@ export function CampaignTagsSelector({
   setSelectedPartnerTagIds: (tagIds: string[] | null) => void;
 }) {
   const hasTagFilter = Boolean(selectedPartnerTagIds?.length);
-  const { partnerTags: selectedTags, isLoading: tagsLoading } = usePartnerTags({
-    query: { ids: selectedPartnerTagIds ?? undefined },
+  const [openPopover, setOpenPopover] = useState(false);
+
+  // Same approach as the groups above: resolve from the popover's cached list first
+  const {
+    partnerTags: allTags,
+    isLoading: allTagsLoading,
+    error: allTagsError,
+  } = usePartnerTags({
     enabled: hasTagFilter,
   });
-  const [openPopover, setOpenPopover] = useState(false);
 
-  const isLoading = tagsLoading && hasTagFilter;
-  const plusCount = Math.max(0, (selectedTags?.length ?? 0) - MAX_DISPLAYED);
+  const missingTagIds = getMissingIds(
+    selectedPartnerTagIds,
+    allTags,
+    Boolean(allTagsError),
+  );
+  const { partnerTags: missingTags, isLoading: missingTagsLoading } =
+    usePartnerTags({
+      query: { ids: missingTagIds },
+      enabled: missingTagIds.length > 0,
+    });
+
+  const selectedTags = resolveSelected(
+    selectedPartnerTagIds,
+    allTags,
+    missingTags,
+  );
+  const isLoading =
+    hasTagFilter &&
+    selectedTags.length === 0 &&
+    (allTagsLoading || missingTagsLoading);
+  const plusCount = Math.max(0, selectedTags.length - MAX_DISPLAYED);
 
   return (
     <CampaignRecipientPopover
@@ -108,7 +157,7 @@ export function CampaignTagsSelector({
         </RecipientChip>
       ) : (
         <div className="flex min-w-0 flex-1 items-center gap-2">
-          {selectedTags?.slice(0, MAX_DISPLAYED).map((tag) => (
+          {selectedTags.slice(0, MAX_DISPLAYED).map((tag) => (
             <RecipientChip key={tag.id} openPopover={openPopover}>
               <TagIcon className="size-3.5 shrink-0" />
               <span className="text-content-default min-w-0 truncate text-sm font-medium">
@@ -212,3 +261,41 @@ function PlusCountBadge({
     </span>
   );
 }
+
+// Selected ids that the loaded list doesn't contain. Derived from the list only, so the
+// fallback fetch's key stays stable once its own results arrive.
+function getMissingIds(
+  selectedIds: string[] | null,
+  list: { id: string }[] | undefined,
+  listFailed: boolean,
+) {
+  if (!selectedIds?.length) return [];
+
+  // No list yet: wait for it, unless its request failed, then fetch everything by id
+  if (!list) return listFailed ? selectedIds : [];
+
+  return selectedIds.filter((id) => !list.some((item) => item.id === id));
+}
+
+// Resolves the selected ids against each source in turn, keeping the sources' own order
+function resolveSelected<T extends { id: string }>(
+  selectedIds: string[] | null,
+  ...sources: (T[] | undefined)[]
+) {
+  if (!selectedIds?.length) return [];
+
+  const resolved: T[] = [];
+
+  for (const source of sources) {
+    for (const item of source ?? []) {
+      if (
+        selectedIds.includes(item.id) &&
+        !resolved.some((r) => r.id === item.id)
+      ) {
+        resolved.push(item);
+      }
+    }
+  }
+
+  return resolved;
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
index e4e7ca78030..bfa2982fe31 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/send-email-preview-modal.tsx
@@ -3,7 +3,7 @@
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useUser from "@/lib/swr/use-user";
 import { Button, Modal, useEnterSubmit, useMediaQuery } from "@dub/ui";
-import { Dispatch, SetStateAction, useState } from "react";
+import { Dispatch, SetStateAction, useCallback, useState } from "react";
 import { useWatch } from "react-hook-form";
 import { toast } from "sonner";
 import { useCampaignFormContext } from "./campaign-form-context";
@@ -135,15 +135,20 @@ export function useSendEmailPreviewModal({
   const [showSendEmailPreviewModal, setShowSendEmailPreviewModal] =
     useState(false);
 
-  return {
-    showSendEmailPreviewModal,
-    setShowSendEmailPreviewModal,
-    SendEmailPreviewModal: () => (
+  const SendEmailPreviewModalCallback = useCallback(
+    () => (
       <SendEmailPreviewModal
         showModal={showSendEmailPreviewModal}
         setShowModal={setShowSendEmailPreviewModal}
         campaignId={campaignId}
       />
     ),
+    [showSendEmailPreviewModal, campaignId],
+  );
+
+  return {
+    showSendEmailPreviewModal,
+    setShowSendEmailPreviewModal,
+    SendEmailPreviewModal: SendEmailPreviewModalCallback,
   };
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/transactional-campaign-logic.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/transactional-campaign-logic.tsx
index 93b48192dd0..7004dda4912 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/transactional-campaign-logic.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/[campaignId]/transactional-campaign-logic.tsx
@@ -9,17 +9,16 @@ import {
   type SendCampaignAttributeKey,
 } from "@/lib/api/workflows/send-campaign/schema";
 import { satisfiesExclusiveAttributeRules } from "@/lib/api/workflows/utils";
-import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
 import { DurationPopoverContent } from "@/ui/shared/duration-popover-content";
 import {
   InlineBadgePopover,
-  InlineBadgePopoverContext,
+  InlineBadgePopoverAmountInput,
   InlineBadgePopoverMenu,
 } from "@/ui/shared/inline-badge-popover";
 import { Button } from "@dub/ui";
 import { Xmark } from "@dub/ui/icons";
-import { cn, currencyFormatter, pluralize } from "@dub/utils";
-import { useContext, useEffect, useMemo, useRef } from "react";
+import { currencyFormatter, pluralize } from "@dub/utils";
+import { ChangeEvent, useEffect, useMemo, useRef } from "react";
 import { Controller, useFieldArray } from "react-hook-form";
 import { useCampaignFormContext } from "./campaign-form-context";
 
@@ -152,8 +151,11 @@ function ConditionRow({
       setValue(
         `triggerConditions.${index}.value`,
         attribute === "partnerJoined" ? 0 : (null as any),
+        { shouldDirty: true },
       );
-      setValue(`triggerConditions.${index}.operator`, "gte");
+      setValue(`triggerConditions.${index}.operator`, "gte", {
+        shouldDirty: true,
+      });
     }
 
     prevAttributeRef.current = attribute;
@@ -162,7 +164,7 @@ function ConditionRow({
   // Ensure partnerJoined always has value 0
   useEffect(() => {
     if (attribute === "partnerJoined" && value !== 0) {
-      setValue(`triggerConditions.${index}.value`, 0);
+      setValue(`triggerConditions.${index}.value`, 0, { shouldDirty: true });
     }
   }, [attribute, value, index, setValue]);
 
@@ -235,7 +237,7 @@ function ConditionRow({
             {config.inputType === "dropdown" ? (
               <DropdownValueInput index={index} config={config} />
             ) : (
-              <ValueInput index={index} config={config} value={value} />
+              <ValueInput index={index} config={config} />
             )}
           </>
         )}
@@ -299,83 +301,57 @@ function DropdownValueInput({
 function ValueInput({
   index,
   config,
-  value,
 }: {
   index: number;
   config: { inputType?: string };
-  value: number | null | undefined;
 }) {
-  const { watch, setValue } = useCampaignFormContext();
-  const { setIsOpen } = useContext(InlineBadgePopoverContext);
-
-  const storedValue = watch(`triggerConditions.${index}.value`);
-
+  const { control } = useCampaignFormContext();
   const isCurrency = config.inputType === "currency";
 
-  const displayValue =
-    isCurrency && storedValue ? storedValue / 100 : storedValue;
-
-  const hasValue = value !== null && value !== undefined;
-
   return (
-    <InlineBadgePopover
-      text={
-        hasValue
-          ? isCurrency
-            ? currencyFormatter(value, {
-                trailingZeroDisplay: "stripIfInteger",
-              })
-            : value
-          : "amount"
-      }
-      invalid={!hasValue}
-    >
-      <div className="relative rounded-md shadow-sm">
-        {isCurrency && (
-          <span className="absolute inset-y-0 left-0 flex items-center pl-1.5 text-sm text-neutral-400">
-            $
-          </span>
-        )}
-        <input
-          className={cn(
-            "block w-full rounded-md border-neutral-300 px-1.5 py-1 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:w-32 sm:text-sm",
-            isCurrency ? "pl-4 pr-12" : "pr-7",
-          )}
-          value={displayValue ?? ""}
-          onChange={(e) => {
-            const nextValue = e.target.value;
-            if (nextValue === "") {
-              setValue(`triggerConditions.${index}.value`, null as any);
-            } else {
-              const numValue = +nextValue;
-              setValue(
-                `triggerConditions.${index}.value`,
-                isCurrency ? Math.round(numValue * 100) : numValue,
-              );
-            }
+    <Controller
+      control={control}
+      name={`triggerConditions.${index}.value`}
+      render={({ field }) => {
+        const storedValue = field.value;
+        const displayValue =
+          isCurrency && storedValue ? storedValue / 100 : storedValue;
+        const hasValue = storedValue !== null && storedValue !== undefined;
 
-            if (isCurrency) {
-              handleMoneyInputChange(e);
-            }
-          }}
-          onKeyDown={(e) => {
-            if (e.key === "Enter") {
-              e.preventDefault();
-              setIsOpen(false);
-              return;
+        return (
+          <InlineBadgePopover
+            text={
+              hasValue
+                ? isCurrency
+                  ? currencyFormatter(storedValue, {
+                      trailingZeroDisplay: "stripIfInteger",
+                    })
+                  : storedValue
+                : "amount"
             }
+            invalid={!hasValue}
+          >
+            <InlineBadgePopoverAmountInput
+              type={isCurrency ? "currency" : "number"}
+              value={displayValue ?? ""}
+              onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                const nextValue = e.target.value;
 
-            if (isCurrency) {
-              handleMoneyKeyDown(e);
-            }
-          }}
-        />
-        {isCurrency && (
-          <span className="absolute inset-y-0 right-0 flex items-center pr-1.5 text-sm text-neutral-400">
-            USD
-          </span>
-        )}
-      </div>
-    </InlineBadgePopover>
+                if (nextValue === "") {
+                  field.onChange(null as unknown as number);
+                  return;
+                }
+
+                const numValue = +nextValue;
+                field.onChange(
+                  isCurrency ? Math.round(numValue * 100) : numValue,
+                );
+              }}
+              onBlur={field.onBlur}
+            />
+          </InlineBadgePopover>
+        );
+      }}
+    />
   );
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/create-campaign-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/create-campaign-button.tsx
index 0cd36562ff4..6efe2a57ac0 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/create-campaign-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/create-campaign-button.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useWorkspace from "@/lib/swr/use-workspace";
@@ -22,10 +23,16 @@ const campaignTypes = Object.values(CAMPAIGN_TYPE_BADGES).map(
 
 export function CreateCampaignButton() {
   const router = useRouter();
-  const { slug } = useWorkspace();
+  const { slug, role } = useWorkspace();
   const { makeRequest, isSubmitting } = useApiMutation<Campaign>();
   const [isOpen, setIsOpen] = useState(false);
 
+  const permissionsError = clientAccessCheck({
+    action: "campaigns.write",
+    role,
+    customPermissionDescription: "create campaigns",
+  }).error;
+
   const createDraftCampaign = async (type: "marketing" | "transactional") => {
     await makeRequest(`/api/campaigns`, {
       method: "POST",
@@ -40,13 +47,25 @@ export function CreateCampaignButton() {
   };
 
   useKeyboardShortcut("m", () => createDraftCampaign("marketing"), {
-    enabled: isOpen && !isSubmitting,
+    enabled: isOpen && !isSubmitting && !permissionsError,
   });
 
   useKeyboardShortcut("t", () => createDraftCampaign("transactional"), {
-    enabled: isOpen && !isSubmitting,
+    enabled: isOpen && !isSubmitting && !permissionsError,
   });
 
+  if (permissionsError) {
+    return (
+      <Button
+        type="button"
+        variant="primary"
+        className="h-9 w-fit rounded-lg px-3"
+        text="Create campaign"
+        disabledTooltip={permissionsError}
+      />
+    );
+  }
+
   return (
     <Popover
       openPopover={isOpen}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/delete-campaign-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/delete-campaign-modal.tsx
index 9b31a015984..b8bb4c59ef6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/delete-campaign-modal.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/campaigns/delete-campaign-modal.tsx
@@ -142,7 +142,7 @@ export function useDeleteCampaignModal(
         campaign={campaign}
       />
     );
-  }, [showDeleteCampaignModal, setShowDeleteCampaignModal, campaign]);
+  }, [showDeleteCampaignModal, setShowDeleteCampaignModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-clawback-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-clawback-sheet.tsx
index 2e1b8e80107..89355406456 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-clawback-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-clawback-sheet.tsx
@@ -1,14 +1,13 @@
-import { createClawbackAction } from "@/lib/actions/partners/create-clawback";
 import { mutatePrefix } from "@/lib/swr/mutate";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   CLAWBACK_REASONS,
-  createClawbackSchema,
+  createCommissionResponseSchema,
 } from "@/lib/zod/schemas/commissions";
 import { PartnerSelector } from "@/ui/partners/partner-selector";
 import { X } from "@/ui/shared/icons";
 import { Button, Sheet } from "@dub/ui";
-import { useAction } from "next-safe-action/hooks";
 import { useParams } from "next/navigation";
 import { useState } from "react";
 import { Controller, useForm } from "react-hook-form";
@@ -21,7 +20,11 @@ interface CreateClawbackSheetProps {
   nested?: boolean;
 }
 
-type FormData = z.infer<typeof createClawbackSchema>;
+type FormData = {
+  partnerId?: string;
+  amount?: number;
+  reason?: (typeof CLAWBACK_REASONS)[number]["value"];
+};
 
 function CreateClawbackSheetContent(
   props: Omit<CreateClawbackSheetProps, "nested">,
@@ -37,47 +40,42 @@ function CreateClawbackSheetContent(
     reset,
     watch,
     getValues,
-    formState: { errors, isSubmitting, isSubmitSuccessful },
+    formState: { errors, isSubmitting },
   } = useForm<FormData>({
     defaultValues: {
       partnerId: params.partnerId,
-      description: "",
+      reason: undefined,
     },
   });
 
-  const [partnerId, amount, description] = watch([
-    "partnerId",
-    "amount",
-    "description",
-  ]);
+  const [partnerId, amount, reason] = watch(["partnerId", "amount", "reason"]);
 
-  const { executeAsync, isPending } = useAction(createClawbackAction, {
-    onSuccess: () => {
-      toast.success("A clawback has been created for the partner!");
-      setIsOpen(false);
-      mutatePrefix(`/api/commissions?workspaceId=${workspaceId}`);
-      const currentValues = getValues();
-      reset(currentValues);
-    },
-    onError({ error }) {
-      toast.error(error.serverError || "Failed to create clawback.");
-    },
-  });
+  const { makeRequest, isSubmitting: isCreating } =
+    useApiMutation<z.infer<typeof createCommissionResponseSchema>>();
 
   const onSubmit = async (data: FormData) => {
     if (!workspaceId || !defaultProgramId) {
       return;
     }
 
-    await executeAsync({
-      ...data,
-      amount: data.amount * 100,
-      workspaceId,
+    await makeRequest("/api/commissions", {
+      method: "POST",
+      body: {
+        type: "custom",
+        partnerId: data.partnerId,
+        amount: data.amount ? -Math.round(data.amount * 100) : 0,
+        description: data.reason,
+      },
+      onSuccess: async ({ message }) => {
+        toast.success(message);
+        setIsOpen(false);
+        await mutatePrefix("/api/commissions");
+        const currentValues = getValues();
+        reset(currentValues);
+      },
     });
   };
 
-  const disableSubmitButton = !partnerId || !amount || !description;
-
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="flex h-full flex-col">
       <div className="sticky top-0 z-10 border-b border-neutral-200 bg-white">
@@ -110,7 +108,7 @@ function CreateClawbackSheetContent(
                 rules={{ required: true }}
                 render={({ field }) => (
                   <PartnerSelector
-                    selectedPartnerId={field.value}
+                    selectedPartnerId={field.value ?? null}
                     setSelectedPartnerId={field.onChange}
                   />
                 )}
@@ -171,21 +169,21 @@ function CreateClawbackSheetContent(
 
           <div>
             <label
-              htmlFor="description"
+              htmlFor="reason"
               className="text-sm font-medium text-neutral-900"
             >
               Reason
             </label>
             <div className="relative mt-2 rounded-md shadow-sm">
               <Controller
-                name="description"
+                name="reason"
                 control={control}
                 rules={{ required: true }}
                 render={({ field }) => (
                   <select
-                    id="description"
+                    id="reason"
                     className="block w-full rounded-md border-neutral-300 pr-10 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
-                    value={field.value}
+                    value={field.value ?? ""}
                     onChange={field.onChange}
                   >
                     <option value="" disabled>
@@ -199,9 +197,9 @@ function CreateClawbackSheetContent(
                   </select>
                 )}
               />
-              {errors.description && (
+              {errors.reason && (
                 <span className="text-xs text-red-600">
-                  {errors.description.message}
+                  {errors.reason.message}
                 </span>
               )}
             </div>
@@ -216,15 +214,15 @@ function CreateClawbackSheetContent(
             onClick={() => setIsOpen(false)}
             text="Cancel"
             className="w-fit"
-            disabled={isPending || isSubmitting || isSubmitSuccessful}
+            disabled={isCreating || isSubmitting}
           />
           <Button
             type="submit"
             variant="primary"
             text="Create clawback"
             className="w-fit"
-            loading={isPending || isSubmitting || isSubmitSuccessful}
-            disabled={disableSubmitButton}
+            loading={isCreating || isSubmitting}
+            disabled={!partnerId || !amount || !reason}
           />
         </div>
       </div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-button.tsx
index ca7439e1916..cf704fb4ecf 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-button.tsx
@@ -1,16 +1,27 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
+import useWorkspace from "@/lib/swr/use-workspace";
 import { Button, useKeyboardShortcut, useMediaQuery } from "@dub/ui";
 import { useCreateCommissionSheet } from "./create-commission-sheet";
 
 export function CreateCommissionButton() {
   const { isMobile } = useMediaQuery();
+  const { role } = useWorkspace();
   const { createCommissionSheet, setIsOpen: setShowCreateCommissionSheet } =
     useCreateCommissionSheet({
       nested: false,
     });
 
-  useKeyboardShortcut("c", () => setShowCreateCommissionSheet(true));
+  const permissionsError = clientAccessCheck({
+    action: "commissions.write",
+    role,
+    customPermissionDescription: "create commissions",
+  }).error;
+
+  useKeyboardShortcut("c", () => setShowCreateCommissionSheet(true), {
+    enabled: !permissionsError,
+  });
 
   return (
     <>
@@ -21,6 +32,7 @@ export function CreateCommissionButton() {
         text={`Create${isMobile ? "" : " commission"}`}
         shortcut="C"
         className="h-8 px-3 sm:h-9"
+        disabledTooltip={permissionsError || undefined}
       />
     </>
   );
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx
index b7ad59f1f4b..2af5aa7e81d 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx
@@ -1,7 +1,7 @@
 import { handleMoneyKeyDown } from "@/lib/form-utils";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
-import useRewards from "@/lib/swr/use-rewards";
+import { useRewards } from "@/lib/swr/use-rewards";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   createCommissionResponseSchema,
@@ -17,6 +17,7 @@ import {
   ProgramSheetAccordionItem,
   ProgramSheetAccordionTrigger,
 } from "@/ui/partners/program-sheet-accordion";
+import { Callout } from "@/ui/shared/callout";
 import { X } from "@/ui/shared/icons";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
 import {
@@ -668,26 +669,26 @@ function CreateCommissionSheetContent({
                               <LoadingSpinner />
                             </div>
                           ) : noStripeCustomerId ? (
-                            <div className="rounded-lg border border-amber-200 bg-amber-50/80 p-4">
-                              <p className="text-sm font-medium text-amber-800">
+                            <Callout variant="warn" size={2}>
+                              <p className="font-medium">
                                 No Stripe customer ID
                               </p>
-                              <p className="mt-1 text-xs text-amber-700">
+                              <p className="mt-1">
                                 {noStripeCustomerMessage ??
                                   "This customer doesn't have a Stripe customer ID. Add one in the customer profile to use paid Stripe invoices here."}
                               </p>
                               <a
                                 href={`/${slug}/program/customers/${customerId}`}
                                 target="_blank"
-                                className="mt-2 inline-block text-xs font-medium text-amber-800 underline hover:no-underline"
+                                className="mt-2 inline-block font-medium underline hover:no-underline"
                               >
                                 Open customer profile →
                               </a>
-                            </div>
+                            </Callout>
                           ) : stripeInvoicesError ? (
-                            <div className="rounded-lg border border-red-200 bg-red-50/80 p-4 text-sm text-red-800">
+                            <Callout variant="error" size={2}>
                               Failed to load invoices. Try again.
-                            </div>
+                            </Callout>
                           ) : stripeInvoices.length === 0 ? (
                             <div className="flex h-24 flex-col items-center justify-center rounded-lg border border-neutral-200 bg-neutral-50/30 text-center">
                               <p className="text-sm font-medium text-neutral-600">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx
deleted file mode 100644
index b76391e3528..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/layout.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-"use client";
-
-import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
-import useCustomersCount from "@/lib/swr/use-customers-count";
-import { useProgramSubmittedLeadsCount } from "@/lib/swr/use-program-submitted-leads-count";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { CustomersMenuPopover } from "@/ui/customers/customers-menu-popover";
-import { PageContent } from "@/ui/layout/page-content";
-import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { InfoTooltip } from "@dub/ui";
-import { cn } from "@dub/utils";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { CSSProperties, ReactNode, useMemo } from "react";
-
-export default function PartnerCustomersLayout({
-  children,
-}: {
-  children: ReactNode;
-}) {
-  const pathname = usePathname();
-  const { slug, defaultProgramId } = useWorkspace();
-
-  const { data: customersCount } = useCustomersCount<number>({
-    includeParams: [],
-  });
-
-  const isReferralEnabled = defaultProgramId
-    ? SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(defaultProgramId)
-    : false;
-
-  const { data: leadsCount } = useProgramSubmittedLeadsCount<number>({
-    ignoreParams: true,
-    enabled: isReferralEnabled,
-  });
-
-  const tabs = useMemo(() => {
-    if (!isReferralEnabled) {
-      return [];
-    }
-
-    return [
-      {
-        label: "Customers",
-        id: "customers",
-        href: "",
-        info: "Shows both converted and non-converted customers.",
-        count: customersCount,
-      },
-      {
-        label: "Submitted leads",
-        id: "leads",
-        href: "leads",
-        info: "Shows your partners' submitted leads.",
-        count: leadsCount,
-      },
-    ];
-  }, [isReferralEnabled, customersCount, leadsCount]);
-
-  return (
-    <PageContent
-      title="Customers"
-      titleInfo={{
-        title:
-          "Get deeper, real-time insights about your referred customers' demographics, purchasing behavior, and lifetime value (LTV).",
-        href: "https://dub.co/help/article/customer-insights",
-      }}
-      controls={<CustomersMenuPopover />}
-    >
-      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
-        {tabs.length > 0 && (
-          <div
-            className={cn(
-              "grid grid-cols-[repeat(var(--tabs),minmax(0,1fr))] gap-2",
-            )}
-            style={{ "--tabs": tabs.length } as CSSProperties}
-          >
-            {tabs.map((tab) => {
-              const isActive = pathname.endsWith(
-                `/customers${tab.href ? `/${tab.href}` : ""}`,
-              );
-
-              return (
-                <Link
-                  key={tab.id}
-                  href={`/${slug}/program/customers${tab.href ? `/${tab.href}` : ""}`}
-                  className={cn(
-                    "border-border-subtle flex flex-col gap-1 rounded-lg border p-4 text-left transition-colors duration-100",
-                    isActive
-                      ? "border-black ring-1 ring-black"
-                      : "hover:bg-bg-muted",
-                  )}
-                >
-                  <div className="flex items-center gap-2">
-                    <span className="text-content-default text-xs font-semibold">
-                      {tab.label}
-                    </span>
-                    {tab.info && <InfoTooltip content={tab.info} />}
-                  </div>
-                  {tab.count !== undefined ? (
-                    <span className="text-content-emphasis text-base font-semibold">
-                      {tab.count.toLocaleString()}
-                    </span>
-                  ) : (
-                    <div className="h-6 w-12 animate-pulse rounded-md bg-neutral-200" />
-                  )}
-                </Link>
-              );
-            })}
-          </div>
-        )}
-        {children}
-      </PageWidthWrapper>
-    </PageContent>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/leads/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/leads/page.tsx
deleted file mode 100644
index fd39273f9a0..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/leads/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-"use client";
-
-import { SubmittedLeadTable } from "@/ui/submitted-leads/submitted-lead-table";
-
-export default function SubmittedLeadsPage() {
-  return <SubmittedLeadTable />;
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/page.tsx
index 49ef6c45d9f..c4f6c6ad0dd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/(index)/page.tsx
@@ -1,11 +1,26 @@
 "use client";
 
 import useWorkspace from "@/lib/swr/use-workspace";
+import { CustomersMenuPopover } from "@/ui/customers/customers-menu-popover";
 import { CustomersTable } from "@/ui/customers/customers-table/customers-table";
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 
 export default function ProgramCustomersPage() {
   const { defaultProgramId } = useWorkspace();
   return (
-    <CustomersTable query={{ programId: defaultProgramId || undefined }} />
+    <PageContent
+      title="Customers"
+      titleInfo={{
+        title:
+          "Get deeper, real-time insights about your referred customers' demographics, purchasing behavior, and lifetime value (LTV).",
+        href: "https://dub.co/help/article/customer-insights",
+      }}
+      controls={<CustomersMenuPopover />}
+    >
+      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
+        <CustomersTable query={{ programId: defaultProgramId || undefined }} />
+      </PageWidthWrapper>
+    </PageContent>
   );
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/layout.tsx
index 4d78a8c80e3..4e5d47aa4a5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/customers/[customerId]/layout.tsx
@@ -83,7 +83,6 @@ export default function ProgramCustomerLayout({
               customer={customer}
               customerActivity={customerActivity}
               isCustomerActivityLoading={!customer || isCustomerActivityLoading}
-              workspaceSlug={workspaceSlug}
             />
           </div>
           <div className="@3xl/page:order-1">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
index 60b64e56339..c105187588a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/discounts/group-discounts.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { useDiscounts } from "@/lib/swr/use-discounts";
 import useGroup from "@/lib/swr/use-group";
 import type { DiscountProps, GroupProps } from "@/lib/types";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
@@ -7,16 +8,17 @@ import {
   DiscountSheet,
   useDiscountSheet,
 } from "@/ui/partners/discounts/add-edit-discount-sheet";
+import { CustomItemsAccordion } from "@/ui/partners/groups/custom-rewards-accordion";
 import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
-import { Button, useRouterStuff } from "@dub/ui";
+import { Button, DiscountCode, useRouterStuff } from "@dub/ui";
 import { cn, isClickOnInteractiveChild } from "@dub/utils";
-import { BadgePercent } from "lucide-react";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useEffect, useState } from "react";
 
 export const GroupDiscounts = () => {
   const { group, loading } = useGroup();
+  const { discounts } = useDiscounts({ groupId: group?.id });
   const { searchParams } = useRouterStuff();
 
   const [discountSheetState, setDiscountSheetState] = useState<
@@ -34,11 +36,12 @@ export const GroupDiscounts = () => {
     }
   }, [searchParams]);
 
-  const currentDiscount =
-    discountSheetState.discountId &&
-    group?.discount?.id === discountSheetState.discountId
-      ? group.discount
-      : undefined;
+  const currentDiscount = getCurrentDiscount({
+    discountId: discountSheetState.discountId,
+    groupDiscount: group?.discount,
+    discounts,
+  });
+
   const isNewDiscount = discountSheetState.discountId === "new";
 
   return (
@@ -50,13 +53,16 @@ export const GroupDiscounts = () => {
             setDiscountSheetState((s) => ({ ...s, open }) as typeof s)
           }
           {...(currentDiscount && { discount: currentDiscount })}
+          isDefault={
+            isNewDiscount || currentDiscount?.id === group?.discount?.id
+          }
         />
       )}
 
       {loading || !group ? (
         <DiscountSkeleton />
       ) : (
-        <DiscountItem discount={group?.discount} group={group} />
+        <DiscountItem discount={group.discount} group={group} />
       )}
     </div>
   );
@@ -74,64 +80,67 @@ const DiscountItem = ({
   const As = discount ? Link : "div";
 
   return (
-    <As
-      href={
-        discount
-          ? `/${slug}/program/groups/${group.slug}/discounts?discountId=${discount.id}`
-          : ""
-      }
-      scroll={false}
-      className={cn(
-        "flex cursor-pointer flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
-        discount && "border border-neutral-200 hover:border-neutral-300",
-        !discount && "bg-neutral-50 hover:bg-neutral-100",
-      )}
-      onClick={(e) => {
-        if (isClickOnInteractiveChild(e)) return;
-        queryParams({
-          set: {
-            discountId: discount?.id ?? "new",
-          },
-        });
-      }}
-    >
-      <div className="flex size-10 items-center justify-center rounded-full border border-neutral-200 bg-white">
-        <BadgePercent className="size-4 text-neutral-600" />
-      </div>
-      <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
-        <div className="flex items-center gap-2">
-          <span className="text-sm font-normal">
-            {discount ? (
-              <ProgramRewardDescription discount={discount} />
-            ) : (
-              <span className="text-sm font-normal text-neutral-600">
-                No referral discount created
-              </span>
-            )}
-          </span>
+    <div>
+      <As
+        href={
+          discount
+            ? `/${slug}/program/groups/${group.slug}/discounts?discountId=${discount.id}`
+            : ""
+        }
+        {...(discount ? { scroll: false } : {})}
+        className={cn(
+          "flex cursor-pointer flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
+          discount && "border border-neutral-200 hover:border-neutral-300",
+          !discount && "bg-neutral-50 hover:bg-neutral-100",
+        )}
+        onClick={(e) => {
+          if (isClickOnInteractiveChild(e)) return;
+          queryParams({
+            set: {
+              discountId: discount?.id ?? "new",
+            },
+          });
+        }}
+      >
+        <div className="flex size-10 items-center justify-center rounded-full border border-neutral-200 bg-white">
+          <DiscountCode className="size-4 text-neutral-600" />
         </div>
+        <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
+          <div className="flex items-center gap-2">
+            <span className="text-sm font-normal">
+              {discount ? (
+                <ProgramRewardDescription discount={discount} />
+              ) : (
+                <span className="text-sm font-normal text-neutral-600">
+                  No referral discount created
+                </span>
+              )}
+            </span>
+          </div>
 
-        <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
-          {!discount && group.slug !== DEFAULT_PARTNER_GROUP.slug && (
-            <CopyDefaultDiscountButton />
-          )}
-          <Button
-            text={discount ? "Edit" : "Create"}
-            variant={discount ? "secondary" : "primary"}
-            className="h-9 w-full rounded-lg md:w-fit"
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              queryParams({
-                set: {
-                  discountId: discount?.id ?? "new",
-                },
-              });
-            }}
-          />
+          <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
+            {!discount && group.slug !== DEFAULT_PARTNER_GROUP.slug && (
+              <CopyDefaultDiscountButton />
+            )}
+            <Button
+              text={discount ? "Edit" : "Create"}
+              variant={discount ? "secondary" : "primary"}
+              className="h-9 w-full rounded-lg md:w-fit"
+              onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                queryParams({
+                  set: {
+                    discountId: discount?.id ?? "new",
+                  },
+                });
+              }}
+            />
+          </div>
         </div>
-      </div>
-    </As>
+      </As>
+      <CustomItemsAccordion group={group} />
+    </div>
   );
 };
 
@@ -172,3 +181,23 @@ const DiscountSkeleton = () => {
     </div>
   );
 };
+
+function getCurrentDiscount({
+  discountId,
+  groupDiscount,
+  discounts,
+}: {
+  discountId: string | null;
+  groupDiscount: GroupProps["discount"];
+  discounts: DiscountProps[] | undefined;
+}): DiscountProps | undefined {
+  if (!discountId) {
+    return undefined;
+  }
+
+  if (groupDiscount?.id === discountId) {
+    return groupDiscount;
+  }
+
+  return discounts?.find((discount) => discount.id === discountId);
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/group-header.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/group-header.tsx
index 319466b660b..06b5ffc5eec 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/group-header.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/group-header.tsx
@@ -10,7 +10,7 @@ import {
   Brush,
   Button,
   ChevronRight,
-  Discount,
+  DiscountCode,
   Gift,
   Hyperlink,
   Sliders,
@@ -93,7 +93,7 @@ export function GroupHeaderTabs() {
     {
       id: "discounts",
       label: "Discounts",
-      icon: Discount,
+      icon: DiscountCode,
       external: false,
       getHref: (group: GroupProps) =>
         `/${slug}/program/groups/${group.slug}/discounts`,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-default-link-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-default-link-sheet.tsx
index 3fecf4ebfae..9cba1daede3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-default-link-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/add-edit-group-default-link-sheet.tsx
@@ -9,11 +9,12 @@ import useProgram from "@/lib/swr/use-program";
 import { PartnerGroupDefaultLink } from "@/lib/types";
 import { createOrUpdateDefaultLinkSchema } from "@/lib/zod/schemas/groups";
 import { DomainSelector } from "@/ui/domains/domain-selector";
+import { useChangeProgramDomainModal } from "@/ui/modals/change-program-domain-modal";
 import { RewardIconSquare } from "@/ui/partners/rewards/reward-icon-square";
 import { X } from "@/ui/shared/icons";
 import { Button, Input, Sheet } from "@dub/ui";
 import { Eye, Hyperlink } from "@dub/ui/icons";
-import { normalizeUrl } from "@dub/utils";
+import { normalizeUrl, safeDecodeURIComponent } from "@dub/utils";
 import {
   Dispatch,
   PropsWithChildren,
@@ -24,7 +25,6 @@ import {
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import * as z from "zod/v4";
-import { useChangeProgramDomainModal } from "./change-program-domain-modal";
 import { PartnerLinkPreview } from "./partner-link-preview";
 
 interface DefaultPartnerLinkSheetProps {
@@ -47,7 +47,7 @@ function DefaultPartnerLinkSheetContent({
   const { handleSubmit, watch, setValue, formState } = useForm<FormData>({
     defaultValues: {
       domain: link?.domain || program?.domain || "",
-      url: link?.url || "",
+      url: link?.url ? safeDecodeURIComponent(link.url) : "",
     },
   });
 
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/group-link-settings.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/group-link-settings.tsx
index e7b10629a5e..cb5c6af28fa 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/group-link-settings.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/group-link-settings.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { getLinkStructureOptions } from "@/lib/partners/get-link-structure-options";
+import { PARTNER_MACROS } from "@/lib/partners/macros";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import useGroup from "@/lib/swr/use-group";
@@ -68,7 +69,7 @@ function GroupLinkSettingsForm({ group }: { group: GroupProps }) {
   const { setShowConfirmModal, confirmModal } = useConfirmModal({
     title: "Save changes",
     description:
-      "Are you sure you want to save these link settings changes? This will update all links in this group.",
+      "Are you sure you want to save these link settings? This will update all links in this group and overwrite any custom UTM parameters on partner links.",
     onConfirm: () => handleSubmit(onSubmit)(),
     confirmText: "Save changes",
   });
@@ -260,19 +261,30 @@ function GroupLinkSettingsForm({ group }: { group: GroupProps }) {
               heading="UTM parameters"
               description="Configure [UTM tracking parameters](https://dub.co/help/article/partner-link-settings#utm-parameters) for all links in this group"
             >
-              <UTMBuilder
-                values={{
-                  utm_source: currentValues.utm_source || "",
-                  utm_medium: currentValues.utm_medium || "",
-                  utm_campaign: currentValues.utm_campaign || "",
-                  utm_term: currentValues.utm_term || "",
-                  utm_content: currentValues.utm_content || "",
-                  ref: currentValues.ref || "",
-                }}
-                onChange={(key, value) => {
-                  setValue(key, value, { shouldDirty: true });
-                }}
-              />
+              <div className="flex flex-col gap-3">
+                <UTMBuilder
+                  values={{
+                    utm_source: currentValues.utm_source || "",
+                    utm_medium: currentValues.utm_medium || "",
+                    utm_campaign: currentValues.utm_campaign || "",
+                    utm_term: currentValues.utm_term || "",
+                    utm_content: currentValues.utm_content || "",
+                    ref: currentValues.ref || "",
+                  }}
+                  onChange={(key, value) => {
+                    setValue(key, value, { shouldDirty: true });
+                  }}
+                  suggestions={PARTNER_MACROS.map((m) => ({
+                    value: m.macro,
+                    description: m.description,
+                  }))}
+                />
+                <p className="text-content-muted text-xs">
+                  Dynamic values:{" "}
+                  <code className="font-mono">{"{{PARTNER_NAME}}"}</code>,{" "}
+                  <code className="font-mono">{"{{PARTNER_LINK_KEY}}"}</code>
+                </p>
+              </div>
             </GroupSettingsRow>
           </motion.div>
         )}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/partner-link-preview.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/partner-link-preview.tsx
index 73bc2440232..68f80779a0d 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/partner-link-preview.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/partner-link-preview.tsx
@@ -1,7 +1,7 @@
 import { getLinkStructureOptions } from "@/lib/partners/get-link-structure-options";
 import { LinkLogo } from "@dub/ui";
 import { ArrowTurnRight2 } from "@dub/ui/icons";
-import { cn, getApexDomain, getPrettyUrl } from "@dub/utils";
+import { cn, getApexDomain, getPrettyUrl, safeDecodeURIComponent } from "@dub/utils";
 import { PartnerLinkStructure } from "@prisma/client";
 import { useMemo } from "react";
 
@@ -64,7 +64,9 @@ export function PartnerLinkPreview({
           {url ? (
             <>
               <ArrowTurnRight2 className="h-3 w-3 shrink-0 text-neutral-400" />
-              <span className="truncate">{getPrettyUrl(url)}</span>
+              <span className="truncate">
+                {getPrettyUrl(safeDecodeURIComponent(url))}
+              </span>
             </>
           ) : (
             <div className="h-3 w-1/2 rounded-md bg-neutral-200" />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx
deleted file mode 100644
index 3532be84db0..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx
+++ /dev/null
@@ -1,346 +0,0 @@
-"use client";
-
-import { getPlanCapabilities } from "@/lib/plan-capabilities";
-import useGroup from "@/lib/swr/use-group";
-import useWorkspace from "@/lib/swr/use-workspace";
-import type { GroupProps, RewardProps } from "@/lib/types";
-import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
-import { useRewardHistorySheet } from "@/ui/activity-logs/reward-history-sheet";
-import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
-import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
-import {
-  RewardSheet,
-  useRewardSheet,
-} from "@/ui/partners/rewards/add-edit-reward-sheet";
-import { REWARD_EVENT_DESCRIPTIONS } from "@/ui/partners/rewards/reward-event-descriptions";
-import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
-import {
-  Button,
-  TimestampTooltip,
-  TooltipContent,
-  useRouterStuff,
-} from "@dub/ui";
-import { cn, formatDate } from "@dub/utils";
-import { EventType } from "@prisma/client";
-import Link from "next/link";
-import { useParams } from "next/navigation";
-import { useEffect, useState } from "react";
-
-export function GroupRewards() {
-  const { group, loading } = useGroup();
-  const { searchParams } = useRouterStuff();
-
-  const [rewardSheetState, setRewardSheetState] = useState<
-    { open: false; rewardId: string | null } | { open: true; rewardId: string }
-  >({ open: false, rewardId: null });
-
-  useEffect(() => {
-    const rewardId = searchParams.get("rewardId");
-
-    if (rewardId) {
-      setRewardSheetState({ open: true, rewardId });
-    } else {
-      setRewardSheetState({ open: false, rewardId: null });
-    }
-  }, [searchParams]);
-
-  const rewards =
-    [
-      group?.clickReward,
-      group?.leadReward,
-      group?.saleReward,
-      group?.referralReward,
-    ].filter(Boolean) ?? [];
-
-  const currentReward = rewardSheetState.rewardId
-    ? rewards.find((r) => r?.id === rewardSheetState.rewardId)
-    : undefined;
-  const isNewReward = rewardSheetState.rewardId?.startsWith("new-");
-  const newRewardEvent = isNewReward
-    ? (rewardSheetState.rewardId?.replace("new-", "") as EventType)
-    : undefined;
-
-  return (
-    <div>
-      {rewardSheetState.rewardId && (currentReward || isNewReward) && (
-        <RewardSheetWrapper
-          reward={currentReward}
-          event={newRewardEvent}
-          isOpen={rewardSheetState.open}
-          setIsOpen={(open) =>
-            setRewardSheetState((s) => ({ ...s, open }) as any)
-          }
-        />
-      )}
-
-      <div className="flex flex-col gap-6">
-        {loading || !group ? (
-          <>
-            {Array.from({ length: 4 }).map((_, index) => (
-              <RewardSkeleton key={index} />
-            ))}
-          </>
-        ) : (
-          <>
-            <RewardItem reward={group.saleReward} event="sale" group={group} />
-            <RewardItem reward={group.leadReward} event="lead" group={group} />
-            <RewardItem
-              reward={group.clickReward}
-              event="click"
-              group={group}
-            />
-
-            <hr className="border-neutral-200" />
-
-            <RewardItem
-              reward={group.referralReward}
-              event="referral"
-              group={group}
-            />
-          </>
-        )}
-      </div>
-    </div>
-  );
-}
-
-const RewardSheetWrapper = ({
-  reward,
-  event,
-  isOpen,
-  setIsOpen,
-}: {
-  reward?: RewardProps | null;
-  event?: EventType;
-  isOpen: boolean;
-  setIsOpen: (open: boolean) => void;
-}) => {
-  return (
-    <RewardSheet
-      isOpen={isOpen}
-      setIsOpen={setIsOpen}
-      event={event || reward?.event || "sale"}
-      reward={reward || undefined}
-    />
-  );
-};
-
-const RewardItem = ({
-  reward,
-  event,
-  group,
-}: {
-  reward?: RewardProps | null;
-  event: EventType;
-  group: GroupProps;
-}) => {
-  const { slug } = useParams();
-  const { plan } = useWorkspace();
-  const { queryParams } = useRouterStuff();
-  const { canCreateReferralReward } = getPlanCapabilities(plan);
-  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
-    useAdvancedUpsellModal();
-
-  const { RewardSheet, setIsOpen } = useRewardSheet({
-    event,
-    reward: reward || undefined,
-  });
-
-  const {
-    loading: activityLogsLoading,
-    hasActivityLogs,
-    finalActivityLogDate,
-    rewardHistorySheet,
-    setIsOpen: setHistoryOpen,
-  } = useRewardHistorySheet({
-    reward: reward ?? null,
-  });
-
-  const Icon = REWARD_EVENT_ICON[event];
-  const As = reward ? Link : "div";
-
-  const lastUpdatedDate = finalActivityLogDate ?? reward?.updatedAt;
-
-  return (
-    <>
-      {advancedUpsellModal}
-      {RewardSheet}
-      {rewardHistorySheet}
-      <As
-        href={
-          reward
-            ? `/${slug}/program/groups/${group.slug}/rewards?rewardId=${reward.id}`
-            : "#"
-        }
-        scroll={false}
-        className={cn(
-          "flex flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
-          reward &&
-            "cursor-pointer border border-neutral-200 hover:border-neutral-300",
-          !reward && "bg-neutral-50 hover:bg-neutral-100",
-        )}
-      >
-        <div className="flex size-10 shrink-0 items-center justify-center rounded-full border border-neutral-200 bg-white">
-          <Icon className="size-4 text-neutral-600" />
-        </div>
-        <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
-          <div className="flex w-full items-center gap-2">
-            {reward ? (
-              <div className="flex min-w-0 flex-1 flex-col gap-1">
-                <div className="text-sm font-normal">
-                  <ProgramRewardDescription
-                    reward={reward}
-                    amountClassName="text-blue-600"
-                  />
-                </div>
-
-                <div className="flex items-center gap-1 text-xs font-medium text-neutral-500">
-                  <span>Last updated </span>
-                  {!lastUpdatedDate ? (
-                    <div className="h-3 w-16 animate-pulse rounded bg-neutral-100" />
-                  ) : (
-                    <TimestampTooltip
-                      timestamp={lastUpdatedDate}
-                      side="left"
-                      rows={["local", "utc", "unix"]}
-                    >
-                      <span>
-                        {formatDate(lastUpdatedDate, {
-                          month: "short",
-                          day: "numeric",
-                          year: "numeric",
-                        })}
-                      </span>
-                    </TimestampTooltip>
-                  )}
-
-                  {activityLogsLoading ? (
-                    <div className="ml-1 h-3 w-20 animate-pulse rounded bg-neutral-100" />
-                  ) : hasActivityLogs ? (
-                    <>
-                      <span
-                        className="ml-1 size-1 shrink-0 rounded-full bg-neutral-400"
-                        aria-hidden
-                      />
-                      <Button
-                        variant="outline"
-                        text="View history"
-                        className="h-4 w-fit px-1 py-0.5 text-xs font-medium text-neutral-500"
-                        onClick={(e) => {
-                          e.preventDefault();
-                          e.stopPropagation();
-                          setHistoryOpen(true);
-                        }}
-                      />
-                    </>
-                  ) : null}
-                </div>
-              </div>
-            ) : (
-              <div className="flex flex-col">
-                <span className="text-sm font-medium text-neutral-900">
-                  {REWARD_EVENT_DESCRIPTIONS[event].title}
-                </span>
-                <span className="text-sm font-normal text-neutral-500">
-                  {REWARD_EVENT_DESCRIPTIONS[event].description}.{" "}
-                  <Link
-                    href={REWARD_EVENT_DESCRIPTIONS[event].learnMoreHref}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="underline decoration-neutral-400 decoration-dotted underline-offset-2 hover:text-neutral-600"
-                  >
-                    Learn more ↗
-                  </Link>
-                </span>
-              </div>
-            )}
-          </div>
-
-          {reward ? (
-            <Button
-              text="Edit"
-              variant="secondary"
-              className="h-9 w-fit rounded-lg"
-              onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                queryParams({
-                  set: {
-                    rewardId: reward.id,
-                  },
-                });
-              }}
-            />
-          ) : (
-            <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
-              {group.slug !== DEFAULT_PARTNER_GROUP.slug &&
-                (event !== "referral" || canCreateReferralReward) && (
-                  <CopyDefaultRewardButton event={event} />
-                )}
-              <Button
-                text="Create"
-                variant="primary"
-                className="h-9 w-full rounded-lg md:w-fit"
-                disabledTooltip={
-                  event === "referral" && !canCreateReferralReward ? (
-                    <TooltipContent
-                      title="Referral rewards are only available on the Advanced plan and above."
-                      cta="Upgrade to Advanced"
-                      onClick={() => setShowAdvancedUpsellModal(true)}
-                    />
-                  ) : undefined
-                }
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  setIsOpen(true);
-                }}
-              />
-            </div>
-          )}
-        </div>
-      </As>
-    </>
-  );
-};
-
-const CopyDefaultRewardButton = ({ event }: { event: EventType }) => {
-  const { group: defaultGroup } = useGroup({
-    groupIdOrSlug: DEFAULT_PARTNER_GROUP.slug,
-  });
-
-  const defaultReward = defaultGroup?.[`${event}Reward`];
-
-  const { RewardSheet, setIsOpen } = useRewardSheet({
-    event,
-    defaultRewardValues: defaultReward ?? undefined,
-  });
-
-  return defaultReward ? (
-    <>
-      {RewardSheet}
-      <Button
-        text="Duplicate default group"
-        variant="secondary"
-        className="animate-fade-in h-9 w-full rounded-lg md:w-fit"
-        onClick={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          setIsOpen(true);
-        }}
-      />
-    </>
-  ) : null;
-};
-
-const RewardSkeleton = () => {
-  return (
-    <div className="flex items-center gap-4 rounded-lg bg-neutral-50 p-6">
-      <div className="flex size-10 animate-pulse items-center justify-center rounded-full border border-neutral-200 bg-neutral-100" />
-      <div className="flex flex-1 items-center justify-between">
-        <div className="h-4 w-64 animate-pulse rounded bg-neutral-100" />
-        <div className="h-6 w-24 animate-pulse rounded-full bg-neutral-100" />
-      </div>
-    </div>
-  );
-};
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
index ffe6204fe3c..65ee464626f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/page.tsx
@@ -1,5 +1,393 @@
-import { GroupRewards } from "./group-rewards";
+"use client";
+
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import useGroup from "@/lib/swr/use-group";
+import { useRewards } from "@/lib/swr/use-rewards";
+import useWorkspace from "@/lib/swr/use-workspace";
+import type { GroupProps, RewardProps } from "@/lib/types";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { useRewardHistorySheet } from "@/ui/activity-logs/reward-history-sheet";
+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
+import { CustomItemsAccordion } from "@/ui/partners/groups/custom-rewards-accordion";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import {
+  RewardSheet,
+  useRewardSheet,
+} from "@/ui/partners/rewards/add-edit-reward-sheet";
+import { REWARD_EVENT_DESCRIPTIONS } from "@/ui/partners/rewards/reward-event-descriptions";
+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
+import {
+  Button,
+  TimestampTooltip,
+  TooltipContent,
+  useRouterStuff,
+} from "@dub/ui";
+import { cn, formatDate } from "@dub/utils";
+import { EventType } from "@prisma/client";
+import Link from "next/link";
+import { useParams } from "next/navigation";
+import { useEffect, useState } from "react";
 
 export default function GroupRewardsPage() {
-  return <GroupRewards />;
+  const { group, loading } = useGroup();
+  const { rewards: groupRewards } = useRewards({ groupId: group?.id });
+  const { searchParams } = useRouterStuff();
+
+  const [rewardSheetState, setRewardSheetState] = useState<
+    { open: false; rewardId: string | null } | { open: true; rewardId: string }
+  >({ open: false, rewardId: null });
+
+  useEffect(() => {
+    const rewardId = searchParams.get("rewardId");
+
+    if (rewardId) {
+      setRewardSheetState({ open: true, rewardId });
+    } else {
+      setRewardSheetState({ open: false, rewardId: null });
+    }
+  }, [searchParams]);
+
+  const rewards =
+    [
+      group?.clickReward,
+      group?.leadReward,
+      group?.saleReward,
+      group?.referralReward,
+      group?.customReward,
+    ].filter(Boolean) ?? [];
+
+  const currentReward = getCurrentReward({
+    rewardId: rewardSheetState.rewardId,
+    defaultRewards: rewards,
+    rewards: groupRewards,
+  });
+
+  const isNewReward = rewardSheetState.rewardId?.startsWith("new-");
+  const newRewardEvent = isNewReward
+    ? (rewardSheetState.rewardId?.replace("new-", "") as EventType)
+    : undefined;
+
+  return (
+    <div>
+      {rewardSheetState.rewardId && (currentReward || isNewReward) && (
+        <RewardSheetWrapper
+          reward={currentReward}
+          event={newRewardEvent}
+          isOpen={rewardSheetState.open}
+          setIsOpen={(open) =>
+            setRewardSheetState((s) => ({ ...s, open }) as any)
+          }
+          isDefault={
+            Boolean(isNewReward) ||
+            rewards.some((reward) => reward?.id === currentReward?.id)
+          }
+        />
+      )}
+
+      <div className="flex flex-col gap-6">
+        {loading || !group ? (
+          <>
+            {Array.from({ length: 5 }).map((_, index) => (
+              <RewardSkeleton key={index} />
+            ))}
+          </>
+        ) : (
+          <>
+            <RewardItem reward={group.saleReward} event="sale" group={group} />
+            <RewardItem reward={group.leadReward} event="lead" group={group} />
+            <RewardItem
+              reward={group.clickReward}
+              event="click"
+              group={group}
+            />
+
+            <div className="flex items-center gap-3">
+              <h3 className="text-sm font-medium text-neutral-800">
+                Additional rewards
+              </h3>
+              <hr className="min-w-0 flex-1 border-neutral-200" />
+            </div>
+
+            <RewardItem
+              reward={group.referralReward}
+              event="referral"
+              group={group}
+            />
+
+            <RewardItem
+              reward={group.customReward}
+              event="custom"
+              group={group}
+            />
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+const RewardSheetWrapper = ({
+  reward,
+  event,
+  isOpen,
+  setIsOpen,
+  isDefault,
+}: {
+  reward?: RewardProps | null;
+  event?: EventType;
+  isOpen: boolean;
+  setIsOpen: (open: boolean) => void;
+  isDefault: boolean;
+}) => {
+  return (
+    <RewardSheet
+      isOpen={isOpen}
+      setIsOpen={setIsOpen}
+      event={event || reward?.event || "sale"}
+      reward={reward || undefined}
+      isDefault={isDefault}
+    />
+  );
+};
+
+const RewardItem = ({
+  reward,
+  event,
+  group,
+}: {
+  reward?: RewardProps | null;
+  event: EventType;
+  group: GroupProps;
+}) => {
+  const { slug } = useParams();
+  const { plan } = useWorkspace();
+  const { queryParams } = useRouterStuff();
+  const { canCreateReferralReward } = getPlanCapabilities(plan);
+  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+    useAdvancedUpsellModal();
+
+  const { RewardSheet, setIsOpen } = useRewardSheet({
+    event,
+    reward: reward || undefined,
+  });
+
+  const {
+    loading: activityLogsLoading,
+    hasActivityLogs,
+    finalActivityLogDate,
+    rewardHistorySheet,
+    setIsOpen: setHistoryOpen,
+  } = useRewardHistorySheet({
+    reward: reward ?? null,
+  });
+
+  const Icon = REWARD_EVENT_ICON[event];
+  const As = reward ? Link : "div";
+
+  const lastUpdatedDate = finalActivityLogDate ?? reward?.updatedAt;
+
+  return (
+    <>
+      {advancedUpsellModal}
+      {RewardSheet}
+      {rewardHistorySheet}
+      <div>
+        <As
+          href={
+            reward
+              ? `/${slug}/program/groups/${group.slug}/rewards?rewardId=${reward.id}`
+              : "#"
+          }
+          {...(reward ? { scroll: false } : {})}
+          className={cn(
+            "flex flex-col gap-4 rounded-lg p-6 transition-all md:flex-row md:items-center",
+            reward &&
+              "cursor-pointer border border-neutral-200 hover:border-neutral-300",
+            !reward && "bg-neutral-50 hover:bg-neutral-100",
+          )}
+        >
+          <div className="flex size-10 shrink-0 items-center justify-center rounded-full border border-neutral-200 bg-white">
+            <Icon className="size-4 text-neutral-600" />
+          </div>
+          <div className="flex flex-1 flex-col justify-between gap-y-4 md:flex-row md:items-center">
+            <div className="flex w-full items-center gap-2">
+              {reward ? (
+                <div className="flex min-w-0 flex-1 flex-col gap-1">
+                  <div className="text-sm font-normal">
+                    <ProgramRewardDescription
+                      reward={reward}
+                      amountClassName="text-blue-600"
+                    />
+                  </div>
+
+                  <div className="flex items-center gap-1 text-xs font-medium text-neutral-500">
+                    <span>Last updated </span>
+                    {!lastUpdatedDate ? (
+                      <div className="h-3 w-16 animate-pulse rounded bg-neutral-100" />
+                    ) : (
+                      <TimestampTooltip
+                        timestamp={lastUpdatedDate}
+                        side="left"
+                        rows={["local", "utc", "unix"]}
+                      >
+                        <span>
+                          {formatDate(lastUpdatedDate, {
+                            month: "short",
+                            day: "numeric",
+                            year: "numeric",
+                          })}
+                        </span>
+                      </TimestampTooltip>
+                    )}
+
+                    {activityLogsLoading ? (
+                      <div className="ml-1 h-3 w-20 animate-pulse rounded bg-neutral-100" />
+                    ) : hasActivityLogs ? (
+                      <>
+                        <span
+                          className="ml-1 size-1 shrink-0 rounded-full bg-neutral-400"
+                          aria-hidden
+                        />
+                        <Button
+                          variant="outline"
+                          text="View history"
+                          className="h-4 w-fit px-1 py-0.5 text-xs font-medium text-neutral-500"
+                          onClick={(e) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            setHistoryOpen(true);
+                          }}
+                        />
+                      </>
+                    ) : null}
+                  </div>
+                </div>
+              ) : (
+                <div className="flex flex-col">
+                  <span className="text-sm font-medium text-neutral-900">
+                    {REWARD_EVENT_DESCRIPTIONS[event].title}
+                  </span>
+                  <span className="text-sm font-normal text-neutral-500">
+                    {REWARD_EVENT_DESCRIPTIONS[event].description}.{" "}
+                    <Link
+                      href={REWARD_EVENT_DESCRIPTIONS[event].learnMoreHref}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="underline decoration-neutral-400 decoration-dotted underline-offset-2 hover:text-neutral-600"
+                    >
+                      Learn more ↗
+                    </Link>
+                  </span>
+                </div>
+              )}
+            </div>
+
+            {reward ? (
+              <Button
+                text="Edit"
+                variant="secondary"
+                className="h-9 w-fit rounded-lg"
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  queryParams({
+                    set: {
+                      rewardId: reward.id,
+                    },
+                  });
+                }}
+              />
+            ) : (
+              <div className="flex flex-col-reverse items-center gap-2 md:flex-row">
+                {group.slug !== DEFAULT_PARTNER_GROUP.slug &&
+                  (event !== "referral" || canCreateReferralReward) && (
+                    <CopyDefaultRewardButton event={event} />
+                  )}
+                <Button
+                  text="Create"
+                  variant="primary"
+                  className="h-9 w-full rounded-lg md:w-fit"
+                  disabledTooltip={
+                    event === "referral" && !canCreateReferralReward ? (
+                      <TooltipContent
+                        title="Referral rewards are only available on the Advanced plan and above."
+                        cta="Upgrade to Advanced"
+                        onClick={() => setShowAdvancedUpsellModal(true)}
+                      />
+                    ) : undefined
+                  }
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    setIsOpen(true);
+                  }}
+                />
+              </div>
+            )}
+          </div>
+        </As>
+        <CustomItemsAccordion group={group} event={event} />
+      </div>
+    </>
+  );
+};
+
+const CopyDefaultRewardButton = ({ event }: { event: EventType }) => {
+  const { group: defaultGroup } = useGroup({
+    groupIdOrSlug: DEFAULT_PARTNER_GROUP.slug,
+  });
+
+  const defaultReward = defaultGroup?.[`${event}Reward`];
+
+  const { RewardSheet, setIsOpen } = useRewardSheet({
+    event,
+    defaultRewardValues: defaultReward ?? undefined,
+  });
+
+  return defaultReward ? (
+    <>
+      {RewardSheet}
+      <Button
+        text="Duplicate default group"
+        variant="secondary"
+        className="animate-fade-in h-9 w-full rounded-lg md:w-fit"
+        onClick={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          setIsOpen(true);
+        }}
+      />
+    </>
+  ) : null;
+};
+
+const RewardSkeleton = () => {
+  return (
+    <div className="flex items-center gap-4 rounded-lg bg-neutral-50 p-6">
+      <div className="flex size-10 animate-pulse items-center justify-center rounded-full border border-neutral-200 bg-neutral-100" />
+      <div className="flex flex-1 items-center justify-between">
+        <div className="h-4 w-64 animate-pulse rounded bg-neutral-100" />
+        <div className="h-6 w-24 animate-pulse rounded-full bg-neutral-100" />
+      </div>
+    </div>
+  );
+};
+
+function getCurrentReward({
+  rewardId,
+  defaultRewards,
+  rewards,
+}: {
+  rewardId: string | null;
+  defaultRewards: (RewardProps | null | undefined)[];
+  rewards: RewardProps[] | undefined;
+}): RewardProps | undefined {
+  if (!rewardId) {
+    return undefined;
+  }
+
+  return (
+    defaultRewards.find((reward) => reward?.id === rewardId) ??
+    rewards?.find((reward) => reward.id === rewardId)
+  );
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
index 027523f5931..53ac0d9778b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-move-rules.tsx
@@ -112,8 +112,13 @@ export function GroupMoveRules() {
     [metricRuleIndexes],
   );
 
+  const hasIncompleteMetricRule = metricRuleIndexes.some(
+    ({ rule }) => !rule.attribute,
+  );
+
   const canAddMetricRule =
-    usedMetricAttributes.length < GROUP_MOVE_METRIC_ATTRIBUTE_KEYS.length;
+    !hasIncompleteMetricRule &&
+    metricRuleIndexes.length < GROUP_MOVE_METRIC_ATTRIBUTE_KEYS.length;
 
   // Source group is only an additional condition after a complete metric rule
   const canAddPartnerGroupCondition =
@@ -220,7 +225,9 @@ export function GroupMoveRules() {
           disabled={!canAddMetricRule && ruleFields.length > 0}
           disabledTooltip={
             !canAddMetricRule && ruleFields.length > 0
-              ? "All rules are in use. Delete existing rules."
+              ? hasIncompleteMetricRule
+                ? "Select an activity before adding another rule"
+                : "All available rules have been added"
               : undefined
           }
         />
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
index 00c75d35788..f77b9a018e2 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
@@ -2,6 +2,7 @@
 
 import { clientAccessCheck } from "@/lib/client-access-check";
 import useGroupsCount from "@/lib/swr/use-groups-count";
+import usePartnersCount from "@/lib/swr/use-partners-count";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { GroupExtendedProps } from "@/lib/types";
@@ -38,7 +39,7 @@ import { cn, currencyFormatter, fetcher, nFormatter } from "@dub/utils";
 import { Row } from "@tanstack/react-table";
 import { Command } from "cmdk";
 import { useParams, useRouter } from "next/navigation";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { toast } from "sonner";
 import useSWR from "swr";
 
@@ -88,6 +89,36 @@ export function GroupsTable() {
     error: countError,
   } = useGroupsCount();
 
+  const {
+    partnersCount: partnersCountByGroup,
+    loading: partnersCountLoading,
+    error: partnersCountError,
+  } = usePartnersCount<
+    | {
+        groupId: string;
+        _count: number;
+      }[]
+    | undefined
+  >({
+    groupBy: "groupId",
+    ignoreParams: true,
+  });
+
+  const partnersCountByGroupId = useMemo(() => {
+    const map = new Map<string, number>();
+    partnersCountByGroup?.forEach(({ groupId, _count }) => {
+      if (groupId) {
+        map.set(groupId, _count);
+      }
+    });
+    return map;
+  }, [partnersCountByGroup]);
+
+  const partnersCountReady =
+    !partnersCountLoading &&
+    !partnersCountError &&
+    partnersCountByGroup != null;
+
   const isFiltered = Object.keys(searchParamsObj).some(
     (key) => !["sortBy", "sortOrder", "page"].includes(key),
   );
@@ -164,7 +195,15 @@ export function GroupsTable() {
         enableHiding: false,
         header: () => <EditColumnsButton table={table} />,
         cell: ({ row }) => (
-          <RowMenuButton row={row} currentDefaultGroup={currentDefaultGroup} />
+          <RowMenuButton
+            row={row}
+            currentDefaultGroup={currentDefaultGroup}
+            partnersCount={
+              partnersCountReady
+                ? partnersCountByGroupId.get(row.original.id) ?? 0
+                : undefined
+            }
+          />
         ),
       },
     ],
@@ -246,28 +285,41 @@ export function GroupsTable() {
 function RowMenuButton({
   row,
   currentDefaultGroup,
+  partnersCount,
 }: {
   row: Row<GroupExtendedProps>;
   currentDefaultGroup: GroupExtendedProps | undefined;
+  partnersCount: number | undefined;
 }) {
   const router = useRouter();
   const { slug } = useParams();
   const [isOpen, setIsOpen] = useState(false);
   const { role } = useWorkspace();
 
-  const { DeleteGroupModal, setShowDeleteGroupModal } = useDeleteGroupModal(
-    row.original,
-  );
+  const { DeleteGroupModal, setShowDeleteGroupModal } = useDeleteGroupModal({
+    id: row.original.id,
+    name: row.original.name,
+    color: row.original.color,
+    partnersCount: partnersCount ?? 0,
+  });
 
   const { openConfirmSetDefaultGroupModal, ConfirmSetDefaultGroupModal } =
     useConfirmSetDefaultGroupModal();
 
-  const permissionsError = clientAccessCheck({
+  const [copiedGroupId, copyToClipboard] = useCopyToClipboard();
+
+  const { error: permissionsError } = clientAccessCheck({
     action: "groups.write",
     role,
-  }).error;
+  });
 
-  const [copiedGroupId, copyToClipboard] = useCopyToClipboard();
+  const deleteGroupDisabledReason = permissionsError
+    ? String(permissionsError)
+    : partnersCount === undefined
+      ? true
+      : partnersCount > 0
+        ? "Move all partners to another group before deleting."
+        : undefined;
 
   return (
     <>
@@ -347,7 +399,7 @@ function RowMenuButton({
                         label="Delete group"
                         variant="danger"
                         onSelect={() => setShowDeleteGroupModal(true)}
-                        disabledTooltip={permissionsError || undefined}
+                        disabledTooltip={deleteGroupDisabledReason || undefined}
                       />
                     </>
                   )}
@@ -396,21 +448,27 @@ function MenuItem({
 
   return (
     <DynamicTooltipWrapper
-      tooltipProps={disabledTooltip ? { content: disabledTooltip } : undefined}
+      tooltipProps={
+        typeof disabledTooltip === "string"
+          ? { content: disabledTooltip, side: "left" }
+          : undefined
+      }
     >
-      <Command.Item
-        className={cn(
-          "flex cursor-pointer select-none items-center gap-2 whitespace-nowrap rounded-md p-2 text-sm",
-          disabledTooltip
-            ? "cursor-not-allowed opacity-50"
-            : "data-[selected=true]:bg-neutral-100",
-          text,
-        )}
-        onSelect={disabledTooltip ? undefined : onSelect}
-      >
-        <IconComp className={cn("size-4 shrink-0", icon)} />
-        {label}
-      </Command.Item>
+      <div>
+        <Command.Item
+          className={cn(
+            "flex cursor-pointer select-none items-center gap-2 whitespace-nowrap rounded-md p-2 text-sm",
+            disabledTooltip
+              ? "cursor-not-allowed opacity-50"
+              : "data-[selected=true]:bg-neutral-100",
+            text,
+          )}
+          onSelect={disabledTooltip ? undefined : onSelect}
+        >
+          <IconComp className={cn("size-4 shrink-0", icon)} />
+          {label}
+        </Command.Item>
+      </div>
     </DynamicTooltipWrapper>
   );
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/leads/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/leads/page.tsx
new file mode 100644
index 00000000000..fdc6ea49bba
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/leads/page.tsx
@@ -0,0 +1,19 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { SubmittedLeadTable } from "@/ui/submitted-leads/submitted-lead-table";
+
+export default function SubmittedLeadsPage() {
+  return (
+    <PageContent
+      title="Submitted Leads"
+      titleInfo={{
+        title:
+          "Review and manage leads submitted by your partners. [Learn more](https://dub.co/help/article/submitted-leads).",
+      }}
+    >
+      <PageWidthWrapper className="flex flex-col gap-3 pb-10">
+        <SubmittedLeadTable />
+      </PageWidthWrapper>
+    </PageContent>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
index b2fd7bbf894..9ea68c30a7c 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/[partnerId]/page-client.tsx
@@ -1,11 +1,11 @@
 "use client";
 
 import { parseActionError } from "@/lib/actions/parse-action-errors";
-import { PROGRAM_ALLOWED_ATTACHMENT_TYPES } from "@/lib/messages/constants";
 import { usePartnerMessages } from "@/lib/messages/hooks/use-partner-messages";
 import { markPartnerMessagesReadAction } from "@/lib/messages/mark-partner-messages-read";
 import { messagePartnerAction } from "@/lib/messages/message-partner";
 import { uploadMessageAttachmentAction } from "@/lib/messages/upload-message-attachment";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import usePartner from "@/lib/swr/use-partner";
 import useProgram from "@/lib/swr/use-program";
@@ -117,8 +117,7 @@ export function ProgramMessagesPartnerPageClient() {
           const result = await uploadAttachment({
             workspaceId: workspaceId!,
             fileName: file.name,
-            contentType:
-              file.type as (typeof PROGRAM_ALLOWED_ATTACHMENT_TYPES)[number],
+            contentType: file.type,
             contentLength: file.size,
           });
 
@@ -228,7 +227,9 @@ export function ProgramMessagesPartnerPageClient() {
             pendingAttachments={pendingAttachments}
             onAddFiles={handleAddFiles}
             onRemoveAttachment={handleRemoveAttachment}
-            allowedFileTypes={PROGRAM_ALLOWED_ATTACHMENT_TYPES}
+            allowedFileTypes={
+              UPLOAD_POLICIES.programMessageAttachments.contentTypes
+            }
             defaultValue={defaultMessage}
             onSendMessage={async (message, attachments) => {
               const createdAt = new Date();
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
index cd1d63394b2..e4144d905f7 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/messages/layout.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { usePartnerMessages } from "@/lib/messages/hooks/use-partner-messages";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import useProgram from "@/lib/swr/use-program";
@@ -28,10 +29,16 @@ export default function MessagesLayout({ children }: { children: ReactNode }) {
 }
 
 function CapableLayout({ children }: { children: ReactNode }) {
-  const { slug: workspaceSlug } = useWorkspace();
+  const { slug: workspaceSlug, role } = useWorkspace();
   const { partnerId } = useParams() as { partnerId?: string };
   const { program } = useProgram();
 
+  const permissionsError = clientAccessCheck({
+    action: "messages.write",
+    role,
+    customPermissionDescription: "message partners",
+  }).error;
+
   const router = useRouter();
 
   const { partnerMessages, isLoading, error } = usePartnerMessages({
@@ -69,22 +76,32 @@ function CapableLayout({ children }: { children: ReactNode }) {
                   />
                 </div>
               </div>
-              <PartnerSelector
-                selectedPartnerId={partnerId ?? null}
-                setSelectedPartnerId={(id) =>
-                  router.push(`/${workspaceSlug}/program/messages/${id}`)
-                }
-                trigger={
-                  <Button
-                    type="button"
-                    variant="secondary"
-                    icon={<Pen2 className="size-4" />}
-                    className="size-8 rounded-lg p-0"
-                  />
-                }
-                matchTriggerWidth={false}
-                optionClassName="sm:max-w-[320px]"
-              />
+              {permissionsError ? (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  icon={<Pen2 className="size-4" />}
+                  className="size-8 rounded-lg p-0"
+                  disabledTooltip={permissionsError}
+                />
+              ) : (
+                <PartnerSelector
+                  selectedPartnerId={partnerId ?? null}
+                  setSelectedPartnerId={(id) =>
+                    router.push(`/${workspaceSlug}/program/messages/${id}`)
+                  }
+                  trigger={
+                    <Button
+                      type="button"
+                      variant="secondary"
+                      icon={<Pen2 className="size-4" />}
+                      className="size-8 rounded-lg p-0"
+                    />
+                  }
+                  matchTriggerWidth={false}
+                  optionClassName="sm:max-w-[320px]"
+                />
+              )}
             </div>
             <div className="scrollbar-hide grow overflow-y-auto">
               {partnerMessages?.length || isLoading ? (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
index 772c2b84f78..d8ee4bd7eeb 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx
@@ -2,6 +2,7 @@
 
 import { deleteProgramInviteAction } from "@/lib/actions/partners/delete-program-invite";
 import { resendProgramInviteAction } from "@/lib/actions/partners/resend-program-invite";
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { getDeletePartnerDisabledTooltip } from "@/lib/partners/utils";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import usePartner from "@/lib/swr/use-partner";
@@ -171,9 +172,27 @@ function PartnerProfileButton({
 }
 
 function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
-  const { slug: workspaceSlug, id: workspaceId } = useWorkspace();
+  const { slug: workspaceSlug, id: workspaceId, role } = useWorkspace();
   const router = useRouter();
 
+  const commissionPermissionsError = clientAccessCheck({
+    action: "commissions.write",
+    role,
+    customPermissionDescription: "create commissions",
+  }).error;
+
+  const clawbackPermissionsError = clientAccessCheck({
+    action: "commissions.write",
+    role,
+    customPermissionDescription: "create clawbacks",
+  }).error;
+
+  const messagesPermissionsError = clientAccessCheck({
+    action: "messages.write",
+    role,
+    customPermissionDescription: "message partners",
+  }).error;
+
   const { createCommissionSheet, setIsOpen: setCreateCommissionSheetOpen } =
     useCreateCommissionSheet({
       nested: true,
@@ -182,15 +201,21 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
   const canCreateCommission = COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES.includes(
     partner.status,
   );
-  const createCommissionDisabledTooltip = canCreateCommission
-    ? undefined
-    : `You can't create a commission for a partner that is ${partner.status}.`;
+  const createCommissionDisabledTooltip =
+    commissionPermissionsError ||
+    (canCreateCommission
+      ? undefined
+      : `You can't create a commission for a partner that is ${partner.status}.`);
 
-  useKeyboardShortcut("c", () => {
-    if (canCreateCommission) {
-      setCreateCommissionSheetOpen(true);
-    }
-  });
+  useKeyboardShortcut(
+    "c",
+    () => {
+      if (canCreateCommission) {
+        setCreateCommissionSheetOpen(true);
+      }
+    },
+    { enabled: !commissionPermissionsError },
+  );
 
   const { createClawbackSheet, setIsOpen: setClawbackSheetOpen } =
     useCreateClawbackSheet({});
@@ -297,15 +322,25 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
             className="hidden h-8 w-fit px-3 sm:h-9 md:flex"
           />
 
-          <Link href={`/${workspaceSlug}/program/messages/${partner.id}`}>
+          {messagesPermissionsError ? (
             <Button
               variant="secondary"
               text="Message"
               icon={<Msgs className="size-4 shrink-0" />}
-              onClick={() => setIsOpen(false)}
+              disabledTooltip={messagesPermissionsError}
               className="hidden h-8 w-fit px-3 sm:h-9 md:flex"
             />
-          </Link>
+          ) : (
+            <Link href={`/${workspaceSlug}/program/messages/${partner.id}`}>
+              <Button
+                variant="secondary"
+                text="Message"
+                icon={<Msgs className="size-4 shrink-0" />}
+                onClick={() => setIsOpen(false)}
+                className="hidden h-8 w-fit px-3 sm:h-9 md:flex"
+              />
+            </Link>
+          )}
         </>
       )}
 
@@ -343,16 +378,26 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
             ) : (
               <>
                 <div className="grid gap-px p-2">
-                  <MenuItem
-                    as={Link}
-                    href={`/${workspaceSlug}/program/messages/${partner.id}`}
-                    target="_blank"
-                    icon={Msgs}
-                    onClick={() => setIsOpen(false)}
-                    className="md:hidden"
-                  >
-                    Message
-                  </MenuItem>
+                  {messagesPermissionsError ? (
+                    <MenuItem
+                      icon={Msgs}
+                      disabledTooltip={messagesPermissionsError}
+                      className="md:hidden"
+                    >
+                      Message
+                    </MenuItem>
+                  ) : (
+                    <MenuItem
+                      as={Link}
+                      href={`/${workspaceSlug}/program/messages/${partner.id}`}
+                      target="_blank"
+                      icon={Msgs}
+                      onClick={() => setIsOpen(false)}
+                      className="md:hidden"
+                    >
+                      Message
+                    </MenuItem>
+                  )}
                   <MenuItem
                     icon={InvoiceDollar}
                     onClick={() => {
@@ -370,6 +415,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {
                       setClawbackSheetOpen(true);
                       setIsOpen(false);
                     }}
+                    disabledTooltip={clawbackPermissionsError || undefined}
                   >
                     Create clawback
                   </MenuItem>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsx
new file mode 100644
index 00000000000..2e38ac72861
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/discount-codes.tsx
@@ -0,0 +1,508 @@
+"use client";
+
+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
+import useDiscountCodes from "@/lib/swr/use-discount-codes";
+import { useDiscounts } from "@/lib/swr/use-discounts";
+import useGroup from "@/lib/swr/use-group";
+import {
+  ProgramPartnerLinkExtended,
+  useProgramPartnerLinks,
+} from "@/lib/swr/use-program-partner-links";
+import useWorkspace from "@/lib/swr/use-workspace";
+import {
+  DiscountCodeProps,
+  DiscountProps,
+  EnrolledPartnerExtendedProps,
+  EnrolledPartnerProps,
+  GroupProps,
+} from "@/lib/types";
+import { useAddDiscountCodeModal } from "@/ui/modals/add-discount-code-modal";
+import { DeleteDiscountCodeModal } from "@/ui/modals/delete-discount-code-modal";
+import { useEditPartnerDiscountModal } from "@/ui/modals/edit-partner-discount-modal";
+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
+import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";
+import { ButtonLink } from "@/ui/placeholders/button-link";
+import { ThreeDots } from "@/ui/shared/icons";
+import {
+  Button,
+  CardList,
+  LoadingSpinner,
+  MenuItem,
+  Popover,
+  Tooltip,
+  TooltipContent,
+  useCopyToClipboard,
+} from "@dub/ui";
+import { DiscountCode, Trash } from "@dub/ui/icons";
+import { cn, getPrettyUrl, nFormatter, pluralize } from "@dub/utils";
+import { DiscountProvider } from "@prisma/client";
+import { Command } from "cmdk";
+import Link from "next/link";
+import { type ReactNode, useCallback, useMemo, useState } from "react";
+
+type PartnerLink = ProgramPartnerLinkExtended;
+type PartnerForDiscountOverride = Pick<
+  EnrolledPartnerProps,
+  "id" | "name" | "email" | "image" | "groupId" | "discountId"
+>;
+
+function getEffectiveDiscountProvider({
+  link,
+  discounts,
+  partnerDiscount,
+  groupDiscount,
+}: {
+  link: PartnerLink;
+  discounts?: DiscountProps[] | null;
+  partnerDiscount?: Pick<DiscountProps, "id" | "provider"> | null;
+  groupDiscount?: Pick<DiscountProps, "id" | "provider"> | null;
+}): DiscountProvider | null {
+  if (link.discount) {
+    return discounts?.find((d) => d.id === link.discount)?.provider ?? null;
+  }
+
+  return partnerDiscount?.provider ?? groupDiscount?.provider ?? null;
+}
+
+function linkHasEffectiveDiscount({
+  link,
+  partnerDiscount,
+  groupDiscount,
+}: {
+  link: PartnerLink;
+  partnerDiscount?: Pick<DiscountProps, "id"> | null;
+  groupDiscount?: Pick<DiscountProps, "id"> | null;
+}) {
+  return Boolean(link.discount || partnerDiscount?.id || groupDiscount?.id);
+}
+
+export function PartnerDiscountCodes({
+  partner,
+}: {
+  partner: EnrolledPartnerExtendedProps;
+}) {
+  const { slug, stripeConnectId, shopifyStoreId } = useWorkspace();
+  const { group } = useGroup({
+    groupIdOrSlug: partner.groupId ?? undefined,
+  });
+
+  const [selectedDiscountCode, setSelectedDiscountCode] =
+    useState<DiscountCodeProps | null>(null);
+
+  const [showDeleteDiscountCodeModal, setShowDeleteDiscountCodeModal] =
+    useState(false);
+
+  const { discountCodes, loading, error } = useDiscountCodes({
+    partnerId: partner.id || null,
+  });
+
+  const { links } = useProgramPartnerLinks({
+    partnerId: partner.id || null,
+  });
+
+  const { discounts } = useDiscounts({
+    groupId: partner.groupId ?? undefined,
+  });
+
+  const getDiscountProvider = useCallback(
+    (linkId: string) => {
+      const link = links?.find((item) => item.id === linkId);
+      if (!link) return null;
+
+      return getEffectiveDiscountProvider({
+        link,
+        discounts,
+        partnerDiscount: partner.discount,
+        groupDiscount: group?.discount,
+      });
+    },
+    [links, discounts, partner.discount, group?.discount],
+  );
+
+  const { AddDiscountCodeModal, setShowAddDiscountCodeModal } =
+    useAddDiscountCodeModal({
+      partner,
+      getDiscountProvider,
+    });
+
+  const usedLinkIds = useMemo(
+    () => new Set(discountCodes?.map((code) => code.linkId) ?? []),
+    [discountCodes],
+  );
+
+  const eligibleLinks = useMemo(() => {
+    if (!links) {
+      return [];
+    }
+
+    return links.filter(
+      (link) =>
+        !usedLinkIds.has(link.id) &&
+        linkHasEffectiveDiscount({
+          link,
+          partnerDiscount: partner.discount,
+          groupDiscount: group?.discount,
+        }),
+    );
+  }, [links, usedLinkIds, partner.discount, group?.discount]);
+
+  const disabledReason = useMemo(() => {
+    if (!links || links.length === 0) {
+      return "No links assigned to this partner group. Please add a link before you can create a discount code.";
+    }
+
+    if (eligibleLinks.length === 0) {
+      if (links.length === discountCodes?.length) {
+        return "All links have a discount code assigned to them. Please add a new link before you can create a discount code.";
+      }
+
+      return "No discount assigned to this partner or their links. Please add a discount before you can create a discount code.";
+    }
+
+    const providers = new Set(
+      eligibleLinks
+        .map((link) =>
+          getEffectiveDiscountProvider({
+            link,
+            discounts,
+            partnerDiscount: partner.discount,
+            groupDiscount: group?.discount,
+          }),
+        )
+        .filter(Boolean),
+    );
+
+    if (providers.has(DiscountProvider.stripe) && !stripeConnectId) {
+      return (
+        <TooltipContent
+          title="Your workspace isn't connected to Stripe yet. Please install the Dub Stripe app in settings to create discount codes."
+          cta="Install Stripe app"
+          href={`/${slug}/settings/integrations/stripe`}
+          target="_blank"
+        />
+      );
+    }
+
+    if (providers.has(DiscountProvider.shopify) && !shopifyStoreId) {
+      return (
+        <TooltipContent
+          title="Your workspace isn't connected to Shopify yet. Please install the Dub Shopify app in settings to create discount codes."
+          cta="Install Shopify app"
+          href={`/${slug}/settings/integrations/shopify`}
+          target="_blank"
+        />
+      );
+    }
+
+    return undefined;
+  }, [
+    links,
+    eligibleLinks,
+    discountCodes,
+    discounts,
+    partner.discount,
+    group?.discount,
+    stripeConnectId,
+    shopifyStoreId,
+    slug,
+  ]);
+
+  const hasPartnerOrLinkDiscount = Boolean(
+    partner.discount?.id ||
+      group?.discount?.id ||
+      links?.some((link) => link.discount) ||
+      eligibleLinks.length > 0,
+  );
+
+  const discountCodeEmptyState = hasPartnerOrLinkDiscount
+    ? {
+        description:
+          "Great for short-form content, podcasts and more. Works alongside link-based discounts.",
+        buttonText: "Learn more",
+        buttonHref:
+          "https://dub.co/help/article/dual-sided-incentives#option-2-using-stripe-promo-codes-no-code-required",
+      }
+    : {
+        description:
+          "You need to create a group discount for this partner before you can create a discount code.",
+        buttonText: "Create group discount",
+        buttonHref: group?.slug
+          ? `/${slug}/program/groups/${group.slug}/discounts`
+          : `/${slug}/program/groups`,
+      };
+
+  return (
+    <>
+      <div className="flex items-end justify-between gap-4">
+        <h2 className="text-content-emphasis text-lg font-semibold">
+          Discount codes
+        </h2>
+        <Button
+          variant="secondary"
+          text="Create code"
+          className="h-8 w-fit rounded-lg px-3 py-2 font-medium"
+          onClick={() => setShowAddDiscountCodeModal(true)}
+          disabled={!!disabledReason}
+          disabledTooltip={disabledReason}
+        />
+      </div>
+
+      {loading ? (
+        <div className="flex justify-center py-16">
+          <LoadingSpinner />
+        </div>
+      ) : !error && (!discountCodes || discountCodes.length === 0) ? (
+        <div className="flex flex-col items-center justify-center gap-2 rounded-lg border border-neutral-200 bg-neutral-50 py-6">
+          <div className="flex max-w-sm flex-col items-center gap-2 text-center">
+            <DiscountCode className="mb-2 size-6 text-neutral-900" />
+            <h3 className="text-content-emphasis text-sm font-semibold leading-5">
+              No discount codes created
+            </h3>
+            <p className="text-content-subtle -mt-1 text-sm font-medium leading-5">
+              {discountCodeEmptyState.description}
+            </p>
+            {discountCodeEmptyState.buttonHref && (
+              <ButtonLink
+                href={discountCodeEmptyState.buttonHref}
+                target={
+                  discountCodeEmptyState.buttonHref.startsWith("https")
+                    ? "_blank"
+                    : undefined
+                }
+                variant="secondary"
+                className="mt-2 h-7 rounded-md px-3 text-sm font-medium"
+              >
+                {discountCodeEmptyState.buttonText}
+              </ButtonLink>
+            )}
+          </div>
+        </div>
+      ) : error ? (
+        <div className="flex justify-center py-16">
+          <span className="text-content-subtle text-sm">
+            Failed to load discount codes
+          </span>
+        </div>
+      ) : (
+        <CardList variant="compact">
+          {discountCodes?.map((discountCode) => {
+            const link = links?.find((l) => l.id === discountCode.linkId);
+
+            return (
+              <DiscountCodeCard
+                key={discountCode.id}
+                discountCode={discountCode}
+                link={link}
+                partner={partner}
+                group={group}
+                slug={slug}
+                onDelete={() => {
+                  setSelectedDiscountCode(discountCode);
+                  setShowDeleteDiscountCodeModal(true);
+                }}
+              />
+            );
+          })}
+        </CardList>
+      )}
+
+      <AddDiscountCodeModal />
+
+      {selectedDiscountCode && (
+        <DeleteDiscountCodeModal
+          showModal={showDeleteDiscountCodeModal}
+          setShowModal={setShowDeleteDiscountCodeModal}
+          discountCode={selectedDiscountCode}
+        />
+      )}
+    </>
+  );
+}
+
+function DiscountCodeCard({
+  discountCode,
+  link,
+  partner,
+  group,
+  slug,
+  onDelete,
+}: {
+  discountCode: DiscountCodeProps;
+  link?: PartnerLink;
+  partner: PartnerForDiscountOverride;
+  group?: GroupProps | null;
+  slug?: string;
+  onDelete: () => void;
+}) {
+  const { plan } = useWorkspace();
+  const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
+  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+    useAdvancedUpsellModal();
+
+  const partnerLink = link ? constructPartnerLink({ group, link }) : "";
+  const hasDiscountOverride = Boolean(link?.discount);
+  const conversions = link?.conversions ?? 0;
+
+  const { EditPartnerDiscountModal, setShowEditPartnerDiscountModal } =
+    useEditPartnerDiscountModal({
+      target: link ? { type: "link", link, partner } : null,
+      group,
+    });
+
+  const editDiscountDisabledTooltip = !link ? (
+    "Link not found"
+  ) : !canUseAdvancedRewardLogic ? (
+    <TooltipContent
+      title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+      cta="Upgrade to Advanced"
+      onClick={() => setShowAdvancedUpsellModal(true)}
+    />
+  ) : undefined;
+
+  return (
+    <>
+      {advancedUpsellModal}
+      <CardList.Card
+        innerClassName="flex items-center justify-between gap-4 px-3 py-2.5"
+        hoverStateEnabled={false}
+      >
+        <div className="flex min-w-0 flex-1 items-center gap-3">
+          <div className="w-40 shrink-0">
+            <DiscountCodeBadge
+              code={discountCode.code}
+              disabledAt={discountCode.disabledAt}
+            />
+          </div>
+
+          {link ? (
+            <div className="flex min-w-0 items-center gap-2">
+              <Link
+                href={`/${slug}/links/${link.domain}/${link.key}`}
+                target="_blank"
+                className="text-content-default cursor-alias truncate text-sm font-medium decoration-dotted hover:underline"
+              >
+                {getPrettyUrl(partnerLink)}
+              </Link>
+              {hasDiscountOverride && (
+                <Tooltip
+                  content={
+                    <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+                      This link has a discount override
+                    </div>
+                  }
+                >
+                  <div className="flex h-5 shrink-0 items-center justify-center rounded-md bg-neutral-100 px-1">
+                    <DiscountCode className="size-3 text-neutral-700" />
+                  </div>
+                </Tooltip>
+              )}
+            </div>
+          ) : (
+            <span className="text-sm text-neutral-500">Link not found</span>
+          )}
+        </div>
+
+        <div className="flex shrink-0 items-center gap-3">
+          {link && (
+            <Tooltip
+              content={
+                <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+                  {nFormatter(conversions, { full: true })}{" "}
+                  {pluralize("conversion", conversions)}
+                </div>
+              }
+            >
+              <Link
+                href={`/${slug}/events?event=sales&interval=all&domain=${link.domain}&key=${link.key}`}
+                target="_blank"
+                className="flex items-center gap-1.5"
+              >
+                <DiscountCode
+                  data-active={conversions > 0}
+                  className={cn(
+                    "size-4 shrink-0 text-neutral-400",
+                    "data-[active=true]:text-green-600",
+                  )}
+                />
+                <span className="text-xs font-medium text-neutral-700">
+                  {nFormatter(conversions)}
+                </span>
+              </Link>
+            </Tooltip>
+          )}
+
+          <DiscountCodeCardMenu
+            code={discountCode.code}
+            partnerLink={partnerLink}
+            onDelete={onDelete}
+            onEditDiscount={() => setShowEditPartnerDiscountModal(true)}
+            editDiscountDisabledTooltip={editDiscountDisabledTooltip}
+          />
+        </div>
+      </CardList.Card>
+      <EditPartnerDiscountModal />
+    </>
+  );
+}
+
+function DiscountCodeCardMenu({
+  code,
+  partnerLink,
+  onDelete,
+  onEditDiscount,
+  editDiscountDisabledTooltip,
+}: {
+  code: string;
+  partnerLink: string;
+  onDelete: () => void;
+  onEditDiscount: () => void;
+  editDiscountDisabledTooltip?: ReactNode;
+}) {
+  const [openPopover, setOpenPopover] = useState(false);
+  const [, copyToClipboard] = useCopyToClipboard();
+
+  return (
+    <Popover
+      align="end"
+      openPopover={openPopover}
+      setOpenPopover={setOpenPopover}
+      content={
+        <Command tabIndex={0} loop className="focus:outline-none">
+          <Command.List className="flex w-screen flex-col gap-1 p-1.5 text-sm focus-visible:outline-none sm:w-auto sm:min-w-[180px]">
+            <MenuItem
+              as={Command.Item}
+              icon={DiscountCode}
+              disabledTooltip={editDiscountDisabledTooltip}
+              onSelect={() => {
+                setOpenPopover(false);
+                onEditDiscount();
+              }}
+            >
+              Edit discount
+            </MenuItem>
+            <MenuItem
+              as={Command.Item}
+              variant="danger"
+              icon={Trash}
+              onSelect={() => {
+                setOpenPopover(false);
+                onDelete();
+              }}
+            >
+              Delete discount code
+            </MenuItem>
+          </Command.List>
+        </Command>
+      }
+    >
+      <Button
+        type="button"
+        variant="outline"
+        className="size-6 shrink-0 rounded-lg p-0"
+        icon={<ThreeDots className="size-3.5 shrink-0" />}
+      />
+    </Popover>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx
index 11256da1407..ac0813af7ff 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/page.tsx
@@ -2,37 +2,16 @@
 
 import { usePartnerReferral } from "@/lib/partner-referrals/hooks/use-partner-referral";
 import { constructPartnerReferralLink } from "@/lib/partner-referrals/utils";
-import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
-import useDiscountCodes from "@/lib/swr/use-discount-codes";
-import useGroup from "@/lib/swr/use-group";
 import usePartner from "@/lib/swr/use-partner";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
-import {
-  DiscountCodeProps,
-  EnrolledPartnerExtendedProps,
-  EnrolledPartnerProps,
-} from "@/lib/types";
-import { useAddDiscountCodeModal } from "@/ui/modals/add-discount-code-modal";
-import { useAddPartnerLinkModal } from "@/ui/modals/add-partner-link-modal";
-import { DeleteDiscountCodeModal } from "@/ui/modals/delete-discount-code-modal";
-import { DiscountCodeBadge } from "@/ui/partners/discounts/discount-code-badge";
-import { ButtonLink } from "@/ui/placeholders/button-link";
-import {
-  Button,
-  CopyButton,
-  LoadingSpinner,
-  Table,
-  Tag,
-  TooltipContent,
-  useTable,
-} from "@dub/ui";
-import { Trash } from "@dub/ui/icons";
+import { EnrolledPartnerProps } from "@/lib/types";
+import { CopyButton, LoadingSpinner, Table, useTable } from "@dub/ui";
 import { cn, currencyFormatter, getPrettyUrl, nFormatter } from "@dub/utils";
-import { DiscountProvider } from "@prisma/client";
-import Link from "next/link";
 import { useParams, useRouter } from "next/navigation";
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
+import { PartnerDiscountCodes } from "./discount-codes";
+import { ReferralLinks } from "./referral-links";
 
 export default function ProgramPartnerLinksPage() {
   const { partnerId } = useParams() as { partnerId: string };
@@ -40,7 +19,7 @@ export default function ProgramPartnerLinksPage() {
 
   return partner ? (
     <div className="grid min-w-0 gap-4">
-      <PartnerLinks partner={partner} />
+      <ReferralLinks partner={partner} />
       <PartnerDiscountCodes partner={partner} />
       <PartnerReferralLink partner={partner} />
     </div>
@@ -57,137 +36,6 @@ export default function ProgramPartnerLinksPage() {
   );
 }
 
-const PartnerLinks = ({ partner }: { partner: EnrolledPartnerProps }) => {
-  const { slug } = useWorkspace();
-
-  const { group } = useGroup({
-    groupIdOrSlug: partner.groupId ?? undefined,
-  });
-
-  const { AddPartnerLinkModal, setShowAddPartnerLinkModal } =
-    useAddPartnerLinkModal({
-      partner,
-    });
-
-  const table = useTable({
-    data: partner.links || [],
-    columns: [
-      {
-        id: "shortLink",
-        header: "Link",
-        meta: {
-          disableTruncate: true,
-        },
-        cell: ({ row }) => {
-          const partnerLink = constructPartnerLink({
-            group: group ?? undefined,
-            link: row.original,
-          });
-          return (
-            <div className="flex items-center gap-3">
-              <Link
-                href={`/${slug}/links/${row.original.domain}/${row.original.key}`}
-                target="_blank"
-                className="cursor-alias font-medium text-black decoration-dotted hover:underline"
-              >
-                {getPrettyUrl(partnerLink)}
-              </Link>
-              <CopyButton value={partnerLink} className="p-0.5" />
-            </div>
-          );
-        },
-      },
-      {
-        header: "Clicks",
-        size: 1,
-        minSize: 1,
-        cell: ({ row }) => (
-          <Link
-            href={`/${slug}/events?event=clicks&interval=all&domain=${row.original.domain}&key=${row.original.key}`}
-            target="_blank"
-            className="block w-full cursor-alias decoration-dotted hover:underline"
-          >
-            {nFormatter(row.original.clicks)}
-          </Link>
-        ),
-      },
-      {
-        header: "Leads",
-        size: 1,
-        minSize: 1,
-        cell: ({ row }) => (
-          <Link
-            href={`/${slug}/events?event=leads&interval=all&domain=${row.original.domain}&key=${row.original.key}`}
-            target="_blank"
-            className="block w-full cursor-alias decoration-dotted hover:underline"
-          >
-            {nFormatter(row.original.leads)}
-          </Link>
-        ),
-      },
-      {
-        header: "Conversions",
-        size: 1,
-        minSize: 1,
-        cell: ({ row }) => (
-          <Link
-            href={`/${slug}/events?event=sales&interval=all&domain=${row.original.domain}&key=${row.original.key}`}
-            target="_blank"
-            className="block w-full cursor-alias decoration-dotted hover:underline"
-          >
-            {nFormatter(row.original.conversions)}
-          </Link>
-        ),
-      },
-      {
-        header: "Revenue",
-        accessorFn: (d) =>
-          currencyFormatter(d.saleAmount, {
-            trailingZeroDisplay: "stripIfInteger",
-          }),
-        size: 1,
-        minSize: 1,
-        cell: ({ row }) => (
-          <Link
-            href={`/${slug}/events?event=sales&interval=all&domain=${row.original.domain}&key=${row.original.key}`}
-            target="_blank"
-            className="block w-full cursor-alias decoration-dotted hover:underline"
-          >
-            {currencyFormatter(row.original.saleAmount, {
-              trailingZeroDisplay: "stripIfInteger",
-            })}
-          </Link>
-        ),
-      },
-    ],
-    resourceName: (p) => `link${p ? "s" : ""}`,
-    thClassName: (id) =>
-      cn(id === "total" && "[&>div]:justify-end", "border-l-0"),
-    tdClassName: (id) => cn(id === "total" && "text-right", "border-l-0"),
-    className: "[&_tr:last-child>td]:border-b-transparent",
-    containerClassName: "w-full max-w-full overflow-hidden",
-    scrollWrapperClassName: "min-h-[40px] max-w-full",
-  } as any);
-
-  return (
-    <>
-      <div className="flex items-end justify-between gap-4">
-        <h2 className="text-content-emphasis text-lg font-semibold">
-          Referral links
-        </h2>
-        <Button
-          variant="secondary"
-          text="Create link"
-          className="h-8 w-fit rounded-lg px-3 py-2 font-medium"
-          onClick={() => setShowAddPartnerLinkModal(true)}
-        />
-      </div>
-      <Table {...table} />
-      <AddPartnerLinkModal />
-    </>
-  );
-};
-
 const PartnerReferralLink = ({
   partner,
 }: {
@@ -301,226 +149,3 @@ const PartnerReferralLink = ({
     </>
   );
 };
-
-const PartnerDiscountCodes = ({
-  partner,
-}: {
-  partner: EnrolledPartnerExtendedProps;
-}) => {
-  const { slug, stripeConnectId, shopifyStoreId } = useWorkspace();
-  const { group } = useGroup({
-    groupIdOrSlug: partner.groupId ?? undefined,
-  });
-
-  const [selectedDiscountCode, setSelectedDiscountCode] =
-    useState<DiscountCodeProps | null>(null);
-
-  const [showDeleteDiscountCodeModal, setShowDeleteDiscountCodeModal] =
-    useState(false);
-
-  const { discountCodes, loading, error } = useDiscountCodes({
-    partnerId: partner.id || null,
-  });
-
-  const { AddDiscountCodeModal, setShowAddDiscountCodeModal } =
-    useAddDiscountCodeModal({
-      partner,
-    });
-
-  const table = useTable({
-    data: discountCodes || [],
-    columns: [
-      {
-        id: "code",
-        header: "Code",
-        cell: ({ row }) => (
-          <DiscountCodeBadge
-            code={row.original.code}
-            disabledAt={row.original.disabledAt}
-          />
-        ),
-      },
-      {
-        id: "shortLink",
-        header: "Link",
-        cell: ({ row }) => {
-          const link = partner.links?.find((l) => l.id === row.original.linkId);
-          return link ? (
-            <Link
-              href={`/${slug}/links/${link.domain}/${link.key}`}
-              target="_blank"
-              className="cursor-alias font-medium text-black decoration-dotted hover:underline"
-            >
-              {getPrettyUrl(link.shortLink)}
-            </Link>
-          ) : (
-            <span className="text-neutral-500">Link not found</span>
-          );
-        },
-      },
-      {
-        id: "menu",
-        enableHiding: false,
-        minSize: 28,
-        size: 28,
-        maxSize: 28,
-        cell: ({ row }) => (
-          <Button
-            icon={<Trash className="size-3.5 shrink-0 text-neutral-600" />}
-            variant="outline"
-            className="size-8 whitespace-nowrap"
-            onClick={() => {
-              setSelectedDiscountCode(row.original);
-              setShowDeleteDiscountCodeModal(true);
-            }}
-          />
-        ),
-      },
-    ],
-    resourceName: (p) => `discount code${p ? "s" : ""}`,
-    thClassName: (id) =>
-      cn(id === "total" && "[&>div]:justify-end", "border-l-0"),
-    tdClassName: (id) => cn(id === "total" && "text-right", "border-l-0"),
-    className: "[&_tr:last-child>td]:border-b-transparent",
-    scrollWrapperClassName: "min-h-[40px]",
-    loading,
-    error: error ? "Failed to load discount codes" : undefined,
-  } as any);
-
-  const disabledReason = useMemo(() => {
-    if (!partner.discount) {
-      return "No discount assigned to this partner group. Please add a discount before you can create a discount code.";
-    }
-
-    if (
-      partner.discount.provider === DiscountProvider.stripe &&
-      !stripeConnectId
-    ) {
-      return (
-        <TooltipContent
-          title="Your workspace isn't connected to Stripe yet. Please install the Dub Stripe app in settings to create discount codes."
-          cta="Install Stripe app"
-          href={`/${slug}/settings/integrations/stripe`}
-          target="_blank"
-        />
-      );
-    }
-
-    if (
-      partner.discount.provider === DiscountProvider.shopify &&
-      !shopifyStoreId
-    ) {
-      return (
-        <TooltipContent
-          title="Your workspace isn't connected to Shopify yet. Please install the Dub Shopify app in settings to create discount codes."
-          cta="Install Shopify app"
-          href={`/${slug}/settings/integrations/shopify`}
-          target="_blank"
-        />
-      );
-    }
-
-    if (partner.links?.length === 0) {
-      return "No links assigned to this partner group. Please add a link before you can create a discount code.";
-    }
-
-    if (partner.links?.length === discountCodes?.length) {
-      return "All links have a discount code assigned to them. Please add a new link before you can create a discount code.";
-    }
-
-    return undefined;
-  }, [
-    partner.discount,
-    partner.links,
-    discountCodes,
-    stripeConnectId,
-    shopifyStoreId,
-  ]);
-
-  const groupDiscount = group?.discount ?? partner.discount;
-
-  const discountCodeEmptyState = groupDiscount
-    ? {
-        description:
-          "Great for short-form content, podcasts and more. Works alongside link-based discounts.",
-        buttonText: "Learn more",
-        buttonHref:
-          "https://dub.co/help/article/dual-sided-incentives#option-2-using-stripe-promo-codes-no-code-required",
-      }
-    : {
-        description:
-          "You need to create a group discount for this partner before you can create a discount code.",
-        buttonText: "Create group discount",
-        buttonHref: group?.slug
-          ? `/${slug}/program/groups/${group.slug}/discounts`
-          : `/${slug}/program/groups`,
-      };
-
-  return (
-    <>
-      <div className="flex items-end justify-between gap-4">
-        <h2 className="text-content-emphasis text-lg font-semibold">
-          Discount codes
-        </h2>
-        <Button
-          variant="secondary"
-          text="Create code"
-          className="h-8 w-fit rounded-lg px-3 py-2 font-medium"
-          onClick={() => setShowAddDiscountCodeModal(true)}
-          disabled={!!disabledReason}
-          disabledTooltip={disabledReason}
-        />
-      </div>
-
-      {loading ? (
-        <div className="flex justify-center py-16">
-          <LoadingSpinner />
-        </div>
-      ) : !error && (!discountCodes || discountCodes.length === 0) ? (
-        <div className="flex flex-col items-center justify-center gap-2 rounded-lg border border-neutral-200 bg-neutral-50 py-6">
-          <div className="flex max-w-sm flex-col items-center gap-2 text-center">
-            <Tag className="mb-2 size-6 text-neutral-900" />
-            <h3 className="text-content-emphasis text-sm font-semibold leading-5">
-              No discount codes created
-            </h3>
-            <p className="text-content-subtle -mt-1 text-sm font-medium leading-5">
-              {discountCodeEmptyState.description}
-            </p>
-            {discountCodeEmptyState.buttonHref && (
-              <ButtonLink
-                href={discountCodeEmptyState.buttonHref}
-                target={
-                  discountCodeEmptyState.buttonHref.startsWith("https")
-                    ? "_blank"
-                    : undefined
-                }
-                variant="secondary"
-                className="mt-2 h-7 rounded-md px-3 text-sm font-medium"
-              >
-                {discountCodeEmptyState.buttonText}
-              </ButtonLink>
-            )}
-          </div>
-        </div>
-      ) : error ? (
-        <div className="flex justify-center py-16">
-          <span className="text-content-subtle text-sm">
-            Failed to load discount codes
-          </span>
-        </div>
-      ) : (
-        <Table {...table} />
-      )}
-
-      <AddDiscountCodeModal />
-
-      {selectedDiscountCode && (
-        <DeleteDiscountCodeModal
-          showModal={showDeleteDiscountCodeModal}
-          setShowModal={setShowDeleteDiscountCodeModal}
-          discountCode={selectedDiscountCode}
-        />
-      )}
-    </>
-  );
-};
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx
new file mode 100644
index 00000000000..02c135f79c1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/links/referral-links.tsx
@@ -0,0 +1,492 @@
+"use client";
+
+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
+import useGroup from "@/lib/swr/use-group";
+import {
+  ProgramPartnerLinkExtended,
+  useProgramPartnerLinks,
+} from "@/lib/swr/use-program-partner-links";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { EnrolledPartnerProps, GroupProps } from "@/lib/types";
+import { useAddPartnerLinkModal } from "@/ui/modals/add-partner-link-modal";
+import { useEditPartnerDiscountModal } from "@/ui/modals/edit-partner-discount-modal";
+import { useEditPartnerRewardModal } from "@/ui/modals/edit-partner-reward-modal";
+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
+import { RewardOverrideIcon } from "@/ui/partners/rewards/reward-override-icon";
+import { ThreeDots } from "@/ui/shared/icons";
+import {
+  Button,
+  CardList,
+  CopyButton,
+  CursorRays,
+  DiscountCode,
+  InvoiceDollar,
+  LoadingSpinner,
+  MenuItem,
+  Popover,
+  Shuffle,
+  Tooltip,
+  TooltipContent,
+  UserCheck,
+} from "@dub/ui";
+import {
+  cn,
+  currencyFormatter,
+  getPrettyUrl,
+  nFormatter,
+  pluralize,
+} from "@dub/utils";
+import { Command } from "cmdk";
+import Link from "next/link";
+import { type ReactNode, useState } from "react";
+
+type PartnerLink = ProgramPartnerLinkExtended;
+type PartnerForOverrides = Pick<
+  EnrolledPartnerProps,
+  | "id"
+  | "name"
+  | "email"
+  | "image"
+  | "groupId"
+  | "clickRewardId"
+  | "leadRewardId"
+  | "saleRewardId"
+  | "discountId"
+>;
+
+const LINK_REWARD_OVERRIDE_EVENTS = ["click", "lead", "sale"] as const;
+
+function hasLinkRewardOverride({
+  linkAssignedId,
+  partnerAssignedId,
+}: {
+  linkAssignedId: string | null | undefined;
+  partnerAssignedId: string | null | undefined;
+}) {
+  return Boolean(linkAssignedId) && linkAssignedId !== partnerAssignedId;
+}
+
+function getLinkRewardOverride(
+  link: Pick<PartnerLink, "clickReward" | "leadReward" | "saleReward">,
+  partner: Pick<
+    PartnerForOverrides,
+    "clickRewardId" | "leadRewardId" | "saleRewardId"
+  >,
+) {
+  return LINK_REWARD_OVERRIDE_EVENTS.filter((event) => {
+    const linkAssignedId = {
+      click: link.clickReward,
+      lead: link.leadReward,
+      sale: link.saleReward,
+    }[event];
+
+    const partnerAssignedId = {
+      click: partner.clickRewardId,
+      lead: partner.leadRewardId,
+      sale: partner.saleRewardId,
+    }[event];
+
+    return hasLinkRewardOverride({
+      linkAssignedId,
+      partnerAssignedId,
+    });
+  });
+}
+
+function OverrideIndicator({
+  tooltip,
+  disabledTooltip,
+  ariaLabel,
+  onClick,
+  children,
+}: {
+  tooltip: string;
+  disabledTooltip?: ReactNode;
+  ariaLabel: string;
+  onClick: () => void;
+  children: ReactNode;
+}) {
+  return (
+    <Tooltip
+      disableHoverableContent
+      content={
+        disabledTooltip ?? (
+          <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+            {tooltip}
+          </div>
+        )
+      }
+    >
+      <button
+        type="button"
+        aria-label={ariaLabel}
+        onClick={disabledTooltip ? undefined : onClick}
+        className={cn(
+          "flex h-5 items-center",
+          disabledTooltip ? "cursor-not-allowed" : "cursor-pointer",
+        )}
+      >
+        <span className="relative flex">
+          {children}
+          <RewardOverrideIcon ringClassName="stroke-neutral-100 group-hover/override:stroke-neutral-200" />
+        </span>
+      </button>
+    </Tooltip>
+  );
+}
+
+function OverrideIndicatorGroup({
+  disabled,
+  children,
+}: {
+  disabled?: boolean;
+  children: ReactNode;
+}) {
+  return (
+    <div
+      className={cn(
+        "group/override flex h-5 shrink-0 items-center gap-1 rounded-md bg-neutral-100 px-1 transition-colors",
+        !disabled && "hover:bg-neutral-200",
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
+const formatStatCount = ({ count, unit }: { count: number; unit: string }) => ({
+  count,
+  formatted: nFormatter(count),
+  tooltip: `${nFormatter(count, { full: true })} ${pluralize(unit, count)}`,
+});
+
+const PARTNER_LINK_STATS = [
+  {
+    id: "clicks",
+    icon: CursorRays,
+    event: "clicks",
+    iconClassName: "data-[active=true]:text-blue-500",
+    getValue: (link: PartnerLink) =>
+      formatStatCount({
+        count: link.clicks,
+        unit: "click",
+      }),
+  },
+  {
+    id: "leads",
+    icon: UserCheck,
+    event: "leads",
+    iconClassName: "data-[active=true]:text-purple-500",
+    getValue: (link: PartnerLink) =>
+      formatStatCount({
+        count: link.leads,
+        unit: "lead",
+      }),
+  },
+  {
+    id: "conversions",
+    icon: Shuffle,
+    event: "sales",
+    iconClassName: "data-[active=true]:text-orange-500",
+    getValue: (link: PartnerLink) =>
+      formatStatCount({
+        count: link.conversions,
+        unit: "conversion",
+      }),
+  },
+  {
+    id: "revenue",
+    icon: InvoiceDollar,
+    event: "sales",
+    iconClassName: "data-[active=true]:text-teal-500",
+    getValue: (link: PartnerLink) => ({
+      count: link.saleAmount,
+      formatted: `$${nFormatter(link.saleAmount / 100)}`,
+      tooltip: `${currencyFormatter(link.saleAmount, { trailingZeroDisplay: "stripIfInteger" })} revenue`,
+    }),
+  },
+] as const;
+
+export function ReferralLinks({ partner }: { partner: EnrolledPartnerProps }) {
+  const { slug } = useWorkspace();
+
+  const { group } = useGroup({
+    groupIdOrSlug: partner.groupId ?? undefined,
+  });
+
+  const { AddPartnerLinkModal, setShowAddPartnerLinkModal } =
+    useAddPartnerLinkModal({
+      partner,
+    });
+
+  const { links, loading, error } = useProgramPartnerLinks({
+    partnerId: partner.id,
+  });
+
+  return (
+    <>
+      <div className="flex items-end justify-between gap-4">
+        <h2 className="text-content-emphasis text-lg font-semibold">
+          Referral links
+        </h2>
+        <Button
+          variant="secondary"
+          text="Create link"
+          className="h-8 w-fit rounded-lg px-3 py-2 font-medium"
+          onClick={() => setShowAddPartnerLinkModal(true)}
+        />
+      </div>
+      {loading ? (
+        <div className="flex justify-center py-8">
+          <LoadingSpinner />
+        </div>
+      ) : error ? (
+        <div className="text-content-subtle rounded-xl border border-neutral-200 py-8 text-center text-sm">
+          Failed to load partner links
+        </div>
+      ) : links && links.length > 0 ? (
+        <CardList variant="compact">
+          {links.map((link) => (
+            <PartnerLinkCard
+              key={link.id}
+              link={link}
+              partner={partner}
+              group={group}
+              slug={slug}
+            />
+          ))}
+        </CardList>
+      ) : (
+        <div className="text-content-subtle rounded-xl border border-neutral-200 py-8 text-center text-sm">
+          No links created
+        </div>
+      )}
+      <AddPartnerLinkModal />
+    </>
+  );
+}
+
+function PartnerLinkCard({
+  link,
+  partner,
+  group,
+  slug,
+}: {
+  link: PartnerLink;
+  partner: PartnerForOverrides;
+  group?: GroupProps | null;
+  slug?: string;
+}) {
+  const { plan } = useWorkspace();
+  const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
+  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+    useAdvancedUpsellModal();
+
+  const partnerLink = constructPartnerLink({
+    group,
+    link,
+  });
+
+  const rewardEvents = getLinkRewardOverride(link, partner);
+
+  const hasDiscountOverride = hasLinkRewardOverride({
+    linkAssignedId: link.discount,
+    partnerAssignedId: partner.discountId,
+  });
+
+  const [rewardEvent, setRewardEvent] = useState<"sale" | "lead" | "click">(
+    "sale",
+  );
+
+  const { EditPartnerRewardModal, setShowEditPartnerRewardModal } =
+    useEditPartnerRewardModal({
+      event: rewardEvent,
+      target: { type: "link", link, partner },
+      group,
+    });
+
+  const { EditPartnerDiscountModal, setShowEditPartnerDiscountModal } =
+    useEditPartnerDiscountModal({
+      target: { type: "link", link, partner },
+      group,
+    });
+
+  const overrideDisabledTooltip = !canUseAdvancedRewardLogic ? (
+    <TooltipContent
+      title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+      cta="Upgrade to Advanced"
+      onClick={() => setShowAdvancedUpsellModal(true)}
+    />
+  ) : undefined;
+
+  return (
+    <>
+      {advancedUpsellModal}
+      <CardList.Card
+        innerClassName="flex items-center justify-between gap-4 px-3 py-2.5"
+        hoverStateEnabled={false}
+      >
+        <div className="flex min-w-0 items-center gap-2">
+          <div className="flex min-w-0 items-center gap-1">
+            <Link
+              href={`/${slug}/links/${link.domain}/${link.key}`}
+              target="_blank"
+              className="text-content-default cursor-alias truncate text-sm font-medium decoration-dotted hover:underline"
+            >
+              {getPrettyUrl(partnerLink)}
+            </Link>
+            <CopyButton
+              value={partnerLink}
+              variant="neutral"
+              className="shrink-0 p-1"
+            />
+          </div>
+          {rewardEvents.length > 0 && (
+            <OverrideIndicatorGroup disabled={Boolean(overrideDisabledTooltip)}>
+              {rewardEvents.map((event) => {
+                const Icon = REWARD_EVENT_ICON[event];
+                return (
+                  <OverrideIndicator
+                    key={event}
+                    tooltip={`This link has a ${event} reward override`}
+                    disabledTooltip={overrideDisabledTooltip}
+                    ariaLabel={`Edit ${event} reward`}
+                    onClick={() => {
+                      setRewardEvent(event);
+                      setShowEditPartnerRewardModal(true);
+                    }}
+                  >
+                    <Icon className="size-3 text-neutral-700" />
+                  </OverrideIndicator>
+                );
+              })}
+            </OverrideIndicatorGroup>
+          )}
+          {hasDiscountOverride && (
+            <OverrideIndicatorGroup disabled={Boolean(overrideDisabledTooltip)}>
+              <OverrideIndicator
+                tooltip="This link has a discount override"
+                disabledTooltip={overrideDisabledTooltip}
+                ariaLabel="Edit discount"
+                onClick={() => setShowEditPartnerDiscountModal(true)}
+              >
+                <DiscountCode className="size-3 text-neutral-700" />
+              </OverrideIndicator>
+            </OverrideIndicatorGroup>
+          )}
+        </div>
+
+        <div className="flex shrink-0 items-center gap-3">
+          {PARTNER_LINK_STATS.map(
+            ({ id, icon: Icon, event, getValue, iconClassName }) => {
+              const { count, formatted, tooltip } = getValue(link);
+
+              return (
+                <Tooltip
+                  key={id}
+                  content={
+                    <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+                      {tooltip}
+                    </div>
+                  }
+                >
+                  <Link
+                    href={`/${slug}/events?event=${event}&interval=all&domain=${link.domain}&key=${link.key}`}
+                    target="_blank"
+                    className="flex items-center gap-1.5"
+                  >
+                    <Icon
+                      data-active={count > 0}
+                      className={cn(
+                        "size-4 shrink-0 text-neutral-400",
+                        iconClassName,
+                      )}
+                    />
+                    <span className="text-xs font-medium text-neutral-700">
+                      {formatted}
+                    </span>
+                  </Link>
+                </Tooltip>
+              );
+            },
+          )}
+
+          <PartnerLinkCardMenu
+            overrideDisabledTooltip={overrideDisabledTooltip}
+            onEditReward={(event) => {
+              setRewardEvent(event);
+              setShowEditPartnerRewardModal(true);
+            }}
+            onEditDiscount={() => setShowEditPartnerDiscountModal(true)}
+          />
+        </div>
+      </CardList.Card>
+      <EditPartnerRewardModal />
+      <EditPartnerDiscountModal />
+    </>
+  );
+}
+
+function PartnerLinkCardMenu({
+  onEditReward,
+  onEditDiscount,
+  overrideDisabledTooltip,
+}: {
+  onEditReward: (event: "sale" | "lead" | "click") => void;
+  onEditDiscount: () => void;
+  overrideDisabledTooltip?: ReactNode;
+}) {
+  const [openPopover, setOpenPopover] = useState(false);
+
+  return (
+    <Popover
+      align="end"
+      openPopover={openPopover}
+      setOpenPopover={setOpenPopover}
+      content={
+        <Command tabIndex={0} loop className="focus:outline-none">
+          <Command.List className="flex w-screen flex-col gap-1 p-1.5 text-sm focus-visible:outline-none sm:w-auto sm:min-w-[180px]">
+            {(["sale", "lead", "click"] as const).map((event) => {
+              const Icon = REWARD_EVENT_ICON[event];
+              return (
+                <MenuItem
+                  key={event}
+                  as={Command.Item}
+                  icon={Icon}
+                  disabledTooltip={overrideDisabledTooltip}
+                  onSelect={() => {
+                    setOpenPopover(false);
+                    onEditReward(event);
+                  }}
+                >
+                  Edit {event} reward
+                </MenuItem>
+              );
+            })}
+            <MenuItem
+              as={Command.Item}
+              icon={DiscountCode}
+              disabledTooltip={overrideDisabledTooltip}
+              onSelect={() => {
+                setOpenPopover(false);
+                onEditDiscount();
+              }}
+            >
+              Edit discount
+            </MenuItem>
+          </Command.List>
+        </Command>
+      }
+    >
+      <Button
+        type="button"
+        variant="outline"
+        className="size-6 shrink-0 rounded-lg p-0"
+        icon={<ThreeDots className="size-3.5 shrink-0" />}
+      />
+    </Popover>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
index 9bc1540954b..e65d71d7253 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/page-client.tsx
@@ -81,11 +81,20 @@ export function ProgramPartnersApplicationsPageClient() {
     (key) => !["sortBy", "sortOrder", "page"].includes(key),
   );
 
-  const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =
-    usePartnerFilters({ sortBy, sortOrder, status: "pending" }, [
-      "groupId",
-      "country",
-    ]);
+  const {
+    filters,
+    activeFilters,
+    onSelect,
+    onRemove,
+    onRemoveFilter,
+    onRemoveAll,
+    onToggleOperator,
+    setSelectedFilter,
+    setSearch,
+  } = usePartnerFilters({ sortBy, sortOrder, status: "pending" }, [
+    "groupId",
+    "country",
+  ]);
 
   const { partnersCount, error: countError } = usePartnersCount<number>({
     status: "pending",
@@ -462,6 +471,9 @@ export function ProgramPartnersApplicationsPageClient() {
             activeFilters={activeFilters}
             onSelect={onSelect}
             onRemove={onRemove}
+            onRemoveFilter={onRemoveFilter}
+            onSearchChange={setSearch}
+            onSelectedFilterChange={setSelectedFilter}
           />
           <div className="flex w-full grow items-center gap-2 md:w-auto">
             <div className="min-w-0 flex-1">
@@ -496,7 +508,9 @@ export function ProgramPartnersApplicationsPageClient() {
                   activeFilters={activeFilters}
                   onSelect={onSelect}
                   onRemove={onRemove}
+                  onRemoveFilter={onRemoveFilter}
                   onRemoveAll={onRemoveAll}
+                  onToggleOperator={onToggleOperator}
                 />
               </div>
             )}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
index 175b81aad82..27774c42e8a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/rejected/page-client.tsx
@@ -70,8 +70,17 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
   const sortBy = searchParams.get("sortBy") || "createdAt";
   const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
 
-  const { filters, activeFilters, onSelect, onRemove, onRemoveAll } =
-    usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);
+  const {
+    filters,
+    activeFilters,
+    onSelect,
+    onRemove,
+    onRemoveFilter,
+    onRemoveAll,
+    onToggleOperator,
+    setSelectedFilter,
+    setSearch,
+  } = usePartnerFilters({ sortBy, sortOrder, status: "rejected" }, ["country"]);
 
   const { partnersCount, error: countError } = usePartnersCount<number>({
     status: "rejected",
@@ -397,6 +406,9 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
             activeFilters={activeFilters}
             onSelect={onSelect}
             onRemove={onRemove}
+            onRemoveFilter={onRemoveFilter}
+            onSearchChange={setSearch}
+            onSelectedFilterChange={setSelectedFilter}
           />
           <SearchBoxPersisted
             placeholder="Search by name, email, or company"
@@ -412,7 +424,9 @@ export function ProgramPartnersRejectedApplicationsPageClient() {
                   activeFilters={activeFilters}
                   onSelect={onSelect}
                   onRemove={onRemove}
+                  onRemoveFilter={onRemoveFilter}
                   onRemoveAll={onRemoveAll}
+                  onToggleOperator={onToggleOperator}
                 />
               </div>
             )}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-button.tsx
index 5a07bc356c4..40e3e9c13d8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/invite-partner-button.tsx
@@ -1,17 +1,39 @@
 "use client";
 
-import { Button, useKeyboardShortcut, useMediaQuery } from "@dub/ui";
+import { clientAccessCheck } from "@/lib/client-access-check";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
+import {
+  Button,
+  TooltipContent,
+  useKeyboardShortcut,
+  useMediaQuery,
+} from "@dub/ui";
+import { isWorkspaceBillingTrialActive } from "@dub/utils";
 import { useInvitePartnerSheet } from "./invite-partner-sheet";
 
 export function InvitePartnerButton() {
   const { isMobile } = useMediaQuery();
+  const { slug, role, exceededPartners, trialEndsAt } = useWorkspace();
   const { invitePartnerSheet, setIsOpen: setShowInvitePartnerSheet } =
     useInvitePartnerSheet();
+  const { openTrialLimitModal, TrialLimitActivateModal } =
+    useTrialLimitActivateModal();
+  const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
 
-  useKeyboardShortcut("p", () => setShowInvitePartnerSheet(true));
+  const permissionsError = clientAccessCheck({
+    action: "partners.write",
+    role,
+    customPermissionDescription: "invite partners",
+  }).error;
+
+  useKeyboardShortcut("p", () => setShowInvitePartnerSheet(true), {
+    enabled: !exceededPartners && !permissionsError,
+  });
 
   return (
     <>
+      <TrialLimitActivateModal />
       {invitePartnerSheet}
       <Button
         type="button"
@@ -19,6 +41,19 @@ export function InvitePartnerButton() {
         text={`Invite${isMobile ? "" : " partner"}`}
         shortcut="P"
         className="h-8 px-3 sm:h-9"
+        disabledTooltip={
+          exceededPartners ? (
+            <TooltipContent
+              title="Your have exceeded your partners limit. You need to upgrade to invite more partners."
+              cta={trialActive ? "Start paid plan" : "Upgrade plan"}
+              {...(trialActive
+                ? { onClick: () => openTrialLimitModal("partnerEnrollments") }
+                : { href: `/${slug}/upgrade` })}
+            />
+          ) : (
+            permissionsError || undefined
+          )
+        }
       />
     </>
   );
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-menu-popover.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-menu-popover.tsx
index ca526a1b76c..3d124ffc53b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-menu-popover.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-menu-popover.tsx
@@ -4,6 +4,7 @@ import { PROGRAM_IMPORT_SOURCES } from "@/lib/constants/program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { useExportPartnersModal } from "@/ui/modals/export-partners-modal";
 import { useImportFirstPromoterModal } from "@/ui/modals/import-firstpromoter-modal";
+import { useImportLemonSqueezyModal } from "@/ui/modals/import-lemonsqueezy-modal";
 import { useImportPartnerStackModal } from "@/ui/modals/import-partnerstack-modal";
 import { useImportRewardfulModal } from "@/ui/modals/import-rewardful-modal";
 import { useImportTapfiliateModal } from "@/ui/modals/import-tapfiliate-modal";
@@ -23,6 +24,7 @@ export function PartnersMenuPopover() {
   const { ImportPartnerStackModal } = useImportPartnerStackModal();
   const { ImportFirstPromoterModal } = useImportFirstPromoterModal();
   const { ImportTapfiliateModal } = useImportTapfiliateModal();
+  const { ImportLemonSqueezyModal } = useImportLemonSqueezyModal();
 
   const { ExportPartnersModal, setShowExportPartnersModal } =
     useExportPartnersModal();
@@ -34,6 +36,7 @@ export function PartnersMenuPopover() {
       <ImportFirstPromoterModal />
       <ImportPartnerStackModal />
       <ImportTapfiliateModal />
+      <ImportLemonSqueezyModal />
       <ExportPartnersModal />
       <Popover
         content={
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
index 38a3cee7d68..d37e78125ee 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
@@ -117,6 +117,11 @@ const partnersColumns = {
   ],
 };
 
+// Searching sorts by relevance so the closest match to the query is the first
+// row. A column sort still applies to the same relevance-ranked candidates, but
+// it reorders them, so the best match moves down the list.
+const PARTNER_SEARCH_RESET_PARAMS = ["sortBy", "sortOrder"];
+
 const getPartnerUrl = ({
   workspaceSlug,
   id,
@@ -133,6 +138,10 @@ export function PartnersTable() {
   const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
   const { program } = useProgram();
 
+  // A blank query is not searchable, and asking for relevance without one is a
+  // 400 from the API.
+  const search = searchParams.get("search")?.trim();
+
   const defaultStatus = program?.deactivatedAt
     ? ProgramEnrollmentStatus.deactivated
     : ProgramEnrollmentStatus.approved;
@@ -145,7 +154,11 @@ export function PartnersTable() {
 
   const sortBy =
     searchParams.get("sortBy") ||
-    (program?.primaryRewardEvent === "lead" ? "totalLeads" : "totalSaleAmount");
+    (search
+      ? "relevance"
+      : program?.primaryRewardEvent === "lead"
+        ? "totalLeads"
+        : "totalSaleAmount");
   const sortOrder = searchParams.get("sortOrder") === "asc" ? "asc" : "desc";
 
   const { partnersCount, error: countError } = usePartnersCount<number>({
@@ -160,6 +173,7 @@ export function PartnersTable() {
     data: partners,
     error,
     isLoading,
+    isValidating,
   } = useSWR<EnrolledPartnerProps[]>(
     `/api/partners${getQueryString({
       workspaceId,
@@ -537,7 +551,12 @@ export function PartnersTable() {
 
   return (
     <div className="flex flex-col gap-4">
-      <PartnersFilters sortBy={sortBy} sortOrder={sortOrder} status={status} />
+      <PartnersFilters
+        sortBy={sortBy}
+        sortOrder={sortOrder}
+        status={status}
+        searchLoading={isValidating}
+      />
       {partners?.length !== 0 ? (
         <Table {...tableProps} table={table} />
       ) : (
@@ -564,15 +583,18 @@ function PartnersFilters({
   sortBy,
   sortOrder,
   status,
+  searchLoading,
 }: {
   sortBy: string;
   sortOrder: "asc" | "desc";
-  status: ProgramEnrollmentStatus;
+  status: ProgramEnrollmentStatus | undefined;
+  searchLoading: boolean;
 }) {
   const { queryParams, searchParams } = useRouterStuff();
 
   const { partnersCount: inviteCount } = usePartnersCount<number>({
     status: ProgramEnrollmentStatus.invited,
+    ignoreParams: true,
   });
 
   const {
@@ -583,7 +605,13 @@ function PartnersFilters({
     onRemoveFilter,
     onRemoveAll,
     onToggleOperator,
-  } = usePartnerFilters({ sortBy, sortOrder, status });
+    setSelectedFilter,
+    setSearch,
+  } = usePartnerFilters({
+    sortBy,
+    sortOrder,
+    ...(status && { status }),
+  });
 
   const showPendingInvitesButton =
     inviteCount > 0 &&
@@ -600,6 +628,8 @@ function PartnersFilters({
             onSelect={onSelect}
             onRemove={onRemove}
             onRemoveFilter={onRemoveFilter}
+            onSearchChange={setSearch}
+            onSelectedFilterChange={setSelectedFilter}
           />
           {showPendingInvitesButton ? (
             <Button
@@ -621,8 +651,10 @@ function PartnersFilters({
           ) : null}
         </div>
         <SearchBoxPersisted
-          placeholder="Search by name, email, or company"
+          placeholder="Search by name, email, link, etc."
           inputClassName="md:w-80"
+          loading={searchLoading}
+          resetParamsOnChange={PARTNER_SEARCH_RESET_PARAMS}
         />
       </div>
       <AnimatedSizeContainer height>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
index c40f6008b20..4d305a0bc4f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/use-partner-filters.tsx
@@ -169,7 +169,9 @@ export function usePartnerFilters(
   const { id: workspaceId, slug } = useWorkspace();
   const status = (searchParamsObj.status ||
     extraSearchParams.status ||
-    "approved") as ProgramEnrollmentStatus;
+    (searchParamsObj.search?.trim() ? undefined : "approved")) as
+    | ProgramEnrollmentStatus
+    | undefined;
 
   const cohortParams = useMemo(
     () => ({
@@ -184,9 +186,21 @@ export function usePartnerFilters(
   const [search, setSearch] = useState("");
   const [debouncedSearch] = useDebounce(search, 500);
 
+  // Load grouped counts only while their options are visible or already active
+  const isFilterOptionsEnabled = (key: PartnerFilterKey) =>
+    enabledFilters.includes(key) &&
+    (selectedFilter === key || Boolean(searchParamsObj[key]));
+  const partnerTagOptionsEnabled = isFilterOptionsEnabled("partnerTagId");
+  const countryOptionsEnabled = isFilterOptionsEnabled("country");
+  const statusOptionsEnabled = isFilterOptionsEnabled("status");
+  const groupOptionsEnabled = isFilterOptionsEnabled("groupId");
+  const referredByOptionsEnabled = isFilterOptionsEnabled(
+    "referredByPartnerId",
+  );
+
   const { partnerTags, partnerTagsAsync } = usePartnerTagFilterOptions({
     search: selectedFilter === "partnerTagId" ? debouncedSearch : "",
-    enabled: enabledFilters.includes("partnerTagId"),
+    enabled: partnerTagOptionsEnabled,
     status,
     cohortParams,
   });
@@ -203,7 +217,7 @@ export function usePartnerFilters(
     groupBy: "country",
     status,
     ...cohortParams,
-    enabled: enabledFilters.includes("country"),
+    enabled: countryOptionsEnabled,
   });
 
   const { partnersCount: statusCount } = usePartnersCount<
@@ -216,7 +230,7 @@ export function usePartnerFilters(
     groupBy: "status",
     status,
     ...cohortParams,
-    enabled: enabledFilters.includes("status"),
+    enabled: statusOptionsEnabled,
   });
 
   const { partnersCount: groupsCount } = usePartnersCount<
@@ -229,7 +243,7 @@ export function usePartnerFilters(
     groupBy: "groupId",
     status,
     ...cohortParams,
-    enabled: enabledFilters.includes("groupId"),
+    enabled: groupOptionsEnabled,
   });
 
   const { partnersCount: referredByCount } = usePartnersCount<
@@ -242,12 +256,12 @@ export function usePartnerFilters(
     groupBy: "referredByPartnerId",
     status,
     ...cohortParams,
-    enabled: enabledFilters.includes("referredByPartnerId"),
+    enabled: referredByOptionsEnabled,
   });
 
   const { referredByPartners } = useReferredByPartnerFilterOptions({
     referredByCount,
-    enabled: enabledFilters.includes("referredByPartnerId"),
+    enabled: referredByOptionsEnabled,
   });
 
   const filters = useMemo(
@@ -327,7 +341,7 @@ export function usePartnerFilters(
                       ),
                       right: nFormatter(_count || 0, { full: true }),
                     };
-                  }) ?? [],
+                  }) ?? null,
             },
           ]
         : []),
@@ -344,7 +358,7 @@ export function usePartnerFilters(
                     value: country,
                     label: COUNTRIES[country],
                     right: nFormatter(_count, { full: true }),
-                  })) ?? [],
+                  })) ?? null,
               getOptionIcon: (value: string) => (
                 <CountryFlag countryCode={value} />
               ),
@@ -683,7 +697,7 @@ function usePartnerTagFilterOptions({
 }: {
   search: string;
   enabled?: boolean;
-  status: ProgramEnrollmentStatus;
+  status?: ProgramEnrollmentStatus;
   cohortParams: {
     groupId?: string;
     country?: string;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
index 5e48059f7d4..959727c2d1b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-stats.tsx
@@ -3,20 +3,29 @@
 import { clientAccessCheck } from "@/lib/client-access-check";
 import { usePayoutsCount } from "@/lib/swr/use-payouts-count";
 import useWorkspace from "@/lib/swr/use-workspace";
+import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
 import { ConfirmPayoutsSheet } from "@/ui/partners/confirm-payouts-sheet";
 import {
   Button,
   buttonVariants,
   Tooltip,
+  TooltipContent,
   useKeyboardShortcut,
   useRouterStuff,
 } from "@dub/ui";
-import { cn, currencyFormatter } from "@dub/utils";
+import {
+  cn,
+  currencyFormatter,
+  isWorkspaceBillingTrialActive,
+} from "@dub/utils";
 import { PayoutStatus } from "@prisma/client";
 import Link from "next/link";
 
 export function PayoutStats() {
-  const { slug, role } = useWorkspace();
+  const { slug, role, exceededPayouts, trialEndsAt } = useWorkspace();
+  const { openTrialLimitModal, TrialLimitActivateModal } =
+    useTrialLimitActivateModal();
+  const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
 
   const permissionsError = clientAccessCheck({
     action: "payouts.write",
@@ -63,7 +72,7 @@ export function PayoutStats() {
   const totalPaid = completedPayoutsAmount + processingPayoutsAmount;
 
   useKeyboardShortcut("c", () => {
-    if (!permissionsError) {
+    if (!permissionsError && !exceededPayouts) {
       queryParams({
         set: {
           confirmPayouts: "true",
@@ -74,6 +83,7 @@ export function PayoutStats() {
 
   return (
     <>
+      <TrialLimitActivateModal />
       <ConfirmPayoutsSheet />
       <div className="grid grid-cols-1 divide-neutral-200 rounded-lg border border-neutral-200 bg-neutral-50 max-sm:divide-y sm:grid-cols-2 sm:divide-x">
         <div className="flex flex-col p-4">
@@ -95,9 +105,19 @@ export function PayoutStats() {
               }}
               disabled={eligiblePayoutsLoading || confirmButtonDisabled}
               disabledTooltip={
-                confirmButtonDisabled
-                  ? "You have no pending payouts that match the minimum payout requirement for partners that have payouts enabled."
-                  : permissionsError || undefined
+                exceededPayouts ? (
+                  <TooltipContent
+                    title="You have exceeded your payouts limit. You need to upgrade to send more payouts."
+                    cta={trialActive ? "Start paid plan" : "Upgrade plan"}
+                    {...(trialActive
+                      ? { onClick: () => openTrialLimitModal("payouts") }
+                      : { href: `/${slug}/upgrade` })}
+                  />
+                ) : confirmButtonDisabled ? (
+                  "You have no pending payouts that match the minimum payout requirement for partners that have payouts enabled."
+                ) : (
+                  permissionsError || undefined
+                )
               }
             />
           </div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-holding-periods.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-holding-periods.tsx
new file mode 100644
index 00000000000..39ab4458289
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-holding-periods.tsx
@@ -0,0 +1,369 @@
+"use client";
+
+import { PAYOUT_HOLDING_PERIOD_DAYS } from "@/lib/constants/payouts";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { GroupProps } from "@/lib/types";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
+import { MarkdownDescription } from "@/ui/shared/markdown-description";
+import { StatusBadge, Switch } from "@dub/ui";
+import { ChevronDown } from "lucide-react";
+import Link from "next/link";
+import { useCallback, useMemo, useState } from "react";
+
+export type HoldingPeriodGroup = Pick<
+  GroupProps,
+  "id" | "name" | "slug" | "color" | "holdingPeriodDays"
+>;
+
+// A PATCH /api/groups/[groupId] payload that Save needs to send
+export type HoldingPeriodUpdate = {
+  groupId: string;
+  holdingPeriodDays: number;
+  applyToAllGroups?: boolean;
+};
+
+type AllGroupsState = { enabled: false } | { enabled: true; days: number };
+
+// Scroll distance (px) over which the top/bottom fades go from hidden to fully visible
+const FADE_SCROLL_DISTANCE = 40;
+
+/**
+ * Stages holding period edits (per group, or one value for all groups) until
+ * the payout settings form is saved. Nothing here touches the API.
+ */
+export function useProgramHoldingPeriods(
+  groups: HoldingPeriodGroup[] | undefined,
+) {
+  // Per-group edits keyed by group ID; only holds values that differ from the saved value
+  const [overrides, setOverrides] = useState<Record<string, number>>({});
+
+  // null = untouched, so the switch reflects the saved data (on when every group already shares one value)
+  const [allGroups, setAllGroups] = useState<AllGroupsState | null>(null);
+
+  // Always list the default group first
+  const sortedGroups = useMemo(() => {
+    if (!groups) return [];
+
+    const defaultGroup = groups.find(
+      (group) => group.slug === DEFAULT_PARTNER_GROUP.slug,
+    );
+
+    return defaultGroup
+      ? [defaultGroup, ...groups.filter((group) => group !== defaultGroup)]
+      : groups;
+  }, [groups]);
+
+  const defaultGroup: HoldingPeriodGroup | undefined = sortedGroups[0];
+
+  const getHoldingPeriodDays = useCallback(
+    (group: HoldingPeriodGroup) =>
+      overrides[group.id] ?? group.holdingPeriodDays,
+    [overrides],
+  );
+
+  const setGroupHoldingPeriodDays = useCallback(
+    (group: HoldingPeriodGroup, days: number) =>
+      setOverrides((prev) => {
+        const next = { ...prev };
+
+        if (days === group.holdingPeriodDays) {
+          delete next[group.id];
+        } else {
+          next[group.id] = days;
+        }
+
+        return next;
+      }),
+    [],
+  );
+
+  const savedValuesMatch =
+    sortedGroups.length > 1 &&
+    sortedGroups.every(
+      (group) => group.holdingPeriodDays === sortedGroups[0].holdingPeriodDays,
+    );
+
+  const allGroupsEnabled = allGroups ? allGroups.enabled : savedValuesMatch;
+
+  const allGroupsDays = allGroups?.enabled
+    ? allGroups.days
+    : defaultGroup?.holdingPeriodDays ?? PAYOUT_HOLDING_PERIOD_DAYS[0];
+
+  // Switching on starts from the default group's current value; switching off
+  // restores the per-group values (including any unsaved per-group edits)
+  const setAllGroupsEnabled = useCallback(
+    (enabled: boolean) =>
+      setAllGroups(
+        enabled && defaultGroup
+          ? { enabled: true, days: getHoldingPeriodDays(defaultGroup) }
+          : { enabled: false },
+      ),
+    [defaultGroup, getHoldingPeriodDays],
+  );
+
+  const setAllGroupsDays = useCallback(
+    (days: number) => setAllGroups({ enabled: true, days }),
+    [],
+  );
+
+  const pendingUpdates = useMemo<HoldingPeriodUpdate[]>(() => {
+    if (allGroupsEnabled) {
+      const needsUpdate = sortedGroups.some(
+        (group) => group.holdingPeriodDays !== allGroupsDays,
+      );
+
+      return needsUpdate && defaultGroup
+        ? [
+            {
+              groupId: defaultGroup.id,
+              holdingPeriodDays: allGroupsDays,
+              applyToAllGroups: true,
+            },
+          ]
+        : [];
+    }
+
+    return sortedGroups.flatMap((group) => {
+      const days = overrides[group.id];
+
+      return days !== undefined && days !== group.holdingPeriodDays
+        ? [{ groupId: group.id, holdingPeriodDays: days }]
+        : [];
+    });
+  }, [allGroupsEnabled, allGroupsDays, defaultGroup, sortedGroups, overrides]);
+
+  return {
+    sortedGroups,
+    getHoldingPeriodDays,
+    setGroupHoldingPeriodDays,
+    allGroupsEnabled,
+    allGroupsDays,
+    setAllGroupsEnabled,
+    setAllGroupsDays,
+    pendingUpdates,
+  };
+}
+
+export type ProgramHoldingPeriods = ReturnType<typeof useProgramHoldingPeriods>;
+
+export function ProgramPayoutHoldingPeriods({
+  loading,
+  holdingPeriods,
+}: {
+  loading: boolean;
+  holdingPeriods: ProgramHoldingPeriods;
+}) {
+  const {
+    sortedGroups,
+    getHoldingPeriodDays,
+    setGroupHoldingPeriodDays,
+    allGroupsEnabled,
+    allGroupsDays,
+    setAllGroupsEnabled,
+    setAllGroupsDays,
+  } = holdingPeriods;
+
+  return (
+    <div className="space-y-3">
+      <div>
+        <h4 className="text-base font-semibold leading-6 text-neutral-900">
+          Payout holding period
+        </h4>
+        <MarkdownDescription className="text-sm font-medium text-neutral-500">
+          [Set how long to hold
+          funds](https://dub.co/help/article/partner-payouts#payout-holding-period)
+          before they are eligible for payout.
+        </MarkdownDescription>
+      </div>
+
+      <label className="flex w-fit cursor-pointer select-none items-center gap-3 py-1">
+        <Switch
+          checked={allGroupsEnabled}
+          fn={setAllGroupsEnabled}
+          disabled={loading}
+        />
+        <span className="text-sm font-medium text-neutral-900">
+          Use the same holding period for all groups
+        </span>
+      </label>
+
+      {allGroupsEnabled ? (
+        <div className="flex h-11 items-center justify-between gap-4 rounded-lg border border-neutral-200 bg-white px-4">
+          <div className="flex min-w-0 items-center gap-2">
+            <div className="flex -space-x-1">
+              {sortedGroups.slice(0, 3).map((group) => (
+                <div key={group.id} className="rounded-full ring-2 ring-white">
+                  <GroupColorCircle group={group} />
+                </div>
+              ))}
+            </div>
+            <span className="text-sm font-medium text-neutral-700">
+              All groups
+            </span>
+            <span className="rounded-md bg-neutral-100 px-1.5 py-0.5 text-xs font-semibold text-neutral-700">
+              {sortedGroups.length}
+            </span>
+          </div>
+
+          <HoldingPeriodSelect
+            label="all groups"
+            value={allGroupsDays}
+            onChange={setAllGroupsDays}
+          />
+        </div>
+      ) : (
+        <HoldingPeriodsTable
+          groups={sortedGroups}
+          loading={loading}
+          getHoldingPeriodDays={getHoldingPeriodDays}
+          onHoldingPeriodDaysChange={setGroupHoldingPeriodDays}
+        />
+      )}
+    </div>
+  );
+}
+
+function HoldingPeriodsTable({
+  groups,
+  loading,
+  getHoldingPeriodDays,
+  onHoldingPeriodDaysChange,
+}: {
+  groups: HoldingPeriodGroup[];
+  loading: boolean;
+  getHoldingPeriodDays: (group: HoldingPeriodGroup) => number;
+  onHoldingPeriodDaysChange: (group: HoldingPeriodGroup, days: number) => void;
+}) {
+  const { slug: workspaceSlug } = useWorkspace();
+
+  const [fades, setFades] = useState({ top: 0, bottom: 0 });
+
+  const updateFades = useCallback((el: HTMLElement) => {
+    const maxScrollTop = el.scrollHeight - el.clientHeight;
+    const top = Math.min(el.scrollTop / FADE_SCROLL_DISTANCE, 1);
+    const bottom =
+      maxScrollTop <= 0
+        ? 0
+        : Math.min((maxScrollTop - el.scrollTop) / FADE_SCROLL_DISTANCE, 1);
+
+    setFades((prev) =>
+      prev.top === top && prev.bottom === bottom ? prev : { top, bottom },
+    );
+  }, []);
+
+  // Callback ref (rather than an effect): measures once the container mounts and
+  // whenever it or its rows resize, e.g. when the skeleton is replaced by groups
+  const scrollRef = useCallback(
+    (el: HTMLDivElement | null) => {
+      if (!el) return;
+
+      const observer = new ResizeObserver(() => updateFades(el));
+      observer.observe(el);
+      if (el.firstElementChild) observer.observe(el.firstElementChild);
+
+      return () => observer.disconnect();
+    },
+    [updateFades],
+  );
+
+  return (
+    <div className="relative overflow-hidden rounded-lg border border-neutral-200 bg-white">
+      <div
+        ref={scrollRef}
+        onScroll={(e) => updateFades(e.currentTarget)}
+        className="scrollbar-hide max-h-[268px] overflow-y-auto [clip-path:inset(0)]"
+      >
+        <div className="divide-y divide-neutral-200">
+          {loading
+            ? [...Array(3)].map((_, idx) => (
+                <div
+                  key={idx}
+                  className="flex h-11 items-center justify-between px-4"
+                >
+                  <div className="h-4 w-32 animate-pulse rounded-md bg-neutral-200" />
+                  <div className="h-4 w-16 animate-pulse rounded-md bg-neutral-200" />
+                </div>
+              ))
+            : groups.map((group) => (
+                <div
+                  key={group.id}
+                  className="flex h-11 items-center justify-between gap-4 px-4"
+                >
+                  <div className="flex min-w-0 items-center gap-2">
+                    <Link
+                      href={`/${workspaceSlug}/program/groups/${group.slug}/settings`}
+                      target="_blank"
+                      className="flex min-w-0 items-center gap-2 rounded-md text-sm font-medium text-neutral-700 transition-colors hover:text-neutral-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-500"
+                    >
+                      <GroupColorCircle group={group} />
+                      <span className="truncate">{group.name}</span>
+                    </Link>
+                    {group.slug === DEFAULT_PARTNER_GROUP.slug && (
+                      <StatusBadge
+                        variant="new"
+                        icon={null}
+                        className="px-1.5 py-0.5"
+                      >
+                        Default
+                      </StatusBadge>
+                    )}
+                  </div>
+
+                  <HoldingPeriodSelect
+                    label={group.name}
+                    value={getHoldingPeriodDays(group)}
+                    onChange={(days) => onHoldingPeriodDaysChange(group, days)}
+                  />
+                </div>
+              ))}
+        </div>
+      </div>
+
+      {/* Top scroll fade */}
+      <div
+        aria-hidden
+        className="pointer-events-none absolute inset-x-0 top-0 h-8 bg-gradient-to-b from-white to-transparent"
+        style={{ opacity: fades.top }}
+      />
+
+      {/* Bottom scroll fade */}
+      <div
+        aria-hidden
+        className="pointer-events-none absolute inset-x-0 bottom-0 h-20 bg-gradient-to-t from-white to-transparent"
+        style={{ opacity: fades.bottom }}
+      />
+    </div>
+  );
+}
+
+function HoldingPeriodSelect({
+  label,
+  value,
+  onChange,
+}: {
+  label: string;
+  value: number;
+  onChange: (days: number) => void;
+}) {
+  // The native <select> is stretched invisibly over the label so the closed
+  // state matches the design while still opening the system dropdown
+  return (
+    <div className="relative -mr-2 flex h-8 shrink-0 items-center gap-2 rounded-md px-2 text-sm text-neutral-800 transition-colors hover:bg-neutral-100 has-[:focus-visible]:ring-2 has-[:focus-visible]:ring-neutral-500">
+      <span aria-hidden>{value} days</span>
+      <ChevronDown className="size-3 text-neutral-600" aria-hidden />
+      <select
+        aria-label={`Payout holding period for ${label}`}
+        value={value}
+        onChange={(e) => onChange(Number(e.target.value))}
+        className="absolute inset-0 size-full cursor-pointer opacity-0"
+      >
+        {PAYOUT_HOLDING_PERIOD_DAYS.map((days) => (
+          <option key={days} value={days}>
+            {days} days{days === 30 ? " (recommended)" : ""}
+          </option>
+        ))}
+      </select>
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-methods.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-methods.tsx
index f500cf61b62..2e7e0345179 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-methods.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-methods.tsx
@@ -140,7 +140,7 @@ export function ProgramPayoutMethods() {
         {program?.payoutMode !== "internal" && <ExternalPayoutMethods />}
 
         {!paymentMethodsLoading && displayPaymentMethods.length === 0 && (
-          <div className="flex flex-col items-center justify-center rounded-lg bg-neutral-50 py-6">
+          <div className="flex flex-col items-center justify-center rounded-xl bg-neutral-100 py-6">
             <MoneyBill className="mb-2 size-6 text-neutral-900" />
             <h3 className="text-content-emphasis text-xs font-semibold leading-4">
               No payout methods
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-mode-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-mode-section.tsx
index e1749fe6c76..5f1109a5fc6 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-mode-section.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-mode-section.tsx
@@ -2,7 +2,8 @@
 
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
-import { CircleDollarOut, Webhook } from "@dub/ui";
+import { Callout } from "@/ui/shared/callout";
+import { CircleDollarOut } from "@dub/ui";
 import { ProgramPayoutMode } from "@prisma/client";
 import Link from "next/link";
 
@@ -70,22 +71,19 @@ function WebhookInfo() {
   const { slug } = useWorkspace();
 
   return (
-    <div className="flex items-start gap-2 rounded-md border border-amber-100 bg-amber-50 p-2.5">
-      <Webhook className="mt-0.5 size-3.5 shrink-0 text-amber-600" />
-      <p className="text-xs font-medium leading-4 text-amber-900">
-        Ensure webhooks are configured to listen for the{" "}
-        <code className="rounded bg-amber-200 px-1 py-0.5 font-mono text-xs text-amber-900">
-          payout.confirmed
-        </code>{" "}
-        event.{" "}
-        <Link
-          href={`/${slug}/settings/webhooks`}
-          target="_blank"
-          className="font-medium underline underline-offset-2 hover:text-amber-800"
-        >
-          Manage webhooks
-        </Link>
-      </p>
-    </div>
+    <Callout variant="warn" size={1}>
+      Ensure webhooks are configured to listen for the{" "}
+      <code className="rounded bg-amber-200 px-1 py-0.5 font-mono text-xs text-amber-900">
+        payout.confirmed
+      </code>{" "}
+      event.{" "}
+      <Link
+        href={`/${slug}/settings/webhooks`}
+        target="_blank"
+        className="font-medium underline underline-offset-2 hover:text-amber-800"
+      >
+        Manage webhooks
+      </Link>
+    </Callout>
   );
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-settings-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-settings-sheet.tsx
index 363e5b8f7f9..1fc7b67b388 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-settings-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/program-payout-settings-sheet.tsx
@@ -7,18 +7,22 @@ import {
   getAllowedMinPayoutAmounts,
 } from "@/lib/constants/payouts";
 import { mutatePrefix } from "@/lib/swr/mutate";
+import useGroups from "@/lib/swr/use-groups";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { ProgramProps } from "@/lib/types";
-import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
 import { X } from "@/ui/shared/icons";
 import { Button, Sheet, Slider } from "@dub/ui";
 import NumberFlow from "@number-flow/react";
 import { useAction } from "next-safe-action/hooks";
-import { useParams } from "next/navigation";
-import { Dispatch, SetStateAction, useEffect, useState } from "react";
+import { Dispatch, SetStateAction, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import {
+  HoldingPeriodUpdate,
+  ProgramPayoutHoldingPeriods,
+  useProgramHoldingPeriods,
+} from "./program-payout-holding-periods";
 import { ProgramPayoutMethods } from "./program-payout-methods";
 import { ProgramPayoutModeSection } from "./program-payout-mode-section";
 
@@ -33,7 +37,9 @@ function ProgramPayoutSettingsSheetContent({
 }: ProgramPayoutSettingsSheetProps) {
   const { id: workspaceId, defaultProgramId } = useWorkspace();
   const { program } = useProgram();
-  const params = useParams<{ slug: string }>();
+  const { groups, loading: groupsLoading } = useGroups({
+    query: { sortBy: "createdAt", sortOrder: "asc" },
+  });
 
   const {
     register,
@@ -43,34 +49,66 @@ function ProgramPayoutSettingsSheetContent({
     formState: { isDirty, isValid, isSubmitting },
   } = useForm<FormData>({
     mode: "onBlur",
+    // Resets the form (and recomputes isDirty/isValid) once the program loads
+    values: program ? { minPayoutAmount: program.minPayoutAmount } : undefined,
   });
 
-  useEffect(() => {
-    if (program) {
-      setValue("minPayoutAmount", program.minPayoutAmount);
-    }
-  }, [program, setValue]);
+  // Holding period edits are staged until the form is saved
+  const holdingPeriods = useProgramHoldingPeriods(groups);
 
-  const { executeAsync } = useAction(updateProgramAction, {
-    onSuccess: async () => {
-      toast.success("Payout settings updated successfully.");
-      setIsOpen(false);
-      mutatePrefix([`/api/programs/${defaultProgramId}`, `/api/groups`]);
-    },
-    onError: ({ error }) => {
-      toast.error(parseActionError(error, "Failed to update payout settings."));
-    },
-  });
+  const { executeAsync } = useAction(updateProgramAction);
 
   const onSubmit = async (data: FormData) => {
-    if (!workspaceId) {
+    if (!workspaceId || !program) {
       return;
     }
 
-    await executeAsync({
-      workspaceId,
-      ...data,
-    });
+    const requests: Promise<void>[] = [];
+
+    if (data.minPayoutAmount !== program.minPayoutAmount) {
+      requests.push(
+        executeAsync({
+          workspaceId,
+          minPayoutAmount: data.minPayoutAmount,
+        }).then((result) => {
+          if (result?.serverError || result?.validationErrors) {
+            throw new Error(
+              parseActionError(
+                result,
+                "Failed to update minimum payout amount.",
+              ),
+            );
+          }
+        }),
+      );
+    }
+
+    requests.push(
+      ...holdingPeriods.pendingUpdates.map((update) =>
+        updateGroupHoldingPeriod({ workspaceId, ...update }),
+      ),
+    );
+
+    const results = await Promise.allSettled(requests);
+
+    // Refresh the program + groups even if a request failed, so the sheet reflects what was saved
+    await mutatePrefix([`/api/programs/${defaultProgramId}`, "/api/groups"]);
+
+    const failure = results.find(
+      (result): result is PromiseRejectedResult => result.status === "rejected",
+    );
+
+    if (failure) {
+      toast.error(
+        failure.reason instanceof Error
+          ? failure.reason.message
+          : "Failed to update payout settings.",
+      );
+      return;
+    }
+
+    toast.success("Payout settings updated successfully.");
+    setIsOpen(false);
   };
 
   const minPayoutAmount = watch("minPayoutAmount");
@@ -78,6 +116,8 @@ function ProgramPayoutSettingsSheetContent({
     ? getAllowedMinPayoutAmounts(workspaceId)
     : ALLOWED_MIN_PAYOUT_AMOUNTS;
 
+  const hasChanges = isDirty || holdingPeriods.pendingUpdates.length > 0;
+
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="flex h-full flex-col">
       <div className="sticky top-0 z-10 border-b border-neutral-200 bg-white">
@@ -95,32 +135,9 @@ function ProgramPayoutSettingsSheetContent({
         </div>
       </div>
 
-      <div className="h-full divide-y divide-neutral-200 bg-neutral-50 p-4 sm:p-6">
-        {/* Payout holding period */}
-        <div className="grid gap-3 pb-6">
-          <div>
-            <h4 className="text-base font-semibold leading-6 text-neutral-900">
-              Payout holding period
-            </h4>
-            <p className="text-sm font-medium text-neutral-500">
-              The payout holding period is now configurable on a group level.
-            </p>
-          </div>
-          <a
-            href={`/${params.slug}/program/groups/${DEFAULT_PARTNER_GROUP.slug}/settings`}
-            target="_blank"
-          >
-            <Button
-              type="button"
-              variant="secondary"
-              text="View default group settings ↗"
-              className="h-8 w-full px-3"
-            />
-          </a>
-        </div>
-
+      <div className="flex h-full flex-col gap-8 bg-neutral-50 p-4 sm:p-6">
         {/* Minimum payout amount */}
-        <div className="space-y-6 py-6">
+        <div className="space-y-6">
           <div>
             <h4 className="text-base font-semibold leading-6 text-neutral-900">
               Minimum payout amount
@@ -170,15 +187,15 @@ function ProgramPayoutSettingsSheetContent({
         </div>
 
         {/* Payout methods */}
-        <div className="py-6">
-          <ProgramPayoutMethods />
-        </div>
+        <ProgramPayoutMethods />
 
-        {program?.payoutMode !== "internal" && (
-          <div className="py-6">
-            <ProgramPayoutModeSection />
-          </div>
-        )}
+        {program?.payoutMode !== "internal" && <ProgramPayoutModeSection />}
+
+        {/* Payout holding period */}
+        <ProgramPayoutHoldingPeriods
+          loading={groupsLoading}
+          holdingPeriods={holdingPeriods}
+        />
       </div>
 
       <div className="sticky bottom-0 z-10 border-t border-neutral-200 bg-white">
@@ -195,7 +212,7 @@ function ProgramPayoutSettingsSheetContent({
             text="Save"
             className="h-8 w-fit px-3"
             loading={isSubmitting}
-            disabled={!isDirty || !isValid}
+            disabled={!hasChanges || !isValid}
             type="submit"
           />
         </div>
@@ -204,6 +221,32 @@ function ProgramPayoutSettingsSheetContent({
   );
 }
 
+async function updateGroupHoldingPeriod({
+  workspaceId,
+  groupId,
+  holdingPeriodDays,
+  applyToAllGroups,
+}: HoldingPeriodUpdate & { workspaceId: string }) {
+  const response = await fetch(
+    `/api/groups/${groupId}?workspaceId=${workspaceId}`,
+    {
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        holdingPeriodDays,
+        ...(applyToAllGroups && { updateHoldingPeriodDaysForAllGroups: true }),
+      }),
+    },
+  );
+
+  if (!response.ok) {
+    const { error } = await response.json();
+    throw new Error(
+      error?.message || "Failed to update payout holding period.",
+    );
+  }
+}
+
 export function ProgramPayoutSettingsSheet({
   isOpen,
   ...rest
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/program-settings-row.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/program-settings-row.tsx
index 9b59b95a66d..020eb2109a5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/program-settings-row.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/program-settings-row.tsx
@@ -1,3 +1,4 @@
+import { MarkdownDescription } from "@/ui/shared/markdown-description";
 import { PropsWithChildren } from "react";
 
 export function SettingsRow({
@@ -17,7 +18,9 @@ export function SettingsRow({
           {heading} {required && <span className="text-red-700">*</span>}
         </h3>
         {description && (
-          <p className="text-sm text-neutral-600">{description}</p>
+          <MarkdownDescription className="text-sm text-neutral-600">
+            {description}
+          </MarkdownDescription>
         )}
       </div>
       <div>{children}</div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/use-upload-program-resource.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/use-upload-program-resource.ts
index d1bc9457ecc..59fd054ff2b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/use-upload-program-resource.ts
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/use-upload-program-resource.ts
@@ -1,5 +1,6 @@
 "use client";
 
+import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { getProgramResourceUploadUrlAction } from "@/lib/actions/partners/program-resources/get-program-resource-upload-url";
 import { useAction } from "next-safe-action/hooks";
 
@@ -19,27 +20,33 @@ export function useUploadProgramResource(workspaceId: string) {
       resourceType: opts.resourceType,
       name: opts.name,
       extension: opts.extension,
-      fileSize: opts.file.size,
+      contentType: opts.file.type,
+      contentLength: opts.file.size,
     });
 
-    if (!result?.data) throw new Error("Failed to get upload URL");
-
-    const { signedUrl, key, fileSize } = result.data;
-
-    const headers: Record<string, string> = {};
-    if (opts.resourceType === "logo" && opts.extension === "svg") {
-      headers["Content-Type"] = "image/svg+xml";
+    if (!result?.data) {
+      throw new Error(
+        parseActionError(result ?? {}, "Failed to get upload URL"),
+      );
     }
 
+    const { signedUrl, key } = result.data;
+
     const response = await fetch(signedUrl, {
       method: "PUT",
-      headers,
+      headers: {
+        "Content-Type": opts.file.type,
+        "Content-Length": opts.file.size.toString(),
+      },
       body: opts.file,
     });
 
     if (!response.ok) throw new Error(`Failed to upload ${opts.resourceType}`);
 
-    return { key, fileSize };
+    return {
+      key,
+      fileSize: opts.file.size,
+    };
   };
 
   return { upload };
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-help-and-support.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-help-and-support.tsx
index 7a0127f2fb1..e7c1a8342fc 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-help-and-support.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-help-and-support.tsx
@@ -183,7 +183,7 @@ export function ProgramHelpAndSupportContent({
 
           <SettingsRow
             heading="Terms of Service"
-            description="Program terms of service and legal information"
+            description="Program terms of service and legal information. [Try our generator ↗](https://dub.co/tools/affiliate-terms-generator)"
           >
             <div className="flex items-center justify-end">
               <div className="w-full max-w-md">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
index b5f8083c0eb..662985a443a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { clientAccessCheck } from "@/lib/client-access-check";
+import { testIds } from "@/lib/e2e/test-ids";
 import { MEGA_WORKSPACE_LINKS_LIMIT } from "@/lib/constants/misc";
 import useGroupsCount from "@/lib/swr/use-groups-count";
 import { useLinkTagsCount } from "@/lib/swr/use-link-tags-count";
@@ -40,6 +41,7 @@ import {
   isLegacyBusinessPlan,
   isWorkspaceBillingTrialActive,
   nFormatter,
+  sleep,
 } from "@dub/utils";
 import NumberFlow from "@number-flow/react";
 import Link from "next/link";
@@ -191,7 +193,7 @@ export default function PlanUsage() {
 
       if (res.ok) {
         // sleep for 2 seconds to make sure Stripe webhook was received, and then mutate
-        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await sleep(2000);
         await mutate();
         toast.success("Your subscription will continue as normal.");
       } else {
@@ -261,7 +263,10 @@ export default function PlanUsage() {
         ) : trialEndsAt != null &&
           isWorkspaceBillingTrialActive(trialEndsAt) ? (
           <div className="mx-1 mt-1 flex items-center justify-center rounded-lg bg-blue-50/50 px-3 py-2">
-            <p className="text-xs font-medium text-blue-600">
+            <p
+              className="text-xs font-medium text-blue-600"
+              data-testid={testIds.billing.trialBanner}
+            >
               Trial ends on{" "}
               <span className="font-semibold">
                 {new Date(trialEndsAt).toLocaleDateString("en-US", {
@@ -317,6 +322,7 @@ export default function PlanUsage() {
                     className="h-9"
                     disabled={Boolean(permissionsError)}
                     onClick={() => setShowStartPaidPlanModal(true)}
+                    data-testid={testIds.billing.startPaidPlan}
                   />
                 </DynamicTooltipWrapper>
               ) : showPendingCancellation ? (
@@ -358,6 +364,11 @@ export default function PlanUsage() {
                 }
                 variant="secondary"
                 className="h-9"
+                data-testid={
+                  isWorkspaceBillingTrialActive(trialEndsAt)
+                    ? testIds.billing.viewPlans
+                    : undefined
+                }
               />
             </Link>
 
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
index 0d25529119c..3f691e2d9d3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { clientAccessCheck } from "@/lib/client-access-check";
+import { testIds } from "@/lib/e2e/test-ids";
 import { isEligibleForTrial } from "@/lib/stripe/is-eligible-for-trial";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { PageContent } from "@/ui/layout/page-content";
@@ -183,7 +184,7 @@ export default function WorkspaceBillingUpgradePage() {
             Billing
           </Link>
           <ChevronRight className="text-content-muted size-2.5 shrink-0 [&_*]:stroke-2" />
-          <h1>Plans</h1>
+          <h1 data-testid={testIds.billing.plansHeading}>Plans</h1>
         </div>
       }
       controls={
@@ -340,6 +341,7 @@ export default function WorkspaceBillingUpgradePage() {
                       ) : (
                         <UpgradePlanButton
                           plan={plan.name.toLowerCase()}
+                          data-testid={testIds.billing.planCta(plan.name)}
                           tier={planTier > 1 ? planTier : undefined}
                           period={period}
                           disabled={
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/usage-chart.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/usage-chart.tsx
index cdf4d2f502f..0d31082fb86 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/usage-chart.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/usage-chart.tsx
@@ -1,3 +1,4 @@
+import { formatDateTooltip } from "@/lib/analytics/format-date-tooltip";
 import useDomains from "@/lib/swr/use-domains";
 import useFolders from "@/lib/swr/use-folders";
 import { useUsageTimeseries } from "@/lib/swr/use-usage-timeseries";
@@ -16,7 +17,7 @@ import {
 } from "@dub/ui";
 import { Bars, TimeSeriesChart, XAxis, YAxis } from "@dub/ui/charts";
 import { CursorRays, Folder, Globe2, Hyperlink } from "@dub/ui/icons";
-import { cn, formatDate, GOOGLE_FAVICON_URL, nFormatter } from "@dub/utils";
+import { cn, GOOGLE_FAVICON_URL, nFormatter } from "@dub/utils";
 import NumberFlow, { NumberFlowGroup } from "@number-flow/react";
 import {
   ComponentProps,
@@ -398,7 +399,7 @@ export function UsageChart() {
                   <>
                     <div className="flex items-center justify-between gap-4 px-4 py-3 text-xs">
                       <span className="text-content-emphasis font-semibold">
-                        {formatDate(d.date, { month: "short" })}
+                        {formatDateTooltip(d.date, { interval, start, end })}
                       </span>
                       <span className="text-content-default font-medium">
                         {nFormatter(d.values.usage, { full: true })}
@@ -440,7 +441,12 @@ export function UsageChart() {
                 );
               }}
             >
-              <XAxis highlightLast={false} />
+              <XAxis
+                highlightLast={false}
+                tickFormat={(date) =>
+                  formatDateTooltip(date, { interval, start, end })
+                }
+              />
               <YAxis showGridLines tickFormat={nFormatter} />
               <Bars />
             </TimeSeriesChart>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/constants.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/constants.ts
index f441c76eab3..7fd224f430b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/constants.ts
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/constants.ts
@@ -7,4 +7,6 @@ export const EMAIL_DOMAIN_STATUS_TO_VARIANT: Record<EmailDomainStatus, string> =
     pending: "pending",
     temporary_failure: "warning",
     not_started: "neutral",
+    partially_verified: "pending",
+    partially_failed: "warning",
   } as const;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx
index b7e162a0dc0..698f95d5921 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card.tsx
@@ -4,7 +4,6 @@ import { DomainCardTitleColumn } from "@/ui/domains/domain-card-title-column";
 import { useAddEditEmailDomainModal } from "@/ui/modals/add-edit-email-domain-modal";
 import { useDeleteEmailDomainModal } from "@/ui/modals/delete-email-domain-modal";
 import { Delete, ThreeDots } from "@/ui/shared/icons";
-import { GetDomainResponseSuccess } from "@dub/email/resend/types";
 import {
   Button,
   Envelope,
@@ -19,7 +18,7 @@ import {
 import { capitalize, cn, fetcher, formatDate } from "@dub/utils";
 import { motion } from "motion/react";
 import { useEffect, useRef, useState } from "react";
-import useSWRImmutable from "swr/immutable";
+import useSWR from "swr";
 import { EMAIL_DOMAIN_STATUS_TO_VARIANT } from "./constants";
 import { EmailDomainDnsRecords } from "./email-domain-dns-records";
 
@@ -34,13 +33,16 @@ export function EmailDomainCard({ domain }: EmailDomainCardProps) {
   const domainRef = useRef<HTMLDivElement>(null);
   const isVisible = useInViewport(domainRef, { defaultValue: true });
 
-  const { isValidating, mutate, data } =
-    useSWRImmutable<GetDomainResponseSuccess>(
-      workspaceId &&
-        isVisible &&
-        `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,
-      fetcher,
-    );
+  const { isValidating, mutate, data } = useSWR<{ status?: string }>(
+    workspaceId &&
+      isVisible &&
+      `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,
+    fetcher,
+    {
+      revalidateOnFocus: false,
+      dedupingInterval: 5000,
+    },
+  );
 
   const { addEditEmailDomainModal, setIsOpen: setShowEditModal } =
     useAddEditEmailDomainModal({
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx
index e2fb57ea261..c0b01a15bcf 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-dns-records.tsx
@@ -1,15 +1,38 @@
+"use client";
+
+import { clientAccessCheck } from "@/lib/client-access-check";
+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EmailDomainProps } from "@/lib/types";
+import { useForwardDnsInstructionsModal } from "@/ui/modals/forward-dns-instructions-modal";
+import { Callout } from "@/ui/shared/callout";
 import { GetDomainResponseSuccess } from "@dub/email/resend/types";
-import { CircleCheck, CopyButton, StatusBadge, Table, useTable } from "@dub/ui";
-import { capitalize, fetcher } from "@dub/utils";
-import useSWRImmutable from "swr/immutable";
+import {
+  Button,
+  Cloudflare,
+  CopyButton,
+  StatusBadge,
+  Table,
+  useTable,
+  Vercel,
+} from "@dub/ui";
+import { EnvelopeArrowRight } from "@dub/ui/icons";
+import { capitalize, cn, fetcher } from "@dub/utils";
+import { usePathname } from "next/navigation";
+import { useState } from "react";
+import { toast } from "sonner";
+import useSWR from "swr";
 import { EMAIL_DOMAIN_STATUS_TO_VARIANT } from "./constants";
 
 interface EmailDomainDnsRecordsProps {
   domain: EmailDomainProps;
 }
 
+type EmailDomainVerifyResponse = GetDomainResponseSuccess & {
+  domainConnect?: DomainConnectDiscovery | null;
+};
+
 interface DomainRecord {
   record: string;
   type: string;
@@ -168,22 +191,85 @@ function DnsRecordsTable({
   );
 }
 
+// Hide until Domain Connect + forward-instructions email template are ready to ship for email domains.
+const ENABLE_EMAIL_DNS_ACTIONS = false;
+
 export function EmailDomainDnsRecords({ domain }: EmailDomainDnsRecordsProps) {
-  const { id: workspaceId } = useWorkspace();
+  const { id: workspaceId, slug: workspaceSlug, role } = useWorkspace();
+  const pathname = usePathname();
+  const [autoLoading, setAutoLoading] = useState(false);
 
-  const { data, isValidating } = useSWRImmutable<GetDomainResponseSuccess>(
-    workspaceId &&
-      `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,
-    fetcher,
-    {
-      onError: (error) => {
-        console.error("Failed to fetch email domain verification", error);
+  const { error: permissionsError } = clientAccessCheck({
+    action: "domains.write",
+    role,
+  });
+
+  const { data, error, isLoading, isValidating, mutate } =
+    useSWR<EmailDomainVerifyResponse>(
+      workspaceId &&
+        `/api/email-domains/${domain.slug}/verify?workspaceId=${workspaceId}`,
+      fetcher,
+      {
+        revalidateOnFocus: false,
+        dedupingInterval: 5000,
+        onError: (err) => {
+          console.error("Failed to fetch email domain verification", err);
+        },
       },
-    },
-  );
+    );
 
+  const domainConnect = data?.domainConnect ?? null;
   const isVerified = data?.status === "verified";
-  const records = data?.records || [];
+  const records = data?.records;
+
+  const { ForwardDnsInstructionsModal, setShowForwardDnsModal } =
+    useForwardDnsInstructionsModal({
+      domain: domain.slug,
+      workspaceId: workspaceId ?? "",
+      endpoint: workspaceId
+        ? `/api/email-domains/${encodeURIComponent(domain.slug)}/forward-instructions?workspaceId=${workspaceId}`
+        : "",
+    });
+
+  const providerLabel =
+    domainConnect?.providerKind === "cloudflare" ? "Cloudflare" : "Vercel";
+  const ProviderIcon =
+    domainConnect?.providerKind === "cloudflare" ? Cloudflare : Vercel;
+
+  const handleAutoConfigure = async () => {
+    if (!workspaceId) return;
+    setAutoLoading(true);
+    try {
+      const res = await fetch(
+        `/api/email-domains/${encodeURIComponent(domain.slug)}/domain-connect/apply?workspaceId=${workspaceId}`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            returnTo: pathname ?? `/${workspaceSlug}/settings/domains/email`,
+          }),
+        },
+      );
+      const json = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        toast.error(json?.error?.message ?? "Could not start auto configure.");
+        return;
+      }
+      if (json?.applyUrl) {
+        if (!isAllowedSyncUXOrigin(json.applyUrl as string)) {
+          toast.error("Invalid redirect URL from server.");
+          return;
+        }
+        window.location.assign(json.applyUrl as string);
+        return;
+      }
+      toast.error("Could not start auto configure.");
+    } catch {
+      toast.error("Could not start auto configure.");
+    } finally {
+      setAutoLoading(false);
+    }
+  };
 
   const dmarcRecords = [
     {
@@ -195,59 +281,113 @@ export function EmailDomainDnsRecords({ domain }: EmailDomainDnsRecordsProps) {
     },
   ];
 
+  if (error && !data) {
+    return (
+      <div className="mt-4 flex flex-col items-center gap-3 rounded-lg bg-neutral-100/80 p-4 text-center">
+        <p className="text-sm text-neutral-600">
+          Failed to load verification records. Please try again.
+        </p>
+        <Button
+          type="button"
+          variant="secondary"
+          text="Retry"
+          className="w-fit"
+          loading={isValidating}
+          onClick={() => mutate()}
+        />
+      </div>
+    );
+  }
+
+  if (!data || isLoading) {
+    return (
+      <div className="mt-4">
+        <div className="h-20 animate-pulse rounded-lg bg-neutral-200" />
+      </div>
+    );
+  }
+
   return (
     <div className="mt-4 space-y-4">
-      {!records && !isValidating ? (
-        <div className="h-20 animate-pulse rounded-lg bg-neutral-200" />
-      ) : isVerified ? (
-        <div className="flex items-center gap-2 text-pretty rounded-lg bg-green-100/80 p-3 text-sm text-green-600">
-          <CircleCheck className="h-5 w-5 shrink-0" />
-          <div>
-            Good news! All the DNS records are verified. You are ready to start
-            sending emails with this domain.
-          </div>
-        </div>
+      {isVerified ? (
+        <Callout variant="success" size={2}>
+          Good news! All the DNS records are verified. You are ready to start
+          sending emails with this domain.
+        </Callout>
       ) : records && records.length > 0 ? (
         <div className="flex flex-col gap-8">
           <div className="flex flex-col gap-4 rounded-lg border border-neutral-200 bg-neutral-100 p-4">
             <div className="flex flex-col gap-6">
-              {records.length > 0 && (
-                <DnsRecordsTable
-                  title="DKIM and SPF (Required)"
-                  description={
-                    <p className="text-sm text-neutral-700">
-                      To authorize Dub to send emails from{" "}
-                      <strong>{domain.slug}</strong> to your partners, verify
-                      that the DNS records listed below are properly configured
-                      in your domain's DNS settings.
-                    </p>
-                  }
-                  records={records}
-                  showPriority
-                  showStatus
-                />
-              )}
-            </div>
-          </div>
-
-          <div className="flex flex-col rounded-lg border border-neutral-200 bg-neutral-100 p-4">
-            {dmarcRecords.length > 0 && (
               <DnsRecordsTable
-                title="DMARC (Recommended)"
+                title="DKIM and SPF (Required)"
                 description={
                   <p className="text-sm text-neutral-700">
-                    Add DMARC record to build trust in your domain and protect
-                    against email spoofing.
+                    To authorize Dub to send emails from{" "}
+                    <strong>{domain.slug}</strong> to your partners, verify that
+                    the DNS records listed below are properly configured in your
+                    domain's DNS settings.
                   </p>
                 }
-                records={dmarcRecords}
+                records={records}
+                showPriority
+                showStatus
               />
-            )}
+            </div>
           </div>
+
+          <div className="flex flex-col rounded-lg border border-neutral-200 bg-neutral-100 p-4">
+            <DnsRecordsTable
+              title="DMARC (Recommended)"
+              description={
+                <p className="text-sm text-neutral-700">
+                  Add DMARC record to build trust in your domain and protect
+                  against email spoofing.
+                </p>
+              }
+              records={dmarcRecords}
+            />
+          </div>
+
+          {ENABLE_EMAIL_DNS_ACTIONS && (domainConnect || workspaceId) && (
+            <div className="flex flex-wrap gap-2">
+              {domainConnect && workspaceId && (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  text={`Auto configure with ${providerLabel}`}
+                  icon={
+                    <ProviderIcon
+                      className={cn(
+                        "size-4 shrink-0",
+                        domainConnect.providerKind === "cloudflare"
+                          ? "text-[#F6821F]"
+                          : "text-black",
+                      )}
+                    />
+                  }
+                  className="w-fit"
+                  onClick={handleAutoConfigure}
+                  loading={autoLoading}
+                />
+              )}
+              {workspaceId && (
+                <Button
+                  type="button"
+                  variant="secondary"
+                  text="Forward instructions"
+                  icon={<EnvelopeArrowRight className="size-4 shrink-0" />}
+                  className="w-fit"
+                  onClick={() => setShowForwardDnsModal(true)}
+                  disabledTooltip={permissionsError || undefined}
+                />
+              )}
+            </div>
+          )}
+          {ENABLE_EMAIL_DNS_ACTIONS && <ForwardDnsInstructionsModal />}
         </div>
       ) : (
         <div className="rounded-lg bg-neutral-100/80 p-4 text-center text-sm text-neutral-600">
-          Loading verification records...
+          No verification records available for this domain yet.
         </div>
       )}
     </div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx
index fdbc1ca9046..99ecefe7616 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/page-client.tsx
@@ -6,14 +6,24 @@ import useWorkspace from "@/lib/swr/use-workspace";
 import { EmailDomainProps } from "@/lib/types";
 import { useAddEditEmailDomainModal } from "@/ui/modals/add-edit-email-domain-modal";
 import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
-import { ArrowTurnRight2, Button, buttonVariants } from "@dub/ui";
+import {
+  ArrowTurnRight2,
+  Button,
+  buttonVariants,
+  useRouterStuff,
+} from "@dub/ui";
 import { cn } from "@dub/utils";
 import { EmailDomainCard } from "app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/email/email-domain-card";
 import { Mail } from "lucide-react";
 import Link from "next/link";
+import { useEffect } from "react";
+import { toast } from "sonner";
+import { useSWRConfig } from "swr";
 
 export function EmailDomains() {
   const { slug, plan } = useWorkspace();
+  const { searchParams, queryParams } = useRouterStuff();
+  const { mutate } = useSWRConfig();
 
   const {
     emailDomains,
@@ -23,6 +33,43 @@ export function EmailDomains() {
 
   const { canSendEmailCampaigns } = getPlanCapabilities(plan);
 
+  useEffect(() => {
+    if (searchParams.get("domain_connect") !== "callback") return;
+    const error = searchParams.get("error");
+    const errorDesc = searchParams.get("error_description");
+    if (error) {
+      toast.error(
+        errorDesc === "user_cancel"
+          ? "DNS setup was cancelled."
+          : "Your DNS provider returned an error. Try again or configure manually.",
+      );
+    } else {
+      toast.success(
+        "DNS changes submitted. Checking email domain verification…",
+      );
+      const revalidateEmailDomains = () => {
+        void mutate(
+          (key) =>
+            typeof key === "string" &&
+            key.includes("/api/email-domains/") &&
+            key.includes("/verify"),
+        );
+        void mutate(
+          (key) =>
+            typeof key === "string" && key.startsWith("/api/email-domains"),
+        );
+      };
+      revalidateEmailDomains();
+      window.setTimeout(revalidateEmailDomains, 4000);
+      window.setTimeout(revalidateEmailDomains, 10000);
+    }
+    queryParams({
+      del: ["domain_connect", "error", "error_description", "state"],
+      replace: true,
+      scroll: false,
+    });
+  }, [searchParams, queryParams, mutate]);
+
   if (!canSendEmailCampaigns) {
     return (
       <div className="grid gap-5">
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx
index c163889eeae..2d41f187ac5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/domains/page-client.tsx
@@ -30,6 +30,8 @@ import {
 import { capitalize, pluralize } from "@dub/utils";
 import { ChevronDown, Crown } from "lucide-react";
 import { useEffect, useState } from "react";
+import { toast } from "sonner";
+import { useSWRConfig } from "swr";
 
 export function CustomDomains() {
   const {
@@ -44,6 +46,7 @@ export function CustomDomains() {
 
   const [openPopover, setOpenPopover] = useState(false);
   const { searchParams, queryParams } = useRouterStuff();
+  const { mutate } = useSWRConfig();
   const { allWorkspaceDomains, loading } = useDomains({
     opts: { includeLink: "true" },
   });
@@ -72,6 +75,41 @@ export function CustomDomains() {
     [searchParams],
   );
 
+  useEffect(() => {
+    if (searchParams.get("domain_connect") !== "callback") return;
+    const error = searchParams.get("error");
+    const errorDesc = searchParams.get("error_description");
+    if (error) {
+      toast.error(
+        errorDesc === "user_cancel"
+          ? "DNS setup was cancelled."
+          : "Your DNS provider returned an error. Try again or configure manually.",
+      );
+    } else {
+      toast.success("DNS changes submitted. Checking domain verification…");
+      const revalidateDomains = () => {
+        void mutate(
+          (key) =>
+            typeof key === "string" &&
+            key.includes("/api/domains/") &&
+            key.includes("/verify"),
+        );
+        void mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/domains"),
+        );
+      };
+      // Immediate check, then again after DNS has a moment to propagate to Vercel
+      revalidateDomains();
+      window.setTimeout(revalidateDomains, 4000);
+      window.setTimeout(revalidateDomains, 10000);
+    }
+    queryParams({
+      del: ["domain_connect", "error", "error_description", "state"],
+      replace: true,
+      scroll: false,
+    });
+  }, [searchParams, queryParams, mutate]);
+
   const { error: permissionsError } = clientAccessCheck({
     action: "domains.write",
     role,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/integrations-list.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/integrations-list.tsx
index 5aad45b03c4..81ab5056eb5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/integrations-list.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/integrations-list.tsx
@@ -38,6 +38,9 @@ async function IntegrationsListRSC() {
   const integrations = await prisma.integration.findMany({
     where: {
       verified: true,
+      category: {
+        not: null,
+      },
     },
     include: {
       _count: {
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
index 9ceb07c1b53..5bd50fd15c8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
@@ -16,12 +16,15 @@ import { useInviteWorkspaceUserModal } from "@/ui/modals/invite-workspace-user-m
 import { useRemoveWorkspaceUserModal } from "@/ui/modals/remove-workspace-user-modal";
 import { useWorkspaceUserRoleModal } from "@/ui/modals/update-workspace-user-role";
 import { SearchBoxPersisted } from "@/ui/shared/search-box";
+import { SimpleEmptyState } from "@/ui/shared/simple-empty-state";
 import { UserAvatar } from "@/ui/users/user-avatar";
 import {
   Button,
+  buttonVariants,
   DynamicTooltipWrapper,
   Filter,
   Popover,
+  ShieldSlash,
   Table,
   useKeyboardShortcut,
   usePagination,
@@ -43,6 +46,7 @@ import { ColumnDef, Row } from "@tanstack/react-table";
 import { Command } from "cmdk";
 import { UserMinus } from "lucide-react";
 import { useSession } from "next-auth/react";
+import Link from "next/link";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
 import useSWR from "swr";
@@ -53,7 +57,7 @@ export default function WorkspaceMembersPage() {
 
   const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();
 
-  const { role, plan, planPeriod, usersLimit } = useWorkspace();
+  const { role, plan, planPeriod, usersLimit, slug } = useWorkspace();
   const { data: session } = useSession();
   const { id: workspaceId } = useWorkspace();
   const { users: workspaceUsers } = useWorkspaceUsers();
@@ -71,6 +75,7 @@ export default function WorkspaceMembersPage() {
     isLoading: loading,
   } = useSWR<WorkspaceUserProps[]>(
     workspaceId &&
+      role !== "viewer" &&
       `/api/workspaces/${workspaceId}/${status === "invited" ? "invites" : "users"}?${new URLSearchParams(
         {
           ...(search && { search }),
@@ -84,7 +89,9 @@ export default function WorkspaceMembersPage() {
   );
 
   const { data: invitesForCount } = useSWR<WorkspaceUserProps[]>(
-    workspaceId ? `/api/workspaces/${workspaceId}/invites` : null,
+    workspaceId && role !== "viewer"
+      ? `/api/workspaces/${workspaceId}/invites`
+      : null,
     fetcher,
   );
   const inviteCount = invitesForCount?.length ?? 0;
@@ -286,6 +293,10 @@ export default function WorkspaceMembersPage() {
     });
   };
 
+  if (role === "viewer") {
+    return <AccessDenied slug={slug} />;
+  }
+
   return (
     <>
       <InviteWorkspaceUserModal />
@@ -560,3 +571,32 @@ function MenuItem({
     </Command.Item>
   );
 }
+
+function AccessDenied({ slug }: { slug?: string }) {
+  return (
+    <PageContent title="Members">
+      <SimpleEmptyState
+        title="You don't have access to this page"
+        description="Contact your workspace admin if you have any questions."
+        graphic={
+          <div className="flex size-16 items-center justify-center rounded-2xl border border-neutral-200 bg-neutral-50">
+            <ShieldSlash className="size-6 text-neutral-800" />
+          </div>
+        }
+        addButton={
+          slug ? (
+            <Link
+              href={`/${slug}/settings`}
+              className={cn(
+                buttonVariants({ variant: "primary" }),
+                "flex h-9 items-center whitespace-nowrap rounded-lg border px-4 text-sm",
+              )}
+            >
+              Go to workspace settings
+            </Link>
+          ) : undefined
+        }
+      />
+    </PageContent>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
index 53819d20c54..87f0d2d9ff5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
@@ -63,7 +63,7 @@ export function SAML() {
           <img
             src={currentProvider.logo}
             alt={currentProvider.name}
-            className="h-8 w-8"
+            className="h-8 w-8 shrink-0"
           />
         ),
         title: `${currentProvider.name} SAML`,
@@ -73,7 +73,7 @@ export function SAML() {
       return {
         status: "unconfigured",
         logo: (
-          <div className="rounded-full border border-neutral-200 p-2">
+          <div className="shrink-0 rounded-full border border-neutral-200 p-2">
             <Lock className="h-4 w-4 text-neutral-600" />
           </div>
         ),
@@ -130,12 +130,12 @@ export function SAML() {
           </div>
 
           <div className="rounded-xl border border-neutral-200 bg-white">
-            <div className="flex flex-col items-start justify-between space-y-4 px-4 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
-              <div className="flex flex-col items-start gap-4 sm:flex-row sm:items-center">
+            <div className="flex items-center justify-between gap-4 px-4 py-4">
+              <div className="flex min-w-0 items-center gap-4">
                 {data.logo || (
-                  <div className="h-8 w-8 animate-pulse rounded-full bg-neutral-100" />
+                  <div className="h-8 w-8 shrink-0 animate-pulse rounded-full bg-neutral-100" />
                 )}
-                <div className="flex flex-col">
+                <div className="flex min-w-0 flex-col">
                   {data.title ? (
                     <h3 className="font-medium">{data.title}</h3>
                   ) : (
@@ -150,7 +150,7 @@ export function SAML() {
                   )}
                 </div>
               </div>
-              <div>
+              <div className="shrink-0">
                 {loading ? (
                   <div className="h-9 w-24 animate-pulse rounded-md bg-neutral-100" />
                 ) : configured ? (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
index e99dae4a8b1..df600ea2d87 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
@@ -37,7 +37,7 @@ export function SCIM() {
           <img
             src={SAML_PROVIDERS.find((p) => p.scim === provider)!.logo}
             alt={`${provider} logo`}
-            className="h-8 w-8"
+            className="h-8 w-8 shrink-0"
           />
         ),
         title: `${SAML_PROVIDERS.find((p) => p.scim === provider)!.name} SCIM`,
@@ -46,7 +46,7 @@ export function SCIM() {
     } else
       return {
         logo: (
-          <div className="rounded-full border border-neutral-200 p-2">
+          <div className="shrink-0 rounded-full border border-neutral-200 p-2">
             <FolderSync className="h-4 w-4 text-neutral-600" />
           </div>
         ),
@@ -74,12 +74,12 @@ export function SCIM() {
           </div>
 
           <div className="rounded-xl border border-neutral-200 bg-white">
-            <div className="flex flex-col items-start justify-between space-y-4 px-4 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
-              <div className="flex flex-col items-start gap-4 sm:flex-row sm:items-center">
+            <div className="flex items-center justify-between gap-4 px-4 py-4">
+              <div className="flex min-w-0 items-center gap-4">
                 {data.logo || (
-                  <div className="h-8 w-8 animate-pulse rounded-full bg-neutral-100" />
+                  <div className="h-8 w-8 shrink-0 animate-pulse rounded-full bg-neutral-100" />
                 )}
-                <div className="flex flex-col">
+                <div className="flex min-w-0 flex-col">
                   {data.title ? (
                     <h3 className="font-medium">{data.title}</h3>
                   ) : (
@@ -94,7 +94,7 @@ export function SCIM() {
                   )}
                 </div>
               </div>
-              <div>
+              <div className="shrink-0">
                 {loading ? (
                   <div className="h-9 w-24 animate-pulse rounded-md bg-neutral-100" />
                 ) : configured ? (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tokens/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tokens/page.tsx
index 9895ec828a8..3cdd8b5dce5 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tokens/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tokens/page.tsx
@@ -20,6 +20,7 @@ import {
   Key,
   PenWriting,
   Popover,
+  StatusBadge,
   Table,
   Tooltip,
   usePagination,
@@ -140,7 +141,21 @@ export default function TokensPage() {
         id: "partialKey",
         header: "Key",
         accessorKey: "partialKey",
-        cell: ({ row }) => row.original.partialKey,
+        cell: ({ row }) => {
+          const isExpired =
+            row.original.expires && new Date(row.original.expires) < new Date();
+
+          return (
+            <span className="flex items-center gap-2">
+              {row.original.partialKey}
+              {isExpired && (
+                <StatusBadge variant="warning" size="sm" icon={null}>
+                  Expired
+                </StatusBadge>
+              )}
+            </span>
+          );
+        },
       },
       {
         id: "lastUsed",
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-hostname-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-hostname-modal.tsx
index 368394d80e5..6595eaec62b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-hostname-modal.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-hostname-modal.tsx
@@ -1,40 +1,48 @@
 "use client";
 
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
 import { X } from "@/ui/shared/icons";
-import { Button, LoadingDots, Modal, useMediaQuery } from "@dub/ui";
+import { Button, Modal, useMediaQuery } from "@dub/ui";
 import { cn, validDomainRegex } from "@dub/utils";
-import { useCallback, useMemo, useState } from "react";
+import { useState } from "react";
 import { toast } from "sonner";
 
-const AddHostnameForm = ({
-  onCreate,
-  onCancel,
+const isValidHostname = (hostname: string) => {
+  return (
+    validDomainRegex.test(hostname) ||
+    hostname === "localhost" ||
+    hostname.startsWith("*.")
+  );
+};
+
+const AddHostnameModal = ({
+  showModal,
+  setShowModal,
+  existingHostnames,
+  onAdd,
 }: {
-  onCreate: () => void;
-  onCancel?: () => void;
+  showModal: boolean;
+  setShowModal: (showModal: boolean) => void;
+  existingHostnames: string[];
+  onAdd: (hostname: string) => void | Promise<void>;
 }) => {
   const [hostname, setHostname] = useState("");
-  const [processing, setProcessing] = useState(false);
-  const { id, allowedHostnames, mutate, role } = useWorkspace();
+  const [isLoading, setIsLoading] = useState(false);
+  const { isMobile } = useMediaQuery();
 
-  const { error: permissionsError } = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "add hostnames",
-  });
+  const close = () => {
+    if (isLoading) {
+      return;
+    }
 
-  const isValidHostname = (hostname: string) => {
-    return (
-      validDomainRegex.test(hostname) ||
-      hostname === "localhost" ||
-      hostname.startsWith("*.")
-    );
+    setShowModal(false);
   };
 
-  const addHostname = async () => {
-    if (allowedHostnames?.includes(hostname)) {
+  const handleAdd = async () => {
+    if (isLoading) {
+      return;
+    }
+
+    if (existingHostnames.includes(hostname)) {
       toast.error("Hostname already exists.");
       return;
     }
@@ -44,64 +52,60 @@ const AddHostnameForm = ({
       return;
     }
 
-    setProcessing(true);
-
-    const response = await fetch(`/api/workspaces/${id}`, {
-      method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        allowedHostnames: [...(allowedHostnames || []), hostname],
-      }),
-    });
-
-    if (response.ok) {
-      toast.success("Hostname added.");
-      onCreate();
-    } else {
-      const { error } = await response.json();
-      toast.error(error.message);
+    setIsLoading(true);
+    try {
+      await onAdd(hostname);
+      setHostname("");
+      setShowModal(false);
+    } finally {
+      setIsLoading(false);
     }
-
-    mutate();
-    setProcessing(false);
-    setHostname("");
   };
 
-  const { isMobile } = useMediaQuery();
-
   return (
-    <form
-      className="bg-neutral-50"
-      onSubmit={(e) => {
-        e.preventDefault();
-        addHostname();
-      }}
-    >
-      <div className="relative flex-1 rounded-md px-6 py-5">
-        <input
-          type="text"
-          required
-          value={hostname}
-          onChange={(e) => setHostname(e.target.value)}
-          autoComplete="off"
-          autoFocus={!isMobile}
-          placeholder="example.com or *.example.com"
-          className={cn(
-            "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-          )}
-        />
+    <Modal showModal={showModal} setShowModal={setShowModal}>
+      <div className="flex items-center justify-between border-b border-neutral-200 p-4">
+        <h3 className="text-lg font-medium">Add hostname</h3>
+        <button
+          type="button"
+          onClick={close}
+          className="group rounded-full p-2 text-neutral-500 transition-all duration-75 hover:bg-neutral-100 focus:outline-none active:bg-neutral-200"
+        >
+          <X className="h-5 w-5" />
+        </button>
       </div>
 
-      <div className="flex items-center justify-between gap-2 border-t border-neutral-200 px-6 py-5">
-        <div>{processing && <LoadingDots />}</div>
-        <div className="flex items-center gap-2">
+      <form
+        className="bg-neutral-50"
+        onSubmit={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          void handleAdd();
+        }}
+      >
+        <div className="relative flex-1 rounded-md px-6 py-5">
+          <input
+            type="text"
+            required
+            value={hostname}
+            onChange={(e) => setHostname(e.target.value)}
+            autoComplete="off"
+            autoFocus={!isMobile}
+            placeholder="example.com or *.example.com"
+            className={cn(
+              "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+            )}
+          />
+        </div>
+
+        <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-6 py-5">
           <Button
-            onClick={() => onCancel?.()}
+            type="button"
+            onClick={close}
             variant="secondary"
             text="Cancel"
             className="h-8 w-fit px-3"
+            disabled={isLoading}
           />
           <Button
             type="submit"
@@ -109,62 +113,32 @@ const AddHostnameForm = ({
             text="Add hostname"
             className="h-8 w-fit px-3"
             disabled={!isValidHostname(hostname)}
-            loading={processing}
-            disabledTooltip={permissionsError || undefined}
+            loading={isLoading}
           />
         </div>
-      </div>
-    </form>
-  );
-};
-
-interface AddHostnameModalProps {
-  showModal: boolean;
-  setShowModal: (showModal: boolean) => void;
-}
-
-const AddHostnameModal = ({
-  showModal,
-  setShowModal,
-}: AddHostnameModalProps) => {
-  const close = () => setShowModal(false);
-  return (
-    <Modal showModal={showModal} setShowModal={setShowModal}>
-      <div className="flex items-center justify-between border-b border-neutral-200 p-4">
-        <h3 className="text-lg font-medium">Add hostname</h3>
-        <button
-          type="button"
-          onClick={close}
-          className="group rounded-full p-2 text-neutral-500 transition-all duration-75 hover:bg-neutral-100 focus:outline-none active:bg-neutral-200"
-        >
-          <X className="h-5 w-5" />
-        </button>
-      </div>
-
-      <div className="bg-neutral-50">
-        <AddHostnameForm onCancel={close} onCreate={close} />
-      </div>
+      </form>
     </Modal>
   );
 };
 
-export function useAddHostnameModal() {
+export function useAddHostnameModal({
+  existingHostnames,
+  onAdd,
+}: {
+  existingHostnames: string[];
+  onAdd: (hostname: string) => void | Promise<void>;
+}) {
   const [showAddHostnameModal, setShowAddHostnameModal] = useState(false);
 
-  const AddHostnameModalCallback = useCallback(() => {
-    return (
+  return {
+    setShowAddHostnameModal,
+    addHostnameModal: (
       <AddHostnameModal
         showModal={showAddHostnameModal}
         setShowModal={setShowAddHostnameModal}
+        existingHostnames={existingHostnames}
+        onAdd={onAdd}
       />
-    );
-  }, [showAddHostnameModal, setShowAddHostnameModal]);
-
-  return useMemo(
-    () => ({
-      setShowAddHostnameModal,
-      AddHostnameModal: AddHostnameModalCallback,
-    }),
-    [setShowAddHostnameModal, AddHostnameModalCallback],
-  );
+    ),
+  };
 }
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-sitemap-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-sitemap-modal.tsx
new file mode 100644
index 00000000000..16af622c7d2
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/add-sitemap-modal.tsx
@@ -0,0 +1,142 @@
+"use client";
+
+import { X } from "@/ui/shared/icons";
+import { Button, Modal, useMediaQuery } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { useCallback, useMemo, useState } from "react";
+import { toast } from "sonner";
+
+const normalizeSitemapUrl = (value: string) => {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+
+  const withProtocol =
+    trimmed.startsWith("http://") || trimmed.startsWith("https://")
+      ? trimmed
+      : `https://${trimmed}`;
+
+  try {
+    return new URL(withProtocol).toString();
+  } catch {
+    return null;
+  }
+};
+
+const AddSitemapForm = ({
+  existingUrls,
+  onAdd,
+  onCancel,
+}: {
+  existingUrls: string[];
+  onAdd: (url: string) => void;
+  onCancel?: () => void;
+}) => {
+  const [url, setUrl] = useState("");
+  const { isMobile } = useMediaQuery();
+  const normalizedUrl = normalizeSitemapUrl(url);
+
+  return (
+    <form
+      className="bg-neutral-50"
+      onSubmit={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (!normalizedUrl) {
+          toast.error("Enter a valid sitemap URL.");
+          return;
+        }
+
+        if (existingUrls.includes(normalizedUrl)) {
+          toast.error("Sitemap already exists.");
+          return;
+        }
+
+        onAdd(normalizedUrl);
+        setUrl("");
+      }}
+    >
+      <div className="relative flex-1 rounded-md px-6 py-5">
+        <input
+          type="text"
+          required
+          value={url}
+          onChange={(e) => setUrl(e.target.value)}
+          autoComplete="off"
+          autoFocus={!isMobile}
+          placeholder="https://acme.com/sitemap.xml"
+          className={cn(
+            "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+          )}
+        />
+      </div>
+
+      <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-6 py-5">
+        <Button
+          onClick={() => onCancel?.()}
+          variant="secondary"
+          text="Cancel"
+          className="h-8 w-fit px-3"
+        />
+        <Button
+          type="submit"
+          variant="primary"
+          text="Add sitemap"
+          className="h-8 w-fit px-3"
+          disabled={!normalizedUrl}
+        />
+      </div>
+    </form>
+  );
+};
+
+export function useAddSitemapModal({
+  existingUrls,
+  onAdd,
+}: {
+  existingUrls: string[];
+  onAdd: (url: string) => void;
+}) {
+  const [showAddSitemapModal, setShowAddSitemapModal] = useState(false);
+
+  const AddSitemapModalCallback = useCallback(() => {
+    return (
+      <Modal
+        showModal={showAddSitemapModal}
+        setShowModal={setShowAddSitemapModal}
+      >
+        <div className="flex items-center justify-between border-b border-neutral-200 p-4">
+          <h3 className="text-lg font-medium">Add sitemap</h3>
+          <button
+            type="button"
+            onClick={() => setShowAddSitemapModal(false)}
+            className="group rounded-full p-2 text-neutral-500 transition-all duration-75 hover:bg-neutral-100 focus:outline-none active:bg-neutral-200"
+          >
+            <X className="h-5 w-5" />
+          </button>
+        </div>
+
+        <div className="bg-neutral-50">
+          <AddSitemapForm
+            existingUrls={existingUrls}
+            onCancel={() => setShowAddSitemapModal(false)}
+            onAdd={(sitemapUrl) => {
+              onAdd(sitemapUrl);
+              setShowAddSitemapModal(false);
+            }}
+          />
+        </div>
+      </Modal>
+    );
+  }, [showAddSitemapModal, existingUrls, onAdd]);
+
+  return useMemo(
+    () => ({
+      setShowAddSitemapModal,
+      AddSitemapModal: AddSitemapModalCallback,
+    }),
+    [AddSitemapModalCallback],
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/base-script-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/base-script-section.tsx
deleted file mode 100644
index ffd510d66b1..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/base-script-section.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-"use client";
-
-import { LockSmall, Switch } from "@dub/ui";
-import { useId } from "react";
-import { HostnameSection } from "./hostname-section";
-
-export function BaseScriptSection() {
-  const id = useId();
-
-  return (
-    <div className="flex flex-1 flex-col rounded-lg border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between gap-4 p-3">
-        <div className="flex min-w-0 items-center gap-4">
-          <div className="overflow-hidden">
-            <label
-              htmlFor={`${id}-switch`}
-              className="text-content-emphasis block text-sm font-semibold"
-            >
-              Base script
-            </label>
-            <p className="text-content-subtle text-sm font-medium">
-              For basic cookie-management and{" "}
-              <a
-                href="https://dub.co/docs/sdks/client-side/features/click-tracking"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="cursor-help text-neutral-800 underline decoration-dotted underline-offset-2"
-              >
-                client-side click tracking
-              </a>
-              .
-            </p>
-          </div>
-        </div>
-
-        <Switch
-          disabledTooltip="Required for all Dub tracking"
-          disabled
-          checked={true}
-          trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20 w-7 h-4"
-          thumbDimensions="size-3"
-          thumbTranslate="translate-x-3"
-          thumbIcon={
-            <div className="flex size-full items-center justify-center">
-              <LockSmall className="size-[8px] text-black" />
-            </div>
-          }
-        />
-      </div>
-
-      <HostnameSection className="border-t border-neutral-200" />
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/complete-step-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/complete-step-button.tsx
deleted file mode 100644
index 927418e9bcc..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/complete-step-button.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Button } from "@dub/ui";
-
-export const CompleteStepButton = ({
-  onClick,
-  loading,
-}: {
-  onClick: () => void;
-  loading?: boolean;
-}) => {
-  return (
-    <Button text="Mark step as complete" loading={loading} onClick={onClick} />
-  );
-};
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/configure-tracking-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/configure-tracking-section.tsx
new file mode 100644
index 00000000000..8028ea23bbf
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/configure-tracking-section.tsx
@@ -0,0 +1,366 @@
+"use client";
+
+import { clientAccessCheck } from "@/lib/client-access-check";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
+import { stackItems } from "@/ui/guides/integrations";
+import { Button, Switch } from "@dub/ui";
+import { useEffect, useMemo } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { HostnameField } from "./hostname-field";
+import { PublishableKeyField } from "./publishable-key-field";
+import { SectionCard } from "./section-card";
+import {
+  SiteVisitTrackingField,
+  TrackedSitemapDraft,
+} from "./site-visit-tracking-field";
+import { StackPicker, StackSelectionStatus } from "./stack-picker";
+import { TrackingSettingsRow } from "./tracking-settings-row";
+
+type TrackingFormData = {
+  stack: string[];
+  allowedHostnames: string[];
+  publishableKey: string | null;
+  siteVisitTrackingEnabled: boolean;
+  siteDomainSlug: string;
+  trackedSitemaps: TrackedSitemapDraft[];
+  outboundDomainTrackingEnabled: boolean;
+};
+
+const emptyTrackingFormValues: TrackingFormData = {
+  stack: [],
+  allowedHostnames: [],
+  publishableKey: null,
+  siteVisitTrackingEnabled: false,
+  siteDomainSlug: "",
+  trackedSitemaps: [],
+  outboundDomainTrackingEnabled: false,
+};
+
+const STACK_DESCRIPTION =
+  "Select all items that apply to your stack. [Learn more](https://dub.co/docs/conversions/quickstart)";
+const HOSTNAMES_DESCRIPTION =
+  "Domains to allow client-side click tracking for. [Learn more](https://dub.co/docs/sdks/client-side/features/click-tracking)";
+const PUBLISHABLE_KEY_DESCRIPTION =
+  "Required for client-side conversion tracking. [Learn more](https://dub.co/docs/api-reference/publishable-keys)";
+const SITE_VISIT_DESCRIPTION =
+  "For tracking site visits (organic visits from Google/SEO/AEO). [Learn more](https://dub.co/docs/concepts/attribution)";
+const OUTBOUND_DESCRIPTION =
+  "Track outbound clicks to your other domains. [Learn more](https://dub.co/docs/sdks/client-side/features/cross-domain-tracking#cross-domain-tracking)";
+
+export function ConfigureTrackingSection() {
+  const workspace = useWorkspace();
+  const {
+    id,
+    role,
+    flags,
+    mutate,
+    loading: workspaceLoading,
+    allowedHostnames,
+    publishableKey,
+    siteVisitTrackingSettings,
+  } = workspace;
+
+  const permissionsError = clientAccessCheck({
+    action: "workspaces.write",
+    role,
+    customPermissionDescription: "manage tracking settings",
+  }).error;
+  const disabledTooltip =
+    typeof permissionsError === "string" ? permissionsError : undefined;
+
+  const [savedStack, setSavedStack, { loading: stackLoading }] =
+    useWorkspaceStore<string[]>("analyticsSettingsSelectedStack");
+  const [siteVisitEnabled, setSiteVisitEnabled] = useWorkspaceStore<boolean>(
+    "analyticsSettingsSiteVisitTrackingEnabled",
+  );
+  const [outboundEnabled, setOutboundEnabled] = useWorkspaceStore<boolean>(
+    "analyticsSettingsOutboundDomainTrackingEnabled",
+  );
+  const [, setConversionEnabled] = useWorkspaceStore<boolean>(
+    "analyticsSettingsConversionTrackingEnabled",
+  );
+  const [, setConnectionComplete] = useWorkspaceStore<boolean>(
+    "analyticsSettingsConnectionSetupComplete",
+  );
+
+  const persistedSitemaps = useMemo(
+    () =>
+      (siteVisitTrackingSettings?.trackedSitemaps ?? [])
+        .filter((sitemap) => sitemap?.url)
+        .map((sitemap) => ({
+          url: sitemap.url,
+          ...(sitemap.lastCrawledAt
+            ? { lastCrawledAt: sitemap.lastCrawledAt }
+            : {}),
+          ...(typeof sitemap.lastUrlCount === "number"
+            ? { lastUrlCount: sitemap.lastUrlCount }
+            : {}),
+        })),
+    [siteVisitTrackingSettings],
+  );
+
+  const defaultValues = useMemo<TrackingFormData>(
+    () => ({
+      stack: savedStack ?? [],
+      allowedHostnames: allowedHostnames ?? [],
+      publishableKey: publishableKey ?? null,
+      siteVisitTrackingEnabled: Boolean(siteVisitEnabled),
+      siteDomainSlug: siteVisitTrackingSettings?.siteDomainSlug ?? "",
+      trackedSitemaps: persistedSitemaps,
+      outboundDomainTrackingEnabled: Boolean(outboundEnabled),
+    }),
+    [
+      savedStack,
+      allowedHostnames,
+      publishableKey,
+      siteVisitEnabled,
+      siteVisitTrackingSettings?.siteDomainSlug,
+      persistedSitemaps,
+      outboundEnabled,
+    ],
+  );
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    watch,
+    setValue,
+    formState: { isDirty, isSubmitting },
+  } = useForm<TrackingFormData>({
+    defaultValues: emptyTrackingFormValues,
+  });
+
+  const loading = Boolean(workspaceLoading || stackLoading);
+
+  useEffect(() => {
+    if (loading || isDirty) {
+      return;
+    }
+
+    reset(defaultValues);
+  }, [loading, isDirty, defaultValues, reset]);
+
+  const persistedSitemapUrls = persistedSitemaps.map((sitemap) => sitemap.url);
+  const disabled = Boolean(permissionsError) || loading;
+  const selectedStack = watch("stack") ?? [];
+
+  const onSubmit = async (data: TrackingFormData) => {
+    if (!id) {
+      toast.error("Workspace is still loading. Please try again.");
+      return;
+    }
+
+    try {
+      const response = await fetch(`/api/workspaces/${id}`, {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          allowedHostnames: data.allowedHostnames,
+          publishableKey: data.publishableKey,
+          ...(flags?.analyticsSettingsSiteVisitTracking
+            ? {
+                siteVisitTrackingSettings: {
+                  trackedSitemaps: data.trackedSitemaps,
+                  siteDomainSlug: data.siteDomainSlug || null,
+                },
+              }
+            : {}),
+        }),
+      });
+
+      if (!response.ok) {
+        const { error } = await response.json();
+        toast.error(error?.message || "Failed to save settings.");
+        return;
+      }
+
+      await setSavedStack(data.stack);
+      await setSiteVisitEnabled(data.siteVisitTrackingEnabled);
+      await setOutboundEnabled(data.outboundDomainTrackingEnabled);
+
+      if (data.publishableKey) {
+        await setConversionEnabled(true);
+      }
+
+      if (data.allowedHostnames.length > 0 && data.stack.length > 0) {
+        await setConnectionComplete(true);
+      }
+
+      const existingUrls = new Set(persistedSitemapUrls);
+      const newSitemaps = data.trackedSitemaps.filter(
+        (sitemap) => !existingUrls.has(sitemap.url),
+      );
+
+      for (const sitemap of newSitemaps) {
+        const importResponse = await fetch(
+          `/api/workspaces/${id}/sitemaps/import`,
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+              sitemapUrl: sitemap.url,
+            }),
+          },
+        );
+
+        if (!importResponse.ok) {
+          try {
+            const { error } = await importResponse.json();
+            toast.error(error?.message || "Sitemap added, but crawl failed.");
+          } catch {
+            toast.error("Sitemap added, but crawl failed.");
+          }
+        }
+      }
+
+      await mutate();
+      reset(data);
+      toast.success("Tracking settings saved.");
+    } catch {
+      toast.error("Network error, please try again.");
+    }
+  };
+
+  return (
+    <SectionCard number={1} title="Configure tracking">
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <div className="divide-y divide-neutral-200">
+          <TrackingSettingsRow
+            heading="Stack"
+            description={STACK_DESCRIPTION}
+            leftExtra={
+              selectedStack.length > 0 ? (
+                <StackSelectionStatus count={selectedStack.length} />
+              ) : undefined
+            }
+            leftExtraAlign="end"
+          >
+            <Controller
+              control={control}
+              name="stack"
+              render={({ field }) => (
+                <StackPicker
+                  items={stackItems}
+                  value={field.value}
+                  onChange={field.onChange}
+                  disabled={disabled}
+                />
+              )}
+            />
+          </TrackingSettingsRow>
+
+          <TrackingSettingsRow
+            heading="Allowed hostnames"
+            description={HOSTNAMES_DESCRIPTION}
+          >
+            <Controller
+              control={control}
+              name="allowedHostnames"
+              render={({ field }) => (
+                <HostnameField
+                  hostnames={field.value}
+                  onChange={field.onChange}
+                  onSave={(allowedHostnames) =>
+                    handleSubmit((data) =>
+                      onSubmit({ ...data, allowedHostnames }),
+                    )()
+                  }
+                  disabled={disabled}
+                  disabledTooltip={disabledTooltip}
+                />
+              )}
+            />
+          </TrackingSettingsRow>
+
+          <TrackingSettingsRow
+            heading="Publishable key"
+            description={PUBLISHABLE_KEY_DESCRIPTION}
+          >
+            <Controller
+              control={control}
+              name="publishableKey"
+              render={({ field }) => (
+                <PublishableKeyField
+                  publishableKey={field.value}
+                  onChange={field.onChange}
+                  disabled={disabled}
+                  disabledTooltip={disabledTooltip}
+                />
+              )}
+            />
+          </TrackingSettingsRow>
+
+          {flags?.analyticsSettingsSiteVisitTracking && (
+            <TrackingSettingsRow
+              heading="Site visit tracking"
+              description={SITE_VISIT_DESCRIPTION}
+            >
+              <SiteVisitTrackingField
+                enabled={watch("siteVisitTrackingEnabled")}
+                onEnabledChange={(enabled) =>
+                  setValue("siteVisitTrackingEnabled", enabled, {
+                    shouldDirty: true,
+                  })
+                }
+                siteDomainSlug={watch("siteDomainSlug")}
+                onSiteDomainSlugChange={(slug) =>
+                  setValue("siteDomainSlug", slug, { shouldDirty: true })
+                }
+                sitemaps={watch("trackedSitemaps")}
+                onSitemapsChange={(sitemaps) =>
+                  setValue("trackedSitemaps", sitemaps, { shouldDirty: true })
+                }
+                persistedSitemapUrls={persistedSitemapUrls}
+                workspaceId={id}
+                onSitemapRefreshed={() => void mutate()}
+                disabled={disabled}
+                disabledTooltip={disabledTooltip}
+              />
+            </TrackingSettingsRow>
+          )}
+
+          <TrackingSettingsRow
+            heading="Outbound domain tracking"
+            description={OUTBOUND_DESCRIPTION}
+            align="center"
+          >
+            <label className="flex w-fit cursor-pointer items-center gap-2">
+              <Switch
+                checked={watch("outboundDomainTrackingEnabled")}
+                fn={(enabled) =>
+                  setValue("outboundDomainTrackingEnabled", enabled, {
+                    shouldDirty: true,
+                  })
+                }
+                disabled={disabled}
+                disabledTooltip={disabledTooltip}
+              />
+              <span className="text-content-default text-sm font-medium">
+                Enable
+              </span>
+            </label>
+          </TrackingSettingsRow>
+        </div>
+
+        <div className="flex h-16 items-center justify-end border-t border-neutral-200 bg-neutral-50 px-5 py-4">
+          <Button
+            text="Save changes"
+            className="h-8 w-fit px-3"
+            loading={isSubmitting}
+            disabled={!isDirty || loading}
+            disabledTooltip={
+              disabledTooltip || (!isDirty ? "No unsaved changes" : undefined)
+            }
+          />
+        </div>
+      </form>
+    </SectionCard>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/connection-instructions.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/connection-instructions.tsx
deleted file mode 100644
index c7c623de78b..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/connection-instructions.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-"use client";
-
-import { GuideActionButton } from "@/ui/guides/guide-action-button";
-import { GuideSelector } from "@/ui/guides/guide-selector";
-import { guides as allGuides } from "@/ui/guides/integrations";
-import { GuidesMarkdown } from "@/ui/guides/markdown";
-import { useDynamicGuide } from "./use-dynamic-guide";
-import { useSelectedGuide } from "./use-selected-guide";
-
-export function ConnectionInstructions() {
-  const guides = allGuides.filter((guide) => guide.type === "client-sdk");
-  const { selectedGuide, setSelectedGuide } = useSelectedGuide({ guides });
-
-  const { loading, guideMarkdown } = useDynamicGuide({
-    guide: selectedGuide.key,
-  });
-
-  let button: React.ReactNode;
-  let content: React.ReactNode;
-
-  if (loading) {
-    content = (
-      <div className="space-y-4">
-        <div className="h-6 w-1/2 animate-pulse rounded bg-neutral-200" />
-        <div className="h-4 w-full animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-5/6 animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-2/3 animate-pulse rounded bg-neutral-100" />
-      </div>
-    );
-    button = (
-      <div className="h-8 w-24 animate-pulse rounded-md bg-neutral-200" />
-    );
-  } else if (guideMarkdown) {
-    content = <GuidesMarkdown>{guideMarkdown}</GuidesMarkdown>;
-    button = (
-      <GuideActionButton guide={selectedGuide} markdown={guideMarkdown} />
-    );
-  } else {
-    content = (
-      <div className="text-content-subtle flex size-full items-center justify-center text-sm">
-        Failed to load guide
-      </div>
-    );
-  }
-
-  return (
-    <div className="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between p-3">
-        <GuideSelector
-          value={selectedGuide}
-          onChange={setSelectedGuide}
-          guides={guides}
-          className="-my-1 -ml-1"
-        />
-
-        {button}
-      </div>
-
-      <div className="max-w-full rounded-t-xl border-t border-neutral-200 bg-white p-5">
-        <div className="mx-auto max-w-2xl">{content}</div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/conversion-tracking-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/conversion-tracking-section.tsx
deleted file mode 100644
index c5333ce15ac..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/conversion-tracking-section.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-"use client";
-
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { LockSmall, Switch } from "@dub/ui";
-import { motion } from "motion/react";
-import { useEffect, useId } from "react";
-import { PublishableKeyForm } from "./publishable-key-form";
-
-export function ConversionTrackingSection() {
-  const id = useId();
-
-  const { role, publishableKey } = useWorkspace();
-
-  const permissionsError = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "manage conversion tracking settings",
-  }).error;
-
-  const [enabled, setEnabled, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsConversionTrackingEnabled",
-    {
-      mutateOnSet: true,
-    },
-  );
-
-  // Default to enabled if the workspace already has a publishable key
-  useEffect(() => {
-    if (publishableKey && enabled === undefined) setEnabled(true);
-  }, [publishableKey, enabled]);
-
-  return (
-    <div className="flex flex-1 flex-col rounded-lg border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between gap-4 p-3">
-        <div className="flex min-w-0 items-center gap-4">
-          <div className="overflow-hidden">
-            <label
-              htmlFor={`${id}-switch`}
-              className="text-content-emphasis block text-sm font-semibold"
-            >
-              Conversion tracking
-            </label>
-            <p className="text-content-subtle text-sm font-medium">
-              For client-side conversion tracking.{" "}
-              <a
-                href="https://dub.co/docs/conversions/quickstart"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="cursor-help text-neutral-800 underline decoration-dotted underline-offset-2"
-              >
-                Learn more
-              </a>
-              .
-            </p>
-          </div>
-        </div>
-
-        <Switch
-          disabled={loading}
-          checked={enabled || false}
-          trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20 w-7 h-4"
-          thumbDimensions="size-3"
-          thumbTranslate="translate-x-3"
-          fn={setEnabled}
-          {...(publishableKey || permissionsError
-            ? {
-                disabledTooltip:
-                  permissionsError ||
-                  "You need to revoke your current publishable key first before disabling conversion tracking.",
-                thumbIcon: (
-                  <div className="flex size-full items-center justify-center">
-                    <LockSmall className="size-[8px] text-black" />
-                  </div>
-                ),
-              }
-            : {})}
-        />
-      </div>
-
-      <motion.div
-        animate={{
-          height: enabled ? "auto" : 0,
-          overflow: "hidden",
-        }}
-        transition={{
-          duration: 0.15,
-        }}
-        initial={false}
-      >
-        <PublishableKeyForm className="border-t border-neutral-200" />
-      </motion.div>
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/empty-tracking-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/empty-tracking-card.tsx
new file mode 100644
index 00000000000..0954007702b
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/empty-tracking-card.tsx
@@ -0,0 +1,42 @@
+import { ReactNode } from "react";
+
+export const emptyTrackingActionClassName =
+  "h-8 w-fit shrink-0 gap-2 rounded-lg px-3 py-2";
+
+export function EmptyTrackingCard({
+  icon,
+  text,
+  action,
+  variant = "row",
+}: {
+  icon: ReactNode;
+  text: string;
+  action: ReactNode;
+  variant?: "row" | "stack";
+}) {
+  if (variant === "stack") {
+    return (
+      <div className="flex h-[138px] w-full flex-col items-center justify-center gap-4 rounded-xl bg-neutral-50 py-6">
+        <div className="flex flex-col items-center gap-2">
+          {icon}
+          <span className="text-content-subtle text-center text-sm font-medium leading-5 tracking-[-0.02em]">
+            {text}
+          </span>
+        </div>
+        {action}
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-16 w-full items-center justify-between gap-4 rounded-xl bg-neutral-50 py-4 pl-6 pr-4">
+      <div className="flex min-w-0 items-center gap-2">
+        {icon}
+        <span className="text-content-subtle truncate text-center text-sm font-medium leading-5 tracking-[-0.02em]">
+          {text}
+        </span>
+      </div>
+      {action}
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/guide.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/guide.tsx
deleted file mode 100644
index 8be76ba8149..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/guide.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-"use client";
-
-import { GuidesMarkdown } from "@/ui/guides/markdown";
-import { use } from "react";
-
-export default function GuideMarkdown({
-  guideMarkdown,
-}: {
-  guideMarkdown: Promise<string | null>;
-}) {
-  const guide = use(guideMarkdown);
-
-  if (!guide) {
-    return null;
-  }
-
-  return <GuidesMarkdown>{guide}</GuidesMarkdown>;
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-field.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-field.tsx
new file mode 100644
index 00000000000..f1792ccf223
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-field.tsx
@@ -0,0 +1,124 @@
+"use client";
+
+import { useConfirmModal } from "@/ui/modals/confirm-modal";
+import { Button, Globe } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { useAddHostnameModal } from "./add-hostname-modal";
+import {
+  EmptyTrackingCard,
+  emptyTrackingActionClassName,
+} from "./empty-tracking-card";
+import { HostnameMenu } from "./hostname-menu";
+
+export function HostnameField({
+  hostnames,
+  onChange,
+  onSave,
+  disabled,
+  disabledTooltip,
+}: {
+  hostnames: string[];
+  onChange: (hostnames: string[]) => void;
+  onSave?: (hostnames: string[]) => void | Promise<void>;
+  disabled?: boolean;
+  disabledTooltip?: string;
+}) {
+  const { addHostnameModal, setShowAddHostnameModal } = useAddHostnameModal({
+    existingHostnames: hostnames,
+    onAdd: async (hostname) => {
+      const nextHostnames = [...hostnames, hostname];
+      await onSave?.(nextHostnames);
+      onChange(nextHostnames);
+    },
+  });
+
+  return (
+    <>
+      <div className="flex flex-col gap-2">
+        {hostnames.length === 0 ? (
+          <EmptyTrackingCard
+            icon={<Globe className="size-[18px] shrink-0 text-neutral-600" />}
+            text="No hostnames added"
+            action={
+              <Button
+                text="Add hostname"
+                variant="secondary"
+                className={emptyTrackingActionClassName}
+                textWrapperClassName="overflow-visible"
+                onClick={() => setShowAddHostnameModal(true)}
+                disabled={disabled}
+                disabledTooltip={disabledTooltip}
+              />
+            }
+          />
+        ) : (
+          <>
+            <div className="flex flex-col gap-2">
+              {hostnames.map((hostname) => (
+                <HostnameRow
+                  key={hostname}
+                  hostname={hostname}
+                  disabled={disabled}
+                  onDelete={async () => {
+                    const nextHostnames = hostnames.filter(
+                      (item) => item !== hostname,
+                    );
+                    await onSave?.(nextHostnames);
+                    onChange(nextHostnames);
+                  }}
+                />
+              ))}
+            </div>
+            <Button
+              text="Add hostname"
+              variant="secondary"
+              className="h-8 w-fit shrink-0 px-3"
+              textWrapperClassName="overflow-visible"
+              onClick={() => setShowAddHostnameModal(true)}
+              disabled={disabled}
+              disabledTooltip={disabledTooltip}
+            />
+          </>
+        )}
+      </div>
+      {addHostnameModal}
+    </>
+  );
+}
+
+function HostnameRow({
+  hostname,
+  disabled,
+  onDelete,
+}: {
+  hostname: string;
+  disabled?: boolean;
+  onDelete: () => void | Promise<void>;
+}) {
+  const { setShowConfirmModal, confirmModal } = useConfirmModal({
+    title: "Delete hostname",
+    description: `Are you sure you want to delete "${hostname}"? This action cannot be undone.`,
+    confirmText: "Delete hostname",
+    onConfirm: onDelete,
+  });
+
+  return (
+    <div
+      className={cn(
+        "flex items-center justify-between gap-3 rounded-xl border border-neutral-200 bg-white px-3 py-2.5",
+        disabled && "opacity-50",
+      )}
+    >
+      <div className="flex min-w-0 items-center gap-2.5">
+        <div className="flex size-7 items-center justify-center rounded-md bg-neutral-100">
+          <Globe className="size-4 text-neutral-800" />
+        </div>
+        <span className="min-w-0 truncate text-sm font-medium text-neutral-800">
+          {hostname}
+        </span>
+      </div>
+      {!disabled && <HostnameMenu onDelete={() => setShowConfirmModal(true)} />}
+      {confirmModal}
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-menu.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-menu.tsx
index 2a3a1ffa64b..6d72a682984 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-menu.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-menu.tsx
@@ -1,16 +1,9 @@
 import { ThreeDots } from "@/ui/shared/icons";
-import { Button, LoadingSpinner, Popover } from "@dub/ui";
+import { Button, Popover } from "@dub/ui";
 import { Delete } from "lucide-react";
 import { useState } from "react";
 
-function HostnameMenu({
-  onDelete,
-  loading,
-}: {
-  onDelete: () => void;
-  loading: boolean;
-  permissionsError?: string;
-}) {
+export function HostnameMenu({ onDelete }: { onDelete: () => void }) {
   const [openPopover, setOpenPopover] = useState(false);
 
   return (
@@ -36,16 +29,9 @@ function HostnameMenu({
       setOpenPopover={setOpenPopover}
     >
       <Button
-        variant="plain"
-        color="secondary"
-        className="h-9 border-none p-2"
-        icon={
-          loading ? (
-            <LoadingSpinner className="size-4 shrink-0" />
-          ) : (
-            <ThreeDots className="h-5 w-5 shrink-0 rotate-90" />
-          )
-        }
+        variant="outline"
+        className="size-7 shrink-0 border-transparent p-0 outline-none transition-all duration-200 data-[state=open]:border-neutral-500"
+        icon={<ThreeDots className="size-4 shrink-0 rotate-90" />}
         onClick={() => {
           setOpenPopover(!openPopover);
         }}
@@ -53,5 +39,3 @@ function HostnameMenu({
     </Popover>
   );
 }
-
-export default HostnameMenu;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-section.tsx
deleted file mode 100644
index 84647ba1eee..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/hostname-section.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-"use client";
-
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useConfirmModal } from "@/ui/modals/confirm-modal";
-import { Button, CardList, Globe, InfoTooltip } from "@dub/ui";
-import { cn } from "@dub/utils";
-import { useState } from "react";
-import { toast } from "sonner";
-import { useAddHostnameModal } from "./add-hostname-modal";
-import HostnameMenu from "./hostname-menu";
-
-export const HostnameSection = ({ className }: { className?: string }) => {
-  const { AddHostnameModal, setShowAddHostnameModal } = useAddHostnameModal();
-  const { role, allowedHostnames, loading } = useWorkspace();
-
-  const permissionsError = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "manage allowed hostnames",
-  }).error;
-
-  let content;
-
-  if (allowedHostnames && allowedHostnames.length > 0) {
-    content = (
-      <div className="grid grid-cols-1 gap-2">
-        <CardList variant="compact" loading={loading}>
-          {allowedHostnames?.map((hostname) => (
-            <HostnameCard key={hostname} hostname={hostname} />
-          ))}
-        </CardList>
-      </div>
-    );
-  } else {
-    content = (
-      <div className="flex items-center justify-center rounded-xl border border-neutral-200 bg-neutral-100 p-3">
-        <p className="text-content-subtle text-sm font-medium">
-          No hostnames added
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className={cn("flex flex-col gap-2 p-3", className)}>
-        <div className="flex items-center justify-between">
-          <div className="flex items-center gap-1">
-            <h2 className="text-content-emphasis flex-1 text-sm font-semibold">
-              Allowed hostnames
-            </h2>
-            <InfoTooltip content="Allowlist domains that you want to allow client-side click tracking on." />
-          </div>
-
-          <Button
-            text="Add hostname"
-            className="h-7 w-fit rounded-lg px-2.5 py-1 text-sm font-medium"
-            onClick={() => setShowAddHostnameModal(true)}
-            disabledTooltip={permissionsError || undefined}
-          />
-        </div>
-
-        {content}
-      </div>
-
-      <AddHostnameModal />
-    </>
-  );
-};
-
-const HostnameCard = ({ hostname }: { hostname: string }) => {
-  const { id, allowedHostnames, mutate, role } = useWorkspace();
-  const [processing, setProcessing] = useState(false);
-
-  const { allowed: canWriteWorkspaces } = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "delete hostnames",
-  });
-
-  const handleDeleteHostname = async () => {
-    setProcessing(true);
-
-    const response = await fetch(`/api/workspaces/${id}`, {
-      method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        allowedHostnames: allowedHostnames?.filter((h) => h !== hostname),
-      }),
-    });
-
-    if (response.ok) {
-      toast.success("Hostname deleted.");
-    } else {
-      const { error } = await response.json();
-      toast.error(error.message);
-    }
-
-    mutate();
-    setProcessing(false);
-  };
-
-  const { setShowConfirmModal, confirmModal } = useConfirmModal({
-    title: "Delete Hostname",
-    description: `Are you sure you want to delete "${hostname}"? This action cannot be undone.`,
-    confirmText: "Delete Hostname",
-    onConfirm: handleDeleteHostname,
-  });
-
-  return (
-    <CardList.Card
-      key={hostname}
-      innerClassName={cn(
-        "flex items-center justify-between gap-5 sm:gap-8 md:gap-12 text-sm transition-opacity",
-        processing && "opacity-50",
-      )}
-      hoverStateEnabled={false}
-    >
-      <div className="flex min-w-0 grow items-center gap-3">
-        <div className="flex size-[28px] items-center justify-center rounded-md bg-neutral-100">
-          <Globe className="size-4 text-neutral-800" />
-        </div>
-
-        <span className="min-w-0 truncate whitespace-nowrap font-medium text-neutral-800">
-          {hostname}
-        </span>
-      </div>
-
-      <div className="flex items-center gap-5 sm:gap-8 md:gap-12">
-        {canWriteWorkspaces && (
-          <HostnameMenu
-            onDelete={() => setShowConfirmModal(true)}
-            loading={processing}
-          />
-        )}
-      </div>
-      {confirmModal}
-    </CardList.Card>
-  );
-};
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/installation-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/installation-section.tsx
new file mode 100644
index 00000000000..0e5309e6e83
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/installation-section.tsx
@@ -0,0 +1,89 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
+import { buildTrackingSetup } from "@/lib/tracking/build-tracking-setup";
+import { useEffect, useMemo, useRef } from "react";
+import { SectionCard } from "./section-card";
+import { DeveloperGuides, SetupInstructions } from "./setup-instructions";
+import { TrackingSettingsRow } from "./tracking-settings-row";
+import { VerifyInstall } from "./verify-install";
+
+const DEFAULT_STACK = ["custom"] as const;
+
+export function InstallationSection() {
+  const {
+    allowedHostnames,
+    publishableKey,
+    loading: workspaceLoading,
+  } = useWorkspace();
+  const [savedStack, setSavedStack, { loading: stackLoading }] =
+    useWorkspaceStore<string[]>("analyticsSettingsSelectedStack", {
+      mutateOnSet: true,
+    });
+  const [siteVisitEnabled] = useWorkspaceStore<boolean>(
+    "analyticsSettingsSiteVisitTrackingEnabled",
+  );
+  const [outboundEnabled] = useWorkspaceStore<boolean>(
+    "analyticsSettingsOutboundDomainTrackingEnabled",
+  );
+
+  const stack = savedStack ?? [];
+  const hostnames = allowedHostnames ?? [];
+  const ready = stack.length > 0 && hostnames.length > 0;
+  const seedingRef = useRef(false);
+
+  useEffect(() => {
+    if (workspaceLoading || stackLoading || seedingRef.current) {
+      return;
+    }
+
+    if (savedStack !== undefined || hostnames.length === 0) {
+      return;
+    }
+
+    seedingRef.current = true;
+    void setSavedStack([...DEFAULT_STACK]);
+  }, [
+    workspaceLoading,
+    stackLoading,
+    savedStack,
+    hostnames.length,
+    setSavedStack,
+  ]);
+
+  const setup = useMemo(
+    () =>
+      buildTrackingSetup({
+        stack,
+        hostnames,
+        publishableKey: publishableKey ?? null,
+        siteVisitEnabled: Boolean(siteVisitEnabled),
+        outboundEnabled: Boolean(outboundEnabled),
+      }),
+    [stack, hostnames, publishableKey, siteVisitEnabled, outboundEnabled],
+  );
+
+  return (
+    <SectionCard number={2} title="Installation and verification">
+      <div className="divide-y divide-neutral-200">
+        <TrackingSettingsRow
+          heading="Setup instructions"
+          description="Use the prompts and instructions to install Dub."
+          leftExtra={ready ? <DeveloperGuides /> : undefined}
+          leftExtraAlign="end"
+        >
+          <SetupInstructions setup={setup} ready={ready} />
+        </TrackingSettingsRow>
+
+        <TrackingSettingsRow
+          heading="Verify installation"
+          description="Select your hostname to verify the Dub installation."
+          align="center"
+        >
+          <VerifyInstall hostnames={hostnames} />
+        </TrackingSettingsRow>
+      </div>
+    </SectionCard>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/outbound-domain-tracking-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/outbound-domain-tracking-section.tsx
deleted file mode 100644
index 0b4dc9fbf52..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/outbound-domain-tracking-section.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-"use client";
-
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { LockSmall, Switch } from "@dub/ui";
-import { useId } from "react";
-
-export function OutboundDomainTrackingSection() {
-  const id = useId();
-  const { role } = useWorkspace();
-
-  const [enabled, setEnabled, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsOutboundDomainTrackingEnabled",
-    {
-      mutateOnSet: true,
-    },
-  );
-
-  const permissionsError = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "manage outbound domain tracking",
-  }).error;
-
-  return (
-    <div className="flex flex-1 flex-col rounded-lg border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between gap-4 p-3">
-        <div className="flex min-w-0 items-center gap-4">
-          <div className="overflow-hidden">
-            <label
-              htmlFor={`${id}-switch`}
-              className="text-content-emphasis block text-sm font-semibold"
-            >
-              Outbound domain tracking
-            </label>
-            <p className="text-content-subtle text-sm font-medium">
-              Track outbound clicks to your other domains.{" "}
-              <a
-                href="https://dub.co/docs/sdks/client-side/features/cross-domain-tracking#cross-domain-tracking"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="cursor-help text-neutral-800 underline decoration-dotted underline-offset-2"
-              >
-                Learn more
-              </a>
-            </p>
-          </div>
-        </div>
-
-        <Switch
-          disabled={loading}
-          {...(permissionsError
-            ? {
-                disabledTooltip: permissionsError,
-                thumbIcon: (
-                  <div className="flex size-full items-center justify-center">
-                    <LockSmall className="size-[8px] text-black" />
-                  </div>
-                ),
-              }
-            : {})}
-          checked={enabled || false}
-          trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20 w-7 h-4"
-          thumbDimensions="size-3"
-          thumbTranslate="translate-x-3"
-          fn={setEnabled}
-        />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page-client.tsx
deleted file mode 100644
index b2107d56d6a..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page-client.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-"use client";
-
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { AnimatedSizeContainer, useRouterStuff } from "@dub/ui";
-import { BaseScriptSection } from "./base-script-section";
-import { CompleteStepButton } from "./complete-step-button";
-import { ConnectionInstructions } from "./connection-instructions";
-import { ConversionTrackingSection } from "./conversion-tracking-section";
-import { OutboundDomainTrackingSection } from "./outbound-domain-tracking-section";
-import { SiteVisitTrackingSection } from "./site-visit-tracking-section";
-import Step, { BaseStepProps, type Step as StepType } from "./step";
-import { TrackLeadsGuidesSection } from "./track-lead-guides-section";
-import { TrackSalesGuidesSection } from "./track-sales-guides-section";
-
-const ConnectStep = ({
-  expanded,
-  toggleExpanded,
-  onComplete,
-}: BaseStepProps & { onComplete: () => void }) => {
-  const { flags } = useWorkspace();
-
-  const { searchParams } = useRouterStuff();
-  const guide = searchParams.get("guide");
-
-  const [complete, markComplete, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsConnectionSetupComplete",
-  );
-
-  return (
-    <Step
-      id="connect"
-      step={1}
-      title="Install the Dub client-side script"
-      subtitle="Generate and install the Dub client-side script to start tracking conversions."
-      expanded={expanded}
-      toggleExpanded={toggleExpanded}
-      complete={complete}
-    >
-      <AnimatedSizeContainer height>
-        {guide !== "shopify" && (
-          <div className="grid gap-3 pb-8">
-            <BaseScriptSection />
-
-            <ConversionTrackingSection />
-
-            {flags?.analyticsSettingsSiteVisitTracking && (
-              <SiteVisitTrackingSection />
-            )}
-
-            <OutboundDomainTrackingSection />
-          </div>
-        )}
-      </AnimatedSizeContainer>
-
-      <ConnectionInstructions />
-
-      {!complete && (
-        <div className="mt-5">
-          <CompleteStepButton
-            onClick={() => {
-              markComplete(true);
-              onComplete();
-            }}
-            loading={loading}
-          />
-        </div>
-      )}
-      {/* <VerifyInstall /> */}
-    </Step>
-  );
-};
-
-const LeadEventsStep = ({
-  expanded,
-  toggleExpanded,
-  onComplete,
-}: BaseStepProps & { onComplete: () => void }) => {
-  const [complete, markComplete, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsLeadTrackingSetupComplete",
-  );
-
-  return (
-    <Step
-      id="lead"
-      step={2}
-      title="Track lead events"
-      subtitle="For lead events from your server using our server side SDKs or the REST API"
-      expanded={expanded}
-      toggleExpanded={toggleExpanded}
-      complete={complete}
-      contentClassName="grid gap-5"
-    >
-      <TrackLeadsGuidesSection />
-
-      {!complete && (
-        <CompleteStepButton
-          onClick={() => {
-            markComplete(true);
-            onComplete();
-          }}
-          loading={loading}
-        />
-      )}
-    </Step>
-  );
-};
-
-const SaleEventsStep = ({
-  expanded,
-  toggleExpanded,
-  onComplete,
-}: BaseStepProps & { onComplete: () => void }) => {
-  const [complete, markComplete, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsSaleTrackingSetupComplete",
-  );
-
-  return (
-    <Step
-      id="sale"
-      step={3}
-      title="Track sale events"
-      subtitle="For tracking purchases using our Stripe integration or our server side SDKs"
-      expanded={expanded}
-      toggleExpanded={toggleExpanded}
-      complete={complete}
-      contentClassName="grid gap-5"
-    >
-      <TrackSalesGuidesSection />
-
-      {!complete && (
-        <CompleteStepButton
-          onClick={() => {
-            markComplete(true);
-            onComplete();
-          }}
-          loading={loading}
-        />
-      )}
-    </Step>
-  );
-};
-
-export function WorkspaceTrackingSettingsPageClient() {
-  const { searchParams, queryParams } = useRouterStuff();
-  const expandedStep = (searchParams.get("step") as StepType) || "connect";
-
-  const toggleStep = (step: StepType) => {
-    if (expandedStep === step) {
-      queryParams({
-        del: ["step", "guide"],
-      });
-    } else {
-      queryParams({
-        del: "guide",
-        set: {
-          step,
-        },
-      });
-    }
-  };
-
-  const closeStep = (step: StepType) => {
-    if (expandedStep === step) {
-      queryParams({
-        del: ["step", "guide"],
-      });
-    }
-  };
-
-  return (
-    <div className="flex flex-1 flex-col gap-8 overflow-hidden">
-      <ConnectStep
-        expanded={expandedStep === "connect"}
-        toggleExpanded={() => toggleStep("connect")}
-        onComplete={() => closeStep("connect")}
-      />
-      <LeadEventsStep
-        expanded={expandedStep === "lead"}
-        toggleExpanded={() => toggleStep("lead")}
-        onComplete={() => closeStep("lead")}
-      />
-      <SaleEventsStep
-        expanded={expandedStep === "sale"}
-        toggleExpanded={() => toggleStep("sale")}
-        onComplete={() => closeStep("sale")}
-      />
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page.tsx
index e0673e69092..e8eb48aa8f0 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/page.tsx
@@ -1,8 +1,9 @@
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
 import { Suspense } from "react";
+import { ConfigureTrackingSection } from "./configure-tracking-section";
 import { ConversionTrackingToggle } from "./conversion-tracking-toggle";
-import { WorkspaceTrackingSettingsPageClient } from "./page-client";
+import { InstallationSection } from "./installation-section";
 
 export default function WorkspaceTrackingSettingsPage() {
   return (
@@ -15,9 +16,12 @@ export default function WorkspaceTrackingSettingsPage() {
       }}
       controls={<ConversionTrackingToggle />}
     >
-      <PageWidthWrapper className="max-w-[800px] pb-20">
+      <PageWidthWrapper className="pb-20">
         <Suspense>
-          <WorkspaceTrackingSettingsPageClient />
+          <div className="flex flex-1 flex-col gap-8 overflow-hidden">
+            <ConfigureTrackingSection />
+            <InstallationSection />
+          </div>
         </Suspense>
       </PageWidthWrapper>
     </PageContent>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-field.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-field.tsx
new file mode 100644
index 00000000000..e10e811f893
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-field.tsx
@@ -0,0 +1,111 @@
+"use client";
+
+import { useConfirmModal } from "@/ui/modals/confirm-modal";
+import { Button, Copy, Key, Tick, Tooltip, useCopyToClipboard } from "@dub/ui";
+import { nanoid } from "@dub/utils";
+import {
+  EmptyTrackingCard,
+  emptyTrackingActionClassName,
+} from "./empty-tracking-card";
+import { PublishableKeyMenu } from "./publishable-key-menu";
+
+export function PublishableKeyField({
+  publishableKey,
+  onChange,
+  disabled,
+  disabledTooltip,
+}: {
+  publishableKey: string | null;
+  onChange: (publishableKey: string | null) => void;
+  disabled?: boolean;
+  disabledTooltip?: string;
+}) {
+  const [copied, copyToClipboard] = useCopyToClipboard();
+
+  const generateKey = () => `dub_pk_${nanoid(24)}`;
+
+  const {
+    setShowConfirmModal: setShowGenerateModal,
+    confirmModal: generateModal,
+  } = useConfirmModal({
+    title: "Generate New Publishable Key",
+    description: publishableKey
+      ? "Are you sure you want to generate a new publishable key? This will invalidate the existing key after you save."
+      : "This key will provide access to your workspace's conversion tracking endpoints.",
+    confirmText: "Generate Key",
+    onConfirm: () => onChange(generateKey()),
+  });
+
+  const { setShowConfirmModal: setShowRevokeModal, confirmModal: revokeModal } =
+    useConfirmModal({
+      title: "Revoke Publishable Key",
+      description:
+        "Are you sure you want to revoke the publishable key? This action cannot be undone after you save.",
+      confirmText: "Revoke Key",
+      onConfirm: () => onChange(null),
+    });
+
+  return (
+    <>
+      {publishableKey ? (
+        <div className="flex items-center justify-between gap-3 rounded-xl border border-neutral-200 bg-white px-3 py-2.5">
+          <div className="flex min-w-0 items-center gap-2.5">
+            <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+              <Key className="size-4 text-neutral-800" />
+            </div>
+            <code className="min-w-0 truncate font-mono text-sm text-neutral-800">
+              {publishableKey}
+            </code>
+          </div>
+          <div className="flex shrink-0 items-center gap-2">
+            <Tooltip content={copied ? "Key copied" : "Copy key"}>
+              <button
+                type="button"
+                onClick={() => copyToClipboard(publishableKey)}
+                className="flex size-7 shrink-0 items-center justify-center rounded-lg border border-neutral-200 p-0 transition-colors duration-150 hover:bg-neutral-50 [&_svg]:size-3.5"
+              >
+                <span className="sr-only">Copy key</span>
+                {copied ? (
+                  <Tick className="text-neutral-800" />
+                ) : (
+                  <Copy className="text-neutral-800" />
+                )}
+              </button>
+            </Tooltip>
+            <Button
+              text="Regenerate"
+              variant="secondary"
+              onClick={() => setShowGenerateModal(true)}
+              disabled={disabled}
+              disabledTooltip={disabledTooltip}
+              className="h-7 w-fit shrink-0 px-2.5"
+              textWrapperClassName="overflow-visible"
+            />
+            <PublishableKeyMenu
+              onRevoke={() => setShowRevokeModal(true)}
+              disabled={disabled}
+              disabledTooltip={disabledTooltip}
+            />
+          </div>
+        </div>
+      ) : (
+        <EmptyTrackingCard
+          icon={<Key className="size-[18px] shrink-0 text-neutral-600" />}
+          text="No publishable key generated"
+          action={
+            <Button
+              text="Generate key"
+              className={emptyTrackingActionClassName}
+              textWrapperClassName="overflow-visible"
+              onClick={() => setShowGenerateModal(true)}
+              disabled={disabled}
+              disabledTooltip={disabledTooltip}
+            />
+          }
+        />
+      )}
+      {generateModal}
+      {revokeModal}
+    </>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-form.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-form.tsx
deleted file mode 100644
index e03c7d8f3b4..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-form.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-"use client";
-
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useConfirmModal } from "@/ui/modals/confirm-modal";
-import { Button, CopyButton, InfoTooltip, Key } from "@dub/ui";
-import { cn, nanoid } from "@dub/utils";
-import { useState } from "react";
-import { toast } from "sonner";
-import PublishableKeyMenu from "./publishable-key-menu";
-
-export const PublishableKeyForm = ({ className }: { className?: string }) => {
-  const { id, publishableKey, mutate, role } = useWorkspace();
-  const [processing, setProcessing] = useState(false);
-
-  const { error: permissionsError } = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "manage publishable keys",
-  });
-
-  const handleGenerateKey = async () => {
-    setProcessing(true);
-
-    const newPublishableKey = `dub_pk_${nanoid(24)}`;
-
-    const response = await fetch(`/api/workspaces/${id}`, {
-      method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        publishableKey: newPublishableKey,
-      }),
-    });
-
-    if (response.ok) {
-      toast.success("Publishable key generated successfully.");
-    } else {
-      const { error } = await response.json();
-      toast.error(error.message);
-    }
-
-    mutate();
-    setProcessing(false);
-  };
-
-  const handleRevokeKey = async () => {
-    setProcessing(true);
-
-    const response = await fetch(`/api/workspaces/${id}`, {
-      method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        publishableKey: null,
-      }),
-    });
-
-    if (response.ok) {
-      toast.success("Publishable key revoked successfully.");
-    } else {
-      const { error } = await response.json();
-      toast.error(error.message);
-    }
-
-    mutate();
-    setProcessing(false);
-  };
-
-  const {
-    setShowConfirmModal: setShowGenerateModal,
-    confirmModal: generateModal,
-  } = useConfirmModal({
-    title: "Generate New Publishable Key",
-    description: `Are you sure you want to generate a new publishable key? ${publishableKey ? "This will invalidate the existing key." : "This key will provide access to your workspace's conversion tracking endpoints."}`,
-    confirmText: "Generate Key",
-    onConfirm: handleGenerateKey,
-  });
-
-  const { setShowConfirmModal: setShowRevokeModal, confirmModal: revokeModal } =
-    useConfirmModal({
-      title: "Revoke Publishable Key",
-      description:
-        "Are you sure you want to revoke the publishable key? This action cannot be undone.",
-      confirmText: "Revoke Key",
-      onConfirm: handleRevokeKey,
-    });
-
-  return (
-    <div className={cn("flex flex-col gap-2 p-3", className)}>
-      <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
-        <div className="flex items-center gap-1">
-          <h2 className="text-content-emphasis flex-1 text-sm font-semibold">
-            Publishable key
-          </h2>
-          <InfoTooltip content="For authenticating requests when tracking conversion events on the client-side. [Learn more.](https://dub.co/docs/api-reference/publishable-keys)" />
-        </div>
-
-        {!publishableKey && (
-          <Button
-            text="Generate"
-            className="h-7 w-fit rounded-lg px-2.5 py-1 text-sm font-medium"
-            onClick={() => setShowGenerateModal(true)}
-            loading={processing}
-            disabledTooltip={permissionsError || undefined}
-          />
-        )}
-      </div>
-
-      {publishableKey ? (
-        <div className="flex flex-col gap-3 rounded-xl border border-neutral-200 bg-white p-3 sm:flex-row sm:items-center sm:justify-between sm:gap-2">
-          <div className="flex min-w-0 items-center gap-2">
-            <div className="flex min-w-0 items-center gap-4">
-              <div className="flex size-[28px] items-center justify-center rounded-md bg-neutral-100">
-                <Key className="size-4 text-neutral-800" />
-              </div>
-              <code className="min-w-0 flex-1 truncate font-mono text-sm text-neutral-800">
-                {publishableKey}
-              </code>
-            </div>
-            <CopyButton value={publishableKey} className="shrink-0" />
-          </div>
-          <div className="flex w-fit items-center gap-2 sm:shrink-0">
-            <Button
-              text="Regenerate"
-              variant="secondary"
-              onClick={() => setShowGenerateModal(true)}
-              loading={processing}
-              disabledTooltip={permissionsError || undefined}
-              className="h-7 w-fit flex-1 px-2 text-xs sm:flex-none"
-            />
-            <PublishableKeyMenu
-              onRevoke={() => setShowRevokeModal(true)}
-              loading={processing}
-            />
-          </div>
-        </div>
-      ) : (
-        <div className="flex items-center justify-center rounded-xl border border-neutral-200 bg-neutral-100 p-3">
-          <p className="text-content-subtle text-sm font-medium">
-            No publishable key created
-          </p>
-        </div>
-      )}
-      {generateModal}
-      {revokeModal}
-    </div>
-  );
-};
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-menu.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-menu.tsx
index d4937efceed..961d45e838f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-menu.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/publishable-key-menu.tsx
@@ -3,13 +3,14 @@ import { Button, Popover } from "@dub/ui";
 import { Delete } from "lucide-react";
 import { useState } from "react";
 
-function PublishableKeyMenu({
+export function PublishableKeyMenu({
   onRevoke,
-  loading,
+  disabled,
+  disabledTooltip,
 }: {
   onRevoke: () => void;
-  loading: boolean;
-  permissionsError?: string;
+  disabled?: boolean;
+  disabledTooltip?: string;
 }) {
   const [openPopover, setOpenPopover] = useState(false);
 
@@ -27,7 +28,8 @@ function PublishableKeyMenu({
               }}
               icon={<Delete className="h-4 w-4" />}
               className="h-9 justify-start px-2 font-medium"
-              loading={loading}
+              disabled={disabled}
+              disabledTooltip={disabledTooltip}
             />
           </div>
         </div>
@@ -37,10 +39,11 @@ function PublishableKeyMenu({
       setOpenPopover={setOpenPopover}
     >
       <Button
-        variant="plain"
-        color="secondary"
-        className="h-9 border-none p-2"
-        icon={<ThreeDots className="h-5 w-5 shrink-0 rotate-90" />}
+        variant="outline"
+        className="size-7 shrink-0 border-transparent p-0 outline-none transition-all duration-200 data-[state=open]:border-neutral-500"
+        icon={<ThreeDots className="size-4 shrink-0 rotate-90" />}
+        disabled={disabled}
+        disabledTooltip={disabledTooltip}
         onClick={() => {
           setOpenPopover(!openPopover);
         }}
@@ -48,5 +51,3 @@ function PublishableKeyMenu({
     </Popover>
   );
 }
-
-export default PublishableKeyMenu;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/section-card.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/section-card.tsx
new file mode 100644
index 00000000000..3bca8a1dc00
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/section-card.tsx
@@ -0,0 +1,25 @@
+import { PropsWithChildren, ReactNode } from "react";
+
+export function SectionCard({
+  number,
+  title,
+  children,
+}: PropsWithChildren<{
+  number: number;
+  title: string;
+  children?: ReactNode;
+}>) {
+  return (
+    <div className="overflow-hidden rounded-xl border border-neutral-200 bg-white">
+      <div className="flex items-center gap-3 p-6">
+        <div className="text-content-emphasis flex size-7 shrink-0 items-center justify-center rounded-full bg-neutral-100 text-sm font-semibold">
+          {number}
+        </div>
+        <h2 className="text-content-emphasis text-lg font-semibold leading-7 tracking-[-0.02em]">
+          {title}
+        </h2>
+      </div>
+      <div className="border-t border-neutral-200">{children}</div>
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/setup-instructions.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/setup-instructions.tsx
new file mode 100644
index 00000000000..c37c20ae5c1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/setup-instructions.tsx
@@ -0,0 +1,274 @@
+"use client";
+
+import {
+  TrackingSetup,
+  TrackingSetupStep,
+} from "@/lib/tracking/build-tracking-setup";
+import {
+  AnimatedSizeContainer,
+  BookOpen,
+  Button,
+  CopyButton,
+  Tooltip,
+} from "@dub/ui";
+import {
+  ChatGPTIcon,
+  ChatTask,
+  Claude,
+  Cursor,
+  Grok,
+  Layers3,
+} from "@dub/ui/icons";
+import { cn } from "@dub/utils";
+import { useReducedMotion } from "motion/react";
+import Link from "next/link";
+import { useState } from "react";
+
+const OPEN_IN_APPS = [
+  {
+    id: "claude",
+    name: "Claude",
+    icon: Claude,
+    href: (prompt: string) =>
+      `https://claude.ai/new?q=${encodeURIComponent(prompt)}`,
+  },
+  {
+    id: "chatgpt",
+    name: "ChatGPT",
+    icon: ChatGPTIcon,
+    href: (prompt: string) =>
+      `https://chatgpt.com/?hints=search&q=${encodeURIComponent(prompt)}`,
+  },
+  {
+    id: "cursor",
+    name: "Cursor",
+    icon: Cursor,
+    href: (prompt: string) =>
+      `https://cursor.com/link/prompt?text=${encodeURIComponent(prompt)}`,
+  },
+  {
+    id: "grok",
+    name: "Grok",
+    icon: Grok,
+    href: (prompt: string) =>
+      `https://grok.com/?q=${encodeURIComponent(prompt)}`,
+  },
+] as const;
+
+function OpenInApps({ prompt }: { prompt: string }) {
+  return (
+    <div className="flex items-center gap-2">
+      <span className="text-xs font-medium leading-4 tracking-[-0.02em] text-neutral-500">
+        Open in
+      </span>
+      <div className="flex items-center">
+        {OPEN_IN_APPS.map((app) => {
+          const Icon = app.icon;
+
+          return (
+            <Tooltip key={app.id} content={`Open in ${app.name}`}>
+              <button
+                type="button"
+                aria-label={`Open in ${app.name}`}
+                onClick={() =>
+                  window.open(app.href(prompt), "_blank", "noopener,noreferrer")
+                }
+                className={cn(
+                  "flex size-6 items-center justify-center rounded-lg text-neutral-900",
+                  "transition-[transform,background-color] duration-150 ease-out",
+                  "hover:bg-neutral-100 active:scale-[0.97]",
+                  "motion-reduce:transition-none motion-reduce:active:scale-100",
+                )}
+              >
+                <Icon className="size-3.5" />
+              </button>
+            </Tooltip>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+function StepIcon({ step }: { step: TrackingSetupStep }) {
+  if (!step.icon) {
+    return <BookOpen className="size-5 shrink-0 text-neutral-800" />;
+  }
+
+  const Icon = step.icon;
+
+  if (step.iconProps?.fullSize) {
+    return (
+      <Icon
+        className="size-5 shrink-0 overflow-hidden rounded"
+        width="auto"
+        height="100%"
+      />
+    );
+  }
+
+  return <Icon className="size-5 shrink-0" />;
+}
+
+const GENERAL_GUIDES = [
+  { title: "Dub docs", href: "https://dub.co/docs" },
+  {
+    title: "Conversion tracking guide",
+    href: "https://dub.co/docs/conversions/quickstart",
+  },
+  {
+    title: "API reference",
+    href: "https://dub.co/docs/api-reference/introduction",
+  },
+] as const;
+
+export function DeveloperGuides() {
+  return (
+    <div className="flex flex-col gap-1.5">
+      <h4 className="text-xs font-semibold leading-4 tracking-[-0.02em] text-neutral-600">
+        Read developer guides
+      </h4>
+      <div className="flex flex-col gap-1.5">
+        {GENERAL_GUIDES.map((guide) => (
+          <Link
+            key={guide.href}
+            href={guide.href}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="flex w-fit items-center gap-1.5 text-xs font-medium leading-4 tracking-[-0.02em] text-neutral-500 transition-colors duration-150 hover:text-neutral-700"
+          >
+            <BookOpen className="size-3.5 shrink-0" />
+            {guide.title} ↗
+          </Link>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+export function SetupInstructions({
+  setup,
+  ready,
+}: {
+  setup: TrackingSetup;
+  ready: boolean;
+}) {
+  if (!ready) {
+    return (
+      <div className="flex h-[114px] w-full flex-col items-center justify-center gap-2 rounded-xl bg-neutral-50 py-6">
+        <Layers3 className="size-[18px] shrink-0 text-neutral-500" />
+        <p className="text-center text-sm font-medium leading-5 tracking-[-0.02em] text-neutral-500">
+          Save your changes after selecting your stack, and adding your
+          hostnames to generate install instructions
+        </p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-3">
+      <MainPromptCard prompt={setup.prompt} />
+
+      {setup.steps.length > 0 && (
+        <div className="flex flex-col gap-2">
+          {setup.steps.map((step) => (
+            <div
+              key={`${step.type}-${step.guideKey ?? step.url}`}
+              className="flex h-[52px] w-full items-center justify-between gap-3 rounded-[10px] bg-neutral-50 p-3"
+            >
+              <div className="flex min-w-0 items-center gap-2.5">
+                <StepIcon step={step} />
+                <span className="truncate text-sm font-medium text-neutral-800">
+                  {step.label}
+                </span>
+              </div>
+              <Button
+                text="Read install guide"
+                variant="secondary"
+                className="h-8 w-fit shrink-0 px-2.5"
+                onClick={() =>
+                  window.open(step.url, "_blank", "noopener,noreferrer")
+                }
+              />
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+function MainPromptCard({ prompt }: { prompt: string }) {
+  const [expanded, setExpanded] = useState(false);
+  const shouldReduceMotion = useReducedMotion();
+
+  return (
+    <div className="flex flex-col gap-3">
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex items-center gap-2">
+          <ChatTask className="size-5 shrink-0 text-neutral-800" />
+          <h4 className="text-sm font-semibold leading-5 tracking-[-0.02em] text-neutral-800">
+            Main prompt
+          </h4>
+        </div>
+        <OpenInApps prompt={prompt} />
+      </div>
+
+      <div className="relative overflow-hidden rounded-xl border border-neutral-200 bg-white">
+        <CopyButton
+          value={prompt}
+          className="absolute right-3 top-3 z-10 flex size-6 items-center justify-center rounded-lg border border-neutral-200 p-0 hover:bg-neutral-50 [&_svg]:size-3.5"
+          successMessage="Prompt copied to clipboard"
+        />
+
+        <AnimatedSizeContainer
+          height
+          transition={
+            shouldReduceMotion
+              ? { duration: 0 }
+              : { duration: 0.18, ease: [0.23, 1, 0.32, 1] }
+          }
+        >
+          <div className="relative">
+            <div
+              className={cn(
+                "p-4",
+                !expanded && "max-h-[200px] overflow-hidden",
+              )}
+            >
+              <p className="whitespace-pre-wrap pr-8 font-mono text-[13px] leading-6 text-neutral-800">
+                {prompt}
+              </p>
+            </div>
+
+            {expanded ? (
+              <div className="flex justify-center px-4 pb-4">
+                <Button
+                  text="Show less"
+                  variant="secondary"
+                  className="h-8 w-fit px-2.5"
+                  onClick={() => setExpanded(false)}
+                />
+              </div>
+            ) : (
+              <div
+                className="pointer-events-none absolute inset-x-0 bottom-0 flex h-[107px] items-end justify-center pb-4"
+                style={{
+                  background:
+                    "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #FFFFFF 100%)",
+                }}
+              >
+                <Button
+                  text="View all"
+                  variant="secondary"
+                  className="pointer-events-auto h-8 w-fit px-2.5"
+                  onClick={() => setExpanded(true)}
+                />
+              </div>
+            )}
+          </div>
+        </AnimatedSizeContainer>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-field.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-field.tsx
new file mode 100644
index 00000000000..117c1819ed1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-field.tsx
@@ -0,0 +1,341 @@
+"use client";
+
+import { MAX_TRACKED_SITEMAPS_PER_WORKSPACE } from "@/lib/zod/schemas/site-visit-tracking";
+import { DomainSelector } from "@/ui/domains/domain-selector";
+import { ThreeDots } from "@/ui/shared/icons";
+import {
+  AnimatedSizeContainer,
+  Button,
+  InfoTooltip,
+  LoadingSpinner,
+  Popover,
+  Sitemap,
+  Switch,
+} from "@dub/ui";
+import { Trash } from "@dub/ui/icons";
+import { cn, formatDate } from "@dub/utils";
+import { RefreshCw } from "lucide-react";
+import { useReducedMotion } from "motion/react";
+import { useState } from "react";
+import { toast } from "sonner";
+import { useAddSitemapModal } from "./add-sitemap-modal";
+import { EmptyTrackingCard } from "./empty-tracking-card";
+
+export type TrackedSitemapDraft = {
+  url: string;
+  lastCrawledAt?: string;
+  lastUrlCount?: number;
+};
+
+export function SiteVisitTrackingField({
+  enabled,
+  onEnabledChange,
+  siteDomainSlug,
+  onSiteDomainSlugChange,
+  sitemaps,
+  onSitemapsChange,
+  persistedSitemapUrls,
+  workspaceId,
+  onSitemapRefreshed,
+  disabled,
+  disabledTooltip,
+}: {
+  enabled: boolean;
+  onEnabledChange: (enabled: boolean) => void;
+  siteDomainSlug: string;
+  onSiteDomainSlugChange: (slug: string) => void;
+  sitemaps: TrackedSitemapDraft[];
+  onSitemapsChange: (sitemaps: TrackedSitemapDraft[]) => void;
+  persistedSitemapUrls: string[];
+  workspaceId?: string;
+  onSitemapRefreshed?: () => void;
+  disabled?: boolean;
+  disabledTooltip?: string;
+}) {
+  const shouldReduceMotion = useReducedMotion();
+  const [shouldAnimateHeight, setShouldAnimateHeight] = useState(false);
+  const [refreshingSitemapUrl, setRefreshingSitemapUrl] = useState<
+    string | null
+  >(null);
+
+  const addSitemap = (normalizedSitemapUrl: string) => {
+    if (disabled) {
+      return;
+    }
+
+    if (!siteDomainSlug) {
+      toast.error("Choose a domain for sitemap imports before adding sources.");
+      return;
+    }
+
+    if (sitemaps.some((sitemap) => sitemap.url === normalizedSitemapUrl)) {
+      toast.error("Sitemap already exists.");
+      return;
+    }
+
+    if (sitemaps.length >= MAX_TRACKED_SITEMAPS_PER_WORKSPACE) {
+      toast.error(
+        `You can track up to ${MAX_TRACKED_SITEMAPS_PER_WORKSPACE} sitemaps per workspace.`,
+      );
+      return;
+    }
+
+    onSitemapsChange([
+      ...sitemaps,
+      {
+        url: normalizedSitemapUrl,
+      },
+    ]);
+  };
+
+  const { AddSitemapModal, setShowAddSitemapModal } = useAddSitemapModal({
+    existingUrls: sitemaps.map((sitemap) => sitemap.url),
+    onAdd: addSitemap,
+  });
+
+  const refreshSitemap = async (sitemapUrl: string) => {
+    if (!workspaceId) {
+      toast.error("Workspace is still loading. Please try again.");
+      return;
+    }
+
+    setRefreshingSitemapUrl(sitemapUrl);
+
+    try {
+      const response = await fetch(
+        `/api/workspaces/${workspaceId}/sitemaps/import`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            sitemapUrl,
+          }),
+        },
+      );
+
+      if (response.ok) {
+        toast.success("Sitemap refreshed.");
+        onSitemapRefreshed?.();
+      } else {
+        const { error } = await response.json();
+        toast.error(error?.message || "Failed to refresh sitemap.");
+      }
+    } catch {
+      toast.error("Network error, please try again.");
+    } finally {
+      setRefreshingSitemapUrl(null);
+    }
+  };
+
+  const addSitemapDisabledReason = disabledTooltip
+    ? disabledTooltip
+    : !siteDomainSlug
+      ? "Choose a domain for imports first"
+      : sitemaps.length >= MAX_TRACKED_SITEMAPS_PER_WORKSPACE
+        ? `Maximum ${MAX_TRACKED_SITEMAPS_PER_WORKSPACE} sitemaps per workspace`
+        : undefined;
+
+  return (
+    <>
+      <div className="flex flex-col">
+        <label className="flex w-fit cursor-pointer items-center gap-2">
+          <Switch
+            checked={enabled}
+            fn={(next) => {
+              setShouldAnimateHeight(true);
+              onEnabledChange(next);
+            }}
+            disabled={disabled}
+            disabledTooltip={disabledTooltip}
+          />
+          <span className="text-content-default text-sm font-medium">
+            Enable
+          </span>
+        </label>
+
+        <AnimatedSizeContainer
+          height
+          transition={
+            shouldReduceMotion || !shouldAnimateHeight
+              ? { duration: 0 }
+              : { duration: 0.18, ease: [0.23, 1, 0.32, 1] }
+          }
+        >
+          {enabled && (
+            <div className="flex flex-col gap-4 pt-4">
+              <div className="flex flex-col gap-2">
+                <label className="text-content-emphasis text-sm font-semibold">
+                  Domain for sitemap imports
+                </label>
+                <DomainSelector
+                  selectedDomain={siteDomainSlug}
+                  setSelectedDomain={onSiteDomainSlugChange}
+                  disabled={disabled}
+                  disabledTooltip={disabledTooltip}
+                />
+                <p className="text-content-subtle text-xs font-medium">
+                  This domain will be used for links we create when importing
+                  pages from the sitemaps you add.
+                </p>
+              </div>
+
+              <div className="flex flex-col gap-2">
+                <h4 className="text-content-emphasis flex items-center gap-1 text-sm font-semibold">
+                  Sitemaps
+                  <InfoTooltip content="Add sitemap URLs we should crawl to create links for site visit tracking." />
+                </h4>
+
+                {sitemaps.length === 0 ? (
+                  <EmptyTrackingCard
+                    variant="stack"
+                    icon={<Sitemap className="size-[18px] text-neutral-500" />}
+                    text="No site maps added"
+                    action={
+                      <Button
+                        text="Add sitemap"
+                        variant="secondary"
+                        className="h-8 w-fit px-2.5 active:scale-[0.97]"
+                        onClick={() => setShowAddSitemapModal(true)}
+                        disabled={disabled || Boolean(addSitemapDisabledReason)}
+                        disabledTooltip={addSitemapDisabledReason}
+                      />
+                    }
+                  />
+                ) : (
+                  <>
+                    <div className="flex flex-col gap-2">
+                      {sitemaps.map((sitemap) => (
+                        <div
+                          key={sitemap.url}
+                          className="flex items-center justify-between gap-4 rounded-xl border border-neutral-200 bg-white p-3"
+                        >
+                          <div className="flex min-w-0 items-center gap-2">
+                            <div className="flex size-7 items-center justify-center rounded-md bg-neutral-100">
+                              <Sitemap className="size-4 text-neutral-800" />
+                            </div>
+                            <div className="flex min-w-0 flex-col">
+                              <span className="text-content-emphasis min-w-0 truncate text-sm font-semibold">
+                                {sitemap.url.replace(/^https?:\/\//, "")}
+                              </span>
+                              <span className="text-content-subtle text-xs font-medium">
+                                {sitemap.lastCrawledAt
+                                  ? `Last crawled ${formatDate(sitemap.lastCrawledAt, { month: "short" })}`
+                                  : "Not crawled yet"}
+                                {typeof sitemap.lastUrlCount === "number"
+                                  ? ` • ${sitemap.lastUrlCount} URLs found`
+                                  : ""}
+                              </span>
+                            </div>
+                          </div>
+                          {!disabled && (
+                            <SitemapRowMenu
+                              canRefresh={persistedSitemapUrls.includes(
+                                sitemap.url,
+                              )}
+                              onRefresh={() => refreshSitemap(sitemap.url)}
+                              onDelete={() =>
+                                onSitemapsChange(
+                                  sitemaps.filter(
+                                    (item) => item.url !== sitemap.url,
+                                  ),
+                                )
+                              }
+                              loading={refreshingSitemapUrl === sitemap.url}
+                            />
+                          )}
+                        </div>
+                      ))}
+                    </div>
+
+                    <Button
+                      text="Add sitemap"
+                      variant="secondary"
+                      className="h-8 w-fit px-2.5 active:scale-[0.97]"
+                      onClick={() => setShowAddSitemapModal(true)}
+                      disabled={disabled || Boolean(addSitemapDisabledReason)}
+                      disabledTooltip={addSitemapDisabledReason}
+                    />
+                  </>
+                )}
+              </div>
+            </div>
+          )}
+        </AnimatedSizeContainer>
+      </div>
+      <AddSitemapModal />
+    </>
+  );
+}
+
+function SitemapRowMenu({
+  canRefresh,
+  onRefresh,
+  onDelete,
+  loading,
+}: {
+  canRefresh: boolean;
+  onRefresh: () => void;
+  onDelete: () => void;
+  loading: boolean;
+}) {
+  const [openPopover, setOpenPopover] = useState(false);
+
+  return (
+    <Popover
+      content={
+        <div className="w-full sm:w-48">
+          {canRefresh && (
+            <>
+              <div className="grid gap-px p-2">
+                <Button
+                  text="Refresh source"
+                  variant="outline"
+                  onClick={() => {
+                    setOpenPopover(false);
+                    onRefresh();
+                  }}
+                  icon={<RefreshCw className="h-4 w-4" />}
+                  className="h-9 justify-start px-2 font-medium"
+                />
+              </div>
+              <div className="border-t border-neutral-200" />
+            </>
+          )}
+          <div className="grid gap-px p-2">
+            <Button
+              text="Delete source"
+              variant="danger-outline"
+              onClick={() => {
+                setOpenPopover(false);
+                onDelete();
+              }}
+              icon={<Trash className="size-4" />}
+              className="h-9 justify-start px-2 font-medium"
+            />
+          </div>
+        </div>
+      }
+      align="end"
+      openPopover={openPopover}
+      setOpenPopover={setOpenPopover}
+    >
+      <Button
+        variant="outline"
+        className={cn(
+          "size-7 shrink-0 p-0 outline-none transition-all duration-200",
+          "border-transparent data-[state=open]:border-neutral-500",
+        )}
+        icon={
+          loading ? (
+            <LoadingSpinner className="size-3 shrink-0" />
+          ) : (
+            <ThreeDots className="size-4 shrink-0 rotate-90" />
+          )
+        }
+        onClick={() => setOpenPopover(!openPopover)}
+      />
+    </Popover>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-section.tsx
deleted file mode 100644
index 8165265ee13..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/site-visit-tracking-section.tsx
+++ /dev/null
@@ -1,566 +0,0 @@
-"use client";
-
-import { clientAccessCheck } from "@/lib/client-access-check";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { MAX_TRACKED_SITEMAPS_PER_WORKSPACE } from "@/lib/zod/schemas/site-visit-tracking";
-import { DomainSelector } from "@/ui/domains/domain-selector";
-import { ThreeDots } from "@/ui/shared/icons";
-import {
-  Button,
-  InfoTooltip,
-  LoadingSpinner,
-  LockSmall,
-  Popover,
-  Sitemap,
-  Switch,
-} from "@dub/ui";
-import { Trash } from "@dub/ui/icons";
-import { cn, formatDate } from "@dub/utils";
-import { RefreshCw } from "lucide-react";
-import { motion } from "motion/react";
-import { useId, useState } from "react";
-import { toast } from "sonner";
-
-export function SiteVisitTrackingSection() {
-  const switchId = useId();
-  const workspace = useWorkspace();
-  const { role, id, mutate } = workspace;
-  const siteVisitTrackingSettings = workspace.siteVisitTrackingSettings;
-  const trackedSitemaps = siteVisitTrackingSettings?.trackedSitemaps;
-  const siteDomainSlug = siteVisitTrackingSettings?.siteDomainSlug ?? "";
-  const [newSitemapUrl, setNewSitemapUrl] = useState("");
-  const [addingSitemap, setAddingSitemap] = useState(false);
-  const [refreshingSitemapUrl, setRefreshingSitemapUrl] = useState<
-    string | null
-  >(null);
-  const [deletingSitemapUrl, setDeletingSitemapUrl] = useState<string | null>(
-    null,
-  );
-
-  const [enabled, setEnabled, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsSiteVisitTrackingEnabled",
-    {
-      mutateOnSet: true,
-    },
-  );
-  const siteVisitTrackingEnabled = Boolean(enabled);
-
-  const permissionsError = clientAccessCheck({
-    action: "workspaces.write",
-    role,
-    customPermissionDescription: "manage site visit tracking",
-  }).error;
-
-  const trackedSitemapRows = Array.isArray(trackedSitemaps)
-    ? trackedSitemaps
-        .map((sitemap) => {
-          if (!sitemap?.url) {
-            return null;
-          }
-
-          return {
-            url: sitemap.url,
-            lastCrawledAt: sitemap.lastCrawledAt
-              ? new Date(sitemap.lastCrawledAt)
-              : null,
-            lastUrlCount:
-              typeof sitemap.lastUrlCount === "number"
-                ? sitemap.lastUrlCount
-                : null,
-          };
-        })
-        .filter(
-          (
-            sitemap,
-          ): sitemap is {
-            url: string;
-            lastCrawledAt: Date | null;
-            lastUrlCount: number | null;
-          } => Boolean(sitemap),
-        )
-    : [];
-
-  const sitemaps = siteVisitTrackingEnabled
-    ? trackedSitemapRows
-    : [
-        {
-          url: "dub.co/sitemap.xml",
-          lastCrawledAt: new Date(),
-          lastUrlCount: null,
-        },
-      ];
-
-  const serializeSitemaps = (
-    input: {
-      url: string;
-      lastCrawledAt: Date | null;
-      lastUrlCount: number | null;
-    }[],
-  ) =>
-    input.map((sitemap) => ({
-      url: sitemap.url,
-      ...(sitemap.lastCrawledAt
-        ? { lastCrawledAt: sitemap.lastCrawledAt.toISOString() }
-        : {}),
-      ...(typeof sitemap.lastUrlCount === "number"
-        ? { lastUrlCount: sitemap.lastUrlCount }
-        : {}),
-    }));
-
-  const normalizeSitemapUrl = (value: string) => {
-    const trimmed = value.trim();
-    if (!trimmed) {
-      return null;
-    }
-
-    const withProtocol =
-      trimmed.startsWith("http://") || trimmed.startsWith("https://")
-        ? trimmed
-        : `https://${trimmed}`;
-
-    try {
-      return new URL(withProtocol).toString();
-    } catch {
-      return null;
-    }
-  };
-
-  const persistSiteVisitTrackingSettings = async (payload: {
-    trackedSitemaps: {
-      url: string;
-      lastCrawledAt?: string;
-      lastUrlCount?: number;
-    }[];
-    siteDomainSlug?: string | null;
-  }) => {
-    if (!id) {
-      toast.error("Workspace is still loading. Please try again.");
-      return false;
-    }
-
-    const response = await fetch(`/api/workspaces/${id}`, {
-      method: "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        siteVisitTrackingSettings: payload,
-      }),
-    });
-
-    if (!response.ok) {
-      const { error } = await response.json();
-      toast.error(error?.message || "Failed to save settings.");
-      return false;
-    }
-
-    await mutate();
-    return true;
-  };
-
-  const setSiteDomainSlug = async (slug: string) => {
-    if (permissionsError) {
-      toast.error(permissionsError);
-      return;
-    }
-
-    const ok = await persistSiteVisitTrackingSettings({
-      trackedSitemaps: serializeSitemaps(trackedSitemapRows),
-      siteDomainSlug: slug ? slug : null,
-    });
-
-    if (ok) {
-      toast.success(slug ? "Domain saved." : "Domain cleared.");
-    }
-  };
-
-  const addSitemap = async () => {
-    if (permissionsError) {
-      toast.error(permissionsError);
-      return;
-    }
-
-    if (!id) {
-      toast.error("Workspace is still loading. Please try again.");
-      return;
-    }
-
-    if (!siteDomainSlug) {
-      toast.error("Choose a domain for sitemap imports before adding sources.");
-      return;
-    }
-
-    const normalizedSitemapUrl = normalizeSitemapUrl(newSitemapUrl);
-
-    if (!normalizedSitemapUrl) {
-      toast.error("Enter a valid sitemap URL.");
-      return;
-    }
-
-    const sitemapAlreadyExists = sitemaps.some(
-      (sitemap) => sitemap.url === normalizedSitemapUrl,
-    );
-
-    if (sitemapAlreadyExists) {
-      toast.error("Sitemap already exists.");
-      return;
-    }
-
-    if (sitemaps.length >= MAX_TRACKED_SITEMAPS_PER_WORKSPACE) {
-      toast.error(
-        `You can track up to ${MAX_TRACKED_SITEMAPS_PER_WORKSPACE} sitemaps per workspace.`,
-      );
-      return;
-    }
-
-    setAddingSitemap(true);
-
-    try {
-      const ok = await persistSiteVisitTrackingSettings({
-        trackedSitemaps: [
-          ...serializeSitemaps(sitemaps),
-          {
-            url: normalizedSitemapUrl,
-          },
-        ],
-        siteDomainSlug,
-      });
-
-      if (ok) {
-        const importResponse = await fetch(
-          `/api/workspaces/${id}/sitemaps/import`,
-          {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              sitemapUrl: normalizedSitemapUrl,
-            }),
-          },
-        );
-
-        if (importResponse.ok) {
-          toast.success("Sitemap added and crawled.");
-        } else {
-          try {
-            const { error } = await importResponse.json();
-            toast.error(error?.message || "Sitemap added, but crawl failed.");
-          } catch {
-            toast.error("Sitemap added, but crawl failed.");
-          }
-        }
-
-        setNewSitemapUrl("");
-        // Import updates crawl metadata on the server; revalidate so the row shows last crawled / URL count.
-        await mutate();
-      }
-    } catch {
-      toast.error("Network error, please try again or contact support.");
-    } finally {
-      setAddingSitemap(false);
-    }
-  };
-
-  const refreshSitemap = async (sitemapUrl: string) => {
-    if (permissionsError) {
-      toast.error(permissionsError);
-      return;
-    }
-
-    if (!id) {
-      toast.error("Workspace is still loading. Please try again.");
-      return;
-    }
-
-    setRefreshingSitemapUrl(sitemapUrl);
-
-    try {
-      const response = await fetch(`/api/workspaces/${id}/sitemaps/import`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          sitemapUrl,
-        }),
-      });
-
-      if (response.ok) {
-        toast.success("Sitemap refreshed.");
-        mutate();
-      } else {
-        const { error } = await response.json();
-        toast.error(error?.message || "Failed to refresh sitemap.");
-      }
-    } catch {
-      toast.error("Network error, please try again.");
-    } finally {
-      setRefreshingSitemapUrl(null);
-    }
-  };
-
-  const deleteSitemap = async (sitemapUrl: string) => {
-    if (permissionsError) {
-      toast.error(permissionsError);
-      return;
-    }
-
-    if (!id) {
-      toast.error("Workspace is still loading. Please try again.");
-      return;
-    }
-
-    setDeletingSitemapUrl(sitemapUrl);
-
-    const remainingSitemaps = sitemaps.filter(
-      (sitemap) => sitemap.url !== sitemapUrl,
-    );
-
-    try {
-      const ok = await persistSiteVisitTrackingSettings({
-        trackedSitemaps: serializeSitemaps(remainingSitemaps),
-      });
-
-      if (ok) {
-        toast.success("Sitemap deleted.");
-      }
-    } catch {
-      toast.error("Network error, please try again.");
-    } finally {
-      setDeletingSitemapUrl(null);
-    }
-  };
-
-  return (
-    <div className="flex flex-1 flex-col rounded-lg border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between gap-4 p-3">
-        <div className="flex min-w-0 items-center gap-4">
-          <div className="overflow-hidden">
-            <label
-              htmlFor={`${switchId}-switch`}
-              className="text-content-emphasis block text-sm font-semibold"
-            >
-              Site visit tracking
-            </label>
-            <p className="text-content-subtle text-sm font-medium">
-              For tracking site visits (organic visits from Google/SEO/AEO).
-            </p>
-          </div>
-        </div>
-
-        <Switch
-          id={`${switchId}-switch`}
-          disabled={loading}
-          {...(permissionsError
-            ? {
-                disabledTooltip: permissionsError,
-                thumbIcon: (
-                  <div className="flex size-full items-center justify-center">
-                    <LockSmall className="size-[8px] text-black" />
-                  </div>
-                ),
-              }
-            : {})}
-          checked={enabled || false}
-          trackDimensions="radix-state-checked:bg-black focus-visible:ring-black/20 w-7 h-4"
-          thumbDimensions="size-3"
-          thumbTranslate="translate-x-3"
-          fn={setEnabled}
-        />
-      </div>
-
-      <motion.div
-        animate={{
-          height: enabled ? "auto" : 0,
-          overflow: "hidden",
-        }}
-        transition={{
-          duration: 0.15,
-        }}
-        initial={false}
-      >
-        <div className="flex flex-col gap-4 border-t border-neutral-200 p-3">
-          <div className="flex flex-col gap-2">
-            <div className="flex flex-col">
-              <label className="text-content-emphasis text-sm font-semibold">
-                Domain for sitemap imports
-              </label>
-              <p className="text-content-subtle text-xs font-medium">
-                This domain will be used for links we create when importing
-                pages from the sitemaps you add.
-              </p>
-            </div>
-
-            <DomainSelector
-              selectedDomain={siteDomainSlug}
-              setSelectedDomain={(slug) => void setSiteDomainSlug(slug)}
-              disabled={Boolean(permissionsError)}
-              disabledTooltip={permissionsError || undefined}
-            />
-          </div>
-
-          <div className="flex flex-col gap-2">
-            <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
-              <div className="flex items-center gap-1">
-                <h2 className="text-content-emphasis text-sm font-semibold">
-                  Sitemaps
-                </h2>
-                <InfoTooltip content="Required for conversion tracking." />
-              </div>
-              <div className="flex w-full items-center gap-2 sm:w-auto">
-                {siteVisitTrackingEnabled && (
-                  <input
-                    type="text"
-                    value={newSitemapUrl}
-                    onChange={(e) => setNewSitemapUrl(e.target.value)}
-                    placeholder="e.g. https://acme.com/sitemap.xml"
-                    className="h-7 w-full rounded-lg border border-neutral-300 px-2.5 text-sm focus:border-neutral-500 focus:outline-none focus:ring-0 sm:w-[260px]"
-                  />
-                )}
-                <Button
-                  text="Add sitemap"
-                  className="h-7 w-fit rounded-lg px-2.5 py-1 text-sm font-medium"
-                  onClick={() =>
-                    siteVisitTrackingEnabled
-                      ? addSitemap()
-                      : toast.info("Coming soon")
-                  }
-                  loading={addingSitemap}
-                  disabled={
-                    Boolean(permissionsError) ||
-                    (siteVisitTrackingEnabled && !siteDomainSlug) ||
-                    (siteVisitTrackingEnabled &&
-                      trackedSitemapRows.length >=
-                        MAX_TRACKED_SITEMAPS_PER_WORKSPACE)
-                  }
-                  disabledTooltip={
-                    permissionsError ||
-                    (siteVisitTrackingEnabled && !siteDomainSlug
-                      ? "Choose a domain for imports first"
-                      : undefined) ||
-                    (siteVisitTrackingEnabled &&
-                    trackedSitemapRows.length >=
-                      MAX_TRACKED_SITEMAPS_PER_WORKSPACE
-                      ? `Maximum ${MAX_TRACKED_SITEMAPS_PER_WORKSPACE} sitemaps per workspace`
-                      : undefined)
-                  }
-                />
-              </div>
-            </div>
-
-            <div className="flex flex-col gap-2">
-              {siteVisitTrackingEnabled && sitemaps.length === 0 ? (
-                <div className="text-content-subtle rounded-xl border border-dashed border-neutral-300 bg-white p-3 text-sm">
-                  No tracked sitemaps configured yet.
-                </div>
-              ) : (
-                sitemaps.map((sitemap) => (
-                  <div
-                    key={sitemap.url}
-                    className="border-border-subtle flex items-center justify-between gap-4 rounded-xl border bg-white p-3"
-                  >
-                    <div className="flex min-w-0 items-center gap-2">
-                      <div className="flex size-[28px] items-center justify-center rounded-md bg-neutral-100">
-                        <Sitemap className="size-4 text-neutral-800" />
-                      </div>
-                      <div className="flex min-w-0 flex-col">
-                        <span className="text-content-emphasis min-w-0 truncate text-sm font-semibold">
-                          {sitemap.url}
-                        </span>
-                        <span className="text-content-subtle text-xs font-medium">
-                          {sitemap.lastCrawledAt
-                            ? `Last crawled ${formatDate(sitemap.lastCrawledAt)}`
-                            : "Not crawled yet"}
-                          {sitemap.lastUrlCount !== null
-                            ? ` · ${sitemap.lastUrlCount} URLs found`
-                            : ""}
-                        </span>
-                      </div>
-                    </div>
-                    {siteVisitTrackingEnabled && (
-                      <SitemapRowMenu
-                        onRefresh={() => refreshSitemap(sitemap.url)}
-                        onDelete={() => deleteSitemap(sitemap.url)}
-                        loading={
-                          refreshingSitemapUrl === sitemap.url ||
-                          deletingSitemapUrl === sitemap.url
-                        }
-                      />
-                    )}
-                  </div>
-                ))
-              )}
-            </div>
-          </div>
-        </div>
-      </motion.div>
-    </div>
-  );
-}
-
-function SitemapRowMenu({
-  onRefresh,
-  onDelete,
-  loading,
-}: {
-  onRefresh: () => void;
-  onDelete: () => void;
-  loading: boolean;
-}) {
-  const [openPopover, setOpenPopover] = useState(false);
-
-  return (
-    <Popover
-      content={
-        <div className="w-full sm:w-48">
-          <div className="grid gap-px p-2">
-            <Button
-              text="Refresh source"
-              variant="outline"
-              onClick={() => {
-                setOpenPopover(false);
-                onRefresh();
-              }}
-              icon={<RefreshCw className="h-4 w-4" />}
-              className="h-9 justify-start px-2 font-medium"
-            />
-          </div>
-          <div className="border-t border-neutral-200" />
-          <div className="grid gap-px p-2">
-            <Button
-              text="Delete source"
-              variant="danger-outline"
-              onClick={() => {
-                setOpenPopover(false);
-                onDelete();
-              }}
-              icon={<Trash className="size-4" />}
-              className="h-9 justify-start px-2 font-medium"
-            />
-          </div>
-        </div>
-      }
-      align="end"
-      openPopover={openPopover}
-      setOpenPopover={setOpenPopover}
-    >
-      <Button
-        variant="outline"
-        className={cn(
-          "h-8 w-fit px-1.5 outline-none transition-all duration-200",
-          "border-transparent data-[state=open]:border-neutral-500 sm:group-hover/card:data-[state=closed]:border-neutral-200",
-        )}
-        icon={
-          loading ? (
-            <LoadingSpinner className="size-4 shrink-0" />
-          ) : (
-            <ThreeDots className="size-5 shrink-0" />
-          )
-        }
-        onClick={() => setOpenPopover(!openPopover)}
-      />
-    </Popover>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/stack-picker.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/stack-picker.tsx
new file mode 100644
index 00000000000..ee4d096e464
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/stack-picker.tsx
@@ -0,0 +1,121 @@
+"use client";
+
+import { StackItem } from "@/ui/guides/integrations";
+import { Layers3 } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
+
+function StackItemIcon({
+  icon: Icon,
+  fullSize,
+}: {
+  icon: StackItem["icon"];
+  fullSize?: boolean;
+}) {
+  if (fullSize) {
+    return (
+      <Icon
+        className="size-5 shrink-0 overflow-hidden rounded"
+        width="auto"
+        height="100%"
+      />
+    );
+  }
+
+  return <Icon className="size-5 shrink-0" />;
+}
+
+const stackItemTitleClassName =
+  "text-xs font-semibold leading-4 tracking-[-0.02em] text-neutral-800";
+
+function StackItemTitle({ title }: { title: string }) {
+  const stripeSuffix = title.startsWith("Stripe ")
+    ? title.slice("Stripe ".length)
+    : null;
+
+  if (!stripeSuffix) {
+    return (
+      <span className={cn("min-w-0 flex-1 truncate", stackItemTitleClassName)}>
+        {title}
+      </span>
+    );
+  }
+
+  return (
+    <span className="flex min-w-0 flex-1 items-baseline gap-1 truncate">
+      <span className={stackItemTitleClassName}>Stripe</span>
+      <span className="text-content-subtle text-xs font-medium leading-4 tracking-[-0.02em]">
+        {stripeSuffix}
+      </span>
+    </span>
+  );
+}
+
+export function StackSelectionStatus({ count }: { count: number }) {
+  return (
+    <p className="text-content-subtle flex items-center gap-1.5 text-xs font-medium">
+      <Layers3 variant="fill" className="size-3.5 shrink-0" />
+      {count} item{count === 1 ? "" : "s"} selected
+    </p>
+  );
+}
+
+export function StackPicker({
+  items,
+  value,
+  onChange,
+  disabled,
+}: {
+  items: StackItem[];
+  value: string[];
+  onChange: (value: string[]) => void;
+  disabled?: boolean;
+}) {
+  const toggleItem = (id: string) => {
+    if (disabled) {
+      return;
+    }
+
+    onChange(
+      value.includes(id) ? value.filter((item) => item !== id) : [...value, id],
+    );
+  };
+
+  return (
+    <div className="grid w-full grid-cols-2 gap-3 sm:grid-cols-3">
+      {items.map((item) => {
+        const selected = value.includes(item.id);
+
+        return (
+          <button
+            key={item.id}
+            type="button"
+            disabled={disabled}
+            aria-pressed={selected}
+            onClick={() => toggleItem(item.id)}
+            className={cn(
+              "relative flex h-10 items-center gap-2.5 rounded-lg border bg-white px-3 py-2 text-left",
+              "transition-[border-color,background-color,box-shadow,transform] duration-150 ease-out",
+              "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-black/50",
+              "active:scale-[0.98] motion-reduce:transition-none motion-reduce:active:scale-100",
+              selected
+                ? "border-[1.5px] border-neutral-600"
+                : "border-neutral-200",
+              !disabled &&
+                "[@media(hover:hover)_and_(pointer:fine)]:hover:bg-neutral-50 [@media(hover:hover)_and_(pointer:fine)]:hover:shadow-[0_0_0_3px_#0000000A]",
+              !disabled &&
+                !selected &&
+                "[@media(hover:hover)_and_(pointer:fine)]:hover:border-neutral-300",
+              disabled && "cursor-not-allowed opacity-50",
+            )}
+          >
+            <StackItemIcon
+              icon={item.icon}
+              fullSize={item.iconProps?.fullSize}
+            />
+            <StackItemTitle title={item.title} />
+          </button>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/step.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/step.tsx
deleted file mode 100644
index 50fbf87efa1..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/step.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-"use client";
-
-import { PropsWithChildren } from "react";
-
-import { Button, Check2, ChevronRight } from "@dub/ui";
-import { cn, isClickOnInteractiveChild } from "@dub/utils";
-import { AnimatePresence, motion } from "motion/react";
-import { ReactNode } from "react";
-
-export type Step = "connect" | "lead" | "sale";
-
-export type BaseStepProps = {
-  expanded?: boolean;
-  toggleExpanded: () => void;
-};
-
-export type StepProps = BaseStepProps & {
-  id: Step;
-  step: number;
-  title: string;
-  subtitle?: string;
-  complete?: boolean;
-  children?: ReactNode;
-  contentClassName?: string;
-};
-
-const Step = ({
-  step,
-  title,
-  subtitle,
-  complete,
-  expanded,
-  toggleExpanded,
-  children,
-  contentClassName,
-}: PropsWithChildren<StepProps>) => {
-  return (
-    <div className="flex items-start gap-[22px] rounded-xl border border-neutral-200 bg-white p-5">
-      <StepNumber number={step} complete={complete} />
-
-      <div className="flex min-w-0 grow flex-col">
-        <div
-          className="group/step-header flex cursor-pointer items-center justify-between gap-2"
-          onClick={(e) => {
-            if (!isClickOnInteractiveChild(e)) toggleExpanded();
-          }}
-        >
-          <div>
-            <div className="text-content-emphasis text-base font-semibold">
-              {title}
-            </div>
-            {subtitle && (
-              <div className="text-content-subtle text-sm font-medium">
-                {subtitle}
-              </div>
-            )}
-          </div>
-
-          <Button
-            variant="plain"
-            className="hover:bg-bg-subtle group-hover/step-header:bg-bg-subtle group size-8 w-fit rounded-full border-none px-2"
-            data-state={expanded ? "open" : "closed"}
-            text={
-              <ChevronRight className="text-content-emphasis size-4 transition-transform duration-75 group-data-[state=open]:rotate-90" />
-            }
-            onClick={() => toggleExpanded()}
-          />
-        </div>
-
-        <motion.div
-          initial={false}
-          animate={{ height: expanded ? "auto" : 0 }}
-          className="overflow-hidden"
-        >
-          <AnimatePresence initial={false}>
-            {expanded && (
-              <motion.div
-                className={cn(contentClassName, "pt-5")}
-                key="step-content"
-                initial={{ opacity: 0 }}
-                animate={{ opacity: 1 }}
-                exit={{ opacity: 0 }}
-                transition={{ duration: 0.2, ease: "easeInOut" }}
-              >
-                {children}
-              </motion.div>
-            )}
-          </AnimatePresence>
-        </motion.div>
-      </div>
-    </div>
-  );
-};
-
-const StepNumber = ({
-  number,
-  complete,
-}: {
-  number: number;
-  complete?: boolean;
-}) => {
-  return (
-    <div
-      className={cn(
-        "hidden size-[42px] shrink-0 items-center justify-center rounded-full sm:flex",
-        complete ? "bg-green-400" : "bg-neutral-100",
-      )}
-    >
-      {complete ? (
-        <Check2 className="size-4 text-green-800" />
-      ) : (
-        <span className="text-content-default text-base font-semibold">
-          {number}
-        </span>
-      )}
-    </div>
-  );
-};
-
-export default Step;
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-lead-guides-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-lead-guides-section.tsx
deleted file mode 100644
index b25c5f8d1a6..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-lead-guides-section.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-"use client";
-
-import useGuide from "@/lib/swr/use-guide";
-import { GuideActionButton } from "@/ui/guides/guide-action-button";
-import { GuideSelector } from "@/ui/guides/guide-selector";
-import { guides as allGuides } from "@/ui/guides/integrations";
-import { GuidesMarkdown } from "@/ui/guides/markdown";
-import { useSelectedGuide } from "./use-selected-guide";
-
-export function TrackLeadsGuidesSection() {
-  const guides = allGuides.filter((guide) => guide.type === "track-lead");
-  const { selectedGuide, setSelectedGuide } = useSelectedGuide({ guides });
-
-  const { loading, guideMarkdown } = useGuide(selectedGuide.key);
-
-  let button: React.ReactNode;
-  let content: React.ReactNode;
-
-  if (loading) {
-    content = (
-      <div className="space-y-4">
-        <div className="h-6 w-1/2 animate-pulse rounded bg-neutral-200" />
-        <div className="h-4 w-full animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-5/6 animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-2/3 animate-pulse rounded bg-neutral-100" />
-      </div>
-    );
-    button = (
-      <div className="h-8 w-24 animate-pulse rounded-md bg-neutral-200" />
-    );
-  } else if (guideMarkdown) {
-    content = <GuidesMarkdown>{guideMarkdown}</GuidesMarkdown>;
-    button = (
-      <GuideActionButton guide={selectedGuide} markdown={guideMarkdown} />
-    );
-  } else {
-    content = (
-      <div className="text-content-subtle flex size-full items-center justify-center text-sm">
-        Failed to load guide
-      </div>
-    );
-  }
-
-  return (
-    <div className="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between p-3">
-        <GuideSelector
-          value={selectedGuide}
-          onChange={setSelectedGuide}
-          guides={guides}
-          className="-my-1 -ml-1"
-        />
-
-        {button}
-      </div>
-
-      <div className="max-w-full rounded-t-xl border-t border-neutral-200 bg-white p-5">
-        <div className="mx-auto max-w-2xl">{content}</div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-sales-guides-section.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-sales-guides-section.tsx
deleted file mode 100644
index a1dd8593cfa..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/track-sales-guides-section.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client";
-
-import useGuide from "@/lib/swr/use-guide";
-import { GuideActionButton } from "@/ui/guides/guide-action-button";
-import { GuideSelector } from "@/ui/guides/guide-selector";
-import { InstallStripeIntegrationButton } from "@/ui/guides/install-stripe-integration-button";
-import { guides as allGuides } from "@/ui/guides/integrations";
-import { GuidesMarkdown } from "@/ui/guides/markdown";
-import { useSelectedGuide } from "./use-selected-guide";
-
-export function TrackSalesGuidesSection() {
-  const guides = allGuides.filter((guide) => guide.type === "track-sale");
-  const { selectedGuide, setSelectedGuide } = useSelectedGuide({ guides });
-
-  const { loading, guideMarkdown } = useGuide(selectedGuide.key);
-
-  let button;
-  let content;
-
-  if (loading) {
-    content = (
-      <div className="space-y-4">
-        <div className="h-6 w-1/2 animate-pulse rounded bg-neutral-200" />
-        <div className="h-4 w-full animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-5/6 animate-pulse rounded bg-neutral-100" />
-        <div className="h-4 w-2/3 animate-pulse rounded bg-neutral-100" />
-      </div>
-    );
-    button = (
-      <div className="h-8 w-24 animate-pulse rounded-md bg-neutral-200" />
-    );
-  } else if (guideMarkdown) {
-    content = (
-      <div className="space-y-6">
-        {selectedGuide.key.startsWith("stripe") && (
-          <InstallStripeIntegrationButton />
-        )}
-        <GuidesMarkdown>{guideMarkdown}</GuidesMarkdown>
-      </div>
-    );
-    button = (
-      <GuideActionButton guide={selectedGuide} markdown={guideMarkdown} />
-    );
-  } else {
-    content = (
-      <div className="text-content-subtle flex size-full items-center justify-center text-sm">
-        Failed to load guide
-      </div>
-    );
-  }
-
-  return (
-    <div className="overflow-hidden rounded-xl border border-neutral-200 bg-neutral-50">
-      <div className="flex items-center justify-between p-3">
-        <GuideSelector
-          value={selectedGuide}
-          onChange={setSelectedGuide}
-          guides={guides}
-          className="-my-1 -ml-1"
-        />
-
-        {button}
-      </div>
-
-      <div className="max-w-full rounded-t-xl border-t border-neutral-200 bg-white p-5">
-        <div className="mx-auto max-w-2xl">{content}</div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/tracking-settings-row.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/tracking-settings-row.tsx
new file mode 100644
index 00000000000..28e795ca752
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/tracking-settings-row.tsx
@@ -0,0 +1,42 @@
+import { MarkdownDescription } from "@/ui/shared/markdown-description";
+import { cn } from "@dub/utils";
+import { PropsWithChildren, ReactNode } from "react";
+
+export function TrackingSettingsRow({
+  heading,
+  description,
+  leftExtra,
+  leftExtraAlign = "start",
+  align = "start",
+  children,
+}: PropsWithChildren<{
+  heading: string;
+  description: string;
+  leftExtra?: ReactNode;
+  leftExtraAlign?: "start" | "end";
+  align?: "start" | "center";
+}>) {
+  return (
+    <div
+      className={cn(
+        "grid grid-cols-1 gap-10 p-6 sm:grid-cols-2",
+        align === "center" && "sm:items-center",
+      )}
+    >
+      <div className="flex h-full min-w-0 flex-col gap-1">
+        <h3 className="text-content-emphasis text-base font-semibold leading-6 tracking-[-0.02em]">
+          {heading}
+        </h3>
+        <MarkdownDescription className="text-content-subtle [&_a]:text-content-subtle text-sm font-normal leading-5 tracking-[-0.02em] [&_a]:decoration-solid [&_a]:underline-offset-auto">
+          {description}
+        </MarkdownDescription>
+        {leftExtra && (
+          <div className={cn(leftExtraAlign === "end" && "mt-auto pt-4")}>
+            {leftExtra}
+          </div>
+        )}
+      </div>
+      <div className="min-w-0">{children}</div>
+    </div>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-dynamic-guide.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-dynamic-guide.ts
deleted file mode 100644
index 4ea15a17192..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-dynamic-guide.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import useGuide from "@/lib/swr/use-guide";
-import useProgram from "@/lib/swr/use-program";
-import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { useMemo } from "react";
-import { SWRConfiguration } from "swr";
-
-export function useDynamicGuide(
-  { guide }: { guide: string },
-  swrOpts?: SWRConfiguration,
-) {
-  const { guideMarkdown: guideMarkdownRaw, error } = useGuide(guide, swrOpts);
-
-  const { publishableKey } = useWorkspace();
-  const { program } = useProgram();
-
-  const [siteVisitTrackingEnabled] = useWorkspaceStore<boolean>(
-    "analyticsSettingsSiteVisitTrackingEnabled",
-  );
-  const [domainTrackingEnabled] = useWorkspaceStore<boolean>(
-    "analyticsSettingsOutboundDomainTrackingEnabled",
-  );
-  const [conversionTrackingEnabled] = useWorkspaceStore<boolean>(
-    "analyticsSettingsConversionTrackingEnabled",
-  );
-
-  const guideMarkdown = useMemo(() => {
-    let result = guideMarkdownRaw;
-
-    if (program?.domain)
-      result = result?.replaceAll(/yourcompany\.link/g, program.domain);
-
-    const scriptComponents = [
-      siteVisitTrackingEnabled ? "site-visit" : null,
-      domainTrackingEnabled ? "outbound-domains" : null,
-      conversionTrackingEnabled ? "conversion-tracking" : null,
-    ]
-      .filter(Boolean)
-      .join(".");
-
-    if (scriptComponents.length)
-      result = result?.replaceAll(
-        /https\:\/\/www.dubcdn.com\/analytics\/script.js/g,
-        `https://www.dubcdn.com/analytics/script.${scriptComponents}.js`,
-      );
-
-    if (result) {
-      // Store original result for context checks
-      const originalResult = result;
-
-      result = result
-        // for manual installations - add data-publishable-key after src attribute
-        .replaceAll(
-          /(<script[\s\S]*?)(src="https:\/\/www\.dubcdn\.com\/analytics\/script[^"]+")([\s\S]*?)(>)/g,
-          (match, beforeSrc, srcAttr, afterSrc, closingTag) => {
-            if (match.includes("data-publishable-key")) return match;
-
-            // Find src line in original to get indentation
-            const originalLines = originalResult.split("\n");
-            const srcLine =
-              originalLines.find((line) => line.includes(srcAttr)) || "";
-            const indent = srcLine.match(/^(\s*)/)?.[1] || "  ";
-
-            // Clean up other attributes
-            const otherAttrs = afterSrc.replace(/>$/, "").trim();
-
-            const domainsConfigParts = [
-              ...(program ? [`"refer": "${program.domain}"`] : []),
-              ...(domainTrackingEnabled
-                ? [`"outbound": ["example.com", "example.sh"]`]
-                : []),
-            ].join(`, `);
-            const parts = [
-              ...(publishableKey
-                ? [`data-publishable-key="${publishableKey}"`]
-                : []),
-              ...(domainsConfigParts
-                ? [`data-domains='{${domainsConfigParts}}'`]
-                : []),
-            ].join(`\n${indent}`);
-
-            // Return: before src, src, publishable-key, other attrs, closing tag
-            return `${beforeSrc}${srcAttr}${parts ? `\n${indent}${parts}` : ""}${otherAttrs ? `\n${indent}${otherAttrs}` : ""}\n${closingTag}`;
-          },
-        )
-        // for React applications - add publishableKey prop after <DubAnalytics
-        .replaceAll(
-          /^(\s+)(<DubAnalytics)(\s*\/?>|\s+[^\n>]*\/?>|)$/gm,
-          (match, indent, tag, rest) => {
-            if (match.includes("publishableKey")) return match;
-            // Check context for multiline case
-            if (rest === "") {
-              const idx = originalResult.indexOf(match);
-              if (idx >= 0) {
-                const context = originalResult.substring(idx, idx + 300);
-                if (context.includes("publishableKey")) return match;
-              }
-            }
-
-            const domainsConfigParts = [
-              ...(program ? [`refer: "${program.domain}"`] : []),
-              ...(domainTrackingEnabled
-                ? [`outbound: ["example.com", "example.sh"]`]
-                : []),
-            ].join(`,\n${indent}    `);
-            const parts = [
-              ...(publishableKey ? [`publishableKey="${publishableKey}"`] : []),
-              ...(domainsConfigParts
-                ? [
-                    `domainsConfig={{\n${indent}    ${domainsConfigParts}\n${indent}  }}`,
-                  ]
-                : []),
-            ].join(`\n  ${indent}`);
-
-            return `${indent}${tag}${parts ? `\n${indent}  ${parts}` : ""}${rest}`;
-          },
-        )
-        // for GTM installations - add data-publishable-key after script.src
-        .replaceAll(
-          /^(\s+)(s\.src\s*=\s*"https:\/\/www\.dubcdn\.com\/analytics\/script[^"]+";)$/gm,
-          (match, indent, srcLine) => {
-            const idx = originalResult.indexOf(match);
-            if (idx >= 0) {
-              const context = originalResult.substring(idx, idx + 200);
-              if (context.includes("data-publishable-key")) return match;
-            }
-
-            const domainsConfigParts = [
-              ...(program ? [`"refer": "${program.domain}"`] : []),
-              ...(domainTrackingEnabled
-                ? [`"outbound": ["example.com", "example.sh"]`]
-                : []),
-            ].join(`, `);
-            const parts = [
-              ...(publishableKey
-                ? [
-                    `s.setAttribute("data-publishable-key", "${publishableKey}");`,
-                  ]
-                : []),
-              ...(domainsConfigParts
-                ? [
-                    `s.dataset.domains = JSON.stringify({${domainsConfigParts}});`,
-                  ]
-                : []),
-            ].join(`\n${indent}`);
-
-            return `${indent}${srcLine}${parts ? `\n${indent}${parts}` : ""}`;
-          },
-        );
-    }
-
-    return result;
-  }, [
-    guideMarkdownRaw,
-    program,
-    siteVisitTrackingEnabled,
-    domainTrackingEnabled,
-    conversionTrackingEnabled,
-    publishableKey,
-  ]);
-
-  return {
-    guideMarkdown,
-    error,
-    loading: !guideMarkdown && !error,
-  };
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-selected-guide.ts b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-selected-guide.ts
deleted file mode 100644
index ef541c36931..00000000000
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/use-selected-guide.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { IntegrationGuide } from "@/ui/guides/integrations";
-import { useRouterStuff } from "@dub/ui";
-import { useEffect, useState } from "react";
-
-export function useSelectedGuide({ guides }: { guides: IntegrationGuide[] }) {
-  const { searchParams, queryParams } = useRouterStuff();
-  const paramGuide = searchParams.get("guide");
-
-  if (guides.length === 0)
-    throw new Error("useSelectedGuide requires a non-empty guides array");
-
-  const [selectedGuide, setSelectedGuide] = useState<IntegrationGuide>(
-    guides[0],
-  );
-
-  useEffect(() => {
-    if (!paramGuide) return;
-
-    const guide = guides.find((g) => g.key === paramGuide);
-    if (!guide) return;
-
-    setSelectedGuide(guide);
-  }, [paramGuide, guides]);
-
-  return {
-    selectedGuide,
-    setSelectedGuide: (guide: IntegrationGuide) =>
-      queryParams({ set: { guide: guide.key } }),
-  };
-}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/verify-install.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/verify-install.tsx
index e0311e32a7c..ba05739bcec 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/verify-install.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/tracking/verify-install.tsx
@@ -1,151 +1,275 @@
+"use client";
+
 import { verifyWorkspaceSetup } from "@/lib/actions/verify-workspace-setup";
+import type { VerifyInstallationResult } from "@/lib/analytics/verify-installation";
+import { clientAccessCheck } from "@/lib/client-access-check";
 import useWorkspace from "@/lib/swr/use-workspace";
-import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
-import { Button, Plug2 } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { UserAvatar } from "@/ui/users/user-avatar";
+import { Button, Combobox, Globe } from "@dub/ui";
+import { cn, getPrettyUrl, OG_AVATAR_URL, timeAgo } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
-import Link from "next/link";
-import { useMemo } from "react";
+import { type ReactNode, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
-import { CompleteStepButton } from "./complete-step-button";
 
-type VerifyStatus = "pending" | "success" | "error";
+const HOSTNAME_REQUIRED_MESSAGE =
+  "A hostname is required in order to verify installation.";
 
-const VerifyInstallIcon = ({ status }: { status: VerifyStatus }) => {
-  return (
-    <div
-      className={cn(
-        "text-content-default flex size-10 items-center justify-center rounded-full",
-        status === "pending" && "border border-blue-200 bg-white",
-        status === "error" && "bg-red-400 text-red-900",
-        status === "success" && "bg-green-400 text-green-800",
-      )}
-    >
-      <Plug2 className="size-4" />
-    </div>
-  );
+const isVerifiableHostname = (hostname: string) =>
+  !hostname.startsWith("*.") &&
+  hostname !== "localhost" &&
+  !hostname.startsWith("localhost:");
+
+const VERIFY_DOCS_HREF = "https://dub.co/docs/sdks/client-side/introduction";
+const VERIFY_SUPPORT_HREF = "https://dub.co/support";
+
+const ERROR_HEADLINE = {
+  not_installed: "Script is not installed.",
+  missing_attributes: "Script missing attributes.",
+  missing_refer_domain: "Script is missing the referral link domain.",
+  duplicate: "Duplicate script.",
+  malformed: "Malformed script.",
+  unreachable: "We couldn’t reach this hostname.",
+  unsupported: "Wildcard hostnames can’t be verified.",
+};
+
+const getErrorHeadline = (
+  result: Extract<VerifyInstallationResult, { status: "error" }>,
+) => {
+  if (result.error === "missing_refer_domain" && result.referDomain) {
+    return `Script is missing the referral link domain (${result.referDomain}).`;
+  }
+
+  return ERROR_HEADLINE[result.error];
 };
 
-type VerificationResponse = {
-  verifiedAt: Date;
-  verifiedBy: { name: string; avatarUrl?: string };
+type LastVerified = {
+  hostname: string;
+  verifiedAt: string;
+  user: {
+    id: string;
+    name: string | null;
+    image: string | null;
+  };
 };
 
-const VerifyInstall = () => {
-  const { id: workspaceId } = useWorkspace();
+type HelperTone = "success" | "error" | "neutral";
+
+export function VerifyInstall({ hostnames }: { hostnames: string[] }) {
+  const { id: workspaceId, role, store, mutate } = useWorkspace();
+  const [selectedHostname, setSelectedHostname] = useState<string | null>(null);
+  const [result, setResult] = useState<VerifyInstallationResult | null>(null);
+  const selectedHostnameRef = useRef(selectedHostname);
+  const pendingHostnameRef = useRef<string | null>(null);
+  selectedHostnameRef.current = selectedHostname;
+
+  const permissionsError = clientAccessCheck({
+    action: "workspaces.write",
+    role,
+    customPermissionDescription: "verify tracking installation",
+  }).error;
+  const disabledTooltip =
+    typeof permissionsError === "string"
+      ? permissionsError
+      : !selectedHostname
+        ? HOSTNAME_REQUIRED_MESSAGE
+        : undefined;
+
+  const lastVerified = store?.analyticsSettingsInstallationVerified as
+    | LastVerified
+    | undefined;
 
-  //   const [verified, setVerified] = useState(false);
+  const hostnameOptions = useMemo(
+    () =>
+      hostnames.filter(isVerifiableHostname).map((hostname) => ({
+        value: hostname,
+        label: getPrettyUrl(hostname),
+        icon: <Globe className="size-4 text-neutral-600" />,
+      })),
+    [hostnames],
+  );
+
+  const selectedOption =
+    hostnameOptions.find((option) => option.value === selectedHostname) ?? null;
+
+  const persistedForHostname =
+    selectedHostname && lastVerified?.hostname === selectedHostname
+      ? lastVerified
+      : null;
 
-  const error: any | null = null;
-  const response: VerificationResponse | null = null;
-  // const response: VerificationResponse | null = {
-  //   verifiedAt: new Date(),
-  //   verifiedBy: { name: "Ian" },
-  // };
+  const resultForSelection =
+    result && result.hostname === selectedHostname ? result : null;
+  const showSuccess = resultForSelection?.status === "success";
+  const showError = resultForSelection?.status === "error";
+  const showLastVerified = !resultForSelection && Boolean(persistedForHostname);
+  const canReverify = showSuccess || showLastVerified;
+
+  const helperTone: HelperTone | null = showSuccess
+    ? "success"
+    : showError
+      ? "error"
+      : showLastVerified
+        ? "neutral"
+        : null;
 
   const { executeAsync, isPending } = useAction(verifyWorkspaceSetup, {
-    async onSuccess(response) {
-      toast.success("Account created! Redirecting to dashboard...");
-
-      // if (response?.ok) {
-      // } else {
-      //   toast.error(
-      //     "Failed to sign in with credentials. Please try again or contact support.",
-      //   );
-      // }
+    onSuccess({ data }) {
+      if (!data) {
+        return;
+      }
+
+      if (data.status === "success") {
+        void mutate();
+      }
+
+      if (data.hostname !== selectedHostnameRef.current) {
+        return;
+      }
+
+      setResult(data);
     },
     onError({ error }) {
-      toast.error(error.serverError);
+      const hostname = pendingHostnameRef.current;
+
+      if (!hostname || hostname !== selectedHostnameRef.current) {
+        return;
+      }
+
+      setResult({
+        status: "error",
+        hostname,
+        error: "unreachable",
+      });
+      toast.error(error.serverError || "Failed to verify installation.");
     },
   });
 
-  const status: VerifyStatus = useMemo(() => {
-    if (error) return "error";
-    if (response) return "success";
-    return "pending";
-  }, [response, error]);
+  return (
+    <div className="flex w-full flex-col gap-3">
+      <div
+        className={cn(
+          "flex w-full flex-col",
+          helperTone && "gap-1.5 rounded-[10px] px-0.5 pb-1.5 pt-0.5",
+          helperTone === "success" && "bg-[#DCFCE7]",
+          helperTone === "error" && "bg-[#FFE2E2]",
+          helperTone === "neutral" && "bg-neutral-100",
+        )}
+      >
+        <Combobox
+          caret
+          options={hostnameOptions}
+          selected={selectedOption}
+          setSelected={(option) => {
+            setSelectedHostname(option?.value ?? null);
+            setResult(null);
+          }}
+          placeholder="Select hostname"
+          searchPlaceholder="Search hostnames..."
+          buttonProps={{
+            className: cn("h-10 w-full", helperTone && "bg-bg-default"),
+            disabled: hostnameOptions.length === 0 || isPending,
+            disabledTooltip:
+              hostnameOptions.length === 0
+                ? HOSTNAME_REQUIRED_MESSAGE
+                : isPending
+                  ? "Verification in progress..."
+                  : undefined,
+          }}
+          matchTriggerWidth
+        />
 
-  const [complete, markComplete, { loading }] = useWorkspaceStore<boolean>(
-    "analyticsSettingsConnectionSetupComplete",
-  );
+        {showSuccess && (
+          <HelperText tone="success">
+            Successfully connected and ready to use.
+          </HelperText>
+        )}
 
-  return (
-    <div
-      className={cn(
-        "flex flex-col gap-3 rounded-xl border px-8 py-6",
-        status === "pending" &&
-          "border-blue-200 bg-gradient-to-b from-blue-50 to-white",
-        status === "error" && "",
-        status === "success" && "",
-      )}
-    >
-      <form
-        onSubmit={(e) => {
-          if (!workspaceId) {
+        {showError && resultForSelection?.status === "error" && (
+          <HelperText tone="error">
+            {getErrorHeadline(resultForSelection)} After correcting, try
+            verifying again and if the issue still persists, check out our{" "}
+            <a
+              href={VERIFY_DOCS_HREF}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="underline underline-offset-2"
+            >
+              docs
+            </a>{" "}
+            or{" "}
+            <a
+              href={VERIFY_SUPPORT_HREF}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="underline underline-offset-2"
+            >
+              contact support
+            </a>
+            .
+          </HelperText>
+        )}
+
+        {showLastVerified && persistedForHostname && (
+          <HelperText tone="neutral" inline>
+            Last verified by
+            <UserAvatar
+              user={{
+                id: persistedForHostname.user.id,
+                name: persistedForHostname.user.name,
+                image:
+                  persistedForHostname.user.image ??
+                  `${OG_AVATAR_URL}${persistedForHostname.user.id}`,
+              }}
+              className="size-4 border-neutral-200"
+            />
+            <span className="font-medium">
+              {persistedForHostname.user.name}
+            </span>
+            {timeAgo(new Date(persistedForHostname.verifiedAt), {
+              withAgo: true,
+            })}
+          </HelperText>
+        )}
+      </div>
+
+      <Button
+        text={canReverify ? "Verify again" : "Verify installation"}
+        className="h-8 w-fit px-3"
+        loading={isPending}
+        disabled={!workspaceId || Boolean(disabledTooltip)}
+        disabledTooltip={disabledTooltip}
+        onClick={() => {
+          if (!workspaceId || !selectedHostname) {
             return;
           }
 
-          e.preventDefault();
-          executeAsync({ workspaceId });
+          pendingHostnameRef.current = selectedHostname;
+          void executeAsync({ workspaceId, hostname: selectedHostname });
         }}
-      >
-        <div>
-          <div className="flex flex-col items-center">
-            <VerifyInstallIcon status={status} />
-
-            <div className="text-content-emphasis mt-3 font-semibold">
-              {error
-                ? "Unable to connect"
-                : response
-                  ? "Successfully connected!"
-                  : "Verify your install"}
-            </div>
-
-            <p className="text-content-emphasis text-sm font-medium">
-              {error ? (
-                <>
-                  Try again. For more help, see our{" "}
-                  <Link href={"/docs"} className="underline">
-                    docs
-                  </Link>{" "}
-                  or{" "}
-                  <Link href={"/contact"} className="underline">
-                    contact support
-                  </Link>
-                  .
-                </>
-              ) : response ? (
-                "You’re connected and ready to track conversions"
-              ) : (
-                "Test your connection to Dub"
-              )}
-            </p>
-          </div>
-
-          <div className="mt-4">
-            {status !== "success" && (
-              <Button
-                text={isPending ? "Verifying..." : "Verify"}
-                type="submit"
-                loading={isPending}
-                disabled={isPending}
-                variant={status === "pending" ? "success" : "primary"}
-              />
-            )}
-
-            {status === "success" && !complete && (
-              <CompleteStepButton
-                onClick={() => {
-                  markComplete(true);
-                }}
-                loading={loading}
-              />
-            )}
-          </div>
-        </div>
-      </form>
+      />
     </div>
   );
-};
+}
 
-export default VerifyInstall;
+function HelperText({
+  tone,
+  inline = false,
+  children,
+}: {
+  tone: HelperTone;
+  inline?: boolean;
+  children: ReactNode;
+}) {
+  return (
+    <p
+      className={cn(
+        "min-h-5 px-3 text-sm leading-5",
+        inline && "flex flex-wrap items-center gap-2",
+        tone === "success" && "text-[#0D542B]",
+        tone === "error" && "text-[#82181A]",
+        tone === "neutral" && "text-content-subtle",
+      )}
+    >
+      {children}
+    </p>
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/create-webhook-button.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/create-webhook-button.tsx
index 86d923dfdb4..8d5ab89b2f0 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/create-webhook-button.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/webhooks/create-webhook-button.tsx
@@ -27,9 +27,10 @@ export default function CreateWebhookButton() {
   return (
     <Link href={`/${slug}/settings/webhooks/new`}>
       <Button
-        className="flex h-10 items-center justify-center whitespace-nowrap rounded-lg border px-4 text-sm"
-        text="Create Webhook"
+        className="h-9"
+        text="Create webhook"
         disabledTooltip={permissionsError}
+        aria-label="Create webhook"
       />
     </Link>
   );
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx
index 264c68a8831..5d38b9a29c2 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/links/page-client.tsx
@@ -428,13 +428,13 @@ function ImportOption({
       content={
         trialActive ? (
           <TooltipContent
-            title="Your workspace has exceeded its monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
+            title="Your workspace have exceeded your monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
             cta="Start paid plan"
             onClick={() => openTrialLimitModal("links")}
           />
         ) : (
           <TooltipContent
-            title="Your workspace has exceeded its monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
+            title="Your workspace have exceeded your monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
             cta={nextPlan ? `Upgrade to ${nextPlan.name}` : "Contact support"}
             href={`/${slug}/upgrade`}
           />
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx
index 2da0e6b23cf..469e803deeb 100644
--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/tokens/page-client.tsx
@@ -2,8 +2,9 @@
 
 import { TokenProps } from "@/lib/types";
 import { useDeleteTokenModal } from "@/ui/modals/delete-token-modal";
+import { Callout } from "@/ui/shared/callout";
 import { TokenAvatar } from "@/ui/token-avatar";
-import { IconMenu, LoadingSpinner, Popover, TriangleWarning } from "@dub/ui";
+import { IconMenu, LoadingSpinner, Popover } from "@dub/ui";
 import { fetcher, timeAgo } from "@dub/utils";
 import { FolderOpen, MoreVertical, Trash } from "lucide-react";
 import { useState } from "react";
@@ -17,29 +18,26 @@ export default function TokensPageClient() {
 
   return (
     <>
-      <div className="flex items-start gap-3 rounded-lg border border-amber-200 bg-amber-50 px-4 py-2.5">
-        <TriangleWarning className="mt-0.5 size-4 shrink-0 text-amber-600" />
-        <p className="flex-1 text-sm text-amber-900">
-          User API Keys have been replaced by Workspace API Keys. We recommend
-          creating a new{" "}
-          <a
-            href="https://dub.co/docs/api-reference/tokens"
-            target="_blank"
-            className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
-          >
-            Workspace API Key
-          </a>{" "}
-          for more granular control over your resources such as Links, Tags,
-          Domains, Analytics, etc.{" "}
-          <a
-            href="https://dub.co/blog/workspace-api-keys"
-            target="_blank"
-            className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
-          >
-            Read the announcement.
-          </a>
-        </p>
-      </div>
+      <Callout variant="warn" size={2}>
+        User API Keys have been replaced by Workspace API Keys. We recommend
+        creating a new{" "}
+        <a
+          href="https://dub.co/docs/api-reference/tokens"
+          target="_blank"
+          className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
+        >
+          Workspace API Key
+        </a>{" "}
+        for more granular control over your resources such as Links, Tags,
+        Domains, Analytics, etc.{" "}
+        <a
+          href="https://dub.co/blog/workspace-api-keys"
+          target="_blank"
+          className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
+        >
+          Read the announcement.
+        </a>
+      </Callout>
 
       <div className="mt-6 rounded-lg border border-neutral-200 bg-white">
         {isLoading || !tokens ? (
diff --git a/apps/web/app/app.dub.co/(dashboard)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/layout.tsx
index 588a3e39d3f..a9047292847 100644
--- a/apps/web/app/app.dub.co/(dashboard)/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/layout.tsx
@@ -5,6 +5,7 @@ import { NewsRSC } from "@/ui/layout/sidebar/news-rsc";
 import { ReferButton } from "@/ui/layout/sidebar/refer-button";
 import Toolbar from "@/ui/layout/toolbar/toolbar";
 import { UpgradeBanner } from "@/ui/layout/upgrade-banner";
+import { ModalProvider } from "@/ui/modals/modal-provider";
 import { constructMetadata } from "@dub/utils";
 import { ReactNode } from "react";
 
@@ -13,7 +14,7 @@ export const metadata = constructMetadata();
 
 export default async function Layout({ children }: { children: ReactNode }) {
   return (
-    <>
+    <ModalProvider>
       <div className="min-h-screen w-full bg-white">
         <UpgradeBanner />
         <MainNav
@@ -30,6 +31,6 @@ export default async function Layout({ children }: { children: ReactNode }) {
         </MainNav>
       </div>
       <Toolbar show={["onboarding"]} />
-    </>
+    </ModalProvider>
   );
 }
diff --git a/apps/web/app/app.dub.co/(deeplink)/deeplink/[domain]/[[...key]]/page.tsx b/apps/web/app/app.dub.co/(deeplink)/deeplink/[domain]/[[...key]]/page.tsx
index 4d4c7aa00cb..cecaa6a7218 100644
--- a/apps/web/app/app.dub.co/(deeplink)/deeplink/[domain]/[[...key]]/page.tsx
+++ b/apps/web/app/app.dub.co/(deeplink)/deeplink/[domain]/[[...key]]/page.tsx
@@ -12,7 +12,7 @@ import {
   IOSAppStore,
   MobilePhone,
 } from "@dub/ui/icons";
-import { cn, getApexDomain } from "@dub/utils";
+import { cn, constructMetadata, getApexDomain } from "@dub/utils";
 import { headers } from "next/headers";
 import Link from "next/link";
 import { redirect } from "next/navigation";
@@ -31,6 +31,17 @@ interface AssetLink {
   };
 }
 
+export async function generateMetadata(props: {
+  params: Promise<{ domain: string; key?: string[] }>;
+}) {
+  const { domain, key } = await props.params;
+
+  return constructMetadata({
+    title: `${domain}${key ? `/${decodeURIComponent(key.join("/"))}` : ""}`,
+    noIndex: true,
+  });
+}
+
 export default async function DeepLinkPreviewPage(props: {
   params: Promise<{ domain: string; key?: string[] }>;
 }) {
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/form.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/form.tsx
index ce1b6442362..e58fb94724c 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/form.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/form.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { AddEditDomainForm } from "@/ui/domains/add-edit-domain-form";
 import { useSearchParams } from "next/navigation";
 import { useOnboardingProduct } from "../../../use-onboarding-product";
@@ -18,6 +19,8 @@ export function Form() {
       }}
       enableDomainConfig={false}
       initialDomain={`${workspaceSlug}.com`}
+      submitTestId={testIds.onboarding.addDomain}
+      domainInputTestId={testIds.onboarding.domainInput}
     />
   );
 }
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/page.tsx
index f8e6c70005b..f77d83be2c2 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/custom/page.tsx
@@ -1,9 +1,11 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { StepPage } from "../../step-page";
 import { Form } from "./form";
 
 export default function Custom() {
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepDomainCustom}
       title="Connect a custom domain"
       description={
         <a
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
index 3daefe4e4bb..30924d84f76 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/default-domain-selector.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { OnboardingStep } from "@/lib/onboarding/types";
 import {
   Bolt,
@@ -77,6 +78,7 @@ export function DefaultDomainSelector() {
               : undefined
           }
           cta="Connect domain"
+          testId={testIds.onboarding.connectDomain}
         />
         {product === "partners" && (
           <DomainOption
@@ -131,7 +133,11 @@ export function DefaultDomainSelector() {
       </div>
       {product === "links" && (
         <div className="mx-auto mt-8 w-full max-w-sm">
-          <LaterButton next="plan" className="mt-4" />
+          <LaterButton
+            next="plan"
+            className="mt-4"
+            data-testid={testIds.onboarding.skipDomain}
+          />
         </div>
       )}
     </>
@@ -148,6 +154,7 @@ function DomainOption({
   bannerIcon: BannerIcon,
   bannerText,
   bannerVariant = "default",
+  testId,
 }: {
   step: OnboardingStep;
   icon: string;
@@ -161,6 +168,7 @@ function DomainOption({
   bannerIcon?: Icon;
   bannerText?: string;
   bannerVariant?: "default" | "recommended";
+  testId?: string;
 }) {
   const plausible = usePlausible();
   const { continueTo, isLoading, isSuccessful } = useOnboardingProgress();
@@ -233,6 +241,7 @@ function DomainOption({
             }}
             loading={isLoading || isSuccessful}
             text={cta}
+            data-testid={testId}
           />
         </div>
       </div>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/page.tsx
index beba4253cea..f638e0ad94e 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/domain/page.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { StepPage } from "../step-page";
 import { DefaultDomainSelector } from "./default-domain-selector";
 
@@ -11,6 +12,7 @@ export default async function Domain({
 
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepDomain}
       title="Add a custom domain"
       description={
         isPartners ? (
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/page.tsx
index ba00f99c299..80ea0ffac91 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { DubProductIcon } from "@dub/ui";
 import { capitalize } from "@dub/utils";
 import { LaterButton } from "../../later-button";
@@ -14,6 +15,7 @@ export default function Plan() {
 
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepPlan}
       title={
         <>
           Choose your{" "}
@@ -57,6 +59,7 @@ export default function Plan() {
           <LaterButton
             next="success"
             className="underline-offset-4 hover:underline"
+            data-testid={testIds.onboarding.freePlan}
           >
             Start for free, pick a plan later
           </LaterButton>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/plan-selector.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/plan-selector.tsx
index 1a0fd25b846..d7f7d0bae58 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/plan-selector.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/plan/plan-selector.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import X from "@/ui/shared/icons/x";
 import { UpgradePlanButton } from "@/ui/workspaces/upgrade-plan-button";
 import {
@@ -171,7 +172,7 @@ export function PlanSelector({ product }: { product: OnboardingProduct }) {
                         plan={plan.name.toLowerCase()}
                         period={period}
                         className="h-10 rounded-lg shadow-sm"
-                        data-testid={`onboarding-plan-cta-${plan.name.toLowerCase()}`}
+                        data-testid={testIds.onboarding.planCta(plan.name)}
                       />
                     )}
                     <button
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/page.tsx
index faa7a9b26ae..9234a64eda7 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/page.tsx
@@ -1,9 +1,11 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { StepPage } from "../step-page";
 import { ProductSelector } from "./product-selector";
 
 export default function Products() {
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepProducts}
       title="What do you want to do with Dub?"
       description="Choose how you'll use Dub to grow your business"
       className="max-w-none"
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/product-selector.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/product-selector.tsx
index 27e3521c117..dec4069c329 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/product-selector.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/products/product-selector.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { MarkdownDescription } from "@/ui/shared/markdown-description";
 import { Button, DubProductIcon } from "@dub/ui";
 import { capitalize } from "@dub/utils";
@@ -103,6 +104,7 @@ function ProductOption({
           }}
           loading={isLoading || isSuccessful}
           text={cta}
+          data-testid={testIds.onboarding.productCta(product)}
         />
       </div>
     </div>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/form.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/form.tsx
index 1259375c69a..4c493140814 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/form.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/form.tsx
@@ -2,9 +2,12 @@
 
 import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { onboardProgramAction } from "@/lib/actions/partners/onboard-program";
+import { testIds } from "@/lib/e2e/test-ids";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { ProgramData } from "@/lib/types";
 import { Button, FileUpload, Input, useMediaQuery } from "@dub/ui";
+import { toErrorMessage } from "@dub/utils";
 import { Plus } from "lucide-react";
 import { usePlausible } from "next-plausible";
 import { useAction } from "next-safe-action/hooks";
@@ -13,6 +16,9 @@ import { Controller, useFormContext } from "react-hook-form";
 import { toast } from "sonner";
 import { useOnboardingProgress } from "../../use-onboarding-progress";
 
+const { contentTypes, maxBytes } = UPLOAD_POLICIES.programLogos;
+const maxFileSizeMB = maxBytes / (1024 * 1024);
+
 export function Form() {
   const { isMobile } = useMediaQuery();
   const [isUploading, setIsUploading] = useState(false);
@@ -73,14 +79,20 @@ export function Form() {
         `/api/workspaces/${workspaceId}/upload-url`,
         {
           method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
           body: JSON.stringify({
-            folder: "program-logos",
+            folder: "programLogos",
+            contentType: file.type,
+            contentLength: file.size,
           }),
         },
       );
 
       if (!response.ok) {
-        throw new Error("Failed to get signed URL for upload.");
+        const { error } = await response.json();
+        throw new Error(toErrorMessage(error));
       }
 
       const { signedUrl, destinationUrl } = await response.json();
@@ -99,9 +111,11 @@ export function Form() {
       }
 
       setValue("logo", destinationUrl, { shouldDirty: true });
-      toast.success(`${file.name} uploaded!`);
+      toast.success(`${file.name} uploaded!`, {
+        testId: testIds.onboarding.programLogoUploaded,
+      });
     } catch (e) {
-      toast.error("Failed to upload logo");
+      toast.error(toErrorMessage(e));
     } finally {
       setIsUploading(false);
     }
@@ -132,7 +146,7 @@ export function Form() {
           autoFocus={!isMobile}
           className="max-w-full"
           error={errors.name?.message}
-          data-testid="onboarding-program-company-name"
+          data-testid={testIds.onboarding.programCompanyName}
         />
 
         <p className="text-content-subtle text-xs">
@@ -152,7 +166,7 @@ export function Form() {
             rules={{ required: true }}
             render={({ field }) => (
               <FileUpload
-                accept="images"
+                acceptedFileTypes={contentTypes}
                 className="size-14 rounded-lg"
                 iconClassName="size-4 text-neutral-800"
                 icon={Plus}
@@ -162,8 +176,8 @@ export function Form() {
                 readFile
                 onChange={({ file }) => handleUpload(file)}
                 content={null}
-                maxFileSizeMB={2}
-                data-testid="onboarding-program-logo"
+                maxFileSizeMB={maxFileSizeMB}
+                data-testid={testIds.onboarding.programLogo}
               />
             )}
           />
@@ -191,7 +205,7 @@ export function Form() {
               placeholder="https://"
               className="max-w-full"
               error={errors.url?.message}
-              data-testid="onboarding-program-destination-url"
+              data-testid={testIds.onboarding.programDestinationUrl}
             />
           )}
         />
@@ -219,7 +233,7 @@ export function Form() {
               type="email"
               className="max-w-full"
               error={errors.supportEmail?.message}
-              data-testid="onboarding-program-support-email"
+              data-testid={testIds.onboarding.programSupportEmail}
             />
           )}
         />
@@ -235,7 +249,7 @@ export function Form() {
         disabledTooltip={!isLoading ? disabledTooltip : undefined}
         text="Continue"
         className="w-full"
-        data-testid="onboarding-program-continue"
+        data-testid={testIds.onboarding.programContinue}
       />
     </form>
   );
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/page-client.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/page-client.tsx
index 67ac4f7dbe8..c8dab768071 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/page-client.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/page-client.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { ProgramOnboardingFormWrapper } from "@/ui/partners/program-onboarding-form-wrapper";
 import { cn } from "@dub/utils/src";
 import { StepPage } from "../step-page";
@@ -11,6 +12,7 @@ export function ProgramPageClient({ domain }: { domain: string }) {
 
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepProgram}
       title="Create your partner program"
       description="Set up your program in a few steps"
     >
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx
index ebd60d8cb02..4259c10fe8f 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { onboardProgramAction } from "@/lib/actions/partners/onboard-program";
+import { testIds } from "@/lib/e2e/test-ids";
 import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { ProgramData } from "@/lib/types";
@@ -448,7 +449,7 @@ export function Form() {
                 </span>
                 <input
                   id={rewardAmountInputId}
-                  data-testid="onboarding-reward-amount"
+                  data-testid={testIds.onboarding.rewardAmount}
                   className={cn(
                     "block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
                     type === "flat" ? "pl-6 pr-12" : "pr-7",
@@ -480,7 +481,7 @@ export function Form() {
         loading={isLoading}
         disabledTooltip={!isLoading ? disabledTooltip : undefined}
         type="submit"
-        data-testid="onboarding-reward-continue"
+        data-testid={testIds.onboarding.rewardContinue}
       />
     </form>
   );
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/page.tsx
index 2e503868086..a1d045f1b84 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/program/reward/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { ProgramOnboardingFormWrapper } from "@/ui/partners/program-onboarding-form-wrapper";
 import { cn } from "@dub/utils";
 import { StepPage } from "../../step-page";
@@ -11,6 +12,7 @@ export default function ProgramReward() {
 
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepReward}
       title="Create your default reward"
       description={
         <>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/step-page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/step-page.tsx
index 5d6d50af38a..05a335c58c1 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/step-page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/step-page.tsx
@@ -10,6 +10,7 @@ export function StepPage({
   paidPlanRequired,
   badge,
   className,
+  headingTestId,
 }: PropsWithChildren<{
   title: ReactNode;
   description: ReactNode;
@@ -19,6 +20,7 @@ export function StepPage({
     label: string;
   };
   className?: string;
+  headingTestId?: string;
 }>) {
   const BadgeIcon = badge?.icon ?? Crown;
 
@@ -36,7 +38,12 @@ export function StepPage({
           {badge?.label ?? "Paid plan required"}
         </div>
       )}
-      <h1 className="text-center text-xl font-semibold">{title}</h1>
+      <h1
+        className="text-center text-xl font-semibold"
+        data-testid={headingTestId}
+      >
+        {title}
+      </h1>
       <div className="mt-2 text-balance text-center text-base text-neutral-500">
         {description}
       </div>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx
index 433a2023548..46a03d139c3 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/success/page-client.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { DIRECT_DEBIT_PAYMENT_METHOD_TYPES } from "@/lib/constants/payouts";
+import { testIds } from "@/lib/e2e/test-ids";
 import { useSyncedLocalStorage } from "@/lib/hooks/use-synced-local-storage";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import useDomains from "@/lib/swr/use-domains";
@@ -111,7 +112,10 @@ export function SuccessPageClient({
             </div>
           </div>
         )}
-        <h1 className="text-pretty text-center text-xl font-semibold">
+        <h1
+          className="text-pretty text-center text-xl font-semibold"
+          data-testid={testIds.onboarding.workspaceCreated}
+        >
           The {workspace.name} workspace has been created
         </h1>
         <MarkdownDescription className="mt-2 text-pretty text-center text-base text-neutral-500">
@@ -125,6 +129,7 @@ export function SuccessPageClient({
             loading={isLoading || isSuccessful}
             text="Go to your dashboard"
             className="h-9 rounded-lg"
+            data-testid={testIds.onboarding.goToDashboard}
           />
         </div>
       </div>
@@ -135,7 +140,12 @@ export function SuccessPageClient({
           "animate-slide-up-fade motion-reduce:animate-fade-in [--offset:10px] [animation-delay:250ms] [animation-duration:0.5s] [animation-fill-mode:both]",
         )}
       >
-        <h3 className="text-content-emphasis font-semibold">Complete setup</h3>
+        <h3
+          className="text-content-emphasis font-semibold"
+          data-testid={testIds.onboarding.completeSetup}
+        >
+          Complete setup
+        </h3>
 
         <div className="divide-border-subtle border-border-subtle bg-bg-muted flex flex-col divide-y overflow-hidden rounded-lg border">
           {[
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/workspace/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/workspace/page.tsx
index 9030c76af96..79ec5648a20 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/workspace/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/(steps)/workspace/page.tsx
@@ -1,9 +1,11 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { StepPage } from "../step-page";
 import { Form } from "./form";
 
 export default function Workspace() {
   return (
     <StepPage
+      headingTestId={testIds.onboarding.stepWorkspace}
       title="Create your workspace"
       description={
         <>
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/later-button.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/later-button.tsx
index 0c1c2f0c072..e7a45295ca2 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/later-button.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/later-button.tsx
@@ -10,12 +10,18 @@ export function LaterButton({
   next,
   className,
   children,
-}: PropsWithChildren<{ next: OnboardingStep; className?: string }>) {
+  "data-testid": dataTestId,
+}: PropsWithChildren<{
+  next: OnboardingStep;
+  className?: string;
+  "data-testid"?: string;
+}>) {
   const { continueTo, isLoading, isSuccessful } = useOnboardingProgress();
 
   return (
     <button
       type="button"
+      data-testid={dataTestId}
       onClick={() => continueTo(next)}
       className={cn(
         "mx-auto flex w-fit items-center gap-2 text-center text-sm font-medium text-neutral-800 transition-colors enabled:hover:text-neutral-950",
diff --git a/apps/web/app/app.dub.co/(onboarding)/onboarding/welcome/page.tsx b/apps/web/app/app.dub.co/(onboarding)/onboarding/welcome/page.tsx
index 4c2b55add55..7e5d7ba766a 100644
--- a/apps/web/app/app.dub.co/(onboarding)/onboarding/welcome/page.tsx
+++ b/apps/web/app/app.dub.co/(onboarding)/onboarding/welcome/page.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { NewBackground } from "@/ui/shared/new-background";
 import { Wordmark } from "@dub/ui";
 import { cn } from "@dub/utils/src";
@@ -16,7 +17,10 @@ export default function Welcome() {
             <Wordmark className="relative h-24 sm:h-36" />
             <Gradient className="opacity-50 mix-blend-hard-light" />
           </div>
-          <h1 className="animate-slide-up-fade mt-14 text-xl font-semibold text-neutral-900 [--offset:10px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]">
+          <h1
+            className="animate-slide-up-fade mt-14 text-xl font-semibold text-neutral-900 [--offset:10px] [animation-delay:250ms] [animation-duration:1s] [animation-fill-mode:both]"
+            data-testid={testIds.onboarding.stepWelcome}
+          >
             Welcome to Dub
           </h1>
           <p className="animate-slide-up-fade mt-2 text-balance text-base text-neutral-500 [--offset:10px] [animation-delay:500ms] [animation-duration:1s] [animation-fill-mode:both]">
@@ -24,7 +28,11 @@ export default function Welcome() {
             convert to revenue.
           </p>
           <div className="animate-slide-up-fade mt-8 w-full [--offset:10px] [animation-delay:750ms] [animation-duration:1s] [animation-fill-mode:both]">
-            <NextButton text="Get started" step="workspace" />
+            <NextButton
+              text="Get started"
+              step="workspace"
+              data-testid={testIds.onboarding.getStarted}
+            />
           </div>
         </div>
       </div>
diff --git a/apps/web/app/app.dub.co/(share)/share/[dashboardId]/action.ts b/apps/web/app/app.dub.co/(share)/share/[dashboardId]/action.ts
index 92bf4bfacc7..6ab5f934b1e 100644
--- a/apps/web/app/app.dub.co/(share)/share/[dashboardId]/action.ts
+++ b/apps/web/app/app.dub.co/(share)/share/[dashboardId]/action.ts
@@ -20,7 +20,7 @@ export async function verifyPassword(_prevState: any, data: FormData) {
   }
 
   (await cookies()).set(`dub_password_${dashboardId}`, password, {
-    path: `/share/${dashboardId}`,
+    path: "/",
     httpOnly: true,
     secure: true,
   });
diff --git a/apps/web/app/app.dub.co/layout.tsx b/apps/web/app/app.dub.co/layout.tsx
index c9900f4fa06..741d0d243fb 100644
--- a/apps/web/app/app.dub.co/layout.tsx
+++ b/apps/web/app/app.dub.co/layout.tsx
@@ -1,23 +1,12 @@
 "use client";
 
-import { ModalProvider } from "@/ui/modals/modal-provider";
-import { Analytics as DubAnalytics } from "@dub/analytics/react";
 import { SessionProvider } from "next-auth/react";
-import { ReactNode } from "react";
+import { ReactNode, Suspense } from "react";
 
 export default function AppLayout({ children }: { children: ReactNode }) {
   return (
     <SessionProvider>
-      <DubAnalytics
-        apiHost="/_proxy/dub"
-        cookieOptions={{
-          domain: process.env.VERCEL === "1" ? ".dub.co" : "localhost",
-        }}
-        domainsConfig={{
-          refer: "refer.dub.co",
-        }}
-      />
-      <ModalProvider>{children}</ModalProvider>
+      <Suspense>{children}</Suspense>
     </SessionProvider>
   );
 }
diff --git a/apps/web/app/app.dub.co/marketplace/[[...segments]]/page.tsx b/apps/web/app/app.dub.co/marketplace/[[...segments]]/page.tsx
new file mode 100644
index 00000000000..04d0724d894
--- /dev/null
+++ b/apps/web/app/app.dub.co/marketplace/[[...segments]]/page.tsx
@@ -0,0 +1,89 @@
+import { getNetworkProgram } from "@/lib/fetchers/get-network-program";
+import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
+import { MarketplaceExternalRouter } from "@/ui/program-marketplace/external/marketplace-external-router";
+import { Analytics as DubAnalytics } from "@dub/analytics/react";
+import { APP_DOMAIN, constructMetadata } from "@dub/utils";
+import { Category } from "@prisma/client";
+import { Metadata } from "next";
+
+export {
+  generateStaticParams,
+  revalidate,
+} from "@/ui/program-marketplace/utils/default-exports";
+
+export async function generateMetadata(props: {
+  params: Promise<{ segments?: string[] }>;
+}): Promise<Metadata> {
+  const { segments = [] } = await props.params;
+  const pathname = `/marketplace${segments.length > 0 ? `/${segments.join("/")}` : ""}`;
+
+  const currentYear = new Date().getFullYear();
+
+  let title = `Best SaaS affiliate programs in ${currentYear}`;
+  let description = `Browse and apply to the best SaaS affiliate programs on Dub's Partner Network.`;
+  let image = "https://assets.dub.co/og/marketplace.jpg";
+
+  if (segments.length === 1 && segments[0] === "all") {
+    title = `Top SaaS affiliate programs in ${currentYear}`;
+  } else if (
+    segments.length === 1 &&
+    segments[0] !== "all" &&
+    segments[0] !== "popular"
+  ) {
+    const program = await getNetworkProgram({ slug: segments[0] });
+
+    if (program) {
+      title = `${program.name} Affiliate Program`;
+      description =
+        program.description ||
+        `Join the ${program.name} affiliate program on Dub's Program Marketplace.`;
+      image =
+        program.marketplaceHeaderImage ||
+        `${APP_DOMAIN}/api/og/program?slug=${program.slug}`;
+    }
+  } else if (segments.length === 2 && segments[0] === "c") {
+    const category = Object.values(Category).find(
+      (value) => value.toLowerCase() === segments[1],
+    );
+
+    if (category) {
+      // categoryMeta should always return a value, but just in case
+      const categoryMeta = PROGRAM_CATEGORIES_MAP[category];
+      const label = categoryMeta?.label ?? category.replaceAll("_", " ");
+      title = `Best ${label} SaaS Affiliate Programs in ${currentYear}`;
+      description =
+        categoryMeta?.listPageDescription ??
+        `Browse the best ${label} affiliate programs on Dub's Program Marketplace.`;
+      image = `${APP_DOMAIN}/api/og/program/categories?categorySlug=${category.toLowerCase()}`;
+    }
+  }
+
+  return constructMetadata({
+    title,
+    description,
+    image,
+    canonicalUrl: `https://dub.co${pathname.startsWith("/") ? pathname : `/${pathname}`}`,
+  });
+}
+
+export default async function MarketplaceExternalPage(props: {
+  params: Promise<{ segments?: string[] }>;
+}) {
+  const { segments = [] } = await props.params;
+
+  return (
+    <>
+      <DubAnalytics
+        apiHost="/_proxy/dub"
+        domainsConfig={{
+          refer: "refer.dub.co",
+          site: "site.dub.co",
+        }}
+        scriptProps={{
+          src: "/_proxy/dub/script.js",
+        }}
+      />
+      <MarketplaceExternalRouter segments={segments} />
+    </>
+  );
+}
diff --git a/apps/web/app/app.dub.co/marketplace/layout.tsx b/apps/web/app/app.dub.co/marketplace/layout.tsx
new file mode 100644
index 00000000000..1a1f6c4f132
--- /dev/null
+++ b/apps/web/app/app.dub.co/marketplace/layout.tsx
@@ -0,0 +1,33 @@
+import { MarketplaceExternalHeader } from "@/ui/program-marketplace/external/marketplace-external-header";
+import { Footer } from "@dub/ui";
+import { PropsWithChildren } from "react";
+
+export default function MarketplaceExternalLayout({
+  children,
+}: PropsWithChildren) {
+  return (
+    <div className="flex min-h-screen flex-col bg-white">
+      <MarketplaceExternalHeader />
+      <div className="relative flex flex-1 flex-col">
+        <MarketplaceExternalGridLines />
+        <main className="flex-1">{children}</main>
+        <div className="relative z-10 h-px w-full bg-neutral-200" />
+        <Footer className="border-t-0 md:rounded-t-none" />
+      </div>
+    </div>
+  );
+}
+
+function MarketplaceExternalGridLines() {
+  return (
+    <div
+      aria-hidden
+      className="pointer-events-none absolute inset-0 z-0 flex justify-center"
+    >
+      <div className="relative h-full w-full max-w-screen-xl">
+        <div className="absolute inset-y-0 left-0 w-px bg-neutral-200 [mask-image:linear-gradient(to_bottom,transparent,#000_96px)]" />
+        <div className="absolute inset-y-0 right-0 w-px bg-neutral-200 [mask-image:linear-gradient(to_bottom,transparent,#000_96px)]" />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/sitemap.ts b/apps/web/app/sitemap.ts
index 29dd44013d5..0871ace4bfd 100644
--- a/apps/web/app/sitemap.ts
+++ b/apps/web/app/sitemap.ts
@@ -1,6 +1,10 @@
 import { prisma } from "@/lib/prisma";
-import { PARTNERS_HOSTNAMES, SHORT_DOMAIN } from "@dub/utils";
-import { Prisma } from "@prisma/client";
+import {
+  getMarketplaceAllHref,
+  getMarketplaceCategoryHref,
+} from "@/ui/program-marketplace/utils/urls";
+import { isAppHostname, PARTNERS_HOSTNAMES, SHORT_DOMAIN } from "@dub/utils";
+import { Category, Prisma } from "@prisma/client";
 import { MetadataRoute } from "next";
 import { headers } from "next/headers";
 
@@ -8,7 +12,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const headersList = await headers();
   let domain = headersList.get("host") as string;
 
-  if (domain === "dub.localhost:8888" || domain.endsWith(".vercel.app")) {
+  if (domain === "dub.localhost:8888") {
     // for local development and preview URLs
     domain = SHORT_DOMAIN;
   }
@@ -39,10 +43,48 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     }));
   }
 
-  return [
+  const entries: MetadataRoute.Sitemap = [
     {
       url: `https://${domain}`,
       lastModified: new Date(),
     },
   ];
+
+  if (isAppHostname(domain)) {
+    const marketplacePrograms = await prisma.program.findMany({
+      where: {
+        addedToMarketplaceAt: {
+          not: null,
+        },
+      },
+      select: {
+        slug: true,
+        updatedAt: true,
+      },
+      orderBy: {
+        slug: "asc",
+      },
+    });
+
+    entries.push(
+      {
+        url: "https://dub.co/marketplace",
+        lastModified: new Date(),
+      },
+      {
+        url: `https://dub.co${getMarketplaceAllHref()}`,
+        lastModified: new Date(),
+      },
+      ...Object.values(Category).map((category) => ({
+        url: `https://dub.co${getMarketplaceCategoryHref(category)}`,
+        lastModified: new Date(),
+      })),
+      ...marketplacePrograms.map((program) => ({
+        url: `https://dub.co/marketplace/${program.slug}`,
+        lastModified: program.updatedAt,
+      })),
+    );
+  }
+
+  return entries;
 }
diff --git a/apps/web/lib/actions/confirm-email-change.ts b/apps/web/lib/actions/confirm-email-change.ts
index 48fecef3e7a..7ffb7988c55 100644
--- a/apps/web/lib/actions/confirm-email-change.ts
+++ b/apps/web/lib/actions/confirm-email-change.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { hashToken } from "@/lib/auth";
 import {
   assertCanConfirmEmailChange,
@@ -129,6 +130,14 @@ export const confirmEmailChangeAction = authUserActionClient
     const shouldSyncPlainCustomerEmail =
       !!data.syncIdentity || !data.isPartnerProfile;
 
+    // Whichever of the two partner branches above ran, if either. The email-only
+    // branch touches no partner and so has nothing to re-index.
+    const changedPartnerId = data.syncIdentity
+      ? data.partnerId
+      : data.isPartnerProfile
+        ? tokenIdentifier
+        : undefined;
+
     waitUntil(
       Promise.allSettled([
         sendEmail({
@@ -154,6 +163,12 @@ export const confirmEmailChangeAction = authUserActionClient
           : []),
 
         redis.del(`email-change-request:token:${tokenFound.token}`),
+
+        // Queue an index update because the partner email changed, which is
+        // searchable and the n-gram source.
+        ...(changedPartnerId
+          ? [queuePartnerSearchSync({ partnerIds: [changedPartnerId] })]
+          : []),
       ]),
     );
 
diff --git a/apps/web/lib/actions/partners/accept-program-invite.ts b/apps/web/lib/actions/partners/accept-program-invite.ts
index 48d54bf0731..1be682c170c 100644
--- a/apps/web/lib/actions/partners/accept-program-invite.ts
+++ b/apps/web/lib/actions/partners/accept-program-invite.ts
@@ -1,5 +1,6 @@
 "use server";
 
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
 import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
 import { generateDiscountCodeForPartner } from "@/lib/discounts/generate-discount-code-for-partner";
@@ -45,6 +46,9 @@ export const acceptProgramInviteAction = authPartnerActionClient
       },
     });
 
+    // Queue an index update because the enrollment status moved to approved.
+    waitUntil(queuePartnerSearchSync({ enrollmentIds: [enrollment.id] }));
+
     waitUntil(
       (async () => {
         const workspace = await prisma.project.findUnique({
@@ -54,6 +58,8 @@ export const acceptProgramInviteAction = authPartnerActionClient
           select: {
             id: true,
             webhookEnabled: true,
+            stripeConnectId: true,
+            shopifyStoreId: true,
           },
         });
 
@@ -72,7 +78,7 @@ export const acceptProgramInviteAction = authPartnerActionClient
         await Promise.allSettled([
           // 1. Generate discount code for partner (if enabled)
           generateDiscountCodeForPartner({
-            workspaceId: workspace.id,
+            workspace,
             partner: enrolledPartner,
           }),
           // 2. Send "partner.enrolled" webhook to workspace
diff --git a/apps/web/lib/actions/partners/approve-bounty-submission.ts b/apps/web/lib/actions/partners/approve-bounty-submission.ts
deleted file mode 100644
index 207064a6292..00000000000
--- a/apps/web/lib/actions/partners/approve-bounty-submission.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-"use server";
-
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { approveBountySubmission } from "@/lib/bounty/api/approve-bounty-submission";
-import { approveBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
-import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
-
-const inputSchema = approveBountySubmissionBodySchema.extend({
-  workspaceId: z.string(),
-  submissionId: z.string(),
-});
-
-// Approve a submission for a bounty
-export const approveBountySubmissionAction = authActionClient
-  .inputSchema(inputSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { workspace, user } = ctx;
-    const { submissionId, rewardAmount } = parsedInput;
-
-    throwIfNoPermission({
-      role: workspace.role,
-      requiredRoles: ["owner", "member"],
-    });
-
-    const programId = getDefaultProgramIdOrThrow(workspace);
-
-    await approveBountySubmission({
-      programId,
-      submissionId,
-      rewardAmount,
-      user,
-    });
-  });
diff --git a/apps/web/lib/actions/partners/archive-partner.ts b/apps/web/lib/actions/partners/archive-partner.ts
index 6bd4da46c61..a89fb80a5c2 100644
--- a/apps/web/lib/actions/partners/archive-partner.ts
+++ b/apps/web/lib/actions/partners/archive-partner.ts
@@ -1,6 +1,7 @@
 "use server";
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { prisma } from "@/lib/prisma";
@@ -46,20 +47,25 @@ export const archivePartnerAction = authActionClient
     });
 
     waitUntil(
-      trackActivityLog({
-        workspaceId: workspace.id,
-        programId,
-        resourceType: "partner",
-        resourceId: partnerId,
-        userId: user.id,
-        action:
-          status === "archived" ? "partner.archived" : "partner.unarchived",
-        changeSet: {
-          status: {
-            old: programEnrollment.status,
-            new: status,
+      Promise.allSettled([
+        trackActivityLog({
+          workspaceId: workspace.id,
+          programId,
+          resourceType: "partner",
+          resourceId: partnerId,
+          userId: user.id,
+          action:
+            status === "archived" ? "partner.archived" : "partner.unarchived",
+          changeSet: {
+            status: {
+              old: programEnrollment.status,
+              new: status,
+            },
           },
-        },
-      }),
+        }),
+
+        // Queue an index update because the enrollment status moved to archived
+        queuePartnerSearchSync({ partnerIds: [partnerId], programId }),
+      ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/ban-partner.ts b/apps/web/lib/actions/partners/ban-partner.ts
index 9fcc6f9e8b2..5d2a488a0d6 100644
--- a/apps/web/lib/actions/partners/ban-partner.ts
+++ b/apps/web/lib/actions/partners/ban-partner.ts
@@ -3,6 +3,7 @@
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { DubApiError } from "@/lib/api/errors";
 import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { qstash } from "@/lib/cron";
@@ -103,6 +104,7 @@ export const banPartner = async ({
       leadRewardId: null,
       saleRewardId: null,
       referralRewardId: null,
+      customRewardId: null,
       discountId: null,
     },
   });
@@ -141,6 +143,11 @@ export const banPartner = async ({
         },
       }),
 
+      // Queue an index update because the enrollment status moved to banned
+      queuePartnerSearchSync({
+        enrollmentIds: [programEnrollmentUpdated.id],
+      }),
+
       flagForFraud && flagForFraudReason
         ? prisma.fraudAlert.create({
             data: {
diff --git a/apps/web/lib/actions/partners/bulk-approve-partners.ts b/apps/web/lib/actions/partners/bulk-approve-partners.ts
index 0466c3562d9..2b95340e04a 100644
--- a/apps/web/lib/actions/partners/bulk-approve-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-approve-partners.ts
@@ -2,9 +2,10 @@
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
-import { triggerQStashWorkflow } from "@/lib/cron/qstash-workflow";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import { throwIfPartnersLimitExceeded } from "@/lib/partners/throw-if-partners-limit-exceeded";
 import { prisma } from "@/lib/prisma";
 import { bulkApprovePartnersSchema } from "@/lib/zod/schemas/partners";
@@ -67,6 +68,7 @@ export const bulkApprovePartnersAction = authActionClient
             leadRewardId: group.leadRewardId,
             saleRewardId: group.saleRewardId,
             referralRewardId: group.referralRewardId,
+            customRewardId: group.customRewardId,
             discountId: group.discountId,
           },
         });
@@ -142,15 +144,17 @@ export const bulkApprovePartnersAction = authActionClient
             })),
           ),
 
-          triggerQStashWorkflow(
+          dispatchWorkflows(
             updatedEnrollments.map(({ partnerId, programId }) => ({
-              workflowType: "partner-approved",
-              workflowLabel: partnerId,
-              body: {
+              name: "partner-approved-workflow",
+              payload: {
                 programId,
                 partnerId,
                 userId: user.id,
               },
+              options: {
+                label: partnerId,
+              },
             })),
           ),
 
@@ -159,6 +163,11 @@ export const bulkApprovePartnersAction = authActionClient
             programId: program.id,
             partnerIds: updatedEnrollments.map(({ partnerId }) => partnerId),
           }),
+
+          // Queue an index update because the enrollment statuses moved to approved
+          queuePartnerSearchSync({
+            enrollmentIds: updatedEnrollments.map(({ id }) => id),
+          }),
         ]);
       })(),
     );
diff --git a/apps/web/lib/actions/partners/bulk-archive-partners.ts b/apps/web/lib/actions/partners/bulk-archive-partners.ts
index 48b656daa77..1c81b5e185d 100644
--- a/apps/web/lib/actions/partners/bulk-archive-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-archive-partners.ts
@@ -1,6 +1,7 @@
 "use server";
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { prisma } from "@/lib/prisma";
 import {
@@ -65,21 +66,28 @@ export const bulkArchivePartnersAction = authActionClient
     });
 
     waitUntil(
-      trackActivityLog(
-        programEnrollments.map(({ partnerId, status }) => ({
-          workspaceId: workspace.id,
-          programId,
-          resourceType: "partner",
-          resourceId: partnerId,
-          userId: user.id,
-          action: "partner.archived",
-          changeSet: {
-            status: {
-              old: status,
-              new: "archived",
+      Promise.allSettled([
+        trackActivityLog(
+          programEnrollments.map(({ partnerId, status }) => ({
+            workspaceId: workspace.id,
+            programId,
+            resourceType: "partner",
+            resourceId: partnerId,
+            userId: user.id,
+            action: "partner.archived",
+            changeSet: {
+              status: {
+                old: status,
+                new: "archived",
+              },
             },
-          },
-        })),
-      ),
+          })),
+        ),
+
+        // Queue an index update because the enrollment statuses moved to
+        // archived. Scoped to the updateMany above, not the findMany, which is
+        // narrowed to ACTIVE_ENROLLMENT_STATUSES.
+        queuePartnerSearchSync({ partnerIds, programId }),
+      ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/bulk-ban-partners.ts b/apps/web/lib/actions/partners/bulk-ban-partners.ts
index 228436edf72..9df518f1c1a 100644
--- a/apps/web/lib/actions/partners/bulk-ban-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-ban-partners.ts
@@ -2,6 +2,7 @@
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { enqueueBatchJobs } from "@/lib/cron/enqueue-batch-jobs";
 import { prisma } from "@/lib/prisma";
@@ -72,6 +73,7 @@ export const bulkBanPartnersAction = authActionClient
         leadRewardId: null,
         saleRewardId: null,
         referralRewardId: null,
+        customRewardId: null,
         discountId: null,
       },
     });
@@ -91,6 +93,11 @@ export const bulkBanPartnersAction = authActionClient
 
     waitUntil(
       Promise.allSettled([
+        // Queue an index update because the enrollment statuses moved to banned
+        queuePartnerSearchSync({
+          enrollmentIds: programEnrollments.map(({ id }) => id),
+        }),
+
         trackActivityLog(
           programEnrollments.map(({ partnerId, status }) => ({
             workspaceId: workspace.id,
diff --git a/apps/web/lib/actions/partners/bulk-invite-partners.ts b/apps/web/lib/actions/partners/bulk-invite-partners.ts
index 496b531a3b8..321e428bdb4 100644
--- a/apps/web/lib/actions/partners/bulk-invite-partners.ts
+++ b/apps/web/lib/actions/partners/bulk-invite-partners.ts
@@ -4,15 +4,16 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { createId } from "@/lib/api/create-id";
 import { bulkCreateLinks } from "@/lib/api/links";
 import { getGroupRewardsAndBounties } from "@/lib/api/partners/get-group-rewards-and-bounties";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
 import { throwIfPartnersLimitExceeded } from "@/lib/partners/throw-if-partners-limit-exceeded";
 import { prisma } from "@/lib/prisma";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
 import { bulkInvitePartnersSchema } from "@/lib/zod/schemas/partners";
 import { sendBatchEmail } from "@dub/email";
 import ProgramInvite from "@dub/email/templates/program-invite";
-import { constructURLFromUTMParams, nanoid } from "@dub/utils";
+import { nanoid } from "@dub/utils";
 import { prettyPrint } from "@dub/utils/src";
 import slugify from "@sindresorhus/slugify";
 import { waitUntil } from "@vercel/functions";
@@ -121,7 +122,6 @@ export const bulkInvitePartnersAction = authActionClient
 
     const group = program.groups[0];
     const partnerGroupDefaultLinks = group.partnerGroupDefaultLinks;
-    const utmTemplate = group.utmTemplate;
 
     const invitedCount = await prisma.$transaction(async (tx) => {
       const { count: invitedCount } = await tx.programEnrollment.createMany({
@@ -135,6 +135,7 @@ export const bulkInvitePartnersAction = authActionClient
           leadRewardId: group.leadRewardId,
           saleRewardId: group.saleRewardId,
           referralRewardId: group.referralRewardId,
+          customRewardId: group.customRewardId,
           discountId: group.discountId,
         })),
         skipDuplicates: true,
@@ -177,21 +178,27 @@ export const bulkInvitePartnersAction = authActionClient
         // Create default links for the partners for each group default link
         for (const partnerGroupDefaultLink of partnerGroupDefaultLinks) {
           const links = await bulkCreateLinks({
-            links: partners.map((partner) => ({
-              domain: partnerGroupDefaultLink.domain,
-              key: `${slugify(partner.email!.split("@")[0])}-${nanoid(4)}`,
-              url: constructURLFromUTMParams(
-                partnerGroupDefaultLink.url,
-                extractUtmParams(utmTemplate),
-              ),
-              ...extractUtmParams(utmTemplate, { excludeRef: true }),
-              projectId: workspace.id,
-              programId: program.id,
-              partnerId: partner.id,
-              userId: user.id,
-              folderId: program.defaultFolderId,
-              partnerGroupDefaultLinkId: partnerGroupDefaultLink.id,
-            })),
+            links: partners.map((partner) => {
+              const key = `${slugify(partner.email!.split("@")[0])}-${nanoid(4)}`;
+
+              const link = {
+                domain: partnerGroupDefaultLink.domain,
+                key,
+                url: partnerGroupDefaultLink.url,
+                projectId: workspace.id,
+                programId: program.id,
+                partnerId: partner.id,
+                userId: user.id,
+                folderId: program.defaultFolderId,
+                partnerGroupDefaultLinkId: partnerGroupDefaultLink.id,
+              };
+
+              return applyGroupUtmToLink({
+                link,
+                utmTemplate: group.utmTemplate,
+                partnerName: partner.name,
+              });
+            }),
           });
 
           console.log(
@@ -199,6 +206,14 @@ export const bulkInvitePartnersAction = authActionClient
           );
         }
 
+        // Queue an index update because the partners were enrolled. createMany
+        // returns no IDs, so this passes partners and lets the job resolve
+        // them, after the default links exist.
+        await queuePartnerSearchSync({
+          partnerIds: partners.map(({ id }) => id),
+          programId,
+        });
+
         const { rewards, bounties } = await getGroupRewardsAndBounties({
           programId,
           groupId: groupId || program.defaultGroupId,
diff --git a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
index d78472944e7..66d4506ef7f 100644
--- a/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
+++ b/apps/web/lib/actions/partners/bulk-reject-partner-applications.ts
@@ -2,6 +2,7 @@
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
 import { prisma } from "@/lib/prisma";
@@ -65,6 +66,7 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
           leadRewardId: null,
           saleRewardId: null,
           referralRewardId: null,
+          customRewardId: null,
           discountId: null,
         },
       });
@@ -89,6 +91,11 @@ export const bulkRejectPartnerApplicationsAction = authActionClient
     waitUntil(
       (async () => {
         await Promise.allSettled([
+          // Queue an index update because the enrollment statuses moved to rejected
+          queuePartnerSearchSync({
+            enrollmentIds: programEnrollments.map(({ id }) => id),
+          }),
+
           trackActivityLog(
             programEnrollments.map(({ partner }) => ({
               workspaceId: workspace.id,
diff --git a/apps/web/lib/actions/partners/create-clawback.ts b/apps/web/lib/actions/partners/create-clawback.ts
deleted file mode 100644
index 5372d8d10f1..00000000000
--- a/apps/web/lib/actions/partners/create-clawback.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-"use server";
-
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
-import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
-import { createClawbackSchema } from "@/lib/zod/schemas/commissions";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
-
-export const createClawbackAction = authActionClient
-  .inputSchema(createClawbackSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { workspace, user } = ctx;
-    const programId = getDefaultProgramIdOrThrow(workspace);
-
-    throwIfNoPermission({
-      role: workspace.role,
-      requiredRoles: ["owner", "member"],
-    });
-
-    const { partnerId, amount, description } = parsedInput;
-
-    await getProgramEnrollmentOrThrow({
-      programId,
-      partnerId,
-      include: {},
-    });
-
-    await queuePartnerCommissionCreation({
-      event: "custom",
-      partnerId,
-      programId,
-      description,
-      amount: -amount,
-      quantity: 1,
-      userId: user.id,
-    });
-  });
diff --git a/apps/web/lib/actions/partners/create-discount.ts b/apps/web/lib/actions/partners/create-discount.ts
index 2dbcc188d62..c702528436d 100644
--- a/apps/web/lib/actions/partners/create-discount.ts
+++ b/apps/web/lib/actions/partners/create-discount.ts
@@ -4,12 +4,13 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { createId } from "@/lib/api/create-id";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { qstash } from "@/lib/cron";
 import { getDiscountProvider } from "@/lib/discounts/discount-provider";
+import { attachDiscountJob } from "@/lib/jobs/handlers/attach-discount-job";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import { DubDiscountAttributes } from "@/lib/stripe/coupon-discount-converter";
 import { createDiscountSchema } from "@/lib/zod/schemas/discount";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { DiscountProvider } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { authActionClient } from "../safe-action";
@@ -28,6 +29,7 @@ export const createDiscountAction = authActionClient
       couponTestId,
       groupId,
       autoProvision,
+      isDefault,
     } = parsedInput;
 
     throwIfNoPermission({
@@ -35,6 +37,13 @@ export const createDiscountAction = authActionClient
       requiredRoles: ["owner", "member"],
     });
 
+    if (
+      !isDefault &&
+      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+    ) {
+      throw new Error(PARTNER_LEVEL_REWARDS_PLAN_ERROR);
+    }
+
     const programId = getDefaultProgramIdOrThrow(workspace);
 
     const group = await getGroupOrThrow({
@@ -42,10 +51,8 @@ export const createDiscountAction = authActionClient
       programId,
     });
 
-    if (group.discountId) {
-      throw new Error(
-        `You can't create a discount for this group because it already has a discount.`,
-      );
+    if (isDefault && group.discountId) {
+      throw new Error("This group already has a default discount.");
     }
 
     const discountProvider = getDiscountProvider(provider);
@@ -72,88 +79,74 @@ export const createDiscountAction = authActionClient
       });
     }
 
-    // Create the discount and update the group and program enrollment
+    // Create the discount and assign it to the group when it is the default
     const discount = await prisma.$transaction(async (tx) => {
       const discount = await tx.discount.create({
         data: {
           id: createId({ prefix: "disc_" }),
           programId,
+          groupId,
           amount,
           type,
           maxDuration,
           provider,
-          couponId: coupon?.id || couponId || null,
-          ...(couponTestId && { couponTestId }),
+          couponId:
+            provider === DiscountProvider.stripe
+              ? coupon?.id || couponId || null
+              : null,
+          ...(provider === DiscountProvider.stripe &&
+            couponTestId && { couponTestId }),
           ...(autoProvision && { autoProvisionEnabledAt: new Date() }),
         },
       });
 
-      await tx.partnerGroup.update({
-        where: {
-          id: groupId,
-        },
-        data: {
-          discountId: discount.id,
-        },
-      });
-
-      await tx.programEnrollment.updateMany({
-        where: {
-          groupId,
-        },
-        data: {
-          discountId: discount.id,
-        },
-      });
-
-      await tx.discountCode.updateMany({
-        where: {
-          programEnrollment: {
-            groupId,
+      if (isDefault) {
+        const { count } = await tx.partnerGroup.updateMany({
+          where: {
+            id: groupId,
+            discountId: null,
           },
-        },
-        data: {
-          discountId: discount.id,
-        },
-      });
+          data: {
+            discountId: discount.id,
+          },
+        });
+
+        // This means that the group already has a default discount
+        if (count === 0) {
+          throw new Error("This group already has a default discount.");
+        }
+      }
 
       return discount;
     });
 
+    // No need to attach the discount to the group if it is not the default
+    // because the default discount is attached to the group when the discount is created
+    if (isDefault) {
+      await attachDiscountJob.dispatch(
+        { discountId: discount.id },
+        { label: discount.id },
+      );
+    }
+
     waitUntil(
-      Promise.allSettled([
-        qstash.publishJSON({
-          url: `${APP_DOMAIN_WITH_NGROK}/api/cron/links/invalidate-for-discounts`,
-          body: {
-            groupId,
+      recordAuditLog({
+        workspaceId: workspace.id,
+        programId,
+        action: "discount.created",
+        description: `Discount ${discount.id} created`,
+        actor: user,
+        targets: [
+          {
+            type: "discount",
+            id: discount.id,
+            metadata: discount,
           },
-        }),
-
-        recordAuditLog({
-          workspaceId: workspace.id,
-          programId,
-          action: "discount.created",
-          description: `Discount ${discount.id} created`,
-          actor: user,
-          targets: [
-            {
-              type: "discount",
-              id: discount.id,
-              metadata: discount,
-            },
-          ],
-        }),
-
-        ...(discount.autoProvisionEnabledAt
-          ? [
-              qstash.publishJSON({
-                url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,
-                body: {
-                  discountId: discount.id,
-                },
-              }),
-            ]
-          : []),
-      ]),
+        ],
+      }),
     );
+
+    return {
+      id: discount.id,
+    };
   });
diff --git a/apps/web/lib/actions/partners/create-program-application.ts b/apps/web/lib/actions/partners/create-program-application.ts
index 9a6b4d834d7..4543b86b02c 100644
--- a/apps/web/lib/actions/partners/create-program-application.ts
+++ b/apps/web/lib/actions/partners/create-program-application.ts
@@ -4,11 +4,14 @@ import { createId } from "@/lib/api/create-id";
 import { isCI, isLocalDev } from "@/lib/api/environment";
 import { detectAndRecordFraudApplication } from "@/lib/api/fraud/detect-record-fraud-application";
 import { notifyPartnerApplication } from "@/lib/api/partners/notify-partner-application";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getIP } from "@/lib/api/utils/get-ip";
 import { markApplicationEventSubmitted } from "@/lib/application-events/update-application-event";
 import { getApplicationEventCookieName } from "@/lib/application-events/utils";
 import { getSession } from "@/lib/auth";
 import { qstash } from "@/lib/cron";
+import { autoApprovePartnerJob } from "@/lib/jobs/handlers/auto-approve-partner-job";
+import { autoRejectPartnerJob } from "@/lib/jobs/handlers/auto-reject-partner-job";
 import { getNetworkProfileChecklistProgress } from "@/lib/network/get-network-profile-checklist-progress";
 import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
 import {
@@ -20,7 +23,8 @@ import {
   ProgramApplicationFormData,
   ProgramApplicationFormDataWithValues,
 } from "@/lib/types";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { partnerApplicationWebhookSchema } from "@/lib/zod/schemas/program-application";
 import { programApplicationFormWebsiteAndSocialsFieldWithValueSchema } from "@/lib/zod/schemas/program-application-form";
@@ -121,13 +125,10 @@ export const createProgramApplicationAction = actionClient
     const { programId, groupId, inAppApplication } = parsedInput;
 
     // Limit to 3 requests per minute per program per IP
-    const { success } = await ratelimit(3, "1 m").limit(
-      `create-program-application:${programId}:${await getIP()}`,
-    );
-
-    if (!success) {
-      throw new Error("Too many requests. Please try again later.");
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.createProgramApplication,
+      identifier: [programId, await getIP()],
+    });
 
     const program = await prisma.program.findUniqueOrThrow({
       where: {
@@ -277,25 +278,16 @@ async function createApplicationAndEnrollment({
       );
     }
 
-    const qstashResponse = await qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/auto-reject`,
-      delay: 30 * 60, // 30 minutes
-      body: {
+    await autoRejectPartnerJob.dispatch(
+      {
         programId: program.id,
         partnerId: partner.id,
       },
-    });
-
-    if (qstashResponse.messageId) {
-      console.log(
-        `The partner did not meet the eligibility requirements for this program. Auto-reject job enqueued successfully.`,
-        {
-          ...qstashResponse,
-          programId: program.id,
-          partnerId: partner.id,
-        },
-      );
-    }
+      {
+        delay: 30 * 60, // 30 minutes
+        label: partner.id,
+      },
+    );
   }
 
   const applicationId = createId({ prefix: "pga_" });
@@ -323,6 +315,7 @@ async function createApplicationAndEnrollment({
         leadRewardId: group.leadRewardId,
         saleRewardId: group.saleRewardId,
         referralRewardId: group.referralRewardId,
+        customRewardId: group.customRewardId,
         discountId: group.discountId,
       },
     }),
@@ -347,13 +340,15 @@ async function createApplicationAndEnrollment({
 
         // Auto-approve the partner if the group has auto-approval enabled
         group.autoApprovePartnersEnabledAt
-          ? qstash.publishJSON({
-              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/auto-approve`,
-              body: {
+          ? autoApprovePartnerJob.dispatch(
+              {
                 programId: program.id,
                 partnerId: partner.id,
               },
-            })
+              {
+                label: partner.id,
+              },
+            )
           : Promise.resolve(null),
 
         // Send "partner.application_submitted" webhook
@@ -382,6 +377,9 @@ async function createApplicationAndEnrollment({
         }),
 
         markApplicationEventSubmitted(programEnrollment),
+
+        // Queue an index update because a new pending enrollment was created.
+        queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
       ]);
     })(),
   );
diff --git a/apps/web/lib/actions/partners/create-program.ts b/apps/web/lib/actions/partners/create-program.ts
index 4443c6bd973..e138ad47c2c 100644
--- a/apps/web/lib/actions/partners/create-program.ts
+++ b/apps/web/lib/actions/partners/create-program.ts
@@ -20,7 +20,13 @@ import { sendEmail } from "@dub/email";
 import ProgramInvite from "@dub/email/templates/program-invite";
 import ProgramWelcome from "@dub/email/templates/program-welcome";
 import TrialStartedEmail from "@dub/email/templates/trial/trial-started";
-import { getDomainWithoutWWW, isLegacyBusinessPlan, nanoid } from "@dub/utils";
+import {
+  capitalize,
+  getDomainWithoutWWW,
+  isLegacyBusinessPlan,
+  log,
+  nanoid,
+} from "@dub/utils";
 import { Program, Project, User } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { redirect } from "next/navigation";
@@ -149,6 +155,7 @@ export const createProgram = async ({
             rewards: {
               create: {
                 id: createId({ prefix: "rw_" }),
+                groupId: defaultGroupId,
                 type,
                 amountInCents: type === "flat" ? amountInCents : null,
                 amountInPercentage:
@@ -304,6 +311,15 @@ export const createProgram = async ({
           },
         ],
       }),
+
+      log({
+        message: `:tada: New program created: ${
+          program.url
+            ? `<${program.url}|*${program.name}*>`
+            : `*${program.name}*`
+        } (\`${program.slug}\`) → *${capitalize(workspace.plan)}* plan`,
+        type: "alerts",
+      }),
     ]),
   );
 
diff --git a/apps/web/lib/actions/partners/create-reward.ts b/apps/web/lib/actions/partners/create-reward.ts
index 948315c6c11..2a3e1f99998 100644
--- a/apps/web/lib/actions/partners/create-reward.ts
+++ b/apps/web/lib/actions/partners/create-reward.ts
@@ -8,8 +8,10 @@ import { serializeReward } from "@/lib/api/partners/serialize-reward";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { queueRewardProcessing } from "@/lib/api/rewards/queue-reward-processing";
 import { validateReward } from "@/lib/api/rewards/validate-reward";
+import { getFeatureFlags } from "@/lib/edge-config";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import {
   createRewardSchema,
   REWARD_EVENT_COLUMN_MAPPING,
@@ -38,6 +40,7 @@ export const createRewardAction = authActionClient
       spendLimitAmount,
       spendLimitInterval,
       activityDescription,
+      isDefault,
     } = parsedInput;
 
     throwIfNoPermission({
@@ -46,11 +49,8 @@ export const createRewardAction = authActionClient
     });
 
     const programId = getDefaultProgramIdOrThrow(workspace);
-    const {
-      canUseAdvancedRewardLogic,
-      canSetRewardSpendLimit,
-      canCreateReferralReward,
-    } = getPlanCapabilities(workspace.plan);
+    const { canUseAdvancedRewardLogic, canCreateReferralReward } =
+      getPlanCapabilities(workspace.plan);
 
     if (event === "referral" && !canCreateReferralReward) {
       throw new Error(
@@ -58,16 +58,24 @@ export const createRewardAction = authActionClient
       );
     }
 
+    if (!isDefault && !canUseAdvancedRewardLogic) {
+      throw new Error(PARTNER_LEVEL_REWARDS_PLAN_ERROR);
+    }
+
     if (modifiers && !canUseAdvancedRewardLogic) {
       throw new Error(
         "Advanced reward structures are only available on the Advanced plan and above.",
       );
     }
 
-    if ((spendLimitAmount || spendLimitInterval) && !canSetRewardSpendLimit) {
-      throw new Error(
-        "Spend limits are only available on the Enterprise plan.",
-      );
+    if (spendLimitAmount || spendLimitInterval) {
+      const flags = await getFeatureFlags({
+        workspaceId: workspace.id,
+      });
+
+      if (!flags?.rewardSpendLimit) {
+        throw new Error("Spend limits are not enabled on your workspace.");
+      }
     }
 
     const group = await getGroupOrThrow({
@@ -77,10 +85,8 @@ export const createRewardAction = authActionClient
 
     const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[event];
 
-    if (group[rewardIdColumn]) {
-      throw new Error(
-        `You can't create a ${event} reward for this group because it already has a ${event} reward.`,
-      );
+    if (isDefault && group[rewardIdColumn]) {
+      throw new Error(`This group already has a default ${event} reward.`);
     }
 
     validateReward(parsedInput);
@@ -90,6 +96,7 @@ export const createRewardAction = authActionClient
         data: {
           id: createId({ prefix: "rw_" }),
           programId,
+          groupId,
           event,
           type,
           maxDuration,
@@ -111,31 +118,41 @@ export const createRewardAction = authActionClient
         },
       });
 
-      await tx.partnerGroup.update({
-        where: {
-          id: groupId,
-        },
-        data: {
-          [rewardIdColumn]: reward.id,
-        },
-      });
+      if (isDefault) {
+        const { count } = await tx.partnerGroup.updateMany({
+          where: {
+            id: groupId,
+            [rewardIdColumn]: null,
+          },
+          data: {
+            [rewardIdColumn]: reward.id,
+          },
+        });
+
+        // This means that the group already has a default reward
+        if (count === 0) {
+          throw new Error(`This group already has a default ${event} reward.`);
+        }
+      }
 
       return reward;
     });
 
-    await queueRewardProcessing({
-      event: "reward-created",
-      groupId,
-      occurredAt: new Date().toISOString(),
-      rewardSnapshot: {
-        id: reward.id,
-        event: reward.event,
-        description: formatRewardDescription(serializeReward(reward), {
-          includeEarnPrefix: false,
-        }),
-        activityDescription,
-      },
-    });
+    if (isDefault) {
+      await queueRewardProcessing({
+        event: "reward-created",
+        groupId,
+        occurredAt: new Date().toISOString(),
+        rewardSnapshot: {
+          id: reward.id,
+          event: reward.event,
+          description: formatRewardDescription(serializeReward(reward), {
+            includeEarnPrefix: false,
+          }),
+          activityDescription,
+        },
+      });
+    }
 
     waitUntil(
       Promise.allSettled([
@@ -167,4 +184,8 @@ export const createRewardAction = authActionClient
         }),
       ]),
     );
+
+    return {
+      id: reward.id,
+    };
   });
diff --git a/apps/web/lib/actions/partners/decline-program-invite.ts b/apps/web/lib/actions/partners/decline-program-invite.ts
index fd874301507..cdef6fe1e4a 100644
--- a/apps/web/lib/actions/partners/decline-program-invite.ts
+++ b/apps/web/lib/actions/partners/decline-program-invite.ts
@@ -1,6 +1,8 @@
 "use server";
 
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { prisma } from "@/lib/prisma";
+import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
 
@@ -14,7 +16,7 @@ export const declineProgramInviteAction = authPartnerActionClient
     const { partner } = ctx;
     const { programId } = parsedInput;
 
-    await prisma.programEnrollment.update({
+    const enrollment = await prisma.programEnrollment.update({
       where: {
         partnerId_programId: {
           partnerId: partner.id,
@@ -26,4 +28,7 @@ export const declineProgramInviteAction = authPartnerActionClient
         status: "declined",
       },
     });
+
+    // Queue an index update because the enrollment status moved to declined.
+    waitUntil(queuePartnerSearchSync({ enrollmentIds: [enrollment.id] }));
   });
diff --git a/apps/web/lib/actions/partners/delete-discount.ts b/apps/web/lib/actions/partners/delete-discount.ts
index 4a4c48843ca..2856731141e 100644
--- a/apps/web/lib/actions/partners/delete-discount.ts
+++ b/apps/web/lib/actions/partners/delete-discount.ts
@@ -3,10 +3,9 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { qstash } from "@/lib/cron";
-import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
+import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { authActionClient } from "../safe-action";
@@ -35,71 +34,40 @@ export const deleteDiscountAction = authActionClient
       discountId,
     });
 
-    // Cache discount codes to delete them later
-    const discountCodes = await prisma.discountCode.findMany({
-      where: {
-        discountId: discount.id,
-      },
-      select: {
-        id: true,
-        code: true,
-        programId: true,
-        discount: {
-          select: {
-            provider: true,
-          },
-        },
-      },
-    });
-
-    const group = await prisma.$transaction(async (tx) => {
-      const group = await tx.partnerGroup.update({
+    await prisma.$transaction(async (tx) => {
+      // Using updateMany otherwise this would fail if the discount is not a group-level discount
+      await tx.partnerGroup.updateMany({
         where: {
-          discountId: discount.id,
+          discountId,
         },
         data: {
           discountId: null,
         },
       });
 
-      await tx.programEnrollment.updateMany({
+      await tx.discount.update({
         where: {
-          discountId: discount.id,
+          id: discountId,
         },
         data: {
-          discountId: null,
-        },
-      });
-
-      await tx.discountCode.updateMany({
-        where: {
-          discountId: discount.id,
-        },
-        data: {
-          discountId: null,
-        },
-      });
-
-      await tx.discount.delete({
-        where: {
-          id: discount.id,
+          programId: null,
         },
       });
+    });
 
-      return group;
+    await dispatchWorkflows({
+      name: "detach-discount-workflow",
+      payload: {
+        programId,
+        discountId,
+      },
+      options: {
+        label: discountId,
+      },
     });
 
     waitUntil(
       Promise.allSettled([
-        qstash.publishJSON({
-          url: `${APP_DOMAIN_WITH_NGROK}/api/cron/links/invalidate-for-discounts`,
-          body: {
-            groupId: group.id,
-          },
-        }),
-
-        deleteDiscountCodes(discountCodes),
-
         recordAuditLog({
           workspaceId: workspace.id,
           programId,
@@ -114,6 +82,14 @@ export const deleteDiscountAction = authActionClient
             },
           ],
         }),
+
+        // Expire cached links immediately — edge ignores soft-deleted rows, but
+        // Redis may still serve the pre-delete discount until detach finishes.
+        invalidateLinksForDiscountsJob.dispatch({
+          by: "discount",
+          programId,
+          discountId,
+        }),
       ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/delete-program-invite.ts b/apps/web/lib/actions/partners/delete-program-invite.ts
index efc0923569a..c73058c1c98 100644
--- a/apps/web/lib/actions/partners/delete-program-invite.ts
+++ b/apps/web/lib/actions/partners/delete-program-invite.ts
@@ -2,6 +2,7 @@
 
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { prisma } from "@/lib/prisma";
 import { waitUntil } from "@vercel/functions";
@@ -100,19 +101,24 @@ export const deleteProgramInviteAction = authActionClient
     ]);
 
     waitUntil(
-      recordAuditLog({
-        workspaceId: workspace.id,
-        programId,
-        action: "partner.invite_deleted",
-        description: `Partner ${partner.id} invite deleted`,
-        actor: user,
-        targets: [
-          {
-            type: "partner",
-            id: partner.id,
-            metadata: partner,
-          },
-        ],
-      }),
+      Promise.allSettled([
+        recordAuditLog({
+          workspaceId: workspace.id,
+          programId,
+          action: "partner.invite_deleted",
+          description: `Partner ${partner.id} invite deleted`,
+          actor: user,
+          targets: [
+            {
+              type: "partner",
+              id: partner.id,
+              metadata: partner,
+            },
+          ],
+        }),
+
+        // Queue an index update because the invited enrollment was deleted.
+        queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
+      ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/delete-reward.ts b/apps/web/lib/actions/partners/delete-reward.ts
index 20d05018b1b..629abe7c118 100644
--- a/apps/web/lib/actions/partners/delete-reward.ts
+++ b/apps/web/lib/actions/partners/delete-reward.ts
@@ -37,56 +37,66 @@ export const deleteRewardAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const reward = await getRewardOrThrow({
+    const { partnerGroup, ...reward } = await getRewardOrThrow({
       rewardId,
       programId,
+      include: {
+        partnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+      },
     });
 
     const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[reward.event];
 
-    const { partnerGroup, deletedReward } = await prisma.$transaction(
-      async (tx) => {
-        const partnerGroup = await tx.partnerGroup.update({
-          // @ts-ignore
-          where: {
-            [rewardIdColumn]: reward.id,
-          },
-          data: {
-            [rewardIdColumn]: null,
-          },
-        });
-
-        // soft delete reward, we will hard delete it in the cron job
-        const deletedReward = await tx.reward.update({
-          where: {
-            id: reward.id,
-          },
-          data: {
-            programId: null,
-          },
-        });
+    await prisma.$transaction(async (tx) => {
+      await tx.partnerGroup.updateMany({
+        where: {
+          [rewardIdColumn]: reward.id,
+        },
+        data: {
+          [rewardIdColumn]: null,
+        },
+      });
 
-        return {
-          partnerGroup,
-          deletedReward,
-        };
-      },
-    );
+      await tx.linkReward.updateMany({
+        where: {
+          [rewardIdColumn]: reward.id,
+        },
+        data: {
+          [rewardIdColumn]: null,
+        },
+      });
 
-    await queueRewardProcessing({
-      event: "reward-deleted",
-      groupId: partnerGroup.id,
-      occurredAt: new Date().toISOString(),
-      rewardSnapshot: {
-        id: deletedReward.id,
-        event: deletedReward.event,
-        description: formatRewardDescription(serializeReward(deletedReward), {
-          includeEarnPrefix: false,
-        }),
-        activityDescription,
-      },
+      // soft delete reward, we will hard delete it in the cron job
+      await tx.reward.update({
+        where: {
+          id: reward.id,
+        },
+        data: {
+          programId: null,
+        },
+      });
     });
 
+    if (partnerGroup) {
+      await queueRewardProcessing({
+        event: "reward-deleted",
+        groupId: partnerGroup.id,
+        occurredAt: new Date().toISOString(),
+        rewardSnapshot: {
+          id: reward.id,
+          event: reward.event,
+          description: formatRewardDescription(serializeReward(reward), {
+            includeEarnPrefix: false,
+          }),
+          activityDescription,
+        },
+      });
+    }
+
     waitUntil(
       Promise.allSettled([
         recordAuditLog({
@@ -99,7 +109,7 @@ export const deleteRewardAction = authActionClient
             {
               type: "reward",
               id: rewardId,
-              metadata: reward,
+              metadata: serializeReward(reward),
             },
           ],
         }),
@@ -110,7 +120,7 @@ export const deleteRewardAction = authActionClient
           userId: user.id,
           resourceId: reward.id,
           parentResourceType: "group",
-          parentResourceId: partnerGroup.id,
+          parentResourceId: partnerGroup?.id,
           old: reward,
           new: null,
           description: activityDescription,
diff --git a/apps/web/lib/actions/partners/merge-partner-accounts.ts b/apps/web/lib/actions/partners/merge-partner-accounts.ts
index afeba176f78..a727605aa29 100644
--- a/apps/web/lib/actions/partners/merge-partner-accounts.ts
+++ b/apps/web/lib/actions/partners/merge-partner-accounts.ts
@@ -1,13 +1,12 @@
 "use server";
 
 import { generateOTP } from "@/lib/auth/utils";
-import { qstash } from "@/lib/cron";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import { prisma } from "@/lib/prisma";
 import { ratelimit, redis } from "@/lib/upstash";
 import { emailSchema } from "@/lib/zod/schemas/auth";
 import { sendBatchEmail } from "@dub/email";
 import VerifyEmailForAccountMerge from "@dub/email/templates/verify-email-for-account-merge";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
 
@@ -341,12 +340,19 @@ const mergeAccounts = async ({ userId }: { userId: string }) => {
 
   const { sourceEmail, targetEmail } = accounts;
 
-  await qstash.publishJSON({
-    url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/merge-accounts`,
-    body: {
+  await dispatchWorkflows({
+    name: "merge-partner-accounts-workflow",
+    payload: {
       userId,
       sourceEmail,
       targetEmail,
     },
+    options: {
+      flowControl: {
+        key: userId,
+        parallelism: 1,
+      },
+      label: userId,
+    },
   });
 };
diff --git a/apps/web/lib/actions/partners/onboard-partner.ts b/apps/web/lib/actions/partners/onboard-partner.ts
index a7441e302d3..797a71e36b7 100644
--- a/apps/web/lib/actions/partners/onboard-partner.ts
+++ b/apps/web/lib/actions/partners/onboard-partner.ts
@@ -3,8 +3,10 @@
 import { createId } from "@/lib/api/create-id";
 import { isCI, isLocalDev } from "@/lib/api/environment";
 import { generatePartnerUsername } from "@/lib/api/partners/generate-partner-username";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { markApplicationEventSubmittedNetwork } from "@/lib/application-events/mark-application-event-submitted-network";
 import { completeProgramApplications } from "@/lib/partners/complete-program-applications";
+import { dispatchGroupUtmSyncForPartner } from "@/lib/partners/dispatch-partner-utm-sync";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import { onboardPartnerSchema } from "@/lib/zod/schemas/partners";
@@ -29,6 +31,7 @@ export const onboardPartnerAction = authUserActionClient
       },
       select: {
         id: true,
+        name: true,
         username: true,
         country: true,
         profileType: true,
@@ -124,6 +127,14 @@ export const onboardPartnerAction = authUserActionClient
 
         // Mark the application event as submitted for the `network` program
         markApplicationEventSubmittedNetwork(updatedPartner),
+
+        existingPartner && existingPartner.name !== updatedPartner.name
+          ? dispatchGroupUtmSyncForPartner(updatedPartner.id)
+          : undefined,
+
+        // Queue an index update because onboarding set the partner name,
+        // country and description.
+        queuePartnerSearchSync({ partnerIds: [updatedPartner.id] }),
       ]),
     );
 
diff --git a/apps/web/lib/actions/partners/program-resources/get-program-resource-upload-url.ts b/apps/web/lib/actions/partners/program-resources/get-program-resource-upload-url.ts
index 1259f02ecbb..698514a36ea 100644
--- a/apps/web/lib/actions/partners/program-resources/get-program-resource-upload-url.ts
+++ b/apps/web/lib/actions/partners/program-resources/get-program-resource-upload-url.ts
@@ -2,14 +2,16 @@
 
 import { createId } from "@/lib/api/create-id";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { prisma } from "@/lib/prisma";
-import { storage } from "@/lib/storage";
-import { nanoid, R2_URL } from "@dub/utils";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { nanoid } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
 import * as z from "zod/v4";
 import { authActionClient } from "../../safe-action";
 import { throwIfNoPermission } from "../../throw-if-no-permission";
-import { MAX_PROGRAM_RESOURCE_FILE_SIZE_BYTES } from "./constants";
 
 const schema = z.object({
   workspaceId: z.string(),
@@ -19,57 +21,55 @@ const schema = z.object({
     .string()
     .regex(/^[a-zA-Z0-9_-]+$/, "Invalid file extension")
     .nullish(),
-  fileSize: z.number().int().positive(),
+  ...signedUploadInputSchema.shape,
 });
 
 export const getProgramResourceUploadUrlAction = authActionClient
   .inputSchema(schema)
   .action(async ({ ctx, parsedInput }) => {
-    const { workspace } = ctx;
-    const { resourceType, name, extension, fileSize } = parsedInput;
+    const { workspace, user } = ctx;
+    const { resourceType, name, extension, contentType, contentLength } =
+      parsedInput;
 
     throwIfNoPermission({
       role: workspace.role,
       requiredRoles: ["owner", "member"],
     });
 
-    if (fileSize > MAX_PROGRAM_RESOURCE_FILE_SIZE_BYTES) {
-      throw new Error(
-        `File size exceeds the maximum allowed size of ${MAX_PROGRAM_RESOURCE_FILE_SIZE_BYTES / 1024 / 1024}MB`,
-      );
-    }
-
     const programId = getDefaultProgramIdOrThrow(workspace);
-
-    const program = await prisma.program.findUnique({
-      where: {
-        id: programId,
-        workspaceId: workspace.id,
-      },
-      select: {
-        id: true,
-      },
-    });
-
-    if (!program) throw new Error("Program not found");
-
     const resourceId = createId({ prefix: "pgr_" });
+
     const sanitizedExtension = extension
       ? extension.replace(/^\.+/, "").replace(/[^a-zA-Z0-9_-]/g, "")
       : null;
-    const key = `programs/${program.id}/${resourceType}s/${slugify(name || resourceType)}-${nanoid(4)}${sanitizedExtension ? `.${sanitizedExtension}` : ""}`;
+    const key = `programs/${programId}/${resourceType}s/${slugify(name || resourceType)}-${nanoid(4)}${sanitizedExtension ? `.${sanitizedExtension}` : ""}`;
+
+    const uploadPolicy =
+      resourceType === "logo"
+        ? ("programResourceLogos" as const)
+        : ("programResourceFiles" as const);
+
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: uploadPolicy,
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.workspaceFileUpload,
+      identifier: [workspace.id, user.id],
+    });
 
-    const signedUrl = await storage.getSignedUploadUrl({
+    const { signedUrl, destinationUrl } = await createSignedUploadUrl({
       key,
-      expiresIn: 300,
-      contentLength: fileSize,
+      contentType,
+      contentLength,
     });
 
     return {
       signedUrl,
-      destinationUrl: `${R2_URL}/${key}`,
+      destinationUrl,
       resourceId,
       key,
-      fileSize,
     };
   });
diff --git a/apps/web/lib/actions/partners/reactivate-partner.ts b/apps/web/lib/actions/partners/reactivate-partner.ts
index 19348a201c9..9c22ddeec98 100644
--- a/apps/web/lib/actions/partners/reactivate-partner.ts
+++ b/apps/web/lib/actions/partners/reactivate-partner.ts
@@ -3,6 +3,7 @@
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { linkCache } from "@/lib/api/links/cache";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { prisma } from "@/lib/prisma";
 import { deactivatePartnerSchema } from "@/lib/zod/schemas/partners";
@@ -67,6 +68,8 @@ export const reactivatePartnerAction = authActionClient
           clickRewardId: partnerGroup.clickRewardId,
           leadRewardId: partnerGroup.leadRewardId,
           saleRewardId: partnerGroup.saleRewardId,
+          referralRewardId: partnerGroup.referralRewardId,
+          customRewardId: partnerGroup.customRewardId,
           discountId: partnerGroup.discountId,
         },
       }),
@@ -86,6 +89,9 @@ export const reactivatePartnerAction = authActionClient
           // TODO send email to partner
           linkCache.expireMany(links),
 
+          // Queue an index update because the enrollment status moved back to approved
+          queuePartnerSearchSync({ partnerIds: [partnerId], programId }),
+
           trackActivityLog({
             workspaceId: workspace.id,
             programId,
diff --git a/apps/web/lib/actions/partners/reject-bounty-submission.ts b/apps/web/lib/actions/partners/reject-bounty-submission.ts
deleted file mode 100644
index fe5665ed018..00000000000
--- a/apps/web/lib/actions/partners/reject-bounty-submission.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-"use server";
-
-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { rejectBountySubmission } from "@/lib/bounty/api/reject-bounty-submission";
-import { rejectBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
-import * as z from "zod/v4";
-import { authActionClient } from "../safe-action";
-import { throwIfNoPermission } from "../throw-if-no-permission";
-
-const inputSchema = rejectBountySubmissionBodySchema.extend({
-  workspaceId: z.string(),
-  submissionId: z.string(),
-});
-
-// Reject a bounty submission
-export const rejectBountySubmissionAction = authActionClient
-  .inputSchema(inputSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { workspace, user } = ctx;
-    const { submissionId, rejectionReason, rejectionNote } = parsedInput;
-
-    throwIfNoPermission({
-      role: workspace.role,
-      requiredRoles: ["owner", "member"],
-    });
-
-    const programId = getDefaultProgramIdOrThrow(workspace);
-
-    await rejectBountySubmission({
-      programId,
-      submissionId,
-      rejectionReason,
-      rejectionNote,
-      user,
-    });
-  });
diff --git a/apps/web/lib/actions/partners/retry-failed-paypal-payouts.ts b/apps/web/lib/actions/partners/retry-failed-paypal-payouts.ts
index 44aa8e721fd..4c26595f011 100644
--- a/apps/web/lib/actions/partners/retry-failed-paypal-payouts.ts
+++ b/apps/web/lib/actions/partners/retry-failed-paypal-payouts.ts
@@ -3,7 +3,8 @@
 import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";
 import { createPayPalBatchPayout } from "@/lib/paypal/create-batch-payout";
 import { prisma } from "@/lib/prisma";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
@@ -34,15 +35,10 @@ export const retryFailedPaypalPayoutsAction = authPartnerActionClient
       throw new Error("Connect your PayPal account to enable payouts.");
     }
 
-    const { success } = await ratelimit(1, "12 h").limit(
-      `retry-failed-paypal-payouts:${payoutId}`,
-    );
-
-    if (!success) {
-      throw new Error(
-        "You've reached the maximum number of retry attempts for the past 24 hours. Please wait and try again later.",
-      );
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.retryFailedPaypalPayout,
+      identifier: payoutId,
+    });
 
     // Use a transaction to atomically check and update the payout status
     // This prevents race conditions where multiple retry requests happen concurrently
diff --git a/apps/web/lib/actions/partners/set-lemonsqueezy-token.ts b/apps/web/lib/actions/partners/set-lemonsqueezy-token.ts
new file mode 100644
index 00000000000..5156abb3476
--- /dev/null
+++ b/apps/web/lib/actions/partners/set-lemonsqueezy-token.ts
@@ -0,0 +1,50 @@
+"use server";
+
+import { LemonSqueezyClient } from "@/lib/lemonsqueezy/client";
+import { lemonSqueezyImporter } from "@/lib/lemonsqueezy/importer";
+import { LemonSqueezyStore } from "@/lib/lemonsqueezy/types";
+import * as z from "zod/v4";
+import { authActionClient } from "../safe-action";
+import { throwIfNoPermission } from "../throw-if-no-permission";
+
+const schema = z.object({
+  workspaceId: z.string(),
+  apiKey: z.string().trim().min(1),
+});
+
+export const setLemonSqueezyTokenAction = authActionClient
+  .inputSchema(schema)
+  .action(async ({ parsedInput, ctx }) => {
+    const { workspace } = ctx;
+    const { apiKey } = parsedInput;
+
+    throwIfNoPermission({
+      role: workspace.role,
+      requiredRoles: ["owner", "member"],
+    });
+
+    const lemonSqueezyApi = new LemonSqueezyClient({
+      apiKey,
+    });
+
+    let stores: LemonSqueezyStore[];
+
+    try {
+      stores = await lemonSqueezyApi.listStores();
+    } catch (error) {
+      console.error(error);
+      throw new Error("Invalid Lemon Squeezy API key.");
+    }
+
+    if (stores.length === 0) {
+      throw new Error("No stores found in your Lemon Squeezy account.");
+    }
+
+    await lemonSqueezyImporter.setCredentials(workspace.id, {
+      apiKey,
+    });
+
+    return {
+      stores,
+    };
+  });
diff --git a/apps/web/lib/actions/partners/start-identity-verification.ts b/apps/web/lib/actions/partners/start-identity-verification.ts
index 45b8489af9d..d77164ff5e7 100644
--- a/apps/web/lib/actions/partners/start-identity-verification.ts
+++ b/apps/web/lib/actions/partners/start-identity-verification.ts
@@ -1,9 +1,9 @@
 "use server";
 
-import { shouldApplyRateLimit } from "@/lib/api/environment";
 import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";
 import { prisma } from "@/lib/prisma";
-import { ratelimit } from "@/lib/upstash/ratelimit";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { createVeriffSession } from "@/lib/veriff/create-veriff-session";
 import {
   mergeVeriffMetadata,
@@ -59,18 +59,10 @@ export const startIdentityVerificationAction = authPartnerActionClient.action(
       };
     }
 
-    // Rate limit check
-    if (shouldApplyRateLimit) {
-      const { success } = await ratelimit(1, "1 h").limit(
-        `identityVerification:${partner.id}`,
-      );
-
-      if (!success) {
-        throw new Error(
-          "Too many verification attempts. Please try again later.",
-        );
-      }
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.identityVerificationStart,
+      identifier: partner.id,
+    });
 
     // Create a new session
     const { verification } = await createVeriffSession({
diff --git a/apps/web/lib/actions/partners/start-lemonsqueezy-import.ts b/apps/web/lib/actions/partners/start-lemonsqueezy-import.ts
new file mode 100644
index 00000000000..4f186acd17b
--- /dev/null
+++ b/apps/web/lib/actions/partners/start-lemonsqueezy-import.ts
@@ -0,0 +1,62 @@
+"use server";
+
+import { createId } from "@/lib/api/create-id";
+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { LemonSqueezyClient } from "@/lib/lemonsqueezy/client";
+import { lemonSqueezyImporter } from "@/lib/lemonsqueezy/importer";
+import * as z from "zod/v4";
+import { getProgramOrThrow } from "../../api/programs/get-program-or-throw";
+import { authActionClient } from "../safe-action";
+import { throwIfNoPermission } from "../throw-if-no-permission";
+
+const schema = z.object({
+  workspaceId: z.string(),
+  storeId: z.string().trim().min(1),
+});
+
+export const startLemonSqueezyImportAction = authActionClient
+  .inputSchema(schema)
+  .action(async ({ ctx, parsedInput }) => {
+    const { workspace, user } = ctx;
+    const { storeId } = parsedInput;
+
+    throwIfNoPermission({
+      role: workspace.role,
+      requiredRoles: ["owner", "member"],
+    });
+
+    const programId = getDefaultProgramIdOrThrow(workspace);
+
+    const program = await getProgramOrThrow({
+      workspaceId: workspace.id,
+      programId,
+    });
+
+    if (!program.domain) {
+      throw new Error("Program domain is not set.");
+    }
+
+    if (!program.url) {
+      throw new Error("Program URL is not set.");
+    }
+
+    const credentials = await lemonSqueezyImporter.getCredentials(workspace.id);
+
+    const lemonSqueezyApi = new LemonSqueezyClient({
+      apiKey: credentials.apiKey,
+    });
+
+    const stores = await lemonSqueezyApi.listStores();
+
+    if (!stores.some((store) => store.id === storeId)) {
+      throw new Error("Invalid Lemon Squeezy store ID.");
+    }
+
+    await lemonSqueezyImporter.queue({
+      importId: createId({ prefix: "import_" }),
+      userId: user.id,
+      programId: program.id,
+      storeId,
+      action: "import-partners",
+    });
+  });
diff --git a/apps/web/lib/actions/partners/start-partner-platform-verification.ts b/apps/web/lib/actions/partners/start-partner-platform-verification.ts
index 829237a8e22..56fa6bc2389 100644
--- a/apps/web/lib/actions/partners/start-partner-platform-verification.ts
+++ b/apps/web/lib/actions/partners/start-partner-platform-verification.ts
@@ -6,6 +6,7 @@ import {
 } from "@/lib/api/oauth/utils";
 import { PARTNER_PLATFORMS_PROVIDERS } from "@/lib/api/partner-profile/partner-platforms-providers";
 import { upsertPartnerPlatform } from "@/lib/api/partner-profile/upsert-partner-platform";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { generateOTP } from "@/lib/auth/utils";
 import { extractEmailDomain } from "@/lib/email/extract-email-domain";
 import { isGenericEmail } from "@/lib/email/is-generic-email";
@@ -14,7 +15,8 @@ import {
   SOCIAL_PLATFORM_CONFIGS,
 } from "@/lib/social-utils";
 import { PartnerProps } from "@/lib/types";
-import { ratelimit } from "@/lib/upstash/ratelimit";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { redis } from "@/lib/upstash/redis";
 import {
   getDomainWithoutWWW,
@@ -22,6 +24,7 @@ import {
   PARTNERS_DOMAIN_WITH_NGROK,
 } from "@dub/utils";
 import { PlatformType } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
 import { cookies } from "next/headers";
 import { v4 as uuid } from "uuid";
 import * as z from "zod/v4";
@@ -59,16 +62,10 @@ export const startPartnerPlatformVerificationAction = authPartnerActionClient
     const { partner } = ctx;
     const { platform, handle, source } = parsedInput;
 
-    // Rate limit check
-    const { success } = await ratelimit(5, "1 h").limit(
-      `social-verification:${partner.id}:${platform}`,
-    );
-
-    if (!success) {
-      throw new Error(
-        "Too many verification attempts. Please try again later.",
-      );
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.socialAccountVerification,
+      identifier: [partner.id, platform],
+    });
 
     const params: VerificationParams = {
       partner,
@@ -77,19 +74,29 @@ export const startPartnerPlatformVerificationAction = authPartnerActionClient
       source,
     };
 
-    // For website
-    if (platform === "website") {
-      return startWebsiteVerification(params);
-    }
+    const startVerification = async () => {
+      // For website
+      if (platform === "website") {
+        return startWebsiteVerification(params);
+      }
 
-    // For OAuth based verification
-    const oauthProvider = PARTNER_PLATFORMS_PROVIDERS[platform];
-    if (oauthProvider) {
-      return startOAuthVerification(params);
-    }
+      // For OAuth based verification
+      const oauthProvider = PARTNER_PLATFORMS_PROVIDERS[platform];
+      if (oauthProvider) {
+        return startOAuthVerification(params);
+      }
+
+      // For code based verification
+      return startCodeVerification(params);
+    };
+
+    const result = await startVerification();
+
+    // Queue an index update because verification upserts the searchable platform identifier.
+    // Queued once here rather than at each of the four upserts.
+    waitUntil(queuePartnerSearchSync({ partnerIds: [partner.id] }));
 
-    // For code based verification
-    return startCodeVerification(params);
+    return result;
   });
 
 // Start website verification using TXT record (or auto-verify if email domain matches)
diff --git a/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts b/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts
index 621cdf7187e..64f574cd97f 100644
--- a/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts
+++ b/apps/web/lib/actions/partners/tags/update-program-partner-tags.ts
@@ -2,6 +2,7 @@
 
 import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
 import { includeTags } from "@/lib/api/links/include-tags";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
 import { prisma } from "@/lib/prisma";
@@ -95,6 +96,9 @@ export const updateProgramPartnerTagsAction = authActionClient
       ]);
     });
 
+    // Queue an index update because the partner's tags for this program changed
+    waitUntil(queuePartnerSearchSync({ partnerIds, programId }));
+
     waitUntil(
       (async () => {
         // Sync updated partner tags to Tinybird for analytics (top_partner_tags)
diff --git a/apps/web/lib/actions/partners/unban-partner.ts b/apps/web/lib/actions/partners/unban-partner.ts
index df209b4f0ca..19b54c85c0d 100644
--- a/apps/web/lib/actions/partners/unban-partner.ts
+++ b/apps/web/lib/actions/partners/unban-partner.ts
@@ -2,6 +2,7 @@
 
 import { trackActivityLog } from "@/lib/api/activity-log/track-activity-log";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { unbanPartnerJob } from "@/lib/jobs/handlers/unban-partner-job";
 import { prisma } from "@/lib/prisma";
@@ -73,6 +74,8 @@ export const unbanPartnerAction = authActionClient
           clickRewardId: partnerGroup.clickRewardId,
           leadRewardId: partnerGroup.leadRewardId,
           saleRewardId: partnerGroup.saleRewardId,
+          referralRewardId: partnerGroup.referralRewardId,
+          customRewardId: partnerGroup.customRewardId,
           discountId: partnerGroup.discountId,
         },
       }),
@@ -90,19 +93,24 @@ export const unbanPartnerAction = authActionClient
     );
 
     waitUntil(
-      trackActivityLog({
-        workspaceId: workspace.id,
-        programId,
-        resourceType: "partner",
-        resourceId: partnerId,
-        userId: user.id,
-        action: "partner.unbanned",
-        changeSet: {
-          status: {
-            old: "banned",
-            new: "approved",
+      Promise.allSettled([
+        trackActivityLog({
+          workspaceId: workspace.id,
+          programId,
+          resourceType: "partner",
+          resourceId: partnerId,
+          userId: user.id,
+          action: "partner.unbanned",
+          changeSet: {
+            status: {
+              old: "banned",
+              new: "approved",
+            },
           },
-        },
-      }),
+        }),
+
+        // Queue an index update because the enrollment status moved back to approved
+        queuePartnerSearchSync({ partnerIds: [partnerId], programId }),
+      ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/update-discount.ts b/apps/web/lib/actions/partners/update-discount.ts
index 3519667253f..eff6cc3474d 100644
--- a/apps/web/lib/actions/partners/update-discount.ts
+++ b/apps/web/lib/actions/partners/update-discount.ts
@@ -3,13 +3,12 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getDiscountOrThrow } from "@/lib/api/partners/get-discount-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { qstash } from "@/lib/cron";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
+import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";
+import { publishDiscountCodesCreationJob } from "@/lib/jobs/handlers/publish-discount-codes-creation-job";
 import { prisma } from "@/lib/prisma";
 import { updateDiscountSchema } from "@/lib/zod/schemas/discount";
-import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
-import { revalidatePath } from "next/cache";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
 
@@ -31,80 +30,65 @@ export const updateDiscountAction = authActionClient
       discountId,
     });
 
-    const { program, partnerGroup, ...updatedDiscount } =
-      await prisma.discount.update({
-        where: {
-          id: discountId,
-        },
-        data: {
-          couponTestId: couponTestId || null,
-          ...(autoProvision !== undefined && {
-            autoProvisionEnabledAt: autoProvision
-              ? discount.autoProvisionEnabledAt ?? new Date()
-              : null,
-          }),
-        },
-        include: {
-          program: true,
-          partnerGroup: true,
-        },
-      });
-
-    waitUntil(
-      (async () => {
-        const shouldExpireCache =
-          discount.couponTestId !== updatedDiscount.couponTestId;
-
-        await Promise.allSettled([
-          ...(shouldExpireCache
-            ? [
-                qstash.publishJSON({
-                  url: `${APP_DOMAIN_WITH_NGROK}/api/cron/links/invalidate-for-discounts`,
-                  body: {
-                    groupId: partnerGroup?.id,
-                  },
-                }),
+    const updatedDiscount = await prisma.discount.update({
+      where: {
+        id: discountId,
+      },
+      data: {
+        couponTestId: couponTestId || null,
+        ...(autoProvision !== undefined && {
+          autoProvisionEnabledAt: autoProvision
+            ? discount.autoProvisionEnabledAt ?? new Date()
+            : null,
+        }),
+      },
+    });
 
-                // we only cache default group pages for now so we need to invalidate them
-                ...(partnerGroup?.slug === DEFAULT_PARTNER_GROUP.slug
-                  ? [
-                      revalidatePath(`/partners.dub.co/${program.slug}`),
-                      revalidatePath(`/partners.dub.co/${program.slug}/apply`),
-                      program.addedToMarketplaceAt &&
-                        revalidatePath(
-                          `/partners.dub.co/marketplace/${program.slug}`,
-                        ),
-                    ]
-                  : []),
-              ]
-            : []),
+    const shouldExpireCache =
+      discount.couponTestId !== updatedDiscount.couponTestId;
 
-          ...(updatedDiscount.autoProvisionEnabledAt
-            ? [
-                qstash.publishJSON({
-                  url: `${APP_DOMAIN_WITH_NGROK}/api/cron/discount-codes/create/queue-batches`,
-                  body: {
-                    discountId: discount.id,
-                  },
-                }),
-              ]
-            : []),
+    if (shouldExpireCache) {
+      revalidateProgramPublicPages(programId);
+    }
 
-          recordAuditLog({
-            workspaceId: workspace.id,
-            programId,
-            action: "discount.updated",
-            description: `Discount ${discount.id} updated`,
-            actor: user,
-            targets: [
+    await Promise.all([
+      ...(shouldExpireCache
+        ? [
+            invalidateLinksForDiscountsJob.dispatch(
               {
-                type: "discount",
-                id: discount.id,
-                metadata: updatedDiscount,
+                by: "discount",
+                programId,
+                discountId: discount.id,
               },
-            ],
-          }),
-        ]);
-      })(),
+              { label: discount.id },
+            ),
+          ]
+        : []),
+
+      ...(updatedDiscount.autoProvisionEnabledAt
+        ? [
+            publishDiscountCodesCreationJob.dispatch(
+              { discountId: discount.id },
+              { label: discount.id },
+            ),
+          ]
+        : []),
+    ]);
+
+    waitUntil(
+      recordAuditLog({
+        workspaceId: workspace.id,
+        programId,
+        action: "discount.updated",
+        description: `Discount ${discount.id} updated`,
+        actor: user,
+        targets: [
+          {
+            type: "discount",
+            id: discount.id,
+            metadata: updatedDiscount,
+          },
+        ],
+      }),
     );
   });
diff --git a/apps/web/lib/actions/partners/update-group-branding.ts b/apps/web/lib/actions/partners/update-group-branding.ts
index e4b0663af0c..0d509d3ba2f 100644
--- a/apps/web/lib/actions/partners/update-group-branding.ts
+++ b/apps/web/lib/actions/partners/update-group-branding.ts
@@ -3,6 +3,7 @@
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { prisma } from "@/lib/prisma";
 import { isStored, storage } from "@/lib/storage";
 import { ProgramLanderData } from "@/lib/types";
@@ -14,7 +15,6 @@ import {
 } from "@/lib/zod/schemas/program-lander";
 import { isFulfilled, isRejected, nanoid, R2_URL } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
-import { revalidatePath } from "next/cache";
 import * as z from "zod/v4";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
@@ -112,28 +112,13 @@ export const updateGroupBrandingAction = authActionClient
       },
     });
 
+    if (landerDataInput || applicationFormDataInput || unpublish) {
+      revalidateProgramPublicPages(programId);
+    }
+
     waitUntil(
       (async () => {
         const res = await Promise.allSettled([
-          /*
-         Revalidate public pages if the following fields were updated:
-         - lander data
-         - application form data
-        */
-          ...(landerDataInput || applicationFormDataInput || unpublish
-            ? [
-                revalidatePath(`/partners.dub.co/${program.slug}`),
-                revalidatePath(`/partners.dub.co/${program.slug}/apply`),
-                revalidatePath(
-                  `/partners.dub.co/${program.slug}/apply/success`,
-                ),
-                program.addedToMarketplaceAt &&
-                  revalidatePath(
-                    `/partners.dub.co/marketplace/${program.slug}`,
-                  ),
-              ]
-            : []),
-
           recordAuditLog({
             workspaceId: workspace.id,
             programId: program.id,
diff --git a/apps/web/lib/actions/partners/update-partner-enrollment.ts b/apps/web/lib/actions/partners/update-partner-enrollment.ts
index 7e51d6ae9c4..e31e7f93efa 100644
--- a/apps/web/lib/actions/partners/update-partner-enrollment.ts
+++ b/apps/web/lib/actions/partners/update-partner-enrollment.ts
@@ -1,26 +1,62 @@
 "use server";
 
+import { trackPartnerRewardOverrideLog } from "@/lib/api/activity-log/track-reward-overrides";
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
+import { linkCache } from "@/lib/api/links/cache";
 import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
 import { includeTags } from "@/lib/api/links/include-tags";
+import { notifyPartnerRewardOverride } from "@/lib/api/partners/notify-partner-reward-change";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { throwIfExistingTenantEnrollmentExists } from "@/lib/api/partners/throw-if-existing-tenant-id-exists";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
+import {
+  hasRewardAssignment,
+  hasRewardIdsInput,
+} from "@/lib/api/rewards/reward-overrides";
+import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";
+import { syncDiscountCodes } from "@/lib/discounts/sync-discount-codes";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import { recordLink } from "@/lib/tinybird";
+import { rewardActivityDescriptionSchema } from "@/lib/zod/schemas/rewards";
+import { Prisma } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
 
-const updatePartnerEnrollmentSchema = z.object({
-  workspaceId: z.string(),
-  partnerId: z.string(),
-  tenantId: z.string().nullable(),
-  customerDataSharingEnabledAt: z.coerce.date().nullable(),
-  groupMoveDisabledAt: z.coerce.date().nullable(),
-  riskMonitoringDisabledAt: z.coerce.date().nullable(),
-});
+const updatePartnerEnrollmentSchema = z
+  .object({
+    workspaceId: z.string(),
+    partnerId: z.string(),
+    tenantId: z.string().nullable().optional(),
+    customerDataSharingEnabledAt: z.coerce.date().nullable().optional(),
+    groupMoveDisabledAt: z.coerce.date().nullable().optional(),
+    riskMonitoringDisabledAt: z.coerce.date().nullable().optional(),
+    clickRewardId: z.string().nullish(),
+    leadRewardId: z.string().nullish(),
+    saleRewardId: z.string().nullish(),
+    discountId: z.string().nullish(),
+  })
+  .extend(rewardActivityDescriptionSchema.shape)
+  .refine(
+    (data) =>
+      [
+        data.tenantId,
+        data.customerDataSharingEnabledAt,
+        data.groupMoveDisabledAt,
+        data.riskMonitoringDisabledAt,
+        data.clickRewardId,
+        data.leadRewardId,
+        data.saleRewardId,
+        data.discountId,
+      ].some((value) => value !== undefined),
+    {
+      message: "At least one enrollment field must be provided.",
+    },
+  );
 
 // Update a partner's program enrollment data
 export const updatePartnerEnrollmentAction = authActionClient
@@ -28,11 +64,14 @@ export const updatePartnerEnrollmentAction = authActionClient
   .action(async ({ parsedInput, ctx }) => {
     const { workspace, user } = ctx;
     const {
+      workspaceId,
       partnerId,
       tenantId,
       customerDataSharingEnabledAt,
       groupMoveDisabledAt,
       riskMonitoringDisabledAt,
+      activityDescription,
+      ...rewardIds
     } = parsedInput;
 
     throwIfNoPermission({
@@ -42,14 +81,29 @@ export const updatePartnerEnrollmentAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { partner, tenantId: existingTenantId } =
-      await getProgramEnrollmentOrThrow({
-        partnerId,
-        programId,
-        include: {
-          partner: true,
-        },
-      });
+    if (
+      hasRewardAssignment(rewardIds) &&
+      !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+    ) {
+      throw new Error(PARTNER_LEVEL_REWARDS_PLAN_ERROR);
+    }
+
+    const {
+      partner,
+      tenantId: existingTenantId,
+      groupId,
+      groupMoveDisabledAt: existingGroupMoveDisabledAt,
+      clickRewardId: existingClickRewardId,
+      leadRewardId: existingLeadRewardId,
+      saleRewardId: existingSaleRewardId,
+      discountId: existingDiscountId,
+    } = await getProgramEnrollmentOrThrow({
+      partnerId,
+      programId,
+      include: {
+        partner: true,
+      },
+    });
 
     const where = {
       programId,
@@ -63,24 +117,48 @@ export const updatePartnerEnrollmentAction = authActionClient
       });
     }
 
+    await throwIfInvalidRewards({
+      programId,
+      groupId,
+      ...rewardIds,
+    });
+
+    const { clickRewardId, leadRewardId, saleRewardId, discountId } = rewardIds;
+
+    const enrollmentData: Prisma.ProgramEnrollmentUpdateInput = {
+      ...(tenantId !== undefined && { tenantId }),
+      ...(customerDataSharingEnabledAt !== undefined && {
+        customerDataSharingEnabledAt,
+      }),
+      ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
+      ...(riskMonitoringDisabledAt !== undefined && {
+        riskMonitoringDisabledAt,
+      }),
+      ...(clickRewardId !== undefined && { clickRewardId }),
+      ...(leadRewardId !== undefined && { leadRewardId }),
+      ...(saleRewardId !== undefined && { saleRewardId }),
+      ...(discountId !== undefined && { discountId }),
+      ...(hasRewardAssignment(rewardIds) &&
+        !existingGroupMoveDisabledAt && {
+          groupMoveDisabledAt: new Date(),
+        }),
+    };
+
     const programEnrollment = await prisma.$transaction(async (tx) => {
-      await tx.link.updateMany({
-        where,
-        data: {
-          tenantId,
-        },
-      });
+      if (tenantId !== undefined) {
+        await tx.link.updateMany({
+          where,
+          data: {
+            tenantId,
+          },
+        });
+      }
 
-      return await tx.programEnrollment.update({
+      const enrollment = await tx.programEnrollment.update({
         where: {
           partnerId_programId: where,
         },
-        data: {
-          tenantId,
-          customerDataSharingEnabledAt,
-          groupMoveDisabledAt,
-          riskMonitoringDisabledAt,
-        },
+        data: enrollmentData,
         include: {
           links: {
             include: {
@@ -90,11 +168,69 @@ export const updatePartnerEnrollmentAction = authActionClient
           },
         },
       });
+
+      await trackPartnerRewardOverrideLog({
+        workspaceId: workspace.id,
+        programId,
+        partnerId,
+        userId: user.id,
+        description: activityDescription,
+        previous: {
+          clickRewardId: existingClickRewardId,
+          leadRewardId: existingLeadRewardId,
+          saleRewardId: existingSaleRewardId,
+          discountId: existingDiscountId,
+        },
+        next: {
+          clickRewardId: enrollment.clickRewardId,
+          leadRewardId: enrollment.leadRewardId,
+          saleRewardId: enrollment.saleRewardId,
+          discountId: enrollment.discountId,
+        },
+        tx,
+      });
+
+      return enrollment;
     });
 
+    if (discountId !== undefined) {
+      await syncDiscountCodes({
+        programId,
+        partnerIds: [partnerId],
+      });
+    }
+
     waitUntil(
       Promise.allSettled([
-        recordLink(programEnrollment.links),
+        ...(tenantId !== undefined
+          ? [recordLink(programEnrollment.links)]
+          : []),
+
+        ...(hasRewardIdsInput(rewardIds)
+          ? [linkCache.expireMany(programEnrollment.links)]
+          : []),
+
+        // Queue an index update because the tenant ID changed
+        ...(tenantId !== undefined && tenantId !== existingTenantId
+          ? [queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] })]
+          : []),
+
+        notifyPartnerRewardOverride({
+          programId,
+          partnerId,
+          previous: {
+            clickRewardId: existingClickRewardId,
+            leadRewardId: existingLeadRewardId,
+            saleRewardId: existingSaleRewardId,
+          },
+          next: {
+            clickRewardId: programEnrollment.clickRewardId,
+            leadRewardId: programEnrollment.leadRewardId,
+            saleRewardId: programEnrollment.saleRewardId,
+          },
+          activityDescription,
+        }),
+
         recordAuditLog({
           workspaceId: workspace.id,
           programId,
diff --git a/apps/web/lib/actions/partners/update-partner-platforms.ts b/apps/web/lib/actions/partners/update-partner-platforms.ts
index 1649b0c891b..786e8c06675 100644
--- a/apps/web/lib/actions/partners/update-partner-platforms.ts
+++ b/apps/web/lib/actions/partners/update-partner-platforms.ts
@@ -1,11 +1,13 @@
 "use server";
 
 import { upsertPartnerPlatform } from "@/lib/api/partner-profile/upsert-partner-platform";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { prisma } from "@/lib/prisma";
 import { sanitizeSocialHandle, sanitizeWebsite } from "@/lib/social-utils";
 import { parseUrlSchemaAllowEmpty } from "@/lib/zod/schemas/utils";
 import { getDomainWithoutWWW, getUrlFromString, isValidUrl } from "@dub/utils";
 import { PartnerPlatform, PlatformType } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
 
@@ -189,4 +191,8 @@ export const updatePartnerPlatformsAction = authPartnerActionClient
     }
 
     await Promise.all(operations);
+
+    // Queue an index update because the platform identifiers changed. Not
+    // scoped by program, since platforms are shared across them.
+    waitUntil(queuePartnerSearchSync({ partnerIds: [partner.id] }));
   });
diff --git a/apps/web/lib/actions/partners/update-partner-profile.ts b/apps/web/lib/actions/partners/update-partner-profile.ts
index 7663bf1c9e5..2c32fd43e26 100644
--- a/apps/web/lib/actions/partners/update-partner-profile.ts
+++ b/apps/web/lib/actions/partners/update-partner-profile.ts
@@ -1,10 +1,12 @@
 "use server";
 
 import { DubApiError } from "@/lib/api/errors";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { throwIfNoPermission } from "@/lib/auth/partner-users/throw-if-no-permission";
 import { requestEmailChange } from "@/lib/auth/request-email-change";
 import { qstash } from "@/lib/cron";
 import { isReservedUsername } from "@/lib/edge-config";
+import { dispatchGroupUtmSyncForPartner } from "@/lib/partners/dispatch-partner-utm-sync";
 import {
   assertEmailAvailableForIdentitySync,
   requestSyncedEmailChange,
@@ -12,7 +14,8 @@ import {
 } from "@/lib/partners/sync-partner-identity";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { partnerProfileChangeHistoryLogSchema } from "@/lib/zod/schemas/partner-profile";
 import {
   MAX_PARTNER_DESCRIPTION_LENGTH,
@@ -110,17 +113,10 @@ export const updatePartnerProfileAction = authPartnerActionClient
     }
 
     if (username && username !== partner.username) {
-      const { success } = await ratelimit(5, "1 h").limit(
-        `partner-profile:username-update:${partner.id}`,
-      );
-
-      if (!success) {
-        throw new DubApiError({
-          code: "rate_limit_exceeded",
-          message:
-            "You've updated your username too many times. Please try again later.",
-        });
-      }
+      await assertRateLimit({
+        policy: RATELIMIT_POLICIES.partnerUsernameUpdate,
+        identifier: partner.id,
+      });
 
       if (!validSlugRegex.test(username) || RESERVED_SLUGS.includes(username)) {
         throw new Error("Invalid username");
@@ -186,6 +182,10 @@ export const updatePartnerProfileAction = authPartnerActionClient
         },
       });
 
+      // Queue an index update because the partner profile changed. Not scoped
+      // by program, since a profile is shared across them.
+      waitUntil(queuePartnerSearchSync({ partnerIds: [partner.id] }));
+
       // If the email is being changed, we need to verify the new email address
       if (emailChanged) {
         if (syncIdentity) {
@@ -255,6 +255,10 @@ export const updatePartnerProfileAction = authPartnerActionClient
 
       waitUntil(
         Promise.allSettled([
+          partner.name !== updatedPartner.name
+            ? dispatchGroupUtmSyncForPartner(partner.id)
+            : undefined,
+
           (async () => {
             const shouldExpireCache = !deepEqual(
               {
diff --git a/apps/web/lib/actions/partners/update-program.ts b/apps/web/lib/actions/partners/update-program.ts
index b8bc8fd0688..09f9c7d5fff 100644
--- a/apps/web/lib/actions/partners/update-program.ts
+++ b/apps/web/lib/actions/partners/update-program.ts
@@ -2,6 +2,7 @@
 
 import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import {
   ALLOWED_MIN_PAYOUT_AMOUNTS,
   getAllowedMinPayoutAmounts,
@@ -10,7 +11,6 @@ import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
 import { submittedLeadFormSchema } from "@/lib/zod/schemas/submitted-lead-form";
 import { waitUntil } from "@vercel/functions";
-import { revalidatePath } from "next/cache";
 import * as z from "zod/v4";
 import { getProgramOrThrow } from "../../api/programs/get-program-or-throw";
 import { ProgramSchema, updateProgramSchema } from "../../zod/schemas/programs";
@@ -76,24 +76,26 @@ export const updateProgramAction = authActionClient
     });
 
     if (updatedProgram.termsUrl !== program.termsUrl) {
-      revalidatePath(`/partners.dub.co/${program.slug}/apply`);
+      revalidateProgramPublicPages(programId);
     }
 
     waitUntil(
-      recordAuditLog({
-        workspaceId: workspace.id,
-        programId: program.id,
-        action: "program.updated",
-        description: `Program ${program.name} updated`,
-        actor: user,
-        targets: [
-          {
-            type: "program",
-            id: program.id,
-            metadata: updatedProgram,
-          },
-        ],
-      }),
+      Promise.allSettled([
+        recordAuditLog({
+          workspaceId: workspace.id,
+          programId: program.id,
+          action: "program.updated",
+          description: `Program ${program.name} updated`,
+          actor: user,
+          targets: [
+            {
+              type: "program",
+              id: program.id,
+              metadata: updatedProgram,
+            },
+          ],
+        }),
+      ]),
     );
 
     return {
diff --git a/apps/web/lib/actions/partners/update-reward.ts b/apps/web/lib/actions/partners/update-reward.ts
index 88955866843..f7aa288db88 100644
--- a/apps/web/lib/actions/partners/update-reward.ts
+++ b/apps/web/lib/actions/partners/update-reward.ts
@@ -5,15 +5,16 @@ import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";
 import { getRewardOrThrow } from "@/lib/api/partners/get-reward-or-throw";
 import { serializeReward } from "@/lib/api/partners/serialize-reward";
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
+import { revalidateProgramPublicPages } from "@/lib/api/programs/revalidate-program-public-pages";
 import { queueRewardProcessing } from "@/lib/api/rewards/queue-reward-processing";
 import { validateReward } from "@/lib/api/rewards/validate-reward";
+import { getFeatureFlags } from "@/lib/edge-config";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
 import { prisma } from "@/lib/prisma";
 import { updateRewardSchema } from "@/lib/zod/schemas/rewards";
 import { formatRewardDescription } from "@/ui/partners/format-reward-description";
 import { Prisma } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
-import { revalidatePath } from "next/cache";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
 
@@ -48,11 +49,8 @@ export const updateRewardAction = authActionClient
       programId,
     });
 
-    const {
-      canUseAdvancedRewardLogic,
-      canSetRewardSpendLimit,
-      canCreateReferralReward,
-    } = getPlanCapabilities(workspace.plan);
+    const { canUseAdvancedRewardLogic, canCreateReferralReward } =
+      getPlanCapabilities(workspace.plan);
 
     if (reward.event === "referral" && !canCreateReferralReward) {
       throw new Error(
@@ -66,10 +64,14 @@ export const updateRewardAction = authActionClient
       );
     }
 
-    if ((spendLimitAmount || spendLimitInterval) && !canSetRewardSpendLimit) {
-      throw new Error(
-        "Spend limits are only available on the Enterprise plan.",
-      );
+    if (spendLimitAmount || spendLimitInterval) {
+      const flags = await getFeatureFlags({
+        workspaceId: workspace.id,
+      });
+
+      if (!flags?.rewardSpendLimit) {
+        throw new Error("Spend limits are not enabled on your workspace.");
+      }
     }
 
     validateReward({
@@ -100,55 +102,25 @@ export const updateRewardAction = authActionClient
               amountInPercentage: new Prisma.Decimal(amountInPercentage!),
             }),
       },
-      include: {
-        program: true,
-        clickPartnerGroup: true,
-        leadPartnerGroup: true,
-        salePartnerGroup: true,
-        referralPartnerGroup: true,
-      },
     });
 
-    const {
-      program,
-      clickPartnerGroup,
-      leadPartnerGroup,
-      salePartnerGroup,
-      referralPartnerGroup,
-      ...rewardMetadata
-    } = updatedReward;
-
-    const isDefaultGroup = [
-      clickPartnerGroup,
-      leadPartnerGroup,
-      salePartnerGroup,
-      referralPartnerGroup,
-    ].some((group) => group?.slug === "default");
-
-    // Determine the groupId from the partner group relation
-    const partnerGroup =
-      clickPartnerGroup ||
-      leadPartnerGroup ||
-      salePartnerGroup ||
-      referralPartnerGroup;
-
-    if (!partnerGroup) {
-      throw new Error("Partner group not found.");
+    if (updatedReward.groupId) {
+      await queueRewardProcessing({
+        event: "reward-updated",
+        groupId: updatedReward.groupId,
+        occurredAt: new Date().toISOString(),
+        rewardSnapshot: {
+          id: reward.id,
+          event: reward.event,
+          description: formatRewardDescription(serializeReward(updatedReward), {
+            includeEarnPrefix: false,
+          }),
+          activityDescription,
+        },
+      });
     }
 
-    await queueRewardProcessing({
-      event: "reward-updated",
-      groupId: partnerGroup.id,
-      occurredAt: new Date().toISOString(),
-      rewardSnapshot: {
-        id: reward.id,
-        event: reward.event,
-        description: formatRewardDescription(serializeReward(updatedReward), {
-          includeEarnPrefix: false,
-        }),
-        activityDescription,
-      },
-    });
+    revalidateProgramPublicPages(programId);
 
     waitUntil(
       Promise.allSettled([
@@ -162,7 +134,7 @@ export const updateRewardAction = authActionClient
             {
               type: "reward",
               id: rewardId,
-              metadata: serializeReward(rewardMetadata),
+              metadata: serializeReward(updatedReward),
             },
           ],
         }),
@@ -171,23 +143,13 @@ export const updateRewardAction = authActionClient
           workspaceId: workspace.id,
           programId,
           userId: user.id,
-          resourceId: rewardMetadata.id,
+          resourceId: updatedReward.id,
           parentResourceType: "group",
-          parentResourceId: partnerGroup.id,
+          parentResourceId: updatedReward.groupId,
           old: reward,
           new: updatedReward,
           description: activityDescription,
         }),
-
-        // we only cache default group pages for now so we need to invalidate them
-        ...(isDefaultGroup && program
-          ? [
-              revalidatePath(`/partners.dub.co/${program.slug}`),
-              revalidatePath(`/partners.dub.co/${program.slug}/apply`),
-              program.addedToMarketplaceAt &&
-                revalidatePath(`/partners.dub.co/marketplace/${program.slug}`),
-            ]
-          : []),
       ]),
     );
   });
diff --git a/apps/web/lib/actions/partners/upload-bounty-submission-file.ts b/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
index 897a803f534..5bf6e625175 100644
--- a/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
+++ b/apps/web/lib/actions/partners/upload-bounty-submission-file.ts
@@ -2,6 +2,7 @@
 
 import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";
 import { getBountySubmissionUploadUrl } from "@/lib/bounty/api/get-bounty-submission-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
 
@@ -9,8 +10,7 @@ const schema = z.object({
   programId: z.string(),
   bountyId: z.string(),
   fileName: z.string().trim().min(1),
-  contentType: z.string().trim().min(1),
-  contentLength: z.number().int().positive(),
+  ...signedUploadInputSchema.shape,
 });
 
 export const uploadBountySubmissionFileAction = authPartnerActionClient
diff --git a/apps/web/lib/actions/partners/upload-campaign-image.ts b/apps/web/lib/actions/partners/upload-campaign-image.ts
index d6ac083978c..cc3581ff320 100644
--- a/apps/web/lib/actions/partners/upload-campaign-image.ts
+++ b/apps/web/lib/actions/partners/upload-campaign-image.ts
@@ -1,20 +1,26 @@
 "use server";
 
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { storage } from "@/lib/storage";
-import { nanoid, R2_URL } from "@dub/utils";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
 
-const schema = z.object({
+const inputSchema = z.object({
   workspaceId: z.string(),
+  ...signedUploadInputSchema.shape,
 });
 
 export const uploadCampaignImageAction = authActionClient
-  .inputSchema(schema)
-  .action(async ({ ctx }) => {
-    const { workspace } = ctx;
+  .inputSchema(inputSchema)
+  .action(async ({ ctx, parsedInput }) => {
+    const { workspace, user } = ctx;
+    const { contentType, contentLength } = parsedInput;
 
     throwIfNoPermission({
       role: workspace.role,
@@ -23,18 +29,26 @@ export const uploadCampaignImageAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    try {
-      const key = `programs/${programId}/emails/image_${nanoid(7)}`;
-      const signedUrl = await storage.getSignedUploadUrl({
-        key,
-      });
-
-      return {
-        key,
-        signedUrl,
-        destinationUrl: `${R2_URL}/${key}`,
-      };
-    } catch (e) {
-      throw new Error("Failed to get signed URL for upload.");
-    }
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: "programCampaignImages",
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.workspaceFileUpload,
+      identifier: [workspace.id, user.id],
+    });
+
+    const { key, signedUrl, destinationUrl } = await createSignedUploadUrl({
+      key: `programs/${programId}/emails/image_${nanoid(10)}`,
+      contentType,
+      contentLength,
+    });
+
+    return {
+      key,
+      signedUrl,
+      destinationUrl,
+    };
   });
diff --git a/apps/web/lib/actions/partners/upload-lander-image.ts b/apps/web/lib/actions/partners/upload-lander-image.ts
index 9465bd04e76..62a8e7d8025 100644
--- a/apps/web/lib/actions/partners/upload-lander-image.ts
+++ b/apps/web/lib/actions/partners/upload-lander-image.ts
@@ -1,20 +1,26 @@
 "use server";
 
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import { storage } from "@/lib/storage";
-import { nanoid, R2_URL } from "@dub/utils";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
+import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
 import { authActionClient } from "../safe-action";
 import { throwIfNoPermission } from "../throw-if-no-permission";
 
-const schema = z.object({
+const inputSchema = z.object({
   workspaceId: z.string(),
+  ...signedUploadInputSchema.shape,
 });
 
 export const uploadLanderImageAction = authActionClient
-  .inputSchema(schema)
-  .action(async ({ ctx }) => {
-    const { workspace } = ctx;
+  .inputSchema(inputSchema)
+  .action(async ({ ctx, parsedInput }) => {
+    const { workspace, user } = ctx;
+    const { contentType, contentLength } = parsedInput;
 
     throwIfNoPermission({
       role: workspace.role,
@@ -23,19 +29,26 @@ export const uploadLanderImageAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    try {
-      const key = `programs/${programId}/lander/image_${nanoid(7)}`;
-
-      const signedUrl = await storage.getSignedUploadUrl({
-        key,
-      });
-
-      return {
-        key,
-        signedUrl,
-        destinationUrl: `${R2_URL}/${key}`,
-      };
-    } catch (e) {
-      throw new Error("Failed to get signed URL for upload.");
-    }
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: "programLanderImages",
+    });
+
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.workspaceFileUpload,
+      identifier: [workspace.id, user.id],
+    });
+
+    const { key, signedUrl, destinationUrl } = await createSignedUploadUrl({
+      key: `programs/${programId}/lander/image_${nanoid(10)}`,
+      contentType,
+      contentLength,
+    });
+
+    return {
+      key,
+      signedUrl,
+      destinationUrl,
+    };
   });
diff --git a/apps/web/lib/actions/partners/upload-program-application-image.ts b/apps/web/lib/actions/partners/upload-program-application-image.ts
index cd0cb881bef..4b94debed4a 100644
--- a/apps/web/lib/actions/partners/upload-program-application-image.ts
+++ b/apps/web/lib/actions/partners/upload-program-application-image.ts
@@ -2,36 +2,35 @@
 
 import { getIP } from "@/lib/api/utils/get-ip";
 import { prisma } from "@/lib/prisma";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
 import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
-import { nanoid, R2_URL } from "@dub/utils";
+import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
 import { actionClient } from "../safe-action";
 
 const inputSchema = z.object({
   programSlug: z.string().trim().toLowerCase().min(1),
+  ...signedUploadInputSchema.shape,
 });
 
-const rateLimitPolicy = RATELIMIT_POLICIES.programImageUpload;
-
 export const uploadProgramApplicationImageAction = actionClient
   .inputSchema(inputSchema)
   .action(async ({ parsedInput }) => {
-    const { programSlug } = parsedInput;
-
-    const ipAddress = await getIP();
+    const { programSlug, contentType, contentLength } = parsedInput;
 
-    const { success } = await ratelimit(
-      rateLimitPolicy.attempts,
-      rateLimitPolicy.window,
-    ).limit(`${rateLimitPolicy.keyPrefix}:${ipAddress}`);
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: "programApplicationImages",
+    });
 
-    if (!success) {
-      throw new Error(
-        "You've reached the maximum number of attempts to upload images for this application. Please try again later.",
-      );
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.programImageUpload,
+      identifier: await getIP(),
+    });
 
     const program = await prisma.program.findUniqueOrThrow({
       where: {
@@ -42,13 +41,14 @@ export const uploadProgramApplicationImageAction = actionClient
       },
     });
 
-    const key = `programs/${program.id}/applications/${nanoid(10)}`;
-    const signedUrl = await storage.getSignedUploadUrl({
-      key,
+    const { signedUrl, destinationUrl } = await createSignedUploadUrl({
+      key: `programs/${program.id}/applications/${nanoid(10)}`,
+      contentType,
+      contentLength,
     });
 
     return {
       signedUrl,
-      destinationUrl: `${R2_URL}/${key}`,
+      destinationUrl,
     };
   });
diff --git a/apps/web/lib/actions/partners/verify-social-account-by-code.ts b/apps/web/lib/actions/partners/verify-social-account-by-code.ts
index de046fb7cbf..132ed3fee1c 100644
--- a/apps/web/lib/actions/partners/verify-social-account-by-code.ts
+++ b/apps/web/lib/actions/partners/verify-social-account-by-code.ts
@@ -3,7 +3,8 @@
 import { getLinkedInPost } from "@/lib/api/scrape-creators/get-linkedin-post";
 import { getSocialProfile } from "@/lib/api/scrape-creators/get-social-profile";
 import { prisma } from "@/lib/prisma";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { redis } from "@/lib/upstash/redis";
 import { PlatformType } from "@prisma/client";
 import * as z from "zod/v4";
@@ -30,16 +31,10 @@ export const verifySocialAccountByCodeAction = authPartnerActionClient
       throw new Error("Please provide the LinkedIn post URL.");
     }
 
-    // Rate limit check
-    const { success } = await ratelimit(5, "1 h").limit(
-      `social-verification:${partner.id}:${platform}`,
-    );
-
-    if (!success) {
-      throw new Error(
-        "Too many verification attempts. Please try again later.",
-      );
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.socialAccountVerification,
+      identifier: [partner.id, platform],
+    });
 
     // Get the verification code from Redis
     const cacheKey = `social-verification:${partner.id}:${platform}:${handle}`;
diff --git a/apps/web/lib/actions/partners/withdraw-partner-application.ts b/apps/web/lib/actions/partners/withdraw-partner-application.ts
index e15b845abd3..e18fe4c191b 100644
--- a/apps/web/lib/actions/partners/withdraw-partner-application.ts
+++ b/apps/web/lib/actions/partners/withdraw-partner-application.ts
@@ -1,6 +1,8 @@
 "use server";
 
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { prisma } from "@/lib/prisma";
+import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { authPartnerActionClient } from "../safe-action";
 
@@ -46,4 +48,9 @@ export const withdrawPartnerApplicationAction = authPartnerActionClient
 
       return deletedProgramEnrollment;
     });
+
+    // Queue an index update because the enrollment was deleted.
+    waitUntil(
+      queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
+    );
   });
diff --git a/apps/web/lib/actions/submit-oauth-app-for-review.ts b/apps/web/lib/actions/submit-oauth-app-for-review.ts
index a3585d9c605..fd986e37e47 100644
--- a/apps/web/lib/actions/submit-oauth-app-for-review.ts
+++ b/apps/web/lib/actions/submit-oauth-app-for-review.ts
@@ -1,10 +1,11 @@
 "use server";
 
 import { prisma } from "@/lib/prisma";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { ComponentDividerSpacingSize } from "@team-plain/typescript-sdk";
 import * as z from "zod/v4";
 import { createPlainThread } from "../plain/create-plain-thread";
-import { ratelimit } from "../upstash";
 import { authActionClient } from "./safe-action";
 import { throwIfNoPermission } from "./throw-if-no-permission";
 
@@ -33,15 +34,10 @@ export const submitOAuthAppForReview = authActionClient
       },
     });
 
-    const { success } = await ratelimit(1, "1 m").limit(
-      `submit-oauth-app-for-review:${integrationId}`,
-    );
-
-    if (!success) {
-      throw new Error(
-        "Rate limit exceeded. Please try again later or contact support.",
-      );
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.oauthAppReviewSubmit,
+      identifier: integrationId,
+    });
 
     await createPlainThread({
       user,
diff --git a/apps/web/lib/actions/verify-workspace-setup.ts b/apps/web/lib/actions/verify-workspace-setup.ts
index ff2e5523b5c..a47ad00fefa 100644
--- a/apps/web/lib/actions/verify-workspace-setup.ts
+++ b/apps/web/lib/actions/verify-workspace-setup.ts
@@ -1,93 +1,127 @@
 "use server";
 
+import {
+  analyzeDubAnalyticsScript,
+  toVerifySiteUrl,
+  type VerifyInstallationResult,
+} from "@/lib/analytics/verify-installation";
 import { prisma } from "@/lib/prisma";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import FirecrawlApp from "@mendable/firecrawl-js";
 import * as z from "zod/v4";
 import { authActionClient } from "./safe-action";
 import { throwIfNoPermission } from "./throw-if-no-permission";
 
-const getExpectedScriptForWorkspace = (store: Record<string, any>) => {
-  const {
-    analyticsSettingsConversionTrackingEnabled: conversionTrackingEnabled,
-    analyticsSettingsSiteVisitTrackingEnabled: siteVisitEnabled,
-    analyticsSettingsOutboundDomainTrackingEnabled: outboundDomainsEnabled,
-  } = store;
-
-  const components = [
-    "script",
-    siteVisitEnabled ? "site-visit" : null,
-    outboundDomainsEnabled ? "outbound-domains" : null,
-    conversionTrackingEnabled ? "conversion-tracking" : null,
-  ].filter(Boolean);
-
-  return `${components.join(".")}.js`;
-};
-
 const schema = z.object({
   workspaceId: z.string(),
+  hostname: z.string().min(1),
 });
 
-// Attempt to verify the workspace setup
 export const verifyWorkspaceSetup = authActionClient
   .inputSchema(schema)
-  .action(async ({ ctx }) => {
-    const { workspace } = ctx;
+  .action(async ({ ctx, parsedInput }): Promise<VerifyInstallationResult> => {
+    const { workspace, user } = ctx;
+    const { hostname } = parsedInput;
 
     throwIfNoPermission({
       role: workspace.role,
-      requiredPermissions: ["workspaces.read"],
+      requiredPermissions: ["workspaces.write"],
     });
 
-    const domains = await prisma.domain.findMany({
-      where: { projectId: workspace.id },
-      select: { slug: true },
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.verifyWorkspaceSetup,
+      identifier: workspace.id,
     });
 
-    const domain = domains[0];
+    const hostnames = (workspace.allowedHostnames as string[]) || [];
 
-    if (!domain) {
-      throw new Error(`Please setup a domain`);
+    if (!hostnames.includes(hostname)) {
+      throw new Error("Select a hostname from your allowlist.");
     }
 
-    // const siteUrl = domain.slug;
-    const siteUrl = "https://dub.co/home";
-
-    const hostnames = (workspace.allowedHostnames as string[]) || [];
-
-    if (!hostnames.length) {
-      throw new Error(`Add a hostname for your domain`);
+    if (hostname.startsWith("*.")) {
+      return {
+        status: "error",
+        hostname,
+        error: "unsupported",
+      };
     }
 
     const firecrawl = new FirecrawlApp({
       apiKey: process.env.FIRECRAWL_API_KEY,
     });
 
-    const scrapeResult = await firecrawl.scrapeUrl(siteUrl, {
-      formats: ["rawHtml"],
-      onlyMainContent: false,
-      parsePDF: false,
-      includeTags: ["head"],
-      maxAge: 14400000,
-      waitFor: 5000,
+    const [scrapeResult, program] = await Promise.all([
+      firecrawl.scrapeUrl(toVerifySiteUrl(hostname), {
+        formats: ["rawHtml"],
+        onlyMainContent: false,
+        parsePDF: false,
+        maxAge: 0,
+        waitFor: 5000,
+      }),
+      workspace.defaultProgramId
+        ? prisma.program.findUnique({
+            where: { id: workspace.defaultProgramId },
+            select: { domain: true },
+          })
+        : null,
+    ]);
+
+    if (!scrapeResult.success || !scrapeResult.rawHtml) {
+      return {
+        status: "error",
+        hostname,
+        error: "unreachable",
+      };
+    }
+
+    const analysis = analyzeDubAnalyticsScript(scrapeResult.rawHtml, {
+      referDomain: program?.domain,
     });
 
-    if (!scrapeResult.success) {
-      throw new Error("Failed to verify site");
+    if (analysis !== "ok") {
+      return {
+        status: "error",
+        hostname,
+        error: analysis,
+        ...(analysis === "missing_refer_domain" && program?.domain
+          ? { referDomain: program.domain }
+          : {}),
+      };
     }
 
-    //console.log("RAW HTML: ", scrapeResult.rawHtml);
+    const verifiedAt = new Date().toISOString();
+    const verifiedUser = {
+      id: user.id,
+      name: user.name ?? user.email ?? "Unknown",
+      image: user.image ?? null,
+    };
 
-    console.log(`result: `, {
-      hasDataAttribute: scrapeResult.rawHtml?.includes(
-        `data-sdkn="@dub/analytics"`,
-      ),
-      hasExpectedScript: scrapeResult.rawHtml?.includes(
-        getExpectedScriptForWorkspace(workspace.store as Record<string, any>),
-      ),
+    const latest = await prisma.project.findUnique({
+      where: { id: workspace.id },
+      select: { store: true },
+    });
+    const store = (latest?.store as Record<string, unknown> | null) ?? {};
+
+    await prisma.project.update({
+      where: { id: workspace.id },
+      data: {
+        store: {
+          ...store,
+          analyticsSettingsInstallationVerified: {
+            hostname,
+            verifiedAt,
+            user: verifiedUser,
+          },
+        },
+      },
     });
 
     return {
-      verifiedAt: new Date().toISOString(),
-      // analyticsScriptSrc: scriptTag,
+      status: "success",
+      hostname,
+      verifiedAt,
+      user: verifiedUser,
     };
   });
diff --git a/apps/web/lib/ai/build-system-prompt.ts b/apps/web/lib/ai/build-system-prompt.ts
index 3aa53f73b28..e5a9d47efbb 100644
--- a/apps/web/lib/ai/build-system-prompt.ts
+++ b/apps/web/lib/ai/build-system-prompt.ts
@@ -18,6 +18,7 @@ const CONTEXT_SYSTEM_PROMPTS: Record<SupportChatContext, string> = {
   partners: `You are a helpful Dub Partners support assistant helping affiliate partners with their programs.
   Focus on: payouts, referral tracking, commission structure, partner links, bank account setup, payout countries, program enrollment, and affiliate performance.
   When the user asks about their specific program data — such as earnings, commissions, payouts, minimum payout amount, holding period, or payout history — call getProgramPerformance with the program's ID before answering. Use this real data in your response instead of guessing or citing generic documentation.
+  Money amounts from getProgramPerformance are already formatted USD strings (e.g. $10). Never treat them as cents or multiply/divide.
   When a user has a payout dispute, tax compliance issue, or a problem that can't be resolved through documentation, first call requestSupportTicket (to show them an upload form), then after the user confirms, call createSupportTicket.
   Always try to provide the program's support email for program-specific issues.`,
 };
@@ -39,7 +40,7 @@ const BASE_SYSTEM_PROMPT = `
   `.trim();
 
 const PARTNERS_PAYOUT_PROMPT = `
-  For any partner payout question — pending, timing, schedule, or a failed/retry/resend request — always call getProgramPerformance first to get real data (payout status, holding period, minimum payout threshold). Then branch by status:
+  For any partner payout question — pending, timing, schedule, or a failed/retry/resend request — always call getProgramPerformance first to get real data (payout status, holding period, minimum payout threshold). Money amounts from getProgramPerformance are already formatted USD (e.g. $10) — never treat them as cents or multiply/divide. Then branch by status:
 
   Status is pending, processing, processed, sent, or completed (i.e. NOT failed):
   - Explain using the real data from getProgramPerformance. Call findRelevantDocs too if helpful for general context.
diff --git a/apps/web/lib/ai/create-support-ticket.ts b/apps/web/lib/ai/create-support-ticket.ts
index 419b6d72003..643725eeec2 100644
--- a/apps/web/lib/ai/create-support-ticket.ts
+++ b/apps/web/lib/ai/create-support-ticket.ts
@@ -224,7 +224,10 @@ async function getPriorityAndMetadata(
             ? { "Program Support Email": program.supportEmail }
             : {}),
           "Program Holding Period Days": holdingPeriodDays.toString(),
-          "Program Min Payout Amount": program.minPayoutAmount.toString(),
+          "Program Min Payout Amount": currencyFormatter(
+            program.minPayoutAmount,
+            { trailingZeroDisplay: "stripIfInteger" },
+          ),
           "Partner Lifetime Payouts": currencyFormatter(partnerLifetimePayouts),
         });
       }
diff --git a/apps/web/lib/ai/get-program-performance.ts b/apps/web/lib/ai/get-program-performance.ts
index 20f3a638ea3..505ac9530a9 100644
--- a/apps/web/lib/ai/get-program-performance.ts
+++ b/apps/web/lib/ai/get-program-performance.ts
@@ -1,9 +1,13 @@
 import { prisma } from "@/lib/prisma";
+import { currencyFormatter } from "@dub/utils";
 import { CommissionStatus, PayoutStatus } from "@prisma/client";
 import { tool } from "ai";
 import { z } from "zod";
 import { getSession } from "../auth/utils";
 
+const formatUsd = (valueInCents: number) =>
+  currencyFormatter(valueInCents, { trailingZeroDisplay: "stripIfInteger" });
+
 const programPerformanceSchema = z.object({
   program: z.object({
     name: z.string().describe("The name of the program."),
@@ -13,9 +17,9 @@ const programPerformanceSchema = z.object({
         "The support email of the program. Useful for letting the user know how to contact the program's support team.",
       ),
     minPayoutAmount: z
-      .number()
+      .string()
       .describe(
-        "The minimum payout amount for the program in USD cents. If the partner's earnings are less than this amount, it will not be eligible for payout.",
+        'The minimum payout amount for the program, already formatted as USD (e.g. "$10"). If the partner\'s earnings are less than this amount, it will not be eligible for payout.',
       ),
   }),
   commissions: z.array(
@@ -23,12 +27,18 @@ const programPerformanceSchema = z.object({
       status: z
         .enum(CommissionStatus)
         .describe("The status of the commission."),
-      earningsInCents: z.number().describe("Total earnings in USD cents"),
+      earnings: z
+        .string()
+        .describe('Total earnings, already formatted as USD (e.g. "$10").'),
     }),
   ),
   payouts: z.array(
     z.object({
-      amount: z.number().describe("The amount of the payout in USD cents."),
+      amount: z
+        .string()
+        .describe(
+          'The amount of the payout, already formatted as USD (e.g. "$10").',
+        ),
       status: z.enum(PayoutStatus).describe("The status of the payout."),
       stripePayoutTraceId: z
         .string()
@@ -118,16 +128,22 @@ export const getProgramPerformanceTool = tool({
     ]);
 
     const data = programPerformanceSchema.parse({
-      program: programEnrollment.program,
+      program: {
+        ...programEnrollment.program,
+        minPayoutAmount: formatUsd(programEnrollment.program.minPayoutAmount),
+      },
       holdingPeriodDays:
         programEnrollment.partnerGroup?.holdingPeriodDays ??
         programEnrollment.program.groups[0]?.holdingPeriodDays ??
         0,
       commissions: commissions.map((commission) => ({
         status: commission.status,
-        earningsInCents: commission._sum.earnings,
+        earnings: formatUsd(commission._sum.earnings ?? 0),
+      })),
+      payouts: payouts.map((payout) => ({
+        ...payout,
+        amount: formatUsd(payout.amount),
       })),
-      payouts,
     });
 
     return data;
diff --git a/apps/web/lib/analytics/constants.ts b/apps/web/lib/analytics/constants.ts
index 2fd7c7b5a60..50dee089d0e 100644
--- a/apps/web/lib/analytics/constants.ts
+++ b/apps/web/lib/analytics/constants.ts
@@ -73,6 +73,7 @@ export const VALID_ANALYTICS_ENDPOINTS = [
   "os",
   "trigger", // deprecated, but keeping for now for backwards compatibility
   "triggers",
+  "event_names",
   "referers",
   "referer_urls",
   "top_folders",
@@ -103,6 +104,7 @@ export const SINGULAR_ANALYTICS_ENDPOINTS = {
   referer_urls: "refererUrl",
   os: "os",
   triggers: "trigger",
+  event_names: "eventName",
   utm_sources: "utm_source",
   utm_mediums: "utm_medium",
   utm_campaigns: "utm_campaign",
@@ -142,6 +144,7 @@ export const VALID_ANALYTICS_FILTERS = [
   "browser",
   "os",
   "trigger",
+  "eventName",
   "referer",
   "refererUrl",
   "url",
@@ -167,6 +170,7 @@ export const DIMENSIONAL_ANALYTICS_FILTERS = [
   "browser",
   "os",
   "trigger",
+  "eventName",
   "referer",
   "refererUrl",
   "url",
diff --git a/apps/web/lib/analytics/filter-helpers.ts b/apps/web/lib/analytics/filter-helpers.ts
index 2cb312e9d13..c70da0f5382 100644
--- a/apps/web/lib/analytics/filter-helpers.ts
+++ b/apps/web/lib/analytics/filter-helpers.ts
@@ -149,6 +149,7 @@ const SUPPORTED_FIELDS = [
   "refererUrl",
   "url",
   "trigger",
+  "eventName",
   "utm_source",
   "utm_medium",
   "utm_campaign",
diff --git a/apps/web/lib/analytics/format-date-tooltip.ts b/apps/web/lib/analytics/format-date-tooltip.ts
index e36f1a24237..d2d1906e221 100644
--- a/apps/web/lib/analytics/format-date-tooltip.ts
+++ b/apps/web/lib/analytics/format-date-tooltip.ts
@@ -34,7 +34,7 @@ export const formatDateTooltip = (
         hour: "numeric",
         minute: "numeric",
       });
-    else if (daysDifference > 180)
+    else if (daysDifference > 90)
       return targetDate.toLocaleDateString("en-US", {
         month: "short",
         year: "numeric",
diff --git a/apps/web/lib/analytics/utils/get-interval-data.ts b/apps/web/lib/analytics/utils/get-interval-data.ts
index 47d156edd88..94e9a211c8d 100644
--- a/apps/web/lib/analytics/utils/get-interval-data.ts
+++ b/apps/web/lib/analytics/utils/get-interval-data.ts
@@ -15,7 +15,7 @@ const INTERVAL_DATA: Record<
   ({ timezone }: { timezone?: string }) => {
     startDate: TZDate;
     endDate: TZDate;
-    granularity: "minute" | "hour" | "day" | "month";
+    granularity: "hour" | "day" | "month";
   }
 > = {
   "24h": ({ timezone }) => ({
diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.ts
index e86fd934186..28de2e9656c 100644
--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts
+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts
@@ -20,7 +20,7 @@ export const getStartEndDates = ({
 
   let startDate: TZDate;
   let endDate: TZDate;
-  let granularity: "minute" | "hour" | "day" | "month" = "day";
+  let granularity: "hour" | "day" | "month" = "day";
 
   if (start || (interval === "all" && dataAvailableFrom)) {
     startDate = startOfDay(
@@ -34,7 +34,7 @@ export const getStartEndDates = ({
 
     if (daysDifference <= 2) {
       granularity = "hour";
-    } else if (daysDifference > 180) {
+    } else if (daysDifference > 90) {
       granularity = "month";
     }
 
diff --git a/apps/web/lib/analytics/verify-installation.ts b/apps/web/lib/analytics/verify-installation.ts
new file mode 100644
index 00000000000..354e84e0561
--- /dev/null
+++ b/apps/web/lib/analytics/verify-installation.ts
@@ -0,0 +1,135 @@
+type VerifyErrorCode =
+  | "not_installed"
+  | "missing_attributes"
+  | "missing_refer_domain"
+  | "duplicate"
+  | "malformed";
+
+type VerifyError = VerifyErrorCode | "unreachable" | "unsupported";
+
+export type VerifyInstallationResult =
+  | {
+      status: "success";
+      hostname: string;
+      verifiedAt: string;
+      user: {
+        id: string;
+        name: string | null;
+        image: string | null;
+      };
+    }
+  | {
+      status: "error";
+      hostname: string;
+      error: VerifyError;
+      referDomain?: string;
+    };
+
+const SCRIPT_TAG_RE = /<script\b[^>]*>/gi;
+const DUB_SCRIPT_RE =
+  /dubcdn\.com\/analytics|data-sdkn=["']@dub\/analytics["']|@dub\/analytics/i;
+const DUB_SRC_RE =
+  /src\s*=\s*(?:["'][^"']*dubcdn\.com\/analytics[^"']*["']|[^\s>]*dubcdn\.com\/analytics[^\s>]*)/i;
+const CONVERSION_SRC_RE =
+  /src\s*=\s*(?:["'][^"']*dubcdn\.com\/analytics[^"']*conversion-tracking[^"']*["']|[^\s>]*dubcdn\.com\/analytics[^\s>]*conversion-tracking[^\s>]*)/i;
+const SDK_NAME_RE =
+  /data-sdkn\s*=\s*(?:["']@dub\/analytics["']|@dub\/analytics(?=[\s>/]))/i;
+const PUBLISHABLE_KEY_RE = /data-publishable-key=/i;
+const ATTR_RE = (name: string) =>
+  new RegExp(`${name}\\s*=\\s*(["'])([\\s\\S]*?)\\1`, "i");
+
+const decodeHtmlEntities = (value: string) =>
+  value
+    .replace(/&quot;/gi, '"')
+    .replace(/&#34;/g, '"')
+    .replace(/&#x22;/gi, '"')
+    .replace(/&apos;/gi, "'")
+    .replace(/&#39;/g, "'")
+    .replace(/&amp;/gi, "&");
+
+const normalizeReferDomain = (value: string) =>
+  value.trim().toLowerCase().replace(/^https?:\/\//, "").replace(/\/$/, "");
+
+const getScriptAttr = (tag: string, name: string) => {
+  const match = tag.match(ATTR_RE(name));
+  return match ? decodeHtmlEntities(match[2]) : null;
+};
+
+const parseScriptReferDomain = (tag: string) => {
+  const rawDomains = getScriptAttr(tag, "data-domains");
+  if (rawDomains) {
+    try {
+      const parsed = JSON.parse(rawDomains) as { refer?: unknown };
+      if (typeof parsed.refer === "string" && parsed.refer.trim()) {
+        return parsed.refer.trim();
+      }
+    } catch {
+      // Fall through to the legacy data-short-domain attribute.
+    }
+  }
+
+  const shortDomain = getScriptAttr(tag, "data-short-domain");
+  return shortDomain?.trim() || null;
+};
+
+export function analyzeDubAnalyticsScript(
+  html: string,
+  { referDomain }: { referDomain?: string | null } = {},
+): "ok" | VerifyErrorCode {
+  const scriptTags = html.match(SCRIPT_TAG_RE) ?? [];
+  const dubScripts = scriptTags.filter((tag) => DUB_SCRIPT_RE.test(tag));
+
+  if (dubScripts.length === 0) {
+    if (DUB_SCRIPT_RE.test(html)) {
+      return "malformed";
+    }
+
+    return "not_installed";
+  }
+
+  if (dubScripts.length > 1) {
+    return "duplicate";
+  }
+
+  const tag = dubScripts[0];
+  const hasSrc = DUB_SRC_RE.test(tag);
+  const hasSdkName = SDK_NAME_RE.test(tag);
+
+  if (!hasSrc && !hasSdkName) {
+    return "malformed";
+  }
+
+  if (
+    CONVERSION_SRC_RE.test(tag) &&
+    !hasSdkName &&
+    !PUBLISHABLE_KEY_RE.test(tag)
+  ) {
+    return "missing_attributes";
+  }
+
+  const expectedReferDomain = referDomain?.trim();
+  if (expectedReferDomain) {
+    const scriptReferDomain = parseScriptReferDomain(tag);
+    if (
+      !scriptReferDomain ||
+      normalizeReferDomain(scriptReferDomain) !==
+        normalizeReferDomain(expectedReferDomain)
+    ) {
+      return "missing_refer_domain";
+    }
+  }
+
+  return "ok";
+}
+
+export function toVerifySiteUrl(hostname: string) {
+  if (hostname.startsWith("http://") || hostname.startsWith("https://")) {
+    return hostname;
+  }
+
+  if (hostname === "localhost" || hostname.startsWith("localhost:")) {
+    return `http://${hostname}`;
+  }
+
+  return `https://${hostname}`;
+}
diff --git a/apps/web/lib/api-logs/constants.ts b/apps/web/lib/api-logs/constants.ts
index 80834cbfff7..9b30f942800 100644
--- a/apps/web/lib/api-logs/constants.ts
+++ b/apps/web/lib/api-logs/constants.ts
@@ -25,6 +25,7 @@ export const ROUTE_PATTERNS = [
 
   // Partners
   "/partners/links/upsert",
+  "/partners/links/:linkId",
   "/partners/links",
   "/partners/applications/approve",
   "/partners/applications/reject",
@@ -221,7 +222,7 @@ export const WEBHOOK_REQUEST_ACTORS_BY_PATH = {
     id: INTERCOM_INTEGRATION_ID,
     name: "Intercom",
     image:
-      "https://dubassets.com/integrations/int_ffw3qgrFAahY6qs1hXaH3wHS_JPoCPOh",
+      "https://dubassets.com/integrations/int_1KV6R1E61E0044C0VFQKV2Q6K_PfbSFTk",
   },
 } as const;
 
diff --git a/apps/web/lib/api-logs/record-api-log.ts b/apps/web/lib/api-logs/record-api-log.ts
index 0e53919ea29..41669374cf5 100644
--- a/apps/web/lib/api-logs/record-api-log.ts
+++ b/apps/web/lib/api-logs/record-api-log.ts
@@ -1,5 +1,5 @@
 import { tb } from "@/lib/tinybird";
-import { log } from "@dub/utils";
+import { log, sleep } from "@dub/utils";
 import * as z from "zod/v4";
 import { createId } from "../api/create-id";
 import { RequestType } from "../types";
@@ -73,9 +73,7 @@ export const recordApiLog = async ({
       return await recordApiLogTB(apiLog);
     } catch (error) {
       if (attempt < maxRetries) {
-        await new Promise((resolve) =>
-          setTimeout(resolve, 100 * Math.pow(2, attempt)),
-        );
+        await sleep(100 * Math.pow(2, attempt));
         continue;
       }
 
diff --git a/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts b/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts
new file mode 100644
index 00000000000..89c7b3c92d1
--- /dev/null
+++ b/apps/web/lib/api/activity-log/to-reward-activity-snapshot.ts
@@ -0,0 +1,59 @@
+import type { DiscountProps, LinkProps, RewardProps } from "@/lib/types";
+
+export function toLinkActivitySnapshot(
+  link: Pick<LinkProps, "id" | "domain" | "key">,
+) {
+  return {
+    id: link.id,
+    domain: link.domain,
+    key: link.key,
+  };
+}
+
+export function toRewardActivitySnapshot(
+  reward: Pick<
+    RewardProps,
+    | "id"
+    | "event"
+    | "type"
+    | "amountInCents"
+    | "amountInPercentage"
+    | "maxDuration"
+    | "description"
+    | "tooltipDescription"
+    | "modifiers"
+    | "config"
+    | "spendLimitAmount"
+    | "spendLimitInterval"
+  >,
+) {
+  return {
+    id: reward.id,
+    event: reward.event,
+    type: reward.type,
+    amountInCents: reward.amountInCents ?? null,
+    amountInPercentage: reward.amountInPercentage ?? null,
+    maxDuration: reward.maxDuration ?? null,
+    description: reward.description ?? null,
+    tooltipDescription: reward.tooltipDescription ?? null,
+    modifiers: reward.modifiers ?? null,
+    config: reward.config ?? null,
+    spendLimitAmount: reward.spendLimitAmount ?? null,
+    spendLimitInterval: reward.spendLimitInterval ?? null,
+  };
+}
+
+export function toDiscountActivitySnapshot(
+  discount: Pick<
+    DiscountProps,
+    "id" | "amount" | "type" | "maxDuration" | "description"
+  >,
+) {
+  return {
+    id: discount.id,
+    amount: discount.amount,
+    type: discount.type,
+    maxDuration: discount.maxDuration ?? null,
+    description: discount.description ?? null,
+  };
+}
diff --git a/apps/web/lib/api/activity-log/track-activity-log.ts b/apps/web/lib/api/activity-log/track-activity-log.ts
index e0e7111079e..840aef5bdf3 100644
--- a/apps/web/lib/api/activity-log/track-activity-log.ts
+++ b/apps/web/lib/api/activity-log/track-activity-log.ts
@@ -63,3 +63,31 @@ export const trackActivityLog = async (
     await logger.flush();
   }
 };
+
+// Same as trackActivityLog, but writes within the caller's Prisma transaction.
+export const trackActivityLogsTx = async ({
+  tx,
+  logs,
+}: {
+  tx: Prisma.TransactionClient;
+  logs: TrackActivityLogInput | TrackActivityLogInput[];
+}) => {
+  let inputs = Array.isArray(logs) ? logs : [logs];
+
+  inputs = inputs.filter(
+    (i) =>
+      ACTIONS_WITHOUT_CHANGE_SET.includes(i.action) ||
+      (i.changeSet && Object.keys(i.changeSet).length > 0),
+  );
+
+  if (inputs.length === 0) {
+    return;
+  }
+
+  await tx.activityLog.createMany({
+    data: inputs.map((input) => ({
+      ...input,
+      changeSet: input.changeSet as Prisma.InputJsonValue,
+    })),
+  });
+};
diff --git a/apps/web/lib/api/activity-log/track-reward-overrides.ts b/apps/web/lib/api/activity-log/track-reward-overrides.ts
new file mode 100644
index 00000000000..d32daaede72
--- /dev/null
+++ b/apps/web/lib/api/activity-log/track-reward-overrides.ts
@@ -0,0 +1,334 @@
+import {
+  toDiscountActivitySnapshot,
+  toLinkActivitySnapshot,
+  toRewardActivitySnapshot,
+} from "@/lib/api/activity-log/to-reward-activity-snapshot";
+import {
+  trackActivityLog,
+  type TrackActivityLogInput,
+} from "@/lib/api/activity-log/track-activity-log";
+import { serializeReward } from "@/lib/api/partners/serialize-reward";
+import type {
+  EnrollmentRewardIds,
+  RewardOverrideIds,
+} from "@/lib/api/rewards/reward-overrides";
+import { prisma } from "@/lib/prisma";
+import type { LinkProps } from "@/lib/types";
+import { Prisma } from "@prisma/client";
+
+type RewardOverrideBaseInput = {
+  workspaceId: string;
+  programId: string;
+  partnerId: string;
+  userId: string;
+  previous: EnrollmentRewardIds;
+  next: EnrollmentRewardIds;
+  description?: string;
+  tx: Prisma.TransactionClient;
+};
+
+export async function trackPartnerRewardOverrideLog(
+  input: RewardOverrideBaseInput,
+) {
+  const {
+    workspaceId,
+    programId,
+    partnerId,
+    userId,
+    previous,
+    next,
+    description,
+    tx,
+  } = input;
+
+  const rewardFields = [
+    ["clickReward", previous.clickRewardId, next.clickRewardId],
+    ["leadReward", previous.leadRewardId, next.leadRewardId],
+    ["saleReward", previous.saleRewardId, next.saleRewardId],
+  ] as const;
+
+  const changedRewardFields = rewardFields.filter(
+    ([, oldId, newId]) => oldId !== newId,
+  );
+  const discountChanged = previous.discountId !== next.discountId;
+
+  if (changedRewardFields.length === 0 && !discountChanged) {
+    return;
+  }
+
+  const rewardIds = [
+    ...new Set(
+      changedRewardFields.flatMap(([, oldId, newId]) =>
+        [oldId, newId].filter((id): id is string => Boolean(id)),
+      ),
+    ),
+  ];
+
+  const discountIds = [
+    ...new Set(
+      [previous.discountId, next.discountId].filter((id): id is string =>
+        Boolean(id),
+      ),
+    ),
+  ];
+
+  const [rewards, discounts] = await Promise.all([
+    rewardIds.length > 0
+      ? tx.reward.findMany({
+          where: {
+            id: {
+              in: rewardIds,
+            },
+          },
+        })
+      : [],
+
+    discountChanged && discountIds.length > 0
+      ? tx.discount.findMany({
+          where: {
+            id: {
+              in: discountIds,
+            },
+          },
+          select: {
+            id: true,
+            amount: true,
+            type: true,
+            maxDuration: true,
+            description: true,
+          },
+        })
+      : [],
+  ]);
+
+  const rewardsById = new Map<
+    string,
+    ReturnType<typeof toRewardActivitySnapshot>
+  >();
+
+  const discountsById = new Map<
+    string,
+    ReturnType<typeof toDiscountActivitySnapshot>
+  >();
+
+  for (const reward of rewards) {
+    rewardsById.set(
+      reward.id,
+      toRewardActivitySnapshot(serializeReward(reward)),
+    );
+  }
+
+  for (const discount of discounts) {
+    discountsById.set(discount.id, toDiscountActivitySnapshot(discount));
+  }
+
+  const base = {
+    workspaceId,
+    programId,
+    resourceType: "partner" as const,
+    resourceId: partnerId,
+    userId,
+  };
+
+  const activityLogs: TrackActivityLogInput[] = [];
+
+  if (changedRewardFields.length > 0) {
+    activityLogs.push({
+      ...base,
+      action: "partner.rewardChanged",
+      description,
+      changeSet: Object.fromEntries(
+        changedRewardFields.map(([field, oldId, newId]) => [
+          field,
+          {
+            old: oldId ? rewardsById.get(oldId) ?? { id: oldId } : null,
+            new: newId ? rewardsById.get(newId) ?? { id: newId } : null,
+          },
+        ]),
+      ),
+    });
+  }
+
+  if (discountChanged) {
+    activityLogs.push({
+      ...base,
+      action: "partner.discountChanged",
+      description,
+      changeSet: {
+        discount: {
+          old: previous.discountId
+            ? discountsById.get(previous.discountId) ?? {
+                id: previous.discountId,
+              }
+            : null,
+          new: next.discountId
+            ? discountsById.get(next.discountId) ?? { id: next.discountId }
+            : null,
+        },
+      },
+    });
+  }
+
+  await tx.activityLog.createMany({
+    data: activityLogs.map((activityLog) => ({
+      ...activityLog,
+      changeSet: activityLog.changeSet as Prisma.InputJsonValue,
+    })),
+  });
+}
+
+type LinkSnapshot = Pick<LinkProps, "id" | "domain" | "key">;
+
+// Track link-level reward/discount overrides. Unlike the partner-level tracker,
+// this variant runs outside a transaction and dispatches via trackActivityLog.
+export async function trackLinkRewardOverrideLog(input: {
+  workspaceId: string;
+  programId: string;
+  partnerId: string;
+  userId: string;
+  previous: RewardOverrideIds;
+  next: RewardOverrideIds;
+  description?: string;
+  link: LinkSnapshot;
+}) {
+  const {
+    workspaceId,
+    programId,
+    partnerId,
+    userId,
+    previous,
+    next,
+    description,
+    link,
+  } = input;
+
+  const rewardFields = [
+    ["clickReward", previous.clickRewardId, next.clickRewardId],
+    ["leadReward", previous.leadRewardId, next.leadRewardId],
+    ["saleReward", previous.saleRewardId, next.saleRewardId],
+  ] as const;
+
+  const changedRewardFields = rewardFields.filter(
+    ([, oldId, newId]) => oldId !== newId,
+  );
+  const discountChanged = previous.discountId !== next.discountId;
+
+  if (changedRewardFields.length === 0 && !discountChanged) {
+    return;
+  }
+
+  const rewardIds = [
+    ...new Set(
+      changedRewardFields.flatMap(([, oldId, newId]) =>
+        [oldId, newId].filter((id): id is string => Boolean(id)),
+      ),
+    ),
+  ];
+
+  const discountIds = [
+    ...new Set(
+      [previous.discountId, next.discountId].filter((id): id is string =>
+        Boolean(id),
+      ),
+    ),
+  ];
+
+  const [rewards, discounts] = await Promise.all([
+    rewardIds.length > 0
+      ? prisma.reward.findMany({
+          where: { id: { in: rewardIds } },
+        })
+      : [],
+    discountChanged && discountIds.length > 0
+      ? prisma.discount.findMany({
+          where: { id: { in: discountIds } },
+          select: {
+            id: true,
+            amount: true,
+            type: true,
+            maxDuration: true,
+            description: true,
+          },
+        })
+      : [],
+  ]);
+
+  const rewardsById = new Map<
+    string,
+    ReturnType<typeof toRewardActivitySnapshot>
+  >();
+  const discountsById = new Map<
+    string,
+    ReturnType<typeof toDiscountActivitySnapshot>
+  >();
+
+  for (const reward of rewards) {
+    rewardsById.set(
+      reward.id,
+      toRewardActivitySnapshot(serializeReward(reward)),
+    );
+  }
+
+  for (const discount of discounts) {
+    discountsById.set(discount.id, toDiscountActivitySnapshot(discount));
+  }
+
+  const base = {
+    workspaceId,
+    programId,
+    resourceType: "partner" as const,
+    resourceId: partnerId,
+    userId,
+  };
+
+  const activityLogs: TrackActivityLogInput[] = [];
+
+  if (changedRewardFields.length > 0) {
+    activityLogs.push({
+      ...base,
+      action: "link.rewardChanged",
+      description,
+      changeSet: {
+        link: {
+          old: null,
+          new: toLinkActivitySnapshot(link),
+        },
+        ...Object.fromEntries(
+          changedRewardFields.map(([field, oldId, newId]) => [
+            field,
+            {
+              old: oldId ? rewardsById.get(oldId) ?? { id: oldId } : null,
+              new: newId ? rewardsById.get(newId) ?? { id: newId } : null,
+            },
+          ]),
+        ),
+      },
+    });
+  }
+
+  if (discountChanged) {
+    activityLogs.push({
+      ...base,
+      action: "link.discountChanged",
+      description,
+      changeSet: {
+        link: {
+          old: null,
+          new: toLinkActivitySnapshot(link),
+        },
+        discount: {
+          old: previous.discountId
+            ? discountsById.get(previous.discountId) ?? {
+                id: previous.discountId,
+              }
+            : null,
+          new: next.discountId
+            ? discountsById.get(next.discountId) ?? { id: next.discountId }
+            : null,
+        },
+      },
+    });
+  }
+
+  await trackActivityLog(activityLogs);
+}
diff --git a/apps/web/lib/api/campaigns/marketing-campaign-broadcast.ts b/apps/web/lib/api/campaigns/marketing-campaign-broadcast.ts
new file mode 100644
index 00000000000..795cb2fb6d5
--- /dev/null
+++ b/apps/web/lib/api/campaigns/marketing-campaign-broadcast.ts
@@ -0,0 +1,35 @@
+import { Campaign, CampaignStatus, CampaignType } from "@prisma/client";
+
+type MarketingBroadcastCampaign = Pick<
+  Campaign,
+  "type" | "status" | "scheduledAt"
+>;
+
+export function isDueMarketingCampaign({
+  campaign,
+  now = new Date(),
+}: {
+  campaign: MarketingBroadcastCampaign;
+  now?: Date;
+}) {
+  return (
+    campaign.type === CampaignType.marketing &&
+    campaign.status === CampaignStatus.scheduled &&
+    (!campaign.scheduledAt || campaign.scheduledAt <= now)
+  );
+}
+
+export function shouldEnqueueDueMarketingBroadcast({
+  previous,
+  next,
+  now = new Date(),
+}: {
+  previous: MarketingBroadcastCampaign;
+  next: MarketingBroadcastCampaign;
+  now?: Date;
+}) {
+  return (
+    isDueMarketingCampaign({ campaign: next, now }) &&
+    !isDueMarketingCampaign({ campaign: previous, now })
+  );
+}
diff --git a/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts b/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
index e42c8cc74f6..889988229d7 100644
--- a/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
+++ b/apps/web/lib/api/campaigns/pause-campaigns-on-plan-downgrade.ts
@@ -1,5 +1,3 @@
-import { scheduleTransactionalCampaign } from "@/lib/api/campaigns/schedule-campaigns";
-import { qstash } from "@/lib/cron";
 import { prisma } from "@/lib/prisma";
 import { CampaignStatus, CampaignType } from "@prisma/client";
 
@@ -8,7 +6,8 @@ export async function pauseOrCancelCampaignsForProgramOnPlanDowngrade({
 }: {
   programId: string;
 }): Promise<void> {
-  const marketingCampaigns = await prisma.campaign.findMany({
+  // Cancel marketing campaigns
+  await prisma.campaign.updateMany({
     where: {
       programId,
       type: CampaignType.marketing,
@@ -16,69 +15,50 @@ export async function pauseOrCancelCampaignsForProgramOnPlanDowngrade({
         in: [CampaignStatus.scheduled, CampaignStatus.sending],
       },
     },
+    data: {
+      status: CampaignStatus.canceled,
+    },
   });
 
-  for (const campaign of marketingCampaigns) {
-    let qstashDeleteSucceeded = !campaign.qstashMessageId;
-
-    if (campaign.qstashMessageId) {
-      try {
-        await qstash.messages.cancel(campaign.qstashMessageId);
-        qstashDeleteSucceeded = true;
-      } catch (error) {
-        console.warn(
-          `Failed to delete QStash message ${campaign.qstashMessageId} for campaign ${campaign.id}:`,
-          error,
-        );
-      }
-    }
-
-    await prisma.campaign.update({
-      where: { id: campaign.id },
-      data: {
-        status: CampaignStatus.canceled,
-        ...(qstashDeleteSucceeded ? { qstashMessageId: null } : {}),
-      },
-    });
-  }
-
   const transactionalCampaigns = await prisma.campaign.findMany({
     where: {
       programId,
       type: CampaignType.transactional,
       status: CampaignStatus.active,
     },
-    include: {
-      workflow: true,
+    select: {
+      workflowId: true,
     },
   });
 
-  for (const campaign of transactionalCampaigns) {
-    try {
-      const updatedCampaign = await prisma.$transaction(async (tx) => {
-        if (campaign.workflowId) {
-          await tx.workflow.update({
-            where: { id: campaign.workflowId },
-            data: { disabledAt: new Date() },
-          });
-        }
+  const workflowIds = transactionalCampaigns.flatMap((campaign) =>
+    campaign.workflowId ? [campaign.workflowId] : [],
+  );
 
-        return tx.campaign.update({
-          where: { id: campaign.id },
-          data: { status: CampaignStatus.paused },
-          include: { workflow: true },
-        });
+  await prisma.$transaction(async (tx) => {
+    if (workflowIds.length > 0) {
+      await tx.workflow.updateMany({
+        where: {
+          id: {
+            in: workflowIds,
+          },
+          disabledAt: null,
+        },
+        data: {
+          disabledAt: new Date(),
+        },
       });
-
-      await scheduleTransactionalCampaign({
-        campaign,
-        updatedCampaign,
-      });
-    } catch (error) {
-      console.warn(
-        `Failed to pause transactional campaign ${campaign.id} on plan downgrade:`,
-        error,
-      );
     }
-  }
+
+    await tx.campaign.updateMany({
+      where: {
+        programId,
+        type: CampaignType.transactional,
+        status: CampaignStatus.active,
+      },
+      data: {
+        status: CampaignStatus.paused,
+      },
+    });
+  });
 }
diff --git a/apps/web/lib/api/campaigns/render-campaign-email-html.ts b/apps/web/lib/api/campaigns/render-campaign-email-html.ts
index 1591d4aaf7c..f390297bae6 100644
--- a/apps/web/lib/api/campaigns/render-campaign-email-html.ts
+++ b/apps/web/lib/api/campaigns/render-campaign-email-html.ts
@@ -1,12 +1,16 @@
 import { configureCampaignEmailImage } from "@/lib/tiptap/campaign-email-image";
 import { EmailTemplateVariables, TiptapNode } from "@/lib/types";
 import { EMAIL_TEMPLATE_VARIABLES } from "@/lib/zod/schemas/campaigns";
+import { CAMPAIGN_EMAIL_TEXT_COLOR } from "@dub/email/templates/campaign-email";
 import Mention from "@tiptap/extension-mention";
 import { generateHTML } from "@tiptap/html/server";
 import StarterKit from "@tiptap/starter-kit";
 import sanitizeHtml from "sanitize-html";
 import { interpolateEmailTemplate } from "./interpolate-email-template";
 
+// neutral-500, matching the editor's list markers
+const LIST_MARKER_COLOR = "#737373";
+
 export function renderCampaignEmailHTML({
   content,
   variables,
@@ -72,9 +76,17 @@ export function renderCampaignEmailHTML({
       /<ol([^>]*)>/g,
       '<ol$1 style="padding-left: 30px; margin-left: 0;">',
     )
+    // The bullet/number takes its color from the <li>, so color the <li> and
+    // restore the body text color on the paragraph inside it (below).
     .replace(
       /<li([^>]*)>/g,
-      '<li$1 style="margin-left: 0; padding-left: 4px; margin-top: 0px; margin-bottom: 0px;">',
+      `<li$1 style="margin-left: 0; padding-left: 4px; margin-top: 0px; margin-bottom: 4px; color: ${LIST_MARKER_COLOR};">`,
+    )
+    // Tiptap wraps each list item's content in a <p>, and email clients give it
+    // a default 1em margin. Zero it so the 4px <li> margin is the only gap.
+    .replace(
+      /(<li[^>]*>)<p>/g,
+      `$1<p style="margin: 0; color: ${CAMPAIGN_EMAIL_TEXT_COLOR};">`,
     );
 
   return interpolateEmailTemplate({
@@ -105,6 +117,7 @@ const sanitizeHtmlBody = (body: string) => {
       ul: ["style"],
       ol: ["style"],
       li: ["style"],
+      p: ["style"],
       "*": ["class"],
     },
     allowedSchemes: ["http", "https", "mailto"],
diff --git a/apps/web/lib/api/campaigns/schedule-campaigns.ts b/apps/web/lib/api/campaigns/schedule-campaigns.ts
deleted file mode 100644
index a8748beef00..00000000000
--- a/apps/web/lib/api/campaigns/schedule-campaigns.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { qstash } from "@/lib/cron";
-import { prisma } from "@/lib/prisma";
-import { PARTNER_ENROLLED_WORKFLOW_CRON } from "@/lib/zod/schemas/workflows";
-import { APP_DOMAIN_WITH_NGROK, log } from "@dub/utils";
-import { Campaign, CampaignType, Workflow } from "@prisma/client";
-import { isScheduledWorkflow } from "../workflows/utils";
-
-type ScheduleCampaignProps = {
-  campaign: Campaign;
-  updatedCampaign: Campaign & {
-    workflow: Workflow | null;
-  };
-};
-
-export const scheduleCampaign = async ({
-  campaign,
-  updatedCampaign,
-}: ScheduleCampaignProps) => {
-  if (campaign.type == CampaignType.marketing) {
-    return scheduleMarketingCampaign({
-      campaign,
-      updatedCampaign,
-    });
-  }
-
-  if (campaign.type == CampaignType.transactional) {
-    return scheduleTransactionalCampaign({
-      campaign,
-      updatedCampaign,
-    });
-  }
-};
-
-export const deleteCampaignSchedule = async (
-  campaign: Pick<Campaign, "type" | "qstashMessageId"> & {
-    workflow: Pick<Workflow, "id" | "triggerConditions" | "actions"> | null;
-  },
-) => {
-  if (campaign.type == CampaignType.marketing && campaign.qstashMessageId) {
-    try {
-      await qstash.messages.cancel(campaign.qstashMessageId);
-    } catch (error) {
-      console.warn(
-        `Failed to delete QStash message ${campaign.qstashMessageId}:`,
-        error,
-      );
-    }
-    return;
-  }
-
-  if (
-    campaign.type == CampaignType.transactional &&
-    campaign.workflow &&
-    isScheduledWorkflow(campaign.workflow)
-  ) {
-    try {
-      await qstash.schedules.delete(campaign.workflow.id);
-    } catch (error) {
-      console.warn(
-        `Failed to delete QStash schedule ${campaign.workflow.id}:`,
-        error,
-      );
-    }
-  }
-};
-
-// Schedule a marketing campaign
-const scheduleMarketingCampaign = async ({
-  campaign,
-  updatedCampaign,
-}: ScheduleCampaignProps) => {
-  if (updatedCampaign.status === "draft") {
-    return;
-  }
-
-  const scheduleChanged =
-    campaign.scheduledAt?.getTime() !== updatedCampaign.scheduledAt?.getTime();
-
-  const statusChanged =
-    (campaign.status === "draft" && updatedCampaign.status === "scheduled") ||
-    (campaign.status === "scheduled" && updatedCampaign.status === "canceled");
-
-  if (!statusChanged && !scheduleChanged) {
-    return;
-  }
-
-  let qstashMessageId = updatedCampaign.qstashMessageId;
-
-  // Delete the existing message
-  if (campaign.qstashMessageId) {
-    try {
-      await qstash.messages.cancel(campaign.qstashMessageId);
-      qstashMessageId = null;
-    } catch (error) {
-      console.warn(
-        `Failed to delete QStash message ${campaign.qstashMessageId}:`,
-        error,
-      );
-    }
-  }
-
-  // Queue a new message
-  if (updatedCampaign.status === "scheduled") {
-    const notBefore = updatedCampaign.scheduledAt
-      ? Math.floor(updatedCampaign.scheduledAt.getTime() / 1000)
-      : null;
-
-    try {
-      const response = await qstash.publishJSON({
-        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/campaigns/broadcast`,
-        method: "POST",
-        ...(notBefore && { notBefore }),
-        body: {
-          campaignId: campaign.id,
-        },
-      });
-
-      qstashMessageId = response.messageId;
-    } catch (error) {
-      console.warn(
-        `Failed to queue QStash message for campaign ${campaign.id}:`,
-        error,
-      );
-    }
-  }
-
-  await prisma.campaign.update({
-    where: {
-      id: campaign.id,
-    },
-    data: {
-      qstashMessageId,
-    },
-  });
-};
-
-// Schedule a transactional campaign
-export const scheduleTransactionalCampaign = async ({
-  campaign,
-  updatedCampaign,
-}: ScheduleCampaignProps) => {
-  if (
-    !updatedCampaign.workflow ||
-    !isScheduledWorkflow(updatedCampaign.workflow)
-  ) {
-    console.log(`No workflow found for campaign ${campaign.id}. Skipping...`);
-    return;
-  }
-
-  const shouldSchedule =
-    (campaign.status === "draft" || campaign.status === "paused") &&
-    updatedCampaign.status === "active";
-
-  if (shouldSchedule) {
-    try {
-      return await qstash.schedules.create({
-        destination: `${APP_DOMAIN_WITH_NGROK}/api/cron/workflows/${updatedCampaign.workflow.id}`,
-        cron: PARTNER_ENROLLED_WORKFLOW_CRON,
-        scheduleId: updatedCampaign.workflow.id,
-      });
-    } catch (error) {
-      // should never happen, but just in case
-      const errorMessage = `Failed to create QStash schedule ${updatedCampaign.workflow.id}: ${error}`;
-      console.warn(errorMessage);
-      await log({
-        type: "errors",
-        message: errorMessage,
-      });
-    }
-    return;
-  }
-
-  const shouldDeleteSchedule =
-    campaign.status === "active" && updatedCampaign.status === "paused";
-
-  if (shouldDeleteSchedule) {
-    try {
-      return await qstash.schedules.delete(updatedCampaign.workflow.id);
-    } catch (error) {
-      // should never happen, but just in case
-      const errorMessage = `Failed to delete QStash schedule ${updatedCampaign.workflow.id}: ${error}`;
-      console.warn(errorMessage);
-      await log({
-        type: "errors",
-        message: errorMessage,
-      });
-    }
-  }
-};
diff --git a/apps/web/lib/api/commissions/create-manual-commissions.ts b/apps/web/lib/api/commissions/create-manual-commissions.ts
index ffbd3f7ebe3..3d87aa59202 100644
--- a/apps/web/lib/api/commissions/create-manual-commissions.ts
+++ b/apps/web/lib/api/commissions/create-manual-commissions.ts
@@ -1,3 +1,4 @@
+import { convertCurrency } from "@/lib/analytics/convert-currency";
 import { isFirstConversion } from "@/lib/analytics/is-first-conversion";
 import { Session } from "@/lib/auth";
 import { generateRandomName } from "@/lib/names";
@@ -16,6 +17,7 @@ import { leadEventSchemaTB } from "@/lib/zod/schemas/leads";
 import { saleEventSchemaTB } from "@/lib/zod/schemas/sales";
 import { COUNTRIES_TO_CONTINENTS, nanoid, R2_URL } from "@dub/utils";
 import {
+  CommissionSource,
   CommissionType,
   Customer,
   Link,
@@ -98,6 +100,7 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
       createdAt: date ?? new Date(),
       description,
       userId: user.id,
+      source: CommissionSource.user,
       triggerAggregateDueCommissions: true,
     });
 
@@ -113,33 +116,9 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
     });
 
   if (type === "sale") {
-    const {
-      importStripeInvoices,
-      saleAmount,
-      saleEventDate,
-      invoiceId,
-      productId,
-    } = args;
-
-    if (!importStripeInvoices && !saleAmount) {
-      throw new DubApiError({
-        code: "bad_request",
-        message: "Either saleAmount or importStripeInvoices must be provided.",
-      });
-    }
-
-    const hasManualSaleFields =
-      saleAmount || saleEventDate || invoiceId || productId;
+    const { importStripeInvoices, sale } = args;
 
     if (importStripeInvoices) {
-      if (hasManualSaleFields) {
-        throw new DubApiError({
-          code: "bad_request",
-          message:
-            "saleAmount, saleEventDate, invoiceId, and productId cannot be provided when importStripeInvoices is enabled.",
-        });
-      }
-
       if (!workspace.stripeConnectId) {
         throw new DubApiError({
           code: "bad_request",
@@ -155,6 +134,8 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
       }
     }
 
+    const invoiceId = sale?.invoiceId ?? args.invoiceId;
+
     if (invoiceId) {
       const commission = await prisma.commission.findUnique({
         where: {
@@ -188,6 +169,8 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
 
   // Lead commission
   if (type === CommissionType.lead) {
+    const metadata = args.lead?.metadata;
+
     commissionsToCreate.push({
       event: CommissionType.lead,
       programId,
@@ -199,10 +182,15 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
       // we don't add the "Z" to the timestamp because it's already in UTC
       createdAt: new Date(leadEvent.timestamp),
       userId: user.id,
+      source: CommissionSource.user,
+      ...(metadata != null && { metadata }),
       context: {
         customer: {
           country: targetCustomer.country,
         },
+        lead: {
+          ...(metadata != null && { metadata }),
+        },
       },
     });
   }
@@ -227,6 +215,8 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
           status: "refunded" as const,
         }),
         userId: user.id,
+        source: CommissionSource.user,
+        ...(saleEvent.metadata != null && { metadata: saleEvent.metadata }),
         context: {
           customer: {
             country: targetCustomer.country,
@@ -235,6 +225,7 @@ export async function createManualCommissions(args: CreateCommissionsArgs) {
           sale: {
             productId: saleEvent.productId,
             amount: saleEvent.amount,
+            ...(saleEvent.metadata != null && { metadata: saleEvent.metadata }),
           },
         },
         isFirstConversion,
@@ -272,7 +263,9 @@ async function resolveLinkAndCustomer(args: ResolveLinkAndCustomerArgs) {
 
   let targetLink: Link;
   let targetCustomer: Customer | null = null;
-  const { workspace, partner, links, linkId, customerId, customer } = args;
+  const { workspace, partner, links, programId, linkId, customerId, customer } =
+    args;
+  const discountCode = type === "sale" ? args.discountCode : undefined;
 
   if (links.length === 0) {
     throw new DubApiError({
@@ -295,13 +288,49 @@ async function resolveLinkAndCustomer(args: ResolveLinkAndCustomerArgs) {
     });
   }
 
-  if (linkId) {
-    const link = links.find((l) => l.id === linkId);
+  let resolvedLinkId = linkId ?? null;
+
+  if (discountCode) {
+    const found = await prisma.discountCode.findUnique({
+      where: {
+        programId_code: {
+          programId,
+          code: discountCode,
+        },
+      },
+    });
+
+    if (!found) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Discount code ${discountCode} not found.`,
+      });
+    }
+
+    if (found.partnerId !== partner.id) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Discount code ${discountCode} does not belong to partner ${partner.email} (${partner.id}).`,
+      });
+    }
+
+    if (found.disabledAt) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `Discount code ${discountCode} is disabled.`,
+      });
+    }
+
+    resolvedLinkId = found.linkId;
+  }
+
+  if (resolvedLinkId) {
+    const link = links.find((l) => l.id === resolvedLinkId);
 
     if (!link) {
       throw new DubApiError({
         code: "not_found",
-        message: `Link ${linkId} does not belong to partner ${partner.email} (${partner.id}).`,
+        message: `Link ${resolvedLinkId} does not belong to partner ${partner.email} (${partner.id}).`,
       });
     }
 
@@ -422,7 +451,7 @@ async function recordEvents(args: RecordEventsArgs) {
   const { workspace, programId, targetLink, targetCustomer } = args;
 
   if (type === "lead") {
-    finalLeadEventDate = args.leadEventDate ?? new Date();
+    finalLeadEventDate = args.date ?? args.leadEventDate ?? new Date();
   } else if (args.importStripeInvoices) {
     stripeCustomerInvoices = await getCustomerStripeInvoices({
       stripeCustomerId: targetCustomer.stripeCustomerId!,
@@ -449,47 +478,55 @@ async function recordEvents(args: RecordEventsArgs) {
 
     finalLeadEventDate = stripeCustomerInvoices[0].createdAt;
   } else {
-    finalLeadEventDate = args.saleEventDate ?? new Date();
+    finalLeadEventDate = args.date ?? args.saleEventDate ?? new Date();
   }
 
   const clickId = nanoid(16);
   const clickedAt = new Date(finalLeadEventDate.getTime() - 5 * 60 * 1000);
-  const leadEventName = type === "lead" ? args.leadEventName : "Sign up";
-  let saleEvents: z.infer<typeof saleEventSchemaTBWithTimestamp>[] = [];
 
-  // Record click event
+  // Record a dummy click event (start of the conversion funnel)
   const clickEvent = recordClickZodSchema.parse({
     timestamp: clickedAt.toISOString(),
     identity_hash: targetCustomer.externalId || targetCustomer.id,
+    workspace_id: workspace.id,
     click_id: clickId,
     link_id: targetLink.id,
+    domain: targetLink.domain,
+    key: targetLink.key,
     url: targetLink.url,
     ip: "127.0.0.1",
+    country: targetCustomer.country,
     continent: targetCustomer.country
       ? COUNTRIES_TO_CONTINENTS[targetCustomer.country.toUpperCase()] || ""
       : "",
   });
 
   // Record lead event
+  const lead =
+    type === "lead"
+      ? {
+          eventName: args.lead?.eventName ?? args.leadEventName ?? "Sign up",
+          metadata: args.lead?.metadata ?? null,
+        }
+      : null;
+
   const leadEvent = leadEventSchemaTBWithTimestamp.parse({
     ...clickEvent,
     event_id: nanoid(16),
-    event_name: leadEventName ?? "Sign up",
+    event_name: lead?.eventName ?? "Sign up",
     customer_id: targetCustomer.id,
     timestamp: finalLeadEventDate.toISOString(),
+    metadata: lead?.metadata ? JSON.stringify(lead.metadata) : "",
   });
 
   // Record sale events
-  if (type === "sale") {
-    const {
-      invoiceId,
-      saleAmount,
-      saleEventDate,
-      productId,
-      importStripeInvoices,
-    } = args;
+  let saleEvents: z.infer<typeof saleEventSchemaTBWithTimestamp>[] = [];
 
-    if (importStripeInvoices) {
+  // Only persist user-provided sale.metadata on the commission
+  let commissionMetadata: Record<string, unknown> | null = null;
+
+  if (type === "sale") {
+    if (args.importStripeInvoices) {
       saleEvents = stripeCustomerInvoices.map((invoice) =>
         saleEventSchemaTBWithTimestamp.parse({
           ...clickEvent,
@@ -504,19 +541,50 @@ async function recordEvents(args: RecordEventsArgs) {
           metadata: JSON.stringify(invoice.metadata),
         }),
       );
-    } else if (saleAmount) {
+    } else {
+      const { sale } = args;
+      const invoiceId = sale?.invoiceId ?? args.invoiceId;
+      const productId = sale?.metadata?.productId ?? args.productId;
+      const saleEventDate = args.date ?? args.saleEventDate ?? Date.now();
+      const eventName = sale?.eventName ?? "Purchase";
+      const paymentProcessor = sale?.paymentProcessor ?? "custom";
+      let currency = sale?.currency ?? "usd";
+      let saleAmount = sale?.amount ?? args.saleAmount;
+
+      const eventMetadata = {
+        ...(sale?.metadata ?? {}),
+        ...(productId ? { productId } : {}),
+      };
+
+      commissionMetadata = sale?.metadata ?? null;
+
+      // Convert the non-USD sale amount to USD based on the current FX rate
+      if (currency !== "usd") {
+        const { currency: convertedCurrency, amount: convertedAmount } =
+          await convertCurrency({
+            currency,
+            amount: saleAmount!,
+          });
+
+        currency = convertedCurrency;
+        saleAmount = convertedAmount;
+      }
+
       saleEvents = [
         saleEventSchemaTBWithTimestamp.parse({
           ...clickEvent,
           event_id: nanoid(16),
           invoice_id: invoiceId ?? "",
-          event_name: "Purchase",
+          event_name: eventName,
           amount: saleAmount,
           customer_id: targetCustomer.id,
-          payment_processor: "custom",
-          currency: "usd",
-          timestamp: new Date(saleEventDate ?? Date.now()).toISOString(),
-          metadata: productId ? JSON.stringify({ productId }) : undefined,
+          payment_processor: paymentProcessor,
+          currency,
+          timestamp: new Date(saleEventDate).toISOString(),
+          metadata:
+            Object.keys(eventMetadata).length > 0
+              ? JSON.stringify(eventMetadata)
+              : "",
         }),
       ];
     }
@@ -542,9 +610,9 @@ async function recordEvents(args: RecordEventsArgs) {
         (invoice) => invoice.id === saleEvent.invoice_id,
       );
 
-      const metadata = saleEvent.metadata
+      const eventMetadata = saleEvent.metadata
         ? JSON.parse(saleEvent.metadata)
-        : undefined;
+        : null;
 
       return {
         id: saleEvent.event_id,
@@ -552,7 +620,9 @@ async function recordEvents(args: RecordEventsArgs) {
         amount: saleEvent.amount,
         currency: saleEvent.currency,
         invoiceId: saleEvent.invoice_id,
-        productId: metadata?.productId,
+        productId: eventMetadata?.productId,
+        // Only persist user-provided metadata on the commission.
+        metadata: stripeInvoice ? null : commissionMetadata,
         ...(stripeInvoice?.refunded && {
           status: "refunded" as const,
         }),
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index 7511e90ef09..65a28ed824f 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -5,6 +5,10 @@ import { parseFilterValue } from "@dub/utils";
 import { CommissionStatus, CommissionType } from "@prisma/client";
 import * as z from "zod/v4";
 import { getFraudEventGroupEventIds } from "../fraud/get-fraud-event-group-event-ids";
+import {
+  buildCommissionMetadataWhere,
+  parseCommissionMetadataQuery,
+} from "./metadata-filters";
 
 type CommissionsCountFilters = z.infer<
   typeof getCommissionsCountQuerySchema
@@ -28,6 +32,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
     interval,
     timezone,
     programId,
+    query,
   } = filters;
 
   // Filter the commissions based on the risk event group
@@ -79,6 +84,10 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
   const customerFilter = parseFilterValue(customerId);
   const typeFilter = parseFilterValue(type);
 
+  // Metadata filter
+  const parsedMetadataQuery = parseCommissionMetadataQuery(query);
+  const metadataWhere = buildCommissionMetadataWhere(parsedMetadataQuery);
+
   const commissionsCount = await prisma.commission.groupBy({
     by: ["status"],
     where: {
@@ -118,6 +127,7 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
       ...(Object.keys(programEnrollmentFilter).length > 0 && {
         programEnrollment: programEnrollmentFilter,
       }),
+      ...metadataWhere,
     },
     _count: true,
     _sum: {
diff --git a/apps/web/lib/api/commissions/get-commissions.ts b/apps/web/lib/api/commissions/get-commissions.ts
index 50c19aa5f73..874b6ad53d1 100644
--- a/apps/web/lib/api/commissions/get-commissions.ts
+++ b/apps/web/lib/api/commissions/get-commissions.ts
@@ -2,11 +2,15 @@ import { getStartEndDates } from "@/lib/analytics/utils/get-start-end-dates";
 import { prisma } from "@/lib/prisma";
 import { getCommissionsQuerySchema } from "@/lib/zod/schemas/commissions";
 import { parseFilterValue } from "@dub/utils";
-import { CommissionStatus, CommissionType } from "@prisma/client";
+import { CommissionStatus, CommissionType, Prisma } from "@prisma/client";
 import * as z from "zod/v4";
 import { DubApiError } from "../errors";
 import { getFraudEventGroupEventIds } from "../fraud/get-fraud-event-group-event-ids";
 import { buildPaginationQuery } from "../pagination";
+import {
+  buildCommissionMetadataWhere,
+  parseCommissionMetadataQuery,
+} from "./metadata-filters";
 
 type CommissionsFilters = Omit<
   z.infer<typeof getCommissionsQuerySchema>,
@@ -17,6 +21,17 @@ type CommissionsFilters = Omit<
   fraudEventGroupId?: string;
 };
 
+const commissionIncludes = {
+  customer: true,
+  partner: true,
+  programEnrollment: true,
+  payout: {
+    select: {
+      paidAt: true,
+    },
+  },
+} satisfies Prisma.CommissionInclude;
+
 export async function getCommissions(filters: CommissionsFilters) {
   const {
     invoiceId,
@@ -35,8 +50,27 @@ export async function getCommissions(filters: CommissionsFilters) {
     timezone,
     startingAfter,
     endingBefore,
+    query,
   } = filters;
 
+  // Metadata filter
+  const parsedMetadataQuery = parseCommissionMetadataQuery(query);
+  const metadataWhere = buildCommissionMetadataWhere(parsedMetadataQuery);
+
+  // InvoiceId is unique within a program
+  if (invoiceId) {
+    return await prisma.commission.findMany({
+      where: {
+        invoiceId,
+        programId,
+        ...metadataWhere,
+      },
+      include: {
+        ...commissionIncludes,
+      },
+    });
+  }
+
   const paginationQuery = buildPaginationQuery(filters);
 
   // Validate the provided cursor ID
@@ -131,53 +165,42 @@ export async function getCommissions(filters: CommissionsFilters) {
   };
 
   return await prisma.commission.findMany({
-    where: invoiceId
-      ? {
-          invoiceId,
-          programId,
-        }
-      : {
-          earnings: {
-            not: 0,
-          },
-          programId,
-          ...(partnerFilter && {
-            partnerId:
-              partnerFilter.sqlOperator === "NOT IN"
-                ? { notIn: partnerFilter.values }
-                : { in: partnerFilter.values },
-          }),
-          status: statusFilter,
-          ...(typeFilter && {
-            type:
-              typeFilter.sqlOperator === "NOT IN"
-                ? { notIn: typeFilter.values }
-                : { in: typeFilter.values },
-          }),
-          customerId,
-          payoutId,
-          ...(eventIds && {
-            eventId: {
-              in: eventIds,
-            },
-          }),
-          createdAt: {
-            gte: startDate,
-            lte: endDate,
-          },
-          ...(Object.keys(programEnrollmentFilter).length > 0 && {
-            programEnrollment: programEnrollmentFilter,
-          }),
-        },
-    include: {
-      customer: true,
-      partner: true,
-      programEnrollment: true,
-      payout: {
-        select: {
-          paidAt: true,
+    where: {
+      earnings: {
+        not: 0,
+      },
+      programId,
+      ...(partnerFilter && {
+        partnerId:
+          partnerFilter.sqlOperator === "NOT IN"
+            ? { notIn: partnerFilter.values }
+            : { in: partnerFilter.values },
+      }),
+      status: statusFilter,
+      ...(typeFilter && {
+        type:
+          typeFilter.sqlOperator === "NOT IN"
+            ? { notIn: typeFilter.values }
+            : { in: typeFilter.values },
+      }),
+      customerId,
+      payoutId,
+      ...(eventIds && {
+        eventId: {
+          in: eventIds,
         },
+      }),
+      createdAt: {
+        gte: startDate,
+        lte: endDate,
       },
+      ...(Object.keys(programEnrollmentFilter).length > 0 && {
+        programEnrollment: programEnrollmentFilter,
+      }),
+      ...metadataWhere,
+    },
+    include: {
+      ...commissionIncludes,
     },
     ...paginationQuery,
   });
diff --git a/apps/web/lib/api/commissions/metadata-filters.ts b/apps/web/lib/api/commissions/metadata-filters.ts
new file mode 100644
index 00000000000..7a02220b021
--- /dev/null
+++ b/apps/web/lib/api/commissions/metadata-filters.ts
@@ -0,0 +1,192 @@
+import { Prisma } from "@prisma/client";
+import { DubApiError } from "../errors";
+
+export type CommissionMetadataFilterOp = "equals" | "notEquals";
+
+export type CommissionMetadataFilter = {
+  key: string;
+  op: CommissionMetadataFilterOp;
+  value: string;
+};
+
+export type ParsedCommissionMetadataQuery = {
+  logic: "AND" | "OR";
+  filters: CommissionMetadataFilter[];
+};
+
+const MAX_METADATA_FILTER_CONDITIONS = 5;
+
+function mapOperator(operator: string): CommissionMetadataFilterOp {
+  switch (operator) {
+    case ":":
+    case "=":
+      return "equals";
+    case "!=":
+      return "notEquals";
+    default:
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message: "Metadata query only supports `=` and `!=` operators.",
+      });
+  }
+}
+
+function parseCondition(condition: string): CommissionMetadataFilter {
+  // Top-level metadata['key'] / metadata["key"] only — nested brackets fail the match.
+  const match = condition.match(
+    /^metadata\[['"]([A-Za-z0-9_]+)['"]\]\s*(!=|>=|<=|:|=|>|<)\s*(.+)$/,
+  );
+
+  if (!match) {
+    const invalidKeyMatch = condition.match(
+      /^metadata\[['"]([^'"]+)['"]\]\s*(!=|>=|<=|:|=|>|<)\s*(.+)$/,
+    );
+
+    if (invalidKeyMatch && !/^[A-Za-z0-9_]+$/.test(invalidKeyMatch[1])) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message:
+          "Invalid metadata query. Metadata keys may only contain letters, numbers, and underscores.",
+      });
+    }
+
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message:
+        "Invalid metadata query. Use top-level keys only, e.g. `metadata['key']='value'`.",
+    });
+  }
+
+  const [, key, operator, rawValue] = match;
+  const value = rawValue.trim().replace(/^['"`]|['"`]$/g, "");
+
+  if (!value) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "Invalid metadata query: empty filter value.",
+    });
+  }
+
+  // e.g. `==` leaves a leftover that starts with `=` after the first `=` is matched.
+  if (/^[=:!<>]/.test(value)) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "Metadata query only supports `=` and `!=` operators.",
+    });
+  }
+
+  return {
+    key,
+    op: mapOperator(operator),
+    value,
+  };
+}
+
+/** Mask quoted segments so AND/OR inside values are not treated as connectives. */
+function maskQuotedSegments(query: string): string {
+  return query.replace(/'[^']*'|"[^"]*"/g, (match) =>
+    "\u0000".repeat(match.length),
+  );
+}
+
+/** Split on AND/OR outside quotes by finding connectives on a masked copy. */
+function splitConditionsOutsideQuotes(query: string): string[] {
+  const masked = maskQuotedSegments(query);
+  const connective = /\s+(?:and|or)\s+/gi;
+  const conditions: string[] = [];
+  let lastIndex = 0;
+
+  for (const match of masked.matchAll(connective)) {
+    const start = match.index ?? 0;
+    conditions.push(query.slice(lastIndex, start));
+    lastIndex = start + match[0].length;
+  }
+
+  conditions.push(query.slice(lastIndex));
+  return conditions;
+}
+
+export function parseCommissionMetadataQuery(
+  query: string | undefined,
+): ParsedCommissionMetadataQuery | undefined {
+  if (query == null || !query.trim()) {
+    return undefined;
+  }
+
+  const trimmed = query.trim();
+  const masked = maskQuotedSegments(trimmed);
+
+  if (/\s+(?:and|or)\s*$/i.test(masked)) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "Invalid metadata query.",
+    });
+  }
+
+  const hasAnd = /\s+and\s+/i.test(masked);
+  const hasOr = /\s+or\s+/i.test(masked);
+
+  if (hasAnd && hasOr) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "Metadata query cannot mix AND and OR.",
+    });
+  }
+
+  const logic: "AND" | "OR" = hasOr ? "OR" : "AND";
+  const conditions = splitConditionsOutsideQuotes(trimmed);
+  const filters: CommissionMetadataFilter[] = [];
+
+  for (const condition of conditions) {
+    const trimmedCondition = condition.trim();
+    if (!trimmedCondition) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message: "Invalid metadata query.",
+      });
+    }
+    filters.push(parseCondition(trimmedCondition));
+  }
+
+  if (filters.length === 0) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "Invalid metadata query.",
+    });
+  }
+
+  if (filters.length > MAX_METADATA_FILTER_CONDITIONS) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: `Metadata query supports at most ${MAX_METADATA_FILTER_CONDITIONS} conditions.`,
+    });
+  }
+
+  return {
+    logic,
+    filters,
+  };
+}
+
+export function buildCommissionMetadataWhere(
+  parsed: ParsedCommissionMetadataQuery | undefined,
+): Prisma.CommissionWhereInput | undefined {
+  if (!parsed) {
+    return undefined;
+  }
+
+  const clauses: Prisma.CommissionWhereInput[] = parsed.filters.map(
+    (filter) => ({
+      metadata:
+        filter.op === "equals"
+          ? { path: `$.${filter.key}`, equals: filter.value }
+          : { path: `$.${filter.key}`, not: filter.value },
+    }),
+  );
+
+  if (clauses.length === 1) {
+    return clauses[0];
+  }
+
+  return parsed.logic === "OR" ? { OR: clauses } : { AND: clauses };
+}
diff --git a/apps/web/lib/api/commissions/update-partner-commission.ts b/apps/web/lib/api/commissions/update-partner-commission.ts
index c9a6ffe2412..87db97c92f7 100644
--- a/apps/web/lib/api/commissions/update-partner-commission.ts
+++ b/apps/web/lib/api/commissions/update-partner-commission.ts
@@ -147,11 +147,14 @@ export async function updatePartnerCommission({
       },
     });
 
-    const reward = determinePartnerReward({
+    const partnerReward = await determinePartnerReward({
       event: "sale",
       programEnrollment,
+      linkId: commission.linkId,
     });
 
+    const reward = partnerReward?.reward;
+
     if (!reward) {
       throw new DubApiError({
         code: "not_found",
diff --git a/apps/web/lib/api/conversions/track-lead.ts b/apps/web/lib/api/conversions/track-lead.ts
index 8f39ebc0192..25f22f22776 100644
--- a/apps/web/lib/api/conversions/track-lead.ts
+++ b/apps/web/lib/api/conversions/track-lead.ts
@@ -18,7 +18,7 @@ import {
   trackLeadResponseSchema,
 } from "@/lib/zod/schemas/leads";
 import { nanoid, R2_URL } from "@dub/utils";
-import { EventType, Link } from "@prisma/client";
+import { CommissionSource, EventType, Link } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { syncPartnerLinksStats } from "../partners/sync-partner-links-stats";
@@ -27,6 +27,8 @@ import { executeWorkflows } from "../workflows/execute-workflows";
 type TrackLeadParams = z.input<typeof trackLeadRequestSchema> & {
   workspace: Pick<WorkspaceProps, "id" | "stripeConnectId" | "webhookEnabled">;
   source?: CustomerSource; // default is "tracked"
+  commissionSource?: CommissionSource; // default is api
+  userId?: string; // only passed if CommissionSource.user
 };
 
 export const trackLead = async ({
@@ -41,6 +43,8 @@ export const trackLead = async ({
   metadata,
   workspace,
   source = "tracked",
+  commissionSource = CommissionSource.api,
+  userId,
 }: TrackLeadParams) => {
   // try to find the customer to use if it exists
   let customer = await prisma.customer.findUnique({
@@ -300,6 +304,9 @@ export const trackLead = async ({
               eventId: leadEventId,
               customerId: customer.id,
               quantity: eventQuantity ?? 1,
+              source: commissionSource,
+              userId,
+              ...(metadata != null && { metadata }),
               context: {
                 customer: {
                   country: customer.country,
@@ -356,6 +363,7 @@ export const trackLead = async ({
               workspaceId: workspace.id,
               eventType: EventType.lead,
               eventId: leadEventId,
+              eventName,
               conversionDateTime: new Date().toISOString(),
               conversionCount: eventQuantity ?? undefined,
               click: {
diff --git a/apps/web/lib/api/conversions/track-sale.ts b/apps/web/lib/api/conversions/track-sale.ts
index ea4b8472fee..aa8c857ef5a 100644
--- a/apps/web/lib/api/conversions/track-sale.ts
+++ b/apps/web/lib/api/conversions/track-sale.ts
@@ -27,7 +27,7 @@ import {
   trackSaleResponseSchema,
 } from "@/lib/zod/schemas/sales";
 import { nanoid, R2_URL } from "@dub/utils";
-import { Customer, EventType } from "@prisma/client";
+import { CommissionSource, Customer, EventType } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 import { createId } from "../create-id";
@@ -37,6 +37,8 @@ import { executeWorkflows } from "../workflows/execute-workflows";
 type TrackSaleParams = z.input<typeof trackSaleRequestSchema> & {
   workspace: Pick<WorkspaceProps, "id" | "stripeConnectId" | "webhookEnabled">;
   source?: CustomerSource; // default is "tracked"
+  commissionSource?: CommissionSource; // default is api
+  userId?: string; // only passed if CommissionSource.user
 };
 
 export const trackSale = async ({
@@ -54,6 +56,8 @@ export const trackSale = async ({
   metadata,
   workspace,
   source = "tracked",
+  commissionSource = CommissionSource.api,
+  userId,
 }: TrackSaleParams) => {
   let existingCustomer: Customer | null = null;
   let newCustomer: Customer | null = null;
@@ -347,6 +351,8 @@ export const trackSale = async ({
       leadEventData,
       customer,
       source,
+      commissionSource,
+      userId,
     }),
   ]);
 
@@ -471,6 +477,8 @@ const _trackSale = async ({
   leadEventData,
   customer,
   source,
+  commissionSource = CommissionSource.api,
+  userId,
 }: Omit<TrackSaleParams, "customerExternalId"> & {
   leadEventData: LeadEventTB | null;
   customer: Customer;
@@ -577,6 +585,9 @@ const _trackSale = async ({
           quantity: 1,
           invoiceId,
           currency,
+          source: commissionSource,
+          userId,
+          ...(metadata != null && { metadata }),
           context: {
             customer: {
               country: customer.country,
@@ -644,13 +655,14 @@ const _trackSale = async ({
         queueGoogleAdsConversionUpload({
           workspaceId: workspace.id,
           eventType: EventType.sale,
+          eventName: saleData.event_name,
           conversionDateTime: new Date().toISOString(),
           eventId: saleData.event_id,
-          conversionValue: amount / 100, // Data Manager expects major currency units
-          currencyCode: currency,
+          conversionValue: saleData.amount,
+          currencyCode: saleData.currency,
           click: {
-            id: leadEventData.click_id,
-            url: leadEventData.url,
+            id: saleData.click_id,
+            url: saleData.url,
           },
         }),
 
diff --git a/apps/web/lib/api/customers/get-customer-or-throw.ts b/apps/web/lib/api/customers/get-customer-or-throw.ts
index 1e044a2c313..5eea7ad9f66 100644
--- a/apps/web/lib/api/customers/get-customer-or-throw.ts
+++ b/apps/web/lib/api/customers/get-customer-or-throw.ts
@@ -30,7 +30,15 @@ export const getCustomerOrThrow = async (
     ...(includeExpandedFields
       ? {
           include: {
-            link: true,
+            link: {
+              include: {
+                linkReward: {
+                  select: {
+                    discount: true,
+                  },
+                },
+              },
+            },
             programEnrollment: {
               include: {
                 partner: true,
diff --git a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts b/apps/web/lib/api/customers/get-customer-stripe-invoices.ts
index 1db1f5046d8..6f3233d647a 100644
--- a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts
+++ b/apps/web/lib/api/customers/get-customer-stripe-invoices.ts
@@ -4,6 +4,7 @@ import { stripeAppClient } from "@/lib/stripe";
 import { StripeCustomerInvoiceSchema } from "@/lib/zod/schemas/customers";
 import { STRIPE_INTEGRATION_ID } from "@dub/utils";
 import Stripe from "stripe";
+import { DubApiError } from "../errors";
 
 type ExpandedStripeInvoice = Stripe.Invoice & {
   id: string;
@@ -48,20 +49,45 @@ export async function getCustomerStripeInvoices({
     installedStripeIntegration.settings || {},
   );
 
+  if (!stripeCustomerId.startsWith("cus_")) {
+    throw new DubApiError({
+      code: "bad_request",
+      message: `Customer has an invalid Stripe customer ID (${stripeCustomerId}). Stripe customer IDs start with "cus_".`,
+    });
+  }
+
   const stripe = stripeAppClient({
     mode: stripeIntegrationSettings.stripeMode,
   });
-  const { data } = await stripe.invoices.list(
-    {
-      customer: stripeCustomerId,
-      status: "paid",
-      limit: 100,
-      expand: ["data.payments.data.payment"],
-    },
-    {
-      stripeAccount: stripeConnectId,
-    },
-  );
+
+  let data: Stripe.Invoice[];
+  try {
+    const res = await stripe.invoices.list(
+      {
+        customer: stripeCustomerId,
+        status: "paid",
+        limit: 100,
+        expand: ["data.payments.data.payment"],
+      },
+      {
+        stripeAccount: stripeConnectId,
+      },
+    );
+    data = res.data;
+  } catch (error) {
+    if (
+      error instanceof Stripe.errors.StripeError &&
+      error.code === "resource_missing"
+    ) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: `Stripe customer "${stripeCustomerId}" was not found on the connected Stripe account. Update the customer's Stripe customer ID and try again.`,
+      });
+    }
+
+    throw error;
+  }
+
   const invoices = data.filter(
     (invoice) => invoice.id,
   ) as ExpandedStripeInvoice[];
diff --git a/apps/web/lib/api/customers/reattribute-customer.ts b/apps/web/lib/api/customers/reattribute-customer.ts
new file mode 100644
index 00000000000..273babfb06c
--- /dev/null
+++ b/apps/web/lib/api/customers/reattribute-customer.ts
@@ -0,0 +1,880 @@
+import { reconcilePayoutAmounts } from "@/lib/api/commissions/reconcile-payout-amounts";
+import { updateLinkStatsForImporter } from "@/lib/api/links/update-link-stats-for-importer";
+import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
+import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
+import { MUTABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";
+import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
+import { prisma } from "@/lib/prisma";
+import { getCustomerEventsTB } from "@/lib/tinybird/get-customer-events-tb";
+import {
+  recordClickZod,
+  recordClickZodSchema,
+} from "@/lib/tinybird/record-click-zod";
+import { recordLeadWithTimestamp } from "@/lib/tinybird/record-lead";
+import { recordSaleWithTimestamp } from "@/lib/tinybird/record-sale";
+import { redis } from "@/lib/upstash";
+import { leadEventSchemaTB } from "@/lib/zod/schemas/leads";
+import { saleEventSchemaTB } from "@/lib/zod/schemas/sales";
+import { nanoid } from "@dub/utils";
+import { Customer, Link } from "@prisma/client";
+import * as z from "zod/v4";
+
+export const CUSTOMER_REATTRIBUTION_EVENTS_LIMIT = 500;
+const UNPAID_COMMISSION_STATUSES = ["pending", "hold", "processed"] as const;
+const STATS_LOCK_TTL_SECONDS = 60 * 60 * 24;
+
+const leadEventSchemaTBWithTimestamp = leadEventSchemaTB.extend({
+  timestamp: z.string(),
+});
+
+const saleEventSchemaTBWithTimestamp = saleEventSchemaTB.extend({
+  timestamp: z.string(),
+});
+
+type CustomerTBEvent = {
+  event: "click" | "lead" | "sale";
+  timestamp: string;
+  click_id?: string;
+  link_id?: string;
+  event_id?: string;
+  event_name?: string;
+  saleAmount?: number;
+  invoice_id?: string;
+  payment_processor?: string;
+  currency?: string;
+  [key: string]: unknown;
+};
+
+type ReattributeEventPlan = {
+  hasClick: boolean;
+  hasLead: boolean;
+  leadCount: number;
+  saleCount: number;
+  saleAmount: number;
+  leadTimestamp: string | null;
+  saleTimestamp: string | null;
+};
+
+async function runOnce({ key, fn }: { key: string; fn: () => Promise<void> }) {
+  const acquired = await redis.set(key, "1", {
+    nx: true,
+    ex: STATS_LOCK_TTL_SECONDS,
+  });
+
+  if (acquired !== "OK") {
+    return false;
+  }
+
+  try {
+    await fn();
+    return true;
+  } catch (error) {
+    await redis.del(key);
+    throw error;
+  }
+}
+
+export function isReattributedCustomerStub({
+  externalId,
+  partnerId,
+  linkId,
+  programId,
+}: {
+  externalId: string | null;
+  partnerId: string | null;
+  linkId: string | null;
+  programId: string | null;
+}) {
+  return (
+    (externalId?.startsWith("reattributed_") === true ||
+      externalId?.startsWith("dummy_") === true ||
+      externalId?.startsWith("retired_") === true) &&
+    partnerId == null &&
+    linkId == null &&
+    programId == null
+  );
+}
+
+export async function getCustomerReattributeEvents(customerId: string) {
+  const { data } = await getCustomerEventsTB({
+    customerId,
+    limit: CUSTOMER_REATTRIBUTION_EVENTS_LIMIT,
+  });
+
+  return (data ?? []).filter(
+    (event): event is CustomerTBEvent =>
+      typeof event === "object" &&
+      event !== null &&
+      "event" in event &&
+      (event.event === "click" ||
+        event.event === "lead" ||
+        event.event === "sale"),
+  );
+}
+
+export async function recreateCustomerForReattribution({
+  customer,
+  link,
+  newCustomerId,
+  newClickId,
+}: {
+  customer: Customer;
+  link: Pick<Link, "id" | "programId" | "partnerId">;
+  newCustomerId: string;
+  newClickId: string;
+}) {
+  return await prisma.$transaction(async (tx) => {
+    await tx.customer.update({
+      where: {
+        id: customer.id,
+      },
+      data: {
+        name: customer.name ? `${customer.name} (old)` : undefined,
+        externalId: `reattributed_${nanoid(32)}`,
+        stripeCustomerId: null,
+        linkId: null,
+        clickId: null,
+        clickedAt: null,
+        programId: null,
+        partnerId: null,
+        sales: 0,
+        saleAmount: 0,
+        firstSaleAt: null,
+        subscriptionCanceledAt: null,
+      },
+    });
+
+    return await tx.customer.create({
+      data: {
+        id: newCustomerId,
+        name: customer.name,
+        email: customer.email,
+        avatar: customer.avatar,
+        externalId: customer.externalId,
+        stripeCustomerId: customer.stripeCustomerId,
+        clickedAt: customer.clickedAt,
+        country: customer.country,
+        sales: customer.sales,
+        saleAmount: customer.saleAmount,
+        firstSaleAt: customer.firstSaleAt,
+        subscriptionCanceledAt: customer.subscriptionCanceledAt,
+        projectId: customer.projectId,
+        projectConnectId: customer.projectConnectId,
+        createdAt: customer.createdAt,
+        linkId: link.id,
+        programId: link.programId,
+        partnerId: link.partnerId,
+        clickId: newClickId,
+      },
+    });
+  });
+}
+
+export async function rollbackCustomerRecreation({
+  customer,
+  newCustomerId,
+}: {
+  customer: Customer;
+  newCustomerId: string;
+}) {
+  return await prisma.$transaction(async (tx) => {
+    await tx.customer.delete({
+      where: {
+        id: newCustomerId,
+      },
+    });
+
+    return await tx.customer.update({
+      where: {
+        id: customer.id,
+      },
+      data: {
+        name: customer.name,
+        externalId: customer.externalId,
+        stripeCustomerId: customer.stripeCustomerId,
+        linkId: customer.linkId,
+        programId: customer.programId,
+        partnerId: customer.partnerId,
+        clickId: customer.clickId,
+      },
+    });
+  });
+}
+
+export async function loadReattributeEventPlan({
+  oldCustomerId,
+  newCustomerId,
+}: {
+  oldCustomerId: string;
+  newCustomerId: string;
+}): Promise<ReattributeEventPlan> {
+  const [oldEvents, newEvents] = await Promise.all([
+    getCustomerReattributeEvents(oldCustomerId),
+    getCustomerReattributeEvents(newCustomerId),
+  ]);
+
+  if (oldEvents.length >= CUSTOMER_REATTRIBUTION_EVENTS_LIMIT) {
+    throw new Error(
+      `Customer ${oldCustomerId} has too many events to reattribute (limit ${CUSTOMER_REATTRIBUTION_EVENTS_LIMIT}).`,
+    );
+  }
+
+  const sourceEvents = oldEvents.length > 0 ? oldEvents : newEvents;
+  const clickEvent = sourceEvents.find((event) => event.event === "click");
+  const leadEvent = sourceEvents.find((event) => event.event === "lead");
+  const saleEvents = sourceEvents.filter((event) => event.event === "sale");
+
+  return {
+    hasClick: Boolean(clickEvent),
+    hasLead: Boolean(leadEvent),
+    leadCount: leadEvent ? 1 : 0,
+    saleCount: saleEvents.length,
+    saleAmount: saleEvents.reduce(
+      (sum, event) => sum + (event.saleAmount ?? 0),
+      0,
+    ),
+    leadTimestamp: leadEvent?.timestamp ?? null,
+    saleTimestamp:
+      saleEvents.length > 0
+        ? saleEvents.reduce((latest, event) =>
+            event.timestamp > latest.timestamp ? event : latest,
+          ).timestamp
+        : null,
+  };
+}
+
+export async function reingestCustomerEvents({
+  oldCustomerId,
+  newCustomerId,
+  newClickId,
+  link,
+  workspaceId,
+}: {
+  oldCustomerId: string;
+  newCustomerId: string;
+  newClickId: string;
+  link: Pick<Link, "id" | "domain" | "key" | "url">;
+  workspaceId: string;
+}) {
+  const [oldEvents, newEvents] = await Promise.all([
+    getCustomerReattributeEvents(oldCustomerId),
+    getCustomerReattributeEvents(newCustomerId),
+  ]);
+
+  if (oldEvents.length >= CUSTOMER_REATTRIBUTION_EVENTS_LIMIT) {
+    throw new Error(
+      `Customer ${oldCustomerId} has too many events to reattribute (limit ${CUSTOMER_REATTRIBUTION_EVENTS_LIMIT}).`,
+    );
+  }
+
+  const newHasClick = newEvents.some((event) => event.event === "click");
+  const newHasLead = newEvents.some((event) => event.event === "lead");
+  const newSaleInvoiceIds = new Set(
+    newEvents
+      .filter((event) => event.event === "sale" && event.invoice_id)
+      .map((event) => event.invoice_id),
+  );
+  const newInvoicelessSaleTimestamps = new Set(
+    newEvents
+      .filter((event) => event.event === "sale" && !event.invoice_id)
+      .map((event) => event.timestamp),
+  );
+
+  const clickEvent = !newHasClick
+    ? oldEvents.find((event) => event.event === "click") ?? null
+    : null;
+  const leadEvent = !newHasLead
+    ? oldEvents.find((event) => event.event === "lead") ?? null
+    : null;
+  const saleEvents = oldEvents.filter((event) => {
+    if (event.event !== "sale") {
+      return false;
+    }
+
+    if (event.invoice_id) {
+      return !newSaleInvoiceIds.has(event.invoice_id);
+    }
+
+    return !newInvoicelessSaleTimestamps.has(event.timestamp);
+  });
+
+  if (!clickEvent && !leadEvent && saleEvents.length === 0) {
+    return {
+      skipped: true,
+      reason:
+        oldEvents.length > 0
+          ? ("already-reingested" as const)
+          : ("no-events" as const),
+    };
+  }
+
+  const sourceClickEvent =
+    oldEvents.find((event) => event.event === "click") ??
+    newEvents.find((event) => event.event === "click");
+
+  const newClickAttributes = {
+    click_id: newClickId,
+    link_id: link.id,
+  };
+
+  const clickEventData = recordClickZodSchema.parse({
+    ...sourceClickEvent,
+    ...newClickAttributes,
+    workspace_id: workspaceId,
+    domain: link.domain,
+    key: link.key,
+    url: link.url,
+  });
+
+  const eventsToRecord: Promise<unknown>[] = [];
+
+  if (clickEvent) {
+    eventsToRecord.push(recordClickZod(clickEventData));
+  }
+
+  if (leadEvent) {
+    const leadEventData = leadEventSchemaTBWithTimestamp.parse({
+      ...clickEventData,
+      ...leadEvent,
+      ...newClickAttributes,
+      event_id: nanoid(16),
+      link_id: link.id,
+      customer_id: newCustomerId,
+    });
+
+    eventsToRecord.push(recordLeadWithTimestamp(leadEventData));
+  }
+
+  if (saleEvents.length > 0) {
+    const saleEventsData = saleEvents.map((existingSaleEvent) =>
+      saleEventSchemaTBWithTimestamp.parse({
+        ...clickEventData,
+        ...existingSaleEvent,
+        ...newClickAttributes,
+        event_id: nanoid(16),
+        link_id: link.id,
+        customer_id: newCustomerId,
+        amount: existingSaleEvent.saleAmount,
+      }),
+    );
+
+    eventsToRecord.push(recordSaleWithTimestamp(saleEventsData));
+  }
+
+  const results = await Promise.allSettled(eventsToRecord);
+  const failed = results.filter((result) => result.status === "rejected");
+
+  if (failed.length > 0) {
+    throw new Error(
+      `Failed to re-ingest ${failed.length} Tinybird event batch(es) for customer ${newCustomerId}.`,
+    );
+  }
+
+  return { skipped: false, recorded: eventsToRecord.length };
+}
+
+export async function incrementNewLinkStats({
+  oldCustomerId,
+  newLinkId,
+  programId,
+  partnerId,
+  plan,
+  incrementConversions,
+}: {
+  oldCustomerId: string;
+  newLinkId: string;
+  programId: string;
+  partnerId: string;
+  plan: ReattributeEventPlan;
+  incrementConversions: boolean;
+}) {
+  const didUpdate = await runOnce({
+    key: `reattribute-customer:${oldCustomerId}:new-link-stats`,
+    fn: async () => {
+      const link = await prisma.link.findUniqueOrThrow({
+        where: { id: newLinkId },
+        select: {
+          id: true,
+          lastLeadAt: true,
+          lastConversionAt: true,
+        },
+      });
+
+      const leadEventTimestamp = plan.leadTimestamp
+        ? new Date(`${plan.leadTimestamp}Z`)
+        : new Date();
+      const saleEventTimestamp = plan.saleTimestamp
+        ? new Date(`${plan.saleTimestamp}Z`)
+        : new Date();
+
+      await prisma.link.update({
+        where: { id: newLinkId },
+        data: {
+          ...(plan.hasClick && {
+            clicks: { increment: 1 },
+          }),
+          ...(plan.hasLead && {
+            leads: { increment: plan.leadCount },
+            lastLeadAt: updateLinkStatsForImporter({
+              currentTimestamp: link.lastLeadAt,
+              newTimestamp: leadEventTimestamp,
+            }),
+          }),
+          ...(incrementConversions && {
+            conversions: { increment: 1 },
+            lastConversionAt: updateLinkStatsForImporter({
+              currentTimestamp: link.lastConversionAt,
+              newTimestamp: saleEventTimestamp,
+            }),
+          }),
+          ...(plan.saleCount > 0 && {
+            sales: { increment: plan.saleCount },
+            saleAmount: { increment: plan.saleAmount },
+          }),
+        },
+      });
+    },
+  });
+
+  if (didUpdate && (plan.hasLead || plan.saleCount > 0)) {
+    await syncPartnerLinksStats({
+      partnerId,
+      programId,
+      eventType: plan.saleCount > 0 ? "sale" : "lead",
+    });
+  }
+}
+
+export async function decrementOldLinkStats({
+  oldCustomerId,
+  oldLinkId,
+  oldPartnerId,
+  programId,
+  plan,
+  decrementConversions,
+}: {
+  oldCustomerId: string;
+  oldLinkId: string | null;
+  oldPartnerId: string | null;
+  programId: string;
+  plan: ReattributeEventPlan;
+  decrementConversions: boolean;
+}) {
+  if (!oldLinkId || !oldPartnerId) {
+    return;
+  }
+
+  const didUpdate = await runOnce({
+    key: `reattribute-customer:${oldCustomerId}:old-link-stats`,
+    fn: async () => {
+      await prisma.link.update({
+        where: { id: oldLinkId },
+        data: {
+          ...(plan.hasClick && {
+            clicks: { decrement: 1 },
+          }),
+          ...(plan.hasLead && {
+            leads: { decrement: plan.leadCount },
+          }),
+          ...(decrementConversions && {
+            conversions: { decrement: 1 },
+          }),
+          ...(plan.saleCount > 0 && {
+            sales: { decrement: plan.saleCount },
+            saleAmount: { decrement: plan.saleAmount },
+          }),
+        },
+      });
+    },
+  });
+
+  if (didUpdate && (plan.hasLead || plan.saleCount > 0)) {
+    await syncPartnerLinksStats({
+      partnerId: oldPartnerId,
+      programId,
+      eventType: plan.saleCount > 0 ? "sale" : "lead",
+    });
+  }
+}
+
+export async function transferUnpaidCommissions({
+  oldCustomerId,
+  newCustomerId,
+  newPartnerId,
+  newLinkId,
+  programId,
+  oldPartnerId,
+}: {
+  oldCustomerId: string;
+  newCustomerId: string;
+  newPartnerId: string;
+  newLinkId: string;
+  programId: string;
+  oldPartnerId: string | null;
+}) {
+  let transferred = 0;
+
+  const didUpdate = await runOnce({
+    key: `reattribute-customer:${oldCustomerId}:transfer-unpaid`,
+    fn: async () => {
+      const unpaidCommissions = await prisma.commission.findMany({
+        where: {
+          customerId: oldCustomerId,
+          status: { in: [...UNPAID_COMMISSION_STATUSES] },
+        },
+        select: {
+          id: true,
+          status: true,
+          payoutId: true,
+          payout: {
+            select: {
+              id: true,
+              status: true,
+            },
+          },
+        },
+      });
+
+      const transferablePendingOrHoldIds: string[] = [];
+      const transferableProcessedIds: string[] = [];
+      const mutablePayoutIds: string[] = [];
+
+      for (const commission of unpaidCommissions) {
+        const isLocked =
+          Boolean(commission.payoutId) &&
+          commission.payout != null &&
+          !MUTABLE_PAYOUT_STATUSES.includes(commission.payout.status);
+
+        if (isLocked) {
+          continue;
+        }
+
+        if (
+          commission.payoutId &&
+          commission.payout &&
+          MUTABLE_PAYOUT_STATUSES.includes(commission.payout.status)
+        ) {
+          mutablePayoutIds.push(commission.payoutId);
+        }
+
+        if (commission.status === "processed") {
+          transferableProcessedIds.push(commission.id);
+        } else {
+          transferablePendingOrHoldIds.push(commission.id);
+        }
+      }
+
+      const transferableIds = [
+        ...transferablePendingOrHoldIds,
+        ...transferableProcessedIds,
+      ];
+
+      if (transferableIds.length === 0) {
+        return;
+      }
+
+      const stillTransferable = {
+        OR: [
+          { payoutId: null },
+          {
+            payout: {
+              status: {
+                in: MUTABLE_PAYOUT_STATUSES,
+              },
+            },
+          },
+        ],
+      };
+
+      if (transferablePendingOrHoldIds.length > 0) {
+        await prisma.commission.updateMany({
+          where: {
+            id: { in: transferablePendingOrHoldIds },
+            ...stillTransferable,
+          },
+          data: {
+            customerId: newCustomerId,
+            partnerId: newPartnerId,
+            linkId: newLinkId,
+            payoutId: null,
+          },
+        });
+      }
+
+      if (transferableProcessedIds.length > 0) {
+        await prisma.commission.updateMany({
+          where: {
+            id: { in: transferableProcessedIds },
+            ...stillTransferable,
+          },
+          data: {
+            customerId: newCustomerId,
+            partnerId: newPartnerId,
+            linkId: newLinkId,
+            payoutId: null,
+            status: "pending",
+          },
+        });
+      }
+
+      await reconcilePayoutAmounts([...new Set(mutablePayoutIds)]);
+
+      await Promise.all([
+        syncTotalCommissions({
+          partnerId: newPartnerId,
+          programId,
+        }),
+        oldPartnerId
+          ? syncTotalCommissions({
+              partnerId: oldPartnerId,
+              programId,
+            })
+          : Promise.resolve(),
+      ]);
+
+      transferred = transferableIds.length;
+    },
+  });
+
+  return { transferred: didUpdate ? transferred : 0 };
+}
+
+export type ClawbackPlan =
+  | { skipped: true; reason: "no-old-partner" | "no-paid-earnings" }
+  | {
+      skipped: false;
+      paidCommissionIds: string[];
+      paidEarnings: number;
+      hasPaidLead: boolean;
+      paidInvoiceIds: string[];
+      paidInvoicelessCount: number;
+      shouldClearIdentifiers: boolean;
+    };
+
+export async function loadClawbackPlan({
+  oldCustomerId,
+  oldPartnerId,
+}: {
+  oldCustomerId: string;
+  oldPartnerId: string | null;
+}): Promise<ClawbackPlan> {
+  if (!oldPartnerId) {
+    return { skipped: true, reason: "no-old-partner" };
+  }
+
+  const paidCommissions = await prisma.commission.findMany({
+    where: {
+      customerId: oldCustomerId,
+      partnerId: oldPartnerId,
+      status: "paid",
+    },
+    select: {
+      id: true,
+      eventId: true,
+      invoiceId: true,
+      earnings: true,
+      type: true,
+    },
+  });
+
+  const paidEarnings = paidCommissions.reduce(
+    (sum, commission) => sum + commission.earnings,
+    0,
+  );
+
+  if (paidEarnings <= 0) {
+    return { skipped: true, reason: "no-paid-earnings" };
+  }
+
+  return {
+    skipped: false,
+    paidCommissionIds: paidCommissions.map((commission) => commission.id),
+    paidEarnings,
+    hasPaidLead: paidCommissions.some(
+      (commission) => commission.type === "lead",
+    ),
+    paidInvoiceIds: paidCommissions
+      .filter(
+        (commission) => commission.type === "sale" && commission.invoiceId,
+      )
+      .map((commission) => commission.invoiceId!),
+    paidInvoicelessCount: paidCommissions.filter(
+      (commission) => commission.type === "sale" && !commission.invoiceId,
+    ).length,
+    shouldClearIdentifiers: paidCommissions.some(
+      (commission) => commission.eventId || commission.invoiceId,
+    ),
+  };
+}
+
+export async function applyClawbackAndReplacementCommissions({
+  oldCustomerId,
+  newCustomerId,
+  oldPartnerId,
+  newPartnerId,
+  newLinkId,
+  programId,
+  customerCountry,
+  plan,
+}: {
+  oldCustomerId: string;
+  newCustomerId: string;
+  oldPartnerId: string;
+  newPartnerId: string;
+  newLinkId: string;
+  programId: string;
+  customerCountry: string | null;
+  plan: Extract<ClawbackPlan, { skipped: false }>;
+}) {
+  if (plan.shouldClearIdentifiers && plan.paidCommissionIds.length > 0) {
+    await prisma.commission.updateMany({
+      where: {
+        id: { in: plan.paidCommissionIds },
+      },
+      data: {
+        eventId: null,
+        invoiceId: null,
+      },
+    });
+  }
+
+  await runOnce({
+    key: `reattribute-customer:${oldCustomerId}:clawback`,
+    fn: async () => {
+      const existingClawback = await prisma.commission.findFirst({
+        where: {
+          customerId: oldCustomerId,
+          partnerId: oldPartnerId,
+          programId,
+          type: "custom",
+          description: "tracking_error",
+          earnings: { lt: 0 },
+        },
+        select: { id: true },
+      });
+
+      if (existingClawback) {
+        return;
+      }
+
+      await queuePartnerCommissionCreation({
+        event: "custom",
+        partnerId: oldPartnerId,
+        programId,
+        customerId: oldCustomerId,
+        amount: -plan.paidEarnings,
+        quantity: 1,
+        description: "tracking_error",
+        skipWorkflow: true,
+      });
+    },
+  });
+
+  const [newEvents, existingNewCommissions] = await Promise.all([
+    getCustomerReattributeEvents(newCustomerId),
+    prisma.commission.findMany({
+      where: {
+        customerId: newCustomerId,
+        partnerId: newPartnerId,
+        type: { in: ["lead", "sale"] },
+      },
+      select: {
+        type: true,
+        invoiceId: true,
+      },
+    }),
+  ]);
+
+  const hasExistingLead = existingNewCommissions.some(
+    (commission) => commission.type === "lead",
+  );
+
+  const leadEvent =
+    plan.hasPaidLead && !hasExistingLead
+      ? newEvents.find((event) => event.event === "lead") ?? null
+      : null;
+
+  const paidInvoiceIds = new Set(plan.paidInvoiceIds);
+  const existingInvoiceIds = new Set(
+    existingNewCommissions
+      .map((commission) => commission.invoiceId)
+      .filter((invoiceId): invoiceId is string => Boolean(invoiceId)),
+  );
+  const existingInvoicelessCount = existingNewCommissions.filter(
+    (commission) => commission.type === "sale" && !commission.invoiceId,
+  ).length;
+
+  const saleEvents = [
+    ...newEvents.filter(
+      (event) =>
+        event.event === "sale" &&
+        event.invoice_id &&
+        paidInvoiceIds.has(event.invoice_id) &&
+        !existingInvoiceIds.has(event.invoice_id),
+    ),
+    ...newEvents
+      .filter((event) => event.event === "sale" && !event.invoice_id)
+      .slice(
+        0,
+        Math.max(0, plan.paidInvoicelessCount - existingInvoicelessCount),
+      ),
+  ];
+
+  if (leadEvent?.event_id) {
+    await queuePartnerCommissionCreation({
+      event: "lead",
+      programId,
+      partnerId: newPartnerId,
+      linkId: newLinkId,
+      customerId: newCustomerId,
+      eventId: leadEvent.event_id,
+      quantity: 1,
+      createdAt: new Date(`${leadEvent.timestamp}Z`),
+      context: {
+        customer: { country: customerCountry },
+      },
+      skipWorkflow: true,
+    });
+  }
+
+  for (const saleEvent of saleEvents) {
+    if (!saleEvent.event_id) {
+      continue;
+    }
+
+    await queuePartnerCommissionCreation({
+      event: "sale",
+      programId,
+      partnerId: newPartnerId,
+      linkId: newLinkId,
+      customerId: newCustomerId,
+      eventId: saleEvent.event_id,
+      quantity: 1,
+      amount: saleEvent.saleAmount,
+      currency: saleEvent.currency,
+      invoiceId: saleEvent.invoice_id,
+      createdAt: new Date(`${saleEvent.timestamp}Z`),
+      context: {
+        customer: { country: customerCountry },
+      },
+      skipWorkflow: true,
+    });
+  }
+
+  await Promise.all([
+    syncTotalCommissions({
+      partnerId: oldPartnerId,
+      programId,
+    }),
+    syncTotalCommissions({
+      partnerId: newPartnerId,
+      programId,
+    }),
+  ]);
+
+  return {
+    skipped: false,
+    clawback: true,
+    recreated: (leadEvent ? 1 : 0) + saleEvents.length,
+  };
+}
diff --git a/apps/web/lib/api/customers/transform-customer.ts b/apps/web/lib/api/customers/transform-customer.ts
index 60d61c6c1f1..a4191db7587 100644
--- a/apps/web/lib/api/customers/transform-customer.ts
+++ b/apps/web/lib/api/customers/transform-customer.ts
@@ -8,7 +8,13 @@ import {
 } from "@prisma/client";
 
 export interface CustomerWithLink extends Customer {
-  link?: Link | null;
+  link?:
+    | (Link & {
+        linkReward?: {
+          discount?: Discount | null;
+        } | null;
+      })
+    | null;
   programEnrollment?:
     | (ProgramEnrollment & {
         partner: Partner;
@@ -20,13 +26,17 @@ export interface CustomerWithLink extends Customer {
 export const transformCustomer = (customer: CustomerWithLink) => {
   const programEnrollment = customer.programEnrollment;
 
+  // Prefer the link discount if it exists, otherwise use the enrollment discount
+  const discount =
+    customer.link?.linkReward?.discount ?? programEnrollment?.discount;
+
   return {
     ...customer,
     name: customer.name || customer.email || generateRandomName(),
     link: customer.link || undefined,
     programId: programEnrollment?.programId || undefined,
     partner: programEnrollment?.partner || undefined,
-    discount: programEnrollment?.discount || undefined,
+    discount: discount || undefined,
   };
 };
 
diff --git a/apps/web/lib/api/demo/create-demo-commission.ts b/apps/web/lib/api/demo/create-demo-commission.ts
new file mode 100644
index 00000000000..85660836d15
--- /dev/null
+++ b/apps/web/lib/api/demo/create-demo-commission.ts
@@ -0,0 +1,301 @@
+import { isFirstConversion } from "@/lib/analytics/is-first-conversion";
+import { createId } from "@/lib/api/create-id";
+import { DubApiError } from "@/lib/api/errors";
+import { updateLinkStatsForImporter } from "@/lib/api/links/update-link-stats-for-importer";
+import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
+import { generateRandomName } from "@/lib/names";
+import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
+import { EdgeLinkProps } from "@/lib/planetscale/types";
+import { prisma } from "@/lib/prisma";
+import { recordFakeClick } from "@/lib/tinybird/record-fake-click";
+import { recordLeadWithTimestamp } from "@/lib/tinybird/record-lead";
+import { recordSaleWithTimestamp } from "@/lib/tinybird/record-sale";
+import { leadEventSchemaTB } from "@/lib/zod/schemas/leads";
+import { saleEventSchemaTB } from "@/lib/zod/schemas/sales";
+import { DEMO_PROGRAM_ID, nanoid } from "@dub/utils";
+import { CommissionSource, CommissionType } from "@prisma/client";
+import * as z from "zod/v4";
+
+const leadEventSchemaTBWithTimestamp = leadEventSchemaTB.extend({
+  timestamp: z.string(),
+});
+
+const saleEventSchemaTBWithTimestamp = saleEventSchemaTB.extend({
+  timestamp: z.string(),
+});
+
+export async function createDemoCommission({
+  link,
+  type,
+  date,
+  country,
+  region,
+  city,
+  continent,
+  referrer,
+  userAgent,
+  customer,
+  sale,
+}: {
+  link: Pick<
+    EdgeLinkProps,
+    "id" | "url" | "domain" | "key" | "projectId" | "programId" | "partnerId"
+  >;
+  type: "lead" | "sale";
+  date: Date;
+  country: string;
+  region?: string | null;
+  city?: string | null;
+  continent?: string | null;
+  referrer?: string | null;
+  userAgent?: string | null;
+  customer: {
+    name?: string | null;
+    email?: string | null;
+    externalId: string;
+    country: string;
+  };
+  sale?: {
+    amount: number;
+    invoiceId?: string | null;
+    eventName?: string | null;
+  } | null;
+}) {
+  if (!link.partnerId) {
+    throw new DubApiError({
+      code: "bad_request",
+      message: "Demo commissions require a partner link.",
+    });
+  }
+
+  if (type === "sale" && sale?.amount == null) {
+    throw new DubApiError({
+      code: "bad_request",
+      message: "sale.amount is required when type is sale.",
+    });
+  }
+
+  const workspace = await prisma.project.findUnique({
+    where: {
+      id: link.projectId,
+    },
+    select: {
+      id: true,
+      stripeConnectId: true,
+    },
+  });
+
+  if (!workspace) {
+    throw new DubApiError({
+      code: "not_found",
+      message: "Demo workspace not found.",
+    });
+  }
+
+  const targetLink = await prisma.link.findUnique({
+    where: { id: link.id },
+  });
+
+  if (!targetLink) {
+    throw new DubApiError({
+      code: "not_found",
+      message: `Link ${link.id} not found.`,
+    });
+  }
+
+  const invoiceId = sale?.invoiceId ?? null;
+
+  if (type === "sale" && invoiceId) {
+    const existing = await prisma.commission.findUnique({
+      where: {
+        invoiceId_programId: {
+          invoiceId,
+          programId: DEMO_PROGRAM_ID,
+        },
+      },
+      select: { id: true },
+    });
+
+    if (existing) {
+      throw new DubApiError({
+        code: "conflict",
+        message: `There is already a commission for the invoice ${invoiceId}.`,
+      });
+    }
+  }
+
+  const customerId = createId({ prefix: "cus_" });
+  const targetCustomer = await prisma.customer.upsert({
+    where: {
+      projectId_externalId: {
+        projectId: workspace.id,
+        externalId: customer.externalId,
+      },
+    },
+    create: {
+      id: customerId,
+      name: customer.name || customer.email || generateRandomName(),
+      email: customer.email,
+      externalId: customer.externalId,
+      country: customer.country,
+      linkId: targetLink.id,
+      projectId: workspace.id,
+      projectConnectId: workspace.stripeConnectId,
+      createdAt: date,
+    },
+    update: {
+      name: customer.name || customer.email || generateRandomName(),
+      email: customer.email,
+      country: customer.country,
+    },
+  });
+
+  const firstConversion = isFirstConversion({
+    customer: targetCustomer,
+    linkId: targetLink.id,
+  });
+
+  const clickedAt = new Date(date.getTime() - 5 * 60 * 1000);
+
+  const clickEvent = await recordFakeClick({
+    link: {
+      id: targetLink.id,
+      url: targetLink.url,
+      domain: targetLink.domain,
+      key: targetLink.key,
+      projectId: targetLink.projectId,
+      programId: targetLink.programId,
+      partnerId: targetLink.partnerId,
+    },
+    customer: {
+      country,
+      region,
+      city,
+      continent,
+    },
+    referrer,
+    userAgent,
+    timestamp: clickedAt.toISOString(),
+  });
+
+  const eventTimestamp = date.toISOString();
+
+  const leadEvent = leadEventSchemaTBWithTimestamp.parse({
+    ...clickEvent,
+    event_id: nanoid(16),
+    event_name: "Sign up",
+    customer_id: targetCustomer.id,
+    timestamp: eventTimestamp,
+    metadata: "",
+  });
+
+  const saleEvent =
+    type === "sale" && sale
+      ? saleEventSchemaTBWithTimestamp.parse({
+          ...clickEvent,
+          event_id: nanoid(16),
+          event_name: sale.eventName ?? "Purchase",
+          customer_id: targetCustomer.id,
+          payment_processor: "stripe",
+          amount: sale.amount,
+          invoice_id: invoiceId ?? "",
+          currency: "usd",
+          timestamp: eventTimestamp,
+          metadata: "",
+        })
+      : null;
+
+  await Promise.all([
+    recordLeadWithTimestamp(leadEvent),
+    saleEvent ? recordSaleWithTimestamp(saleEvent) : undefined,
+  ]);
+
+  await queuePartnerCommissionCreation({
+    event: type === "sale" ? CommissionType.sale : CommissionType.lead,
+    programId: DEMO_PROGRAM_ID,
+    partnerId: link.partnerId,
+    linkId: targetLink.id,
+    customerId: targetCustomer.id,
+    eventId: saleEvent?.event_id ?? leadEvent.event_id,
+    quantity: 1,
+    createdAt: date,
+    source: CommissionSource.api,
+    ...(saleEvent && {
+      amount: saleEvent.amount,
+      currency: saleEvent.currency,
+      invoiceId: saleEvent.invoice_id || undefined,
+      isFirstConversion: firstConversion,
+    }),
+    context: {
+      customer: {
+        country: targetCustomer.country,
+        ...(type === "sale" && { signupDate: targetCustomer.createdAt }),
+      },
+      ...(type === "sale" &&
+        saleEvent && {
+          sale: {
+            amount: saleEvent.amount,
+          },
+        }),
+    },
+    triggerAggregateDueCommissions: true,
+  });
+
+  const totalSales = saleEvent ? 1 : 0;
+  const totalSaleAmount = saleEvent?.amount ?? 0;
+  const lastLeadAt = updateLinkStatsForImporter({
+    currentTimestamp: targetLink.lastLeadAt,
+    newTimestamp: date,
+  });
+  const lastConversionAt = saleEvent
+    ? updateLinkStatsForImporter({
+        currentTimestamp: targetLink.lastConversionAt,
+        newTimestamp: date,
+      })
+    : undefined;
+
+  await prisma.$transaction([
+    prisma.link.update({
+      where: { id: targetLink.id },
+      data: {
+        clicks: { increment: 1 },
+        leads: { increment: 1 },
+        lastLeadAt,
+        ...(firstConversion &&
+          saleEvent && {
+            conversions: { increment: 1 },
+            lastConversionAt,
+          }),
+        sales: { increment: totalSales },
+        saleAmount: { increment: totalSaleAmount },
+      },
+    }),
+    prisma.customer.update({
+      where: { id: targetCustomer.id },
+      data: {
+        linkId: targetLink.id,
+        programId: targetLink.programId,
+        partnerId: targetLink.partnerId,
+        clickId: clickEvent.click_id,
+        clickedAt,
+        sales: { increment: totalSales },
+        saleAmount: { increment: totalSaleAmount },
+        ...(type === "sale" &&
+          !targetCustomer.firstSaleAt && {
+            firstSaleAt: date,
+          }),
+      },
+    }),
+  ]);
+
+  await syncPartnerLinksStats({
+    partnerId: link.partnerId,
+    programId: DEMO_PROGRAM_ID,
+    eventType: type,
+  });
+
+  return {
+    clickId: clickEvent.click_id,
+    customerId: targetCustomer.id,
+  };
+}
diff --git a/apps/web/lib/api/demo/guard.ts b/apps/web/lib/api/demo/guard.ts
new file mode 100644
index 00000000000..43ae0bf60ab
--- /dev/null
+++ b/apps/web/lib/api/demo/guard.ts
@@ -0,0 +1,43 @@
+import { DubApiError } from "@/lib/api/errors";
+import { prefixWorkspaceId } from "@/lib/api/workspaces/workspace-id";
+import { EdgeLinkProps } from "@/lib/planetscale/types";
+import { DEMO_PROGRAM_ID, DEMO_WORKSPACE_ID } from "@dub/utils";
+
+export function verifyDemoSecret(req: Request) {
+  const secret = process.env.DEMO_CLICK_SECRET;
+  const authorization = req.headers.get("authorization");
+
+  if (!secret || authorization !== `Bearer ${secret}`) {
+    throw new DubApiError({
+      code: "unauthorized",
+      message: "Invalid or missing DEMO_CLICK_SECRET.",
+    });
+  }
+}
+
+export function assertDemoLink(
+  link: Pick<EdgeLinkProps, "projectId" | "programId"> | null,
+): asserts link is NonNullable<typeof link> {
+  if (!link) {
+    throw new DubApiError({
+      code: "not_found",
+      message: "Link not found.",
+    });
+  }
+
+  if (
+    prefixWorkspaceId(link.projectId) !== prefixWorkspaceId(DEMO_WORKSPACE_ID)
+  ) {
+    throw new DubApiError({
+      code: "forbidden",
+      message: "This endpoint can only record events for the demo workspace.",
+    });
+  }
+
+  if (link.programId && link.programId !== DEMO_PROGRAM_ID) {
+    throw new DubApiError({
+      code: "forbidden",
+      message: "This endpoint can only record events for the demo program.",
+    });
+  }
+}
diff --git a/apps/web/lib/api/discounts/list-discounts.ts b/apps/web/lib/api/discounts/list-discounts.ts
new file mode 100644
index 00000000000..f6bd425c09d
--- /dev/null
+++ b/apps/web/lib/api/discounts/list-discounts.ts
@@ -0,0 +1,59 @@
+import { prisma } from "@/lib/prisma";
+import { DiscountSchema } from "@/lib/zod/schemas/discount";
+import { Prisma, type Discount } from "@prisma/client";
+import * as z from "zod/v4";
+
+type DiscountRow = Discount & {
+  partnersCount: bigint | number;
+};
+
+export const getDiscountsQuerySchema = z.object({
+  groupId: z.string().nullish(),
+});
+
+export const listDiscountsResponseSchema = z.array(
+  DiscountSchema.extend({
+    groupId: z.string().nullable(),
+    partnersCount: z.number(),
+  }),
+);
+
+// Lists program discounts (optionally filtered by group) with a partnersCount.
+export async function listDiscounts({
+  programId,
+  groupId,
+}: {
+  programId: string;
+  groupId?: string | null;
+}) {
+  const discounts = await prisma.$queryRaw<DiscountRow[]>(Prisma.sql`
+    SELECT
+      d.id,
+      d.programId,
+      d.groupId,
+      d.amount,
+      d.type,
+      d.maxDuration,
+      d.description,
+      d.couponId,
+      d.couponTestId,
+      d.autoProvisionEnabledAt,
+      d.provider,
+      d.createdAt,
+      d.updatedAt,
+      (
+        SELECT COUNT(*)
+        FROM ProgramEnrollment pe
+        WHERE pe.discountId = d.id
+      ) AS partnersCount
+    FROM Discount d
+    WHERE d.programId = ${programId}
+      ${groupId ? Prisma.sql`AND d.groupId = ${groupId}` : Prisma.sql``}
+    ORDER BY d.createdAt DESC
+  `);
+
+  return discounts.map((discount) => ({
+    ...discount,
+    partnersCount: Number(discount.partnersCount),
+  }));
+}
diff --git a/apps/web/lib/api/domains/get-config-response.ts b/apps/web/lib/api/domains/get-config-response.ts
index 43979b89d38..8afead1d76a 100644
--- a/apps/web/lib/api/domains/get-config-response.ts
+++ b/apps/web/lib/api/domains/get-config-response.ts
@@ -25,7 +25,7 @@ export const getConfigResponse = async (domain: string) => {
   if (apexDomain !== domain) {
     const wildcardDomain = `*.${apexDomain}`;
     const wildcardResponse = await getVercelConfigResponse(wildcardDomain);
-    if (!wildcardResponse.misconfigured) {
+    if (!wildcardResponse?.error && wildcardResponse?.misconfigured === false) {
       return wildcardResponse;
     }
   }
diff --git a/apps/web/lib/api/domains/update-program-domain.ts b/apps/web/lib/api/domains/update-program-domain.ts
new file mode 100644
index 00000000000..e3ba3149d4c
--- /dev/null
+++ b/apps/web/lib/api/domains/update-program-domain.ts
@@ -0,0 +1,42 @@
+import { prisma } from "@/lib/prisma";
+import { waitUntil } from "@vercel/functions";
+import { queueDomainUpdate } from "./queue-domain-update";
+
+export async function updateProgramDomain({
+  programId,
+  oldDomain,
+  newDomain,
+}: {
+  programId: string;
+  oldDomain: string | null;
+  newDomain: string;
+}) {
+  await prisma.$transaction([
+    prisma.program.update({
+      where: {
+        id: programId,
+      },
+      data: {
+        domain: newDomain,
+      },
+    }),
+    prisma.partnerGroupDefaultLink.updateMany({
+      where: {
+        programId,
+      },
+      data: {
+        domain: newDomain,
+      },
+    }),
+  ]);
+
+  if (oldDomain && oldDomain !== newDomain) {
+    waitUntil(
+      queueDomainUpdate({
+        oldDomain,
+        newDomain,
+        programId,
+      }),
+    );
+  }
+}
diff --git a/apps/web/lib/api/domains/verify-domain.ts b/apps/web/lib/api/domains/verify-domain.ts
index c93e42d6aeb..7d14cae35c7 100644
--- a/apps/web/lib/api/domains/verify-domain.ts
+++ b/apps/web/lib/api/domains/verify-domain.ts
@@ -1,5 +1,6 @@
+import { sleep } from "@dub/utils";
 export const verifyDomain = async (domain: string) => {
-  return await fetch(
+  const res = await fetch(
     `https://api.vercel.com/v9/projects/${process.env.VERCEL_PROJECT_ID}/domains/${domain.toLowerCase()}/verify?teamId=${process.env.TEAM_ID_VERCEL}`,
     {
       method: "POST",
@@ -8,5 +9,33 @@ export const verifyDomain = async (domain: string) => {
         "Content-Type": "application/json",
       },
     },
-  ).then((res) => res.json());
+  );
+  return res.json();
+};
+
+export const verifyDomainWithRetry = async (
+  domain: string,
+  {
+    attempts = 3,
+    delayMs = 2500,
+  }: { attempts?: number; delayMs?: number } = {},
+) => {
+  let last: any = null;
+  for (let i = 0; i < attempts; i++) {
+    if (i > 0) {
+      await sleep(delayMs);
+    }
+    try {
+      last = await verifyDomain(domain);
+    } catch (error) {
+      if (i === attempts - 1) {
+        throw error;
+      }
+      continue;
+    }
+    if (last?.verified) {
+      return last;
+    }
+  }
+  return last;
 };
diff --git a/apps/web/lib/api/fraud/constants.ts b/apps/web/lib/api/fraud/constants.ts
index 7fdc01cdd46..c1098d837d7 100644
--- a/apps/web/lib/api/fraud/constants.ts
+++ b/apps/web/lib/api/fraud/constants.ts
@@ -33,7 +33,7 @@ export const FRAUD_RULES: FraudRuleInfo[] = [
     type: "referralSourceBanned",
     name: "Banned referral source",
     description:
-      "A conversion, event, or click was made on a banned referral domain.",
+      "A conversion, event, or click was made on a banned referral source.",
     scope: "conversionEvent",
     configurable: true,
   },
diff --git a/apps/web/lib/api/fraud/report-network-level-ban.ts b/apps/web/lib/api/fraud/report-network-level-ban.ts
index 9c23d3ca3f9..66f27c71538 100644
--- a/apps/web/lib/api/fraud/report-network-level-ban.ts
+++ b/apps/web/lib/api/fraud/report-network-level-ban.ts
@@ -43,6 +43,9 @@ export async function reportNetworkLevelBan({
   });
 
   if (affectedProgramEnrollments.length === 0) {
+    console.log(
+      `No eligible program enrollments found for partner ${partnerId}, skipping reportNetworkLevelBan...`,
+    );
     return;
   }
 
@@ -55,6 +58,9 @@ export async function reportNetworkLevelBan({
   );
 
   if (affectedProgramEnrollments.length === 0) {
+    console.log(
+      `No eligible program enrollments found for partner ${partnerId}, skipping reportNetworkLevelBan...`,
+    );
     return;
   }
 
@@ -71,6 +77,10 @@ export async function reportNetworkLevelBan({
     })),
   );
 
+  console.log(
+    `Reporting network level ban for partner ${partnerId} to ${affectedGroups.length} programs...`,
+  );
+
   const results = await Promise.allSettled([
     holdPendingCommissions(affectedGroups),
     holdProcessedCommissions(affectedGroups),
diff --git a/apps/web/lib/api/groups/delete-group.ts b/apps/web/lib/api/groups/delete-group.ts
new file mode 100644
index 00000000000..11624bc92b4
--- /dev/null
+++ b/apps/web/lib/api/groups/delete-group.ts
@@ -0,0 +1,139 @@
+import { invalidateLinksForDiscountsJob } from "@/lib/jobs/handlers/invalidate-links-for-discounts-job";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
+import { prisma } from "@/lib/prisma";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { PartnerGroup } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
+import { DubApiError } from "../errors";
+import { removeGroupIdFromMoveRules } from "./remove-group-id-from-move-rules";
+
+// Delete a partner group. You can't delete a group that still has partners.
+export async function deletePartnerGroup(
+  group: Pick<
+    PartnerGroup,
+    | "id"
+    | "slug"
+    | "name"
+    | "clickRewardId"
+    | "leadRewardId"
+    | "saleRewardId"
+    | "referralRewardId"
+    | "customRewardId"
+    | "discountId"
+    | "workflowId"
+    | "programId"
+  >,
+) {
+  if (group.slug === DEFAULT_PARTNER_GROUP.slug) {
+    throw new DubApiError({
+      code: "forbidden",
+      message: "You cannot delete the default group of your program.",
+    });
+  }
+
+  const discounts = await prisma.discount.findMany({
+    where: {
+      groupId: group.id,
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  await prisma.$transaction(async (tx) => {
+    // Soft delete rewards
+    await tx.reward.updateMany({
+      where: {
+        groupId: group.id,
+      },
+      data: {
+        programId: null,
+        groupId: null,
+      },
+    });
+
+    // Soft delete discounts (orphaned cleanup cron hard-deletes after remapping)
+    await tx.discount.updateMany({
+      where: {
+        groupId: group.id,
+      },
+      data: {
+        programId: null,
+        groupId: null,
+      },
+    });
+
+    // Soft delete default links so Link.partnerGroupDefaultLinkId stays set
+    // for in-flight remap after partners were moved out of this group
+    await tx.partnerGroupDefaultLink.updateMany({
+      where: {
+        groupId: group.id,
+      },
+      data: {
+        groupId: null,
+      },
+    });
+
+    // Delete group move workflow
+    if (group.workflowId) {
+      await tx.workflow.delete({
+        where: {
+          id: group.workflowId,
+        },
+      });
+    }
+
+    // Only delete when no enrollments still reference this group
+    const { count } = await tx.partnerGroup.deleteMany({
+      where: {
+        id: group.id,
+        partners: {
+          none: {},
+        },
+      },
+    });
+
+    if (count === 0) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "You cannot delete a group that still has partners. Move them to another group first.",
+      });
+    }
+  });
+
+  // An empty group (no enrollments with this `groupId`)
+  // can still own discount rows referenced by codes/enrollments/LinkReward
+  // for partners who already moved if remaps are in-flight
+  if (discounts.length > 0) {
+    await Promise.all(
+      discounts.map(({ id: discountId }) =>
+        invalidateLinksForDiscountsJob.dispatch({
+          by: "discount",
+          programId: group.programId,
+          discountId,
+        }),
+      ),
+    );
+
+    await dispatchWorkflows(
+      discounts.map((discount) => ({
+        name: "detach-discount-workflow" as const,
+        payload: {
+          programId: group.programId,
+          discountId: discount.id,
+        },
+        options: {
+          label: discount.id,
+        },
+      })),
+    );
+  }
+
+  waitUntil(
+    removeGroupIdFromMoveRules({
+      programId: group.programId,
+      groupId: group.id,
+    }),
+  );
+}
diff --git a/apps/web/lib/api/groups/delete-orphaned-default-links.ts b/apps/web/lib/api/groups/delete-orphaned-default-links.ts
new file mode 100644
index 00000000000..d01b7d38133
--- /dev/null
+++ b/apps/web/lib/api/groups/delete-orphaned-default-links.ts
@@ -0,0 +1,41 @@
+import { prisma } from "@/lib/prisma";
+import { pluck } from "@dub/utils";
+
+// Hard-delete soft-deleted PartnerGroupDefaultLink rows (groupId null) once
+// no links still reference them. Group delete soft-deletes first so in-flight
+// remap can keep partnerGroupDefaultLinkId; this cron finishes cleanup after
+// the stale cutoff.
+export async function deleteOrphanedDefaultLinks(cutoff: Date) {
+  const defaultLinks = await prisma.partnerGroupDefaultLink.findMany({
+    where: {
+      groupId: null,
+      updatedAt: {
+        lt: cutoff,
+      },
+      links: {
+        none: {},
+      },
+    },
+    select: {
+      id: true,
+    },
+    orderBy: {
+      updatedAt: "desc",
+    },
+    take: 50,
+  });
+
+  if (defaultLinks.length === 0) {
+    return 0;
+  }
+
+  const { count } = await prisma.partnerGroupDefaultLink.deleteMany({
+    where: {
+      id: {
+        in: pluck(defaultLinks, "id"),
+      },
+    },
+  });
+
+  return count;
+}
diff --git a/apps/web/lib/api/groups/get-group-or-throw.ts b/apps/web/lib/api/groups/get-group-or-throw.ts
index a8c6a80a23e..fad403e21b9 100644
--- a/apps/web/lib/api/groups/get-group-or-throw.ts
+++ b/apps/web/lib/api/groups/get-group-or-throw.ts
@@ -31,6 +31,7 @@ export const getGroupOrThrow = async ({
       leadReward: includeExpandedFields,
       saleReward: includeExpandedFields,
       referralReward: includeExpandedFields,
+      customReward: includeExpandedFields,
       discount: includeExpandedFields,
       utmTemplate: includeExpandedFields,
       partnerGroupDefaultLinks: includeExpandedFields,
diff --git a/apps/web/lib/api/groups/move-partners-to-group.ts b/apps/web/lib/api/groups/move-partners-to-group.ts
index bded179de36..8e219757709 100644
--- a/apps/web/lib/api/groups/move-partners-to-group.ts
+++ b/apps/web/lib/api/groups/move-partners-to-group.ts
@@ -1,19 +1,11 @@
-import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
-import { qstash } from "@/lib/cron";
+import { processPartnerGroupChangeJob } from "@/lib/jobs/handlers/process-partner-group-change-job";
 import { prisma } from "@/lib/prisma";
-import { recordLink } from "@/lib/tinybird";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
-import { PartnerGroup, WorkspaceRole } from "@prisma/client";
+import { nanoid, pluck } from "@dub/utils";
+import { PartnerGroup, Prisma } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { buildProgramEnrollmentChangeSet } from "../activity-log/build-program-enrollment-change-set";
-import {
-  trackActivityLog,
-  TrackActivityLogInput,
-} from "../activity-log/track-activity-log";
-import { getWorkspaceUsers } from "../get-workspace-users";
-import { includeProgramEnrollment } from "../links/include-program-enrollment";
-import { includeTags } from "../links/include-tags";
-import { notifyPartnerGroupChange } from "../partners/notify-partner-group-change";
+import { trackActivityLogsTx } from "../activity-log/track-activity-log";
+import { DubApiError } from "../errors";
 
 interface MovePartnersToGroupParams {
   workspaceId: string;
@@ -28,10 +20,15 @@ interface MovePartnersToGroupParams {
     | "leadRewardId"
     | "saleRewardId"
     | "referralRewardId"
+    | "customRewardId"
     | "discountId"
   >;
-  isGroupDeleted?: boolean;
   groupMoveDisabledAt?: Date | null;
+  // Partner page moves one partner and refetches as soon as this request
+  // returns. Defaults to true for single-partner moves so the refetch sees
+  // cleared link overrides. Workflows / bulk moves leave this to
+  // processPartnerGroupChangeJob.
+  clearLinkRewardsSync?: boolean;
 }
 
 export async function movePartnersToGroup({
@@ -40,164 +37,195 @@ export async function movePartnersToGroup({
   partnerIds,
   userId,
   group,
-  isGroupDeleted = false,
   groupMoveDisabledAt,
+  clearLinkRewardsSync,
 }: MovePartnersToGroupParams): Promise<number> {
+  partnerIds = [...new Set(partnerIds)];
+
+  const shouldClearLinkRewardsSync =
+    clearLinkRewardsSync ?? partnerIds.length === 1;
+
   if (partnerIds.length === 0) {
-    return 0;
+    throw new DubApiError({
+      code: "bad_request",
+      message: "At least one partner ID is required.",
+    });
   }
 
-  const programEnrollments = await prisma.programEnrollment.findMany({
-    where: {
+  const result = await prisma.$transaction(async (tx) => {
+    // Partners already in this group are not moved. Still persist the lock
+    // when the caller only wants to set or clear groupMoveDisabledAt.
+    let alreadyInGroupCount = 0;
+
+    if (groupMoveDisabledAt !== undefined) {
+      const updated = await tx.programEnrollment.updateMany({
+        where: {
+          partnerId: {
+            in: partnerIds,
+          },
+          programId,
+          groupId: group.id,
+        },
+        data: {
+          groupMoveDisabledAt,
+        },
+      });
+
+      alreadyInGroupCount = updated.count;
+    }
+
+    const where: Prisma.ProgramEnrollmentWhereInput = {
       partnerId: {
         in: partnerIds,
       },
       programId,
-    },
-    select: {
-      id: true,
-      partnerId: true,
-      status: true,
-      partnerGroup: {
-        select: {
-          id: true,
-          name: true,
+      OR: [{ groupId: { not: group.id } }, { groupId: null }],
+    };
+
+    const programEnrollmentsBefore = await tx.programEnrollment.findMany({
+      where,
+      select: {
+        id: true,
+        partnerId: true,
+        partnerGroup: {
+          select: {
+            id: true,
+            name: true,
+          },
         },
       },
-    },
-  });
+    });
 
-  if (programEnrollments.length === 0) {
-    return 0;
-  }
+    if (programEnrollmentsBefore.length === 0) {
+      if (alreadyInGroupCount === 0) {
+        return null;
+      }
 
-  partnerIds = programEnrollments.map(({ partnerId }) => partnerId);
+      return {
+        count: alreadyInGroupCount,
+        programEnrollmentsAfter: [],
+      };
+    }
+
+    const { count } = await tx.programEnrollment.updateMany({
+      where,
+      data: {
+        groupId: group.id,
+        clickRewardId: group.clickRewardId,
+        leadRewardId: group.leadRewardId,
+        saleRewardId: group.saleRewardId,
+        referralRewardId: group.referralRewardId,
+        customRewardId: group.customRewardId,
+        discountId: group.discountId,
+        ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
+      },
+    });
 
-  const { count } = await prisma.programEnrollment.updateMany({
-    where: {
-      partnerId: {
-        in: partnerIds,
+    if (count === 0) {
+      if (alreadyInGroupCount === 0) {
+        return null;
+      }
+
+      return {
+        count: alreadyInGroupCount,
+        programEnrollmentsAfter: [],
+      };
+    }
+
+    const programEnrollmentsAfter = await tx.programEnrollment.findMany({
+      where: {
+        id: {
+          in: pluck(programEnrollmentsBefore, "id"),
+        },
       },
-      programId,
-    },
-    data: {
-      groupId: group.id,
-      clickRewardId: group.clickRewardId,
-      leadRewardId: group.leadRewardId,
-      saleRewardId: group.saleRewardId,
-      referralRewardId: group.referralRewardId,
-      discountId: group.discountId,
-      ...(groupMoveDisabledAt !== undefined && { groupMoveDisabledAt }),
-    },
-  });
+      select: {
+        id: true,
+        partnerId: true,
+        partnerGroup: {
+          select: {
+            id: true,
+            name: true,
+          },
+        },
+      },
+    });
+
+    // Track the activity logs for the program enrollments that were moved to the group
+    const enrollmentsBeforeById = new Map(
+      programEnrollmentsBefore.map((enrollment) => [enrollment.id, enrollment]),
+    );
+
+    const logs = programEnrollmentsAfter.map((newEnrollment) => {
+      const oldEnrollment = enrollmentsBeforeById.get(newEnrollment.id);
+
+      return {
+        workspaceId,
+        programId,
+        resourceType: "partner" as const,
+        resourceId: newEnrollment.partnerId,
+        userId,
+        action: "partner.groupChanged" as const,
+        changeSet: buildProgramEnrollmentChangeSet({
+          oldEnrollment,
+          newEnrollment,
+        }),
+      };
+    });
 
-  if (count === 0) {
-    return 0;
-  }
+    await trackActivityLogsTx({
+      tx,
+      logs,
+    });
 
-  waitUntil(
-    (async () => {
-      const partnerLinks = await prisma.link.findMany({
+    if (shouldClearLinkRewardsSync) {
+      const partnerLinks = await tx.link.findMany({
         where: {
           programId,
           partnerId: {
-            in: partnerIds,
+            in: pluck(programEnrollmentsAfter, "partnerId"),
           },
         },
-        include: {
-          ...includeTags,
-          ...includeProgramEnrollment,
+        select: {
+          id: true,
         },
       });
 
-      const updatedProgramEnrollments = await prisma.programEnrollment.findMany(
-        {
+      if (partnerLinks.length > 0) {
+        await tx.linkReward.deleteMany({
           where: {
-            partnerId: {
-              in: partnerIds,
+            linkId: {
+              in: pluck(partnerLinks, "id"),
             },
-            programId,
           },
-          select: {
-            id: true,
-            partnerId: true,
-            partnerGroup: {
-              select: {
-                id: true,
-                name: true,
-              },
-            },
-          },
-        },
-      );
-
-      // Build activity log inputs
-      const activityLogInputs: TrackActivityLogInput[] =
-        updatedProgramEnrollments.map((updatedEnrollment) => {
-          const oldEnrollment = programEnrollments.find(
-            (e) => e.id === updatedEnrollment.id,
-          );
-
-          return {
-            workspaceId,
-            programId,
-            resourceType: "partner",
-            resourceId: updatedEnrollment.partnerId,
-            userId,
-            action: "partner.groupChanged",
-            changeSet: buildProgramEnrollmentChangeSet({
-              oldEnrollment,
-              newEnrollment: updatedEnrollment,
-            }),
-          };
         });
-
-      // If the userId is not provided, get the workspace user id from the workspace users
-      // userId will be null for workflow-initiated actions
-      let workspaceUserId = userId;
-
-      if (!workspaceUserId) {
-        const { users } = await getWorkspaceUsers({
-          programId,
-          role: WorkspaceRole.owner,
-        });
-
-        if (users.length > 0) {
-          workspaceUserId = users[0].id;
-        }
       }
+    }
 
-      await Promise.allSettled([
-        qstash.publishJSON({
-          url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
-          body: {
-            programId,
-            groupId: group.id,
-            // skip remap-default-links / remap-discount-codes for pending applications (no links yet)
-            partnerIds: programEnrollments
-              .filter(({ status }) => status !== "pending")
-              .map(({ partnerId }) => partnerId),
-            userId: workspaceUserId,
-            isGroupDeleted,
-          },
-        }),
+    return {
+      count: count + alreadyInGroupCount,
+      programEnrollmentsAfter,
+    };
+  });
 
-        triggerDraftBountySubmissionCreation({
-          programId,
-          partnerIds,
-        }),
+  if (!result) {
+    return 0;
+  }
 
-        recordLink(partnerLinks),
+  const { count, programEnrollmentsAfter } = result;
+  const movedPartnerIds = pluck(programEnrollmentsAfter, "partnerId");
 
-        notifyPartnerGroupChange({
-          programId,
-          groupId: group.id,
-          partnerIds,
-        }),
+  if (movedPartnerIds.length === 0) {
+    return count;
+  }
 
-        trackActivityLog(activityLogInputs),
-      ]);
-    })(),
+  waitUntil(
+    processPartnerGroupChangeJob.dispatch({
+      programId,
+      groupId: group.id,
+      movedPartnerIds,
+      userId,
+      idempotencyKey: nanoid(10),
+    }),
   );
 
   return count;
diff --git a/apps/web/lib/api/links/bulk-create-links.ts b/apps/web/lib/api/links/bulk-create-links.ts
index e5faf38ef34..9a246736b1e 100644
--- a/apps/web/lib/api/links/bulk-create-links.ts
+++ b/apps/web/lib/api/links/bulk-create-links.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSyncForLinks } from "@/lib/api/partners/queue-partner-search-sync";
 import { prisma } from "@/lib/prisma";
 import { ProcessedLinkProps } from "@/lib/types";
 import { publishWorkspaceLinksUsageEvent } from "@/lib/upstash/redis-streams/workspace-links-usage";
@@ -235,6 +236,11 @@ export async function bulkCreateLinks({
         linksCount: links.length,
         timestamp: new Date().toISOString(),
       }),
+      // Queue an index update if any of the new links are associated with a partner
+      createdLinksData.some((link) => link.partnerId) &&
+        queuePartnerSearchSyncForLinks(
+          createdLinksData.filter((link) => link.partnerId),
+        ),
     ]),
   );
 
diff --git a/apps/web/lib/api/links/bulk-delete-links.ts b/apps/web/lib/api/links/bulk-delete-links.ts
index 1a16a84e5cf..9230d599580 100644
--- a/apps/web/lib/api/links/bulk-delete-links.ts
+++ b/apps/web/lib/api/links/bulk-delete-links.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSyncForLinks } from "@/lib/api/partners/queue-partner-search-sync";
 import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
@@ -60,6 +61,13 @@ export async function bulkDeleteLinks(
           .map((link) =>
             storage.delete({ key: link.image!.replace(`${R2_URL}/`, "") }),
           ),
+
+        // Queue an index update if any of the deleted links are associated with a partner
+        // The program enrollments outlives them, so the document is re-serialized without them.
+        links.some((link) => link.partnerId) &&
+          queuePartnerSearchSyncForLinks(
+            links.filter((link) => link.partnerId),
+          ),
       ]),
     );
   }
@@ -79,11 +87,7 @@ async function deleteLinksBatch(links: ExpandedLink[]): Promise<number> {
       },
     },
     include: {
-      discount: {
-        select: {
-          provider: true,
-        },
-      },
+      discount: true,
     },
   });
 
diff --git a/apps/web/lib/api/links/bulk-update-links.ts b/apps/web/lib/api/links/bulk-update-links.ts
index 92256367600..61fa3190584 100644
--- a/apps/web/lib/api/links/bulk-update-links.ts
+++ b/apps/web/lib/api/links/bulk-update-links.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSyncForLinks } from "@/lib/api/partners/queue-partner-search-sync";
 import { prisma } from "@/lib/prisma";
 import { isNotHostedImage, storage } from "@/lib/storage";
 import { bulkUpdateLinksBodySchema } from "@/lib/zod/schemas/links";
@@ -39,6 +40,17 @@ export async function bulkUpdateLinks(
 
   const imageUrlNonce = nanoid(7);
 
+  // The bulk payload omits link key but not `partnerId`, so an
+  // update can move links between partners. The former owners are unrecoverable
+  // after the write, so read them first, and only when the payload can move one.
+  const previousPartnersForLinks =
+    rest.partnerId !== undefined || rest.programId !== undefined
+      ? await prisma.link.findMany({
+          where: { id: { in: linkIds } },
+          select: { programId: true, partnerId: true },
+        })
+      : [];
+
   const updatedLinks = await Promise.all(
     linkIds.map((linkId) =>
       prisma.link.update({
@@ -115,6 +127,12 @@ export async function bulkUpdateLinks(
       propagateBulkLinkChanges({
         links: updatedLinks,
       }),
+      // Queue an index update if there are previous partners (meaning partnerId was bulk updated)
+      previousPartnersForLinks.length > 0 &&
+        queuePartnerSearchSyncForLinks([
+          ...previousPartnersForLinks,
+          ...updatedLinks,
+        ]),
       // if proxy is true and image is not stored in R2, upload image to R2
       proxy &&
         image &&
diff --git a/apps/web/lib/api/links/cache.ts b/apps/web/lib/api/links/cache.ts
index 8d1521ea8b8..d3050cc7784 100644
--- a/apps/web/lib/api/links/cache.ts
+++ b/apps/web/lib/api/links/cache.ts
@@ -68,7 +68,10 @@ class LinkCache {
     ]);
   }
 
-  async get({ domain, key }: Pick<LinkProps, "domain" | "key">) {
+  async get({ domain, key }: Pick<LinkProps, "domain" | "key">): Promise<{
+    cachedLink: RedisLinkProps | null;
+    redisFailOver: boolean;
+  }> {
     // here we use linkcache:${domain}:${key} instead of this._createKey({ domain, key })
     // because the key can either be cached as case-sensitive or case-insensitive depending on the domain
     // so we should get the original key from the cache
@@ -80,7 +83,7 @@ class LinkCache {
     if (cachedLink) {
       console.log(`[LRU Cache HIT] ${cacheKey}`);
       linkLRUCache.set(cacheKey, cachedLink); // refresh the LRU cache
-      return cachedLink;
+      return { cachedLink, redisFailOver: false };
     }
 
     console.log(`[LRU Cache MISS] ${cacheKey} - Checking redisGlobal...`);
@@ -92,12 +95,12 @@ class LinkCache {
       if (cachedLink) {
         console.log(`[Redis Cache HIT] ${cacheKey} - Populating LRU Cache...`);
         linkLRUCache.set(cacheKey, cachedLink); // persist to LRU cache
-        return cachedLink;
+        return { cachedLink, redisFailOver: false };
       } else {
         console.log(
           `[Redis Cache MISS] ${cacheKey} - Not found in LRU or Redis, falling back to MySQL...`,
         );
-        return null;
+        return { cachedLink: null, redisFailOver: false };
       }
     } catch (error) {
       console.error(`[Redis Cache Error] ${cacheKey} - ${error}`);
@@ -106,7 +109,7 @@ class LinkCache {
       if (cachedLink) {
         console.log(`[Vercel Cache HIT] ${cacheKey}`);
         linkLRUCache.set(cacheKey, cachedLink);
-        return cachedLink;
+        return { cachedLink, redisFailOver: true };
       }
 
       console.log(`[Vercel Cache MISS] ${cacheKey} - Falling back to MySQL...`);
@@ -128,7 +131,7 @@ class LinkCache {
           ttl: VERCEL_CACHE_EXPIRATION,
         }),
       );
-      return cachedLink;
+      return { cachedLink, redisFailOver: true };
     }
   }
 
diff --git a/apps/web/lib/api/links/create-link.ts b/apps/web/lib/api/links/create-link.ts
index f5b2e9ec576..4fdb159047d 100644
--- a/apps/web/lib/api/links/create-link.ts
+++ b/apps/web/lib/api/links/create-link.ts
@@ -1,3 +1,8 @@
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import {
+  hasRewardAssignment,
+  RewardOverrideIdsInput,
+} from "@/lib/api/rewards/reward-overrides";
 import { qstash } from "@/lib/cron";
 import { getPartnerEnrollmentInfo } from "@/lib/planetscale/get-partner-enrollment-info";
 import { prisma } from "@/lib/prisma";
@@ -7,8 +12,8 @@ import { ProcessedLinkProps } from "@/lib/types";
 import { publishWorkspaceLinksUsageEvent } from "@/lib/upstash/redis-streams/workspace-links-usage";
 import {
   APP_DOMAIN_WITH_NGROK,
-  R2_URL,
   getParamsFromURL,
+  R2_URL,
   truncate,
 } from "@dub/utils";
 import { linkConstructorSimple } from "@dub/utils/src/functions/link-constructor";
@@ -23,7 +28,11 @@ import { encodeKeyIfCaseSensitive } from "./case-sensitivity";
 import { includeTags } from "./include-tags";
 import { transformLink } from "./utils";
 
-export async function createLink(link: ProcessedLinkProps) {
+type CreateLinkOptions = ProcessedLinkProps & {
+  linkReward?: RewardOverrideIdsInput;
+};
+
+export async function createLink(link: CreateLinkOptions) {
   let {
     key,
     url,
@@ -44,13 +53,15 @@ export async function createLink(link: ProcessedLinkProps) {
   const { utm_source, utm_medium, utm_campaign, utm_term, utm_content } =
     getParamsFromURL(url);
 
-  const { tagId, tagIds, tagNames, webhookIds, ...rest } = link;
+  const { tagId, tagIds, tagNames, webhookIds, linkReward, ...rest } = link;
 
   key = encodeKeyIfCaseSensitive({
     domain: link.domain,
     key,
   });
 
+  const hasLinkLevelReward = linkReward && hasRewardAssignment(linkReward);
+
   const response = await withPrismaRetry(() =>
     prisma.link.create({
       data: {
@@ -127,6 +138,18 @@ export async function createLink(link: ProcessedLinkProps) {
             },
           },
         }),
+
+        // Link level rewards
+        ...(hasLinkLevelReward && {
+          linkReward: {
+            create: {
+              clickRewardId: linkReward.clickRewardId ?? null,
+              leadRewardId: linkReward.leadRewardId ?? null,
+              saleRewardId: linkReward.saleRewardId ?? null,
+              discountId: linkReward.discountId ?? null,
+            },
+          },
+        }),
       },
       include: {
         ...includeTags,
@@ -143,6 +166,7 @@ export async function createLink(link: ProcessedLinkProps) {
       const { partner, discount } = await getPartnerEnrollmentInfo({
         programId: response.programId,
         partnerId: response.partnerId,
+        linkId: response.id,
       });
 
       await Promise.allSettled([
@@ -153,6 +177,15 @@ export async function createLink(link: ProcessedLinkProps) {
           ...(discount && { discount }),
         }),
 
+        // Queue an index update because the new link adds a searchable
+        // shortLink. Default delay rather than the longer link one.
+        response.programId &&
+          response.partnerId &&
+          queuePartnerSearchSync({
+            partnerIds: [response.partnerId],
+            programId: response.programId,
+          }),
+
         // Record link in Tinybird
         recordLink({
           ...response,
diff --git a/apps/web/lib/api/links/delete-link.ts b/apps/web/lib/api/links/delete-link.ts
index 7976a0737c8..dad9719fd9c 100644
--- a/apps/web/lib/api/links/delete-link.ts
+++ b/apps/web/lib/api/links/delete-link.ts
@@ -1,4 +1,5 @@
-import { enqueueDeleteDiscountCode } from "@/lib/discounts/delete-discount-code";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { deleteDiscountCodes } from "@/lib/discounts/delete-discount-code";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import { recordLink } from "@/lib/tinybird";
@@ -19,34 +20,21 @@ export async function deleteLink(linkId: string) {
       ...includeProgramEnrollment,
       discountCode: {
         include: {
-          discount: {
-            select: {
-              provider: true,
-            },
-          },
+          discount: true,
         },
       },
     },
   });
 
-  // Delete the discount code and link in a transaction
-  await prisma.$transaction([
-    ...(link.discountCode
-      ? [
-          prisma.discountCode.delete({
-            where: {
-              id: link.discountCode.id,
-            },
-          }),
-        ]
-      : []),
+  if (link.discountCode) {
+    await deleteDiscountCodes([link.discountCode]);
+  }
 
-    prisma.link.delete({
-      where: {
-        id: linkId,
-      },
-    }),
-  ]);
+  await prisma.link.delete({
+    where: {
+      id: linkId,
+    },
+  });
 
   waitUntil(
     Promise.allSettled([
@@ -73,7 +61,14 @@ export async function deleteLink(linkId: string) {
           },
         }),
 
-      link.discountCode && enqueueDeleteDiscountCode([link.discountCode]),
+      // Queue an index update because the link was deleted. The enrollment
+      // outlives it, so the document is re-serialized without it.
+      link.programId &&
+        link.partnerId &&
+        queuePartnerSearchSync({
+          partnerIds: [link.partnerId],
+          programId: link.programId,
+        }),
     ]),
   );
 
diff --git a/apps/web/lib/api/links/malicious-link-check.ts b/apps/web/lib/api/links/malicious-link-check.ts
new file mode 100644
index 00000000000..4999cba1920
--- /dev/null
+++ b/apps/web/lib/api/links/malicious-link-check.ts
@@ -0,0 +1,92 @@
+import { isBlacklistedDomain } from "@/lib/edge-config/is-blacklisted-domain";
+import { updateConfig } from "@/lib/edge-config/update";
+import { getDomainWithoutWWW } from "@dub/utils";
+import { waitUntil } from "@vercel/functions";
+import { experimental_evaluate as evaluate } from "ai";
+
+export async function maliciousLinkCheck(url: string) {
+  const domain = getDomainWithoutWWW(url);
+
+  if (!domain) {
+    return false;
+  }
+
+  const domainStatus = await isBlacklistedDomain(domain);
+
+  if (domainStatus === "blacklisted") {
+    return true;
+  }
+
+  // skip remaining checks for trusted domains
+  if (domainStatus === "whitelisted") {
+    return false;
+  }
+
+  // run jev check
+  try {
+    const result = await evaluate({
+      model: "typesafe-ai/jev",
+      state: { url, domain },
+      questions: {
+        isMalicious: {
+          type: "boolean",
+          instructions:
+            "Is this destination abusive to publish as a public short link?",
+          criteria: {
+            true: {
+              meaning:
+                "Yes if the URL is meant to deceive, steal credentials or funds, deliver malware, or is a category we refuse to shorten. One strong match is enough.",
+              matches_any: [
+                "Phishing or brand impersonation: login, verify, KYC, billing, shipping, wallet-connect, or support pages mimicking banks/utilities, marketplaces, crypto, Microsoft/Google/Adobe/Apple, carriers, government, or Roblox — including typosquats, hyphenated lookalikes, and extra-TLD hosts like brand.com.evil.tld.",
+                "Those same lures on throwaway hosting (Vercel, Netlify, Weebly, Blogspot, Surge, Firebase, serveo, Cloudflare, DuckDNS, Azure blobs, Heroku, tiiny.site, IPFS, AWS lambda URLs, Google Sites, Microsoft Forms).",
+                "Another URL shortener, cloaking/redirector, or QR-code hop (nested shortening).",
+                "Adult, porn, cam, or dating-spam sites.",
+                "Malware, fake downloads/updates, scareware, crypto drainers, or pirate IPTV/streaming.",
+                "Gibberish, keyboard-smash, punycode/IDN homograph, raw-IP, or random smashed-dictionary domains used for cloaking (yhujykujujk.xyz, concealmentbroad.com).",
+              ],
+            },
+            false: {
+              meaning:
+                "No if this is a normal site someone would reasonably shorten.",
+              even_if: [
+                "It has a real login or checkout on the organization's own official domain.",
+                "It is a legitimate app on Vercel/Netlify/GitHub Pages with no impersonation signals.",
+                "The brand is unfamiliar or new, as long as the name is coherent and not a lookalike, shortener, or gibberish domain.",
+              ],
+            },
+          },
+        },
+      },
+      providerOptions: {
+        gateway: {
+          zeroDataRetention: true,
+        },
+      },
+    });
+
+    const maliciousProbability = result.answers.isMalicious.probability;
+
+    console.log("typesafe/jev check results:");
+    console.log({
+      url,
+      domain,
+      probability: maliciousProbability,
+      isMalicious: maliciousProbability > 0.5,
+    });
+
+    // if high probability, add to blacklist
+    if (maliciousProbability > 0.8) {
+      waitUntil(
+        updateConfig({
+          key: "domains",
+          value: domain,
+        }),
+      );
+    }
+
+    return maliciousProbability > 0.5;
+  } catch (error) {
+    console.error("typesafe/jev check error:", error);
+    return false;
+  }
+}
diff --git a/apps/web/lib/api/links/process-link.ts b/apps/web/lib/api/links/process-link.ts
index 7e3378408c9..6589be02c06 100644
--- a/apps/web/lib/api/links/process-link.ts
+++ b/apps/web/lib/api/links/process-link.ts
@@ -1,4 +1,3 @@
-import { isBlacklistedDomain } from "@/lib/edge-config";
 import { verifyFolderAccess } from "@/lib/folder/permissions";
 import { checkIfUserExists, getRandomKey } from "@/lib/planetscale";
 import { prisma } from "@/lib/prisma";
@@ -18,6 +17,7 @@ import {
 } from "@dub/utils";
 import { Project, WorkspaceRole } from "@prisma/client";
 import { combineTagIds } from "../tags/combine-tag-ids";
+import { maliciousLinkCheck } from "./malicious-link-check";
 import {
   businessFeaturesCheck,
   dubLinkSubdomainCheck,
@@ -436,22 +436,27 @@ export async function processLink<T extends Record<string, any>>({
       }
     }
 
-    // Program validity checks
+    // only perform program validity checks if not bulk creation (we do that check separately in the route itself)
     if (programId && !skipProgramChecks) {
+      if (!partnerId && !tenantId) {
+        return {
+          link: payload,
+          error:
+            "programId was passed but no valid partnerId or tenantId was provided.",
+          code: "unprocessable_entity",
+        };
+      }
+
       const program = await prisma.program.findUnique({
         where: { id: programId },
         select: {
           workspaceId: true,
           defaultFolderId: true,
-          ...(!partnerId && tenantId
-            ? {
-                partners: {
-                  where: {
-                    tenantId,
-                  },
-                },
-              }
-            : {}),
+          partners: {
+            where: {
+              ...(partnerId ? { partnerId } : { tenantId }),
+            },
+          },
         },
       });
 
@@ -463,11 +468,15 @@ export async function processLink<T extends Record<string, any>>({
         };
       }
 
-      if (!partnerId) {
-        partnerId =
-          program?.partners?.length > 0 ? program.partners[0].partnerId : null;
+      if (!program.partners.length) {
+        return {
+          link: payload,
+          error: "Invalid partnerId or tenantId provided.",
+          code: "not_found",
+        };
       }
 
+      partnerId = program.partners[0].partnerId;
       defaultProgramFolderId = program.defaultFolderId;
     }
 
@@ -592,23 +601,3 @@ export async function processLink<T extends Record<string, any>>({
     error: null,
   };
 }
-
-async function maliciousLinkCheck(url: string) {
-  // flag for suspicious URL strings
-  if (["?key=", "&key="].some((param) => url.includes(param))) {
-    return true;
-  }
-
-  const domain = getDomainWithoutWWW(url);
-
-  if (!domain) {
-    return false;
-  }
-
-  const domainBlacklisted = await isBlacklistedDomain(domain);
-  if (domainBlacklisted === true) {
-    return true;
-  }
-
-  return false;
-}
diff --git a/apps/web/lib/api/links/update-link.ts b/apps/web/lib/api/links/update-link.ts
index 6f19f679f88..365726b5c5a 100644
--- a/apps/web/lib/api/links/update-link.ts
+++ b/apps/web/lib/api/links/update-link.ts
@@ -1,3 +1,4 @@
+import { queuePartnerSearchSyncForLinks } from "@/lib/api/partners/queue-partner-search-sync";
 import { getPartnerEnrollmentInfo } from "@/lib/planetscale/get-partner-enrollment-info";
 import { prisma } from "@/lib/prisma";
 import { isNotHostedImage, storage } from "@/lib/storage";
@@ -29,6 +30,11 @@ export async function updateLink({
     key: string;
     image?: string | null;
     testCompletedAt?: Date | null;
+    // Required rather than optional: the link body accepts `partnerId`, so an
+    // update can move a link, and an optional field here would let the next
+    // caller omit the former owner and silently lose its re-index.
+    programId: string | null;
+    partnerId: string | null;
   };
   updatedLink: ProcessedLinkProps &
     Pick<LinkProps, "id" | "clicks" | "lastClicked" | "updatedAt">;
@@ -45,9 +51,11 @@ export async function updateLink({
     proxy,
     geo,
     publicStats,
+    partnerId,
   } = updatedLink;
   const changedKey = key.toLowerCase() !== oldLink.key.toLowerCase();
   const changedDomain = domain !== oldLink.domain;
+  const changedPartnerId = partnerId !== oldLink.partnerId;
 
   const { utm_source, utm_medium, utm_campaign, utm_term, utm_content } =
     getParamsFromURL(url);
@@ -172,6 +180,7 @@ export async function updateLink({
       const { partner, discount } = await getPartnerEnrollmentInfo({
         programId: response.programId,
         partnerId: response.partnerId,
+        linkId: response.id,
       });
 
       await Promise.allSettled([
@@ -202,6 +211,10 @@ export async function updateLink({
         // If key is changed: delete the old key in Redis
         (changedDomain || changedKey) && linkCache.delete(oldLink),
 
+        // Queue an index update if the link key or partner ID changed (indexed fields)
+        (changedKey || changedPartnerId) &&
+          queuePartnerSearchSyncForLinks([oldLink, response]),
+
         // If proxy is true and image is not stored in R2, upload image to R2
         proxy &&
           image &&
diff --git a/apps/web/lib/api/links/utils/check-if-links-have-program-partners.ts b/apps/web/lib/api/links/utils/check-if-links-have-program-partners.ts
new file mode 100644
index 00000000000..a82f0065fd1
--- /dev/null
+++ b/apps/web/lib/api/links/utils/check-if-links-have-program-partners.ts
@@ -0,0 +1,3 @@
+export const checkIfLinksHaveProgramPartners = (
+  links: { programId?: string | null; partnerId?: string | null }[],
+) => links.some((link) => link.programId || link.partnerId);
diff --git a/apps/web/lib/api/links/validate-links-query-filters.ts b/apps/web/lib/api/links/validate-links-query-filters.ts
index 3c101d87ffb..638c553294b 100644
--- a/apps/web/lib/api/links/validate-links-query-filters.ts
+++ b/apps/web/lib/api/links/validate-links-query-filters.ts
@@ -7,7 +7,7 @@ import { getDomainOrThrow } from "../domains/get-domain-or-throw";
 
 interface LinksQueryFilters
   extends Partial<z.infer<typeof getLinksQuerySchemaExtended>> {
-  userId: string;
+  sessionUserId: string;
   workspace: Pick<WorkspaceProps, "id" | "plan" | "foldersUsage" | "users">;
 }
 
@@ -21,6 +21,7 @@ export async function validateLinksQueryFilters({
   tenantId,
   folderId,
   userId,
+  sessionUserId,
   workspace,
 }: LinksQueryFilters) {
   let folderIds: string[] | undefined = undefined;
@@ -35,7 +36,7 @@ export async function validateLinksQueryFilters({
   if (folderId) {
     await verifyFolderAccess({
       workspace,
-      userId,
+      userId: sessionUserId,
       folderId,
       requiredPermission: "folders.read",
     });
@@ -43,15 +44,22 @@ export async function validateLinksQueryFilters({
 
   /* we only need to get the folder ids if we are:
       - not filtering by folder
-      - filtering by search, domain, tags, tenantId, or linkIds
+      - filtering by search, domain, tags, creator, tenantId, or linkIds
     */
   if (
     !folderId &&
-    (search || domain || tagId || tagIds || tagNames || tenantId || linkIds)
+    (search ||
+      domain ||
+      tagId ||
+      tagIds ||
+      tagNames ||
+      tenantId ||
+      linkIds ||
+      userId)
   ) {
     folderIds = await getFolderIdsToFilter({
       workspace,
-      userId,
+      userId: sessionUserId,
     });
   }
 
diff --git a/apps/web/lib/api/network/calculate-partner-ranking.ts b/apps/web/lib/api/network/calculate-partner-ranking.ts
index ec6d6275f04..0445f166fac 100644
--- a/apps/web/lib/api/network/calculate-partner-ranking.ts
+++ b/apps/web/lib/api/network/calculate-partner-ranking.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@/lib/prisma";
 import { getNetworkPartnersQuerySchema } from "@/lib/zod/schemas/partner-network";
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 import { PlatformType, Prisma } from "@prisma/client";
 import * as z from "zod/v4";
 
@@ -160,7 +160,7 @@ export async function calculatePartnerRanking({
       FROM Partner p_filter_all
       WHERE ${buildDiscoverablePartnersFilter("p_filter_all")}
     )
-      AND pe_all.programId != ${ACME_PROGRAM_ID}
+      AND pe_all.programId NOT IN (${ACME_PROGRAM_ID}, ${DEMO_PROGRAM_ID})
       AND pe_all.totalConversions > 0
     GROUP BY pe_all.partnerId
   ) allProgramMetrics ON allProgramMetrics.partnerId = p.id`;
diff --git a/apps/web/lib/api/partners/applications/approve-partner.ts b/apps/web/lib/api/partners/applications/approve-partner.ts
index 2509e3fc1dc..164c058ba77 100644
--- a/apps/web/lib/api/partners/applications/approve-partner.ts
+++ b/apps/web/lib/api/partners/applications/approve-partner.ts
@@ -1,14 +1,15 @@
 import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
 import { prisma } from "@/lib/prisma";
 import { ProgramEnrollmentStatus } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
-import { triggerQStashWorkflow } from "../../../cron/qstash-workflow";
 import { throwIfPartnersLimitExceeded } from "../../../partners/throw-if-partners-limit-exceeded";
 import { approvePartnerSchema } from "../../../zod/schemas/partners";
 import { trackActivityLog } from "../../activity-log/track-activity-log";
 import { DubApiError } from "../../errors";
 import { getGroupOrThrow } from "../../groups/get-group-or-throw";
+import { queuePartnerSearchSync } from "../queue-partner-search-sync";
 
 type ApprovePartnerInput = z.infer<typeof approvePartnerSchema> & {
   programId: string;
@@ -99,6 +100,7 @@ export async function approvePartner({
         leadRewardId: group.leadRewardId,
         saleRewardId: group.saleRewardId,
         referralRewardId: group.referralRewardId,
+        customRewardId: group.customRewardId,
         discountId: group.discountId,
       },
     });
@@ -131,6 +133,9 @@ export async function approvePartner({
 
   waitUntil(
     Promise.allSettled([
+      // Queue an index update because the enrollment status moved to approved.
+      queuePartnerSearchSync({ partnerIds: [partnerId], programId }),
+
       trackActivityLog({
         workspaceId: program.workspace.id,
         programId,
@@ -152,14 +157,16 @@ export async function approvePartner({
         partnerIds: [partnerId],
       }),
 
-      triggerQStashWorkflow({
-        workflowType: "partner-approved",
-        workflowLabel: partnerId,
-        body: {
+      dispatchWorkflows({
+        name: "partner-approved-workflow",
+        payload: {
           programId,
           partnerId,
           userId,
         },
+        options: {
+          label: partnerId,
+        },
       }),
     ]),
   );
diff --git a/apps/web/lib/api/partners/applications/reject-partner.ts b/apps/web/lib/api/partners/applications/reject-partner.ts
index 2d4cfbdabe0..4380273f934 100644
--- a/apps/web/lib/api/partners/applications/reject-partner.ts
+++ b/apps/web/lib/api/partners/applications/reject-partner.ts
@@ -12,6 +12,7 @@ import { trackActivityLog } from "../../activity-log/track-activity-log";
 import { DubApiError } from "../../errors";
 import { resolveFraudGroups } from "../../fraud/resolve-fraud-groups";
 import { getDefaultProgramIdOrThrow } from "../../programs/get-default-program-id-or-throw";
+import { queuePartnerSearchSync } from "../queue-partner-search-sync";
 
 type RejectPartnerInput = z.infer<typeof rejectPartnerSchema> & {
   userId: string;
@@ -127,6 +128,7 @@ export async function rejectPartner({
         leadRewardId: null,
         saleRewardId: null,
         referralRewardId: null,
+        customRewardId: null,
         discountId: null,
       },
     });
@@ -146,6 +148,10 @@ export async function rejectPartner({
 
   waitUntil(
     Promise.allSettled([
+      // Queue an index update because the enrollment was either rejected or deleted.
+      // The job reads the ID back, so this does not need to know which.
+      queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
+
       trackActivityLog({
         workspaceId: workspace.id,
         programId,
diff --git a/apps/web/lib/api/partners/bulk-delete-partners.ts b/apps/web/lib/api/partners/bulk-delete-partners.ts
index 1b25b0c147f..ed99edf2017 100644
--- a/apps/web/lib/api/partners/bulk-delete-partners.ts
+++ b/apps/web/lib/api/partners/bulk-delete-partners.ts
@@ -2,6 +2,7 @@ import { conn } from "@/lib/planetscale";
 import { prisma } from "@/lib/prisma";
 import { ACME_PROGRAM_ID } from "@dub/utils";
 import { bulkDeleteLinks } from "../links/bulk-delete-links";
+import { queuePartnerSearchSync } from "./queue-partner-search-sync";
 
 const BATCH_SIZE = 250;
 
@@ -160,6 +161,9 @@ export async function bulkDeletePartners({
       `Deleted ${deletedProgramEnrollments.count} program enrollments`,
     );
 
+    // Queue an index update because the ACME enrollments were deleted.
+    await queuePartnerSearchSync({ enrollmentIds: programEnrollmentIds });
+
     if (deletedProgramEnrollments.count > 0) {
       await prisma.project.updateMany({
         where: {
@@ -175,6 +179,20 @@ export async function bulkDeletePartners({
   }
 
   if (deletePartners) {
+    // The enrollment delete above is scoped to ACME, but this one is not, and
+    // ProgramEnrollment.partner is onDelete: Cascade. Read whatever is left in
+    // other programs first, since the rows are unrecoverable afterwards.
+    const cascadedEnrollments = await prisma.programEnrollment.findMany({
+      where: {
+        partnerId: {
+          in: partnerIds,
+        },
+      },
+      select: {
+        id: true,
+      },
+    });
+
     // using conn.execute here since Prisma is throwing a weird error
     const res = await conn.execute(
       `DELETE FROM Partner WHERE id IN (${partnerIds.map(() => "?").join(",")})`,
@@ -183,5 +201,11 @@ export async function bulkDeletePartners({
     console.log(JSON.stringify(res, null, 2));
 
     console.log(`Deleted ${partnerIds.length} partners`);
+
+    // Queue an index update because deleting the partners cascades to their
+    // remaining enrollments in other programs.
+    await queuePartnerSearchSync({
+      enrollmentIds: cascadedEnrollments.map(({ id }) => id),
+    });
   }
 }
diff --git a/apps/web/lib/api/partners/bulk-reactivate-partners.ts b/apps/web/lib/api/partners/bulk-reactivate-partners.ts
index 39a0a6f1593..20a97e9cd0b 100644
--- a/apps/web/lib/api/partners/bulk-reactivate-partners.ts
+++ b/apps/web/lib/api/partners/bulk-reactivate-partners.ts
@@ -6,6 +6,7 @@ import { Partner, Program, ProgramEnrollment } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { trackActivityLog } from "../activity-log/track-activity-log";
 import { linkCache } from "../links/cache";
+import { queuePartnerSearchSync } from "./queue-partner-search-sync";
 
 type ProgramEnrollmentWithPartner = Pick<
   ProgramEnrollment,
@@ -50,6 +51,7 @@ export async function bulkReactivatePartners({
       leadRewardId: true,
       saleRewardId: true,
       referralRewardId: true,
+      customRewardId: true,
       discountId: true,
     },
   });
@@ -131,27 +133,35 @@ export async function bulkReactivatePartners({
         leadRewardId: group.leadRewardId,
         saleRewardId: group.saleRewardId,
         referralRewardId: group.referralRewardId,
+        customRewardId: group.customRewardId,
         discountId: group.discountId,
       },
     });
   }
 
   waitUntil(
-    trackActivityLog(
-      programEnrollments.map(({ partnerId }) => ({
-        workspaceId: program.workspaceId,
-        programId: program.id,
-        resourceType: "partner",
-        resourceId: partnerId,
-        action: "partner.reactivated",
-        changeSet: {
-          status: {
-            old: "deactivated",
-            new: "approved",
+    Promise.allSettled([
+      trackActivityLog(
+        programEnrollments.map(({ partnerId }) => ({
+          workspaceId: program.workspaceId,
+          programId: program.id,
+          resourceType: "partner",
+          resourceId: partnerId,
+          action: "partner.reactivated",
+          changeSet: {
+            status: {
+              old: "deactivated",
+              new: "approved",
+            },
           },
-        },
-      })),
-    ),
+        })),
+      ),
+
+      // Queue an index update because the enrollment statuses moved back to approved
+      queuePartnerSearchSync({
+        enrollmentIds: programEnrollments.map(({ id }) => id),
+      }),
+    ]),
   );
 
   // Send email notifications
diff --git a/apps/web/lib/api/partners/create-and-enroll-partner.ts b/apps/web/lib/api/partners/create-and-enroll-partner.ts
index 377cfd15588..d98f4d5ea19 100644
--- a/apps/web/lib/api/partners/create-and-enroll-partner.ts
+++ b/apps/web/lib/api/partners/create-and-enroll-partner.ts
@@ -15,6 +15,7 @@ import { getGroupOrThrow } from "../groups/get-group-or-throw";
 import { createOrGetProgramEnrollment } from "./create-or-get-program-enrollment";
 import { createPartnerDefaultLinks } from "./create-partner-default-links";
 import { getOrCreatePartner } from "./get-or-create-partner";
+import { queuePartnerSearchSync } from "./queue-partner-search-sync";
 import { throwIfExistingTenantEnrollmentExists } from "./throw-if-existing-tenant-id-exists";
 
 interface CreateAndEnrollPartnerInput {
@@ -165,6 +166,7 @@ export const createAndEnrollPartner = async ({
     leadRewardId: group.leadRewardId,
     saleRewardId: group.saleRewardId,
     referralRewardId: group.referralRewardId,
+    customRewardId: group.customRewardId,
     discountId: group.discountId,
     enrolledAt,
   });
@@ -179,6 +181,9 @@ export const createAndEnrollPartner = async ({
     });
   }
 
+  // Queue an index update because a new enrollment was created.
+  waitUntil(queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }));
+
   // Create the partner links based on group defaults
   const links = await createPartnerDefaultLinks({
     workspace: {
diff --git a/apps/web/lib/api/partners/create-or-get-program-enrollment.ts b/apps/web/lib/api/partners/create-or-get-program-enrollment.ts
index fceee374860..c2b2b2c2951 100644
--- a/apps/web/lib/api/partners/create-or-get-program-enrollment.ts
+++ b/apps/web/lib/api/partners/create-or-get-program-enrollment.ts
@@ -15,6 +15,7 @@ export async function createOrGetProgramEnrollment({
   leadRewardId,
   saleRewardId,
   referralRewardId,
+  customRewardId,
   discountId,
   enrolledAt,
 }: Pick<
@@ -28,6 +29,7 @@ export async function createOrGetProgramEnrollment({
   | "leadRewardId"
   | "saleRewardId"
   | "referralRewardId"
+  | "customRewardId"
   | "discountId"
 > & {
   enrolledAt?: Date;
@@ -45,6 +47,7 @@ export async function createOrGetProgramEnrollment({
         leadRewardId,
         saleRewardId,
         referralRewardId,
+        customRewardId,
         discountId,
         ...(enrolledAt && {
           createdAt: enrolledAt,
diff --git a/apps/web/lib/api/partners/create-partner-default-links.ts b/apps/web/lib/api/partners/create-partner-default-links.ts
index 0fb57779060..ac60221596f 100644
--- a/apps/web/lib/api/partners/create-partner-default-links.ts
+++ b/apps/web/lib/api/partners/create-partner-default-links.ts
@@ -7,10 +7,10 @@ import {
   UtmTemplateProps,
   WorkspaceProps,
 } from "@/lib/types";
-import { constructURLFromUTMParams, isFulfilled } from "@dub/utils";
+import { isFulfilled } from "@dub/utils";
 import { PartnerGroupDefaultLink } from "@prisma/client";
 import { bulkCreateLinks } from "../links";
-import { extractUtmParams } from "../utm/extract-utm-params";
+import { applyGroupUtmToLink } from "../utm/apply-group-utm-to-link";
 import {
   buildPartnerDefaultLinkKey,
   generatePartnerLink,
@@ -59,14 +59,14 @@ export async function createPartnerDefaultLinks({
 
   const processedLinks = (
     await Promise.allSettled(
-      defaultLinks.map((defaultLink) => {
+      defaultLinks.map(async (defaultLink) => {
         const key = buildPartnerDefaultLinkKey({
           link,
           partner,
           hasMoreThanOneDefaultLink,
         });
 
-        return generatePartnerLink({
+        const processedLink = await generatePartnerLink({
           workspace,
           program,
           partner,
@@ -74,16 +74,18 @@ export async function createPartnerDefaultLinks({
             ...link,
             key,
             domain: defaultLink.domain,
-            url: constructURLFromUTMParams(
-              defaultLink.url,
-              extractUtmParams(utmTemplate),
-            ),
-            ...extractUtmParams(utmTemplate, { excludeRef: true }),
+            url: defaultLink.url,
             partnerGroupDefaultLinkId: defaultLink.id,
           },
           userId,
           appsFlyerParameters,
         });
+
+        return applyGroupUtmToLink({
+          link: processedLink,
+          utmTemplate,
+          partnerName: partner.name,
+        });
       }),
     )
   )
diff --git a/apps/web/lib/api/partners/generate-partner-username.ts b/apps/web/lib/api/partners/generate-partner-username.ts
index 49985706ca0..597bd9e0ed5 100644
--- a/apps/web/lib/api/partners/generate-partner-username.ts
+++ b/apps/web/lib/api/partners/generate-partner-username.ts
@@ -2,6 +2,8 @@ import { prisma } from "@/lib/prisma";
 import { nanoid } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
 
+const MAX_RETRIES = 3;
+
 export async function generatePartnerUsername({
   email,
   name,
@@ -11,10 +13,9 @@ export async function generatePartnerUsername({
 }) {
   const slugifiedBase = name ? slugify(name) : slugify(email.split("@")[0]);
   let username = `${slugifiedBase}-${nanoid(4).toLowerCase()}`;
-  const maxRetries = 3;
   let retries = 0;
 
-  while (retries <= maxRetries) {
+  while (retries <= MAX_RETRIES) {
     const existingPartner = await prisma.partner.findUnique({
       where: {
         username,
@@ -28,7 +29,7 @@ export async function generatePartnerUsername({
       return username;
     }
 
-    if (retries === maxRetries) {
+    if (retries === MAX_RETRIES) {
       return null;
     }
 
diff --git a/apps/web/lib/api/partners/get-discount-or-throw.ts b/apps/web/lib/api/partners/get-discount-or-throw.ts
index 24bad48f08e..d7252ff35d6 100644
--- a/apps/web/lib/api/partners/get-discount-or-throw.ts
+++ b/apps/web/lib/api/partners/get-discount-or-throw.ts
@@ -1,18 +1,23 @@
 import { prisma } from "@/lib/prisma";
-import { DiscountSchema } from "@/lib/zod/schemas/discount";
+import { Prisma } from "@prisma/client";
 import { DubApiError } from "../errors";
 
-export async function getDiscountOrThrow({
+export async function getDiscountOrThrow<
+  T extends Prisma.DiscountInclude = {},
+>({
   discountId,
   programId,
+  include,
 }: {
   discountId: string;
   programId: string;
-}) {
+  include?: T;
+}): Promise<Prisma.DiscountGetPayload<{ include: T }>> {
   const discount = await prisma.discount.findUnique({
     where: {
       id: discountId,
     },
+    include,
   });
 
   if (!discount) {
@@ -29,5 +34,5 @@ export async function getDiscountOrThrow({
     });
   }
 
-  return DiscountSchema.parse(discount);
+  return discount as Prisma.DiscountGetPayload<{ include: T }>;
 }
diff --git a/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts b/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
index 402abbc67c7..8f9b943553e 100644
--- a/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
+++ b/apps/web/lib/api/partners/get-group-rewards-and-bounties.ts
@@ -9,6 +9,7 @@ const REWARD_ICONS: Record<EventType, string> = {
   lead: "https://assets.dub.co/email-assets/icons/user-plus.png",
   sale: "https://assets.dub.co/email-assets/icons/invoice-dollar.png",
   referral: "https://assets.dub.co/email-assets/icons/nodes-4.png",
+  custom: "https://assets.dub.co/cms/icon-calendar-bounty.png",
 };
 
 const BOUNTY_ICONS: Record<BountyType, string> = {
@@ -37,6 +38,7 @@ export async function getGroupRewardsAndBounties({
         group.leadReward,
         group.saleReward,
         group.referralReward,
+        group.customReward,
       ]
         .filter((r): r is Reward => r !== null)
         .map((reward) => ({
diff --git a/apps/web/lib/api/partners/get-or-create-partner.ts b/apps/web/lib/api/partners/get-or-create-partner.ts
index 89f09526675..9f1892372f4 100644
--- a/apps/web/lib/api/partners/get-or-create-partner.ts
+++ b/apps/web/lib/api/partners/get-or-create-partner.ts
@@ -50,18 +50,10 @@ export async function getOrCreatePartner({
       error instanceof Prisma.PrismaClientKnownRequestError &&
       error.code === "P2002"
     ) {
-      const target = error.meta?.target as string | undefined;
-
       console.info(
         "[getOrCreatePartner] Unique constraint conflict (P2002), falling back to find",
-        { target },
       );
 
-      // Only fall back to "find by email" when the conflict was actually on email, not username
-      if (!target || !target.includes("email")) {
-        throw error;
-      }
-
       const partner = await prisma.partner.findUniqueOrThrow({
         where: {
           email,
diff --git a/apps/web/lib/api/partners/get-partners-count.ts b/apps/web/lib/api/partners/get-partners-count.ts
index 0588619bca7..c0d832ccfea 100644
--- a/apps/web/lib/api/partners/get-partners-count.ts
+++ b/apps/web/lib/api/partners/get-partners-count.ts
@@ -9,6 +9,12 @@ import {
   buildProgramEnrollmentWhereForList,
   mergePartnerCountryAndSearchWhere,
 } from "./program-enrollment-query";
+import {
+  findPartnerSearchCandidates,
+  getPartnerSearchReadProvider,
+  PartnerSearchProvider,
+  resolvePartnerSearchCandidateQuery,
+} from "./search";
 
 type PartnersCountFilters = z.infer<typeof partnersCountQuerySchema> & {
   programId: string;
@@ -19,10 +25,39 @@ type PartnersCountFilters = z.infer<typeof partnersCountQuerySchema> & {
 
 export async function getPartnersCount<T>(
   filters: PartnersCountFilters,
+  {
+    searchProvider = getPartnerSearchReadProvider(),
+    throwOnSearchError = false,
+  }: {
+    searchProvider?: PartnerSearchProvider | null;
+    throwOnSearchError?: boolean;
+  } = {},
 ): Promise<T> {
   const { groupBy, programId, ...enrollmentFilters } = filters;
-  const enrollmentBase = { ...enrollmentFilters, programId };
+  const candidateQuery = searchProvider
+    ? await resolvePartnerSearchCandidateQuery({
+        ...enrollmentFilters,
+        programId,
+      })
+    : null;
+  const candidateResult =
+    searchProvider && candidateQuery
+      ? await findPartnerSearchCandidates(searchProvider, candidateQuery, {
+          throwOnError: throwOnSearchError,
+        })
+      : null;
+  const candidateIds = candidateResult?.hits.map(({ id }) => id);
+  const enrollmentBase = {
+    ...enrollmentFilters,
+    programId,
+    ...(candidateResult ? { search: undefined } : {}),
+  };
 
+  // Read from `enrollmentBase` so the grouping paths below see the same
+  // cleared `search` as `buildProgramEnrollmentWhereForList`. Destructuring
+  // `enrollmentFilters` here would AND the database full-text predicate on top
+  // of the relevance candidates, which drops every match the database cannot
+  // find on its own (e.g. partial emails, links, platforms, descriptions).
   const {
     status,
     country,
@@ -32,14 +67,16 @@ export async function getPartnersCount<T>(
     groupId,
     partnerTagId,
     tenantId,
+    referredByPartnerId,
     partnerTagIdOperator = "IN",
     groupIdOperator = "IN",
     countryOperator = "IN",
-  } = enrollmentFilters;
+  } = enrollmentBase;
 
   const enrollmentScope: Prisma.ProgramEnrollmentWhereInput = {
     programId,
     ...(tenantId ? { tenantId } : {}),
+    ...(candidateIds ? { id: { in: candidateIds } } : {}),
   };
 
   const partnerTagIdNotIn = partnerTagIdOperator === "NOT IN";
@@ -172,10 +209,13 @@ export async function getPartnersCount<T>(
   }
 
   if (groupBy === "partnerTagId") {
-    const enrollmentWhere = buildProgramEnrollmentWhereForList({
-      ...enrollmentBase,
-      partnerTagId: undefined,
-    });
+    const enrollmentWhere: Prisma.ProgramEnrollmentWhereInput = {
+      ...buildProgramEnrollmentWhereForList({
+        ...enrollmentBase,
+        partnerTagId: undefined,
+      }),
+      ...(candidateIds ? { id: { in: candidateIds } } : {}),
+    };
 
     const partners = await prisma.programPartnerTag.groupBy({
       by: ["partnerTagId"],
@@ -224,9 +264,46 @@ export async function getPartnersCount<T>(
     })) as T;
   }
 
-  // Get absolute count of partners
+  // Every filter the provider does not carry. `email` is absent because it stops
+  // a candidate query being built at all. Adding a filter to
+  // buildProgramEnrollmentWhereForList without adding it here or to the
+  // document would silently over-count.
+  const databaseOnlyFilters =
+    Boolean(tenantId) ||
+    Boolean(partnerIds?.length) ||
+    Boolean(referredByPartnerId) ||
+    Object.keys(buildMetricRangeWhere(enrollmentBase)).length > 0;
+
+  if (
+    searchProvider &&
+    candidateQuery &&
+    candidateResult &&
+    !databaseOnlyFilters
+  ) {
+    try {
+      const total = await searchProvider.countCandidates(candidateQuery);
+
+      if (typeof total === "number") {
+        return Math.min(total, candidateQuery.limit) as T;
+      }
+    } catch (error) {
+      console.error(
+        "[Partner Search] Count aggregation failed, falling back to counting candidates.",
+        error,
+      );
+    }
+  }
+
+  // Counting the candidate IDs reports a floor rather than a total, because the
+  // provider already truncated them to the candidate ceiling. Every path that
+  // lands here accepts that: a database-only filter, a declined short prefix, or
+  // a failed aggregation. It stays consistent with the list, which is capped at
+  // the same ceiling, but a broad query will under-report.
   const count = await prisma.programEnrollment.count({
-    where: buildProgramEnrollmentWhereForList(enrollmentBase),
+    where: {
+      ...buildProgramEnrollmentWhereForList(enrollmentBase),
+      ...(candidateIds ? { id: { in: candidateIds } } : {}),
+    },
   });
 
   return count as T;
diff --git a/apps/web/lib/api/partners/get-partners.ts b/apps/web/lib/api/partners/get-partners.ts
index 8764538304a..e0b1f4d27e6 100644
--- a/apps/web/lib/api/partners/get-partners.ts
+++ b/apps/web/lib/api/partners/get-partners.ts
@@ -1,18 +1,32 @@
 import { prisma } from "@/lib/prisma";
-import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
 import { toCentsNumber } from "@dub/utils";
-import * as z from "zod/v4";
+import { Prisma } from "@prisma/client";
 import { buildProgramEnrollmentWhereForList } from "./program-enrollment-query";
+import {
+  findPartnerSearchCandidates,
+  getPartnerSearchReadProvider,
+  orderByPartnerSearchHits,
+  PartnerSearchProvider,
+  PartnerSearchQueryInput,
+  resolvePartnerSearchCandidateQuery,
+} from "./search";
 
-type PartnerFilters = z.infer<typeof getPartnersQuerySchemaExtended> & {
-  programId: string;
+type PartnerFilters = PartnerSearchQueryInput & {
   includeGroup?: boolean;
-  partnerTagIdOperator?: "IN" | "NOT IN";
-  groupIdOperator?: "IN" | "NOT IN";
-  countryOperator?: "IN" | "NOT IN";
 };
 
-export async function getPartners(filters: PartnerFilters) {
+interface GetPartnersOptions {
+  searchProvider?: PartnerSearchProvider | null;
+  throwOnSearchError?: boolean;
+}
+
+export async function getPartners(
+  filters: PartnerFilters,
+  {
+    searchProvider = getPartnerSearchReadProvider(),
+    throwOnSearchError = false,
+  }: GetPartnersOptions = {},
+) {
   const {
     page = 1,
     pageSize,
@@ -24,53 +38,119 @@ export async function getPartners(filters: PartnerFilters) {
     ...enrollmentRest
   } = filters;
 
-  const partners = await prisma.programEnrollment.findMany({
-    where: buildProgramEnrollmentWhereForList({
-      ...enrollmentRest,
-      programId,
-    }),
-    include: {
-      partner: {
-        include: {
-          programPartnerTags: {
+  const candidateQuery = searchProvider
+    ? await resolvePartnerSearchCandidateQuery(filters)
+    : null;
+  const candidateResult =
+    searchProvider && candidateQuery
+      ? await findPartnerSearchCandidates(searchProvider, candidateQuery, {
+          throwOnError: throwOnSearchError,
+        })
+      : null;
+  const databaseSortBy = sortBy === "relevance" ? "totalSaleAmount" : sortBy;
+  const relevanceHits =
+    candidateResult && sortBy === "relevance" ? candidateResult.hits : null;
+  const enrollmentWhere = buildProgramEnrollmentWhereForList({
+    ...enrollmentRest,
+    programId,
+    ...(candidateResult ? { search: undefined } : {}),
+  });
+
+  // The candidate IDs already carry the provider's ranking, but the database
+  // still has to apply every other filter, so they narrow the query rather than
+  // define the result. See PARTNER_SEARCH_CANDIDATE_LIMIT for what that costs.
+  const candidateWhere: Prisma.ProgramEnrollmentWhereInput = {
+    ...enrollmentWhere,
+    ...(candidateResult
+      ? { id: { in: candidateResult.hits.map(({ id }) => id) } }
+      : {}),
+  };
+
+  const include = {
+    partner: {
+      include: {
+        platforms: true,
+      },
+    },
+    programPartnerTags: {
+      // Deleted tags have a null programId until background cleanup removes their associations.
+      where: {
+        partnerTag: {
+          programId,
+        },
+      },
+      include: {
+        partnerTag: true,
+      },
+    },
+    links: true,
+    ...(includeGroup
+      ? {
+          partnerGroup: {
+            select: {
+              name: true,
+            },
+          },
+        }
+      : {}),
+  } satisfies Prisma.ProgramEnrollmentInclude;
+
+  let partners: Prisma.ProgramEnrollmentGetPayload<{
+    include: typeof include;
+  }>[];
+
+  if (relevanceHits) {
+    // Relevance order cannot be expressed in SQL, so the page has to be chosen
+    // in memory. Resolve which candidates survive the filters as bare IDs
+    // first, because hydrating all of them to show one page costs ~330ms at the
+    // candidate limit against ~4ms for the page alone.
+    const matches = await prisma.programEnrollment.findMany({
+      where: candidateWhere,
+      select: { id: true },
+    });
+
+    const pageIds = orderByPartnerSearchHits(matches, relevanceHits)
+      .slice((page - 1) * pageSize, page * pageSize)
+      .map(({ id }) => id);
+
+    const pageEnrollments =
+      pageIds.length > 0
+        ? await prisma.programEnrollment.findMany({
             where: {
               programId,
+              id: { in: pageIds },
             },
-            include: {
-              partnerTag: true,
-            },
-          },
-          platforms: true,
-        },
+            include,
+          })
+        : [];
+
+    partners = orderByPartnerSearchHits(pageEnrollments, relevanceHits);
+  } else {
+    partners = await prisma.programEnrollment.findMany({
+      where: candidateWhere,
+      include,
+      take: pageSize,
+      skip: (page - 1) * pageSize,
+      orderBy: {
+        [databaseSortBy]: sortOrder,
       },
-      links: true,
-      ...(includeGroup
-        ? {
-            partnerGroup: {
-              select: {
-                name: true,
-              },
-            },
-          }
-        : {}),
-    },
-    take: pageSize,
-    skip: (page - 1) * pageSize,
-    orderBy: {
-      [sortBy]: sortOrder,
-    },
-  });
+    });
+  }
 
   return partners.map(
-    ({ partner, links, partnerGroup, ...programEnrollment }) => ({
+    ({
+      partner,
+      links,
+      partnerGroup,
+      programPartnerTags,
+      ...programEnrollment
+    }) => ({
       ...partner,
       ...programEnrollment,
       id: partner.id,
       createdAt: new Date(programEnrollment.createdAt),
       ...(includeGroup && { group: partnerGroup }),
-      tags: partner.programPartnerTags
-        .map(({ partnerTag }) => partnerTag)
-        .filter((t) => t.programId != null && t.programId === programId),
+      tags: programPartnerTags.map(({ partnerTag }) => partnerTag),
       links,
       netRevenue:
         toCentsNumber(programEnrollment.totalSaleAmount ?? 0) -
diff --git a/apps/web/lib/api/partners/get-reward-or-throw.ts b/apps/web/lib/api/partners/get-reward-or-throw.ts
index f7ddc1c5896..577e1eb6fa0 100644
--- a/apps/web/lib/api/partners/get-reward-or-throw.ts
+++ b/apps/web/lib/api/partners/get-reward-or-throw.ts
@@ -1,18 +1,21 @@
 import { prisma } from "@/lib/prisma";
-import { RewardSchema } from "@/lib/zod/schemas/rewards";
+import { Prisma } from "@prisma/client";
 import { DubApiError } from "../errors";
 
-export async function getRewardOrThrow({
+export async function getRewardOrThrow<T extends Prisma.RewardInclude = {}>({
   rewardId,
   programId,
+  include,
 }: {
   rewardId: string;
   programId: string;
-}) {
+  include?: T;
+}): Promise<Prisma.RewardGetPayload<{ include: T }>> {
   const reward = await prisma.reward.findUnique({
     where: {
       id: rewardId,
     },
+    include,
   });
 
   if (!reward) {
@@ -29,5 +32,5 @@ export async function getRewardOrThrow({
     });
   }
 
-  return RewardSchema.parse(reward);
+  return reward as Prisma.RewardGetPayload<{ include: T }>;
 }
diff --git a/apps/web/lib/api/partners/notify-partner-group-change.ts b/apps/web/lib/api/partners/notify-partner-group-change.ts
index f202068025b..ad507e87fab 100644
--- a/apps/web/lib/api/partners/notify-partner-group-change.ts
+++ b/apps/web/lib/api/partners/notify-partner-group-change.ts
@@ -7,6 +7,7 @@ interface NotifyPartnerGroupChangeParams {
   programId: string;
   groupId: string;
   partnerIds: string[];
+  idempotencyKey?: string;
 }
 
 // Send email to partners when they are moved to a new group
@@ -14,6 +15,7 @@ export async function notifyPartnerGroupChange({
   programId,
   groupId,
   partnerIds,
+  idempotencyKey,
 }: NotifyPartnerGroupChangeParams) {
   if (partnerIds.length === 0) {
     return;
@@ -58,5 +60,6 @@ export async function notifyPartnerGroupChange({
         bounties,
       },
     })),
+    idempotencyKey ? { idempotencyKey } : undefined,
   );
 }
diff --git a/apps/web/lib/api/partners/notify-partner-reward-change.ts b/apps/web/lib/api/partners/notify-partner-reward-change.ts
index d8c1e5ae4f5..fad2d16275a 100644
--- a/apps/web/lib/api/partners/notify-partner-reward-change.ts
+++ b/apps/web/lib/api/partners/notify-partner-reward-change.ts
@@ -1,14 +1,20 @@
+import { serializeReward } from "@/lib/api/partners/serialize-reward";
 import type { RewardJob } from "@/lib/api/rewards/queue-reward-processing";
+import type { EnrollmentRewardIds } from "@/lib/api/rewards/reward-overrides";
 import { queueBatchEmail } from "@/lib/email/queue-batch-email";
+import { prisma } from "@/lib/prisma";
 import { RewardProps } from "@/lib/types";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
 import type PartnerRewardUpdated from "@dub/email/templates/partner-reward-updated";
 import { Program, Reward, User } from "@prisma/client";
+import { getPartnerUsers } from "./get-partner-users";
 
 const REWARD_ICONS: Record<RewardProps["event"], string> = {
   click: "https://assets.dub.co/email-assets/icons/cursor-rays.png",
   lead: "https://assets.dub.co/email-assets/icons/user-plus.png",
   sale: "https://assets.dub.co/email-assets/icons/invoice-dollar.png",
   referral: "https://assets.dub.co/email-assets/icons/nodes-4.png",
+  custom: "https://assets.dub.co/cms/icon-calendar-bounty.png",
 };
 
 interface NotifyPartnerRewardChangeParams {
@@ -18,7 +24,7 @@ interface NotifyPartnerRewardChangeParams {
   rewardSnapshot: { description: string; activityDescription?: string };
   effectiveAt: Date | string;
   users: Pick<User, "name" | "email">[];
-  idempotencyKey: string;
+  idempotencyKey?: string;
 }
 
 export async function notifyPartnerRewardChange({
@@ -30,6 +36,12 @@ export async function notifyPartnerRewardChange({
   users,
   idempotencyKey,
 }: NotifyPartnerRewardChangeParams) {
+  // TODO: Remove after Aug 24
+  if (program.id === "prog_1JWVR53QX1NM7NDEK62E3J19H") {
+    console.log("Skipping notification for program", program.id);
+    return;
+  }
+
   const usersWithEmail = users.filter(
     (user): user is Pick<User, "name"> & { email: string } =>
       user.email !== null,
@@ -65,8 +77,84 @@ export async function notifyPartnerRewardChange({
         action,
       },
     })),
-    {
-      idempotencyKey,
-    },
+    idempotencyKey ? { idempotencyKey } : undefined,
   );
 }
+
+type OverrideRewardIds = Pick<
+  EnrollmentRewardIds,
+  "clickRewardId" | "leadRewardId" | "saleRewardId"
+>;
+
+export async function notifyPartnerRewardOverride({
+  programId,
+  partnerId,
+  previous,
+  next,
+  groupRewardIds,
+  activityDescription,
+}: {
+  programId: string;
+  partnerId: string;
+  previous: OverrideRewardIds;
+  next: OverrideRewardIds;
+  groupRewardIds?: OverrideRewardIds;
+  activityDescription?: string;
+}) {
+  const rewardId = (
+    ["clickRewardId", "leadRewardId", "saleRewardId"] as const
+  ).reduce<string | null>((found, field) => {
+    if (found || previous[field] === next[field]) {
+      return found;
+    }
+
+    return next[field] ?? groupRewardIds?.[field] ?? null;
+  }, null);
+
+  if (!rewardId) {
+    return;
+  }
+
+  const [program, reward, partnerUsers] = await Promise.all([
+    prisma.program.findUnique({
+      where: {
+        id: programId,
+      },
+      select: {
+        id: true,
+        name: true,
+        logo: true,
+        slug: true,
+        supportEmail: true,
+      },
+    }),
+
+    prisma.reward.findUnique({
+      where: {
+        id: rewardId,
+      },
+    }),
+
+    getPartnerUsers({
+      partnerIds: [partnerId],
+    }),
+  ]);
+
+  if (!program || !reward || partnerUsers.length === 0) {
+    return;
+  }
+
+  await notifyPartnerRewardChange({
+    action: "reward-updated",
+    program,
+    reward,
+    rewardSnapshot: {
+      description: formatRewardDescription(serializeReward(reward), {
+        includeEarnPrefix: false,
+      }),
+      activityDescription,
+    },
+    effectiveAt: new Date(),
+    users: partnerUsers.map(({ user }) => user),
+  });
+}
diff --git a/apps/web/lib/api/partners/process-partner-deactivation.ts b/apps/web/lib/api/partners/process-partner-deactivation.ts
index 87473a8b3be..71c5aee82c5 100644
--- a/apps/web/lib/api/partners/process-partner-deactivation.ts
+++ b/apps/web/lib/api/partners/process-partner-deactivation.ts
@@ -5,6 +5,7 @@ import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { Partner, ProgramEnrollmentStatus } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import { trackActivityLog } from "../activity-log/track-activity-log";
+import { queuePartnerSearchSync } from "./queue-partner-search-sync";
 
 interface ProcessPartnerDeactivationParams {
   workspaceId: string;
@@ -61,6 +62,7 @@ export async function processPartnerDeactivation({
         leadRewardId: null,
         saleRewardId: null,
         referralRewardId: null,
+        customRewardId: null,
         discountId: null,
       },
     });
@@ -90,6 +92,9 @@ export async function processPartnerDeactivation({
     },
   );
 
+  // Queue an index update because the enrollment statuses moved to deactivated.
+  waitUntil(queuePartnerSearchSync({ partnerIds, programId }));
+
   if (user) {
     waitUntil(
       trackActivityLog(
diff --git a/apps/web/lib/api/partners/program-enrollment-query.ts b/apps/web/lib/api/partners/program-enrollment-query.ts
index adfc21f2b71..09dcddf4247 100644
--- a/apps/web/lib/api/partners/program-enrollment-query.ts
+++ b/apps/web/lib/api/partners/program-enrollment-query.ts
@@ -3,24 +3,46 @@ import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
 import { Prisma } from "@prisma/client";
 import * as z from "zod/v4";
 
+/**
+ * A complete address, not merely something containing "@". `steven@` is what a
+ * half-typed query looks like, and treating that as an exact lookup returns
+ * nothing instead of the partial matches the caller wanted.
+ *
+ * `@dub.co` fails this on purpose: it is a domain search, which the email index
+ * cannot serve (a trailing-wildcard match), so it belongs on the search path.
+ */
+export function isExactEmailQuery(query: string): boolean {
+  return /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/u.test(query);
+}
+
+/**
+ * A pasted partner ID, not a prefix of one. IDs are 24 or 25 characters after
+ * `pn_`, so a shorter suffix is someone typing, and matching it exactly would return nothing.
+ */
+export function isExactPartnerIdQuery(query: string): boolean {
+  return /^pn_[a-z0-9]{24,}$/iu.test(query);
+}
+
 /**
  * Email / search filters on `Partner` (exact email, exact partner ID, or full-text on email/name/company).
  */
 export function buildPartnerEmailSearchWhere({
   email,
-  search,
+  search: rawSearch,
 }: {
   email?: string | null;
   search?: string | null;
 }): Prisma.PartnerWhereInput {
+  const search = rawSearch?.trim();
+
   if (email) {
     return { email };
   }
   if (search) {
-    if (search.includes("@")) {
+    if (isExactEmailQuery(search)) {
       return { email: search };
     }
-    if (search.startsWith("pn_")) {
+    if (isExactPartnerIdQuery(search)) {
       return { id: search };
     }
     const q = sanitizeFullTextSearch(search);
@@ -215,6 +237,8 @@ export function buildProgramEnrollmentWhereForList(
     email,
     partnerTagId,
     referredByPartnerId,
+    rewardId,
+    discountId,
     partnerTagIdOperator = "IN",
     groupIdOperator = "IN",
     countryOperator = "IN",
@@ -263,6 +287,24 @@ export function buildProgramEnrollmentWhereForList(
     groupIdNotIn,
   );
 
+  const and: Prisma.ProgramEnrollmentWhereInput[] = [];
+
+  if (rewardId) {
+    and.push({
+      OR: [
+        { clickRewardId: rewardId },
+        { leadRewardId: rewardId },
+        { saleRewardId: rewardId },
+        { referralRewardId: rewardId },
+        { customRewardId: rewardId },
+      ],
+    });
+  }
+
+  if (Array.isArray(metricWhere.AND)) {
+    and.push(...metricWhere.AND);
+  }
+
   return {
     tenantId,
     programId,
@@ -279,6 +321,7 @@ export function buildProgramEnrollmentWhereForList(
         referredByPartnerId,
       },
     }),
-    ...metricWhere,
+    ...(discountId && { discountId }),
+    ...(and.length ? { AND: and } : {}),
   };
 }
diff --git a/apps/web/lib/api/partners/queue-partner-search-sync.ts b/apps/web/lib/api/partners/queue-partner-search-sync.ts
new file mode 100644
index 00000000000..b76109e6309
--- /dev/null
+++ b/apps/web/lib/api/partners/queue-partner-search-sync.ts
@@ -0,0 +1,125 @@
+import { partnerSearchSyncJob } from "@/lib/jobs/handlers/partner-search-sync-job";
+import { chunk, unique } from "@dub/utils";
+import {
+  getPartnerSearchProvider,
+  PARTNER_SEARCH_SYNC_BATCH_SIZE,
+} from "./search";
+
+/**
+ * How long a sync waits, so the mutation has committed before the job reads the
+ * row back.
+ *
+ * Not deduplicated by subject. QStash suppresses a repeated key for ten minutes
+ * from the first publish, not just while one is pending, so the second of two
+ * changes in that window would be dropped rather than collapsed.
+ */
+export const PARTNER_SEARCH_SYNC_DELAY_SECONDS = 5;
+
+type PartnerSearchSyncPayload =
+  | { type: "enrollments"; enrollmentIds: string[] }
+  | { type: "partners"; partnerIds: string[]; programId?: string };
+
+interface QueuePartnerSearchSyncInput {
+  /**
+   * Enrollments the caller already has IDs for. The only shape that can express
+   * a deletion, since the job removes what it cannot read back.
+   */
+  enrollmentIds?: string[];
+  /**
+   * Partners whose change fans out to every enrollment they hold, unless
+   * `programId` narrows it to one.
+   */
+  partnerIds?: string[];
+  programId?: string;
+  delay?: number;
+}
+
+/**
+ * Queues an index sync for whatever the caller just changed.
+ *
+ * Never throws, so a queue error cannot fail the source mutation. A failed
+ * QStash publish falls back to the jobs outbox, so this catch only fires when
+ * even that persist fails, and the sync is lost.
+ */
+export async function queuePartnerSearchSync({
+  enrollmentIds,
+  partnerIds,
+  programId,
+  delay = PARTNER_SEARCH_SYNC_DELAY_SECONDS,
+}: QueuePartnerSearchSyncInput) {
+  // Checked here as well as in the handler so an unconfigured environment does
+  // not pay for queueing work that would immediately no-op.
+  if (!getPartnerSearchProvider()) {
+    return;
+  }
+
+  const enrollments = unique(enrollmentIds?.filter(Boolean));
+  const partners = unique(partnerIds?.filter(Boolean));
+
+  if (enrollments.length === 0 && partners.length === 0) {
+    return;
+  }
+
+  const payloads: PartnerSearchSyncPayload[] = [
+    ...chunk(enrollments, PARTNER_SEARCH_SYNC_BATCH_SIZE).map((ids) => ({
+      type: "enrollments" as const,
+      enrollmentIds: ids,
+    })),
+    ...chunk(partners, PARTNER_SEARCH_SYNC_BATCH_SIZE).map((ids) => ({
+      type: "partners" as const,
+      partnerIds: ids,
+      ...(programId && { programId }),
+    })),
+  ];
+
+  try {
+    await partnerSearchSyncJob.dispatchBatch(payloads, () => ({ delay }));
+  } catch (error) {
+    console.error(
+      "[Partner Search] Failed to queue an index sync and the outbox could not persist it. The affected documents stay stale until their next sync.",
+      error,
+    );
+  }
+}
+
+interface PartnerSearchSyncLink {
+  programId: string | null;
+  partnerId: string | null;
+}
+
+/**
+ * Queues a sync for every partner whose links changed.
+ *
+ * A link reaches the document through its (programId, partnerId) pair, so this
+ * groups by program and queues one payload per program rather than one per
+ * link. Links carrying neither are ordinary workspace links and hold nothing
+ * the document indexes, which is why the bulk link helpers can call this
+ * unconditionally: an import of a hundred thousand workspace links queues
+ * nothing at all.
+ */
+export async function queuePartnerSearchSyncForLinks(
+  links: PartnerSearchSyncLink[],
+  { delay }: { delay?: number } = {},
+) {
+  const partnersByProgram = new Map<string, Set<string>>();
+
+  for (const { programId, partnerId } of links) {
+    if (!programId || !partnerId) {
+      continue;
+    }
+
+    const partners = partnersByProgram.get(programId) ?? new Set<string>();
+    partners.add(partnerId);
+    partnersByProgram.set(programId, partners);
+  }
+
+  await Promise.all(
+    Array.from(partnersByProgram, ([programId, partnerIds]) =>
+      queuePartnerSearchSync({
+        partnerIds: [...partnerIds],
+        programId,
+        ...(delay !== undefined && { delay }),
+      }),
+    ),
+  );
+}
diff --git a/apps/web/lib/api/partners/search/backfill.ts b/apps/web/lib/api/partners/search/backfill.ts
new file mode 100644
index 00000000000..311399febde
--- /dev/null
+++ b/apps/web/lib/api/partners/search/backfill.ts
@@ -0,0 +1,47 @@
+import {
+  indexPartnerSearchEnrollments,
+  type PartnerSearchIndexProgress,
+} from "./index-enrollments";
+import { getPartnerSearchProvider } from "./provider";
+import type { PartnerSearchProvider } from "./types";
+
+const DEFAULT_BATCH_SIZE = 500;
+
+export type PartnerSearchBackfillProgress = PartnerSearchIndexProgress;
+
+interface BackfillPartnerSearchOptions {
+  programId: string;
+  batchSize?: number;
+  after?: string;
+  searchProvider?: PartnerSearchProvider | null;
+  onProgress?: (progress: PartnerSearchBackfillProgress) => void;
+}
+
+export async function backfillPartnerSearch({
+  programId,
+  batchSize = DEFAULT_BATCH_SIZE,
+  after,
+  searchProvider = getPartnerSearchProvider(),
+  onProgress,
+}: BackfillPartnerSearchOptions) {
+  if (!searchProvider) {
+    throw new Error("Partner search provider is not configured.");
+  }
+
+  if (!Number.isSafeInteger(batchSize) || batchSize <= 0) {
+    throw new Error("Batch size must be a positive integer.");
+  }
+
+  const { processed, lastDocumentId } = await indexPartnerSearchEnrollments({
+    searchProvider,
+    where: { programId },
+    after,
+    batchSize,
+    onProgress,
+  });
+
+  return {
+    processed,
+    lastDocumentId,
+  };
+}
diff --git a/apps/web/lib/api/partners/search/build-search-query.ts b/apps/web/lib/api/partners/search/build-search-query.ts
new file mode 100644
index 00000000000..1a9453d4e4f
--- /dev/null
+++ b/apps/web/lib/api/partners/search/build-search-query.ts
@@ -0,0 +1,127 @@
+import { isExactPartnerIdQuery } from "@/lib/api/partners/program-enrollment-query";
+import { getPartnersQuerySchemaExtended } from "@/lib/zod/schemas/partners";
+import * as z from "zod/v4";
+import {
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  PartnerSearchCandidateFilter,
+  PartnerSearchCandidateQuery,
+} from "./types";
+
+export type PartnerSearchQueryInput = z.infer<
+  typeof getPartnersQuerySchemaExtended
+> & {
+  programId: string;
+  partnerTagIdOperator?: "IN" | "NOT IN";
+  groupIdOperator?: "IN" | "NOT IN";
+  countryOperator?: "IN" | "NOT IN";
+};
+
+type PartnerSearchCandidateQueryInput = Pick<
+  PartnerSearchQueryInput,
+  | "programId"
+  | "search"
+  | "email"
+  | "tenantId"
+  | "status"
+  | "groupId"
+  | "country"
+  | "partnerTagId"
+  | "groupIdOperator"
+  | "countryOperator"
+  | "partnerTagIdOperator"
+>;
+
+function toFilter(
+  value: string | string[] | undefined | null,
+  operator?: "IN" | "NOT IN",
+): PartnerSearchCandidateFilter | undefined {
+  const values = (Array.isArray(value) ? value : [value]).filter(
+    (entry): entry is string => Boolean(entry),
+  );
+
+  return values.length > 0
+    ? { values, exclude: operator === "NOT IN" }
+    : undefined;
+}
+
+export function buildPartnerSearchCandidateQuery({
+  programId,
+  search,
+  email,
+  tenantId,
+  status,
+  groupId,
+  country,
+  partnerTagId,
+  groupIdOperator,
+  countryOperator,
+  partnerTagIdOperator,
+}: PartnerSearchCandidateQueryInput): PartnerSearchCandidateQuery | null {
+  const query = search?.trim();
+
+  // Exact email and tenant lookups remain database-only. The search provider
+  // is responsible only for finding relevance-ranked free-text candidates.
+  //
+  // A pasted partner ID joins them, and unlike a complete email it needs no
+  // fallback: the provider indexes the ID as a plain token, so a miss there is
+  // the same miss the primary key already gave, without the round trip.
+  if (!query || email || tenantId || isExactPartnerIdQuery(query)) {
+    return null;
+  }
+
+  return {
+    programId,
+    query,
+    limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+    filters: {
+      status: toFilter(status),
+      groupId: toFilter(groupId, groupIdOperator),
+      country: toFilter(country, countryOperator),
+      partnerTagIds: toFilter(partnerTagId, partnerTagIdOperator),
+    },
+  };
+}
+
+/**
+ * A dotted host with an optional protocol, `www.`, and URL suffix. Plain words
+ * and email addresses do not match. This limits the program lookup to
+ * link-shaped search values.
+ */
+const LINK_SHAPED_QUERY =
+  /^(?:https?:\/\/)?(?:www\.)?([a-z0-9-]+(?:\.[a-z0-9-]+)+)([/?#]\S*)?$/i;
+
+export function isLinkShapedQuery(query: string): boolean {
+  return LINK_SHAPED_QUERY.test(query.trim());
+}
+
+/**
+ * Removes the program domain from a matching short link. The search index
+ * stores link keys, but it does not store link domains. Removing the domain
+ * prevents unrelated domain tokens from adding matches or changing result
+ * order. Other domains and bare domains are returned unchanged.
+ */
+export function stripProgramDomain(
+  query: string,
+  programDomain: string | null | undefined,
+): string {
+  const match = query.trim().match(LINK_SHAPED_QUERY);
+
+  if (!match || !programDomain) {
+    return query;
+  }
+
+  const [, host, rest = ""] = match;
+  const normalizedDomain = programDomain.toLowerCase().replace(/^www\./, "");
+
+  if (host.toLowerCase() !== normalizedDomain) {
+    return query;
+  }
+
+  // Query strings and fragments are never part of a key
+  const key = rest
+    .split(/[?#]/)[0]
+    .replace(/^\/+|\/+$/g, "")
+    .trim();
+
+  return key || query;
+}
diff --git a/apps/web/lib/api/partners/search/find-candidates.ts b/apps/web/lib/api/partners/search/find-candidates.ts
new file mode 100644
index 00000000000..0671a7619b0
--- /dev/null
+++ b/apps/web/lib/api/partners/search/find-candidates.ts
@@ -0,0 +1,59 @@
+import { isExactEmailQuery } from "@/lib/api/partners/program-enrollment-query";
+import { prisma } from "@/lib/prisma";
+import type {
+  PartnerSearchCandidateQuery,
+  PartnerSearchProvider,
+  PartnerSearchResult,
+} from "./types";
+
+interface FindPartnerSearchCandidatesOptions {
+  /**
+   * Surface provider failures instead of degrading. The benchmark needs this so
+   * a broken provider cannot be reported as a fast, error-free run.
+   */
+  throwOnError?: boolean;
+}
+
+/**
+ * Resolves relevance candidates, falling back to the database search path when
+ * the provider fails. Returning null here is what the callers already do when
+ * no provider is configured, so a provider outage costs relevance ranking and
+ * the wider field coverage rather than the entire partners list.
+ *
+ * A complete email address takes the same exit, but only once the database
+ * confirms it: `email` is unique and indexed, so the lookup is a point read
+ * against a network round trip. A miss still goes to the provider, because an
+ * address matching nothing exactly is usually one the caller is still typing,
+ * `steven@dub.co` on the way to `steven@dub.com`, and n-grams still match it.
+ */
+export async function findPartnerSearchCandidates(
+  searchProvider: PartnerSearchProvider,
+  query: PartnerSearchCandidateQuery,
+  { throwOnError = false }: FindPartnerSearchCandidatesOptions = {},
+): Promise<PartnerSearchResult | null> {
+  if (isExactEmailQuery(query.query)) {
+    const partner = await prisma.partner.findUnique({
+      where: { email: query.query },
+      select: { id: true },
+    });
+
+    if (partner) {
+      return null;
+    }
+  }
+
+  try {
+    return await searchProvider.searchCandidates(query);
+  } catch (error) {
+    if (throwOnError) {
+      throw error;
+    }
+
+    console.error(
+      "[Partner Search] Candidate lookup failed, falling back to the database search path.",
+      error,
+    );
+
+    return null;
+  }
+}
diff --git a/apps/web/lib/api/partners/search/index-enrollments.ts b/apps/web/lib/api/partners/search/index-enrollments.ts
new file mode 100644
index 00000000000..fa5478bcb01
--- /dev/null
+++ b/apps/web/lib/api/partners/search/index-enrollments.ts
@@ -0,0 +1,107 @@
+import { prisma } from "@/lib/prisma";
+import { Prisma } from "@prisma/client";
+import {
+  partnerSearchDocumentSelect,
+  serializePartnerSearchDocument,
+} from "./serialize-document";
+import type { PartnerSearchProvider } from "./types";
+
+export interface PartnerSearchIndexProgress {
+  batchSize: number;
+  processed: number;
+  lastDocumentId: string;
+}
+
+interface IndexPartnerSearchEnrollmentsOptions {
+  searchProvider: PartnerSearchProvider;
+  /**
+   * Narrows what gets indexed. Must not constrain `id`, which is reserved for
+   * the keyset cursor.
+   */
+  where?: Prisma.ProgramEnrollmentWhereInput;
+  after?: string;
+  batchSize: number;
+  /**
+   * Wall-clock budget, checked between batches, so a caller under a function
+   * timeout stops itself and resumes from the returned cursor. Runs to
+   * exhaustion when omitted.
+   */
+  timeBudgetMs?: number;
+  /** Injectable clock, so the budget is testable without real time passing. */
+  now?: () => number;
+  onProgress?: (progress: PartnerSearchIndexProgress) => void;
+}
+
+/**
+ * Pages enrollments by ID and writes them to the index. Keyset paging, so
+ * per-batch cost stays flat however deep the run gets.
+ *
+ * Upserts only. An ID absent from a range scan is indistinguishable from one
+ * that was never in range, so deletions are the call sites' responsibility.
+ */
+export async function indexPartnerSearchEnrollments({
+  searchProvider,
+  where,
+  after,
+  batchSize,
+  timeBudgetMs,
+  now = Date.now,
+  onProgress,
+}: IndexPartnerSearchEnrollmentsOptions) {
+  const startedAt = now();
+  let lastDocumentId = after;
+  let processed = 0;
+  let done = false;
+
+  while (true) {
+    const enrollments = await prisma.programEnrollment.findMany({
+      where: {
+        ...where,
+        ...(lastDocumentId && {
+          id: { gt: lastDocumentId },
+        }),
+      },
+      select: partnerSearchDocumentSelect,
+      orderBy: {
+        id: "asc",
+      },
+      take: batchSize,
+    });
+
+    if (enrollments.length === 0) {
+      done = true;
+      break;
+    }
+
+    await searchProvider.upsert(
+      enrollments.map(serializePartnerSearchDocument),
+    );
+
+    lastDocumentId = enrollments[enrollments.length - 1].id;
+    processed += enrollments.length;
+
+    onProgress?.({
+      batchSize: enrollments.length,
+      processed,
+      lastDocumentId,
+    });
+
+    // A short page means the range is exhausted.
+    if (enrollments.length < batchSize) {
+      done = true;
+      break;
+    }
+
+    // Checked after a batch, so a run always makes progress however tight the
+    // budget is. One batch can therefore overrun it, hence the caller headroom.
+    if (timeBudgetMs !== undefined && now() - startedAt >= timeBudgetMs) {
+      break;
+    }
+  }
+
+  return {
+    processed,
+    lastDocumentId: lastDocumentId ?? null,
+    done,
+  };
+}
diff --git a/apps/web/lib/api/partners/search/index.ts b/apps/web/lib/api/partners/search/index.ts
new file mode 100644
index 00000000000..fda2558bf49
--- /dev/null
+++ b/apps/web/lib/api/partners/search/index.ts
@@ -0,0 +1,11 @@
+export * from "./backfill";
+export * from "./build-search-query";
+export * from "./find-candidates";
+export * from "./index-enrollments";
+export * from "./order-search-results";
+export * from "./provider";
+export * from "./resolve-candidate-query";
+export * from "./searchable-values";
+export * from "./serialize-document";
+export * from "./sync";
+export * from "./types";
diff --git a/apps/web/lib/api/partners/search/order-search-results.ts b/apps/web/lib/api/partners/search/order-search-results.ts
new file mode 100644
index 00000000000..9c97c07d58e
--- /dev/null
+++ b/apps/web/lib/api/partners/search/order-search-results.ts
@@ -0,0 +1,13 @@
+import { PartnerSearchHit } from "./types";
+
+export function orderByPartnerSearchHits<T extends { id: string }>(
+  records: T[],
+  hits: PartnerSearchHit[],
+): T[] {
+  const recordsById = new Map(records.map((record) => [record.id, record]));
+
+  return hits.flatMap(({ id }) => {
+    const record = recordsById.get(id);
+    return record ? [record] : [];
+  });
+}
diff --git a/apps/web/lib/api/partners/search/provider.ts b/apps/web/lib/api/partners/search/provider.ts
new file mode 100644
index 00000000000..0935d384035
--- /dev/null
+++ b/apps/web/lib/api/partners/search/provider.ts
@@ -0,0 +1,39 @@
+import { createTurbopufferPartnerSearchProvider } from "./providers/turbopuffer";
+import type { PartnerSearchProvider } from "./types";
+
+// Built once per process. A fresh client per call would create a new HTTP
+// connection pool each time, paying a TLS handshake on every search.
+let cachedSearchProvider: PartnerSearchProvider | null = null;
+
+/**
+ * The provider for everything that writes: the sync jobs and the backfill.
+ * Null until turbopuffer is configured, which is what keeps this dark.
+ */
+export function getPartnerSearchProvider(): PartnerSearchProvider | null {
+  if (!process.env.TURBOPUFFER_API_KEY?.trim()) {
+    return null;
+  }
+
+  cachedSearchProvider ??= createTurbopufferPartnerSearchProvider();
+
+  return cachedSearchProvider;
+}
+
+/**
+ * Whether the partners list and count read from the index rather than the
+ * database.
+ *
+ * Separate from the key so that turning search off never turns indexing off,
+ * which would strand deletions.
+ *
+ * It also keeps reads off until the backfill finishes. An empty index does not
+ * fall back: an empty candidate list is applied as `id IN ()` once the database
+ * search predicate is cleared, so every query returns nothing.
+ */
+export function isPartnerSearchReadEnabled(): boolean {
+  return process.env.PARTNER_SEARCH_READ_ENABLED?.trim() === "true";
+}
+
+export function getPartnerSearchReadProvider(): PartnerSearchProvider | null {
+  return isPartnerSearchReadEnabled() ? getPartnerSearchProvider() : null;
+}
diff --git a/apps/web/lib/api/partners/search/providers/resilience.ts b/apps/web/lib/api/partners/search/providers/resilience.ts
new file mode 100644
index 00000000000..03b66821c51
--- /dev/null
+++ b/apps/web/lib/api/partners/search/providers/resilience.ts
@@ -0,0 +1,105 @@
+import { sleep } from "@dub/utils";
+import {
+  APIConnectionError,
+  APIConnectionTimeoutError,
+  APIError,
+} from "@turbopuffer/turbopuffer";
+
+const TRANSIENT_RETRY_ATTEMPTS = 2;
+
+function isTransientError(error: unknown): boolean {
+  // The SDK's errors carry the status code, so it is read rather than sniffed
+  // out of the message, where a stray "500" in an ID or a count would
+  // misclassify a permanent failure as transient.
+  if (error instanceof APIError) {
+    return (
+      error instanceof APIConnectionError ||
+      error.status === 429 ||
+      (typeof error.status === "number" && error.status >= 500)
+    );
+  }
+
+  const message = error instanceof Error ? error.message : String(error);
+
+  // fetch network failures surface as TypeError ("fetch failed"), but so do
+  // ordinary programming errors, and only the network ones deserve a retry.
+  if (error instanceof TypeError) {
+    const normalized = message.toLowerCase();
+    return (
+      normalized.includes("fetch failed") ||
+      normalized.includes("network") ||
+      normalized.includes("load failed")
+    );
+  }
+
+  return /timeout|timed out|fetch failed|network|ECONNRESET|ETIMEDOUT/i.test(
+    message,
+  );
+}
+
+function isTimeoutError(error: unknown): boolean {
+  if (error instanceof APIConnectionTimeoutError) {
+    return true;
+  }
+
+  const message = error instanceof Error ? error.message : String(error);
+  return /timeout|timed out|ETIMEDOUT/i.test(message);
+}
+
+export async function withTransientRetry<T>(
+  operation: () => Promise<T>,
+  { retryTimeouts = true }: { retryTimeouts?: boolean } = {},
+): Promise<T> {
+  for (let attempt = 1; attempt <= TRANSIENT_RETRY_ATTEMPTS; attempt++) {
+    try {
+      return await operation();
+    } catch (error) {
+      if (
+        attempt === TRANSIENT_RETRY_ATTEMPTS ||
+        !isTransientError(error) ||
+        (!retryTimeouts && isTimeoutError(error))
+      ) {
+        throw error;
+      }
+
+      await sleep(50 * attempt + Math.random() * 25);
+    }
+  }
+
+  throw new Error("Partner search operation failed.");
+}
+
+/**
+ * Rejects if `operation` has not settled within `timeoutMs`. The operation is
+ * not cancelled, because `Promise.race` cannot do that, so only pass work that
+ * settles on its own.
+ */
+async function withDeadline<T>(
+  operation: () => Promise<T>,
+  timeoutMs: number,
+  message: string,
+): Promise<T> {
+  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  const timeout = new Promise<never>((_, reject) => {
+    timeoutId = setTimeout(() => reject(new Error(message)), timeoutMs);
+  });
+
+  try {
+    return await Promise.race([operation(), timeout]);
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+
+export async function withQueryDeadline<T>(
+  operation: () => Promise<T>,
+  timeoutMs: number,
+): Promise<T> {
+  return withDeadline(
+    // A request timeout consumes nearly the full SLA budget, so only retry
+    // transient failures such as rate limits and 503s that return quickly.
+    () => withTransientRetry(operation, { retryTimeouts: false }),
+    timeoutMs,
+    `Partner search query timed out after ${timeoutMs}ms.`,
+  );
+}
diff --git a/apps/web/lib/api/partners/search/providers/shared.ts b/apps/web/lib/api/partners/search/providers/shared.ts
new file mode 100644
index 00000000000..ee010bc1dbc
--- /dev/null
+++ b/apps/web/lib/api/partners/search/providers/shared.ts
@@ -0,0 +1,44 @@
+import { normalizePartnerSearchQuery } from "../searchable-values";
+
+const NGRAM_SIZE = 3;
+
+/**
+ * Three-character tokens, which is what lets a partial email match without a
+ * leading-wildcard query.
+ */
+function toNgrams(value: string): string[] {
+  return Array.from(
+    new Set(
+      Array.from({ length: value.length - (NGRAM_SIZE - 1) }, (_, index) =>
+        value.slice(index, index + NGRAM_SIZE),
+      ),
+    ),
+  );
+}
+
+/** N-grams of an indexed email, as the space-separated field the document stores. */
+export function getEmailNgrams(email: string | null): string {
+  if (!email) {
+    return "";
+  }
+
+  const normalized = normalizePartnerSearchQuery(email);
+  if (normalized.length < NGRAM_SIZE) {
+    return normalized;
+  }
+
+  return toNgrams(normalized).join(" ");
+}
+
+/**
+ * N-grams of a search term, or none when the term cannot use the n-gram path.
+ * Multi-word queries are excluded because the stored field holds n-grams of a
+ * single address.
+ */
+export function getQueryNgrams(query: string): string[] {
+  if (query.length < NGRAM_SIZE || /\s/u.test(query)) {
+    return [];
+  }
+
+  return toNgrams(query);
+}
diff --git a/apps/web/lib/api/partners/search/providers/turbopuffer.ts b/apps/web/lib/api/partners/search/providers/turbopuffer.ts
new file mode 100644
index 00000000000..34a20d4d533
--- /dev/null
+++ b/apps/web/lib/api/partners/search/providers/turbopuffer.ts
@@ -0,0 +1,421 @@
+import { chunk } from "@dub/utils";
+import { Turbopuffer } from "@turbopuffer/turbopuffer";
+import {
+  getPartnerIdentityValues,
+  getPartnerSearchableValues,
+  normalizePartnerSearchQuery,
+} from "../searchable-values";
+import type {
+  PartnerSearchCandidateQuery,
+  PartnerSearchDocument,
+  PartnerSearchProvider,
+} from "../types";
+import { validatePartnerSearchCandidateLimit } from "../types";
+import { withQueryDeadline, withTransientRetry } from "./resilience";
+import { getEmailNgrams, getQueryNgrams } from "./shared";
+
+/**
+ * One namespace holding every program, scoped per query by a `programId`
+ * filter.
+ *
+ * Turbopuffer's idiomatic multi-tenancy is a namespace per tenant, which would
+ * make program isolation structural rather than filter-enforced. One shared
+ * namespace is used instead because Turbopuffer's latency is cache-dependent:
+ * traffic from every program keeps the single namespace warm, while per-program
+ * namespaces would leave rarely-searched programs paying the cold-start cost on
+ * most queries. The whole workload also fits one namespace comfortably (all
+ * programs together are ~1.6M enrollment documents).
+ *
+ * Bumped whenever the document shape changes, because turbopuffer keeps the
+ * schema a namespace was created with, and writing a new one does not migrate an
+ * existing namespace. A new version is backfilled alongside the old one and
+ * swapped in, rather than rebuilt in place.
+ */
+export const PARTNER_SEARCH_NAMESPACE = "partner-search-v4";
+const WRITE_BATCH_SIZE = 500;
+
+/**
+ * Below this, the counting aggregation is not worth attempting.
+ *
+ * The final token is a prefix, so a short one expands to every term beginning
+ * with it. Measured against 626K documents: one character takes the count from
+ * ~50ms to ~1.2s, past the query deadline on every attempt, and two characters
+ * are still 2-3x slower than three. The first keystrokes of a search fall back
+ * to the database count instead.
+ */
+const MIN_COUNT_PREFIX_LENGTH = 3;
+const QUERY_OPERATION_TIMEOUT_MS = 2_000;
+
+interface TurbopufferPartnerSearchRow extends Record<string, unknown> {
+  id: string;
+  programId: string;
+  searchText: string;
+  identityText: string;
+  emailNgrams: string;
+  status: string;
+  groupId?: string;
+  country?: string;
+  partnerTagIds: string[];
+}
+
+/**
+ * Pinned rather than left to default. Turbopuffer's newer tokenizers keep a URL
+ * as a single token, so `scottdigital` cannot match
+ * `https://www.scottdigital-42.techcorp.io`. Partner websites, short links, and
+ * destination URLs are all searchable fields here, and word_v2 splits
+ * URLs into their components while handling emails, handles, and hyphenated
+ * keys the same way the newer ones do.
+ *
+ * Changing this requires a full re-backfill: it changes how documents are
+ * tokenized at write time, so existing rows keep their old indexing.
+ */
+const SEARCH_TEXT_TOKENIZER = "word_v2";
+
+// No text attribute is filterable. The n-gram and all-terms branches narrow with
+// ContainsAllTokens, which reads the BM25 index rather than a filter index.
+// Marking them filterable would buy nothing and cost plenty: turbopuffer bills
+// an attribute per enabled index, so FTS + filterable is 200% of logical size.
+//
+// The scalar attributes are filterable so the provider narrows before it
+// truncates to `limit`, rather than leaving filters to run over an already
+// truncated list.
+const TURBOPUFFER_SCHEMA = {
+  programId: { type: "string", filterable: true },
+  status: { type: "string", filterable: true },
+  groupId: { type: "string", filterable: true },
+  country: { type: "string", filterable: true },
+  partnerTagIds: { type: "[]string", filterable: true },
+  searchText: {
+    type: "string",
+    full_text_search: { tokenizer: SEARCH_TEXT_TOKENIZER },
+  },
+  identityText: {
+    type: "string",
+    full_text_search: { tokenizer: SEARCH_TEXT_TOKENIZER },
+  },
+  emailNgrams: {
+    type: "string",
+    full_text_search: { tokenizer: SEARCH_TEXT_TOKENIZER },
+  },
+} as const;
+
+interface CreateTurbopufferPartnerSearchProviderOptions {
+  namespace?: TurbopufferNamespace;
+  namespaceName?: string;
+}
+
+/** The subset of the SDK namespace this provider uses, so tests can fake it. */
+export interface TurbopufferNamespace {
+  write(params: Record<string, unknown>): Promise<{ rows_affected: number }>;
+  multiQuery(params: Record<string, unknown>): Promise<{
+    results?: { rows?: { id: string | number; $dist?: number }[] }[];
+  }>;
+  query(params: Record<string, unknown>): Promise<{
+    aggregations?: Record<string, unknown>;
+  }>;
+  deleteAll(): Promise<unknown>;
+}
+
+function getNamespaceName(namespaceName?: string): string {
+  return namespaceName?.trim() || PARTNER_SEARCH_NAMESPACE;
+}
+
+function createNamespace(namespaceName: string): TurbopufferNamespace {
+  const apiKey = process.env.TURBOPUFFER_API_KEY;
+
+  if (!apiKey) {
+    throw new Error("TURBOPUFFER_API_KEY is required for partner search.");
+  }
+
+  const client = new Turbopuffer({
+    apiKey,
+    region: "aws-us-east-1",
+  });
+
+  return client.namespace(namespaceName) as unknown as TurbopufferNamespace;
+}
+
+function normalizeValues(values: string[]): string {
+  return values.map(normalizePartnerSearchQuery).join(" ");
+}
+
+function serializeTurbopufferRow(
+  document: PartnerSearchDocument,
+): TurbopufferPartnerSearchRow {
+  return {
+    id: document.id,
+    programId: document.programId,
+    searchText: normalizeValues(getPartnerSearchableValues(document)),
+    identityText: normalizeValues(getPartnerIdentityValues(document)),
+    emailNgrams: getEmailNgrams(document.email),
+    status: document.status,
+    // Omitted rather than stored null, which is what makes a NotIn filter match
+    // the partners that have no group or no country, the same rows the
+    // database includes when it ORs the negation with IS NULL.
+    ...(document.groupId ? { groupId: document.groupId } : {}),
+    ...(document.country ? { country: document.country } : {}),
+    partnerTagIds: document.partnerTagIds,
+  };
+}
+
+/** Turns the discrete filters into turbopuffer clauses. */
+function buildFilterClauses(
+  filters: PartnerSearchCandidateQuery["filters"],
+): unknown[] {
+  if (!filters) {
+    return [];
+  }
+
+  const clauses: unknown[] = [];
+
+  for (const [attribute, filter] of Object.entries(filters)) {
+    // An empty value list would become `In []`, which matches nothing and would
+    // silently empty the results rather than leaving them unfiltered.
+    if (!filter || filter.values.length === 0) {
+      continue;
+    }
+
+    const isArray = attribute === "partnerTagIds";
+    const operator = filter.exclude
+      ? isArray
+        ? "NotContainsAny"
+        : "NotIn"
+      : isArray
+        ? "ContainsAny"
+        : "In";
+
+    clauses.push([attribute, operator, filter.values]);
+  }
+
+  return clauses;
+}
+
+/**
+ * Each branch is ranked independently and rank-fused by the caller (see
+ * mergeBranchRows).
+ *
+ * Identity is searched separately from everything else because a single-token
+ * `last_as_prefix` query scores every match at exactly 1, so the broad branch
+ * cannot order its own results. Matching an identity field puts a document in
+ * two branches, which is what the fusion orders on.
+ *
+ * The all-terms branch requires every query word, which BM25 does not: term
+ * frequency saturates while length normalization keeps biting, so a partner
+ * matching both words can otherwise rank below one matching only the first. It
+ * runs on identityText so a full name is not out-weighted by a long description
+ * or a pile of links.
+ *
+ * The n-gram branch requires every trigram; BM25 alone scores a document that
+ * shares just one, which is how an unrelated address looks like a partial-email
+ * match.
+ */
+function buildQueryBranches(
+  programId: string,
+  query: string,
+  filters?: PartnerSearchCandidateQuery["filters"],
+) {
+  const scope = ["programId", "Eq", programId];
+  const filterClauses = buildFilterClauses(filters);
+  // Every branch carries the same scope, because a root-level clause beside the
+  // branches would not narrow them individually.
+  const programFilter =
+    filterClauses.length > 0 ? ["And", [scope, ...filterClauses]] : scope;
+  const branches: Record<string, unknown>[] = [
+    "searchText",
+    "identityText",
+  ].map((attribute) => ({
+    rank_by: [attribute, "BM25", query, { last_as_prefix: true }],
+    filters: programFilter,
+  }));
+
+  if (/\s/u.test(query)) {
+    branches.push({
+      rank_by: ["identityText", "BM25", query, { last_as_prefix: true }],
+      filters: [
+        "And",
+        [
+          programFilter,
+          // Prefix on the last token here too. Without it the branch needs an
+          // exact final token, so a half-typed "steven te" matches nothing and
+          // the boost disappears while the user is still typing.
+          [
+            "identityText",
+            "ContainsAllTokens",
+            query,
+            { last_as_prefix: true },
+          ],
+        ],
+      ],
+    });
+  }
+
+  const ngrams = getQueryNgrams(query).join(" ");
+  if (ngrams) {
+    branches.push({
+      rank_by: ["emailNgrams", "BM25", ngrams],
+      filters: [
+        "And",
+        [programFilter, ["emailNgrams", "ContainsAllTokens", ngrams]],
+      ],
+    });
+  }
+
+  return branches;
+}
+
+/**
+ * The same documents the ranked branches would return, as one filter.
+ *
+ * `identityText` holds a subset of what `searchText` holds, so a single
+ * ContainsAnyToken over `searchText` covers both text branches and the all-terms
+ * branch that narrows them. BM25 matches a document sharing any query token, and
+ * ContainsAnyToken is that same test without the scoring.
+ */
+function buildCountFilter(
+  programId: string,
+  query: string,
+  filters: PartnerSearchCandidateQuery["filters"],
+) {
+  const matchClauses: unknown[] = [
+    ["searchText", "ContainsAnyToken", query, { last_as_prefix: true }],
+  ];
+
+  const ngrams = getQueryNgrams(query).join(" ");
+  if (ngrams) {
+    matchClauses.push(["emailNgrams", "ContainsAllTokens", ngrams]);
+  }
+
+  return [
+    "And",
+    [
+      ["programId", "Eq", programId],
+      ...buildFilterClauses(filters),
+      ["Or", matchClauses],
+    ],
+  ];
+}
+
+// The standard reciprocal-rank-fusion constant: dampens the gap between
+// neighboring ranks so one branch's top result cannot drown out the other's.
+const RRF_RANK_CONSTANT = 60;
+
+/**
+ * Fuses the branches by rank (RRF) rather than by score. BM25 scores from
+ * different clauses are not comparable, because the n-gram branch sums over many
+ * trigram terms and runs numerically hotter than the text branch, but rank
+ * positions are. Each document scores Σ 1/(60 + rank) across the branches it
+ * appears in, so a document found by both branches receives a contribution
+ * from each, and the raw `$dist` values are deliberately unused. Relies on
+ * each branch's rows arriving in the server's relevance order.
+ */
+function mergeBranchRows(
+  branches: { rows?: { id: string | number; $dist?: number }[] }[],
+  limit: number,
+) {
+  const scoreById = new Map<string, number>();
+
+  for (const branch of branches) {
+    (branch.rows ?? []).forEach((row, index) => {
+      const id = String(row.id);
+      const contribution = 1 / (RRF_RANK_CONSTANT + index + 1);
+      scoreById.set(id, (scoreById.get(id) ?? 0) + contribution);
+    });
+  }
+
+  return Array.from(scoreById, ([id, score]) => ({ id, score }))
+    .sort(
+      (left, right) =>
+        right.score - left.score || left.id.localeCompare(right.id),
+    )
+    .slice(0, limit);
+}
+
+export async function deleteTurbopufferPartnerSearchNamespace({
+  namespace,
+  namespaceName,
+}: CreateTurbopufferPartnerSearchProviderOptions = {}) {
+  const resolvedNamespaceName = getNamespaceName(namespaceName);
+  const resolvedNamespace = namespace ?? createNamespace(resolvedNamespaceName);
+
+  await withTransientRetry(() => resolvedNamespace.deleteAll());
+
+  return { namespaceName: resolvedNamespaceName };
+}
+
+export function createTurbopufferPartnerSearchProvider({
+  namespace,
+  namespaceName,
+}: CreateTurbopufferPartnerSearchProviderOptions = {}): PartnerSearchProvider {
+  const resolvedNamespaceName = getNamespaceName(namespaceName);
+  const resolvedNamespace = namespace ?? createNamespace(resolvedNamespaceName);
+
+  return {
+    async searchCandidates({ programId, query, limit, filters }) {
+      validatePartnerSearchCandidateLimit(limit);
+
+      const normalizedQuery = normalizePartnerSearchQuery(query);
+      const branches = buildQueryBranches(
+        programId,
+        normalizedQuery,
+        filters,
+      ).map((branch) => ({
+        ...branch,
+        top_k: limit,
+        include_attributes: false,
+      }));
+
+      const { results } = await withQueryDeadline(
+        () => resolvedNamespace.multiQuery({ queries: branches }),
+        QUERY_OPERATION_TIMEOUT_MS,
+      );
+
+      const hits = mergeBranchRows(results ?? [], limit);
+
+      return { hits };
+    },
+
+    async countCandidates({ programId, query, filters }) {
+      const normalizedQuery = normalizePartnerSearchQuery(query);
+      const lastToken = normalizedQuery.split(/\s+/u).at(-1) ?? "";
+
+      if (lastToken.length < MIN_COUNT_PREFIX_LENGTH) {
+        return null;
+      }
+
+      const response = await withQueryDeadline(
+        () =>
+          resolvedNamespace.query({
+            filters: buildCountFilter(programId, normalizedQuery, filters),
+            aggregate_by: { total: ["Count"] },
+          }),
+        QUERY_OPERATION_TIMEOUT_MS,
+      );
+
+      const total = response.aggregations?.total;
+
+      // A missing aggregate means the response was not what we asked for.
+      // Reporting it as zero would render an unanswered count as an exact
+      // empty result.
+      return typeof total === "number" ? total : null;
+    },
+
+    async upsert(documents) {
+      for (const documentBatch of chunk(documents, WRITE_BATCH_SIZE)) {
+        await withTransientRetry(() =>
+          resolvedNamespace.write({
+            upsert_rows: documentBatch.map(serializeTurbopufferRow),
+            schema: TURBOPUFFER_SCHEMA,
+          }),
+        );
+      }
+    },
+
+    async delete(documentIds) {
+      for (const documentIdBatch of chunk(documentIds, WRITE_BATCH_SIZE)) {
+        await withTransientRetry(() =>
+          resolvedNamespace.write({ deletes: documentIdBatch }),
+        );
+      }
+    },
+  };
+}
diff --git a/apps/web/lib/api/partners/search/resolve-candidate-query.ts b/apps/web/lib/api/partners/search/resolve-candidate-query.ts
new file mode 100644
index 00000000000..829b3c766ae
--- /dev/null
+++ b/apps/web/lib/api/partners/search/resolve-candidate-query.ts
@@ -0,0 +1,32 @@
+import { prisma } from "@/lib/prisma";
+import {
+  buildPartnerSearchCandidateQuery,
+  isLinkShapedQuery,
+  stripProgramDomain,
+} from "./build-search-query";
+import type { PartnerSearchCandidateQuery } from "./types";
+
+/**
+ * Builds the candidate query and removes the program domain from a matching
+ * short link. Shared by the list and the count so both send the provider the
+ * same query.
+ */
+export async function resolvePartnerSearchCandidateQuery(
+  input: Parameters<typeof buildPartnerSearchCandidateQuery>[0],
+): Promise<PartnerSearchCandidateQuery | null> {
+  const candidateQuery = buildPartnerSearchCandidateQuery(input);
+
+  if (!candidateQuery || !isLinkShapedQuery(candidateQuery.query)) {
+    return candidateQuery;
+  }
+
+  const program = await prisma.program.findUnique({
+    where: { id: candidateQuery.programId },
+    select: { domain: true },
+  });
+
+  return {
+    ...candidateQuery,
+    query: stripProgramDomain(candidateQuery.query, program?.domain),
+  };
+}
diff --git a/apps/web/lib/api/partners/search/searchable-values.ts b/apps/web/lib/api/partners/search/searchable-values.ts
new file mode 100644
index 00000000000..1bb25536dca
--- /dev/null
+++ b/apps/web/lib/api/partners/search/searchable-values.ts
@@ -0,0 +1,40 @@
+import { PartnerSearchDocument } from "./types";
+
+/**
+ * Who the partner is: the fields someone types when they have a specific person
+ * in mind. Short and stable, so a provider can index them separately and score a
+ * name match against name length rather than against a document whose length is
+ * really a count of how many links the partner has.
+ */
+export function getPartnerIdentityValues(
+  document: PartnerSearchDocument,
+): string[] {
+  return [
+    document.partnerId,
+    document.tenantId,
+    document.name,
+    document.email,
+    document.companyName,
+  ].filter((value): value is string => Boolean(value));
+}
+
+/**
+ * Every value covered by the partner-search assignment. Providers can index
+ * these as separate weighted fields or as one normalized search field.
+ */
+export function getPartnerSearchableValues(
+  document: PartnerSearchDocument,
+): string[] {
+  return [
+    ...getPartnerIdentityValues(document),
+    document.description,
+    ...document.platformTypes,
+    ...document.platformIdentifiers,
+    ...document.linkKeys,
+  ].filter((value): value is string => Boolean(value));
+}
+
+export function normalizePartnerSearchQuery(query: string): string {
+  // Normalize equivalent Unicode characters for consistent matching.
+  return query.normalize("NFKC").trim().toLowerCase();
+}
diff --git a/apps/web/lib/api/partners/search/serialize-document.ts b/apps/web/lib/api/partners/search/serialize-document.ts
new file mode 100644
index 00000000000..ad384235eb9
--- /dev/null
+++ b/apps/web/lib/api/partners/search/serialize-document.ts
@@ -0,0 +1,69 @@
+import { unique } from "@dub/utils";
+import { Prisma } from "@prisma/client";
+import { PartnerSearchDocument } from "./types";
+
+export const partnerSearchDocumentSelect = {
+  id: true,
+  programId: true,
+  partnerId: true,
+  status: true,
+  tenantId: true,
+  groupId: true,
+  partner: {
+    select: {
+      name: true,
+      email: true,
+      companyName: true,
+      description: true,
+      country: true,
+      platforms: {
+        select: {
+          type: true,
+          identifier: true,
+        },
+      },
+    },
+  },
+  links: {
+    select: {
+      key: true,
+    },
+  },
+  programPartnerTags: {
+    select: {
+      partnerTagId: true,
+    },
+  },
+} satisfies Prisma.ProgramEnrollmentSelect;
+
+export type PartnerSearchDocumentSource = Prisma.ProgramEnrollmentGetPayload<{
+  select: typeof partnerSearchDocumentSelect;
+}>;
+
+export function serializePartnerSearchDocument(
+  enrollment: PartnerSearchDocumentSource,
+): PartnerSearchDocument {
+  const { partner, links, programPartnerTags } = enrollment;
+
+  return {
+    id: enrollment.id,
+    programId: enrollment.programId,
+    partnerId: enrollment.partnerId,
+    name: partner.name,
+    email: partner.email,
+    companyName: partner.companyName,
+    country: partner.country,
+    description: partner.description,
+    platformTypes: unique(partner.platforms.map(({ type }) => type)),
+    platformIdentifiers: unique(
+      partner.platforms.map(({ identifier }) => identifier),
+    ),
+    linkKeys: unique(links.map(({ key }) => key)),
+    status: enrollment.status,
+    tenantId: enrollment.tenantId,
+    groupId: enrollment.groupId,
+    partnerTagIds: unique(
+      programPartnerTags.map(({ partnerTagId }) => partnerTagId),
+    ),
+  };
+}
diff --git a/apps/web/lib/api/partners/search/sync.ts b/apps/web/lib/api/partners/search/sync.ts
new file mode 100644
index 00000000000..5d046ce84dd
--- /dev/null
+++ b/apps/web/lib/api/partners/search/sync.ts
@@ -0,0 +1,131 @@
+import { prisma } from "@/lib/prisma";
+import { unique } from "@dub/utils";
+import { getPartnerSearchProvider } from "./provider";
+import {
+  partnerSearchDocumentSelect,
+  serializePartnerSearchDocument,
+} from "./serialize-document";
+import type { PartnerSearchProvider } from "./types";
+
+/**
+ * How many enrollments one sync hydrates at a time. The provider chunks its own
+ * writes below this, so this bounds the database read, not the write.
+ */
+export const PARTNER_SEARCH_SYNC_BATCH_SIZE = 500;
+
+export interface PartnerSearchSyncResult {
+  upserted: number;
+  deleted: number;
+}
+
+interface SyncPartnerSearchDocumentsOptions {
+  enrollmentIds: string[];
+  searchProvider?: PartnerSearchProvider | null;
+}
+
+/**
+ * Brings the index in line with the database for the given enrollments.
+ *
+ * State is read here rather than passed in, so a delayed or replayed sync
+ * converges on current truth. That is also what makes deletes free: an ID the
+ * database no longer has is removed rather than treated as an error, so callers
+ * queue the same payload whether they edited or deleted.
+ */
+export async function syncPartnerSearchDocuments({
+  enrollmentIds,
+  searchProvider = getPartnerSearchProvider(),
+}: SyncPartnerSearchDocumentsOptions): Promise<PartnerSearchSyncResult> {
+  const ids = unique(enrollmentIds.filter(Boolean));
+
+  if (!searchProvider || ids.length === 0) {
+    return { upserted: 0, deleted: 0 };
+  }
+
+  const enrollments = await prisma.programEnrollment.findMany({
+    where: {
+      id: {
+        in: ids,
+      },
+    },
+    select: partnerSearchDocumentSelect,
+  });
+
+  const foundIds = new Set(enrollments.map(({ id }) => id));
+  const missingIds = ids.filter((id) => !foundIds.has(id));
+
+  if (enrollments.length > 0) {
+    await searchProvider.upsert(
+      enrollments.map(serializePartnerSearchDocument),
+    );
+  }
+
+  if (missingIds.length > 0) {
+    await searchProvider.delete(missingIds);
+  }
+
+  return {
+    upserted: enrollments.length,
+    deleted: missingIds.length,
+  };
+}
+
+interface SyncPartnersOptions {
+  partnerIds: string[];
+  programId?: string;
+  after?: string;
+  take?: number;
+  searchProvider?: PartnerSearchProvider | null;
+}
+
+export interface SyncPartnersResult {
+  upserted: number;
+  lastEnrollmentId: string | null;
+}
+
+/**
+ * One page of documents for the given partners, for changes that fan out
+ * beyond a single enrollment: a profile or platform edit touches every program
+ * the partner is in. Paged because that fan-out is unbounded. `programId`
+ * narrows it to one enrollment per partner.
+ *
+ * Upserts only. The rows come from the database, so there is nothing to delete.
+ */
+export async function syncPartnerEnrollments({
+  partnerIds,
+  programId,
+  after,
+  take = PARTNER_SEARCH_SYNC_BATCH_SIZE,
+  searchProvider = getPartnerSearchProvider(),
+}: SyncPartnersOptions): Promise<SyncPartnersResult> {
+  const ids = unique(partnerIds.filter(Boolean));
+
+  if (!searchProvider || ids.length === 0) {
+    return { upserted: 0, lastEnrollmentId: null };
+  }
+
+  const enrollments = await prisma.programEnrollment.findMany({
+    where: {
+      partnerId: {
+        in: ids,
+      },
+      ...(programId && { programId }),
+      ...(after && { id: { gt: after } }),
+    },
+    select: partnerSearchDocumentSelect,
+    orderBy: {
+      id: "asc",
+    },
+    take,
+  });
+
+  if (enrollments.length > 0) {
+    await searchProvider.upsert(
+      enrollments.map(serializePartnerSearchDocument),
+    );
+  }
+
+  return {
+    upserted: enrollments.length,
+    lastEnrollmentId: enrollments.at(-1)?.id ?? null,
+  };
+}
diff --git a/apps/web/lib/api/partners/search/types.ts b/apps/web/lib/api/partners/search/types.ts
new file mode 100644
index 00000000000..ed050caabee
--- /dev/null
+++ b/apps/web/lib/api/partners/search/types.ts
@@ -0,0 +1,115 @@
+import { PlatformType, ProgramEnrollmentStatus } from "@prisma/client";
+
+/**
+ * How many ranked enrollment IDs a provider may return for one query.
+ *
+ * Status, group, country, and tags are indexed as filterable attributes, so the
+ * provider applies them *before* this cut. The filters the document does not
+ * carry are applied by the database *after* it, over an already truncated list:
+ *
+ *   - tenant ID and explicit partner IDs
+ *   - the referral filter
+ *   - every metric range, deliberately absent from the document because
+ *     metrics move on each click and would churn it continuously
+ *
+ * A query still matching more than this after the provider's filters reports a
+ * floor rather than a total for the rows and the grouped facet counts. The
+ * ungrouped count is exact via `countCandidates`, falling back to a floor on
+ * database-only filters, short prefixes, or a failed aggregation. Raising the
+ * ceiling is paid on every query, in a larger `top_k` across each ranked
+ * branch, a longer `IN` list for the database, and more rows ordered in memory
+ * for a relevance sort.
+ */
+export const PARTNER_SEARCH_CANDIDATE_LIMIT = 999;
+
+export function validatePartnerSearchCandidateLimit(limit: number) {
+  if (
+    !Number.isSafeInteger(limit) ||
+    limit <= 0 ||
+    limit > PARTNER_SEARCH_CANDIDATE_LIMIT
+  ) {
+    throw new Error(
+      `Partner search candidate limit must be between 1 and ${PARTNER_SEARCH_CANDIDATE_LIMIT}.`,
+    );
+  }
+}
+
+/**
+ * Program enrollment data stored in the partner search index.
+ * The database remains the source of truth, so every field must be rebuildable.
+ */
+export interface PartnerSearchDocument {
+  id: string;
+  programId: string;
+  partnerId: string;
+
+  // Searchable partner profile fields (including tenant ID)
+  name: string;
+  email: string | null;
+  companyName: string | null;
+  description: string | null;
+  tenantId: string | null;
+
+  // Searchable platform fields
+  platformTypes: PlatformType[];
+  platformIdentifiers: string[];
+
+  // Searchable link field
+  linkKeys: string[];
+
+  // Filterable fields. Metrics are deliberately absent: they move on every click
+  // and conversion, so indexing them would make the document churn continuously.
+  status: ProgramEnrollmentStatus;
+  groupId: string | null;
+  country: string | null;
+  partnerTagIds: string[];
+}
+
+export interface PartnerSearchHit {
+  id: string;
+  score?: number;
+}
+
+export interface PartnerSearchResult {
+  hits: PartnerSearchHit[];
+}
+
+/**
+ * A discrete filter, plus whether the caller is excluding those values. Exclusion
+ * also matches partners that have no value at all, which is what the database
+ * does when it ORs the negation with IS NULL.
+ */
+export interface PartnerSearchCandidateFilter {
+  values: string[];
+  exclude?: boolean;
+}
+
+export interface PartnerSearchCandidateQuery {
+  programId: string;
+  query: string;
+  limit: number;
+  /**
+   * Applied by the provider before it truncates to `limit`. The database still
+   * re-applies every one of them, so the index only ever narrows the candidate
+   * pool, and it never decides the result on its own.
+   */
+  filters?: {
+    status?: PartnerSearchCandidateFilter;
+    groupId?: PartnerSearchCandidateFilter;
+    country?: PartnerSearchCandidateFilter;
+    partnerTagIds?: PartnerSearchCandidateFilter;
+  };
+}
+
+export interface PartnerSearchProvider {
+  searchCandidates(
+    query: PartnerSearchCandidateQuery,
+  ): Promise<PartnerSearchResult>;
+  /**
+   * How many documents match, ignoring `limit`. Null when the provider cannot
+   * answer cheaply, which the caller handles by counting another way.
+   */
+  countCandidates(query: PartnerSearchCandidateQuery): Promise<number | null>;
+  upsert(documents: PartnerSearchDocument[]): Promise<void>;
+  delete(documentIds: string[]): Promise<void>;
+}
diff --git a/apps/web/lib/api/partners/update-partner-link.ts b/apps/web/lib/api/partners/update-partner-link.ts
new file mode 100644
index 00000000000..0d536bb1e61
--- /dev/null
+++ b/apps/web/lib/api/partners/update-partner-link.ts
@@ -0,0 +1,216 @@
+import { trackLinkRewardOverrideLog } from "@/lib/api/activity-log/track-reward-overrides";
+import { DubApiError } from "@/lib/api/errors";
+import { linkCache } from "@/lib/api/links/cache";
+import { getLinkOrThrow } from "@/lib/api/links/get-link-or-throw";
+import { notifyPartnerRewardOverride } from "@/lib/api/partners/notify-partner-reward-change";
+import {
+  hasRewardAssignment,
+  hasRewardIdsInput,
+  pickDefinedRewardIds,
+  RewardOverrideIdsInput,
+  toPartnerLinkRewardIdFields,
+} from "@/lib/api/rewards/reward-overrides";
+import { throwIfInvalidRewards } from "@/lib/api/rewards/throw-if-invalid-rewards";
+import { syncDiscountCodes } from "@/lib/discounts/sync-discount-codes";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { prisma } from "@/lib/prisma";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
+import { WorkspaceProps } from "@/lib/types";
+import { updatePartnerLinkSchema } from "@/lib/zod/schemas/partners";
+import { waitUntil } from "@vercel/functions";
+import * as z from "zod/v4";
+
+type UpdatePartnerLinkParams = {
+  workspace: Pick<WorkspaceProps, "id" | "plan">;
+  programId: string;
+  linkId: string;
+  userId: string;
+  activityDescription?: z.infer<
+    typeof updatePartnerLinkSchema
+  >["activityDescription"];
+} & RewardOverrideIdsInput;
+
+export async function updatePartnerLink({
+  workspace,
+  programId,
+  linkId,
+  userId,
+  activityDescription,
+  ...body
+}: UpdatePartnerLinkParams) {
+  if (!hasRewardIdsInput(body)) {
+    throw new DubApiError({
+      code: "bad_request",
+      message:
+        "At least one of clickRewardId, leadRewardId, saleRewardId, or discountId must be provided.",
+    });
+  }
+
+  if (
+    hasRewardAssignment(body) &&
+    !getPlanCapabilities(workspace.plan).canUseAdvancedRewardLogic
+  ) {
+    throw new DubApiError({
+      code: "forbidden",
+      message: PARTNER_LEVEL_REWARDS_PLAN_ERROR,
+    });
+  }
+
+  const link = await getLinkOrThrow({
+    workspaceId: workspace.id,
+    linkId,
+  });
+
+  if (link.programId !== programId || !link.partnerId) {
+    throw new DubApiError({
+      code: "not_found",
+      message: "Partner link not found.",
+    });
+  }
+
+  const [existingLinkReward, programEnrollment] = await Promise.all([
+    prisma.linkReward.findUnique({
+      where: {
+        linkId: link.id,
+      },
+      select: {
+        clickRewardId: true,
+        leadRewardId: true,
+        saleRewardId: true,
+        discountId: true,
+      },
+    }),
+
+    prisma.programEnrollment.findUnique({
+      where: {
+        partnerId_programId: {
+          partnerId: link.partnerId,
+          programId,
+        },
+      },
+      select: {
+        groupId: true,
+        discountId: true,
+        groupMoveDisabledAt: true,
+        partnerGroup: {
+          select: {
+            clickRewardId: true,
+            leadRewardId: true,
+            saleRewardId: true,
+            discountId: true,
+          },
+        },
+      },
+    }),
+  ]);
+
+  if (!programEnrollment) {
+    throw new DubApiError({
+      code: "not_found",
+      message: "Partner not found.",
+    });
+  }
+
+  const { partnerGroup } = programEnrollment;
+
+  const linkRewardInput = pickDefinedRewardIds(body);
+
+  await throwIfInvalidRewards({
+    programId,
+    groupId: programEnrollment.groupId,
+    ...linkRewardInput,
+  });
+
+  const linkReward =
+    hasRewardAssignment(linkRewardInput) || existingLinkReward
+      ? await prisma.linkReward.upsert({
+          where: {
+            linkId: link.id,
+          },
+          create: {
+            linkId: link.id,
+            ...linkRewardInput,
+          },
+          update: {
+            ...linkRewardInput,
+          },
+        })
+      : null;
+
+  if (
+    hasRewardAssignment(linkRewardInput) &&
+    !programEnrollment.groupMoveDisabledAt
+  ) {
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: link.partnerId,
+          programId,
+        },
+      },
+      data: {
+        groupMoveDisabledAt: new Date(),
+      },
+    });
+  }
+
+  if (body.discountId !== undefined) {
+    await syncDiscountCodes({
+      programId,
+      partnerIds: [link.partnerId],
+    });
+  }
+
+  waitUntil(
+    Promise.allSettled([
+      linkCache.expireMany([link]),
+
+      trackLinkRewardOverrideLog({
+        workspaceId: workspace.id,
+        programId,
+        partnerId: link.partnerId,
+        userId,
+        description: activityDescription,
+        previous: {
+          clickRewardId: existingLinkReward?.clickRewardId ?? null,
+          leadRewardId: existingLinkReward?.leadRewardId ?? null,
+          saleRewardId: existingLinkReward?.saleRewardId ?? null,
+          discountId: existingLinkReward?.discountId ?? null,
+        },
+        next: {
+          clickRewardId: linkReward?.clickRewardId ?? null,
+          leadRewardId: linkReward?.leadRewardId ?? null,
+          saleRewardId: linkReward?.saleRewardId ?? null,
+          discountId: linkReward?.discountId ?? null,
+        },
+        link,
+      }),
+
+      notifyPartnerRewardOverride({
+        programId,
+        partnerId: link.partnerId,
+        previous: {
+          clickRewardId: existingLinkReward?.clickRewardId ?? null,
+          leadRewardId: existingLinkReward?.leadRewardId ?? null,
+          saleRewardId: existingLinkReward?.saleRewardId ?? null,
+        },
+        next: {
+          clickRewardId: linkReward?.clickRewardId ?? null,
+          leadRewardId: linkReward?.leadRewardId ?? null,
+          saleRewardId: linkReward?.saleRewardId ?? null,
+        },
+        groupRewardIds: {
+          clickRewardId: partnerGroup?.clickRewardId ?? null,
+          leadRewardId: partnerGroup?.leadRewardId ?? null,
+          saleRewardId: partnerGroup?.saleRewardId ?? null,
+        },
+        activityDescription,
+      }),
+    ]),
+  );
+
+  return {
+    ...link,
+    ...toPartnerLinkRewardIdFields(linkReward),
+  };
+}
diff --git a/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts b/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts
index 4b08f18e62f..f94057dee5e 100644
--- a/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts
+++ b/apps/web/lib/api/programs/get-program-enrollment-or-throw.ts
@@ -18,6 +18,7 @@ export async function getProgramEnrollmentOrThrow<
     ...include,
     links: include.links
       ? {
+          ...(typeof include.links === "object" ? include.links : {}),
           orderBy: {
             createdAt: "asc",
           },
diff --git a/apps/web/lib/api/programs/revalidate-program-public-pages.ts b/apps/web/lib/api/programs/revalidate-program-public-pages.ts
new file mode 100644
index 00000000000..ebc4a9ba143
--- /dev/null
+++ b/apps/web/lib/api/programs/revalidate-program-public-pages.ts
@@ -0,0 +1,41 @@
+import { prisma } from "@/lib/prisma";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { revalidatePath } from "next/cache";
+import { after } from "next/server";
+
+export function revalidateProgramPublicPages(programId: string) {
+  after(async () => {
+    const program = await prisma.program.findUniqueOrThrow({
+      where: { id: programId },
+      select: {
+        slug: true,
+        addedToMarketplaceAt: true,
+        groups: { select: { slug: true } },
+      },
+    });
+
+    const paths = [
+      `/partners.dub.co/${program.slug}`,
+      `/partners.dub.co/${program.slug}/apply`,
+      `/partners.dub.co/${program.slug}/apply/success`,
+      ...program.groups
+        .filter((group) => group.slug !== DEFAULT_PARTNER_GROUP.slug)
+        .flatMap((group) => [
+          `/partners.dub.co/${program.slug}/${group.slug}`,
+          `/partners.dub.co/${program.slug}/${group.slug}/apply`,
+          `/partners.dub.co/${program.slug}/${group.slug}/apply/success`,
+        ]),
+      ...(program.addedToMarketplaceAt
+        ? [`/partners.dub.co/marketplace/${program.slug}`]
+        : []),
+    ];
+
+    paths.forEach((path) => revalidatePath(path));
+  });
+}
+
+export function revalidateExternalMarketplacePages() {
+  after(() => {
+    revalidatePath("/app.dub.co/marketplace", "layout");
+  });
+}
diff --git a/apps/web/lib/api/rbac/permissions.ts b/apps/web/lib/api/rbac/permissions.ts
index dac3308cb4e..4718204a597 100644
--- a/apps/web/lib/api/rbac/permissions.ts
+++ b/apps/web/lib/api/rbac/permissions.ts
@@ -22,6 +22,10 @@ export const PERMISSION_ACTIONS = [
   "folders.write",
   "groups.write",
   "groups.read",
+  "partners.write",
+  "commissions.write",
+  "bounties.write",
+  "campaigns.write",
   "messages.read",
   "messages.write",
   "payouts.write",
@@ -150,6 +154,26 @@ export const ROLE_PERMISSIONS: {
     description: "manage groups",
     roles: ["owner", "member"],
   },
+  {
+    action: "partners.write",
+    description: "manage partners",
+    roles: ["owner", "member"],
+  },
+  {
+    action: "commissions.write",
+    description: "manage commissions",
+    roles: ["owner", "member"],
+  },
+  {
+    action: "bounties.write",
+    description: "manage bounties",
+    roles: ["owner", "member"],
+  },
+  {
+    action: "campaigns.write",
+    description: "manage campaigns",
+    roles: ["owner", "member"],
+  },
   {
     action: "messages.read",
     description: "access messages",
diff --git a/apps/web/lib/api/rewards/create-custom-reward-commissions.ts b/apps/web/lib/api/rewards/create-custom-reward-commissions.ts
new file mode 100644
index 00000000000..f4c76726db5
--- /dev/null
+++ b/apps/web/lib/api/rewards/create-custom-reward-commissions.ts
@@ -0,0 +1,190 @@
+import { dispatchWorkflows } from "@/lib/jobs/publish-workflows";
+import { prisma } from "@/lib/prisma";
+import { customRewardConfigSchema } from "@/lib/zod/schemas/rewards";
+import { pluck } from "@dub/utils";
+import {
+  CommissionType,
+  EventType,
+  ProgramEnrollmentStatus,
+} from "@prisma/client";
+import {
+  buildCommissionIdempotencyKey,
+  formatCommissionDescription,
+  hasRewardMaxDurationElapsed,
+  toUtcDateOnly,
+} from "./custom-reward-utils";
+
+const PAGE_SIZE = 100;
+
+export async function createCustomRewardCommissions({
+  rewardId,
+  periodDate,
+  startAfterPartnerId,
+}: {
+  rewardId: string;
+  periodDate: string;
+  startAfterPartnerId?: string;
+}) {
+  const reward = await prisma.reward.findUnique({
+    where: {
+      id: rewardId,
+    },
+    select: {
+      id: true,
+      programId: true,
+      event: true,
+      amountInCents: true,
+      maxDuration: true,
+      config: true,
+    },
+  });
+
+  if (!reward || reward.event !== EventType.custom || !reward.programId) {
+    console.info(
+      `[createCustomRewardCommissions] Reward ${rewardId} not found or not a custom reward. Skipping...`,
+    );
+    return {
+      nextCursor: null,
+    };
+  }
+
+  if (reward.amountInCents == null) {
+    console.info(
+      `[createCustomRewardCommissions] Reward ${rewardId} has no amountInCents. Skipping...`,
+    );
+    return {
+      nextCursor: null,
+    };
+  }
+
+  const parsedConfig = customRewardConfigSchema.safeParse(reward.config);
+
+  if (!parsedConfig.success) {
+    console.error(
+      `[createCustomRewardCommissions] Invalid config for reward ${rewardId}. Skipping...`,
+    );
+    return {
+      nextCursor: null,
+    };
+  }
+
+  const enrollments = await prisma.programEnrollment.findMany({
+    where: {
+      customRewardId: rewardId,
+      status: ProgramEnrollmentStatus.approved,
+      ...(startAfterPartnerId && {
+        partnerId: {
+          gt: startAfterPartnerId,
+        },
+      }),
+    },
+    select: {
+      partnerId: true,
+      programId: true,
+    },
+    orderBy: {
+      partnerId: "asc",
+    },
+    take: PAGE_SIZE,
+  });
+
+  if (enrollments.length === 0) {
+    return {
+      nextCursor: null,
+    };
+  }
+
+  const partnerIds = pluck(enrollments, "partnerId");
+  const firstCommissionAtByPartnerId = new Map<string, Date | null>();
+
+  // Batch-fetch each partner's earliest custom commission so we can enforce maxDuration
+  // without N+1 queries. Skip when maxDuration is unlimited (null).
+  if (reward.maxDuration != null) {
+    const firstCommissions = await prisma.commission.groupBy({
+      by: ["partnerId"],
+      where: {
+        programId: reward.programId,
+        partnerId: {
+          in: partnerIds,
+        },
+        rewardId: reward.id,
+        type: CommissionType.custom,
+      },
+      _min: {
+        createdAt: true,
+      },
+    });
+
+    for (const commission of firstCommissions) {
+      firstCommissionAtByPartnerId.set(
+        commission.partnerId,
+        commission._min.createdAt,
+      );
+    }
+  }
+
+  const description = formatCommissionDescription({
+    amountInCents: reward.amountInCents,
+    frequency: parsedConfig.data.frequency,
+    interval: parsedConfig.data.interval,
+    periodDate,
+  });
+
+  const eligibleEnrollments = enrollments.filter((enrollment) => {
+    const firstCommissionAt = firstCommissionAtByPartnerId.get(
+      enrollment.partnerId,
+    );
+
+    // Skip partners whose first custom commission is already maxDuration months ago.
+    // No first commission means they haven't started earning yet, so they're still eligible.
+    return !(
+      firstCommissionAt &&
+      hasRewardMaxDurationElapsed({
+        firstCommissionAt,
+        maxDuration: reward.maxDuration,
+        periodDate,
+      })
+    );
+  });
+
+  const jobs = eligibleEnrollments.map((enrollment) => {
+    const invoiceId = buildCommissionIdempotencyKey({
+      rewardId: reward.id,
+      partnerId: enrollment.partnerId,
+      periodDate,
+    });
+
+    return {
+      name: "create-partner-commission-workflow" as const,
+      payload: {
+        event: CommissionType.custom,
+        partnerId: enrollment.partnerId,
+        programId: enrollment.programId,
+        amount: reward.amountInCents,
+        quantity: 1,
+        rewardId: reward.id,
+        invoiceId,
+        description,
+        createdAt: toUtcDateOnly(periodDate),
+      },
+      options: {
+        label: enrollment.partnerId,
+        flowControl: {
+          key: "create-custom-reward-commissions",
+          parallelism: 10,
+        },
+      },
+    };
+  });
+
+  await dispatchWorkflows(jobs);
+
+  const nextCursor =
+    enrollments.length === PAGE_SIZE
+      ? enrollments[enrollments.length - 1].partnerId
+      : null;
+
+  return {
+    nextCursor,
+  };
+}
diff --git a/apps/web/lib/api/rewards/custom-reward-utils.ts b/apps/web/lib/api/rewards/custom-reward-utils.ts
new file mode 100644
index 00000000000..4b151a47191
--- /dev/null
+++ b/apps/web/lib/api/rewards/custom-reward-utils.ts
@@ -0,0 +1,189 @@
+import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
+import type { CustomRewardConfig } from "@/lib/types";
+import { CUSTOM_REWARD_CADENCE_PRESETS } from "@/lib/zod/schemas/rewards";
+import { tz } from "@date-fns/tz";
+import { pluralize } from "@dub/utils";
+import { EventType } from "@prisma/client";
+import { createHash } from "crypto";
+import {
+  differenceInCalendarDays,
+  differenceInCalendarMonths,
+  differenceInCalendarYears,
+  differenceInMonths,
+  format,
+} from "date-fns";
+
+export function isEventBasedReward<T extends { event: EventType }>(
+  reward: T,
+): reward is T & { event: Exclude<EventType, "custom"> } {
+  return reward.event !== EventType.custom;
+}
+
+export function toUtcDateOnly(date: Date | string): Date {
+  if (typeof date === "string") {
+    const [year, month, day] = date.split("-").map(Number);
+    return new Date(Date.UTC(year, month - 1, day));
+  }
+
+  return new Date(
+    Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()),
+  );
+}
+
+function formatUtcDate(date: Date): string {
+  const year = date.getUTCFullYear();
+  const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const day = String(date.getUTCDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
+export function getUtcPeriodDate(date: Date | string = new Date()): string {
+  return formatUtcDate(toUtcDateOnly(date));
+}
+
+export function isCustomRewardStartDateInPast(anchorDate: string): boolean {
+  return anchorDate < getUtcPeriodDate();
+}
+
+function daysInUtcMonth(year: number, monthIndex: number) {
+  return new Date(Date.UTC(year, monthIndex + 1, 0)).getUTCDate();
+}
+
+function expectedUtcDayOfMonth(anchor: Date, candidate: Date) {
+  const anchorDay = anchor.getUTCDate();
+  const daysInCandidateMonth = daysInUtcMonth(
+    candidate.getUTCFullYear(),
+    candidate.getUTCMonth(),
+  );
+  return Math.min(anchorDay, daysInCandidateMonth);
+}
+
+export function isCadenceDue(
+  config: CustomRewardConfig,
+  dateUTC: Date | string,
+): boolean {
+  const today = toUtcDateOnly(dateUTC);
+  const anchor = toUtcDateOnly(config.anchorDate);
+
+  if (today.getTime() < anchor.getTime()) {
+    return false;
+  }
+
+  const { frequency, interval } = config;
+
+  if (frequency === "day") {
+    const daysDiff = differenceInCalendarDays(today, anchor, { in: tz("UTC") });
+    return daysDiff % interval === 0;
+  }
+
+  if (frequency === "week") {
+    const daysDiff = differenceInCalendarDays(today, anchor, { in: tz("UTC") });
+    return daysDiff % (interval * 7) === 0;
+  }
+
+  if (frequency === "month") {
+    if (today.getUTCDate() !== expectedUtcDayOfMonth(anchor, today)) {
+      return false;
+    }
+
+    const monthsDiff = differenceInCalendarMonths(today, anchor, {
+      in: tz("UTC"),
+    });
+    return monthsDiff % interval === 0;
+  }
+
+  // year
+  if (
+    today.getUTCMonth() !== anchor.getUTCMonth() ||
+    today.getUTCDate() !== expectedUtcDayOfMonth(anchor, today)
+  ) {
+    return false;
+  }
+
+  const yearsDiff = differenceInCalendarYears(today, anchor, { in: tz("UTC") });
+  return yearsDiff % interval === 0;
+}
+
+const CADENCE_LABELS: Record<CustomRewardConfig["frequency"], string> = {
+  day: "daily",
+  week: "weekly",
+  month: "monthly",
+  year: "yearly",
+};
+
+export function formatCadenceLabel({
+  frequency,
+  interval,
+}: Pick<CustomRewardConfig, "frequency" | "interval">) {
+  const preset = CUSTOM_REWARD_CADENCE_PRESETS.find(
+    (p) => p.frequency === frequency && p.interval === interval,
+  );
+
+  if (preset) {
+    return preset.label.toLowerCase();
+  }
+
+  if (interval === 1) {
+    return CADENCE_LABELS[frequency];
+  }
+
+  return `every ${interval} ${pluralize(frequency, interval)}`;
+}
+
+export function formatCommissionDescription({
+  amountInCents,
+  frequency,
+  interval,
+  periodDate,
+}: Pick<CustomRewardConfig, "frequency" | "interval"> & {
+  amountInCents: number;
+  periodDate: string;
+}) {
+  const cadenceLabel = formatCadenceLabel({ frequency, interval });
+  const periodFormat =
+    frequency === "day" || frequency === "week" ? "MMM d, yyyy" : "MMM yyyy";
+  const periodLabel = format(toUtcDateOnly(periodDate), periodFormat, {
+    in: tz("UTC"),
+  });
+  const amountLabel = constructRewardAmount({
+    type: "flat",
+    amountInCents,
+    amountInPercentage: null,
+  });
+
+  return `${amountLabel} ${cadenceLabel} · ${periodLabel}`;
+}
+
+export function buildCommissionIdempotencyKey({
+  rewardId,
+  partnerId,
+  periodDate,
+}: {
+  rewardId: string;
+  partnerId: string;
+  periodDate: string;
+}) {
+  return createHash("sha256")
+    .update(`custom_${rewardId}_${partnerId}_${periodDate}`)
+    .digest("hex");
+}
+
+export function hasRewardMaxDurationElapsed({
+  firstCommissionAt,
+  maxDuration,
+  periodDate,
+}: {
+  firstCommissionAt: Date;
+  maxDuration: number | null | undefined;
+  periodDate: Date | string;
+}): boolean {
+  // null / undefined = infinite
+  if (maxDuration == null) {
+    return false;
+  }
+
+  const period = toUtcDateOnly(periodDate);
+  const first = toUtcDateOnly(firstCommissionAt);
+
+  return differenceInMonths(period, first, { in: tz("UTC") }) >= maxDuration;
+}
diff --git a/apps/web/lib/api/rewards/find-due-custom-rewards.ts b/apps/web/lib/api/rewards/find-due-custom-rewards.ts
new file mode 100644
index 00000000000..7a032bf0203
--- /dev/null
+++ b/apps/web/lib/api/rewards/find-due-custom-rewards.ts
@@ -0,0 +1,89 @@
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { prisma } from "@/lib/prisma";
+import type { CustomRewardConfig } from "@/lib/types";
+import { customRewardConfigSchema } from "@/lib/zod/schemas/rewards";
+import { EventType } from "@prisma/client";
+import { getUtcPeriodDate, isCadenceDue } from "./custom-reward-utils";
+
+export type DueCustomReward = {
+  id: string;
+  programId: string;
+  amountInCents: number;
+  maxDuration: number | null;
+  config: CustomRewardConfig;
+};
+
+export async function findDueCustomRewards({
+  periodDate = getUtcPeriodDate(),
+}: {
+  periodDate?: string;
+} = {}): Promise<DueCustomReward[]> {
+  const due: DueCustomReward[] = [];
+  let startAfterId: string | undefined;
+
+  while (true) {
+    const rewards = await prisma.reward.findMany({
+      where: {
+        event: EventType.custom,
+        programId: {
+          not: null,
+        },
+        ...(startAfterId && {
+          id: {
+            gt: startAfterId,
+          },
+        }),
+      },
+      select: {
+        id: true,
+        programId: true,
+        amountInCents: true,
+        maxDuration: true,
+        config: true,
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: CRON_BATCH_SIZE,
+    });
+
+    if (rewards.length === 0) {
+      break;
+    }
+
+    for (const reward of rewards) {
+      if (!reward.programId || reward.amountInCents == null) {
+        continue;
+      }
+
+      const parsedConfig = customRewardConfigSchema.safeParse(reward.config);
+
+      if (!parsedConfig.success) {
+        console.error(
+          `[findDueCustomRewards] Invalid config for reward ${reward.id}. Skipping...`,
+        );
+        continue;
+      }
+
+      if (!isCadenceDue(parsedConfig.data, periodDate)) {
+        continue;
+      }
+
+      due.push({
+        id: reward.id,
+        programId: reward.programId,
+        amountInCents: reward.amountInCents,
+        maxDuration: reward.maxDuration,
+        config: parsedConfig.data,
+      });
+    }
+
+    startAfterId = rewards[rewards.length - 1].id;
+
+    if (rewards.length < CRON_BATCH_SIZE) {
+      break;
+    }
+  }
+
+  return due;
+}
diff --git a/apps/web/lib/api/rewards/list-rewards.ts b/apps/web/lib/api/rewards/list-rewards.ts
new file mode 100644
index 00000000000..43451e8b4e6
--- /dev/null
+++ b/apps/web/lib/api/rewards/list-rewards.ts
@@ -0,0 +1,84 @@
+import { prisma } from "@/lib/prisma";
+import { RewardSchema } from "@/lib/zod/schemas/rewards";
+import { Prisma, type Reward } from "@prisma/client";
+import * as z from "zod/v4";
+
+export const getRewardsQuerySchema = z.object({
+  groupId: z.string().nullish(),
+});
+
+export const listRewardsResponseSchema = z.array(
+  RewardSchema.extend({
+    groupId: z.string().nullable(),
+    partnersCount: z.number(),
+  }),
+);
+
+type RewardRow = Reward & {
+  partnersCount: bigint | number;
+};
+
+// Lists program rewards (optionally filtered by group) with a partnersCount.
+export async function listRewards({
+  programId,
+  groupId,
+}: {
+  programId: string;
+  groupId?: string | null;
+}) {
+  const rewards = await prisma.$queryRaw<RewardRow[]>(Prisma.sql`
+    SELECT
+      r.id,
+      r.programId,
+      r.groupId,
+      r.description,
+      r.tooltipDescription,
+      r.event,
+      r.type,
+      r.amountInCents,
+      r.amountInPercentage,
+      r.maxDuration,
+      r.modifiers,
+      r.config,
+      r.spendLimitAmount,
+      r.spendLimitInterval,
+      r.createdAt,
+      r.updatedAt,
+      CASE r.event
+        WHEN 'click' THEN (
+          SELECT COUNT(*)
+          FROM ProgramEnrollment pe
+          WHERE pe.clickRewardId = r.id
+        )
+        WHEN 'lead' THEN (
+          SELECT COUNT(*)
+          FROM ProgramEnrollment pe
+          WHERE pe.leadRewardId = r.id
+        )
+        WHEN 'sale' THEN (
+          SELECT COUNT(*)
+          FROM ProgramEnrollment pe
+          WHERE pe.saleRewardId = r.id
+        )
+        WHEN 'referral' THEN (
+          SELECT COUNT(*)
+          FROM ProgramEnrollment pe
+          WHERE pe.referralRewardId = r.id
+        )
+        WHEN 'custom' THEN (
+          SELECT COUNT(*)
+          FROM ProgramEnrollment pe
+          WHERE pe.customRewardId = r.id
+        )
+      END AS partnersCount
+    FROM Reward r
+    WHERE r.programId = ${programId}
+      ${groupId ? Prisma.sql`AND r.groupId = ${groupId}` : Prisma.sql``}
+    ORDER BY r.event DESC, r.createdAt DESC
+  `);
+
+  return rewards.map((reward) => ({
+    ...reward,
+    partnersCount: Number(reward.partnersCount),
+  }));
+}
diff --git a/apps/web/lib/api/rewards/reward-overrides.ts b/apps/web/lib/api/rewards/reward-overrides.ts
new file mode 100644
index 00000000000..b23b5ea0c56
--- /dev/null
+++ b/apps/web/lib/api/rewards/reward-overrides.ts
@@ -0,0 +1,61 @@
+import { ProgramEnrollment } from "@prisma/client";
+
+export type RewardOverrideIds = Pick<
+  ProgramEnrollment,
+  "clickRewardId" | "leadRewardId" | "saleRewardId" | "discountId"
+>;
+
+export type RewardOverrideIdsInput = Partial<RewardOverrideIds>;
+export type EnrollmentRewardIds = RewardOverrideIds;
+export type EnrollmentRewardIdsInput = RewardOverrideIdsInput;
+export type LinkRewardIds = RewardOverrideIds;
+export type LinkRewardIdsInput = RewardOverrideIdsInput;
+
+export const REWARD_OVERRIDE_ID_KEYS = [
+  "clickRewardId",
+  "leadRewardId",
+  "saleRewardId",
+  "discountId",
+] as const;
+
+// Keep explicit ids, including the group default. Link-level null means inherit
+// from the partner, so a selected group default must be stored as that id.
+export const pickDefinedRewardIds = (
+  rewardIds: RewardOverrideIdsInput,
+): RewardOverrideIdsInput => {
+  const result: RewardOverrideIdsInput = {};
+
+  for (const key of REWARD_OVERRIDE_ID_KEYS) {
+    const value = rewardIds[key];
+    if (value === undefined) {
+      continue;
+    }
+
+    result[key] = value;
+  }
+
+  return result;
+};
+
+// Maps *RewardId / discountId fields to ProgramPartnerLinkSchemaInternal names.
+export const toPartnerLinkRewardIdFields = (
+  linkReward: RewardOverrideIdsInput | null | undefined,
+) => ({
+  clickReward: linkReward?.clickRewardId ?? null,
+  leadReward: linkReward?.leadRewardId ?? null,
+  saleReward: linkReward?.saleRewardId ?? null,
+  discount: linkReward?.discountId ?? null,
+});
+
+// True when any reward/discount field was sent, including explicit null clears.
+export const hasRewardIdsInput = (rewardIds: RewardOverrideIdsInput) => {
+  return REWARD_OVERRIDE_ID_KEYS.some((key) => rewardIds[key] !== undefined);
+};
+
+// True when any field assigns a non-null reward/discount id (not a clear).
+export const hasRewardAssignment = (rewardIds: RewardOverrideIdsInput) => {
+  return REWARD_OVERRIDE_ID_KEYS.some((key) => {
+    const id = rewardIds[key];
+    return id !== undefined && id !== null;
+  });
+};
diff --git a/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts b/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts
new file mode 100644
index 00000000000..c768a965e0b
--- /dev/null
+++ b/apps/web/lib/api/rewards/throw-if-invalid-rewards.ts
@@ -0,0 +1,168 @@
+import { DubApiError } from "@/lib/api/errors";
+import type { EnrollmentRewardIdsInput } from "@/lib/api/rewards/reward-overrides";
+import { prisma } from "@/lib/prisma";
+import { EventType } from "@prisma/client";
+
+const belongsToGroup = ({
+  groupId,
+  entityGroupId,
+  defaultGroupId,
+}: {
+  groupId: string;
+  entityGroupId: string | null;
+  defaultGroupId?: string | null;
+}) => entityGroupId === groupId || defaultGroupId === groupId;
+
+export async function throwIfInvalidRewards({
+  programId,
+  groupId,
+  clickRewardId,
+  leadRewardId,
+  saleRewardId,
+  discountId,
+}: {
+  programId: string;
+  groupId: string | null | undefined;
+} & EnrollmentRewardIdsInput) {
+  const assignments: {
+    id: string;
+    event: EventType;
+  }[] = [];
+
+  if (clickRewardId) {
+    assignments.push({
+      id: clickRewardId,
+      event: EventType.click,
+    });
+  }
+
+  if (leadRewardId) {
+    assignments.push({
+      id: leadRewardId,
+      event: EventType.lead,
+    });
+  }
+
+  if (saleRewardId) {
+    assignments.push({
+      id: saleRewardId,
+      event: EventType.sale,
+    });
+  }
+
+  if (assignments.length === 0 && !discountId) {
+    return;
+  }
+
+  if (!groupId) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "This partner is not part of a partner group.",
+    });
+  }
+
+  if (assignments.length > 0) {
+    const rewards = await prisma.reward.findMany({
+      where: {
+        id: {
+          in: assignments.map(({ id }) => id),
+        },
+        programId,
+      },
+      select: {
+        id: true,
+        event: true,
+        groupId: true,
+        clickPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        leadPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        salePartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    const rewardsById = new Map(rewards.map((reward) => [reward.id, reward]));
+
+    for (const assignment of assignments) {
+      const reward = rewardsById.get(assignment.id);
+
+      if (!reward) {
+        throw new DubApiError({
+          code: "not_found",
+          message: `Reward ${assignment.id} not found.`,
+        });
+      }
+
+      if (reward.event !== assignment.event) {
+        throw new DubApiError({
+          code: "unprocessable_entity",
+          message: `Reward ${assignment.id} is a ${reward.event} reward and cannot be assigned as a ${assignment.event} reward.`,
+        });
+      }
+
+      if (
+        !belongsToGroup({
+          groupId,
+          entityGroupId: reward.groupId,
+          defaultGroupId:
+            reward.clickPartnerGroup?.id ??
+            reward.leadPartnerGroup?.id ??
+            reward.salePartnerGroup?.id,
+        })
+      ) {
+        throw new DubApiError({
+          code: "unprocessable_entity",
+          message: `Reward ${assignment.id} does not belong to this partner's group.`,
+        });
+      }
+    }
+  }
+
+  if (discountId) {
+    const discount = await prisma.discount.findFirst({
+      where: {
+        id: discountId,
+        programId,
+      },
+      select: {
+        id: true,
+        groupId: true,
+        defaultForPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    if (!discount) {
+      throw new DubApiError({
+        code: "not_found",
+        message: `Discount ${discountId} not found.`,
+      });
+    }
+
+    if (
+      !belongsToGroup({
+        groupId,
+        entityGroupId: discount.groupId,
+        defaultGroupId: discount.defaultForPartnerGroup?.id,
+      })
+    ) {
+      throw new DubApiError({
+        code: "unprocessable_entity",
+        message: `Discount ${discountId} does not belong to this partner's group.`,
+      });
+    }
+  }
+}
diff --git a/apps/web/lib/api/rewards/validate-reward.ts b/apps/web/lib/api/rewards/validate-reward.ts
index 3e062ad4b63..b541672b3fe 100644
--- a/apps/web/lib/api/rewards/validate-reward.ts
+++ b/apps/web/lib/api/rewards/validate-reward.ts
@@ -4,11 +4,13 @@ import {
 } from "@/lib/partner-referrals/constants";
 import {
   createOrUpdateRewardSchema,
+  customRewardConfigSchema,
   referralRewardConfigSchema,
   rewardConditionsArraySchema,
 } from "@/lib/zod/schemas/rewards";
 import * as z from "zod/v4";
 import { DubApiError } from "../errors";
+import { isCustomRewardStartDateInPast } from "./custom-reward-utils";
 
 export function validateReward(
   reward: Partial<z.infer<typeof createOrUpdateRewardSchema>>,
@@ -37,6 +39,68 @@ export function validateReward(
     }
   }
 
+  if (reward.event === "custom") {
+    if (reward.type === "percentage") {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Percentage rewards are not allowed for custom events.",
+      });
+    }
+
+    if (reward.amountInCents == null) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "amountInCents must be provided for custom events.",
+      });
+    }
+
+    if (reward.amountInPercentage != null) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "amountInPercentage is not allowed for custom events.",
+      });
+    }
+
+    if (reward.modifiers != null) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Reward modifiers are not allowed for custom rewards.",
+      });
+    }
+
+    if (reward.spendLimitAmount != null || reward.spendLimitInterval != null) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Spend limits are not allowed for custom rewards.",
+      });
+    }
+
+    if (reward.maxDuration === 0) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "maxDuration cannot be 0 for custom rewards. Use a manual commission for one-off payments.",
+      });
+    }
+
+    const parsedConfig = customRewardConfigSchema.safeParse(reward.config);
+
+    if (!parsedConfig.success) {
+      throw new DubApiError({
+        code: "bad_request",
+        message:
+          "config must include frequency, interval, and anchorDate for custom rewards.",
+      });
+    }
+
+    if (isCustomRewardStartDateInPast(parsedConfig.data.anchorDate)) {
+      throw new DubApiError({
+        code: "bad_request",
+        message: "Start date cannot be in the past.",
+      });
+    }
+  }
+
   if (reward.event === "sale") {
     if (reward.amountInCents != null && reward.amountInPercentage != null) {
       throw new DubApiError({
diff --git a/apps/web/lib/api/sales/calculate-sale-earnings.ts b/apps/web/lib/api/sales/calculate-sale-earnings.ts
index b119674aceb..79a0d227a52 100644
--- a/apps/web/lib/api/sales/calculate-sale-earnings.ts
+++ b/apps/web/lib/api/sales/calculate-sale-earnings.ts
@@ -21,7 +21,7 @@ export const calculateSaleEarnings = ({
   if (reward.type === "flat") {
     return sale.quantity * amount;
   } else if (reward.type === "percentage") {
-    return sale.amount * (amount / 100);
+    return Math.round((sale.amount * amount) / 100);
   }
 
   return 0;
diff --git a/apps/web/lib/api/scrape-creators/schema.ts b/apps/web/lib/api/scrape-creators/schema.ts
index 8125409d023..532da3cc86d 100644
--- a/apps/web/lib/api/scrape-creators/schema.ts
+++ b/apps/web/lib/api/scrape-creators/schema.ts
@@ -1,5 +1,10 @@
 import * as z from "zod/v4";
 
+export const scrapedCountSchema = z
+  .number()
+  .nullish()
+  .transform((val) => Math.round(val ?? 0));
+
 export const socialProfileSchema = z.preprocess(
   (data: any) => {
     if (typeof data === "object" && data !== null) {
@@ -65,18 +70,9 @@ export const socialProfileSchema = z.preprocess(
       platform: z.literal("youtube"),
       description: z.string(),
       channelId: z.string(),
-      videoCount: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
-      subscriberCount: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
-      viewCount: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
+      videoCount: scrapedCountSchema,
+      subscriberCount: scrapedCountSchema,
+      viewCount: scrapedCountSchema,
       avatar: z.object({
         image: z.object({
           sources: z.array(
@@ -96,16 +92,10 @@ export const socialProfileSchema = z.preprocess(
         user: z.object({
           biography: z.string(),
           edge_followed_by: z.object({
-            count: z
-              .number()
-              .nullish()
-              .transform((val) => val ?? 0),
+            count: scrapedCountSchema,
           }),
           edge_owner_to_timeline_media: z.object({
-            count: z
-              .number()
-              .nullish()
-              .transform((val) => val ?? 0),
+            count: scrapedCountSchema,
           }),
           profile_pic_url: z.url().nullish().default(null),
         }),
@@ -121,18 +111,9 @@ export const socialProfileSchema = z.preprocess(
         avatarThumb: z.url().nullish().default(null),
       }),
       stats: z.object({
-        followerCount: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
-        videoCount: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
-        heartCount: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
+        followerCount: scrapedCountSchema,
+        videoCount: scrapedCountSchema,
+        heartCount: scrapedCountSchema,
       }),
     }),
 
@@ -141,14 +122,8 @@ export const socialProfileSchema = z.preprocess(
       rest_id: z.string(),
       legacy: z.object({
         description: z.string(),
-        followers_count: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
-        statuses_count: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
+        followers_count: scrapedCountSchema,
+        statuses_count: scrapedCountSchema,
       }),
       avatar: z.object({
         image_url: z.url().nullish().default(null),
@@ -211,14 +186,8 @@ export const socialContentSchema = z.preprocess(
         id: z.string(),
         handle: z.string(),
       }),
-      viewCountInt: z
-        .number()
-        .nullable()
-        .transform((val) => val ?? 0),
-      likeCountInt: z
-        .number()
-        .nullable()
-        .transform((val) => val ?? 0),
+      viewCountInt: scrapedCountSchema,
+      likeCountInt: scrapedCountSchema,
       title: z.string().nullish(),
       description: z.string().nullish(),
       thumbnailUrl: z.string().nullish(),
@@ -230,19 +199,10 @@ export const socialContentSchema = z.preprocess(
       owner: z.object({
         username: z.string(),
       }),
-      video_play_count: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
-      video_view_count: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
+      video_play_count: scrapedCountSchema,
+      video_view_count: scrapedCountSchema,
       edge_media_preview_like: z.object({
-        count: z
-          .number()
-          .nullable()
-          .transform((val) => val ?? 0),
+        count: scrapedCountSchema,
       }),
       edge_media_to_caption: z
         .object({
@@ -285,14 +245,11 @@ export const socialContentSchema = z.preprocess(
         count: z
           .string()
           .nullable()
-          .transform((val) => (val == null ? 0 : Number(val))),
+          .transform((val) => (val == null ? 0 : Math.round(Number(val)))),
       }),
       legacy: z.object({
         created_at: z.string(),
-        favorite_count: z
-          .number()
-          .nullable()
-          .transform((val) => val ?? 0),
+        favorite_count: scrapedCountSchema,
         full_text: z.string().optional(),
       }),
     }),
@@ -304,14 +261,8 @@ export const socialContentSchema = z.preprocess(
         unique_id: z.string(),
       }),
       statistics: z.object({
-        play_count: z
-          .number()
-          .nullable()
-          .transform((val) => val ?? 0),
-        digg_count: z
-          .number()
-          .nullable()
-          .transform((val) => val ?? 0),
+        play_count: scrapedCountSchema,
+        digg_count: scrapedCountSchema,
       }),
       desc: z.string().optional(),
       video: z
@@ -331,16 +282,10 @@ export const socialContentSchema = z.preprocess(
       description: z.string().nullish(),
       headline: z.string().nullish(),
       datePublished: z.string().nullish(),
-      likeCount: z
-        .number()
-        .nullish()
-        .transform((val) => val ?? 0),
+      likeCount: scrapedCountSchema,
       author: z.object({
         url: z.string(),
-        followers: z
-          .number()
-          .nullish()
-          .transform((val) => val ?? 0),
+        followers: scrapedCountSchema,
       }),
     }),
   ]),
diff --git a/apps/web/lib/api/tokens/scopes.ts b/apps/web/lib/api/tokens/scopes.ts
index bf9faf2f183..517a71addba 100644
--- a/apps/web/lib/api/tokens/scopes.ts
+++ b/apps/web/lib/api/tokens/scopes.ts
@@ -313,3 +313,70 @@ export const consolidateScopes = (scopes: string[]) => {
 
   return Array.from(consolidated) as string[];
 };
+
+const isScopeGrantedForRole = ({
+  scope,
+  role,
+}: {
+  scope: string;
+  role: WorkspaceRole;
+}) => {
+  const scopesForRole: string[] = getScopesForRole(role) ?? [];
+
+  return scope === "user.read" || scopesForRole.includes(scope);
+};
+
+// Scopes that can be granted for the given role (intersection with requested)
+export const getGrantedScopesForRole = ({
+  scopes,
+  role,
+}: {
+  scopes: string[];
+  role: WorkspaceRole;
+}) => {
+  return scopes.filter((scope) =>
+    isScopeGrantedForRole({
+      scope,
+      role,
+    }),
+  );
+};
+
+// Requested scopes the role cannot grant (raw intersection, same basis as grant)
+export const getMissingScopesForRole = ({
+  scopes,
+  role,
+}: {
+  scopes: string[];
+  role: WorkspaceRole;
+}) => {
+  return scopes.filter((scope) => !isScopeGrantedForRole({ scope, role }));
+};
+
+// Consent rows: consolidate granted and missing separately so a granted
+// `{resource}.read` is still shown when `{resource}.write` is denied.
+export const getDisplayedScopesForRole = ({
+  scopes,
+  role,
+}: {
+  scopes: string[];
+  role: WorkspaceRole;
+}) => {
+  const grantedScopes = consolidateScopes(
+    getGrantedScopesForRole({ scopes, role }),
+  );
+
+  const missingScopes = consolidateScopes(
+    getMissingScopesForRole({ scopes, role }),
+  );
+
+  const order = new Map(scopes.map((scope, index) => [scope, index]));
+
+  return [
+    ...grantedScopes.map((scope) => ({ scope, missing: false })),
+    ...missingScopes.map((scope) => ({ scope, missing: true })),
+  ].sort(
+    (a, b) =>
+      (order.get(a.scope) ?? Infinity) - (order.get(b.scope) ?? Infinity),
+  );
+};
diff --git a/apps/web/lib/api/utils/with-prisma-retry.ts b/apps/web/lib/api/utils/with-prisma-retry.ts
index 3ad9915527e..ba0b6f66b08 100644
--- a/apps/web/lib/api/utils/with-prisma-retry.ts
+++ b/apps/web/lib/api/utils/with-prisma-retry.ts
@@ -1,3 +1,4 @@
+import { sleep } from "@dub/utils";
 import { Prisma } from "@prisma/client";
 
 const DEFAULT_CONFIG = {
@@ -63,7 +64,7 @@ export async function withPrismaRetry<T>(
       );
 
       // Add delay before retrying
-      await new Promise((resolve) => setTimeout(resolve, delay));
+      await sleep(delay);
     }
   }
 
diff --git a/apps/web/lib/api/utm/apply-group-utm-to-link.ts b/apps/web/lib/api/utm/apply-group-utm-to-link.ts
new file mode 100644
index 00000000000..990577035c3
--- /dev/null
+++ b/apps/web/lib/api/utm/apply-group-utm-to-link.ts
@@ -0,0 +1,48 @@
+import { ProcessedLinkProps } from "@/lib/types";
+import { constructURLFromUTMParams } from "@dub/utils";
+import { UtmTemplate } from "@prisma/client";
+import { extractAndResolveUtmParams } from "./extract-and-resolve-utm-params";
+
+// Applies a group's UTM template to a processed partner link before createLink / updateLink
+export function applyGroupUtmToLink<T extends ProcessedLinkProps>({
+  link,
+  utmTemplate,
+  partnerName,
+}: {
+  link: T;
+  utmTemplate:
+    | Pick<
+        UtmTemplate,
+        | "utm_source"
+        | "utm_medium"
+        | "utm_campaign"
+        | "utm_term"
+        | "utm_content"
+        | "ref"
+      >
+    | null
+    | undefined;
+  partnerName?: string | null;
+}): T {
+  if (!utmTemplate) {
+    return link;
+  }
+
+  const utmContext = {
+    partnerName: partnerName || link.key,
+    partnerLinkKey: link.key,
+  };
+
+  const resolvedUtmParams = extractAndResolveUtmParams(utmTemplate, utmContext);
+  const resolvedUtmColumns = extractAndResolveUtmParams(
+    utmTemplate,
+    utmContext,
+    { excludeRef: true },
+  );
+
+  return {
+    ...link,
+    ...resolvedUtmColumns,
+    url: constructURLFromUTMParams(link.url, resolvedUtmParams),
+  };
+}
diff --git a/apps/web/lib/api/utm/extract-and-resolve-utm-params.ts b/apps/web/lib/api/utm/extract-and-resolve-utm-params.ts
new file mode 100644
index 00000000000..0a14dea2e33
--- /dev/null
+++ b/apps/web/lib/api/utm/extract-and-resolve-utm-params.ts
@@ -0,0 +1,31 @@
+import {
+  PartnerMacroContext,
+  resolvePartnerMacros,
+} from "@/lib/partners/macros";
+import { UTM_TAG_MAX_LENGTH } from "@/lib/zod/schemas/utm";
+import { extractUtmParams } from "./extract-utm-params";
+
+// Extracts UTM params from a template and resolves partner macros
+// (e.g. {{PARTNER_NAME}}, {{PARTNER_LINK_KEY}}) against the given context.
+export const extractAndResolveUtmParams = (
+  utmTemplate: Parameters<typeof extractUtmParams>[0],
+  context: PartnerMacroContext,
+  options?: Parameters<typeof extractUtmParams>[1],
+) => {
+  const params = extractUtmParams(utmTemplate, options);
+
+  return Object.fromEntries(
+    Object.entries(params).map(([key, value]) => {
+      if (value == null) {
+        return [key, value];
+      }
+
+      const resolved = resolvePartnerMacros(value, context).slice(
+        0,
+        UTM_TAG_MAX_LENGTH,
+      );
+
+      return [key, resolved];
+    }),
+  ) as ReturnType<typeof extractUtmParams>;
+};
diff --git a/apps/web/lib/api/workflows/move-group/execute.ts b/apps/web/lib/api/workflows/move-group/execute.ts
index 1174b41e5d2..6db8dfe6f1a 100644
--- a/apps/web/lib/api/workflows/move-group/execute.ts
+++ b/apps/web/lib/api/workflows/move-group/execute.ts
@@ -100,6 +100,7 @@ export const executeMoveGroupWorkflow = async ({
       leadRewardId: true,
       saleRewardId: true,
       referralRewardId: true,
+      customRewardId: true,
       discountId: true,
     },
   });
@@ -126,6 +127,7 @@ export const executeMoveGroupWorkflow = async ({
       partnerIds: [partnerId],
       userId: null,
       group: newGroup,
+      clearLinkRewardsSync: false,
     });
   } finally {
     await redis.del(lockKey);
diff --git a/apps/web/lib/api/workflows/send-campaign/execute.ts b/apps/web/lib/api/workflows/send-campaign/execute.ts
index 8a4d0c4e6ae..b168cf16c5a 100644
--- a/apps/web/lib/api/workflows/send-campaign/execute.ts
+++ b/apps/web/lib/api/workflows/send-campaign/execute.ts
@@ -4,6 +4,7 @@ import { resolveCampaignFromAddress } from "@/lib/email/parse-campaign-from-addr
 import { aggregatePartnerLinksStats } from "@/lib/partners/aggregate-partner-links-stats";
 import { prisma } from "@/lib/prisma";
 import { TiptapNode } from "@/lib/types";
+import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { WORKFLOW_ACTION_TYPES } from "@/lib/zod/schemas/workflows";
 import { sendBatchEmail } from "@dub/email";
 import CampaignEmail from "@dub/email/templates/campaign-email";
@@ -12,7 +13,6 @@ import {
   CommissionStatus,
   NotificationEmailType,
   Prisma,
-  ProgramEnrollmentStatus,
   Workflow,
 } from "@prisma/client";
 import { addHours, differenceInDays, subDays } from "date-fns";
@@ -326,7 +326,9 @@ function campaignAudienceWhere({
   partnerTagIds: string[];
 }) {
   return {
-    status: ProgramEnrollmentStatus.approved,
+    status: {
+      in: ACTIVE_ENROLLMENT_STATUSES,
+    },
     ...(groupIds.length > 0 && {
       groupId: {
         in: groupIds,
diff --git a/apps/web/lib/api/workspaces/delete-workspace.ts b/apps/web/lib/api/workspaces/delete-workspace.ts
index 9dcbf4f1336..bdfc715eab3 100644
--- a/apps/web/lib/api/workspaces/delete-workspace.ts
+++ b/apps/web/lib/api/workspaces/delete-workspace.ts
@@ -1,18 +1,10 @@
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import { WorkspaceProps } from "@/lib/types";
-import {
-  APP_DOMAIN_WITH_NGROK,
-  DUB_DOMAINS_ARRAY,
-  LEGAL_USER_ID,
-  LEGAL_WORKSPACE_ID,
-  prettyPrint,
-  R2_URL,
-} from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, prettyPrint, R2_URL } from "@dub/utils";
 import { waitUntil } from "@vercel/functions";
 import { qstash } from "../../cron";
 import { cancelSubscription } from "../../stripe/cancel-subscription";
-import { linkCache } from "../links/cache";
 
 export async function deleteWorkspace(
   workspace: Pick<WorkspaceProps, "id" | "slug" | "logo" | "stripeId">,
@@ -68,77 +60,3 @@ export async function deleteWorkspace(
     }),
   );
 }
-
-export async function deleteWorkspaceAdmin(
-  workspace: Pick<WorkspaceProps, "id" | "slug" | "logo" | "stripeId">,
-) {
-  while (true) {
-    const defaultDomainLinks = await prisma.link.findMany({
-      where: {
-        projectId: workspace.id,
-        domain: {
-          in: DUB_DOMAINS_ARRAY,
-        },
-      },
-      select: {
-        id: true,
-        domain: true,
-        key: true,
-      },
-      take: 100,
-    });
-
-    if (defaultDomainLinks.length === 0) {
-      break;
-    }
-
-    const [redisRes, prismaRes] = await Promise.allSettled([
-      linkCache.expireMany(defaultDomainLinks),
-      prisma.link.updateMany({
-        where: {
-          id: {
-            in: defaultDomainLinks.map((link) => link.id),
-          },
-        },
-        data: {
-          projectId: LEGAL_WORKSPACE_ID,
-          userId: LEGAL_USER_ID,
-        },
-      }),
-    ]);
-
-    console.log(
-      `Banned ${defaultDomainLinks.length} default domain links for ${workspace.slug}`,
-      redisRes,
-      prismaRes,
-    );
-  }
-
-  const deleteWorkspaceResponse = await Promise.allSettled([
-    // delete workspace logo if it's a custom logo stored in R2
-    workspace.logo &&
-      workspace.logo.startsWith(`${R2_URL}/logos/${workspace.id}`) &&
-      storage.delete({ key: workspace.logo.replace(`${R2_URL}/`, "") }),
-
-    // if they have a Stripe subscription, cancel it
-    workspace.stripeId &&
-      cancelSubscription({
-        customerId: workspace.stripeId,
-        reason: "Customer was banned from Dub",
-      }),
-
-    // Queue the workspace for deletion
-    qstash.publishJSON({
-      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/workspaces/delete`,
-      body: {
-        workspaceId: workspace.id,
-      },
-    }),
-  ]);
-
-  console.log(`Deleted workspace ${workspace.slug}`, deleteWorkspaceResponse);
-
-  return {
-    deleteWorkspaceResponse,
-  };
-}
diff --git a/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts b/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts
index 140cfd3434a..4d63d062238 100644
--- a/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts
+++ b/apps/web/lib/api/workspaces/is-saml-enforced-for-email-domain.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@/lib/prisma";
-import { APP_HOSTNAMES } from "@dub/utils";
+import { isAppHostname } from "@dub/utils";
 import { headers } from "next/headers";
 import { isGenericEmail } from "../../email/is-generic-email";
 
@@ -11,7 +11,7 @@ export const isSamlEnforcedForEmailDomain = async (email: string) => {
   if (
     !hostname ||
     !emailDomain ||
-    !APP_HOSTNAMES.has(hostname) ||
+    !isAppHostname(hostname) ||
     isGenericEmail(email)
   ) {
     return false;
diff --git a/apps/web/lib/auth/options.ts b/apps/web/lib/auth/options.ts
index 731a156edf3..d4a3f7e93ef 100644
--- a/apps/web/lib/auth/options.ts
+++ b/apps/web/lib/auth/options.ts
@@ -1,5 +1,6 @@
 import { isBlacklistedEmail } from "@/lib/edge-config";
 import { jackson } from "@/lib/jackson";
+import { welcomeUserJob } from "@/lib/jobs/handlers/welcome-user-job";
 import { prisma } from "@/lib/prisma";
 import { isStored, storage } from "@/lib/storage";
 import { UserProps } from "@/lib/types";
@@ -7,7 +8,6 @@ import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
 import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { sendEmail } from "@dub/email";
 import LoginLink from "@dub/email/templates/login-link";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { PrismaAdapter } from "@next-auth/prisma-adapter";
 import { PrismaClient } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
@@ -21,7 +21,6 @@ import GoogleProvider from "next-auth/providers/google";
 import { createId } from "../api/create-id";
 import { isProduction } from "../api/environment";
 import { isSamlEnforcedForEmailDomain } from "../api/workspaces/is-saml-enforced-for-email-domain";
-import { qstash } from "../cron";
 import { completeProgramApplications } from "../partners/complete-program-applications";
 import {
   consumeAdminImpersonation,
@@ -122,6 +121,7 @@ export const authOptions: NextAuthOptions = {
     GithubProvider({
       clientId: process.env.GITHUB_CLIENT_ID as string,
       clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
+      issuer: "https://github.com/login/oauth",
       allowDangerousEmailAccountLinking: true,
     }),
     {
@@ -383,9 +383,7 @@ export const authOptions: NextAuthOptions = {
         sameSite: "lax",
         path: "/",
         // When working on localhost, the cookie domain must be omitted entirely (https://stackoverflow.com/a/1188145)
-        domain: VERCEL_DEPLOYMENT
-          ? process.env.NEXTAUTH_COOKIE_DOMAIN || ".dub.co"
-          : undefined,
+        domain: VERCEL_DEPLOYMENT ? ".dub.co" : undefined,
         secure: VERCEL_DEPLOYMENT,
       },
     },
@@ -611,11 +609,15 @@ export const authOptions: NextAuthOptions = {
             // track lead if dub_id cookie is present
             trackDubLead(user),
             // trigger welcome workflow 45 minutes after the user signed up
-            qstash.publishJSON({
-              url: `${APP_DOMAIN_WITH_NGROK}/api/cron/welcome-user`,
-              delay: 45 * 60,
-              body: { userId: user.id },
-            }),
+            welcomeUserJob.dispatch(
+              {
+                userId: user.id,
+              },
+              {
+                delay: 45 * 60,
+                label: user.id,
+              },
+            ),
           ]),
         );
       }
diff --git a/apps/web/lib/auth/workspace.ts b/apps/web/lib/auth/workspace.ts
index c97b9028d42..aac725c11ec 100644
--- a/apps/web/lib/auth/workspace.ts
+++ b/apps/web/lib/auth/workspace.ts
@@ -407,8 +407,11 @@ export const withWorkspace = (
         permissions = getPermissionsByRole(workspace.users[0].role);
 
         // Find the subset of permissions that the user has access to based on the token scopes
-        if (isRestrictedToken && token?.scopes) {
-          const tokenScopes = (token.scopes.split(" ") as Scope[]) || [];
+        // Empty/null scopes must fail closed (no permissions) — never inherit full role perms
+        if (isRestrictedToken) {
+          const tokenScopes = (token?.scopes?.split(" ").filter(Boolean) ??
+            []) as Scope[];
+
           permissions = mapScopesToPermissions(tokenScopes).filter((p) =>
             permissions.includes(p),
           );
diff --git a/apps/web/lib/bounty/api/approve-bounty-submission.ts b/apps/web/lib/bounty/api/approve-bounty-submission.ts
index 54956d33655..d99e94c686a 100644
--- a/apps/web/lib/bounty/api/approve-bounty-submission.ts
+++ b/apps/web/lib/bounty/api/approve-bounty-submission.ts
@@ -11,6 +11,7 @@ import {
 } from "@/lib/zod/schemas/bounties";
 import { sendEmail } from "@dub/email";
 import BountyApproved from "@dub/email/templates/bounty-approved";
+import { CommissionSource } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
 import * as z from "zod/v4";
 
@@ -143,7 +144,8 @@ export async function approveBountySubmission({
     amount: finalRewardAmount,
     quantity: 1,
     userId: user.id,
-    description: `Commission for successfully completed "${bounty.name}" bounty.`,
+    source: CommissionSource.user,
+    description: `Commission for successfully completing "${bounty.name}" bounty.`,
     bountySubmissionId: submissionId,
   });
 
diff --git a/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts b/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
index 216a5d02c34..836ae448fab 100644
--- a/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
+++ b/apps/web/lib/bounty/api/get-bounty-submission-upload-url.ts
@@ -1,24 +1,25 @@
 import { DubApiError } from "@/lib/api/errors";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { submissionRequirementsSchema } from "@/lib/zod/schemas/bounties";
 import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
-import { nanoid, R2_URL } from "@dub/utils";
+import { nanoid } from "@dub/utils";
 import { ProgramEnrollment, ProgramPartnerTag } from "@prisma/client";
+import * as z from "zod/v4";
 import {
   bountyEligibilityIncludes,
   canPartnerSubmitBounty,
 } from "./bounty-availability";
 import { getBountyOrThrow } from "./get-bounty-or-throw";
 
-const MAX_ATTEMPTS = 25;
-const CACHE_KEY_PREFIX = "bounty:submission:file:upload";
-
-type GetBountySubmissionUploadUrlParams = {
+type GetBountySubmissionUploadUrlParams = z.infer<
+  typeof signedUploadInputSchema
+> & {
   bountyId: string;
   fileName: string;
-  contentType: string;
-  contentLength: number;
   programEnrollment: Pick<
     ProgramEnrollment,
     "programId" | "partnerId" | "groupId" | "status" | "createdAt"
@@ -27,14 +28,6 @@ type GetBountySubmissionUploadUrlParams = {
   };
 };
 
-const MAX_UPLOAD_SIZE_BYTES = 5 * 1024 * 1024;
-const ALLOWED_IMAGE_CONTENT_TYPES = new Set([
-  "image/jpeg",
-  "image/png",
-  "image/webp",
-  "image/svg+xml",
-]);
-
 export async function getBountySubmissionUploadUrl({
   bountyId,
   fileName,
@@ -58,35 +51,16 @@ export async function getBountySubmissionUploadUrl({
     });
   }
 
-  if (!ALLOWED_IMAGE_CONTENT_TYPES.has(contentType)) {
-    throw new DubApiError({
-      code: "unprocessable_entity",
-      message: "Unsupported file type. Please upload SVG, JPG, PNG, or WEBP.",
-    });
-  }
-
-  if (
-    !Number.isInteger(contentLength) ||
-    contentLength <= 0 ||
-    contentLength > MAX_UPLOAD_SIZE_BYTES
-  ) {
-    throw new DubApiError({
-      code: "unprocessable_entity",
-      message: "File size exceeds maximum of 5MB.",
-    });
-  }
-
-  const { success } = await ratelimit(MAX_ATTEMPTS, "24 h").limit(
-    `${CACHE_KEY_PREFIX}:${bountyId}:${partnerId}`,
-  );
+  validateSignedUpload({
+    contentLength,
+    contentType,
+    policy: "bountySubmissionImages",
+  });
 
-  if (!success) {
-    throw new DubApiError({
-      code: "rate_limit_exceeded",
-      message:
-        "You've reached the maximum number of attempts to upload a file for this bounty.",
-    });
-  }
+  await assertRateLimit({
+    policy: RATELIMIT_POLICIES.bountySubmissionUpload,
+    identifier: [bountyId, partnerId],
+  });
 
   const bounty = await getBountyOrThrow({
     bountyId,
@@ -138,18 +112,21 @@ export async function getBountySubmissionUploadUrl({
   }
 
   try {
-    const key = `programs/${programId}/bounties/${bountyId}/submissions/${partnerId}/${nanoid(7)}`;
-    const signedUrl = await storage.getSignedUploadUrl({
-      key,
-      contentLength,
+    const { signedUrl, destinationUrl } = await createSignedUploadUrl({
+      key: `programs/${programId}/bounties/${bountyId}/submissions/${partnerId}/${nanoid(10)}`,
       contentType,
+      contentLength,
     });
 
     return {
       signedUrl,
-      destinationUrl: `${R2_URL}/${key}`,
+      destinationUrl,
     };
   } catch (e) {
+    if (e instanceof DubApiError) {
+      throw e;
+    }
+
     throw new DubApiError({
       code: "internal_server_error",
       message: "Failed to get signed URL for upload.",
diff --git a/apps/web/lib/bounty/api/get-group-bounty-summaries.ts b/apps/web/lib/bounty/api/get-group-bounty-summaries.ts
index 4e29bdb6250..a3c173cd819 100644
--- a/apps/web/lib/bounty/api/get-group-bounty-summaries.ts
+++ b/apps/web/lib/bounty/api/get-group-bounty-summaries.ts
@@ -9,6 +9,7 @@ type BountyEligibilityCandidate = {
   endsAt: Date | null;
   archivedAt: Date | null;
   groups: { groupId: string }[];
+  partnerTags: { partnerTagId: string }[];
 };
 
 export function filterActiveGroupBounties(
@@ -34,6 +35,10 @@ export function filterActiveGroupBounties(
       return false;
     }
 
+    if (bounty.partnerTags.length > 0) {
+      return false;
+    }
+
     return (
       bounty.groups.length === 0 ||
       bounty.groups.some((group) => group.groupId === groupId)
@@ -66,6 +71,11 @@ export async function getGroupBountySummaries({
           groupId: true,
         },
       },
+      partnerTags: {
+        select: {
+          partnerTagId: true,
+        },
+      },
     },
     orderBy: {
       startsAt: "asc",
diff --git a/apps/web/lib/bounty/api/trigger-draft-bounty-submissions.ts b/apps/web/lib/bounty/api/trigger-draft-bounty-submissions.ts
index 93cc5acc980..b6c1c554b8f 100644
--- a/apps/web/lib/bounty/api/trigger-draft-bounty-submissions.ts
+++ b/apps/web/lib/bounty/api/trigger-draft-bounty-submissions.ts
@@ -13,9 +13,11 @@ import {
 export async function triggerDraftBountySubmissionCreation({
   programId,
   partnerIds,
+  idempotencyKey,
 }: {
   programId: string;
   partnerIds: string[];
+  idempotencyKey?: string;
 }) {
   const programEnrollments = await prisma.programEnrollment.findMany({
     where: {
@@ -134,6 +136,9 @@ export async function triggerDraftBountySubmissionCreation({
           bountyId,
           partnerIds,
         },
+        ...(idempotencyKey && {
+          deduplicationId: `${idempotencyKey}-${bountyId}`,
+        }),
       }),
     ),
   );
diff --git a/apps/web/lib/commissions/build-commission-description.ts b/apps/web/lib/commissions/build-commission-description.ts
new file mode 100644
index 00000000000..e81cedcd093
--- /dev/null
+++ b/apps/web/lib/commissions/build-commission-description.ts
@@ -0,0 +1,93 @@
+import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
+import { formatRewardConditionClause } from "@/lib/rewards/format-reward-condition";
+import { getSpendLimitDescriptionParts } from "@/lib/rewards/reward-spend-limit";
+import { RewardConditions, RewardProps } from "@/lib/types";
+import { currencyFormatter } from "@dub/utils";
+
+export function buildCommissionDescription({
+  reward,
+  matchedCondition,
+  earnings,
+  cappedEarnings,
+}: {
+  // Already resolved by determinePartnerReward (matched condition amounts applied)
+  reward: Pick<
+    RewardProps,
+    | "event"
+    | "type"
+    | "amountInCents"
+    | "amountInPercentage"
+    | "maxDuration"
+    | "spendLimitAmount"
+    | "spendLimitInterval"
+  >;
+  matchedCondition?: RewardConditions | null;
+  // Pre-spend-limit earnings (used to detect whether the limit was applied)
+  earnings?: number;
+  // Earnings after spend-limit clamping (same as earnings when not capped)
+  cappedEarnings?: number;
+}): string {
+  const rewardAmount = constructRewardAmount({
+    ...reward,
+    modifiers: undefined,
+  });
+
+  const parts: string[] = ["Earn", rewardAmount];
+
+  if (reward.event === "sale" && reward.maxDuration === 0) {
+    parts.push("for the first sale");
+  } else {
+    parts.push(`per ${reward.event}`);
+  }
+
+  // Duration only applies to sale rewards (click/lead are one-off)
+  if (reward.event === "sale") {
+    if (reward.maxDuration === null) {
+      parts.push("for the customer's lifetime");
+    } else if (reward.maxDuration && reward.maxDuration >= 1) {
+      const durationText =
+        reward.maxDuration % 12 === 0
+          ? `${reward.maxDuration / 12} year${reward.maxDuration / 12 > 1 ? "s" : ""}`
+          : `${reward.maxDuration} month${reward.maxDuration > 1 ? "s" : ""}`;
+      parts.push(`for ${durationText}`);
+    }
+  }
+
+  let description = parts.join(" ");
+
+  if (matchedCondition?.conditions?.length) {
+    const clauses = matchedCondition.conditions.map((condition, idx) =>
+      formatRewardConditionClause({
+        condition,
+        event: reward.event,
+        operator: matchedCondition.operator,
+        isFirst: idx === 0,
+      }),
+    );
+
+    description += ` ${clauses.join(" ")}`;
+  }
+
+  if (earnings != null && cappedEarnings != null && earnings > cappedEarnings) {
+    const from = currencyFormatter(earnings, {
+      trailingZeroDisplay: "stripIfInteger",
+    });
+    const to = currencyFormatter(cappedEarnings, {
+      trailingZeroDisplay: "stripIfInteger",
+    });
+
+    const limitParts = getSpendLimitDescriptionParts({
+      spendLimitAmount: reward.spendLimitAmount,
+      spendLimitInterval: reward.spendLimitInterval,
+    });
+    const limitLabel = limitParts
+      ? [limitParts.amount, limitParts.interval].filter(Boolean).join(" ")
+      : null;
+
+    description += limitLabel
+      ? `, capped from ${from} to ${to} due to ${limitLabel} spend limit`
+      : `, capped from ${from} to ${to} due to spend limit`;
+  }
+
+  return description;
+}
diff --git a/apps/web/lib/commissions/process-click-aggregation.ts b/apps/web/lib/commissions/process-click-aggregation.ts
new file mode 100644
index 00000000000..c94141b01c7
--- /dev/null
+++ b/apps/web/lib/commissions/process-click-aggregation.ts
@@ -0,0 +1,374 @@
+import { createId } from "@/lib/api/create-id";
+import { serializeReward } from "@/lib/api/partners/serialize-reward";
+import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";
+import { getRewardSpendLimitWindow } from "@/lib/api/rewards/reward-spend-limit-window";
+import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";
+import { getRewardAmount } from "@/lib/partners/get-reward-amount";
+import { prisma } from "@/lib/prisma";
+import { resolveClickReward } from "@/lib/rewards/resolve-click-reward";
+import { getTopLinksByCountries } from "@/lib/tinybird/get-top-links-by-countries";
+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { pluck } from "@dub/utils";
+import {
+  CommissionStatus,
+  CommissionType,
+  Prisma,
+  ProgramEnrollment,
+  Reward,
+} from "@prisma/client";
+
+type LinkEarnings = {
+  clicks: number;
+  earnings: number;
+  reward: Reward;
+};
+
+type ProcessClickAggregationInput = {
+  programId: string;
+  partnerId: string;
+  startDate: Date;
+  endDate: Date;
+};
+
+export async function processClickAggregation({
+  programId,
+  partnerId,
+  startDate,
+  endDate,
+}: ProcessClickAggregationInput) {
+  const programEnrollment = await prisma.programEnrollment.findUnique({
+    where: {
+      partnerId_programId: {
+        partnerId,
+        programId,
+      },
+    },
+    select: {
+      id: true,
+      status: true,
+      programId: true,
+      partnerId: true,
+      clickReward: true,
+    },
+  });
+
+  if (!programEnrollment) {
+    console.log(
+      `Enrollment not found for partner ${partnerId} and program ${programId}`,
+    );
+    return;
+  }
+
+  if (
+    !COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES.includes(programEnrollment.status)
+  ) {
+    console.log(
+      `Enrollment not commission eligible for partner ${partnerId} and program ${programId}`,
+    );
+    return;
+  }
+
+  const linkEarningsMap = await calculateEarningsByLink({
+    startDate,
+    endDate,
+    programEnrollment,
+  });
+
+  if (!linkEarningsMap) {
+    return;
+  }
+
+  await createClickCommissions({
+    startDate,
+    endDate,
+    programEnrollment,
+    linkEarningsMap,
+  });
+}
+
+// Calculate how much was earned by each link for a program enrollment between two dates
+async function calculateEarningsByLink({
+  startDate,
+  endDate,
+  programEnrollment,
+}: Pick<ProcessClickAggregationInput, "startDate" | "endDate"> & {
+  programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId"> & {
+    clickReward: Reward | null;
+  };
+}) {
+  const { programId, partnerId } = programEnrollment;
+
+  const links = await prisma.link.findMany({
+    where: {
+      programId,
+      partnerId,
+      // links that were clicked on after the start date
+      lastClicked: {
+        gte: startDate,
+      },
+      clicks: {
+        gt: 0,
+      },
+    },
+    orderBy: {
+      id: "asc",
+    },
+    select: {
+      id: true,
+      shortLink: true,
+      linkReward: {
+        select: {
+          clickReward: true,
+        },
+      },
+    },
+  });
+
+  if (links.length === 0) {
+    console.log(
+      `No links found for partner ${partnerId} and program ${programId} with clicks after ${startDate}.`,
+    );
+    return;
+  }
+
+  const clicksByCountries = await getTopLinksByCountries({
+    linkIds: pluck(links, "id"),
+    start: startDate,
+    end: endDate,
+  });
+
+  // Group clicks by link
+  const clicksByLinkId = new Map<string, typeof clicksByCountries>();
+
+  for (const click of clicksByCountries) {
+    const existing = clicksByLinkId.get(click.link_id) || [];
+    existing.push(click);
+    clicksByLinkId.set(click.link_id, existing);
+  }
+
+  // Calculate earnings per link considering geo CPC
+  const linkEarningsMap = new Map<string, LinkEarnings>();
+
+  for (const link of links) {
+    const clickReward =
+      link.linkReward?.clickReward ?? programEnrollment.clickReward;
+
+    // Skip soft deleted click rewards
+    if (clickReward?.programId === null || clickReward?.groupId === null) {
+      console.log(
+        `Click reward ${clickReward.id} for link ${link.id} is soft deleted (programId=${clickReward.programId}, groupId=${clickReward.groupId}). Skipping...`,
+      );
+      continue;
+    }
+
+    if (!clickReward) {
+      console.log(`No click reward for link ${link.id}. Skipping...`);
+      continue;
+    }
+
+    const linkClicksByCountry = clicksByLinkId.get(link.id) || [];
+
+    if (linkClicksByCountry.length === 0) {
+      console.log(
+        `No clicks in aggregation window for link ${link.id}. Skipping...`,
+      );
+      continue;
+    }
+
+    // Calculate earnings per country for each link
+    for (const { country, clicks } of linkClicksByCountry) {
+      const finalReward = resolveClickReward({
+        reward: clickReward,
+        country,
+      });
+
+      const existing = linkEarningsMap.get(link.id) || {
+        clicks: 0,
+        earnings: 0,
+        reward: clickReward,
+      };
+
+      const amountInCents = getRewardAmount(serializeReward(finalReward));
+
+      linkEarningsMap.set(link.id, {
+        clicks: existing.clicks + clicks,
+        earnings: existing.earnings + amountInCents * clicks,
+        reward: clickReward,
+      });
+    }
+  }
+
+  return linkEarningsMap;
+}
+
+async function getHistoricalClicksEarnings({
+  startDate: aggregationStartDate,
+  programEnrollment,
+  reward,
+}: {
+  programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId">;
+  startDate: Date;
+  reward: Pick<Reward, "id" | "spendLimitInterval">;
+}) {
+  if (!reward.spendLimitInterval) {
+    return 0;
+  }
+
+  const { startDate, endDate } = getRewardSpendLimitWindow({
+    spendLimitInterval: reward.spendLimitInterval,
+    referenceDate: aggregationStartDate,
+  });
+
+  const {
+    _sum: { earnings },
+  } = await prisma.commission.aggregate({
+    where: {
+      programId: programEnrollment.programId,
+      partnerId: programEnrollment.partnerId,
+      rewardId: reward.id,
+      type: CommissionType.click,
+      status: {
+        in: [
+          CommissionStatus.pending,
+          CommissionStatus.processed,
+          CommissionStatus.paid,
+        ],
+      },
+      ...(startDate && endDate
+        ? {
+            createdAt: {
+              gte: startDate,
+              lte: endDate,
+            },
+          }
+        : {}),
+    },
+    _sum: {
+      earnings: true,
+    },
+  });
+
+  return earnings ?? 0;
+}
+
+async function createClickCommissions({
+  startDate,
+  endDate,
+  programEnrollment,
+  linkEarningsMap,
+}: Pick<ProcessClickAggregationInput, "startDate" | "endDate"> & {
+  programEnrollment: Pick<ProgramEnrollment, "programId" | "partnerId">;
+  linkEarningsMap: Map<string, LinkEarnings>;
+}) {
+  const { programId, partnerId } = programEnrollment;
+
+  if (linkEarningsMap.size === 0) {
+    console.log(
+      `No link earnings to commission for partner ${partnerId} in program ${programId}. Skipping...`,
+    );
+    return;
+  }
+
+  const aggregationDate = startDate.toISOString().split("T")[0];
+  const usedSpendLimitByReward = new Map<string, number>();
+  const historicalEarningsByReward = new Map<string, number>();
+  const rewardsWithSpendLimit = new Map<string, Reward>();
+
+  for (const { reward } of linkEarningsMap.values()) {
+    if (reward.spendLimitAmount && reward.spendLimitInterval) {
+      rewardsWithSpendLimit.set(reward.id, reward);
+    }
+  }
+
+  await Promise.all(
+    Array.from(rewardsWithSpendLimit.values()).map(async (reward) => {
+      const historicalEarnings = await getHistoricalClicksEarnings({
+        programEnrollment,
+        startDate,
+        reward,
+      });
+
+      historicalEarningsByReward.set(reward.id, historicalEarnings);
+    }),
+  );
+
+  const commissionsToCreate: Prisma.CommissionCreateManyInput[] = [];
+
+  // Create commissions for each link
+  for (const [linkId, { clicks, earnings, reward }] of linkEarningsMap) {
+    if (clicks === 0 || earnings === 0) {
+      console.log(
+        `No click earnings for link ${linkId} (clicks=${clicks}, earnings=${earnings}). Skipping...`,
+      );
+      continue;
+    }
+
+    let cappedEarnings = earnings;
+
+    // Cap earnings to spend limit
+    if (reward.spendLimitAmount && reward.spendLimitInterval) {
+      const usedThisBatch = usedSpendLimitByReward.get(reward.id) ?? 0;
+      const historicalEarnings = historicalEarningsByReward.get(reward.id) ?? 0;
+
+      const remainingSpendLimit =
+        reward.spendLimitAmount - historicalEarnings - usedThisBatch;
+
+      cappedEarnings = Math.max(0, Math.min(earnings, remainingSpendLimit));
+
+      if (cappedEarnings === 0) {
+        console.log(
+          `Reached spend limit for partner ${partnerId} on link ${linkId} (reward ${reward.id}). Skipping...`,
+        );
+        continue;
+      }
+
+      usedSpendLimitByReward.set(reward.id, usedThisBatch + cappedEarnings);
+    }
+
+    // Persist the base click reward description (no per-country clause —
+    // one commission can mix countries/rates).
+    const description = buildCommissionDescription({
+      reward: serializeReward(reward),
+      earnings,
+      cappedEarnings,
+    });
+
+    commissionsToCreate.push({
+      id: createId({ prefix: "cm_" }),
+      programId,
+      partnerId,
+      rewardId: reward.id,
+      linkId,
+      quantity: clicks,
+      type: CommissionType.click,
+      amount: 0,
+      earnings: cappedEarnings,
+      description,
+      createdAt: endDate,
+      invoiceId: `${linkId}-${aggregationDate}`, // used as a idempotency key
+    });
+  }
+
+  if (commissionsToCreate.length === 0) {
+    console.log(
+      `No click commissions to create for partner ${partnerId} in program ${programId}. Skipping...`,
+    );
+    return;
+  }
+
+  const { count } = await prisma.commission.createMany({
+    data: commissionsToCreate,
+    skipDuplicates: true,
+  });
+
+  console.log(
+    `Created ${count} click commissions for partner ${partnerId} in program ${programId}.`,
+  );
+
+  if (count > 0) {
+    await syncTotalCommissions({
+      partnerId,
+      programId,
+    });
+  }
+}
diff --git a/apps/web/lib/constants/partner-profile.ts b/apps/web/lib/constants/partner-profile.ts
index 9c6eaf49d8c..34a9642cbb5 100644
--- a/apps/web/lib/constants/partner-profile.ts
+++ b/apps/web/lib/constants/partner-profile.ts
@@ -1,17 +1,21 @@
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 
 export const MAX_INVITES_PER_REQUEST = 5;
-export const MAX_PARTNER_USERS = 10;
 export const MAX_PARTNER_LINKS_FOR_LOCAL_FILTERING = 100; // if over 100 links we should filter on TB directly
 
 export const LARGE_PROGRAM_IDS = ["prog_1K0QHV7MP3PR05CJSCF5VN93X"];
 export const LARGE_PROGRAM_MIN_TOTAL_COMMISSIONS_CENTS = 500000; // $5000
 
-export const EXCLUDED_PROGRAM_IDS = [
+export const PARTNER_NETWORK_EXCLUDED_PROGRAM_IDS = [
   ACME_PROGRAM_ID,
+  DEMO_PROGRAM_ID,
   "prog_1K0QHV7MP3PR05CJSCF5VN93X",
   "prog_1JWVR53QX1NM7NDEK62E3J19H",
 ];
 export const PARTNER_NETWORK_MIN_COMMISSIONS_CENTS = 10_00; // $10
 
 export const PARTNER_CUSTOMERS_MAX_PAGE_SIZE = 100;
+
+export const CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS = [
+  "prog_qGGSH0jXFZLeogOnq1sLkriY",
+];
diff --git a/apps/web/lib/constants/payouts.ts b/apps/web/lib/constants/payouts.ts
index 60e810b6d3f..342d3391694 100644
--- a/apps/web/lib/constants/payouts.ts
+++ b/apps/web/lib/constants/payouts.ts
@@ -9,8 +9,8 @@ export const ALLOWED_MIN_PAYOUT_AMOUNTS = [0, 1000, 2000, 5000, 10000];
 
 const EXTENDED_MIN_PAYOUT_AMOUNT_CENTS = 20000; // $200
 const EXTENDED_MIN_PAYOUT_WORKSPACE_IDS = new Set<string>([
-  "clsvopiw0000ejy0grp821me0",
   ACME_WORKSPACE_ID,
+  "clsvopiw0000ejy0grp821me0",
 ]);
 
 export function getAllowedMinPayoutAmounts(workspaceId: string): number[] {
@@ -23,6 +23,13 @@ export function getAllowedMinPayoutAmounts(workspaceId: string): number[] {
   return ALLOWED_MIN_PAYOUT_AMOUNTS;
 }
 
+export const SEPA_ENABLED_WORKSPACE_IDS = new Set<string>([
+  ACME_WORKSPACE_ID,
+  "ws_1KNN3RC8XVQEHTZBQ9XQVNHEB",
+  "ws_1KYSFA2ZKN8C1QTB356ASGQRV",
+  "ws_1JRCHG2F49QGHFHBTSASS411X",
+]);
+
 export const PAYOUTS_SHEET_ITEMS_LIMIT = 10;
 export const ELIGIBLE_PAYOUTS_MAX_PAGE_SIZE = 500;
 export const CUTOFF_PERIOD_MAX_PAYOUTS = 1000;
diff --git a/apps/web/lib/constants/program.ts b/apps/web/lib/constants/program.ts
index c3cb7e2132a..f5f8ea1937b 100644
--- a/apps/web/lib/constants/program.ts
+++ b/apps/web/lib/constants/program.ts
@@ -1,4 +1,4 @@
-import { ACME_PROGRAM_ID } from "@dub/utils";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
 
 export const PROGRAM_ONBOARDING_PARTNERS_LIMIT = 5;
 export const MAX_PARTNERS_INVITES_PER_REQUEST = 50;
@@ -37,6 +37,12 @@ export const PROGRAM_IMPORT_SOURCES = [
     image: "https://assets.dub.co/misc/icons/tapfiliate.svg",
     helpUrl: "https://dub.co/help/article/migrating-from-tapfiliate",
   },
+  {
+    id: "lemonsqueezy",
+    value: "Lemon Squeezy",
+    image: "https://assets.dub.co/misc/icons/lemonsqueezy.svg",
+    helpUrl: "https://dub.co/help/article/migrating-from-lemonsqueezy",
+  },
 ] as const;
 
 export const PROGRAM_APPLICATION_IMAGE_MAX_FILE_SIZE_MB = 5;
@@ -51,5 +57,6 @@ export const PROGRAM_APPLICATION_IMAGE_ALLOWED_TYPES_LABEL = "JPG, PNG, WebP";
 
 export const EXTERNAL_PAYOUTS_PROGRAM_IDS = [
   ACME_PROGRAM_ID, // Acme
-  "prog_1JWVR53QX1NM7NDEK62E3J19H", // Polymarket
+  DEMO_PROGRAM_ID, // Demo
+  "prog_1JWVR53QX1NM7NDEK62E3J19H",
 ];
diff --git a/apps/web/lib/cron/enqueue-batch-jobs.ts b/apps/web/lib/cron/enqueue-batch-jobs.ts
index 00c69a65556..f58b8cf2afc 100644
--- a/apps/web/lib/cron/enqueue-batch-jobs.ts
+++ b/apps/web/lib/cron/enqueue-batch-jobs.ts
@@ -1,12 +1,11 @@
-import { log } from "@dub/utils";
+import { log, sleep } from "@dub/utils";
 import type { PublishBatchRequest } from "@upstash/qstash";
 import { qstash } from ".";
 
 type EnqueueBatchJobsProps = PublishBatchRequest<unknown> & {
-  queueName:
+  queueName?:
     | "ban-partner"
     | "send-partner-summary"
-    | "create-discount-code"
     | "sync-bounty-social-metrics"
     | "process-hubspot-webhook"
     | "process-intercom-webhook"
@@ -24,9 +23,7 @@ export async function enqueueBatchJobs(jobs: EnqueueBatchJobsProps[]) {
       return await qstash.batchJSON(jobs);
     } catch (error) {
       if (attempt < maxRetries) {
-        await new Promise((resolve) =>
-          setTimeout(resolve, 1000 * Math.pow(2, attempt)),
-        );
+        await sleep(1000 * Math.pow(2, attempt));
         continue;
       }
 
diff --git a/apps/web/lib/cron/index.ts b/apps/web/lib/cron/index.ts
index dece18a598e..8e3650a8dc6 100644
--- a/apps/web/lib/cron/index.ts
+++ b/apps/web/lib/cron/index.ts
@@ -3,6 +3,19 @@ import { Client } from "@upstash/qstash";
 export const qstash = new Client({
   baseUrl: process.env.QSTASH_URL || "https://qstash-us-east-1.upstash.io",
   token: process.env.QSTASH_TOKEN || "",
+  ...(process.env.VERCEL_ENV === "preview" && {
+    headers: {
+      "x-vercel-protection-bypass":
+        process.env.VERCEL_AUTOMATION_BYPASS_SECRET || "",
+    },
+  }),
+});
+
+// This is a special client only used for publishWebhookEventToQStash
+// (to avoid forwarding the Vercel automation bypass secret to third party webhook receivers)
+export const qstashWithoutBypass = new Client({
+  baseUrl: process.env.QSTASH_URL || "https://qstash-us-east-1.upstash.io",
+  token: process.env.QSTASH_TOKEN || "",
 });
 
 // Default batch size for cron jobs that process records in batches
diff --git a/apps/web/lib/cron/qstash-workflow.ts b/apps/web/lib/cron/qstash-workflow.ts
deleted file mode 100644
index 4d6fc4151f4..00000000000
--- a/apps/web/lib/cron/qstash-workflow.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { logger, toErrorFields } from "@/lib/axiom/server";
-import { APP_DOMAIN_WITH_NGROK, pluralize } from "@dub/utils";
-import { FlowControl } from "@upstash/qstash";
-import { Client } from "@upstash/workflow";
-
-const client = new Client({
-  baseUrl: process.env.QSTASH_URL || "https://qstash-us-east-1.upstash.io",
-  token: process.env.QSTASH_TOKEN || "",
-});
-
-type WorkflowType = "partner-approved" | "create-partner-commission";
-
-interface QStashWorkflow {
-  workflowType: WorkflowType;
-  workflowLabel: string;
-  body: Record<string, unknown>;
-  flowControl?: FlowControl;
-}
-
-// Run workflows
-export async function triggerQStashWorkflow(
-  input: QStashWorkflow | QStashWorkflow[],
-) {
-  const workflows = Array.isArray(input) ? input : [input];
-  const maxRetries = 3;
-
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      const response = await client.trigger(
-        workflows.map((workflow) => ({
-          url: `${APP_DOMAIN_WITH_NGROK}/api/workflows/${workflow.workflowType}`,
-          body: workflow.body,
-          label: workflow.workflowLabel,
-          retries: 5,
-          flowControl: workflow.flowControl ?? {
-            key: workflow.workflowType,
-            parallelism: 15,
-          },
-        })),
-      );
-
-      console.log(
-        `${response.length} QStash ${pluralize("workflow", response.length)} triggered`,
-        response,
-      );
-
-      return response;
-    } catch (error) {
-      console.error("QStash workflow trigger failed", { error, workflows });
-
-      if (attempt < maxRetries) {
-        await new Promise((resolve) =>
-          setTimeout(resolve, 1000 * Math.pow(2, attempt)),
-        );
-        continue;
-      }
-
-      for (const workflow of workflows) {
-        const { correlation } = getWorkflowConfig(workflow);
-
-        logger.error("workflow.trigger_failed", {
-          service: "qstash",
-          event: "workflow.trigger_failed",
-          workflowType: workflow.workflowType,
-          error: toErrorFields(error),
-          correlation,
-        });
-      }
-
-      await logger.flush();
-
-      return null;
-    }
-  }
-}
-
-export function getWorkflowConfig({
-  workflowType,
-  body,
-}: Omit<QStashWorkflow, "workflowLabel">): {
-  correlation: Record<string, unknown>;
-} {
-  switch (workflowType) {
-    case "partner-approved":
-      return {
-        correlation: {
-          programId: body.programId,
-          partnerId: body.partnerId,
-          userId: body.userId,
-        },
-      };
-
-    case "create-partner-commission": {
-      return {
-        correlation: {
-          programId: body.programId,
-          partnerId: body.partnerId,
-          customerId: body.customerId,
-          bountySubmissionId: body.bountySubmissionId,
-        },
-      };
-    }
-
-    default:
-      return {
-        correlation: {},
-      };
-  }
-}
diff --git a/apps/web/lib/customers/api/customer-count-where.ts b/apps/web/lib/customers/api/customer-count-where.ts
index 0a6ebad698f..a8c175a88a8 100644
--- a/apps/web/lib/customers/api/customer-count-where.ts
+++ b/apps/web/lib/customers/api/customer-count-where.ts
@@ -7,6 +7,34 @@ type CustomerCountFilters = z.infer<typeof getCustomersCountQuerySchema> & {
   workspaceId: string;
 };
 
+export function buildCustomerSearchWhere({
+  email,
+  externalId,
+  search: rawSearch,
+}: {
+  email?: string | null;
+  externalId?: string | null;
+  search?: string | null;
+}): Prisma.CustomerWhereInput {
+  if (email) return { email };
+
+  if (externalId) return { externalId };
+
+  const search = rawSearch?.trim();
+  if (!search) return {};
+
+  const isExactCustomerIdQuery = /^cus_[a-z0-9]{24,}$/i.test(search);
+  if (isExactCustomerIdQuery) return { id: search };
+
+  if (search.includes("@")) return { email: search };
+
+  const q = sanitizeFullTextSearch(search);
+  return {
+    email: { search: q },
+    name: { search: q },
+  };
+}
+
 export function buildCustomerCountWhere(filters: CustomerCountFilters) {
   const {
     programId,
@@ -28,18 +56,7 @@ export function buildCustomerCountWhere(filters: CustomerCountFilters) {
       partnerId,
     }),
     projectId: workspaceId,
-    ...(email
-      ? { email }
-      : externalId
-        ? { externalId }
-        : search
-          ? search.includes("@")
-            ? { email: search }
-            : {
-                email: { search: sanitizeFullTextSearch(search) },
-                name: { search: sanitizeFullTextSearch(search) },
-              }
-          : {}),
+    ...buildCustomerSearchWhere({ email, externalId, search }),
     // only filter by country if not grouping by country
     ...(country &&
       groupBy !== "country" && {
diff --git a/apps/web/lib/customers/api/format-partner-customers-export.ts b/apps/web/lib/customers/api/format-partner-customers-export.ts
new file mode 100644
index 00000000000..2d68ea7b3a7
--- /dev/null
+++ b/apps/web/lib/customers/api/format-partner-customers-export.ts
@@ -0,0 +1,89 @@
+import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-customer-email";
+import { formatMoneyCentsForExport } from "@/lib/api/utils/format-money-cents-for-export";
+import { generateRandomName } from "@/lib/names";
+import {
+  PARTNER_CUSTOMER_EXPORT_COLUMNS,
+  PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS,
+} from "@/lib/zod/schemas/partner-profile";
+import { toCentsNumber } from "@dub/utils";
+
+export type PartnerCustomerForExport = {
+  id: string;
+  name: string | null;
+  email: string | null;
+  country: string | null;
+  saleAmount: number | bigint | null;
+  createdAt: Date;
+  subscriptionCanceledAt: Date | null;
+  link?: { shortLink: string; url: string } | null;
+  commissions?: { createdAt: Date }[];
+};
+
+const dateToIso = (d: Date | null | undefined) => (d ? d.toISOString() : "");
+
+const columnOrderById = new Map<string, number>(
+  PARTNER_CUSTOMER_EXPORT_COLUMNS.map((col) => [col.id, col.order]),
+);
+
+export function formatPartnerCustomersForExport(
+  customers: PartnerCustomerForExport[],
+  columns: string[] = PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS,
+  {
+    customerDataSharingEnabledAt,
+    ltvExcluded = false,
+  }: {
+    customerDataSharingEnabledAt: Date | null | undefined;
+    ltvExcluded?: boolean;
+  },
+) {
+  const allowedColumns = columns.filter((key) => {
+    if (key === "name" && !customerDataSharingEnabledAt) {
+      return false;
+    }
+    if (key === "saleAmount" && ltvExcluded) {
+      return false;
+    }
+    return true;
+  });
+
+  const sortedColumns = [...allowedColumns].sort(
+    (a, b) => (columnOrderById.get(a) ?? 999) - (columnOrderById.get(b) ?? 999),
+  );
+
+  return customers.map((c) => {
+    const email = c.email
+      ? customerDataSharingEnabledAt
+        ? c.email
+        : obfuscateCustomerEmail(c.email)
+      : customerDataSharingEnabledAt
+        ? ""
+        : generateRandomName();
+
+    const full: Record<string, string | number> = {
+      id: c.id,
+      email,
+      ...(customerDataSharingEnabledAt
+        ? { name: c.name || c.email || "" }
+        : {}),
+      country: c.country ?? "",
+      link: c.link?.shortLink ?? c.link?.url ?? "",
+      createdAt: dateToIso(c.createdAt),
+      firstSaleAt: dateToIso(c.commissions?.[0]?.createdAt),
+      subscriptionCanceledAt: dateToIso(c.subscriptionCanceledAt),
+      ...(!ltvExcluded
+        ? {
+            saleAmount: formatMoneyCentsForExport(
+              toCentsNumber(c.saleAmount ?? 0),
+              "USD",
+              `customer ${c.id}`,
+            ),
+          }
+        : {}),
+    };
+
+    return sortedColumns.reduce<Record<string, string | number>>((acc, key) => {
+      if (key in full) acc[key] = full[key];
+      return acc;
+    }, {});
+  });
+}
diff --git a/apps/web/lib/customers/api/get-customers.ts b/apps/web/lib/customers/api/get-customers.ts
index 803665aeb41..d42a2c50e0e 100644
--- a/apps/web/lib/customers/api/get-customers.ts
+++ b/apps/web/lib/customers/api/get-customers.ts
@@ -1,8 +1,9 @@
-import { prisma, sanitizeFullTextSearch } from "@/lib/prisma";
+import { prisma } from "@/lib/prisma";
 import { getCustomersQuerySchemaExtended } from "@/lib/zod/schemas/customers";
 import * as z from "zod/v4";
 import { DubApiError } from "../../api/errors";
 import { buildPaginationQuery } from "../../api/pagination";
+import { buildCustomerSearchWhere } from "./customer-count-where";
 
 type GetCustomersInput = z.infer<typeof getCustomersQuerySchemaExtended> & {
   workspaceId: string;
@@ -62,18 +63,7 @@ export async function getCustomers(filters: GetCustomersInput) {
         partnerId,
       }),
       projectId: workspaceId,
-      ...(email
-        ? { email }
-        : externalId
-          ? { externalId }
-          : search
-            ? search.includes("@")
-              ? { email: search }
-              : {
-                  email: { search: sanitizeFullTextSearch(search) },
-                  name: { search: sanitizeFullTextSearch(search) },
-                }
-            : {}),
+      ...buildCustomerSearchWhere({ email, externalId, search }),
       ...(country && {
         country,
       }),
@@ -93,6 +83,11 @@ export async function getCustomers(filters: GetCustomersInput) {
                 shortLink: true,
                 url: true,
                 programId: true,
+                linkReward: {
+                  select: {
+                    discount: true,
+                  },
+                },
               },
             },
             programEnrollment: {
diff --git a/apps/web/lib/discounts/attach-discount.ts b/apps/web/lib/discounts/attach-discount.ts
new file mode 100644
index 00000000000..34749203ec0
--- /dev/null
+++ b/apps/web/lib/discounts/attach-discount.ts
@@ -0,0 +1,209 @@
+import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
+import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";
+import { prisma } from "@/lib/prisma";
+import { pluck } from "@dub/utils";
+import { invalidateLinksForDiscountsJob } from "../jobs/handlers/invalidate-links-for-discounts-job";
+import { publishDiscountCodesCreationJob } from "../jobs/handlers/publish-discount-codes-creation-job";
+
+// Attach a group-level discount to one batch of enrollments in the group.
+// Returns whether more enrollments remain to attach.
+export async function attachDiscount({
+  discountId,
+}: {
+  discountId: string;
+}): Promise<{ hasMore: boolean } | null> {
+  const discount = await prisma.discount.findUnique({
+    where: {
+      id: discountId,
+    },
+    select: {
+      id: true,
+      programId: true,
+      autoProvisionEnabledAt: true,
+      defaultForPartnerGroup: {
+        select: {
+          id: true,
+        },
+      },
+    },
+  });
+
+  if (!discount) {
+    console.info(`Discount ${discountId} not found. Skipping...`);
+    return null;
+  }
+
+  if (isDiscountDeleted(discount)) {
+    console.info(`Discount ${discountId} is soft-deleted. Skipping...`);
+    return null;
+  }
+
+  if (!discount.defaultForPartnerGroup) {
+    console.info(
+      `Discount ${discountId} is not a group-level discount. Skipping...`,
+    );
+    return null;
+  }
+
+  const groupId = discount.defaultForPartnerGroup.id;
+
+  // Inheritors only: no discount yet, or still on a soft-deleted discount
+  // owned by this group. Live partner-level overrides stay put.
+  const inheritingEnrollmentWhere = {
+    OR: [
+      { discountId: null },
+      {
+        discount: {
+          is: {
+            programId: null,
+            groupId,
+          },
+        },
+      },
+    ],
+  };
+
+  const enrollments = await prisma.programEnrollment.findMany({
+    where: {
+      groupId,
+      ...inheritingEnrollmentWhere,
+    },
+    select: {
+      id: true,
+    },
+    take: PRISMA_UPDATEMANY_LIMIT,
+    orderBy: {
+      id: "asc",
+    },
+  });
+
+  if (enrollments.length > 0) {
+    const enrollmentIds = pluck(enrollments, "id");
+
+    // Re-check liveness inside the transaction so a concurrent soft-delete
+    // (clears PartnerGroup.discountId / Discount.programId) cannot stamp this id
+    const count = await prisma.$transaction(async (tx) => {
+      const stillValid = await tx.discount.findFirst({
+        where: {
+          id: discount.id,
+          programId: {
+            not: null,
+          },
+          defaultForPartnerGroup: {
+            is: {
+              id: groupId,
+            },
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+
+      if (!stillValid) {
+        return null;
+      }
+
+      const { count } = await tx.programEnrollment.updateMany({
+        where: {
+          id: {
+            in: enrollmentIds,
+          },
+          groupId,
+          ...inheritingEnrollmentWhere,
+          partnerGroup: {
+            discountId: discount.id,
+          },
+        },
+        data: {
+          discountId: discount.id,
+        },
+      });
+
+      // Only stamp codes for enrollments that still point at this discount
+      // (skips partners who received a partner-level override mid-batch)
+      await tx.discountCode.updateMany({
+        where: {
+          discountId: null,
+          programEnrollment: {
+            id: {
+              in: enrollmentIds,
+            },
+            discountId: discount.id,
+          },
+        },
+        data: {
+          discountId: discount.id,
+        },
+      });
+
+      return count;
+    });
+
+    if (count === null) {
+      console.info(
+        `Discount ${discount.id} is no longer the group default. Skipping...`,
+      );
+      return null;
+    }
+
+    console.info(
+      `Attached discount ${discount.id} to ${count} enrollments in group ${groupId}.`,
+    );
+  }
+
+  if (enrollments.length === PRISMA_UPDATEMANY_LIMIT) {
+    return {
+      hasMore: true,
+    };
+  }
+
+  // Final liveness check before side effects (invalidate / auto-provision)
+  const stillValid = await prisma.discount.findFirst({
+    where: {
+      id: discount.id,
+      programId: {
+        not: null,
+      },
+      defaultForPartnerGroup: {
+        is: {
+          id: groupId,
+        },
+      },
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  if (!stillValid) {
+    console.info(
+      `Discount ${discount.id} is no longer the group default. Skipping...`,
+    );
+    return null;
+  }
+
+  await Promise.all([
+    invalidateLinksForDiscountsJob.dispatch(
+      {
+        by: "discount",
+        programId: discount.programId!,
+        discountId: discount.id,
+      },
+      { label: discount.id },
+    ),
+
+    ...(discount.autoProvisionEnabledAt
+      ? [
+          publishDiscountCodesCreationJob.dispatch(
+            { discountId: discount.id },
+            { label: discount.id },
+          ),
+        ]
+      : []),
+  ]);
+
+  return {
+    hasMore: false,
+  };
+}
diff --git a/apps/web/lib/discounts/create-discount-code.ts b/apps/web/lib/discounts/create-discount-code.ts
index d6d5b02c014..382a1c47da3 100644
--- a/apps/web/lib/discounts/create-discount-code.ts
+++ b/apps/web/lib/discounts/create-discount-code.ts
@@ -1,12 +1,22 @@
 import { createId } from "@/lib/api/create-id";
 import { DubApiError } from "@/lib/api/errors";
 import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
 import { Discount, Link, Partner, Prisma, Project } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
+import { sendWorkspaceWebhook } from "../webhook/publish";
+import { DiscountCodeWebhookSchema } from "../zod/schemas/discount";
 import { constructDiscountCode } from "./construct-discount-code";
 import { getDiscountProvider } from "./discount-provider";
+import { isDiscountDeleted } from "./is-discount-deleted";
+
+const MAX_ATTEMPTS = 3;
 
 interface CreateDiscountCodeArgs {
-  workspace: Pick<Project, "id" | "stripeConnectId" | "shopifyStoreId">;
+  workspace: Pick<
+    Project,
+    "id" | "stripeConnectId" | "shopifyStoreId" | "webhookEnabled"
+  >;
   partner: Pick<Partner, "id" | "name">;
   link: Pick<Link, "id">;
   discount: Discount;
@@ -20,6 +30,13 @@ export async function createDiscountCode({
   discount,
   code,
 }: CreateDiscountCodeArgs) {
+  if (isDiscountDeleted(discount)) {
+    throw new DubApiError({
+      code: "not_found",
+      message: `Discount ${discount.id} not found.`,
+    });
+  }
+
   const finalCode =
     code ||
     constructDiscountCode({
@@ -28,8 +45,16 @@ export async function createDiscountCode({
     });
 
   const linkWithCode = await prisma.link.findUnique({
-    where: { id: link.id },
-    select: { discountCode: { select: { code: true } } },
+    where: {
+      id: link.id,
+    },
+    select: {
+      discountCode: {
+        select: {
+          code: true,
+        },
+      },
+    },
   });
 
   if (linkWithCode?.discountCode) {
@@ -40,42 +65,153 @@ export async function createDiscountCode({
   }
 
   const discountProvider = getDiscountProvider(discount.provider);
+  const shouldRetry = !code;
 
   const externalDiscountCode = await discountProvider.createDiscountCode({
     workspace,
     discount,
     code: finalCode,
-    shouldRetry: code ? false : true,
+    shouldRetry,
   });
 
+  let currentCode = externalDiscountCode.code;
+  let discountCode: DiscountCodeWithDiscount | undefined;
+
+  for (let attempt = 0; attempt < (shouldRetry ? MAX_ATTEMPTS : 1); attempt++) {
+    const result = await createDiscountCodeRecord({
+      workspace,
+      partner,
+      link,
+      discount,
+      code: currentCode,
+      canRetry: shouldRetry && attempt < MAX_ATTEMPTS - 1,
+      discountProvider,
+    });
+
+    if (result.discountCode) {
+      discountCode = result.discountCode;
+      break;
+    }
+
+    currentCode = result.nextCode;
+  }
+
+  if (!discountCode) {
+    throw new DubApiError({
+      code: "conflict",
+      message:
+        "This discount code is already in use, or this link already has a code. Please refresh and try again.",
+    });
+  }
+
+  waitUntil(
+    (async () => {
+      await sendWorkspaceWebhook({
+        workspace,
+        trigger: "discount_code.created",
+        data: DiscountCodeWebhookSchema.parse(discountCode),
+      });
+    })(),
+  );
+
+  return discountCode;
+}
+
+type DiscountCodeWithDiscount = Prisma.DiscountCodeGetPayload<{
+  include: { discount: true };
+}>;
+
+type CreateDiscountCodeRecordResult =
+  | { discountCode: DiscountCodeWithDiscount; nextCode?: never }
+  | { nextCode: string; discountCode?: never };
+
+async function createDiscountCodeRecord({
+  workspace,
+  partner,
+  link,
+  discount,
+  code,
+  canRetry,
+  discountProvider,
+}: {
+  workspace: CreateDiscountCodeArgs["workspace"];
+  partner: CreateDiscountCodeArgs["partner"];
+  link: CreateDiscountCodeArgs["link"];
+  discount: Discount;
+  code: string;
+  canRetry: boolean;
+  discountProvider: ReturnType<typeof getDiscountProvider>;
+}): Promise<CreateDiscountCodeRecordResult> {
   try {
-    return await prisma.discountCode.create({
+    const discountCode = await prisma.discountCode.create({
       data: {
         id: createId({ prefix: "dcode_" }),
-        code: externalDiscountCode.code,
-        programId: discount.programId,
+        code,
+        programId: discount.programId!,
         partnerId: partner.id,
         linkId: link.id,
         discountId: discount.id,
       },
+      include: {
+        discount: true,
+      },
     });
+
+    return {
+      discountCode,
+    };
   } catch (error) {
-    try {
-      await discountProvider.disableDiscountCode({
+    const isUniqueConflict =
+      error instanceof Prisma.PrismaClientKnownRequestError &&
+      error.code === "P2002";
+
+    if (isUniqueConflict && canRetry) {
+      await rollbackExternalDiscountCode({
+        discountProvider,
         workspace,
-        code: externalDiscountCode.code,
+        code,
       });
-    } catch (rollbackError) {
-      console.error("Failed to rollback external discount code", {
-        code: externalDiscountCode.code,
-        rollbackError,
+
+      const existingForLink = await prisma.discountCode.findUnique({
+        where: {
+          linkId: link.id,
+        },
+        select: {
+          code: true,
+        },
       });
+
+      if (existingForLink) {
+        throw new DubApiError({
+          code: "bad_request",
+          message: `This link already has a discount code (${existingForLink.code}) assigned.`,
+        });
+      }
+
+      const nextCode = `${code}${nanoid(2)}`;
+      console.warn(
+        `Discount code "${code}" already exists. Retrying with "${nextCode}".`,
+      );
+
+      const retried = await discountProvider.createDiscountCode({
+        workspace,
+        discount,
+        code: nextCode,
+        shouldRetry: false,
+      });
+
+      return {
+        nextCode: retried.code,
+      };
     }
 
-    if (
-      error instanceof Prisma.PrismaClientKnownRequestError &&
-      error.code === "P2002"
-    ) {
+    await rollbackExternalDiscountCode({
+      discountProvider,
+      workspace,
+      code,
+    });
+
+    if (isUniqueConflict) {
       throw new DubApiError({
         code: "conflict",
         message:
@@ -86,3 +222,25 @@ export async function createDiscountCode({
     throw error;
   }
 }
+
+async function rollbackExternalDiscountCode({
+  discountProvider,
+  workspace,
+  code,
+}: {
+  discountProvider: ReturnType<typeof getDiscountProvider>;
+  workspace: CreateDiscountCodeArgs["workspace"];
+  code: string;
+}) {
+  try {
+    await discountProvider.disableDiscountCode({
+      workspace,
+      code,
+    });
+  } catch (rollbackError) {
+    console.error("Failed to rollback external discount code", {
+      code,
+      rollbackError,
+    });
+  }
+}
diff --git a/apps/web/lib/discounts/delete-discount-code.ts b/apps/web/lib/discounts/delete-discount-code.ts
index 3594084d773..08f1d083725 100644
--- a/apps/web/lib/discounts/delete-discount-code.ts
+++ b/apps/web/lib/discounts/delete-discount-code.ts
@@ -1,13 +1,21 @@
 import { prisma } from "@/lib/prisma";
+import { DiscountCodeWebhookSchema } from "@/lib/zod/schemas/discount";
 import { APP_DOMAIN_WITH_NGROK, chunk } from "@dub/utils";
-import { Discount, DiscountCode } from "@prisma/client";
+import { Discount, DiscountCode, DiscountProvider } from "@prisma/client";
+import { waitUntil } from "@vercel/functions";
+import * as z from "zod/v4";
 import { enqueueBatchJobs } from "../cron/enqueue-batch-jobs";
+import { sendWorkspaceWebhook } from "../webhook/publish";
+
+type DiscountCodeWebhookDiscount = z.infer<
+  typeof DiscountCodeWebhookSchema
+>["discount"];
 
 type DeleteDiscountCodesParams = Pick<
   DiscountCode,
-  "id" | "code" | "programId"
+  "id" | "code" | "programId" | "partnerId" | "linkId" | "disabledAt"
 > & {
-  discount: Pick<Discount, "provider"> | null;
+  discount: DiscountCodeWebhookDiscount;
 };
 
 type EnqueueDeleteDiscountCodeParams = Pick<
@@ -38,6 +46,8 @@ export async function deleteDiscountCodes(
   }
 
   if (isSoftDelete) {
+    const disabledAt = new Date();
+
     // Soft delete the discount codes from the database (mark them as disabled)
     const disabledDiscountCodes = await prisma.discountCode.updateMany({
       where: {
@@ -46,13 +56,22 @@ export async function deleteDiscountCodes(
         },
       },
       data: {
-        disabledAt: new Date(),
+        disabledAt,
       },
     });
 
     console.log(
       `[deleteDiscountCodes] Disabled ${disabledDiscountCodes.count} discount codes.`,
     );
+
+    waitUntil(
+      sendDiscountCodeDeletedWebhooks(
+        discountCodes.map((discountCode) => ({
+          ...discountCode,
+          disabledAt,
+        })),
+      ),
+    );
   } else {
     // Delete the discount codes from the database
     const deletedDiscountCodes = await prisma.discountCode.deleteMany({
@@ -66,6 +85,8 @@ export async function deleteDiscountCodes(
     console.log(
       `[deleteDiscountCodes] Deleted ${deletedDiscountCodes.count} discount codes.`,
     );
+
+    waitUntil(sendDiscountCodeDeletedWebhooks(discountCodes));
   }
 
   await enqueueDeleteDiscountCode(discountCodes);
@@ -74,12 +95,13 @@ export async function deleteDiscountCodes(
 // Only enqueue external-provider cleanup for codes whose provider is known.
 // Orphaned codes (discount relation is null) still get deleted locally above
 // but we can't tell which external provider to clean up, so we skip them.
+// Custom providers disable via webhook, so they are not queued.
 export async function enqueueDeleteDiscountCode(
   discountCodes: EnqueueDeleteDiscountCodeParams[],
 ) {
   const codesWithProvider = discountCodes.filter(
     (dc): dc is typeof dc & { discount: Pick<Discount, "provider"> } =>
-      dc.discount != null,
+      dc.discount != null && dc.discount.provider !== DiscountProvider.custom,
   );
 
   if (codesWithProvider.length === 0) {
@@ -104,3 +126,42 @@ export async function enqueueDeleteDiscountCode(
     );
   }
 }
+
+async function sendDiscountCodeDeletedWebhooks(
+  discountCodes: DeleteDiscountCodesParams[],
+) {
+  const programIds = [...new Set(discountCodes.map((dc) => dc.programId))];
+
+  const workspaces = await prisma.project.findMany({
+    where: {
+      defaultProgramId: {
+        in: programIds,
+      },
+    },
+    select: {
+      id: true,
+      webhookEnabled: true,
+      defaultProgramId: true,
+    },
+  });
+
+  const workspaceByProgramId = new Map(
+    workspaces.map((workspace) => [workspace.defaultProgramId, workspace]),
+  );
+
+  await Promise.all(
+    discountCodes.map((discountCode) => {
+      const workspace = workspaceByProgramId.get(discountCode.programId);
+
+      if (!workspace) {
+        return;
+      }
+
+      return sendWorkspaceWebhook({
+        workspace,
+        trigger: "discount_code.deleted",
+        data: DiscountCodeWebhookSchema.parse(discountCode),
+      });
+    }),
+  );
+}
diff --git a/apps/web/lib/discounts/delete-orphaned-discounts.ts b/apps/web/lib/discounts/delete-orphaned-discounts.ts
new file mode 100644
index 00000000000..93aa1a51e1c
--- /dev/null
+++ b/apps/web/lib/discounts/delete-orphaned-discounts.ts
@@ -0,0 +1,41 @@
+import { pluck } from "@dub/utils";
+import { prisma } from "../prisma";
+
+// Hard-delete soft-deleted discounts (programId null) once nothing still
+// references them. Detach workflow remaps codes first; this cron finishes
+// cleanup after the stale cutoff so equivalence checks can still see the row.
+export async function deleteOrphanedDiscounts(cutoff: Date) {
+  const discounts = await prisma.discount.findMany({
+    where: {
+      programId: null,
+      updatedAt: {
+        lt: cutoff,
+      },
+      programEnrollments: { none: {} },
+      defaultForPartnerGroup: { is: null },
+      linkDiscounts: { none: {} },
+      discountCodes: { none: {} },
+    },
+    select: {
+      id: true,
+    },
+    orderBy: {
+      updatedAt: "desc",
+    },
+    take: 50,
+  });
+
+  if (discounts.length === 0) {
+    return 0;
+  }
+
+  const { count } = await prisma.discount.deleteMany({
+    where: {
+      id: {
+        in: pluck(discounts, "id"),
+      },
+    },
+  });
+
+  return count;
+}
diff --git a/apps/web/lib/discounts/detach-discount.ts b/apps/web/lib/discounts/detach-discount.ts
new file mode 100644
index 00000000000..e4485829256
--- /dev/null
+++ b/apps/web/lib/discounts/detach-discount.ts
@@ -0,0 +1,222 @@
+import { prisma } from "@/lib/prisma";
+import { pluck } from "@dub/utils";
+import { Prisma } from "@prisma/client";
+import { invalidateLinksForDiscountsJob } from "../jobs/handlers/invalidate-links-for-discounts-job";
+import { remapDiscountCodeJob } from "../jobs/handlers/remap-discount-code-job";
+
+type DetachDiscountParams = {
+  programId: string;
+  discountId: string;
+};
+
+const BATCH_SIZE = 500;
+
+// Detach discount from program enrollments
+export async function detachDiscountFromProgramEnrollments({
+  programId,
+  discountId,
+}: DetachDiscountParams) {
+  let startAfterId: string | null = null;
+
+  const discount = await prisma.discount.findUnique({
+    where: {
+      id: discountId,
+    },
+    select: {
+      id: true,
+      partnerGroup: {
+        select: {
+          discountId: true,
+        },
+      },
+    },
+  });
+
+  if (!discount) {
+    console.info(`Discount ${discountId} not found. Skipping...`);
+    return;
+  }
+
+  // Restore enrollments to the owning group's current default, or clear them
+  // if this discount was the group default
+  const groupDiscountId = discount.partnerGroup?.discountId ?? null;
+  const restoredDiscountId =
+    groupDiscountId !== discount.id ? groupDiscountId : null;
+
+  while (true) {
+    const where: Prisma.ProgramEnrollmentWhereInput = {
+      discountId,
+      ...(startAfterId
+        ? {
+            id: {
+              gt: startAfterId,
+            },
+          }
+        : {}),
+    };
+
+    const enrollments = await prisma.programEnrollment.findMany({
+      where,
+      select: {
+        id: true,
+        partnerId: true,
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: BATCH_SIZE,
+    });
+
+    if (enrollments.length === 0) {
+      break;
+    }
+
+    await prisma.programEnrollment.updateMany({
+      where: {
+        id: {
+          in: pluck(enrollments, "id"),
+        },
+        discountId,
+      },
+      data: {
+        discountId: restoredDiscountId,
+      },
+    });
+
+    await invalidateLinksForDiscountsJob.dispatch(
+      {
+        by: "partners",
+        programId,
+        partnerIds: pluck(enrollments, "partnerId"),
+      },
+      {
+        label: discountId,
+      },
+    );
+
+    startAfterId = enrollments[enrollments.length - 1].id;
+
+    if (enrollments.length < BATCH_SIZE) {
+      break;
+    }
+  }
+}
+
+// Detach discount from link rewards
+export async function detachDiscountFromLinkRewards({
+  programId,
+  discountId,
+}: DetachDiscountParams) {
+  let startAfterId: string | null = null;
+
+  while (true) {
+    const where: Prisma.LinkRewardWhereInput = {
+      discountId,
+      ...(startAfterId && {
+        id: {
+          gt: startAfterId,
+        },
+      }),
+    };
+
+    const linkRewards = await prisma.linkReward.findMany({
+      where,
+      select: {
+        id: true,
+        link: {
+          select: {
+            partnerId: true,
+          },
+        },
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: BATCH_SIZE,
+    });
+
+    if (linkRewards.length === 0) {
+      break;
+    }
+
+    await prisma.linkReward.updateMany({
+      where: {
+        id: {
+          in: pluck(linkRewards, "id"),
+        },
+        discountId,
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    const partnerIds = [
+      ...new Set(
+        linkRewards
+          .map(({ link }) => link.partnerId)
+          .filter((id): id is string => Boolean(id)),
+      ),
+    ];
+
+    if (partnerIds.length > 0) {
+      await invalidateLinksForDiscountsJob.dispatch({
+        by: "partners",
+        programId,
+        partnerIds,
+      });
+    }
+
+    startAfterId = linkRewards[linkRewards.length - 1].id;
+
+    if (linkRewards.length < BATCH_SIZE) {
+      break;
+    }
+  }
+}
+
+// Dispatch per-code remap jobs for codes still pointing at this discount
+export async function dispatchRemapDiscountCodes({
+  discountId,
+}: DetachDiscountParams) {
+  let startAfterId: string | null = null;
+
+  while (true) {
+    const where: Prisma.DiscountCodeWhereInput = {
+      discountId,
+      disabledAt: null,
+      ...(startAfterId && {
+        id: {
+          gt: startAfterId,
+        },
+      }),
+    };
+
+    const discountCodes = await prisma.discountCode.findMany({
+      where,
+      select: {
+        id: true,
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: BATCH_SIZE,
+    });
+
+    if (discountCodes.length === 0) {
+      break;
+    }
+
+    await remapDiscountCodeJob.dispatchBatch(
+      discountCodes.map(({ id }) => ({
+        discountCodeId: id,
+      })),
+    );
+
+    startAfterId = discountCodes[discountCodes.length - 1].id;
+
+    if (discountCodes.length < BATCH_SIZE) {
+      break;
+    }
+  }
+}
diff --git a/apps/web/lib/discounts/discount-provider-custom.ts b/apps/web/lib/discounts/discount-provider-custom.ts
new file mode 100644
index 00000000000..10a73e40c64
--- /dev/null
+++ b/apps/web/lib/discounts/discount-provider-custom.ts
@@ -0,0 +1,31 @@
+function createCustomDiscountProvider() {
+  const getCoupon = async () => {
+    throw new Error("Custom discount provider does not support this method.");
+  };
+
+  const createCoupon = async () => {
+    throw new Error("Custom discount provider does not support this method.");
+  };
+
+  const createDiscountCode = async ({ code }: { code: string }) => {
+    return { code };
+  };
+
+  const disableDiscountCode = async () => {
+    // Dub is the source of truth; external apps disable coupons via webhook.
+  };
+
+  const assertDiscountIntegration = async () => {
+    // Custom discounts do not require Stripe or Shopify.
+  };
+
+  return {
+    getCoupon,
+    createCoupon,
+    createDiscountCode,
+    disableDiscountCode,
+    assertDiscountIntegration,
+  };
+}
+
+export const customDiscountProvider = createCustomDiscountProvider();
diff --git a/apps/web/lib/discounts/discount-provider.ts b/apps/web/lib/discounts/discount-provider.ts
index f39f609ec7f..e827d6e087d 100644
--- a/apps/web/lib/discounts/discount-provider.ts
+++ b/apps/web/lib/discounts/discount-provider.ts
@@ -1,10 +1,12 @@
 import { DiscountProvider } from "@prisma/client";
+import { customDiscountProvider } from "./discount-provider-custom";
 import { shopifyDiscountProvider } from "./discount-provider-shopify";
 import { stripeDiscountProvider } from "./discount-provider-stripe";
 
 const discountProviders = {
   stripe: stripeDiscountProvider,
   shopify: shopifyDiscountProvider,
+  custom: customDiscountProvider,
 } as const;
 
 export function getDiscountProvider(name: DiscountProvider) {
diff --git a/apps/web/lib/discounts/generate-discount-code-for-partner.ts b/apps/web/lib/discounts/generate-discount-code-for-partner.ts
index 8df75a78592..a52873d122a 100644
--- a/apps/web/lib/discounts/generate-discount-code-for-partner.ts
+++ b/apps/web/lib/discounts/generate-discount-code-for-partner.ts
@@ -1,12 +1,16 @@
 import { prisma } from "@/lib/prisma";
 import { EnrolledPartnerProps } from "@/lib/types";
+import { Project } from "@prisma/client";
 import { createDiscountCode } from "./create-discount-code";
 
 export async function generateDiscountCodeForPartner({
-  workspaceId,
+  workspace,
   partner,
 }: {
-  workspaceId: string;
+  workspace: Pick<
+    Project,
+    "id" | "webhookEnabled" | "stripeConnectId" | "shopifyStoreId"
+  >;
   partner: Pick<EnrolledPartnerProps, "id" | "name" | "groupId">;
 }) {
   if (!partner.groupId) {
@@ -20,29 +24,53 @@ export async function generateDiscountCodeForPartner({
     where: {
       id: partner.groupId,
     },
-    include: {
-      discount: true,
+    select: {
+      programId: true,
     },
   });
 
-  if (!group?.discount?.autoProvisionEnabledAt) {
+  if (!group) {
     console.log(
-      `Group ${partner.groupId} does not have auto provision enabled, skipping discount code creation...`,
+      `Group ${partner.groupId} not found, skipping discount code creation...`,
     );
     return;
   }
 
-  const workspace = await prisma.project.findUniqueOrThrow({
+  const programEnrollment = await prisma.programEnrollment.findUnique({
     where: {
-      id: workspaceId,
+      partnerId_programId: {
+        partnerId: partner.id,
+        programId: group.programId,
+      },
     },
     select: {
-      id: true,
-      stripeConnectId: true,
-      shopifyStoreId: true,
+      discount: true,
     },
   });
 
+  if (!programEnrollment) {
+    console.log(
+      `No program enrollment found for partner ${partner.id}, skipping discount code creation...`,
+    );
+    return;
+  }
+
+  const discount = programEnrollment?.discount;
+
+  if (!discount) {
+    console.log(
+      `No discount found for partner ${partner.id}, skipping discount code creation...`,
+    );
+    return;
+  }
+
+  if (!discount.autoProvisionEnabledAt) {
+    console.log(
+      `Discount ${discount.id} does not have auto provision enabled, skipping discount code creation...`,
+    );
+    return;
+  }
+
   const partnerDefaultLink = await prisma.link.findFirst({
     where: {
       programId: group.programId,
@@ -71,7 +99,7 @@ export async function generateDiscountCodeForPartner({
       workspace,
       partner,
       link: partnerDefaultLink,
-      discount: group.discount,
+      discount,
     });
   } catch (error) {
     console.error(
diff --git a/apps/web/lib/discounts/is-discount-deleted.ts b/apps/web/lib/discounts/is-discount-deleted.ts
new file mode 100644
index 00000000000..08a0ee52e6e
--- /dev/null
+++ b/apps/web/lib/discounts/is-discount-deleted.ts
@@ -0,0 +1,8 @@
+import { Discount } from "@prisma/client";
+
+// Soft-deleted discounts keep their row with programId cleared.
+export function isDiscountDeleted(
+  discount: Pick<Discount, "programId">,
+): boolean {
+  return !discount.programId;
+}
diff --git a/apps/web/lib/discounts/is-discount-equivalent.ts b/apps/web/lib/discounts/is-discount-equivalent.ts
index fc8d6ec0939..55ffef88fd1 100644
--- a/apps/web/lib/discounts/is-discount-equivalent.ts
+++ b/apps/web/lib/discounts/is-discount-equivalent.ts
@@ -1,26 +1,36 @@
 import { Discount } from "@prisma/client";
 
+type DiscountEquivalenceFields = Pick<
+  Discount,
+  "couponId" | "provider" | "amount" | "type" | "maxDuration"
+>;
+
 export function isDiscountEquivalent(
-  firstDiscount: Discount | null | undefined,
-  secondDiscount: Discount | null | undefined,
+  firstDiscount: DiscountEquivalenceFields | null | undefined,
+  secondDiscount: DiscountEquivalenceFields | null | undefined,
 ): boolean {
   if (!firstDiscount || !secondDiscount) {
     return false;
   }
 
-  // If both groups use the same Stripe coupon
-  if (firstDiscount.couponId === secondDiscount.couponId) {
-    return true;
+  if (firstDiscount.provider !== secondDiscount.provider) {
+    return false;
   }
 
-  // If both discounts are effectively equivalent
+  // If both groups use the same coupon
   if (
-    firstDiscount.amount === secondDiscount.amount &&
-    firstDiscount.type === secondDiscount.type &&
-    firstDiscount.maxDuration === secondDiscount.maxDuration
+    firstDiscount.couponId &&
+    secondDiscount.couponId &&
+    firstDiscount.couponId === secondDiscount.couponId
   ) {
     return true;
   }
 
-  return false;
+  // If both discounts are effectively equivalent
+  return (
+    firstDiscount.provider === secondDiscount.provider &&
+    firstDiscount.amount === secondDiscount.amount &&
+    firstDiscount.type === secondDiscount.type &&
+    firstDiscount.maxDuration === secondDiscount.maxDuration
+  );
 }
diff --git a/apps/web/lib/discounts/remap-discount-code.ts b/apps/web/lib/discounts/remap-discount-code.ts
new file mode 100644
index 00000000000..b9aa41d5def
--- /dev/null
+++ b/apps/web/lib/discounts/remap-discount-code.ts
@@ -0,0 +1,110 @@
+import { prisma } from "@/lib/prisma";
+import { deleteDiscountCodes } from "./delete-discount-code";
+import { isDiscountDeleted } from "./is-discount-deleted";
+import { isDiscountEquivalent } from "./is-discount-equivalent";
+import { enqueueMissingDiscountCodes } from "./sync-discount-codes";
+
+// Remap a single discount code to the partner's current enrollment/link discount
+export async function remapDiscountCode({
+  discountCodeId,
+}: {
+  discountCodeId: string;
+}) {
+  const discountCode = await prisma.discountCode.findUnique({
+    where: {
+      id: discountCodeId,
+    },
+    include: {
+      discount: true,
+      link: {
+        select: {
+          id: true,
+          linkReward: {
+            select: {
+              discount: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!discountCode) {
+    console.info(
+      `Discount code ${discountCodeId} not found. Skipping remap...`,
+    );
+    return;
+  }
+
+  if (discountCode.disabledAt) {
+    console.info(
+      `Discount code ${discountCodeId} is disabled. Skipping remap...`,
+    );
+    return;
+  }
+
+  const programEnrollment = await prisma.programEnrollment.findUnique({
+    where: {
+      partnerId_programId: {
+        partnerId: discountCode.partnerId,
+        programId: discountCode.programId,
+      },
+    },
+    select: {
+      discount: true,
+    },
+  });
+
+  if (!programEnrollment) {
+    console.info(
+      `Program enrollment not found for partner ${discountCode.partnerId} and program ${discountCode.programId}. Skipping remap of discount code ${discountCodeId}...`,
+    );
+    return;
+  }
+
+  const existingDiscount = discountCode.discount;
+
+  // Prefer the link discount if it exists, otherwise use the enrollment discount
+  const newDiscount =
+    discountCode.link?.linkReward?.discount ?? programEnrollment.discount;
+
+  // No live discount for this code.
+  if (!newDiscount || isDiscountDeleted(newDiscount)) {
+    await deleteDiscountCodes([discountCode]);
+    return;
+  }
+
+  // The discount is already the correct one, skip
+  if (existingDiscount?.id === newDiscount.id) {
+    return;
+  }
+
+  const isEquivalent = isDiscountEquivalent(newDiscount, existingDiscount);
+
+  // The discounts are equivalent, update the discount code to use the new discount
+  if (isEquivalent) {
+    await prisma.discountCode.updateMany({
+      where: {
+        id: discountCode.id,
+      },
+      data: {
+        discountId: newDiscount.id,
+      },
+    });
+    return;
+  }
+
+  // The discounts are different, delete the discount code then provision a new
+  // one on default links when the destination discount has auto-provision on.
+  await deleteDiscountCodes([discountCode]);
+
+  await enqueueMissingDiscountCodes({
+    programId: discountCode.programId,
+    enrollments: [
+      {
+        partnerId: discountCode.partnerId,
+        discount: programEnrollment.discount,
+      },
+    ],
+  });
+}
diff --git a/apps/web/lib/discounts/sync-discount-codes.ts b/apps/web/lib/discounts/sync-discount-codes.ts
new file mode 100644
index 00000000000..b4b16f1c3e9
--- /dev/null
+++ b/apps/web/lib/discounts/sync-discount-codes.ts
@@ -0,0 +1,147 @@
+import { createDiscountCodeForLinkJob } from "@/lib/jobs/handlers/create-discount-code-for-link-job";
+import { remapDiscountCodeJob } from "@/lib/jobs/handlers/remap-discount-code-job";
+import { prisma } from "@/lib/prisma";
+import { pluck } from "@dub/utils";
+import { Discount } from "@prisma/client";
+
+// Remap existing codes and enqueue missing default-link codes for partners in a program
+export async function syncDiscountCodes({
+  programId,
+  partnerIds,
+}: {
+  programId: string;
+  partnerIds: string[];
+}) {
+  partnerIds = [...new Set(partnerIds)];
+
+  if (partnerIds.length === 0) {
+    return;
+  }
+
+  const programEnrollments = await prisma.programEnrollment.findMany({
+    where: {
+      programId,
+      partnerId: {
+        in: partnerIds,
+      },
+    },
+    select: {
+      partnerId: true,
+      discount: true,
+    },
+  });
+
+  if (programEnrollments.length === 0) {
+    console.info(
+      `No program enrollments found for program ${programId}. Skipping discount code sync...`,
+    );
+    return;
+  }
+
+  const enrolledPartnerIds = pluck(programEnrollments, "partnerId");
+
+  const discountCodes = await prisma.discountCode.findMany({
+    where: {
+      programId,
+      partnerId: {
+        in: enrolledPartnerIds,
+      },
+      disabledAt: null,
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  if (discountCodes.length === 0) {
+    console.info(
+      `No discount codes found for ${enrolledPartnerIds.length} partners in program ${programId}. Skipping remap jobs...`,
+    );
+  } else {
+    await remapDiscountCodeJob.dispatchBatch(
+      discountCodes.map(({ id }) => ({
+        discountCodeId: id,
+      })),
+    );
+  }
+
+  await enqueueMissingDiscountCodes({
+    programId,
+    enrollments: programEnrollments,
+  });
+}
+
+// Find default links that do not have a discount code assigned to them and enqueue a job to create one
+export async function enqueueMissingDiscountCodes({
+  programId,
+  enrollments,
+}: {
+  programId: string;
+  enrollments: {
+    partnerId: string;
+    discount: Pick<Discount, "autoProvisionEnabledAt"> | null;
+  }[];
+}) {
+  if (enrollments.length === 0) {
+    return;
+  }
+
+  const enrollmentDiscountByPartnerId = new Map(
+    enrollments.map((enrollment) => [
+      enrollment.partnerId,
+      enrollment.discount,
+    ]),
+  );
+
+  const links = await prisma.link.findMany({
+    where: {
+      partnerId: {
+        in: pluck(enrollments, "partnerId"),
+      },
+      programId,
+      partnerGroupDefaultLinkId: {
+        not: null,
+      },
+      discountCode: {
+        is: null,
+      },
+    },
+    select: {
+      id: true,
+      partnerId: true,
+      linkReward: {
+        select: {
+          discount: {
+            select: {
+              autoProvisionEnabledAt: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  const linksToProvision = links.filter((link) => {
+    if (!link.partnerId) {
+      return false;
+    }
+
+    const enrollmentDiscount = enrollmentDiscountByPartnerId.get(
+      link.partnerId,
+    );
+
+    const discount = link.linkReward?.discount ?? enrollmentDiscount ?? null;
+
+    return Boolean(discount?.autoProvisionEnabledAt);
+  });
+
+  if (linksToProvision.length === 0) {
+    return;
+  }
+
+  await createDiscountCodeForLinkJob.dispatchBatch(
+    linksToProvision.map((link) => ({
+      linkId: link.id,
+    })),
+  );
+}
diff --git a/apps/web/lib/domain-connect/allowed-origins.ts b/apps/web/lib/domain-connect/allowed-origins.ts
new file mode 100644
index 00000000000..6cf103ff1d9
--- /dev/null
+++ b/apps/web/lib/domain-connect/allowed-origins.ts
@@ -0,0 +1,16 @@
+/** Allowed origins for Domain Connect SyncUX / signed apply redirects. */
+export const ALLOWED_SYNC_UX_ORIGINS = [
+  "https://vercel.com",
+  "https://dash.cloudflare.com",
+] as const;
+
+/** True when `url` (SyncUX or apply URL) has an allowlisted origin. */
+export function isAllowedSyncUXOrigin(url: string): boolean {
+  try {
+    return (ALLOWED_SYNC_UX_ORIGINS as readonly string[]).includes(
+      new URL(url).origin,
+    );
+  } catch {
+    return false;
+  }
+}
diff --git a/apps/web/lib/domain-connect/constants.ts b/apps/web/lib/domain-connect/constants.ts
new file mode 100644
index 00000000000..26921b7d94b
--- /dev/null
+++ b/apps/web/lib/domain-connect/constants.ts
@@ -0,0 +1,7 @@
+export const DUB_CUSTOM_DOMAIN_A_RECORD = "76.76.21.21";
+export const DUB_CUSTOM_DOMAIN_CNAME = "cname.dub.co";
+export const DOMAIN_CONNECT_PROVIDER_ID = "dub.co";
+export const DOMAIN_CONNECT_KEY_HOST = "_dck1";
+export const DEFAULT_DC_SERVICE_APEX = "links-apex";
+export const DEFAULT_DC_SERVICE_SUBDOMAIN = "links-subdomain";
+export const DEFAULT_DC_SERVICE_EMAIL = "email";
diff --git a/apps/web/lib/domain-connect/discover.ts b/apps/web/lib/domain-connect/discover.ts
new file mode 100644
index 00000000000..dee52ca7975
--- /dev/null
+++ b/apps/web/lib/domain-connect/discover.ts
@@ -0,0 +1,141 @@
+import dns from "node:dns/promises";
+import { isAllowedSyncUXOrigin } from "./allowed-origins";
+import type {
+  DomainConnectDiscovery,
+  DomainConnectProviderKind,
+} from "./types";
+
+type DomainConnectSettings = {
+  providerId?: string;
+  urlSyncUX?: string;
+};
+
+function providerKindFromId(
+  id: string | undefined,
+): DomainConnectProviderKind | null {
+  if (!id) return null;
+  const lower = id.toLowerCase();
+  if (lower === "vercel.com") return "vercel";
+  if (lower === "cloudflare.com" || lower.includes("cloudflare"))
+    return "cloudflare";
+  return null;
+}
+
+const ALLOWED_SETTINGS_HOST_SUFFIXES = [
+  "domainconnect.org",
+  ".vercel.com",
+  ".cloudflare.com",
+];
+
+function settingsBaseFromTxtRecords(records: string[][]): string | null {
+  const candidates = records
+    .map((chunks) =>
+      chunks
+        .join("")
+        .replace(/^"(.*)"$/, "$1")
+        .trim(),
+    )
+    .map((s) =>
+      s
+        .replace(/^https?:\/\//i, "")
+        .replace(/\/$/, "")
+        .toLowerCase(),
+    )
+    .filter((s) => {
+      if (!s.includes(".")) return false;
+      const [host, ...pathParts] = s.split("/");
+      if (
+        !host ||
+        !/^[a-z0-9.-]+$/.test(host) ||
+        /^\d+\.\d+\.\d+\.\d+$/.test(host)
+      ) {
+        return false;
+      }
+      // Allow only simple path segments (no query/fragment)
+      if (
+        pathParts.some(
+          (p) => !p || !/^[a-z0-9._-]+$/i.test(p) || p === "." || p === "..",
+        )
+      ) {
+        return false;
+      }
+      return ALLOWED_SETTINGS_HOST_SUFFIXES.some((suffix) => {
+        const hostnameSuffix = suffix.replace(/^\./, "");
+        return host === hostnameSuffix || host.endsWith(`.${hostnameSuffix}`);
+      });
+    });
+
+  return candidates[0] ?? null;
+}
+
+/**
+ * Discover Domain Connect provider for the given apex domain.
+ * Returns null when the provider is not Vercel or Cloudflare, or on any error.
+ */
+export async function discoverDomainConnect(
+  apexDomain: string,
+): Promise<DomainConnectDiscovery | null> {
+  let txtRecords: string[][];
+  try {
+    txtRecords = await dns.resolveTxt(
+      `_domainconnect.${apexDomain.toLowerCase()}`,
+    );
+  } catch {
+    return null;
+  }
+
+  const settingsBase = settingsBaseFromTxtRecords(txtRecords);
+  if (!settingsBase) return null;
+
+  const settingsUrl = `https://${settingsBase}/v2/${encodeURIComponent(apexDomain.toLowerCase())}/settings`;
+  let res: Response;
+  try {
+    res = await fetch(settingsUrl, {
+      headers: { accept: "application/json" },
+      redirect: "manual",
+      signal: AbortSignal.timeout(3000),
+    });
+  } catch {
+    return null;
+  }
+
+  if (!res.ok) return null;
+
+  let json: DomainConnectSettings;
+  try {
+    json = (await res.json()) as DomainConnectSettings;
+  } catch {
+    return null;
+  }
+
+  const urlSyncUX = json.urlSyncUX?.trim().replace(/\/$/, "");
+  const dnsProviderId = json.providerId ?? "";
+  if (!urlSyncUX || !dnsProviderId) return null;
+
+  let parsedSyncUX: URL;
+  try {
+    parsedSyncUX = new URL(urlSyncUX);
+  } catch {
+    return null;
+  }
+  if (parsedSyncUX.protocol !== "https:") return null;
+  if (!isAllowedSyncUXOrigin(urlSyncUX)) return null;
+
+  const providerKind = providerKindFromId(dnsProviderId);
+  if (!providerKind) return null;
+
+  return { providerKind, dnsProviderId, urlSyncUX };
+}
+
+/**
+ * Only discover when the feature is enabled and the status warrants it.
+ */
+export async function discoverDomainConnectIfEligible(
+  apexDomain: string,
+  status: string,
+): Promise<DomainConnectDiscovery | null> {
+  if (!process.env.DOMAIN_CONNECT_PRIVATE_KEY?.trim()) return null;
+  if (status !== "Pending Verification" && status !== "Invalid Configuration")
+    return null;
+  return discoverDomainConnect(apexDomain);
+}
diff --git a/apps/web/lib/domain-connect/map-email-domain-records.ts b/apps/web/lib/domain-connect/map-email-domain-records.ts
new file mode 100644
index 00000000000..7e8c3b49fab
--- /dev/null
+++ b/apps/web/lib/domain-connect/map-email-domain-records.ts
@@ -0,0 +1,255 @@
+/**
+ * Map Resend email-domain DNS records to Domain Connect apply query params
+ * for serviceId `email` (dub.co.email.json v2).
+ *
+ * Subdomain email domains (e.g. partners.acme.com) use the Domain Connect
+ * `host` query parameter — record hosts stay relative to that email domain
+ * (`send`, `resend._domainkey`, `_dmarc`), never zone-appended
+ * (`send.partners`, `_dmarc.partners`).
+ */
+
+type ResendDnsRecord = {
+  record?: string;
+  type?: string;
+  name?: string;
+  value?: string;
+  priority?: number | null;
+};
+
+type EmailDomainConnectParams = {
+  groupId: string;
+  /** Domain Connect `host` — email subdomain relative to the zone apex, if any. */
+  host?: string;
+  mxHost: string;
+  mxValue: string;
+  spfTxtHost: string;
+  spfTxtValue: string;
+  dkimSelector: string;
+  dkimTxtValue: string;
+  dkim2Selector?: string;
+  dkim2TxtValue?: string;
+};
+
+/** Strip full SPF TXT into SPFM merge mechanisms (no v=spf1 / trailing all). */
+function toSpfRules(raw: string): string {
+  return raw
+    .trim()
+    .replace(/^"+|"+$/g, "")
+    .replace(/^v=spf1\s+/i, "")
+    .replace(/\s+[~\-+?]?all\s*$/i, "")
+    .trim();
+}
+
+/** Ensure DKIM TXT starts with v=DKIM1 for template conflict matching. */
+function normalizeDkimValue(raw: string): string {
+  const value = raw.trim().replace(/^"+|"+$/g, "");
+  if (!value) return value;
+  if (/^v=DKIM1/i.test(value)) return value;
+  if (/^p=/i.test(value)) return `v=DKIM1; k=rsa; ${value}`;
+  return `v=DKIM1; ${value}`;
+}
+
+/**
+ * Relativize a Resend record name onto the email domain slug
+ * (Domain Connect host scope), not the zone apex.
+ *
+ * e.g. slug `partners.acme.com`, name `send` → `send`
+ *      slug `partners.acme.com`, name `send.partners.acme.com` → `send`
+ *      slug `acme.com`, name `@` → `@`
+ */
+function relativeToEmailSlug({
+  resendName,
+  emailSlug,
+}: {
+  resendName: string;
+  emailSlug: string;
+}): string {
+  const name = (resendName || "").trim().toLowerCase();
+  const slug = emailSlug.toLowerCase();
+
+  if (name === "" || name === "@" || name === slug) return "@";
+
+  const slugSuffix = `.${slug}`;
+  if (name.endsWith(slugSuffix)) {
+    const relative = name.slice(0, -slugSuffix.length);
+    return relative || "@";
+  }
+
+  return name;
+}
+
+/**
+ * Relativize a Resend record name onto the zone apex (for forward-instructions
+ * emails that list zone-absolute labels an admin pastes into DNS).
+ *
+ * e.g. slug `partners.acme.com`, apex `acme.com`, name `send`
+ *   → host `send.partners`
+ */
+function toZoneHost({
+  resendName,
+  emailSlug,
+  apex,
+}: {
+  resendName: string;
+  emailSlug: string;
+  apex: string;
+}): string {
+  const name = (resendName || "").trim().toLowerCase();
+  const slug = emailSlug.toLowerCase();
+  const apexLower = apex.toLowerCase();
+
+  const fqdn =
+    name === "" || name === "@"
+      ? slug
+      : name === slug || name.endsWith(`.${slug}`)
+        ? name
+        : `${name}.${slug}`.replace(/\.+/g, ".");
+
+  const apexSuffix = `.${apexLower}`;
+  if (fqdn === apexLower) return "@";
+  if (fqdn.endsWith(apexSuffix)) return fqdn.slice(0, -apexSuffix.length);
+  return name || "@";
+}
+
+function extractDkimSelector(relativeHost: string): string | null {
+  const host = relativeHost.trim().toLowerCase();
+  if (!host || host === "@") return null;
+  const match = host.match(/^([^.]+)\._domainkey$/i);
+  if (match?.[1]) return match[1];
+  // Resend sometimes returns only the selector label
+  if (!host.includes(".")) return host;
+  return null;
+}
+
+/**
+ * Build Domain Connect query params from Resend domain records.
+ * Returns null when required MX, SPF TXT, or primary DKIM are missing.
+ */
+export function mapResendRecordsToEmailDomainConnectParams({
+  records,
+  emailSlug,
+  apex,
+}: {
+  records: ResendDnsRecord[];
+  emailSlug: string;
+  apex: string;
+}): EmailDomainConnectParams | null {
+  const mx = records.find(
+    (r) => r.type === "MX" && r.record !== "Receiving" && r.name && r.value,
+  );
+  const spfTxt = records.find(
+    (r) => r.record === "SPF" && r.type === "TXT" && r.name && r.value,
+  );
+  const dkims = records.filter(
+    (r) => r.record === "DKIM" && r.type === "TXT" && r.name && r.value,
+  );
+
+  if (!mx?.name || !mx.value || !spfTxt?.name || !spfTxt.value || !dkims[0]) {
+    return null;
+  }
+
+  const mxHost = relativeToEmailSlug({
+    resendName: mx.name,
+    emailSlug,
+  });
+  const spfTxtHost = relativeToEmailSlug({
+    resendName: spfTxt.name,
+    emailSlug,
+  });
+  const spfTxtValue = toSpfRules(spfTxt.value);
+  if (!spfTxtValue || !mxHost || mxHost === "@" || !spfTxtHost) return null;
+
+  const dkimRelative = relativeToEmailSlug({
+    resendName: dkims[0].name!,
+    emailSlug,
+  });
+  const dkimSelector = extractDkimSelector(dkimRelative);
+  const dkimTxtValue = normalizeDkimValue(dkims[0].value!);
+  if (!dkimSelector || !dkimTxtValue) return null;
+
+  const slug = emailSlug.toLowerCase();
+  const apexLower = apex.toLowerCase();
+  const host =
+    slug === apexLower
+      ? undefined
+      : slug.endsWith(`.${apexLower}`)
+        ? slug.slice(0, -(apexLower.length + 1))
+        : undefined;
+
+  const groups = ["mx", "spf", "dkim"];
+  const params: EmailDomainConnectParams = {
+    groupId: "",
+    ...(host ? { host } : {}),
+    mxHost,
+    mxValue: mx.value.trim().replace(/\.$/, ""),
+    spfTxtHost,
+    spfTxtValue,
+    dkimSelector,
+    dkimTxtValue,
+  };
+
+  if (dkims[1]?.name && dkims[1]?.value) {
+    const dkim2Relative = relativeToEmailSlug({
+      resendName: dkims[1].name,
+      emailSlug,
+    });
+    const dkim2Selector = extractDkimSelector(dkim2Relative);
+    const dkim2TxtValue = normalizeDkimValue(dkims[1].value);
+    if (dkim2Selector && dkim2TxtValue) {
+      groups.push("dkim2");
+      params.dkim2Selector = dkim2Selector;
+      params.dkim2TxtValue = dkim2TxtValue;
+    }
+  }
+
+  groups.push("dmarc");
+  params.groupId = groups.join(",");
+  return params;
+}
+
+/** Flat DNS rows for forward-instructions email (includes recommended DMARC). */
+export function mapResendRecordsToForwardRows({
+  records,
+  emailSlug,
+  apex,
+}: {
+  records: ResendDnsRecord[];
+  emailSlug: string;
+  apex: string;
+}): { type: string; name: string; value: string }[] {
+  const rows: { type: string; name: string; value: string }[] = [];
+
+  for (const r of records) {
+    if (!r.type || !r.name || !r.value) continue;
+    // Skip inbound Receiving MX if present — outbound setup only
+    if (r.record === "Receiving") continue;
+
+    const name = toZoneHost({
+      resendName: r.name,
+      emailSlug,
+      apex,
+    });
+    const trimmed = r.value.trim();
+    const value =
+      r.type === "MX" && typeof r.priority === "number"
+        ? `${r.priority} ${trimmed}`
+        : trimmed;
+    rows.push({
+      type: r.type,
+      name,
+      value,
+    });
+  }
+
+  rows.push({
+    type: "TXT",
+    name: toZoneHost({
+      resendName: "_dmarc",
+      emailSlug,
+      apex,
+    }),
+    value: "v=DMARC1; p=none;",
+  });
+
+  return rows;
+}
diff --git a/apps/web/lib/domain-connect/sign-apply-url.ts b/apps/web/lib/domain-connect/sign-apply-url.ts
new file mode 100644
index 00000000000..7809befa92d
--- /dev/null
+++ b/apps/web/lib/domain-connect/sign-apply-url.ts
@@ -0,0 +1,48 @@
+import crypto from "node:crypto";
+import { DOMAIN_CONNECT_PROVIDER_ID } from "./constants";
+
+type SignApplyUrlParams = {
+  urlSyncUX: string;
+  serviceId: string;
+  privateKeyPem: string;
+  keyHost: string;
+  queryParams: Record<string, string>;
+};
+
+/**
+ * Builds a fully signed Domain Connect apply URL.
+ * sig= is placed last (required by Cloudflare).
+ */
+export function buildSignedApplyUrl({
+  urlSyncUX,
+  serviceId,
+  privateKeyPem,
+  keyHost,
+  queryParams,
+}: SignApplyUrlParams): string {
+  const base = [
+    urlSyncUX.replace(/\/$/, ""),
+    "v2/domainTemplates/providers",
+    encodeURIComponent(DOMAIN_CONNECT_PROVIDER_ID),
+    "services",
+    encodeURIComponent(serviceId),
+    "apply",
+  ].join("/");
+
+  const sortedParts = Object.keys(queryParams)
+    .sort()
+    .map(
+      (k) => `${encodeURIComponent(k)}=${encodeURIComponent(queryParams[k]!)}`,
+    );
+  const signingString = sortedParts.join("&");
+
+  const sign = crypto.createSign("RSA-SHA256");
+  sign.update(signingString);
+  sign.end();
+  const sig = sign.sign(privateKeyPem, "base64");
+
+  sortedParts.push(`key=${encodeURIComponent(keyHost)}`);
+  sortedParts.push(`sig=${encodeURIComponent(sig)}`);
+
+  return `${base}?${sortedParts.join("&")}`;
+}
diff --git a/apps/web/lib/domain-connect/types.ts b/apps/web/lib/domain-connect/types.ts
new file mode 100644
index 00000000000..1a6ed2ff7f3
--- /dev/null
+++ b/apps/web/lib/domain-connect/types.ts
@@ -0,0 +1,7 @@
+export type DomainConnectProviderKind = "vercel" | "cloudflare";
+
+export type DomainConnectDiscovery = {
+  providerKind: DomainConnectProviderKind;
+  dnsProviderId: string;
+  urlSyncUX: string;
+};
diff --git a/apps/web/lib/dotenv-flow.d.ts b/apps/web/lib/dotenv-flow.d.ts
new file mode 100644
index 00000000000..e2e85d5490c
--- /dev/null
+++ b/apps/web/lib/dotenv-flow.d.ts
@@ -0,0 +1 @@
+declare module "dotenv-flow/config";
diff --git a/apps/web/lib/e2e/test-ids.ts b/apps/web/lib/e2e/test-ids.ts
new file mode 100644
index 00000000000..b8679f6fd01
--- /dev/null
+++ b/apps/web/lib/e2e/test-ids.ts
@@ -0,0 +1,68 @@
+export const testIds = {
+  auth: {
+    signupSubmit: "auth-signup-submit",
+    loginSubmit: "auth-login-submit",
+    loginHeading: "auth-login-heading",
+    verifyEmailHeading: "auth-verify-email-heading",
+    loginNoAccount: "auth-login-no-account",
+    loginInvalidCredentials: "auth-login-invalid-credentials",
+  },
+  onboarding: {
+    getStarted: "onboarding-get-started",
+    createWorkspace: "onboarding-create-workspace",
+    workspaceName: "onboarding-workspace-name",
+    workspaceSlug: "onboarding-workspace-slug",
+    connectDomain: "onboarding-connect-domain",
+    domainInput: "onboarding-domain-input",
+    domainAvailable: "onboarding-domain-available",
+    addDomain: "onboarding-add-domain",
+    skipDomain: "onboarding-skip-domain",
+    freePlan: "onboarding-free-plan",
+    programCompanyName: "onboarding-program-company-name",
+    programLogo: "onboarding-program-logo",
+    programLogoUploaded: "onboarding-program-logo-uploaded",
+    programDestinationUrl: "onboarding-program-destination-url",
+    programSupportEmail: "onboarding-program-support-email",
+    programContinue: "onboarding-program-continue",
+    rewardAmount: "onboarding-reward-amount",
+    rewardContinue: "onboarding-reward-continue",
+    goToDashboard: "onboarding-go-to-dashboard",
+    completeSetup: "onboarding-complete-setup",
+    workspaceCreated: "onboarding-workspace-created",
+    stepWelcome: "onboarding-step-welcome",
+    stepWorkspace: "onboarding-step-workspace",
+    stepProducts: "onboarding-step-products",
+    stepDomain: "onboarding-step-domain",
+    stepDomainCustom: "onboarding-step-domain-custom",
+    stepProgram: "onboarding-step-program",
+    stepReward: "onboarding-step-reward",
+    stepPlan: "onboarding-step-plan",
+    productCta: (product: "links" | "partners") =>
+      `onboarding-product-cta-${product}` as const,
+    planCta: (plan: string) =>
+      `onboarding-plan-cta-${plan.toLowerCase()}` as const,
+  },
+  partnerOnboarding: {
+    continue: "partner-onboarding-continue",
+    skip: "partner-onboarding-skip",
+    profile: "partner-onboarding-profile",
+    platforms: "partner-onboarding-platforms",
+    profileImage: "partner-onboarding-profile-image",
+    aboutYou: "partner-onboarding-about-you",
+    profileType: "partner-onboarding-profile-type",
+  },
+  billing: {
+    plansHeading: "billing-plans-heading",
+    viewDashboard: "billing-view-dashboard",
+    upgradedHeading: "billing-upgraded-heading",
+    startPaidPlan: "billing-start-paid-plan",
+    viewPlans: "billing-view-plans",
+    confirmStartPaidPlan: "billing-confirm-start-paid-plan",
+    startPaidPlanHeading: "billing-start-paid-plan-heading",
+    startPaidPlanNotice: "billing-start-paid-plan-notice",
+    trialBanner: "billing-trial-banner",
+    freeTrial: "billing-free-trial",
+    planCta: (plan: string) =>
+      `billing-plan-cta-${plan.toLowerCase()}` as const,
+  },
+} as const;
diff --git a/apps/web/lib/edge-config/get-feature-flags.ts b/apps/web/lib/edge-config/get-feature-flags.ts
index 37874596674..270a9387cee 100644
--- a/apps/web/lib/edge-config/get-feature-flags.ts
+++ b/apps/web/lib/edge-config/get-feature-flags.ts
@@ -18,6 +18,7 @@ export const getFeatureFlags = async ({
   const workspaceFeatures: Record<BetaFeatures, boolean> = {
     analyticsSettingsSiteVisitTracking: false,
     noProrationUpgrade: false,
+    rewardSpendLimit: false,
   };
 
   if (!process.env.EDGE_CONFIG) {
diff --git a/apps/web/lib/edge-config/index.ts b/apps/web/lib/edge-config/index.ts
index 1b77e1d99d5..a3206facfa8 100644
--- a/apps/web/lib/edge-config/index.ts
+++ b/apps/web/lib/edge-config/index.ts
@@ -1,6 +1,5 @@
 export * from "./get-feature-flags";
 export * from "./get-partner-feature-flags";
-export * from "./is-blacklisted-domain";
 export * from "./is-blacklisted-email";
 export * from "./is-blacklisted-key";
 export * from "./is-blacklisted-referrer";
diff --git a/apps/web/lib/edge-config/is-blacklisted-domain.ts b/apps/web/lib/edge-config/is-blacklisted-domain.ts
index fed69705240..67368c6d271 100644
--- a/apps/web/lib/edge-config/is-blacklisted-domain.ts
+++ b/apps/web/lib/edge-config/is-blacklisted-domain.ts
@@ -1,12 +1,10 @@
 import { getAll } from "@vercel/edge-config";
 
-export const isBlacklistedDomain = async (domain: string): Promise<boolean> => {
-  if (!process.env.EDGE_CONFIG) {
-    return false;
-  }
-
-  if (!domain) {
-    return false;
+export const isBlacklistedDomain = async (
+  domain: string,
+): Promise<"whitelisted" | "blacklisted" | null> => {
+  if (!process.env.EDGE_CONFIG || !domain) {
+    return null;
   }
 
   try {
@@ -17,8 +15,7 @@ export const isBlacklistedDomain = async (domain: string): Promise<boolean> => {
     } = await getAll(["domains", "terms", "whitelistedDomains"]);
 
     if (whitelistedDomains.includes(domain)) {
-      console.log("Domain is whitelisted", domain);
-      return false;
+      return "whitelisted";
     }
 
     const blacklistedTermsRegex = new RegExp(
@@ -27,15 +24,15 @@ export const isBlacklistedDomain = async (domain: string): Promise<boolean> => {
         .join("|"),
     );
 
-    const isBlacklisted =
-      blacklistedDomains.includes(domain) || blacklistedTermsRegex.test(domain);
-
-    if (isBlacklisted) {
-      return true;
+    if (
+      blacklistedDomains.includes(domain) ||
+      blacklistedTermsRegex.test(domain)
+    ) {
+      return "blacklisted";
     }
 
-    return false;
-  } catch (e) {
-    return false;
+    return null;
+  } catch {
+    return null;
   }
 };
diff --git a/apps/web/lib/email/assert-email-sent.ts b/apps/web/lib/email/assert-email-sent.ts
new file mode 100644
index 00000000000..4b11bad5c7d
--- /dev/null
+++ b/apps/web/lib/email/assert-email-sent.ts
@@ -0,0 +1,18 @@
+import { DubApiError } from "@/lib/api/errors";
+import { sendEmail } from "@dub/email";
+
+type SendEmailResult = Awaited<ReturnType<typeof sendEmail>>;
+
+export function assertEmailSent(result: SendEmailResult) {
+  const failed =
+    !result ||
+    ("error" in result && Boolean(result.error)) ||
+    ("data" in result && !result.data);
+
+  if (failed) {
+    throw new DubApiError({
+      code: "internal_server_error",
+      message: "Failed to send DNS instructions email.",
+    });
+  }
+}
diff --git a/apps/web/lib/email/email-templates-map.ts b/apps/web/lib/email/email-templates-map.ts
index 91b8f892de7..30c315c0fc8 100644
--- a/apps/web/lib/email/email-templates-map.ts
+++ b/apps/web/lib/email/email-templates-map.ts
@@ -1,6 +1,6 @@
 import BountyApproved from "@dub/email/templates/bounty-approved";
-import IdentityVerificationAnnouncement from "@dub/email/templates/broadcasts/identity-verification-announcement";
-import DubLaunchWeekDay5 from "@dub/email/templates/broadcasts/launch-week-day-5";
+import DubProductUpdateSummer26 from "@dub/email/templates/broadcasts/dub-product-update-summer26";
+import DubStartupProgramAnnouncement from "@dub/email/templates/broadcasts/dub-startup-program-announcement";
 import ConnectPayoutReminder from "@dub/email/templates/connect-payout-reminder";
 import ConnectPlatformsReminder from "@dub/email/templates/connect-platforms-reminder";
 import PartnerBanned from "@dub/email/templates/partner-banned";
@@ -27,11 +27,6 @@ export const EMAIL_TEMPLATES_MAP = {
   PartnerRewardUpdated,
   WorkspaceDisabled,
   // special broadcast emails
-  // DubPartnerRewind,
-  // DubProductUpdateMar26,
-  IdentityVerificationAnnouncement,
-  // PayoutAutoWithdrawals,
-  // ProgramMarketplaceAnnouncement,
-  // StablecoinPayoutsAnnouncement,
-  DubLaunchWeekDay5,
+  DubStartupProgramAnnouncement,
+  DubProductUpdateSummer26,
 } as const;
diff --git a/apps/web/lib/email/unsubscribe-token.ts b/apps/web/lib/email/unsubscribe-token.ts
index ce597e7b9e8..c2ca8dd9d94 100644
--- a/apps/web/lib/email/unsubscribe-token.ts
+++ b/apps/web/lib/email/unsubscribe-token.ts
@@ -1,4 +1,5 @@
-import { createHmac, timingSafeEqual } from "crypto";
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
+import { createHmac } from "crypto";
 
 const TOKEN_SECRET =
   process.env.UNSUBSCRIBE_TOKEN_SECRET || process.env.NEXTAUTH_SECRET;
@@ -41,12 +42,7 @@ export function verifyUnsubscribeToken(token: string): string | null {
       .digest("hex")
       .slice(0, 24);
 
-    if (
-      !timingSafeEqual(
-        Uint8Array.from(Buffer.from(signature)),
-        Uint8Array.from(Buffer.from(expectedSignature)),
-      )
-    ) {
+    if (!timingSafeCompare(signature, expectedSignature)) {
       return null;
     }
 
diff --git a/apps/web/lib/fetchers/get-marketplace-programs-summary.ts b/apps/web/lib/fetchers/get-marketplace-programs-summary.ts
index ad16eb2ee17..6633850b3bf 100644
--- a/apps/web/lib/fetchers/get-marketplace-programs-summary.ts
+++ b/apps/web/lib/fetchers/get-marketplace-programs-summary.ts
@@ -206,7 +206,12 @@ export const getMarketplaceProgramsSummary = cache(async () => {
     .map(formatNetworkProgram);
 
   const mostPopular = selectRow(programs, byMarketplaceRanking);
-  const newPrograms = selectRow(programs, byRecency);
+  const newPrograms = selectPrograms(
+    programs,
+    new Set(),
+    MARKETPLACE_HOME_ROW_PAGE_SIZE,
+    byRecency,
+  ).map(formatNetworkProgram);
   const categoryRows = selectCategoryRows(programMeta, usedIds);
 
   const categories = Object.fromEntries(
diff --git a/apps/web/lib/fetchers/get-network-program-counts.ts b/apps/web/lib/fetchers/get-network-program-counts.ts
new file mode 100644
index 00000000000..9a4cdd0712e
--- /dev/null
+++ b/apps/web/lib/fetchers/get-network-program-counts.ts
@@ -0,0 +1,176 @@
+import { prisma } from "@/lib/prisma";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { getPublicNetworkProgramsQuerySchema } from "@/lib/zod/schemas/program-network";
+import { Category, Prisma, ProgramEnrollmentStatus } from "@prisma/client";
+import { cache } from "react";
+import * as z from "zod/v4";
+
+type RewardType = NonNullable<
+  z.infer<typeof getPublicNetworkProgramsQuerySchema>["rewardType"]
+>;
+
+const rewardTypeMap: Record<RewardType, Prisma.Sql> = {
+  sale: Prisma.sql`pg.saleRewardId IS NOT NULL`,
+  lead: Prisma.sql`pg.leadRewardId IS NOT NULL`,
+  click: Prisma.sql`pg.clickRewardId IS NOT NULL`,
+  discount: Prisma.sql`pg.discountId IS NOT NULL`,
+};
+
+type NetworkProgramWhereParams = {
+  category?: Category;
+  rewardType?: RewardType;
+  search?: string;
+  // partner-scoped (network) filters only
+  status?: ProgramEnrollmentStatus | null;
+  partnerId?: string;
+  featured?: boolean;
+};
+
+export function buildNetworkProgramCountWhereSql({
+  category,
+  rewardType,
+  search,
+  status,
+  partnerId,
+  featured,
+}: NetworkProgramWhereParams) {
+  const searchSql = search ? Prisma.sql`CONCAT('%', ${search}, '%')` : null;
+
+  return Prisma.sql`
+    p.addedToMarketplaceAt IS NOT NULL
+    AND EXISTS (
+      SELECT 1 FROM PartnerGroup pg
+      WHERE
+        pg.programId = p.id
+        AND pg.slug = ${DEFAULT_PARTNER_GROUP.slug}
+        AND pg.applicationFormPublishedAt IS NOT NULL
+        ${rewardType ? Prisma.sql`AND ${rewardTypeMap[rewardType]}` : Prisma.sql``}
+    )
+    ${
+      category
+        ? Prisma.sql`
+          AND EXISTS (
+            SELECT 1 FROM ProgramCategory pc
+            WHERE pc.programId = p.id AND pc.category = ${category}
+          )`
+        : Prisma.sql``
+    }
+    ${
+      status !== undefined && partnerId
+        ? Prisma.sql`
+          AND ${status === null ? Prisma.sql`NOT` : Prisma.sql``} EXISTS (
+            SELECT 1 FROM ProgramEnrollment pe
+            WHERE
+              pe.programId = p.id
+              AND pe.partnerId = ${partnerId}
+              ${status === null ? Prisma.sql`` : Prisma.sql`AND pe.status = ${status}`}
+          )`
+        : Prisma.sql``
+    }
+    ${
+      featured !== undefined
+        ? Prisma.sql`AND p.featuredOnMarketplaceAt IS ${featured ? Prisma.sql`NOT` : Prisma.sql``} NULL`
+        : Prisma.sql``
+    }
+    ${
+      searchSql
+        ? Prisma.sql`AND (p.name LIKE ${searchSql} OR p.slug LIKE ${searchSql} OR p.domain LIKE ${searchSql} OR p.url LIKE ${searchSql} OR p.description LIKE ${searchSql})`
+        : Prisma.sql``
+    }
+  `;
+}
+
+export async function getNetworkProgramTotalCount(
+  params: NetworkProgramWhereParams = {},
+) {
+  const whereSql = buildNetworkProgramCountWhereSql(params);
+
+  const result = (await prisma.$queryRaw`
+    SELECT COUNT(*) AS count FROM Program p
+    WHERE ${whereSql}
+  `) as { count: bigint }[];
+
+  return Number(result[0].count);
+}
+
+export async function getNetworkProgramCategoryCounts(
+  params: NetworkProgramWhereParams = {},
+) {
+  // category counts ignore the active category filter
+  const whereSql = buildNetworkProgramCountWhereSql({
+    ...params,
+    category: undefined,
+  });
+
+  const categories = (await prisma.$queryRaw`
+    SELECT pc.category, COUNT(p.id) AS _count
+    FROM ProgramCategory pc
+    JOIN Program p ON p.id = pc.programId
+    WHERE ${whereSql}
+    GROUP BY pc.category
+    ORDER BY _count DESC
+  `) as { category: Category; _count: bigint }[];
+
+  return categories.map(({ category, _count }) => ({
+    category,
+    count: Number(_count),
+  }));
+}
+
+export async function getNetworkProgramRewardTypeCounts(
+  params: NetworkProgramWhereParams = {},
+) {
+  // reward type counts ignore the active reward type filter
+  const whereSql = buildNetworkProgramCountWhereSql({
+    ...params,
+    rewardType: undefined,
+  });
+
+  const rewards = (await prisma.$queryRaw`
+    SELECT
+      COUNT(pg.clickRewardId) AS "click",
+      COUNT(pg.leadRewardId) AS "lead",
+      COUNT(pg.saleRewardId) AS "sale",
+      COUNT(pg.discountId) AS "discount"
+    FROM PartnerGroup pg
+    JOIN Program p ON p.id = pg.programId
+    WHERE pg.slug = ${DEFAULT_PARTNER_GROUP.slug} AND ${whereSql}
+  `) as { click: bigint; lead: bigint; sale: bigint; discount: bigint }[];
+
+  return (["sale", "lead", "click", "discount"] as const).map((type) => ({
+    type,
+    count: Number(rewards[0][type]),
+  }));
+}
+
+/**
+ * Public marketplace counts: total program count + per-category and
+ * per-reward-type filter counts in a single call. Wrapped in React `cache()`
+ * so it dedupes when invoked multiple times within one server render.
+ */
+export const getNetworkProgramCounts = cache(
+  async ({
+    category,
+    rewardType,
+    search,
+  }: Pick<
+    NetworkProgramWhereParams,
+    "category" | "rewardType" | "search"
+  > = {}) => {
+    const [total, categories, rewardTypes] = await Promise.all([
+      getNetworkProgramTotalCount({ category, rewardType, search }),
+      getNetworkProgramCategoryCounts({ rewardType, search }),
+      getNetworkProgramRewardTypeCounts({ category, search }),
+    ]);
+
+    return {
+      total,
+      categories,
+      rewardTypes,
+    };
+  },
+);
+
+export type NetworkProgramCounts = Awaited<
+  ReturnType<typeof getNetworkProgramCounts>
+>;
diff --git a/apps/web/lib/fetchers/get-public-network-programs.ts b/apps/web/lib/fetchers/get-public-network-programs.ts
new file mode 100644
index 00000000000..1f060a52281
--- /dev/null
+++ b/apps/web/lib/fetchers/get-public-network-programs.ts
@@ -0,0 +1,114 @@
+import { prisma } from "@/lib/prisma";
+import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import {
+  getPublicNetworkProgramsQuerySchema,
+  NetworkProgramSchema,
+  PROGRAM_NETWORK_MAX_PAGE_SIZE,
+} from "@/lib/zod/schemas/program-network";
+import { cache } from "react";
+import * as z from "zod/v4";
+
+export const getPublicNetworkPrograms = cache(
+  async (
+    params: Partial<z.infer<typeof getPublicNetworkProgramsQuerySchema>> = {},
+  ) => {
+    const {
+      category,
+      rewardType,
+      featured,
+      search,
+      sortBy = "popularity",
+      sortOrder = "desc",
+      page = 1,
+      pageSize = PROGRAM_NETWORK_MAX_PAGE_SIZE,
+    } = params;
+
+    const programs = await prisma.program.findMany({
+      where: {
+        addedToMarketplaceAt: {
+          not: null,
+        },
+        ...(featured && {
+          featuredOnMarketplaceAt: {
+            not: null,
+          },
+        }),
+        ...(search && {
+          OR: [
+            { name: { contains: search } },
+            { slug: { contains: search } },
+            { domain: { contains: search } },
+            { url: { contains: search } },
+            { description: { contains: search } },
+          ],
+        }),
+        ...(category && {
+          categories: {
+            some: {
+              category,
+            },
+          },
+        }),
+        ...(rewardType && {
+          groups: {
+            some: {
+              slug: DEFAULT_PARTNER_GROUP.slug,
+              ...(rewardType === "sale" && {
+                saleRewardId: { not: null },
+              }),
+              ...(rewardType === "lead" && {
+                leadRewardId: { not: null },
+              }),
+              ...(rewardType === "click" && {
+                clickRewardId: { not: null },
+              }),
+              ...(rewardType === "discount" && {
+                discountId: { not: null },
+              }),
+            },
+          },
+        }),
+      },
+      include: {
+        groups: {
+          where: {
+            slug: DEFAULT_PARTNER_GROUP.slug,
+          },
+          include: {
+            clickReward: true,
+            leadReward: true,
+            saleReward: true,
+            referralReward: true,
+            discount: true,
+          },
+        },
+        categories: true,
+      },
+      orderBy:
+        sortBy === "popularity"
+          ? { marketplaceRanking: "asc" }
+          : {
+              [sortBy === "recency" ? "addedToMarketplaceAt" : sortBy]:
+                sortOrder,
+            },
+      skip: (page - 1) * pageSize,
+      take: pageSize,
+    });
+
+    return z.array(NetworkProgramSchema).parse(
+      programs.map((program) => ({
+        ...program,
+        rewards:
+          program.groups.length > 0
+            ? [
+                program.groups[0].clickReward,
+                program.groups[0].leadReward,
+                program.groups[0].saleReward,
+              ].filter(Boolean)
+            : [],
+        discount: program.groups.length > 0 ? program.groups[0].discount : null,
+        categories: program.categories.map(({ category }) => category),
+      })),
+    );
+  },
+);
diff --git a/apps/web/lib/firstpromoter/import-commissions.ts b/apps/web/lib/firstpromoter/import-commissions.ts
index 01082239200..3b56d950aa1 100644
--- a/apps/web/lib/firstpromoter/import-commissions.ts
+++ b/apps/web/lib/firstpromoter/import-commissions.ts
@@ -2,7 +2,13 @@ import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import ProgramImported from "@dub/email/templates/program-imported";
 import { nanoid } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import {
+  CommissionSource,
+  CommissionStatus,
+  Customer,
+  Link,
+  Program,
+} from "@prisma/client";
 import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
 import { isFirstConversion } from "../analytics/is-first-conversion";
 import { createId } from "../api/create-id";
@@ -342,6 +348,7 @@ async function createCommission({
         invoiceId: `${commission.id}`, // this is not the actual invoice ID, but we use this to deduplicate the sales
         createdAt: new Date(commission.created_at),
         description: commission.external_note || null,
+        source: CommissionSource.firstpromoter,
       },
     }),
 
diff --git a/apps/web/lib/firstpromoter/import-customers.ts b/apps/web/lib/firstpromoter/import-customers.ts
index de8c6dc18c1..d0736cb2ce4 100644
--- a/apps/web/lib/firstpromoter/import-customers.ts
+++ b/apps/web/lib/firstpromoter/import-customers.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@/lib/prisma";
-import { chunk, nanoid } from "@dub/utils";
+import { chunk, nanoid, sleep } from "@dub/utils";
 import { Customer, Link, Project } from "@prisma/client";
 import { createId } from "../api/create-id";
 import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
@@ -160,7 +160,7 @@ export async function importCustomers(payload: FirstPromoterImportPayload) {
       }
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     currentPage++;
     processedBatches++;
diff --git a/apps/web/lib/firstpromoter/import-partners.ts b/apps/web/lib/firstpromoter/import-partners.ts
index 025071d3368..1cf3c4d9592 100644
--- a/apps/web/lib/firstpromoter/import-partners.ts
+++ b/apps/web/lib/firstpromoter/import-partners.ts
@@ -9,6 +9,7 @@ import {
 import { createId } from "../api/create-id";
 import { bulkCreateLinks } from "../api/links";
 import { upsertPartnerPlatform } from "../api/partner-profile/upsert-partner-platform";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
 import { FirstPromoterApi } from "./api";
 import { firstPromoterImporter, MAX_BATCHES } from "./importer";
@@ -89,6 +90,14 @@ export async function importPartners(payload: FirstPromoterImportPayload) {
           );
         }
       });
+
+      // Queue an index update because the imported partners were enrolled.
+      // Queued per page rather than per partner.
+      await queuePartnerSearchSync({
+        enrollmentIds: results.flatMap((result) =>
+          result.status === "fulfilled" && result.value ? [result.value] : [],
+        ),
+      });
     }
 
     currentPage++;
@@ -187,6 +196,7 @@ async function createPartnerAndLinks({
       leadRewardId: group.leadRewardId,
       saleRewardId: group.saleRewardId,
       referralRewardId: group.referralRewardId,
+      customRewardId: group.customRewardId,
       discountId: group.discountId,
     },
     update: {
@@ -199,12 +209,12 @@ async function createPartnerAndLinks({
 
   if (!program.domain || !program.url) {
     console.error("Program domain or url not found", program.id);
-    return;
+    return programEnrollment.id;
   }
 
   if (programEnrollment.links.length > 0) {
     console.log("Partner already has links", partner.id);
-    return;
+    return programEnrollment.id;
   }
 
   const links = affiliate.promoter_campaigns.map((campaign, idx) => ({
@@ -221,7 +231,18 @@ async function createPartnerAndLinks({
       idx === 0 ? group.partnerGroupDefaultLinks[0]?.id ?? null : null,
   }));
 
-  await bulkCreateLinks({
-    links,
-  });
+  try {
+    await bulkCreateLinks({
+      links,
+    });
+  } catch (error) {
+    // The enrollment is already committed, so its ID must still reach the
+    // page-level search sync even when link creation fails.
+    console.error(
+      `Failed to create links for imported affiliate ${affiliate.id}`,
+      error,
+    );
+  }
+
+  return programEnrollment.id;
 }
diff --git a/apps/web/lib/firstpromoter/update-stripe-customers.ts b/apps/web/lib/firstpromoter/update-stripe-customers.ts
index f8bc9a5e1d7..f5b49212898 100644
--- a/apps/web/lib/firstpromoter/update-stripe-customers.ts
+++ b/apps/web/lib/firstpromoter/update-stripe-customers.ts
@@ -1,6 +1,8 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
 import { Customer, Project } from "@prisma/client";
 import Stripe from "stripe";
+
 import { stripeAppClient } from "../stripe";
 import { logImportError } from "../tinybird/log-import-error";
 import { firstPromoterImporter, MAX_BATCHES } from "./importer";
@@ -81,7 +83,7 @@ export async function updateStripeCustomers(
       ),
     );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     startingAfter = customers[customers.length - 1].id;
diff --git a/apps/web/lib/integrations/appsflyer/apply-parameters.ts b/apps/web/lib/integrations/appsflyer/apply-parameters.ts
index 93251f0a995..4a8d114f85e 100644
--- a/apps/web/lib/integrations/appsflyer/apply-parameters.ts
+++ b/apps/web/lib/integrations/appsflyer/apply-parameters.ts
@@ -1,17 +1,11 @@
+import {
+  PartnerMacroContext,
+  resolvePartnerMacros,
+} from "@/lib/partners/macros";
 import { prisma } from "@/lib/prisma";
 import { APPSFLYER_INTEGRATION_ID } from "@dub/utils";
 import { AppsFlyerSettings, appsFlyerSettingsSchema } from "./schema";
 
-interface AppsFlyerParameterContext {
-  partnerName: string;
-  partnerLinkKey: string;
-}
-
-const macroReplacements: Record<string, keyof AppsFlyerParameterContext> = {
-  "{{PARTNER_NAME}}": "partnerName",
-  "{{PARTNER_LINK_KEY}}": "partnerLinkKey",
-};
-
 // Resolve macros in parameter values and append them to a URL
 export function applyAppsFlyerParameters({
   url,
@@ -20,21 +14,12 @@ export function applyAppsFlyerParameters({
 }: {
   url: string;
   parameters: { key: string; value: string }[];
-  context: AppsFlyerParameterContext;
+  context: PartnerMacroContext;
 }) {
   const urlObj = new URL(url);
 
   for (const { key, value } of parameters) {
-    let resolvedValue = value;
-
-    for (const [macro, contextKey] of Object.entries(macroReplacements)) {
-      resolvedValue = resolvedValue.replaceAll(
-        macro,
-        context[contextKey] ?? "",
-      );
-    }
-
-    urlObj.searchParams.set(key, resolvedValue);
+    urlObj.searchParams.set(key, resolvePartnerMacros(value, context));
   }
 
   return urlObj.toString();
diff --git a/apps/web/lib/integrations/appsflyer/constants.ts b/apps/web/lib/integrations/appsflyer/constants.ts
index bfecdcd0d5a..2f753663e1c 100644
--- a/apps/web/lib/integrations/appsflyer/constants.ts
+++ b/apps/web/lib/integrations/appsflyer/constants.ts
@@ -31,18 +31,3 @@ export const APPSFLYER_REQUIRED_PARAMETERS = [
 
 // @see: https://support.appsflyer.com/hc/en-us/articles/207447093-AppsFlyer-server-IP-address-ranges-allowlisting
 export const APPSFLYER_IP_RANGES = ["45.92.116.0/22", "194.28.46.0/23"];
-
-export const APPSFLYER_MACROS = [
-  {
-    macro: "{{PARTNER_NAME}}",
-    description: "The partner's name (e.g. 'John Doe')",
-  },
-  {
-    macro: "{{PARTNER_LINK_KEY}}",
-    description: "The partner's link key (e.g. 'john-doe')",
-  },
-] as const;
-
-export const APPSFLYER_MACRO_VALUES: readonly string[] = APPSFLYER_MACROS.map(
-  (m) => m.macro,
-);
diff --git a/apps/web/lib/integrations/appsflyer/macro-template.ts b/apps/web/lib/integrations/appsflyer/macro-template.ts
deleted file mode 100644
index acf72a3a787..00000000000
--- a/apps/web/lib/integrations/appsflyer/macro-template.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { APPSFLYER_MACRO_VALUES } from "./constants";
-
-const MACRO_TOKEN_RE = /\{\{[^}]+\}\}/g;
-
-/** Every `{{...}}` substring must be a known AppsFlyer macro. */
-export function isValidAppsFlyerMacroTemplate(value: string): boolean {
-  const matches = value.match(MACRO_TOKEN_RE) ?? [];
-  return matches.every((token) => APPSFLYER_MACRO_VALUES.includes(token));
-}
-
-/**
- * Validates a free-form custom parameter value (any `{{...}}` tokens must be known macros).
- * @throws Error when validation fails.
- */
-export function assertAppsFlyerMacroValueParses(value: string): void {
-  if (!isValidAppsFlyerMacroTemplate(value)) {
-    throw new Error(
-      `Invalid macro in value. Use only: ${APPSFLYER_MACRO_VALUES.join(", ")}`,
-    );
-  }
-}
diff --git a/apps/web/lib/integrations/appsflyer/schema.ts b/apps/web/lib/integrations/appsflyer/schema.ts
index ef9a41e017e..2fe6ca409f5 100644
--- a/apps/web/lib/integrations/appsflyer/schema.ts
+++ b/apps/web/lib/integrations/appsflyer/schema.ts
@@ -1,18 +1,20 @@
+import {
+  PARTNER_MACRO_VALUES,
+  isValidPartnerMacroTemplate,
+} from "@/lib/partners/macros";
 import * as z from "zod/v4";
-import { APPSFLYER_MACRO_VALUES } from "./constants";
-import { isValidAppsFlyerMacroTemplate } from "./macro-template";
 
 export const appsFlyerMacroExactValueSchema = z
   .string()
-  .refine((v) => APPSFLYER_MACRO_VALUES.includes(v), {
-    message: `Value must be one of: ${APPSFLYER_MACRO_VALUES.join(", ")}`,
+  .refine((v) => PARTNER_MACRO_VALUES.includes(v), {
+    message: `Value must be one of: ${PARTNER_MACRO_VALUES.join(", ")}`,
   });
 
 /** Free-form value; every `{{...}}` token must be a known macro. */
 export const appsFlyerMacroTemplateValueSchema = z
   .string()
-  .refine((v) => isValidAppsFlyerMacroTemplate(v), {
-    message: `Invalid macro in value. Use only: ${APPSFLYER_MACRO_VALUES.join(", ")}`,
+  .refine((v) => isValidPartnerMacroTemplate(v), {
+    message: `Invalid macro in value. Use only: ${PARTNER_MACRO_VALUES.join(", ")}`,
   });
 
 export const appsFlyerRequiredParameterSchema = z.object({
diff --git a/apps/web/lib/integrations/appsflyer/ui/settings.tsx b/apps/web/lib/integrations/appsflyer/ui/settings.tsx
index d8691908ac5..a56e52de316 100644
--- a/apps/web/lib/integrations/appsflyer/ui/settings.tsx
+++ b/apps/web/lib/integrations/appsflyer/ui/settings.tsx
@@ -1,5 +1,9 @@
 "use client";
 
+import {
+  assertValidPartnerMacroValue,
+  PARTNER_MACROS,
+} from "@/lib/partners/macros";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { InstalledIntegrationInfoProps } from "@/lib/types";
 import { Button, Combobox, ComboboxOption, Input } from "@dub/ui";
@@ -11,10 +15,8 @@ import { toast } from "sonner";
 import {
   APPSFLYER_DEFAULT_SETTINGS,
   APPSFLYER_HARDCODED_PARAMETERS,
-  APPSFLYER_MACROS,
   APPSFLYER_REQUIRED_PARAMETERS,
 } from "../constants";
-import { assertAppsFlyerMacroValueParses } from "../macro-template";
 import { appsFlyerSettingsSchema } from "../schema";
 import { updateAppsFlyerSettingsAction } from "../update-settings";
 
@@ -35,7 +37,7 @@ function cloneFormBaseline(data: AppsFlyerFormBaseline): AppsFlyerFormBaseline {
 type AppsFlyerMacroMeta = { description: string };
 
 const REQUIRED_MACRO_COMBO_OPTIONS: ComboboxOption<AppsFlyerMacroMeta>[] =
-  APPSFLYER_MACROS.map((m) => ({
+  PARTNER_MACROS.map((m) => ({
     value: m.macro,
     label: m.macro,
     meta: { description: m.description },
@@ -172,7 +174,7 @@ export const AppsFlyerSettings = ({
 
     for (const p of filteredParameters) {
       try {
-        assertAppsFlyerMacroValueParses(p.value);
+        assertValidPartnerMacroValue(p.value);
       } catch (err) {
         toast.error(
           err instanceof Error
@@ -202,7 +204,7 @@ export const AppsFlyerSettings = ({
   }
 
   return (
-    <form className="mt-4 space-y-4" onSubmit={onSubmit}>
+    <form className="space-y-4" onSubmit={onSubmit}>
       {/* App IDs */}
       <div className="rounded-lg border border-neutral-200 bg-white">
         <div className="border-b border-neutral-200 px-4 py-4">
diff --git a/apps/web/lib/integrations/google-ads/api.ts b/apps/web/lib/integrations/google-ads/api.ts
index b2783d6dfb8..8f44e5c92a1 100644
--- a/apps/web/lib/integrations/google-ads/api.ts
+++ b/apps/web/lib/integrations/google-ads/api.ts
@@ -134,8 +134,49 @@ const dataManagerFetch = async <T>({
   return data as T;
 };
 
-const formatApiErrorDetail = (data: any, rawText: string) => {
-  return data?.error?.message ?? JSON.stringify(data) ?? rawText;
+export const formatApiErrorDetail = (data: any, rawText: string) => {
+  const payload = Array.isArray(data) ? data[0] : data;
+  const adsError = payload?.error?.details?.[0]?.errors?.[0];
+  const authorizationError = adsError?.errorCode?.authorizationError;
+  const googleAdsError = adsError?.message;
+
+  const detail =
+    googleAdsError ??
+    payload?.error?.message ??
+    (data ? JSON.stringify(data) : rawText);
+
+  if (authorizationError && !String(detail).includes(authorizationError)) {
+    return `${authorizationError}: ${detail}`;
+  }
+
+  return detail;
+};
+
+const normalizeGoogleAdsCustomerId = (customerId: string) =>
+  customerId.replace(/-/g, "").replace(/^customers\//, "");
+
+export const isGoogleAdsPermissionDenied = (error: unknown) => {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("USER_PERMISSION_DENIED");
+};
+
+type SearchStreamRow = {
+  customer?: {
+    id?: string | number;
+    descriptiveName?: string;
+    manager?: boolean;
+  };
+  conversionAction?: {
+    id?: string | number;
+    resourceName?: string;
+    name?: string;
+  };
+  customerClient?: {
+    id?: string | number;
+    resourceName?: string;
+    descriptiveName?: string;
+    manager?: boolean;
+  };
 };
 
 const searchStream = async ({
@@ -146,23 +187,10 @@ const searchStream = async ({
   customerId: string;
   query: string;
 }) => {
-  const normalizedCustomerId = customerId.replace(/-/g, "");
+  const normalizedCustomerId = normalizeGoogleAdsCustomerId(customerId);
 
   const response = await googleAdsFetch<
-    {
-      results?: {
-        customer?: {
-          id?: string;
-          descriptiveName?: string;
-          manager?: boolean;
-        };
-        conversionAction?: {
-          id?: string;
-          resourceName?: string;
-          name?: string;
-        };
-      }[];
-    }[]
+    { results?: SearchStreamRow[] }[] | { results?: SearchStreamRow[] }
   >({
     ...options,
     path: `customers/${normalizedCustomerId}/googleAds:searchStream`,
@@ -170,7 +198,8 @@ const searchStream = async ({
     body: { query },
   });
 
-  return response.flatMap((batch) => batch.results ?? []);
+  const batches = Array.isArray(response) ? response : [response];
+  return batches.flatMap((batch) => batch.results ?? []);
 };
 
 export class GoogleAdsApi {
@@ -191,6 +220,42 @@ export class GoogleAdsApi {
     });
 
     const resourceNames = response.resourceNames ?? [];
+    const customersById = new Map<
+      string,
+      z.infer<typeof googleAdsCustomerSchema>
+    >();
+
+    const toCustomer = ({
+      id,
+      resourceName,
+      descriptiveName,
+      manager,
+      loginCustomerId,
+    }: {
+      id: string;
+      resourceName?: string;
+      descriptiveName?: string;
+      manager?: boolean;
+      loginCustomerId?: string | null;
+    }) => {
+      const normalizedId = normalizeGoogleAdsCustomerId(id);
+
+      return googleAdsCustomerSchema.parse({
+        id: normalizedId,
+        resourceName: resourceName ?? `customers/${normalizedId}`,
+        descriptiveName: descriptiveName || `Account ${normalizedId}`,
+        manager: manager ?? false,
+        loginCustomerId: loginCustomerId ?? (manager ? normalizedId : null),
+      });
+    };
+
+    const setCustomer = (customer: z.infer<typeof googleAdsCustomerSchema>) => {
+      const id = normalizeGoogleAdsCustomerId(customer.id);
+
+      if (!customersById.has(id)) {
+        customersById.set(id, customer);
+      }
+    };
 
     const fetchCustomer = async ({
       resourceName,
@@ -199,7 +264,7 @@ export class GoogleAdsApi {
       resourceName: string;
       loginCustomerId?: string | null;
     }) => {
-      const customerId = resourceName.replace("customers/", "");
+      const customerId = normalizeGoogleAdsCustomerId(resourceName);
 
       const results = await searchStream({
         ...this.options,
@@ -211,15 +276,24 @@ export class GoogleAdsApi {
 
       const customer = results[0]?.customer;
 
-      return googleAdsCustomerSchema.parse({
-        id: customer?.id?.toString() ?? customerId,
+      if (!customer) {
+        throw new Error(
+          `[Google Ads API] No customer data returned for ${customerId}`,
+        );
+      }
+
+      const id = customer.id?.toString() ?? customerId;
+
+      return toCustomer({
+        id,
         resourceName,
-        descriptiveName: customer?.descriptiveName ?? `Account ${customerId}`,
-        manager: customer?.manager ?? false,
+        descriptiveName: customer.descriptiveName,
+        manager: customer.manager,
+        loginCustomerId: loginCustomerId ?? (customer.manager ? id : null),
       });
     };
 
-    const initialResults = await Promise.all(
+    const directResults = await Promise.all(
       resourceNames.map(async (resourceName) => {
         try {
           return {
@@ -227,10 +301,12 @@ export class GoogleAdsApi {
             customer: await fetchCustomer({ resourceName }),
           };
         } catch (error) {
-          console.error(
-            `[Google Ads API] Failed to fetch customer ${resourceName.replace("customers/", "")}`,
-            error,
-          );
+          if (!isGoogleAdsPermissionDenied(error)) {
+            console.error(
+              `[Google Ads API] Failed to fetch customer ${normalizeGoogleAdsCustomerId(resourceName)}`,
+              error,
+            );
+          }
 
           return {
             resourceName,
@@ -240,45 +316,100 @@ export class GoogleAdsApi {
       }),
     );
 
-    const managerAccounts = initialResults
-      .map((result) => result.customer)
-      .filter((customer): customer is z.infer<typeof googleAdsCustomerSchema> =>
-        Boolean(customer?.manager),
-      );
+    for (const { customer } of directResults) {
+      if (customer) {
+        setCustomer(customer);
+      }
+    }
 
-    const loginCustomerId =
-      managerAccounts.length === 1 ? managerAccounts[0].id : null;
+    // Only directly accessible managers are valid login-customer-id values.
+    const managerAccounts = [...customersById.values()].filter(
+      (customer) => customer.manager,
+    );
 
-    const customers = await Promise.all(
-      initialResults.map(async ({ resourceName, customer }) => {
-        if (customer) {
-          return customer;
-        }
+    const failedResourceNames = directResults
+      .filter((result) => result.customer === null)
+      .map((result) => result.resourceName);
 
-        if (!loginCustomerId) {
-          return null;
-        }
+    for (const manager of managerAccounts) {
+      const remainingResourceNames = failedResourceNames.filter(
+        (resourceName) =>
+          !customersById.has(normalizeGoogleAdsCustomerId(resourceName)),
+      );
 
-        const customerId = resourceName.replace("customers/", "");
+      if (remainingResourceNames.length === 0) {
+        break;
+      }
+
+      await Promise.all(
+        remainingResourceNames.map(async (resourceName) => {
+          const customerId = normalizeGoogleAdsCustomerId(resourceName);
+
+          try {
+            setCustomer(
+              await fetchCustomer({
+                resourceName,
+                loginCustomerId: manager.id,
+              }),
+            );
+          } catch (error) {
+            if (!isGoogleAdsPermissionDenied(error)) {
+              console.error(
+                `[Google Ads API] Failed to fetch customer ${customerId} with login-customer-id ${manager.id}`,
+                error,
+              );
+            }
+          }
+        }),
+      );
+    }
 
+    await Promise.all(
+      managerAccounts.map(async (manager) => {
         try {
-          return await fetchCustomer({ resourceName, loginCustomerId });
+          const results = await searchStream({
+            ...this.options,
+            customerId: manager.id,
+            loginCustomerId: manager.id,
+            query:
+              "SELECT customer_client.id, customer_client.descriptive_name, customer_client.manager, customer_client.resource_name FROM customer_client WHERE customer_client.status = ENABLED",
+          });
+
+          for (const result of results) {
+            const client = result.customerClient;
+
+            if (!client?.id) {
+              continue;
+            }
+
+            const normalizedId = normalizeGoogleAdsCustomerId(
+              client.id.toString(),
+            );
+
+            if (customersById.has(normalizedId)) {
+              continue;
+            }
+
+            setCustomer(
+              toCustomer({
+                id: normalizedId,
+                resourceName: `customers/${normalizedId}`,
+                descriptiveName: client.descriptiveName,
+                manager: client.manager,
+                loginCustomerId: manager.id,
+              }),
+            );
+          }
         } catch (error) {
           console.error(
-            `[Google Ads API] Failed to fetch customer ${customerId} with login-customer-id ${loginCustomerId}`,
+            `[Google Ads API] Failed to list client accounts for manager ${manager.id}`,
             error,
           );
-
-          return null;
         }
       }),
     );
 
-    // Only keep accounts we could actually read (skip permission-denied ones).
-    return customers.filter(
-      (customer): customer is z.infer<typeof googleAdsCustomerSchema> =>
-        customer !== null,
-    );
+    return [...customersById.values()];
   }
 
   async listUploadClickConversionActions(customerId: string) {
@@ -372,8 +503,9 @@ export class GoogleAdsApi {
   }
 }
 
-// Resolves the login-customer-id header: use the selected account if it's a
-// manager, otherwise the sole accessible manager account (or null if ambiguous).
+// Resolves the login-customer-id header for a selected account.
+// Prefers the manager that actually granted access; does not guess a sole MCC
+// because that 403s when the client isn't under that manager.
 export const inferLoginCustomerId = ({
   customers,
   selectedCustomerId,
@@ -381,6 +513,7 @@ export const inferLoginCustomerId = ({
   customers: {
     id: string;
     manager: boolean;
+    loginCustomerId?: string | null;
   }[];
   selectedCustomerId: string;
 }) => {
@@ -389,19 +522,78 @@ export const inferLoginCustomerId = ({
     (customer) => customer.id.replace(/-/g, "") === normalizedSelectedId,
   );
 
-  if (selectedCustomer?.manager) {
-    return normalizedSelectedId;
+  if (!selectedCustomer) {
+    return null;
   }
 
-  const managerAccounts = customers.filter((customer) => customer.manager);
+  if (selectedCustomer.loginCustomerId) {
+    return selectedCustomer.loginCustomerId.replace(/-/g, "");
+  }
 
-  if (managerAccounts.length === 1) {
-    return managerAccounts[0].id.replace(/-/g, "");
+  if (selectedCustomer.manager) {
+    return normalizedSelectedId;
   }
 
   return null;
 };
 
+// login-customer-id candidates to try when the stored/inferred value 403s.
+export const getLoginCustomerIdCandidates = ({
+  customers,
+  selectedCustomerId,
+  loginCustomerId,
+}: {
+  customers: {
+    id: string;
+    manager: boolean;
+    loginCustomerId?: string | null;
+  }[];
+  selectedCustomerId: string;
+  loginCustomerId?: string | null;
+}) => {
+  const persistedLoginCustomerId = loginCustomerId?.replace(/-/g, "") || null;
+
+  const managerIds = customers
+    .filter((customer) => {
+      if (!customer.manager) {
+        return false;
+      }
+
+      const id = customer.id.replace(/-/g, "");
+      const customerLoginCustomerId = customer.loginCustomerId?.replace(
+        /-/g,
+        "",
+      );
+
+      // Sub-managers discovered via hierarchy aren't valid login-customer-ids.
+      return !customerLoginCustomerId || customerLoginCustomerId === id;
+    })
+    .map((customer) => customer.id.replace(/-/g, ""));
+
+  const candidates: (string | null)[] = [
+    ...(persistedLoginCustomerId ? [persistedLoginCustomerId] : []),
+    inferLoginCustomerId({ customers, selectedCustomerId }),
+    null,
+    ...managerIds,
+  ];
+
+  const seen = new Set<string>();
+  const unique: (string | null)[] = [];
+
+  for (const candidate of candidates) {
+    const key = candidate ?? "";
+
+    if (seen.has(key)) {
+      continue;
+    }
+
+    seen.add(key);
+    unique.push(candidate);
+  }
+
+  return unique;
+};
+
 // Formats a date as RFC 3339 for Data Manager API event uploads.
 const formatGoogleAdsEventTimestamp = (input: string | Date) => {
   const date = typeof input === "string" ? new Date(input) : input;
diff --git a/apps/web/lib/integrations/google-ads/constants.ts b/apps/web/lib/integrations/google-ads/constants.ts
index c706ab9006a..2276e28779f 100644
--- a/apps/web/lib/integrations/google-ads/constants.ts
+++ b/apps/web/lib/integrations/google-ads/constants.ts
@@ -1,12 +1,15 @@
 import { DUB_WORKSPACE_ID } from "@dub/utils";
 
+export const GOOGLE_ADS_LOGO =
+  "https://dubassets.com/integrations/int_1M096GK5Q66FJ78WQAH82SD7V_5icvkj4";
+
 export const GOOGLE_ADS_DEFAULT_SETTINGS = {
   customers: [],
   customerId: null,
   loginCustomerId: null,
   customerName: null,
-  leadConversionAction: null,
-  saleConversionAction: null,
+  leadMappings: [],
+  saleMappings: [],
 } as const;
 
 export const GOOGLE_ADS_OAUTH_SCOPE = [
@@ -18,4 +21,5 @@ export const GOOGLE_ADS_API_VERSION = "v22";
 
 export const GOOGLE_ADS_ALLOWED_WORKSPACE_IDS = new Set<string>([
   DUB_WORKSPACE_ID,
+  "ws_1KHV03S34C41PN8WWM4PRY462",
 ]);
diff --git a/apps/web/lib/integrations/google-ads/oauth.ts b/apps/web/lib/integrations/google-ads/oauth.ts
index b0cb88a1d49..3318bf50c30 100644
--- a/apps/web/lib/integrations/google-ads/oauth.ts
+++ b/apps/web/lib/integrations/google-ads/oauth.ts
@@ -1,6 +1,6 @@
 import { decrypt, encrypt } from "@/lib/encryption";
 import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK, nanoid } from "@dub/utils";
+import { APP_DOMAIN_WITH_NGROK, nanoid, sleep } from "@dub/utils";
 import { InstalledIntegration } from "@prisma/client";
 import * as z from "zod/v4";
 import { redis } from "../../upstash";
@@ -164,7 +164,7 @@ class GoogleAdsOAuthProvider extends OAuthProvider<
 
     while (Date.now() < deadline) {
       const delay = pollIntervalMs + Math.floor(Math.random() * pollIntervalMs);
-      await new Promise((resolve) => setTimeout(resolve, delay));
+      await sleep(delay);
 
       const credentials = await this.loadCredentials(installationId);
 
diff --git a/apps/web/lib/integrations/google-ads/schema.ts b/apps/web/lib/integrations/google-ads/schema.ts
index 93920941e6c..ecc0fc305b8 100644
--- a/apps/web/lib/integrations/google-ads/schema.ts
+++ b/apps/web/lib/integrations/google-ads/schema.ts
@@ -1,4 +1,5 @@
 import * as z from "zod/v4";
+import { getGoogleAdsEventMappingsError } from "./utils";
 
 export const googleAdsAuthTokenSchema = z.object({
   access_token: z.string(),
@@ -14,15 +15,37 @@ export const googleAdsCustomerSchema = z.object({
   resourceName: z.string(),
   descriptiveName: z.string(),
   manager: z.boolean(),
+  // Manager account to send as login-customer-id. Null means direct access.
+  loginCustomerId: z.string().nullish(),
+});
+
+export const googleAdsEventMappingSchema = z.object({
+  conversionAction: z.string().min(1),
+  // Empty means this mapping matches unmatched event names of that type
+  eventNames: z.array(z.string().trim().min(1).max(255)).max(50).default([]),
 });
 
+const googleAdsEventMappingsSchema = z
+  .array(googleAdsEventMappingSchema)
+  .max(50)
+  .superRefine((mappings, ctx) => {
+    const error = getGoogleAdsEventMappingsError(mappings);
+    if (error) {
+      ctx.addIssue({
+        code: "custom",
+        message: error,
+      });
+    }
+  })
+  .default([]);
+
 export const googleAdsSettingsSchema = z.object({
   customers: z.array(googleAdsCustomerSchema).default([]),
   customerId: z.string().nullish(),
   loginCustomerId: z.string().nullish(),
   customerName: z.string().nullish(),
-  leadConversionAction: z.string().nullish(),
-  saleConversionAction: z.string().nullish(),
+  leadMappings: googleAdsEventMappingsSchema,
+  saleMappings: googleAdsEventMappingsSchema,
 });
 
 export const googleAdsConversionActionSchema = z.object({
@@ -40,6 +63,7 @@ export const googleAdsConversionUploadSchema = z.object({
   }),
   conversionDateTime: z.string(),
   eventId: z.string(),
+  eventName: z.string().optional(),
   conversionValue: z.number().optional(),
   currencyCode: z.string().optional(),
   conversionCount: z.number().positive().optional(),
diff --git a/apps/web/lib/integrations/google-ads/ui/settings.tsx b/apps/web/lib/integrations/google-ads/ui/settings.tsx
index 51d86d3d535..b858e74d44c 100644
--- a/apps/web/lib/integrations/google-ads/ui/settings.tsx
+++ b/apps/web/lib/integrations/google-ads/ui/settings.tsx
@@ -2,32 +2,44 @@
 
 import useWorkspace from "@/lib/swr/use-workspace";
 import { InstalledIntegrationInfoProps } from "@/lib/types";
-import { Button, Combobox, ComboboxOption } from "@dub/ui";
-import { fetcher } from "@dub/utils";
+import { BlurImage, Button, Combobox, ComboboxOption } from "@dub/ui";
+import { Plus, Xmark } from "@dub/ui/icons";
+import { DUB_LOGO, fetcher, nFormatter } from "@dub/utils";
+import { cn } from "@dub/utils/src";
 import { ChevronDown } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
 import { useEffect, useMemo } from "react";
-import { Controller, useForm } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { Controller, useFieldArray, useForm, useWatch } from "react-hook-form";
 import { toast } from "sonner";
 import useSWR from "swr";
 import * as z from "zod/v4";
-import { GOOGLE_ADS_DEFAULT_SETTINGS } from "../constants";
+import { GOOGLE_ADS_DEFAULT_SETTINGS, GOOGLE_ADS_LOGO } from "../constants";
 import {
   googleAdsConversionActionSchema,
+  googleAdsEventMappingSchema,
   googleAdsSettingsSchema,
 } from "../schema";
 import { updateGoogleAdsSettingsAction } from "../update-google-ads-settings";
+import { getGoogleAdsEventMappingsError } from "../utils";
 
 type GoogleAdsCustomerOption = ComboboxOption<{
   descriptiveName: string;
   manager: boolean;
 }>;
 
+type EventNameOption = ComboboxOption<{
+  count?: number;
+}>;
+
+type EventMapping = z.infer<typeof googleAdsEventMappingSchema>;
+
 type FormData = {
-  [K in keyof Omit<
-    z.infer<typeof googleAdsSettingsSchema>,
-    "customers"
-  >]: string;
+  customerId: string;
+  loginCustomerId: string;
+  customerName: string;
+  leadMappings: EventMapping[];
+  saleMappings: EventMapping[];
 };
 
 type ConversionActionsResponse = {
@@ -35,6 +47,28 @@ type ConversionActionsResponse = {
   loginCustomerId: string | null;
 };
 
+type EventNameRow = {
+  eventName: string;
+  leads: number;
+  sales: number;
+};
+
+const MAX_MAPPINGS = 50;
+
+const createEmptyMapping = (): EventMapping => ({
+  conversionAction: "",
+  eventNames: [],
+});
+
+const comboboxCaret = (
+  <ChevronDown className="text-content-muted size-3.5 shrink-0 transition-transform duration-75 group-data-[state=open]:rotate-180" />
+);
+
+const comboboxButtonProps = {
+  className:
+    "h-9 w-full max-w-none justify-between gap-1.5 px-3 py-0 text-sm font-normal shadow-none",
+};
+
 export const GoogleAdsSettings = ({
   installed,
   settings,
@@ -46,19 +80,17 @@ export const GoogleAdsSettings = ({
     ...(settings as any),
   });
 
-  const { control, handleSubmit, watch, setValue } = useForm<FormData>({
+  const { control, handleSubmit, setValue } = useForm<FormData>({
     defaultValues: {
       customerId: googleAdsSettings.customerId ?? "",
       loginCustomerId: googleAdsSettings.loginCustomerId ?? "",
       customerName: googleAdsSettings.customerName ?? "",
-      leadConversionAction: googleAdsSettings.leadConversionAction ?? "",
-      saleConversionAction: googleAdsSettings.saleConversionAction ?? "",
+      leadMappings: toFormMappings(googleAdsSettings.leadMappings),
+      saleMappings: toFormMappings(googleAdsSettings.saleMappings),
     },
   });
 
-  const customerId = watch("customerId");
-  const leadConversionAction = watch("leadConversionAction");
-  const saleConversionAction = watch("saleConversionAction");
+  const customerId = useWatch({ control, name: "customerId" });
 
   const customerOptions = useMemo<GoogleAdsCustomerOption[]>(
     () =>
@@ -84,6 +116,28 @@ export const GoogleAdsSettings = ({
     fetcher,
   );
 
+  const {
+    data: leadEventNamesData,
+    isLoading: isLoadingLeadEventNames,
+    error: leadEventNamesError,
+  } = useSWR<EventNameRow[]>(
+    workspaceId && installed && customerId
+      ? `/api/analytics?event=leads&groupBy=event_names&interval=90d&workspaceId=${workspaceId}`
+      : null,
+    fetcher,
+  );
+
+  const {
+    data: saleEventNamesData,
+    isLoading: isLoadingSaleEventNames,
+    error: saleEventNamesError,
+  } = useSWR<EventNameRow[]>(
+    workspaceId && installed && customerId
+      ? `/api/analytics?event=sales&groupBy=event_names&interval=90d&workspaceId=${workspaceId}`
+      : null,
+    fetcher,
+  );
+
   useEffect(() => {
     if (conversionActionsError) {
       toast.error(
@@ -93,6 +147,22 @@ export const GoogleAdsSettings = ({
     }
   }, [conversionActionsError]);
 
+  useEffect(() => {
+    if (leadEventNamesError) {
+      toast.error(
+        leadEventNamesError.message || "Failed to load lead event names.",
+      );
+    }
+  }, [leadEventNamesError]);
+
+  useEffect(() => {
+    if (saleEventNamesError) {
+      toast.error(
+        saleEventNamesError.message || "Failed to load sale event names.",
+      );
+    }
+  }, [saleEventNamesError]);
+
   useEffect(() => {
     if (!conversionActionsData) {
       return;
@@ -129,34 +199,33 @@ export const GoogleAdsSettings = ({
     [customerOptions, customerId],
   );
 
-  const selectedLeadAction = useMemo(
-    () =>
-      conversionActionOptions.find(
-        (option) => option.value === leadConversionAction,
-      ) ?? null,
-    [conversionActionOptions, leadConversionAction],
-  );
-
-  const selectedSaleAction = useMemo(
-    () =>
-      conversionActionOptions.find(
-        (option) => option.value === saleConversionAction,
-      ) ?? null,
-    [conversionActionOptions, saleConversionAction],
-  );
-
   const onSubmit = async (data: FormData) => {
     if (!workspaceId) {
       return;
     }
 
+    const leadMappings = sanitizeMappings(data.leadMappings);
+    const saleMappings = sanitizeMappings(data.saleMappings);
+
+    const leadMappingsError = getGoogleAdsEventMappingsError(leadMappings);
+    if (leadMappingsError) {
+      toast.error(`Lead events: ${leadMappingsError}`);
+      return;
+    }
+
+    const saleMappingsError = getGoogleAdsEventMappingsError(saleMappings);
+    if (saleMappingsError) {
+      toast.error(`Sale events: ${saleMappingsError}`);
+      return;
+    }
+
     await saveSettings({
       workspaceId,
       customerId: data.customerId || null,
       loginCustomerId: data.loginCustomerId || null,
       customerName: data.customerName || null,
-      leadConversionAction: data.leadConversionAction || null,
-      saleConversionAction: data.saleConversionAction || null,
+      leadMappings,
+      saleMappings,
     });
   };
 
@@ -165,7 +234,7 @@ export const GoogleAdsSettings = ({
   }
 
   return (
-    <form className="mt-4 space-y-4" onSubmit={handleSubmit(onSubmit)}>
+    <form className="space-y-4" onSubmit={handleSubmit(onSubmit)}>
       <div className="rounded-lg border border-neutral-200 bg-white">
         <div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4">
           <p className="text-sm font-medium text-neutral-700">
@@ -197,18 +266,13 @@ export const GoogleAdsSettings = ({
                     setValue("customerId", option.value);
                     setValue("customerName", option.label);
                     setValue("loginCustomerId", "");
-                    setValue("leadConversionAction", "");
-                    setValue("saleConversionAction", "");
+                    setValue("leadMappings", [createEmptyMapping()]);
+                    setValue("saleMappings", [createEmptyMapping()]);
                   }}
                   placeholder="Select account"
                   matchTriggerWidth
-                  caret={
-                    <ChevronDown className="text-content-muted size-3.5 shrink-0 transition-transform duration-75 group-data-[state=open]:rotate-180" />
-                  }
-                  buttonProps={{
-                    className:
-                      "h-9 w-full max-w-none justify-between gap-1.5 px-3 py-0 text-sm font-normal shadow-none",
-                  }}
+                  caret={comboboxCaret}
+                  buttonProps={comboboxButtonProps}
                 />
               )}
             />
@@ -220,92 +284,396 @@ export const GoogleAdsSettings = ({
 
           {customerId && (
             <>
-              <div>
-                <p className="mb-2 text-sm font-medium text-neutral-700">
-                  Lead conversion action
-                </p>
-                <p className="mb-4 text-sm leading-normal text-neutral-600">
-                  Map Dub lead events to an existing Google Ads conversion
-                  action with type UPLOAD_CLICKS.
-                </p>
-                <Controller
-                  name="leadConversionAction"
+              <EventMappingsSection
+                name="leadMappings"
+                control={control}
+                title="Lead events"
+                description="Map Dub lead events to Google Ads conversion actions. Each event name can only be assigned to one conversion action."
+                conversionActionPlaceholder={
+                  isLoadingOptions
+                    ? "Loading conversion actions..."
+                    : "Select lead conversion action"
+                }
+                eventNamesPlaceholder="All unmatched lead events"
+                eventNamesEmptyState="No lead events in the last 90 days. Type a name to add one."
+                conversionActionOptions={conversionActionOptions}
+                eventNameRows={leadEventNamesData}
+                eventCountKey="leads"
+                isLoadingConversionActions={isLoadingOptions}
+                isLoadingEventNames={isLoadingLeadEventNames}
+              />
+
+              <div className="border-t border-neutral-200 pt-6">
+                <EventMappingsSection
+                  name="saleMappings"
                   control={control}
-                  render={({ field }) => (
-                    <Combobox
-                      options={conversionActionOptions}
-                      selected={selectedLeadAction}
-                      setSelected={(option) => {
-                        if (option) {
-                          field.onChange(option.value);
-                        }
-                      }}
-                      placeholder={
-                        isLoadingOptions
-                          ? "Loading conversion actions..."
-                          : "Select lead conversion action"
-                      }
-                      matchTriggerWidth
-                      caret={
-                        <ChevronDown className="text-content-muted size-3.5 shrink-0 transition-transform duration-75 group-data-[state=open]:rotate-180" />
-                      }
-                      buttonProps={{
-                        className:
-                          "h-9 w-full max-w-none justify-between gap-1.5 px-3 py-0 text-sm font-normal shadow-none",
-                      }}
-                    />
-                  )}
+                  title="Sale events"
+                  description="Map Dub sale events to Google Ads conversion actions. Each event name can only be assigned to one conversion action."
+                  conversionActionPlaceholder={
+                    isLoadingOptions
+                      ? "Loading conversion actions..."
+                      : "Select sale conversion action"
+                  }
+                  eventNamesPlaceholder="All unmatched sale events"
+                  eventNamesEmptyState="No sale events in the last 90 days. Type a name to add one."
+                  conversionActionOptions={conversionActionOptions}
+                  eventNameRows={saleEventNamesData}
+                  eventCountKey="sales"
+                  isLoadingConversionActions={isLoadingOptions}
+                  isLoadingEventNames={isLoadingSaleEventNames}
                 />
               </div>
+            </>
+          )}
+        </div>
 
-              <div>
-                <p className="mb-2 text-sm font-medium text-neutral-700">
-                  Sale conversion action
-                </p>
-                <p className="mb-4 text-sm leading-normal text-neutral-600">
-                  Map Dub sale events to an existing Google Ads conversion
-                  action with type UPLOAD_CLICKS.
-                </p>
+        <div className="flex items-center justify-end rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-4 py-3">
+          <Button
+            type="submit"
+            variant="primary"
+            text="Save changes"
+            className="h-8 w-fit"
+            loading={isSaving}
+            disabled={!customerId || isLoadingOptions}
+          />
+        </div>
+      </div>
+    </form>
+  );
+};
+
+function EventMappingsSection({
+  name,
+  control,
+  title,
+  description,
+  conversionActionPlaceholder,
+  eventNamesPlaceholder,
+  eventNamesEmptyState,
+  conversionActionOptions,
+  eventNameRows,
+  eventCountKey,
+  isLoadingConversionActions,
+  isLoadingEventNames,
+}: {
+  name: "leadMappings" | "saleMappings";
+  control: Control<FormData>;
+  title: string;
+  description: string;
+  conversionActionPlaceholder: string;
+  eventNamesPlaceholder: string;
+  eventNamesEmptyState: string;
+  conversionActionOptions: ComboboxOption[];
+  eventNameRows: EventNameRow[] | undefined;
+  eventCountKey: "leads" | "sales";
+  isLoadingConversionActions: boolean;
+  isLoadingEventNames: boolean;
+}) {
+  const mappings = useWatch({ control, name }) ?? [];
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name,
+  });
+
+  const conversionActionLabelByValue = useMemo(() => {
+    return new Map(
+      conversionActionOptions.map((option) => [option.value, option.label]),
+    );
+  }, [conversionActionOptions]);
+
+  const canAddMapping =
+    mappings.length > 0 &&
+    mappings.every((mapping) => mapping.conversionAction) &&
+    mappings.length < MAX_MAPPINGS &&
+    mappings.length < conversionActionOptions.length;
+
+  return (
+    <div>
+      <p className="mb-1 text-sm font-medium text-neutral-700">{title}</p>
+      <p className="mb-4 text-sm text-neutral-500">{description}</p>
+
+      <div className="space-y-2">
+        <div className="flex items-center gap-2">
+          <div className="grid flex-1 grid-cols-2 gap-2">
+            <FieldLabel src={GOOGLE_ADS_LOGO} alt="Google Ads">
+              Conversion action
+            </FieldLabel>
+            <FieldLabel src={DUB_LOGO} alt="Dub">
+              Event names
+            </FieldLabel>
+          </div>
+          {fields.length > 1 && <div className="size-4 shrink-0" />}
+        </div>
+
+        {fields.map((field, index) => {
+          const mapping = mappings[index] ?? createEmptyMapping();
+          const selectedConversionAction =
+            conversionActionOptions.find(
+              (option) => option.value === mapping.conversionAction,
+            ) ?? null;
+          const usedConversionActions = new Set(
+            mappings
+              .filter((_, mappingIndex) => mappingIndex !== index)
+              .map((item) => item.conversionAction)
+              .filter(Boolean),
+          );
+          const usedEventNames = new Map<string, string>();
+          mappings.forEach((item, mappingIndex) => {
+            if (mappingIndex === index) {
+              return;
+            }
+
+            const actionLabel =
+              conversionActionLabelByValue.get(item.conversionAction) ??
+              "another conversion action";
+
+            for (const eventName of item.eventNames) {
+              usedEventNames.set(eventName, String(actionLabel));
+            }
+          });
+
+          return (
+            <div key={field.id} className="flex items-center gap-2">
+              <div className="grid min-w-0 flex-1 grid-cols-2 gap-2">
                 <Controller
-                  name="saleConversionAction"
+                  name={`${name}.${index}.conversionAction`}
                   control={control}
-                  render={({ field }) => (
+                  render={({ field: conversionActionField }) => (
                     <Combobox
-                      options={conversionActionOptions}
-                      selected={selectedSaleAction}
+                      options={conversionActionOptions.map((option) => ({
+                        ...option,
+                        disabledTooltip: usedConversionActions.has(option.value)
+                          ? "Already used by another mapping"
+                          : undefined,
+                      }))}
+                      selected={selectedConversionAction}
                       setSelected={(option) => {
                         if (option) {
-                          field.onChange(option.value);
+                          conversionActionField.onChange(option.value);
                         }
                       }}
-                      placeholder={
-                        isLoadingOptions
-                          ? "Loading conversion actions..."
-                          : "Select sale conversion action"
-                      }
+                      placeholder={conversionActionPlaceholder}
                       matchTriggerWidth
-                      caret={
-                        <ChevronDown className="text-content-muted size-3.5 shrink-0 transition-transform duration-75 group-data-[state=open]:rotate-180" />
-                      }
-                      buttonProps={{
-                        className:
-                          "h-9 w-full max-w-none justify-between gap-1.5 px-3 py-0 text-sm font-normal shadow-none",
-                      }}
+                      caret={comboboxCaret}
+                      buttonProps={comboboxButtonProps}
                     />
                   )}
                 />
+
+                <EventNamesField
+                  name={`${name}.${index}.eventNames`}
+                  control={control}
+                  options={buildEventNameOptions({
+                    rows: eventNameRows,
+                    selected: mapping.eventNames,
+                    usedByOthers: usedEventNames,
+                    countKey: eventCountKey,
+                  })}
+                  usedByOthers={usedEventNames}
+                  isLoading={isLoadingEventNames}
+                  disabled={!mapping.conversionAction}
+                  placeholder={
+                    !mapping.conversionAction
+                      ? "Select a conversion action first"
+                      : mappings.filter((item) => item.conversionAction)
+                            .length > 1
+                        ? eventNamesPlaceholder
+                        : eventNamesPlaceholder.replace("unmatched ", "")
+                  }
+                  emptyState={eventNamesEmptyState}
+                />
               </div>
-            </>
-          )}
+              {fields.length > 1 && (
+                <button
+                  type="button"
+                  onClick={() => remove(index)}
+                  className="text-neutral-400 transition-colors hover:text-red-500"
+                  aria-label={`Remove mapping ${index + 1}`}
+                >
+                  <Xmark className="size-4" aria-hidden />
+                </button>
+              )}
+            </div>
+          );
+        })}
 
-          <Button
-            type="submit"
-            text="Save settings"
-            loading={isSaving}
-            disabled={!customerId || isLoadingOptions}
-          />
-        </div>
+        <Button
+          type="button"
+          variant="secondary"
+          onClick={() => append(createEmptyMapping())}
+          icon={<Plus className="size-3.5" />}
+          text="Add mapping"
+          className="h-7 w-fit px-2 text-xs"
+          disabled={!canAddMapping || isLoadingConversionActions}
+        />
       </div>
-    </form>
+    </div>
   );
-};
+}
+
+function toFormMappings(mappings: EventMapping[]): EventMapping[] {
+  if (mappings.length === 0) {
+    return [createEmptyMapping()];
+  }
+
+  return mappings.map((mapping) => ({
+    conversionAction: mapping.conversionAction,
+    eventNames: [...mapping.eventNames],
+  }));
+}
+
+function sanitizeMappings(mappings: EventMapping[]) {
+  return mappings
+    .filter((mapping) => mapping.conversionAction)
+    .map((mapping) => ({
+      conversionAction: mapping.conversionAction,
+      eventNames: [...new Set(mapping.eventNames)],
+    }));
+}
+
+function buildEventNameOptions({
+  rows,
+  selected,
+  usedByOthers,
+  countKey,
+}: {
+  rows: EventNameRow[] | undefined;
+  selected: string[];
+  usedByOthers: Map<string, string>;
+  countKey: "leads" | "sales";
+}): EventNameOption[] {
+  const fromAnalytics = (rows ?? [])
+    .filter((row) => row.eventName)
+    .map((row) => ({
+      value: row.eventName,
+      label: row.eventName,
+      meta: { count: row[countKey] },
+      disabledTooltip: usedByOthers.has(row.eventName)
+        ? `Already mapped to ${usedByOthers.get(row.eventName)}`
+        : undefined,
+    }));
+  const fromAnalyticsSet = new Set(fromAnalytics.map((option) => option.value));
+  const extras = selected
+    .filter((eventName) => !fromAnalyticsSet.has(eventName))
+    .map((eventName) => ({
+      value: eventName,
+      label: eventName,
+    }));
+
+  return [...extras, ...fromAnalytics];
+}
+
+function FieldLabel({
+  src,
+  alt,
+  children,
+}: {
+  src: string;
+  alt: string;
+  children: string;
+}) {
+  return (
+    <div className="flex items-center gap-1.5">
+      <BlurImage
+        src={src}
+        alt={alt}
+        width={16}
+        height={16}
+        className={cn(
+          "size-4 shrink-0 object-contain",
+          src === DUB_LOGO ? "size-3.5 rounded-sm" : "",
+        )}
+      />
+      <span className="text-sm font-medium text-neutral-700">{children}</span>
+    </div>
+  );
+}
+
+function EventNamesField({
+  name,
+  control,
+  options,
+  usedByOthers,
+  isLoading,
+  disabled,
+  placeholder,
+  emptyState,
+}: {
+  name:
+    | `leadMappings.${number}.eventNames`
+    | `saleMappings.${number}.eventNames`;
+  control: Control<FormData>;
+  options: EventNameOption[];
+  usedByOthers: Map<string, string>;
+  isLoading: boolean;
+  disabled: boolean;
+  placeholder: string;
+  emptyState: string;
+}) {
+  return (
+    <Controller
+      name={name}
+      control={control}
+      render={({ field }) => (
+        <Combobox
+          multiple
+          options={isLoading || disabled ? undefined : options}
+          selected={(field.value ?? []).map(
+            (eventName) =>
+              options.find((option) => option.value === eventName) ?? {
+                value: eventName,
+                label: eventName,
+              },
+          )}
+          setSelected={(selected) => {
+            if (disabled) {
+              return;
+            }
+            field.onChange(selected.map((option) => option.value));
+          }}
+          onCreate={async (search) => {
+            if (disabled) {
+              return false;
+            }
+
+            const eventName = search.trim();
+            if (!eventName) {
+              return false;
+            }
+
+            const usedBy = usedByOthers.get(eventName);
+            if (usedBy) {
+              toast.error(`Already mapped to ${usedBy}`);
+              return false;
+            }
+
+            const current = field.value ?? [];
+            if (!current.includes(eventName)) {
+              field.onChange([...current, eventName]);
+            }
+            return true;
+          }}
+          createLabel={(search) => `Add "${search.trim()}"`}
+          placeholder={
+            isLoading && !disabled ? "Loading event names..." : placeholder
+          }
+          searchPlaceholder="Search or add event names..."
+          emptyState={emptyState}
+          optionRight={(option) =>
+            option.meta?.count != null ? (
+              <span className="text-xs text-neutral-500">
+                {nFormatter(option.meta.count, { full: true })}
+              </span>
+            ) : undefined
+          }
+          matchTriggerWidth
+          caret={comboboxCaret}
+          buttonProps={{
+            ...comboboxButtonProps,
+            disabled,
+          }}
+        />
+      )}
+    />
+  );
+}
diff --git a/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts b/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts
index 417f090ccd0..20efcfac224 100644
--- a/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts
+++ b/apps/web/lib/integrations/google-ads/update-google-ads-settings.ts
@@ -9,11 +9,20 @@ import { revalidatePath } from "next/cache";
 import * as z from "zod/v4";
 import { inferLoginCustomerId } from "./api";
 import { googleAdsSettingsSchema } from "./schema";
+import { getGoogleAdsEventMappingsError } from "./utils";
 
 const schema = googleAdsSettingsSchema.omit({ customers: true }).extend({
   workspaceId: z.string(),
 });
 
+const uniqueMappingEventNames = (
+  mappings: z.infer<typeof googleAdsSettingsSchema>["leadMappings"],
+) =>
+  mappings.map((mapping) => ({
+    ...mapping,
+    eventNames: [...new Set(mapping.eventNames)],
+  }));
+
 export const updateGoogleAdsSettingsAction = authActionClient
   .inputSchema(schema)
   .action(async ({ parsedInput, ctx }) => {
@@ -21,8 +30,9 @@ export const updateGoogleAdsSettingsAction = authActionClient
     const {
       customerId,
       customerName,
-      leadConversionAction,
-      saleConversionAction,
+      loginCustomerId: submittedLoginCustomerId,
+      leadMappings,
+      saleMappings,
     } = parsedInput;
 
     throwIfNoPermission({
@@ -67,13 +77,14 @@ export const updateGoogleAdsSettingsAction = authActionClient
     }
 
     const resolvedLoginCustomerId = customerId
-      ? inferLoginCustomerId({
+      ? submittedLoginCustomerId?.replace(/-/g, "") ||
+        inferLoginCustomerId({
           customers: currentSettings.customers,
           selectedCustomerId: customerId,
         })
       : null;
 
-    if (!customerId && (leadConversionAction || saleConversionAction)) {
+    if (!customerId && (leadMappings.length || saleMappings.length)) {
       throw new Error(
         "A Google Ads account is required to configure conversion actions.",
       );
@@ -84,20 +95,32 @@ export const updateGoogleAdsSettingsAction = authActionClient
       const expectedPrefix = `customers/${normalizedCustomerId}/conversionActions/`;
 
       if (
-        leadConversionAction &&
-        !leadConversionAction.startsWith(expectedPrefix)
+        leadMappings.some(
+          (mapping) => !mapping.conversionAction.startsWith(expectedPrefix),
+        )
       ) {
         throw new Error("Invalid lead conversion action.");
       }
 
       if (
-        saleConversionAction &&
-        !saleConversionAction.startsWith(expectedPrefix)
+        saleMappings.some(
+          (mapping) => !mapping.conversionAction.startsWith(expectedPrefix),
+        )
       ) {
         throw new Error("Invalid sale conversion action.");
       }
     }
 
+    const leadMappingsError = getGoogleAdsEventMappingsError(leadMappings);
+    if (leadMappingsError) {
+      throw new Error(`Lead events: ${leadMappingsError}`);
+    }
+
+    const saleMappingsError = getGoogleAdsEventMappingsError(saleMappings);
+    if (saleMappingsError) {
+      throw new Error(`Sale events: ${saleMappingsError}`);
+    }
+
     await prisma.installedIntegration.update({
       where: {
         id: installedIntegration.id,
@@ -108,8 +131,8 @@ export const updateGoogleAdsSettingsAction = authActionClient
           customerId,
           loginCustomerId: resolvedLoginCustomerId,
           customerName,
-          leadConversionAction,
-          saleConversionAction,
+          leadMappings: uniqueMappingEventNames(leadMappings),
+          saleMappings: uniqueMappingEventNames(saleMappings),
         },
       },
     });
diff --git a/apps/web/lib/integrations/google-ads/upload-conversion.ts b/apps/web/lib/integrations/google-ads/upload-conversion.ts
index 696f952c785..a7854b44ab9 100644
--- a/apps/web/lib/integrations/google-ads/upload-conversion.ts
+++ b/apps/web/lib/integrations/google-ads/upload-conversion.ts
@@ -5,6 +5,8 @@ import {
   APP_DOMAIN_WITH_NGROK,
   getSearchParams,
   GOOGLE_ADS_INTEGRATION_ID,
+  isZeroDecimalCurrency,
+  sleep,
 } from "@dub/utils";
 import * as z from "zod/v4";
 import { GoogleAdsApi, GoogleAdsClickId } from "./api";
@@ -14,6 +16,7 @@ import {
   googleAdsConversionUploadSchema,
   googleAdsSettingsSchema,
 } from "./schema";
+import { resolveGoogleAdsConversionMapping } from "./utils";
 
 const extractGoogleAdsClickId = (url: string): GoogleAdsClickId | null => {
   try {
@@ -54,6 +57,16 @@ export const queueGoogleAdsConversionUpload = async (
     return;
   }
 
+  // Data Manager expects major currency units, so we need to divide by 100
+  // if the currency is NOT a zero decimal currency (e.g. JPY doesn't have cents)
+  if (
+    payload.conversionValue &&
+    payload.currencyCode &&
+    !isZeroDecimalCurrency(payload.currencyCode)
+  ) {
+    payload.conversionValue = payload.conversionValue / 100;
+  }
+
   try {
     const response = await qstash.publishJSON({
       url: `${APP_DOMAIN_WITH_NGROK}/api/google-ads/upload-conversion`,
@@ -98,6 +111,7 @@ export const uploadGoogleAdsConversion = async (
     click,
     conversionDateTime,
     eventId,
+    eventName,
     conversionValue,
     currencyCode,
     conversionCount,
@@ -127,18 +141,31 @@ export const uploadGoogleAdsConversion = async (
       installedIntegration.settings ?? {},
     );
 
-    const conversionAction =
-      eventType === "lead"
-        ? settings.leadConversionAction
-        : settings.saleConversionAction;
+    const mappings =
+      eventType === "lead" ? settings.leadMappings : settings.saleMappings;
+    const mapping = resolveGoogleAdsConversionMapping({
+      mappings,
+      eventName,
+    });
 
-    if (!settings.customerId || !conversionAction) {
+    if (!settings.customerId) {
       return {
-        message: `Missing ${!settings.customerId ? "customerId" : `${eventType}ConversionAction`}. Skipping...`,
+        message: `Missing customerId. Skipping...`,
         status: "skipped",
       };
     }
 
+    if (!mapping) {
+      return {
+        message: mappings.length
+          ? `No ${eventType} conversion mapping matched event name "${eventName ?? ""}". Skipping...`
+          : `Missing ${eventType} conversion mapping. Skipping...`,
+        status: "skipped",
+      };
+    }
+
+    const conversionAction = mapping.conversionAction;
+
     const googleClickId = extractGoogleAdsClickId(click.url);
 
     if (!googleClickId) {
@@ -187,9 +214,7 @@ export const uploadGoogleAdsConversion = async (
         };
       } catch (error) {
         if (attempt < maxRetries) {
-          await new Promise((resolve) =>
-            setTimeout(resolve, 1000 * Math.pow(2, attempt)),
-          );
+          await sleep(1000 * Math.pow(2, attempt));
           continue;
         }
 
diff --git a/apps/web/lib/integrations/google-ads/utils.ts b/apps/web/lib/integrations/google-ads/utils.ts
index 5c85b99cdd6..2ba34fe9488 100644
--- a/apps/web/lib/integrations/google-ads/utils.ts
+++ b/apps/web/lib/integrations/google-ads/utils.ts
@@ -3,3 +3,77 @@ import { GOOGLE_ADS_ALLOWED_WORKSPACE_IDS } from "./constants";
 
 export const isGoogleAdsAllowedWorkspace = (workspaceId: string) =>
   GOOGLE_ADS_ALLOWED_WORKSPACE_IDS.has(normalizeWorkspaceId(workspaceId));
+
+type GoogleAdsEventMapping = {
+  conversionAction: string;
+  eventNames: string[];
+};
+
+export const findDuplicateMappingEventNames = (
+  mappings: Pick<GoogleAdsEventMapping, "eventNames">[],
+) => {
+  const seen = new Set<string>();
+  const duplicates = new Set<string>();
+
+  for (const mapping of mappings) {
+    for (const eventName of mapping.eventNames) {
+      if (seen.has(eventName)) {
+        duplicates.add(eventName);
+      }
+      seen.add(eventName);
+    }
+  }
+
+  return [...duplicates];
+};
+
+export const getGoogleAdsEventMappingsError = (
+  mappings: GoogleAdsEventMapping[],
+) => {
+  const duplicateEventNames = findDuplicateMappingEventNames(mappings);
+  if (duplicateEventNames.length > 0) {
+    return `Each event name can only be mapped to one conversion action: ${duplicateEventNames.join(", ")}`;
+  }
+
+  const conversionActions = mappings
+    .map((mapping) => mapping.conversionAction)
+    .filter(Boolean);
+  if (new Set(conversionActions).size !== conversionActions.length) {
+    return "Each conversion action can only be used once.";
+  }
+
+  const catchAllCount = mappings.filter(
+    (mapping) => mapping.conversionAction && mapping.eventNames.length === 0,
+  ).length;
+  if (catchAllCount > 1) {
+    return "Only one conversion action can receive unmatched events.";
+  }
+
+  return null;
+};
+
+// Prefer a mapping whose eventNames includes the event, then a catch-all
+// mapping with an empty eventNames list. Returns null when nothing matches.
+export const resolveGoogleAdsConversionMapping = ({
+  mappings,
+  eventName,
+}: {
+  mappings: GoogleAdsEventMapping[];
+  eventName?: string | null;
+}): GoogleAdsEventMapping | null => {
+  if (!mappings.length) {
+    return null;
+  }
+
+  if (eventName) {
+    const specific = mappings.find((mapping) =>
+      mapping.eventNames.includes(eventName),
+    );
+
+    if (specific) {
+      return specific;
+    }
+  }
+
+  return mappings.find((mapping) => mapping.eventNames.length === 0) ?? null;
+};
diff --git a/apps/web/lib/integrations/hubspot/track-lead.ts b/apps/web/lib/integrations/hubspot/track-lead.ts
index 4a2e1373ca7..bd3f4f277e0 100644
--- a/apps/web/lib/integrations/hubspot/track-lead.ts
+++ b/apps/web/lib/integrations/hubspot/track-lead.ts
@@ -1,6 +1,7 @@
 import { trackLead } from "@/lib/api/conversions/track-lead";
 import { prisma } from "@/lib/prisma";
 import { TrackLeadResponse, WorkspaceProps } from "@/lib/types";
+import { CommissionSource } from "@prisma/client";
 import * as z from "zod/v4";
 import { HubSpotAuthToken, HubSpotContact } from "../types";
 import { HubSpotApi } from "./api";
@@ -50,6 +51,7 @@ export const trackHubSpotLeadEvent = async ({
       customerName,
       mode: "deferred",
       workspace,
+      commissionSource: CommissionSource.hubspot,
     });
 
     if (trackLeadResult) {
@@ -97,6 +99,7 @@ export const trackHubSpotLeadEvent = async ({
       where: {
         projectId: workspace.id,
         OR: [
+          { email: contactInfo.properties.email },
           { externalId: contactInfo.id },
           { externalId: contactInfo.properties.email },
         ],
@@ -115,6 +118,7 @@ export const trackHubSpotLeadEvent = async ({
       customerEmail: contactInfo.properties.email,
       mode: "async",
       workspace,
+      commissionSource: CommissionSource.hubspot,
     });
 
     if (trackLeadResult) {
@@ -173,6 +177,7 @@ export const trackHubSpotLeadEvent = async ({
       customerEmail: properties.email,
       mode: "async",
       workspace,
+      commissionSource: CommissionSource.hubspot,
     });
 
     if (trackLeadResult) {
diff --git a/apps/web/lib/integrations/hubspot/track-sale.ts b/apps/web/lib/integrations/hubspot/track-sale.ts
index f8688659e72..3858d385162 100644
--- a/apps/web/lib/integrations/hubspot/track-sale.ts
+++ b/apps/web/lib/integrations/hubspot/track-sale.ts
@@ -1,6 +1,7 @@
 import { trackSale } from "@/lib/api/conversions/track-sale";
 import { prisma } from "@/lib/prisma";
 import { WorkspaceProps } from "@/lib/types";
+import { CommissionSource } from "@prisma/client";
 import * as z from "zod/v4";
 import { HubSpotAuthToken } from "../types";
 import { HubSpotApi } from "./api";
@@ -69,6 +70,7 @@ export const trackHubSpotSaleEvent = async ({
     where: {
       projectId: workspace.id,
       OR: [
+        { email: contactInfo.properties.email },
         { externalId: contactInfo.id },
         { externalId: contactInfo.properties.email },
       ],
@@ -87,6 +89,7 @@ export const trackHubSpotSaleEvent = async ({
     invoiceId: dealId,
     workspace,
     metadata: {},
+    commissionSource: CommissionSource.hubspot,
   });
 
   return `Sale tracked for deal ${dealId}.`;
diff --git a/apps/web/lib/integrations/hubspot/ui/settings.tsx b/apps/web/lib/integrations/hubspot/ui/settings.tsx
index b03995a3547..34d42348ddc 100644
--- a/apps/web/lib/integrations/hubspot/ui/settings.tsx
+++ b/apps/web/lib/integrations/hubspot/ui/settings.tsx
@@ -66,7 +66,7 @@ export const HubSpotSettings = ({
   }
 
   return (
-    <form className="mt-4 space-y-4" onSubmit={onSubmit}>
+    <form className="space-y-4" onSubmit={onSubmit}>
       <div className="rounded-lg border border-neutral-200 bg-white">
         <div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4">
           <p className="text-sm font-medium text-neutral-700">
diff --git a/apps/web/lib/integrations/segment/ui/set-write-key.tsx b/apps/web/lib/integrations/segment/ui/set-write-key.tsx
index bfd22d07e60..c6c5f8ddd3e 100644
--- a/apps/web/lib/integrations/segment/ui/set-write-key.tsx
+++ b/apps/web/lib/integrations/segment/ui/set-write-key.tsx
@@ -55,7 +55,7 @@ export function SetWriteKey({
   );
 
   return (
-    <form className="mt-4 flex items-end gap-2" onSubmit={onSubmit}>
+    <form className="flex items-end gap-2" onSubmit={onSubmit}>
       <div className="w-full rounded-lg border border-neutral-200 bg-white">
         <div className="flex items-center gap-x-2 border-b border-neutral-200 px-6 py-4">
           <Lock className="size-4" />
diff --git a/apps/web/lib/integrations/shopify/attribute-via-discount-code.ts b/apps/web/lib/integrations/shopify/attribute-via-discount-code.ts
new file mode 100644
index 00000000000..93666345970
--- /dev/null
+++ b/apps/web/lib/integrations/shopify/attribute-via-discount-code.ts
@@ -0,0 +1,185 @@
+import { createId } from "@/lib/api/create-id";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
+import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
+import { queueGoogleAdsConversionUpload } from "@/lib/integrations/google-ads/upload-conversion";
+import { generateRandomName } from "@/lib/names";
+import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
+import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
+import { prisma } from "@/lib/prisma";
+import { recordLead } from "@/lib/tinybird";
+import { recordFakeClick } from "@/lib/tinybird/record-fake-click";
+import { WorkspaceProps } from "@/lib/types";
+import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
+import { transformLeadEventData } from "@/lib/webhook/transform";
+import { COUNTRIES_TO_CONTINENTS, nanoid } from "@dub/utils";
+import { CommissionSource, EventType, Link } from "@prisma/client";
+import { ShopifyOrder } from "./schema";
+
+export async function attributeViaDiscountCode({
+  order,
+  workspace,
+  link,
+}: {
+  order: ShopifyOrder;
+  workspace: Pick<WorkspaceProps, "id" | "defaultProgramId" | "webhookEnabled">;
+  link: Link;
+}) {
+  const { customer: orderCustomer, billing_address: billingAddress } = order;
+
+  const billingAddressCountry = billingAddress?.country_code?.toUpperCase();
+
+  // Record a fake click for this event
+  const clickEvent = await recordFakeClick({
+    link,
+    customer: {
+      continent: billingAddressCountry
+        ? COUNTRIES_TO_CONTINENTS[billingAddressCountry] ?? "Unknown"
+        : "Unknown",
+      country: billingAddressCountry ?? "Unknown",
+      region: billingAddress?.province ?? "Unknown",
+    },
+  });
+
+  const customerId = createId({ prefix: "cus_" });
+  const clickId = clickEvent.click_id;
+
+  // Create the customer before recording the fake click so a P2002 on
+  // projectId_externalId never leaves an orphaned Tinybird click behind.
+  const customer = await prisma.customer.create({
+    data: {
+      id: customerId,
+      name: orderCustomer
+        ? `${orderCustomer.first_name} ${orderCustomer.last_name}`.trim()
+        : generateRandomName(),
+      email: orderCustomer?.email,
+      externalId: orderCustomer?.id?.toString() || customerId,
+      linkId: link.id,
+      clickId,
+      clickedAt: new Date(),
+      country: billingAddress?.country_code,
+      projectId: workspace.id,
+      programId: link.programId,
+      partnerId: link.partnerId,
+    },
+  });
+
+  // Prepare the payload for the lead event
+  const { timestamp, ...rest } = clickEvent;
+
+  const leadEvent = {
+    ...rest,
+    workspace_id: clickEvent.workspace_id || customer.projectId, // in case for some reason the click event doesn't have workspace_id
+    event_id: nanoid(16),
+    event_name: "Checkout with discount code",
+    customer_id: customer.id,
+    metadata: "",
+  };
+
+  await recordLead(leadEvent);
+
+  const linkUpdated = await prisma.link.update({
+    where: {
+      id: link.id,
+    },
+    data: {
+      leads: {
+        increment: 1,
+      },
+      lastLeadAt: new Date(),
+    },
+    include: includeTags,
+  });
+
+  let result:
+    | Awaited<ReturnType<typeof queuePartnerCommissionCreation>>
+    | undefined = undefined;
+
+  if (link.programId && link.partnerId) {
+    result = await queuePartnerCommissionCreation({
+      event: "lead",
+      programId: link.programId,
+      partnerId: link.partnerId,
+      linkId: link.id,
+      eventId: leadEvent.event_id,
+      customerId: customer.id,
+      quantity: 1,
+      source: CommissionSource.shopify,
+      context: {
+        customer: {
+          country: customer.country,
+        },
+      },
+    });
+
+    await Promise.allSettled([
+      executeWorkflows({
+        event: "leadRecorded",
+        identity: {
+          workspaceId: workspace.id,
+          programId: link.programId,
+          partnerId: link.partnerId,
+        },
+        metrics: {
+          current: {
+            leads: 1,
+          },
+        },
+      }),
+
+      syncPartnerLinksStats({
+        partnerId: link.partnerId,
+        programId: link.programId,
+        eventType: "lead",
+      }),
+    ]);
+  }
+
+  await Promise.allSettled([
+    sendWorkspaceWebhook({
+      trigger: "lead.created",
+      workspace,
+      data: transformLeadEventData({
+        ...clickEvent,
+        eventName: "Checkout with discount code",
+        link: linkUpdated,
+        customer,
+        partner: result?.webhookPartner,
+        metadata: null,
+      }),
+    }),
+
+    queueGoogleAdsConversionUpload({
+      workspaceId: workspace.id,
+      eventType: EventType.lead,
+      eventId: leadEvent.event_id,
+      eventName: leadEvent.event_name,
+      conversionDateTime: new Date().toISOString(),
+      conversionCount: 1,
+      click: {
+        id: clickEvent.click_id,
+        url: clickEvent.url,
+      },
+    }),
+
+    ...(link.partnerId
+      ? [
+          sendPartnerPostback({
+            partnerId: link.partnerId,
+            event: "lead.created",
+            data: {
+              ...leadEvent,
+              eventName: "Checkout with discount code",
+              link: linkUpdated,
+              customer,
+            },
+          }),
+        ]
+      : []),
+  ]);
+
+  return {
+    customer,
+    leadEvent,
+  };
+}
diff --git a/apps/web/lib/integrations/shopify/checkout-cache.ts b/apps/web/lib/integrations/shopify/checkout-cache.ts
new file mode 100644
index 00000000000..543228e2c40
--- /dev/null
+++ b/apps/web/lib/integrations/shopify/checkout-cache.ts
@@ -0,0 +1,128 @@
+import { processShopifyOrderJob } from "@/lib/jobs/handlers/process-shopify-order-job";
+import { redis } from "@/lib/upstash";
+import * as z from "zod/v4";
+import { shopifyOrderSchema } from "./schema";
+
+const SHOPIFY_CHECKOUT_CACHE_TTL_SECONDS = 60 * 60; // 1 hours
+const SHOPIFY_CHECKOUT_CACHE_KEY_PREFIX = "shopify:checkout:";
+
+const shopifyCheckoutCacheSchema = z.object({
+  clickId: z
+    .string()
+    .nullish()
+    .transform((value) => value ?? undefined),
+  workspaceId: z.string().optional(),
+  order: shopifyOrderSchema.optional(),
+  dispatched: z.boolean().optional(),
+});
+
+type ShopifyCheckoutCacheItem = z.infer<typeof shopifyCheckoutCacheSchema>;
+
+class ShopifyCheckoutCache {
+  async get(checkoutToken: string): Promise<ShopifyCheckoutCacheItem> {
+    const cache = await redis.hgetall(this.createKey(checkoutToken));
+    return this.parse(cache);
+  }
+
+  async set({
+    checkoutToken,
+    fields,
+  }: {
+    checkoutToken: string;
+    fields: Partial<ShopifyCheckoutCacheItem>;
+  }): Promise<ShopifyCheckoutCacheItem> {
+    const key = this.createKey(checkoutToken);
+
+    const pipeline = redis.pipeline();
+    pipeline.hset(key, fields);
+    pipeline.expire(key, SHOPIFY_CHECKOUT_CACHE_TTL_SECONDS);
+    pipeline.hgetall(key);
+
+    const results = await pipeline.exec();
+    return this.parse(results[2]);
+  }
+
+  async delete(checkoutToken: string) {
+    return await redis.del(this.createKey(checkoutToken));
+  }
+
+  createKey(checkoutToken: string) {
+    return `${SHOPIFY_CHECKOUT_CACHE_KEY_PREFIX}${checkoutToken}`;
+  }
+
+  parse(cache: unknown): ShopifyCheckoutCacheItem {
+    const parsed = shopifyCheckoutCacheSchema.safeParse(cache);
+    return parsed.success ? parsed.data : shopifyCheckoutCacheSchema.parse({});
+  }
+}
+
+export const shopifyCheckoutCache = new ShopifyCheckoutCache();
+
+export async function tryDispatchShopifyOrderJob({
+  checkoutToken,
+  checkout,
+}: {
+  checkoutToken: string;
+  checkout: ShopifyCheckoutCacheItem;
+}) {
+  const logContext = {
+    checkoutToken,
+    workspaceId: checkout.workspaceId,
+    clickId: checkout.clickId,
+    hasClickId: Boolean(checkout.clickId),
+    hasOrder: Boolean(checkout.order),
+    dispatched: Boolean(checkout.dispatched),
+  };
+
+  if (!checkout.order || !checkout.workspaceId || !checkout.clickId) {
+    console.info(
+      "Shopify order dispatch skipped: checkout incomplete",
+      logContext,
+    );
+    return false;
+  }
+
+  if (checkout.dispatched) {
+    console.info(
+      "Shopify order dispatch skipped: already dispatched",
+      logContext,
+    );
+    return false;
+  }
+
+  // Claim the checkout
+  const key = shopifyCheckoutCache.createKey(checkoutToken);
+  const claim = await redis.hsetnx(key, "dispatched", true);
+  const claimed = Boolean(claim);
+
+  if (!claimed) {
+    console.info("Shopify order dispatch skipped: claim lost", logContext);
+    return false;
+  }
+
+  try {
+    await processShopifyOrderJob.dispatch(
+      {
+        workspaceId: checkout.workspaceId,
+        clickId: checkout.clickId,
+        order: checkout.order,
+      },
+      {
+        deduplicationId: `shopify-order-${checkoutToken}`,
+      },
+    );
+  } catch (error) {
+    console.error("Shopify order dispatch failed, releasing claim", {
+      ...logContext,
+      error,
+    });
+    await redis.hdel(key, "dispatched");
+    throw error;
+  }
+
+  await shopifyCheckoutCache.delete(checkoutToken);
+
+  console.info("Shopify order job dispatched", logContext);
+
+  return true;
+}
diff --git a/apps/web/lib/integrations/shopify/create-lead.ts b/apps/web/lib/integrations/shopify/create-lead.ts
index a361a40ae2f..e0ab241752d 100644
--- a/apps/web/lib/integrations/shopify/create-lead.ts
+++ b/apps/web/lib/integrations/shopify/create-lead.ts
@@ -1,5 +1,4 @@
 import { createId } from "@/lib/api/create-id";
-import { DubApiError } from "@/lib/api/errors";
 import { includeTags } from "@/lib/api/links/include-tags";
 import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
 import { generateRandomName } from "@/lib/names";
@@ -10,19 +9,22 @@ import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformLeadEventData } from "@/lib/webhook/transform";
 import { leadEventSchemaTB } from "@/lib/zod/schemas/leads";
 import { nanoid } from "@dub/utils";
+import { EventType } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
-import { orderSchema } from "./schema";
+import { queueGoogleAdsConversionUpload } from "../google-ads/upload-conversion";
+import { ShopifyError } from "./error";
+import { ShopifyOrder } from "./schema";
 
 export async function createShopifyLead({
+  order,
   clickId,
   workspaceId,
-  event,
 }: {
+  order: ShopifyOrder;
   clickId: string;
   workspaceId: string;
-  event: any;
 }) {
-  const { customer: orderCustomer } = orderSchema.parse(event);
+  const { customer: orderCustomer } = order;
 
   const customerId = createId({ prefix: "cus_" });
   /*
@@ -40,10 +42,13 @@ export async function createShopifyLead({
   const clickData = await getClickEvent({ clickId });
 
   if (!clickData) {
-    throw new DubApiError({
-      code: "not_found",
-      message: `Click event not found for clickId: ${clickId}`,
-    });
+    throw new ShopifyError("Click event not found. Skipping the order...");
+  }
+
+  if (clickData.workspace_id !== workspaceId) {
+    throw new ShopifyError(
+      "Click event not found in the workspace. Skipping the order...",
+    );
   }
 
   const { link_id: linkId, country, timestamp } = clickData;
@@ -56,14 +61,18 @@ export async function createShopifyLead({
       id: true,
       programId: true,
       partnerId: true,
+      disabledAt: true,
     },
   });
 
   if (!partnerLink) {
-    throw new DubApiError({
-      code: "not_found",
-      message: `Link not found for linkId: ${linkId}`,
-    });
+    throw new ShopifyError(
+      "Link not found in your workspace. Skipping the order...",
+    );
+  }
+
+  if (partnerLink.disabledAt) {
+    throw new ShopifyError("Link is disabled. Skipping the order...");
   }
 
   // create customer
@@ -83,13 +92,16 @@ export async function createShopifyLead({
     },
   });
 
-  const eventName = "Account created";
+  const leadEvent = {
+    id: nanoid(16),
+    name: "Account created",
+  };
 
   const leadData = leadEventSchemaTB.parse({
     ...clickData,
     workspace_id: clickData.workspace_id || customer.projectId, // in case for some reason the click event doesn't have workspace_id
-    event_id: nanoid(16),
-    event_name: eventName,
+    event_id: leadEvent.id,
+    event_name: leadEvent.name,
     customer_id: customer.id,
   });
 
@@ -131,13 +143,26 @@ export async function createShopifyLead({
         workspace,
         data: transformLeadEventData({
           ...clickData,
-          eventName,
+          eventName: leadEvent.name,
           link,
           customer,
           metadata: null,
         }),
       }),
 
+      queueGoogleAdsConversionUpload({
+        workspaceId: workspace.id,
+        eventType: EventType.lead,
+        eventId: leadData.event_id,
+        eventName: leadData.event_name,
+        conversionDateTime: new Date().toISOString(),
+        conversionCount: 1,
+        click: {
+          id: clickData.click_id,
+          url: clickData.url,
+        },
+      }),
+
       ...(link.partnerId
         ? [
             sendPartnerPostback({
@@ -145,7 +170,7 @@ export async function createShopifyLead({
               event: "lead.created",
               data: {
                 ...clickData,
-                eventName,
+                eventName: leadEvent.name,
                 link,
                 customer,
               },
@@ -174,5 +199,7 @@ export async function createShopifyLead({
     ]),
   );
 
-  return leadData;
+  return {
+    leadData,
+  };
 }
diff --git a/apps/web/lib/integrations/shopify/create-sale.ts b/apps/web/lib/integrations/shopify/create-sale.ts
index d4b20f2b80c..3add12c4794 100644
--- a/apps/web/lib/integrations/shopify/create-sale.ts
+++ b/apps/web/lib/integrations/shopify/create-sale.ts
@@ -11,22 +11,23 @@ import { redis } from "@/lib/upstash";
 import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
 import { transformSaleEventData } from "@/lib/webhook/transform";
 import { nanoid } from "@dub/utils";
+import { CommissionSource } from "@prisma/client";
 import { waitUntil } from "@vercel/functions";
-import { orderSchema } from "./schema";
+import { shopifyCheckoutCache } from "./checkout-cache";
+import { ShopifyError } from "./error";
+import { ShopifyOrder } from "./schema";
 
 export async function createShopifySale({
-  event,
+  order,
   customerId,
   workspaceId,
   leadData,
 }: {
-  event: any;
+  order: ShopifyOrder;
   customerId: string;
   workspaceId: string;
   leadData: LeadEventTB;
 }) {
-  const order = orderSchema.parse(event);
-
   const {
     checkout_token: checkoutToken,
     confirmation_number: invoiceId,
@@ -48,14 +49,14 @@ export async function createShopifySale({
   );
 
   if (!ok) {
-    return new Response(
-      `[Shopify] Order has been processed already. Skipping...`,
+    throw new ShopifyError(
+      "Sale event for this order has been processed already. Skipping the order...",
     );
   }
 
   const saleData = {
     ...leadData,
-    workspace_id: leadData.workspace_id || workspaceId, // in case for some reason the lead event doesn't have workspace_id
+    workspace_id: workspaceId,
     event_id: nanoid(16),
     event_name: "Purchase",
     payment_processor: "shopify",
@@ -127,7 +128,7 @@ export async function createShopifySale({
         firstSaleAt: existingCustomer.firstSaleAt ? undefined : new Date(),
       },
     }),
-    redis.del(`shopify:checkout:${checkoutToken}`),
+    shopifyCheckoutCache.delete(checkoutToken),
   ]);
 
   // for program links
@@ -147,6 +148,7 @@ export async function createShopifySale({
       quantity: 1,
       invoiceId: saleData.invoice_id,
       currency: saleData.currency,
+      source: CommissionSource.shopify,
       context: {
         customer: {
           country: customer.country,
@@ -222,4 +224,8 @@ export async function createShopifySale({
         : []),
     ]),
   );
+
+  return {
+    saleData,
+  };
 }
diff --git a/apps/web/lib/integrations/shopify/error.ts b/apps/web/lib/integrations/shopify/error.ts
new file mode 100644
index 00000000000..0531925c2e3
--- /dev/null
+++ b/apps/web/lib/integrations/shopify/error.ts
@@ -0,0 +1,10 @@
+export class ShopifyError extends Error {
+  readonly data: Record<string, string> | null;
+
+  constructor(message: string, data: Record<string, string> | null = null) {
+    super(message);
+    this.name = "ShopifyError";
+    this.data = data;
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
diff --git a/apps/web/lib/integrations/shopify/process-order.ts b/apps/web/lib/integrations/shopify/process-order.ts
index 1a9f2866d61..d3059d17ef7 100644
--- a/apps/web/lib/integrations/shopify/process-order.ts
+++ b/apps/web/lib/integrations/shopify/process-order.ts
@@ -1,232 +1,141 @@
-import { createId } from "@/lib/api/create-id";
-import { handleAndReturnErrorResponse } from "@/lib/api/errors";
-import { includeTags } from "@/lib/api/links/include-tags";
-import { syncPartnerLinksStats } from "@/lib/api/partners/sync-partner-links-stats";
-import { executeWorkflows } from "@/lib/api/workflows/execute-workflows";
-import { generateRandomName } from "@/lib/names";
-import { queuePartnerCommissionCreation } from "@/lib/partners/queue-partner-commission-creation";
-import { sendPartnerPostback } from "@/lib/postback/send-partner-postback";
 import { prisma } from "@/lib/prisma";
-import { getLeadEvent, recordLead } from "@/lib/tinybird";
-import { recordFakeClick } from "@/lib/tinybird/record-fake-click";
+import { getLeadEvent } from "@/lib/tinybird";
 import { WorkspaceProps } from "@/lib/types";
-import { sendWorkspaceWebhook } from "@/lib/webhook/publish";
-import { transformLeadEventData } from "@/lib/webhook/transform";
-import { COUNTRIES_TO_CONTINENTS, nanoid } from "@dub/utils";
-import { Link } from "@prisma/client";
-import { waitUntil } from "@vercel/functions";
+import { attributeViaDiscountCode } from "./attribute-via-discount-code";
 import { createShopifyLead } from "./create-lead";
 import { createShopifySale } from "./create-sale";
-import { orderSchema } from "./schema";
+import { ShopifyOrder } from "./schema";
 
 // Process the order from Shopify webhook
-export async function processOrder({
-  event,
-  workspaceId,
-  customerId,
+export async function processShopifyOrder({
+  order,
+  workspace,
   clickId,
 }: {
-  event: unknown;
-  workspaceId: string;
-  customerId?: string; // ID of the customer in Dub
-  clickId?: string; // ID of the click event from Shopify pixel
+  order: ShopifyOrder;
+  workspace: Pick<WorkspaceProps, "id" | "defaultProgramId" | "webhookEnabled">;
+  clickId: string | null; // ID of the click event from Shopify pixel
 }) {
-  try {
-    // for existing customer
-    if (customerId) {
-      const leadEvent = await getLeadEvent({ customerId });
+  const { customer: orderCustomer, discount_codes: discountCodes } = order;
 
-      if (!leadEvent) {
-        return new Response(
-          `[Shopify] Lead event with customer ID ${customerId} not found, skipping...`,
-        );
-      }
+  const sharedData = {
+    checkoutToken: order.checkout_token,
+    shopifyCustomerId: orderCustomer?.id,
+  };
 
-      await createShopifySale({
-        leadData: leadEvent,
-        event,
-        workspaceId,
-        customerId,
-      });
+  // Check customer exists in the workspace
+  if (orderCustomer) {
+    const externalId = orderCustomer.id?.toString();
 
-      return;
-    }
+    const customer = await prisma.customer.findUnique({
+      where: {
+        projectId_externalId: {
+          projectId: workspace.id,
+          externalId,
+        },
+      },
+    });
 
-    // for new customer
-    if (clickId) {
-      const leadData = await createShopifyLead({
-        clickId,
-        workspaceId,
-        event,
+    // Existing customer found
+    if (customer) {
+      const leadData = await getLeadEvent({
+        customerId: customer.id,
       });
 
-      const { customer_id: customerId } = leadData;
+      if (!leadData) {
+        // Not a skip — we cannot tell "no lead" from "Tinybird unavailable".
+        // Throw so the job retries rather than creating a duplicate customer.
+        throw new Error(
+          `Lead event not found for customer ${customer.id}; refusing to re-attribute.`,
+        );
+      }
 
-      await createShopifySale({
+      const { saleData } = await createShopifySale({
         leadData,
-        event,
-        workspaceId,
-        customerId,
+        order,
+        workspaceId: workspace.id,
+        customerId: customer.id,
       });
 
-      return;
+      return {
+        message: "Sale has been tracked for this order.",
+        data: {
+          ...sharedData,
+          eventId: saleData.event_id,
+          customerId: customer.id,
+          attribution: "existing_lead",
+        },
+      };
     }
-  } catch (error) {
-    return handleAndReturnErrorResponse(error);
   }
-}
-
-export async function attributeViaDiscountCode({
-  event,
-  workspace,
-  link,
-}: {
-  event: unknown;
-  workspace: Pick<WorkspaceProps, "id" | "defaultProgramId" | "webhookEnabled">;
-  link: Link;
-}) {
-  const { customer: orderCustomer, billing_address: billingAddress } =
-    orderSchema.parse(event);
-
-  const billingAddressCountry = billingAddress?.country_code?.toUpperCase();
-  // Record a fake click for this event
-  const clickEvent = await recordFakeClick({
-    link,
-    customer: {
-      continent: billingAddressCountry
-        ? COUNTRIES_TO_CONTINENTS[billingAddressCountry] ?? "Unknown"
-        : "Unknown",
-      country: billingAddressCountry ?? "Unknown",
-      region: billingAddress?.province ?? "Unknown",
-    },
-  });
-
-  const customerId = createId({ prefix: "cus_" });
 
-  const customer = await prisma.customer.create({
-    data: {
-      id: customerId,
-      name: orderCustomer
-        ? `${orderCustomer.first_name} ${orderCustomer.last_name}`.trim()
-        : generateRandomName(),
-      email: orderCustomer?.email,
-      externalId: orderCustomer?.id?.toString() || customerId,
-      linkId: clickEvent.link_id,
-      clickId: clickEvent.click_id,
-      clickedAt: new Date(clickEvent.timestamp + "Z"),
-      country: billingAddress?.country_code,
-      projectId: workspace.id,
-      programId: link.programId,
-      partnerId: link.partnerId,
-    },
-  });
-
-  // Prepare the payload for the lead event
-  const { timestamp, ...rest } = clickEvent;
-
-  const leadEvent = {
-    ...rest,
-    workspace_id: clickEvent.workspace_id || customer.projectId, // in case for some reason the click event doesn't have workspace_id
-    event_id: nanoid(16),
-    event_name: "Checkout with discount code",
-    customer_id: customer.id,
-    metadata: "",
-  };
-
-  await recordLead(leadEvent);
-
-  waitUntil(
-    (async () => {
-      const linkUpdated = await prisma.link.update({
-        where: {
-          id: link.id,
+  // Check if the order has created using a program discount code
+  if (discountCodes && discountCodes.length > 0 && workspace.defaultProgramId) {
+    const programDiscountCodes = await prisma.discountCode.findMany({
+      where: {
+        programId: workspace.defaultProgramId,
+        code: {
+          in: discountCodes.map(({ code }) => code),
         },
-        data: {
-          leads: {
-            increment: 1,
-          },
-          lastLeadAt: new Date(),
-        },
-        include: includeTags,
+      },
+      include: {
+        link: true,
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
+
+    if (programDiscountCodes.length > 0) {
+      const { leadEvent: leadData } = await attributeViaDiscountCode({
+        order,
+        workspace,
+        link: programDiscountCodes[0].link,
       });
 
-      let result:
-        | Awaited<ReturnType<typeof queuePartnerCommissionCreation>>
-        | undefined = undefined;
-
-      if (link.programId && link.partnerId) {
-        result = await queuePartnerCommissionCreation({
-          event: "lead",
-          programId: link.programId,
-          partnerId: link.partnerId,
-          linkId: link.id,
-          eventId: leadEvent.event_id,
-          customerId: customer.id,
-          quantity: 1,
-          context: {
-            customer: {
-              country: customer.country,
-            },
-          },
-        });
-
-        await Promise.allSettled([
-          executeWorkflows({
-            event: "leadRecorded",
-            identity: {
-              workspaceId: workspace.id,
-              programId: link.programId,
-              partnerId: link.partnerId,
-            },
-            metrics: {
-              current: {
-                leads: 1,
-              },
-            },
-          }),
-
-          syncPartnerLinksStats({
-            partnerId: link.partnerId,
-            programId: link.programId,
-            eventType: "lead",
-          }),
-        ]);
-      }
-
-      await Promise.allSettled([
-        sendWorkspaceWebhook({
-          trigger: "lead.created",
-          workspace,
-          data: transformLeadEventData({
-            ...clickEvent,
-            eventName: "Checkout with discount code",
-            link: linkUpdated,
-            customer,
-            partner: result?.webhookPartner,
-            metadata: null,
-          }),
-        }),
+      const { saleData } = await createShopifySale({
+        leadData,
+        order,
+        workspaceId: workspace.id,
+        customerId: leadData.customer_id,
+      });
 
-        ...(link.partnerId
-          ? [
-              sendPartnerPostback({
-                partnerId: link.partnerId,
-                event: "lead.created",
-                data: {
-                  ...leadEvent,
-                  eventName: "Checkout with discount code",
-                  link: linkUpdated,
-                  customer,
-                },
-              }),
-            ]
-          : []),
-      ]);
-    })(),
-  );
+      return {
+        message: "Sale has been tracked for this order.",
+        data: {
+          ...sharedData,
+          eventId: saleData.event_id,
+          customerId: leadData.customer_id,
+          discountCode: programDiscountCodes[0].code,
+          attribution: "discount_code",
+        },
+      };
+    }
+  }
 
-  return {
-    customer,
-    leadEvent,
-  };
+  // New customer
+  if (clickId) {
+    const { leadData } = await createShopifyLead({
+      order,
+      clickId,
+      workspaceId: workspace.id,
+    });
+
+    const { saleData } = await createShopifySale({
+      leadData,
+      order,
+      workspaceId: workspace.id,
+      customerId: leadData.customer_id,
+    });
+
+    return {
+      message: "Sale has been tracked for this order.",
+      data: {
+        ...sharedData,
+        eventId: saleData.event_id,
+        customerId: leadData.customer_id,
+        attribution: "click",
+      },
+    };
+  }
 }
diff --git a/apps/web/lib/integrations/shopify/schema.ts b/apps/web/lib/integrations/shopify/schema.ts
index cc7c985a5f4..62ad7bcb850 100644
--- a/apps/web/lib/integrations/shopify/schema.ts
+++ b/apps/web/lib/integrations/shopify/schema.ts
@@ -1,11 +1,11 @@
 import * as z from "zod/v4";
 
-export const orderSchema = z.object({
+export const shopifyOrderSchema = z.object({
   confirmation_number: z.string(),
   checkout_token: z.string(),
   customer: z
     .object({
-      id: z.number(),
+      id: z.union([z.number(), z.string()]),
       email: z.string().nullish(),
       first_name: z.string().nullish(),
       last_name: z.string().nullish(),
@@ -30,6 +30,14 @@ export const orderSchema = z.object({
       country_code: z.string().nullish(),
     })
     .nullish(),
+  note_attributes: z
+    .array(
+      z.object({
+        name: z.string(), // dubClickId
+        value: z.string().nullish(),
+      }),
+    )
+    .default([]),
 });
 
 export const integrationCredentialsSchema = z.object({
@@ -39,3 +47,5 @@ export const integrationCredentialsSchema = z.object({
     .describe("Encrypted access token for the Shopify store."),
   scope: z.string().nullish().describe("Scope of the Shopify store."),
 });
+
+export type ShopifyOrder = z.infer<typeof shopifyOrderSchema>;
diff --git a/apps/web/lib/integrations/singular/track-lead.ts b/apps/web/lib/integrations/singular/track-lead.ts
index a6fe0c05e6f..37acc5291be 100644
--- a/apps/web/lib/integrations/singular/track-lead.ts
+++ b/apps/web/lib/integrations/singular/track-lead.ts
@@ -1,6 +1,7 @@
 import { trackLead } from "@/lib/api/conversions/track-lead";
 import { WorkspaceProps } from "@/lib/types";
 import { trackLeadRequestSchema } from "@/lib/zod/schemas/leads";
+import { CommissionSource } from "@prisma/client";
 import * as z from "zod/v4";
 
 const singularLeadEventSchema = z.object({
@@ -58,5 +59,6 @@ export const trackSingularLeadEvent = async ({
     mode,
     metadata: null,
     workspace,
+    commissionSource: CommissionSource.singular,
   });
 };
diff --git a/apps/web/lib/integrations/singular/track-sale.ts b/apps/web/lib/integrations/singular/track-sale.ts
index b5ff3175dce..e48b5606ae3 100644
--- a/apps/web/lib/integrations/singular/track-sale.ts
+++ b/apps/web/lib/integrations/singular/track-sale.ts
@@ -1,6 +1,7 @@
 import { trackSale } from "@/lib/api/conversions/track-sale";
 import { WorkspaceProps } from "@/lib/types";
 import { trackSaleRequestSchema } from "@/lib/zod/schemas/sales";
+import { CommissionSource } from "@prisma/client";
 import * as z from "zod/v4";
 
 // TODO:
@@ -61,5 +62,6 @@ export const trackSingularSaleEvent = async ({
     leadEventName,
     metadata: null,
     workspace,
+    commissionSource: CommissionSource.singular,
   });
 };
diff --git a/apps/web/lib/integrations/slack/transform.ts b/apps/web/lib/integrations/slack/transform.ts
index f3288b5255e..202e45e2c17 100644
--- a/apps/web/lib/integrations/slack/transform.ts
+++ b/apps/web/lib/integrations/slack/transform.ts
@@ -10,9 +10,11 @@ import {
   BountyEventWebhookPayload,
   ClickEventWebhookPayload,
   CommissionEventWebhookPayload,
+  DiscountCodeEventWebhookPayload,
   LeadEventWebhookPayload,
   PartnerApplicationWebhookPayload,
   PartnerEventWebhookPayload,
+  PartnerMergedWebhookPayload,
   PayoutEventWebhookPayload,
   SaleEventWebhookPayload,
 } from "../../webhook/types";
@@ -535,6 +537,69 @@ const bountyTemplates = ({
   };
 };
 
+const partnerMergedTemplate = ({
+  data,
+}: {
+  data: PartnerMergedWebhookPayload;
+}) => {
+  const { targetAlreadyEnrolled, sourcePartner, targetPartner } = data;
+  const hrefToPartnerPage = `${APP_DOMAIN}/program/partners/${targetPartner.id}`;
+  const outcomeLabel = targetAlreadyEnrolled
+    ? "Target was already enrolled"
+    : "Target was not enrolled";
+
+  return {
+    blocks: [
+      {
+        type: "section",
+        text: {
+          type: "mrkdwn",
+          text: `*Partner accounts merged* :twisted_rightwards_arrows:`,
+        },
+      },
+      {
+        type: "section",
+        fields: [
+          {
+            type: "mrkdwn",
+            text: `*Source*\n\`${sourcePartner.id}\`${sourcePartner.email ? ` (${sourcePartner.email})` : ""}`,
+          },
+          {
+            type: "mrkdwn",
+            text: `*Target*\n<${hrefToPartnerPage}|\`${targetPartner.id}\`>${targetPartner.email ? ` (${targetPartner.email})` : ""}`,
+          },
+        ],
+      },
+      {
+        type: "section",
+        fields: [
+          {
+            type: "mrkdwn",
+            text: `*Outcome*\n${outcomeLabel}`,
+          },
+          ...(sourcePartner.tenantId || targetPartner.tenantId
+            ? [
+                {
+                  type: "mrkdwn",
+                  text: `*Tenant ID*\n${sourcePartner.tenantId ?? "—"} → ${targetPartner.tenantId ?? "—"}`,
+                },
+              ]
+            : []),
+        ],
+      },
+      {
+        type: "context",
+        elements: [
+          {
+            type: "mrkdwn",
+            text: `<${hrefToPartnerPage}|View on Dub>`,
+          },
+        ],
+      },
+    ],
+  };
+};
+
 const payoutConfirmedTemplate = ({
   data,
 }: {
@@ -596,6 +661,44 @@ const payoutConfirmedTemplate = ({
   };
 };
 
+const discountCodeTemplates = ({
+  data,
+  event,
+}: {
+  data: DiscountCodeEventWebhookPayload;
+  event: WebhookTrigger;
+}) => {
+  const eventMessages = {
+    "discount_code.created": "*Discount code created* :ticket:",
+    "discount_code.deleted": "*Discount code deleted* :ticket:",
+  };
+
+  return {
+    blocks: [
+      {
+        type: "section",
+        text: {
+          type: "mrkdwn",
+          text: eventMessages[event as keyof typeof eventMessages],
+        },
+      },
+      {
+        type: "section",
+        fields: [
+          {
+            type: "mrkdwn",
+            text: `*Code*\n${data.code}`,
+          },
+          {
+            type: "mrkdwn",
+            text: `*Partner ID*\n${data.partnerId}`,
+          },
+        ],
+      },
+    ],
+  };
+};
+
 const slackTemplates: Record<WebhookTrigger, any> = {
   "link.created": linkTemplates,
   "link.updated": linkTemplates,
@@ -604,11 +707,14 @@ const slackTemplates: Record<WebhookTrigger, any> = {
   "lead.created": leadCreatedTemplate,
   "sale.created": saleCreatedTemplate,
   "partner.enrolled": partnerEnrolledTemplate,
+  "partner.merged": partnerMergedTemplate,
   "partner.application_submitted": partnerApplicationSubmittedTemplate,
   "commission.created": commissionCreatedTemplate,
   "bounty.created": bountyTemplates,
   "bounty.updated": bountyTemplates,
   "payout.confirmed": payoutConfirmedTemplate,
+  "discount_code.created": discountCodeTemplates,
+  "discount_code.deleted": discountCodeTemplates,
 };
 
 export const formatEventForSlack = (
@@ -625,9 +731,13 @@ export const formatEventForSlack = (
     event,
   );
   const isBountyEvent = ["bounty.created", "bounty.updated"].includes(event);
+  const isDiscountCodeEvent = [
+    "discount_code.created",
+    "discount_code.deleted",
+  ].includes(event);
 
   return template({
     data,
-    ...((isLinkEvent || isBountyEvent) && { event }),
+    ...((isLinkEvent || isBountyEvent || isDiscountCodeEvent) && { event }),
   });
 };
diff --git a/apps/web/lib/integrations/slack/ui/settings.tsx b/apps/web/lib/integrations/slack/ui/settings.tsx
index b62f88cb8fa..b57b963440e 100644
--- a/apps/web/lib/integrations/slack/ui/settings.tsx
+++ b/apps/web/lib/integrations/slack/ui/settings.tsx
@@ -19,6 +19,7 @@ export const SlackSettings = (props: InstalledIntegrationInfoProps) => {
             "lead.created",
             "sale.created",
             "partner.enrolled",
+            "partner.merged",
             "commission.created",
             "bounty.created",
             "bounty.updated",
diff --git a/apps/web/lib/integrations/slack/verify-request.ts b/apps/web/lib/integrations/slack/verify-request.ts
index bbe2c342f87..bf51a60cf7d 100644
--- a/apps/web/lib/integrations/slack/verify-request.ts
+++ b/apps/web/lib/integrations/slack/verify-request.ts
@@ -1,3 +1,4 @@
+import { timingSafeCompare } from "@/lib/webhook/timing-safe-compare";
 import { createHmac } from "crypto";
 
 interface SlackRequestVerificationOptions {
@@ -63,7 +64,7 @@ export const verifySlackSignature = async (req: Request, body: string) => {
   hmac.update(`${signatureVersion}:${requestTimestampSec}:${options.body}`);
   const expectedSignature = hmac.digest("hex");
 
-  if (!signatureHash || signatureHash !== expectedSignature) {
+  if (!timingSafeCompare(signatureHash, expectedSignature)) {
     throw new Error(`${verifyErrorPrefix}: signature mismatch`);
   }
 };
diff --git a/apps/web/lib/integrations/stripe/ui/settings.tsx b/apps/web/lib/integrations/stripe/ui/settings.tsx
index b4499209e02..6ca2882fe56 100644
--- a/apps/web/lib/integrations/stripe/ui/settings.tsx
+++ b/apps/web/lib/integrations/stripe/ui/settings.tsx
@@ -1,9 +1,10 @@
 "use client";
 
+import { clientAccessCheck } from "@/lib/client-access-check";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { InstalledIntegrationInfoProps } from "@/lib/types";
 import { MarkdownDescription } from "@/ui/shared/markdown-description";
-import { AnimatedSizeContainer, Button, Switch } from "@dub/ui";
+import { AnimatedSizeContainer, Button, InfoTooltip, Switch } from "@dub/ui";
 import { useAction } from "next-safe-action/hooks";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
@@ -22,7 +23,11 @@ export const StripeIntegrationSettings = ({
   installed,
   settings,
 }: InstalledIntegrationInfoProps) => {
-  const { id: workspaceId } = useWorkspace();
+  const { id: workspaceId, role } = useWorkspace();
+  const { error: permissionsError } = clientAccessCheck({
+    action: "integrations.write",
+    role,
+  });
 
   const stripeSettings = stripeIntegrationSettingsSchema.parse({
     ...STRIPE_DEFAULT_SETTINGS,
@@ -32,6 +37,8 @@ export const StripeIntegrationSettings = ({
   const initialFreeTrialsEnabled = stripeSettings?.freeTrials?.enabled ?? false;
   const initialTrackQuantity =
     stripeSettings?.freeTrials?.trackQuantity ?? false;
+  const initialFirstTimeTransaction =
+    stripeSettings.discountCodeRestrictions.firstTimeTransaction;
 
   // Track saved values that can be updated after successful save
   const [savedFreeTrialsEnabled, setSavedFreeTrialsEnabled] = useState(
@@ -39,23 +46,32 @@ export const StripeIntegrationSettings = ({
   );
   const [savedTrackQuantity, setSavedTrackQuantity] =
     useState(initialTrackQuantity);
+  const [savedFirstTimeTransaction, setSavedFirstTimeTransaction] = useState(
+    initialFirstTimeTransaction,
+  );
 
   const [freeTrialsEnabled, setFreeTrialsEnabled] = useState(
     initialFreeTrialsEnabled,
   );
 
   const [trackQuantity, setTrackQuantity] = useState(initialTrackQuantity);
+  const [firstTimeTransaction, setFirstTimeTransaction] = useState(
+    initialFirstTimeTransaction,
+  );
 
   const isDirty = useMemo(() => {
     return (
       freeTrialsEnabled !== savedFreeTrialsEnabled ||
-      trackQuantity !== savedTrackQuantity
+      (freeTrialsEnabled ? trackQuantity : false) !== savedTrackQuantity ||
+      firstTimeTransaction !== savedFirstTimeTransaction
     );
   }, [
     freeTrialsEnabled,
     savedFreeTrialsEnabled,
     trackQuantity,
     savedTrackQuantity,
+    firstTimeTransaction,
+    savedFirstTimeTransaction,
   ]);
 
   const { executeAsync, isPending } = useAction(updateStripeSettingsAction, {
@@ -63,6 +79,7 @@ export const StripeIntegrationSettings = ({
       // Update saved values to match current values after successful save
       setSavedFreeTrialsEnabled(freeTrialsEnabled);
       setSavedTrackQuantity(freeTrialsEnabled ? trackQuantity : false);
+      setSavedFirstTimeTransaction(firstTimeTransaction);
       toast.success("Stripe settings updated successfully.");
     },
     onError({ error }) {
@@ -83,6 +100,9 @@ export const StripeIntegrationSettings = ({
         enabled: freeTrialsEnabled,
         trackQuantity: freeTrialsEnabled ? trackQuantity : false,
       },
+      discountCodeRestrictions: {
+        firstTimeTransaction,
+      },
     });
   };
 
@@ -91,7 +111,7 @@ export const StripeIntegrationSettings = ({
   }
 
   return (
-    <form className="mt-4 space-y-4" onSubmit={onSubmit}>
+    <form className="space-y-4" onSubmit={onSubmit}>
       <div className="rounded-lg border border-neutral-200 bg-white">
         <div className="flex items-center gap-x-2 border-b border-neutral-200 px-4 py-4">
           <p className="text-sm font-medium text-neutral-700">
@@ -141,6 +161,29 @@ export const StripeIntegrationSettings = ({
               </div>
             )}
           </AnimatedSizeContainer>
+
+          <div className="border-t border-neutral-200">
+            <div className="flex items-center justify-between gap-4 p-5">
+              <div className="min-w-0 flex-1">
+                <div className="mb-1 flex items-center gap-1">
+                  <label className="text-sm font-semibold text-neutral-900">
+                    Discounts eligible for first-time order only
+                  </label>
+                  <InfoTooltip content="Changes will only take effect for future discount codes." />
+                </div>
+                <MarkdownDescription className="text-sm text-neutral-600">
+                  Whether to restrict discount codes to [first-time
+                  orders](https://docs.stripe.com/payments/advanced/discounts#limit-by-first-time-order)
+                  only.
+                </MarkdownDescription>
+              </div>
+              <Switch
+                checked={firstTimeTransaction}
+                fn={setFirstTimeTransaction}
+                disabled={isPending}
+              />
+            </div>
+          </div>
         </div>
 
         <div className="flex items-center justify-end rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-4 py-3">
@@ -151,7 +194,10 @@ export const StripeIntegrationSettings = ({
               text="Save changes"
               className="h-8 w-fit"
               loading={isPending}
-              disabled={!isDirty || isPending}
+              disabled={!isDirty || isPending || Boolean(permissionsError)}
+              {...(permissionsError && {
+                disabledTooltip: permissionsError,
+              })}
             />
           </div>
         </div>
diff --git a/apps/web/lib/integrations/stripe/update-stripe-settings.ts b/apps/web/lib/integrations/stripe/update-stripe-settings.ts
index 072beb39f00..23a977c752d 100644
--- a/apps/web/lib/integrations/stripe/update-stripe-settings.ts
+++ b/apps/web/lib/integrations/stripe/update-stripe-settings.ts
@@ -1,21 +1,33 @@
 "use server";
 
 import { authActionClient } from "@/lib/actions/safe-action";
+import { throwIfNoPermission } from "@/lib/actions/throw-if-no-permission";
 import { prisma } from "@/lib/prisma";
 import { STRIPE_INTEGRATION_ID } from "@dub/utils";
 import { revalidatePath } from "next/cache";
 import * as z from "zod/v4";
 import { stripeIntegrationSettingsSchema } from "./schema";
 
-const schema = stripeIntegrationSettingsSchema.extend({
+const schema = z.object({
   workspaceId: z.string(),
+  freeTrials: stripeIntegrationSettingsSchema.shape.freeTrials,
+  discountCodeRestrictions: z
+    .object({
+      firstTimeTransaction: z.boolean(),
+    })
+    .optional(),
 });
 
 export const updateStripeSettingsAction = authActionClient
   .inputSchema(schema)
   .action(async ({ parsedInput, ctx }) => {
     const { workspace } = ctx;
-    const { freeTrials } = parsedInput;
+    const { freeTrials, discountCodeRestrictions } = parsedInput;
+
+    throwIfNoPermission({
+      role: workspace.role,
+      requiredPermissions: ["integrations.write"],
+    });
 
     const installedIntegration = await prisma.installedIntegration.findFirst({
       where: {
@@ -38,6 +50,9 @@ export const updateStripeSettingsAction = authActionClient
         settings: {
           ...current,
           freeTrials,
+          ...(discountCodeRestrictions !== undefined
+            ? { discountCodeRestrictions }
+            : {}),
         },
       },
     });
diff --git a/apps/web/lib/integrations/zapier/ui/settings.tsx b/apps/web/lib/integrations/zapier/ui/settings.tsx
index 6f5c9f874c5..a3e2859dc57 100644
--- a/apps/web/lib/integrations/zapier/ui/settings.tsx
+++ b/apps/web/lib/integrations/zapier/ui/settings.tsx
@@ -20,6 +20,7 @@ export const ZapierSettings = (props: InstalledIntegrationInfoProps) => {
             "sale.created",
             "partner.application_submitted",
             "partner.enrolled",
+            "partner.merged",
           ]}
         />
       )}
diff --git a/apps/web/lib/jobs/constants.ts b/apps/web/lib/jobs/constants.ts
new file mode 100644
index 00000000000..0d73eb9cc50
--- /dev/null
+++ b/apps/web/lib/jobs/constants.ts
@@ -0,0 +1,4 @@
+export const QSTASH_BATCH_CHUNK_SIZE = 100;
+export const LAST_ERROR_MAX_LENGTH = 1000;
+export const MAX_JOB_ATTEMPTS = 10;
+export const MAX_JOBS_PER_BATCH = 100;
diff --git a/apps/web/lib/jobs/handlers/aggregate-clicks-job.ts b/apps/web/lib/jobs/handlers/aggregate-clicks-job.ts
new file mode 100644
index 00000000000..4499a21d1ac
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/aggregate-clicks-job.ts
@@ -0,0 +1,24 @@
+import { processClickAggregation } from "@/lib/commissions/process-click-aggregation";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  partnerId: z.string(),
+  programId: z.string(),
+  startDate: z.coerce.date(),
+  endDate: z.coerce.date(),
+});
+
+// Aggregate clicks for links per day for a program enrollment
+export const aggregateClicksJob = defineJob({
+  name: "aggregate-clicks-job",
+  schema: inputSchema,
+  async handle({ programId, partnerId, startDate, endDate }) {
+    await processClickAggregation({
+      programId,
+      partnerId,
+      startDate,
+      endDate,
+    });
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/attach-discount-job.ts b/apps/web/lib/jobs/handlers/attach-discount-job.ts
new file mode 100644
index 00000000000..168a2cba187
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/attach-discount-job.ts
@@ -0,0 +1,22 @@
+import { attachDiscount } from "@/lib/discounts/attach-discount";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  discountId: z.string(),
+});
+
+// Attach a newly created group-level discount to enrollments in the group
+export const attachDiscountJob = defineJob({
+  name: "attach-discount-job",
+  schema: inputSchema,
+  async handle({ discountId }) {
+    const result = await attachDiscount({
+      discountId,
+    });
+
+    if (result?.hasMore) {
+      await attachDiscountJob.dispatch({ discountId }, { label: discountId });
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
new file mode 100644
index 00000000000..e4abdefc993
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/auto-approve-partner-job.ts
@@ -0,0 +1,147 @@
+import { getPartnerApplicationRisks } from "@/lib/api/fraud/get-partner-application-risks";
+import { approvePartner } from "@/lib/api/partners/applications/approve-partner";
+import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { prisma } from "@/lib/prisma";
+import { ProgramEnrollmentStatus } from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  programId: z.string(),
+  partnerId: z.string(),
+});
+
+// This job is used to auto-approve a partner enrolled in a program
+export const autoApprovePartnerJob = defineJob({
+  name: "auto-approve-partner-job",
+  schema: inputSchema,
+  async handle(input) {
+    const { programId, partnerId } = input;
+
+    const programEnrollment = await prisma.programEnrollment.findUnique({
+      where: {
+        partnerId_programId: {
+          partnerId,
+          programId,
+        },
+      },
+      include: {
+        partnerGroup: true,
+        partner: {
+          include: {
+            platforms: true,
+          },
+        },
+      },
+    });
+
+    if (!programEnrollment) {
+      console.warn(`Partner ${partnerId} not found in program ${programId}.`);
+      return;
+    }
+
+    const group = programEnrollment.partnerGroup;
+
+    if (!group) {
+      console.warn(
+        `Group not found for partner ${partnerId} in program ${programId}.`,
+      );
+      return;
+    }
+
+    if (!group.autoApprovePartnersEnabledAt) {
+      console.warn(`Group ${group.id} does not have auto-approval enabled.`);
+      return;
+    }
+
+    if (programEnrollment.status !== ProgramEnrollmentStatus.pending) {
+      console.warn(`${partnerId} is in ${programEnrollment.status} status.`);
+      return;
+    }
+
+    // Check if the workspace plan has fraud event management capabilities
+    // If enabled, we'll evaluate risk signals before auto-approving
+    const program = await prisma.program.findUniqueOrThrow({
+      where: {
+        id: programId,
+      },
+      select: {
+        id: true,
+        applicationRequirements: true,
+        workspace: {
+          select: {
+            plan: true,
+            users: {
+              where: {
+                role: "owner",
+              },
+              take: 1,
+              select: {
+                userId: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const { canManageFraudEvents } = getPlanCapabilities(
+      program.workspace.plan,
+    );
+
+    if (canManageFraudEvents) {
+      const { riskSeverity } = await getPartnerApplicationRisks({
+        program,
+        partner: programEnrollment.partner,
+      });
+
+      if (riskSeverity === "high") {
+        console.warn(`Partner ${partnerId} has high risk.`);
+        return;
+      }
+    }
+
+    const result = evaluateApplicationRequirements({
+      applicationRequirements: program.applicationRequirements,
+      context: {
+        country: programEnrollment.partner.country,
+        email: programEnrollment.partner.email,
+      },
+    });
+
+    if (!result.valid) {
+      switch (result.reason) {
+        case "invalidRequirements":
+          console.warn(
+            `Invalid applicationRequirements for program ${programId}.`,
+          );
+          return;
+
+        case "requirementsNotMet":
+          console.warn(
+            `Partner ${partnerId} does not meet eligibility requirements.`,
+          );
+          return;
+      }
+    }
+
+    const owner = program.workspace.users[0];
+
+    if (!owner) {
+      console.warn(`Owner not found for program ${programId}.`);
+      return;
+    }
+
+    await approvePartner({
+      programId,
+      partnerId,
+      userId: owner.userId,
+      groupId: programEnrollment.groupId,
+    });
+
+    console.info(
+      `Successfully auto-approved partner ${partnerId} in program ${programId}.`,
+    );
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts b/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts
new file mode 100644
index 00000000000..635990362c1
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/auto-reject-partner-job.ts
@@ -0,0 +1,175 @@
+import { resolveFraudGroups } from "@/lib/api/fraud/resolve-fraud-groups";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { trackApplicationEvents } from "@/lib/application-events/update-application-event";
+import { evaluateApplicationRequirements } from "@/lib/partners/evaluate-application-requirements";
+import { prisma } from "@/lib/prisma";
+import { sendEmail } from "@dub/email";
+import PartnerApplicationRejected from "@dub/email/templates/partner-application-rejected";
+import {
+  ProgramApplicationRejectionReason,
+  ProgramEnrollmentStatus,
+} from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  programId: z.string(),
+  partnerId: z.string(),
+});
+
+// This job is used to auto-reject a partner enrollment (e.g. when eligibility requirements are not met)
+export const autoRejectPartnerJob = defineJob({
+  name: "auto-reject-partner-job",
+  schema: inputSchema,
+  async handle(input) {
+    const { programId, partnerId } = input;
+
+    const programEnrollment = await prisma.programEnrollment.findUnique({
+      where: {
+        partnerId_programId: {
+          partnerId,
+          programId,
+        },
+      },
+      include: {
+        partner: {
+          select: {
+            id: true,
+            name: true,
+            email: true,
+            country: true,
+          },
+        },
+        program: {
+          select: {
+            id: true,
+            name: true,
+            slug: true,
+            supportEmail: true,
+            applicationRequirements: true,
+          },
+        },
+      },
+    });
+
+    if (!programEnrollment) {
+      console.warn(`Partner ${partnerId} not found in program ${programId}.`);
+      return;
+    }
+
+    if (programEnrollment.status !== ProgramEnrollmentStatus.pending) {
+      console.warn(`${partnerId} is in ${programEnrollment.status} status.`);
+      return;
+    }
+
+    const result = evaluateApplicationRequirements({
+      applicationRequirements:
+        programEnrollment.program.applicationRequirements,
+      context: {
+        country: programEnrollment.partner.country,
+        email: programEnrollment.partner.email,
+      },
+    });
+
+    if (result.reason !== "requirementsNotMet") {
+      console.warn(
+        `Partner ${partnerId} now meets requirements for program ${programId} (reason: ${result.reason}).`,
+      );
+      return;
+    }
+
+    const { skipped } = await prisma.$transaction(async (tx) => {
+      const { count } = await tx.programEnrollment.updateMany({
+        where: {
+          id: programEnrollment.id,
+          status: ProgramEnrollmentStatus.pending,
+        },
+        data: {
+          status: ProgramEnrollmentStatus.rejected,
+          clickRewardId: null,
+          leadRewardId: null,
+          saleRewardId: null,
+          referralRewardId: null,
+          customRewardId: null,
+          discountId: null,
+        },
+      });
+
+      if (count === 0) {
+        return {
+          skipped: true,
+        };
+      }
+
+      if (programEnrollment.applicationId) {
+        await tx.programApplication.update({
+          where: {
+            id: programEnrollment.applicationId,
+          },
+          data: {
+            reviewedAt: new Date(),
+            rejectionReason:
+              ProgramApplicationRejectionReason.doesNotMeetRequirements,
+            rejectionNote: null,
+          },
+        });
+      }
+
+      return {
+        skipped: false,
+      };
+    });
+
+    if (skipped) {
+      console.warn(
+        `Partner ${partnerId} is no longer pending in program ${programId}.`,
+      );
+      return;
+    }
+
+    const { partner, program } = programEnrollment;
+
+    await Promise.allSettled([
+      resolveFraudGroups({
+        where: {
+          programId,
+          partnerId,
+        },
+        resolutionReason:
+          "Resolved automatically because the partner application was automatically rejected.",
+      }),
+
+      trackApplicationEvents({
+        event: "rejected",
+        programId,
+        partnerIds: [partnerId],
+      }),
+
+      // Queue an index update because the enrollment status moved to rejected.
+      queuePartnerSearchSync({ enrollmentIds: [programEnrollment.id] }),
+
+      partner.email &&
+        sendEmail({
+          to: partner.email,
+          subject: `Your application to ${program.name} was not approved`,
+          variant: "notifications",
+          replyTo: program.supportEmail || "noreply",
+          react: PartnerApplicationRejected({
+            partner: {
+              name: partner.name ?? "there",
+              email: partner.email,
+            },
+            program: {
+              name: program.name,
+              slug: program.slug,
+              supportEmail: program.supportEmail ?? undefined,
+            },
+          }),
+        }),
+    ]);
+
+    console.info(
+      `Successfully auto-rejected partner ${partnerId} in program ${programId}.`,
+    );
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/create-custom-commission-job.ts b/apps/web/lib/jobs/handlers/create-custom-commission-job.ts
new file mode 100644
index 00000000000..18e2009acd9
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/create-custom-commission-job.ts
@@ -0,0 +1,34 @@
+import { createCustomRewardCommissions } from "@/lib/api/rewards/create-custom-reward-commissions";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  rewardId: z.string(),
+  periodDate: z.iso.date(),
+  startAfterPartnerId: z.string().optional(),
+});
+
+export const createCustomCommissionJob = defineJob({
+  name: "create-custom-commission-job",
+  schema: inputSchema,
+  defaults: {
+    retries: 3,
+  },
+  async handle(input) {
+    const { nextCursor } = await createCustomRewardCommissions(input);
+
+    if (nextCursor) {
+      await createCustomCommissionJob.dispatch(
+        {
+          rewardId: input.rewardId,
+          periodDate: input.periodDate,
+          startAfterPartnerId: nextCursor,
+        },
+        {
+          label: input.rewardId,
+          delay: 1,
+        },
+      );
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts b/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts
new file mode 100644
index 00000000000..c7dcadaf189
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts
@@ -0,0 +1,143 @@
+import { DubApiError } from "@/lib/api/errors";
+import { createDiscountCode } from "@/lib/discounts/create-discount-code";
+import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";
+import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";
+import { prisma } from "@/lib/prisma";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  linkId: z
+    .string()
+    .describe("The ID of the link to create a discount code for."),
+});
+
+// Create a discount code for a single default partner link.
+// Fan-out from sync and discount publish can queue thousands of jobs; flow
+// control caps concurrent creates so we don't stampede Stripe/Shopify.
+export const createDiscountCodeForLinkJob = defineJob({
+  name: "create-discount-code-for-link-job",
+  schema: inputSchema,
+  defaults: {
+    flowControl: {
+      key: "create-discount-code-for-link",
+      parallelism: 20,
+    },
+  },
+  async handle({ linkId }) {
+    const link = await prisma.link.findUnique({
+      where: {
+        id: linkId,
+      },
+      select: {
+        id: true,
+        discountCode: true,
+        partnerGroupDefaultLinkId: true,
+        linkReward: {
+          select: {
+            discount: true,
+          },
+        },
+        programEnrollment: {
+          select: {
+            discount: true,
+            partner: {
+              select: {
+                id: true,
+                name: true,
+              },
+            },
+            program: {
+              select: {
+                id: true,
+              },
+            },
+          },
+        },
+        project: {
+          select: {
+            id: true,
+            webhookEnabled: true,
+            stripeConnectId: true,
+            shopifyStoreId: true,
+          },
+        },
+      },
+    });
+
+    if (!link || !link.project) {
+      console.info(`Link ${linkId} not found. Skipping...`);
+      return;
+    }
+
+    if (link.discountCode) {
+      console.info(`Link ${linkId} already has a discount code. Skipping...`);
+      return;
+    }
+
+    if (link.partnerGroupDefaultLinkId === null) {
+      console.info(`Link ${linkId} is not a default link. Skipping...`);
+      return;
+    }
+
+    if (!link.programEnrollment) {
+      console.info(
+        `Link ${linkId} is not associated with a program enrollment. Skipping...`,
+      );
+      return;
+    }
+
+    const {
+      project: workspace,
+      programEnrollment: { program, partner },
+    } = link;
+
+    const discount =
+      link.linkReward?.discount ?? link.programEnrollment.discount;
+
+    if (!discount) {
+      console.info(
+        `Partner ${partner.id} does not have a discount with program ${program.id}. Skipping...`,
+      );
+      return;
+    }
+
+    if (isDiscountDeleted(discount)) {
+      console.info(`Discount ${discount.id} is soft-deleted. Skipping...`);
+      return;
+    }
+
+    if (!discount.autoProvisionEnabledAt) {
+      console.info(
+        `Discount ${discount.id} does not have auto-provision enabled. Skipping...`,
+      );
+      return;
+    }
+
+    try {
+      await createDiscountCode({
+        workspace,
+        partner,
+        link,
+        discount,
+      });
+    } catch (error) {
+      if (isNonRecoverableDiscountError(error)) {
+        console.warn(error.message);
+        return;
+      }
+
+      if (
+        error instanceof DubApiError &&
+        (error.code === "conflict" || error.code === "bad_request")
+      ) {
+        console.warn(error.message);
+        return;
+      }
+
+      throw error;
+    }
+
+    console.info(`Discount code created for link ${linkId}.`);
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts b/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts
new file mode 100644
index 00000000000..6b5bbb0106c
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/invalidate-links-for-discounts-job.ts
@@ -0,0 +1,209 @@
+import { linkCache } from "@/lib/api/links/cache";
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { prisma } from "@/lib/prisma";
+import { chunk, pluck } from "@dub/utils";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.discriminatedUnion("by", [
+  // Known partners — enrollment/link discount already updated for these ids.
+  z.object({
+    by: z.literal("partners"),
+    programId: z.string(),
+    partnerIds: z.array(z.string()).min(1),
+  }),
+
+  // Discover who still references this discountId within a program.
+  z.object({
+    by: z.literal("discount"),
+    programId: z.string(),
+    discountId: z.string(),
+    source: z.enum(["enrollment", "linkReward"]).optional(),
+    startingAfter: z.string().optional(),
+  }),
+]);
+
+type InvalidateLinksForDiscountsInput = z.infer<typeof inputSchema>;
+type PartnersInput = Extract<
+  InvalidateLinksForDiscountsInput,
+  { by: "partners" }
+>;
+type DiscountInput = Extract<
+  InvalidateLinksForDiscountsInput,
+  { by: "discount" }
+>;
+
+// Clears Redis cache when a link's resolved discount would change
+// (COALESCE(LinkReward.discountId, ProgramEnrollment.discountId)):
+// 1. Enrollment discount changed → by: "partners" (or expireMany at call site)
+// 2. Link override changed → expireMany at call site (or by: "partners")
+// 3. Discount fields changed while still assigned → by: "discount"
+// 4. Discount already unassigned → by: "partners"
+export const invalidateLinksForDiscountsJob = defineJob({
+  name: "invalidate-links-for-discounts-job",
+  schema: inputSchema,
+  async handle(input) {
+    if (input.by === "partners") {
+      await expirePartners(input);
+      return;
+    }
+
+    await scanDiscount(input);
+  },
+});
+
+async function expirePartners({ programId, partnerIds }: PartnersInput) {
+  const partnerIdBatch = partnerIds.slice(0, CRON_BATCH_SIZE);
+  const remainingPartnerIds = partnerIds.slice(CRON_BATCH_SIZE);
+
+  await expirePartnerLinks({
+    programId,
+    partnerIds: partnerIdBatch,
+  });
+
+  if (remainingPartnerIds.length > 0) {
+    await invalidateLinksForDiscountsJob.dispatch({
+      by: "partners",
+      programId,
+      partnerIds: remainingPartnerIds,
+    });
+  }
+}
+
+// Page enrollments then linkRewards within one program; expire those partners' links.
+async function scanDiscount({
+  programId,
+  discountId,
+  source = "enrollment",
+  startingAfter,
+}: DiscountInput) {
+  if (source === "enrollment") {
+    const enrollments = await prisma.programEnrollment.findMany({
+      where: {
+        programId,
+        discountId,
+      },
+      select: {
+        id: true,
+        partnerId: true,
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: CRON_BATCH_SIZE,
+      ...(startingAfter && {
+        skip: 1,
+        cursor: {
+          id: startingAfter,
+        },
+      }),
+    });
+
+    await expirePartnerLinks({
+      programId,
+      partnerIds: pluck(enrollments, "partnerId"),
+    });
+
+    if (enrollments.length === CRON_BATCH_SIZE) {
+      await invalidateLinksForDiscountsJob.dispatch({
+        by: "discount",
+        programId,
+        discountId,
+        source: "enrollment",
+        startingAfter: enrollments[enrollments.length - 1].id,
+      });
+      return;
+    }
+
+    await invalidateLinksForDiscountsJob.dispatch({
+      by: "discount",
+      programId,
+      discountId,
+      source: "linkReward",
+    });
+    return;
+  }
+
+  const linkRewards = await prisma.linkReward.findMany({
+    where: {
+      discountId,
+      link: {
+        programId,
+      },
+    },
+    select: {
+      id: true,
+      link: {
+        select: {
+          partnerId: true,
+        },
+      },
+    },
+    orderBy: {
+      id: "asc",
+    },
+    take: CRON_BATCH_SIZE,
+    ...(startingAfter && {
+      skip: 1,
+      cursor: {
+        id: startingAfter,
+      },
+    }),
+  });
+
+  await expirePartnerLinks({
+    programId,
+    partnerIds: [
+      ...new Set(
+        linkRewards
+          .map(({ link }) => link.partnerId)
+          .filter((id): id is string => Boolean(id)),
+      ),
+    ],
+  });
+
+  if (linkRewards.length === CRON_BATCH_SIZE) {
+    await invalidateLinksForDiscountsJob.dispatch({
+      by: "discount",
+      programId,
+      discountId,
+      source: "linkReward",
+      startingAfter: linkRewards[linkRewards.length - 1].id,
+    });
+  }
+}
+
+async function expirePartnerLinks({
+  programId,
+  partnerIds,
+}: {
+  programId: string;
+  partnerIds: string[];
+}) {
+  if (partnerIds.length === 0) {
+    return;
+  }
+
+  const links = await prisma.link.findMany({
+    where: {
+      programId,
+      partnerId: {
+        in: partnerIds,
+      },
+    },
+    select: {
+      domain: true,
+      key: true,
+    },
+  });
+
+  if (links.length === 0) {
+    return;
+  }
+
+  for (const linkChunk of chunk(links, 100)) {
+    await linkCache.expireMany(linkChunk);
+  }
+
+  console.info(`Expired cache for ${links.length} links.`);
+}
diff --git a/apps/web/lib/jobs/handlers/partner-search-sync-job.ts b/apps/web/lib/jobs/handlers/partner-search-sync-job.ts
new file mode 100644
index 00000000000..0dbc33648d7
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/partner-search-sync-job.ts
@@ -0,0 +1,105 @@
+import {
+  getPartnerSearchProvider,
+  PARTNER_SEARCH_SYNC_BATCH_SIZE,
+  syncPartnerEnrollments,
+  syncPartnerSearchDocuments,
+} from "@/lib/api/partners/search";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+/**
+ * How many syncs may write to the provider at once. A bulk group move fans out
+ * to dozens of jobs that would otherwise all write at the same moment.
+ * Interactive edits queue behind that, which is the trade. Tune against the
+ * provider's write limits.
+ */
+const SYNC_PARALLELISM = 20;
+
+/**
+ * Two shapes, because the two kinds of change have different blast radii.
+ *
+ * `enrollments` carries IDs the caller already has, and is the only shape that
+ * can express a deletion, since the handler finds out by failing to read one
+ * back. `partners` is for changes that fan out past one enrollment, where the
+ * caller knows the partner but not how many programs it reaches.
+ */
+const inputSchema = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("enrollments"),
+    enrollmentIds: z
+      .array(z.string())
+      .min(1)
+      .max(PARTNER_SEARCH_SYNC_BATCH_SIZE),
+  }),
+  z.object({
+    type: z.literal("partners"),
+    partnerIds: z.array(z.string()).min(1).max(PARTNER_SEARCH_SYNC_BATCH_SIZE),
+    programId: z.string().optional(),
+    after: z.string().optional(),
+  }),
+]);
+
+export const partnerSearchSyncJob = defineJob({
+  name: "partner-search-sync-job",
+  schema: inputSchema,
+  defaults: {
+    retries: 3,
+    flowControl: {
+      key: "partner-search-sync",
+      parallelism: SYNC_PARALLELISM,
+    },
+  },
+  async handle(input) {
+    const searchProvider = getPartnerSearchProvider();
+
+    // An environment without the key should not accumulate a backlog of jobs
+    // that can never succeed.
+    if (!searchProvider) {
+      console.log(
+        "[partnerSearchSyncJob] No search provider configured. Skipping...",
+      );
+      return;
+    }
+
+    if (input.type === "enrollments") {
+      const { upserted, deleted } = await syncPartnerSearchDocuments({
+        enrollmentIds: input.enrollmentIds,
+        searchProvider,
+      });
+
+      console.log(
+        `[partnerSearchSyncJob] Synced ${upserted} and removed ${deleted} enrollment documents.`,
+      );
+
+      return;
+    }
+
+    const { upserted, lastEnrollmentId } = await syncPartnerEnrollments({
+      partnerIds: input.partnerIds,
+      programId: input.programId,
+      after: input.after,
+      take: PARTNER_SEARCH_SYNC_BATCH_SIZE,
+      searchProvider,
+    });
+
+    if (upserted === 0) {
+      return;
+    }
+
+    console.log(
+      `[partnerSearchSyncJob] Synced ${upserted} enrollment documents for ${input.partnerIds.length} partner(s).`,
+    );
+
+    if (upserted === PARTNER_SEARCH_SYNC_BATCH_SIZE && lastEnrollmentId) {
+      await partnerSearchSyncJob.dispatch(
+        {
+          ...input,
+          after: lastEnrollmentId,
+        },
+        {
+          delay: 1,
+        },
+      );
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/partner-tag-deleted-job.ts b/apps/web/lib/jobs/handlers/partner-tag-deleted-job.ts
index 2f861060364..1f259205764 100644
--- a/apps/web/lib/jobs/handlers/partner-tag-deleted-job.ts
+++ b/apps/web/lib/jobs/handlers/partner-tag-deleted-job.ts
@@ -1,6 +1,7 @@
 import * as z from "zod/v4";
 import { includeProgramEnrollment } from "../../api/links/include-program-enrollment";
 import { includeTags } from "../../api/links/include-tags";
+import { queuePartnerSearchSync } from "../../api/partners/queue-partner-search-sync";
 import { CRON_BATCH_SIZE } from "../../cron";
 import { prisma } from "../../prisma";
 import { recordLink } from "../../tinybird";
@@ -69,6 +70,13 @@ export const partnerTagDeletedJob = defineJob({
         `[partnerTagDeletedJob] Deleted ${count} program–partner tag associations.`,
       );
 
+      // Queue an index update because the tag was removed from these enrollments.
+      await queuePartnerSearchSync({
+        enrollmentIds: programPartnerTags.map(
+          ({ programEnrollment }) => programEnrollment.id,
+        ),
+      });
+
       // Update the links to remove the partner tag from TB
       const linksToUpdate = await prisma.link.findMany({
         where: {
diff --git a/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts b/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts
new file mode 100644
index 00000000000..840ce9a5ab5
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/process-partner-group-change-job.ts
@@ -0,0 +1,146 @@
+import { DubApiError } from "@/lib/api/errors";
+import { getWorkspaceUsers } from "@/lib/api/get-workspace-users";
+import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";
+import { linkCache } from "@/lib/api/links/cache";
+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";
+import { includeTags } from "@/lib/api/links/include-tags";
+import { notifyPartnerGroupChange } from "@/lib/api/partners/notify-partner-group-change";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { triggerDraftBountySubmissionCreation } from "@/lib/bounty/api/trigger-draft-bounty-submissions";
+import { qstash } from "@/lib/cron";
+import { prisma } from "@/lib/prisma";
+import { recordLink } from "@/lib/tinybird";
+import { APP_DOMAIN_WITH_NGROK, pluck } from "@dub/utils";
+import { ProgramEnrollmentStatus, WorkspaceRole } from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  programId: z.string(),
+  groupId: z.string(),
+  movedPartnerIds: z.array(z.string()).min(1),
+  userId: z.string().nullable(),
+  idempotencyKey: z.string(),
+});
+
+// Side effects after partners are moved to a group: search sync, remap default
+// links / discount codes, Tinybird link records, draft bounties, and notify.
+export const processPartnerGroupChangeJob = defineJob({
+  name: "process-partner-group-change-job",
+  schema: inputSchema,
+  async handle({
+    programId,
+    groupId,
+    movedPartnerIds,
+    userId,
+    idempotencyKey,
+  }) {
+    // Make sure the group exists
+    try {
+      await getGroupOrThrow({
+        programId,
+        groupId,
+      });
+    } catch (error) {
+      if (error instanceof DubApiError) {
+        return;
+      }
+
+      throw error;
+    }
+
+    const [partnerLinks, programEnrollments] = await Promise.all([
+      prisma.link.findMany({
+        where: {
+          programId,
+          partnerId: {
+            in: movedPartnerIds,
+          },
+        },
+        include: {
+          ...includeTags,
+          ...includeProgramEnrollment,
+        },
+      }),
+
+      prisma.programEnrollment.findMany({
+        where: {
+          programId,
+          partnerId: {
+            in: movedPartnerIds,
+          },
+        },
+        select: {
+          partnerId: true,
+          status: true,
+        },
+      }),
+    ]);
+
+    // Remove LinkRewards for discount/reward
+    await prisma.linkReward.deleteMany({
+      where: {
+        linkId: {
+          in: pluck(partnerLinks, "id"),
+        },
+      },
+    });
+
+    // Edge lookups use COALESCE(LinkReward.discountId, enrollment.discountId).
+    // Expire Redis so clicks don't keep serving the pre-move link override.
+    await linkCache.expireMany(partnerLinks);
+
+    // If the userId is not provided, get the workspace user id from the workspace users
+    // userId will be null for workflow-initiated actions
+    let workspaceUserId = userId;
+
+    if (!workspaceUserId) {
+      const { users } = await getWorkspaceUsers({
+        programId,
+        role: WorkspaceRole.owner,
+      });
+
+      if (users.length > 0) {
+        workspaceUserId = users[0].id;
+      }
+    }
+
+    const activeProgramEnrollments = programEnrollments.filter(
+      ({ status }) => status !== ProgramEnrollmentStatus.pending,
+    );
+
+    await Promise.all([
+      // Queue an index update because the enrollments moved group (filterable field)
+      queuePartnerSearchSync({
+        partnerIds: movedPartnerIds,
+        programId,
+      }),
+
+      qstash.publishJSON({
+        url: `${APP_DOMAIN_WITH_NGROK}/api/cron/groups/remap-default-links`,
+        body: {
+          programId,
+          groupId,
+          partnerIds: pluck(activeProgramEnrollments, "partnerId"),
+          userId: workspaceUserId,
+        },
+        deduplicationId: `remap-default-links-${idempotencyKey}`,
+      }),
+
+      triggerDraftBountySubmissionCreation({
+        programId,
+        partnerIds: movedPartnerIds,
+        idempotencyKey,
+      }),
+
+      recordLink(partnerLinks),
+    ]);
+
+    await notifyPartnerGroupChange({
+      programId,
+      groupId,
+      partnerIds: movedPartnerIds,
+      idempotencyKey: `notify-partners-${idempotencyKey}`,
+    });
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/process-shopify-order-job.ts b/apps/web/lib/jobs/handlers/process-shopify-order-job.ts
new file mode 100644
index 00000000000..bf13e9f273f
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/process-shopify-order-job.ts
@@ -0,0 +1,68 @@
+import { captureWebhookLog } from "@/lib/api-logs/capture-webhook-log";
+import { logger } from "@/lib/axiom/server";
+import { processShopifyOrder } from "@/lib/integrations/shopify/process-order";
+import { shopifyOrderSchema } from "@/lib/integrations/shopify/schema";
+import { prisma } from "@/lib/prisma";
+import { serializeError } from "@dub/utils";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  order: shopifyOrderSchema,
+  clickId: z.string().nullable(),
+  workspaceId: z.string(),
+});
+
+// Process the Shopify order
+export const processShopifyOrderJob = defineJob({
+  name: "process-shopify-order-job",
+  schema: inputSchema,
+  async handle({ workspaceId, clickId, order }) {
+    const startTime = Date.now();
+
+    const workspace = await prisma.project.findUniqueOrThrow({
+      where: {
+        id: workspaceId,
+      },
+      select: {
+        id: true,
+        defaultProgramId: true,
+        webhookEnabled: true,
+      },
+    });
+
+    const requestLog = {
+      workspaceId: workspace.id,
+      method: "POST",
+      path: "/shopify/integration/webhook" as const,
+      requestBody: order,
+      userAgent: "Shopify Order Job",
+    };
+
+    try {
+      const result = await processShopifyOrder({
+        order,
+        workspace,
+        clickId,
+      });
+
+      await logger.flush();
+
+      await captureWebhookLog({
+        ...requestLog,
+        statusCode: 200,
+        duration: Date.now() - startTime,
+        responseBody: result,
+      });
+    } catch (error) {
+      await captureWebhookLog({
+        ...requestLog,
+        statusCode: 400,
+        duration: Date.now() - startTime,
+        responseBody: serializeError(error),
+      });
+
+      await logger.flush();
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts
new file mode 100644
index 00000000000..c9730d8d1df
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts
@@ -0,0 +1,148 @@
+import { CRON_BATCH_SIZE } from "@/lib/cron";
+import { isNonRecoverableDiscountError } from "@/lib/discounts/discount-error";
+import { getDiscountProvider } from "@/lib/discounts/discount-provider";
+import { isDiscountDeleted } from "@/lib/discounts/is-discount-deleted";
+import { prisma } from "@/lib/prisma";
+import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+import { createDiscountCodeForLinkJob } from "./create-discount-code-for-link-job";
+
+const inputSchema = z.object({
+  discountId: z.string(),
+  startingAfter: z.string().optional(),
+});
+
+// Page default links for a discount and enqueue per-link create-discount-code-for-link jobs
+export const publishDiscountCodesCreationJob = defineJob({
+  name: "publish-discount-codes-creation-job",
+  schema: inputSchema,
+  async handle({ discountId, startingAfter }) {
+    const discount = await prisma.discount.findUnique({
+      where: {
+        id: discountId,
+      },
+      include: {
+        program: {
+          select: {
+            id: true,
+            workspace: {
+              select: {
+                id: true,
+                stripeConnectId: true,
+                shopifyStoreId: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!discount) {
+      console.info(`Discount ${discountId} not found. Skipping...`);
+      return;
+    }
+
+    if (isDiscountDeleted(discount)) {
+      console.info(`Discount ${discountId} is soft-deleted. Skipping...`);
+      return;
+    }
+
+    if (!discount.autoProvisionEnabledAt) {
+      console.info(
+        `Discount ${discountId} does not have auto-provision enabled. Skipping...`,
+      );
+      return;
+    }
+
+    const { program } = discount;
+
+    if (!program) {
+      console.info(`Discount ${discountId} has no program. Skipping...`);
+      return;
+    }
+
+    const discountProvider = getDiscountProvider(discount.provider);
+
+    try {
+      await discountProvider.assertDiscountIntegration({
+        workspace: program.workspace,
+      });
+    } catch (error) {
+      if (isNonRecoverableDiscountError(error)) {
+        console.warn(error.message);
+        return;
+      }
+
+      throw error;
+    }
+
+    // Get default links for the program
+    const partnerLinks = await prisma.link.findMany({
+      where: {
+        programId: program.id,
+        discountCode: null,
+        partnerGroupDefaultLinkId: {
+          not: null,
+        },
+        programEnrollment: {
+          status: {
+            in: ACTIVE_ENROLLMENT_STATUSES,
+          },
+        },
+        OR: [
+          {
+            linkReward: {
+              discountId,
+            },
+          },
+          {
+            programEnrollment: {
+              discountId,
+            },
+          },
+        ],
+      },
+      select: {
+        id: true,
+      },
+      ...(startingAfter && {
+        skip: 1,
+        cursor: {
+          id: startingAfter,
+        },
+      }),
+      orderBy: {
+        id: "asc",
+      },
+      take: CRON_BATCH_SIZE,
+    });
+
+    if (partnerLinks.length === 0) {
+      console.info(`No more links found for discount ${discountId}.`);
+      return;
+    }
+
+    await createDiscountCodeForLinkJob.dispatchBatch(
+      partnerLinks.map((link) => ({
+        linkId: link.id,
+      })),
+    );
+
+    if (partnerLinks.length === CRON_BATCH_SIZE) {
+      const startingAfter = partnerLinks[partnerLinks.length - 1].id;
+
+      await publishDiscountCodesCreationJob.dispatch(
+        { discountId, startingAfter },
+        { label: discountId },
+      );
+
+      console.info(
+        `Queued next batch for discount ${discountId} (startingAfter: ${startingAfter}).`,
+      );
+      return;
+    }
+
+    console.info(`Finished queuing jobs for discount ${discountId}.`);
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/queue-partner-program-summary-job.ts b/apps/web/lib/jobs/handlers/queue-partner-program-summary-job.ts
new file mode 100644
index 00000000000..95449c9b948
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/queue-partner-program-summary-job.ts
@@ -0,0 +1,118 @@
+import { prisma } from "@/lib/prisma";
+import { yearMonthSchema } from "@/lib/zod/schemas/misc";
+import { Prisma } from "@prisma/client";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+import { sendPartnerProgramSummaryJob } from "./send-partner-program-summary-job";
+
+const PARTNER_BATCH_SIZE = 100;
+const MAX_BATCHES_PER_RUN = 10;
+
+const inputSchema = z.object({
+  yearMonth: yearMonthSchema,
+  startingAfter: z.string().optional(),
+});
+
+// Pages distinct eligible partnerIds by partnerId cursor, keeps partners with
+// at least one user who has monthlyProgramSummary enabled, and dispatches one
+// send-partner-program-summary-job per partner. Self-continues with a partner
+// cursor.
+export const queuePartnerProgramSummaryJob = defineJob({
+  name: "queue-partner-program-summary-job",
+  schema: inputSchema,
+  async handle(input) {
+    const { yearMonth } = input;
+    let startingAfter = input.startingAfter;
+    let partnerCount = 0;
+    let hasMore = false;
+
+    for (let batch = 0; batch < MAX_BATCHES_PER_RUN; batch++) {
+      const cursorFragment = startingAfter
+        ? Prisma.sql`AND pe.partnerId > ${startingAfter}`
+        : Prisma.sql``;
+
+      const rows = await prisma.$queryRaw<{ partnerId: string }[]>(Prisma.sql`
+        SELECT DISTINCT pe.partnerId
+        FROM ProgramEnrollment pe
+        WHERE pe.status = 'approved'
+          AND pe.totalLeads > 0
+          ${cursorFragment}
+        ORDER BY pe.partnerId ASC
+        LIMIT ${PARTNER_BATCH_SIZE}
+      `);
+
+      if (rows.length === 0) {
+        if (partnerCount === 0 && !input.startingAfter) {
+          console.info(`No eligible partners found for ${yearMonth}.`);
+          return;
+        }
+
+        hasMore = false;
+        break;
+      }
+
+      // Advance cursor from the raw page so filtered-out partners are not re-read
+      startingAfter = rows[rows.length - 1].partnerId;
+      hasMore = rows.length === PARTNER_BATCH_SIZE;
+
+      const partners = await prisma.partner.findMany({
+        where: {
+          id: {
+            in: rows.map((r) => r.partnerId),
+          },
+          users: {
+            some: {
+              notificationPreferences: {
+                monthlyProgramSummary: true,
+              },
+            },
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+
+      if (partners.length > 0) {
+        await sendPartnerProgramSummaryJob.dispatchBatch(
+          partners.map(({ id: partnerId }) => ({
+            partnerId,
+            yearMonth,
+          })),
+          ({ partnerId }) => ({
+            deduplicationId: `send-program-summary-${yearMonth}-${partnerId}`,
+            flowControl: {
+              key: "send-program-summary",
+              parallelism: 10,
+            },
+          }),
+        );
+
+        partnerCount += partners.length;
+      }
+
+      if (!hasMore) {
+        break;
+      }
+    }
+
+    if (hasMore && startingAfter) {
+      await queuePartnerProgramSummaryJob.dispatch(
+        {
+          yearMonth,
+          startingAfter,
+        },
+        {
+          delay: 2,
+        },
+      );
+
+      console.info(
+        `Dispatched ${partnerCount} send jobs for ${yearMonth}. Scheduled next batch (startingAfter: ${startingAfter}).`,
+      );
+      return;
+    }
+
+    console.info(`Dispatched ${partnerCount} send jobs for ${yearMonth}.`);
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/remap-discount-code-job.ts b/apps/web/lib/jobs/handlers/remap-discount-code-job.ts
new file mode 100644
index 00000000000..841839325ad
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/remap-discount-code-job.ts
@@ -0,0 +1,24 @@
+import { remapDiscountCode } from "@/lib/discounts/remap-discount-code";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  discountCodeId: z.string(),
+});
+
+// Remap a single discount code to the partner's current enrollment/link discount.
+// Fan-out from sync/detach can queue thousands of jobs; flow control caps
+// concurrent remaps (and provider deletes) so we don't stampede Stripe/Shopify.
+export const remapDiscountCodeJob = defineJob({
+  name: "remap-discount-code-job",
+  schema: inputSchema,
+  defaults: {
+    flowControl: {
+      key: "remap-discount-code",
+      parallelism: 20,
+    },
+  },
+  async handle(input) {
+    await remapDiscountCode(input);
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/send-connect-payout-reminders-job.ts b/apps/web/lib/jobs/handlers/send-connect-payout-reminders-job.ts
new file mode 100644
index 00000000000..066bc706f4c
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/send-connect-payout-reminders-job.ts
@@ -0,0 +1,28 @@
+import { sendPayoutReminder } from "@/lib/payouts/send-payout-reminder";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  afterPartnerId: z.string().optional(),
+  batchNumber: z.number().int().positive().default(1),
+});
+
+// Sends ConnectPayoutReminder emails to partners with pending payouts
+// who have not configured payouts yet.
+export const sendConnectPayoutRemindersJob = defineJob({
+  name: "send-connect-payout-reminders-job",
+  schema: inputSchema,
+  async handle({ afterPartnerId, batchNumber }) {
+    const nextAfterPartnerId = await sendPayoutReminder({
+      afterPartnerId,
+      batchNumber,
+    });
+
+    if (nextAfterPartnerId) {
+      await sendConnectPayoutRemindersJob.dispatch({
+        afterPartnerId: nextAfterPartnerId,
+        batchNumber: batchNumber + 1,
+      });
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/send-partner-program-summary-job.ts b/apps/web/lib/jobs/handlers/send-partner-program-summary-job.ts
new file mode 100644
index 00000000000..6ccaa1bba53
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/send-partner-program-summary-job.ts
@@ -0,0 +1,452 @@
+import { getAnalytics } from "@/lib/analytics/get-analytics";
+import { prisma } from "@/lib/prisma";
+import { redis } from "@/lib/upstash";
+import { yearMonthSchema } from "@/lib/zod/schemas/misc";
+import { ACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { tz } from "@date-fns/tz";
+import { sendBatchEmail } from "@dub/email";
+import PartnerProgramSummary from "@dub/email/templates/partner-program-summary";
+import { chunk } from "@dub/utils";
+import { CommissionStatus, Prisma, Program } from "@prisma/client";
+import { endOfMonth, format, parse, subMonths } from "date-fns";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const MAX_PROGRAMS_PER_SUMMARY = 10;
+const ANALYTICS_CACHE_TTL_SECONDS = 60 * 60; // 1 hour
+const ANALYTICS_REQUEST_BATCH_SIZE = 10;
+
+// earnings from MySQL, clicks, leads, sales from Tinybird
+type MonthMetrics = {
+  earnings: number;
+  clicks: number;
+  leads: number;
+  sales: number;
+};
+
+type PartnerAnalyticsMetrics = {
+  clicks: number;
+  leads: number;
+  sales: number;
+};
+
+const EMPTY_PARTNER_ANALYTICS: PartnerAnalyticsMetrics = {
+  clicks: 0,
+  leads: 0,
+  sales: 0,
+};
+
+type ProgramSummaryStats = {
+  previousMonth: MonthMetrics;
+  currentMonth: MonthMetrics;
+};
+
+function monthHasNoActivity(m: MonthMetrics) {
+  return m.earnings === 0 && m.clicks === 0 && m.leads === 0 && m.sales === 0;
+}
+
+function byCurrentMonthPerformance(
+  a: ProgramSummaryStats,
+  b: ProgramSummaryStats,
+) {
+  return (
+    b.currentMonth.earnings - a.currentMonth.earnings ||
+    b.currentMonth.sales - a.currentMonth.sales ||
+    b.currentMonth.leads - a.currentMonth.leads ||
+    b.currentMonth.clicks - a.currentMonth.clicks
+  );
+}
+
+export function getReportingPeriod(yearMonth: string) {
+  const utc = tz("UTC");
+  const currentMonthStart = parse(yearMonth, "yyyy-MM", new Date(), {
+    in: utc,
+  });
+  const previousMonthStart = subMonths(currentMonthStart, 1);
+  const currentMonthEnd = endOfMonth(currentMonthStart);
+  const previousMonthEnd = endOfMonth(previousMonthStart);
+
+  const currentMonth = new Date(currentMonthStart.getTime());
+  const previousMonth = new Date(previousMonthStart.getTime());
+  const end = new Date(currentMonthEnd.getTime());
+
+  return {
+    currentMonth,
+    previousMonth,
+    previousMonthEnd: new Date(previousMonthEnd.getTime()),
+    currentMonthEnd: end,
+    month: format(currentMonthStart, "MMMM yyyy", { in: utc }),
+    start: currentMonth.toISOString(),
+    end: end.toISOString(),
+  };
+}
+
+// Fetches composite top_partners for a program/month window once, caches the
+// partnerId -> metrics map in Redis so other send jobs for the same program reuse it.
+async function getTopPartnersAnalytics({
+  workspaceId,
+  programId,
+  yearMonth,
+  period,
+  start,
+  end,
+}: {
+  workspaceId: string;
+  programId: string;
+  yearMonth: string;
+  period: "previous" | "current";
+  start: Date;
+  end: Date;
+}): Promise<Record<string, PartnerAnalyticsMetrics>> {
+  const cacheKey = `topPartnersAnalytics:${programId}:${yearMonth}:${period}`;
+
+  const cached =
+    await redis.get<Record<string, PartnerAnalyticsMetrics>>(cacheKey);
+
+  if (cached) {
+    return cached;
+  }
+
+  const rows = await getAnalytics({
+    event: "composite",
+    groupBy: "top_partners",
+    workspaceId,
+    programId,
+    start,
+    end,
+  });
+
+  const byPartnerId: Record<string, PartnerAnalyticsMetrics> = {};
+
+  for (const row of rows) {
+    byPartnerId[row.partnerId] = {
+      clicks: row.clicks ?? 0,
+      leads: row.leads ?? 0,
+      sales: row.sales ?? 0,
+    };
+  }
+
+  console.info(
+    `[getProgramTopPartnersAnalytics] Cached ${Object.keys(byPartnerId).length} partners for ${programId} in ${yearMonth} ${period}`,
+  );
+
+  await redis.set(cacheKey, byPartnerId, {
+    ex: ANALYTICS_CACHE_TTL_SECONDS,
+  });
+
+  return byPartnerId;
+}
+
+async function getPartnerAnalytics({
+  enrollments,
+  partnerId,
+  yearMonth,
+  previousMonth,
+  previousMonthEnd,
+  currentMonth,
+  currentMonthEnd,
+}: {
+  enrollments: {
+    program: Pick<Program, "id" | "name" | "logo" | "slug" | "workspaceId">;
+  }[];
+  partnerId: string;
+  yearMonth: string;
+} & Pick<
+  ReturnType<typeof getReportingPeriod>,
+  "previousMonth" | "previousMonthEnd" | "currentMonth" | "currentMonthEnd"
+>) {
+  const analyticsRequests = enrollments.flatMap(({ program }) => [
+    {
+      program,
+      period: "previous" as const,
+      start: previousMonth,
+      end: previousMonthEnd,
+    },
+    {
+      program,
+      period: "current" as const,
+      start: currentMonth,
+      end: currentMonthEnd,
+    },
+  ]);
+
+  const analyticsByKey = new Map<
+    string,
+    Record<string, PartnerAnalyticsMetrics>
+  >();
+
+  for (const batch of chunk(analyticsRequests, ANALYTICS_REQUEST_BATCH_SIZE)) {
+    const batchResults = await Promise.all(
+      batch.map(async ({ program, period, start, end }) => {
+        const byPartner = await getTopPartnersAnalytics({
+          workspaceId: program.workspaceId,
+          programId: program.id,
+          yearMonth,
+          period,
+          start,
+          end,
+        });
+
+        return {
+          key: `${program.id}:${period}`,
+          byPartner,
+        };
+      }),
+    );
+
+    for (const { key, byPartner } of batchResults) {
+      analyticsByKey.set(key, byPartner);
+    }
+  }
+
+  return enrollments.map(({ program }) => ({
+    program,
+    previousMonthAnalytics:
+      analyticsByKey.get(`${program.id}:previous`)?.[partnerId] ??
+      EMPTY_PARTNER_ANALYTICS,
+    currentMonthAnalytics:
+      analyticsByKey.get(`${program.id}:current`)?.[partnerId] ??
+      EMPTY_PARTNER_ANALYTICS,
+  }));
+}
+
+const inputSchema = z.object({
+  partnerId: z.string(),
+  yearMonth: yearMonthSchema,
+});
+
+// Builds the monthly program summary for a partner (all programs combined)
+// and sends it to each partner user with monthlyProgramSummary enabled.
+// Skip if no users to notify or no program activity in the reporting window.
+export const sendPartnerProgramSummaryJob = defineJob({
+  name: "send-partner-program-summary-job",
+  schema: inputSchema,
+  async handle(input) {
+    const { partnerId, yearMonth } = input;
+
+    const partner = await prisma.partner.findUnique({
+      where: {
+        id: partnerId,
+      },
+      select: {
+        users: {
+          where: {
+            notificationPreferences: {
+              monthlyProgramSummary: true,
+            },
+          },
+          select: {
+            user: {
+              select: {
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const partnerUsersToNotify = (partner?.users ?? [])
+      .map(({ user }) => user)
+      .filter((user): user is { email: string } => Boolean(user?.email));
+
+    if (partnerUsersToNotify.length === 0) {
+      console.info(
+        `[sendPartnerProgramSummaryJob] No partner emails to notify for partner ${partnerId}. Skipping...`,
+      );
+      return;
+    }
+
+    const enrollments = await prisma.programEnrollment.findMany({
+      where: {
+        partnerId,
+        program: {
+          deactivatedAt: null,
+        },
+        status: {
+          in: ACTIVE_ENROLLMENT_STATUSES,
+        },
+        totalLeads: {
+          gt: 0,
+        },
+      },
+      select: {
+        program: {
+          select: {
+            id: true,
+            name: true,
+            logo: true,
+            slug: true,
+            workspaceId: true,
+          },
+        },
+      },
+    });
+
+    if (enrollments.length === 0) {
+      console.info(
+        `[sendPartnerProgramSummaryJob] Partner ${partnerId} has no eligible enrollments. Skipping...`,
+      );
+      return;
+    }
+
+    const {
+      previousMonth,
+      previousMonthEnd,
+      currentMonth,
+      currentMonthEnd,
+      month,
+      start,
+      end,
+    } = getReportingPeriod(yearMonth);
+
+    const programIds = enrollments.map((e) => e.program.id);
+
+    const commissionWhere: Prisma.CommissionWhereInput = {
+      partnerId,
+      programId: {
+        in: programIds,
+      },
+      earnings: {
+        gt: 0,
+      },
+      status: {
+        in: [
+          CommissionStatus.pending,
+          CommissionStatus.processed,
+          CommissionStatus.paid,
+        ],
+      },
+    };
+
+    const [previousMonthEarnings, currentMonthEarnings, analyticsByProgram] =
+      await Promise.all([
+        prisma.commission.groupBy({
+          by: ["programId"],
+          where: {
+            ...commissionWhere,
+            createdAt: {
+              gte: previousMonth,
+              lte: previousMonthEnd,
+            },
+          },
+          _sum: {
+            earnings: true,
+          },
+        }),
+
+        prisma.commission.groupBy({
+          by: ["programId"],
+          where: {
+            ...commissionWhere,
+            createdAt: {
+              gte: currentMonth,
+              lte: currentMonthEnd,
+            },
+          },
+          _sum: {
+            earnings: true,
+          },
+        }),
+
+        getPartnerAnalytics({
+          enrollments,
+          partnerId,
+          yearMonth,
+          previousMonth,
+          previousMonthEnd,
+          currentMonth,
+          currentMonthEnd,
+        }),
+      ]);
+
+    const previousEarningsMap = new Map(
+      previousMonthEarnings.map((e) => [e.programId, e._sum.earnings ?? 0]),
+    );
+
+    const currentEarningsMap = new Map(
+      currentMonthEarnings.map((e) => [e.programId, e._sum.earnings ?? 0]),
+    );
+
+    const programs = analyticsByProgram
+      .map(({ program, previousMonthAnalytics, currentMonthAnalytics }) => {
+        const stats: ProgramSummaryStats = {
+          previousMonth: {
+            earnings: previousEarningsMap.get(program.id) ?? 0,
+            clicks: previousMonthAnalytics.clicks ?? 0,
+            leads: previousMonthAnalytics.leads ?? 0,
+            sales: previousMonthAnalytics.sales ?? 0,
+          },
+          currentMonth: {
+            earnings: currentEarningsMap.get(program.id) ?? 0,
+            clicks: currentMonthAnalytics.clicks ?? 0,
+            leads: currentMonthAnalytics.leads ?? 0,
+            sales: currentMonthAnalytics.sales ?? 0,
+          },
+        };
+
+        return {
+          id: program.id,
+          name: program.name,
+          logo: program.logo,
+          slug: program.slug,
+          ...stats,
+        };
+      })
+      .filter(
+        (program) =>
+          !(
+            monthHasNoActivity(program.previousMonth) &&
+            monthHasNoActivity(program.currentMonth)
+          ),
+      )
+      .sort(byCurrentMonthPerformance)
+      .slice(0, MAX_PROGRAMS_PER_SUMMARY);
+
+    if (programs.length === 0) {
+      console.info(
+        `[sendPartnerProgramSummaryJob] Partner ${partnerId} has no program activity for ${yearMonth}. Skipping...`,
+      );
+      return;
+    }
+
+    console.table(
+      programs.map((p) => {
+        return {
+          name: p.name,
+          current: JSON.stringify(p.currentMonth),
+          previous: JSON.stringify(p.previousMonth),
+        };
+      }),
+    );
+
+    const { error } = await sendBatchEmail(
+      partnerUsersToNotify.map(({ email }) => ({
+        variant: "notifications",
+        subject: `Your ${month} partner program summary`,
+        to: email,
+        replyTo: "noreply",
+        react: PartnerProgramSummary({
+          email,
+          programs,
+          reportingPeriod: {
+            month,
+            start,
+            end,
+          },
+        }),
+      })),
+      {
+        idempotencyKey: `partner-program-summary-${yearMonth}-${partnerId}`,
+      },
+    );
+
+    if (error) {
+      throw new Error(error.message);
+    }
+
+    console.info(
+      `[sendPartnerProgramSummaryJob] Sent summary for partner ${partnerId} (${yearMonth}) to ${partnerUsersToNotify.length} users with ${programs.length} programs.`,
+    );
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/sync-group-utm-job.ts b/apps/web/lib/jobs/handlers/sync-group-utm-job.ts
new file mode 100644
index 00000000000..eab621bf3c4
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/sync-group-utm-job.ts
@@ -0,0 +1,198 @@
+import { linkCache } from "@/lib/api/links/cache";
+import { extractAndResolveUtmParams } from "@/lib/api/utm/extract-and-resolve-utm-params";
+import { prisma } from "@/lib/prisma";
+import { LinkProps } from "@/lib/types";
+import { chunk, constructURLFromUTMParams } from "@dub/utils";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const PAGE_SIZE = 50;
+const UPDATE_BATCH_SIZE = 25;
+
+const inputSchema = z.object({
+  groupId: z.string(),
+  partnerIds: z.array(z.string()).optional(),
+  startAfterProgramEnrollmentId: z.string().optional(),
+});
+
+/**
+  Syncs the UTM parameter settings for a given group (whether there is a UTM template or not)
+
+  This job is triggered when:
+  1. a UTM template is created for a group
+  2. a UTM template is updated
+  3. in groups/remap-default-links cron
+  4. a partner's name changes (via dispatchGroupUtmSyncForPartner)
+ */
+export const syncGroupUtmJob = defineJob({
+  name: "sync-group-utm-job",
+  schema: inputSchema,
+  async handle(input) {
+    let { groupId, partnerIds, startAfterProgramEnrollmentId } = input;
+
+    // Find the UTM template
+    const group = await prisma.partnerGroup.findUnique({
+      where: {
+        id: groupId,
+      },
+      select: {
+        id: true,
+        name: true,
+        utmTemplate: true,
+      },
+    });
+
+    if (!group) {
+      console.error(
+        `[syncGroupUtmJob] Group ${groupId} not found. Skipping...`,
+      );
+      return;
+    }
+
+    const { utmTemplate } = group;
+
+    // Find partners in the group
+    const programEnrollments = await prisma.programEnrollment.findMany({
+      where: {
+        groupId: group.id,
+        ...(partnerIds && {
+          partnerId: {
+            in: partnerIds,
+          },
+        }),
+        ...(startAfterProgramEnrollmentId && {
+          id: {
+            gt: startAfterProgramEnrollmentId,
+          },
+        }),
+      },
+      take: PAGE_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+      select: {
+        id: true,
+        partner: {
+          select: {
+            name: true,
+          },
+        },
+        links: {
+          select: {
+            id: true,
+            domain: true,
+            key: true,
+            url: true,
+          },
+        },
+      },
+    });
+
+    if (programEnrollments.length === 0) {
+      console.log(
+        `[syncGroupUtmJob] No program enrollments found. Skipping...`,
+      );
+      return;
+    }
+
+    const linksToExpire: Pick<LinkProps, "domain" | "key">[] = [];
+    const linkUpdateGroupsByUrl = new Map<
+      string,
+      {
+        linkIds: string[];
+        data: {
+          url: string;
+        } & ReturnType<typeof extractAndResolveUtmParams>;
+      }
+    >();
+
+    for (const { links, partner } of programEnrollments) {
+      for (const link of links) {
+        const utmContext = {
+          partnerName: partner.name || link.key,
+          partnerLinkKey: link.key,
+        };
+
+        const resolvedUtmParams = extractAndResolveUtmParams(
+          utmTemplate,
+          utmContext,
+        );
+
+        const resolvedUtmColumns = extractAndResolveUtmParams(
+          utmTemplate,
+          utmContext,
+          { excludeRef: true },
+        );
+
+        const data = {
+          url: constructURLFromUTMParams(link.url, resolvedUtmParams),
+          ...resolvedUtmColumns,
+        };
+
+        const existing = linkUpdateGroupsByUrl.get(data.url);
+
+        if (existing) {
+          existing.linkIds.push(link.id);
+        } else {
+          linkUpdateGroupsByUrl.set(data.url, { linkIds: [link.id], data });
+        }
+
+        linksToExpire.push({
+          domain: link.domain,
+          key: link.key,
+        });
+      }
+    }
+
+    const linkUpdateGroups = [...linkUpdateGroupsByUrl.values()];
+    const linkUpdateGroupBatches = chunk(linkUpdateGroups, UPDATE_BATCH_SIZE);
+
+    for (const batch of linkUpdateGroupBatches) {
+      await Promise.all(
+        batch.map(({ linkIds, data }) =>
+          prisma.link.updateMany({
+            where: {
+              id: {
+                in: linkIds,
+              },
+            },
+            data,
+          }),
+        ),
+      );
+    }
+
+    const totalLinks = linkUpdateGroups.reduce(
+      (sum, { linkIds }) => sum + linkIds.length,
+      0,
+    );
+
+    console.log(
+      `[syncGroupUtmJob] Updated ${totalLinks} links. Expiring Redis cache for ${linksToExpire.length} links...`,
+    );
+
+    await linkCache.expireMany(linksToExpire);
+
+    if (programEnrollments.length === PAGE_SIZE) {
+      startAfterProgramEnrollmentId =
+        programEnrollments[programEnrollments.length - 1].id;
+
+      await syncGroupUtmJob.dispatch(
+        {
+          groupId,
+          partnerIds,
+          startAfterProgramEnrollmentId,
+        },
+        {
+          delay: 1,
+          label: groupId,
+        },
+      );
+      return;
+    }
+
+    console.log(
+      `[syncGroupUtmJob] Finished syncing UTM settings for ${programEnrollments.length} partners in the ${group.name} group (${group.id}).`,
+    );
+  },
+});
diff --git a/apps/web/lib/jobs/handlers/unban-partner-job.ts b/apps/web/lib/jobs/handlers/unban-partner-job.ts
index 80375ec0aa8..10a9e87490d 100644
--- a/apps/web/lib/jobs/handlers/unban-partner-job.ts
+++ b/apps/web/lib/jobs/handlers/unban-partner-job.ts
@@ -85,7 +85,10 @@ export const unbanPartnerJob = defineJob({
           status: BountySubmissionStatus.rejected,
         },
         data: {
-          status: BountySubmissionStatus.submitted,
+          status: BountySubmissionStatus.draft,
+          rejectionNote: null,
+          rejectionReason: null,
+          reviewedAt: null,
         },
       }),
     ]);
diff --git a/apps/web/lib/jobs/handlers/welcome-user-job.ts b/apps/web/lib/jobs/handlers/welcome-user-job.ts
new file mode 100644
index 00000000000..b6b9c72973d
--- /dev/null
+++ b/apps/web/lib/jobs/handlers/welcome-user-job.ts
@@ -0,0 +1,101 @@
+import { generateUnsubscribeToken } from "@/lib/email/unsubscribe-token";
+import { prisma } from "@/lib/prisma";
+import { sendEmail } from "@dub/email";
+import WelcomeEmail from "@dub/email/templates/welcome-email";
+import WelcomeEmailPartner from "@dub/email/templates/welcome-email-partner";
+import { APP_DOMAIN, PARTNERS_DOMAIN } from "@dub/utils";
+import * as z from "zod/v4";
+import { defineJob } from "../index";
+
+const inputSchema = z.object({
+  userId: z.string(),
+});
+
+// This job is used to send a welcome email to new users + subscribe them to the corresponding Resend audience
+// It is dispatched 45 minutes after a user is created.
+
+// Trial sequence: users who later start a paid-plan trial also receive marketing emails from
+// `/api/cron/trial-emails` when due; that flow is additive (this welcome is not skipped).
+export const welcomeUserJob = defineJob({
+  name: "welcome-user-job",
+  schema: inputSchema,
+  async handle(input) {
+    const { userId } = input;
+
+    const user = await prisma.user.findUnique({
+      where: {
+        id: userId,
+      },
+      select: {
+        name: true,
+        email: true,
+        partners: true,
+        projects: {
+          select: {
+            project: {
+              select: {
+                slug: true,
+                name: true,
+                logo: true,
+                plan: true,
+                trialEndsAt: true,
+                defaultProgramId: true,
+              },
+            },
+          },
+          orderBy: {
+            createdAt: "asc",
+          },
+          take: 1,
+        },
+      },
+    });
+
+    if (!user) {
+      console.error(`User ${userId} not found.`);
+      return;
+    }
+
+    if (!user.email) {
+      console.error(`User ${userId} email not found.`);
+      return;
+    }
+
+    const isPartner = user.partners.length > 0;
+    const unsubscribeUrl = `${isPartner ? PARTNERS_DOMAIN : APP_DOMAIN}/unsubscribe/${generateUnsubscribeToken(user.email)}`;
+
+    if (isPartner) {
+      await sendEmail({
+        variant: "marketing",
+        to: user.email,
+        replyTo: "steven.tey@dub.co",
+        subject: "Welcome to Dub Partners!",
+        react: WelcomeEmailPartner({
+          email: user.email,
+          name: user.name,
+          unsubscribeUrl,
+        }),
+      });
+
+      // only send WelcomeEmail if the user has a workspace that:
+      // - is not in a trial
+      // - hasn't created a program yet
+    } else if (
+      user.projects.length > 0 &&
+      user.projects[0].project.trialEndsAt === null &&
+      user.projects[0].project.defaultProgramId === null
+    ) {
+      await sendEmail({
+        variant: "marketing",
+        to: user.email,
+        replyTo: "steven.tey@dub.co",
+        subject: "Welcome to Dub!",
+        react: WelcomeEmail({
+          email: user.email,
+          workspace: user.projects[0].project,
+          unsubscribeUrl,
+        }),
+      });
+    }
+  },
+});
diff --git a/apps/web/lib/jobs/index.ts b/apps/web/lib/jobs/index.ts
index 4e1afd59d53..49d04bc7226 100644
--- a/apps/web/lib/jobs/index.ts
+++ b/apps/web/lib/jobs/index.ts
@@ -1,27 +1,17 @@
-import { createId } from "@/lib/api/create-id";
-import { logger } from "@/lib/axiom/server";
+import { logger, toErrorFields } from "@/lib/axiom/server";
 import { qstash } from "@/lib/cron";
-import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK, chunk } from "@dub/utils";
-import { Prisma } from "@prisma/client";
-import { PublishRequest } from "@upstash/qstash";
+import { chunk, sleep } from "@dub/utils";
 import * as z from "zod/v4";
-
-export type JobEnvelope = z.infer<typeof jobEnvelopeSchema>;
-
-type JobPublishOptions = Pick<
-  PublishRequest,
-  | "delay"
-  | "notBefore"
-  | "deduplicationId"
-  | "retries"
-  | "flowControl"
-  | "label"
->;
-
-export type JobDispatchOptions = JobPublishOptions & {
-  queue?: string;
-};
+import { QSTASH_BATCH_CHUNK_SIZE } from "./constants";
+import { persistBackgroundJobs } from "./outbox";
+import {
+  buildJobLabel,
+  buildQStashJobRequest,
+  isPublishSuccess,
+  jobNameSchema,
+  type DispatchJobInput,
+  type JobDispatchOptions,
+} from "./send-jobs";
 
 // Per-job defaults, merged under per-dispatch options
 export type JobDefaults = Pick<
@@ -29,85 +19,26 @@ export type JobDefaults = Pick<
   "retries" | "queue" | "flowControl" | "label"
 >;
 
-export type DispatchResult =
+type DispatchResult =
   | { status: "published"; messageId: string }
   | { status: "deferred"; backgroundJobId: string };
 
-export type DispatchBatchResult = {
+type DispatchBatchResult = {
   published: number;
   deferred: number;
   failed: number;
   results: DispatchResult[];
 };
 
-interface DispatchJobInput {
-  name: string;
-  payload: unknown;
-  options?: JobDispatchOptions;
-}
-
-type JobReplayOptions = Pick<
-  JobDispatchOptions,
-  "deduplicationId" | "retries" | "queue" | "flowControl" | "label"
->;
-
-const JOBS_ENDPOINT_URL = `${APP_DOMAIN_WITH_NGROK}/api/jobs/process`;
-
 const QSTASH_PUBLISH_MAX_RETRIES = 3;
 
-const QSTASH_BATCH_CHUNK_SIZE = 100;
-
-export const jobNameSchema = z
-  .string()
-  .regex(
-    /^[a-z][a-z0-9]*(-[a-z0-9]+)*-job$/,
-    'Job name must be kebab-case ending in "-job"',
-  );
-
-export function getJobsEndpointUrl(name: string) {
-  return `${JOBS_ENDPOINT_URL}/${name}`;
-}
-
-// QStash label: user-provided tag first, job name appended for log filtering
-export function buildJobLabel(name: string, label?: string) {
-  return label ? `${label},${name}` : name;
-}
-
-// QStash deduplicationId: user-provided id first, job name appended for cross-job isolation
-export function buildJobDeduplicationId(
-  name: string,
-  deduplicationId?: string,
-) {
-  if (!deduplicationId) {
-    return undefined;
-  }
-
-  return `${deduplicationId},${name}`;
-}
-
-// Wire format published to QStash and consumed by /api/jobs/process/[jobName]
-export const jobEnvelopeSchema = z.object({
-  name: jobNameSchema,
-  dispatchedAt: z.string(),
-  payload: z.unknown(),
-});
-
-function toErrorFields(error: unknown) {
-  return {
-    errorName: error instanceof Error ? error.name : undefined,
-    errorMessage: error instanceof Error ? error.message : String(error),
-  };
-}
-
 async function withQStashRetry<T>(fn: () => Promise<T>): Promise<T> {
   for (let attempt = 0; attempt <= QSTASH_PUBLISH_MAX_RETRIES; attempt++) {
     try {
       return await fn();
     } catch (error) {
       if (attempt < QSTASH_PUBLISH_MAX_RETRIES) {
-        await new Promise((resolve) =>
-          setTimeout(resolve, 1000 * Math.pow(2, attempt)),
-        );
+        await sleep(1000 * Math.pow(2, attempt));
         continue;
       }
 
@@ -118,122 +49,6 @@ async function withQStashRetry<T>(fn: () => Promise<T>): Promise<T> {
   throw new Error("Failed to publish to QStash.");
 }
 
-function buildQStashJobRequest(
-  { name, payload, options }: DispatchJobInput,
-  opts?: {
-    dispatchedAt?: string;
-    batch?: boolean;
-    notBefore?: number;
-  },
-) {
-  const envelope: JobEnvelope = {
-    name,
-    payload,
-    dispatchedAt: opts?.dispatchedAt ?? new Date().toISOString(),
-  };
-
-  const notBefore = opts?.notBefore ?? options?.notBefore;
-  const deduplicationId = buildJobDeduplicationId(
-    name,
-    options?.deduplicationId,
-  );
-
-  return {
-    url: getJobsEndpointUrl(name),
-    body: envelope,
-    label: buildJobLabel(name, options?.label),
-    ...(options?.delay &&
-      opts?.notBefore === undefined && {
-        delay: options.delay,
-      }),
-    ...(notBefore && { notBefore }),
-    ...(deduplicationId && { deduplicationId }),
-    ...(options?.retries !== undefined && { retries: options.retries }),
-    ...(options?.flowControl && { flowControl: options.flowControl }),
-    ...(opts?.batch && options?.queue && { queueName: options.queue }),
-  };
-}
-
-export function buildReplayRequest(
-  job: {
-    name: string;
-    payload: Prisma.JsonValue;
-    options: Prisma.JsonValue | null;
-    createdAt: Date;
-    scheduledFor: Date | null;
-  },
-  now: Date = new Date(),
-) {
-  const options = (job.options ?? {}) as JobReplayOptions;
-
-  const notBefore =
-    job.scheduledFor && job.scheduledFor > now
-      ? Math.floor(job.scheduledFor.getTime() / 1000)
-      : undefined;
-
-  return buildQStashJobRequest(
-    {
-      name: job.name,
-      payload: job.payload,
-      options,
-    },
-    {
-      dispatchedAt: job.createdAt.toISOString(),
-      batch: true,
-      notBefore,
-    },
-  );
-}
-
-export function isPublishSuccess(
-  response: unknown,
-): response is { messageId: string } {
-  return (
-    typeof response === "object" &&
-    response !== null &&
-    "messageId" in response &&
-    typeof response.messageId === "string"
-  );
-}
-
-// Persist jobs that could not be published to QStash. The
-// /api/cron/queue/retry cron republishes them and deletes the rows on success.
-async function persistBackgroundJobs(inputs: DispatchJobInput[]) {
-  const jobs = inputs.map(({ name, payload, options }) => {
-    let scheduledFor: Date | null = null;
-
-    if (options?.notBefore) {
-      scheduledFor = new Date(options.notBefore * 1000);
-    } else if (typeof options?.delay === "number") {
-      scheduledFor = new Date(Date.now() + options.delay * 1000);
-    }
-
-    const replayOptions = {
-      ...(options?.deduplicationId && {
-        deduplicationId: options.deduplicationId,
-      }),
-      ...(options?.retries !== undefined && { retries: options.retries }),
-      ...(options?.queue && { queue: options.queue }),
-      ...(options?.flowControl && { flowControl: options.flowControl }),
-      ...(options?.label && { label: options.label }),
-    };
-
-    return {
-      id: createId({ prefix: "job_" }),
-      name,
-      payload: payload as Prisma.InputJsonValue,
-      options: replayOptions as Prisma.InputJsonValue,
-      scheduledFor,
-    };
-  });
-
-  await prisma.job.createMany({
-    data: jobs,
-  });
-
-  return jobs;
-}
-
 async function deferJobs(inputs: DispatchJobInput[]) {
   const backgroundJobs = await persistBackgroundJobs(inputs);
 
@@ -340,7 +155,7 @@ async function dispatchJobs(
           logger.error("jobs.dispatch_lost", {
             jobName,
             jobCount: failedInputs.length,
-            ...toErrorFields(error),
+            error: toErrorFields(error),
           });
 
           failed += failedInputs.length;
@@ -362,7 +177,7 @@ async function dispatchJobs(
         jobName,
         jobCount: inputChunk.length,
         batch: !isSingleDispatch,
-        ...toErrorFields(error),
+        error: toErrorFields(error),
       });
 
       try {
@@ -373,7 +188,7 @@ async function dispatchJobs(
         logger.error("jobs.dispatch_lost", {
           jobName,
           jobCount: inputChunk.length,
-          ...toErrorFields(persistError),
+          error: toErrorFields(persistError),
         });
 
         failed += inputChunk.length;
diff --git a/apps/web/lib/jobs/outbox.ts b/apps/web/lib/jobs/outbox.ts
new file mode 100644
index 00000000000..2461e0a693f
--- /dev/null
+++ b/apps/web/lib/jobs/outbox.ts
@@ -0,0 +1,269 @@
+import { createId } from "@/lib/api/create-id";
+import { logger, toErrorFields } from "@/lib/axiom/server";
+import { Job, Prisma } from "@prisma/client";
+import { prisma } from "../prisma";
+import { MAX_JOB_ATTEMPTS, MAX_JOBS_PER_BATCH } from "./constants";
+import { isDefineJobName, sendJobs, type DispatchJobInput } from "./send-jobs";
+import { isWorkflowName, triggerWorkflows } from "./send-workflows";
+import type { PersistableJob, PublishResult } from "./types";
+
+type JobTransport = {
+  matches: (name: string) => boolean;
+  send: (jobs: Job[]) => Promise<PublishResult[]>;
+};
+
+const transports: JobTransport[] = [
+  {
+    matches: isWorkflowName,
+    send: triggerWorkflows,
+  },
+  {
+    matches: isDefineJobName,
+    send: sendJobs,
+  },
+];
+
+// First failed publish counts as attempt 1 so retry budget matches MAX_JOB_ATTEMPTS.
+function toJobCreateInput({
+  job,
+  lastError,
+}: {
+  job: PersistableJob;
+  lastError?: string | null;
+}): Prisma.JobCreateManyInput {
+  return {
+    id: job.id,
+    name: job.name,
+    payload: job.payload as Prisma.InputJsonValue,
+    options: (job.options ?? {}) as Prisma.InputJsonValue,
+    scheduledAt: job.scheduledAt ?? new Date(),
+    lastError,
+    attempts: 1,
+  };
+}
+
+// Persist jobs that failed to publish. Swallow DB errors (log only)
+export async function persistFailedJobs({
+  jobs,
+  failedResults,
+  logEvent = "jobs.dispatch_lost",
+}: {
+  jobs: PersistableJob[];
+  failedResults: PublishResult[];
+  logEvent?: string;
+}) {
+  if (failedResults.length === 0) {
+    return;
+  }
+
+  const failedById = new Map(
+    failedResults.map((result) => [result.id, result]),
+  );
+
+  const data = jobs
+    .filter((job) => failedById.has(job.id))
+    .map((job) =>
+      toJobCreateInput({
+        job,
+        lastError: failedById.get(job.id)!.lastError,
+      }),
+    );
+
+  try {
+    await prisma.job.createMany({
+      skipDuplicates: true,
+      data,
+    });
+  } catch (error) {
+    logger.error(logEvent, {
+      jobCount: data.length,
+      error: toErrorFields(error),
+    });
+    await logger.flush();
+  }
+}
+
+// Persist jobs that could not be published to QStash.
+// /api/cron/queue/retry cron republishes them and deletes the rows on success.
+export async function persistBackgroundJobs(inputs: DispatchJobInput[]) {
+  const jobs: PersistableJob[] = inputs.map(({ name, payload, options }) => {
+    let scheduledAt = new Date();
+
+    if (options?.notBefore) {
+      scheduledAt = new Date(options.notBefore * 1000);
+    } else if (typeof options?.delay === "number") {
+      scheduledAt = new Date(Date.now() + options.delay * 1000);
+    }
+
+    const replayOptions = {
+      ...(options?.deduplicationId && {
+        deduplicationId: options.deduplicationId,
+      }),
+      ...(options?.retries !== undefined && { retries: options.retries }),
+      ...(options?.queue && { queue: options.queue }),
+      ...(options?.flowControl && { flowControl: options.flowControl }),
+      ...(options?.label && { label: options.label }),
+    };
+
+    return {
+      id: createId({ prefix: "job_" }),
+      name,
+      payload,
+      options: replayOptions,
+      scheduledAt,
+    };
+  });
+
+  await prisma.job.createMany({
+    data: jobs.map((job) => toJobCreateInput({ job })),
+  });
+
+  return jobs;
+}
+
+// Delete successfully republished rows; bump attempts on failures.
+export async function settlePublishResults({
+  results,
+  jobs,
+}: {
+  results: PublishResult[];
+  jobs: Pick<Job, "id" | "name" | "attempts">[];
+}) {
+  const publishedIds = results
+    .filter((result) => result.status === "published")
+    .map((result) => result.id);
+
+  const failedResults = results.filter((result) => result.status === "failed");
+
+  if (publishedIds.length > 0) {
+    await prisma.job.deleteMany({
+      where: {
+        id: {
+          in: publishedIds,
+        },
+      },
+    });
+  }
+
+  if (failedResults.length === 0) {
+    return {
+      published: publishedIds.length,
+      failed: 0,
+    };
+  }
+
+  const byError = new Map<string, string[]>();
+
+  for (const result of failedResults) {
+    const key = result.lastError ?? "";
+    const ids = byError.get(key) ?? [];
+    ids.push(result.id);
+    byError.set(key, ids);
+  }
+
+  await Promise.all(
+    Array.from(byError.entries()).map(([lastError, ids]) =>
+      prisma.job.updateMany({
+        where: {
+          id: {
+            in: ids,
+          },
+        },
+        data: {
+          lastError,
+          attempts: {
+            increment: 1,
+          },
+        },
+      }),
+    ),
+  );
+
+  const failedIds = new Set(failedResults.map((result) => result.id));
+
+  const exhaustedJobs = jobs.filter(
+    (job) => failedIds.has(job.id) && job.attempts + 1 >= MAX_JOB_ATTEMPTS,
+  );
+
+  if (exhaustedJobs.length > 0) {
+    logger.error("jobs.retry_exhausted", {
+      jobs: exhaustedJobs.map(({ id, name }) => ({ id, name })),
+    });
+    await logger.flush();
+  }
+
+  return {
+    published: publishedIds.length,
+    failed: failedResults.length,
+  };
+}
+
+// Select due rows once (indexed), send via matching transport, then settle.
+export async function publishPendingJobs(): Promise<{
+  attempted: number;
+  published: number;
+  failed: number;
+}> {
+  const jobs = await prisma.job.findMany({
+    where: {
+      scheduledAt: {
+        lte: new Date(),
+      },
+      attempts: {
+        lt: MAX_JOB_ATTEMPTS,
+      },
+    },
+    orderBy: {
+      createdAt: "asc",
+    },
+    take: MAX_JOBS_PER_BATCH,
+  });
+
+  if (jobs.length === 0) {
+    return {
+      attempted: 0,
+      published: 0,
+      failed: 0,
+    };
+  }
+
+  const matched = new Set<string>();
+  const pending: Promise<PublishResult[]>[] = [];
+
+  for (const transport of transports) {
+    const batch = jobs.filter((job) => transport.matches(job.name));
+
+    for (const job of batch) {
+      matched.add(job.id);
+    }
+
+    pending.push(transport.send(batch));
+  }
+
+  const results = (await Promise.all(pending)).flat();
+
+  for (const job of jobs) {
+    if (matched.has(job.id)) {
+      continue;
+    }
+
+    logger.error("jobs.unknown_kind", { id: job.id, name: job.name });
+    results.push({
+      id: job.id,
+      status: "failed",
+      lastError: `Unknown job kind: ${job.name}`,
+    });
+  }
+
+  if (matched.size < jobs.length) {
+    await logger.flush();
+  }
+
+  const settled = await settlePublishResults({ results, jobs });
+
+  return {
+    attempted: jobs.length,
+    published: settled.published,
+    failed: settled.failed,
+  };
+}
diff --git a/apps/web/lib/jobs/publish-workflows.ts b/apps/web/lib/jobs/publish-workflows.ts
new file mode 100644
index 00000000000..d1997a5c578
--- /dev/null
+++ b/apps/web/lib/jobs/publish-workflows.ts
@@ -0,0 +1,65 @@
+import { createId } from "@/lib/api/create-id";
+import { persistFailedJobs } from "./outbox";
+import {
+  triggerWorkflows,
+  type WorkflowName,
+  type WorkflowOptions,
+} from "./send-workflows";
+import type { PersistableJob } from "./types";
+
+type DispatchWorkflowInput = {
+  name: WorkflowName;
+  payload: unknown;
+  options?: WorkflowOptions;
+};
+
+type DispatchWorkflowsResult = {
+  published: number;
+  failed: number;
+  results: Awaited<ReturnType<typeof triggerWorkflows>>;
+};
+
+export async function dispatchWorkflows(
+  input: DispatchWorkflowInput | DispatchWorkflowInput[],
+): Promise<DispatchWorkflowsResult> {
+  const inputs = Array.isArray(input) ? input : [input];
+
+  if (inputs.length === 0) {
+    return {
+      published: 0,
+      failed: 0,
+      results: [],
+    };
+  }
+
+  const jobs: PersistableJob[] = inputs.map((job) => {
+    const id = createId({ prefix: "job_" });
+
+    return {
+      id,
+      name: job.name,
+      payload: job.payload,
+      options: job.options,
+    };
+  });
+
+  const results = await triggerWorkflows(jobs);
+
+  const publishedResults = results.filter(
+    (result) => result.status === "published",
+  );
+
+  const failedResults = results.filter((result) => result.status === "failed");
+
+  await persistFailedJobs({
+    jobs,
+    failedResults,
+    logEvent: "workflows.dispatch_lost",
+  });
+
+  return {
+    published: publishedResults.length,
+    failed: failedResults.length,
+    results,
+  };
+}
diff --git a/apps/web/lib/jobs/registry.ts b/apps/web/lib/jobs/registry.ts
index a93e0a52d1d..adc4d255b0f 100644
--- a/apps/web/lib/jobs/registry.ts
+++ b/apps/web/lib/jobs/registry.ts
@@ -29,6 +29,83 @@ const jobLoaders = {
     import("./handlers/create-tremendous-campaign-job").then(
       (m) => m.createTremendousCampaignJob,
     ),
+
+  "sync-group-utm-job": () =>
+    import("./handlers/sync-group-utm-job").then((m) => m.syncGroupUtmJob),
+
+  "partner-search-sync-job": () =>
+    import("./handlers/partner-search-sync-job").then(
+      (m) => m.partnerSearchSyncJob,
+    ),
+
+  "process-shopify-order-job": () =>
+    import("./handlers/process-shopify-order-job").then(
+      (m) => m.processShopifyOrderJob,
+    ),
+
+  "welcome-user-job": () =>
+    import("./handlers/welcome-user-job").then((m) => m.welcomeUserJob),
+
+  "auto-approve-partner-job": () =>
+    import("./handlers/auto-approve-partner-job").then(
+      (m) => m.autoApprovePartnerJob,
+    ),
+
+  "auto-reject-partner-job": () =>
+    import("./handlers/auto-reject-partner-job").then(
+      (m) => m.autoRejectPartnerJob,
+    ),
+
+  "queue-partner-program-summary-job": () =>
+    import("./handlers/queue-partner-program-summary-job").then(
+      (m) => m.queuePartnerProgramSummaryJob,
+    ),
+
+  "send-partner-program-summary-job": () =>
+    import("./handlers/send-partner-program-summary-job").then(
+      (m) => m.sendPartnerProgramSummaryJob,
+    ),
+
+  "send-connect-payout-reminders-job": () =>
+    import("./handlers/send-connect-payout-reminders-job").then(
+      (m) => m.sendConnectPayoutRemindersJob,
+    ),
+
+  "create-custom-commission-job": () =>
+    import("./handlers/create-custom-commission-job").then(
+      (m) => m.createCustomCommissionJob,
+    ),
+
+  "invalidate-links-for-discounts-job": () =>
+    import("./handlers/invalidate-links-for-discounts-job").then(
+      (m) => m.invalidateLinksForDiscountsJob,
+    ),
+
+  "remap-discount-code-job": () =>
+    import("./handlers/remap-discount-code-job").then(
+      (m) => m.remapDiscountCodeJob,
+    ),
+
+  "attach-discount-job": () =>
+    import("./handlers/attach-discount-job").then((m) => m.attachDiscountJob),
+
+  "create-discount-code-for-link-job": () =>
+    import("./handlers/create-discount-code-for-link-job").then(
+      (m) => m.createDiscountCodeForLinkJob,
+    ),
+
+  "publish-discount-codes-creation-job": () =>
+    import("./handlers/publish-discount-codes-creation-job").then(
+      (m) => m.publishDiscountCodesCreationJob,
+    ),
+
+  "aggregate-clicks-job": () =>
+    import("./handlers/aggregate-clicks-job").then((m) => m.aggregateClicksJob),
+
+  "process-partner-group-change-job": () =>
+    import("./handlers/process-partner-group-change-job").then(
+      (m) => m.processPartnerGroupChangeJob,
+    ),
 } as const satisfies Record<string, () => Promise<JobDefinition>>;
 
 const jobCache = new Map<string, JobDefinition>();
diff --git a/apps/web/lib/jobs/send-jobs.ts b/apps/web/lib/jobs/send-jobs.ts
new file mode 100644
index 00000000000..318e5d44781
--- /dev/null
+++ b/apps/web/lib/jobs/send-jobs.ts
@@ -0,0 +1,201 @@
+import { logger, toErrorFields } from "@/lib/axiom/server";
+import { qstash } from "@/lib/cron";
+import { APP_DOMAIN_WITH_NGROK, chunk, serializeError } from "@dub/utils";
+import { Job, Prisma } from "@prisma/client";
+import { PublishRequest } from "@upstash/qstash";
+import * as z from "zod/v4";
+import { LAST_ERROR_MAX_LENGTH, QSTASH_BATCH_CHUNK_SIZE } from "./constants";
+import type { PublishResult } from "./types";
+
+export type JobDispatchOptions = Pick<
+  PublishRequest,
+  | "delay"
+  | "notBefore"
+  | "deduplicationId"
+  | "retries"
+  | "flowControl"
+  | "label"
+> & {
+  queue?: string;
+};
+
+type JobReplayOptions = Pick<
+  JobDispatchOptions,
+  "deduplicationId" | "retries" | "queue" | "flowControl" | "label"
+>;
+
+export type DispatchJobInput = {
+  name: string;
+  payload: unknown;
+  options?: JobDispatchOptions;
+};
+
+const JOBS_ENDPOINT_URL = `${APP_DOMAIN_WITH_NGROK}/api/jobs/process`;
+
+export const jobNameSchema = z
+  .string()
+  .regex(
+    /^[a-z][a-z0-9]*(-[a-z0-9]+)*-job$/,
+    'Job name must be kebab-case ending in "-job"',
+  );
+
+export const jobEnvelopeSchema = z.object({
+  name: jobNameSchema,
+  dispatchedAt: z.string(),
+  payload: z.unknown(),
+});
+
+type JobEnvelope = z.infer<typeof jobEnvelopeSchema>;
+
+export function isDefineJobName(name: string) {
+  return jobNameSchema.safeParse(name).success;
+}
+
+function getJobsEndpointUrl(name: string) {
+  return `${JOBS_ENDPOINT_URL}/${name}`;
+}
+
+export function buildJobLabel(name: string, label?: string) {
+  return label ? `${label},${name}` : name;
+}
+
+function buildJobDeduplicationId(name: string, deduplicationId?: string) {
+  if (!deduplicationId) {
+    return undefined;
+  }
+
+  return `${deduplicationId},${name}`;
+}
+
+export function buildQStashJobRequest(
+  { name, payload, options }: DispatchJobInput,
+  opts?: {
+    dispatchedAt?: string;
+    batch?: boolean;
+    notBefore?: number;
+  },
+) {
+  const envelope: JobEnvelope = {
+    name,
+    payload,
+    dispatchedAt: opts?.dispatchedAt ?? new Date().toISOString(),
+  };
+
+  const notBefore = opts?.notBefore ?? options?.notBefore;
+  const deduplicationId = buildJobDeduplicationId(
+    name,
+    options?.deduplicationId,
+  );
+
+  return {
+    url: getJobsEndpointUrl(name),
+    body: envelope,
+    label: buildJobLabel(name, options?.label),
+    ...(options?.delay &&
+      opts?.notBefore === undefined && {
+        delay: options.delay,
+      }),
+    ...(notBefore && { notBefore }),
+    ...(deduplicationId && { deduplicationId }),
+    ...(options?.retries !== undefined && { retries: options.retries }),
+    ...(options?.flowControl && { flowControl: options.flowControl }),
+    ...(opts?.batch && options?.queue && { queueName: options.queue }),
+  };
+}
+
+function buildReplayRequest(
+  job: {
+    name: string;
+    payload: Prisma.JsonValue;
+    options: Prisma.JsonValue | null;
+    createdAt: Date;
+    scheduledAt: Date;
+  },
+  now: Date = new Date(),
+) {
+  const options = (job.options ?? {}) as JobReplayOptions;
+
+  const notBefore =
+    job.scheduledAt && job.scheduledAt > now
+      ? Math.floor(job.scheduledAt.getTime() / 1000)
+      : undefined;
+
+  return buildQStashJobRequest(
+    {
+      name: job.name,
+      payload: job.payload,
+      options,
+    },
+    {
+      dispatchedAt: job.createdAt.toISOString(),
+      batch: true,
+      notBefore,
+    },
+  );
+}
+
+export function isPublishSuccess(
+  response: unknown,
+): response is { messageId: string } {
+  return (
+    typeof response === "object" &&
+    response !== null &&
+    "messageId" in response &&
+    typeof response.messageId === "string"
+  );
+}
+
+export async function sendJobs(jobs: Job[]): Promise<PublishResult[]> {
+  if (jobs.length === 0) {
+    return [];
+  }
+
+  const results: PublishResult[] = [];
+  const now = new Date();
+
+  for (const jobChunk of chunk(jobs, QSTASH_BATCH_CHUNK_SIZE)) {
+    try {
+      const responses = await qstash.batchJSON(
+        jobChunk.map((job) => buildReplayRequest(job, now)),
+      );
+
+      jobChunk.forEach((job, index) => {
+        const response = responses[index];
+
+        if (isPublishSuccess(response)) {
+          results.push({
+            id: job.id,
+            status: "published",
+            lastError: null,
+            messageId: response.messageId,
+          });
+        } else {
+          results.push({
+            id: job.id,
+            status: "failed",
+            lastError: "QStash batch publish did not return a messageId",
+          });
+        }
+      });
+    } catch (error) {
+      const lastError = serializeError(error).slice(0, LAST_ERROR_MAX_LENGTH);
+
+      logger.error("jobs.publish_failed", {
+        jobCount: jobChunk.length,
+        error: toErrorFields(error),
+      });
+
+      for (const job of jobChunk) {
+        results.push({
+          id: job.id,
+          status: "failed",
+          lastError,
+        });
+      }
+    }
+  }
+
+  await logger.flush();
+
+  return results;
+}
diff --git a/apps/web/lib/jobs/send-workflows.ts b/apps/web/lib/jobs/send-workflows.ts
new file mode 100644
index 00000000000..dc61078ca92
--- /dev/null
+++ b/apps/web/lib/jobs/send-workflows.ts
@@ -0,0 +1,136 @@
+import { logger, toErrorFields } from "@/lib/axiom/server";
+import { APP_DOMAIN_WITH_NGROK, chunk, serializeError } from "@dub/utils";
+import { PublishRequest } from "@upstash/qstash";
+import { Client, TriggerOptions } from "@upstash/workflow";
+import * as z from "zod/v4";
+import { LAST_ERROR_MAX_LENGTH, QSTASH_BATCH_CHUNK_SIZE } from "./constants";
+import type { PersistableJob, PublishResult } from "./types";
+
+const workflowClient = new Client({
+  baseUrl: process.env.QSTASH_URL || "https://qstash-us-east-1.upstash.io",
+  token: process.env.QSTASH_TOKEN || "",
+  ...(process.env.VERCEL_ENV === "preview" && {
+    headers: {
+      "x-vercel-protection-bypass":
+        process.env.VERCEL_AUTOMATION_BYPASS_SECRET || "",
+    },
+  }),
+});
+
+export const workflowNameSchema = z
+  .string()
+  .regex(
+    /^[a-z][a-z0-9]*(-[a-z0-9]+)*-workflow$/,
+    'Workflow name must be kebab-case ending in "-workflow"',
+  );
+
+const workflowPathMap = {
+  "partner-approved-workflow": "/api/workflows/partner-approved",
+  "merge-partner-accounts-workflow": "/api/workflows/merge-partner-accounts",
+  "create-partner-commission-workflow":
+    "/api/workflows/create-partner-commission",
+  "reattribute-customer-workflow": "/api/workflows/reattribute-customer",
+  "detach-discount-workflow": "/api/workflows/detach-discount",
+} as const;
+
+for (const name of Object.keys(workflowPathMap)) {
+  workflowNameSchema.parse(name);
+}
+
+export type WorkflowName = keyof typeof workflowPathMap;
+
+export type WorkflowOptions = Pick<
+  PublishRequest,
+  "label" | "deduplicationId" | "retries" | "flowControl"
+>;
+
+export function isWorkflowName(name: string): name is WorkflowName {
+  return Object.prototype.hasOwnProperty.call(workflowPathMap, name);
+}
+
+function isTriggerSuccess(
+  response: unknown,
+): response is { workflowRunId: string } {
+  return (
+    typeof response === "object" &&
+    response !== null &&
+    "workflowRunId" in response &&
+    typeof response.workflowRunId === "string"
+  );
+}
+
+function buildTriggerRequest(job: PersistableJob): TriggerOptions {
+  const name = job.name as WorkflowName;
+  const options = (job.options ?? {}) as WorkflowOptions;
+  const workflowPath = workflowPathMap[name];
+  const workflowKey = workflowPath.split("/").pop()!;
+
+  return {
+    url: `${APP_DOMAIN_WITH_NGROK}${workflowPath}`,
+    body: job.payload,
+    workflowRunId: options.deduplicationId ?? job.id,
+    retries: options.retries ?? 5,
+    flowControl: options.flowControl ?? {
+      key: workflowKey,
+      parallelism: 15,
+    },
+    ...(options.label && { label: options.label }),
+  };
+}
+
+/** Publish workflows to QStash Workflows (no DB writes). */
+export async function triggerWorkflows(
+  jobs: PersistableJob[],
+): Promise<PublishResult[]> {
+  if (jobs.length === 0) {
+    return [];
+  }
+
+  const results: PublishResult[] = [];
+
+  for (const jobChunk of chunk(jobs, QSTASH_BATCH_CHUNK_SIZE)) {
+    try {
+      const responses = await workflowClient.trigger(
+        jobChunk.map((job) => buildTriggerRequest(job)),
+      );
+
+      jobChunk.forEach((job, index) => {
+        const response = responses[index];
+
+        if (isTriggerSuccess(response)) {
+          results.push({
+            id: job.id,
+            status: "published",
+            lastError: null,
+            workflowRunId: response.workflowRunId,
+          });
+        } else {
+          results.push({
+            id: job.id,
+            status: "failed",
+            lastError: "Workflow trigger did not return a workflowRunId",
+          });
+        }
+      });
+    } catch (error) {
+      const lastError = serializeError(error).slice(0, LAST_ERROR_MAX_LENGTH);
+
+      logger.error("workflows.publish_failed", {
+        jobCount: jobChunk.length,
+        error: toErrorFields(error),
+      });
+
+      for (const job of jobChunk) {
+        results.push({
+          id: job.id,
+          status: "failed",
+          lastError,
+        });
+      }
+    }
+  }
+
+  await logger.flush();
+
+  return results;
+}
diff --git a/apps/web/lib/jobs/types.ts b/apps/web/lib/jobs/types.ts
new file mode 100644
index 00000000000..769d18d8ff9
--- /dev/null
+++ b/apps/web/lib/jobs/types.ts
@@ -0,0 +1,15 @@
+export type PublishResult = {
+  id: string;
+  status: "published" | "failed";
+  lastError: string | null;
+  messageId?: string;
+  workflowRunId?: string;
+};
+
+export type PersistableJob = {
+  id: string;
+  name: string;
+  payload: unknown;
+  options?: unknown;
+  scheduledAt?: Date;
+};
diff --git a/apps/web/lib/lemonsqueezy/client.ts b/apps/web/lib/lemonsqueezy/client.ts
new file mode 100644
index 00000000000..b2b86075611
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/client.ts
@@ -0,0 +1,187 @@
+import { HttpBaseClient } from "@/lib/http/base-client";
+import * as z from "zod/v4";
+import {
+  lemonSqueezyAffiliateSchema,
+  lemonSqueezyCustomerSchema,
+  lemonSqueezyJsonApiListSchema,
+  lemonSqueezyListResourcesInputSchema,
+  lemonSqueezyOrderSchema,
+  lemonSqueezyStoreSchema,
+  lemonSqueezySubscriptionInvoiceSchema,
+} from "./schemas";
+import {
+  LemonSqueezyAffiliate,
+  LemonSqueezyCustomer,
+  LemonSqueezyJsonApiResource,
+  LemonSqueezyOrder,
+  LemonSqueezyStore,
+  LemonSqueezySubscriptionInvoice,
+} from "./types";
+
+const LEMONSQUEEZY_PAGE_SIZE = 100;
+
+function flattenResource<T extends z.ZodType>(
+  resource: LemonSqueezyJsonApiResource,
+  schema: T,
+  extra?: Record<string, unknown>,
+): z.infer<T> {
+  return schema.parse({
+    id: resource.id,
+    ...resource.attributes,
+    ...extra,
+  });
+}
+
+function getRelationshipIds(
+  resource: LemonSqueezyJsonApiResource,
+  relationshipName: string,
+): string[] {
+  const relationship = resource.relationships?.[relationshipName] as
+    | {
+        data?:
+          | { type: string; id: string }
+          | Array<{ type: string; id: string }>
+          | null;
+      }
+    | undefined;
+
+  if (!relationship?.data) {
+    return [];
+  }
+
+  if (Array.isArray(relationship.data)) {
+    return relationship.data.map((item) => item.id);
+  }
+
+  return [relationship.data.id];
+}
+
+export class LemonSqueezyClient extends HttpBaseClient {
+  protected readonly vendor = "Lemon Squeezy";
+  protected readonly baseUrl = "https://api.lemonsqueezy.com/v1";
+
+  private readonly apiKey: string;
+
+  constructor({ apiKey }: { apiKey: string }) {
+    super();
+    this.apiKey = apiKey;
+  }
+
+  protected buildAuthHeaders() {
+    return {
+      Accept: "application/vnd.api+json",
+      "Content-Type": "application/vnd.api+json",
+      Authorization: `Bearer ${this.apiKey}`,
+    };
+  }
+
+  private async listResources({
+    path,
+    storeId,
+    page = 1,
+    include,
+  }: {
+    path: string;
+    storeId?: string;
+    page?: number;
+    include?: string;
+  }) {
+    return await this.get(path, {
+      input: {
+        "page[number]": page,
+        "page[size]": LEMONSQUEEZY_PAGE_SIZE,
+        ...(storeId ? { "filter[store_id]": storeId } : {}),
+        ...(include ? { include } : {}),
+      },
+      inputSchema: lemonSqueezyListResourcesInputSchema,
+      outputSchema: lemonSqueezyJsonApiListSchema,
+    });
+  }
+
+  async listStores(): Promise<LemonSqueezyStore[]> {
+    const { data } = await this.listResources({ path: "/stores" });
+
+    return data.map((resource) =>
+      flattenResource(resource, lemonSqueezyStoreSchema),
+    );
+  }
+
+  async listAffiliates({
+    storeId,
+    page = 1,
+  }: {
+    storeId: string;
+    page?: number;
+  }): Promise<LemonSqueezyAffiliate[]> {
+    const { data } = await this.listResources({
+      path: "/affiliates",
+      storeId,
+      page,
+    });
+
+    return data.map((resource) =>
+      flattenResource(resource, lemonSqueezyAffiliateSchema),
+    );
+  }
+
+  async listCustomers({
+    storeId,
+    page = 1,
+    include,
+  }: {
+    storeId: string;
+    page?: number;
+    include?: string;
+  }): Promise<LemonSqueezyCustomer[]> {
+    const { data } = await this.listResources({
+      path: "/customers",
+      storeId,
+      page,
+      include,
+    });
+
+    return data.map((resource) =>
+      flattenResource(resource, lemonSqueezyCustomerSchema, {
+        // When `include=affiliates` (or relationship data is sideloaded),
+        // JSON:API puts affiliate refs on relationships.affiliates.data
+        affiliate_ids: getRelationshipIds(resource, "affiliates"),
+      }),
+    );
+  }
+
+  async listOrders({
+    storeId,
+    page = 1,
+  }: {
+    storeId: string;
+    page?: number;
+  }): Promise<LemonSqueezyOrder[]> {
+    const { data } = await this.listResources({
+      path: "/orders",
+      storeId,
+      page,
+    });
+
+    return data.map((resource) =>
+      flattenResource(resource, lemonSqueezyOrderSchema),
+    );
+  }
+
+  async listSubscriptionInvoices({
+    storeId,
+    page = 1,
+  }: {
+    storeId: string;
+    page?: number;
+  }): Promise<LemonSqueezySubscriptionInvoice[]> {
+    const { data } = await this.listResources({
+      path: "/subscription-invoices",
+      storeId,
+      page,
+    });
+
+    return data.map((resource) =>
+      flattenResource(resource, lemonSqueezySubscriptionInvoiceSchema),
+    );
+  }
+}
diff --git a/apps/web/lib/lemonsqueezy/import-commissions.ts b/apps/web/lib/lemonsqueezy/import-commissions.ts
new file mode 100644
index 00000000000..b8817f43316
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/import-commissions.ts
@@ -0,0 +1,660 @@
+import { prisma } from "@/lib/prisma";
+import { sendEmail } from "@dub/email";
+import ProgramImported from "@dub/email/templates/program-imported";
+import { chunk, nanoid } from "@dub/utils";
+import {
+  CommissionSource,
+  CommissionStatus,
+  Customer,
+  Link,
+  Program,
+} from "@prisma/client";
+import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
+import { isFirstConversion } from "../analytics/is-first-conversion";
+import { createId } from "../api/create-id";
+import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
+import { syncPartnerLinksStats } from "../api/partners/sync-partner-links-stats";
+import { syncTotalCommissions } from "../api/partners/sync-total-commissions";
+import { getLeadEvents } from "../tinybird/get-lead-events";
+import { logImportError } from "../tinybird/log-import-error";
+import { recordSaleWithTimestamp } from "../tinybird/record-sale";
+import { LeadEventTB } from "../types";
+import { redis } from "../upstash";
+import { clickEventSchemaTB } from "../zod/schemas/clicks";
+import { LemonSqueezyClient } from "./client";
+import { LEMONSQUEEZY_MAX_BATCHES, lemonSqueezyImporter } from "./importer";
+import {
+  LemonSqueezyImportPayload,
+  LemonSqueezyOrder,
+  LemonSqueezySubscriptionInvoice,
+} from "./types";
+
+type SaleEvent = {
+  invoiceId: string;
+  affiliateId: string;
+  customerExternalId: string;
+  amount: number;
+  currency: string;
+  amountUsd: number | null | undefined;
+  firstOrderItemPrice?: number | null;
+  referralAmount: number | null | undefined;
+  status: string;
+  createdAt: string;
+  metadata: Record<string, unknown>;
+};
+
+// Initial referral is on the Order; renewals/updates are on Invoices.
+// Skip billing_reason: initial (no referral) and missing/unknown reasons.
+const IMPORTABLE_INVOICE_REASONS = new Set(["renewal", "updated"]);
+
+export async function importCommissions(payload: LemonSqueezyImportPayload) {
+  const {
+    importId,
+    programId,
+    storeId,
+    userId,
+    page = 1,
+    resource = "orders",
+  } = payload;
+
+  const program = await prisma.program.findUnique({
+    where: {
+      id: programId,
+    },
+    select: {
+      id: true,
+      name: true,
+      workspaceId: true,
+      domain: true,
+    },
+  });
+
+  if (!program) {
+    console.error(`Program ${programId} not found.`);
+    return;
+  }
+
+  if (!program.domain) {
+    console.error("Program domain not found", program.id);
+    return;
+  }
+
+  const { apiKey } = await lemonSqueezyImporter.getCredentials(
+    program.workspaceId,
+  );
+  const lemonSqueezyApi = new LemonSqueezyClient({ apiKey });
+
+  const fxRates = await redis.hgetall<Record<string, string>>("fxRates:usd");
+
+  let currentPage = page;
+  let hasMore = true;
+  let processedBatches = 0;
+
+  while (hasMore && processedBatches < LEMONSQUEEZY_MAX_BATCHES) {
+    const { saleEvents, pageEmpty } =
+      resource === "orders"
+        ? await listOrderSaleEvents({
+            lemonSqueezyApi,
+            storeId,
+            page: currentPage,
+          })
+        : await listInvoiceSaleEvents({
+            lemonSqueezyApi,
+            storeId,
+            page: currentPage,
+          });
+
+    if (pageEmpty) {
+      hasMore = false;
+      break;
+    }
+
+    if (saleEvents.length > 0) {
+      await processSaleEvents({
+        program,
+        domain: program.domain,
+        saleEvents,
+        fxRates,
+        importId,
+      });
+    }
+
+    currentPage++;
+    processedBatches++;
+  }
+
+  if (hasMore) {
+    await lemonSqueezyImporter.queue({
+      ...payload,
+      action: "import-commissions",
+      resource,
+      page: currentPage,
+    });
+    return;
+  }
+
+  // Finished orders (month-1 + one-time) → renewals/updates via subscription invoices
+  if (resource === "orders") {
+    await lemonSqueezyImporter.queue({
+      ...payload,
+      action: "import-commissions",
+      resource: "subscription-invoices",
+      page: 1,
+    });
+    return;
+  }
+
+  const workspaceUser = await prisma.projectUsers.findUnique({
+    where: {
+      userId_projectId: {
+        userId,
+        projectId: program.workspaceId,
+      },
+    },
+    include: {
+      project: true,
+      user: true,
+    },
+  });
+
+  if (workspaceUser?.user.email) {
+    await sendEmail({
+      to: workspaceUser.user.email,
+      subject: "Lemon Squeezy program imported",
+      react: ProgramImported({
+        email: workspaceUser.user.email,
+        workspace: workspaceUser.project,
+        program,
+        provider: "Lemon Squeezy",
+        importId,
+      }),
+    });
+  }
+
+  await lemonSqueezyImporter.deleteCredentials(program.workspaceId);
+}
+
+async function listOrderSaleEvents({
+  lemonSqueezyApi,
+  storeId,
+  page,
+}: {
+  lemonSqueezyApi: LemonSqueezyClient;
+  storeId: string;
+  page: number;
+}): Promise<{ saleEvents: SaleEvent[]; pageEmpty: boolean }> {
+  const orders = await lemonSqueezyApi.listOrders({
+    storeId,
+    page,
+  });
+
+  if (orders.length === 0) {
+    return {
+      saleEvents: [],
+      pageEmpty: true,
+    };
+  }
+
+  // All attributed Orders: subscription first period + one-time (LS payouts use Order)
+  const saleEvents = orders
+    .filter(
+      (
+        order,
+      ): order is LemonSqueezyOrder & {
+        affiliate_id: number;
+        customer_id: number;
+      } => Boolean(order.affiliate_id) && order.customer_id != null,
+    )
+    .map((order) => ({
+      invoiceId: `ls_order_${order.id}`,
+      affiliateId: String(order.affiliate_id),
+      customerExternalId: String(order.customer_id),
+      amount: order.subtotal,
+      currency: order.currency,
+      amountUsd: order.subtotal_usd,
+      firstOrderItemPrice: order.first_order_item?.price,
+      referralAmount: order.referral_amount,
+      status: order.status,
+      createdAt: order.created_at || new Date().toISOString(),
+      metadata: order as unknown as Record<string, unknown>,
+    }));
+
+  return {
+    saleEvents,
+    pageEmpty: false,
+  };
+}
+
+async function listInvoiceSaleEvents({
+  lemonSqueezyApi,
+  storeId,
+  page,
+}: {
+  lemonSqueezyApi: LemonSqueezyClient;
+  storeId: string;
+  page: number;
+}): Promise<{ saleEvents: SaleEvent[]; pageEmpty: boolean }> {
+  const invoices = await lemonSqueezyApi.listSubscriptionInvoices({
+    storeId,
+    page,
+  });
+
+  if (invoices.length === 0) {
+    return {
+      saleEvents: [],
+      pageEmpty: true,
+    };
+  }
+
+  const saleEvents = invoices
+    .filter(
+      (
+        invoice,
+      ): invoice is LemonSqueezySubscriptionInvoice & {
+        affiliate_id: number;
+        customer_id: number;
+      } =>
+        Boolean(invoice.affiliate_id) &&
+        invoice.customer_id != null &&
+        Boolean(
+          invoice.billing_reason &&
+            IMPORTABLE_INVOICE_REASONS.has(invoice.billing_reason),
+        ),
+    )
+    .map((invoice) => ({
+      invoiceId: `ls_invoice_${invoice.id}`,
+      affiliateId: String(invoice.affiliate_id),
+      customerExternalId: String(invoice.customer_id),
+      amount: invoice.subtotal,
+      currency: invoice.currency,
+      amountUsd: invoice.subtotal_usd,
+      referralAmount: invoice.referral_amount,
+      status: invoice.status,
+      createdAt: invoice.created_at || new Date().toISOString(),
+      metadata: invoice as unknown as Record<string, unknown>,
+    }));
+
+  return {
+    saleEvents,
+    pageEmpty: false,
+  };
+}
+
+async function processSaleEvents({
+  program,
+  domain,
+  saleEvents,
+  fxRates,
+  importId,
+}: {
+  program: Pick<Program, "id" | "workspaceId">;
+  domain: string;
+  saleEvents: SaleEvent[];
+  fxRates: Record<string, string> | null;
+  importId: string;
+}) {
+  const affiliateIds = [
+    ...new Set(saleEvents.map((event) => event.affiliateId)),
+  ];
+  const customerExternalIds = [
+    ...new Set(saleEvents.map((event) => event.customerExternalId)),
+  ];
+
+  const [links, customersData] = await Promise.all([
+    prisma.link.findMany({
+      where: {
+        domain,
+        programId: program.id,
+        key: {
+          in: affiliateIds,
+        },
+      },
+    }),
+
+    prisma.customer.findMany({
+      where: {
+        projectId: program.workspaceId,
+        externalId: {
+          in: customerExternalIds,
+        },
+      },
+      include: {
+        link: true,
+      },
+      orderBy: {
+        createdAt: "asc",
+      },
+    }),
+  ]);
+
+  const affiliateIdToLink = new Map(links.map((link) => [link.key, link]));
+
+  const customerLeadEvents = await getLeadEvents({
+    customerIds: customersData.map((customer) => customer.id),
+  }).then((res) => res.data);
+
+  const saleChunks = chunk(saleEvents, 10);
+
+  for (const saleChunk of saleChunks) {
+    const results = await Promise.allSettled(
+      saleChunk.map((saleEvent) =>
+        createCommission({
+          program,
+          saleEvent,
+          partnerLink: affiliateIdToLink.get(saleEvent.affiliateId),
+          fxRates,
+          importId,
+          customersData,
+          customerLeadEvents,
+        }),
+      ),
+    );
+
+    const failures = results.flatMap((result, index) =>
+      result.status === "rejected"
+        ? [{ saleEvent: saleChunk[index], reason: result.reason }]
+        : [],
+    );
+
+    if (failures.length > 0) {
+      await logImportError(
+        failures.map(({ saleEvent, reason }) => ({
+          workspace_id: program.workspaceId,
+          import_id: importId,
+          source: "lemonsqueezy" as const,
+          entity: "commission" as const,
+          entity_id: saleEvent.invoiceId,
+          code: "TRANSACTION_NOT_FOUND" as const,
+          message: `Failed to import commission ${saleEvent.invoiceId}: ${
+            reason instanceof Error ? reason.message : String(reason)
+          }`,
+        })),
+      );
+    }
+  }
+}
+
+async function createCommission({
+  program,
+  saleEvent,
+  partnerLink,
+  fxRates,
+  importId,
+  customersData,
+  customerLeadEvents,
+}: {
+  program: Pick<Program, "id" | "workspaceId">;
+  saleEvent: SaleEvent;
+  partnerLink?: Link;
+  fxRates: Record<string, string> | null;
+  importId: string;
+  customersData: (Customer & { link: Link | null })[];
+  customerLeadEvents: LeadEventTB[];
+}) {
+  const commonImportLogInputs = {
+    workspace_id: program.workspaceId,
+    import_id: importId,
+    source: "lemonsqueezy" as const,
+    entity: "commission" as const,
+    entity_id: saleEvent.invoiceId,
+  };
+
+  const status = toDubStatus(saleEvent.status);
+
+  const existingCommission = await prisma.commission.findUnique({
+    where: {
+      invoiceId_programId: {
+        invoiceId: saleEvent.invoiceId,
+        programId: program.id,
+      },
+    },
+    select: {
+      id: true,
+    },
+  });
+
+  if (existingCommission) {
+    console.log(
+      `Commission ${saleEvent.invoiceId} already exists, skipping...`,
+    );
+    return;
+  }
+
+  if (!partnerLink?.partnerId) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "PARTNER_NOT_FOUND",
+      message: `No imported partner found for affiliate ${saleEvent.affiliateId} (commission ${saleEvent.invoiceId}).`,
+    });
+    return;
+  }
+
+  const existingCustomer = customersData.find(
+    ({ externalId }) => externalId === saleEvent.customerExternalId,
+  );
+
+  if (!existingCustomer) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "CUSTOMER_NOT_FOUND",
+      message: `No customer ${saleEvent.customerExternalId} found for commission ${saleEvent.invoiceId}.`,
+    });
+    return;
+  }
+
+  if (!existingCustomer.clickId) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "CLICK_NOT_FOUND",
+      message: `No click found for customer ${existingCustomer.id}.`,
+    });
+    return;
+  }
+
+  const leadEvent = customerLeadEvents.find(
+    (event) => event.customer_id === existingCustomer.id,
+  );
+
+  if (!leadEvent) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "LEAD_NOT_FOUND",
+      message: `No lead event found for customer ${existingCustomer.id}.`,
+    });
+    return;
+  }
+
+  // Prefer LS-provided USD amounts; otherwise convert. For subscription first
+  // charges, order subtotal is often 0 while first_order_item.price has the amount.
+  let saleAmount = resolveAmountUsd({
+    amount: saleEvent.amount,
+    amountUsd: saleEvent.amountUsd,
+    currency: saleEvent.currency,
+    fxRates,
+  });
+
+  if (
+    (saleAmount == null || saleAmount === 0) &&
+    saleEvent.firstOrderItemPrice != null &&
+    saleEvent.firstOrderItemPrice > 0
+  ) {
+    saleAmount = resolveAmountUsd({
+      amount: saleEvent.firstOrderItemPrice,
+      amountUsd: null,
+      currency: saleEvent.currency,
+      fxRates,
+    });
+  }
+
+  if (saleAmount == null) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "NOT_SUPPORTED_UNIT",
+      message: `Commission ${saleEvent.invoiceId} skipped: no USD amount and FX rate unavailable for currency ${saleEvent.currency}.`,
+    });
+    return;
+  }
+
+  const createdAt = new Date(saleEvent.createdAt);
+
+  const earnings =
+    saleEvent.referralAmount == null
+      ? 0
+      : resolveAmountUsd({
+          amount: saleEvent.referralAmount,
+          amountUsd: null,
+          currency: saleEvent.currency,
+          fxRates,
+        }) ?? 0;
+
+  const clickData = clickEventSchemaTB
+    .omit({ timestamp: true })
+    .parse(leadEvent);
+
+  const eventId = nanoid(16);
+
+  await Promise.all([
+    prisma.commission.create({
+      data: {
+        id: createId({ prefix: "cm_" }),
+        eventId,
+        type: "sale",
+        programId: program.id,
+        partnerId: partnerLink.partnerId,
+        linkId: partnerLink.id,
+        customerId: existingCustomer.id,
+        amount: saleAmount,
+        earnings,
+        currency: "usd",
+        quantity: 1,
+        status,
+        invoiceId: saleEvent.invoiceId,
+        createdAt,
+        source: CommissionSource.lemonsqueezy,
+      },
+    }),
+
+    saleAmount > 0 &&
+      recordSaleWithTimestamp({
+        ...clickData,
+        link_id: partnerLink.id,
+        domain: partnerLink.domain,
+        key: partnerLink.key,
+        url: partnerLink.url,
+        event_id: eventId,
+        event_name: "Invoice paid",
+        amount: saleAmount,
+        customer_id: existingCustomer.id,
+        payment_processor: "lemonsqueezy",
+        currency: "usd",
+        metadata: JSON.stringify(saleEvent.metadata),
+        timestamp: createdAt.toISOString(),
+      }),
+
+    prisma.link.update({
+      where: {
+        id: partnerLink.id,
+      },
+      data: {
+        ...(isFirstConversion({
+          customer: existingCustomer,
+          linkId: partnerLink.id,
+        }) && {
+          conversions: {
+            increment: 1,
+          },
+          lastConversionAt: updateLinkStatsForImporter({
+            currentTimestamp: partnerLink.lastConversionAt,
+            newTimestamp: createdAt,
+          }),
+        }),
+        ...(saleAmount > 0 && {
+          sales: {
+            increment: 1,
+          },
+          saleAmount: {
+            increment: saleAmount,
+          },
+        }),
+      },
+    }),
+
+    syncPartnerLinksStats({
+      partnerId: partnerLink.partnerId,
+      programId: program.id,
+      eventType: "sale",
+    }),
+
+    saleAmount > 0 &&
+      prisma.customer.update({
+        where: {
+          id: existingCustomer.id,
+        },
+        data: {
+          sales: {
+            increment: 1,
+          },
+          saleAmount: {
+            increment: saleAmount,
+          },
+          firstSaleAt: existingCustomer.firstSaleAt ? undefined : createdAt,
+        },
+      }),
+  ]);
+
+  await syncTotalCommissions({
+    partnerId: partnerLink.partnerId,
+    programId: program.id,
+  });
+}
+
+function resolveAmountUsd({
+  amount,
+  amountUsd,
+  currency,
+  fxRates,
+}: {
+  amount: number;
+  amountUsd: number | null | undefined;
+  currency: string;
+  fxRates: Record<string, string> | null;
+}): number | null {
+  if (amountUsd != null) {
+    return amountUsd;
+  }
+
+  if (currency.toUpperCase() === "USD") {
+    return amount;
+  }
+
+  if (!fxRates) {
+    return null;
+  }
+
+  const converted = convertCurrencyWithFxRates({
+    currency,
+    amount,
+    fxRates,
+  });
+
+  return converted.currency.toUpperCase() === "USD" ? converted.amount : null;
+}
+
+function toDubStatus(status: string): CommissionStatus {
+  switch (status) {
+    case "paid":
+      return CommissionStatus.paid;
+    case "pending":
+      return CommissionStatus.pending;
+    case "refunded":
+    case "partial_refund":
+      return CommissionStatus.refunded;
+    case "fraudulent":
+      return CommissionStatus.fraud;
+    case "void":
+    case "failed":
+      return CommissionStatus.canceled;
+    default:
+      return CommissionStatus.pending;
+  }
+}
diff --git a/apps/web/lib/lemonsqueezy/import-customers.ts b/apps/web/lib/lemonsqueezy/import-customers.ts
new file mode 100644
index 00000000000..25a6c6dbd03
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/import-customers.ts
@@ -0,0 +1,301 @@
+import { prisma } from "@/lib/prisma";
+import { chunk, nanoid } from "@dub/utils";
+import { Customer, Link, Project } from "@prisma/client";
+import { createId } from "../api/create-id";
+import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
+import { syncPartnerLinksStats } from "../api/partners/sync-partner-links-stats";
+import { recordLeadWithTimestamp } from "../tinybird";
+import { logImportError } from "../tinybird/log-import-error";
+import { recordFakeClick } from "../tinybird/record-fake-click";
+import { LemonSqueezyClient } from "./client";
+import { LEMONSQUEEZY_MAX_BATCHES, lemonSqueezyImporter } from "./importer";
+import { LemonSqueezyCustomer, LemonSqueezyImportPayload } from "./types";
+
+export async function importCustomers(payload: LemonSqueezyImportPayload) {
+  const { importId, programId, storeId, page = 1 } = payload;
+
+  const program = await prisma.program.findUnique({
+    where: {
+      id: programId,
+    },
+    select: {
+      id: true,
+      name: true,
+      domain: true,
+      url: true,
+      workspace: {
+        select: {
+          id: true,
+          plan: true,
+          stripeConnectId: true,
+        },
+      },
+    },
+  });
+
+  if (!program) {
+    console.error(`Program ${programId} not found.`);
+    return;
+  }
+
+  if (!program.domain || !program.url) {
+    console.error("Program domain or url not found", program.id);
+    return;
+  }
+
+  const { workspace } = program;
+  const { apiKey } = await lemonSqueezyImporter.getCredentials(workspace.id);
+  const lemonSqueezyApi = new LemonSqueezyClient({ apiKey });
+
+  let currentPage = page;
+  let hasMore = true;
+  let processedBatches = 0;
+
+  while (hasMore && processedBatches < LEMONSQUEEZY_MAX_BATCHES) {
+    const customers = await lemonSqueezyApi.listCustomers({
+      storeId,
+      page: currentPage,
+      include: "affiliates",
+    });
+
+    if (customers.length === 0) {
+      hasMore = false;
+      break;
+    }
+
+    // Gate: only import customers with a non-empty affiliates relationship
+    const referredCustomers = customers.filter(
+      (customer) => customer.affiliate_ids.length > 0,
+    );
+
+    if (referredCustomers.length > 0) {
+      const affiliateIds = [
+        ...new Set(
+          referredCustomers.flatMap((customer) => customer.affiliate_ids),
+        ),
+      ];
+
+      const links = await prisma.link.findMany({
+        where: {
+          domain: program.domain,
+          programId: program.id,
+          key: {
+            in: affiliateIds,
+          },
+        },
+        select: {
+          id: true,
+          key: true,
+          domain: true,
+          url: true,
+          projectId: true,
+          partnerId: true,
+          programId: true,
+          lastLeadAt: true,
+        },
+      });
+
+      const affiliateIdToLink = new Map(links.map((link) => [link.key, link]));
+
+      const customerExternalIds = referredCustomers.map(
+        (customer) => customer.id,
+      );
+
+      const existingCustomers = await prisma.customer.findMany({
+        where: {
+          projectId: workspace.id,
+          externalId: {
+            in: customerExternalIds,
+          },
+        },
+        select: {
+          id: true,
+          externalId: true,
+        },
+      });
+
+      const existingExternalIds = new Set(
+        existingCustomers.map((customer) => customer.externalId),
+      );
+
+      const newCustomers = referredCustomers.filter(
+        (customer) => !existingExternalIds.has(customer.id),
+      );
+
+      if (newCustomers.length > 0) {
+        const customerChunks = chunk(newCustomers, 10);
+
+        for (const customerChunk of customerChunks) {
+          await Promise.allSettled(
+            customerChunk.map((customer) => {
+              // Deterministic: first affiliate_id that has an imported partner link
+              const affiliateId = customer.affiliate_ids.find((id) =>
+                affiliateIdToLink.has(id),
+              );
+
+              return createCustomer({
+                workspace,
+                customer,
+                link: affiliateId
+                  ? affiliateIdToLink.get(affiliateId)
+                  : undefined,
+                importId,
+              });
+            }),
+          );
+        }
+      }
+    }
+
+    currentPage++;
+    processedBatches++;
+  }
+
+  await lemonSqueezyImporter.queue({
+    ...payload,
+    action: hasMore ? "import-customers" : "import-commissions",
+    page: hasMore ? currentPage : undefined,
+    resource: hasMore ? undefined : "orders",
+  });
+}
+
+async function createCustomer({
+  workspace,
+  customer,
+  link,
+  importId,
+}: {
+  workspace: Pick<Project, "id" | "stripeConnectId">;
+  customer: LemonSqueezyCustomer;
+  link?: Pick<
+    Link,
+    | "id"
+    | "key"
+    | "domain"
+    | "url"
+    | "projectId"
+    | "partnerId"
+    | "programId"
+    | "lastLeadAt"
+  >;
+  importId: string;
+}) {
+  const externalId = customer.id;
+
+  const commonImportLogInputs = {
+    workspace_id: workspace.id,
+    import_id: importId,
+    source: "lemonsqueezy" as const,
+    entity: "customer" as const,
+    entity_id: externalId,
+  };
+
+  if (!customer.email) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "CUSTOMER_EMAIL_NOT_FOUND",
+      message: `Customer ${externalId} not imported because it has no email.`,
+    });
+
+    return;
+  }
+
+  if (!link) {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "LINK_NOT_FOUND",
+      message: `No imported partner link found for customer ${externalId} (affiliates: ${customer.affiliate_ids.join(", ")}).`,
+    });
+
+    return;
+  }
+
+  const clickedAt = new Date(customer.created_at || Date.now());
+
+  let clickEvent: Awaited<ReturnType<typeof recordFakeClick>>;
+
+  try {
+    clickEvent = await recordFakeClick({
+      link,
+      customer: {
+        country: customer.country,
+      },
+      timestamp: clickedAt.toISOString(),
+    });
+  } catch {
+    await logImportError({
+      ...commonImportLogInputs,
+      code: "CLICK_NOT_FOUND",
+      message: `Failed to record click for customer ${externalId}.`,
+    });
+
+    return;
+  }
+
+  let createdCustomer: Customer | null = null;
+
+  try {
+    createdCustomer = await prisma.customer.create({
+      data: {
+        id: createId({ prefix: "cus_" }),
+        name: customer.name || customer.email,
+        email: customer.email,
+        externalId,
+        projectId: workspace.id,
+        projectConnectId: workspace.stripeConnectId,
+        clickId: clickEvent.click_id,
+        linkId: link.id,
+        programId: link.programId,
+        partnerId: link.partnerId,
+        country: customer.country || clickEvent.country,
+        clickedAt,
+        createdAt: clickedAt,
+      },
+    });
+  } catch (error) {
+    if (error.code === "P2002") {
+      console.warn(
+        `Customer with external ID ${externalId} already exists. Skipping...`,
+      );
+    } else {
+      console.error("Error creating customer", customer, error);
+    }
+
+    return;
+  }
+
+  await Promise.all([
+    recordLeadWithTimestamp({
+      ...clickEvent,
+      event_id: nanoid(16),
+      event_name: "Sign up",
+      customer_id: createdCustomer.id,
+      timestamp: clickedAt.toISOString(),
+    }),
+
+    prisma.link.update({
+      where: {
+        id: link.id,
+      },
+      data: {
+        leads: {
+          increment: 1,
+        },
+        lastLeadAt: updateLinkStatsForImporter({
+          currentTimestamp: link.lastLeadAt,
+          newTimestamp: clickedAt,
+        }),
+      },
+    }),
+
+    ...(link.partnerId && link.programId
+      ? [
+          syncPartnerLinksStats({
+            partnerId: link.partnerId,
+            programId: link.programId,
+            eventType: "lead",
+          }),
+        ]
+      : []),
+  ]);
+}
diff --git a/apps/web/lib/lemonsqueezy/import-partners.ts b/apps/web/lib/lemonsqueezy/import-partners.ts
new file mode 100644
index 00000000000..9c09242796c
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/import-partners.ts
@@ -0,0 +1,315 @@
+import { prisma } from "@/lib/prisma";
+import { PartnerGroup, Program } from "@prisma/client";
+import { createId } from "../api/create-id";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
+import { createLink } from "../api/links";
+import { generatePartnerLink } from "../api/partners/generate-partner-link";
+import { logImportError } from "../tinybird/log-import-error";
+import { WorkspaceProps } from "../types";
+import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
+import { LemonSqueezyClient } from "./client";
+import { LEMONSQUEEZY_MAX_BATCHES, lemonSqueezyImporter } from "./importer";
+import { LemonSqueezyAffiliate, LemonSqueezyImportPayload } from "./types";
+
+export async function importPartners(payload: LemonSqueezyImportPayload) {
+  const { importId, programId, storeId, userId, page = 1 } = payload;
+
+  const program = await prisma.program.findUnique({
+    where: {
+      id: programId,
+    },
+    select: {
+      id: true,
+      name: true,
+      domain: true,
+      url: true,
+      workspaceId: true,
+      defaultFolderId: true,
+      groups: {
+        select: {
+          id: true,
+          slug: true,
+          clickRewardId: true,
+          leadRewardId: true,
+          saleRewardId: true,
+          referralRewardId: true,
+          customRewardId: true,
+          discountId: true,
+        },
+      },
+      workspace: {
+        select: {
+          id: true,
+          plan: true,
+        },
+      },
+    },
+  });
+
+  if (!program) {
+    console.error(`Program ${programId} not found.`);
+    return;
+  }
+
+  if (!program.domain || !program.url) {
+    console.error("Program domain or url not found", program.id);
+    return;
+  }
+
+  const defaultGroup = program.groups.find(
+    (group) => group.slug === DEFAULT_PARTNER_GROUP.slug,
+  );
+
+  if (!defaultGroup) {
+    console.error(`Default group not found for program ${programId}.`);
+    return;
+  }
+
+  const workspace = program.workspace as WorkspaceProps;
+
+  const { apiKey } = await lemonSqueezyImporter.getCredentials(workspace.id);
+  const lemonSqueezyApi = new LemonSqueezyClient({ apiKey });
+
+  let currentPage = page;
+  let hasMore = true;
+  let processedBatches = 0;
+
+  const commonImportLogInputs = {
+    workspace_id: program.workspaceId,
+    import_id: importId,
+    source: "lemonsqueezy" as const,
+    entity: "partner" as const,
+  };
+
+  while (hasMore && processedBatches < LEMONSQUEEZY_MAX_BATCHES) {
+    const affiliates = await lemonSqueezyApi.listAffiliates({
+      storeId,
+      page: currentPage,
+    });
+
+    if (affiliates.length === 0) {
+      hasMore = false;
+      break;
+    }
+
+    const activeAffiliates: LemonSqueezyAffiliate[] = [];
+    const notImportedAffiliates: LemonSqueezyAffiliate[] = [];
+
+    for (const affiliate of affiliates) {
+      // LS has no leads count on affiliates. Import all active partners;
+      // pending/disabled are skipped. Customer/commission steps only
+      // attach referred activity.
+      if (affiliate.status === "active") {
+        activeAffiliates.push(affiliate);
+      } else {
+        notImportedAffiliates.push(affiliate);
+      }
+    }
+
+    if (activeAffiliates.length > 0) {
+      const results = await Promise.allSettled(
+        activeAffiliates.map((affiliate) =>
+          createPartnerAndLinks({
+            workspace,
+            program,
+            affiliate,
+            group: defaultGroup,
+            userId,
+            importId,
+          }),
+        ),
+      );
+
+      const failures = results.flatMap((result, index) =>
+        result.status === "rejected"
+          ? [{ affiliate: activeAffiliates[index], reason: result.reason }]
+          : [],
+      );
+
+      if (failures.length > 0) {
+        await logImportError(
+          failures.map(({ affiliate, reason }) => ({
+            ...commonImportLogInputs,
+            entity_id: affiliate.id,
+            code: "PARTNER_NOT_FOUND" as const,
+            message: `Failed to import affiliate ${affiliate.id}: ${
+              reason instanceof Error ? reason.message : String(reason)
+            }`,
+          })),
+        );
+      }
+
+      // Queue an index update because the imported partners were enrolled.
+      // Queued per page rather than per partner.
+      await queuePartnerSearchSync({
+        partnerIds: results.flatMap((result) =>
+          result.status === "fulfilled" && result.value ? [result.value] : [],
+        ),
+        programId: program.id,
+      });
+    }
+
+    if (notImportedAffiliates.length > 0) {
+      await logImportError(
+        notImportedAffiliates.map((affiliate) => ({
+          ...commonImportLogInputs,
+          entity_id: affiliate.id,
+          code: "INACTIVE_PARTNER",
+          message: `Partner ${affiliate.user_email} not imported because status is "${affiliate.status}" (only active affiliates are imported).`,
+        })),
+      );
+    }
+
+    currentPage++;
+    processedBatches++;
+  }
+
+  await lemonSqueezyImporter.queue({
+    ...payload,
+    action: hasMore ? "import-partners" : "import-customers",
+    page: hasMore ? currentPage : undefined,
+  });
+}
+
+async function createPartnerAndLinks({
+  workspace,
+  program,
+  affiliate,
+  group,
+  userId,
+  importId,
+}: {
+  workspace: Pick<WorkspaceProps, "id" | "plan">;
+  program: Pick<
+    Program,
+    "id" | "workspaceId" | "domain" | "url" | "defaultFolderId"
+  >;
+  affiliate: LemonSqueezyAffiliate;
+  group: Pick<
+    PartnerGroup,
+    | "id"
+    | "discountId"
+    | "clickRewardId"
+    | "leadRewardId"
+    | "saleRewardId"
+    | "referralRewardId"
+    | "customRewardId"
+  >;
+  userId: string;
+  importId: string;
+}) {
+  if (!affiliate.user_email) {
+    await logImportError({
+      workspace_id: program.workspaceId,
+      import_id: importId,
+      source: "lemonsqueezy",
+      entity: "partner",
+      entity_id: affiliate.id,
+      code: "PARTNER_NOT_FOUND",
+      message: `Affiliate ${affiliate.id} not imported because it has no email.`,
+    });
+
+    return;
+  }
+
+  const partner = await prisma.partner.upsert({
+    where: {
+      email: affiliate.user_email,
+    },
+    create: {
+      id: createId({ prefix: "pn_" }),
+      name: affiliate.user_name || affiliate.user_email,
+      email: affiliate.user_email,
+    },
+    update: {},
+  });
+
+  const { links } = await prisma.programEnrollment.upsert({
+    where: {
+      partnerId_programId: {
+        partnerId: partner.id,
+        programId: program.id,
+      },
+    },
+    create: {
+      id: createId({ prefix: "pge_" }),
+      programId: program.id,
+      partnerId: partner.id,
+      status: "approved",
+      groupId: group.id,
+      clickRewardId: group.clickRewardId,
+      leadRewardId: group.leadRewardId,
+      saleRewardId: group.saleRewardId,
+      referralRewardId: group.referralRewardId,
+      customRewardId: group.customRewardId,
+      discountId: group.discountId,
+    },
+    update: {
+      status: "approved",
+    },
+    select: {
+      links: {
+        select: {
+          key: true,
+        },
+      },
+    },
+  });
+
+  if (links.length > 0 && links.some((link) => link.key === affiliate.id)) {
+    console.log(
+      `Partner ${partner.id} already has a link with key ${affiliate.id}, skipping...`,
+    );
+    return partner.id;
+  }
+
+  try {
+    const partnerLink = await generatePartnerLink({
+      workspace,
+      program,
+      partner: {
+        id: partner.id,
+        name: partner.name,
+        email: partner.email!,
+      },
+      link: {
+        domain: program.domain!,
+        url: program.url!,
+        // Use affiliate id so commissions can map affiliate_id → partner link
+        key: affiliate.id,
+      },
+      userId,
+    });
+
+    // Reject suffixed keys — customers/commissions look up by exact affiliate id
+    if (partnerLink.key !== affiliate.id) {
+      await logImportError({
+        workspace_id: program.workspaceId,
+        import_id: importId,
+        source: "lemonsqueezy",
+        entity: "partner",
+        entity_id: affiliate.id,
+        code: "LINK_NOT_FOUND",
+        message: `Partner link key conflict for affiliate ${affiliate.id}: generated key "${partnerLink.key}" instead of "${affiliate.id}".`,
+      });
+      return partner.id;
+    }
+
+    await createLink(partnerLink);
+  } catch (error) {
+    console.error("Error creating partner link", error, affiliate);
+    await logImportError({
+      workspace_id: program.workspaceId,
+      import_id: importId,
+      source: "lemonsqueezy",
+      entity: "partner",
+      entity_id: affiliate.id,
+      code: "LINK_NOT_FOUND",
+      message: `Failed to create partner link for affiliate ${affiliate.id}: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    });
+  }
+
+  return partner.id;
+}
diff --git a/apps/web/lib/lemonsqueezy/importer.ts b/apps/web/lib/lemonsqueezy/importer.ts
new file mode 100644
index 00000000000..fcb395b874e
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/importer.ts
@@ -0,0 +1,50 @@
+import { qstash } from "@/lib/cron";
+import { redis } from "@/lib/upstash";
+import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
+import { LemonSqueezyCredentials, LemonSqueezyImportPayload } from "./types";
+
+// Lemon Squeezy rate limit is 300 requests per minute
+export const LEMONSQUEEZY_MAX_BATCHES = 10;
+
+export const CACHE_EXPIRY = 60 * 60 * 24;
+export const CACHE_KEY_PREFIX = "lemonsqueezy:import";
+
+class LemonSqueezyImporter {
+  async setCredentials(
+    workspaceId: string,
+    credentials: LemonSqueezyCredentials,
+  ) {
+    await redis.set(`${CACHE_KEY_PREFIX}:${workspaceId}`, credentials, {
+      ex: CACHE_EXPIRY,
+    });
+  }
+
+  async getCredentials(workspaceId: string): Promise<LemonSqueezyCredentials> {
+    const credentials = await redis.get<LemonSqueezyCredentials>(
+      `${CACHE_KEY_PREFIX}:${workspaceId}`,
+    );
+
+    if (!credentials) {
+      throw new Error(
+        "Lemon Squeezy credentials not found. Please restart the import process.",
+      );
+    }
+
+    return credentials;
+  }
+
+  async deleteCredentials(workspaceId: string) {
+    return await redis.del(`${CACHE_KEY_PREFIX}:${workspaceId}`);
+  }
+
+  async queue(body: LemonSqueezyImportPayload, options?: { delay?: number }) {
+    return await qstash.publishJSON({
+      url: `${APP_DOMAIN_WITH_NGROK}/api/cron/import/lemonsqueezy`,
+      body,
+      contentBasedDeduplication: true,
+      ...(options?.delay != null && { delay: options.delay }),
+    });
+  }
+}
+
+export const lemonSqueezyImporter = new LemonSqueezyImporter();
diff --git a/apps/web/lib/lemonsqueezy/schemas.ts b/apps/web/lib/lemonsqueezy/schemas.ts
new file mode 100644
index 00000000000..422662eb646
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/schemas.ts
@@ -0,0 +1,173 @@
+import * as z from "zod/v4";
+
+export const lemonSqueezyImportSteps = z.enum([
+  "import-partners",
+  "import-customers",
+  "import-commissions",
+]);
+
+export const lemonSqueezyImportPayloadSchema = z.object({
+  importId: z.string(),
+  userId: z.string(),
+  programId: z.string(),
+  storeId: z.string(),
+  action: lemonSqueezyImportSteps,
+  page: z.number().optional(),
+  // Used by import-commissions to paginate orders first, then subscription invoices
+  resource: z.enum(["orders", "subscription-invoices"]).optional(),
+});
+
+export const lemonSqueezyJsonApiResourceSchema = z.object({
+  type: z.string(),
+  id: z.string(),
+  attributes: z.record(z.string(), z.unknown()),
+  relationships: z.record(z.string(), z.unknown()).optional(),
+});
+
+export const lemonSqueezyJsonApiListSchema = z.object({
+  data: z.array(lemonSqueezyJsonApiResourceSchema),
+  included: z.array(lemonSqueezyJsonApiResourceSchema).optional(),
+  meta: z
+    .object({
+      page: z
+        .object({
+          currentPage: z.number(),
+          from: z.number().nullable().optional(),
+          lastPage: z.number(),
+          perPage: z.number(),
+          to: z.number().nullable().optional(),
+          total: z.number(),
+        })
+        .optional(),
+    })
+    .optional(),
+  links: z
+    .object({
+      first: z.string().optional(),
+      last: z.string().optional(),
+      next: z.string().nullable().optional(),
+      prev: z.string().nullable().optional(),
+    })
+    .optional(),
+});
+
+// GET list endpoints — JSON:API pagination / filter / include query params
+export const lemonSqueezyListResourcesInputSchema = z.object({
+  "page[number]": z.number(),
+  "page[size]": z.number(),
+  "filter[store_id]": z.string().optional(),
+  include: z.string().optional(),
+});
+
+export const lemonSqueezyStoreSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  slug: z.string(),
+  domain: z.string(),
+  url: z.string(),
+  currency: z.string().nullish(),
+  total_sales: z.number().nullish(),
+  total_revenue: z.number().nullish(),
+  created_at: z.string().nullish(),
+  updated_at: z.string().nullish(),
+});
+
+export const lemonSqueezyAffiliateSchema = z.object({
+  id: z.string(),
+  store_id: z.number(),
+  user_id: z.number().nullish(),
+  user_name: z.string().nullish(),
+  user_email: z.string().nullish(),
+  share_domain: z.string().nullish(),
+  status: z.string(),
+  products: z.unknown().nullish(),
+  application_note: z.string().nullish(),
+  total_earnings: z.number().nullish(),
+  unpaid_earnings: z.number().nullish(),
+  created_at: z.string().nullish(),
+  updated_at: z.string().nullish(),
+  // Optional if Lemon Squeezy exposes the affiliate link token
+  token: z.string().nullish(),
+});
+
+export const lemonSqueezyCustomerSchema = z.object({
+  id: z.string(),
+  store_id: z.number(),
+  name: z.string().nullish(),
+  email: z.string().nullish(),
+  status: z.string().nullish(),
+  city: z.string().nullish(),
+  region: z.string().nullish(),
+  country: z.string().nullish(),
+  total_revenue_currency: z.number().nullish(),
+  mrr: z.number().nullish(),
+  created_at: z.string().nullish(),
+  updated_at: z.string().nullish(),
+  test_mode: z.boolean().nullish(),
+  affiliate_ids: z.array(z.string()).default([]),
+});
+
+export const lemonSqueezyOrderSchema = z.object({
+  id: z.string(),
+  store_id: z.number(),
+  customer_id: z.number().nullish(),
+  affiliate_id: z.number().nullish(),
+  identifier: z.string().nullish(),
+  order_number: z.number().nullish(),
+  user_name: z.string().nullish(),
+  user_email: z.string().nullish(),
+  currency: z.string(),
+  currency_rate: z.union([z.string(), z.number()]).nullish(),
+  subtotal: z.number(),
+  discount_total: z.number().nullish(),
+  tax: z.number().nullish(),
+  total: z.number().nullish(),
+  subtotal_usd: z.number().nullish(),
+  discount_total_usd: z.number().nullish(),
+  tax_usd: z.number().nullish(),
+  total_usd: z.number().nullish(),
+  refunded_amount: z.number().nullish(),
+  refunded_amount_usd: z.number().nullish(),
+  referral_amount: z.number().nullish(),
+  first_order_item: z
+    .object({
+      price: z.number().nullish(),
+    })
+    .nullish(),
+  status: z.string(),
+  refunded: z.boolean().nullish(),
+  refunded_at: z.string().nullish(),
+  created_at: z.string().nullish(),
+  updated_at: z.string().nullish(),
+  test_mode: z.boolean().nullish(),
+});
+
+export const lemonSqueezySubscriptionInvoiceSchema = z.object({
+  id: z.string(),
+  store_id: z.number(),
+  subscription_id: z.number().nullish(),
+  customer_id: z.number().nullish(),
+  affiliate_id: z.number().nullish(),
+  user_name: z.string().nullish(),
+  user_email: z.string().nullish(),
+  billing_reason: z.string().nullish(),
+  currency: z.string(),
+  currency_rate: z.union([z.string(), z.number()]).nullish(),
+  status: z.string(),
+  refunded: z.boolean().nullish(),
+  refunded_at: z.string().nullish(),
+  subtotal: z.number(),
+  discount_total: z.number().nullish(),
+  tax: z.number().nullish(),
+  total: z.number().nullish(),
+  refunded_amount: z.number().nullish(),
+  subtotal_usd: z.number().nullish(),
+  discount_total_usd: z.number().nullish(),
+  tax_usd: z.number().nullish(),
+  total_usd: z.number().nullish(),
+  refunded_amount_usd: z.number().nullish(),
+  referral_amount: z.number().nullish(),
+  created_at: z.string().nullish(),
+  updated_at: z.string().nullish(),
+  test_mode: z.boolean().nullish(),
+});
diff --git a/apps/web/lib/lemonsqueezy/types.ts b/apps/web/lib/lemonsqueezy/types.ts
new file mode 100644
index 00000000000..712c261ba8d
--- /dev/null
+++ b/apps/web/lib/lemonsqueezy/types.ts
@@ -0,0 +1,34 @@
+import * as z from "zod/v4";
+import {
+  lemonSqueezyAffiliateSchema,
+  lemonSqueezyCustomerSchema,
+  lemonSqueezyImportPayloadSchema,
+  lemonSqueezyJsonApiResourceSchema,
+  lemonSqueezyOrderSchema,
+  lemonSqueezyStoreSchema,
+  lemonSqueezySubscriptionInvoiceSchema,
+} from "./schemas";
+
+export interface LemonSqueezyCredentials {
+  apiKey: string;
+}
+
+export type LemonSqueezyImportPayload = z.infer<
+  typeof lemonSqueezyImportPayloadSchema
+>;
+
+export type LemonSqueezyJsonApiResource = z.infer<
+  typeof lemonSqueezyJsonApiResourceSchema
+>;
+
+export type LemonSqueezyStore = z.infer<typeof lemonSqueezyStoreSchema>;
+
+export type LemonSqueezyAffiliate = z.infer<typeof lemonSqueezyAffiliateSchema>;
+
+export type LemonSqueezyCustomer = z.infer<typeof lemonSqueezyCustomerSchema>;
+
+export type LemonSqueezyOrder = z.infer<typeof lemonSqueezyOrderSchema>;
+
+export type LemonSqueezySubscriptionInvoice = z.infer<
+  typeof lemonSqueezySubscriptionInvoiceSchema
+>;
diff --git a/apps/web/lib/marketplace/parse-public-marketplace-query.ts b/apps/web/lib/marketplace/parse-public-marketplace-query.ts
new file mode 100644
index 00000000000..334993e4f2e
--- /dev/null
+++ b/apps/web/lib/marketplace/parse-public-marketplace-query.ts
@@ -0,0 +1,34 @@
+import { getPublicNetworkProgramsQuerySchema } from "@/lib/zod/schemas/program-network";
+import { Category } from "@prisma/client";
+
+export const EXTERNAL_MARKETPLACE_PAGE_SIZE = 24;
+
+function pickString(value: string | string[] | undefined) {
+  return typeof value === "string" ? value : undefined;
+}
+
+export function parsePublicMarketplaceQuery(
+  searchParams: Record<string, string | string[] | undefined> = {},
+  fixedCategory?: Category,
+) {
+  const input = {
+    category: fixedCategory ?? pickString(searchParams.category),
+    rewardType: pickString(searchParams.rewardType),
+    search: pickString(searchParams.search),
+    sortBy: pickString(searchParams.sortBy),
+    sortOrder: pickString(searchParams.sortOrder),
+    page: pickString(searchParams.page),
+    pageSize: EXTERNAL_MARKETPLACE_PAGE_SIZE,
+  };
+
+  const parsed = getPublicNetworkProgramsQuerySchema.safeParse(input);
+
+  if (parsed.success) {
+    return parsed.data;
+  }
+
+  return getPublicNetworkProgramsQuerySchema.parse({
+    pageSize: EXTERNAL_MARKETPLACE_PAGE_SIZE,
+    ...(fixedCategory ? { category: fixedCategory } : {}),
+  });
+}
diff --git a/apps/web/lib/messages/constants.ts b/apps/web/lib/messages/constants.ts
index c4f25206a0b..8d0c248d279 100644
--- a/apps/web/lib/messages/constants.ts
+++ b/apps/web/lib/messages/constants.ts
@@ -2,30 +2,8 @@ export const MAX_MESSAGE_LENGTH = 2000;
 
 export const MAX_ATTACHMENTS_PER_MESSAGE = 5;
 
-export const MAX_ATTACHMENT_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
-
 export const MAX_ATTACHMENT_NAME_LENGTH = 255;
 
-export const PROGRAM_ALLOWED_ATTACHMENT_TYPES = [
-  "image/png",
-  "image/jpeg",
-  "image/webp",
-  "application/pdf",
-] as const;
-
-export const PARTNER_ALLOWED_ATTACHMENT_TYPES = [
-  "image/png",
-  "image/jpeg",
-  "image/webp",
-] as const;
-
-export const ATTACHMENT_MIME_TYPE_LABELS: Record<string, string> = {
-  "application/pdf": "PDF",
-  "image/png": "PNG",
-  "image/jpeg": "JPG",
-  "image/webp": "WEBP",
-};
-
 // MIME types that are safe to render as inline image previews.
 export const PREVIEWABLE_IMAGE_TYPES = new Set([
   "image/png",
diff --git a/apps/web/lib/messages/schemas.ts b/apps/web/lib/messages/schemas.ts
index 6e1672c6487..6a5222991d8 100644
--- a/apps/web/lib/messages/schemas.ts
+++ b/apps/web/lib/messages/schemas.ts
@@ -1,8 +1,8 @@
 import {
-  MAX_ATTACHMENT_SIZE_BYTES,
   MAX_ATTACHMENTS_PER_MESSAGE,
   MAX_MESSAGE_LENGTH,
 } from "@/lib/messages/constants";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { MessageType } from "@prisma/client";
 import * as z from "zod/v4";
 import { PartnerSchema } from "../zod/schemas/partners";
@@ -22,12 +22,27 @@ export const MessageAttachmentSchema = z.object({
   createdAt: z.date(),
 });
 
-export const messageAttachmentInputSchema = z.object({
-  storageKey: z.string().min(1),
-  name: z.string().min(1).max(255),
-  size: z.number().int().positive().max(MAX_ATTACHMENT_SIZE_BYTES),
-  type: z.string().min(1),
-});
+const createMessageAttachmentInputSchema = (maxBytes: number) =>
+  z.object({
+    storageKey: z.string().min(1),
+    name: z.string().min(1).max(255),
+    size: z.number().int().positive().max(maxBytes),
+    type: z.string().min(1),
+  });
+
+export const programMessageAttachmentInputSchema =
+  createMessageAttachmentInputSchema(
+    UPLOAD_POLICIES.programMessageAttachments.maxBytes,
+  );
+
+export const partnerMessageAttachmentInputSchema =
+  createMessageAttachmentInputSchema(
+    UPLOAD_POLICIES.partnerMessageAttachments.maxBytes,
+  );
+
+export type MessageAttachmentInput = z.infer<
+  typeof programMessageAttachmentInputSchema
+>;
 
 export const MessageSchema = z.object({
   id: z.string(),
@@ -81,7 +96,7 @@ export const messagePartnerSchema = z.object({
   partnerId: z.string(),
   text: messageTextSchema,
   attachments: z
-    .array(messageAttachmentInputSchema)
+    .array(programMessageAttachmentInputSchema)
     .max(MAX_ATTACHMENTS_PER_MESSAGE)
     .default([]),
 });
@@ -110,7 +125,7 @@ export const messageProgramSchema = z.object({
   programSlug: z.string(),
   text: messageTextSchema,
   attachments: z
-    .array(messageAttachmentInputSchema)
+    .array(partnerMessageAttachmentInputSchema)
     .max(MAX_ATTACHMENTS_PER_MESSAGE)
     .default([]),
 });
diff --git a/apps/web/lib/messages/upload-message-attachment.ts b/apps/web/lib/messages/upload-message-attachment.ts
index 11512bb9307..1d0b1b09f48 100644
--- a/apps/web/lib/messages/upload-message-attachment.ts
+++ b/apps/web/lib/messages/upload-message-attachment.ts
@@ -1,14 +1,12 @@
 "use server";
 
 import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";
-import {
-  MAX_ATTACHMENT_NAME_LENGTH,
-  MAX_ATTACHMENT_SIZE_BYTES,
-  PROGRAM_ALLOWED_ATTACHMENT_TYPES,
-} from "@/lib/messages/constants";
+import { MAX_ATTACHMENT_NAME_LENGTH } from "@/lib/messages/constants";
 import { sanitizeFileName } from "@/lib/messages/utils";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
 import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
@@ -18,12 +16,9 @@ import { throwIfNoPermission } from "../actions/throw-if-no-permission";
 const schema = z.object({
   workspaceId: z.string(),
   fileName: z.string().trim().min(1).max(MAX_ATTACHMENT_NAME_LENGTH),
-  contentType: z.enum(PROGRAM_ALLOWED_ATTACHMENT_TYPES),
-  contentLength: z.number().int().positive().max(MAX_ATTACHMENT_SIZE_BYTES),
+  ...signedUploadInputSchema.shape,
 });
 
-const rateLimitPolicy = RATELIMIT_POLICIES.messageAttachmentUpload;
-
 export const uploadMessageAttachmentAction = authActionClient
   .inputSchema(schema)
   .action(async ({ ctx, parsedInput }) => {
@@ -37,26 +32,25 @@ export const uploadMessageAttachmentAction = authActionClient
 
     const programId = getDefaultProgramIdOrThrow(workspace);
 
-    const { success } = await ratelimit(
-      rateLimitPolicy.attempts,
-      rateLimitPolicy.window,
-    ).limit(`${rateLimitPolicy.keyPrefix}:${user.id}`);
-
-    if (!success) {
-      throw new Error("Too many file uploads. Please try again later.");
-    }
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: "programMessageAttachments",
+    });
 
-    const storageKey = `messages/${programId}/${nanoid(10)}/${sanitizeFileName(fileName)}`;
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.messageAttachmentUpload,
+      identifier: user.id,
+    });
 
-    const signedUrl = await storage.getSignedUploadUrl({
-      key: storageKey,
+    const { key, signedUrl } = await createSignedUploadUrl({
+      key: `messages/${programId}/${nanoid(10)}/${sanitizeFileName(fileName)}`,
       bucket: "private",
       contentLength,
       contentType,
     });
-
     return {
       signedUrl,
-      storageKey,
+      storageKey: key,
     };
   });
diff --git a/apps/web/lib/messages/upload-partner-message-attachment.ts b/apps/web/lib/messages/upload-partner-message-attachment.ts
index 9d6e0c4cfaf..21d9efae1a5 100644
--- a/apps/web/lib/messages/upload-partner-message-attachment.ts
+++ b/apps/web/lib/messages/upload-partner-message-attachment.ts
@@ -1,14 +1,12 @@
 "use server";
 
-import {
-  MAX_ATTACHMENT_NAME_LENGTH,
-  MAX_ATTACHMENT_SIZE_BYTES,
-  PARTNER_ALLOWED_ATTACHMENT_TYPES,
-} from "@/lib/messages/constants";
+import { MAX_ATTACHMENT_NAME_LENGTH } from "@/lib/messages/constants";
 import { sanitizeFileName } from "@/lib/messages/utils";
 import { prisma } from "@/lib/prisma";
-import { storage } from "@/lib/storage";
-import { ratelimit } from "@/lib/upstash";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { signedUploadInputSchema } from "@/lib/storage/schemas";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
 import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import { nanoid } from "@dub/utils";
 import * as z from "zod/v4";
@@ -18,11 +16,10 @@ import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "../zod/schemas/partners
 const schema = z.object({
   programSlug: z.string(),
   fileName: z.string().trim().min(1).max(MAX_ATTACHMENT_NAME_LENGTH),
-  contentType: z.enum(PARTNER_ALLOWED_ATTACHMENT_TYPES),
-  contentLength: z.number().int().positive().max(MAX_ATTACHMENT_SIZE_BYTES),
+  ...signedUploadInputSchema.shape,
 });
 
-const rateLimitPolicy = RATELIMIT_POLICIES.messageAttachmentUpload;
+const uploadPolicy = "partnerMessageAttachments" as const;
 
 export const uploadPartnerMessageAttachmentAction = authPartnerActionClient
   .inputSchema(schema)
@@ -30,14 +27,16 @@ export const uploadPartnerMessageAttachmentAction = authPartnerActionClient
     const { partner } = ctx;
     const { programSlug, fileName, contentType, contentLength } = parsedInput;
 
-    const { success } = await ratelimit(
-      rateLimitPolicy.attempts,
-      rateLimitPolicy.window,
-    ).limit(`${rateLimitPolicy.keyPrefix}:${partner.id}`);
+    validateSignedUpload({
+      contentLength,
+      contentType,
+      policy: uploadPolicy,
+    });
 
-    if (!success) {
-      throw new Error("Too many file uploads. Please try again later.");
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.messageAttachmentUpload,
+      identifier: partner.id,
+    });
 
     const program = await prisma.program.findFirst({
       select: {
@@ -79,10 +78,8 @@ export const uploadPartnerMessageAttachmentAction = authPartnerActionClient
       throw new Error("You are not able to message this program.");
     }
 
-    const storageKey = `messages/${program.id}/${nanoid(10)}/${sanitizeFileName(fileName)}`;
-
-    const signedUrl = await storage.getSignedUploadUrl({
-      key: storageKey,
+    const { key, signedUrl } = await createSignedUploadUrl({
+      key: `messages/${program.id}/${nanoid(10)}/${sanitizeFileName(fileName)}`,
       bucket: "private",
       contentLength,
       contentType,
@@ -90,6 +87,6 @@ export const uploadPartnerMessageAttachmentAction = authPartnerActionClient
 
     return {
       signedUrl,
-      storageKey,
+      storageKey: key,
     };
   });
diff --git a/apps/web/lib/messages/utils.ts b/apps/web/lib/messages/utils.ts
index 591a706c83d..3d93c634277 100644
--- a/apps/web/lib/messages/utils.ts
+++ b/apps/web/lib/messages/utils.ts
@@ -1,8 +1,5 @@
 import { createId } from "@/lib/api/create-id";
-import {
-  ATTACHMENT_MIME_TYPE_LABELS,
-  PREVIEWABLE_IMAGE_TYPES,
-} from "./constants";
+import { PREVIEWABLE_IMAGE_TYPES } from "./constants";
 
 export const messageAttachmentsOrderBy = { createdAt: "asc" } as const;
 
@@ -46,14 +43,6 @@ export function sanitizeFileName(name: string): string {
     .replace(/[\x00-\x1F\x7F/\\?#%]/g, (ch) => encodeURIComponent(ch));
 }
 
-export function getAttachmentTypeLabel(mimeType: string): string {
-  return (
-    ATTACHMENT_MIME_TYPE_LABELS[mimeType] ||
-    mimeType.split("/").pop()?.toUpperCase() ||
-    "FILE"
-  );
-}
-
 export function isPreviewableImageType(mimeType: string): boolean {
   return PREVIEWABLE_IMAGE_TYPES.has(mimeType);
 }
diff --git a/apps/web/lib/middleware/app.ts b/apps/web/lib/middleware/app.ts
index 27ec8567075..634e0c0b85d 100644
--- a/apps/web/lib/middleware/app.ts
+++ b/apps/web/lib/middleware/app.ts
@@ -13,6 +13,16 @@ import { isTopLevelSettingsRedirect } from "./utils/is-top-level-settings-redire
 import { parse } from "./utils/parse";
 import { WorkspacesMiddleware } from "./workspaces";
 
+const isPublicPath = (path: string) =>
+  ["/marketplace"].some((p) => path === p) ||
+  [
+    "/marketplace/",
+    "/share/",
+    "/deeplink/",
+    "/unsubscribe/",
+    "/auth/reset-password/",
+  ].some((p) => path.startsWith(p));
+
 export async function AppMiddleware(req: NextRequest) {
   const { path, fullPath, searchParamsString } = parse(req);
 
@@ -29,10 +39,7 @@ export async function AppMiddleware(req: NextRequest) {
     path !== "/forgot-password" &&
     path !== "/register" &&
     path !== "/auth/saml" &&
-    !path.startsWith("/auth/reset-password/") &&
-    !path.startsWith("/share/") &&
-    !path.startsWith("/deeplink/") &&
-    !path.startsWith("/unsubscribe/")
+    !isPublicPath(path)
   ) {
     return NextResponse.redirect(
       new URL(
@@ -42,7 +49,7 @@ export async function AppMiddleware(req: NextRequest) {
     );
 
     // if there's a user
-  } else if (user) {
+  } else if (user && !isPublicPath(path)) {
     // /new is a special path that creates a new link (or workspace if the user doesn't have one yet)
     if (path === "/new") {
       return NewLinkMiddleware(req, user);
diff --git a/apps/web/lib/middleware/link.ts b/apps/web/lib/middleware/link.ts
index 5ebc4ec699d..1f58c89fc3a 100644
--- a/apps/web/lib/middleware/link.ts
+++ b/apps/web/lib/middleware/link.ts
@@ -1,12 +1,15 @@
-import { recordClick } from "@/lib/tinybird";
+import { recordClick as recordClickJob } from "@/lib/tinybird";
 import { formatRedisLink } from "@/lib/upstash";
 import {
   APP_DOMAIN,
   DUB_HEADERS,
   LEGAL_WORKSPACE_ID,
   LOCALHOST_GEO_DATA,
+  REDIRECTION_QUERY_PARAM,
   isDubDomain,
+  isGoogleClickTrackerDomain,
   isUnsupportedKey,
+  isValidUrl,
   nanoid,
   punyEncode,
 } from "@dub/utils";
@@ -38,7 +41,7 @@ import { parse } from "./utils/parse";
 import { resolveABTestURL } from "./utils/resolve-ab-test-url";
 
 export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
-  let { domain, fullKey: originalKey, fullPath } = parse(req);
+  let { domain, fullKey: originalKey, fullPath, searchParamsObj } = parse(req);
 
   if (!domain) {
     return NextResponse.next();
@@ -83,9 +86,17 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
     });
   }
 
-  let cachedLink = await linkCache.get({ domain, key });
+  let { cachedLink, redisFailOver } = await linkCache.get({ domain, key });
   let isPartnerLink = Boolean(cachedLink?.programId && cachedLink?.partnerId);
 
+  // skip click tracking during Redis failover to avoid timeouts
+  const recordClick = redisFailOver
+    ? async () => {
+        console.log("Redis failover detected, skipping click tracking...");
+        return;
+      }
+    : recordClickJob;
+
   if (!cachedLink) {
     let linkData = await getLinkViaEdge({
       domain,
@@ -120,6 +131,7 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
         const { partner, discount } = await getPartnerEnrollmentInfo({
           programId: linkData.programId,
           partnerId: linkData.partnerId,
+          linkId: linkData.id,
         });
 
         // we'll use this data on /track/click
@@ -174,6 +186,37 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
   // everything else is not indexed by default, unless the user has explicitly set it to be indexed
   const shouldIndex = isDubDomain(domain) || doIndex === true;
 
+  const dubIdCookieName = `dub_id_${domain}_${key}`;
+
+  let clickId: string | undefined;
+  // only lookup/mint a new clickId if not in Redis failover mode
+  if (!redisFailOver) {
+    const cookieStore = await cookies();
+    clickId = cookieStore.get(dubIdCookieName)?.value;
+    if (!clickId) {
+      // if we need to cache the clickId, check if clickId is cached in Redis
+      if (shouldCacheClickId) {
+        const identityHash = await getIdentityHash(req);
+        clickId =
+          (await recordClickCache
+            .get({ domain, key, identityHash })
+            .catch(() => undefined)) || undefined;
+      }
+
+      // if there's still no clickId, generate a new one
+      if (!clickId) {
+        clickId = nanoid(16);
+      }
+    }
+  }
+
+  const cookieData = {
+    path: `/${encodeURI(originalKey)}`,
+    dubIdCookieName,
+    dubIdCookieValue: clickId,
+    dubTestUrlValue: testUrl,
+  };
+
   // only show inspect modal if the link is not password protected
   if (inspectMode && !password) {
     return NextResponse.rewrite(
@@ -225,10 +268,11 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
 
   // handle disabled links
   if (disabledAt) {
-    return NextResponse.rewrite(new URL(`/${domain}/notfound`, req.url), {
+    return NextResponse.rewrite(new URL(`/${domain}/disabled`, req.url), {
       headers: {
         ...DUB_HEADERS,
         ...STATIC_PAGES_CACHE_HEADERS,
+        "X-Robots-Tag": "googlebot: noindex",
       },
     });
   }
@@ -254,33 +298,45 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
     }
   }
 
-  const dubIdCookieName = `dub_id_${domain}_${key}`;
+  // for Google click tracker domains (dub.sh, dub.link):
+  // if there is a redirection url set, then use it instead of the target
+  if (isGoogleClickTrackerDomain(domain)) {
+    const redirectionUrl = searchParamsObj[REDIRECTION_QUERY_PARAM];
 
-  const cookieStore = await cookies();
-  let clickId = cookieStore.get(dubIdCookieName)?.value;
-  if (!clickId) {
-    // if we need to pass the clickId, check if clickId is cached in Redis
-    if (shouldCacheClickId) {
-      const identityHash = await getIdentityHash(req);
-      clickId =
-        (await recordClickCache
-          .get({ domain, key, identityHash })
-          .catch(() => undefined)) || undefined;
-    }
+    // if a valid redirection url is present, return it immediately
+    if (
+      redirectionUrl &&
+      isValidUrl(redirectionUrl) &&
+      redirectionUrl.startsWith("https://")
+    ) {
+      ev.waitUntil(
+        recordClick({
+          req,
+          clickId,
+          workspaceId,
+          linkId,
+          domain,
+          key,
+          url: redirectionUrl,
+          programId: cachedLink.programId,
+          partnerId: cachedLink.partnerId,
+          shouldCacheClickId,
+        }),
+      );
 
-    // if there's still no clickId, generate a new one
-    if (!clickId) {
-      clickId = nanoid(16);
+      return createResponseWithCookies(
+        NextResponse.redirect(redirectionUrl, {
+          headers: {
+            ...DUB_HEADERS,
+            ...(!shouldIndex && { "X-Robots-Tag": "googlebot: noindex" }),
+          },
+          status: key === "_root" ? 301 : 302,
+        }),
+        cookieData,
+      );
     }
   }
 
-  const cookieData = {
-    path: `/${encodeURI(originalKey)}`,
-    dubIdCookieName,
-    dubIdCookieValue: clickId,
-    dubTestUrlValue: testUrl,
-  };
-
   // for root domain links, if there's no destination URL, rewrite to placeholder page
   if (!url) {
     ev.waitUntil(
@@ -434,18 +490,20 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
       isIosAppStoreUrl(ios) &&
       !req.nextUrl.searchParams.get("skip_deeplink_preview")
     ) {
-      ev.waitUntil(
-        cacheDeepLinkClickData({
-          req,
-          clickId,
-          link: {
-            id: linkId,
-            domain,
-            key,
-            url, // pass the main destination URL to the cache (for deferred deep linking)
-          },
-        }),
-      );
+      if (clickId) {
+        ev.waitUntil(
+          cacheDeepLinkClickData({
+            req,
+            clickId,
+            link: {
+              id: linkId,
+              domain,
+              key,
+              url, // pass the main destination URL to the cache (for deferred deep linking)
+            },
+          }),
+        );
+      }
 
       // redirect to the deeplink interstitial splash page "DeepLinkPreviewPage"
       // we're doing this because the interstitial page needs to be on a different domain than the actual deep link domain
@@ -502,18 +560,20 @@ export async function LinkMiddleware(req: NextRequest, ev: NextFetchEvent) {
       isGooglePlayStoreUrl(android) &&
       !req.nextUrl.searchParams.get("skip_deeplink_preview")
     ) {
-      ev.waitUntil(
-        cacheDeepLinkClickData({
-          req,
-          clickId,
-          link: {
-            id: linkId,
-            domain,
-            key,
-            url, // pass the main destination URL to the cache (for deferred deep linking)
-          },
-        }),
-      );
+      if (clickId) {
+        ev.waitUntil(
+          cacheDeepLinkClickData({
+            req,
+            clickId,
+            link: {
+              id: linkId,
+              domain,
+              key,
+              url, // pass the main destination URL to the cache (for deferred deep linking)
+            },
+          }),
+        );
+      }
 
       // redirect to the deeplink interstitial splash page "DeepLinkPreviewPage"
       return createResponseWithCookies(
diff --git a/apps/web/lib/middleware/utils/app-redirect.ts b/apps/web/lib/middleware/utils/app-redirect.ts
index 234d8e3248c..99b1a5f80d7 100644
--- a/apps/web/lib/middleware/utils/app-redirect.ts
+++ b/apps/web/lib/middleware/utils/app-redirect.ts
@@ -7,7 +7,6 @@ const APP_REDIRECTS = {
   "/welcome": "/onboarding/welcome",
   "/campaigns": "/program/campaigns",
   "/messages": "/program/messages",
-  "/marketplace": "/program/network",
   "/fraud": "/program/risks",
   "/risks": "/program/risks",
 };
@@ -99,10 +98,15 @@ export const appRedirect = async (path: string) => {
       "/$1/program/partners/$2/links?profile=true",
     );
 
+  // Redirect "/[slug]/program/customers/leads" to "/[slug]/program/leads"
+  const programCustomersLeadsRegex =
+    /^\/([^\/]+)\/program\/customers\/leads$/;
+  if (programCustomersLeadsRegex.test(path))
+    return path.replace(programCustomersLeadsRegex, "/$1/program/leads");
+
   // Redirect "/[slug]/[*]/customers/:customerId" to "/[slug]/[*]/customers/:customerId/sales"
-  // Exclude "leads" since it's a tab route, not a customer ID
   const customersPageRegex =
-    /^\/([^\/]+)\/([^\/]+)\/customers\/(?!leads$)([^\/]+)$/;
+    /^\/([^\/]+)\/([^\/]+)\/customers\/([^\/]+)$/;
   if (customersPageRegex.test(path))
     return path.replace(customersPageRegex, "/$1/$2/customers/$3/sales");
 
diff --git a/apps/web/lib/middleware/utils/create-response-with-cookies.ts b/apps/web/lib/middleware/utils/create-response-with-cookies.ts
index 52133884ffe..a957dfa79b6 100644
--- a/apps/web/lib/middleware/utils/create-response-with-cookies.ts
+++ b/apps/web/lib/middleware/utils/create-response-with-cookies.ts
@@ -10,16 +10,18 @@ export function createResponseWithCookies(
   }: {
     path: string;
     dubIdCookieName: string;
-    dubIdCookieValue: string;
+    dubIdCookieValue?: string;
     dubTestUrlValue?: string | null;
   },
 ): NextResponse {
   // set dub_id_<domain>_<key> cookie
   // this caches dub_id for 1 hour (for deduplication)
-  response.cookies.set(dubIdCookieName, dubIdCookieValue, {
-    path,
-    maxAge: 60 * 60, // 1 hour
-  });
+  if (dubIdCookieValue) {
+    response.cookies.set(dubIdCookieName, dubIdCookieValue, {
+      path,
+      maxAge: 60 * 60, // 1 hour
+    });
+  }
 
   // set dub_test_url if this link has testVariants
   // caches for 1 week (for consistent user experience)
diff --git a/apps/web/lib/middleware/utils/domain-redirects.ts b/apps/web/lib/middleware/utils/domain-redirects.ts
new file mode 100644
index 00000000000..df2d15dbb07
--- /dev/null
+++ b/apps/web/lib/middleware/utils/domain-redirects.ts
@@ -0,0 +1,3 @@
+export const DOMAIN_REDIRECTS = {
+  "renovateai.dub.link": "share.renovateai.app",
+};
diff --git a/apps/web/lib/middleware/utils/get-final-url.ts b/apps/web/lib/middleware/utils/get-final-url.ts
index dffec203ae3..0d449507687 100644
--- a/apps/web/lib/middleware/utils/get-final-url.ts
+++ b/apps/web/lib/middleware/utils/get-final-url.ts
@@ -2,7 +2,6 @@ import {
   LOCALHOST_IP,
   REDIRECTION_QUERY_PARAM,
 } from "@dub/utils/src/constants";
-import { getUrlFromStringIfValid } from "@dub/utils/src/functions";
 import { ipAddress } from "@vercel/functions";
 import { NextRequest, userAgent } from "next/server";
 import { isAppsFlyerTrackingUrl } from "./is-appsflyer-tracking-url";
@@ -25,13 +24,7 @@ export const getFinalUrl = (
   // query is the query string (e.g. d.to/github?utm_source=twitter -> ?utm_source=twitter)
   const searchParams = req.nextUrl.searchParams;
 
-  // if there is a redirection url set, then use it instead of the target url
-  const redirectionUrl = getUrlFromStringIfValid(
-    searchParams.get(REDIRECTION_QUERY_PARAM) ?? "",
-  );
-
-  // get the query params of the target url
-  const urlObj = redirectionUrl ? new URL(redirectionUrl) : new URL(url);
+  const urlObj = new URL(url);
 
   if (via) {
     urlObj.searchParams.set("via", via);
@@ -58,9 +51,6 @@ export const getFinalUrl = (
 
   // for AppsFlyer tracking links
   if (isAppsFlyerTrackingUrl(url)) {
-    const { ua } = userAgent(req);
-    const ip = process.env.VERCEL === "1" ? ipAddress(req) : LOCALHOST_IP;
-
     // set hardcoded query params
     urlObj.searchParams.set("pid", "dubinc_int");
 
diff --git a/apps/web/lib/middleware/utils/parse.ts b/apps/web/lib/middleware/utils/parse.ts
index 1156f2c711f..abe0001a6c8 100644
--- a/apps/web/lib/middleware/utils/parse.ts
+++ b/apps/web/lib/middleware/utils/parse.ts
@@ -1,5 +1,6 @@
-import { SHORT_DOMAIN } from "@dub/utils";
+import { isAppHostname, SHORT_DOMAIN } from "@dub/utils";
 import { NextRequest } from "next/server";
+import { DOMAIN_REDIRECTS } from "./domain-redirects";
 
 export const parse = (req: NextRequest) => {
   let domain = req.headers.get("host") as string;
@@ -8,7 +9,20 @@ export const parse = (req: NextRequest) => {
 
   // remove www. from domain and convert to lowercase
   domain = domain.replace(/^www./, "").toLowerCase();
-  if (domain === "dub.localhost:8888" || domain.endsWith(".vercel.app")) {
+
+  if (DOMAIN_REDIRECTS[domain]) {
+    domain = DOMAIN_REDIRECTS[domain];
+  }
+
+  const isE2ERedirectTestRequest =
+    // local development
+    domain === "dub.localhost:8888" ||
+    // preview environment
+    (process.env.VERCEL_ENV === "preview" &&
+      isAppHostname(domain) &&
+      req.headers.get("x-e2e-redirect-test") === "true");
+
+  if (isE2ERedirectTestRequest) {
     if (path.toLowerCase() === "/case-sensitive-test") {
       // special case for case-sensitive link test
       domain = "dub-internal-test.com";
diff --git a/apps/web/lib/middleware/utils/partners-redirect.ts b/apps/web/lib/middleware/utils/partners-redirect.ts
index 4b79a5d3ad4..e5499a301bc 100644
--- a/apps/web/lib/middleware/utils/partners-redirect.ts
+++ b/apps/web/lib/middleware/utils/partners-redirect.ts
@@ -47,9 +47,19 @@ const PARTNERS_PROGRAM_REDIRECTS = {
   "voice-os": "voiceos",
   "speechify-inc": "speechifyai",
   "ggms-labs-ltd-ai": "mira",
+  missioncontrolhq: "squad-so",
+  nozomio: "folk",
+  base: "coinbasewallet",
 };
 
 export const partnersProgramRedirects = (path: string) => {
+  const customersLeadsMatch = path.match(
+    /^\/programs\/([^/]+)\/customers\/leads$/,
+  );
+  if (customersLeadsMatch) {
+    return `/programs/${customersLeadsMatch[1]}/leads`;
+  }
+
   const programRedirect = Object.keys(PARTNERS_PROGRAM_REDIRECTS).find(
     (redirect) => path === `/${redirect}` || path.includes(`/${redirect}/`),
   );
diff --git a/apps/web/lib/network/get-network-approval-requirements.ts b/apps/web/lib/network/get-network-approval-requirements.ts
index 80011065204..db8d4d2e27a 100644
--- a/apps/web/lib/network/get-network-approval-requirements.ts
+++ b/apps/web/lib/network/get-network-approval-requirements.ts
@@ -1,6 +1,6 @@
 import { toCentsNumber } from "@dub/utils";
 import {
-  EXCLUDED_PROGRAM_IDS,
+  PARTNER_NETWORK_EXCLUDED_PROGRAM_IDS,
   PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
 } from "../constants/partner-profile";
 import { PARTNER_PLATFORM_FIELDS } from "../partners/partner-platforms";
@@ -18,7 +18,7 @@ export const partnerHasEarnedCommissions = (
   return (
     programEnrollments.filter(
       (pe) =>
-        !EXCLUDED_PROGRAM_IDS.includes(pe.programId) &&
+        !PARTNER_NETWORK_EXCLUDED_PROGRAM_IDS.includes(pe.programId) &&
         pe.status === "approved" &&
         toCentsNumber(pe.totalCommissions) >=
           PARTNER_NETWORK_MIN_COMMISSIONS_CENTS,
diff --git a/apps/web/lib/network/program-categories.ts b/apps/web/lib/network/program-categories.ts
index 9640a15245a..9d8ddf2cead 100644
--- a/apps/web/lib/network/program-categories.ts
+++ b/apps/web/lib/network/program-categories.ts
@@ -9,6 +9,7 @@ import {
   Icon,
   MarketingTarget,
   MoneyBill,
+  ShieldKeyhole,
   Sparkle3,
   User,
 } from "@dub/ui/icons";
@@ -25,84 +26,84 @@ export const PROGRAM_CATEGORIES: {
     label: "AI",
     icon: Sparkle3,
     listPageDescription:
-      "Browse partner programs for AI tools and machine learning platforms.",
+      "Browse the best affiliate programs for AI tools, agents, and chatbots.",
   },
   {
     id: Category.Development,
-    label: "Development",
+    label: "DevTools",
     icon: Code,
     listPageDescription:
-      "Browse partner programs for developer tools and software infrastructure.",
+      "Browse the best affiliate programs for developer tools, APIs, and no-code platforms.",
   },
   {
     id: Category.Design,
     label: "Design",
     icon: Brush,
     listPageDescription:
-      "Browse partner programs for design tools and creative software.",
+      "Browse the best affiliate programs for graphic design tools and creative software.",
   },
   {
     id: Category.Productivity,
     label: "Productivity",
     icon: CircleHalfDottedClock,
     listPageDescription:
-      "Browse partner programs for productivity software and modern work tools.",
+      "Browse the best affiliate programs for productivity apps, email tools, and collaboration software.",
   },
   {
     id: Category.Finance,
-    label: "Finance",
+    label: "FinTech",
     icon: MoneyBill,
     listPageDescription:
-      "Browse partner programs for finance software and fintech platforms.",
+      "Browse the best affiliate programs for trading, crypto, and finance apps.",
   },
   {
     id: Category.Marketing,
     label: "Marketing",
     icon: MarketingTarget,
     listPageDescription:
-      "Browse partner programs for marketing software and growth tools.",
+      "Browse the best affiliate programs for marketing software, email marketing, and SEO tools.",
   },
   {
     id: Category.Ecommerce,
     label: "Ecommerce",
     icon: CreditCard,
     listPageDescription:
-      "Browse partner programs for ecommerce platforms and online retail tools.",
+      "Browse the best affiliate programs for online stores, newsletters, and ecommerce platforms.",
+  },
+  {
+    id: Category.Security,
+    label: "Security",
+    icon: ShieldKeyhole,
+    listPageDescription:
+      "Browse the best affiliate programs for cybersecurity software and privacy tools.",
   },
-  // {
-  //   id: Category.Security,
-  //   label: "Security",
-  //   icon: ShieldKeyhole,
-  //   listPageDescription:
-  //     "Browse partner programs for security software and privacy tools.",
-  // },
   {
     id: Category.Education,
     label: "Education",
     icon: BookOpen,
     listPageDescription:
-      "Browse partner programs for education platforms and learning tools.",
+      "Browse the best affiliate programs for edtech, learning tools, and education software.",
   },
   {
     id: Category.Health,
-    label: "Health",
+    label: "Fitness",
     icon: Heart,
     listPageDescription:
-      "Browse partner programs for health software and wellness tools.",
+      "Browse the best affiliate programs for fitness, wellness and healthtech apps.",
   },
   {
     id: Category.Consumer,
     label: "Consumer",
     icon: User,
     listPageDescription:
-      "Browse partner programs for consumer apps and lifestyle products.",
+      "Browse the best affiliate programs for consumer apps and lifestyle software.",
   },
   {
     id: Category.Support,
     label: "Support",
     icon: Headset,
     listPageDescription:
-      "Browse partner programs for customer support and help desk tools.",
+      "Browse the best affiliate programs for customer support software and agentic tools.",
   },
 ];
 
diff --git a/apps/web/lib/openapi/analytics/index.ts b/apps/web/lib/openapi/analytics/index.ts
index d2ef6887a4f..21c36cefd3d 100644
--- a/apps/web/lib/openapi/analytics/index.ts
+++ b/apps/web/lib/openapi/analytics/index.ts
@@ -68,6 +68,11 @@ const retrieveAnalytics: ZodOpenApiOperationObject = {
                 id: "AnalyticsTriggers",
               }),
             ),
+            z.array(
+              analyticsResponse.event_names.meta({
+                id: "AnalyticsEventNames",
+              }),
+            ),
             z.array(
               analyticsResponse.referers.meta({
                 id: "AnalyticsReferers",
diff --git a/apps/web/lib/openapi/commissions/create-commission.ts b/apps/web/lib/openapi/commissions/create-commission.ts
index 9c6c9edf0cd..2a8744603a5 100644
--- a/apps/web/lib/openapi/commissions/create-commission.ts
+++ b/apps/web/lib/openapi/commissions/create-commission.ts
@@ -10,7 +10,7 @@ export const createCommission: ZodOpenApiOperationObject = {
   "x-speakeasy-name-override": "create",
   summary: "Create commission",
   description:
-    "Create one or more commissions (custom, lead or sale) for a partner. Commission creation is processed asynchronously. Use the List Commissions endpoint or webhooks to be notified when the commission is created.",
+    "Create one or more commissions (custom, lead or sale) for a partner. Custom commissions accept a negative `amount` to create a clawback. Commission creation is processed asynchronously – use the GET /commissions endpoint or webhooks to be notified when the commission is created.",
   requestBody: {
     content: {
       "application/json": {
diff --git a/apps/web/lib/openapi/discount-codes/create-discount-code.ts b/apps/web/lib/openapi/discount-codes/create-discount-code.ts
new file mode 100644
index 00000000000..2de1f2ebf91
--- /dev/null
+++ b/apps/web/lib/openapi/discount-codes/create-discount-code.ts
@@ -0,0 +1,34 @@
+import { openApiErrorResponses } from "@/lib/openapi/responses";
+import {
+  createDiscountCodeSchema,
+  DiscountCodeSchema,
+} from "@/lib/zod/schemas/discount";
+import { ZodOpenApiOperationObject } from "zod-openapi";
+
+export const createDiscountCode: ZodOpenApiOperationObject = {
+  operationId: "createDiscountCode",
+  "x-speakeasy-name-override": "create",
+  summary: "Create a discount code",
+  description:
+    "Create a discount code for a partner. The partner's group must already have a discount assigned to it, and the discount code must be associated with a link that is not already linked with another discount code.",
+  requestBody: {
+    content: {
+      "application/json": {
+        schema: createDiscountCodeSchema,
+      },
+    },
+  },
+  responses: {
+    "200": {
+      description: "The created discount code.",
+      content: {
+        "application/json": {
+          schema: DiscountCodeSchema,
+        },
+      },
+    },
+    ...openApiErrorResponses,
+  },
+  tags: ["Discount Codes"],
+  security: [{ token: [] }],
+};
diff --git a/apps/web/lib/openapi/discount-codes/delete-discount-code.ts b/apps/web/lib/openapi/discount-codes/delete-discount-code.ts
new file mode 100644
index 00000000000..06d8d21887a
--- /dev/null
+++ b/apps/web/lib/openapi/discount-codes/delete-discount-code.ts
@@ -0,0 +1,33 @@
+import { openApiErrorResponses } from "@/lib/openapi/responses";
+import { DiscountCodeSchema } from "@/lib/zod/schemas/discount";
+import { ZodOpenApiOperationObject } from "zod-openapi";
+import * as z from "zod/v4";
+
+export const deleteDiscountCode: ZodOpenApiOperationObject = {
+  operationId: "deleteDiscountCode",
+  "x-speakeasy-name-override": "delete",
+  "x-speakeasy-max-method-params": 1,
+  summary: "Delete a discount code",
+  description:
+    "Delete a discount code for a partner by its unique ID or alphanumeric code. This will also disable the code in your connected discount provider (Stripe, Shopify, or custom via `disccount.deleted` webhook).",
+  requestParams: {
+    path: z.object({
+      idOrCode: DiscountCodeSchema.shape.id.describe(
+        "The unique ID (e.g. `dcode_...`) or alphanumeric code (e.g. `ABC123`) of the discount code to delete.",
+      ),
+    }),
+  },
+  responses: {
+    "200": {
+      description: "The deleted discount code unique ID (e.g. `dcode_...`).",
+      content: {
+        "application/json": {
+          schema: DiscountCodeSchema.pick({ id: true }),
+        },
+      },
+    },
+    ...openApiErrorResponses,
+  },
+  tags: ["Discount Codes"],
+  security: [{ token: [] }],
+};
diff --git a/apps/web/lib/openapi/discount-codes/index.ts b/apps/web/lib/openapi/discount-codes/index.ts
new file mode 100644
index 00000000000..f5ec228406e
--- /dev/null
+++ b/apps/web/lib/openapi/discount-codes/index.ts
@@ -0,0 +1,14 @@
+import { ZodOpenApiPathsObject } from "zod-openapi";
+import { createDiscountCode } from "./create-discount-code";
+import { deleteDiscountCode } from "./delete-discount-code";
+import { listDiscountCodes } from "./list-discount-codes";
+
+export const discountCodesPaths: ZodOpenApiPathsObject = {
+  "/discount-codes": {
+    get: listDiscountCodes,
+    post: createDiscountCode,
+  },
+  "/discount-codes/{idOrCode}": {
+    delete: deleteDiscountCode,
+  },
+};
diff --git a/apps/web/lib/openapi/discount-codes/list-discount-codes.ts b/apps/web/lib/openapi/discount-codes/list-discount-codes.ts
new file mode 100644
index 00000000000..478ab0c97a1
--- /dev/null
+++ b/apps/web/lib/openapi/discount-codes/list-discount-codes.ts
@@ -0,0 +1,31 @@
+import { openApiErrorResponses } from "@/lib/openapi/responses";
+import {
+  DiscountCodeSchema,
+  getDiscountCodesQuerySchema,
+} from "@/lib/zod/schemas/discount";
+import { ZodOpenApiOperationObject } from "zod-openapi";
+import * as z from "zod/v4";
+
+export const listDiscountCodes: ZodOpenApiOperationObject = {
+  operationId: "listDiscountCodes",
+  "x-speakeasy-name-override": "list",
+  summary: "List discount codes",
+  description:
+    "Retrieve a paginated list of discount codes in a program or filtered by partner, discount, or code.",
+  requestParams: {
+    query: getDiscountCodesQuerySchema,
+  },
+  responses: {
+    "200": {
+      description: "The list of discount codes.",
+      content: {
+        "application/json": {
+          schema: z.array(DiscountCodeSchema),
+        },
+      },
+    },
+    ...openApiErrorResponses,
+  },
+  tags: ["Discount Codes"],
+  security: [{ token: [] }],
+};
diff --git a/apps/web/lib/openapi/index.ts b/apps/web/lib/openapi/index.ts
index 9669bda97cb..0044fc30b02 100644
--- a/apps/web/lib/openapi/index.ts
+++ b/apps/web/lib/openapi/index.ts
@@ -1,5 +1,6 @@
 import { createDocument } from "zod-openapi";
 import { webhookEventSchema } from "../webhook/schemas";
+import { DiscountCodeSchema } from "../zod/schemas/discount";
 import { DomainSchema } from "../zod/schemas/domains";
 import { FolderSchema } from "../zod/schemas/folders";
 import { LinkErrorSchema, LinkSchema } from "../zod/schemas/links";
@@ -8,6 +9,7 @@ import { analyticsPath } from "./analytics";
 import { bountiesPaths } from "./bounties";
 import { commissionsPaths } from "./commissions";
 import { customersPaths } from "./customers";
+import { discountCodesPaths } from "./discount-codes";
 import { domainsPaths } from "./domains";
 import { embedTokensPaths } from "./embed-tokens";
 import { eventsPath } from "./events";
@@ -53,6 +55,7 @@ export const document = createDocument({
     ...trackPaths,
     ...customersPaths,
     ...partnersPaths,
+    ...discountCodesPaths,
     ...commissionsPaths,
     ...payoutsPaths,
     ...embedTokensPaths,
@@ -65,6 +68,7 @@ export const document = createDocument({
       LinkTagSchema,
       FolderSchema,
       DomainSchema,
+      DiscountCodeSchema,
       webhookEventSchema,
       LinkErrorSchema,
     },
diff --git a/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx b/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
index 6d4354506cc..07733c34f2a 100644
--- a/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
+++ b/apps/web/lib/partner-referrals/components/attribute-referring-partner-modal.tsx
@@ -197,7 +197,7 @@ export function useAttributeReferringPartnerModal({
         partner={partner}
       />
     );
-  }, [showModal, setShowModal, partner]);
+  }, [showModal, setShowModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/lib/partner-referrals/create-network-referral-commission.ts b/apps/web/lib/partner-referrals/create-network-referral-commission.ts
index 8eed88b52f1..72f90f4d8d2 100644
--- a/apps/web/lib/partner-referrals/create-network-referral-commission.ts
+++ b/apps/web/lib/partner-referrals/create-network-referral-commission.ts
@@ -2,6 +2,7 @@ import { prisma } from "@/lib/prisma";
 import {
   ACME_PROGRAM_ID,
   currencyFormatter,
+  DEMO_PROGRAM_ID,
   log,
   nanoid,
   NETWORK_PROGRAM_ID,
@@ -40,9 +41,13 @@ export const createNetworkReferralCommission = async ({
     return null;
   }
 
-  if ([NETWORK_PROGRAM_ID, ACME_PROGRAM_ID].includes(payout.programId)) {
+  if (
+    [NETWORK_PROGRAM_ID, ACME_PROGRAM_ID, DEMO_PROGRAM_ID].includes(
+      payout.programId,
+    )
+  ) {
     console.error(
-      `Payout ${payout.id} is from Network or Acme program, skipping...`,
+      `Payout ${payout.id} is from Network, Acme, or Demo program, skipping...`,
     );
     return null;
   }
@@ -162,11 +167,14 @@ export const createNetworkReferralCommission = async ({
     console.error(`No customer found for partner ${partner.id}.`);
   }
 
-  const reward = determinePartnerReward({
+  const partnerReward = await determinePartnerReward({
     event: "sale",
     programEnrollment,
+    linkId: null,
   });
 
+  const reward = partnerReward?.reward;
+
   if (!reward) {
     console.log(
       `Referrer partner ${partner.referredByPartnerId} has no eligible reward for the network program.`,
diff --git a/apps/web/lib/partners/complete-program-applications.ts b/apps/web/lib/partners/complete-program-applications.ts
index 3cbd44efb3b..5e91493af96 100644
--- a/apps/web/lib/partners/complete-program-applications.ts
+++ b/apps/web/lib/partners/complete-program-applications.ts
@@ -1,11 +1,12 @@
 import { prisma } from "@/lib/prisma";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { PlatformType, Prisma } from "@prisma/client";
 import { createId } from "../api/create-id";
 import { detectAndRecordFraudApplication } from "../api/fraud/detect-record-fraud-application";
 import { notifyPartnerApplication } from "../api/partners/notify-partner-application";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { markApplicationEventSubmitted } from "../application-events/update-application-event";
-import { qstash } from "../cron";
+import { autoApprovePartnerJob } from "../jobs/handlers/auto-approve-partner-job";
+import { autoRejectPartnerJob } from "../jobs/handlers/auto-reject-partner-job";
 import { buildSocialPlatformLookup } from "../social-utils";
 import { sendWorkspaceWebhook } from "../webhook/publish";
 import { partnerApplicationWebhookSchema } from "../zod/schemas/program-application";
@@ -89,19 +90,23 @@ export async function completeProgramApplications(userEmail: string) {
 
     const partner = user.partners[0].partner;
 
-    // Program enrollments to create
-    const programEnrollments: Prisma.ProgramEnrollmentCreateManyInput[] =
-      filteredProgramApplications.map((programApplication) => ({
-        id: createId({ prefix: "pge_" }),
-        programId: programApplication.programId,
-        partnerId: user.partners[0].partnerId,
-        applicationId: programApplication.id,
-        groupId: programApplication?.partnerGroup?.id,
-        clickRewardId: programApplication?.partnerGroup?.clickRewardId,
-        leadRewardId: programApplication?.partnerGroup?.leadRewardId,
-        saleRewardId: programApplication?.partnerGroup?.saleRewardId,
-        discountId: programApplication?.partnerGroup?.discountId,
-      }));
+    // Program enrollments to create. `id` is narrowed to required because the
+    // search sync below reads it back, and Prisma leaves it optional here.
+    const programEnrollments: (Prisma.ProgramEnrollmentCreateManyInput & {
+      id: string;
+    })[] = filteredProgramApplications.map((programApplication) => ({
+      id: createId({ prefix: "pge_" }),
+      programId: programApplication.programId,
+      partnerId: user.partners[0].partnerId,
+      applicationId: programApplication.id,
+      groupId: programApplication?.partnerGroup?.id,
+      clickRewardId: programApplication?.partnerGroup?.clickRewardId,
+      leadRewardId: programApplication?.partnerGroup?.leadRewardId,
+      saleRewardId: programApplication?.partnerGroup?.saleRewardId,
+      customRewardId: programApplication?.partnerGroup?.customRewardId,
+      referralRewardId: programApplication?.partnerGroup?.referralRewardId,
+      discountId: programApplication?.partnerGroup?.discountId,
+    }));
 
     const enrollmentsByApplicationId = new Map(
       programEnrollments.map((enrollment) => [
@@ -202,13 +207,15 @@ export async function completeProgramApplications(userEmail: string) {
 
               // Auto-approve the partner if the group has auto-approval enabled
               group?.autoApprovePartnersEnabledAt
-                ? qstash.publishJSON({
-                    url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/auto-approve`,
-                    body: {
+                ? autoApprovePartnerJob.dispatch(
+                    {
                       programId: program.id,
                       partnerId: partner.id,
                     },
-                  })
+                    {
+                      label: partner.id,
+                    },
+                  )
                 : Promise.resolve(null),
 
               // Send "partner.application_submitted" webhook
@@ -231,14 +238,16 @@ export async function completeProgramApplications(userEmail: string) {
                 }),
             ]
           : [
-              qstash.publishJSON({
-                url: `${APP_DOMAIN_WITH_NGROK}/api/cron/partners/auto-reject`,
-                delay: 5 * 60, // 5 minutes
-                body: {
+              autoRejectPartnerJob.dispatch(
+                {
                   programId: program.id,
                   partnerId: partner.id,
                 },
-              }),
+                {
+                  delay: 5 * 60, // 5 minutes
+                  label: partner.id,
+                },
+              ),
             ]),
 
         // if the application has any website or social fields but the partner doesn't have the corresponding one (maybe they forgot to add during onboarding)
@@ -270,6 +279,11 @@ export async function completeProgramApplications(userEmail: string) {
         markApplicationEventSubmitted(programEnrollment),
       ),
     );
+
+    // Queue an index update because the applications completed into enrollments.
+    await queuePartnerSearchSync({
+      enrollmentIds: programEnrollments.map(({ id }) => id),
+    });
   } catch (error) {
     console.error("Failed to complete program applications", error);
   }
diff --git a/apps/web/lib/partners/create-stablecoin-payout.ts b/apps/web/lib/partners/create-stablecoin-payout.ts
index 73d6352881a..1199d67bcff 100644
--- a/apps/web/lib/partners/create-stablecoin-payout.ts
+++ b/apps/web/lib/partners/create-stablecoin-payout.ts
@@ -19,6 +19,7 @@ import {
   MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,
   MIN_WITHDRAWAL_AMOUNT_CENTS,
   STABLECOIN_PAYOUT_FEE_RATE,
+  STABLECOIN_PAYOUT_FIXED_FEE_CENTS,
 } from "../constants/payouts";
 import { enqueueBatchJobs } from "../cron/enqueue-batch-jobs";
 import { createPayoutsIdempotencyKey } from "../payouts/create-payouts-idempotency-key";
@@ -26,6 +27,7 @@ import { markPayoutsAsProcessed } from "../payouts/mark-payouts-as-processed";
 import { createStripeOutboundPayment } from "../stripe/create-stripe-outbound-payment";
 import { fundFinancialAccount } from "../stripe/fund-financial-account";
 import { getStripeRecipientAccount } from "../stripe/get-stripe-recipient-account";
+import { getStripeRecipientPayoutMethod } from "../stripe/get-stripe-recipient-payout-method";
 
 interface CreateStablecoinPayoutParams {
   partnerId: string;
@@ -226,6 +228,32 @@ export const createStablecoinPayout = async ({
     }
   }
 
+  const stripePayoutMethod = await getStripeRecipientPayoutMethod(
+    partner.stripeRecipientId,
+  );
+
+  if (!stripePayoutMethod?.id) {
+    await prisma.partner.update({
+      where: {
+        id: partner.id,
+      },
+      data: {
+        payoutsEnabledAt: null,
+      },
+    });
+
+    await markPayoutsAsProcessed(currentInvoicePayouts);
+
+    const message = `Stripe recipient account for partner ${partner.email} does not have an active crypto wallet payout method.`;
+
+    if (forceWithdrawal) {
+      throw new Error(message);
+    } else {
+      console.warn(message);
+      return;
+    }
+  }
+
   const allPayoutsProgramNames = [
     ...new Set(allPayouts.map((p) => p.program.name)),
   ];
@@ -238,13 +266,20 @@ export const createStablecoinPayout = async ({
 
   if (amountToTransferToFA > 0) {
     await fundFinancialAccount({
-      amount: amountToTransferToFA,
+      // if there are no current invoice payouts (meaning partner is running a forceWithdrawal for previously processed payouts)
+      // we need to add the STABLECOIN_PAYOUT_FIXED_FEE_CENTS to the amount to transfer to the FA (to cover the Stablecoin payout fee)
+      amount:
+        amountToTransferToFA +
+        (currentInvoicePayouts.length === 0 && forceWithdrawal
+          ? STABLECOIN_PAYOUT_FIXED_FEE_CENTS
+          : 0),
       idempotencyKey,
     });
   }
 
   const outboundPayment = await createStripeOutboundPayment({
     stripeRecipientId: partner.stripeRecipientId,
+    payoutMethodId: stripePayoutMethod.id,
     amount: totalTransferableAmount,
     description: `Dub Partners payout (${allPayoutsProgramNames.join(", ")})`,
     idempotencyKey,
diff --git a/apps/web/lib/partners/determine-partner-reward.ts b/apps/web/lib/partners/determine-partner-reward.ts
index 1bc18e417ec..26f92ae96fb 100644
--- a/apps/web/lib/partners/determine-partner-reward.ts
+++ b/apps/web/lib/partners/determine-partner-reward.ts
@@ -1,7 +1,8 @@
-import { prettyPrint, toCentsNumber } from "@dub/utils";
+import { toCentsNumber } from "@dub/utils";
 import { EventType, Link, Prisma, Reward } from "@prisma/client";
 import { serializeReward } from "../api/partners/serialize-reward";
-import { RewardContext, RewardProps } from "../types";
+import { prisma } from "../prisma";
+import { RewardConditions, RewardContext, RewardProps } from "../types";
 import {
   rewardConditionsArraySchema,
   RewardSchema,
@@ -14,7 +15,7 @@ const REWARD_EVENT_COLUMN_MAPPING = {
   [EventType.click]: "clickReward",
   [EventType.lead]: "leadReward",
   [EventType.sale]: "saleReward",
-};
+} as const;
 
 interface ProgramEnrollmentWithReward {
   partner: { country: string | null };
@@ -27,23 +28,73 @@ interface ProgramEnrollmentWithReward {
 
 interface ProductReward {
   reward: RewardProps;
+  matchedCondition: RewardConditions | null;
   sale: {
     amount: number;
     quantity: number;
   };
 }
 
-export const determinePartnerReward = ({
+interface LinkRewards {
+  clickReward?: Reward | null;
+  leadReward?: Reward | null;
+  saleReward?: Reward | null;
+}
+
+type DeterminePartnerRewardResult = {
+  reward: RewardProps;
+  matchedCondition: RewardConditions | null;
+};
+
+export const getRewardMaxDurationForContext = ({
+  reward,
+  context,
+}: {
+  reward: Pick<Reward, "maxDuration" | "modifiers">;
+  context?: RewardContext;
+}): number | null => {
+  if (!reward.modifiers || !context) {
+    return reward.maxDuration;
+  }
+
+  const modifiers = rewardConditionsArraySchema.safeParse(reward.modifiers);
+
+  if (!modifiers.success) {
+    return reward.maxDuration;
+  }
+
+  const matchedCondition = evaluateRewardConditions({
+    conditions: modifiers.data,
+    context,
+  });
+
+  if (matchedCondition && matchedCondition.maxDuration !== undefined) {
+    return matchedCondition.maxDuration;
+  }
+
+  return reward.maxDuration;
+};
+
+export const determinePartnerReward = async ({
   event,
   programEnrollment,
+  linkId,
   context,
 }: {
   event: EventType;
   programEnrollment: ProgramEnrollmentWithReward;
+  linkId: string | null; // ID of the link that triggered the event
   context?: RewardContext; // additional reward context (e.g. customer.country, sale.productId, etc.)
-}) => {
-  let partnerReward: Reward =
-    programEnrollment[REWARD_EVENT_COLUMN_MAPPING[event]];
+}): Promise<DeterminePartnerRewardResult | null> => {
+  const rewardEventColumn = REWARD_EVENT_COLUMN_MAPPING[event];
+
+  const linkRewards = await getLinkRewards({
+    event,
+    linkId,
+  });
+
+  let partnerReward =
+    linkRewards?.[rewardEventColumn] ?? programEnrollment[rewardEventColumn];
 
   if (!partnerReward) {
     return null;
@@ -62,6 +113,8 @@ export const determinePartnerReward = ({
     },
   };
 
+  let matchedCondition: RewardConditions | null = null;
+
   if (partnerReward.modifiers && context) {
     const modifiers = rewardConditionsArraySchema.safeParse(
       partnerReward.modifiers,
@@ -69,7 +122,7 @@ export const determinePartnerReward = ({
 
     // Parse the conditions before evaluating them
     if (modifiers.success) {
-      const matchedCondition = evaluateRewardConditions({
+      matchedCondition = evaluateRewardConditions({
         conditions: modifiers.data,
         context,
       });
@@ -102,43 +155,63 @@ export const determinePartnerReward = ({
     return null;
   }
 
-  return RewardSchema.parse(partnerReward);
+  return {
+    reward: RewardSchema.parse(partnerReward),
+    matchedCondition,
+  };
 };
 
-export const determinePartnerRewards = ({
+// Resolves one or more rewards for a sale: when Stripe line items have a
+// productId modifier, returns a reward per product; otherwise a single reward.
+export const determinePartnerRewards = async ({
   event,
   programEnrollment,
   context,
   amount,
   quantity,
+  linkId,
 }: {
   event: EventType;
   programEnrollment: ProgramEnrollmentWithReward;
   context?: RewardContext; // additional reward context (e.g. customer.country, sale.productId, etc.)
   amount: number;
   quantity: number;
-}): ProductReward[] => {
+  linkId: string | null;
+}): Promise<ProductReward[]> => {
   const rewards: ProductReward[] = [];
   const products = context?.sale?.products ?? [];
-  const modifiers = rewardConditionsArraySchema.safeParse(
-    programEnrollment.saleReward?.modifiers,
-  );
+  let hasProductIdModifier = false;
+
+  if (products.length > 0) {
+    const linkRewards = await getLinkRewards({
+      event,
+      linkId,
+    });
+
+    const partnerReward =
+      linkRewards?.saleReward ?? programEnrollment["saleReward"];
+
+    const modifiers = rewardConditionsArraySchema.safeParse(
+      partnerReward?.modifiers,
+    );
 
-  const hasProductIdModifier = modifiers.success
-    ? modifiers.data.some((m) =>
+    if (modifiers.success) {
+      hasProductIdModifier = modifiers.data.some((m) =>
         m.conditions.some(
           (c) => c.entity === "sale" && c.attribute === "productId",
         ),
-      )
-    : false;
+      );
+    }
+  }
 
   // If there are products and a productId modifier,
   // we need to calculate the reward for each product (for Stripe integration only)
   if (products.length > 0 && hasProductIdModifier) {
     for (const product of products) {
-      const reward = determinePartnerReward({
+      const result = await determinePartnerReward({
         event,
         programEnrollment,
+        linkId,
         context: {
           ...context,
           sale: {
@@ -149,26 +222,31 @@ export const determinePartnerRewards = ({
         },
       });
 
-      if (reward) {
+      if (result) {
+        // product.amount is the Stripe line total (unit × quantity). Flat
+        // rewards are per sale/line, so do not multiply by line.quantity.
         rewards.push({
-          reward,
+          reward: result.reward,
+          matchedCondition: result.matchedCondition,
           sale: {
             amount: product.amount,
-            quantity: product.quantity,
+            quantity: 1,
           },
         });
       }
     }
   } else {
-    const reward = determinePartnerReward({
+    const result = await determinePartnerReward({
       event,
       programEnrollment,
+      linkId,
       ...(context ? { context } : {}),
     });
 
-    if (reward) {
+    if (result) {
       rewards.push({
-        reward,
+        reward: result.reward,
+        matchedCondition: result.matchedCondition,
         sale: {
           amount,
           quantity,
@@ -177,7 +255,28 @@ export const determinePartnerRewards = ({
     }
   }
 
-  console.log("Reward context", prettyPrint(context));
-
   return rewards;
 };
+
+const getLinkRewards = async ({
+  event,
+  linkId,
+}: {
+  event: EventType;
+  linkId: string | null;
+}): Promise<LinkRewards | null> => {
+  if (!linkId) {
+    return null;
+  }
+
+  const rewardEventColumn = REWARD_EVENT_COLUMN_MAPPING[event];
+
+  return prisma.linkReward.findUnique({
+    where: {
+      linkId,
+    },
+    select: {
+      [rewardEventColumn]: true,
+    },
+  });
+};
diff --git a/apps/web/lib/partners/dispatch-partner-utm-sync.ts b/apps/web/lib/partners/dispatch-partner-utm-sync.ts
new file mode 100644
index 00000000000..a374e7fde32
--- /dev/null
+++ b/apps/web/lib/partners/dispatch-partner-utm-sync.ts
@@ -0,0 +1,45 @@
+import { syncGroupUtmJob } from "@/lib/jobs/handlers/sync-group-utm-job";
+import { prisma } from "@/lib/prisma";
+
+// Partner UTM macros ({{PARTNER_NAME}}, {{PARTNER_LINK_KEY}}) are resolved into
+// concrete Link.url / utm_* values at write time.
+// When Partner.name changes, those stored values go stale unless we re-run syncGroupUtmJob.
+export async function dispatchGroupUtmSyncForPartner(partnerId: string) {
+  const programEnrollments = await prisma.programEnrollment.findMany({
+    where: {
+      partnerId,
+      groupId: {
+        not: null,
+      },
+    },
+    select: {
+      groupId: true,
+    },
+  });
+
+  const groupIds = [
+    ...new Set(
+      programEnrollments
+        .map((enrollment) => enrollment.groupId)
+        .filter((id): id is string => id != null),
+    ),
+  ];
+
+  if (groupIds.length === 0) {
+    return;
+  }
+
+  await Promise.all(
+    groupIds.map((groupId) =>
+      syncGroupUtmJob.dispatch(
+        {
+          groupId,
+          partnerIds: [partnerId],
+        },
+        {
+          label: groupId,
+        },
+      ),
+    ),
+  );
+}
diff --git a/apps/web/lib/partners/get-group-rewards-and-discount.ts b/apps/web/lib/partners/get-group-rewards-and-discount.ts
index eb6fde431e2..5a710e0a9c3 100644
--- a/apps/web/lib/partners/get-group-rewards-and-discount.ts
+++ b/apps/web/lib/partners/get-group-rewards-and-discount.ts
@@ -1,3 +1,4 @@
+import { isEventBasedReward } from "@/lib/api/rewards/custom-reward-utils";
 import { GroupProps, RewardProps } from "@/lib/types";
 
 // Determines the rewards and discount for the partner group
@@ -7,9 +8,9 @@ export function getGroupRewardsAndDiscount({
   leadReward,
   discount,
 }: Pick<GroupProps, "clickReward" | "saleReward" | "leadReward" | "discount">) {
-  const rewards = [clickReward, saleReward, leadReward].filter(
-    (r): r is RewardProps => r !== null,
-  );
+  const rewards = [clickReward, saleReward, leadReward]
+    .filter((r): r is RewardProps => r !== null)
+    .filter(isEventBasedReward);
 
   return {
     rewards,
diff --git a/apps/web/lib/partners/macros.ts b/apps/web/lib/partners/macros.ts
new file mode 100644
index 00000000000..aad7f0191db
--- /dev/null
+++ b/apps/web/lib/partners/macros.ts
@@ -0,0 +1,54 @@
+export interface PartnerMacroContext {
+  partnerName: string;
+  partnerLinkKey: string;
+}
+
+export const PARTNER_MACROS = [
+  {
+    macro: "{{PARTNER_NAME}}",
+    description: "The partner's name (e.g. 'John Doe')",
+  },
+  {
+    macro: "{{PARTNER_LINK_KEY}}",
+    description: "The partner's link key (e.g. 'john-doe')",
+  },
+] as const;
+
+export const PARTNER_MACRO_VALUES: readonly string[] = PARTNER_MACROS.map(
+  (m) => m.macro,
+);
+
+const MACRO_TOKEN_RE = /\{\{[^}]+\}\}/g;
+
+// Every `{{...}}` substring must be a known partner macro.
+export function isValidPartnerMacroTemplate(value: string): boolean {
+  const matches = value.match(MACRO_TOKEN_RE) ?? [];
+  return matches.every((token) => PARTNER_MACRO_VALUES.includes(token));
+}
+
+// Validates a free-form value (any `{{...}}` tokens must be known macros).
+export function assertValidPartnerMacroValue(value: string): void {
+  if (!isValidPartnerMacroTemplate(value)) {
+    throw new Error(
+      `Invalid macro in value. Use only: ${PARTNER_MACRO_VALUES.join(", ")}`,
+    );
+  }
+}
+
+const macroReplacements: Record<string, keyof PartnerMacroContext> = {
+  "{{PARTNER_NAME}}": "partnerName",
+  "{{PARTNER_LINK_KEY}}": "partnerLinkKey",
+};
+
+export function resolvePartnerMacros(
+  value: string,
+  context: PartnerMacroContext,
+): string {
+  let resolvedValue = value;
+
+  for (const [macro, contextKey] of Object.entries(macroReplacements)) {
+    resolvedValue = resolvedValue.replaceAll(macro, context[contextKey] ?? "");
+  }
+
+  return resolvedValue;
+}
diff --git a/apps/web/lib/partners/query-link-structure-help-text.tsx b/apps/web/lib/partners/query-link-structure-help-text.tsx
index 10d68c7bf80..e7dff58bba9 100644
--- a/apps/web/lib/partners/query-link-structure-help-text.tsx
+++ b/apps/web/lib/partners/query-link-structure-help-text.tsx
@@ -21,14 +21,14 @@ export const QueryLinkStructureHelpText = ({
         href={link.url}
         target="_blank"
         rel="noopener noreferrer"
-        className="cursor-alias text-neutral-700 decoration-dotted underline-offset-2 hover:underline"
+        className="cursor-alias font-medium text-neutral-700 decoration-dotted underline-offset-2 hover:underline"
       >
         {getDomainWithoutWWW(link.url)}
       </a>{" "}
       by adding{" "}
       <CopyText
         value={appendValue}
-        className="font-mono text-xs text-neutral-700"
+        className="font-mono text-xs font-medium text-neutral-700"
       >
         {appendValue}
       </CopyText>{" "}
diff --git a/apps/web/lib/partners/queue-partner-commission-creation.ts b/apps/web/lib/partners/queue-partner-commission-creation.ts
index bc0bf49f12a..51b7d89147c 100644
--- a/apps/web/lib/partners/queue-partner-commission-creation.ts
+++ b/apps/web/lib/partners/queue-partner-commission-creation.ts
@@ -1,5 +1,5 @@
 import { getProgramEnrollmentOrThrow } from "../api/programs/get-program-enrollment-or-throw";
-import { triggerQStashWorkflow } from "../cron/qstash-workflow";
+import { dispatchWorkflows } from "../jobs/publish-workflows";
 import { CreatePartnerCommissionProps } from "../types";
 import { constructWebhookPartner } from "./constuct-webhook-partner";
 
@@ -19,13 +19,15 @@ export const queuePartnerCommissionCreation = async (
 
   const { partner, links, ...programEnrollment } = result;
 
-  await triggerQStashWorkflow({
-    workflowType: "create-partner-commission",
-    workflowLabel: bountySubmissionId ?? customerId ?? partnerId,
-    body: params,
-    flowControl: {
-      key: partnerId,
-      parallelism: 1,
+  await dispatchWorkflows({
+    name: "create-partner-commission-workflow",
+    payload: params,
+    options: {
+      flowControl: {
+        key: partnerId,
+        parallelism: 1,
+      },
+      label: bountySubmissionId ?? customerId ?? partnerId,
     },
   });
 
diff --git a/apps/web/lib/partners/sync-partner-identity.ts b/apps/web/lib/partners/sync-partner-identity.ts
index 4467f934407..db5830b1926 100644
--- a/apps/web/lib/partners/sync-partner-identity.ts
+++ b/apps/web/lib/partners/sync-partner-identity.ts
@@ -1,8 +1,11 @@
 import { DubApiError } from "@/lib/api/errors";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
 import { requestEmailChange } from "@/lib/auth/request-email-change";
+import { dispatchGroupUtmSyncForPartner } from "@/lib/partners/dispatch-partner-utm-sync";
 import { prisma } from "@/lib/prisma";
 import { storage } from "@/lib/storage";
 import { nanoid } from "@dub/utils";
+import { waitUntil } from "@vercel/functions";
 
 export async function assertEmailAvailableForIdentitySync({
   newEmail,
@@ -101,6 +104,17 @@ export async function syncNameAndImageToPartner({
       ...(hasImageUpdate && { image: partnerImage ?? null }),
     },
   });
+
+  // Queue an index update because the partner name changed. An image-only sync
+  // is skipped, since the image is not indexed.
+  if (hasNameUpdate && name) {
+    waitUntil(
+      Promise.all([
+        dispatchGroupUtmSyncForPartner(partnerId),
+        queuePartnerSearchSync({ partnerIds: [partnerId] }),
+      ]),
+    );
+  }
 }
 
 export async function syncNameAndImageToUser({
diff --git a/apps/web/lib/partnerstack/import-commissions.ts b/apps/web/lib/partnerstack/import-commissions.ts
index e1368cf3a52..d06fc1ba41b 100644
--- a/apps/web/lib/partnerstack/import-commissions.ts
+++ b/apps/web/lib/partnerstack/import-commissions.ts
@@ -1,6 +1,12 @@
 import { prisma } from "@/lib/prisma";
-import { nanoid } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import { nanoid, sleep } from "@dub/utils";
+import {
+  CommissionSource,
+  CommissionStatus,
+  Customer,
+  Link,
+  Program,
+} from "@prisma/client";
 import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
 import { isFirstConversion } from "../analytics/is-first-conversion";
 import { createId } from "../api/create-id";
@@ -118,7 +124,7 @@ export async function importCommissions(payload: PartnerStackImportPayload) {
     processedBatches++;
   }
 
-  await new Promise((resolve) => setTimeout(resolve, 1000));
+  await sleep(1000);
 
   await partnerStackImporter.queue({
     ...payload,
@@ -216,6 +222,7 @@ export async function createCommissionFromPS({
         status: toDubStatus[commission.reward_status],
         invoiceId: commission.key,
         createdAt: new Date(commission.created_at),
+        source: CommissionSource.partnerstack,
       },
     });
 
@@ -373,6 +380,7 @@ export async function createCommissionFromPS({
         status: toDubStatus[commission.reward_status],
         invoiceId: commission.key, // this is not the actual invoice ID, but we use this to deduplicate the sales
         createdAt: new Date(commission.created_at),
+        source: CommissionSource.partnerstack,
       },
     }),
 
diff --git a/apps/web/lib/partnerstack/import-customers.ts b/apps/web/lib/partnerstack/import-customers.ts
index 98742b6740f..798a8fa58c8 100644
--- a/apps/web/lib/partnerstack/import-customers.ts
+++ b/apps/web/lib/partnerstack/import-customers.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@/lib/prisma";
-import { chunk, nanoid } from "@dub/utils";
+import { chunk, nanoid, sleep } from "@dub/utils";
 import { Customer, Link, Project } from "@prisma/client";
 import { createId } from "../api/create-id";
 import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
@@ -169,7 +169,7 @@ export async function importCustomers(payload: PartnerStackImportPayload) {
       }
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     currentStartingAfter = customers[customers.length - 1].key;
diff --git a/apps/web/lib/partnerstack/import-links.ts b/apps/web/lib/partnerstack/import-links.ts
index 1faf57d3eb8..e9b43599bbd 100644
--- a/apps/web/lib/partnerstack/import-links.ts
+++ b/apps/web/lib/partnerstack/import-links.ts
@@ -1,4 +1,6 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
+
 import { createLink } from "../api/links";
 import { generatePartnerLink } from "../api/partners/generate-partner-link";
 import { logImportError } from "../tinybird/log-import-error";
@@ -107,7 +109,7 @@ export async function importLinks(payload: PartnerStackImportPayload) {
       );
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await sleep(100);
   }
 
   await partnerStackImporter.queue({
diff --git a/apps/web/lib/partnerstack/import-partners.ts b/apps/web/lib/partnerstack/import-partners.ts
index a6f3eb65dee..d6e746a6359 100644
--- a/apps/web/lib/partnerstack/import-partners.ts
+++ b/apps/web/lib/partnerstack/import-partners.ts
@@ -1,7 +1,8 @@
 import { prisma } from "@/lib/prisma";
-import { COUNTRIES, COUNTRY_CODES } from "@dub/utils";
+import { COUNTRIES, COUNTRY_CODES, sleep } from "@dub/utils";
 import { PartnerGroup, Program } from "@prisma/client";
 import { createId } from "../api/create-id";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { logImportError } from "../tinybird/log-import-error";
 import { redis } from "../upstash";
 import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -56,7 +57,7 @@ export async function importPartners(payload: PartnerStackImportPayload) {
       break;
     }
 
-    await Promise.allSettled(
+    const results = await Promise.allSettled(
       partners.map((partner) =>
         createPartner({
           program,
@@ -67,7 +68,16 @@ export async function importPartners(payload: PartnerStackImportPayload) {
       ),
     );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    // Queue an index update because the imported partners were enrolled. Queued
+    // per page rather than per partner.
+    await queuePartnerSearchSync({
+      partnerIds: results.flatMap((result) =>
+        result.status === "fulfilled" && result.value ? [result.value] : [],
+      ),
+      programId,
+    });
+
+    await sleep(2000);
 
     processedBatches++;
     currentStartingAfter = partners[partners.length - 1].key;
@@ -186,6 +196,7 @@ async function createPartner({
       leadRewardId: group.leadRewardId,
       saleRewardId: group.saleRewardId,
       referralRewardId: group.referralRewardId,
+      customRewardId: group.customRewardId,
       discountId: group.discountId,
     },
     update: {
@@ -196,7 +207,15 @@ async function createPartner({
   // PS doesn't return the partner email address in the customers response
   // so we need to keep a map of partner_key (PS) -> partner_id (Dub)
   // and use it to identify the partner in the customers response
-  await redis.hset(`${PARTNER_IDS_KEY_PREFIX}:${program.id}`, {
-    [partner.key]: partnerId,
-  });
+  try {
+    await redis.hset(`${PARTNER_IDS_KEY_PREFIX}:${program.id}`, {
+      [partner.key]: partnerId,
+    });
+  } catch (error) {
+    // The enrollment is already committed, so its ID must still reach the
+    // page-level search sync even when the mapping write fails.
+    console.error("Failed to map imported partner key", error, partner.key);
+  }
+
+  return partnerId;
 }
diff --git a/apps/web/lib/partnerstack/import-scheduled-commissions.ts b/apps/web/lib/partnerstack/import-scheduled-commissions.ts
index d112f8aa2a1..faf99c70274 100644
--- a/apps/web/lib/partnerstack/import-scheduled-commissions.ts
+++ b/apps/web/lib/partnerstack/import-scheduled-commissions.ts
@@ -1,4 +1,6 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
+
 import { getLeadEvents } from "../tinybird/get-lead-events";
 import { redis } from "../upstash";
 import { PartnerStackApi } from "./api";
@@ -101,7 +103,7 @@ export async function importScheduledCommissions(
 
   // If there are more scheduled commissions to import, sleep for 1 second and continue the loop
   if (hasMore) {
-    await new Promise((resolve) => setTimeout(resolve, 1000));
+    await sleep(1000);
   } else {
     // else, delete the credentials and exit the loop
     await partnerStackImporter.deleteCredentials(program.workspaceId);
diff --git a/apps/web/lib/partnerstack/update-stripe-customers.ts b/apps/web/lib/partnerstack/update-stripe-customers.ts
index b26887fb34b..d424eede284 100644
--- a/apps/web/lib/partnerstack/update-stripe-customers.ts
+++ b/apps/web/lib/partnerstack/update-stripe-customers.ts
@@ -1,8 +1,10 @@
 import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import ProgramImported from "@dub/email/templates/program-imported";
+import { sleep } from "@dub/utils";
 import { Customer, Project } from "@prisma/client";
 import Stripe from "stripe";
+
 import { stripeAppClient } from "../stripe";
 import { logImportError } from "../tinybird/log-import-error";
 import { MAX_BATCHES, partnerStackImporter } from "./importer";
@@ -37,71 +39,70 @@ export async function updateStripeCustomers(
     },
   });
 
-  if (!workspace.stripeConnectId) {
-    console.error(
-      `Workspace ${workspace.id} has no stripeConnectId. Skipping...`,
-    );
-    return;
-  }
-
-  let hasMore = true;
-  let processedBatches = 0;
-  let currentStartingAfter = startingAfter;
-
-  while (hasMore && processedBatches < MAX_BATCHES) {
-    const customers = await prisma.customer.findMany({
-      where: {
-        projectId: workspace.id,
-        stripeCustomerId: null,
-        email: {
-          not: null,
+  if (workspace.stripeConnectId) {
+    let hasMore = true;
+    let processedBatches = 0;
+    let currentStartingAfter = startingAfter;
+
+    while (hasMore && processedBatches < MAX_BATCHES) {
+      const customers = await prisma.customer.findMany({
+        where: {
+          projectId: workspace.id,
+          stripeCustomerId: null,
+          email: {
+            not: null,
+          },
         },
-      },
-      select: {
-        id: true,
-        name: true,
-        email: true,
-      },
-      orderBy: {
-        id: "asc",
-      },
-      take: CUSTOMERS_PER_BATCH,
-      skip: currentStartingAfter ? 1 : 0,
-      ...(currentStartingAfter && {
-        cursor: {
-          id: currentStartingAfter,
+        select: {
+          id: true,
+          name: true,
+          email: true,
         },
-      }),
-    });
+        orderBy: {
+          id: "asc",
+        },
+        take: CUSTOMERS_PER_BATCH,
+        skip: currentStartingAfter ? 1 : 0,
+        ...(currentStartingAfter && {
+          cursor: {
+            id: currentStartingAfter,
+          },
+        }),
+      });
 
-    if (customers.length === 0) {
-      hasMore = false;
-      break;
-    }
+      if (customers.length === 0) {
+        hasMore = false;
+        break;
+      }
 
-    await Promise.allSettled(
-      customers.map((customer) =>
-        searchStripeAndUpdateCustomer({
-          workspace,
-          customer,
-          importId,
-        }),
-      ),
-    );
+      await Promise.allSettled(
+        customers.map((customer) =>
+          searchStripeAndUpdateCustomer({
+            workspace,
+            customer,
+            importId,
+          }),
+        ),
+      );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+      await sleep(2000);
 
-    processedBatches++;
-    currentStartingAfter = customers[customers.length - 1].id;
-  }
+      processedBatches++;
+      currentStartingAfter = customers[customers.length - 1].id;
+    }
 
-  if (hasMore) {
-    await partnerStackImporter.queue({
-      ...payload,
-      startingAfter: currentStartingAfter,
-      action: "update-stripe-customers",
-    });
-    return;
+    if (hasMore) {
+      await partnerStackImporter.queue({
+        ...payload,
+        startingAfter: currentStartingAfter,
+        action: "update-stripe-customers",
+      });
+      return;
+    }
+  } else {
+    console.error(
+      `Workspace ${workspace.id} has no stripeConnectId. Skipping Stripe customer matching.`,
+    );
   }
 
   const workspaceUser = await prisma.projectUsers.findUniqueOrThrow({
diff --git a/apps/web/lib/payouts/send-payout-reminder.ts b/apps/web/lib/payouts/send-payout-reminder.ts
new file mode 100644
index 00000000000..a102886e780
--- /dev/null
+++ b/apps/web/lib/payouts/send-payout-reminder.ts
@@ -0,0 +1,261 @@
+import { getUtcPeriodDate } from "@/lib/api/rewards/custom-reward-utils";
+import { MIN_PAYOUT_AMOUNT_FOR_REMINDERS } from "@/lib/constants/misc";
+import { PAYOUT_SUPPORTED_COUNTRIES } from "@/lib/constants/payouts-supported-countries";
+import { queueBatchEmail } from "@/lib/email/queue-batch-email";
+import { prisma } from "@/lib/prisma";
+import ConnectPayoutReminder from "@dub/email/templates/connect-payout-reminder";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID, pluck } from "@dub/utils";
+import {
+  Partner,
+  PayoutStatus,
+  Prisma,
+  Program,
+  ProgramPayoutMode,
+} from "@prisma/client";
+
+const BATCH_SIZE = 500;
+
+const EXCLUDED_PROGRAM_IDS = [
+  ACME_PROGRAM_ID,
+  DEMO_PROGRAM_ID,
+  // programs that are in the migration process
+  "prog_xxx",
+];
+
+type PartnerPayoutReminder = {
+  partner: Pick<Partner, "id" | "name"> & {
+    email: string;
+  };
+  programs: (Pick<Program, "id" | "name" | "logo"> & {
+    amount: number;
+  })[];
+};
+
+function payoutReminderWhere({
+  afterPartnerId,
+  partnerIds,
+}: {
+  afterPartnerId?: string;
+  partnerIds?: string[];
+} = {}): Prisma.PayoutWhereInput {
+  return {
+    status: {
+      in: [
+        PayoutStatus.pending,
+        PayoutStatus.processing,
+        PayoutStatus.processed,
+        PayoutStatus.failed,
+      ],
+    },
+    programId: {
+      notIn: EXCLUDED_PROGRAM_IDS,
+    },
+    ...(afterPartnerId && {
+      partnerId: {
+        gt: afterPartnerId,
+      },
+    }),
+    ...(partnerIds && {
+      partnerId: {
+        in: partnerIds,
+      },
+    }),
+    partner: {
+      payoutsEnabledAt: null,
+      AND: [
+        {
+          OR: [
+            { country: null },
+            {
+              country: {
+                in: PAYOUT_SUPPORTED_COUNTRIES.map((c) => c.code),
+              },
+            },
+          ],
+        },
+        {
+          OR: [
+            { connectPayoutsLastRemindedAt: null },
+            {
+              connectPayoutsLastRemindedAt: {
+                lte: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000),
+              },
+            },
+          ],
+        },
+      ],
+    },
+    amount: {
+      gte: MIN_PAYOUT_AMOUNT_FOR_REMINDERS,
+    },
+    programEnrollment: {
+      // - Internal programs always pay through Dub, so those partners still need
+      //   to connect payout details even if a tenantId is set.
+      // - Hybrid programs pay outside Dub once tenantId is set, so skip those.
+      //   Without a tenantId they are still included.
+      // - External programs will always pay outside Dub, so skip those.
+      OR: [
+        {
+          program: {
+            payoutMode: ProgramPayoutMode.internal,
+          },
+        },
+        {
+          program: {
+            payoutMode: ProgramPayoutMode.hybrid,
+          },
+          tenantId: null,
+        },
+      ],
+    },
+  };
+}
+
+// This route is used to send reminders to partners who have pending payouts
+// but haven't configured payouts yet.
+// Returns the last partner id when another batch should run.
+export async function sendPayoutReminder({
+  afterPartnerId,
+  batchNumber = 1,
+}: {
+  afterPartnerId?: string;
+  batchNumber?: number;
+} = {}) {
+  const partners = await prisma.payout.groupBy({
+    by: ["partnerId"],
+    where: payoutReminderWhere({ afterPartnerId }),
+    orderBy: {
+      partnerId: "asc",
+    },
+    take: BATCH_SIZE,
+  });
+
+  if (!partners.length) {
+    console.log("No partners need reminders.");
+    return;
+  }
+
+  const partnerIds = pluck(partners, "partnerId");
+
+  const unsentPayouts = await prisma.payout.groupBy({
+    by: ["partnerId", "programId"],
+    where: payoutReminderWhere({ partnerIds }),
+    _sum: {
+      amount: true,
+    },
+  });
+
+  const [partnerData, programData] = await Promise.all([
+    prisma.partner.findMany({
+      where: {
+        id: {
+          in: pluck(unsentPayouts, "partnerId"),
+        },
+        OR: [
+          {
+            users: {
+              none: {},
+            },
+          },
+          {
+            users: {
+              some: {
+                notificationPreferences: {
+                  connectPayoutReminder: true,
+                },
+              },
+            },
+          },
+        ],
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+      },
+    }),
+
+    prisma.program.findMany({
+      where: {
+        id: {
+          in: pluck(unsentPayouts, "programId"),
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+        logo: true,
+      },
+    }),
+  ]);
+
+  const partnerProgramMap = new Map<string, PartnerPayoutReminder>();
+
+  for (const payout of unsentPayouts) {
+    const { partnerId, programId } = payout;
+    const { amount } = payout._sum;
+
+    const partner = partnerData.find((p) => p.id === partnerId);
+    const program = programData.find((p) => p.id === programId);
+
+    if (!partner?.email || !program) {
+      continue;
+    }
+
+    if (!partnerProgramMap.has(partnerId)) {
+      partnerProgramMap.set(partnerId, {
+        partner: {
+          id: partner.id,
+          name: partner.name,
+          email: partner.email,
+        },
+        programs: [],
+      });
+    }
+
+    partnerProgramMap.get(partnerId)!.programs.push({
+      id: program.id,
+      name: program.name,
+      logo: program.logo!,
+      amount: amount ?? 0,
+    });
+  }
+
+  const partnerPrograms = Array.from(partnerProgramMap.values());
+  const connectPayoutsLastRemindedAt = new Date();
+  const idempotencyKey = `payout-reminders-${getUtcPeriodDate()}-${batchNumber}`;
+
+  await queueBatchEmail<typeof ConnectPayoutReminder>(
+    partnerPrograms.map(({ partner, programs }) => ({
+      variant: "notifications",
+      to: partner.email,
+      subject: "Connect your payout details on Dub Partners",
+      templateName: "ConnectPayoutReminder",
+      templateProps: {
+        email: partner.email,
+        programs,
+      },
+    })),
+    {
+      idempotencyKey,
+    },
+  );
+
+  await prisma.partner.updateMany({
+    where: {
+      id: {
+        in: partnerPrograms.map(({ partner }) => partner.id),
+      },
+    },
+    data: {
+      connectPayoutsLastRemindedAt,
+    },
+  });
+
+  if (partners.length < BATCH_SIZE) {
+    console.log("No more partners to remind.");
+    return;
+  }
+
+  return partnerIds[partnerIds.length - 1];
+}
diff --git a/apps/web/lib/plan-capabilities.ts b/apps/web/lib/plan-capabilities.ts
index 7ce50df77b8..bffe211acaf 100644
--- a/apps/web/lib/plan-capabilities.ts
+++ b/apps/web/lib/plan-capabilities.ts
@@ -14,7 +14,6 @@ export const getPlanCapabilities = (
     canExportAuditLogs: !!plan && ["enterprise"].includes(plan),
     canUseAdvancedRewardLogic:
       !!plan && ["enterprise", "advanced"].includes(plan),
-    canSetRewardSpendLimit: !!plan && ["enterprise"].includes(plan),
     canMessagePartners: !!plan && ["enterprise", "advanced"].includes(plan),
     canSendEmailCampaigns: !!plan && ["enterprise", "advanced"].includes(plan),
     canDiscoverPartners: !!plan && ["enterprise", "advanced"].includes(plan),
diff --git a/apps/web/lib/planetscale/get-link-with-partner.ts b/apps/web/lib/planetscale/get-link-with-partner.ts
index 63117fc0282..a3349cb64d6 100644
--- a/apps/web/lib/planetscale/get-link-with-partner.ts
+++ b/apps/web/lib/planetscale/get-link-with-partner.ts
@@ -52,7 +52,9 @@ export const getLinkWithPartner = async ({
        FROM Link
        LEFT JOIN ProgramEnrollment ON ProgramEnrollment.programId = Link.programId AND ProgramEnrollment.partnerId = Link.partnerId
        LEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId
-       LEFT JOIN Discount PartnerDiscount ON ProgramEnrollment.discountId = PartnerDiscount.id
+       LEFT JOIN LinkReward ON LinkReward.linkId = Link.id
+       LEFT JOIN Discount PartnerDiscount ON PartnerDiscount.id = COALESCE(LinkReward.discountId, ProgramEnrollment.discountId)
+         AND PartnerDiscount.programId IS NOT NULL
        LEFT JOIN Program ON Program.id = Link.programId
        WHERE Link.domain = ? AND Link.key = ?`,
       [domain, keyToQuery],
diff --git a/apps/web/lib/planetscale/get-partner-enrollment-info.ts b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
index 4cd3e6d5d93..598dd631a76 100644
--- a/apps/web/lib/planetscale/get-partner-enrollment-info.ts
+++ b/apps/web/lib/planetscale/get-partner-enrollment-info.ts
@@ -42,9 +42,11 @@ function parsePartnerTagIds(value: QueryResult["partnerTagIds"]): string[] {
 export const getPartnerEnrollmentInfo = async ({
   partnerId,
   programId,
+  linkId,
 }: {
   partnerId: string | null;
   programId: string | null;
+  linkId: string;
 }) => {
   if (!partnerId || !programId) {
     return {
@@ -70,7 +72,9 @@ export const getPartnerEnrollmentInfo = async ({
     FROM
       ProgramEnrollment
       LEFT JOIN Partner ON Partner.id = ProgramEnrollment.partnerId
-      LEFT JOIN Discount ON Discount.id = ProgramEnrollment.discountId
+      LEFT JOIN LinkReward ON LinkReward.linkId = ?
+      LEFT JOIN Discount ON Discount.id = COALESCE(LinkReward.discountId, ProgramEnrollment.discountId)
+        AND Discount.programId IS NOT NULL
       LEFT JOIN (
         SELECT
           programId,
@@ -91,7 +95,7 @@ export const getPartnerEnrollmentInfo = async ({
     WHERE
       ProgramEnrollment.partnerId = ?
       AND ProgramEnrollment.programId = ?`,
-    [programId, partnerId, partnerId, programId],
+    [linkId, programId, partnerId, partnerId, programId],
   );
 
   const result =
diff --git a/apps/web/lib/rewardful/import-campaigns.ts b/apps/web/lib/rewardful/import-campaigns.ts
index 4f157a438e4..548eac41d6d 100644
--- a/apps/web/lib/rewardful/import-campaigns.ts
+++ b/apps/web/lib/rewardful/import-campaigns.ts
@@ -141,6 +141,7 @@ export async function importCampaigns(payload: RewardfulImportPayload) {
         data: {
           id: createId({ prefix: "rw_" }),
           programId,
+          groupId: createdGroup.id,
           // connect the reward to the group
           salePartnerGroup: {
             connect: {
@@ -208,12 +209,13 @@ export async function importCampaigns(payload: RewardfulImportPayload) {
         data: {
           id: createId({ prefix: "disc_" }),
           programId,
+          groupId: createdGroup.id,
           amount: dubDiscountAttrs?.amount ?? 0,
           type: dubDiscountAttrs?.type ?? "percentage",
           maxDuration: dubDiscountAttrs?.maxDuration ?? null,
           couponId: campaign.stripe_coupon_id,
-          // connect the discount to the group
-          partnerGroup: {
+          // connect the discount as the group's default
+          defaultForPartnerGroup: {
             connect: {
               id: createdGroup.id,
             },
diff --git a/apps/web/lib/rewardful/import-commissions.ts b/apps/web/lib/rewardful/import-commissions.ts
index d45deed9d06..3c23b35696a 100644
--- a/apps/web/lib/rewardful/import-commissions.ts
+++ b/apps/web/lib/rewardful/import-commissions.ts
@@ -2,7 +2,13 @@ import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import ProgramImported from "@dub/email/templates/program-imported";
 import { nanoid } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import {
+  CommissionSource,
+  CommissionStatus,
+  Customer,
+  Link,
+  Program,
+} from "@prisma/client";
 import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
 import { isFirstConversion } from "../analytics/is-first-conversion";
 import { createId } from "../api/create-id";
@@ -335,6 +341,7 @@ async function createCommission({
         status: toDubStatus[commission.state],
         invoiceId: sale.id, // this is not the actual invoice ID, but we use this to deduplicate the sales
         createdAt: new Date(sale.created_at),
+        source: CommissionSource.rewardful,
       },
     }),
 
diff --git a/apps/web/lib/rewardful/import-customers.ts b/apps/web/lib/rewardful/import-customers.ts
index a3268c7cfef..f31234f5943 100644
--- a/apps/web/lib/rewardful/import-customers.ts
+++ b/apps/web/lib/rewardful/import-customers.ts
@@ -48,19 +48,31 @@ export async function importCustomers(payload: RewardfulImportPayload) {
       )
       .map((r) => r.stripe_customer_id!);
 
-    const externalIds = referrals.map((r) => r.customer.id);
-
-    const existingCustomers = await prisma.customer.findMany({
-      where: {
-        OR: [
-          { stripeCustomerId: { in: stripeCustomerIds } },
-          {
-            projectId: workspace.id,
-            externalId: { in: externalIds },
-          },
-        ],
-      },
-    });
+    // Rewardful can return a customer object with a null id.
+    const externalIds = referrals
+      .map((r) => r.customer.id)
+      .filter((id): id is string => Boolean(id));
+
+    const existingCustomers =
+      stripeCustomerIds.length === 0 && externalIds.length === 0
+        ? []
+        : await prisma.customer.findMany({
+            where: {
+              OR: [
+                ...(stripeCustomerIds.length > 0
+                  ? [{ stripeCustomerId: { in: stripeCustomerIds } }]
+                  : []),
+                ...(externalIds.length > 0
+                  ? [
+                      {
+                        projectId: workspace.id,
+                        externalId: { in: externalIds },
+                      },
+                    ]
+                  : []),
+              ],
+            },
+          });
 
     const referrralChunks = chunk(referrals, 10);
     for (const referralChunk of referrralChunks) {
diff --git a/apps/web/lib/rewardful/import-partners.ts b/apps/web/lib/rewardful/import-partners.ts
index c982377c2a5..33b4cb0b98e 100644
--- a/apps/web/lib/rewardful/import-partners.ts
+++ b/apps/web/lib/rewardful/import-partners.ts
@@ -3,6 +3,7 @@ import { nanoid } from "@dub/utils";
 import { Program } from "@prisma/client";
 import { createId } from "../api/create-id";
 import { bulkCreateLinks } from "../api/links";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { logImportError } from "../tinybird/log-import-error";
 import { redis } from "../upstash";
 import { RewardfulApi } from "./api";
@@ -96,6 +97,7 @@ export async function importPartners(payload: RewardfulImportPayload) {
               leadRewardId: group.leadRewardId,
               saleRewardId: group.saleRewardId,
               referralRewardId: group.referralRewardId,
+              customRewardId: group.customRewardId,
               discountId: group.discountId,
             },
             partnerGroupDefaultLinkId:
@@ -124,6 +126,13 @@ export async function importPartners(payload: RewardfulImportPayload) {
             ]),
           ),
         );
+
+        // Queue an index update because the imported partners were enrolled.
+        // Queued per page rather than per partner.
+        await queuePartnerSearchSync({
+          partnerIds: filteredPartners.map((p) => p.dubPartnerId),
+          programId: program.id,
+        });
       }
     }
 
@@ -168,6 +177,7 @@ async function createPartnerAndLinks({
     leadRewardId: string | null;
     clickRewardId: string | null;
     referralRewardId: string | null;
+    customRewardId: string | null;
     discountId: string | null;
   };
   partnerGroupDefaultLinkId?: string | null;
diff --git a/apps/web/lib/rewardful/types.ts b/apps/web/lib/rewardful/types.ts
index c60f702d40b..3d6028b894e 100644
--- a/apps/web/lib/rewardful/types.ts
+++ b/apps/web/lib/rewardful/types.ts
@@ -36,7 +36,7 @@ export interface RewardfulLink {
 }
 
 export interface RewardfulCustomer {
-  id: string;
+  id: string | null;
   name: string;
   email: string;
   platform: string;
diff --git a/apps/web/lib/rewards/constants.ts b/apps/web/lib/rewards/constants.ts
new file mode 100644
index 00000000000..1a24ce867bc
--- /dev/null
+++ b/apps/web/lib/rewards/constants.ts
@@ -0,0 +1,2 @@
+export const PARTNER_LEVEL_REWARDS_PLAN_ERROR =
+  "Partner-level rewards and discounts are only available on the Advanced plan and above.";
diff --git a/apps/web/lib/rewards/delete-empty-link-rewards.ts b/apps/web/lib/rewards/delete-empty-link-rewards.ts
new file mode 100644
index 00000000000..6ef50451deb
--- /dev/null
+++ b/apps/web/lib/rewards/delete-empty-link-rewards.ts
@@ -0,0 +1,83 @@
+import { PRISMA_UPDATEMANY_LIMIT } from "@/lib/cron";
+import { prisma } from "../prisma";
+
+// Hard-delete LinkReward rows with no remaining reward/discount relations.
+// Loads relations (not just FK null checks) so dangling IDs after a hard-delete
+// are treated as empty too — update-partner-link nulls overrides, and discount
+// deletes SetNull / may leave a stale discountId until this cron runs.
+export async function deleteEmptyLinkRewards() {
+  let deletedCount = 0;
+  let startAfterId: string | undefined;
+
+  while (true) {
+    const batch = await prisma.linkReward.findMany({
+      select: {
+        id: true,
+        clickReward: {
+          select: {
+            id: true,
+          },
+        },
+        leadReward: {
+          select: {
+            id: true,
+          },
+        },
+        saleReward: {
+          select: {
+            id: true,
+          },
+        },
+        discount: {
+          select: {
+            id: true,
+          },
+        },
+      },
+      orderBy: {
+        id: "asc",
+      },
+      take: PRISMA_UPDATEMANY_LIMIT,
+      ...(startAfterId && {
+        skip: 1,
+        cursor: {
+          id: startAfterId,
+        },
+      }),
+    });
+
+    if (batch.length === 0) {
+      break;
+    }
+
+    startAfterId = batch[batch.length - 1].id;
+
+    const emptyIds = batch
+      .filter(
+        (linkReward) =>
+          !linkReward.clickReward &&
+          !linkReward.leadReward &&
+          !linkReward.saleReward &&
+          !linkReward.discount,
+      )
+      .map((linkReward) => linkReward.id);
+
+    if (emptyIds.length > 0) {
+      const { count } = await prisma.linkReward.deleteMany({
+        where: {
+          id: {
+            in: emptyIds,
+          },
+        },
+      });
+
+      deletedCount += count;
+    }
+
+    if (batch.length < PRISMA_UPDATEMANY_LIMIT) {
+      break;
+    }
+  }
+
+  return deletedCount;
+}
diff --git a/apps/web/lib/rewards/delete-orphaned-rewards.ts b/apps/web/lib/rewards/delete-orphaned-rewards.ts
new file mode 100644
index 00000000000..a2bfe6e4a09
--- /dev/null
+++ b/apps/web/lib/rewards/delete-orphaned-rewards.ts
@@ -0,0 +1,71 @@
+import { pluck } from "@dub/utils";
+import { prisma } from "../prisma";
+
+// Delete rewards that are orphaned (not associated with a program or partner group or commissions)
+export async function deleteOrphanedRewards(cutoff: Date) {
+  const rewards = await prisma.reward.findMany({
+    where: {
+      programId: null,
+      updatedAt: {
+        lt: cutoff,
+      },
+      OR: [
+        {
+          event: "click",
+          clickEnrollments: { none: {} },
+          clickPartnerGroup: { is: null },
+          clickLinkRewards: { none: {} },
+          commissions: { none: {} },
+        },
+        {
+          event: "lead",
+          leadEnrollments: { none: {} },
+          leadPartnerGroup: { is: null },
+          leadLinkRewards: { none: {} },
+          commissions: { none: {} },
+        },
+        {
+          event: "sale",
+          saleEnrollments: { none: {} },
+          salePartnerGroup: { is: null },
+          saleLinkRewards: { none: {} },
+          commissions: { none: {} },
+        },
+        {
+          event: "referral",
+          referralEnrollments: { none: {} },
+          referralPartnerGroup: { is: null },
+          commissions: { none: {} },
+        },
+        {
+          event: "custom",
+          customEnrollments: { none: {} },
+          customPartnerGroup: { is: null },
+          commissions: { none: {} },
+        },
+      ],
+    },
+    select: {
+      id: true,
+    },
+    orderBy: {
+      updatedAt: "desc",
+    },
+    take: 50,
+  });
+
+  if (rewards.length === 0) {
+    return 0;
+  }
+
+  // If the reward is not referenced by any enrollments, groups, link rewards, or commissions, it can be hard deleted
+  const { count } = await prisma.reward.deleteMany({
+    where: {
+      id: {
+        in: pluck(rewards, "id"),
+      },
+    },
+  });
+
+  return count;
+}
diff --git a/apps/web/lib/rewards/format-reward-condition.ts b/apps/web/lib/rewards/format-reward-condition.ts
new file mode 100644
index 00000000000..a7bec934bba
--- /dev/null
+++ b/apps/web/lib/rewards/format-reward-condition.ts
@@ -0,0 +1,138 @@
+import { RewardCondition, RewardConditions, RewardProps } from "@/lib/types";
+import {
+  CONDITION_OPERATOR_LABELS,
+  REWARD_CONDITIONS,
+} from "@/lib/zod/schemas/rewards";
+import {
+  COUNTRIES,
+  capitalize,
+  currencyFormatter,
+  formatDateTime,
+} from "@dub/utils";
+import { formatDuration } from "date-fns";
+
+export function formatRewardConditionParts({
+  condition,
+  event,
+}: {
+  condition: RewardCondition;
+  event: RewardProps["event"];
+}) {
+  const entity = REWARD_CONDITIONS[event].entities.find(
+    (e) => e.id === condition.entity,
+  );
+  const attribute = entity?.attributes?.find(
+    (a) => a.id === condition.attribute,
+  );
+
+  const attributeLabel =
+    (condition.entity === "lead" || condition.entity === "sale") &&
+    condition.attribute === "metadata" &&
+    condition.metadataField?.trim()
+      ? `"${condition.metadataField.trim()}"`
+      : capitalize(attribute?.label);
+
+  const operatorLabel = condition.label
+    ? "is"
+    : CONDITION_OPERATOR_LABELS[condition.operator];
+
+  return {
+    entityLabel: capitalize(condition.entity),
+    attributeLabel: attributeLabel ?? "",
+    operatorLabel,
+    valueLabel: formatRewardConditionValue({ condition, attribute }),
+  };
+}
+
+export function formatRewardConditionClause({
+  condition,
+  event,
+  operator,
+  isFirst,
+}: {
+  condition: RewardCondition;
+  event: RewardProps["event"];
+  operator: RewardConditions["operator"];
+  isFirst: boolean;
+}): string {
+  const { entityLabel, attributeLabel, operatorLabel, valueLabel } =
+    formatRewardConditionParts({ condition, event });
+
+  return [
+    isFirst ? "if" : operator.toLowerCase(),
+    entityLabel,
+    attributeLabel,
+    operatorLabel,
+    valueLabel,
+  ]
+    .filter(Boolean)
+    .join(" ");
+}
+
+function formatRewardConditionValue({
+  condition,
+  attribute,
+}: {
+  condition: RewardCondition;
+  attribute:
+    | {
+        type: string;
+        options?: { id: string; label: string }[];
+      }
+    | undefined;
+}): string {
+  if (condition.value == null || condition.value === "") {
+    return "";
+  }
+
+  if (condition.attribute === "country") {
+    if (Array.isArray(condition.value)) {
+      return (condition.value as (string | number)[])
+        .map((v) => COUNTRIES[v?.toString()] ?? v)
+        .join(", ");
+    }
+
+    return COUNTRIES[condition.value?.toString()] ?? condition.value.toString();
+  }
+
+  if (condition.attribute === "subscriptionDurationMonths") {
+    return formatSubscriptionDuration(Number(condition.value));
+  }
+
+  if (condition.attribute === "productId" && condition.label?.trim()) {
+    return condition.label.trim();
+  }
+
+  if (Array.isArray(condition.value)) {
+    return (
+      attribute?.options
+        ? (condition.value as (string | number)[]).map(
+            (v) => attribute.options?.find((o) => o.id === v)?.label ?? v,
+          )
+        : condition.value
+    ).join(", ");
+  }
+
+  if (attribute?.type === "currency") {
+    return currencyFormatter(Number(condition.value));
+  }
+
+  if (attribute?.type === "date") {
+    return formatDateTime(new Date(Number(condition.value)));
+  }
+
+  if (attribute?.options) {
+    return (
+      attribute.options.find((o) => o.id === condition.value)?.label ??
+      condition.value.toString()
+    );
+  }
+
+  return condition.value.toString();
+}
+
+function formatSubscriptionDuration(v: number): string {
+  return formatDuration(
+    v >= 12 ? { years: Math.floor(v / 12), months: v % 12 } : { months: v },
+  );
+}
diff --git a/apps/web/lib/rewards/get-click-reward-enrollments.ts b/apps/web/lib/rewards/get-click-reward-enrollments.ts
new file mode 100644
index 00000000000..84a72329519
--- /dev/null
+++ b/apps/web/lib/rewards/get-click-reward-enrollments.ts
@@ -0,0 +1,59 @@
+import { prisma } from "@/lib/prisma";
+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
+import { ProgramEnrollment } from "@prisma/client";
+
+// Find enrollments with a qualifying clicked link and either an enrollment
+// click reward or a link-level click reward.
+export async function getClickRewardEnrollments({
+  startDate,
+  startingAfterId,
+  take,
+}: {
+  startDate: Date;
+  startingAfterId?: string;
+  take: number;
+}): Promise<Pick<ProgramEnrollment, "id" | "partnerId" | "programId">[]> {
+  return prisma.programEnrollment.findMany({
+    where: {
+      ...(startingAfterId && {
+        id: {
+          gt: startingAfterId,
+        },
+      }),
+      status: {
+        in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,
+      },
+      OR: [
+        {
+          clickRewardId: { not: null },
+          links: {
+            some: {
+              clicks: { gt: 0 },
+              lastClicked: { gte: startDate },
+            },
+          },
+        },
+        {
+          links: {
+            some: {
+              clicks: { gt: 0 },
+              lastClicked: { gte: startDate },
+              linkReward: {
+                clickRewardId: { not: null },
+              },
+            },
+          },
+        },
+      ],
+    },
+    select: {
+      id: true,
+      partnerId: true,
+      programId: true,
+    },
+    orderBy: {
+      id: "asc",
+    },
+    take,
+  });
+}
diff --git a/apps/web/lib/rewards/get-resolved-partner-link-rewards.ts b/apps/web/lib/rewards/get-resolved-partner-link-rewards.ts
new file mode 100644
index 00000000000..41efab8c85e
--- /dev/null
+++ b/apps/web/lib/rewards/get-resolved-partner-link-rewards.ts
@@ -0,0 +1,42 @@
+import "server-only";
+
+import { serializeReward } from "@/lib/api/partners/serialize-reward";
+import { DiscountProps } from "@/lib/types";
+import { Discount, Reward } from "@prisma/client";
+
+export type LinkRewardWithOptionalRewards = {
+  clickReward?: Reward | null;
+  leadReward?: Reward | null;
+  saleReward?: Reward | null;
+  discount?: Discount | null;
+};
+
+export function getResolvedPartnerLinkRewards({
+  linkReward,
+  enrollmentRewards,
+  enrollmentDiscount,
+}: {
+  linkReward: LinkRewardWithOptionalRewards | null | undefined;
+  enrollmentRewards: Array<Reward | null | undefined>;
+  enrollmentDiscount: Discount | DiscountProps | null | undefined;
+}) {
+  return {
+    clickReward: serializeNullableReward(
+      linkReward?.clickReward ??
+        enrollmentRewards.find((reward) => reward?.event === "click"),
+    ),
+    leadReward: serializeNullableReward(
+      linkReward?.leadReward ??
+        enrollmentRewards.find((reward) => reward?.event === "lead"),
+    ),
+    saleReward: serializeNullableReward(
+      linkReward?.saleReward ??
+        enrollmentRewards.find((reward) => reward?.event === "sale"),
+    ),
+    discount: linkReward?.discount ?? enrollmentDiscount ?? null,
+  };
+}
+
+function serializeNullableReward(reward: Reward | null | undefined) {
+  return reward ? serializeReward(reward) : null;
+}
diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount.ts b/apps/web/lib/rewards/resolve-click-reward.ts
similarity index 100%
rename from apps/web/app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount.ts
rename to apps/web/lib/rewards/resolve-click-reward.ts
diff --git a/apps/web/lib/rewards/resolve-partner-assigned-item.ts b/apps/web/lib/rewards/resolve-partner-assigned-item.ts
new file mode 100644
index 00000000000..fff2c6b86a3
--- /dev/null
+++ b/apps/web/lib/rewards/resolve-partner-assigned-item.ts
@@ -0,0 +1,40 @@
+export function resolvePartnerAssignedItem<T extends { id: string }>({
+  assignedId,
+  groupDefault,
+  itemsById,
+  loading,
+}: {
+  assignedId: string | null | undefined;
+  groupDefault: T | null | undefined;
+  itemsById: Map<string, T>;
+  loading: boolean;
+}): { item: T; isOverride: boolean } | null {
+  if (assignedId) {
+    const item = itemsById.get(assignedId);
+
+    if (item) {
+      return {
+        item,
+        isOverride: assignedId !== groupDefault?.id,
+      };
+    }
+
+    if (groupDefault && (assignedId === groupDefault.id || loading)) {
+      return {
+        item: groupDefault,
+        isOverride: false,
+      };
+    }
+
+    return null;
+  }
+
+  if (groupDefault) {
+    return {
+      item: groupDefault,
+      isOverride: false,
+    };
+  }
+
+  return null;
+}
diff --git a/apps/web/lib/rewards/resolve-partner-link-rewards.ts b/apps/web/lib/rewards/resolve-partner-link-rewards.ts
new file mode 100644
index 00000000000..172d41370fb
--- /dev/null
+++ b/apps/web/lib/rewards/resolve-partner-link-rewards.ts
@@ -0,0 +1,71 @@
+import { getRewardAmount } from "@/lib/partners/get-reward-amount";
+import { DiscountProps, RewardProps } from "@/lib/types";
+
+function pickDisplayReward(reward: RewardProps | null | undefined) {
+  if (!reward || getRewardAmount(reward) < 0) {
+    return null;
+  }
+
+  return reward;
+}
+
+function getDisplayCustomRewards(enrollmentRewards: RewardProps[]) {
+  return enrollmentRewards.filter(
+    (reward) => reward.event === "custom" && getRewardAmount(reward) >= 0,
+  );
+}
+
+export function getPartnerLinkDisplayRewards({
+  clickReward,
+  leadReward,
+  saleReward,
+  discount,
+  enrollmentRewards = [],
+}: {
+  clickReward?: RewardProps | null;
+  leadReward?: RewardProps | null;
+  saleReward?: RewardProps | null;
+  discount?: DiscountProps | null;
+  enrollmentRewards?: RewardProps[];
+}) {
+  return {
+    rewards: [
+      pickDisplayReward(saleReward),
+      pickDisplayReward(leadReward),
+      pickDisplayReward(clickReward),
+      ...getDisplayCustomRewards(enrollmentRewards),
+    ].filter((reward): reward is RewardProps => reward != null),
+    discount: discount ?? null,
+  };
+}
+
+const PRIMARY_REWARD_EVENTS = ["sale", "lead", "click"] as const;
+
+export function getPartnerLinkPrimaryIncentive({
+  rewards,
+  discount,
+}: {
+  rewards: RewardProps[];
+  discount: DiscountProps | null;
+}): {
+  primaryReward: RewardProps | null;
+  primaryDiscount: DiscountProps | null;
+  additionalCount: number;
+} {
+  const primaryReward =
+    PRIMARY_REWARD_EVENTS.map((event) =>
+      rewards.find((reward) => reward.event === event),
+    ).find(Boolean) ??
+    rewards[0] ??
+    null;
+
+  const primaryDiscount = primaryReward ? null : discount;
+  const totalCount = rewards.length + (discount ? 1 : 0);
+  const additionalCount = Math.max(0, totalCount - 1);
+
+  return {
+    primaryReward: primaryReward ?? null,
+    primaryDiscount,
+    additionalCount,
+  };
+}
diff --git a/apps/web/lib/rewards/reward-spend-limit.ts b/apps/web/lib/rewards/reward-spend-limit.ts
new file mode 100644
index 00000000000..03eb77aa6fd
--- /dev/null
+++ b/apps/web/lib/rewards/reward-spend-limit.ts
@@ -0,0 +1,19 @@
+import { RewardProps } from "@/lib/types";
+import { currencyFormatter } from "@dub/utils";
+
+export function getSpendLimitDescriptionParts({
+  spendLimitAmount,
+  spendLimitInterval,
+}: Pick<RewardProps, "spendLimitAmount" | "spendLimitInterval">) {
+  if (spendLimitAmount == null || spendLimitInterval == null) {
+    return null;
+  }
+
+  return {
+    amount: currencyFormatter(spendLimitAmount, {
+      trailingZeroDisplay: "stripIfInteger",
+    }),
+    interval:
+      spendLimitInterval === "allTime" ? "" : `per ${spendLimitInterval}`,
+  };
+}
diff --git a/apps/web/lib/storage.ts b/apps/web/lib/storage.ts
index dd53011bf33..3527d71963a 100644
--- a/apps/web/lib/storage.ts
+++ b/apps/web/lib/storage.ts
@@ -20,7 +20,7 @@ class StorageClient {
       accessKeyId: process.env.STORAGE_ACCESS_KEY_ID || "",
       secretAccessKey: process.env.STORAGE_SECRET_ACCESS_KEY || "",
       service: "s3",
-      region: process.env.STORAGE_REGION || "eu-west-1",
+      region: "auto",
     });
   }
 
@@ -49,7 +49,9 @@ class StorageClient {
     }
 
     const headers = {
-      "Content-Length": uploadBody.size.toString(),
+      "Content-Length": String(
+        uploadBody instanceof Blob ? uploadBody.size : uploadBody.byteLength,
+      ),
       ...opts?.headers,
     };
 
@@ -104,6 +106,69 @@ class StorageClient {
     }
   }
 
+  // Fetch object metadata (Content-Type, size, eTag) without downloading the body
+  async head({ key, bucket = "public" }: { key: string; bucket?: BucketType }) {
+    const response = await this.client.fetch(
+      `${process.env.STORAGE_ENDPOINT}/${this._getBucketName(bucket)}/${key}`,
+      {
+        method: "HEAD",
+      },
+    );
+
+    if (response.status === 404) {
+      return null;
+    }
+
+    if (!response.ok) {
+      throw new Error(
+        `storage.head failed (${response.status}): ${response.statusText}`,
+      );
+    }
+
+    const contentLengthHeader = response.headers.get("content-length");
+
+    return {
+      contentType: response.headers.get("content-type"),
+      contentLength: contentLengthHeader
+        ? Number.parseInt(contentLengthHeader, 10)
+        : null,
+      eTag: response.headers.get("etag"),
+    };
+  }
+
+  // Read the first N bytes of an object (for magic-byte sniffing)
+  async getBytes({
+    key,
+    bucket = "public",
+    length = 4100,
+  }: {
+    key: string;
+    bucket?: BucketType;
+    length?: number;
+  }) {
+    const response = await this.client.fetch(
+      `${process.env.STORAGE_ENDPOINT}/${this._getBucketName(bucket)}/${key}`,
+      {
+        method: "GET",
+        headers: {
+          Range: `bytes=0-${Math.max(length - 1, 0)}`,
+        },
+      },
+    );
+
+    if (response.status === 404) {
+      return null;
+    }
+
+    if (!response.ok && response.status !== 206) {
+      throw new Error(
+        `storage.getBytes failed (${response.status}): ${response.statusText}`,
+      );
+    }
+
+    return new Uint8Array(await response.arrayBuffer());
+  }
+
   async getSignedUrl({
     key,
     method,
@@ -261,7 +326,11 @@ class StorageClient {
     const maxRedirects = 5;
     let currentUrl = url;
 
-    for (let redirectCount = 0; redirectCount <= maxRedirects; redirectCount++) {
+    for (
+      let redirectCount = 0;
+      redirectCount <= maxRedirects;
+      redirectCount++
+    ) {
       await this.assertSafeUrl(currentUrl);
 
       const response = await fetchWithTimeout(currentUrl, {
diff --git a/apps/web/lib/storage/create-signed-upload-url.ts b/apps/web/lib/storage/create-signed-upload-url.ts
new file mode 100644
index 00000000000..3e89ee53422
--- /dev/null
+++ b/apps/web/lib/storage/create-signed-upload-url.ts
@@ -0,0 +1,27 @@
+import { storage } from "@/lib/storage";
+import { R2_URL } from "@dub/utils";
+import * as z from "zod/v4";
+import { signedUploadInputSchema } from "./schemas";
+
+export async function createSignedUploadUrl({
+  key,
+  contentLength,
+  contentType,
+  bucket = "public",
+}: z.infer<typeof signedUploadInputSchema> & {
+  key: string;
+  bucket?: "public" | "private";
+}) {
+  const signedUrl = await storage.getSignedUploadUrl({
+    key,
+    bucket,
+    contentLength,
+    contentType,
+  });
+
+  return {
+    key,
+    signedUrl,
+    destinationUrl: `${R2_URL}/${key}`,
+  };
+}
diff --git a/apps/web/lib/storage/magic-bytes.ts b/apps/web/lib/storage/magic-bytes.ts
new file mode 100644
index 00000000000..70e3cd9bead
--- /dev/null
+++ b/apps/web/lib/storage/magic-bytes.ts
@@ -0,0 +1,339 @@
+/**
+ * Magic-byte helpers for user-upload validation.
+ * Used by Next.js processR2ObjectCreated (Worker only forwards queue messages).
+ */
+
+export const USER_UPLOAD_KEY_PREFIXES = [
+  "programs/",
+  "integration-screenshots/",
+  "program-logos/",
+  "messages/",
+  "resumes/",
+] as const;
+
+export const DANGEROUS_CONTENT_TYPES = [
+  "text/html",
+  "application/xhtml+xml",
+  "text/javascript",
+  "application/javascript",
+  "application/x-javascript",
+  "text/jscript",
+] as const;
+
+const ZIP_FAMILY_CONTENT_TYPES = [
+  "application/zip",
+  "application/x-zip-compressed",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+] as const;
+
+// Legacy .doc / .xls share OLE Compound File magic (not ZIP/OOXML)
+const OLE_FAMILY_CONTENT_TYPES = [
+  "application/msword",
+  "application/vnd.ms-excel",
+] as const;
+
+const TEXT_CONTENT_TYPES = ["text/plain", "text/csv"] as const;
+
+// Unambiguous magic when R2 omits Content-Type (exclude SVG/ZIP/OLE — need declared type)
+const SAFE_MAGIC_ONLY_CONTENT_TYPES = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp",
+  "image/avif",
+  "application/pdf",
+] as const;
+
+function isMissingOrGenericContentType(
+  contentType: string | null | undefined,
+): boolean {
+  const normalized = normalizeContentType(contentType);
+  return !normalized || normalized === "application/octet-stream";
+}
+
+export function isUserUploadKey(key: string): boolean {
+  return USER_UPLOAD_KEY_PREFIXES.some((prefix) => key.startsWith(prefix));
+}
+
+export function normalizeContentType(
+  contentType: string | null | undefined,
+): string | null {
+  if (!contentType) {
+    return null;
+  }
+
+  const base = contentType.split(";")[0]?.trim().toLowerCase() ?? null;
+  if (!base) {
+    return null;
+  }
+
+  if (base === "image/jpg") {
+    return "image/jpeg";
+  }
+
+  return base;
+}
+
+export function isDangerousContentType(
+  contentType: string | null | undefined,
+): boolean {
+  const normalized = normalizeContentType(contentType);
+  if (!normalized) {
+    return false;
+  }
+
+  return (DANGEROUS_CONTENT_TYPES as readonly string[]).includes(normalized);
+}
+
+function startsWithBytes(bytes: Uint8Array, signature: number[]): boolean {
+  if (bytes.length < signature.length) {
+    return false;
+  }
+
+  return signature.every((value, index) => bytes[index] === value);
+}
+
+function indexOfBytes(haystack: Uint8Array, needle: number[]): number {
+  outer: for (let i = 0; i <= haystack.length - needle.length; i++) {
+    for (let j = 0; j < needle.length; j++) {
+      if (haystack[i + j] !== needle[j]) {
+        continue outer;
+      }
+    }
+    return i;
+  }
+  return -1;
+}
+
+function looksLikeSvg(bytes: Uint8Array): boolean {
+  const text = new TextDecoder("utf-8", { fatal: false })
+    .decode(bytes)
+    .trimStart()
+    .toLowerCase();
+
+  if (text.includes("<html") || text.includes("<!doctype html")) {
+    return false;
+  }
+
+  return (
+    text.includes("<svg") || (text.startsWith("<?xml") && text.includes("<svg"))
+  );
+}
+
+/**
+ * Detect MIME from the start of a file. Returns null when unknown.
+ */
+export function detectMimeFromMagicBytes(bytes: Uint8Array): string | null {
+  if (bytes.length === 0) {
+    return null;
+  }
+
+  // JPEG
+  if (startsWithBytes(bytes, [0xff, 0xd8, 0xff])) {
+    return "image/jpeg";
+  }
+
+  // PNG
+  if (
+    startsWithBytes(bytes, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])
+  ) {
+    return "image/png";
+  }
+
+  // GIF
+  if (
+    startsWithBytes(bytes, [0x47, 0x49, 0x46, 0x38, 0x37, 0x61]) ||
+    startsWithBytes(bytes, [0x47, 0x49, 0x46, 0x38, 0x39, 0x61])
+  ) {
+    return "image/gif";
+  }
+
+  // WebP: RIFF....WEBP
+  if (
+    startsWithBytes(bytes, [0x52, 0x49, 0x46, 0x46]) &&
+    bytes.length >= 12 &&
+    bytes[8] === 0x57 &&
+    bytes[9] === 0x45 &&
+    bytes[10] === 0x42 &&
+    bytes[11] === 0x50
+  ) {
+    return "image/webp";
+  }
+
+  // AVIF / HEIC family: ....ftyp
+  if (
+    bytes.length >= 12 &&
+    bytes[4] === 0x66 &&
+    bytes[5] === 0x74 &&
+    bytes[6] === 0x79 &&
+    bytes[7] === 0x70
+  ) {
+    const brand = String.fromCharCode(
+      bytes[8],
+      bytes[9],
+      bytes[10],
+      bytes[11],
+    ).toLowerCase();
+    if (brand.startsWith("avif") || brand.startsWith("avis")) {
+      return "image/avif";
+    }
+  }
+
+  // PDF
+  if (startsWithBytes(bytes, [0x25, 0x50, 0x44, 0x46])) {
+    return "application/pdf";
+  }
+
+  // OLE Compound File (legacy .doc / .xls)
+  if (
+    startsWithBytes(bytes, [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1])
+  ) {
+    return "application/x-ole-storage";
+  }
+
+  // ZIP / OOXML
+  if (startsWithBytes(bytes, [0x50, 0x4b, 0x03, 0x04])) {
+    return "application/zip";
+  }
+
+  // SVG (text)
+  if (looksLikeSvg(bytes)) {
+    return "image/svg+xml";
+  }
+
+  // HTML sniff (for explicit mismatch detection)
+  const htmlMarkers = [
+    [0x3c, 0x68, 0x74, 0x6d, 0x6c], // <html
+    [0x3c, 0x48, 0x54, 0x4d, 0x4c], // <HTML
+    [0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45], // <!DOCTYPE
+  ];
+  for (const marker of htmlMarkers) {
+    if (
+      indexOfBytes(bytes.slice(0, Math.min(bytes.length, 512)), marker) !== -1
+    ) {
+      return "text/html";
+    }
+  }
+
+  return null;
+}
+
+export function mimeMatchesContentType({
+  detectedMime,
+  contentType,
+}: {
+  detectedMime: string | null;
+  contentType: string | null | undefined;
+}): boolean {
+  const declared = normalizeContentType(contentType);
+  if (!declared) {
+    return false;
+  }
+
+  // TXT/CSV have no reliable magic; allow when declared and body is not sniffed
+  // as something else (e.g. HTML would set detectedMime and fail below).
+  if (
+    (TEXT_CONTENT_TYPES as readonly string[]).includes(declared) &&
+    !detectedMime
+  ) {
+    return true;
+  }
+
+  if (!detectedMime) {
+    return false;
+  }
+
+  if (declared === detectedMime) {
+    return true;
+  }
+
+  // OOXML / zip containers share PK magic
+  if (
+    detectedMime === "application/zip" &&
+    (ZIP_FAMILY_CONTENT_TYPES as readonly string[]).includes(declared)
+  ) {
+    return true;
+  }
+
+  // Legacy Office binaries share OLE Compound File magic
+  if (
+    detectedMime === "application/x-ole-storage" &&
+    (OLE_FAMILY_CONTENT_TYPES as readonly string[]).includes(declared)
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
+export type QuarantineDecision =
+  | { action: "skip"; reason: string }
+  | { action: "allow"; reason: string }
+  | {
+      action: "quarantine";
+      reason: string;
+      detectedMime: string | null;
+      contentType: string | null;
+    };
+
+export function decideQuarantine({
+  key,
+  contentType,
+  bytes,
+}: {
+  key: string;
+  contentType: string | null | undefined;
+  bytes: Uint8Array;
+}): QuarantineDecision {
+  if (!isUserUploadKey(key)) {
+    return {
+      action: "skip",
+      reason: "non_user_upload_prefix",
+    };
+  }
+
+  const normalized = normalizeContentType(contentType);
+
+  if (isDangerousContentType(normalized)) {
+    return {
+      action: "quarantine",
+      reason: "dangerous_content_type",
+      detectedMime: detectMimeFromMagicBytes(bytes),
+      contentType: normalized,
+    };
+  }
+
+  const detectedMime = detectMimeFromMagicBytes(bytes);
+
+  if (
+    mimeMatchesContentType({
+      detectedMime,
+      contentType: normalized,
+    })
+  ) {
+    return {
+      action: "allow",
+      reason: "magic_bytes_match",
+    };
+  }
+
+  // R2 sometimes omits Content-Type or stores octet-stream; trust unambiguous magic
+  if (
+    isMissingOrGenericContentType(normalized) &&
+    detectedMime &&
+    (SAFE_MAGIC_ONLY_CONTENT_TYPES as readonly string[]).includes(detectedMime)
+  ) {
+    return {
+      action: "allow",
+      reason: "safe_magic_missing_content_type",
+    };
+  }
+
+  return {
+    action: "quarantine",
+    reason: detectedMime ? "magic_bytes_mismatch" : "unknown_magic_bytes",
+    detectedMime,
+    contentType: normalized,
+  };
+}
diff --git a/apps/web/lib/storage/process-r2-object-created.ts b/apps/web/lib/storage/process-r2-object-created.ts
new file mode 100644
index 00000000000..81a29f897a4
--- /dev/null
+++ b/apps/web/lib/storage/process-r2-object-created.ts
@@ -0,0 +1,134 @@
+import { logger } from "@/lib/axiom/server";
+import { storage } from "@/lib/storage";
+import { decideQuarantine } from "@/lib/storage/magic-bytes";
+import * as z from "zod/v4";
+
+const CREATE_ACTIONS = new Set([
+  "PutObject",
+  "CopyObject",
+  "CompleteMultipartUpload",
+]);
+
+export const r2ObjectCreatedNotificationSchema = z
+  .object({
+    account: z.string().optional(),
+    action: z.string(),
+    bucket: z.string().optional(),
+    object: z
+      .object({
+        key: z.string().optional(),
+        size: z.number().optional(),
+        eTag: z.string().optional(),
+      })
+      .optional(),
+    eventTime: z.string().optional(),
+  })
+  .passthrough();
+
+type R2ObjectCreatedNotification = z.infer<
+  typeof r2ObjectCreatedNotificationSchema
+>;
+
+type ProcessR2ObjectCreatedResult =
+  | { status: "skipped"; reason: string; key?: string }
+  | { status: "allowed"; reason: string; key: string }
+  | {
+      status: "removed";
+      reason: string;
+      key: string;
+      contentType: string | null;
+      detectedMime: string | null;
+    };
+
+// Validate magic bytes for an R2 object-create notification; delete on mismatch
+export async function processR2ObjectCreated(
+  notification: R2ObjectCreatedNotification,
+): Promise<ProcessR2ObjectCreatedResult> {
+  const key = notification.object?.key;
+  const action = notification.action;
+
+  if (!key) {
+    return {
+      status: "skipped",
+      reason: "missing_key",
+    };
+  }
+
+  if (action && !CREATE_ACTIONS.has(action)) {
+    return {
+      status: "skipped",
+      reason: "non_create_action",
+      key,
+    };
+  }
+
+  const head = await storage.head({ key, bucket: "public" });
+  if (!head) {
+    return {
+      status: "skipped",
+      reason: "object_not_found",
+      key,
+    };
+  }
+
+  const bytes = await storage.getBytes({
+    key,
+    bucket: "public",
+    length: 4100,
+  });
+
+  if (!bytes) {
+    return {
+      status: "skipped",
+      reason: "object_not_found",
+      key,
+    };
+  }
+
+  const decision = decideQuarantine({
+    key,
+    contentType: head.contentType,
+    bytes,
+  });
+
+  if (decision.action === "skip") {
+    return {
+      status: "skipped",
+      reason: decision.reason,
+      key,
+    };
+  }
+
+  if (decision.action === "allow") {
+    return {
+      status: "allowed",
+      reason: decision.reason,
+      key,
+    };
+  }
+
+  await storage.delete({
+    key,
+    bucket: "public",
+  });
+
+  logger.warn("storage.r2_magic_bytes_mismatch", {
+    key,
+    contentType: decision.contentType,
+    detectedMime: decision.detectedMime,
+    reason: decision.reason,
+    action,
+    size: notification.object?.size ?? head.contentLength,
+    eTag: notification.object?.eTag ?? head.eTag,
+  });
+
+  await logger.flush();
+
+  return {
+    status: "removed",
+    reason: decision.reason,
+    key,
+    contentType: decision.contentType,
+    detectedMime: decision.detectedMime,
+  };
+}
diff --git a/apps/web/lib/storage/schemas.ts b/apps/web/lib/storage/schemas.ts
new file mode 100644
index 00000000000..4fff18eac77
--- /dev/null
+++ b/apps/web/lib/storage/schemas.ts
@@ -0,0 +1,6 @@
+import * as z from "zod/v4";
+
+export const signedUploadInputSchema = z.object({
+  contentType: z.string().trim().min(1),
+  contentLength: z.number().int().positive(),
+});
diff --git a/apps/web/lib/storage/upload-policies.ts b/apps/web/lib/storage/upload-policies.ts
new file mode 100644
index 00000000000..71359f94e73
--- /dev/null
+++ b/apps/web/lib/storage/upload-policies.ts
@@ -0,0 +1,111 @@
+const RASTER_IMAGE_CONTENT_TYPES = [
+  "image/jpeg",
+  "image/png",
+  "image/webp",
+  "image/gif",
+  "image/avif",
+] as const;
+
+const PROGRAM_RESOURCE_LOGO_CONTENT_TYPES = [
+  "image/png",
+  "image/jpeg",
+  "image/webp",
+  "image/svg+xml",
+  "image/avif",
+] as const;
+
+const PROGRAM_RESOURCE_FILE_CONTENT_TYPES = [
+  ...PROGRAM_RESOURCE_LOGO_CONTENT_TYPES,
+  "application/pdf",
+  "text/plain",
+  "application/msword",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  "application/vnd.ms-excel",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  "text/csv",
+  "application/zip",
+] as const;
+
+// Human-readable labels for MIME types used across upload policies.
+const MIME_TYPE_LABELS: Record<string, string> = {
+  "image/jpeg": "JPG",
+  "image/png": "PNG",
+  "image/webp": "WEBP",
+  "image/gif": "GIF",
+  "image/avif": "AVIF",
+  "image/svg+xml": "SVG",
+  "application/pdf": "PDF",
+  "text/plain": "TXT",
+  "application/msword": "DOC",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+    "DOCX",
+  "application/vnd.ms-excel": "XLS",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "XLSX",
+  "text/csv": "CSV",
+  "application/zip": "ZIP",
+};
+
+export const UPLOAD_POLICIES = {
+  integrationScreenshots: {
+    contentTypes: RASTER_IMAGE_CONTENT_TYPES,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  programLogos: {
+    contentTypes: RASTER_IMAGE_CONTENT_TYPES,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  programApplicationImages: {
+    contentTypes: RASTER_IMAGE_CONTENT_TYPES,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  programCampaignImages: {
+    contentTypes: RASTER_IMAGE_CONTENT_TYPES,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  programLanderImages: {
+    contentTypes: PROGRAM_RESOURCE_LOGO_CONTENT_TYPES,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  programMessageAttachments: {
+    contentTypes: ["image/png", "image/jpeg", "image/webp", "application/pdf"],
+    maxBytes: 10 * 1024 * 1024,
+  },
+
+  partnerMessageAttachments: {
+    contentTypes: ["image/png", "image/jpeg", "image/webp"],
+    maxBytes: 10 * 1024 * 1024,
+  },
+
+  programResourceLogos: {
+    contentTypes: PROGRAM_RESOURCE_LOGO_CONTENT_TYPES,
+    maxBytes: 10 * 1024 * 1024,
+  },
+
+  programResourceFiles: {
+    contentTypes: PROGRAM_RESOURCE_FILE_CONTENT_TYPES,
+    maxBytes: 10 * 1024 * 1024,
+  },
+
+  bountySubmissionImages: {
+    contentTypes: ["image/jpeg", "image/png", "image/webp"] as const,
+    maxBytes: 5 * 1024 * 1024,
+  },
+
+  resumes: {
+    contentTypes: ["application/pdf"] as const,
+    maxBytes: 5 * 1024 * 1024,
+  },
+} as const;
+
+export function getMimeTypeLabel(mimeType: string): string {
+  return (
+    MIME_TYPE_LABELS[mimeType] ||
+    mimeType.split("/").pop()?.toUpperCase() ||
+    "FILE"
+  );
+}
diff --git a/apps/web/lib/storage/validate-signed-upload.ts b/apps/web/lib/storage/validate-signed-upload.ts
new file mode 100644
index 00000000000..f2ecd940a49
--- /dev/null
+++ b/apps/web/lib/storage/validate-signed-upload.ts
@@ -0,0 +1,48 @@
+import { DubApiError } from "@/lib/api/errors";
+import { UPLOAD_POLICIES } from "./upload-policies";
+
+export function validateSignedUpload({
+  contentLength,
+  contentType,
+  policy,
+}: {
+  contentLength: number;
+  contentType: string;
+  policy: keyof typeof UPLOAD_POLICIES;
+}) {
+  const uploadPolicy = UPLOAD_POLICIES[policy];
+
+  if (!uploadPolicy) {
+    throw new DubApiError({
+      code: "bad_request",
+      message: `Invalid policy: ${policy}`,
+    });
+  }
+
+  const allowedContentTypes = uploadPolicy.contentTypes as readonly string[];
+
+  if (!allowedContentTypes.includes(contentType)) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: `Invalid content type. Must be one of: ${uploadPolicy.contentTypes.join(", ")}`,
+    });
+  }
+
+  if (!Number.isInteger(contentLength) || contentLength <= 0) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: "contentLength must be a positive integer.",
+    });
+  }
+
+  if (contentLength > uploadPolicy.maxBytes) {
+    throw new DubApiError({
+      code: "unprocessable_entity",
+      message: `File size exceeds the maximum allowed size of ${
+        uploadPolicy.maxBytes / 1024 / 1024
+      }MB`,
+    });
+  }
+
+  return uploadPolicy;
+}
diff --git a/apps/web/lib/stripe/cancel-subscription.ts b/apps/web/lib/stripe/cancel-subscription.ts
index afb665beb2a..0dd75e1f3d6 100644
--- a/apps/web/lib/stripe/cancel-subscription.ts
+++ b/apps/web/lib/stripe/cancel-subscription.ts
@@ -3,9 +3,11 @@ import { stripe } from ".";
 export async function cancelSubscription({
   customerId,
   reason,
+  immediateCancellation = false,
 }: {
   customerId: string;
   reason?: string;
+  immediateCancellation?: boolean;
 }) {
   try {
     const subscriptionId = await stripe.subscriptions
@@ -14,6 +16,10 @@ export async function cancelSubscription({
       })
       .then((res) => res.data[0].id);
 
+    if (immediateCancellation) {
+      return await stripe.subscriptions.cancel(subscriptionId);
+    }
+
     return await stripe.subscriptions.update(subscriptionId, {
       cancel_at_period_end: true,
       cancellation_details: {
diff --git a/apps/web/lib/stripe/cancellation-feedback.ts b/apps/web/lib/stripe/cancellation-feedback.ts
new file mode 100644
index 00000000000..a8fb1ac095c
--- /dev/null
+++ b/apps/web/lib/stripe/cancellation-feedback.ts
@@ -0,0 +1,56 @@
+import * as z from "zod/v4";
+
+// Stripe `cancellation_details.feedback` enum:
+// https://docs.stripe.com/api/subscriptions/cancel
+export const STRIPE_CANCELLATION_FEEDBACK = [
+  "too_expensive",
+  "missing_features",
+  "switched_service",
+  "unused",
+  "too_complex",
+  "low_quality",
+  "customer_service",
+  "other",
+] as const;
+
+export type StripeCancellationFeedback =
+  (typeof STRIPE_CANCELLATION_FEEDBACK)[number];
+
+export const STRIPE_CANCELLATION_FEEDBACK_LABELS: Record<
+  StripeCancellationFeedback,
+  string
+> = {
+  too_expensive: "It's too expensive",
+  missing_features: "Some features are missing",
+  switched_service: "I'm switching to a different service",
+  unused: "I don't use this service enough",
+  too_complex: "Ease of use was less than expected",
+  low_quality: "Quality was less than expected",
+  customer_service: "Customer service was less than expected",
+  other: "Other reason",
+};
+
+export const STRIPE_CANCELLATION_FEEDBACK_EMAIL_COPY: Record<
+  StripeCancellationFeedback,
+  string
+> = {
+  customer_service: "you had a bad experience with our customer service",
+  low_quality: "the product didn't meet your expectations",
+  missing_features: "you were expecting more features",
+  other: "you had another reason",
+  switched_service: "you switched to a different service",
+  too_complex: "the product was too complex",
+  too_expensive: "the product was too expensive",
+  unused: "you didn't use the product",
+};
+
+export const STRIPE_CANCELLATION_COMMENT_MAX_LENGTH = 1000;
+
+export const cancelSubscriptionSchema = z.object({
+  feedback: z.enum(STRIPE_CANCELLATION_FEEDBACK),
+  comment: z
+    .string()
+    .trim()
+    .min(1, "Comment is required.")
+    .max(STRIPE_CANCELLATION_COMMENT_MAX_LENGTH),
+});
diff --git a/apps/web/lib/stripe/create-stripe-outbound-payment.ts b/apps/web/lib/stripe/create-stripe-outbound-payment.ts
index 06a5baafb3d..c108dd01b71 100644
--- a/apps/web/lib/stripe/create-stripe-outbound-payment.ts
+++ b/apps/web/lib/stripe/create-stripe-outbound-payment.ts
@@ -1,7 +1,9 @@
+import { DubApiError } from "../api/errors";
 import { STRIPE_API_VERSION, stripeV2Fetch } from "./stripe-v2-client";
 
 export interface CreateStripeOutboundPaymentParams {
   stripeRecipientId: string;
+  payoutMethodId: string;
   amount: number;
   description: string;
   idempotencyKey: string;
@@ -9,6 +11,7 @@ export interface CreateStripeOutboundPaymentParams {
 
 export async function createStripeOutboundPayment({
   stripeRecipientId,
+  payoutMethodId,
   amount,
   description,
   idempotencyKey,
@@ -35,6 +38,7 @@ export async function createStripeOutboundPayment({
         to: {
           recipient: stripeRecipientId,
           currency: "usdc",
+          payout_method: payoutMethodId,
         },
         amount: {
           value: amount,
@@ -46,7 +50,12 @@ export async function createStripeOutboundPayment({
   );
 
   if (error) {
-    throw new Error(error.message);
+    throw new DubApiError({
+      code: "bad_request",
+      message:
+        error.message ??
+        `Failed to create Stripe outbound payment for recipient ${stripeRecipientId} and amount ${amount} (cents)`,
+    });
   }
 
   return data;
diff --git a/apps/web/lib/stripe/fund-financial-account.ts b/apps/web/lib/stripe/fund-financial-account.ts
index 1ba9d482ce2..289e49d843f 100644
--- a/apps/web/lib/stripe/fund-financial-account.ts
+++ b/apps/web/lib/stripe/fund-financial-account.ts
@@ -1,4 +1,4 @@
-import { currencyFormatter, prettyPrint } from "@dub/utils";
+import { currencyFormatter, prettyPrint, sleep } from "@dub/utils";
 import { stripe } from "./index";
 import { STRIPE_API_VERSION, stripeV2Fetch } from "./stripe-v2-client";
 
@@ -56,7 +56,7 @@ export async function fundFinancialAccount({
   );
 
   // small delay to make sure the funds are fully available in the financial account
-  await new Promise((resolve) => setTimeout(resolve, 5000));
+  await sleep(5000);
 
   return data;
 }
diff --git a/apps/web/lib/stripe/get-stripe-recipient-payout-method.ts b/apps/web/lib/stripe/get-stripe-recipient-payout-method.ts
index cb3b3356271..9e7d99940a5 100644
--- a/apps/web/lib/stripe/get-stripe-recipient-payout-method.ts
+++ b/apps/web/lib/stripe/get-stripe-recipient-payout-method.ts
@@ -21,5 +21,9 @@ export async function getStripeRecipientPayoutMethod(
     throw new Error(error.message);
   }
 
-  return data.data?.find((m) => m.type === "crypto_wallet") ?? null;
+  return (
+    data.data?.find(
+      (m) => m.type === "crypto_wallet" && !m.crypto_wallet?.archived,
+    ) ?? null
+  );
 }
diff --git a/apps/web/lib/submitted-leads/constants.ts b/apps/web/lib/submitted-leads/constants.ts
index 18078ec8009..e35e6231ccd 100644
--- a/apps/web/lib/submitted-leads/constants.ts
+++ b/apps/web/lib/submitted-leads/constants.ts
@@ -52,6 +52,7 @@ export const SUBMITTED_LEADS_ENABLED_PROGRAM_IDS = [
   "prog_1KFZQJZRDRV62C037FQZSY0Y8", // FFG
   "prog_1K57RA7GVBT9V3S7HRWSV4ADA", // Truss
   "prog_1KH1SFVYG79SV5JQJQRDJH56V", // Brightwave
+  "prog_1M1FDRSBGY02MKBJZ5W35GCZ8", // Affilial
 ];
 
 export const SUBMITTED_LEAD_STATUS_TO_ACTIVITY_ACTION: Record<
diff --git a/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts b/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
index a582cf3e80d..cf468b94cfb 100644
--- a/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
+++ b/apps/web/lib/submitted-leads/mark-submitted-lead-closed-won.ts
@@ -4,13 +4,14 @@ import { trackSale } from "@/lib/api/conversions/track-sale";
 import { DubApiError } from "@/lib/api/errors";
 import { prisma } from "@/lib/prisma";
 import { SubmittedLeadWithCustomer } from "@/lib/types";
-import { Project } from "@prisma/client";
+import { CommissionSource, Project } from "@prisma/client";
 
 interface MarkSubmittedLeadClosedWonInput {
   workspace: Pick<Project, "id" | "stripeConnectId" | "webhookEnabled">;
   lead: SubmittedLeadWithCustomer;
   saleAmount: number;
   stripeCustomerId: string | null;
+  userId: string; // user who marked the lead as closed won
 }
 
 // Mark a submitted lead as closed won
@@ -19,6 +20,7 @@ export const markSubmittedLeadClosedWon = async ({
   lead,
   saleAmount,
   stripeCustomerId,
+  userId,
 }: MarkSubmittedLeadClosedWonInput) => {
   if (!lead.customer) {
     throw new DubApiError({
@@ -36,6 +38,8 @@ export const markSubmittedLeadClosedWon = async ({
     metadata: null,
     workspace,
     source: "submitted",
+    commissionSource: CommissionSource.user,
+    userId,
   });
 
   if (stripeCustomerId) {
diff --git a/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts b/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
index 207927e9fee..7ec1d1a4043 100644
--- a/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
+++ b/apps/web/lib/submitted-leads/mark-submitted-lead-qualified.ts
@@ -4,12 +4,13 @@ import { trackLead } from "@/lib/api/conversions/track-lead";
 import { prisma } from "@/lib/prisma";
 import { recordFakeClick } from "@/lib/tinybird/record-fake-click";
 import { pick } from "@dub/utils";
-import { Project, SubmittedLead } from "@prisma/client";
+import { CommissionSource, Project, SubmittedLead } from "@prisma/client";
 
 interface MarkSubmittedLeadQualifiedInput {
   workspace: Pick<Project, "id" | "stripeConnectId" | "webhookEnabled">;
   lead: SubmittedLead;
   externalId: string | null;
+  userId: string; // user who marked the lead as qualified
 }
 
 // Mark a submitted lead as qualified
@@ -17,6 +18,7 @@ export const markSubmittedLeadQualified = async ({
   workspace,
   lead,
   externalId,
+  userId,
 }: MarkSubmittedLeadQualifiedInput) => {
   // Find the default link for the partner
   const links = await prisma.link.findMany({
@@ -62,6 +64,8 @@ export const markSubmittedLeadQualified = async ({
     mode: "wait",
     workspace: pick(workspace, ["id", "stripeConnectId", "webhookEnabled"]),
     source: "submitted",
+    commissionSource: CommissionSource.user,
+    userId,
   });
 
   const customer = await prisma.customer.findUniqueOrThrow({
diff --git a/apps/web/lib/submitted-leads/submit-lead-action.ts b/apps/web/lib/submitted-leads/submit-lead-action.ts
index 75e74f1b3ec..8fe2d9f9f8e 100644
--- a/apps/web/lib/submitted-leads/submit-lead-action.ts
+++ b/apps/web/lib/submitted-leads/submit-lead-action.ts
@@ -10,7 +10,8 @@ import {
 } from "@/lib/submitted-leads/constants";
 import { notifyPartnerLeadSubmitted } from "@/lib/submitted-leads/notify-partner-lead-submitted";
 import { SubmittedLeadFormDataField } from "@/lib/types";
-import { ratelimit } from "@/lib/upstash";
+import { assertRateLimit } from "@/lib/upstash/assert-rate-limit";
+import { RATELIMIT_POLICIES } from "@/lib/upstash/ratelimit-policies";
 import {
   formFieldSchema,
   submittedLeadFormSchema,
@@ -75,16 +76,10 @@ export const submitLeadAction = authPartnerActionClient
       });
     }
 
-    const { success } = await ratelimit(10, "1 m").limit(
-      `rl:submitted-lead:${partner.id}`,
-    );
-
-    if (!success) {
-      throw new DubApiError({
-        code: "rate_limit_exceeded",
-        message: "Too many leads submitted. Please try again later.",
-      });
-    }
+    await assertRateLimit({
+      policy: RATELIMIT_POLICIES.submitLead,
+      identifier: partner.id,
+    });
 
     const programEnrollment = await prisma.programEnrollment.findUnique({
       where: {
diff --git a/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts b/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
index a994920f630..fd74e1d8290 100644
--- a/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
+++ b/apps/web/lib/submitted-leads/update-submitted-lead-status-action.ts
@@ -101,6 +101,7 @@ export const updateSubmittedLeadStatusAction = authActionClient
                   workspace,
                   lead: updatedLead,
                   externalId: parsedInput.externalId ?? null,
+                  userId: user.id,
                 }),
               ]
             : []),
@@ -112,6 +113,7 @@ export const updateSubmittedLeadStatusAction = authActionClient
                   lead: updatedLead as SubmittedLeadWithCustomer,
                   saleAmount: parsedInput.saleAmount,
                   stripeCustomerId: parsedInput.stripeCustomerId ?? null,
+                  userId: user.id,
                 }),
               ]
             : []),
diff --git a/apps/web/lib/swr/use-discounts.ts b/apps/web/lib/swr/use-discounts.ts
index 055686017ac..601526e6d05 100644
--- a/apps/web/lib/swr/use-discounts.ts
+++ b/apps/web/lib/swr/use-discounts.ts
@@ -1,24 +1,44 @@
+import { getDiscountsQuerySchema } from "@/lib/api/discounts/list-discounts";
 import { fetcher } from "@dub/utils";
-import useSWR from "swr";
+import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
 import { DiscountProps } from "../types";
 import useWorkspace from "./use-workspace";
 
-export default function useDiscounts() {
+export type DiscountListItem = DiscountProps & {
+  groupId?: string | null;
+  partnersCount?: number;
+};
+
+export function useDiscounts(
+  opts: z.infer<typeof getDiscountsQuerySchema> = {},
+  swrOpts: SWRConfiguration = {},
+) {
+  const { groupId } = opts;
   const { id: workspaceId, defaultProgramId } = useWorkspace();
 
-  const { data: discounts, error } = useSWR<DiscountProps[]>(
-    workspaceId &&
-      defaultProgramId &&
-      `/api/programs/${defaultProgramId}/discounts?workspaceId=${workspaceId}`,
+  const searchParams = new URLSearchParams({
+    ...(workspaceId && { workspaceId }),
+    ...(groupId && { groupId }),
+  });
+
+  const requiresGroup = "groupId" in opts;
+  const canFetch =
+    workspaceId && defaultProgramId && (!requiresGroup || groupId);
+
+  const { data: discounts, error } = useSWR<DiscountListItem[]>(
+    canFetch ? `/api/discounts?${searchParams}` : null,
     fetcher,
     {
       dedupingInterval: 60000,
+      keepPreviousData: !groupId,
+      ...swrOpts,
     },
   );
 
   return {
     discounts,
-    loading: !discounts && !error,
+    loading: Boolean(canFetch) && !discounts && !error,
     error,
   };
 }
diff --git a/apps/web/lib/swr/use-partner-cross-program-summary.ts b/apps/web/lib/swr/use-partner-cross-program-summary.ts
deleted file mode 100644
index d49ccd2ed08..00000000000
--- a/apps/web/lib/swr/use-partner-cross-program-summary.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { partnerCrossProgramSummarySchema } from "@/lib/zod/schemas/partners";
-import { fetcher } from "@dub/utils";
-import useSWR from "swr";
-import * as z from "zod/v4";
-import useWorkspace from "./use-workspace";
-
-type CrossProgramSummary = z.infer<typeof partnerCrossProgramSummarySchema>;
-
-export function usePartnerCrossProgramSummary({
-  partnerId,
-  enabled = true,
-}: {
-  partnerId: string | null | undefined;
-  enabled?: boolean;
-}) {
-  const { id: workspaceId } = useWorkspace();
-
-  const { data, isLoading, error } = useSWR<CrossProgramSummary>(
-    enabled && partnerId && workspaceId
-      ? `/api/partners/${partnerId}/cross-program-summary?workspaceId=${workspaceId}`
-      : null,
-    fetcher,
-  );
-
-  return {
-    crossProgramSummary: data,
-    isLoading,
-    error,
-  };
-}
diff --git a/apps/web/lib/swr/use-partner-rewards.ts b/apps/web/lib/swr/use-partner-rewards.ts
new file mode 100644
index 00000000000..e41584badaa
--- /dev/null
+++ b/apps/web/lib/swr/use-partner-rewards.ts
@@ -0,0 +1,147 @@
+import { resolvePartnerAssignedItem } from "@/lib/rewards/resolve-partner-assigned-item";
+import { useDiscounts } from "@/lib/swr/use-discounts";
+import { useRewards } from "@/lib/swr/use-rewards";
+import {
+  DiscountProps,
+  EnrolledPartnerProps,
+  GroupProps,
+  RewardProps,
+} from "@/lib/types";
+import { useMemo } from "react";
+
+export type PartnerRewardItem = RewardProps & {
+  isOverride: boolean;
+};
+
+export type PartnerDiscountItem = DiscountProps & {
+  isOverride: boolean;
+};
+
+type RewardEvent = "click" | "lead" | "sale";
+
+const rewardConfig: {
+  event: RewardEvent;
+  partnerKey: keyof Pick<
+    EnrolledPartnerProps,
+    "clickRewardId" | "leadRewardId" | "saleRewardId"
+  >;
+  groupKey: "clickReward" | "leadReward" | "saleReward";
+}[] = [
+  {
+    event: "click",
+    partnerKey: "clickRewardId",
+    groupKey: "clickReward",
+  },
+  {
+    event: "lead",
+    partnerKey: "leadRewardId",
+    groupKey: "leadReward",
+  },
+  {
+    event: "sale",
+    partnerKey: "saleRewardId",
+    groupKey: "saleReward",
+  },
+];
+
+// Resolves a partner's effective rewards and discount: partner-level overrides
+// when set, otherwise the group's defaults. Marks each item with `isOverride`.
+export function usePartnerRewards({
+  partner,
+  group,
+}: {
+  partner:
+    | Pick<
+        EnrolledPartnerProps,
+        "clickRewardId" | "leadRewardId" | "saleRewardId" | "discountId"
+      >
+    | null
+    | undefined;
+  group: GroupProps | null | undefined;
+}) {
+  const { rewards: groupRewards, loading: rewardsLoading } = useRewards({
+    groupId: group?.id,
+  });
+
+  const { discounts: groupDiscounts, loading: discountsLoading } = useDiscounts(
+    {
+      groupId: group?.id,
+    },
+  );
+
+  return useMemo(() => {
+    const rewards: PartnerRewardItem[] = [];
+    let discount: PartnerDiscountItem | null = null;
+
+    if (!group) {
+      return {
+        rewards,
+        discount,
+      };
+    }
+
+    const rewardsById = new Map<string, RewardProps>(
+      (groupRewards ?? []).map((reward) => [reward.id, reward]),
+    );
+
+    const discountsById = new Map<string, DiscountProps>(
+      (groupDiscounts ?? []).map((discount) => [discount.id, discount]),
+    );
+
+    for (const { partnerKey, groupKey } of rewardConfig) {
+      const resolved = resolvePartnerAssignedItem({
+        assignedId: partner?.[partnerKey],
+        groupDefault: group[groupKey],
+        itemsById: rewardsById,
+        loading: rewardsLoading,
+      });
+
+      if (resolved) {
+        rewards.push({
+          ...resolved.item,
+          isOverride: resolved.isOverride,
+        });
+      }
+    }
+
+    if (group.referralReward) {
+      rewards.push({
+        ...group.referralReward,
+        isOverride: false,
+      });
+    }
+
+    if (group.customReward) {
+      rewards.push({
+        ...group.customReward,
+        isOverride: false,
+      });
+    }
+
+    const resolvedDiscount = resolvePartnerAssignedItem({
+      assignedId: partner?.discountId,
+      groupDefault: group.discount,
+      itemsById: discountsById,
+      loading: discountsLoading,
+    });
+
+    if (resolvedDiscount) {
+      discount = {
+        ...resolvedDiscount.item,
+        isOverride: resolvedDiscount.isOverride,
+      };
+    }
+
+    return {
+      rewards,
+      discount,
+    };
+  }, [
+    group,
+    partner,
+    groupRewards,
+    groupDiscounts,
+    rewardsLoading,
+    discountsLoading,
+  ]);
+}
diff --git a/apps/web/lib/swr/use-partners-count.ts b/apps/web/lib/swr/use-partners-count.ts
index 5d347baea52..9dbff9cc82b 100644
--- a/apps/web/lib/swr/use-partners-count.ts
+++ b/apps/web/lib/swr/use-partners-count.ts
@@ -17,21 +17,21 @@ export default function usePartnersCount<T>({
   const { id: workspaceId, defaultProgramId } = useWorkspace();
   const { getQueryString } = useRouterStuff();
 
+  // URLSearchParams stringifies an undefined value to "undefined", which then
+  // fails the enum parsing in partnersCountQuerySchema. The filter dropdowns hit
+  // this whenever a search is active, because that is when `status` is left
+  // undefined rather than defaulting to "approved".
+  const definedParams = Object.fromEntries(
+    Object.entries({ ...params, workspaceId }).filter(
+      ([, value]) => value !== undefined && value !== null,
+    ),
+  );
+
   const queryString = ignoreParams
-    ? // @ts-ignore
-      `?${new URLSearchParams({
-        ...params,
-        workspaceId,
-      }).toString()}`
-    : getQueryString(
-        {
-          ...params,
-          workspaceId,
-        },
-        {
-          exclude: ["partnerId"],
-        },
-      );
+    ? `?${new URLSearchParams(definedParams as Record<string, string>).toString()}`
+    : getQueryString(definedParams, {
+        exclude: ["partnerId"],
+      });
 
   const {
     data: partnersCount,
diff --git a/apps/web/lib/swr/use-program-partner-links.ts b/apps/web/lib/swr/use-program-partner-links.ts
new file mode 100644
index 00000000000..e8995a2c82e
--- /dev/null
+++ b/apps/web/lib/swr/use-program-partner-links.ts
@@ -0,0 +1,40 @@
+import { ProgramPartnerLinkSchemaInternal } from "@/lib/zod/schemas/programs";
+import { fetcher } from "@dub/utils";
+import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
+import useWorkspace from "./use-workspace";
+
+type UseProgramPartnerLinksProps = {
+  partnerId: string | null;
+};
+
+export type ProgramPartnerLinkExtended = z.infer<
+  typeof ProgramPartnerLinkSchemaInternal
+>;
+
+export function useProgramPartnerLinks(
+  { partnerId }: UseProgramPartnerLinksProps,
+  swrOptions: SWRConfiguration = {},
+) {
+  const { id: workspaceId } = useWorkspace();
+
+  const {
+    data: links,
+    error,
+    isLoading,
+    isValidating,
+  } = useSWR<ProgramPartnerLinkExtended[]>(
+    partnerId && workspaceId
+      ? `/api/partners/links?partnerId=${partnerId}&workspaceId=${workspaceId}&includeRewards=true`
+      : null,
+    fetcher,
+    swrOptions,
+  );
+
+  return {
+    links,
+    loading: isLoading,
+    error,
+    isValidating,
+  };
+}
diff --git a/apps/web/lib/swr/use-rewards.ts b/apps/web/lib/swr/use-rewards.ts
index 1a3627b8426..a0957f6cca2 100644
--- a/apps/web/lib/swr/use-rewards.ts
+++ b/apps/web/lib/swr/use-rewards.ts
@@ -1,25 +1,44 @@
+import { getRewardsQuerySchema } from "@/lib/api/rewards/list-rewards";
 import { fetcher } from "@dub/utils";
-import useSWR from "swr";
+import useSWR, { SWRConfiguration } from "swr";
+import * as z from "zod/v4";
 import { RewardProps } from "../types";
 import useWorkspace from "./use-workspace";
 
-export default function useRewards() {
+export type RewardListItem = RewardProps & {
+  groupId?: string | null;
+  partnersCount?: number;
+};
+
+export function useRewards(
+  opts: z.infer<typeof getRewardsQuerySchema> = {},
+  swrOpts: SWRConfiguration = {},
+) {
+  const { groupId } = opts;
   const { id: workspaceId, defaultProgramId } = useWorkspace();
 
-  const { data: rewards, error } = useSWR<RewardProps[]>(
-    workspaceId &&
-      defaultProgramId &&
-      `/api/rewards?workspaceId=${workspaceId}`,
+  const searchParams = new URLSearchParams({
+    ...(workspaceId && { workspaceId }),
+    ...(groupId && { groupId }),
+  });
+
+  const requiresGroup = "groupId" in opts;
+  const canFetch =
+    workspaceId && defaultProgramId && (!requiresGroup || groupId);
+
+  const { data: rewards, error } = useSWR<RewardListItem[]>(
+    canFetch ? `/api/rewards?${searchParams}` : null,
     fetcher,
     {
       dedupingInterval: 60000,
-      keepPreviousData: true,
+      keepPreviousData: !groupId,
+      ...swrOpts,
     },
   );
 
   return {
     rewards,
-    loading: !rewards && !error,
+    loading: Boolean(canFetch) && !rewards && !error,
     error,
   };
 }
diff --git a/apps/web/lib/swr/use-workspace-users.ts b/apps/web/lib/swr/use-workspace-users.ts
index 4f17b8332bb..f0b5c6bd332 100644
--- a/apps/web/lib/swr/use-workspace-users.ts
+++ b/apps/web/lib/swr/use-workspace-users.ts
@@ -6,10 +6,11 @@ import useWorkspace from "./use-workspace";
 export default function useWorkspaceUsers({
   invites,
 }: { invites?: boolean } = {}) {
-  const { id } = useWorkspace();
+  const { id, role } = useWorkspace();
 
   const { data: users, error } = useSWR<WorkspaceUserProps[]>(
     id &&
+      role !== "viewer" &&
       (invites
         ? `/api/workspaces/${id}/invites`
         : `/api/workspaces/${id}/users`),
diff --git a/apps/web/lib/swr/use-workspace.ts b/apps/web/lib/swr/use-workspace.ts
index bdc652b8227..cb45240cfac 100644
--- a/apps/web/lib/swr/use-workspace.ts
+++ b/apps/web/lib/swr/use-workspace.ts
@@ -10,8 +10,13 @@ export default function useWorkspace({
 }: {
   swrOpts?: SWRConfiguration;
 } = {}) {
-  let { slug } = useParams() as { slug: string | null };
+  let { slug } = useParams() as { slug: string | string[] | null };
   const searchParams = useSearchParams();
+  // catch-all routes (e.g. /marketplace/[[...slug]]) surface `slug` as an array,
+  // which is never a workspace slug - ignore it so we don't fetch /api/workspaces/<segment>
+  if (Array.isArray(slug)) {
+    slug = null;
+  }
   if (!slug) {
     slug = searchParams.get("slug") || searchParams.get("workspace");
   }
@@ -43,6 +48,11 @@ export default function useWorkspace({
       workspace.payoutsUsage >= workspace.payoutsLimit
         ? true
         : false,
+    exceededPartners:
+      workspace?.partnersLimit &&
+      workspace.partnersUsage >= workspace.partnersLimit
+        ? true
+        : false,
     exceededAI: workspace && workspace.aiUsage >= workspace.aiLimit,
     exceededDomains:
       workspace?.domains && workspace.domains.length >= workspace.domainsLimit,
diff --git a/apps/web/lib/tapfiliate/cleanup-partners.ts b/apps/web/lib/tapfiliate/cleanup-partners.ts
index 67a2e332e45..06045dcf688 100644
--- a/apps/web/lib/tapfiliate/cleanup-partners.ts
+++ b/apps/web/lib/tapfiliate/cleanup-partners.ts
@@ -1,4 +1,6 @@
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { conn } from "@/lib/planetscale";
 import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import ProgramImported from "@dub/email/templates/program-imported";
@@ -57,6 +59,20 @@ export async function cleanupPartners(payload: TapfiliateImportPayload) {
 
       await bulkDeleteLinks(linksToDelete);
 
+      // Resolved before the delete, since nothing can map these partners back
+      // to their enrollments afterwards.
+      const removedEnrollments = await prisma.programEnrollment.findMany({
+        where: {
+          programId,
+          partnerId: {
+            in: partnerIdsWithNoLeads,
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+
       await prisma.programEnrollment.deleteMany({
         where: {
           programId,
@@ -66,6 +82,11 @@ export async function cleanupPartners(payload: TapfiliateImportPayload) {
         },
       });
 
+      // Queue an index update because the enrollments were deleted.
+      await queuePartnerSearchSync({
+        enrollmentIds: removedEnrollments.map(({ id }) => id),
+      });
+
       // Remove partners that are not enrolled in any other program
       const otherProgramEnrollments = await prisma.programEnrollment.findMany({
         where: {
@@ -108,13 +129,20 @@ export async function cleanupPartners(payload: TapfiliateImportPayload) {
         });
 
         if (partnersWithoutUserAccount.length > 0) {
-          await prisma.partner.deleteMany({
-            where: {
-              id: {
-                in: partnersWithoutUserAccount.map(({ id }) => id),
-              },
-            },
-          });
+          const partnerIdsToDelete = partnersWithoutUserAccount.map(
+            ({ id }) => id,
+          );
+
+          // using conn.execute here since Prisma throws on partner.deleteMany()
+          await conn.execute(
+            `DELETE FROM Partner WHERE id IN (${partnerIdsToDelete.map(() => "?").join(",")})`,
+            partnerIdsToDelete,
+          );
+
+          console.log(
+            "Removed the following partners",
+            partnersWithoutUserAccount,
+          );
         }
       }
     }
diff --git a/apps/web/lib/tapfiliate/client.ts b/apps/web/lib/tapfiliate/client.ts
index 87a4f2f87df..2b2a215f526 100644
--- a/apps/web/lib/tapfiliate/client.ts
+++ b/apps/web/lib/tapfiliate/client.ts
@@ -57,7 +57,7 @@ export class TapfiliateClient extends HttpBaseClient {
     });
   }
 
-  // GET /customers?program_id=&page=
+  // GET /customers/?program_id=&page=
   async listCustomers({
     programId,
     page = 1,
@@ -65,7 +65,7 @@ export class TapfiliateClient extends HttpBaseClient {
     programId: string;
     page?: number;
   }) {
-    return await this.get("/customers", {
+    return await this.get("/customers/", {
       input: {
         program_id: programId,
         page,
diff --git a/apps/web/lib/tapfiliate/import-commissions.ts b/apps/web/lib/tapfiliate/import-commissions.ts
index b78bfa69bde..291d0802fab 100644
--- a/apps/web/lib/tapfiliate/import-commissions.ts
+++ b/apps/web/lib/tapfiliate/import-commissions.ts
@@ -1,6 +1,6 @@
 import { prisma } from "@/lib/prisma";
 import { chunk, nanoid } from "@dub/utils";
-import { Customer, Link, Program } from "@prisma/client";
+import { CommissionSource, Customer, Link, Program } from "@prisma/client";
 import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
 import { isFirstConversion } from "../analytics/is-first-conversion";
 import { createId } from "../api/create-id";
@@ -14,6 +14,7 @@ import { LeadEventTB } from "../types";
 import { redis } from "../upstash";
 import { clickEventSchemaTB } from "../zod/schemas/clicks";
 import { TapfiliateClient } from "./client";
+import { getTapfiliateCustomerExternalId } from "./import-customers";
 import { TAPFILIATE_MAX_BATCHES, tapfiliateImporter } from "./importer";
 import {
   TapfiliateConversionWithCommission,
@@ -72,9 +73,13 @@ export async function importCommissions(payload: TapfiliateImportPayload) {
       (conversion) => conversion.program?.id === tapfiliateProgramId,
     );
 
-    const customerExternalIds = conversions
-      .map((conversion) => conversion.customer?.customer_id)
-      .filter((id): id is string => Boolean(id));
+    const customerExternalIds = [
+      ...new Set(
+        conversions
+          .map((conversion) => getTapfiliateCustomerExternalId(conversion))
+          .filter((id): id is string => Boolean(id)),
+      ),
+    ];
 
     const customersData = await prisma.customer.findMany({
       where: {
@@ -151,7 +156,8 @@ async function createCommission({
   customersData: (Customer & { link: Link | null })[];
   customerLeadEvents: LeadEventTB[];
 }) {
-  const { commission, customer } = conversion;
+  const { commission } = conversion;
+  const customerExternalId = getTapfiliateCustomerExternalId(conversion);
 
   const commonImportLogInputs = {
     workspace_id: program.workspaceId,
@@ -178,25 +184,25 @@ async function createCommission({
     return;
   }
 
-  if (!customer) {
+  if (!customerExternalId) {
     await logImportError({
       ...commonImportLogInputs,
       code: "CUSTOMER_NOT_FOUND",
-      message: `A customer is not associated with this commission ${commission.id}, skipping...`,
+      message: `No customer id or external_id associated with this commission ${commission.id}, skipping...`,
     });
 
     return;
   }
 
   const existingCustomer = customersData.find(
-    ({ externalId }) => externalId === customer?.customer_id,
+    ({ externalId }) => externalId === customerExternalId,
   );
 
   if (!existingCustomer) {
     await logImportError({
       ...commonImportLogInputs,
       code: "CUSTOMER_NOT_FOUND",
-      message: `No customer ${customer.customer_id} found for commission ${commission.id}.`,
+      message: `No customer ${customerExternalId} found for commission ${commission.id}.`,
     });
 
     return;
@@ -289,6 +295,7 @@ async function createCommission({
         status: commission.approved ? "paid" : "pending",
         invoiceId: commission.id.toString(), // this is not the actual invoice ID, but we use this to deduplicate the sales
         createdAt: new Date(commission.created_at),
+        source: CommissionSource.tapfiliate,
       },
     }),
 
diff --git a/apps/web/lib/tapfiliate/import-customers.ts b/apps/web/lib/tapfiliate/import-customers.ts
index 85493a2a841..a5ee85f45ff 100644
--- a/apps/web/lib/tapfiliate/import-customers.ts
+++ b/apps/web/lib/tapfiliate/import-customers.ts
@@ -9,10 +9,26 @@ import { logImportError } from "../tinybird/log-import-error";
 import { clickEventSchemaTB } from "../zod/schemas/clicks";
 import { TapfiliateClient } from "./client";
 import { TAPFILIATE_MAX_BATCHES, tapfiliateImporter } from "./importer";
-import { TapfiliateCustomer, TapfiliateImportPayload } from "./types";
+import {
+  TapfiliateConversion,
+  TapfiliateCustomer,
+  TapfiliateImportPayload,
+} from "./types";
+
+export function getTapfiliateCustomerExternalId(
+  conversion: Pick<TapfiliateConversion, "customer" | "external_id">,
+): string | null {
+  return conversion.customer?.customer_id ?? conversion.external_id ?? null;
+}
 
 export async function importCustomers(payload: TapfiliateImportPayload) {
-  const { importId, programId, tapfiliateProgramId, page = 1 } = payload;
+  const {
+    importId,
+    programId,
+    tapfiliateProgramId,
+    page = 1,
+    customerSource = "customers",
+  } = payload;
 
   const program = await prisma.program.findUnique({
     where: {
@@ -47,6 +63,21 @@ export async function importCustomers(payload: TapfiliateImportPayload) {
     apiKey,
   });
 
+  if (customerSource === "conversions") {
+    await importCustomersFromConversions({
+      payload,
+      program: {
+        domain: program.domain,
+        workspace,
+      },
+      tapfiliateApi,
+      tapfiliateProgramId,
+      importId,
+      page,
+    });
+    return;
+  }
+
   let currentPage = page;
   let hasMore = true;
   let processedBatches = 0;
@@ -68,77 +99,94 @@ export async function importCustomers(payload: TapfiliateImportPayload) {
         customer.program?.id === tapfiliateProgramId && customer.affiliate?.id,
     );
 
-    if (customers.length > 0) {
-      // Map the Tapfiliate affiliate id -> the partner's referral link (link key = affiliate id)
-      const affiliateIds = [
-        ...new Set(customers.map((customer) => customer.affiliate!.id)),
-      ];
-
-      const links = await prisma.link.findMany({
-        where: {
-          domain: program.domain,
-          key: {
-            in: affiliateIds,
-          },
-        },
-        select: {
-          id: true,
-          key: true,
-          domain: true,
-          url: true,
-          partnerId: true,
-          programId: true,
-          lastLeadAt: true,
-        },
-      });
-
-      const affiliateIdToLink = new Map(links.map((link) => [link.key, link]));
-      const customerExternalIds = [
-        ...new Set(
-          customers
-            .map((customer) => customer.customer_id)
-            .filter((id): id is string => id !== null),
-        ),
-      ];
-
-      // Find the existing customers by their external customer_id
-      const existingCustomers = await prisma.customer.findMany({
-        where: {
-          projectId: workspace.id,
-          externalId: {
-            in: customerExternalIds,
-          },
-        },
-        select: {
-          id: true,
-          externalId: true,
-        },
-      });
+    await createCustomers({
+      workspace,
+      domain: program.domain,
+      importId,
+      customers,
+    });
 
-      // New customers to create
-      const newCustomers = customers.filter(
-        (customer) =>
-          !existingCustomers.some((c) => c.externalId === customer.customer_id),
-      );
+    currentPage++;
+    processedBatches++;
+  }
+
+  await tapfiliateImporter.queue({
+    ...payload,
+    action: "import-customers",
+    customerSource: hasMore ? "customers" : "conversions",
+    page: hasMore ? currentPage : 1,
+  });
+}
+
+async function importCustomersFromConversions({
+  payload,
+  program,
+  tapfiliateApi,
+  tapfiliateProgramId,
+  importId,
+  page,
+}: {
+  payload: TapfiliateImportPayload;
+  program: {
+    domain: string;
+    workspace: Pick<Project, "id" | "stripeConnectId">;
+  };
+  tapfiliateApi: TapfiliateClient;
+  tapfiliateProgramId: string;
+  importId: string;
+  page: number;
+}) {
+  let currentPage = page;
+  let hasMore = true;
+  let processedBatches = 0;
+
+  while (hasMore && processedBatches < TAPFILIATE_MAX_BATCHES) {
+    let conversions = await tapfiliateApi.listConversions({
+      programId: tapfiliateProgramId,
+      page: currentPage,
+    });
+
+    if (conversions.length === 0) {
+      hasMore = false;
+      break;
+    }
+
+    conversions = conversions.filter(
+      (conversion) => conversion.program?.id === tapfiliateProgramId,
+    );
 
-      if (newCustomers.length > 0) {
-        const customerChunks = chunk(newCustomers, 10);
-
-        for (const customerChunk of customerChunks) {
-          await Promise.all(
-            customerChunk.map((customer) =>
-              createCustomer({
-                workspace,
-                customer,
-                link: affiliateIdToLink.get(customer.affiliate!.id),
-                importId,
-              }),
-            ),
-          );
-        }
+    const customersByExternalId = new Map<string, TapfiliateCustomer>();
+
+    for (const conversion of conversions) {
+      const externalId = getTapfiliateCustomerExternalId(conversion);
+      const affiliateId =
+        conversion.affiliate?.id ?? conversion.customer?.affiliate?.id;
+
+      if (!externalId || !affiliateId) {
+        continue;
+      }
+
+      const existing = customersByExternalId.get(externalId);
+
+      if (!existing || conversion.created_at < existing.created_at) {
+        customersByExternalId.set(externalId, {
+          id: String(conversion.id),
+          customer_id: externalId,
+          created_at: conversion.created_at,
+          click: conversion.click ?? null,
+          program: conversion.program,
+          affiliate: { id: affiliateId },
+        });
       }
     }
 
+    await createCustomers({
+      workspace: program.workspace,
+      domain: program.domain,
+      importId,
+      customers: [...customersByExternalId.values()],
+    });
+
     currentPage++;
     processedBatches++;
   }
@@ -146,10 +194,99 @@ export async function importCustomers(payload: TapfiliateImportPayload) {
   await tapfiliateImporter.queue({
     ...payload,
     action: hasMore ? "import-customers" : "import-commissions",
+    customerSource: hasMore ? "conversions" : undefined,
     page: hasMore ? currentPage : undefined,
   });
 }
 
+async function createCustomers({
+  workspace,
+  domain,
+  importId,
+  customers,
+}: {
+  workspace: Pick<Project, "id" | "stripeConnectId">;
+  domain: string;
+  importId: string;
+  customers: TapfiliateCustomer[];
+}) {
+  const customersWithAffiliate = customers.filter(
+    (customer) => customer.affiliate?.id,
+  );
+
+  if (customersWithAffiliate.length === 0) {
+    return;
+  }
+
+  // Map the Tapfiliate affiliate id -> the partner's referral link (link key = affiliate id)
+  const affiliateIds = [
+    ...new Set(
+      customersWithAffiliate.map((customer) => customer.affiliate!.id),
+    ),
+  ];
+
+  const links = await prisma.link.findMany({
+    where: {
+      domain,
+      key: {
+        in: affiliateIds,
+      },
+    },
+    select: {
+      id: true,
+      key: true,
+      domain: true,
+      url: true,
+      partnerId: true,
+      programId: true,
+      lastLeadAt: true,
+    },
+  });
+
+  const affiliateIdToLink = new Map(links.map((link) => [link.key, link]));
+  const customerExternalIds = [
+    ...new Set(customersWithAffiliate.map((customer) => customer.customer_id)),
+  ];
+
+  // Find the existing customers by their external customer_id
+  const existingCustomers = await prisma.customer.findMany({
+    where: {
+      projectId: workspace.id,
+      externalId: {
+        in: customerExternalIds,
+      },
+    },
+    select: {
+      id: true,
+      externalId: true,
+    },
+  });
+
+  const newCustomers = customersWithAffiliate.filter(
+    (customer) =>
+      !existingCustomers.some((c) => c.externalId === customer.customer_id),
+  );
+
+  if (newCustomers.length === 0) {
+    return;
+  }
+
+  const customerChunks = chunk(newCustomers, 10);
+
+  for (const customerChunk of customerChunks) {
+    await Promise.all(
+      customerChunk.map((customer) =>
+        createCustomer({
+          workspace,
+          customer,
+          link: affiliateIdToLink.get(customer.affiliate!.id),
+          importId,
+        }),
+      ),
+    );
+  }
+}
+
 async function createCustomer({
   workspace,
   customer,
diff --git a/apps/web/lib/tapfiliate/import-partners.ts b/apps/web/lib/tapfiliate/import-partners.ts
index a3ae364e8b6..46d9aec45ea 100644
--- a/apps/web/lib/tapfiliate/import-partners.ts
+++ b/apps/web/lib/tapfiliate/import-partners.ts
@@ -4,6 +4,7 @@ import slugify from "@sindresorhus/slugify";
 import { createId } from "../api/create-id";
 import { createLink } from "../api/links";
 import { generatePartnerLink } from "../api/partners/generate-partner-link";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { logImportError } from "../tinybird/log-import-error";
 import { WorkspaceProps } from "../types";
 import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
@@ -26,6 +27,8 @@ export async function importPartners(payload: TapfiliateImportPayload) {
           clickRewardId: true,
           leadRewardId: true,
           saleRewardId: true,
+          referralRewardId: true,
+          customRewardId: true,
           discountId: true,
         },
       },
@@ -111,6 +114,10 @@ export async function importPartners(payload: TapfiliateImportPayload) {
       .map((p) => p.value);
 
     if (partnerIds.length > 0) {
+      // Queue an index update because the imported partners were enrolled.
+      // Queued per page rather than per partner.
+      await queuePartnerSearchSync({ partnerIds, programId });
+
       await tapfiliateImporter.trackImportedPartnerIds({
         programId,
         partnerIds,
@@ -177,7 +184,13 @@ async function createPartnerAndLinks({
   affiliate: TapfiliatePartner;
   group: Pick<
     PartnerGroup,
-    "id" | "discountId" | "clickRewardId" | "leadRewardId" | "saleRewardId"
+    | "id"
+    | "discountId"
+    | "clickRewardId"
+    | "leadRewardId"
+    | "saleRewardId"
+    | "referralRewardId"
+    | "customRewardId"
   >;
   userId: string;
   importId: string;
@@ -229,6 +242,8 @@ async function createPartnerAndLinks({
       clickRewardId: group.clickRewardId,
       leadRewardId: group.leadRewardId,
       saleRewardId: group.saleRewardId,
+      referralRewardId: group.referralRewardId,
+      customRewardId: group.customRewardId,
       discountId: group.discountId,
     },
     update: {
diff --git a/apps/web/lib/tapfiliate/schemas.ts b/apps/web/lib/tapfiliate/schemas.ts
index 5b35cae3368..5d651a063c6 100644
--- a/apps/web/lib/tapfiliate/schemas.ts
+++ b/apps/web/lib/tapfiliate/schemas.ts
@@ -17,6 +17,7 @@ export const tapfiliateImportPayloadSchema = z.object({
   action: tapfiliateImportSteps,
   page: z.number().optional(), // Tapfiliate pagination
   startingAfter: z.string().optional(), // Dub pagination
+  customerSource: z.enum(["customers", "conversions"]).optional(),
 });
 
 // GET /affiliates/
@@ -24,7 +25,7 @@ export const tapfiliateListPartnersInputSchema = z.object({
   page: z.number(),
 });
 
-// GET /customers
+// GET /customers/
 export const tapfiliateListCustomersInputSchema = z.object({
   program_id: z.string(),
   page: z.number(),
@@ -63,17 +64,17 @@ export const tapfiliatePartnerSchema = z.object({
     .nullable(),
 });
 
+export const tapfiliateClickSchema = z.object({
+  created_at: z.string(),
+  referrer: z.string().nullable(),
+  landing_page: z.string().nullable(),
+});
+
 export const tapfiliateCustomerSchema = z.object({
   id: z.string(),
   customer_id: z.string().describe("External customer ID."),
   created_at: z.string(),
-  click: z
-    .object({
-      created_at: z.string(),
-      referrer: z.string().nullable(),
-      landing_page: z.string().nullable(),
-    })
-    .nullable(),
+  click: tapfiliateClickSchema.nullable(),
   program: tapfiliateProgramSchema
     .pick({
       id: true,
@@ -97,6 +98,8 @@ export const tapfiliateCommissionSchema = z.object({
 
 export const tapfiliateConversionSchema = z.object({
   id: z.number(),
+  created_at: z.string(),
+  external_id: z.string().nullish(),
   program: tapfiliateProgramSchema
     .pick({
       id: true,
@@ -105,7 +108,14 @@ export const tapfiliateConversionSchema = z.object({
   customer: tapfiliateCustomerSchema
     .pick({
       customer_id: true,
+      affiliate: true,
     })
-    .nullable(),
+    .nullish(),
+  affiliate: tapfiliatePartnerSchema
+    .pick({
+      id: true,
+    })
+    .nullish(),
+  click: tapfiliateClickSchema.nullish(),
   commissions: z.array(tapfiliateCommissionSchema).nullable(),
 });
diff --git a/apps/web/lib/tapfiliate/update-stripe-customers.ts b/apps/web/lib/tapfiliate/update-stripe-customers.ts
index dca4328478c..063205cf088 100644
--- a/apps/web/lib/tapfiliate/update-stripe-customers.ts
+++ b/apps/web/lib/tapfiliate/update-stripe-customers.ts
@@ -1,7 +1,9 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
 import { Customer, Project } from "@prisma/client";
 import Stripe from "stripe";
 import * as z from "zod/v4";
+
 import { stripeAppClient } from "../stripe";
 import { logImportError } from "../tinybird/log-import-error";
 import { TAPFILIATE_MAX_BATCHES, tapfiliateImporter } from "./importer";
@@ -34,8 +36,13 @@ export async function updateStripeCustomers(payload: TapfiliateImportPayload) {
 
   if (!workspace.stripeConnectId) {
     console.error(
-      `Workspace ${workspace.id} has no stripeConnectId. Skipping...`,
+      `Workspace ${workspace.id} has no stripeConnectId. Skipping Stripe customer matching...`,
     );
+
+    await tapfiliateImporter.queue({
+      ...payload,
+      action: "cleanup-partners",
+    });
     return;
   }
 
@@ -81,7 +88,7 @@ export async function updateStripeCustomers(payload: TapfiliateImportPayload) {
       ),
     );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     startingAfter = customers[customers.length - 1].id;
diff --git a/apps/web/lib/tinybird/delete-customer-events.ts b/apps/web/lib/tinybird/delete-customer-events.ts
new file mode 100644
index 00000000000..1a53727ae04
--- /dev/null
+++ b/apps/web/lib/tinybird/delete-customer-events.ts
@@ -0,0 +1,66 @@
+async function deleteDatasourceRows({
+  dataSource,
+  deleteCondition,
+}: {
+  dataSource: string;
+  deleteCondition: string;
+}) {
+  const baseUrl = process.env.TINYBIRD_API_URL;
+  const token = process.env.TINYBIRD_API_KEY;
+
+  if (!baseUrl || !token) {
+    throw new Error("Tinybird is not configured.");
+  }
+
+  const response = await fetch(
+    `${baseUrl}/v0/datasources/${dataSource}/delete`,
+    {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: `delete_condition=${deleteCondition}`,
+      signal: AbortSignal.timeout(30_000),
+    },
+  );
+
+  const payload = await response.json().catch(() => null);
+
+  if (!response.ok) {
+    throw new Error(
+      `Tinybird delete failed for ${dataSource}: ${JSON.stringify(payload)}`,
+    );
+  }
+
+  console.log(`Deleted rows matching ${deleteCondition} from ${dataSource}`);
+
+  return payload;
+}
+
+export async function deleteTinybirdCustomerEvents({
+  customerId,
+}: {
+  customerId: string;
+}) {
+  if (!customerId.startsWith("cus_")) {
+    throw new Error(`Invalid customer ID: ${customerId}`);
+  }
+
+  const customerCondition = `customer_id='${customerId}'`;
+
+  const dataSources = [
+    "dub_lead_events",
+    "dub_lead_events_mv",
+    "dub_sale_events",
+    "dub_sale_events_mv",
+  ];
+
+  // Delete sequentially to avoid Tinybird rate limits
+  for (const dataSource of dataSources) {
+    await deleteDatasourceRows({
+      dataSource,
+      deleteCondition: customerCondition,
+    });
+  }
+}
diff --git a/apps/web/lib/tinybird/get-customer-events-tb.ts b/apps/web/lib/tinybird/get-customer-events-tb.ts
index 51eaf3ee356..f32ae487dbf 100644
--- a/apps/web/lib/tinybird/get-customer-events-tb.ts
+++ b/apps/web/lib/tinybird/get-customer-events-tb.ts
@@ -10,12 +10,15 @@ const pipe = tb.buildPipe({
 export const getCustomerEventsTB = async ({
   customerId,
   linkIds,
+  limit,
 }: {
   customerId: string;
   linkIds?: string[];
+  limit?: number;
 }) => {
   return await pipe({
     customerId,
     ...(linkIds ? { linkIds } : {}),
+    ...(limit ? { limit } : {}),
   });
 };
diff --git a/apps/web/lib/tinybird/get-workspace-usage.ts b/apps/web/lib/tinybird/get-workspace-usage.ts
index ac62602d21e..0416818de2a 100644
--- a/apps/web/lib/tinybird/get-workspace-usage.ts
+++ b/apps/web/lib/tinybird/get-workspace-usage.ts
@@ -6,9 +6,10 @@ import * as z from "zod/v4";
 import { tb } from "./client";
 
 const usagePipe = tb.buildPipe({
-  pipe: "v3_usage",
+  pipe: "v4_usage",
   parameters: usageQuerySchema.extend({
     workspaceId: z.string(),
+    granularity: z.enum(["minute", "hour", "day", "month"]).optional(),
   }),
   data: usageResponse,
 });
@@ -38,7 +39,7 @@ export async function getWorkspaceUsage({
   end,
   timezone = "UTC",
 }: GetWorkspaceUsageParams) {
-  const { startDate, endDate } = getStartEndDates({
+  const { startDate, endDate, granularity } = getStartEndDates({
     interval,
     start,
     end,
@@ -51,6 +52,7 @@ export async function getWorkspaceUsage({
     start: formatUTCDateTimeClickhouse(startDate),
     end: formatUTCDateTimeClickhouse(endDate),
     timezone,
+    granularity,
     ...(folderId && { folderId }),
     ...(domain && { domain }),
     ...(groupBy && { groupBy }),
diff --git a/apps/web/lib/tinybird/index.ts b/apps/web/lib/tinybird/index.ts
index fc7b91e1d93..a295801a9c3 100644
--- a/apps/web/lib/tinybird/index.ts
+++ b/apps/web/lib/tinybird/index.ts
@@ -1,4 +1,5 @@
 export * from "./client";
+export * from "./delete-customer-events";
 export * from "./get-click-event";
 export * from "./get-lead-event";
 export * from "./record-click";
diff --git a/apps/web/lib/tinybird/record-fake-click.ts b/apps/web/lib/tinybird/record-fake-click.ts
index 76464382dd6..5a56d2be640 100644
--- a/apps/web/lib/tinybird/record-fake-click.ts
+++ b/apps/web/lib/tinybird/record-fake-click.ts
@@ -1,4 +1,4 @@
-import { nanoid } from "@dub/utils";
+import { COUNTRIES_TO_CONTINENTS, nanoid } from "@dub/utils";
 import { Link } from "@prisma/client";
 import { clickEventSchemaTB } from "../zod/schemas/clicks";
 import { recordClick } from "./record-click";
@@ -25,22 +25,51 @@ export async function recordFakeClick({
   link,
   customer,
   timestamp,
+  referrer,
+  userAgent,
 }: {
-  link: Pick<Link, "id" | "url" | "domain" | "key" | "projectId">;
+  link: Pick<Link, "id" | "url" | "domain" | "key" | "projectId"> & {
+    programId?: string | null;
+    partnerId?: string | null;
+  };
   customer?: {
     country?: string | null;
     region?: string | null;
     continent?: string | null;
+    city?: string | null;
+    latitude?: string | null;
+    longitude?: string | null;
   };
   timestamp?: string | number;
+  referrer?: string | null;
+  userAgent?: string | null;
 }) {
+  const country = toSafeHeaderValue(customer?.country) || "US";
+  const continent =
+    toSafeHeaderValue(customer?.continent) ||
+    COUNTRIES_TO_CONTINENTS[country] ||
+    "NA";
+
   const dummyRequest = new Request(link.url, {
     headers: new Headers({
-      "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)",
+      "user-agent":
+        toSafeHeaderValue(userAgent) ||
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)",
       "x-forwarded-for": "127.0.0.1",
-      "x-vercel-ip-country": toSafeHeaderValue(customer?.country) || "US",
+      "x-vercel-ip-country": country,
       "x-vercel-ip-country-region": toSafeHeaderValue(customer?.region) || "CA",
-      "x-vercel-ip-continent": toSafeHeaderValue(customer?.continent) || "NA",
+      "x-vercel-ip-continent": continent,
+      ...(customer?.city && {
+        "x-vercel-ip-city": toSafeHeaderValue(customer.city) || "Unknown",
+      }),
+      ...(customer?.latitude && {
+        "x-vercel-ip-latitude":
+          toSafeHeaderValue(customer.latitude) || "Unknown",
+      }),
+      ...(customer?.longitude && {
+        "x-vercel-ip-longitude":
+          toSafeHeaderValue(customer.longitude) || "Unknown",
+      }),
     }),
   });
 
@@ -52,8 +81,11 @@ export async function recordFakeClick({
     domain: link.domain,
     key: link.key,
     url: link.url,
+    programId: link.programId ?? undefined,
+    partnerId: link.partnerId ?? undefined,
     skipRatelimit: true,
     shouldCacheClickId: true,
+    ...(referrer && { referrer }),
     ...(timestamp && { timestamp: new Date(timestamp).toISOString() }),
   });
 
diff --git a/apps/web/lib/tolt/cleanup-partners.ts b/apps/web/lib/tolt/cleanup-partners.ts
index fa771fe62e7..d7009dd7b09 100644
--- a/apps/web/lib/tolt/cleanup-partners.ts
+++ b/apps/web/lib/tolt/cleanup-partners.ts
@@ -1,4 +1,6 @@
 import { bulkDeleteLinks } from "@/lib/api/links/bulk-delete-links";
+import { queuePartnerSearchSync } from "@/lib/api/partners/queue-partner-search-sync";
+import { conn } from "@/lib/planetscale";
 import { prisma } from "@/lib/prisma";
 import { toltImporter } from "./importer";
 
@@ -51,6 +53,20 @@ export async function cleanupPartners({ programId }: { programId: string }) {
 
       await bulkDeleteLinks(linksToDelete);
 
+      // Resolved before the delete, since nothing can map these partners back
+      // to their enrollments afterwards.
+      const removedEnrollments = await prisma.programEnrollment.findMany({
+        where: {
+          programId,
+          partnerId: {
+            in: partnerIdsToRemove,
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+
       await prisma.programEnrollment.deleteMany({
         where: {
           programId,
@@ -60,6 +76,11 @@ export async function cleanupPartners({ programId }: { programId: string }) {
         },
       });
 
+      // Queue an index update because the enrollments were deleted.
+      await queuePartnerSearchSync({
+        enrollmentIds: removedEnrollments.map(({ id }) => id),
+      });
+
       // Remove partners that are not enrolled in any other program
       const otherProgramEnrollments = await prisma.programEnrollment.findMany({
         where: {
@@ -84,38 +105,38 @@ export async function cleanupPartners({ programId }: { programId: string }) {
       );
 
       if (removablePartnerIds.length > 0) {
-        await prisma.$transaction(async (tx) => {
-          // Find partners that have no user account
-          const partnersWithoutUserAccount = await tx.partner.findMany({
-            where: {
-              id: {
-                in: removablePartnerIds,
-              },
-              users: {
-                none: {},
-              },
+        // Find partners that have no user account
+        const partnersWithoutUserAccount = await prisma.partner.findMany({
+          where: {
+            id: {
+              in: removablePartnerIds,
             },
-            select: {
-              id: true,
-              email: true,
+            users: {
+              none: {},
             },
-          });
-
-          if (partnersWithoutUserAccount.length > 0) {
-            await tx.partner.deleteMany({
-              where: {
-                id: {
-                  in: partnersWithoutUserAccount.map(({ id }) => id),
-                },
-              },
-            });
-
-            console.log(
-              "Removed the following partners",
-              partnersWithoutUserAccount,
-            );
-          }
+          },
+          select: {
+            id: true,
+            email: true,
+          },
         });
+
+        if (partnersWithoutUserAccount.length > 0) {
+          const partnerIdsToDelete = partnersWithoutUserAccount.map(
+            ({ id }) => id,
+          );
+
+          // using conn.execute here since Prisma throws on partner.deleteMany()
+          await conn.execute(
+            `DELETE FROM Partner WHERE id IN (${partnerIdsToDelete.map(() => "?").join(",")})`,
+            partnerIdsToDelete,
+          );
+
+          console.log(
+            "Removed the following partners",
+            partnersWithoutUserAccount,
+          );
+        }
       }
     }
 
diff --git a/apps/web/lib/tolt/import-commissions.ts b/apps/web/lib/tolt/import-commissions.ts
index 02a9bed9224..498d5a38e31 100644
--- a/apps/web/lib/tolt/import-commissions.ts
+++ b/apps/web/lib/tolt/import-commissions.ts
@@ -1,8 +1,14 @@
 import { prisma } from "@/lib/prisma";
 import { sendEmail } from "@dub/email";
 import ProgramImported from "@dub/email/templates/program-imported";
-import { nanoid } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import { nanoid, sleep } from "@dub/utils";
+import {
+  CommissionSource,
+  CommissionStatus,
+  Customer,
+  Link,
+  Program,
+} from "@prisma/client";
 import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
 import { isFirstConversion } from "../analytics/is-first-conversion";
 import { createId } from "../api/create-id";
@@ -94,7 +100,7 @@ export async function importCommissions(payload: ToltImportPayload) {
       ),
     );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     startingAfter = commissions[commissions.length - 1].id;
     processedBatches++;
@@ -331,6 +337,7 @@ async function createCommission({
         status: toDubStatus[commission.status],
         invoiceId: sale.transaction_id, // this is not the actual invoice ID, but we use this to deduplicate the sales
         createdAt: new Date(sale.created_at),
+        source: CommissionSource.tolt,
       },
     }),
 
diff --git a/apps/web/lib/tolt/import-customers.ts b/apps/web/lib/tolt/import-customers.ts
index 8cd5b6a2155..56392836db2 100644
--- a/apps/web/lib/tolt/import-customers.ts
+++ b/apps/web/lib/tolt/import-customers.ts
@@ -1,5 +1,5 @@
 import { prisma } from "@/lib/prisma";
-import { chunk, nanoid } from "@dub/utils";
+import { chunk, nanoid, sleep } from "@dub/utils";
 import { Customer, Link, Project } from "@prisma/client";
 import { createId } from "../api/create-id";
 import { updateLinkStatsForImporter } from "../api/links/update-link-stats-for-importer";
@@ -135,7 +135,7 @@ export async function importCustomers(payload: ToltImportPayload) {
       );
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     startingAfter = customers[customers.length - 1].id;
diff --git a/apps/web/lib/tolt/import-partners.ts b/apps/web/lib/tolt/import-partners.ts
index 8055d55fb33..91fa1278dc6 100644
--- a/apps/web/lib/tolt/import-partners.ts
+++ b/apps/web/lib/tolt/import-partners.ts
@@ -1,6 +1,9 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
 import { Partner, Program } from "@prisma/client";
+
 import { createId } from "../api/create-id";
+import { queuePartnerSearchSync } from "../api/partners/queue-partner-search-sync";
 import { logImportError } from "../tinybird/log-import-error";
 import { DEFAULT_PARTNER_GROUP } from "../zod/schemas/groups";
 import { ToltApi } from "./api";
@@ -71,6 +74,8 @@ export async function importPartners(payload: ToltImportPayload) {
               saleRewardId: defaultGroup.saleRewardId,
               leadRewardId: defaultGroup.leadRewardId,
               clickRewardId: defaultGroup.clickRewardId,
+              customRewardId: defaultGroup.customRewardId,
+              referralRewardId: defaultGroup.referralRewardId,
               discountId: defaultGroup.discountId,
             },
           }),
@@ -84,6 +89,13 @@ export async function importPartners(payload: ToltImportPayload) {
         .map((p) => p.value);
 
       if (partners.length > 0) {
+        // Queue an index update because the imported partners were enrolled.
+        // Queued per page rather than per partner.
+        await queuePartnerSearchSync({
+          partnerIds: partners.map((p) => p.id),
+          programId,
+        });
+
         await toltImporter.addPartners({
           programId,
           partnerIds: partners.map((p) => p.id),
@@ -103,7 +115,7 @@ export async function importPartners(payload: ToltImportPayload) {
       );
     }
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     startingAfter = affiliates[affiliates.length - 1].id;
@@ -129,6 +141,8 @@ async function createPartner({
     saleRewardId: string | null;
     leadRewardId: string | null;
     clickRewardId: string | null;
+    customRewardId: string | null;
+    referralRewardId: string | null;
     discountId: string | null;
   };
 }) {
diff --git a/apps/web/lib/tolt/update-stripe-customers.ts b/apps/web/lib/tolt/update-stripe-customers.ts
index e2d239ea77a..fc2c2ea5e04 100644
--- a/apps/web/lib/tolt/update-stripe-customers.ts
+++ b/apps/web/lib/tolt/update-stripe-customers.ts
@@ -1,6 +1,8 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
 import { Customer, Project } from "@prisma/client";
 import Stripe from "stripe";
+
 import { stripeAppClient } from "../stripe";
 import { logImportError } from "../tinybird/log-import-error";
 import { MAX_BATCHES, toltImporter } from "./importer";
@@ -34,8 +36,13 @@ export async function updateStripeCustomers(payload: ToltImportPayload) {
 
   if (!workspace.stripeConnectId) {
     console.error(
-      `Workspace ${workspace.id} has no stripeConnectId. Skipping...`,
+      `Workspace ${workspace.id} has no stripeConnectId. Skipping Stripe customer matching...`,
     );
+
+    await toltImporter.queue({
+      ...payload,
+      action: "cleanup-partners",
+    });
     return;
   }
 
@@ -80,7 +87,7 @@ export async function updateStripeCustomers(payload: ToltImportPayload) {
       ),
     );
 
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await sleep(2000);
 
     processedBatches++;
     startingAfter = customers[customers.length - 1].id;
diff --git a/apps/web/lib/tracking/build-tracking-setup.ts b/apps/web/lib/tracking/build-tracking-setup.ts
new file mode 100644
index 00000000000..b8ffdcedff4
--- /dev/null
+++ b/apps/web/lib/tracking/build-tracking-setup.ts
@@ -0,0 +1,223 @@
+import { guides, StackItem, stackItems } from "@/ui/guides/integrations";
+
+const ANALYTICS_SCRIPT_BASE = "https://www.dubcdn.com/analytics/script.js";
+
+const REACT_PACKAGE_LINE =
+  "Use the @dub/analytics package with this workspace's publishable key. Do not add the Dub script tag unless a guide says to.";
+
+const KEY_PRESENT_FOOTER =
+  "Use the workspace values above. Do not invent a different publishable key or hostname.";
+
+const KEY_MISSING_FOOTER =
+  "Generate a publishable key in Tracking settings before tracking conversion events. Do not invent a key.";
+
+const ATTRIBUTION_URL = "https://dub.co/docs/concepts/attribution";
+const SERVER_TRACKING_URL = "https://dub.co/docs/quickstart/server";
+const CLIENT_TRACKING_URL = "https://dub.co/docs/quickstart/client";
+
+type IntegrationSlot = {
+  id: string;
+  title: string;
+  url: string;
+  stackIds: string[];
+};
+
+const INTEGRATION_SLOTS: IntegrationSlot[] = [
+  {
+    id: "stripe",
+    title: "Stripe",
+    url: "https://dub.co/docs/integrations/stripe",
+    stackIds: ["stripe-checkout", "stripe-payment-links", "stripe-customers"],
+  },
+  {
+    id: "shopify",
+    title: "Shopify",
+    url: "https://dub.co/docs/integrations/shopify",
+    stackIds: ["shopify"],
+  },
+  {
+    id: "gtm",
+    title: "Google Tag Manager",
+    url: "https://dub.co/docs/integrations/google-tag-manager",
+    stackIds: ["gtm"],
+  },
+  {
+    id: "segment",
+    title: "Segment",
+    url: "https://dub.co/docs/integrations/segment",
+    stackIds: ["segment"],
+  },
+];
+
+type TrackingSetupStepType = "attribution" | "tracking" | "integration";
+
+export type TrackingSetupStep = {
+  type: TrackingSetupStepType;
+  label: string;
+  url: string;
+  guideKey: string | null;
+  icon: StackItem["icon"] | null;
+  iconProps?: StackItem["iconProps"];
+};
+
+type BuildTrackingSetupInput = {
+  stack: string[];
+  hostnames: string[];
+  publishableKey: string | null;
+  siteVisitEnabled: boolean;
+  outboundEnabled: boolean;
+};
+
+export type TrackingSetup = {
+  steps: TrackingSetupStep[];
+  prompt: string;
+};
+
+function toDocUrl(step: TrackingSetupStep) {
+  return step.url.replace(/^https:\/\//, "");
+}
+
+function resolveIntegrationSteps(stack: string[]): TrackingSetupStep[] {
+  const seen = new Set<string>();
+  const steps: TrackingSetupStep[] = [];
+
+  for (const id of stack) {
+    // "custom" has no dedicated install guide beyond the server/client
+    // tracking step already included above.
+    if (id === "custom") {
+      continue;
+    }
+
+    const slot = INTEGRATION_SLOTS.find((item) => item.stackIds.includes(id));
+    const item = stackItems.find((stackItem) => stackItem.id === id);
+
+    if (slot) {
+      if (seen.has(slot.id)) continue;
+
+      seen.add(slot.id);
+      steps.push({
+        type: "integration",
+        label: slot.title,
+        url: slot.url,
+        guideKey: slot.id,
+        icon: item?.icon ?? null,
+        iconProps: item?.iconProps,
+      });
+      continue;
+    }
+
+    if (!item || seen.has(id)) continue;
+
+    const guide = guides.find((g) => item.guideKeys.includes(g.key));
+    if (!guide) continue;
+
+    seen.add(id);
+    steps.push({
+      type: "integration",
+      label: item.title,
+      url: guide.url,
+      guideKey: id,
+      icon: item.icon,
+      iconProps: item.iconProps,
+    });
+  }
+
+  return steps;
+}
+
+function resolveTrackingSetupSteps({
+  stack,
+  publishableKey,
+}: Pick<
+  BuildTrackingSetupInput,
+  "stack" | "publishableKey"
+>): TrackingSetupStep[] {
+  const trackingUrl = publishableKey
+    ? CLIENT_TRACKING_URL
+    : SERVER_TRACKING_URL;
+  const trackingLabel = publishableKey
+    ? "Client-side tracking"
+    : "Server-side tracking";
+
+  return [
+    {
+      type: "attribution",
+      label: "Attribution",
+      url: ATTRIBUTION_URL,
+      guideKey: null,
+      icon: null,
+    },
+    {
+      type: "tracking",
+      label: trackingLabel,
+      url: trackingUrl,
+      guideKey: null,
+      icon: null,
+    },
+    ...resolveIntegrationSteps(stack),
+  ];
+}
+
+function composeTrackingSetupPrompt({
+  steps,
+  stack,
+  hostnames,
+  publishableKey,
+  siteVisitEnabled,
+  outboundEnabled,
+}: {
+  steps: TrackingSetupStep[];
+} & BuildTrackingSetupInput) {
+  const reactSelected = stack.includes("react");
+  const scriptSegments = [
+    siteVisitEnabled ? "site-visit" : null,
+    outboundEnabled ? "outbound-domains" : null,
+    publishableKey ? "conversion-tracking" : null,
+  ].filter(Boolean);
+  const analyticsScriptUrl =
+    scriptSegments.length === 0
+      ? ANALYTICS_SCRIPT_BASE
+      : `https://www.dubcdn.com/analytics/script.${scriptSegments.join(".")}.js`;
+  const stackTitles = stack
+    .map((id) => stackItems.find((item) => item.id === id)?.title)
+    .filter((title): title is string => Boolean(title));
+  const workspaceLines = [
+    hostnames.length > 0 ? `- Hostnames: ${hostnames.join(", ")}` : null,
+    publishableKey
+      ? `- Publishable key (client-side): ${publishableKey}`
+      : null,
+    stackTitles.length > 0 ? `- Stack: ${stackTitles.join(", ")}` : null,
+    reactSelected ? null : `- Analytics script: ${analyticsScriptUrl}`,
+  ].filter(Boolean);
+
+  return [
+    "Help me set up conversion tracking with Dub.co by referencing the following articles (and the linked articles within them):",
+    "",
+    ...steps.map((step) => `- ${toDocUrl(step)}`),
+    "",
+    "Workspace:",
+    ...workspaceLines,
+    ...(reactSelected ? ["", REACT_PACKAGE_LINE] : []),
+    "",
+    "Make sure to tailor the implementation to my existing tech stack, and leverage server-side tracking if possible for the most accurate results.",
+    "",
+    publishableKey ? KEY_PRESENT_FOOTER : KEY_MISSING_FOOTER,
+  ].join("\n");
+}
+
+export function buildTrackingSetup(
+  input: BuildTrackingSetupInput,
+): TrackingSetup {
+  const steps = resolveTrackingSetupSteps({
+    stack: input.stack,
+    publishableKey: input.publishableKey,
+  });
+
+  return {
+    steps,
+    prompt: composeTrackingSetupPrompt({
+      steps,
+      ...input,
+    }),
+  };
+}
diff --git a/apps/web/lib/tremendous/constants.ts b/apps/web/lib/tremendous/constants.ts
index b4d9b253e37..0688557d0c4 100644
--- a/apps/web/lib/tremendous/constants.ts
+++ b/apps/web/lib/tremendous/constants.ts
@@ -1,11 +1,3 @@
-import { ACME_PROGRAM_ID } from "@dub/utils";
-
-export const TREMENDOUS_ENABLED_PROGRAM_IDS = [
-  "prog_d8pl69xXCv4AoHNT281pHQdo", // Dub
-  ACME_PROGRAM_ID,
-  "prog_1KPAZMF49X9A1WEWRBM55KZY7", // Upheal
-];
-
 export const TREMENDOUS_MIN_PAYOUT_AMOUNT_CENTS = 500; // $5
 export const TREMENDOUS_MAX_PAYOUT_AMOUNT_CENTS = 2000_00; // $2,000
 
diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.ts
index 6caa1e933f6..8b953820ee7 100644
--- a/apps/web/lib/types.ts
+++ b/apps/web/lib/types.ts
@@ -179,6 +179,7 @@ import {
 } from "./zod/schemas/programs";
 import {
   CUSTOMER_SOURCES,
+  customRewardConfigSchema,
   rewardConditionsArraySchema,
   rewardConditionSchema,
   rewardConditionsSchema,
@@ -277,7 +278,8 @@ export type PlanProps = (typeof plans)[number];
 
 export type BetaFeatures =
   | "analyticsSettingsSiteVisitTracking"
-  | "noProrationUpgrade";
+  | "noProrationUpgrade"
+  | "rewardSpendLimit";
 
 export type PartnerBetaFeatures = "postbacks";
 
@@ -515,6 +517,7 @@ export type PartnerSharedPlatformProps = z.infer<
 export type PartnerProps = z.infer<typeof PartnerSchema> & {
   role: PartnerRole;
   userId: string;
+  usersLimit: number;
   platforms: PartnerPlatformProps[];
   defaultPayoutMethod: PartnerPayoutMethod | null;
   tremendousEmail: string | null;
@@ -649,6 +652,8 @@ export type FolderSummary = Pick<
 
 export type RewardProps = z.infer<typeof RewardSchema>;
 
+export type CustomRewardConfig = z.infer<typeof customRewardConfigSchema>;
+
 export type CreatePartnerProps = z.infer<typeof createPartnerSchema>;
 
 export type ProgramData = z.infer<typeof programDataSchema>;
diff --git a/apps/web/lib/upstash/ratelimit-policies.ts b/apps/web/lib/upstash/ratelimit-policies.ts
index 10ba05a3f64..8990f57eb31 100644
--- a/apps/web/lib/upstash/ratelimit-policies.ts
+++ b/apps/web/lib/upstash/ratelimit-policies.ts
@@ -2,17 +2,17 @@ import { ratelimit } from "./ratelimit";
 
 type RatelimitWindow = Parameters<typeof ratelimit>[1] & string;
 
+export type RatelimitMessageContext = {
+  retryAfter: string;
+  attempts: number;
+  window: string;
+};
+
 export type RatelimitPolicy = {
   attempts: number;
   window: RatelimitWindow;
   keyPrefix: string;
-  message?:
-    | string
-    | ((ctx: {
-        retryAfter: string;
-        attempts: number;
-        window: string;
-      }) => string);
+  message?: string | ((ctx: RatelimitMessageContext) => string);
 };
 
 export const RATELIMIT_POLICIES = {
@@ -76,12 +76,31 @@ export const RATELIMIT_POLICIES = {
     attempts: 10,
     window: "24 h",
     keyPrefix: "rl:program:application:image:upload",
+    message:
+      "You've reached the maximum number of attempts to upload images for this application. Please try again later.",
   },
 
   messageAttachmentUpload: {
     attempts: 20,
     window: "1 h",
     keyPrefix: "rl:message:attachment:upload",
+    message: "Too many file uploads. Please try again later.",
+  },
+
+  bountySubmissionUpload: {
+    attempts: 25,
+    window: "24 h",
+    keyPrefix: "bounty:submission:file:upload",
+    message:
+      "You've reached the maximum number of attempts to upload a file for this bounty.",
+  },
+
+  // Keyed on workspace + user so one member cannot exhaust the workspace upload budget
+  workspaceFileUpload: {
+    attempts: 20,
+    window: "1 h",
+    keyPrefix: "rl:workspace:file:upload",
+    message: "Too many file uploads. Please try again later.",
   },
 
   partnerProfileInvite: {
@@ -95,4 +114,172 @@ export const RATELIMIT_POLICIES = {
     window: "1 m",
     keyPrefix: "rl:ai:reward:generate",
   },
+
+  // Keyed on workspace + user so one actor cannot exhaust the workspace quota
+  forwardDnsInstructions: {
+    attempts: 10,
+    window: "1 h",
+    keyPrefix: "rl:domains:forward-dns-instructions",
+  },
+
+  // Keyed on the recipient so many accounts can't spam the same address
+  forwardDnsInstructionsTarget: {
+    attempts: 10,
+    window: "1 h",
+    keyPrefix: "rl:domains:forward-dns-instructions:target",
+  },
+
+  // One reattribution per workspace per minute
+  reattributeCustomer: {
+    attempts: 1,
+    window: "1 m",
+    keyPrefix: "rl:customers:reattribute",
+    message: ({ retryAfter }) =>
+      `Customer reattribution is limited to once per minute because it updates analytics. Try again in ${retryAfter}.`,
+  },
+
+  oauthAppReviewSubmit: {
+    attempts: 1,
+    window: "1 m",
+    keyPrefix: "rl:oauth:app:review:submit",
+    message: "Rate limit exceeded. Please try again later or contact support.",
+  },
+
+  verifyWorkspaceSetup: {
+    attempts: 5,
+    window: "1 m",
+    keyPrefix: "rl:workspace:setup:verify",
+    message: "Too many verification attempts. Please try again in a minute.",
+  },
+
+  createProgramApplication: {
+    attempts: 3,
+    window: "1 m",
+    keyPrefix: "rl:program:application:create",
+  },
+
+  // Shared by start + verify so both count toward the same partner/platform budget
+  socialAccountVerification: {
+    attempts: 5,
+    window: "1 h",
+    keyPrefix: "rl:partner:social:verification",
+    message: "Too many verification attempts. Please try again later.",
+  },
+
+  partnerUsernameUpdate: {
+    attempts: 5,
+    window: "1 h",
+    keyPrefix: "rl:partner:profile:username-update",
+    message:
+      "You've updated your username too many times. Please try again later.",
+  },
+
+  domainTransfer: {
+    attempts: 5,
+    window: "1 h",
+    keyPrefix: "rl:domains:transfer",
+  },
+
+  analyticsExport: {
+    attempts: 1,
+    window: "30 s",
+    keyPrefix: "rl:analytics:export",
+    message:
+      "Analytics export is limited to once every 30 seconds. Please try again shortly.",
+  },
+
+  retryFailedPaypalPayout: {
+    attempts: 1,
+    window: "12 h",
+    keyPrefix: "rl:partner:paypal:retry-failed-payout",
+    message:
+      "You've reached the maximum number of retry attempts for the past 24 hours. Please wait and try again later.",
+  },
+
+  identityVerificationStart: {
+    attempts: 1,
+    window: "1 h",
+    keyPrefix: "rl:partner:identity:verification:start",
+    message: "Too many verification attempts. Please try again later.",
+  },
+
+  resumeUpload: {
+    attempts: 5,
+    window: "1 h",
+    keyPrefix: "rl:resume:upload",
+    message: "Too many resume uploads. Please try again later.",
+  },
+
+  // Keyed on partner + program so one partner cannot exhaust another's budget
+  partnerAnalyticsExport: {
+    attempts: 1,
+    window: "30 s",
+    keyPrefix: "rl:analytics:export:partner",
+    message:
+      "Analytics export is limited to once every 30 seconds. Please try again shortly.",
+  },
+
+  createToken: {
+    attempts: 1,
+    window: "5 s",
+    keyPrefix: "rl:tokens:create",
+  },
+
+  submitLead: {
+    attempts: 10,
+    window: "1 m",
+    keyPrefix: "rl:submitted-lead",
+    message: "Too many leads submitted. Please try again later.",
+  },
+
+  trackApplication: {
+    attempts: 10,
+    window: "10 s",
+    keyPrefix: "rl:track:application",
+  },
+
+  workspaceInvite: {
+    attempts: 1,
+    window: "1 s",
+    keyPrefix: "rl:workspace:invites",
+    message:
+      "You've reached the rate limit for inviting teammates. Please try again later after few seconds.",
+  },
+
+  slackSupportInviteWorkspace: {
+    attempts: 5,
+    window: "1 d",
+    keyPrefix: "rl:slack-support-invite:workspace",
+    message:
+      "This workspace has reached the daily limit for Slack invite requests. Please try again tomorrow.",
+  },
+
+  // Keyed on workspace + user so one member cannot exhaust the workspace budget
+  slackSupportInviteUser: {
+    attempts: 10,
+    window: "1 h",
+    keyPrefix: "rl:slack-support-invite",
+    message:
+      "You've requested too many Slack invites recently. Please try again later.",
+  },
+
+  sitemapImport: {
+    attempts: 5,
+    window: "1 m",
+    keyPrefix: "rl:sitemap-import",
+    message:
+      "Sitemap import was requested too recently. Please wait a minute and try again.",
+  },
+
+  tremendousSendOtp: {
+    attempts: 10,
+    window: "24 h",
+    keyPrefix: "rl:tremendous:send-otp",
+  },
+
+  tremendousVerifyOtp: {
+    attempts: 10,
+    window: "24 h",
+    keyPrefix: "rl:tremendous:verify-otp",
+  },
 } as const satisfies Record<string, RatelimitPolicy>;
diff --git a/apps/web/lib/webhook/constants.ts b/apps/web/lib/webhook/constants.ts
index 4040bbf31aa..1cc12e5b0e8 100644
--- a/apps/web/lib/webhook/constants.ts
+++ b/apps/web/lib/webhook/constants.ts
@@ -22,10 +22,13 @@ export const WORKSPACE_LEVEL_WEBHOOK_TRIGGERS = [
 export const PROGRAM_LEVEL_WEBHOOK_TRIGGERS = [
   "partner.application_submitted",
   "partner.enrolled",
+  "partner.merged",
   "commission.created",
   "bounty.created",
   "bounty.updated",
   "payout.confirmed",
+  "discount_code.created",
+  "discount_code.deleted",
 ] as const;
 
 export const WEBHOOK_TRIGGERS = [
@@ -34,18 +37,26 @@ export const WEBHOOK_TRIGGERS = [
 ] as const;
 
 export const WEBHOOK_TRIGGER_DESCRIPTIONS: Record<WebhookTrigger, string> = {
-  "link.created": "Link created",
-  "link.updated": "Link updated",
-  "link.deleted": "Link deleted",
-  "link.clicked": "Link clicked",
-  "lead.created": "Lead created",
-  "sale.created": "Sale created",
-  "partner.application_submitted": "Partner application submitted",
-  "partner.enrolled": "Partner enrolled",
-  "commission.created": "Commission created",
-  "bounty.created": "Bounty created",
-  "bounty.updated": "Bounty updated",
-  "payout.confirmed": "Payout confirmed",
+  "link.created": "Occurs whenever a link is created",
+  "link.updated": "Occurs whenever a link is updated",
+  "link.deleted": "Occurs whenever a link is deleted",
+  "link.clicked": "Occurs whenever a link is clicked",
+  "lead.created": "Occurs whenever a lead is created",
+  "sale.created": "Occurs whenever a sale is created",
+  "partner.application_submitted":
+    "Occurs whenever a partner submits an application to your program",
+  "partner.enrolled":
+    "Occurs whenever a partner is enrolled in your program (either their application was approved, they accepted your invite, or via the API)",
+  "partner.merged": "Occurs when two partner accounts are merged",
+  "commission.created":
+    "Occurs whenever a commission is created for a partner (clawbacks will also trigger this event with a negative amount)",
+  "bounty.created": "Occurs whenever a bounty is created in your program",
+  "bounty.updated": "Occurs whenever a bounty in your program is updated",
+  "payout.confirmed": "Occurs whenever a payout in your program is confirmed",
+  "discount_code.created":
+    "Occurs whenever a discount code is created for a partner",
+  "discount_code.deleted":
+    "Occurs whenever a discount code for a partner is deleted",
 } as const;
 
 export const WEBHOOK_FAILURE_NOTIFY_THRESHOLDS = [5, 10, 15] as const;
diff --git a/apps/web/lib/webhook/qstash.ts b/apps/web/lib/webhook/qstash.ts
index e10de21b0e3..c37ab55cdfb 100644
--- a/apps/web/lib/webhook/qstash.ts
+++ b/apps/web/lib/webhook/qstash.ts
@@ -1,4 +1,4 @@
-import { qstash } from "@/lib/cron";
+import { qstashWithoutBypass } from "@/lib/cron";
 import { webhookPayloadSchema } from "@/lib/webhook/schemas";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { Webhook, WebhookReceiver } from "@prisma/client";
@@ -92,13 +92,25 @@ const publishWebhookEventToQStash = async ({
   // TODO:
   // Add deduplicationId to the webhook
 
-  const response = await qstash.publishJSON({
+  // here, we use qstashWithoutBypass to avoid passing the
+  // Vercel automation bypass secret to arbitrary third party webhook receivers
+  const response = await qstashWithoutBypass.publishJSON({
     url: webhook.url,
     body: finalPayload,
     headers: {
       "Dub-Signature": signature,
       "Upstash-Hide-Headers": "true",
 
+      // for Vercel preview (e2e tests), we need to pass the
+      // Vercel automation bypass secret to the callback URL
+      // see: https://upstash.com/docs/qstash/features/callbacks#configuring-callbacks
+      ...(process.env.VERCEL_ENV === "preview" && {
+        "Upstash-Callback-Forward-x-vercel-protection-bypass":
+          process.env.VERCEL_AUTOMATION_BYPASS_SECRET || "",
+        "Upstash-Failure-Callback-Forward-x-vercel-protection-bypass":
+          process.env.VERCEL_AUTOMATION_BYPASS_SECRET || "",
+      }),
+
       // Integration specific headers
       ...(receiver === "segment" && {
         "Upstash-Forward-Authorization": createSegmentBasicAuthHeader(
@@ -108,6 +120,8 @@ const publishWebhookEventToQStash = async ({
     },
     callback: callbackUrl.href,
     failureCallback: failureCallbackUrl.href,
+
+    // for E2E tests, add a 5s delay
     ...(process.env.NODE_ENV === "test" && { delay: 5 }),
   });
 
diff --git a/apps/web/lib/webhook/sample-events/commission-created.json b/apps/web/lib/webhook/sample-events/commission-created.json
index ed322cbacc7..f612bee91cf 100644
--- a/apps/web/lib/webhook/sample-events/commission-created.json
+++ b/apps/web/lib/webhook/sample-events/commission-created.json
@@ -9,6 +9,7 @@
   "description": null,
   "quantity": 1,
   "userId": "cludszk1h0000wmd2e0ea2b0p",
+  "metadata": null,
   "createdAt": "2025-07-16T10:48:14.722Z",
   "updatedAt": "2025-07-16T10:48:14.960Z",
   "partner": {
diff --git a/apps/web/lib/webhook/sample-events/discount-code-created.json b/apps/web/lib/webhook/sample-events/discount-code-created.json
new file mode 100644
index 00000000000..41bcd5d9037
--- /dev/null
+++ b/apps/web/lib/webhook/sample-events/discount-code-created.json
@@ -0,0 +1,14 @@
+{
+  "id": "dcode_1K39DGZG3MHY9RP4PD0AS2C5P",
+  "code": "STEVEN10OFF",
+  "partnerId": "pn_1K9BZE1K285BSTX4W6MPKXJFZ",
+  "linkId": "link_5myDHLqhIQvUmUPjchVygF9R",
+  "disabledAt": null,
+  "discount": {
+    "id": "disc_1KEC01MXC5H50XQMSN83VCW65",
+    "amount": 10,
+    "type": "percentage",
+    "maxDuration": 6,
+    "provider": "custom"
+  }
+}
diff --git a/apps/web/lib/webhook/sample-events/discount-code-deleted.json b/apps/web/lib/webhook/sample-events/discount-code-deleted.json
new file mode 100644
index 00000000000..41bcd5d9037
--- /dev/null
+++ b/apps/web/lib/webhook/sample-events/discount-code-deleted.json
@@ -0,0 +1,14 @@
+{
+  "id": "dcode_1K39DGZG3MHY9RP4PD0AS2C5P",
+  "code": "STEVEN10OFF",
+  "partnerId": "pn_1K9BZE1K285BSTX4W6MPKXJFZ",
+  "linkId": "link_5myDHLqhIQvUmUPjchVygF9R",
+  "disabledAt": null,
+  "discount": {
+    "id": "disc_1KEC01MXC5H50XQMSN83VCW65",
+    "amount": 10,
+    "type": "percentage",
+    "maxDuration": 6,
+    "provider": "custom"
+  }
+}
diff --git a/apps/web/lib/webhook/sample-events/partner-merged.json b/apps/web/lib/webhook/sample-events/partner-merged.json
new file mode 100644
index 00000000000..ed27a5f9efa
--- /dev/null
+++ b/apps/web/lib/webhook/sample-events/partner-merged.json
@@ -0,0 +1,13 @@
+{
+  "sourcePartner": {
+    "id": "pn_1K9BZE1K285BSTX4W6MPKXJFZ",
+    "tenantId": "64dc9a8c-5cf9-4446-b53b-cdc15199fafc",
+    "email": "source@example.com"
+  },
+  "targetPartner": {
+    "id": "pn_1K06X6FX2GRB31NCM2VVCGJ72",
+    "tenantId": "64dc9a8c-5cf9-4446-b53b-cdc15199fafc",
+    "email": "target@example.com"
+  },
+  "targetAlreadyEnrolled": false
+}
diff --git a/apps/web/lib/webhook/sample-events/payload.ts b/apps/web/lib/webhook/sample-events/payload.ts
index 546af936567..3028ef21b75 100644
--- a/apps/web/lib/webhook/sample-events/payload.ts
+++ b/apps/web/lib/webhook/sample-events/payload.ts
@@ -2,6 +2,8 @@ import type { WebhookTrigger } from "@/lib/webhook/types";
 import bountyCreated from "./bounty-created.json";
 import bountyUpdated from "./bounty-updated.json";
 import commissionCreated from "./commission-created.json";
+import discountCodeCreated from "./discount-code-created.json";
+import discountCodeDeleted from "./discount-code-deleted.json";
 import leadCreated from "./lead-created.json";
 import linkClicked from "./link-clicked.json";
 import linkCreated from "./link-created.json";
@@ -9,6 +11,7 @@ import linkDeleted from "./link-deleted.json";
 import linkUpdated from "./link-updated.json";
 import partnerApplicationSubmitted from "./partner-application-submitted.json";
 import partnerEnrolled from "./partner-enrolled.json";
+import partnerMerged from "./partner-merged.json";
 import payoutConfirmed from "./payout-confirmed.json";
 import saleCreated from "./sale-created.json";
 
@@ -21,8 +24,11 @@ export const samplePayload: Record<WebhookTrigger, any> = {
   "sale.created": saleCreated,
   "partner.application_submitted": partnerApplicationSubmitted,
   "partner.enrolled": partnerEnrolled,
+  "partner.merged": partnerMerged,
   "commission.created": commissionCreated,
   "bounty.created": bountyCreated,
   "bounty.updated": bountyUpdated,
   "payout.confirmed": payoutConfirmed,
+  "discount_code.created": discountCodeCreated,
+  "discount_code.deleted": discountCodeDeleted,
 };
diff --git a/apps/web/lib/webhook/schemas.ts b/apps/web/lib/webhook/schemas.ts
index c67e5c8efca..f0270f0fa08 100644
--- a/apps/web/lib/webhook/schemas.ts
+++ b/apps/web/lib/webhook/schemas.ts
@@ -2,9 +2,11 @@ import * as z from "zod/v4";
 import { clickEventSchema } from "../zod/schemas/clicks";
 import { CommissionWebhookSchema } from "../zod/schemas/commissions";
 import { CustomerSchema } from "../zod/schemas/customers";
+import { DiscountCodeWebhookSchema } from "../zod/schemas/discount";
 import { linkEventSchema } from "../zod/schemas/links";
 import {
   EnrolledPartnerSchema,
+  partnerMergedWebhookSchema,
   WebhookPartnerSchema,
 } from "../zod/schemas/partners";
 import { partnerApplicationWebhookSchema } from "../zod/schemas/program-application";
@@ -156,6 +158,20 @@ export const webhookEventSchema = z
         outputId: "PartnerApplicationSubmittedEvent",
       }),
 
+    z
+      .object({
+        id: z.string(),
+        event: z.literal("partner.merged"),
+        createdAt: z.string(),
+        data: partnerMergedWebhookSchema,
+      })
+      .meta({
+        description:
+          "Triggered when two partner accounts are merged. Fired once per program the source partner was enrolled in.",
+        id: "PartnerMergedEvent",
+        outputId: "PartnerMergedEvent",
+      }),
+
     z
       .object({
         id: z.string(),
@@ -168,6 +184,22 @@ export const webhookEventSchema = z
         id: "CommissionCreatedEvent",
         outputId: "CommissionCreatedEvent",
       }),
+
+    z
+      .object({
+        id: z.string(),
+        event: z.union([
+          z.literal("discount_code.created"),
+          z.literal("discount_code.deleted"),
+        ]),
+        createdAt: z.string(),
+        data: DiscountCodeWebhookSchema,
+      })
+      .meta({
+        description: "Triggered when a discount code is created or deleted.",
+        id: "DiscountCodeWebhookEvent",
+        outputId: "DiscountCodeWebhookEvent",
+      }),
   ])
   .meta({
     description: "Webhook event schema",
diff --git a/apps/web/lib/webhook/timing-safe-compare.ts b/apps/web/lib/webhook/timing-safe-compare.ts
new file mode 100644
index 00000000000..fc30d65d45b
--- /dev/null
+++ b/apps/web/lib/webhook/timing-safe-compare.ts
@@ -0,0 +1,40 @@
+import crypto from "crypto";
+
+/**
+ * Performs constant-time comparison of two strings to prevent timing attacks.
+ *
+ * This function compares two strings in a way that takes the same amount of time
+ * regardless of where the strings differ, mitigating timing side-channel attacks
+ * (CWE-208).
+ *
+ * Use this for comparing security-sensitive values like:
+ * - Webhook signatures
+ * - HMAC digests
+ * - API keys
+ * - Authentication tokens
+ *
+ * @param provided - The value provided by the client/request
+ * @param expected - The expected/computed value
+ * @returns true if the strings match, false otherwise
+ */
+export function timingSafeCompare(
+  provided: string | null | undefined,
+  expected: string,
+): boolean {
+  if (!provided) {
+    return false;
+  }
+
+  const providedBuffer = Buffer.from(provided, "utf8");
+  const expectedBuffer = Buffer.from(expected, "utf8");
+
+  // Length check before constant-time comparison
+  if (providedBuffer.length !== expectedBuffer.length) {
+    return false;
+  }
+
+  return crypto.timingSafeEqual(
+    Uint8Array.from(providedBuffer),
+    Uint8Array.from(expectedBuffer),
+  );
+}
diff --git a/apps/web/lib/webhook/types.ts b/apps/web/lib/webhook/types.ts
index b25707c8a03..eaed23b0eea 100644
--- a/apps/web/lib/webhook/types.ts
+++ b/apps/web/lib/webhook/types.ts
@@ -1,8 +1,12 @@
 import * as z from "zod/v4";
 import { BountySchema } from "../zod/schemas/bounties";
+import { DiscountCodeWebhookSchema } from "../zod/schemas/discount";
 import { CommissionWebhookSchema } from "../zod/schemas/commissions";
 import { linkEventSchema } from "../zod/schemas/links";
-import { EnrolledPartnerSchema } from "../zod/schemas/partners";
+import {
+  EnrolledPartnerSchema,
+  partnerMergedWebhookSchema,
+} from "../zod/schemas/partners";
 import { payoutWebhookEventSchema } from "../zod/schemas/payouts";
 import { partnerApplicationWebhookSchema } from "../zod/schemas/program-application";
 import { WEBHOOK_TRIGGERS } from "./constants";
@@ -26,6 +30,10 @@ export type PartnerApplicationWebhookPayload = z.infer<
   typeof partnerApplicationWebhookSchema
 >;
 
+export type PartnerMergedWebhookPayload = z.infer<
+  typeof partnerMergedWebhookSchema
+>;
+
 export type CommissionEventWebhookPayload = z.infer<
   typeof CommissionWebhookSchema
 >;
@@ -36,6 +44,10 @@ export type PayoutEventWebhookPayload = z.infer<
   typeof payoutWebhookEventSchema
 >;
 
+export type DiscountCodeEventWebhookPayload = z.infer<
+  typeof DiscountCodeWebhookSchema
+>;
+
 export type WebhookEventPayload =
   | z.infer<typeof linkEventSchema>
   | ClickEventWebhookPayload
@@ -43,6 +55,8 @@ export type WebhookEventPayload =
   | SaleEventWebhookPayload
   | PartnerEventWebhookPayload
   | PartnerApplicationWebhookPayload
+  | PartnerMergedWebhookPayload
   | CommissionEventWebhookPayload
   | BountyEventWebhookPayload
-  | PayoutEventWebhookPayload;
+  | PayoutEventWebhookPayload
+  | DiscountCodeEventWebhookPayload;
diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.ts
index ef80f6b66a5..889b7bd96c4 100644
--- a/apps/web/lib/zod/schemas/activity-log.ts
+++ b/apps/web/lib/zod/schemas/activity-log.ts
@@ -8,6 +8,7 @@ export const activityLogResourceTypeSchema = z.enum([
   "saleReward",
   "leadReward",
   "referralReward",
+  "customReward",
   "submittedLead",
 ]);
 
@@ -15,6 +16,8 @@ export const activityLogActionSchema = z.enum([
   "partner_application.approved", // TODO: change to partnerApplication.approved
   "partner_application.rejected", // TODO: change to partnerApplication.rejected
   "partner.groupChanged",
+  "partner.rewardChanged",
+  "partner.discountChanged",
   "partner.banned",
   "partner.unbanned",
   "partner.deactivated",
@@ -22,6 +25,9 @@ export const activityLogActionSchema = z.enum([
   "partner.archived",
   "partner.unarchived",
 
+  "link.rewardChanged",
+  "link.discountChanged",
+
   "commission.updated",
 
   "reward.created",
@@ -67,4 +73,5 @@ export const REWARD_EVENT_TO_RESOURCE_TYPE = {
   sale: "saleReward",
   lead: "leadReward",
   referral: "referralReward",
+  custom: "customReward",
 } as const;
diff --git a/apps/web/lib/zod/schemas/admin.ts b/apps/web/lib/zod/schemas/admin.ts
index 60e1531ec3c..f71c3e6dd1f 100644
--- a/apps/web/lib/zod/schemas/admin.ts
+++ b/apps/web/lib/zod/schemas/admin.ts
@@ -4,7 +4,7 @@ import {
   ProgramEnrollmentStatus,
 } from "@prisma/client";
 import * as z from "zod/v4";
-import { getPaginationQuerySchema } from "./misc";
+import { getPaginationQuerySchema, planSchema } from "./misc";
 import { partnerProfileChangeHistoryLogSchema } from "./partner-profile";
 import {
   EnrolledPartnerSchemaExtended,
@@ -84,6 +84,32 @@ export const adminNetworkPartnerSchema = EnrolledPartnerSchemaExtended.pick({
   ),
 });
 
+export const ADMIN_RECENT_PROGRAMS_PAGE_SIZE = 100;
+
+export const adminRecentProgramsQuerySchema = z
+  .object({
+    plan: planSchema.optional(),
+  })
+  .extend(
+    getPaginationQuerySchema({ pageSize: ADMIN_RECENT_PROGRAMS_PAGE_SIZE }),
+  );
+
+export const adminRecentProgramSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  slug: z.string(),
+  logo: z.string().nullable(),
+  url: z.string().nullable(),
+  addedToMarketplaceAt: z.date().nullable(),
+  createdAt: z.date(),
+  workspace: z.object({
+    plan: z.string(),
+    stripeId: z.string(),
+  }),
+  partners: z.number(),
+  commissions: z.number(),
+});
+
 export const adminNetworkPartnerQuerySchema = z
   .object({
     networkStatus: z.enum(PartnerNetworkStatus).optional(),
diff --git a/apps/web/lib/zod/schemas/analytics-response.ts b/apps/web/lib/zod/schemas/analytics-response.ts
index 2305bafbf93..89c0291b425 100644
--- a/apps/web/lib/zod/schemas/analytics-response.ts
+++ b/apps/web/lib/zod/schemas/analytics-response.ts
@@ -204,6 +204,27 @@ export const analyticsResponse = {
   triggers: analyticsTriggersResponse,
   trigger: analyticsTriggersResponse, // backwards compatibility
 
+  event_names: z.object({
+    eventName: z
+      .string()
+      .describe("The name of the conversion event (lead or sale)"),
+    clicks: z
+      .number()
+      .describe("The number of clicks from this event name")
+      .default(0),
+    leads: z
+      .number()
+      .describe("The number of leads from this event name")
+      .default(0),
+    sales: z
+      .number()
+      .describe("The number of sales from this event name")
+      .default(0),
+    saleAmount: centsSchemaWithDefault.describe(
+      "The total amount of sales from this event name, in cents",
+    ),
+  }),
+
   referers: z.object({
     referer: z
       .string()
diff --git a/apps/web/lib/zod/schemas/analytics.ts b/apps/web/lib/zod/schemas/analytics.ts
index 1b2fafae96d..69bea88860b 100644
--- a/apps/web/lib/zod/schemas/analytics.ts
+++ b/apps/web/lib/zod/schemas/analytics.ts
@@ -277,6 +277,15 @@ export const analyticsQuerySchema = z.object({
         "Examples: `qr`, `qr,link`, `-qr`. " +
         "If undefined, returns all trigger types.",
     ),
+  eventName: z
+    .string()
+    .optional()
+    .transform(parseFilterValue)
+    .describe(
+      "The conversion event name to retrieve analytics for. Only available for lead and sale events. " +
+        "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
+        "Examples: `Sign up`, `Sign up,Purchase`, `-Sign up`.",
+    ),
   referer: z
     .string()
     .optional()
diff --git a/apps/web/lib/zod/schemas/campaigns.ts b/apps/web/lib/zod/schemas/campaigns.ts
index 6259c740a19..123e80ba7f1 100644
--- a/apps/web/lib/zod/schemas/campaigns.ts
+++ b/apps/web/lib/zod/schemas/campaigns.ts
@@ -21,6 +21,41 @@ export const EMAIL_TEMPLATE_VARIABLES = [
   "ReferralReward",
 ] as const;
 
+export const EMAIL_TEMPLATE_VARIABLE_INFO: Record<
+  (typeof EMAIL_TEMPLATE_VARIABLES)[number],
+  { description: string; example: string; hideExample?: boolean }
+> = {
+  PartnerName: {
+    description: "The partner's full name",
+    example: "John Doe",
+  },
+  PartnerEmail: {
+    description: "The partner's email address",
+    example: "partner@acme.com",
+  },
+  PartnerLink: {
+    description: "The partner's default referral link",
+    example: "refer.dub.co/john",
+  },
+  SaleReward: {
+    description: "The partner's sale commission",
+    example: "30% per sale for 6 months",
+  },
+  LeadReward: {
+    description: "The partner's lead commission",
+    example: "$10 per lead",
+  },
+  ClickReward: {
+    description: "The partner's click commission",
+    example: "$0.50 per click",
+  },
+  ReferralReward: {
+    description: "The partner's commission for referring another partner",
+    example: "10% per referred partner's commission for 1 year",
+    hideExample: true,
+  },
+};
+
 export const CAMPAIGN_FROM_FORMAT_ERROR =
   'From must be an email or "Name <email@domain.com>" format.';
 
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.ts
index a940a4dcfc0..699ba6ed15f 100644
--- a/apps/web/lib/zod/schemas/commissions.ts
+++ b/apps/web/lib/zod/schemas/commissions.ts
@@ -1,7 +1,12 @@
 import { DATE_RANGE_INTERVAL_PRESETS } from "@/lib/analytics/constants";
-import { CommissionStatus, CommissionType } from "@prisma/client";
+import {
+  CommissionSource,
+  CommissionStatus,
+  CommissionType,
+} from "@prisma/client";
 import * as z from "zod/v4";
 import { createCustomerBodySchema, CustomerSchema } from "./customers";
+import { trackLeadRequestSchema } from "./leads";
 import { LinkSchema } from "./links";
 import {
   getCursorPaginationQuerySchema,
@@ -10,6 +15,7 @@ import {
 import { EnrolledPartnerSchema, WebhookPartnerSchema } from "./partners";
 import { PayoutSchema } from "./payouts";
 import { rewardContextSchema, RewardSchema } from "./rewards";
+import { trackSaleRequestSchema } from "./sales";
 import { UserSchema } from "./users";
 import { centsSchema, parseDateSchema } from "./utils";
 
@@ -17,20 +23,52 @@ export const CommissionSchema = z.object({
   id: z.string().describe("The commission's unique ID on Dub.").meta({
     example: "cm_1JVR7XRCSR0EDBAF39FZ4PMYE",
   }),
-  type: z.enum(CommissionType).optional(), // Note: Not sure the type will ever be optional
-  amount: z.number(),
-  earnings: z.number(),
-  currency: z.string(),
-  status: z.enum(CommissionStatus),
-  invoiceId: z.string().nullable(),
-  description: z.string().nullable(),
-  quantity: z.number(),
+  type: z
+    .enum(CommissionType)
+    .describe(
+      "The type of commission. Can be `click`, `lead`, `sale`, `referral`, or `custom`.",
+    ),
+  amount: z
+    .number()
+    .describe(
+      "The associated event amount in cents. For sale commissions, this is the sale amount.",
+    ),
+  earnings: z.number().describe("The amount earned by the partner, in cents."),
+  currency: z
+    .string()
+    .describe("The currency of the commission, as an ISO 4217 currency code."),
+  status: z
+    .enum(CommissionStatus)
+    .describe("The current status of the commission."),
+  invoiceId: z
+    .string()
+    .nullable()
+    .describe("The associated invoice ID. Only set for sale commissions."),
+  description: z
+    .string()
+    .nullable()
+    .describe("An optional description of the commission."),
+  quantity: z
+    .number()
+    .describe(
+      "The event quantity. Used for click and lead commissions; typically `1` for sale and custom commissions.",
+    ),
   userId: z
     .string()
     .nullish()
     .describe("The user who created the manual commission."),
-  createdAt: z.date(),
-  updatedAt: z.date(),
+  metadata: z
+    .record(z.string(), z.any())
+    .nullable()
+    .describe(
+      "Metadata from the associated lead or sale event (`lead.metadata` / `sale.metadata`), or from Stripe webhook metadata.",
+    ),
+  createdAt: z
+    .date()
+    .describe("The date and time when the commission was created."),
+  updatedAt: z
+    .date()
+    .describe("The date and time when the commission was last updated."),
 });
 
 // Represents the commission object used in webhook and API responses (/api/commissions/**)
@@ -99,9 +137,14 @@ export const getCommissionsQuerySchema = z
       .enum(CommissionType)
       .optional()
       .describe(
-        "Filter the list of commissions by type. " +
+        [
+          "Filter the list of commissions by type.",
           "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
-          "Examples: `sale`, `sale,lead`, `-click`.",
+            "Examples:",
+          `- "sale"`,
+          `- "sale,lead"`,
+          `- "-click"`,
+        ].join("\n"),
       ),
     customerId: z
       .string()
@@ -115,9 +158,14 @@ export const getCommissionsQuerySchema = z
       .string()
       .optional()
       .describe(
-        "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`. " +
-          "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
-          "Examples: `partner_abc`, `partner_abc,partner_xyz`, `-partner_abc`.",
+        [
+          "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`.",
+          "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`).",
+          "Examples:",
+          `- "partner_abc"`,
+          `- "partner_abc,partner_xyz"`,
+          `- "-partner_abc"`,
+        ].join("\n"),
       ),
     tenantId: z
       .string()
@@ -129,17 +177,27 @@ export const getCommissionsQuerySchema = z
       .string()
       .optional()
       .describe(
-        "Filter the list of commissions by the associated partner group. " +
+        [
+          "Filter the list of commissions by the associated partner group.",
           "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
-          "Examples: `group_abc`, `group_abc,group_xyz`, `-group_abc`.",
+            "Examples:",
+          `- "group_abc"`,
+          `- "group_abc,group_xyz"`,
+          `- "-group_abc"`,
+        ].join("\n"),
       ),
     partnerTagId: z
       .string()
       .optional()
       .describe(
-        "Filter the list of commissions by the associated partner tag. " +
-          "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
-          "Examples: `ptag_abc`, `ptag_abc,ptag_xyz`, `-ptag_abc`.",
+        [
+          "Filter the list of commissions by the associated partner tag.",
+          "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`).",
+          "Examples:",
+          `- "ptag_abc"`,
+          `- "ptag_abc,ptag_xyz"`,
+          `- "-ptag_abc"`,
+        ].join("\n"),
       ),
     invoiceId: z
       .string()
@@ -174,6 +232,18 @@ export const getCommissionsQuerySchema = z
       .optional()
       .describe("The end date of the date range to filter the commissions by."),
     timezone: z.string().optional(),
+    query: z
+      .string()
+      .max(10000)
+      .optional()
+      .meta({
+        description: [
+          "Filter by lead or sale event metadata. Top-level keys only. Compares string values only — numeric and boolean metadata values are not matched.",
+          "Examples:",
+          `- "metadata['key']='value'"`,
+          `- "metadata['key']!='value'"`,
+        ].join("\n"),
+      }),
   })
   .extend({
     ...getCursorPaginationQuerySchema({
@@ -318,15 +388,6 @@ export const CLAWBACK_REASONS_MAP = Object.fromEntries(
   CLAWBACK_REASONS.map((r) => [r.value, r]),
 );
 
-export const createClawbackSchema = z.object({
-  workspaceId: z.string(),
-  partnerId: z.string(),
-  amount: z.number().gt(0, "Amount must be greater than 0."),
-  description: z.enum(
-    CLAWBACK_REASONS.map((r) => r.value) as [string, ...string[]],
-  ),
-});
-
 export const COMMISSION_EXPORT_COLUMNS = [
   { id: "id", label: "ID", type: "string", default: true },
   { id: "type", label: "Type", type: "string", default: true },
@@ -335,6 +396,7 @@ export const COMMISSION_EXPORT_COLUMNS = [
   { id: "currency", label: "Currency", type: "string", default: true },
   { id: "status", label: "Status", type: "string", default: true },
   { id: "invoiceId", label: "Invoice ID", type: "string", default: true },
+  { id: "description", label: "Description", type: "string", default: false },
   { id: "quantity", label: "Quantity", type: "number", default: true },
   { id: "createdAt", label: "Created at", type: "date", default: true },
   { id: "paidAt", label: "Paid at", type: "date", default: false },
@@ -428,6 +490,7 @@ export const createPartnerCommissionSchema = z.object({
   customerId: z.string().optional(),
   eventId: z.string().optional(),
   invoiceId: z.string().nullish(),
+  rewardId: z.string().optional(),
   amount: z.number().default(0).optional(),
   quantity: z.number().default(1),
   currency: z.string().optional(),
@@ -435,6 +498,8 @@ export const createPartnerCommissionSchema = z.object({
   createdAt: z.coerce.date().optional(),
   status: commissionPatchStatusSchema.optional(), // used for create-manual-commission (import commission as refunded)
   userId: z.string().optional(),
+  source: z.enum(CommissionSource).optional(),
+  metadata: z.record(z.string(), z.any()).nullish(),
   context: rewardContextSchema.optional(),
   skipWorkflow: z.boolean().default(false).optional(),
   isFirstConversion: z.boolean().optional(),
@@ -459,128 +524,243 @@ export const createPartnerCommissionSchema = z.object({
     ),
 });
 
-export const createManualCommissionBodySchema = z
-  .discriminatedUnion("type", [
-    // Custom commission
-    z.object({
-      type: z.literal("custom"),
-      partnerId: z
-        .string()
-        .describe("The ID of the partner to create the commission for."),
-      amount: centsSchema
-        .pipe(z.number().min(1))
-        .describe("The commission amount in cents."),
-      date: parseDateSchema
-        .nullish()
-        .describe("If not provided, the current date will be used."),
-      description: z
-        .string()
-        .max(190)
-        .nullish()
-        .describe("The description of the commission."),
-    }),
+// Custom commission (negative amount = clawback)
+const createCustomCommissionSchema = z.object({
+  type: z.literal("custom"),
+  partnerId: z
+    .string()
+    .describe("The ID of the partner to create the commission for."),
+  amount: centsSchema
+    .pipe(
+      z.number().refine((n) => n !== 0, {
+        message: "Amount cannot be 0.",
+      }),
+    )
+    .describe(
+      "The commission earnings amount in cents. Use a negative amount to create a clawback.",
+    ),
+  date: parseDateSchema
+    .nullish()
+    .describe("If not provided, the current date will be used."),
+  description: z
+    .string()
+    .max(190)
+    .nullish()
+    .describe(
+      [
+        "The description of the commission. Required for clawbacks (negative `amount`).",
+        "May be a known clawback reason (`order_canceled`, `fraud`, `terms_violation`, `tracking_error`, `payment_failed`, `ineligible_partner`, `duplicate_commission`) or an arbitrary string (max 190 characters).",
+      ].join(" "),
+    ),
+});
 
-    // Lead commission
-    z.object({
-      type: z.literal("lead"),
-      partnerId: z
-        .string()
-        .describe("The ID of the partner to create the commission for."),
-      customerId: z
-        .string()
-        .nullish()
-        .describe(
-          "The customer ID to associate the commission with. Useful if the customer was already created in a prior operation and you want to associate the commission with it.",
-        ),
-      customer: createCustomerBodySchema
-        .nullish()
-        .describe(
-          "The full customer object to associate the commission with. Useful for creating the customer on demand.",
-        ),
-      linkId: z
-        .string()
-        .nullish()
-        .describe(
-          "The partner link ID to associate the commission with. If not provided, default to the link with the most revenue.",
-        ),
-      leadEventDate: parseDateSchema
-        .nullish()
-        .describe(
-          "The date and time of the lead event. If not provided, defaults to the current date and time.",
-        ),
-      leadEventName: z
-        .string()
+const createLeadCommissionSchema = z.object({
+  type: z.literal("lead"),
+  partnerId: z
+    .string()
+    .describe("The ID of the partner to create the commission for."),
+  customerId: z
+    .string()
+    .nullish()
+    .describe(
+      "The customer ID to associate the commission with. Useful if the customer was already created in a prior operation and you want to associate the commission with it.",
+    ),
+  customer: createCustomerBodySchema
+    .nullish()
+    .describe(
+      "The full customer object to associate the commission with. Useful for creating the customer on demand.",
+    ),
+  linkId: z
+    .string()
+    .nullish()
+    .describe(
+      "The partner link ID to associate the commission with. If not provided, default to the link with the most revenue.",
+    ),
+  date: parseDateSchema
+    .nullish()
+    .describe(
+      "The date and time of the lead event. If not provided, defaults to the current date and time.",
+    ),
+  lead: z
+    .object({
+      eventName: trackLeadRequestSchema.shape.eventName
         .nullish()
-        .default("Sign up")
         .describe(
-          "The name of the lead event. If not provided, defaults to 'Sign up'.",
+          "The name of the lead event to track. If not provided, defaults to 'Sign up'.",
         ),
-    }),
+      metadata: trackLeadRequestSchema.shape.metadata,
+    })
+    .nullish()
+    .describe("The lead event object to associate the commission with."),
 
-    // Sale commission
-    z.object({
-      type: z.literal("sale"),
-      partnerId: z
-        .string()
-        .describe("The ID of the partner to create the commission for."),
-      customerId: z
-        .string()
-        .nullish()
-        .describe(
-          "The customer ID to associate the commission with. Useful if the customer was already created in a prior operation and you want to associate the commission with it.",
-        ),
-      customer: createCustomerBodySchema
-        .nullish()
-        .describe(
-          "The full customer object to associate the commission with. Useful for creating the customer on demand.",
-        ),
-      linkId: z
-        .string()
-        .nullish()
-        .describe(
-          "The partner link ID to associate the commission with. If not provided, default to the link with the most revenue.",
-        ),
-      importStripeInvoices: z
-        .boolean()
-        .nullish()
-        .default(false)
-        .describe(
-          "When `true`, import all unimported paid Stripe invoices for the customer and create a commission for each. When `false`, create a single manual sale event using `saleAmount`.",
-        ),
-      saleAmount: centsSchema
-        .pipe(z.number().min(0))
-        .nullish()
-        .describe(
-          "Required when `importStripeInvoices` is `false`. The sale amount in cents for the manual sale event. Ignored when importing from Stripe.",
-        ),
-      saleEventDate: parseDateSchema
-        .nullish()
-        .describe(
-          "Only used when `importStripeInvoices` is `false`. The date of the manual sale event. Defaults to the current date and time if not provided.",
-        ),
-      invoiceId: z
-        .string()
-        .nullish()
-        .describe(
-          "Only used when `importStripeInvoices` is `false`. An optional invoice ID to attach to the generated sale event and commission entry for deduplication.",
-        ),
-      productId: z
-        .string()
-        .nullish()
-        .describe(
-          "Only used when `importStripeInvoices` is `false`. An optional product ID stored on the sale event metadata – will also impact commission earnings calculation (if a `Sale` `Product ID` modifier is set).",
-        ),
-    }),
-  ])
+  // Deprecated fields
+  leadEventDate: parseDateSchema
+    .nullish()
+    .describe(
+      "Deprecated: Use `date` instead. The date and time of the lead event. If not provided, defaults to the current date and time.",
+    )
+    .meta({ deprecated: true }),
+  leadEventName: z
+    .string()
+    .nullish()
+    .default("Sign up")
+    .describe(
+      "Deprecated: Use `lead.eventName` instead. The name of the lead event. If not provided, defaults to 'Sign up'.",
+    )
+    .meta({ deprecated: true }),
+});
+
+const createSaleCommissionSchema = z
+  .object({
+    type: z.literal("sale"),
+    partnerId: z
+      .string()
+      .describe("The ID of the partner to create the commission for."),
+    customerId: z
+      .string()
+      .nullish()
+      .describe(
+        "The customer ID to associate the commission with. Useful if the customer was already created in a prior operation and you want to associate the commission with it.",
+      ),
+    customer: createCustomerBodySchema
+      .nullish()
+      .describe(
+        "The full customer object to associate the commission with. Useful for creating the customer on demand.",
+      ),
+    linkId: z
+      .string()
+      .nullish()
+      .describe(
+        "The partner link ID to associate the commission with. If neither `linkId` nor `discountCode` is provided, default to the link with the most revenue.",
+      ),
+    discountCode: z
+      .string()
+      .min(1)
+      .nullish()
+      .describe(
+        "The partner discount code to resolve the associated link. Use this when the link ID is unknown. Cannot be provided together with `linkId`.",
+      ),
+    importStripeInvoices: z
+      .boolean()
+      .nullish()
+      .default(false)
+      .describe(
+        "When `true`, import all unimported paid Stripe invoices for the customer and create a commission for each. When `false`, create a single manual sale event using `sale.amount` (or deprecated `saleAmount`).",
+      ),
+    date: parseDateSchema
+      .nullish()
+      .describe(
+        "Only used when `importStripeInvoices` is `false`. The date of the manual sale event. Defaults to the current date and time if not provided.",
+      ),
+    sale: z
+      .object({
+        amount: centsSchema
+          .pipe(z.number().int().min(0))
+          .nullish()
+          .describe(
+            "The amount of the sale in cents (for all two-decimal currencies). If the sale is in a zero-decimal currency, pass the full integer value (e.g. `1580` JPY). Learn more: https://d.to/currency",
+          ),
+        currency: trackSaleRequestSchema.shape.currency,
+        eventName: trackSaleRequestSchema.shape.eventName,
+        paymentProcessor: trackSaleRequestSchema.shape.paymentProcessor,
+        invoiceId: trackSaleRequestSchema.shape.invoiceId,
+        metadata: trackSaleRequestSchema.shape.metadata,
+      })
+      .nullish()
+      .describe("The sale event object to associate the commission with."),
+
+    // Deprecated fields
+    saleEventDate: parseDateSchema
+      .nullish()
+      .describe("Deprecated: Use `date` instead.")
+      .meta({ deprecated: true }),
+    saleAmount: centsSchema
+      .pipe(z.number().min(0))
+      .nullish()
+      .describe("Deprecated: Use `sale.amount` instead.")
+      .meta({ deprecated: true }),
+    invoiceId: z
+      .string()
+      .nullish()
+      .describe("Deprecated: Use `sale.invoiceId` instead.")
+      .meta({ deprecated: true }),
+    productId: z
+      .string()
+      .nullish()
+      .describe("Deprecated: Use `sale.metadata.productId` instead.")
+      .meta({ deprecated: true }),
+  })
   .superRefine((data, ctx) => {
-    if (data.type !== "sale") return;
+    if (data.importStripeInvoices) {
+      const conflicts = [
+        data.sale != null && "sale",
+        data.date != null && "date",
+        data.saleAmount != null && "saleAmount",
+        data.saleEventDate != null && "saleEventDate",
+        (data.invoiceId != null || data.sale?.invoiceId != null) && "invoiceId",
+        (data.productId != null || data.sale?.metadata?.productId != null) &&
+          "productId",
+      ].filter((field): field is string => Boolean(field));
+
+      if (conflicts.length > 0) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `${conflicts.map((field) => `\`${field}\``).join(", ")} cannot be provided when \`importStripeInvoices\` is enabled.`,
+          path: [conflicts[0]],
+        });
+      }
+      return;
+    }
+
+    const saleAmount = data.sale?.amount ?? data.saleAmount;
 
-    if (!data.importStripeInvoices && data.saleAmount == null) {
+    if (saleAmount == null) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         message:
-          "`saleAmount` is required when `importStripeInvoices` is false.",
-        path: ["saleAmount"],
+          "`sale.amount` or `saleAmount` is required when `importStripeInvoices` is false.",
+        path: data.sale ? ["sale", "amount"] : ["saleAmount"],
+      });
+      return;
+    }
+
+    if (saleAmount === 0) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Sale amount cannot be 0.",
+        path: data.sale?.amount != null ? ["sale", "amount"] : ["saleAmount"],
+      });
+    }
+  });
+
+export const createManualCommissionBodySchema = z
+  .discriminatedUnion("type", [
+    createCustomCommissionSchema,
+    createLeadCommissionSchema,
+    createSaleCommissionSchema,
+  ])
+  .superRefine((data, ctx) => {
+    if (data.type === "custom") {
+      if (data.amount < 0 && !data.description?.trim()) {
+        ctx.addIssue({
+          code: "custom",
+          message:
+            "`description` is required when creating a clawback (negative amount).",
+          path: ["description"],
+        });
+      }
+      return;
+    }
+
+    if (
+      data.type === "sale" &&
+      data.linkId != null &&
+      data.discountCode != null
+    ) {
+      ctx.addIssue({
+        code: "custom",
+        message: "Either `linkId` or `discountCode` may be provided, not both.",
+        path: ["discountCode"],
       });
     }
   });
diff --git a/apps/web/lib/zod/schemas/customers.ts b/apps/web/lib/zod/schemas/customers.ts
index 96ffbe0ab2b..ada63c0f814 100644
--- a/apps/web/lib/zod/schemas/customers.ts
+++ b/apps/web/lib/zod/schemas/customers.ts
@@ -7,7 +7,7 @@ import {
   getPaginationQuerySchema,
 } from "./misc";
 import { PartnerSchema } from "./partners";
-import { centsSchema } from "./utils";
+import { centsSchema, parseDateSchema } from "./utils";
 
 export const CUSTOMERS_MAX_PAGE_SIZE = 100;
 
@@ -29,7 +29,7 @@ export const getCustomersQuerySchema = z
       .string()
       .optional()
       .describe(
-        "A search query to filter customers by email, externalId, or name. If `email` or `externalId` is provided, this will be ignored.",
+        "A search query to filter customers by email, name, or customer ID (`cus_...`). If `email` or `externalId` is provided, this will be ignored.",
       ),
     country: z
       .string()
@@ -130,7 +130,45 @@ export const createCustomerBodySchema = z.object({
     ),
 });
 
-export const updateCustomerBodySchema = createCustomerBodySchema.partial();
+export const updateCustomerBodySchema = createCustomerBodySchema
+  .partial()
+  .extend({
+    subscriptionCanceledAt: parseDateSchema
+      .nullish()
+      .describe(
+        "The date the customer canceled their subscription. Set to a timestamp to mark the subscription as canceled, or `null` to clear it (e.g. if they resubscribe).",
+      ),
+  });
+
+export const reattributeCustomerBodySchema = z.object({
+  partnerId: z.string().describe("The partner to attribute this customer to."),
+  linkId: z
+    .string()
+    .describe("The partner referral link to attribute this customer to."),
+  createClawback: z
+    .boolean()
+    .optional()
+    .default(false)
+    .describe(
+      "If the previous partner was already paid, create a clawback for those earnings and recreate commissions for the new partner.",
+    ),
+});
+
+export const reattributeCustomerWorkflowSchema = z.object({
+  workspaceId: z.string(),
+  programId: z.string(),
+  oldCustomerId: z.string(),
+  newCustomerId: z.string(),
+  oldLinkId: z.string().nullable(),
+  newLinkId: z.string(),
+  oldPartnerId: z.string().nullable(),
+  newPartnerId: z.string(),
+  oldClickId: z.string().nullable(),
+  newClickId: z.string(),
+  createClawback: z.boolean(),
+  incrementConversions: z.boolean(),
+  decrementConversions: z.boolean(),
+});
 
 // used in webhook responses + regular /customers endpoints (without expanded fields)
 export const CustomerSchema = z.object({
diff --git a/apps/web/lib/zod/schemas/discount.ts b/apps/web/lib/zod/schemas/discount.ts
index e291a670358..1fa0a2d184c 100644
--- a/apps/web/lib/zod/schemas/discount.ts
+++ b/apps/web/lib/zod/schemas/discount.ts
@@ -33,11 +33,12 @@ export const createDiscountSchema = z.object({
   amount: z.number().min(0),
   type: z.enum(RewardStructure).default("flat"),
   maxDuration: maxDurationSchema,
-  couponId: z.string(),
+  couponId: z.string().optional(),
   couponTestId: z.string().nullish(),
   groupId: z.string(),
   autoProvision: z.boolean().optional(),
   provider: z.enum(DiscountProvider),
+  isDefault: z.boolean().default(true),
 });
 
 export const updateDiscountSchema = createDiscountSchema
@@ -56,17 +57,49 @@ export const discountPartnersQuerySchema = z
   })
   .extend(getPaginationQuerySchema({ pageSize: 25 }));
 
-export const DiscountCodeSchema = z.object({
-  id: z.string(),
-  code: z.string(),
-  discountId: z.string().nullable(),
-  partnerId: z.string(),
-  linkId: z.string(),
-  disabledAt: z.coerce
-    .date()
-    .nullish()
-    .describe(
-      "When this discount code was disabled, which happens when a partner is banned or deactivated.",
+export const DiscountCodeSchema = z
+  .object({
+    id: z.string().describe("The unique ID of the discount code.").meta({
+      example: "dcode_1JVR7XRCSR0EDBAF39FZ4PMYE",
+    }),
+    code: z
+      .string()
+      .describe(
+        "The alphanumeric discount code that customers can apply at checkout.",
+      )
+      .meta({
+        example: "PARTNER10OFF",
+      }),
+    discountId: z
+      .string()
+      .nullable()
+      .describe("The ID of the discount this code belongs to."),
+    partnerId: z
+      .string()
+      .describe("The ID of the partner this discount code is assigned to."),
+    linkId: z
+      .string()
+      .describe(
+        "The ID of the partner's referral link this discount code is associated with.",
+      ),
+    disabledAt: z.coerce
+      .date()
+      .nullish()
+      .describe(
+        "When this discount code was disabled, which happens when a partner is banned or deactivated. We don't delete the discount code to avoid another partner claiming a banned/deactivated code (abuse vector).",
+      ),
+  })
+  .meta({
+    title: "DiscountCode",
+  });
+
+export const restrictedDiscountCodeSchema = z.object({
+  code: z
+    .string()
+    .trim()
+    .regex(
+      /^[a-zA-Z0-9\-_]+$/,
+      "Code can only contain letters, numbers, dashes, and underscores.",
     ),
 });
 
@@ -75,16 +108,50 @@ export const createDiscountCodeSchema = z.object({
     .string()
     .trim()
     .max(100, "Code must be 100 characters or fewer.")
-    .regex(
-      /^[a-zA-Z0-9\-_]+$/,
-      "Code can only contain letters, numbers, dashes, and underscores.",
-    )
     .optional()
-    .or(z.literal("").transform(() => undefined)),
-  partnerId: z.string(),
-  linkId: z.string(),
+    .describe(
+      "The discount code to create. If omitted, a unique code will be generated automatically from the partner's name. Stripe and Shopify codes can only contain letters, numbers, dashes, and underscores. Custom provider codes can contain any characters.",
+    ),
+  partnerId: z
+    .string()
+    .describe("The ID of the partner to create a discount code for."),
+  linkId: z
+    .string()
+    .describe(
+      "The ID of the partner's referral link to associate this discount code with. Each link can only have one discount code.",
+    ),
 });
 
-export const getDiscountCodesQuerySchema = z.object({
-  partnerId: z.string(),
+export const getDiscountCodesQuerySchema = z
+  .object({
+    partnerId: z
+      .string()
+      .optional()
+      .describe(
+        "The ID of the partner to retrieve discount codes for. If omitted, returns discount codes for the whole program.",
+      ),
+    discountId: z
+      .string()
+      .optional()
+      .describe("Filter discount codes by discount ID."),
+    code: z
+      .string()
+      .optional()
+      .describe(
+        "Filter discount codes by the alphanumeric code (e.g. `PARTNER10OFF`).",
+      ),
+  })
+  .extend(getPaginationQuerySchema({ pageSize: 100 }));
+
+// Schema for the discount code webhook
+export const DiscountCodeWebhookSchema = DiscountCodeSchema.omit({
+  discountId: true,
+}).extend({
+  discount: DiscountSchema.pick({
+    id: true,
+    amount: true,
+    type: true,
+    maxDuration: true,
+    provider: true,
+  }).nullable(),
 });
diff --git a/apps/web/lib/zod/schemas/groups.ts b/apps/web/lib/zod/schemas/groups.ts
index f512fa55a10..472a6a516ff 100644
--- a/apps/web/lib/zod/schemas/groups.ts
+++ b/apps/web/lib/zod/schemas/groups.ts
@@ -68,6 +68,7 @@ export const GroupSchema = z.object({
   leadReward: RewardSchema.nullish(),
   saleReward: RewardSchema.nullish(),
   referralReward: RewardSchema.nullish(),
+  customReward: RewardSchema.nullish(),
   discount: DiscountSchema.nullish(),
   utmTemplate: UTMTemplateSchema.nullish(),
   additionalLinks: z.array(additionalPartnerLinkSchema).nullable(),
diff --git a/apps/web/lib/zod/schemas/images.ts b/apps/web/lib/zod/schemas/images.ts
index 1fb7dc433ac..2651ad4917b 100644
--- a/apps/web/lib/zod/schemas/images.ts
+++ b/apps/web/lib/zod/schemas/images.ts
@@ -2,24 +2,33 @@ import { GOOGLE_FAVICON_URL, R2_URL } from "@dub/utils";
 import { fileTypeFromBuffer } from "file-type";
 import * as z from "zod/v4";
 
-/** Raster data-URL prefix for link preview images (base64ImageSchema, preprocess, metatags). */
-export const linkPreviewImageBase64PrefixRegex =
-  /^data:image\/(png|jpeg|jpg|gif|webp);base64,/i;
-
 const allowedImageTypes = [
   "image/png",
   "image/jpeg",
   "image/jpg",
   "image/gif",
   "image/webp",
+  "image/avif",
 ];
 
+const allowedImageFormats = allowedImageTypes
+  .map((type) => type.replace("image/", ""))
+  .join(", ");
+
+export const invalidImageFormatMessage = `Invalid image format, supports only ${allowedImageFormats}.`;
+
+/** Raster data-URL prefix for link preview images (base64ImageSchema, preprocess, metatags). */
+export const linkPreviewImageBase64PrefixRegex = new RegExp(
+  `^data:image/(${allowedImageTypes.map((type) => type.replace("image/", "")).join("|")});base64,`,
+  "i",
+);
+
 // Base64 encoded image
 export const base64ImageSchema = z
   .string()
   .trim()
   .regex(linkPreviewImageBase64PrefixRegex, {
-    message: "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+    message: invalidImageFormatMessage,
   })
   .refine(
     async (str) => {
@@ -39,7 +48,7 @@ export const base64ImageSchema = z
       }
     },
     {
-      message: "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+      message: invalidImageFormatMessage,
     },
   )
   .transform((v) => v || null);
diff --git a/apps/web/lib/zod/schemas/import-error-log.ts b/apps/web/lib/zod/schemas/import-error-log.ts
index bde1e972d2a..f215e4107f6 100644
--- a/apps/web/lib/zod/schemas/import-error-log.ts
+++ b/apps/web/lib/zod/schemas/import-error-log.ts
@@ -9,6 +9,7 @@ export const importErrorLogSchema = z.object({
     "partnerstack",
     "firstpromoter",
     "tapfiliate",
+    "lemonsqueezy",
   ]),
   entity: z.enum(["partner", "link", "customer", "commission"]),
   entity_id: z.string(),
diff --git a/apps/web/lib/zod/schemas/integration.ts b/apps/web/lib/zod/schemas/integration.ts
index 0d608750465..954296e184a 100644
--- a/apps/web/lib/zod/schemas/integration.ts
+++ b/apps/web/lib/zod/schemas/integration.ts
@@ -52,13 +52,13 @@ export const createIntegrationSchema = z.object({
   description: z
     .string()
     .max(120, {
-      message: "must be less than 120 characters",
+      message: "must be 120 characters or fewer",
     })
     .nullish(),
   readme: z
     .string()
-    .max(1000, {
-      message: "must be less than 1000 characters",
+    .max(5000, {
+      message: "must be 5000 characters or fewer",
     })
     .nullish(),
   screenshots: z
diff --git a/apps/web/lib/zod/schemas/leads.ts b/apps/web/lib/zod/schemas/leads.ts
index 2d1abdd75a5..3a390d15d15 100644
--- a/apps/web/lib/zod/schemas/leads.ts
+++ b/apps/web/lib/zod/schemas/leads.ts
@@ -3,6 +3,7 @@ import { clickEventSchema, clickEventSchemaTB } from "./clicks";
 import { CustomerSchema } from "./customers";
 import { commonDeprecatedEventFields } from "./deprecated";
 import { linkEventSchema, LinkSchema } from "./links";
+import { metadataSchema } from "./misc";
 
 export const trackLeadRequestSchema = z.object({
   clickId: z
@@ -62,16 +63,9 @@ export const trackLeadRequestSchema = z.object({
     .describe(
       "The numerical value associated with this lead event (e.g., number of provisioned seats in a free trial). If defined as N, the lead event will be tracked N times.",
     ),
-  metadata: z
-    .record(z.string(), z.any())
-    .nullish()
-    .default(null)
-    .refine((val) => !val || JSON.stringify(val).length <= 10000, {
-      message: "Metadata must be less than 10,000 characters when stringified",
-    })
-    .describe(
-      "Additional metadata to be stored with the lead event. Max 10,000 characters.",
-    ),
+  metadata: metadataSchema.describe(
+    "Additional metadata to be stored with the lead event. Max 10,000 characters.",
+  ),
 });
 
 export const trackLeadResponseSchema = z.object({
diff --git a/apps/web/lib/zod/schemas/links.ts b/apps/web/lib/zod/schemas/links.ts
index d9e60df919a..f79ac5bc0ea 100644
--- a/apps/web/lib/zod/schemas/links.ts
+++ b/apps/web/lib/zod/schemas/links.ts
@@ -332,21 +332,24 @@ export const createLinkBodySchema = z.object({
     ),
   externalId: z
     .string()
-    .min(1)
     .max(255)
-    // remove `ext_` prefix if user passes it
-    .transform((v) => (v?.startsWith("ext_") ? v.slice(4) : v))
+    // remove `ext_` prefix if user passes it; empty string clears the field
+    .transform((v) => {
+      const stripped = v?.startsWith("ext_") ? v.slice(4) : v;
+      return stripped === "" ? null : stripped;
+    })
     .nullish()
     .describe(
-      "The ID of the link in your database. If set, it can be used to identify the link in future API requests (must be prefixed with 'ext_' when passed as a query parameter). This key is unique across your workspace.",
+      "The ID of the link in your database. If set, it can be used to identify the link in future API requests (must be prefixed with 'ext_' when passed as a query parameter). This key is unique across your workspace. Pass `null` or an empty string to remove it.",
     )
     .meta({ example: "123456" }),
   tenantId: z
     .string()
     .max(255)
+    .transform((v) => (v === "" ? null : v))
     .nullish()
     .describe(
-      "The ID of the tenant that created the link inside your system. If set, it can be used to fetch all links for a tenant.",
+      "The ID of the tenant that created the link inside your system. If set, it can be used to fetch all links for a tenant. Pass `null` or an empty string to remove it.",
     ),
   programId: z
     .string()
diff --git a/apps/web/lib/zod/schemas/misc.ts b/apps/web/lib/zod/schemas/misc.ts
index 8bde58e965e..e7b8b8076ec 100644
--- a/apps/web/lib/zod/schemas/misc.ts
+++ b/apps/web/lib/zod/schemas/misc.ts
@@ -16,6 +16,10 @@ export const maxDurationSchema = z.coerce
 
 export const planSchema = z.enum(plans).describe("The plan of the workspace.");
 
+export const yearMonthSchema = z
+  .string()
+  .regex(/^\d{4}-(0[1-9]|1[0-2])$/, "Expected a month in the format yyyy-MM");
+
 export const roleSchema = z
   .enum(WorkspaceRole)
   .describe("The role of the authenticated user in the workspace.");
@@ -93,3 +97,12 @@ export const getCursorPaginationQuerySchema = ({
       example,
     }),
 });
+
+export const metadataSchema = z
+  .record(z.string(), z.any())
+  .nullish()
+  .default(null)
+  .transform((val) => (val != null && Object.keys(val).length > 0 ? val : null))
+  .refine((val) => !val || JSON.stringify(val).length <= 10000, {
+    message: "Metadata must be less than 10,000 characters when stringified",
+  });
diff --git a/apps/web/lib/zod/schemas/opens.ts b/apps/web/lib/zod/schemas/opens.ts
index 96f2637bb68..e8f539b7208 100644
--- a/apps/web/lib/zod/schemas/opens.ts
+++ b/apps/web/lib/zod/schemas/opens.ts
@@ -18,7 +18,7 @@ export const trackOpenRequestSchema = z
   .superRefine((data, ctx) => {
     if (!data.deepLink && !data.dubDomain) {
       ctx.addIssue({
-        code: z.ZodIssueCode.custom,
+        code: "custom",
         message:
           "You need to provide either `deepLink` or `dubDomain` for deferred deep linking.",
       });
diff --git a/apps/web/lib/zod/schemas/partner-profile.ts b/apps/web/lib/zod/schemas/partner-profile.ts
index f8dee55ddc7..a6026e7357a 100644
--- a/apps/web/lib/zod/schemas/partner-profile.ts
+++ b/apps/web/lib/zod/schemas/partner-profile.ts
@@ -23,15 +23,18 @@ import {
 } from "./commissions";
 import { customerActivityResponseSchema } from "./customer-activity";
 import { CustomerEnrichedSchema } from "./customers";
+import { DiscountSchema } from "./discount";
 import { LinkSchema } from "./links";
 import { getPaginationQuerySchema } from "./misc";
 import { payoutsQuerySchema } from "./payouts";
+import { RewardSchema } from "./rewards";
 import { submittedLeadFormDataSchema } from "./submitted-lead-form";
 import { centsSchema } from "./utils";
 
 export const PartnerEarningsSchema = CommissionSchema.omit({
   userId: true,
   invoiceId: true,
+  metadata: true,
 }).extend({
   customer: z
     .object({
@@ -51,6 +54,7 @@ export const getPartnerEarningsQuerySchema = getCommissionsQuerySchema
   .omit({
     partnerId: true,
     sortBy: true,
+    query: true,
   })
   .extend({
     interval: z
@@ -66,6 +70,7 @@ export const getPartnerEarningsQuerySchema = getCommissionsQuerySchema
 export const getPartnerEarningsCountQuerySchema = getCommissionsCountQuerySchema
   .omit({
     partnerId: true,
+    query: true,
   })
   .extend({
     interval: z
@@ -96,6 +101,10 @@ export const PartnerProfileLinkSchema = LinkSchema.pick({
 }).extend({
   createdAt: z.string().or(z.date()),
   partnerGroupDefaultLinkId: z.string().nullish(),
+  clickReward: RewardSchema.nullable().default(null),
+  leadReward: RewardSchema.nullable().default(null),
+  saleReward: RewardSchema.nullable().default(null),
+  discount: DiscountSchema.nullable().default(null),
   discountCode: z.string().nullable().default(null),
   discountCodeDisabledAt: z.coerce.date().nullable().default(null),
 });
@@ -105,6 +114,7 @@ export const PartnerProfileCustomerSchema = CustomerEnrichedSchema.pick({
   email: true,
   country: true,
   createdAt: true,
+  saleAmount: true,
   firstSaleAt: true,
   subscriptionCanceledAt: true,
 }).extend({
@@ -263,7 +273,12 @@ export const getPartnerCustomersQuerySchema = z
         "A filter on the list based on the customer's `linkId` field (the referral link ID).",
       ),
     sortBy: z
-      .enum(["createdAt", "firstSaleAt", "subscriptionCanceledAt"])
+      .enum([
+        "createdAt",
+        "saleAmount",
+        "firstSaleAt",
+        "subscriptionCanceledAt",
+      ])
       .optional()
       .default("createdAt")
       .describe(
@@ -291,6 +306,69 @@ export const getPartnerCustomersCountQuerySchema =
       groupBy: z.enum(["country", "linkId"]).optional(),
     });
 
+export const PARTNER_CUSTOMER_EXPORT_COLUMNS = [
+  { id: "id", label: "ID", default: true, order: 1 },
+  { id: "email", label: "Email", default: true, order: 2 },
+  { id: "name", label: "Name", default: true, order: 3 },
+  { id: "country", label: "Country", default: true, order: 4 },
+  { id: "link", label: "Link", default: true, order: 5 },
+  { id: "createdAt", label: "Created at", default: true, order: 6 },
+  { id: "saleAmount", label: "Sale amount", default: true, order: 7 },
+  { id: "firstSaleAt", label: "First sale at", default: true, order: 8 },
+  {
+    id: "subscriptionCanceledAt",
+    label: "Subscription canceled",
+    default: true,
+    order: 9,
+  },
+] as const;
+
+export const PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS =
+  PARTNER_CUSTOMER_EXPORT_COLUMNS.filter((column) => column.default).map(
+    (column) => column.id,
+  );
+
+export const partnerCustomersExportQuerySchema = getPartnerCustomersQuerySchema
+  .omit({
+    page: true,
+    pageSize: true,
+  })
+  .extend({
+    columns: z
+      .string()
+      .optional()
+      .default(PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS.join(","))
+      .transform((v) =>
+        v
+          .split(",")
+          .map((s) => s.trim())
+          .filter(Boolean),
+      )
+      .refine(
+        (columns) => {
+          const validColumnIds = new Set<string>(
+            PARTNER_CUSTOMER_EXPORT_COLUMNS.map((col) => col.id),
+          );
+
+          return (
+            columns.length > 0 &&
+            columns.every((column) => validColumnIds.has(column))
+          );
+        },
+        {
+          message:
+            "Invalid column IDs provided. Please check the available columns.",
+        },
+      ),
+  });
+
+export const partnerCustomersExportCronInputSchema =
+  partnerCustomersExportQuerySchema.extend({
+    partnerId: z.string(),
+    programId: z.string(),
+    userId: z.string(),
+  });
+
 export const partnerProfileSubmittedLeadSchema = z.object({
   id: z.string(),
   name: z.string(),
diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts
index 9096fc14533..c411b23f8aa 100644
--- a/apps/web/lib/zod/schemas/partners.ts
+++ b/apps/web/lib/zod/schemas/partners.ts
@@ -28,6 +28,7 @@ import { createLinkBodySchema } from "./links";
 import { booleanQuerySchema, getPaginationQuerySchema } from "./misc";
 import { PartnerTagSchema } from "./partner-tags";
 import { ProgramEnrollmentSchema } from "./programs";
+import { rewardActivityDescriptionSchema } from "./rewards";
 import { centsSchema, centsSchemaWithDefault, parseUrlSchema } from "./utils";
 
 export const PARTNERS_MAX_PAGE_SIZE = 100;
@@ -188,14 +189,14 @@ export const getPartnersQuerySchema = z
       .string()
       .optional()
       .describe(
-        "Filter the partner list based on the partner's `tenantId`. The value must be a string. Takes precedence over `email` and `search`.",
+        "Filter the partner list based on the partner's `tenantId`. The value must be a string. Combines with the other filters.",
       )
       .meta({ example: "1K0NM7HCN944PEMZ3CQPH43H8" }),
     search: z
       .string()
       .optional()
       .describe(
-        "A search query to filter partners by ID, name, email, or company name.",
+        "A search query to filter partners by ID, name, email, company name, description, social platforms, or referral links. Partial matches are supported.",
       )
       .meta({ example: "john" }),
   })
@@ -203,6 +204,7 @@ export const getPartnersQuerySchema = z
 
 // Only Dub UI uses the following query parameters
 export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
+  sortBy: getPartnersQuerySchema.shape.sortBy.or(z.literal("relevance")),
   status: z.enum(ProgramEnrollmentStatus).optional(),
   // TODO: refactor to use multi/negative filtering syntax
   partnerIds: z
@@ -217,6 +219,8 @@ export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
   country: z.union([z.string(), z.array(z.string())]).optional(),
   referredByPartnerId: z.string().optional(),
   includePartnerPlatforms: booleanQuerySchema.optional(),
+  rewardId: z.string().optional(),
+  discountId: z.string().optional(),
   // metric range query fields (TODO: Add to public API once we finalize the syntax)
   totalClicksMin: z.coerce
     .number()
@@ -280,9 +284,50 @@ export const getPartnersQuerySchemaExtended = getPartnersQuerySchema.extend({
     .describe("Maximum total commissions (inclusive) in USD cents."),
 });
 
+/**
+ * Parse schema for `GET /api/partners`. Kept here rather than inline in the
+ * route so the relevance guards below are testable.
+ */
+export const getPartnersRouteQuerySchema = getPartnersQuerySchemaExtended
+  .extend({
+    // Also accept the sort values these columns were named before, which the
+    // route maps onto the current ones (`clicks` → `totalClicks`, and so on).
+    sortBy: getPartnersQuerySchemaExtended.shape.sortBy.or(
+      z.enum([
+        "clicks",
+        "leads",
+        "conversions",
+        "sales",
+        "saleAmount",
+        "totalSales",
+      ]),
+    ),
+  })
+  // Relevance ordering only exists when the search provider produced candidates,
+  // and `email` and `tenantId` both keep the query on the database path. Without
+  // this, getPartners quietly orders those results by totalSaleAmount instead.
+  .refine(
+    ({ sortBy, search, email, tenantId }) =>
+      sortBy !== "relevance" ||
+      (Boolean(search?.trim()) && !email && !tenantId),
+    {
+      message:
+        "sortBy=relevance requires a non-empty search, and cannot be combined with email or tenantId.",
+      path: ["sortBy"],
+    },
+  )
+  .refine(
+    ({ sortBy, sortOrder }) => sortBy !== "relevance" || sortOrder !== "asc",
+    {
+      message: "sortBy=relevance does not support sortOrder=asc.",
+      path: ["sortOrder"],
+    },
+  );
+
 export const partnersExportQuerySchema = getPartnersQuerySchemaExtended
-  .omit({ page: true, pageSize: true })
+  .omit({ page: true, pageSize: true, search: true })
   .extend({
+    sortBy: getPartnersQuerySchema.shape.sortBy,
     columns: z
       .string()
       .default(exportPartnersColumnsDefault.join(","))
@@ -801,7 +846,7 @@ export const createPartnerLinkSchema = partnerIdTenantIdSchema
   .extend({
     url: parseUrlSchema
       .describe(
-        "The URL to shorten (if not provided, the program's default URL will be used). Will throw an error if the domain doesn't match the program's default URL domain.",
+        "The URL to shorten (if not provided, the program's default URL will be used).",
       )
       .nullish(),
     key: z
@@ -820,11 +865,27 @@ export const createPartnerLinkSchema = partnerIdTenantIdSchema
   );
 
 export const upsertPartnerLinkSchema = createPartnerLinkSchema.extend({
-  url: parseUrlSchema.describe(
-    "The URL to upsert for. Will throw an error if the domain doesn't match the program's default URL domain.",
-  ),
+  url: parseUrlSchema.describe("The URL to upsert for."),
 });
 
+// Internal-only fields used by the Dub UI.
+// These fields are not exposed through the public API.
+export const createPartnerLinkSchemaInternal = createPartnerLinkSchema.extend({
+  clickRewardId: z.string().nullish(),
+  leadRewardId: z.string().nullish(),
+  saleRewardId: z.string().nullish(),
+  discountId: z.string().nullish(),
+});
+
+export const updatePartnerLinkSchema = createPartnerLinkSchemaInternal
+  .pick({
+    clickRewardId: true,
+    leadRewardId: true,
+    saleRewardId: true,
+    discountId: true,
+  })
+  .extend(rewardActivityDescriptionSchema.shape);
+
 // For /api/partners/analytics
 export const partnerAnalyticsQuerySchema = analyticsQuerySchema
   .pick({
@@ -968,6 +1029,12 @@ export const bulkRejectPartnersSchema = z.object({
 
 export const retrievePartnerLinksSchema = partnerIdTenantIdSchema;
 
+// Only Dub UI uses the following query parameters
+export const retrievePartnerLinksSchemaInternal =
+  retrievePartnerLinksSchema.extend({
+    includeRewards: booleanQuerySchema.default(false),
+  });
+
 export const banPartnerSchema = z.object({
   workspaceId: z.string(),
   partnerId: z.string(),
@@ -1052,7 +1119,7 @@ export const partnerPayoutSettingsSchema = z.object({
   taxId: z.string().max(100).trim().nullish(),
 });
 
-export const partnerCrossProgramSummarySchema = z.object({
+export const partnerNetworkActivitySummarySchema = z.object({
   totalPrograms: z.number(),
   activePrograms: z.number(),
   bannedPrograms: z.number(),
@@ -1070,3 +1137,30 @@ export const partnerSharedPlatformSchema = z.object({
     }),
   ),
 });
+
+const partnerMergedAccountSchema = z.object({
+  id: z.string().describe("The partner's unique ID on Dub."),
+  tenantId: z
+    .string()
+    .nullable()
+    .describe("The partner's unique ID in your system"),
+  email: z.string().nullable().describe("The partner's email address."),
+});
+
+export const partnerMergedWebhookSchema = z.object({
+  sourcePartner: partnerMergedAccountSchema.describe(
+    "The source partner account that was merged away. Its enrollment in this program no longer exists; use `targetPartner.id` instead.",
+  ),
+  targetPartner: partnerMergedAccountSchema.describe(
+    "The target partner account that the source account was merged into.",
+  ),
+  targetAlreadyEnrolled: z
+    .boolean()
+    .describe(
+      [
+        "Whether the target partner account was already enrolled in this program before the merge.",
+        "If `true`, both partners were already enrolled in the program and the merge process will collapse the source account into the target account.",
+        "If `false`, only the source partner account was enrolled in the program, which means the partner's ID in your program will be updated to the target partner's ID.",
+      ].join("\n"),
+    ),
+});
diff --git a/apps/web/lib/zod/schemas/programs.ts b/apps/web/lib/zod/schemas/programs.ts
index f9054c9a073..5892a281512 100644
--- a/apps/web/lib/zod/schemas/programs.ts
+++ b/apps/web/lib/zod/schemas/programs.ts
@@ -123,6 +123,17 @@ export const ProgramPartnerLinkSchema = LinkSchema.pick({
   saleAmount: true,
 });
 
+// Internal-only fields used by the Dub UI.
+// These fields are not exposed through the public API.
+export const ProgramPartnerLinkSchemaInternal = ProgramPartnerLinkSchema.extend(
+  {
+    clickReward: z.string().nullable().default(null),
+    leadReward: z.string().nullable().default(null),
+    saleReward: z.string().nullable().default(null),
+    discount: z.string().nullable().default(null),
+  },
+);
+
 export const ProgramEnrollmentApplicationSchema = z.object({
   rejectionReason: z
     .enum(ProgramApplicationRejectionReason)
@@ -163,6 +174,7 @@ export const ProgramEnrollmentSchema = z.object({
   leadRewardId: z.string().nullish(),
   saleRewardId: z.string().nullish(),
   referralRewardId: z.string().nullish(),
+  customRewardId: z.string().nullish(),
   discount: DiscountSchema.nullish(),
   discountId: z.string().nullish(),
   applicationId: z
diff --git a/apps/web/lib/zod/schemas/referrals-embed.ts b/apps/web/lib/zod/schemas/referrals-embed.ts
index 8fc01244142..494788c8ced 100644
--- a/apps/web/lib/zod/schemas/referrals-embed.ts
+++ b/apps/web/lib/zod/schemas/referrals-embed.ts
@@ -1,5 +1,7 @@
 import * as z from "zod/v4";
+import { DiscountSchema } from "./discount";
 import { LinkSchema } from "./links";
+import { RewardSchema } from "./rewards";
 
 export const ReferralsEmbedLinkSchema = LinkSchema.pick({
   id: true,
@@ -12,4 +14,8 @@ export const ReferralsEmbedLinkSchema = LinkSchema.pick({
   conversions: true,
 }).extend({
   partnerGroupDefaultLinkId: z.string().nullish(),
+  clickReward: RewardSchema.nullable().default(null),
+  leadReward: RewardSchema.nullable().default(null),
+  saleReward: RewardSchema.nullable().default(null),
+  discount: DiscountSchema.nullable().default(null),
 });
diff --git a/apps/web/lib/zod/schemas/rewards.ts b/apps/web/lib/zod/schemas/rewards.ts
index e72edba86df..1440cc8726d 100644
--- a/apps/web/lib/zod/schemas/rewards.ts
+++ b/apps/web/lib/zod/schemas/rewards.ts
@@ -233,6 +233,11 @@ export const REWARD_CONDITIONS: Record<
   referral: {
     entities: [],
   },
+
+  // Custom cadence reward (no modifiers)
+  custom: {
+    entities: [],
+  },
 };
 
 const REWARD_CONDITION_ENTITIES = [
@@ -432,6 +437,7 @@ export const RewardSchema = z.object({
   maxDuration: z.number().nullish(),
   modifiers: z.any().nullish(), // TODO: Fix this
   config: z.any().nullish(),
+  partnersCount: z.number().nullish(),
   updatedAt: z.coerce.date(),
   ...rewardSpendLimitSchema.shape,
 });
@@ -469,6 +475,58 @@ export const referralRewardConfigSchema = z
     }
   });
 
+export const CUSTOM_REWARD_FREQUENCIES = [
+  "day",
+  "week",
+  "month",
+  "year",
+] as const;
+
+export const customRewardConfigSchema = z.object({
+  frequency: z.enum(CUSTOM_REWARD_FREQUENCIES),
+  interval: z.number().int().positive(),
+  anchorDate: z.iso.date(),
+});
+
+export const CUSTOM_REWARD_CADENCE_PRESETS = [
+  {
+    value: "daily",
+    label: "Daily",
+    frequency: "day" as const,
+    interval: 1,
+  },
+  {
+    value: "weekly",
+    label: "Weekly",
+    frequency: "week" as const,
+    interval: 1,
+  },
+  {
+    value: "biweekly",
+    label: "Biweekly",
+    frequency: "week" as const,
+    interval: 2,
+  },
+  {
+    value: "monthly",
+    label: "Monthly",
+    frequency: "month" as const,
+    interval: 1,
+  },
+  {
+    value: "quarterly",
+    label: "Quarterly",
+    frequency: "month" as const,
+    interval: 3,
+  },
+  {
+    value: "yearly",
+    label: "Yearly",
+    frequency: "year" as const,
+    interval: 1,
+  },
+] as const;
+
 export const createOrUpdateRewardSchema = z.object({
   workspaceId: z.string(),
   event: z.enum(EventType),
@@ -477,7 +535,9 @@ export const createOrUpdateRewardSchema = z.object({
   amountInPercentage: PERCENTAGE_REWARD_AMOUNT_SCHEMA.optional(),
   maxDuration: maxDurationSchema,
   modifiers: rewardConditionsArraySchema.nullish(),
-  config: referralRewardConfigSchema.nullish(),
+  config: z
+    .union([referralRewardConfigSchema, customRewardConfigSchema])
+    .nullish(),
   description: z.string().max(REWARD_DESCRIPTION_MAX_LENGTH).nullish(),
   tooltipDescription: z
     .string()
@@ -488,14 +548,26 @@ export const createOrUpdateRewardSchema = z.object({
   ...rewardActivityDescriptionSchema.shape,
 });
 
-export const createRewardSchema = createOrUpdateRewardSchema.superRefine(
-  (data) => {
+export const createRewardSchema = createOrUpdateRewardSchema
+  .extend({
+    isDefault: z.boolean().default(true),
+  })
+  .superRefine((data) => {
     if (isOneOffRewardEvent(data.event)) {
       data.type = "flat";
       data.maxDuration = 0;
     }
-  },
-);
+  })
+  .refine(
+    (data) =>
+      data.isDefault ||
+      (["click", "lead", "sale"] as EventType[]).includes(data.event),
+    {
+      message:
+        "Non-default rewards can only be created for click, lead, and sale events.",
+      path: ["event"],
+    },
+  );
 
 export const updateRewardSchema = createOrUpdateRewardSchema
   .omit({
@@ -517,6 +589,15 @@ export const REWARD_EVENT_COLUMN_MAPPING = Object.freeze({
   lead: "leadRewardId",
   sale: "saleRewardId",
   referral: "referralRewardId",
+  custom: "customRewardId",
+});
+
+export const REWARD_EVENT_RELATION_MAPPING = Object.freeze({
+  click: "clickReward",
+  lead: "leadReward",
+  sale: "saleReward",
+  referral: "referralReward",
+  custom: "customReward",
 });
 
 export const CUSTOMER_SOURCES = ["tracked", "submitted", "trial"] as const;
@@ -540,7 +621,12 @@ export const rewardContextSchema = z.object({
 
   sale: z
     .object({
-      productId: z.string().nullish(),
+      // Non-string productIds (e.g. from sale.metadata) are dropped so reward
+      // conditions only match string product IDs.
+      productId: z.preprocess(
+        (val) => (typeof val === "string" ? val : undefined),
+        z.string().nullish(),
+      ),
       amount: z.number().nullish(),
       type: z.enum(["new", "recurring"]).nullish(),
       metadata: z.record(z.string(), z.unknown()).optional(),
diff --git a/apps/web/lib/zod/schemas/sales.ts b/apps/web/lib/zod/schemas/sales.ts
index c54f2add0c4..30ff3391f51 100644
--- a/apps/web/lib/zod/schemas/sales.ts
+++ b/apps/web/lib/zod/schemas/sales.ts
@@ -3,6 +3,7 @@ import { clickEventSchema, clickEventSchemaTB } from "./clicks";
 import { CustomerSchema } from "./customers";
 import { commonDeprecatedEventFields } from "./deprecated";
 import { linkEventSchema } from "./links";
+import { metadataSchema } from "./misc";
 import { centsSchema } from "./utils";
 
 export const trackSaleRequestSchema = z.object({
@@ -45,6 +46,7 @@ export const trackSaleRequestSchema = z.object({
       "paddle",
       "apple",
       "revenuecat",
+      "lemonsqueezy",
       "dub",
       "custom",
     ])
@@ -57,16 +59,9 @@ export const trackSaleRequestSchema = z.object({
     .describe(
       "The invoice ID of the sale. Can be used as a idempotency key – only one sale event can be recorded for a given invoice ID.",
     ),
-  metadata: z
-    .record(z.string(), z.any())
-    .nullish()
-    .default(null)
-    .refine((val) => !val || JSON.stringify(val).length <= 10000, {
-      message: "Metadata must be less than 10,000 characters when stringified",
-    })
-    .describe(
-      "Additional metadata to be stored with the sale event. Max 10,000 characters when stringified.",
-    ),
+  metadata: metadataSchema.describe(
+    "Additional metadata to be stored with the sale event. Max 10,000 characters when stringified.",
+  ),
   // advanced fields: leadEventName + fields for sale tracking without a  lead event
   leadEventName: z
     .string()
diff --git a/apps/web/lib/zod/schemas/submitted-lead-form.ts b/apps/web/lib/zod/schemas/submitted-lead-form.ts
index fef682bc803..00db9f3ed16 100644
--- a/apps/web/lib/zod/schemas/submitted-lead-form.ts
+++ b/apps/web/lib/zod/schemas/submitted-lead-form.ts
@@ -29,7 +29,7 @@ export const textFieldSchema = fieldCommonSchema.extend({
   type: z.literal("text"),
   constraints: z
     .object({
-      maxLength: z.number().int().positive().optional(),
+      maxLength: z.number().int().min(1).optional(),
       pattern: z.string().optional(),
     })
     .optional(),
@@ -40,7 +40,7 @@ export const textareaFieldSchema = fieldCommonSchema.extend({
   type: z.literal("textarea"),
   constraints: z
     .object({
-      maxLength: z.number().int().positive().optional(),
+      maxLength: z.number().int().min(1).optional(),
     })
     .optional(),
 });
@@ -100,7 +100,7 @@ export const formFieldsSchema = z
         ctx.addIssue({
           path: ["fields"],
           message: `Duplicate field key: ${field.key}`,
-          code: z.ZodIssueCode.custom,
+          code: "custom",
         });
       }
 
@@ -108,7 +108,7 @@ export const formFieldsSchema = z
         ctx.addIssue({
           path: ["fields"],
           message: `Duplicate field position: ${field.position}`,
-          code: z.ZodIssueCode.custom,
+          code: "custom",
         });
       }
 
diff --git a/apps/web/lib/zod/schemas/tags.ts b/apps/web/lib/zod/schemas/tags.ts
index 2f4116a17f2..cc9fc26ece1 100644
--- a/apps/web/lib/zod/schemas/tags.ts
+++ b/apps/web/lib/zod/schemas/tags.ts
@@ -69,7 +69,7 @@ export const createTagBodySchema = z
   .superRefine((data, ctx) => {
     if (!data.name && !data.tag) {
       ctx.addIssue({
-        code: z.ZodIssueCode.custom,
+        code: "custom",
         path: ["name"],
         message: "Name is required.",
       });
diff --git a/apps/web/lib/zod/schemas/token.ts b/apps/web/lib/zod/schemas/token.ts
index b9e2d280256..08964a93bf6 100644
--- a/apps/web/lib/zod/schemas/token.ts
+++ b/apps/web/lib/zod/schemas/token.ts
@@ -11,7 +11,9 @@ export const createTokenSchema = z.object({
     .min(1)
     .max(50),
   isMachine: z.boolean().optional().default(false),
-  scopes: z.array(z.enum(SCOPES)).default([]).optional(),
+  scopes: z.array(z.enum(SCOPES)).min(1, {
+    error: "Please select at least one scope for this API key.",
+  }),
 });
 
 // Schema to validate the request body when updating a token
@@ -31,6 +33,7 @@ export const tokenSchema = z.object({
     .string()
     .nullable()
     .transform((val) => val?.split(" ") ?? []),
+  expires: z.date().nullable(),
   lastUsed: z.date().nullable(),
   createdAt: z.date(),
   updatedAt: z.date(),
@@ -51,7 +54,7 @@ export const createReferralsEmbedTokenSchema = z
   .superRefine((data, ctx) => {
     if (!data.partnerId && !data.tenantId && !data.partner) {
       ctx.addIssue({
-        code: z.ZodIssueCode.custom,
+        code: "custom",
         message: "You must provide either partnerId, tenantId, or partner.",
       });
     }
diff --git a/apps/web/lib/zod/schemas/utm.ts b/apps/web/lib/zod/schemas/utm.ts
index 5dfda0513b5..aa8932a57d6 100644
--- a/apps/web/lib/zod/schemas/utm.ts
+++ b/apps/web/lib/zod/schemas/utm.ts
@@ -1,11 +1,18 @@
+import {
+  PARTNER_MACRO_VALUES,
+  isValidPartnerMacroTemplate,
+} from "@/lib/partners/macros";
 import * as z from "zod/v4";
 
-const UTM_TAG_MAX_LENGTH = 255;
+export const UTM_TAG_MAX_LENGTH = 255;
 
 export const utmTagInputSchema = z
   .string()
   .trim()
   .max(UTM_TAG_MAX_LENGTH)
+  .refine((v) => v === "" || isValidPartnerMacroTemplate(v), {
+    message: `Invalid macro in value. Use only: ${PARTNER_MACRO_VALUES.join(", ")}`,
+  })
   .transform((v) => (v === "" ? null : v))
   .nullish();
 
diff --git a/apps/web/lib/zod/schemas/workflows.ts b/apps/web/lib/zod/schemas/workflows.ts
index c6daae06265..e41a238c3a7 100644
--- a/apps/web/lib/zod/schemas/workflows.ts
+++ b/apps/web/lib/zod/schemas/workflows.ts
@@ -5,9 +5,6 @@ import {
 } from "@/lib/api/workflows/operator-definitions";
 import * as z from "zod/v4";
 
-// Cron for scheduled workflows that use partnerEnrolledDays conditions
-export const PARTNER_ENROLLED_WORKFLOW_CRON = "0 */12 * * *"; // every 12 hours
-
 export enum WORKFLOW_ACTION_TYPES {
   AwardBounty = "awardBounty",
   SendCampaign = "sendCampaign",
diff --git a/apps/web/lib/zod/schemas/workspaces.ts b/apps/web/lib/zod/schemas/workspaces.ts
index f71e14f1c97..8c0ead413ed 100644
--- a/apps/web/lib/zod/schemas/workspaces.ts
+++ b/apps/web/lib/zod/schemas/workspaces.ts
@@ -68,6 +68,10 @@ export const WorkspaceSchema = z
       .date()
       .nullable()
       .describe("The date and time when the payment failed for the workspace."),
+    disabledAt: z
+      .date()
+      .nullable()
+      .describe("The date and time when the workspace was disabled."),
     stripeConnectId: z
       .string()
       .nullable()
@@ -243,9 +247,11 @@ export const workspaceStoreKeys = z.enum([
   "analyticsSettingsConversionTrackingEnabled", // boolean
   "analyticsSettingsSiteVisitTrackingEnabled", // boolean
   "analyticsSettingsOutboundDomainTrackingEnabled", // boolean
+  "analyticsSettingsSelectedStack", // string[]
   "analyticsSettingsConnectionSetupComplete", // boolean
   "analyticsSettingsLeadTrackingSetupComplete", // boolean
   "analyticsSettingsSaleTrackingSetupComplete", // boolean
+  "analyticsSettingsInstallationVerified", // { hostname, verifiedAt, user }
 ]);
 
 export const getWorkspaceUsersQuerySchema = z.object({
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 952f48eb820..622f95408f1 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -3,11 +3,10 @@ import { transformMiddlewareRequest } from "@axiomhq/nextjs";
 import {
   ADMIN_HOSTNAMES,
   API_HOSTNAMES,
-  APP_HOSTNAMES,
   DEFAULT_REDIRECTS,
   isValidUrl,
 } from "@dub/utils";
-import { PARTNERS_HOSTNAMES } from "@dub/utils/src/constants";
+import { isAppHostname, PARTNERS_HOSTNAMES } from "@dub/utils/src/constants";
 import { NextFetchEvent, NextRequest, NextResponse } from "next/server";
 import { AdminMiddleware } from "./lib/middleware/admin";
 import { ApiMiddleware } from "./lib/middleware/api";
@@ -39,12 +38,12 @@ export default async function middleware(req: NextRequest, ev: NextFetchEvent) {
   logger.info(...transformMiddlewareRequest(req));
   ev.waitUntil(logger.flush());
 
-  // for App
-  if (APP_HOSTNAMES.has(domain)) {
+  // for app.dub.co
+  if (isAppHostname(domain)) {
     return AppMiddleware(req);
   }
 
-  // for API
+  // for api.dub.co
   if (API_HOSTNAMES.has(domain)) {
     return ApiMiddleware(req);
   }
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 0f24ec7a77c..fee84a05f1d 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -136,62 +136,37 @@ module.exports = withPlausibleProxy({
   async redirects() {
     return [
       {
-        source: "/",
-        has: [
-          {
-            type: "host",
-            value: "app.dub.sh",
-          },
-        ],
-        destination: "https://app.dub.co",
-        permanent: true,
-        statusCode: 301,
-      },
-      {
-        source: "/:path*",
-        has: [
-          {
-            type: "host",
-            value: "app.dub.sh",
-          },
-        ],
-        destination: "https://app.dub.co/:path*",
-        permanent: true,
-        statusCode: 301,
-      },
-      {
-        source: "/",
-        has: [
+        source: "/api/:path*",
+        missing: [
           {
             type: "host",
-            value: "staging.dub.sh",
+            value: ".*(\\.dub\\.co|localhost)",
           },
         ],
-        destination: "https://dub.co",
-        permanent: true,
-        statusCode: 301,
+        destination: "/",
+        permanent: false,
       },
       {
         source: "/",
         has: [
           {
             type: "host",
-            value: "preview.dub.sh",
+            value: "app.dub.sh",
           },
         ],
-        destination: "https://preview.dub.co",
+        destination: "https://app.dub.co",
         permanent: true,
         statusCode: 301,
       },
       {
-        source: "/",
+        source: "/:path*",
         has: [
           {
             type: "host",
-            value: "admin.dub.sh",
+            value: "app.dub.sh",
           },
         ],
-        destination: "https://admin.dub.co",
+        destination: "https://app.dub.co/:path*",
         permanent: true,
         statusCode: 301,
       },
diff --git a/apps/web/package.json b/apps/web/package.json
index ca16b4d5978..9bf9260746e 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@ai-sdk/anthropic": "^3.0.1",
-    "@ai-sdk/react": "^3.0.3",
-    "@ai-sdk/rsc": "^2.0.3",
+    "@ai-sdk/react": "^4.0.110",
+    "@ai-sdk/rsc": "^3.0.107",
     "@axiomhq/js": "^1.3.1",
     "@axiomhq/logging": "^0.1.5",
     "@axiomhq/nextjs": "^0.1.6",
@@ -54,6 +54,7 @@
     "@tiptap/html": "^3.15.3",
     "@tiptap/starter-kit": "^3.15.3",
     "@tiptap/static-renderer": "^3.15.3",
+    "@turbopuffer/turbopuffer": "^2.8.0",
     "@types/base-x": "^3.0.10",
     "@types/bcryptjs": "^2.4.6",
     "@types/buffer-crc32": "0.2.0",
@@ -75,7 +76,7 @@
     "@visx/scale": "^3.3.0",
     "@visx/shape": "^2.12.2",
     "@visx/text": "^3.3.0",
-    "ai": "^6.0.3",
+    "ai": "^7.0.107",
     "aws4fetch": "^1.0.19",
     "base-x": "^5.0.0",
     "bcryptjs": "^2.4.3",
@@ -91,6 +92,7 @@
     "frimousse": "^0.3.0",
     "fuse.js": "^6.6.2",
     "geist": "^1.3.1",
+    "gemoji": "8.1.0",
     "he": "^1.2.0",
     "html-escaper": "^3.0.3",
     "input-otp": "^1.2.4",
diff --git a/apps/web/playwright.config.ts b/apps/web/playwright.config.ts
index 52af39eddad..19ba583d254 100644
--- a/apps/web/playwright.config.ts
+++ b/apps/web/playwright.config.ts
@@ -88,7 +88,10 @@ export default defineConfig({
         port: 8888,
         reuseExistingServer: true,
         timeout: 120_000,
+        // Zod 422s (and other expected API errors) log to stderr via
+        // handleApiError; ignore both streams so GH Actions logs stay readable.
         stdout: "ignore",
+        stderr: "ignore",
       }
     : undefined,
 });
diff --git a/apps/web/playwright/README.md b/apps/web/playwright/README.md
index a4fbe6ac155..cea8af5eb3c 100644
--- a/apps/web/playwright/README.md
+++ b/apps/web/playwright/README.md
@@ -42,6 +42,10 @@ pnpm --filter web test:e2e --project=api playwright/api/tags/tags.spec.ts -g "PO
 
 `-g` / `--grep` matches the test title (regex). Combine with a file path to narrow further.
 
+## Locators
+
+UI specs locate controls with `page.getByTestId` and IDs from [`lib/e2e/test-ids.ts`](../lib/e2e/test-ids.ts), not button labels or headings. That stays stable when copy changes and when i18n lands. Form fields can still use `input[name]`. Sonner toasts used as assertions set the same ID via the toast `testId` option.
+
 ## Running tests
 
 Make sure the dev server is running first (`pnpm dev`), then:
diff --git a/apps/web/playwright/api/bounties/bounties.spec.ts b/apps/web/playwright/api/bounties/bounties.spec.ts
index 2dee72deefe..c55961419e3 100644
--- a/apps/web/playwright/api/bounties/bounties.spec.ts
+++ b/apps/web/playwright/api/bounties/bounties.spec.ts
@@ -4,13 +4,9 @@ import type { BountyProps } from "@/lib/types";
 import { expect } from "@playwright/test";
 import { BountyStartMode, type Program } from "@prisma/client";
 import { addDays, addMonths, subDays } from "date-fns";
-import { randomName } from "../../utils";
+import { apiError, randomName } from "../../utils";
 import { test, type ApiClient } from "../fixtures";
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 type BountyJson = Omit<
   BountyProps,
   "startsAt" | "endsAt" | "submissionsOpenAt" | "socialMetricsLastSyncedAt"
@@ -93,39 +89,6 @@ const expectedBountyDefaults = {
   partnerTags: [],
 };
 
-const unprocessable = (message: string) => ({
-  status: 422,
-  data: {
-    error: {
-      code: "unprocessable_entity",
-      message,
-      doc_url: "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-    },
-  },
-});
-
-const badRequest = (message: string) => ({
-  status: 400,
-  data: {
-    error: {
-      code: "bad_request",
-      message,
-      doc_url: "https://dub.co/docs/api-reference/errors#bad-request",
-    },
-  },
-});
-
-const notFound = (bountyId: string) => ({
-  status: 404,
-  data: {
-    error: {
-      code: "not_found",
-      message: `Bounty ${bountyId} not found.`,
-      doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-    },
-  },
-});
-
 test("POST /bounties", async ({ api, program }) => {
   let id: string | undefined;
   const body = bountyPayload(program);
@@ -358,7 +321,10 @@ test("DELETE /bounties/{bountyId}", async ({ api, program }) => {
   expect(status).toEqual(200);
   expect(data).toStrictEqual({ id: created.id });
   expect(await api.get(`/api/bounties/${created.id}`)).toEqual(
-    notFound(created.id),
+    apiError({
+      code: "not_found",
+      message: `Bounty ${created.id} not found.`,
+    }),
   );
 });
 
@@ -714,9 +680,11 @@ test("PATCH /bounties/{bountyId} – submissionFrequency requires endsAt on the
         maxSubmissions: 4,
       }),
     ).toEqual(
-      badRequest(
-        "`endsAt` or `endsAfterDays` is required when `submissionFrequency` is set.",
-      ),
+      apiError({
+        code: "bad_request",
+        message:
+          "`endsAt` or `endsAfterDays` is required when `submissionFrequency` is set.",
+      }),
     );
   } finally {
     await deleteBounty(api, id);
@@ -738,7 +706,10 @@ test("PATCH /bounties/{bountyId} – submissionsOpenAt without endsAt is rejecte
         submissionsOpenAt: addDays(new Date(), 5).toISOString(),
       }),
     ).toEqual(
-      badRequest("`endsAt` is required when `submissionsOpenAt` is set."),
+      apiError({
+        code: "bad_request",
+        message: "`endsAt` is required when `submissionsOpenAt` is set.",
+      }),
     );
   } finally {
     await deleteBounty(api, id);
@@ -758,9 +729,11 @@ test("PATCH /bounties/{bountyId} – maxSubmissions below minimum is rejected",
     expect(
       await api.patch(`/api/bounties/${id}`, { maxSubmissions: 1 }),
     ).toEqual(
-      unprocessable(
-        "too_small: maxSubmissions: If `maxSubmissions` is set, it must be at least 2",
-      ),
+      apiError({
+        code: "unprocessable_entity",
+        message:
+          "too_small: maxSubmissions: If `maxSubmissions` is set, it must be at least 2",
+      }),
     );
   } finally {
     await deleteBounty(api, id);
@@ -780,9 +753,10 @@ test("PATCH /bounties/{bountyId} – maxSubmissions above maximum is rejected",
     expect(
       await api.patch(`/api/bounties/${id}`, { maxSubmissions: 51 }),
     ).toEqual(
-      unprocessable(
-        "too_big: maxSubmissions: Too big: expected number to be <=50",
-      ),
+      apiError({
+        code: "unprocessable_entity",
+        message: "too_big: maxSubmissions: Too big: expected number to be <=50",
+      }),
     );
   } finally {
     await deleteBounty(api, id);
@@ -794,7 +768,12 @@ test("POST /bounties – invalid group IDs", async ({ api, program }) => {
     await api.post("/api/bounties", {
       ...bountyPayload(program, { groupIds: ["invalid-group-id"] }),
     }),
-  ).toEqual(badRequest("Invalid group IDs detected: invalid-group-id"));
+  ).toEqual(
+    apiError({
+      code: "bad_request",
+      message: "Invalid group IDs detected: invalid-group-id",
+    }),
+  );
 });
 
 test("POST /bounties – invalid partner tag IDs", async ({ api, program }) => {
@@ -805,7 +784,10 @@ test("POST /bounties – invalid partner tag IDs", async ({ api, program }) => {
       }),
     }),
   ).toEqual(
-    badRequest("Invalid partner tag IDs detected: invalid-partner-tag-id"),
+    apiError({
+      code: "bad_request",
+      message: "Invalid partner tag IDs detected: invalid-partner-tag-id",
+    }),
   );
 });
 
@@ -895,7 +877,10 @@ test("PATCH /bounties/{bountyId} – invalid partner tag IDs", async ({
         partnerTagIds: ["invalid-partner-tag-id"],
       }),
     ).toEqual(
-      badRequest("Invalid partner tag IDs detected: invalid-partner-tag-id"),
+      apiError({
+        code: "bad_request",
+        message: "Invalid partner tag IDs detected: invalid-partner-tag-id",
+      }),
     );
   } finally {
     await deleteBounty(api, id);
@@ -911,9 +896,11 @@ test("POST /bounties – maxSubmissions below minimum is rejected", async ({
       ...bountyPayload(program, { maxSubmissions: 1 }),
     }),
   ).toEqual(
-    unprocessable(
-      "too_small: maxSubmissions: If `maxSubmissions` is set, it must be at least 2",
-    ),
+    apiError({
+      code: "unprocessable_entity",
+      message:
+        "too_small: maxSubmissions: If `maxSubmissions` is set, it must be at least 2",
+    }),
   );
 });
 
@@ -926,9 +913,10 @@ test("POST /bounties – maxSubmissions above maximum is rejected", async ({
       ...bountyPayload(program, { maxSubmissions: 51 }),
     }),
   ).toEqual(
-    unprocessable(
-      "too_big: maxSubmissions: Too big: expected number to be <=50",
-    ),
+    apiError({
+      code: "unprocessable_entity",
+      message: "too_big: maxSubmissions: Too big: expected number to be <=50",
+    }),
   );
 });
 
@@ -948,9 +936,10 @@ test("POST /bounties – submissionFrequency without maxSubmissions is rejected"
       }),
     }),
   ).toEqual(
-    badRequest(
-      "`maxSubmissions` is required when `submissionFrequency` is set.",
-    ),
+    apiError({
+      code: "bad_request",
+      message: "`maxSubmissions` is required when `submissionFrequency` is set.",
+    }),
   );
 });
 
@@ -967,9 +956,11 @@ test("POST /bounties – submissionFrequency without endsAt is rejected", async
       }),
     }),
   ).toEqual(
-    badRequest(
-      "`endsAt` or `endsAfterDays` is required when `submissionFrequency` is set.",
-    ),
+    apiError({
+      code: "bad_request",
+      message:
+        "`endsAt` or `endsAfterDays` is required when `submissionFrequency` is set.",
+    }),
   );
 });
 
@@ -988,7 +979,10 @@ test("POST /bounties – submissionsOpenAt without endsAt is rejected", async ({
       }),
     }),
   ).toEqual(
-    badRequest("`endsAt` is required when `submissionsOpenAt` is set."),
+    apiError({
+      code: "bad_request",
+      message: "`endsAt` is required when `submissionsOpenAt` is set.",
+    }),
   );
 });
 
@@ -1007,7 +1001,12 @@ test("POST /bounties – submissionsOpenAt before startsAt is rejected", async (
         submissionsOpenAt: subDays(new Date(startsAt), 1).toISOString(),
       }),
     }),
-  ).toEqual(badRequest("`submissionsOpenAt` must be on or after `startsAt`."));
+  ).toEqual(
+    apiError({
+      code: "bad_request",
+      message: "`submissionsOpenAt` must be on or after `startsAt`.",
+    }),
+  );
 });
 
 test("POST /bounties – submissionsOpenAt after endsAt is rejected", async ({
@@ -1025,7 +1024,12 @@ test("POST /bounties – submissionsOpenAt after endsAt is rejected", async ({
         submissionsOpenAt: addDays(new Date(endsAt), 1).toISOString(),
       }),
     }),
-  ).toEqual(badRequest("`submissionsOpenAt` must be on or before `endsAt`."));
+  ).toEqual(
+    apiError({
+      code: "bad_request",
+      message: "`submissionsOpenAt` must be on or before `endsAt`.",
+    }),
+  );
 });
 
 test("POST /bounties – relative with startsAt is rejected", async ({
@@ -1041,9 +1045,10 @@ test("POST /bounties – relative with startsAt is rejected", async ({
       }),
     }),
   ).toEqual(
-    badRequest(
-      "`startsAt` is not supported when the `startMode` is `relative`.",
-    ),
+    apiError({
+      code: "bad_request",
+      message: "`startsAt` is not supported when the `startMode` is `relative`.",
+    }),
   );
 });
 
@@ -1061,7 +1066,10 @@ test("POST /bounties – both endsAt and endsAfterDays is rejected", async ({
       }),
     }),
   ).toEqual(
-    badRequest("Bounties cannot have both `endsAt` and `endsAfterDays`."),
+    apiError({
+      code: "bad_request",
+      message: "Bounties cannot have both `endsAt` and `endsAfterDays`.",
+    }),
   );
 });
 
@@ -1069,18 +1077,29 @@ const unknownBountyId = "bnty_does_not_exist";
 
 test("GET /bounties/{bountyId} – not found", async ({ api }) => {
   expect(await api.get(`/api/bounties/${unknownBountyId}`)).toEqual(
-    notFound(unknownBountyId),
+    apiError({
+      code: "not_found",
+      message: `Bounty ${unknownBountyId} not found.`,
+    }),
   );
 });
 
 test("PATCH /bounties/{bountyId} – not found", async ({ api }) => {
   expect(
     await api.patch(`/api/bounties/${unknownBountyId}`, { name: "x" }),
-  ).toEqual(notFound(unknownBountyId));
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message: `Bounty ${unknownBountyId} not found.`,
+    }),
+  );
 });
 
 test("DELETE /bounties/{bountyId} – not found", async ({ api }) => {
   expect(await api.delete(`/api/bounties/${unknownBountyId}`)).toEqual(
-    notFound(unknownBountyId),
+    apiError({
+      code: "not_found",
+      message: `Bounty ${unknownBountyId} not found.`,
+    }),
   );
 });
diff --git a/apps/web/playwright/api/campaigns/campaigns.spec.ts b/apps/web/playwright/api/campaigns/campaigns.spec.ts
new file mode 100644
index 00000000000..1dc13870860
--- /dev/null
+++ b/apps/web/playwright/api/campaigns/campaigns.spec.ts
@@ -0,0 +1,695 @@
+import { DEFAULT_CAMPAIGN_BODY } from "@/lib/api/campaigns/constants";
+import { EMAIL_TEMPLATE_VARIABLES } from "@/lib/zod/schemas/campaigns";
+import { expect } from "@playwright/test";
+import type { CampaignType } from "@prisma/client";
+import { apiError, randomName } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import {
+  campaignContent,
+  createCampaign,
+  createPartnerTag,
+  defaultTransactionalTriggers,
+  deleteCampaign,
+  deletePartnerTag,
+  mentionBodyJson,
+  multipleTriggerConditions,
+  type CampaignJson,
+} from "./helpers";
+
+function defaultCampaign(type: CampaignType) {
+  return {
+    id: expect.any(String),
+    name: "Untitled",
+    subject: "",
+    preview: null,
+    from: null,
+    bodyJson: DEFAULT_CAMPAIGN_BODY,
+    type,
+    status: "draft",
+    triggerConditions:
+      type === "transactional" ? [...defaultTransactionalTriggers] : null,
+    groups: [],
+    partnerTags: [],
+    scheduledAt: null,
+    createdAt: expect.any(String),
+    updatedAt: expect.any(String),
+  };
+}
+
+async function createDraft(
+  api: ApiClient,
+  type: CampaignType = "transactional",
+) {
+  const { status, data } = await createCampaign(api, type);
+  expect(status).toEqual(201);
+  return data.id;
+}
+
+test("POST /campaigns – transactional", async ({ api }) => {
+  let id: string | undefined;
+
+  try {
+    const { status, data } = await api.post<{ id: string }>("/api/campaigns", {
+      type: "transactional",
+    });
+    id = data.id;
+
+    expect(status).toEqual(201);
+    expect(data).toStrictEqual({
+      id: expect.any(String),
+    });
+
+    const { status: getStatus, data: campaign } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+
+    expect(getStatus).toEqual(200);
+    expect(campaign).toStrictEqual(defaultCampaign("transactional"));
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("POST /campaigns – marketing", async ({ api }) => {
+  let id: string | undefined;
+
+  try {
+    const { status, data } = await createCampaign(api, "marketing");
+    id = data.id;
+
+    expect(status).toEqual(201);
+    expect(data).toStrictEqual({
+      id: expect.any(String),
+    });
+
+    const { data: campaign } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+
+    expect(campaign).toStrictEqual(defaultCampaign("marketing"));
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – update transactional content", async ({
+  api,
+  program,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+
+    const triggerConditions = [
+      {
+        attribute: "totalConversions",
+        operator: "gte",
+        value: 50,
+      },
+    ] as const;
+
+    const body = campaignContent({
+      triggerConditions,
+      groupIds: [program.defaultGroupId],
+    });
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      body,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({
+      ...defaultCampaign("transactional"),
+      id,
+      name: body.name,
+      subject: body.subject,
+      bodyJson: body.bodyJson,
+      triggerConditions,
+      groups: [{ id: program.defaultGroupId }],
+    });
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – update marketing content", async ({
+  api,
+  program,
+}) => {
+  let id: string | undefined;
+  const scheduledAt = "2026-12-01T00:00:00.000Z";
+
+  try {
+    id = await createDraft(api, "marketing");
+    const body = campaignContent({
+      groupIds: [program.defaultGroupId],
+      scheduledAt,
+      triggerConditions: [...multipleTriggerConditions],
+    });
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      body,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toMatchObject({
+      id,
+      type: "marketing",
+      name: body.name,
+      subject: body.subject,
+      bodyJson: body.bodyJson,
+      triggerConditions: null,
+      groups: [{ id: program.defaultGroupId }],
+      partnerTags: [],
+    });
+    expect(data.scheduledAt).toEqual(scheduledAt);
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – transactional ignores scheduledAt", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+
+    const { data } = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      scheduledAt: "2026-12-01T00:00:00.000Z",
+    });
+
+    expect(data.scheduledAt).toBeNull();
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("GET /campaigns/:id", async ({ api }) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+
+    const { status, data } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({
+      ...defaultCampaign("transactional"),
+      id,
+    });
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("GET /campaigns – list by search", async ({ api }) => {
+  let id: string | undefined;
+  const name = randomName("campaign");
+
+  try {
+    id = await createDraft(api);
+    await api.patch(`/api/campaigns/${id}`, { name });
+
+    const { status, data: campaigns } = await api.get<CampaignJson[]>(
+      `/api/campaigns?search=${encodeURIComponent(name)}`,
+    );
+
+    expect(status).toEqual(200);
+
+    const { data: fetched } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+
+    expect(campaigns.find((campaign) => campaign.id === id)).toStrictEqual(
+      fetched,
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – transactional status draft → active → paused → active", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+
+    const published = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      status: "active",
+    });
+    expect(published.status).toEqual(200);
+    expect(published.data.status).toEqual("active");
+
+    const paused = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      status: "paused",
+    });
+    expect(paused.status).toEqual(200);
+    expect(paused.data.status).toEqual("paused");
+
+    const resumed = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      status: "active",
+    });
+    expect(resumed.status).toEqual(200);
+    expect(resumed.data.status).toEqual("active");
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – marketing status draft → scheduled → canceled", async ({
+  api,
+}) => {
+  let id: string | undefined;
+  const scheduledAt = new Date(Date.now() + 60 * 60 * 1000).toISOString();
+
+  try {
+    id = await createDraft(api, "marketing");
+
+    const scheduled = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      status: "scheduled",
+      scheduledAt,
+    });
+    expect(scheduled.status).toEqual(200);
+    expect(scheduled.data.status).toEqual("scheduled");
+
+    const canceled = await api.patch<CampaignJson>(`/api/campaigns/${id}`, {
+      status: "canceled",
+    });
+    expect(canceled.status).toEqual(200);
+    expect(canceled.data.status).toEqual("canceled");
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("POST /campaigns/:id/duplicate – transactional", async ({
+  api,
+  program,
+}) => {
+  let id: string | undefined;
+  let duplicateId: string | undefined;
+  let partnerTagId: string | undefined;
+
+  const bodyJson = mentionBodyJson(EMAIL_TEMPLATE_VARIABLES);
+  const triggerConditions = [...multipleTriggerConditions];
+
+  try {
+    const partnerTag = await createPartnerTag(program.id);
+    partnerTagId = partnerTag.id;
+
+    const body = campaignContent({
+      triggerConditions,
+      groupIds: [program.defaultGroupId],
+      partnerTagIds: [partnerTag.id],
+      bodyJson,
+    });
+
+    id = await createDraft(api);
+    await api.patch(`/api/campaigns/${id}`, body);
+
+    const { status, data } = await api.post<{ id: string }>(
+      `/api/campaigns/${id}/duplicate`,
+    );
+    duplicateId = data.id;
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({
+      id: expect.any(String),
+    });
+
+    const { data: duplicated } = await api.get<CampaignJson>(
+      `/api/campaigns/${duplicateId}`,
+    );
+
+    expect(duplicated).toStrictEqual({
+      ...defaultCampaign("transactional"),
+      id: duplicateId,
+      name: `${body.name} (copy)`,
+      subject: body.subject,
+      bodyJson,
+      triggerConditions,
+      groups: [{ id: program.defaultGroupId }],
+      partnerTags: [{ id: partnerTag.id }],
+      status: "draft",
+    });
+  } finally {
+    await deleteCampaign(api, duplicateId);
+    await deleteCampaign(api, id);
+    await deletePartnerTag(partnerTagId);
+  }
+});
+
+test("POST /campaigns/:id/duplicate – marketing", async ({ api }) => {
+  let id: string | undefined;
+  let duplicateId: string | undefined;
+  const body = campaignContent();
+
+  try {
+    id = await createDraft(api, "marketing");
+    await api.patch(`/api/campaigns/${id}`, body);
+
+    const { status, data } = await api.post<{ id: string }>(
+      `/api/campaigns/${id}/duplicate`,
+    );
+    duplicateId = data.id;
+
+    expect(status).toEqual(200);
+
+    const { data: duplicated } = await api.get<CampaignJson>(
+      `/api/campaigns/${duplicateId}`,
+    );
+
+    expect(duplicated).toMatchObject({
+      id: duplicateId,
+      type: "marketing",
+      name: `${body.name} (copy)`,
+      subject: body.subject,
+      bodyJson: body.bodyJson,
+      triggerConditions: null,
+      partnerTags: [],
+      status: "draft",
+    });
+  } finally {
+    await deleteCampaign(api, duplicateId);
+    await deleteCampaign(api, id);
+  }
+});
+
+test("DELETE /campaigns/:id", async ({ api }) => {
+  const id = await createDraft(api);
+
+  const { status, data } = await api.delete<{ id: string }>(
+    `/api/campaigns/${id}`,
+  );
+
+  expect(status).toEqual(200);
+  expect(data).toStrictEqual({ id });
+  expect(await api.get(`/api/campaigns/${id}`)).toEqual(
+    apiError({
+      code: "not_found",
+      message: "Campaign not found.",
+    }),
+  );
+});
+
+const errorCases = [
+  {
+    name: "POST /campaigns – missing type",
+    body: {},
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        'invalid_value: type: Invalid option: expected one of "marketing"|"transactional"',
+    }),
+  },
+  {
+    name: "POST /campaigns – invalid type",
+    body: { type: "invalid" },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        'invalid_value: type: Invalid option: expected one of "marketing"|"transactional"',
+    }),
+  },
+];
+
+for (const { name, body, expected } of errorCases) {
+  test(name, async ({ api }) => {
+    expect(await api.post("/api/campaigns", body)).toEqual(expected);
+  });
+}
+
+test("GET /campaigns/:id – not found", async ({ api }) => {
+  expect(await api.get("/api/campaigns/cmp_does_not_exist")).toEqual(
+    apiError({
+      code: "not_found",
+      message: "Campaign not found.",
+    }),
+  );
+});
+
+test("PATCH /campaigns/:id – marketing draft cannot become active", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api, "marketing");
+    expect(
+      await api.patch(`/api/campaigns/${id}`, { status: "active" }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "A draft campaign can't be moved to active.",
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – transactional draft cannot become scheduled", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+    expect(
+      await api.patch(`/api/campaigns/${id}`, { status: "scheduled" }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "A draft campaign can't be moved to scheduled.",
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – with valid partnerTagIds", async ({
+  api,
+  program,
+}) => {
+  let id: string | undefined;
+  let partnerTagId: string | undefined;
+
+  try {
+    const partnerTag = await createPartnerTag(program.id);
+    partnerTagId = partnerTag.id;
+    id = await createDraft(api);
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      {
+        groupIds: [program.defaultGroupId],
+        partnerTagIds: [partnerTag.id],
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.groups).toEqual([{ id: program.defaultGroupId }]);
+    expect(data.partnerTags).toEqual([{ id: partnerTag.id }]);
+  } finally {
+    await deleteCampaign(api, id);
+    await deletePartnerTag(partnerTagId);
+  }
+});
+
+test("PATCH /campaigns/:id – clear partner tags", async ({ api, program }) => {
+  let id: string | undefined;
+  let partnerTagId: string | undefined;
+
+  try {
+    const partnerTag = await createPartnerTag(program.id);
+    partnerTagId = partnerTag.id;
+    id = await createDraft(api);
+
+    const { data: withTags } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      { partnerTagIds: [partnerTag.id] },
+    );
+    expect(withTags.partnerTags).toEqual([{ id: partnerTag.id }]);
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      { partnerTagIds: null },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.partnerTags).toEqual([]);
+  } finally {
+    await deleteCampaign(api, id);
+    await deletePartnerTag(partnerTagId);
+  }
+});
+
+test("PATCH /campaigns/:id – invalid partner tag IDs", async ({ api }) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+    expect(
+      await api.patch(`/api/campaigns/${id}`, {
+        partnerTagIds: ["invalid-partner-tag-id"],
+      }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "Invalid partner tag IDs detected: invalid-partner-tag-id",
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – multiple trigger conditions", async ({ api }) => {
+  let id: string | undefined;
+  const triggerConditions = [...multipleTriggerConditions];
+
+  try {
+    id = await createDraft(api);
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      { triggerConditions },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.triggerConditions).toEqual(triggerConditions);
+
+    const { data: fetched } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+    expect(fetched.triggerConditions).toEqual(triggerConditions);
+
+    const { status: listStatus, data: campaigns } = await api.get<
+      CampaignJson[]
+    >(
+      `/api/campaigns?triggerConditions=${encodeURIComponent(JSON.stringify(triggerConditions))}`,
+    );
+
+    expect(listStatus).toEqual(200);
+    expect(campaigns.find((campaign) => campaign.id === id)).toMatchObject({
+      id,
+      triggerConditions,
+    });
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – duplicate trigger condition attribute", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+    expect(
+      await api.patch(`/api/campaigns/${id}`, {
+        triggerConditions: [
+          { attribute: "totalConversions", operator: "gte", value: 50 },
+          { attribute: "totalConversions", operator: "lte", value: 100 },
+        ],
+      }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "Each activity can only be used once in the campaign logic.",
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – exclusive trigger condition cannot mix", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+    expect(
+      await api.patch(`/api/campaigns/${id}`, {
+        triggerConditions: [
+          { attribute: "partnerJoined", operator: "gte", value: 0 },
+          { attribute: "totalConversions", operator: "gte", value: 50 },
+        ],
+      }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          'Campaign logic with "joins the program" cannot include other conditions.',
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – triggerConditions must be an array", async ({
+  api,
+}) => {
+  let id: string | undefined;
+
+  try {
+    id = await createDraft(api);
+    expect(
+      await api.patch(`/api/campaigns/${id}`, {
+        triggerConditions: {
+          attribute: "totalConversions",
+          operator: "gte",
+          value: 50,
+        },
+      }),
+    ).toEqual(
+      apiError({
+        code: "unprocessable_entity",
+        message:
+          "invalid_type: triggerConditions: Invalid input: expected array, received object",
+      }),
+    );
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
+
+test("PATCH /campaigns/:id – email template variables in bodyJson", async ({
+  api,
+}) => {
+  let id: string | undefined;
+  const bodyJson = mentionBodyJson(EMAIL_TEMPLATE_VARIABLES);
+
+  try {
+    id = await createDraft(api);
+
+    const { status, data } = await api.patch<CampaignJson>(
+      `/api/campaigns/${id}`,
+      { bodyJson },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.bodyJson).toEqual(bodyJson);
+
+    const { data: fetched } = await api.get<CampaignJson>(
+      `/api/campaigns/${id}`,
+    );
+    expect(fetched.bodyJson).toEqual(bodyJson);
+  } finally {
+    await deleteCampaign(api, id);
+  }
+});
diff --git a/apps/web/playwright/api/campaigns/helpers.ts b/apps/web/playwright/api/campaigns/helpers.ts
new file mode 100644
index 00000000000..385fd4ca207
--- /dev/null
+++ b/apps/web/playwright/api/campaigns/helpers.ts
@@ -0,0 +1,95 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { Campaign } from "@/lib/types";
+import type { CampaignType } from "@prisma/client";
+import { randomName } from "../../utils";
+import type { ApiClient } from "../fixtures";
+
+export type CampaignJson = Omit<
+  Campaign,
+  "scheduledAt" | "createdAt" | "updatedAt"
+> & {
+  scheduledAt: string | null;
+  createdAt: string;
+  updatedAt: string;
+};
+
+export const defaultTransactionalTriggers = [
+  {
+    attribute: "partnerJoined",
+    operator: "gte",
+    value: 0,
+  },
+] as const;
+
+export const multipleTriggerConditions = [
+  {
+    attribute: "totalConversions",
+    operator: "gte",
+    value: 50,
+  },
+  {
+    attribute: "totalLeads",
+    operator: "gte",
+    value: 10,
+  },
+] as const;
+
+export function campaignContent(overrides: Record<string, unknown> = {}) {
+  return {
+    name: randomName("campaign"),
+    subject: randomName("subject"),
+    bodyJson: {
+      type: "doc",
+      content: [
+        {
+          type: "paragraph",
+          content: [{ type: "text", text: "Test campaign body" }],
+        },
+      ],
+    },
+    ...overrides,
+  };
+}
+
+export function mentionBodyJson(ids: readonly string[]) {
+  return {
+    type: "doc",
+    content: [
+      {
+        type: "paragraph",
+        content: ids.map((id) => ({
+          type: "mention",
+          attrs: { id },
+        })),
+      },
+    ],
+  };
+}
+
+export async function createCampaign(
+  api: ApiClient,
+  type: CampaignType = "transactional",
+) {
+  return api.post<{ id: string }>("/api/campaigns", { type });
+}
+
+export async function deleteCampaign(api: ApiClient, id: string | undefined) {
+  if (!id) return;
+  await api.delete(`/api/campaigns/${id}`);
+}
+
+export async function createPartnerTag(programId: string) {
+  return prisma.partnerTag.create({
+    data: {
+      id: createId({ prefix: "ptag_" }),
+      programId,
+      name: randomName("tag"),
+    },
+  });
+}
+
+export async function deletePartnerTag(id: string | undefined) {
+  if (!id) return;
+  await prisma.partnerTag.delete({ where: { id } });
+}
diff --git a/apps/web/playwright/api/campaigns/send-campaign-workflow-fixtures.ts b/apps/web/playwright/api/campaigns/send-campaign-workflow-fixtures.ts
new file mode 100644
index 00000000000..8a30573ccb5
--- /dev/null
+++ b/apps/web/playwright/api/campaigns/send-campaign-workflow-fixtures.ts
@@ -0,0 +1,13 @@
+import { test as base } from "../fixtures";
+import {
+  createCampaignSession,
+  type CampaignSession,
+} from "./send-campaign-workflow-helpers";
+
+export const test = base.extend<{ campaign: CampaignSession }>({
+  campaign: async ({ api, program }, use) => {
+    const session = createCampaignSession(api, program);
+    await use(session);
+    await session.cleanup();
+  },
+});
diff --git a/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts b/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts
new file mode 100644
index 00000000000..74f7132e663
--- /dev/null
+++ b/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts
@@ -0,0 +1,484 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { EnrolledPartnerProps } from "@/lib/types";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { subHours } from "date-fns";
+import { randomName, randomPartnerEmail } from "../../utils";
+import { PLAYWRIGHT_API_BASE } from "../constants";
+import type { ApiClient } from "../fixtures";
+import { deletePartnerData } from "../partners/helpers";
+import {
+  campaignContent,
+  createCampaign,
+  createPartnerTag,
+  deleteCampaign,
+  deletePartnerTag,
+} from "./helpers";
+
+export const enrolledDaysCondition = {
+  attribute: "partnerEnrolledDays",
+  operator: "gte",
+  value: 1,
+} as const;
+
+export async function publishTransactionalCampaign(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  const { status, data } = await createCampaign(api);
+  expect(status).toEqual(201);
+
+  const patched = await api.patch(`/api/campaigns/${data.id}`, {
+    ...campaignContent({
+      triggerConditions: [enrolledDaysCondition],
+      ...overrides,
+    }),
+    status: "active",
+    ...overrides,
+  });
+
+  expect(patched.status).toEqual(200);
+  return data.id;
+}
+
+export async function getCampaignWorkflow(campaignId: string) {
+  return prisma.workflow.findFirstOrThrow({
+    where: {
+      campaign: {
+        id: campaignId,
+      },
+    },
+  });
+}
+
+export async function runScheduledCampaignWorkflow(workflowId: string) {
+  const response = await fetch(
+    `${PLAYWRIGHT_API_BASE}/api/cron/workflows/${workflowId}`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: "{}",
+    },
+  );
+  const message = await response.text();
+
+  expect(response.status).toEqual(200);
+
+  if (message.includes("disabled")) {
+    return "disabled";
+  }
+
+  if (message.includes("not found")) {
+    return "not found";
+  }
+
+  return "finished";
+}
+
+export async function createTestPartner(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  const { status, data } = await api.post<EnrolledPartnerProps>(
+    "/api/partners",
+    {
+      name: randomName("partner"),
+      email: randomPartnerEmail(),
+      ...overrides,
+    },
+  );
+
+  expect(status).toEqual(201);
+  return data;
+}
+
+export async function createPartnerMailbox(partnerId: string) {
+  const partner = await prisma.partner.findUniqueOrThrow({
+    where: { id: partnerId },
+    select: { email: true, name: true },
+  });
+
+  const user = await prisma.user.create({
+    data: {
+      id: createId({ prefix: "user_" }),
+      email: partner.email!,
+      name: partner.name,
+      emailVerified: new Date(),
+      defaultPartnerId: partnerId,
+    },
+  });
+
+  await prisma.partnerUser.create({
+    data: {
+      userId: user.id,
+      partnerId,
+      role: "owner",
+      notificationPreferences: {
+        create: {},
+      },
+    },
+  });
+
+  return user.id;
+}
+
+export async function backdateEnrollment({
+  partnerId,
+  programId,
+  hoursAgo,
+}: {
+  partnerId: string;
+  programId: string;
+  hoursAgo: number;
+}) {
+  await prisma.programEnrollment.update({
+    where: {
+      partnerId_programId: {
+        partnerId,
+        programId,
+      },
+    },
+    data: {
+      createdAt: subHours(new Date(), hoursAgo),
+    },
+  });
+}
+
+export async function setEnrollmentStatus({
+  partnerId,
+  programId,
+  status,
+}: {
+  partnerId: string;
+  programId: string;
+  status: "pending" | "approved" | "banned";
+}) {
+  await prisma.programEnrollment.update({
+    where: {
+      partnerId_programId: {
+        partnerId,
+        programId,
+      },
+    },
+    data: { status },
+  });
+}
+
+export async function setLinkStats({
+  partnerId,
+  programId,
+  leads,
+  conversions,
+  saleAmount,
+}: {
+  partnerId: string;
+  programId: string;
+  leads?: number;
+  conversions?: number;
+  saleAmount?: number;
+}) {
+  const link = await prisma.link.findFirst({
+    where: { partnerId, programId },
+    orderBy: { id: "asc" },
+    select: { id: true },
+  });
+
+  expect(link).not.toBeNull();
+
+  await prisma.link.update({
+    where: { id: link!.id },
+    data: {
+      ...(leads !== undefined && { leads }),
+      ...(conversions !== undefined && { conversions }),
+      ...(saleAmount !== undefined && { saleAmount }),
+    },
+  });
+}
+
+export async function createTestCommission({
+  programId,
+  partnerId,
+  earnings,
+}: {
+  programId: string;
+  partnerId: string;
+  earnings: number;
+}) {
+  return prisma.commission.create({
+    data: {
+      id: createId({ prefix: "cm_" }),
+      programId,
+      partnerId,
+      type: "sale",
+      amount: earnings,
+      quantity: 1,
+      earnings,
+      status: "pending",
+    },
+  });
+}
+
+export async function tagPartner({
+  programId,
+  partnerId,
+  partnerTagId,
+}: {
+  programId: string;
+  partnerId: string;
+  partnerTagId: string;
+}) {
+  await prisma.programPartnerTag.create({
+    data: {
+      programId,
+      partnerId,
+      partnerTagId,
+    },
+  });
+}
+
+export async function insertCampaignEmail({
+  campaignId,
+  programId,
+  partnerId,
+  recipientUserId,
+}: {
+  campaignId: string;
+  programId: string;
+  partnerId: string;
+  recipientUserId: string;
+}) {
+  return prisma.notificationEmail.create({
+    data: {
+      id: createId({ prefix: "em_" }),
+      type: "Campaign",
+      emailId: `pw_${nanoid()}`,
+      campaignId,
+      programId,
+      partnerId,
+      recipientUserId,
+    },
+  });
+}
+
+export async function campaignEmails(campaignId: string, partnerId?: string) {
+  return prisma.notificationEmail.findMany({
+    where: {
+      campaignId,
+      type: "Campaign",
+      ...(partnerId && { partnerId }),
+    },
+  });
+}
+
+export async function expectCampaignEmailCount({
+  campaignId,
+  partnerId,
+  count,
+}: {
+  campaignId: string;
+  partnerId?: string;
+  count: number;
+}) {
+  if (count === 0) {
+    const emails = await campaignEmails(campaignId, partnerId);
+    expect(
+      emails,
+      "did not expect a campaign NotificationEmail",
+    ).toHaveLength(0);
+    return emails;
+  }
+
+  // Event-triggered sends run in waitUntil after /api/track/lead returns.
+  let emails: Awaited<ReturnType<typeof campaignEmails>> = [];
+  await expect
+    .poll(
+      async () => {
+        emails = await campaignEmails(campaignId, partnerId);
+        return emails.length;
+      },
+      {
+        message:
+          "expected a campaign NotificationEmail (SMTP/MailHog or Resend must be configured)",
+      },
+    )
+    .toBe(count);
+
+  return emails;
+}
+
+export async function createTestGroup(api: ApiClient) {
+  const slug = `g-${nanoid(8).toLowerCase()}`;
+  const { status, data } = await api.post<{ id: string }>("/api/groups", {
+    name: randomName("group"),
+    slug,
+    color: "blue",
+  });
+
+  expect(status).toEqual(201);
+  return data.id;
+}
+
+export async function deleteTestGroup(api: ApiClient, id: string | undefined) {
+  if (!id) return;
+  await api.delete(`/api/groups/${id}`);
+}
+
+export async function deleteTestPartner(partnerId: string | undefined) {
+  if (!partnerId) return;
+
+  const partnerUsers = await prisma.partnerUser.findMany({
+    where: { partnerId },
+    select: { userId: true },
+  });
+
+  await prisma.programPartnerTag.deleteMany({
+    where: { partnerId },
+  });
+
+  if (partnerUsers.length > 0) {
+    await prisma.user.deleteMany({
+      where: {
+        id: {
+          in: partnerUsers.map((row) => row.userId),
+        },
+      },
+    });
+  }
+
+  await deletePartnerData(partnerId);
+
+  // Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
+  // bulkDeletePartners cleanup used by e2e cron. Use Prisma so cleanup hits
+  // DATABASE_URL, not PLANETSCALE_DATABASE_URL.
+  await prisma.$executeRaw`DELETE FROM Partner WHERE id = ${partnerId}`;
+}
+
+export async function cleanupCampaign(api: ApiClient, campaignId?: string) {
+  if (!campaignId) return;
+  await prisma.notificationEmail.deleteMany({
+    where: { campaignId },
+  });
+  await deleteCampaign(api, campaignId);
+}
+
+type CreatePartnerOptions = {
+  mailbox?: boolean;
+  hoursAgo?: number | null;
+  groupId?: string;
+};
+
+export function createCampaignSession(
+  api: ApiClient,
+  program: { id: string; defaultGroupId: string },
+) {
+  const partnerIds: string[] = [];
+  const campaignIds: string[] = [];
+  const groupIds: string[] = [];
+  const tagIds: string[] = [];
+  const programId = program.id;
+
+  return {
+    programId,
+    defaultGroupId: program.defaultGroupId,
+
+    trackPartner(partnerId: string) {
+      partnerIds.push(partnerId);
+    },
+
+    trackCampaign(campaignId: string) {
+      campaignIds.push(campaignId);
+    },
+
+    async createGroup() {
+      const groupId = await createTestGroup(api);
+      groupIds.push(groupId);
+      return groupId;
+    },
+
+    async createTag() {
+      const tag = await createPartnerTag(programId);
+      tagIds.push(tag.id);
+      return tag;
+    },
+
+    async setup(overrides: Record<string, unknown> = {}) {
+      const campaignId = await publishTransactionalCampaign(api, overrides);
+      campaignIds.push(campaignId);
+      const workflow = await getCampaignWorkflow(campaignId);
+
+      return {
+        id: campaignId,
+        workflow,
+
+        async createPartner(options: CreatePartnerOptions = {}) {
+          const partner = await createTestPartner(api, {
+            ...(options.groupId && { groupId: options.groupId }),
+          });
+          partnerIds.push(partner.id);
+
+          if (options.mailbox !== false) {
+            await createPartnerMailbox(partner.id);
+          }
+
+          if (options.hoursAgo !== null) {
+            await backdateEnrollment({
+              partnerId: partner.id,
+              programId,
+              hoursAgo: options.hoursAgo ?? 18,
+            });
+          }
+
+          return partner;
+        },
+
+        async run() {
+          return runScheduledCampaignWorkflow(workflow.id);
+        },
+
+        async expectSentTo(partner: Pick<EnrolledPartnerProps, "id">) {
+          await expectCampaignEmailCount({
+            campaignId,
+            partnerId: partner.id,
+            count: 1,
+          });
+        },
+
+        async expectNotSentTo(partner: Pick<EnrolledPartnerProps, "id">) {
+          await expectCampaignEmailCount({
+            campaignId,
+            partnerId: partner.id,
+            count: 0,
+          });
+        },
+
+        async disableWorkflow() {
+          await prisma.workflow.update({
+            where: { id: workflow.id },
+            data: { disabledAt: new Date() },
+          });
+        },
+      };
+    },
+
+    async cleanup() {
+      for (const partnerId of partnerIds) {
+        await deleteTestPartner(partnerId);
+      }
+      for (const campaignId of campaignIds) {
+        await cleanupCampaign(api, campaignId);
+      }
+      for (const tagId of tagIds) {
+        await deletePartnerTag(tagId);
+      }
+      for (const groupId of groupIds) {
+        await deleteTestGroup(api, groupId);
+      }
+    },
+  };
+}
+
+export type CampaignSession = ReturnType<typeof createCampaignSession>;
+export type ScheduledCampaign = Awaited<
+  ReturnType<CampaignSession["setup"]>
+>;
diff --git a/apps/web/playwright/api/campaigns/send-campaign-workflow.spec.ts b/apps/web/playwright/api/campaigns/send-campaign-workflow.spec.ts
new file mode 100644
index 00000000000..d3d896b130f
--- /dev/null
+++ b/apps/web/playwright/api/campaigns/send-campaign-workflow.spec.ts
@@ -0,0 +1,384 @@
+import { prisma } from "@/lib/prisma";
+import { expect } from "@playwright/test";
+import { trackClick, trackLead } from "../conversions/helpers";
+import { createCampaign } from "./helpers";
+import { test } from "./send-campaign-workflow-fixtures";
+import {
+  campaignEmails,
+  createTestCommission,
+  enrolledDaysCondition,
+  getCampaignWorkflow,
+  insertCampaignEmail,
+  runScheduledCampaignWorkflow,
+  setEnrollmentStatus,
+  setLinkStats,
+  tagPartner,
+} from "./send-campaign-workflow-helpers";
+
+test.describe("Lifecycle", () => {
+  test("transactional draft workflow is disabled", async ({
+    api,
+    campaign,
+  }) => {
+    const { status, data } = await createCampaign(api);
+    expect(status).toEqual(201);
+    campaign.trackCampaign(data.id);
+
+    const workflow = await getCampaignWorkflow(data.id);
+    expect(workflow.disabledAt).not.toBeNull();
+    expect(workflow.actions).toEqual([
+      {
+        type: "sendCampaign",
+        data: { campaignId: data.id },
+      },
+    ]);
+  });
+
+  test("publishing a transactional campaign enables the workflow", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+
+    expect(ctx.workflow.disabledAt).toBeNull();
+    expect(ctx.workflow.triggerConditions).toEqual([enrolledDaysCondition]);
+    expect(ctx.workflow.actions).toEqual([
+      {
+        type: "sendCampaign",
+        data: { campaignId: ctx.id },
+      },
+    ]);
+  });
+
+  test("pausing a campaign disables the workflow", async ({
+    api,
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+
+    const paused = await api.patch(`/api/campaigns/${ctx.id}`, {
+      status: "paused",
+    });
+    expect(paused.status).toEqual(200);
+
+    const workflow = await getCampaignWorkflow(ctx.id);
+    expect(workflow.disabledAt).not.toBeNull();
+  });
+
+  test("draft and paused campaigns do not send", async ({ api, campaign }) => {
+    const { data: draft } = await createCampaign(api);
+    campaign.trackCampaign(draft.id);
+    await api.patch(`/api/campaigns/${draft.id}`, {
+      triggerConditions: [enrolledDaysCondition],
+    });
+
+    const paused = await campaign.setup();
+    await api.patch(`/api/campaigns/${paused.id}`, { status: "paused" });
+
+    const partner = await paused.createPartner();
+    const draftWorkflow = await getCampaignWorkflow(draft.id);
+
+    expect(await runScheduledCampaignWorkflow(draftWorkflow.id)).toEqual(
+      "disabled",
+    );
+    expect(await paused.run()).toEqual("disabled");
+    await paused.expectNotSentTo(partner);
+    expect(await campaignEmails(draft.id, partner.id)).toHaveLength(0);
+  });
+});
+
+test.describe("Scheduled window and recipients", () => {
+  test("scheduled run skips a disabled workflow", async ({ campaign }) => {
+    const ctx = await campaign.setup();
+    const partner = await ctx.createPartner();
+    await ctx.disableWorkflow();
+
+    expect(await ctx.run()).toEqual("disabled");
+    await ctx.expectNotSentTo(partner);
+  });
+
+  test("scheduled window only includes enrollments from 12–24h ago", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+    const tooRecent = await ctx.createPartner({ hoursAgo: 6 });
+    const inWindow = await ctx.createPartner({ hoursAgo: 18 });
+    const tooOld = await ctx.createPartner({ hoursAgo: 30 });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectNotSentTo(tooRecent);
+    await ctx.expectSentTo(inWindow);
+    await ctx.expectNotSentTo(tooOld);
+  });
+
+  test("scheduled run skips eligible partners without a partner user", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+    const partner = await ctx.createPartner({ mailbox: false });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectNotSentTo(partner);
+  });
+
+  test("scheduled run does not send duplicate campaign emails", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+    const partner = await ctx.createPartner();
+
+    expect(await ctx.run()).toEqual("finished");
+    expect(await ctx.run()).toEqual("finished");
+
+    const emails = await campaignEmails(ctx.id, partner.id);
+    expect(emails).toHaveLength(1);
+    expect(emails[0].type).toEqual("Campaign");
+  });
+
+  test("scheduled run skips partners who already received the campaign", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup();
+    const partner = await ctx.createPartner();
+    const mailbox = await prisma.partnerUser.findFirstOrThrow({
+      where: { partnerId: partner.id },
+      select: { userId: true },
+    });
+
+    const existing = await insertCampaignEmail({
+      campaignId: ctx.id,
+      programId: campaign.programId,
+      partnerId: partner.id,
+      recipientUserId: mailbox.userId,
+    });
+
+    expect(await ctx.run()).toEqual("finished");
+
+    const emails = await campaignEmails(ctx.id, partner.id);
+    expect(emails).toHaveLength(1);
+    expect(emails[0].id).toEqual(existing.id);
+  });
+});
+
+test.describe("Scheduled AND conditions", () => {
+  const scheduledAndCases = [
+    {
+      title: "sends when enrollment window and leads match",
+      condition: { attribute: "totalLeads", operator: "gte", value: 1 },
+      sent: true,
+      seed: (partner, programId) =>
+        setLinkStats({
+          partnerId: partner.id,
+          programId,
+          leads: 1,
+        }),
+    },
+    {
+      title: "does not send when the metric condition fails",
+      condition: { attribute: "totalLeads", operator: "gte", value: 1 },
+      sent: false,
+    },
+    {
+      title: "sends when totalLeads lte 0",
+      condition: { attribute: "totalLeads", operator: "lte", value: 0 },
+      sent: true,
+    },
+    {
+      title: "sends when totalConversions matches",
+      condition: {
+        attribute: "totalConversions",
+        operator: "gte",
+        value: 1,
+      },
+      sent: true,
+      seed: (partner, programId) =>
+        setLinkStats({
+          partnerId: partner.id,
+          programId,
+          conversions: 1,
+        }),
+    },
+    {
+      title: "sends when totalSaleAmount matches",
+      condition: {
+        attribute: "totalSaleAmount",
+        operator: "gte",
+        value: 100,
+      },
+      sent: true,
+      seed: (partner, programId) =>
+        setLinkStats({
+          partnerId: partner.id,
+          programId,
+          saleAmount: 100,
+        }),
+    },
+    {
+      title: "sends when totalCommissions matches",
+      condition: {
+        attribute: "totalCommissions",
+        operator: "gte",
+        value: 1,
+      },
+      sent: true,
+      seed: async (partner, programId) => {
+        await createTestCommission({
+          programId,
+          partnerId: partner.id,
+          earnings: 500,
+        });
+      },
+    },
+  ];
+
+  for (const { title, condition, sent, seed } of scheduledAndCases) {
+    test(`scheduled AND ${title}`, async ({ campaign }) => {
+      const ctx = await campaign.setup({
+        triggerConditions: [enrolledDaysCondition, condition],
+      });
+      const partner = await ctx.createPartner();
+      await seed?.(partner, campaign.programId);
+
+      expect(await ctx.run()).toEqual("finished");
+      if (sent) {
+        await ctx.expectSentTo(partner);
+      } else {
+        await ctx.expectNotSentTo(partner);
+      }
+    });
+  }
+});
+
+test.describe("Audience", () => {
+  test("group filter only sends to partners in selected groups", async ({
+    campaign,
+  }) => {
+    const groupId = await campaign.createGroup();
+    const ctx = await campaign.setup({ groupIds: [groupId] });
+    const inGroup = await ctx.createPartner({ groupId });
+    const outGroup = await ctx.createPartner({
+      groupId: campaign.defaultGroupId,
+    });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectSentTo(inGroup);
+    await ctx.expectNotSentTo(outGroup);
+  });
+
+  test("partner tag filter only sends to tagged partners", async ({
+    campaign,
+  }) => {
+    const tag = await campaign.createTag();
+    const ctx = await campaign.setup({ partnerTagIds: [tag.id] });
+    const tagged = await ctx.createPartner();
+    await tagPartner({
+      programId: campaign.programId,
+      partnerId: tagged.id,
+      partnerTagId: tag.id,
+    });
+    const untagged = await ctx.createPartner();
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectSentTo(tagged);
+    await ctx.expectNotSentTo(untagged);
+  });
+
+  test("group and tag filters both have to match", async ({ campaign }) => {
+    const groupId = await campaign.createGroup();
+    const tag = await campaign.createTag();
+    const ctx = await campaign.setup({
+      groupIds: [groupId],
+      partnerTagIds: [tag.id],
+    });
+    const partner = await ctx.createPartner({ groupId });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectNotSentTo(partner);
+
+    await tagPartner({
+      programId: campaign.programId,
+      partnerId: partner.id,
+      partnerTagId: tag.id,
+    });
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectSentTo(partner);
+  });
+
+  test("non-approved enrollments are not sent", async ({ campaign }) => {
+    const ctx = await campaign.setup();
+    const partner = await ctx.createPartner();
+    await setEnrollmentStatus({
+      partnerId: partner.id,
+      programId: campaign.programId,
+      status: "pending",
+    });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectNotSentTo(partner);
+  });
+});
+
+test.describe("Event path", () => {
+  test("partnerJoined does not send on the scheduled runner", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup({
+      triggerConditions: [
+        { attribute: "partnerJoined", operator: "gte", value: 0 },
+      ],
+    });
+    const partner = await ctx.createPartner({ hoursAgo: null });
+
+    expect(await ctx.run()).toEqual("finished");
+    await ctx.expectNotSentTo(partner);
+  });
+
+  test("leadRecorded sends when totalLeads matches and skips when it does not", async ({
+    campaign,
+  }) => {
+    const ctx = await campaign.setup({
+      triggerConditions: [
+        { attribute: "totalLeads", operator: "gte", value: 2 },
+      ],
+    });
+
+    const match = await ctx.createPartner({ hoursAgo: null });
+    await setLinkStats({
+      partnerId: match.id,
+      programId: campaign.programId,
+      leads: 1,
+    });
+    const matchClick = await trackClick({
+      domain: match.links![0].domain,
+      key: match.links![0].key,
+    });
+    await trackLead({ clickId: matchClick.clickId });
+
+    const miss = await ctx.createPartner({ hoursAgo: null });
+    const missClick = await trackClick({
+      domain: miss.links![0].domain,
+      key: miss.links![0].key,
+    });
+    await trackLead({ clickId: missClick.clickId });
+
+    await ctx.expectSentTo(match);
+    await ctx.expectNotSentTo(miss);
+  });
+
+  test("event runner skips disabled workflows", async ({ campaign }) => {
+    const ctx = await campaign.setup({
+      triggerConditions: [
+        { attribute: "totalLeads", operator: "gte", value: 1 },
+      ],
+    });
+    const partner = await ctx.createPartner({ hoursAgo: null });
+    await ctx.disableWorkflow();
+
+    const { clickId } = await trackClick({
+      domain: partner.links![0].domain,
+      key: partner.links![0].key,
+    });
+    await trackLead({ clickId });
+
+    await ctx.expectNotSentTo(partner);
+  });
+});
diff --git a/apps/web/playwright/api/commissions/clawbacks.spec.ts b/apps/web/playwright/api/commissions/clawbacks.spec.ts
new file mode 100644
index 00000000000..9bdb57c9a07
--- /dev/null
+++ b/apps/web/playwright/api/commissions/clawbacks.spec.ts
@@ -0,0 +1,132 @@
+import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { apiError } from "../../utils";
+import { test } from "../fixtures";
+import { createPartner, deletePartner } from "../partners/helpers";
+
+const expectedQueuedResponse = {
+  success: true,
+  message: "A clawback has been queued for the partner!",
+};
+
+async function expectClawbackCreated({
+  partnerId,
+  programId,
+  amount,
+  description,
+}: {
+  partnerId: string;
+  programId: string;
+  amount: number;
+  description: string;
+}) {
+  await expect
+    .poll(async () => {
+      const commission = await prisma.commission.findFirst({
+        where: {
+          partnerId,
+          programId,
+          type: "custom",
+          description,
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+      });
+
+      if (!commission) {
+        return null;
+      }
+
+      return {
+        partnerId: commission.partnerId,
+        programId: commission.programId,
+        type: commission.type,
+        amount: Number(commission.amount),
+        earnings: Number(commission.earnings),
+        quantity: commission.quantity,
+        description: commission.description,
+      };
+    })
+    .toEqual({
+      partnerId,
+      programId,
+      type: "custom",
+      amount: 0,
+      earnings: -amount,
+      quantity: 1,
+      description,
+    });
+}
+
+test("POST /commissions – clawback with arbitrary description", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  const description = `chargeback-${nanoid()}`;
+
+  try {
+    const { status: createStatus, data: created } = await createPartner(api, {
+      groupId: program.defaultGroupId,
+    });
+    partnerId = created.id;
+    expect(createStatus).toEqual(201);
+
+    const { status, data } = await api.post("/api/commissions", {
+      type: "custom",
+      partnerId,
+      amount: -100,
+      description,
+    });
+
+    expect(status).toEqual(202);
+    expect(data).toStrictEqual(expectedQueuedResponse);
+
+    await expectClawbackCreated({
+      partnerId: created.id,
+      programId: program.id,
+      amount: 100,
+      description,
+    });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+const missingPartnerId = `pn_${nanoid()}`;
+
+const clawbackErrorCases = [
+  {
+    name: "POST /commissions – clawback partner not found",
+    body: {
+      type: "custom",
+      partnerId: missingPartnerId,
+      amount: -500,
+      description: "fraud",
+    },
+    expected: ({ program }: { program: { id: string } }) =>
+      apiError({
+        code: "not_found",
+        message: `Partner ${missingPartnerId} is not enrolled in program ${program.id}.`,
+      }),
+  },
+  {
+    name: "POST /commissions – clawback missing partnerId",
+    body: { type: "custom", amount: -500, description: "fraud" },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        "invalid_type: partnerId: Invalid input: expected string, received undefined",
+    }),
+  },
+];
+
+for (const { name, body, expected } of clawbackErrorCases) {
+  test(name, async ({ api, program }) => {
+    expect(await api.post("/api/commissions", body)).toEqual(
+      typeof expected === "function" ? expected({ program }) : expected,
+    );
+  });
+}
diff --git a/apps/web/playwright/api/commissions/commissions-create.spec.ts b/apps/web/playwright/api/commissions/commissions-create.spec.ts
new file mode 100644
index 00000000000..bda20f2f83c
--- /dev/null
+++ b/apps/web/playwright/api/commissions/commissions-create.spec.ts
@@ -0,0 +1,1029 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { CommissionResponse } from "@/lib/types";
+import { redis } from "@/lib/upstash";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { apiError, randomCustomer } from "../../utils";
+import { test } from "../fixtures";
+import { TEST_COMMISSION_REWARDS } from "../setup-test-workspace";
+import { expectCommissionCreated, withCommissionPartner } from "./helpers";
+
+const expectedQueuedResponse = {
+  status: 202,
+  data: {
+    success: true,
+    message: "Your commissions are being created and will appear shortly.",
+  },
+};
+
+const expectedClawbackResponse = {
+  status: 202,
+  data: {
+    success: true,
+    message: "A clawback has been queued for the partner!",
+  },
+};
+
+const oversizedMetadata = {
+  blob: "x".repeat(10_000),
+};
+
+function customerBody() {
+  const customer = randomCustomer();
+
+  return {
+    externalId: customer.externalId,
+    email: customer.email,
+    name: customer.name,
+    country: "US",
+  };
+}
+
+async function seedDiscountCode({
+  programId,
+  partnerId,
+  disabledAt,
+}: {
+  programId: string;
+  partnerId: string;
+  disabledAt?: Date;
+}) {
+  const link = await prisma.link.findFirst({
+    where: { partnerId },
+    orderBy: { createdAt: "asc" },
+  });
+
+  if (!link) {
+    throw new Error("Partner was created without a default link.");
+  }
+
+  const code = `PW${nanoid(8)}`;
+
+  await prisma.discountCode.create({
+    data: {
+      id: createId({ prefix: "dcode_" }),
+      code,
+      programId,
+      partnerId,
+      linkId: link.id,
+      disabledAt,
+    },
+  });
+
+  return { code, linkId: link.id };
+}
+
+test.describe("Custom commissions", () => {
+  test("creates a custom commission", async ({ api, program }) => {
+    const description = `custom-${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "custom",
+          partnerId,
+          amount: 500,
+          description,
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "custom",
+        description,
+        expectedAmount: 0,
+        expectedEarnings: 500,
+      });
+    });
+  });
+
+  test("creates a clawback", async ({ api, program }) => {
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "custom",
+          partnerId,
+          amount: -500,
+          description: "fraud",
+        }),
+      ).toEqual(expectedClawbackResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "custom",
+        description: "fraud",
+        expectedAmount: 0,
+        expectedEarnings: -500,
+      });
+    });
+  });
+
+  test.describe("validates", () => {
+    const errorCases = [
+      {
+        name: "rejects amount of 0",
+        body: { type: "custom", partnerId: "pn_test", amount: 0 },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message: "custom: amount: Amount cannot be 0.",
+        }),
+      },
+      {
+        name: "rejects clawback without description",
+        body: { type: "custom", partnerId: "pn_test", amount: -500 },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: description: `description` is required when creating a clawback (negative amount).",
+        }),
+      },
+    ];
+
+    for (const { name, body, expected } of errorCases) {
+      test(name, async ({ api }) => {
+        expect(await api.post("/api/commissions", body)).toEqual(expected);
+      });
+    }
+  });
+});
+
+test.describe("Lead commissions", () => {
+  test("creates a lead commission", async ({ api, program }) => {
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId,
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "lead",
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("creates using date, eventName, and metadata", async ({
+    api,
+    program,
+  }) => {
+    const date = new Date("2024-01-10T00:00:00.000Z");
+    const metadata = { plan: "pro" };
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId,
+          date: date.toISOString(),
+          lead: {
+            eventName: "Requested demo",
+            metadata,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "lead",
+        expectedEarnings:
+          TEST_COMMISSION_REWARDS.lead.modifiers[0].amountInCents,
+        expectedCreatedAt: date,
+        expectedMetadata: metadata,
+      });
+    });
+  });
+
+  test("treats empty lead metadata as absent", async ({ api, program }) => {
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId,
+          lead: { metadata: {} },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "lead",
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("supports deprecated leadEventName + leadEventDate", async ({
+    api,
+    program,
+  }) => {
+    const leadEventDate = new Date("2024-06-15T12:00:00.000Z");
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId,
+          leadEventName: "Signed up",
+          leadEventDate: leadEventDate.toISOString(),
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "lead",
+        expectedCreatedAt: leadEventDate,
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("date takes precedence over leadEventDate", async ({ api, program }) => {
+    const date = new Date("2024-08-01T00:00:00.000Z");
+    const leadEventDate = new Date("2020-01-01T00:00:00.000Z");
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId,
+          date: date.toISOString(),
+          leadEventDate: leadEventDate.toISOString(),
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "lead",
+        expectedCreatedAt: date,
+      });
+    });
+  });
+
+  test.describe("validates", () => {
+    test("rejects oversized metadata", async ({ api }) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "lead",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          lead: { metadata: oversizedMetadata },
+        }),
+      ).toEqual(
+        apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: lead.metadata: Metadata must be less than 10,000 characters when stringified",
+        }),
+      );
+    });
+  });
+});
+
+test.describe("Sale commissions", () => {
+  test("creates a sale commission", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 1000,
+          invoiceId,
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("creates using discountCode", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      const { code, linkId } = await seedDiscountCode({
+        programId: program.id,
+        partnerId,
+      });
+
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          discountCode: code,
+          saleAmount: 1000,
+          invoiceId,
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedLinkId: linkId,
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("creates using nested sale", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    const date = new Date("2024-02-20T00:00:00.000Z");
+    const metadata = { plan: "pro" };
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          date: date.toISOString(),
+          sale: {
+            amount: 1000,
+            currency: "usd",
+            eventName: "Invoice paid",
+            paymentProcessor: "stripe",
+            invoiceId,
+            metadata,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedCreatedAt: date,
+        expectedEarnings:
+          TEST_COMMISSION_REWARDS.sale.modifiers[1].amountInCents,
+        expectedMetadata: metadata,
+      });
+    });
+  });
+
+  test("PATCH preserves metadata on the response", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    // Avoid plan/productId keys that trigger sale reward modifiers.
+    const metadata = { campaign: "spring" };
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          sale: {
+            amount: 1000,
+            invoiceId,
+            metadata,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      const commissionId = await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedMetadata: metadata,
+      });
+
+      const { status, data } = await api.patch<CommissionResponse>(
+        `/api/commissions/${commissionId}`,
+        { earnings: 1111 },
+      );
+
+      expect(status).toEqual(200);
+      expect(data).toMatchObject({
+        id: commissionId,
+        earnings: 1111,
+        metadata,
+      });
+    });
+  });
+
+  test("creates using nested sale with string amount", async ({
+    api,
+    program,
+  }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          sale: {
+            amount: "1000",
+            invoiceId,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+      });
+    });
+  });
+
+  test("converts nested sale.currency to USD", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    const eurRate = await redis.hget("fxRates:usd", "EUR");
+    test.skip(!eurRate, "EUR FX rate not available in Redis");
+
+    const expectedAmount = Math.round(10000 / Number(eurRate));
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          sale: {
+            amount: 10000,
+            currency: "eur",
+            invoiceId,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedAmount,
+      });
+    });
+  });
+
+  test("supports deprecated sale fields", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    const saleEventDate = new Date("2024-03-01T08:30:00.000Z");
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 1000,
+          invoiceId,
+          productId: "sku_pro",
+          saleEventDate: saleEventDate.toISOString(),
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedCreatedAt: saleEventDate,
+        expectedEarnings:
+          TEST_COMMISSION_REWARDS.sale.modifiers[0].amountInCents,
+        // Deprecated top-level productId must not leak into commission.metadata.
+        expectedMetadata: null,
+      });
+    });
+  });
+
+  test("creates with saleAmount when nested sale has no amount", async ({
+    api,
+    program,
+  }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 1000,
+          sale: {
+            eventName: "Invoice paid",
+            invoiceId,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+      });
+    });
+  });
+
+  test("date takes precedence over saleEventDate", async ({ api, program }) => {
+    const date = new Date("2024-08-01T00:00:00.000Z");
+    const saleEventDate = new Date("2020-01-01T00:00:00.000Z");
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 1000,
+          date: date.toISOString(),
+          saleEventDate: saleEventDate.toISOString(),
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        expectedCreatedAt: date,
+      });
+    });
+  });
+
+  test("nested sale takes precedence over deprecated fields", async ({
+    api,
+    program,
+  }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    const date = new Date("2024-09-15T00:00:00.000Z");
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 500,
+          invoiceId: `INV_${nanoid()}`,
+          productId: "sku_old",
+          saleEventDate: new Date("2020-01-01T00:00:00.000Z").toISOString(),
+          date: date.toISOString(),
+          sale: {
+            amount: 2000,
+            invoiceId,
+            metadata: { productId: "sku_pro" },
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        expectedAmount: 2000,
+        expectedCreatedAt: date,
+        expectedEarnings:
+          TEST_COMMISSION_REWARDS.sale.modifiers[0].amountInCents,
+        // User-provided sale.metadata persists; deprecated productId does not.
+        expectedMetadata: { productId: "sku_pro" },
+      });
+    });
+  });
+
+  test("coerces non-string sale.metadata.productId in reward context", async ({
+    api,
+    program,
+  }) => {
+    const invoiceId = `INV_${nanoid()}`;
+    const metadata = { productId: 12345 };
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          sale: {
+            amount: 1000,
+            invoiceId,
+            metadata,
+          },
+          customer: customerBody(),
+        }),
+      ).toEqual(expectedQueuedResponse);
+
+      await expectCommissionCreated({
+        api,
+        partnerId,
+        programId: program.id,
+        type: "sale",
+        invoiceId,
+        // Non-string productId is dropped from reward context (no productId modifier).
+        expectedEarnings: TEST_COMMISSION_REWARDS.sale.amountInCents,
+        // Original metadata still persists on the commission.
+        expectedMetadata: metadata,
+      });
+    });
+  });
+
+  test("rejects duplicate invoice", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      await prisma.commission.create({
+        data: {
+          id: createId({ prefix: "cm_" }),
+          programId: program.id,
+          partnerId,
+          type: "sale",
+          amount: 1000,
+          earnings: 100,
+          quantity: 1,
+          invoiceId,
+        },
+      });
+
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          saleAmount: 1000,
+          invoiceId,
+          customer: customerBody(),
+        }),
+      ).toEqual(
+        apiError({
+          code: "conflict",
+          message: `There is already a commission for the invoice ${invoiceId}.`,
+        }),
+      );
+    });
+  });
+
+  test("rejects duplicate nested sale.invoiceId", async ({ api, program }) => {
+    const invoiceId = `INV_${nanoid()}`;
+
+    await withCommissionPartner(api, program, async (partnerId) => {
+      await prisma.commission.create({
+        data: {
+          id: createId({ prefix: "cm_" }),
+          programId: program.id,
+          partnerId,
+          type: "sale",
+          amount: 1000,
+          earnings: 100,
+          quantity: 1,
+          invoiceId,
+        },
+      });
+
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          sale: { amount: 1000, invoiceId },
+          customer: customerBody(),
+        }),
+      ).toEqual(
+        apiError({
+          code: "conflict",
+          message: `There is already a commission for the invoice ${invoiceId}.`,
+        }),
+      );
+    });
+  });
+
+  test("imports Stripe invoices", async ({ api, program, workspace }) => {
+    await withCommissionPartner(api, program, async (partnerId) => {
+      expect(
+        await api.post("/api/commissions", {
+          type: "sale",
+          partnerId,
+          importStripeInvoices: true,
+          customer: customerBody(),
+        }),
+      ).toEqual(
+        apiError({
+          code: "bad_request",
+          message: `Your workspace isn't connected to Stripe yet. Please install the Stripe integration to continue: https://app.dub.co/${workspace.slug}/settings/integrations/stripe`,
+        }),
+      );
+    });
+  });
+
+  test.describe("validates", () => {
+    const errorCases = [
+      {
+        name: "rejects missing sale.amount and saleAmount",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          importStripeInvoices: false,
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: saleAmount: `sale.amount` or `saleAmount` is required when `importStripeInvoices` is false.",
+        }),
+      },
+      {
+        name: "rejects saleAmount of 0",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          importStripeInvoices: false,
+          saleAmount: 0,
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message: "custom: saleAmount: Sale amount cannot be 0.",
+        }),
+      },
+      {
+        name: "rejects sale.amount of 0",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          sale: { amount: 0 },
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message: "custom: sale.amount: Sale amount cannot be 0.",
+        }),
+      },
+      {
+        name: "rejects non-integer sale.amount",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          sale: { amount: 10.5 },
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "invalid_type: sale.amount: Invalid input: expected int, received number",
+        }),
+      },
+      {
+        name: "rejects nested sale fields when importing Stripe invoices",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          importStripeInvoices: true,
+          date: "2024-03-01T08:30:00.000Z",
+          sale: {
+            amount: 5000,
+            invoiceId: "in_test",
+            metadata: { productId: "sku" },
+          },
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: sale: `sale`, `date`, `invoiceId`, `productId` cannot be provided when `importStripeInvoices` is enabled.",
+        }),
+      },
+      {
+        name: "rejects empty invoiceId and productId when importing Stripe invoices",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          importStripeInvoices: true,
+          invoiceId: "",
+          productId: "",
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: invoiceId: `invoiceId`, `productId` cannot be provided when `importStripeInvoices` is enabled.",
+        }),
+      },
+      {
+        name: "rejects invalid paymentProcessor",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          sale: { amount: 1000, paymentProcessor: "foo" },
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            'invalid_value: sale.paymentProcessor: Invalid option: expected one of "stripe"|"shopify"|"polar"|"paddle"|"apple"|"revenuecat"|"lemonsqueezy"|"dub"|"custom"',
+        }),
+      },
+      {
+        name: "rejects oversized metadata",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          sale: { amount: 1000, metadata: oversizedMetadata },
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: sale.metadata: Metadata must be less than 10,000 characters when stringified",
+        }),
+      },
+      {
+        name: "rejects linkId and discountCode together",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          saleAmount: 1000,
+          linkId: "link_test",
+          discountCode: "SAVE10",
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "custom: discountCode: Either `linkId` or `discountCode` may be provided, not both.",
+        }),
+      },
+      {
+        name: "rejects empty discountCode",
+        body: {
+          type: "sale",
+          partnerId: "pn_test",
+          customerId: "cus_test",
+          saleAmount: 1000,
+          discountCode: "",
+        },
+        expected: apiError({
+          code: "unprocessable_entity",
+          message:
+            "too_small: discountCode: Too small: expected string to have >=1 characters",
+        }),
+      },
+    ];
+
+    for (const { name, body, expected } of errorCases) {
+      test(name, async ({ api }) => {
+        expect(await api.post("/api/commissions", body)).toEqual(expected);
+      });
+    }
+
+    test("rejects unknown customer", async ({ api, program }) => {
+      await withCommissionPartner(api, program, async (partnerId) => {
+        expect(
+          await api.post("/api/commissions", {
+            type: "sale",
+            partnerId,
+            customerId: "cus_nonexistent",
+            saleAmount: 1000,
+          }),
+        ).toEqual(
+          apiError({
+            code: "not_found",
+            message: "Customer cus_nonexistent not found.",
+          }),
+        );
+      });
+    });
+
+    test("rejects unknown discountCode", async ({ api, program }) => {
+      await withCommissionPartner(api, program, async (partnerId) => {
+        const code = `MISSING${nanoid(8)}`;
+
+        expect(
+          await api.post("/api/commissions", {
+            type: "sale",
+            partnerId,
+            discountCode: code,
+            saleAmount: 1000,
+            customer: customerBody(),
+          }),
+        ).toEqual(
+          apiError({
+            code: "not_found",
+            message: `Discount code ${code} not found.`,
+          }),
+        );
+      });
+    });
+
+    test("rejects another partner's discountCode", async ({ api, program }) => {
+      await withCommissionPartner(api, program, async (partnerId) => {
+        await withCommissionPartner(api, program, async (otherPartnerId) => {
+          const { code } = await seedDiscountCode({
+            programId: program.id,
+            partnerId: otherPartnerId,
+          });
+
+          const partner = await prisma.partner.findUniqueOrThrow({
+            where: { id: partnerId },
+            select: { id: true, email: true },
+          });
+
+          expect(
+            await api.post("/api/commissions", {
+              type: "sale",
+              partnerId,
+              discountCode: code,
+              saleAmount: 1000,
+              customer: customerBody(),
+            }),
+          ).toEqual(
+            apiError({
+              code: "not_found",
+              message: `Discount code ${code} does not belong to partner ${partner.email} (${partner.id}).`,
+            }),
+          );
+        });
+      });
+    });
+
+    test("rejects disabled discountCode", async ({ api, program }) => {
+      await withCommissionPartner(api, program, async (partnerId) => {
+        const { code } = await seedDiscountCode({
+          programId: program.id,
+          partnerId,
+          disabledAt: new Date(),
+        });
+
+        expect(
+          await api.post("/api/commissions", {
+            type: "sale",
+            partnerId,
+            discountCode: code,
+            saleAmount: 1000,
+            customer: customerBody(),
+          }),
+        ).toEqual(
+          apiError({
+            code: "bad_request",
+            message: `Discount code ${code} is disabled.`,
+          }),
+        );
+      });
+    });
+  });
+});
+
+const typeErrorCases = [
+  {
+    name: "rejects missing type",
+    body: { partnerId: "pn_test", amount: 500 },
+  },
+  {
+    name: "rejects invalid type",
+    body: { type: "invalid", partnerId: "pn_test" },
+  },
+];
+
+for (const { name, body } of typeErrorCases) {
+  test(name, async ({ api }) => {
+    expect(await api.post("/api/commissions", body)).toEqual(
+      apiError({
+        code: "unprocessable_entity",
+        message: "invalid_union: type: Invalid input",
+      }),
+    );
+  });
+}
diff --git a/apps/web/playwright/api/commissions/commissions-list.spec.ts b/apps/web/playwright/api/commissions/commissions-list.spec.ts
new file mode 100644
index 00000000000..28046364f5c
--- /dev/null
+++ b/apps/web/playwright/api/commissions/commissions-list.spec.ts
@@ -0,0 +1,217 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { CommissionResponse } from "@/lib/types";
+import { expect } from "@playwright/test";
+import { apiError } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import { createPartner } from "../partners/helpers";
+import { deleteCommissionPartner } from "./helpers";
+
+test.describe("GET /commissions – metadata query", () => {
+  // Shared Prisma seed for this describe; serial so beforeAll runs once per worker group.
+  test.describe.configure({ mode: "serial" });
+
+  const seedMetadata: Record<string, string | number | boolean>[] = [
+    { plan: "pro", tier: "gold" },
+    { plan: "Pro", tier: "silver" },
+    { plan: "PRO", seats: 10 },
+    { plan: "enterprise", tier: "gold", active: true },
+    { plan: "enterprise", seats: 5, active: false },
+    { plan: "free", tier: "bronze" },
+    { plan: "free", campaign: "Spring" },
+    { plan: "starter", seats: 10, active: true },
+    { plan: "pro", campaign: "spring" },
+    { plan: "enterprise", campaign: "fall", seats: 5 },
+  ];
+
+  let partnerId: string | undefined;
+  let seeded: {
+    id: string;
+    metadata: Record<string, string | number | boolean>;
+  }[] = [];
+
+  test.beforeAll(async ({ api, program }) => {
+    const { status, data } = await createPartner(api, {
+      groupId: program.defaultGroupId,
+    });
+    expect(status).toEqual(201);
+    partnerId = data.id;
+
+    const rows = seedMetadata.map((metadata, i) => ({
+      id: createId({ prefix: "cm_" }),
+      programId: program.id,
+      partnerId: data.id,
+      type: "custom" as const,
+      amount: 0,
+      earnings: 100,
+      quantity: 1,
+      description: `meta-query-${i}`,
+      metadata,
+    }));
+
+    await prisma.commission.createMany({ data: rows });
+    seeded = rows.map((row) => ({
+      id: row.id,
+      metadata: row.metadata,
+    }));
+  });
+
+  test.afterAll(async () => {
+    await deleteCommissionPartner({ partnerId });
+  });
+
+  function matchingIds(
+    predicate: (metadata: Record<string, string | number | boolean>) => boolean,
+  ) {
+    return seeded
+      .filter((row) => predicate(row.metadata))
+      .map((row) => row.id)
+      .sort();
+  }
+
+  async function listCommissions(api: ApiClient, query: string) {
+    const { status, data } = await api.get<CommissionResponse[]>(
+      `/api/commissions?${new URLSearchParams({
+        partnerId: partnerId!,
+        pageSize: "100",
+        query,
+      })}`,
+    );
+
+    expect(status).toEqual(200);
+    return data.map((commission) => commission.id).sort();
+  }
+
+  test("filters with =", async ({ api }) => {
+    expect(await listCommissions(api, "metadata['plan']='pro'")).toEqual(
+      matchingIds((m) => m.plan === "pro"),
+    );
+  });
+
+  test("filters with : as equals", async ({ api }) => {
+    expect(await listCommissions(api, "metadata['plan']:pro")).toEqual(
+      matchingIds((m) => m.plan === "pro"),
+    );
+  });
+
+  test("filters are case-sensitive", async ({ api }) => {
+    expect(await listCommissions(api, "metadata['plan']='Pro'")).toEqual(
+      matchingIds((m) => m.plan === "Pro"),
+    );
+
+    expect(await listCommissions(api, "metadata['plan']='PRO'")).toEqual(
+      matchingIds((m) => m.plan === "PRO"),
+    );
+
+    expect(await listCommissions(api, "metadata['campaign']='spring'")).toEqual(
+      matchingIds((m) => m.campaign === "spring"),
+    );
+
+    expect(await listCommissions(api, "metadata['campaign']='Spring'")).toEqual(
+      matchingIds((m) => m.campaign === "Spring"),
+    );
+  });
+
+  test("filters with !=", async ({ api }) => {
+    expect(await listCommissions(api, "metadata['plan']!='free'")).toEqual(
+      matchingIds((m) => m.plan !== "free"),
+    );
+  });
+
+  test("filters with AND", async ({ api }) => {
+    expect(
+      await listCommissions(
+        api,
+        "metadata['plan']='pro' AND metadata['tier']='gold'",
+      ),
+    ).toEqual(matchingIds((m) => m.plan === "pro" && m.tier === "gold"));
+  });
+
+  test("filters with OR", async ({ api }) => {
+    expect(
+      await listCommissions(
+        api,
+        "metadata['plan']='pro' OR metadata['plan']='enterprise'",
+      ),
+    ).toEqual(matchingIds((m) => m.plan === "pro" || m.plan === "enterprise"));
+  });
+
+  test("filters with AND on campaign", async ({ api }) => {
+    expect(
+      await listCommissions(
+        api,
+        "metadata['plan']='pro' AND metadata['campaign']='spring'",
+      ),
+    ).toEqual(matchingIds((m) => m.plan === "pro" && m.campaign === "spring"));
+  });
+
+  test("filters with OR on campaign", async ({ api }) => {
+    expect(
+      await listCommissions(
+        api,
+        "metadata['campaign']='spring' OR metadata['campaign']='fall'",
+      ),
+    ).toEqual(
+      matchingIds((m) => m.campaign === "spring" || m.campaign === "fall"),
+    );
+  });
+
+  test("does not match numeric metadata values stored as numbers", async ({
+    api,
+  }) => {
+    expect(await listCommissions(api, "metadata['seats']='10'")).toEqual([]);
+    expect(await listCommissions(api, "metadata['seats']='5'")).toEqual([]);
+  });
+
+  test("does not match boolean metadata values stored as booleans", async ({
+    api,
+  }) => {
+    expect(await listCommissions(api, "metadata['active']='true'")).toEqual([]);
+    expect(await listCommissions(api, "metadata['active']='false'")).toEqual(
+      [],
+    );
+  });
+
+  const invalidQueryCases = [
+    {
+      name: "rejects nested metadata keys",
+      query: "metadata['a']['b']='value'",
+      message:
+        "Invalid metadata query. Use top-level keys only, e.g. `metadata['key']='value'`.",
+    },
+    {
+      name: "rejects mixed AND and OR",
+      query: "metadata['a']='1' AND metadata['b']='2' OR metadata['c']='3'",
+      message: "Metadata query cannot mix AND and OR.",
+    },
+    {
+      name: "rejects unsupported comparison operators",
+      query: "metadata['seats']>5",
+      message: "Metadata query only supports `=` and `!=` operators.",
+    },
+    {
+      name: "rejects non-metadata fields",
+      query: "status:active",
+      message:
+        "Invalid metadata query. Use top-level keys only, e.g. `metadata['key']='value'`.",
+    },
+  ];
+
+  for (const { name, query, message } of invalidQueryCases) {
+    test(name, async ({ api }) => {
+      expect(
+        await api.get(
+          `/api/commissions?${new URLSearchParams({
+            partnerId: partnerId!,
+            query,
+          })}`,
+        ),
+      ).toEqual(
+        apiError({
+          code: "unprocessable_entity",
+          message,
+        }),
+      );
+    });
+  }
+});
diff --git a/apps/web/playwright/api/commissions/helpers.ts b/apps/web/playwright/api/commissions/helpers.ts
new file mode 100644
index 00000000000..138ecf493c2
--- /dev/null
+++ b/apps/web/playwright/api/commissions/helpers.ts
@@ -0,0 +1,214 @@
+import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";
+import { prisma } from "@/lib/prisma";
+import type { CommissionResponse, RewardConditions } from "@/lib/types";
+import { expect } from "@playwright/test";
+import type { ApiClient } from "../fixtures";
+import { createPartner, deletePartner } from "../partners/helpers";
+import { TEST_COMMISSION_REWARDS } from "../setup-test-workspace";
+
+function expectedCommissionDescription({
+  type,
+  earnings,
+}: {
+  type: "custom" | "lead" | "sale";
+  earnings: number;
+}): string | null {
+  if (type === "custom") {
+    return null;
+  }
+
+  const reward = TEST_COMMISSION_REWARDS[type];
+
+  return buildCommissionDescription({
+    reward: {
+      event: reward.event,
+      type: reward.type,
+      amountInCents: earnings,
+      amountInPercentage: null,
+      maxDuration: "maxDuration" in reward ? reward.maxDuration : null,
+      spendLimitAmount: null,
+      spendLimitInterval: null,
+    },
+    matchedCondition: (reward.modifiers.find(
+      (modifier) => modifier.amountInCents === earnings,
+    ) ?? null) as RewardConditions | null,
+  });
+}
+
+export async function withCommissionPartner(
+  api: ApiClient,
+  program: { defaultGroupId: string },
+  run: (partnerId: string) => Promise<void>,
+) {
+  let partnerId: string | undefined;
+
+  try {
+    const { status, data } = await createPartner(api, {
+      groupId: program.defaultGroupId,
+    });
+    partnerId = data.id;
+    expect(status).toEqual(201);
+    await run(partnerId);
+  } finally {
+    await deleteCommissionPartner({ partnerId });
+  }
+}
+
+export async function deleteCommissionPartner({
+  partnerId,
+}: {
+  partnerId: string | undefined;
+}) {
+  if (partnerId) {
+    const links = await prisma.link.findMany({
+      where: {
+        partnerId,
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    await prisma.customer.deleteMany({
+      where: {
+        OR: [
+          { partnerId },
+          ...(links.length > 0
+            ? [{ linkId: { in: links.map((link) => link.id) } }]
+            : []),
+        ],
+      },
+    });
+  }
+
+  await deletePartner(partnerId);
+}
+
+export async function expectCommissionCreated({
+  api,
+  partnerId,
+  programId,
+  type,
+  description,
+  invoiceId,
+  expectedAmount,
+  expectedEarnings,
+  expectedCreatedAt,
+  expectedMetadata,
+  expectedLinkId,
+}: {
+  api: ApiClient;
+  partnerId: string;
+  programId: string;
+  type: "custom" | "lead" | "sale";
+  description?: string;
+  invoiceId?: string;
+  expectedAmount?: number;
+  expectedEarnings?: number;
+  expectedCreatedAt?: Date;
+  expectedMetadata?: Record<string, unknown> | null;
+  expectedLinkId?: string;
+}): Promise<string> {
+  const amount = expectedAmount ?? (type === "sale" ? 1000 : 0);
+  const earnings =
+    expectedEarnings ??
+    (type === "custom" ? 0 : TEST_COMMISSION_REWARDS[type].amountInCents);
+  const metadata = expectedMetadata === undefined ? null : expectedMetadata;
+  const expectedDescription =
+    description ?? expectedCommissionDescription({ type, earnings });
+
+  let commissionId: string | undefined;
+
+  await expect
+    .poll(async () => {
+      const commission = await prisma.commission.findFirst({
+        where: {
+          partnerId,
+          programId,
+          type,
+          ...(description ? { description } : {}),
+          ...(invoiceId ? { invoiceId } : {}),
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+      });
+
+      if (!commission) {
+        return null;
+      }
+
+      commissionId = commission.id;
+
+      return {
+        partnerId: commission.partnerId,
+        programId: commission.programId,
+        type: commission.type,
+        amount: Number(commission.amount),
+        earnings: Number(commission.earnings),
+        quantity: commission.quantity,
+        description: commission.description,
+        invoiceId: commission.invoiceId,
+        currency: commission.currency,
+        createdAt: commission.createdAt.toISOString(),
+        metadata: commission.metadata,
+        ...(expectedLinkId !== undefined ? { linkId: commission.linkId } : {}),
+      };
+    })
+    .toEqual({
+      partnerId,
+      programId,
+      type,
+      amount,
+      earnings,
+      quantity: 1,
+      description: expectedDescription,
+      invoiceId: invoiceId ?? null,
+      currency: "usd",
+      createdAt: expectedCreatedAt
+        ? expectedCreatedAt.toISOString()
+        : expect.any(String),
+      metadata,
+      ...(expectedLinkId !== undefined ? { linkId: expectedLinkId } : {}),
+    });
+
+  if (!commissionId) {
+    throw new Error("Commission was not created");
+  }
+
+  const listQuery = new URLSearchParams({
+    partnerId,
+    type,
+    ...(invoiceId ? { invoiceId } : {}),
+  });
+
+  const { status: listStatus, data: commissions } = await api.get<
+    CommissionResponse[]
+  >(`/api/commissions?${listQuery}`);
+
+  expect(listStatus).toEqual(200);
+
+  const listed = invoiceId
+    ? commissions.find((c) => c.invoiceId === invoiceId)
+    : description
+      ? commissions.find((c) => c.description === description)
+      : commissions.find((c) => c.id === commissionId);
+
+  expect(listed).toMatchObject({
+    id: commissionId,
+    type,
+    metadata,
+  });
+
+  const { status: detailStatus, data: detail } =
+    await api.get<CommissionResponse>(`/api/commissions/${commissionId}`);
+
+  expect(detailStatus).toEqual(200);
+  expect(detail).toMatchObject({
+    id: commissionId,
+    type,
+    metadata,
+  });
+
+  return commissionId;
+}
diff --git a/apps/web/playwright/api/constants.ts b/apps/web/playwright/api/constants.ts
new file mode 100644
index 00000000000..ff56f224175
--- /dev/null
+++ b/apps/web/playwright/api/constants.ts
@@ -0,0 +1 @@
+export const PLAYWRIGHT_API_BASE = "http://localhost:8888";
diff --git a/apps/web/playwright/api/conversions/helpers.ts b/apps/web/playwright/api/conversions/helpers.ts
new file mode 100644
index 00000000000..4bf14a7edfc
--- /dev/null
+++ b/apps/web/playwright/api/conversions/helpers.ts
@@ -0,0 +1,113 @@
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { readFileSync } from "fs";
+import path from "path";
+import { randomCustomer } from "../../utils";
+import { PLAYWRIGHT_API_BASE } from "../constants";
+
+const TRACK_CLICK_HEADERS = {
+  referer: "https://dub.co",
+  "User-Agent":
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+};
+
+function playwrightApiToken() {
+  return JSON.parse(
+    readFileSync(path.join(__dirname, "../../.auth/api.json"), "utf-8"),
+  ).token as string;
+}
+
+async function postAuthenticatedJson(
+  url: string,
+  body: unknown,
+  extraHeaders: Record<string, string> = {},
+) {
+  const response = await fetch(`${PLAYWRIGHT_API_BASE}${url}`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${playwrightApiToken()}`,
+      "Content-Type": "application/json",
+      ...extraHeaders,
+    },
+    body: JSON.stringify(body),
+  });
+
+  return {
+    status: response.status,
+    data: (await response.json()) as Record<string, any>,
+  };
+}
+
+export async function trackClick({
+  domain,
+  key,
+}: {
+  domain: string;
+  key: string;
+}) {
+  const { status, data } = await postAuthenticatedJson(
+    "/api/track/click",
+    { domain, key },
+    TRACK_CLICK_HEADERS,
+  );
+
+  expect(status, JSON.stringify(data)).toEqual(200);
+  expect(data.clickId).toEqual(expect.any(String));
+
+  return data as { clickId: string };
+}
+
+export async function trackLead({
+  clickId,
+  ...overrides
+}: {
+  clickId: string;
+} & Record<string, unknown>) {
+  const customer = randomCustomer();
+
+  const { status, data } = await postAuthenticatedJson("/api/track/lead", {
+    clickId,
+    eventName: `Signup-${nanoid()}`,
+    customerExternalId: customer.externalId,
+    customerEmail: customer.email,
+    customerName: customer.name,
+    mode: "wait",
+    ...overrides,
+  });
+
+  expect(status, JSON.stringify(data)).toEqual(200);
+
+  return {
+    customer,
+    data,
+  };
+}
+
+export async function trackSale({
+  customerExternalId,
+  ...overrides
+}: {
+  customerExternalId: string;
+} & Record<string, unknown>) {
+  const invoiceId =
+    (overrides.invoiceId as string | undefined) ?? `INV_${nanoid()}`;
+  const amount = (overrides.amount as number | undefined) ?? 1000;
+
+  const { status, data } = await postAuthenticatedJson("/api/track/sale", {
+    customerExternalId,
+    amount,
+    currency: "usd",
+    paymentProcessor: "stripe",
+    eventName: "Purchase",
+    invoiceId,
+    ...overrides,
+  });
+
+  expect(status, JSON.stringify(data)).toEqual(200);
+
+  return {
+    invoiceId,
+    amount,
+    data,
+  };
+}
diff --git a/apps/web/playwright/api/customers/customers-pagination.spec.ts b/apps/web/playwright/api/customers/customers-pagination.spec.ts
index 9792aad5a82..5aae7a8d0b3 100644
--- a/apps/web/playwright/api/customers/customers-pagination.spec.ts
+++ b/apps/web/playwright/api/customers/customers-pagination.spec.ts
@@ -4,6 +4,7 @@ import type { Customer } from "@/lib/types";
 import { nanoid } from "@dub/utils";
 import { expect } from "@playwright/test";
 import {
+  apiError,
   expectNoOverlap,
   expectSortedByCreatedAt,
   expectSortedById,
@@ -13,61 +14,50 @@ import { test } from "../fixtures";
 const PAGE_SIZE = 5;
 const SEED_COUNT = 25;
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("GET /customers – rejects both startingAfter and endingBefore", async ({
   api,
 }) => {
-  const { status, data: error } = await api.get(
-    `/api/customers?${new URLSearchParams({
-      pageSize: String(PAGE_SIZE),
-      startingAfter: "id",
-      endingBefore: "id",
-    })}`,
-  );
-
-  expect(status).toEqual(422);
-  expect(error).toStrictEqual({
-    error: {
+  expect(
+    await api.get(
+      `/api/customers?${new URLSearchParams({
+        pageSize: String(PAGE_SIZE),
+        startingAfter: "id",
+        endingBefore: "id",
+      })}`,
+    ),
+  ).toEqual(
+    apiError({
       code: "unprocessable_entity",
       message:
         "You cannot use both startingAfter and endingBefore at the same time.",
-      doc_url: "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-    },
-  });
+    }),
+  );
 });
 
 test("GET /customers – rejects page > MAX_OFFSET_PAGE", async ({ api }) => {
-  const { status, data: error } = await api.get(
-    `/api/customers?${new URLSearchParams({
-      page: "1001",
-      pageSize: "10",
-    })}`,
-  );
-
-  expect(status).toEqual(422);
-  expect(error).toStrictEqual({
-    error: {
+  expect(
+    await api.get(
+      `/api/customers?${new URLSearchParams({
+        page: "1001",
+        pageSize: "10",
+      })}`,
+    ),
+  ).toEqual(
+    apiError({
       code: "unprocessable_entity",
       message:
         "Page is too big (cannot be more than 1000), recommend using cursor-based pagination instead.",
-      doc_url: "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-    },
-  });
+    }),
+  );
 });
 
 test("GET /customers – invalid cursor ID (startingAfter / endingBefore)", async ({
   api,
 }) => {
-  const invalidCursorError = {
-    error: {
-      code: "unprocessable_entity",
-      message: "Invalid cursor: the provided ID does not exist.",
-      doc_url: "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-    },
-  };
+  const invalidCursorError = apiError({
+    code: "unprocessable_entity",
+    message: "Invalid cursor: the provided ID does not exist.",
+  });
 
   const { status: statusAfter, data: errorAfter } = await api.get(
     `/api/customers?${new URLSearchParams({
@@ -76,8 +66,7 @@ test("GET /customers – invalid cursor ID (startingAfter / endingBefore)", asyn
     })}`,
   );
 
-  expect(statusAfter).toEqual(422);
-  expect(errorAfter).toStrictEqual(invalidCursorError);
+  expect({ status: statusAfter, data: errorAfter }).toEqual(invalidCursorError);
 
   const { status: statusBefore, data: errorBefore } = await api.get(
     `/api/customers?${new URLSearchParams({
@@ -86,8 +75,9 @@ test("GET /customers – invalid cursor ID (startingAfter / endingBefore)", asyn
     })}`,
   );
 
-  expect(statusBefore).toEqual(422);
-  expect(errorBefore).toStrictEqual(invalidCursorError);
+  expect({ status: statusBefore, data: errorBefore }).toEqual(
+    invalidCursorError,
+  );
 });
 
 test.describe("with seeded customers", () => {
@@ -224,15 +214,11 @@ test.describe("with seeded customers", () => {
   test("GET /customers – rejects mixing page with startingAfter / endingBefore", async ({
     api,
   }) => {
-    const mixedPaginationError = {
-      error: {
-        code: "unprocessable_entity",
-        message:
-          "You cannot use both page and startingAfter/endingBefore at the same time. Please use one pagination method.",
-        doc_url:
-          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-      },
-    };
+    const mixedPaginationError = apiError({
+      code: "unprocessable_entity",
+      message:
+        "You cannot use both page and startingAfter/endingBefore at the same time. Please use one pagination method.",
+    });
 
     const { status: statusAfter, data: errorAfter } = await api.get(
       `/api/customers?${new URLSearchParams({
@@ -242,8 +228,9 @@ test.describe("with seeded customers", () => {
       })}`,
     );
 
-    expect(statusAfter).toEqual(422);
-    expect(errorAfter).toStrictEqual(mixedPaginationError);
+    expect({ status: statusAfter, data: errorAfter }).toEqual(
+      mixedPaginationError,
+    );
 
     const { status: statusBefore, data: errorBefore } = await api.get(
       `/api/customers?${new URLSearchParams({
@@ -253,8 +240,9 @@ test.describe("with seeded customers", () => {
       })}`,
     );
 
-    expect(statusBefore).toEqual(422);
-    expect(errorBefore).toStrictEqual(mixedPaginationError);
+    expect({ status: statusBefore, data: errorBefore }).toEqual(
+      mixedPaginationError,
+    );
   });
 
   test("GET /customers – rejects cursor pagination with unsupported sort field", async ({
@@ -268,15 +256,12 @@ test.describe("with seeded customers", () => {
       })}`,
     );
 
-    expect(status).toEqual(422);
-    expect(error).toStrictEqual({
-      error: {
+    expect({ status, data: error }).toEqual(
+      apiError({
         code: "unprocessable_entity",
         message:
           "Cursor-based pagination only supports sorting by `createdAt`. Use offset-based pagination (page/pageSize) for other sort fields.",
-        doc_url:
-          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-      },
-    });
+      }),
+    );
   });
 });
diff --git a/apps/web/playwright/api/customers/customers-reattribute.spec.ts b/apps/web/playwright/api/customers/customers-reattribute.spec.ts
new file mode 100644
index 00000000000..6738dd623cc
--- /dev/null
+++ b/apps/web/playwright/api/customers/customers-reattribute.spec.ts
@@ -0,0 +1,162 @@
+import { prisma } from "@/lib/prisma";
+import type { Customer } from "@/lib/types";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { apiError, randomCustomer } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import { createPartner, deletePartner } from "../partners/helpers";
+
+async function createCustomer(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  return api.post<Customer>("/api/customers", {
+    ...randomCustomer(),
+    ...overrides,
+  });
+}
+
+async function deleteCustomer(api: ApiClient, id: string | undefined) {
+  if (!id) return;
+  await api.delete(`/api/customers/${id}`);
+}
+
+test("POST /customers/{id}/reattribute – unknown customer", async ({ api }) => {
+  expect(
+    await api.post("/api/customers/cus_doesnotexist/reattribute", {
+      partnerId: "pn_doesnotexist",
+      linkId: "link_doesnotexist",
+    }),
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message:
+        "Customer not found. Make sure you're using the correct customer ID (e.g. `cus_3TagGjzRzmsFJdH8od2BNCsc`) or external ID (has to be prefixed with `ext_`).",
+    }),
+  );
+});
+
+test("POST /customers/{id}/reattribute – unchanged partner", async ({
+  api,
+  program,
+}) => {
+  let customerId: string | undefined;
+  let partnerId: string | undefined;
+
+  try {
+    const { status: partnerStatus, data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    expect(partnerStatus).toEqual(201);
+    expect(partner.links).not.toBeNull();
+    expect(partner.links!.length).toBeGreaterThan(0);
+
+    const targetLink = partner.links![0];
+    const { data: created } = await createCustomer(api);
+    customerId = created.id;
+
+    await prisma.customer.update({
+      where: { id: created.id },
+      data: {
+        partnerId: partner.id,
+        linkId: targetLink.id,
+        programId: program.id,
+      },
+    });
+
+    expect(
+      await api.post(`/api/customers/${created.id}/reattribute`, {
+        partnerId: partner.id,
+        linkId: targetLink.id,
+      }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: `Customer "${created.id}" is already attributed to the partner "${partner.id}".`,
+      }),
+    );
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /customers/{id}/reattribute – retired stub", async ({ api }) => {
+  let customerId: string | undefined;
+  let partnerId: string | undefined;
+
+  try {
+    const { status: partnerStatus, data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    expect(partnerStatus).toEqual(201);
+    expect(partner.links).not.toBeNull();
+    expect(partner.links!.length).toBeGreaterThan(0);
+
+    const { data: created } = await createCustomer(api);
+    customerId = created.id;
+
+    await prisma.customer.update({
+      where: { id: created.id },
+      data: {
+        externalId: `reattributed_${nanoid(32)}`,
+        partnerId: null,
+        linkId: null,
+        programId: null,
+      },
+    });
+
+    expect(
+      await api.post(`/api/customers/${created.id}/reattribute`, {
+        partnerId: partner.id,
+        linkId: partner.links![0].id,
+      }),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: `Customer "${created.id}" was already reattributed. Use the new customer ID instead.`,
+      }),
+    );
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /customers/{id}/reattribute – banned partner", async ({ api }) => {
+  let customerId: string | undefined;
+  let partnerId: string | undefined;
+
+  try {
+    const { status: partnerStatus, data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    expect(partnerStatus).toEqual(201);
+    expect(partner.links).not.toBeNull();
+    expect(partner.links!.length).toBeGreaterThan(0);
+
+    const { status: banStatus } = await api.post("/api/partners/ban", {
+      partnerId: partner.id,
+      reason: "fraud",
+    });
+    expect(banStatus).toEqual(200);
+
+    const { data: created } = await createCustomer(api);
+    customerId = created.id;
+
+    expect(
+      await api.post(`/api/customers/${created.id}/reattribute`, {
+        partnerId: partner.id,
+        linkId: partner.links![0].id,
+      }),
+    ).toEqual(
+      apiError({
+        code: "unprocessable_entity",
+        message: "This partner is not eligible to receive customers.",
+      }),
+    );
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
diff --git a/apps/web/playwright/api/customers/customers.spec.ts b/apps/web/playwright/api/customers/customers.spec.ts
index ed492a90a8e..c7635c048e9 100644
--- a/apps/web/playwright/api/customers/customers.spec.ts
+++ b/apps/web/playwright/api/customers/customers.spec.ts
@@ -36,10 +36,6 @@ async function deleteCustomer(api: ApiClient, id: string | undefined) {
   await api.delete(`/api/customers/${id}`);
 }
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("POST /customers", async ({ api }) => {
   let customerId: string | undefined;
   const body = randomCustomer();
@@ -106,6 +102,7 @@ test("PATCH /customers/{id}", async ({ api }) => {
     const toUpdate = {
       name: "Updated",
       avatar: "https://api.dub.co/og/avatar/1234567890",
+      country: "BR",
     };
 
     const { status, data } = await api.patch<Customer>(
@@ -123,6 +120,35 @@ test("PATCH /customers/{id}", async ({ api }) => {
   }
 });
 
+test("PATCH /customers/{id} - subscriptionCanceledAt", async ({ api }) => {
+  let customerId: string | undefined;
+
+  try {
+    const { data: created } = await createCustomer(api);
+    customerId = created.id;
+
+    const canceledAt = "2026-09-08T18:00:00.000Z";
+
+    const { status, data } = await api.patch<Customer>(
+      `/api/customers/${customerId}`,
+      { subscriptionCanceledAt: canceledAt },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.subscriptionCanceledAt).toEqual(canceledAt);
+
+    const { status: clearStatus, data: cleared } = await api.patch<Customer>(
+      `/api/customers/${customerId}`,
+      { subscriptionCanceledAt: null },
+    );
+
+    expect(clearStatus).toEqual(200);
+    expect(cleared.subscriptionCanceledAt).toBeNull();
+  } finally {
+    await deleteCustomer(api, customerId);
+  }
+});
+
 test("GET /customers – by externalId with includeExpandedFields", async ({
   api,
 }) => {
diff --git a/apps/web/playwright/api/discount-codes/discount-codes.spec.ts b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
new file mode 100644
index 00000000000..55ab1507cce
--- /dev/null
+++ b/apps/web/playwright/api/discount-codes/discount-codes.spec.ts
@@ -0,0 +1,710 @@
+import { createId } from "@/lib/api/create-id";
+import { constructDiscountCode } from "@/lib/discounts/construct-discount-code";
+import { prisma } from "@/lib/prisma";
+import { DiscountCodeSchema } from "@/lib/zod/schemas/discount";
+import { DEFAULT_ADDITIONAL_PARTNER_LINKS } from "@/lib/zod/schemas/groups";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { DiscountProvider, RewardStructure } from "@prisma/client";
+import * as z from "zod/v4";
+import { test, type ApiClient } from "../fixtures";
+import {
+  createPartner as createPartnerApi,
+  deletePartner,
+} from "../partners/helpers";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+type DiscountCode = z.infer<typeof DiscountCodeSchema>;
+
+test.describe.configure({
+  mode: "parallel",
+});
+
+const customDiscount = {
+  amount: 10,
+  type: RewardStructure.percentage,
+  maxDuration: 6,
+  provider: DiscountProvider.custom,
+};
+
+let customDiscountId: string | undefined;
+let partnerGroupId: string | undefined;
+
+test.beforeAll(async ({ program }) => {
+  const group = await prisma.partnerGroup.create({
+    data: {
+      id: createId({ prefix: "grp_" }),
+      programId: program.id,
+      slug: `pw-dcode-${nanoid(8).toLowerCase()}`,
+      name: "Playwright Discount Codes",
+      maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+    },
+  });
+
+  const discount = await prisma.discount.create({
+    data: {
+      id: createId({ prefix: "disc_" }),
+      programId: program.id,
+      groupId: group.id,
+      ...customDiscount,
+    },
+  });
+
+  await prisma.partnerGroup.update({
+    where: {
+      id: group.id,
+    },
+    data: {
+      discountId: discount.id,
+    },
+  });
+
+  await prisma.partnerGroupDefaultLink.create({
+    data: {
+      id: createId({ prefix: "pgdl_" }),
+      programId: program.id,
+      groupId: group.id,
+      domain: TEST_WORKSPACE.program.domain,
+      url: TEST_WORKSPACE.program.url,
+    },
+  });
+
+  partnerGroupId = group.id;
+  customDiscountId = discount.id;
+});
+
+test.afterAll(async () => {
+  if (partnerGroupId) {
+    const programEnrollments = await prisma.programEnrollment.findMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+      select: {
+        partnerId: true,
+      },
+    });
+
+    for (const enrollment of programEnrollments) {
+      await deletePartner(enrollment.partnerId);
+    }
+
+    await prisma.partnerGroupDefaultLink.deleteMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+    });
+
+    await prisma.partnerGroup.update({
+      where: {
+        id: partnerGroupId,
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    await prisma.discount.updateMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+      data: {
+        groupId: null,
+      },
+    });
+
+    await prisma.partnerGroup.delete({
+      where: {
+        id: partnerGroupId,
+      },
+    });
+  }
+
+  if (customDiscountId) {
+    await prisma.discountCode.deleteMany({
+      where: {
+        discountId: customDiscountId,
+      },
+    });
+
+    await prisma.programEnrollment.updateMany({
+      where: {
+        discountId: customDiscountId,
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    await prisma.discount.delete({
+      where: {
+        id: customDiscountId,
+      },
+    });
+  }
+});
+
+async function createPartner(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  if (!partnerGroupId) {
+    throw new Error("Custom discount group was not seeded.");
+  }
+
+  return createPartnerApi(api, {
+    groupId: partnerGroupId,
+    ...overrides,
+  });
+}
+
+async function createDiscountCode(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  const { data: partner } = await createPartner(api);
+  const linkId = partner.links?.[0]?.id;
+
+  if (!linkId) {
+    throw new Error("Partner was created without a default link.");
+  }
+
+  const body = {
+    partnerId: partner.id,
+    linkId,
+    code: `PW${nanoid(8)}`,
+    ...overrides,
+  };
+
+  const response = await api.post<DiscountCode>("/api/discount-codes", body);
+
+  return { partner, linkId, body, ...response };
+}
+
+test("POST /discount-codes", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { status, data, partner, body } = await createDiscountCode(api);
+    partnerId = partner.id;
+
+    expect(status).toEqual(200);
+    expect(data).toEqual({
+      id: expect.any(String),
+      code: body.code,
+      discountId: customDiscountId,
+      partnerId: partner.id,
+      linkId: body.linkId,
+      disabledAt: null,
+    });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /discount-codes – omits code and auto-generates", async ({
+  api,
+}) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const linkId = partner.links?.[0]?.id;
+
+    const { status, data } = await api.post<DiscountCode>(
+      "/api/discount-codes",
+      {
+        partnerId: partner.id,
+        linkId,
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.code).toEqual(expect.any(String));
+    expect(data.code.length).toBeGreaterThan(0);
+    expect(data.partnerId).toEqual(partner.id);
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /discount-codes – empty code auto-generates", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const linkId = partner.links?.[0]?.id;
+
+    const { status, data } = await api.post<DiscountCode>(
+      "/api/discount-codes",
+      {
+        partnerId: partner.id,
+        linkId,
+        code: "",
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.code).toEqual(expect.any(String));
+    expect(data.code.length).toBeGreaterThan(0);
+    expect(data.partnerId).toEqual(partner.id);
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /discount-codes – auto-generated first-name collision retries", async ({
+  api,
+}) => {
+  let partnerIdA: string | undefined;
+  let partnerIdB: string | undefined;
+
+  try {
+    const firstName = `Sarah${nanoid(6)}`;
+    const { data: partnerA } = await createPartner(api, {
+      name: `${firstName} One`,
+    });
+    const { data: partnerB } = await createPartner(api, {
+      name: `${firstName} Two`,
+    });
+    partnerIdA = partnerA.id;
+    partnerIdB = partnerB.id;
+
+    const expectedBase = constructDiscountCode({
+      partner: partnerA,
+      discount: customDiscount,
+    });
+
+    const first = await api.post<DiscountCode>("/api/discount-codes", {
+      partnerId: partnerA.id,
+      linkId: partnerA.links?.[0]?.id,
+    });
+    const second = await api.post<DiscountCode>("/api/discount-codes", {
+      partnerId: partnerB.id,
+      linkId: partnerB.links?.[0]?.id,
+    });
+
+    expect(first.status).toEqual(200);
+    expect(second.status).toEqual(200);
+    expect(first.data.code).toEqual(expectedBase);
+    expect(second.data.code).not.toEqual(first.data.code);
+    expect(second.data.code.startsWith(expectedBase)).toBe(true);
+    expect(second.data.code.length).toEqual(expectedBase.length + 2);
+  } finally {
+    await deletePartner(partnerIdA);
+    await deletePartner(partnerIdB);
+  }
+});
+
+test("POST /discount-codes – uses link-level discount over enrollment discount", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  let linkDiscountId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const linkId = partner.links?.[0]?.id;
+
+    if (!linkId) {
+      throw new Error("Partner was created without a default link.");
+    }
+
+    const linkDiscount = await prisma.discount.create({
+      data: {
+        id: createId({ prefix: "disc_" }),
+        programId: program.id,
+        ...customDiscount,
+        amount: 25,
+      },
+    });
+    linkDiscountId = linkDiscount.id;
+
+    await prisma.linkReward.create({
+      data: {
+        linkId,
+        discountId: linkDiscount.id,
+      },
+    });
+
+    const { status, data } = await api.post<DiscountCode>(
+      "/api/discount-codes",
+      {
+        partnerId: partner.id,
+        linkId,
+        code: `PW${nanoid(8)}`,
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.discountId).toEqual(linkDiscount.id);
+  } finally {
+    try {
+      await deletePartner(partnerId);
+    } finally {
+      if (linkDiscountId) {
+        await prisma.linkReward.deleteMany({
+          where: {
+            discountId: linkDiscountId,
+          },
+        });
+
+        await prisma.discount.deleteMany({
+          where: {
+            id: linkDiscountId,
+          },
+        });
+      }
+    }
+  }
+});
+
+test("POST /discount-codes – uses link-level discount when enrollment has none", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  let linkDiscountId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const linkId = partner.links?.[0]?.id;
+
+    if (!linkId) {
+      throw new Error("Partner was created without a default link.");
+    }
+
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: partner.id,
+          programId: program.id,
+        },
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    const linkDiscount = await prisma.discount.create({
+      data: {
+        id: createId({ prefix: "disc_" }),
+        programId: program.id,
+        ...customDiscount,
+        amount: 15,
+      },
+    });
+    linkDiscountId = linkDiscount.id;
+
+    await prisma.linkReward.create({
+      data: {
+        linkId,
+        discountId: linkDiscount.id,
+      },
+    });
+
+    const { status, data } = await api.post<DiscountCode>(
+      "/api/discount-codes",
+      {
+        partnerId: partner.id,
+        linkId,
+        code: `PW${nanoid(8)}`,
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data.discountId).toEqual(linkDiscount.id);
+  } finally {
+    try {
+      await deletePartner(partnerId);
+    } finally {
+      if (linkDiscountId) {
+        await prisma.linkReward.deleteMany({
+          where: {
+            discountId: linkDiscountId,
+          },
+        });
+
+        await prisma.discount.deleteMany({
+          where: {
+            id: linkDiscountId,
+          },
+        });
+      }
+    }
+  }
+});
+
+test("POST /discount-codes – same link", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.post("/api/discount-codes", {
+      partnerId: created.partner.id,
+      linkId: created.linkId,
+      code: `PW${nanoid(8)}`,
+    });
+
+    expect(status).toEqual(400);
+    expect(data).toEqual({
+      error: {
+        code: "bad_request",
+        message: `This link already has a discount code (${created.data.code}) assigned.`,
+        doc_url: "https://dub.co/docs/api-reference/errors#bad-request",
+      },
+    });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /discount-codes – duplicate code", async ({ api }) => {
+  let partnerIdA: string | undefined;
+  let partnerIdB: string | undefined;
+
+  try {
+    const first = await createDiscountCode(api);
+    partnerIdA = first.partner.id;
+
+    const { data: partnerB } = await createPartner(api);
+    partnerIdB = partnerB.id;
+
+    const { status, data } = await api.post("/api/discount-codes", {
+      partnerId: partnerB.id,
+      linkId: partnerB.links?.[0]?.id,
+      code: first.body.code,
+    });
+
+    expect(status).toEqual(409);
+    expect(data).toMatchObject({
+      error: {
+        code: "conflict",
+        message: expect.stringContaining(
+          `This discount code "${first.body.code}" is already in use`,
+        ),
+        doc_url: "https://dub.co/docs/api-reference/errors#conflict",
+      },
+    });
+  } finally {
+    await deletePartner(partnerIdA);
+    await deletePartner(partnerIdB);
+  }
+});
+
+test("POST /discount-codes – custom provider allows special characters", async ({
+  api,
+}) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { status, data, partner, body } = await createDiscountCode(api, {
+      code: `NOT VALID!@10.${nanoid(6)}`,
+    });
+    partnerId = partner.id;
+
+    expect(status).toEqual(200);
+    expect(data).toEqual({
+      id: expect.any(String),
+      code: body.code,
+      discountId: customDiscountId,
+      partnerId: partner.id,
+      linkId: body.linkId,
+      disabledAt: null,
+    });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /discount-codes – too long", async ({ api }) => {
+  expect(
+    await api.post("/api/discount-codes", {
+      partnerId: "pn_x",
+      linkId: "link_x",
+      code: "A".repeat(101),
+    }),
+  ).toEqual({
+    status: 422,
+    data: {
+      error: {
+        code: "unprocessable_entity",
+        message: "too_big: code: Code must be 100 characters or fewer.",
+        doc_url:
+          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
+      },
+    },
+  });
+});
+
+test("POST /discount-codes – missing partnerId", async ({ api }) => {
+  expect(
+    await api.post("/api/discount-codes", {
+      linkId: "link_missing",
+      code: `PW${nanoid(8)}`,
+    }),
+  ).toEqual({
+    status: 422,
+    data: {
+      error: {
+        code: "unprocessable_entity",
+        message:
+          "invalid_type: partnerId: Invalid input: expected string, received undefined",
+        doc_url:
+          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
+      },
+    },
+  });
+});
+
+test("GET /discount-codes – by partnerId", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.get<DiscountCode[]>(
+      `/api/discount-codes?partnerId=${partnerId}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toEqual([created.data]);
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /discount-codes – by discountId", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.get<DiscountCode[]>(
+      `/api/discount-codes?discountId=${created.data.discountId}&partnerId=${partnerId}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data.map((code) => code.id)).toContain(created.data.id);
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /discount-codes – by code", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.get<DiscountCode[]>(
+      `/api/discount-codes?code=${encodeURIComponent(created.data.code)}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toEqual([created.data]);
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /discount-codes – pagination", async ({ api }) => {
+  let partnerIdA: string | undefined;
+  let partnerIdB: string | undefined;
+
+  try {
+    const first = await createDiscountCode(api);
+    const second = await createDiscountCode(api);
+    partnerIdA = first.partner.id;
+    partnerIdB = second.partner.id;
+
+    const { status, data } = await api.get<DiscountCode[]>(
+      "/api/discount-codes?pageSize=1&page=1",
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toHaveLength(1);
+  } finally {
+    await deletePartner(partnerIdA);
+    await deletePartner(partnerIdB);
+  }
+});
+
+test("GET /discount-codes – unknown partner", async ({ api, program }) => {
+  expect(
+    await api.get("/api/discount-codes?partnerId=pn_does_not_exist"),
+  ).toEqual({
+    status: 404,
+    data: {
+      error: {
+        code: "not_found",
+        message: `Partner pn_does_not_exist is not enrolled in program ${program.id}.`,
+        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
+      },
+    },
+  });
+});
+
+test("DELETE /discount-codes/{idOrCode} – by id", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.delete<{ id: string }>(
+      `/api/discount-codes/${created.data.id}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toEqual({ id: created.data.id });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("DELETE /discount-codes/{idOrCode} – by code", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const created = await createDiscountCode(api);
+    partnerId = created.partner.id;
+
+    const { status, data } = await api.delete<{ id: string }>(
+      `/api/discount-codes/${created.data.code}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toEqual({ id: created.data.id });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+for (const idOrCode of ["dcode_does_not_exist", "CODE_DOES_NOT_EXIST"]) {
+  test(`DELETE /discount-codes/{idOrCode} – not found (${idOrCode})`, async ({
+    api,
+  }) => {
+    const { status, data } = await api.delete(
+      `/api/discount-codes/${idOrCode}`,
+    );
+
+    expect(status).toEqual(404);
+    expect(data).toEqual({
+      error: {
+        code: "not_found",
+        message: `Discount code (${idOrCode}) not found.`,
+        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
+      },
+    });
+  });
+}
diff --git a/apps/web/playwright/api/discounts/discounts.spec.ts b/apps/web/playwright/api/discounts/discounts.spec.ts
new file mode 100644
index 00000000000..bec2fca1980
--- /dev/null
+++ b/apps/web/playwright/api/discounts/discounts.spec.ts
@@ -0,0 +1,403 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type {
+  Customer,
+  CustomerEnriched,
+  DiscountProps,
+  EnrolledPartnerProps,
+  GroupProps,
+} from "@/lib/types";
+import { DEFAULT_ADDITIONAL_PARTNER_LINKS } from "@/lib/zod/schemas/groups";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { DiscountProvider, RewardStructure } from "@prisma/client";
+import { randomCustomer, randomName } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import {
+  createPartner as createPartnerApi,
+  deletePartner,
+} from "../partners/helpers";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+test.describe.configure({
+  mode: "parallel",
+});
+
+const customDiscount = {
+  amount: 10,
+  type: RewardStructure.percentage,
+  maxDuration: 6,
+  provider: DiscountProvider.custom,
+};
+
+const expectedCustomDiscount = {
+  ...customDiscount,
+  couponId: null,
+  couponTestId: null,
+  description: null,
+  autoProvisionEnabledAt: null,
+};
+
+const expectedCustomerDiscount = {
+  id: expect.any(String),
+  amount: customDiscount.amount,
+  type: customDiscount.type,
+  maxDuration: customDiscount.maxDuration,
+  couponId: null,
+  couponTestId: null,
+  description: null,
+};
+
+let customDiscountId: string | undefined;
+let partnerGroupId: string | undefined;
+
+test.beforeAll(async ({ program }) => {
+  const group = await prisma.partnerGroup.create({
+    data: {
+      id: createId({ prefix: "grp_" }),
+      programId: program.id,
+      slug: `pw-disc-${nanoid(8).toLowerCase()}`,
+      name: "Playwright Custom Discounts",
+      maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+    },
+  });
+
+  const discount = await prisma.discount.create({
+    data: {
+      id: createId({ prefix: "disc_" }),
+      programId: program.id,
+      groupId: group.id,
+      ...customDiscount,
+    },
+  });
+
+  await prisma.partnerGroup.update({
+    where: {
+      id: group.id,
+    },
+    data: {
+      discountId: discount.id,
+    },
+  });
+
+  await prisma.partnerGroupDefaultLink.create({
+    data: {
+      id: createId({ prefix: "pgdl_" }),
+      programId: program.id,
+      groupId: group.id,
+      domain: TEST_WORKSPACE.program.domain,
+      url: TEST_WORKSPACE.program.url,
+    },
+  });
+
+  partnerGroupId = group.id;
+  customDiscountId = discount.id;
+});
+
+test.afterAll(async () => {
+  if (partnerGroupId) {
+    const programEnrollments = await prisma.programEnrollment.findMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+      select: {
+        partnerId: true,
+      },
+    });
+
+    for (const enrollment of programEnrollments) {
+      await deletePartner(enrollment.partnerId);
+    }
+
+    await prisma.partnerGroupDefaultLink.deleteMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+    });
+
+    await prisma.partnerGroup.update({
+      where: {
+        id: partnerGroupId,
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    await prisma.discount.updateMany({
+      where: {
+        groupId: partnerGroupId,
+      },
+      data: {
+        groupId: null,
+      },
+    });
+
+    await prisma.partnerGroup.delete({
+      where: {
+        id: partnerGroupId,
+      },
+    });
+  }
+
+  if (customDiscountId) {
+    await prisma.discountCode.deleteMany({
+      where: {
+        discountId: customDiscountId,
+      },
+    });
+
+    await prisma.programEnrollment.updateMany({
+      where: {
+        discountId: customDiscountId,
+      },
+      data: {
+        discountId: null,
+      },
+    });
+
+    await prisma.discount.delete({
+      where: {
+        id: customDiscountId,
+      },
+    });
+  }
+});
+
+async function createPartner(api: ApiClient) {
+  if (!partnerGroupId) {
+    throw new Error("Custom discount group was not seeded.");
+  }
+
+  return createPartnerApi(api, {
+    groupId: partnerGroupId,
+  });
+}
+
+async function createCustomerWithCustomDiscount({
+  api,
+  program,
+}: {
+  api: ApiClient;
+  program: { id: string };
+}) {
+  const { data: partner } = await createPartner(api);
+  const linkId = partner.links?.[0]?.id;
+
+  if (!linkId) {
+    throw new Error("Partner was created without a default link.");
+  }
+
+  const { data: customer } = await api.post<Customer>(
+    "/api/customers",
+    randomCustomer(),
+  );
+
+  await prisma.customer.update({
+    where: {
+      id: customer.id,
+    },
+    data: {
+      linkId,
+      partnerId: partner.id,
+      programId: program.id,
+    },
+  });
+
+  return { partner, customer };
+}
+
+async function deleteCustomer(api: ApiClient, id: string | undefined) {
+  if (!id) return;
+  await api.delete(`/api/customers/${id}`);
+}
+
+test("GET /api/discounts – lists discounts with partnersCount", async ({
+  api,
+}) => {
+  const { status, data } =
+    await api.get<
+      (DiscountProps & { groupId: string | null; partnersCount: number })[]
+    >("/api/discounts");
+
+  expect(status).toEqual(200);
+
+  const discount = data.find((item) => item.id === customDiscountId);
+
+  expect(discount).toEqual({
+    id: customDiscountId,
+    groupId: partnerGroupId,
+    ...expectedCustomDiscount,
+    partnersCount: expect.any(Number),
+  });
+});
+
+test("GET /api/discounts?groupId= – includes group default", async ({
+  api,
+}) => {
+  const { status, data } = await api.get<
+    (DiscountProps & { groupId: string | null; partnersCount: number })[]
+  >(`/api/discounts?groupId=${partnerGroupId}`);
+
+  expect(status).toEqual(200);
+  expect(data).toEqual([
+    {
+      id: customDiscountId,
+      groupId: partnerGroupId,
+      ...expectedCustomDiscount,
+      partnersCount: expect.any(Number),
+    },
+  ]);
+});
+
+test("GET /groups/{id} – nested custom discount", async ({ api }) => {
+  const { status, data } = await api.get<GroupProps>(
+    `/api/groups/${partnerGroupId}`,
+  );
+
+  expect(status).toEqual(200);
+  expect(data.discount).toEqual({
+    id: customDiscountId,
+    ...expectedCustomDiscount,
+  });
+});
+
+test("GET /groups/{id} – group without discount", async ({ api, program }) => {
+  let groupId: string | undefined;
+
+  try {
+    const group = await prisma.partnerGroup.create({
+      data: {
+        id: createId({ prefix: "grp_" }),
+        programId: program.id,
+        slug: `pw-nodisc-${nanoid(8).toLowerCase()}`,
+        name: randomName("group"),
+        maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+      },
+    });
+    groupId = group.id;
+
+    const { status, data } = await api.get<GroupProps>(
+      `/api/groups/${groupId}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data.discount).toBeNull();
+  } finally {
+    if (groupId) {
+      await prisma.partnerGroup.delete({
+        where: {
+          id: groupId,
+        },
+      });
+    }
+  }
+});
+
+test("GET /partners/{id} – custom discount", async ({ api }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const { status, data } = await api.get<
+      EnrolledPartnerProps & {
+        discount: Pick<DiscountProps, "id" | "provider"> | null;
+      }
+    >(`/api/partners/${partnerId}`);
+
+    expect(status).toEqual(200);
+    expect(data.discount).toEqual({
+      id: customDiscountId,
+      provider: DiscountProvider.custom,
+    });
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /customers/{id} – custom discount", async ({ api, program }) => {
+  let partnerId: string | undefined;
+  let customerId: string | undefined;
+
+  try {
+    const { partner, customer } = await createCustomerWithCustomDiscount({
+      api,
+      program,
+    });
+    partnerId = partner.id;
+    customerId = customer.id;
+
+    const { status, data } = await api.get<CustomerEnriched>(
+      `/api/customers/${customerId}?includeExpandedFields=true`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data.discount).toMatchObject({
+      ...expectedCustomerDiscount,
+      id: customDiscountId,
+    });
+    expect(data.discount).not.toHaveProperty("provider");
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /customers?email= – custom discount", async ({ api, program }) => {
+  let partnerId: string | undefined;
+  let customerId: string | undefined;
+
+  try {
+    const { partner, customer } = await createCustomerWithCustomDiscount({
+      api,
+      program,
+    });
+    partnerId = partner.id;
+    customerId = customer.id;
+
+    const { status, data: customers } = await api.get<CustomerEnriched[]>(
+      `/api/customers?email=${encodeURIComponent(customer.email!)}&includeExpandedFields=true`,
+    );
+
+    expect(status).toEqual(200);
+    expect(customers[0].discount).toMatchObject({
+      ...expectedCustomerDiscount,
+      id: customDiscountId,
+    });
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
+
+test("GET /customers?externalId= – custom discount", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  let customerId: string | undefined;
+
+  try {
+    const { partner, customer } = await createCustomerWithCustomDiscount({
+      api,
+      program,
+    });
+    partnerId = partner.id;
+    customerId = customer.id;
+
+    const { status, data: customers } = await api.get<CustomerEnriched[]>(
+      `/api/customers?externalId=${encodeURIComponent(customer.externalId!)}&includeExpandedFields=true`,
+    );
+
+    expect(status).toEqual(200);
+    expect(customers[0].discount).toMatchObject({
+      ...expectedCustomerDiscount,
+      id: customDiscountId,
+    });
+  } finally {
+    await deleteCustomer(api, customerId);
+    await deletePartner(partnerId);
+  }
+});
diff --git a/apps/web/playwright/api/domains/domains.spec.ts b/apps/web/playwright/api/domains/domains.spec.ts
index 757b776d883..70ba8a29868 100644
--- a/apps/web/playwright/api/domains/domains.spec.ts
+++ b/apps/web/playwright/api/domains/domains.spec.ts
@@ -1,6 +1,6 @@
 import type { DomainProps } from "@/lib/types";
 import { expect } from "@playwright/test";
-import { randomName } from "../../utils";
+import { apiError, randomName } from "../../utils";
 import { test, type ApiClient } from "../fixtures";
 
 test.describe.configure({
@@ -283,51 +283,31 @@ test("DELETE /domains/{slug}", async ({ api }) => {
 });
 
 test("GET /domains/status – not eligible", async ({ api }) => {
-  const { status, data } = await api.get(
-    "/api/domains/status?domains=example.link",
-  );
-
-  expect(status).toEqual(403);
-  expect(data).toEqual({
-    error: {
+  expect(await api.get("/api/domains/status?domains=example.link")).toEqual(
+    apiError({
       code: "forbidden",
       message:
         "GET /domains/status is not available for your workspace. Contact support for more information.",
-      doc_url: "https://dub.co/docs/api-reference/errors#forbidden",
-    },
-  });
+    }),
+  );
 });
 
 const errorCases = [
   {
     name: "POST /domains – without slug",
     body: {},
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message: "invalid_type: slug: slug is required",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message: "invalid_type: slug: slug is required",
+    }),
   },
   {
     name: "POST /domains – invalid domain",
     body: { slug: "not a domain" },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message: "Invalid domain",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message: "Invalid domain",
+    }),
   },
 ];
 
@@ -348,14 +328,12 @@ test("POST /domains – existing slug", async ({ api }) => {
       slug,
     });
 
-    expect(status).toEqual(409);
-    expect(data).toEqual({
-      error: {
+    expect({ status, data }).toEqual(
+      apiError({
         code: "conflict",
         message: "Domain is already in use.",
-        doc_url: "https://dub.co/docs/api-reference/errors#conflict",
-      },
-    });
+      }),
+    );
   } finally {
     await deleteDomain(api, slug);
   }
@@ -366,14 +344,12 @@ test("GET /domains/{slug} – not found", async ({ api }) => {
 
   const { status, data } = await api.get(`/api/domains/${slug}`);
 
-  expect(status).toEqual(404);
-  expect(data).toEqual({
-    error: {
+  expect({ status, data }).toEqual(
+    apiError({
       code: "not_found",
       message: `Domain ${slug} not found.`,
-      doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-    },
-  });
+    }),
+  );
 });
 
 test.describe("JSON config fields", () => {
@@ -490,17 +466,12 @@ test.describe("JSON config fields", () => {
           ...domainBody(slug),
           [field]: INVALID_JSON,
         }),
-      ).toEqual({
-        status: 422,
-        data: {
-          error: {
-            code: "unprocessable_entity",
-            message: `Invalid ${label}`,
-            doc_url:
-              "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-          },
-        },
-      });
+      ).toEqual(
+        apiError({
+          code: "unprocessable_entity",
+          message: `Invalid ${label}`,
+        }),
+      );
     });
 
     test(`PATCH /domains/{slug} – invalid ${field} JSON`, async ({ api }) => {
@@ -514,17 +485,12 @@ test.describe("JSON config fields", () => {
           await api.patch(`/api/domains/${slug}`, {
             [field]: INVALID_JSON,
           }),
-        ).toEqual({
-          status: 422,
-          data: {
-            error: {
-              code: "unprocessable_entity",
-              message: `Invalid ${label}`,
-              doc_url:
-                "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-            },
-          },
-        });
+        ).toEqual(
+          apiError({
+            code: "unprocessable_entity",
+            message: `Invalid ${label}`,
+          }),
+        );
       } finally {
         await deleteDomain(api, slug);
       }
diff --git a/apps/web/playwright/api/domains/program-domain.spec.ts b/apps/web/playwright/api/domains/program-domain.spec.ts
new file mode 100644
index 00000000000..447785b701c
--- /dev/null
+++ b/apps/web/playwright/api/domains/program-domain.spec.ts
@@ -0,0 +1,154 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { DomainProps } from "@/lib/types";
+import { expect } from "@playwright/test";
+import { apiError, randomName } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+test.describe.configure({
+  mode: "serial",
+});
+
+function randomDomainSlug() {
+  return `${randomName("domain").toLowerCase()}.dub-internal-test.com`;
+}
+
+async function createDomain(api: ApiClient) {
+  const slug = randomDomainSlug();
+  const response = await api.post<DomainProps>("/api/domains", { slug });
+  expect(response.status).toEqual(201);
+  return response.data;
+}
+
+async function deleteDomain(api: ApiClient, slug: string | undefined) {
+  if (!slug) return;
+  await api.delete(`/api/domains/${slug}`);
+}
+
+const alreadyProgramDomainError = apiError({
+  code: "bad_request",
+  message: "This domain is already the program domain.",
+});
+
+async function restoreProgramDomain(api: ApiClient) {
+  const response = await api.post(
+    `/api/domains/${TEST_WORKSPACE.program.domain}/program`,
+  );
+
+  if (response.status === 200) {
+    return;
+  }
+
+  expect(response).toEqual(alreadyProgramDomainError);
+}
+
+test("POST /domains/{slug}/program", async ({ api, program }) => {
+  let slug: string | undefined;
+  let changed = false;
+
+  try {
+    const created = await createDomain(api);
+    slug = created.slug;
+
+    const { status, data } = await api.post<DomainProps>(
+      `/api/domains/${slug}/program`,
+    );
+    changed = true;
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual(created);
+
+    const { status: programStatus, data: updatedProgram } = await api.get<{
+      domain: string;
+    }>(`/api/programs/${program.id}`);
+
+    expect(programStatus).toEqual(200);
+    expect(updatedProgram.domain).toEqual(slug);
+
+    const { status: linksStatus, data: defaultLinks } = await api.get<
+      { domain: string }[]
+    >(`/api/groups/${program.defaultGroupId}/default-links`);
+
+    expect(linksStatus).toEqual(200);
+    expect(defaultLinks.length).toBeGreaterThan(0);
+    expect(defaultLinks.every((link) => link.domain === slug)).toBe(true);
+  } finally {
+    if (changed) {
+      await restoreProgramDomain(api);
+    }
+    await deleteDomain(api, slug);
+  }
+});
+
+test("POST /domains/{slug}/program – already the program domain", async ({
+  api,
+}) => {
+  expect(
+    await api.post(`/api/domains/${TEST_WORKSPACE.program.domain}/program`),
+  ).toEqual(alreadyProgramDomainError);
+});
+
+test("POST /domains/{slug}/program – archived domain", async ({ api }) => {
+  let slug: string | undefined;
+
+  try {
+    const created = await createDomain(api);
+    slug = created.slug;
+
+    const { status: archiveStatus } = await api.patch(`/api/domains/${slug}`, {
+      archived: true,
+    });
+    expect(archiveStatus).toEqual(200);
+
+    expect(await api.post(`/api/domains/${slug}/program`)).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "You cannot set an archived domain as the program domain.",
+      }),
+    );
+  } finally {
+    await deleteDomain(api, slug);
+  }
+});
+
+test("POST /domains/{slug}/program – not found", async ({ api }) => {
+  const slug = randomDomainSlug();
+
+  expect(await api.post(`/api/domains/${slug}/program`)).toEqual(
+    apiError({
+      code: "not_found",
+      message: `Domain ${slug} not found.`,
+    }),
+  );
+});
+
+test("POST /domains/{slug}/program – another workspace", async ({ api }) => {
+  const slug = randomDomainSlug();
+
+  await prisma.domain.create({
+    data: {
+      id: createId({ prefix: "dom_" }),
+      slug,
+    },
+  });
+
+  try {
+    const { status, data } = await api.post(`/api/domains/${slug}/program`);
+
+    expect(status).toEqual(403);
+    expect(data).toEqual({
+      error: {
+        code: "forbidden",
+        message: expect.stringContaining(
+          `Domain ${slug} does not belong to workspace`,
+        ),
+        doc_url: "https://dub.co/docs/api-reference/errors#forbidden",
+      },
+    });
+  } finally {
+    await prisma.domain.delete({
+      where: { slug },
+    });
+  }
+});
diff --git a/apps/web/playwright/api/embed/referrals-links.spec.ts b/apps/web/playwright/api/embed/referrals-links.spec.ts
new file mode 100644
index 00000000000..84fb1e6e466
--- /dev/null
+++ b/apps/web/playwright/api/embed/referrals-links.spec.ts
@@ -0,0 +1,238 @@
+import { prisma } from "@/lib/prisma";
+import { ReferralsEmbedLinkSchema } from "@/lib/zod/schemas/referrals-embed";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import * as z from "zod/v4";
+import { apiError } from "../../utils";
+import { createBearerApiClient, test } from "../fixtures";
+import {
+  createGroupWithAdditionalLinks,
+  createPartner,
+  deletePartner,
+} from "../partners/helpers";
+
+type ReferralsEmbedLink = z.infer<typeof ReferralsEmbedLinkSchema>;
+
+test.describe.configure({ mode: "serial" });
+
+test("GET /embed/referrals/links", async ({ api, playwright }) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const { status: tokenStatus, data: token } = await api.post<{
+      publicToken: string;
+    }>("/api/tokens/embed/referrals", { partnerId: partner.id });
+    expect(tokenStatus).toEqual(201);
+
+    const { api: embedApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: token.publicToken,
+    });
+
+    try {
+      const { status, data } = await embedApi.get<ReferralsEmbedLink[]>(
+        "/api/embed/referrals/links",
+      );
+
+      expect(status).toEqual(200);
+      expect(data).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: partner.links![0].id }),
+        ]),
+      );
+    } finally {
+      await dispose();
+    }
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /embed/referrals/links - default URL", async ({
+  api,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const { data: token } = await api.post<{ publicToken: string }>(
+      "/api/tokens/embed/referrals",
+      { partnerId: partner.id },
+    );
+    const { api: embedApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: token.publicToken,
+    });
+    const key = nanoid(8);
+
+    try {
+      const { status, data } = await embedApi.post<ReferralsEmbedLink>(
+        "/api/embed/referrals/links",
+        { key },
+      );
+
+      expect(status).toEqual(201);
+      expect(data).toMatchObject({
+        id: expect.any(String),
+        domain: expect.any(String),
+        key,
+        shortLink: `https://${data.domain}/${key}`,
+      });
+    } finally {
+      await dispose();
+    }
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /embed/referrals/links - URL outside additionalLinks", async ({
+  api,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const { data: token } = await api.post<{ publicToken: string }>(
+      "/api/tokens/embed/referrals",
+      { partnerId: partner.id },
+    );
+    const { api: embedApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: token.publicToken,
+    });
+
+    try {
+      expect(
+        await embedApi.post("/api/embed/referrals/links", {
+          key: nanoid(8),
+          url: `https://github.com/dubinc/${nanoid()}`,
+        }),
+      ).toEqual(
+        apiError({
+          code: "bad_request",
+          message: "You cannot create additional links for this program.",
+        }),
+      );
+    } finally {
+      await dispose();
+    }
+  } finally {
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /embed/referrals/links - allowed additionalLinks domain", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let groupId: string | undefined;
+
+  try {
+    const group = await createGroupWithAdditionalLinks(program.id);
+    groupId = group.id;
+
+    const { data: partner } = await createPartner(api, { groupId });
+    partnerId = partner.id;
+
+    const { data: token } = await api.post<{ publicToken: string }>(
+      "/api/tokens/embed/referrals",
+      { partnerId: partner.id },
+    );
+    const { api: embedApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: token.publicToken,
+    });
+    const url = `https://example.com/${nanoid()}`;
+
+    try {
+      const { status, data } = await embedApi.post<ReferralsEmbedLink>(
+        "/api/embed/referrals/links",
+        { key: nanoid(8), url },
+      );
+
+      expect(status).toEqual(201);
+      expect(data.url).toEqual(url);
+    } finally {
+      await dispose();
+    }
+  } finally {
+    await deletePartner(partnerId);
+    if (groupId) await prisma.partnerGroup.delete({ where: { id: groupId } });
+  }
+});
+
+test("POST /embed/referrals/links - mismatched additionalLinks domain", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let groupId: string | undefined;
+
+  try {
+    const group = await createGroupWithAdditionalLinks(program.id);
+    groupId = group.id;
+
+    const { data: partner } = await createPartner(api, { groupId });
+    partnerId = partner.id;
+
+    const { data: token } = await api.post<{ publicToken: string }>(
+      "/api/tokens/embed/referrals",
+      { partnerId: partner.id },
+    );
+    const { api: embedApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: token.publicToken,
+    });
+
+    try {
+      expect(
+        await embedApi.post("/api/embed/referrals/links", {
+          key: nanoid(8),
+          url: `https://github.com/dubinc/${nanoid()}`,
+        }),
+      ).toEqual(
+        apiError({
+          code: "bad_request",
+          message:
+            "The provided URL's domain (github.com) does not match the program's link domains.",
+        }),
+      );
+    } finally {
+      await dispose();
+    }
+  } finally {
+    await deletePartner(partnerId);
+    if (groupId) await prisma.partnerGroup.delete({ where: { id: groupId } });
+  }
+});
+
+test("GET /embed/referrals/links - invalid token", async ({ playwright }) => {
+  const { api: embedApi, dispose } = await createBearerApiClient({
+    playwright,
+    token: "dub_embed_invalid",
+  });
+
+  try {
+    expect(await embedApi.get("/api/embed/referrals/links")).toEqual(
+      apiError({
+        code: "unauthorized",
+        message: "Invalid embed public token.",
+      }),
+    );
+  } finally {
+    await dispose();
+  }
+});
diff --git a/apps/web/playwright/api/fixtures.ts b/apps/web/playwright/api/fixtures.ts
index 121d3f7a2dd..ac66d68c810 100644
--- a/apps/web/playwright/api/fixtures.ts
+++ b/apps/web/playwright/api/fixtures.ts
@@ -1,6 +1,11 @@
-import { test as base, type APIRequestContext } from "@playwright/test";
+import {
+  test as base,
+  type APIRequest,
+  type APIRequestContext,
+} from "@playwright/test";
 import { readFileSync } from "fs";
 import path from "path";
+import { PLAYWRIGHT_API_BASE } from "./constants";
 
 const authFile = path.join(__dirname, "../.auth/api.json");
 
@@ -12,10 +17,17 @@ type ApiResponse<T> = {
 export type ApiClient = {
   get: <T>(url: string) => Promise<ApiResponse<T>>;
   post: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;
+  put: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;
   patch: <T>(url: string, data?: unknown) => Promise<ApiResponse<T>>;
   delete: <T>(url: string) => Promise<ApiResponse<T>>;
 };
 
+type WorkerFixtures = {
+  api: ApiClient;
+  workspace: { id: string; slug: string };
+  program: { id: string; defaultGroupId: string };
+};
+
 function loadApiAuth() {
   return JSON.parse(readFileSync(authFile, "utf-8")) as {
     token: string;
@@ -41,42 +53,69 @@ function createApiClient(request: APIRequestContext): ApiClient {
     get: <T>(url: string) => parse<T>(request.get(url)),
     post: <T>(url: string, data?: unknown) =>
       parse<T>(request.post(url, { data })),
+    put: <T>(url: string, data?: unknown) =>
+      parse<T>(request.put(url, { data })),
     patch: <T>(url: string, data?: unknown) =>
       parse<T>(request.patch(url, { data })),
     delete: <T>(url: string) => parse<T>(request.delete(url)),
   };
 }
 
-export const test = base.extend<{
-  api: ApiClient;
-  workspace: { id: string; slug: string };
-  program: { id: string; defaultGroupId: string };
-}>({
-  // Authenticated API request context (token from globalSetup → .auth/api.json).
-  request: async ({ playwright, baseURL }, use) => {
-    const { token } = loadApiAuth();
-    const context = await playwright.request.newContext({
-      baseURL,
-      extraHTTPHeaders: {
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json",
-      },
-    });
-    await use(context);
-    await context.dispose();
-  },
+export async function createBearerApiClient({
+  playwright,
+  token,
+  baseURL = PLAYWRIGHT_API_BASE,
+}: {
+  playwright: { request: APIRequest };
+  token: string;
+  baseURL?: string;
+}) {
+  const context = await playwright.request.newContext({
+    baseURL,
+    extraHTTPHeaders: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+  });
+
+  return {
+    api: createApiClient(context),
+    dispose: () => context.dispose(),
+  };
+}
 
-  api: async ({ request }, use) => {
-    await use(createApiClient(request));
-  },
+export const test = base.extend<{}, WorkerFixtures>({
+  // Authenticated API client (token from globalSetup → .auth/api.json).
+  // Worker-scoped so beforeAll hooks can use api/program (Playwright rejects test-scoped fixtures there).
+  api: [
+    async ({ playwright }, use, workerInfo) => {
+      const { token } = loadApiAuth();
+      const context = await playwright.request.newContext({
+        baseURL: workerInfo.project.use.baseURL,
+        extraHTTPHeaders: {
+          Authorization: `Bearer ${token}`,
+          "Content-Type": "application/json",
+        },
+      });
+      await use(createApiClient(context));
+      await context.dispose();
+    },
+    { scope: "worker" },
+  ],
 
-  workspace: async ({}, use) => {
-    const { workspaceId, workspaceSlug } = loadApiAuth();
-    await use({ id: workspaceId, slug: workspaceSlug });
-  },
+  workspace: [
+    async ({}, use) => {
+      const { workspaceId, workspaceSlug } = loadApiAuth();
+      await use({ id: workspaceId, slug: workspaceSlug });
+    },
+    { scope: "worker" },
+  ],
 
-  program: async ({}, use) => {
-    const { programId, defaultGroupId } = loadApiAuth();
-    await use({ id: programId, defaultGroupId });
-  },
+  program: [
+    async ({}, use) => {
+      const { programId, defaultGroupId } = loadApiAuth();
+      await use({ id: programId, defaultGroupId });
+    },
+    { scope: "worker" },
+  ],
 });
diff --git a/apps/web/playwright/api/folders/folders.spec.ts b/apps/web/playwright/api/folders/folders.spec.ts
index ca1dcede7fe..8a5101bcc0d 100644
--- a/apps/web/playwright/api/folders/folders.spec.ts
+++ b/apps/web/playwright/api/folders/folders.spec.ts
@@ -31,10 +31,6 @@ async function deleteFolder(api: ApiClient, folderId: string) {
   await api.delete(`/api/folders/${folderId}`);
 }
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("POST /folders", async ({ api }) => {
   let folderId: string | undefined;
   const folderName = randomName("folder");
diff --git a/apps/web/playwright/api/groups/helpers.ts b/apps/web/playwright/api/groups/helpers.ts
new file mode 100644
index 00000000000..e684eb32212
--- /dev/null
+++ b/apps/web/playwright/api/groups/helpers.ts
@@ -0,0 +1,263 @@
+import { prisma } from "@/lib/prisma";
+import type { EnrolledPartnerProps, GroupProps } from "@/lib/types";
+import { nanoid, sleep } from "@dub/utils";
+import { expect } from "@playwright/test";
+import type { Workflow } from "@prisma/client";
+import { randomName } from "../../utils";
+import { trackClick, trackLead, trackSale } from "../conversions/helpers";
+import type { ApiClient } from "../fixtures";
+
+export type MoveRule = {
+  attribute: string;
+  operator: string;
+  value: number | string | string[] | { min: number; max: number };
+};
+
+export function uniqueThreshold() {
+  return 10_000 + Math.floor(Math.random() * 1_000_000);
+}
+
+export async function createGroup(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  const slug = `g-${nanoid(8).toLowerCase()}`;
+  const { status, data } = await api.post<GroupProps>("/api/groups", {
+    name: randomName("group"),
+    slug,
+    color: "blue",
+    ...overrides,
+  });
+
+  expect(status).toEqual(201);
+  return data;
+}
+
+// Best effort: the response is ignored so cleanup stays safe for groups a test
+// already deleted itself.
+export async function deleteGroup(api: ApiClient, id: string | undefined) {
+  if (!id) return;
+  await api.delete(`/api/groups/${id}`);
+}
+
+export async function setMoveRules(
+  api: ApiClient,
+  groupId: string,
+  moveRules: MoveRule[] | undefined,
+) {
+  return api.patch<GroupProps>(`/api/groups/${groupId}`, {
+    ...(moveRules !== undefined && { moveRules }),
+  });
+}
+
+export async function setGroupMoveDisabledAt(
+  api: ApiClient,
+  {
+    partnerId,
+    groupId,
+    groupMoveDisabledAt,
+  }: {
+    partnerId: string;
+    groupId: string;
+    groupMoveDisabledAt: Date | string;
+  },
+) {
+  const { status } = await api.post(`/api/groups/${groupId}/partners`, {
+    partnerIds: [partnerId],
+    groupMoveDisabledAt,
+  });
+
+  expect(status).toEqual(200);
+}
+
+export async function getGroup(
+  api: ApiClient,
+  groupId: string,
+): Promise<{ status: number; data: GroupProps }> {
+  return api.get<GroupProps>(`/api/groups/${groupId}`);
+}
+
+export async function trackPartnerLead(
+  partner: Pick<EnrolledPartnerProps, "links">,
+) {
+  const link = partner.links![0];
+  const { clickId } = await trackClick({ domain: link.domain, key: link.key });
+
+  return trackLead({ clickId });
+}
+
+export async function trackPartnerSale(
+  partner: Pick<EnrolledPartnerProps, "links">,
+  overrides: Record<string, unknown> = {},
+) {
+  const link = partner.links![0];
+  const { clickId } = await trackClick({ domain: link.domain, key: link.key });
+  const { customer } = await trackLead({ clickId });
+
+  return trackSale({
+    customerExternalId: customer.externalId,
+    ...overrides,
+  });
+}
+
+export async function getGroupWorkflow(
+  groupId: string,
+): Promise<Workflow | null> {
+  return prisma.workflow.findFirst({
+    where: {
+      partnerGroup: {
+        id: groupId,
+      },
+    },
+  });
+}
+
+export async function disableWorkflow(workflowId: string) {
+  return prisma.workflow.update({
+    where: {
+      id: workflowId,
+    },
+    data: {
+      disabledAt: new Date(),
+    },
+  });
+}
+
+export async function getEnrollment({
+  partnerId,
+  programId,
+}: {
+  partnerId: string;
+  programId: string;
+}) {
+  return prisma.programEnrollment.findUniqueOrThrow({
+    where: {
+      partnerId_programId: {
+        partnerId,
+        programId,
+      },
+    },
+    select: {
+      groupId: true,
+      groupMoveDisabledAt: true,
+      leadRewardId: true,
+      saleRewardId: true,
+      discountId: true,
+      clickRewardId: true,
+      referralRewardId: true,
+    },
+  });
+}
+
+export async function expectPartnerInGroup({
+  partnerId,
+  programId,
+  expectedGroupId,
+}: {
+  partnerId: string;
+  programId: string;
+  expectedGroupId: string;
+}) {
+  await expect
+    .poll(async () => {
+      const enrollment = await getEnrollment({ partnerId, programId });
+      return enrollment.groupId;
+    })
+    .toBe(expectedGroupId);
+
+  return getEnrollment({ partnerId, programId });
+}
+
+export async function expectPartnerStaysInGroup({
+  partnerId,
+  programId,
+  expectedGroupId,
+}: {
+  partnerId: string;
+  programId: string;
+  expectedGroupId: string;
+}) {
+  // Give executeWorkflows (waitUntil after /track/lead) time to run (and skip).
+  await sleep(5_000);
+
+  const enrollment = await getEnrollment({ partnerId, programId });
+  expect(enrollment.groupId).toBe(expectedGroupId);
+  return enrollment;
+}
+
+export async function seedLinkStats(
+  linkId: string,
+  {
+    leads,
+    conversions,
+    saleAmount,
+  }: {
+    leads?: number;
+    conversions?: number;
+    saleAmount?: number;
+  },
+) {
+  await prisma.link.update({
+    where: {
+      id: linkId,
+    },
+    data: {
+      ...(leads !== undefined && { leads }),
+      ...(conversions !== undefined && { conversions }),
+      ...(saleAmount !== undefined && { saleAmount }),
+    },
+  });
+}
+
+export async function countGroupChangeActivityLogs({
+  partnerId,
+  programId,
+}: {
+  partnerId: string;
+  programId: string;
+}) {
+  return prisma.activityLog.count({
+    where: {
+      programId,
+      resourceType: "partner",
+      resourceId: partnerId,
+      action: "partner.groupChanged",
+    },
+  });
+}
+
+// removeGroupIdFromMoveRules runs in a waitUntil after DELETE /groups/:id, so
+// the scrubbed conditions land shortly after the response.
+export async function expectMoveRules({
+  groupId,
+  expected,
+}: {
+  groupId: string;
+  expected: MoveRule[];
+}) {
+  await expect
+    .poll(
+      async () => {
+        const workflow = await getGroupWorkflow(groupId);
+        return workflow?.triggerConditions ?? null;
+      },
+      { timeout: 15_000 },
+    )
+    .toEqual(expected);
+}
+
+export async function getPartnerGroupRewards(groupId: string) {
+  return prisma.partnerGroup.findUniqueOrThrow({
+    where: {
+      id: groupId,
+    },
+    select: {
+      id: true,
+      leadRewardId: true,
+      saleRewardId: true,
+      discountId: true,
+      clickRewardId: true,
+      referralRewardId: true,
+    },
+  });
+}
diff --git a/apps/web/playwright/api/groups/move-group-fixtures.ts b/apps/web/playwright/api/groups/move-group-fixtures.ts
new file mode 100644
index 00000000000..28ee5568964
--- /dev/null
+++ b/apps/web/playwright/api/groups/move-group-fixtures.ts
@@ -0,0 +1,61 @@
+import type { EnrolledPartnerProps, GroupProps } from "@/lib/types";
+import { expect } from "@playwright/test";
+import { randomName } from "../../utils";
+import { deleteCommissionPartner } from "../commissions/helpers";
+import { test as base } from "../fixtures";
+import { createPartner as createPartnerRequest } from "../partners/helpers";
+import { createGroup as createGroupRequest, deleteGroup } from "./helpers";
+
+// Everything a test created, torn down afterwards. Partners are deleted before
+// groups so a group delete doesn't have to migrate enrollments to the default
+// group on the way out.
+type CreatedResources = {
+  groupIds: string[];
+  partnerIds: string[];
+};
+
+export const test = base.extend<{
+  created: CreatedResources;
+  createGroup: (overrides?: Record<string, unknown>) => Promise<GroupProps>;
+  createPartner: (options?: {
+    groupId?: string;
+  }) => Promise<EnrolledPartnerProps>;
+}>({
+  created: async ({ api }, use) => {
+    const created: CreatedResources = { groupIds: [], partnerIds: [] };
+
+    await use(created);
+
+    for (const partnerId of created.partnerIds) {
+      await deleteCommissionPartner({ partnerId });
+    }
+
+    for (const groupId of created.groupIds) {
+      await deleteGroup(api, groupId);
+    }
+  },
+
+  createGroup: async ({ api, created }, use) => {
+    await use(async (overrides = {}) => {
+      const group = await createGroupRequest(api, overrides);
+      created.groupIds.push(group.id);
+
+      return group;
+    });
+  },
+
+  createPartner: async ({ api, created }, use) => {
+    await use(async ({ groupId } = {}) => {
+      const { status, data } = await createPartnerRequest(api, {
+        name: randomName("partner"),
+        ...(groupId && { groupId }),
+      });
+
+      expect(status).toEqual(201);
+      expect(data.links?.[0]).toBeTruthy();
+      created.partnerIds.push(data.id);
+
+      return data;
+    });
+  },
+});
diff --git a/apps/web/playwright/api/groups/move-group-workflow.spec.ts b/apps/web/playwright/api/groups/move-group-workflow.spec.ts
new file mode 100644
index 00000000000..f9ea6de894b
--- /dev/null
+++ b/apps/web/playwright/api/groups/move-group-workflow.spec.ts
@@ -0,0 +1,1048 @@
+import { prisma } from "@/lib/prisma";
+import { expect } from "@playwright/test";
+import { apiError } from "../../utils";
+import {
+  countGroupChangeActivityLogs,
+  disableWorkflow,
+  expectMoveRules,
+  expectPartnerInGroup,
+  expectPartnerStaysInGroup,
+  getEnrollment,
+  getGroup,
+  getGroupWorkflow,
+  getPartnerGroupRewards,
+  seedLinkStats,
+  setGroupMoveDisabledAt,
+  setMoveRules,
+  trackPartnerLead,
+  trackPartnerSale,
+  uniqueThreshold,
+} from "./helpers";
+import { test } from "./move-group-fixtures";
+
+// Serial: moveRules are validated program-wide against every other group's
+// rules, so concurrent PATCHes in this file would flake on overlap checks.
+// No retries: a failed case leaves groups/workflows that would flake on retry.
+test.describe.configure({ mode: "serial", retries: 0 });
+
+test.describe("Workflow execution", () => {
+  // totalCommissions is intentionally not covered: it only fires from the
+  // QStash create-partner-commission worker and would make this suite slow.
+
+  test("moves partner when totalLeads condition is met", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    const enrollment = await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+
+    const targetRewards = await getPartnerGroupRewards(target.id);
+    expect(enrollment.leadRewardId).toBe(targetRewards.leadRewardId);
+    expect(enrollment.saleRewardId).toBe(targetRewards.saleRewardId);
+    expect(enrollment.discountId).toBe(targetRewards.discountId);
+  });
+
+  // `gte` is the other operator every metric attribute accepts, and it is
+  // inclusive — seeding n-1 leaves the partner exactly on the threshold.
+  test("moves partner when totalLeads meets a gte threshold exactly", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "gte",
+        value: n,
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+  });
+
+  test("does not move partner when totalLeads condition is not met", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    // Seed far below the window so one lead cannot satisfy it.
+    await seedLinkStats(partner.links![0].id, { leads: 0 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: source.id,
+    });
+  });
+
+  test("does not move partner when workflow is disabled", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const workflow = await getGroupWorkflow(target.id);
+    expect(workflow).not.toBeNull();
+    await disableWorkflow(workflow!.id);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: source.id,
+    });
+  });
+
+  test("moves partner when partnerGroup matches source group", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    expect(partner.groupId).toBe(source.id);
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+  });
+
+  test("does not move partner when partnerGroup does not match", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const allowedSource = await createGroup();
+    const actualSource = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: allowedSource.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: actualSource.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: actualSource.id,
+    });
+  });
+
+  test("moves partner when partnerGroup is one of several source groups", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const otherSource = await createGroup();
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "in",
+        value: [otherSource.id, source.id],
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+  });
+
+  test("does not move partner when partnerGroup is excluded by notIn", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "notIn",
+        value: [source.id],
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+
+    await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: source.id,
+    });
+  });
+
+  test("skips partner with groupMoveDisabledAt set", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await setGroupMoveDisabledAt(api, {
+      partnerId: partner.id,
+      groupId: source.id,
+      groupMoveDisabledAt: new Date().toISOString(),
+    });
+
+    const before = await getEnrollment({
+      partnerId: partner.id,
+      programId: program.id,
+    });
+    expect(before.groupMoveDisabledAt).not.toBeNull();
+    expect(before.groupId).toBe(source.id);
+
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+    await trackPartnerLead(partner);
+
+    const after = await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: source.id,
+    });
+    expect(after.groupMoveDisabledAt).not.toBeNull();
+  });
+
+  test("does not re-move partner on repeat triggers", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 100 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { leads: n - 1 });
+
+    await trackPartnerLead(partner);
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+
+    // Second lead: the already-in-target guard skips before the redis lock is
+    // ever reached, since the first move has already committed by now.
+    await trackPartnerLead(partner);
+    await expectPartnerStaysInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+
+    // The enrollment update is idempotent, so only the activity log proves the
+    // partner was moved once rather than once per trigger.
+    await expect
+      .poll(
+        () =>
+          countGroupChangeActivityLogs({
+            partnerId: partner.id,
+            programId: program.id,
+          }),
+        { timeout: 15_000 },
+      )
+      .toBe(1);
+  });
+
+  test("moves partner when totalSaleAmount condition is met", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalSaleAmount",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await trackPartnerSale(partner, { amount: n });
+
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+  });
+
+  test("moves partner when totalConversions condition is met", async ({
+    api,
+    program,
+    createGroup,
+    createPartner,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const { status } = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalConversions",
+        operator: "gte",
+        value: n,
+      },
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const partner = await createPartner({ groupId: source.id });
+    await seedLinkStats(partner.links![0].id, { conversions: n - 1 });
+
+    // conversions only increment on a customer's first sale, which is what
+    // trackPartnerSale produces (fresh customer per call).
+    await trackPartnerSale(partner);
+
+    await expectPartnerInGroup({
+      partnerId: partner.id,
+      programId: program.id,
+      expectedGroupId: target.id,
+    });
+  });
+});
+
+test.describe("Workflow lifecycle", () => {
+  test("configuring moveRules creates a moveGroup workflow", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const moveRules = [
+      {
+        attribute: "totalCommissions" as const,
+        operator: "between" as const,
+        value: { min: n, max: n + 1 },
+      },
+    ];
+
+    const { status } = await setMoveRules(api, target.id, moveRules);
+    expect(status).toEqual(200);
+
+    const workflow = await getGroupWorkflow(target.id);
+    expect(workflow).not.toBeNull();
+    expect(workflow!.disabledAt).toBeNull();
+    expect(workflow!.actions).toEqual([
+      {
+        type: "moveGroup",
+        data: { groupId: target.id },
+      },
+    ]);
+    expect(workflow!.triggerConditions).toEqual(moveRules);
+
+    const { status: getStatus, data: group } = await getGroup(api, target.id);
+    expect(getStatus).toEqual(200);
+    expect(group.moveRules).toEqual(moveRules);
+  });
+
+  test("changing moveRules updates the same workflow row", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n1 = uniqueThreshold();
+    const n2 = uniqueThreshold();
+
+    await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n1, max: n1 + 1 },
+      },
+    ]);
+
+    const before = await getGroupWorkflow(target.id);
+    expect(before).not.toBeNull();
+
+    const nextRules = [
+      {
+        attribute: "totalConversions" as const,
+        operator: "between" as const,
+        value: { min: n2, max: n2 + 1 },
+      },
+    ];
+    const { status } = await setMoveRules(api, target.id, nextRules);
+    expect(status).toEqual(200);
+
+    const after = await getGroupWorkflow(target.id);
+    expect(after).not.toBeNull();
+    expect(after!.id).toBe(before!.id);
+    expect(after!.triggerConditions).toEqual(nextRules);
+  });
+
+  test("empty moveRules deletes the workflow", async ({ api, createGroup }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+    ]);
+    expect(await getGroupWorkflow(target.id)).not.toBeNull();
+
+    const { status } = await setMoveRules(api, target.id, []);
+    expect(status).toEqual(200);
+
+    expect(await getGroupWorkflow(target.id)).toBeNull();
+
+    const group = await prisma.partnerGroup.findUniqueOrThrow({
+      where: { id: target.id },
+      select: { workflowId: true },
+    });
+    expect(group.workflowId).toBeNull();
+  });
+
+  test("PATCH without moveRules leaves the workflow untouched", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const moveRules = [
+      {
+        attribute: "totalLeads" as const,
+        operator: "between" as const,
+        value: { min: n, max: n + 1 },
+      },
+    ];
+
+    await setMoveRules(api, target.id, moveRules);
+    const before = await getGroupWorkflow(target.id);
+    expect(before).not.toBeNull();
+
+    const { status } = await api.patch(`/api/groups/${target.id}`, {
+      name: `${target.name} updated`,
+    });
+    expect(status).toEqual(200);
+
+    const after = await getGroupWorkflow(target.id);
+    expect(after).not.toBeNull();
+    expect(after!.id).toBe(before!.id);
+    expect(after!.triggerConditions).toEqual(moveRules);
+  });
+
+  test("deleting a group deletes its attached workflow", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n + 1 },
+      },
+    ]);
+
+    const workflow = await getGroupWorkflow(target.id);
+    expect(workflow).not.toBeNull();
+    const workflowId = workflow!.id;
+
+    const { status } = await api.delete(`/api/groups/${target.id}`);
+    expect(status).toEqual(200);
+
+    const deleted = await prisma.workflow.findUnique({
+      where: { id: workflowId },
+    });
+    expect(deleted).toBeNull();
+  });
+
+  test("deleting a source group drops it from another group's move rules", async ({
+    api,
+    createGroup,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const metricRule = {
+      attribute: "totalLeads" as const,
+      operator: "between" as const,
+      value: { min: n, max: n + 1 },
+    };
+
+    const { status } = await setMoveRules(api, target.id, [
+      metricRule,
+      {
+        attribute: "partnerGroup",
+        operator: "eq",
+        value: source.id,
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const { status: deleteStatus } = await api.delete(
+      `/api/groups/${source.id}`,
+    );
+    expect(deleteStatus).toEqual(200);
+
+    // The whole condition is dropped rather than the workflow being disabled,
+    // so what was "in group A and hit the metric" now matches every partner.
+    await expectMoveRules({ groupId: target.id, expected: [metricRule] });
+  });
+
+  test("deleting a source group only removes it from a partnerGroup list", async ({
+    api,
+    createGroup,
+  }) => {
+    const removed = await createGroup();
+    const kept = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const metricRule = {
+      attribute: "totalLeads" as const,
+      operator: "between" as const,
+      value: { min: n, max: n + 1 },
+    };
+
+    const { status } = await setMoveRules(api, target.id, [
+      metricRule,
+      {
+        attribute: "partnerGroup",
+        operator: "in",
+        value: [removed.id, kept.id],
+      },
+    ]);
+    expect(status).toEqual(200);
+
+    const { status: deleteStatus } = await api.delete(
+      `/api/groups/${removed.id}`,
+    );
+    expect(deleteStatus).toEqual(200);
+
+    await expectMoveRules({
+      groupId: target.id,
+      expected: [
+        metricRule,
+        {
+          attribute: "partnerGroup",
+          operator: "in",
+          value: [kept.id],
+        },
+      ],
+    });
+  });
+
+  test("multiple metric move rules are stored in order", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n1 = uniqueThreshold();
+    const n2 = uniqueThreshold();
+    const moveRules = [
+      {
+        attribute: "totalLeads" as const,
+        operator: "between" as const,
+        value: { min: n1, max: n1 + 1 },
+      },
+      {
+        attribute: "totalConversions" as const,
+        operator: "between" as const,
+        value: { min: n2, max: n2 + 1 },
+      },
+    ];
+
+    const { status } = await setMoveRules(api, target.id, moveRules);
+    expect(status).toEqual(200);
+
+    const workflow = await getGroupWorkflow(target.id);
+    expect(workflow).not.toBeNull();
+    expect(workflow!.triggerConditions).toEqual(moveRules);
+  });
+
+  test("metric and partnerGroup move rules are stored together", async ({
+    api,
+    createGroup,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const moveRules = [
+      {
+        attribute: "totalLeads" as const,
+        operator: "between" as const,
+        value: { min: n, max: n + 1 },
+      },
+      {
+        attribute: "partnerGroup" as const,
+        operator: "eq" as const,
+        value: source.id,
+      },
+    ];
+
+    const { status } = await setMoveRules(api, target.id, moveRules);
+    expect(status).toEqual(200);
+
+    const workflow = await getGroupWorkflow(target.id);
+    expect(workflow).not.toBeNull();
+    expect(workflow!.triggerConditions).toEqual(moveRules);
+  });
+});
+
+test.describe("Move rule validation", () => {
+  test("rejects partnerGroup as the only condition", async ({
+    api,
+    createGroup,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "partnerGroup",
+          operator: "eq",
+          value: source.id,
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "Partner group can only be used as an additional condition alongside a metric rule.",
+      }),
+    );
+  });
+
+  test("rejects partnerGroup pointing at the current group", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "totalLeads",
+          operator: "between",
+          value: { min: n, max: n + 1 },
+        },
+        {
+          attribute: "partnerGroup",
+          operator: "eq",
+          value: target.id,
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "Condition 2: Cannot select the current group as a source group.",
+      }),
+    );
+  });
+
+  test("rejects partnerGroup with an unknown group id", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const missingGroupId = "grp_does_not_exist";
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "totalLeads",
+          operator: "between",
+          value: { min: n, max: n + 1 },
+        },
+        {
+          attribute: "partnerGroup",
+          operator: "eq",
+          value: missingGroupId,
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: `Condition 2: Invalid group IDs detected: ${missingGroupId}`,
+      }),
+    );
+  });
+
+  test("rejects a partnerGroup list containing the current group", async ({
+    api,
+    createGroup,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "totalLeads",
+          operator: "between",
+          value: { min: n, max: n + 1 },
+        },
+        {
+          attribute: "partnerGroup",
+          operator: "in",
+          value: [source.id, target.id],
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "Condition 2: Cannot select the current group as a source group.",
+      }),
+    );
+  });
+
+  test("rejects a partnerGroup list with an unknown group id", async ({
+    api,
+    createGroup,
+  }) => {
+    const source = await createGroup();
+    const target = await createGroup();
+    const n = uniqueThreshold();
+    const missingGroupId = "grp_does_not_exist";
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "totalLeads",
+          operator: "between",
+          value: { min: n, max: n + 1 },
+        },
+        {
+          attribute: "partnerGroup",
+          operator: "in",
+          value: [source.id, missingGroupId],
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: `Condition 2: Invalid group IDs detected: ${missingGroupId}`,
+      }),
+    );
+  });
+
+  test("rejects operator not allowed for the attribute", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "totalLeads",
+          operator: "lte",
+          value: 1,
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          'Operator "is less than or equal to" is not valid for the activity "totalLeads".',
+      }),
+    );
+  });
+
+  test("rejects attribute not available for moveGroup", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+
+    expect(
+      await setMoveRules(api, target.id, [
+        {
+          attribute: "partnerEnrolledDays",
+          operator: "gte",
+          value: 1,
+        },
+      ]),
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "Condition 1: Invalid activity.",
+      }),
+    );
+  });
+
+  test("rejects between with max less than or equal to min", async ({
+    api,
+    createGroup,
+  }) => {
+    const target = await createGroup();
+    const n = uniqueThreshold();
+
+    const result = await setMoveRules(api, target.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: n, max: n },
+      },
+    ]);
+
+    expect(result.status).toEqual(422);
+    expect(result.data).toEqual({
+      error: {
+        code: "unprocessable_entity",
+        message: expect.stringContaining(
+          "Maximum value must be greater than minimum value.",
+        ),
+        doc_url:
+          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
+      },
+    });
+  });
+
+  test("rejects overlapping move rules across groups", async ({
+    api,
+    createGroup,
+  }) => {
+    const first = await createGroup();
+    const second = await createGroup();
+    const n = uniqueThreshold();
+    const overlapping = [
+      {
+        attribute: "totalLeads" as const,
+        operator: "between" as const,
+        value: { min: n, max: n + 1 },
+      },
+    ];
+
+    const created = await setMoveRules(api, first.id, overlapping);
+    expect(created.status).toEqual(200);
+
+    expect(await setMoveRules(api, second.id, overlapping)).toEqual(
+      apiError({
+        code: "bad_request",
+        message: `This rule is already in use by the ${first.name} group. Select a different activity or amount.`,
+      }),
+    );
+
+    const disjointN = uniqueThreshold();
+    const disjoint = await setMoveRules(api, second.id, [
+      {
+        attribute: "totalLeads",
+        operator: "between",
+        value: { min: disjointN, max: disjointN + 1 },
+      },
+    ]);
+    expect(disjoint.status).toEqual(200);
+  });
+});
diff --git a/apps/web/playwright/api/links/links-bulk.spec.ts b/apps/web/playwright/api/links/links-bulk.spec.ts
new file mode 100644
index 00000000000..23eac560898
--- /dev/null
+++ b/apps/web/playwright/api/links/links-bulk.spec.ts
@@ -0,0 +1,277 @@
+import { nanoid, sleep } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { apiError } from "../../utils";
+import { test, type ApiClient } from "../fixtures";
+import { createPartner, deletePartner } from "../partners/helpers";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+type BulkLink = {
+  id: string;
+  url: string;
+  domain: string;
+  programId: string | null;
+  partnerId: string | null;
+};
+
+type BulkLinkError = {
+  error: string;
+  code: string;
+  link: Record<string, unknown>;
+};
+
+const domain = TEST_WORKSPACE.program.domain;
+
+function bulkLinkBody(overrides: Record<string, unknown> = {}) {
+  return {
+    url: `https://example.com/${nanoid()}`,
+    domain,
+    key: nanoid(12),
+    ...overrides,
+  };
+}
+
+async function createBulkLinks(
+  api: ApiClient,
+  bodies: Record<string, unknown>[],
+) {
+  let response: { status: number; data: unknown } | undefined;
+
+  for (let attempt = 0; attempt < 3; attempt++) {
+    response = await api.post<unknown>("/api/links/bulk", bodies);
+
+    if (response.status !== 429 && response.status < 500) {
+      break;
+    }
+
+    await sleep(1000 * (attempt + 1));
+  }
+
+  expect(response?.status, JSON.stringify(response?.data)).toEqual(200);
+  expect(
+    Array.isArray(response?.data),
+    `Expected bulk create to return an array, got: ${JSON.stringify(response?.data)}`,
+  ).toBe(true);
+
+  return response as { status: number; data: (BulkLink | BulkLinkError)[] };
+}
+
+async function deleteLinks(api: ApiClient, ids: (string | undefined)[]) {
+  const linkIds = ids.filter((id): id is string => Boolean(id));
+  if (linkIds.length === 0) return;
+  await api.delete(`/api/links/bulk?linkIds=${linkIds.join(",")}`);
+}
+
+function isBulkError(item: BulkLink | BulkLinkError): item is BulkLinkError {
+  return "error" in item;
+}
+
+function isBulkLink(item: BulkLink | BulkLinkError): item is BulkLink {
+  return !isBulkError(item);
+}
+
+test("POST /links/bulk – with valid programId and partnerId", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  const createdIds: string[] = [];
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const body = bulkLinkBody({
+      programId: program.id,
+      partnerId,
+    });
+
+    const { status, data } = await createBulkLinks(api, [body]);
+    const created = data.filter(isBulkLink);
+    createdIds.push(...created.map((link) => link.id));
+
+    expect(status).toEqual(200);
+    expect(created).toHaveLength(1);
+    expect(created[0]).toMatchObject({
+      url: body.url,
+      domain,
+      programId: program.id,
+      partnerId,
+    });
+  } finally {
+    await deleteLinks(api, createdIds);
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /links/bulk – rejects invalid programId", async ({ api }) => {
+  const invalidProgramId = `prog_${nanoid()}`;
+  const validBody = bulkLinkBody();
+  const invalidBody = bulkLinkBody({
+    programId: invalidProgramId,
+    partnerId: `pn_${nanoid()}`,
+  });
+
+  const createdIds: string[] = [];
+
+  try {
+    const { status, data } = await createBulkLinks(api, [
+      invalidBody,
+      validBody,
+    ]);
+    const created = data.filter(isBulkLink);
+    const errors = data.filter(isBulkError);
+    createdIds.push(...created.map((link) => link.id));
+
+    expect(status).toEqual(200);
+    expect(created).toHaveLength(1);
+    expect(created[0].url).toEqual(validBody.url);
+    expect(errors).toEqual([
+      {
+        error: `Invalid programId detected: ${invalidProgramId}`,
+        code: "unprocessable_entity",
+        link: expect.any(Object),
+      },
+    ]);
+  } finally {
+    await deleteLinks(api, createdIds);
+  }
+});
+
+test("POST /links/bulk – rejects invalid partnerId", async ({
+  api,
+  program,
+}) => {
+  const invalidPartnerId = `pn_${nanoid()}`;
+  const invalidBody = bulkLinkBody({
+    programId: program.id,
+    partnerId: invalidPartnerId,
+  });
+
+  const { status, data } = await createBulkLinks(api, [invalidBody]);
+
+  expect(status).toEqual(200);
+  expect(data.filter(isBulkLink)).toHaveLength(0);
+  expect(data.filter(isBulkError)).toEqual([
+    {
+      error: `Invalid partnerId detected: ${invalidPartnerId}`,
+      code: "unprocessable_entity",
+      link: expect.any(Object),
+    },
+  ]);
+});
+
+test("PATCH /links/bulk – with valid programId and partnerId", async ({
+  api,
+  program,
+}) => {
+  let partnerId: string | undefined;
+  const createdIds: string[] = [];
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+
+    const { data: created } = await createBulkLinks(api, [
+      bulkLinkBody(),
+      bulkLinkBody(),
+    ]);
+    const links = created.filter(isBulkLink);
+    createdIds.push(...links.map((link) => link.id));
+
+    expect(links).toHaveLength(2);
+
+    const { status, data } = await api.patch<BulkLink[]>("/api/links/bulk", {
+      linkIds: links.map((link) => link.id),
+      data: {
+        programId: program.id,
+        partnerId,
+      },
+    });
+
+    expect(status).toEqual(200);
+    expect(data).toHaveLength(2);
+    expect(data).toEqual(
+      expect.arrayContaining(
+        links.map((link) =>
+          expect.objectContaining({
+            id: link.id,
+            programId: program.id,
+            partnerId,
+          }),
+        ),
+      ),
+    );
+  } finally {
+    await deleteLinks(api, createdIds);
+    await deletePartner(partnerId);
+  }
+});
+
+test("PATCH /links/bulk – rejects invalid programId", async ({ api }) => {
+  const createdIds: string[] = [];
+  const invalidProgramId = `prog_${nanoid()}`;
+
+  try {
+    const { data: created } = await createBulkLinks(api, [bulkLinkBody()]);
+    const links = created.filter(isBulkLink);
+    createdIds.push(...links.map((link) => link.id));
+
+    expect(
+      await api.patch("/api/links/bulk", {
+        linkIds: links.map((link) => link.id),
+        data: {
+          programId: invalidProgramId,
+        },
+      }),
+    ).toEqual(
+      apiError({
+        code: "unprocessable_entity",
+        message: `Invalid programId detected: ${invalidProgramId}`,
+      }),
+    );
+
+    const { data: unchanged } = await api.get<BulkLink>(
+      `/api/links/${links[0].id}`,
+    );
+    expect(unchanged.programId).toBeNull();
+  } finally {
+    await deleteLinks(api, createdIds);
+  }
+});
+
+test("PATCH /links/bulk – rejects invalid partnerId", async ({
+  api,
+  program,
+}) => {
+  const createdIds: string[] = [];
+  const invalidPartnerId = `pn_${nanoid()}`;
+
+  try {
+    const { data: created } = await createBulkLinks(api, [bulkLinkBody()]);
+    const links = created.filter(isBulkLink);
+    createdIds.push(...links.map((link) => link.id));
+
+    expect(
+      await api.patch("/api/links/bulk", {
+        linkIds: links.map((link) => link.id),
+        data: {
+          programId: program.id,
+          partnerId: invalidPartnerId,
+        },
+      }),
+    ).toEqual(
+      apiError({
+        code: "unprocessable_entity",
+        message: `Invalid partnerId detected: ${invalidPartnerId}`,
+      }),
+    );
+
+    const { data: unchanged } = await api.get<BulkLink>(
+      `/api/links/${links[0].id}`,
+    );
+    expect(unchanged.partnerId).toBeNull();
+    expect(unchanged.programId).toBeNull();
+  } finally {
+    await deleteLinks(api, createdIds);
+  }
+});
diff --git a/apps/web/playwright/api/partner-applications/partner-applications.spec.ts b/apps/web/playwright/api/partner-applications/partner-applications.spec.ts
new file mode 100644
index 00000000000..7c5059b5dea
--- /dev/null
+++ b/apps/web/playwright/api/partner-applications/partner-applications.spec.ts
@@ -0,0 +1,442 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { GroupProps, PartnerApplicationProps } from "@/lib/types";
+import { expect } from "@playwright/test";
+import {
+  ProgramApplicationRejectionReason,
+  ProgramEnrollmentStatus,
+} from "@prisma/client";
+import {
+  apiError,
+  expectNoOverlap,
+  randomName,
+  randomPartnerEmail,
+} from "../../utils";
+import { test } from "../fixtures";
+import { createGroup, deleteGroup } from "../groups/helpers";
+import { deletePartner } from "../partners/helpers";
+
+type SeededApplication = {
+  applicationId: string;
+  partnerId: string;
+  name: string;
+  email: string;
+  country: "US" | "GB";
+  groupId: string;
+};
+
+const REJECTION_NOTE =
+  "Your audience doesn't align with our target customers. Please reapply if that changes.";
+
+function expectApplication(
+  application: PartnerApplicationProps,
+  expected: SeededApplication,
+  status: ProgramEnrollmentStatus = "pending",
+) {
+  expect(application).toMatchObject({
+    id: expected.applicationId,
+    createdAt: expect.any(String),
+    applicationFormData: [],
+    partner: {
+      id: expected.partnerId,
+      name: expected.name,
+      email: expected.email,
+      country: expected.country,
+      groupId: expected.groupId,
+      status,
+    },
+  });
+}
+
+async function expectApplicationState(
+  application: SeededApplication,
+  {
+    enrollmentStatus,
+    rejectionReason,
+  }: {
+    enrollmentStatus: ProgramEnrollmentStatus;
+    rejectionReason: ProgramApplicationRejectionReason | null;
+  },
+) {
+  const enrollment = await prisma.programEnrollment.findUniqueOrThrow({
+    where: {
+      applicationId: application.applicationId,
+    },
+    include: {
+      application: true,
+    },
+  });
+
+  expect(enrollment.status).toBe(enrollmentStatus);
+  expect(enrollment.partnerId).toBe(application.partnerId);
+  expect(enrollment.application?.rejectionReason ?? null).toBe(rejectionReason);
+  expect(enrollment.application?.rejectionNote ?? null).toBe(
+    rejectionReason ? REJECTION_NOTE : null,
+  );
+  expect(enrollment.application?.reviewedAt).toEqual(expect.any(Date));
+}
+
+test.describe("partner applications", () => {
+  test.describe.configure({
+    mode: "serial",
+  });
+
+  let programId: string;
+  let extraGroup: GroupProps;
+  let applications: SeededApplication[] = [];
+
+  test.beforeAll(async ({ api, program }) => {
+    programId = program.id;
+    extraGroup = await createGroup(api);
+
+    const now = Date.now();
+    const rows: {
+      name: string;
+      email: string;
+      country: "US" | "GB";
+      groupId: string;
+    }[] = [
+      {
+        name: randomName("application"),
+        email: randomPartnerEmail(),
+        country: "US",
+        groupId: extraGroup.id,
+      },
+      {
+        name: randomName("application"),
+        email: randomPartnerEmail(),
+        country: "US",
+        groupId: extraGroup.id,
+      },
+      {
+        name: randomName("application"),
+        email: randomPartnerEmail(),
+        country: "GB",
+        groupId: extraGroup.id,
+      },
+      {
+        name: randomName("application"),
+        email: randomPartnerEmail(),
+        country: "US",
+        groupId: program.defaultGroupId,
+      },
+      {
+        name: randomName("application"),
+        email: randomPartnerEmail(),
+        country: "GB",
+        groupId: program.defaultGroupId,
+      },
+    ];
+
+    for (const [i, row] of rows.entries()) {
+      const partnerId = createId({ prefix: "pn_" });
+      const applicationId = createId({ prefix: "pga_" });
+      const createdAt = new Date(now - i * 1000);
+
+      await prisma.partner.create({
+        data: {
+          id: partnerId,
+          name: row.name,
+          email: row.email,
+          country: row.country,
+        },
+      });
+
+      await prisma.programApplication.create({
+        data: {
+          id: applicationId,
+          programId,
+          groupId: row.groupId,
+          name: row.name,
+          email: row.email,
+          country: row.country,
+          formData: { fields: [] },
+          createdAt,
+        },
+      });
+
+      await prisma.programEnrollment.create({
+        data: {
+          id: createId({ prefix: "pge_" }),
+          partnerId,
+          programId,
+          groupId: row.groupId,
+          applicationId,
+          status: "pending",
+          createdAt,
+        },
+      });
+
+      applications.push({
+        applicationId,
+        partnerId,
+        name: row.name,
+        email: row.email,
+        country: row.country,
+        groupId: row.groupId,
+      });
+    }
+  });
+
+  test.afterAll(async ({ api }) => {
+    for (const application of applications) {
+      await deletePartner(application.partnerId);
+    }
+
+    if (applications.length > 0) {
+      await prisma.programApplication.deleteMany({
+        where: {
+          id: {
+            in: applications.map((application) => application.applicationId),
+          },
+        },
+      });
+    }
+
+    await deleteGroup(api, extraGroup?.id);
+  });
+
+  test("GET /partners/applications", async ({ api }) => {
+    const { status, data } = await api.get<PartnerApplicationProps[]>(
+      `/api/partners/applications?${new URLSearchParams({
+        pageSize: "100",
+      })}`,
+    );
+
+    expect(status).toEqual(200);
+
+    const byId = new Map(
+      data.map((application) => [application.id, application]),
+    );
+
+    for (const expected of applications) {
+      const application = byId.get(expected.applicationId);
+      expect(application).toBeDefined();
+      expectApplication(application!, expected);
+    }
+  });
+
+  test("GET /partners/applications – filters by country", async ({ api }) => {
+    const expected = applications.filter(
+      (application) =>
+        application.groupId === extraGroup.id && application.country === "US",
+    );
+
+    const { status, data } = await api.get<PartnerApplicationProps[]>(
+      `/api/partners/applications?${new URLSearchParams({
+        pageSize: "100",
+        country: "US",
+        groupId: extraGroup.id,
+      })}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data.map((application) => application.id).sort()).toEqual(
+      expected.map((application) => application.applicationId).sort(),
+    );
+
+    for (const expectedApplication of expected) {
+      const application = data.find(
+        (item) => item.id === expectedApplication.applicationId,
+      );
+
+      expect(application).toBeDefined();
+      expectApplication(application!, expectedApplication);
+    }
+  });
+
+  test("GET /partners/applications – filters by groupId", async ({ api }) => {
+    const expected = applications.filter(
+      (application) => application.groupId === extraGroup.id,
+    );
+
+    const { status, data } = await api.get<PartnerApplicationProps[]>(
+      `/api/partners/applications?${new URLSearchParams({
+        pageSize: "100",
+        groupId: extraGroup.id,
+      })}`,
+    );
+
+    expect(status).toEqual(200);
+    expect(data.map((application) => application.id).sort()).toEqual(
+      expected.map((application) => application.applicationId).sort(),
+    );
+
+    for (const expectedApplication of expected) {
+      const application = data.find(
+        (item) => item.id === expectedApplication.applicationId,
+      );
+
+      expect(application).toBeDefined();
+      expectApplication(application!, expectedApplication);
+    }
+  });
+
+  test("GET /partners/applications – respects pageSize", async ({ api }) => {
+    const expected = applications.filter(
+      (application) => application.groupId === extraGroup.id,
+    );
+
+    const page1 = await api.get<PartnerApplicationProps[]>(
+      `/api/partners/applications?${new URLSearchParams({
+        groupId: extraGroup.id,
+        page: "1",
+        pageSize: "1",
+      })}`,
+    );
+    const page2 = await api.get<PartnerApplicationProps[]>(
+      `/api/partners/applications?${new URLSearchParams({
+        groupId: extraGroup.id,
+        page: "2",
+        pageSize: "1",
+      })}`,
+    );
+
+    expect(page1.status).toEqual(200);
+    expect(page2.status).toEqual(200);
+    expect(page1.data).toHaveLength(1);
+    expect(page2.data).toHaveLength(1);
+    expect(page1.data[0]?.id).toBe(expected[0]?.applicationId);
+    expect(page2.data[0]?.id).toBe(expected[1]?.applicationId);
+    expectNoOverlap(page1.data, page2.data);
+    expectApplication(page1.data[0]!, expected[0]!);
+    expectApplication(page2.data[0]!, expected[1]!);
+  });
+
+  test("POST /partners/applications/approve", async ({ api }) => {
+    const application = applications[0]!;
+
+    const { status, data } = await api.post<{ partnerId: string }>(
+      "/api/partners/applications/approve",
+      {
+        partnerId: application.partnerId,
+        groupId: application.groupId,
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({ partnerId: application.partnerId });
+    await expectApplicationState(application, {
+      enrollmentStatus: "approved",
+      rejectionReason: null,
+    });
+  });
+
+  test("POST /partners/applications/reject", async ({ api }) => {
+    const application = applications[1]!;
+
+    const { status, data } = await api.post<{ partnerId: string }>(
+      "/api/partners/applications/reject",
+      {
+        partnerId: application.partnerId,
+        rejectionReason: "other",
+        rejectionNote: REJECTION_NOTE,
+        reapplicationTimeframe: "standard",
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({ partnerId: application.partnerId });
+    await expectApplicationState(application, {
+      enrollmentStatus: "rejected",
+      rejectionReason: "other",
+    });
+  });
+
+  test("POST /partners/applications/approve – already approved", async ({
+    api,
+  }) => {
+    const application = applications[0]!;
+
+    const response = await api.post("/api/partners/applications/approve", {
+      partnerId: application.partnerId,
+      groupId: application.groupId,
+    });
+
+    expect(response).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "This enrollment cannot be approved because it is already approved.",
+      }),
+    );
+
+    await expectApplicationState(application, {
+      enrollmentStatus: "approved",
+      rejectionReason: null,
+    });
+  });
+
+  test("POST /partners/applications/reject – already rejected", async ({
+    api,
+  }) => {
+    const application = applications[1]!;
+
+    const response = await api.post("/api/partners/applications/reject", {
+      partnerId: application.partnerId,
+      rejectionReason: "other",
+      rejectionNote: REJECTION_NOTE,
+      reapplicationTimeframe: "standard",
+    });
+
+    expect(response).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "This enrollment cannot be rejected because it is no longer pending.",
+      }),
+    );
+
+    await expectApplicationState(application, {
+      enrollmentStatus: "rejected",
+      rejectionReason: "other",
+    });
+  });
+
+  test("POST /partners/applications/approve – rejected partner", async ({
+    api,
+  }) => {
+    const application = applications[1]!;
+
+    const { status, data } = await api.post<{ partnerId: string }>(
+      "/api/partners/applications/approve",
+      {
+        partnerId: application.partnerId,
+        groupId: application.groupId,
+      },
+    );
+
+    expect(status).toEqual(200);
+    expect(data).toStrictEqual({ partnerId: application.partnerId });
+    await expectApplicationState(application, {
+      enrollmentStatus: "approved",
+      rejectionReason: null,
+    });
+  });
+
+  test("POST /partners/applications/reject – approved partner", async ({
+    api,
+  }) => {
+    const application = applications[0]!;
+
+    const response = await api.post("/api/partners/applications/reject", {
+      partnerId: application.partnerId,
+      rejectionReason: "other",
+      rejectionNote: REJECTION_NOTE,
+      reapplicationTimeframe: "standard",
+    });
+
+    expect(response).toEqual(
+      apiError({
+        code: "bad_request",
+        message:
+          "This enrollment cannot be rejected because it is no longer pending.",
+      }),
+    );
+
+    await expectApplicationState(application, {
+      enrollmentStatus: "approved",
+      rejectionReason: null,
+    });
+  });
+});
diff --git a/apps/web/playwright/api/partner-profile/links.spec.ts b/apps/web/playwright/api/partner-profile/links.spec.ts
new file mode 100644
index 00000000000..51054f7eb96
--- /dev/null
+++ b/apps/web/playwright/api/partner-profile/links.spec.ts
@@ -0,0 +1,242 @@
+import { createId } from "@/lib/api/create-id";
+import { hashToken } from "@/lib/auth/hash-token";
+import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { apiError } from "../../utils";
+import { createBearerApiClient, test } from "../fixtures";
+import {
+  createGroupWithAdditionalLinks,
+  createPartner,
+  deletePartner,
+} from "../partners/helpers";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+type PartnerProfileLink = {
+  id: string;
+  domain: string;
+  key: string;
+  url: string;
+  partnerGroupDefaultLinkId?: string | null;
+};
+
+async function createPartnerProfileAuth(partner: {
+  id: string;
+  email?: string | null;
+}) {
+  const token = `dub_pw_${nanoid(24)}`;
+  const user = await prisma.user.create({
+    data: {
+      id: createId({ prefix: "user_" }),
+      email: partner.email,
+      emailVerified: new Date(),
+      defaultPartnerId: partner.id,
+      partners: {
+        create: {
+          partnerId: partner.id,
+          role: "owner",
+        },
+      },
+      tokens: {
+        create: {
+          name: "Playwright partner profile",
+          hashedKey: await hashToken(token),
+          partialKey: `${token.slice(0, 3)}...${token.slice(-4)}`,
+        },
+      },
+    },
+  });
+
+  return { token, userId: user.id };
+}
+
+test("GET /partner-profile/programs/:id/links - workspace token is rejected", async ({
+  api,
+  program,
+}) => {
+  expect(
+    await api.get(`/api/partner-profile/programs/${program.id}/links`),
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message: "Partner profile not found.",
+    }),
+  );
+});
+
+test("POST /partner-profile/programs/:id/links - default URL", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let userId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const auth = await createPartnerProfileAuth(partner);
+    userId = auth.userId;
+
+    const { api: partnerApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: auth.token,
+    });
+
+    try {
+      const key = nanoid(8);
+      const { status, data } = await partnerApi.post<PartnerProfileLink>(
+        `/api/partner-profile/programs/${program.id}/links`,
+        { key },
+      );
+
+      expect(status).toEqual(201);
+      expect(data).toMatchObject({
+        id: expect.any(String),
+        domain: TEST_WORKSPACE.program.domain,
+        key,
+        shortLink: `https://${TEST_WORKSPACE.program.domain}/${key}`,
+      });
+    } finally {
+      await dispose();
+    }
+  } finally {
+    if (userId) await prisma.user.delete({ where: { id: userId } });
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /partner-profile/programs/:id/links - URL outside additionalLinks", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let userId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const auth = await createPartnerProfileAuth(partner);
+    userId = auth.userId;
+
+    const { api: partnerApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: auth.token,
+    });
+
+    try {
+      expect(
+        await partnerApi.post(
+          `/api/partner-profile/programs/${program.id}/links`,
+          {
+            key: nanoid(8),
+            url: `https://github.com/dubinc/${nanoid()}`,
+          },
+        ),
+      ).toEqual(
+        apiError({
+          code: "bad_request",
+          message: "You cannot create additional links for this program.",
+        }),
+      );
+    } finally {
+      await dispose();
+    }
+  } finally {
+    if (userId) await prisma.user.delete({ where: { id: userId } });
+    await deletePartner(partnerId);
+  }
+});
+
+test("POST /partner-profile/programs/:id/links - allowed additionalLinks domain", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let userId: string | undefined;
+  let groupId: string | undefined;
+
+  try {
+    const group = await createGroupWithAdditionalLinks(program.id);
+    groupId = group.id;
+
+    const { data: partner } = await createPartner(api, { groupId });
+    partnerId = partner.id;
+    const auth = await createPartnerProfileAuth(partner);
+    userId = auth.userId;
+
+    const { api: partnerApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: auth.token,
+    });
+    const url = `https://example.com/${nanoid()}`;
+
+    try {
+      const { status, data } = await partnerApi.post<PartnerProfileLink>(
+        `/api/partner-profile/programs/${program.id}/links`,
+        { key: nanoid(8), url },
+      );
+
+      expect(status).toEqual(201);
+      expect(data.url).toEqual(url);
+    } finally {
+      await dispose();
+    }
+  } finally {
+    if (userId) await prisma.user.delete({ where: { id: userId } });
+    await deletePartner(partnerId);
+    if (groupId) await prisma.partnerGroup.delete({ where: { id: groupId } });
+  }
+});
+
+test("PATCH /partner-profile/programs/:id/links/:linkId - cannot change default link URL", async ({
+  api,
+  program,
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let userId: string | undefined;
+
+  try {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const auth = await createPartnerProfileAuth(partner);
+    userId = auth.userId;
+
+    const { api: partnerApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: auth.token,
+    });
+
+    try {
+      const { data: links } = await partnerApi.get<PartnerProfileLink[]>(
+        `/api/partner-profile/programs/${program.id}/links`,
+      );
+      const defaultLink =
+        links.find((link) => link.partnerGroupDefaultLinkId) ?? links[0];
+
+      expect(
+        await partnerApi.patch(
+          `/api/partner-profile/programs/${program.id}/links/${defaultLink.id}`,
+          {
+            key: defaultLink.key,
+            url: `https://example.com/${nanoid()}`,
+          },
+        ),
+      ).toEqual(
+        apiError({
+          code: "forbidden",
+          message:
+            "You cannot update the destination URL of your default link.",
+        }),
+      );
+    } finally {
+      await dispose();
+    }
+  } finally {
+    if (userId) await prisma.user.delete({ where: { id: userId } });
+    await deletePartner(partnerId);
+  }
+});
diff --git a/apps/web/playwright/api/partner-profile/users.spec.ts b/apps/web/playwright/api/partner-profile/users.spec.ts
new file mode 100644
index 00000000000..2342f5f8a17
--- /dev/null
+++ b/apps/web/playwright/api/partner-profile/users.spec.ts
@@ -0,0 +1,113 @@
+import { createId } from "@/lib/api/create-id";
+import { hashToken } from "@/lib/auth/hash-token";
+import { conn } from "@/lib/planetscale";
+import { prisma } from "@/lib/prisma";
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { randomName, randomPartnerEmail } from "../../utils";
+import { createBearerApiClient, test } from "../fixtures";
+
+async function createPartnerProfileAuth(
+  partner: {
+    id: string;
+    email?: string | null;
+  },
+  { role = "owner" as const }: { role?: "owner" | "member" } = {},
+) {
+  const token = `dub_pw_${nanoid(24)}`;
+  const user = await prisma.user.create({
+    data: {
+      id: createId({ prefix: "user_" }),
+      email: role === "owner" ? partner.email : randomPartnerEmail(),
+      emailVerified: new Date(),
+      defaultPartnerId: partner.id,
+      partners: {
+        create: {
+          partnerId: partner.id,
+          role,
+        },
+      },
+      tokens: {
+        create: {
+          name: "Playwright partner profile",
+          hashedKey: await hashToken(token),
+          partialKey: `${token.slice(0, 3)}...${token.slice(-4)}`,
+        },
+      },
+    },
+  });
+
+  return { token, userId: user.id };
+}
+
+test("DELETE /partner-profile/users - clears defaultPartnerId", async ({
+  playwright,
+}) => {
+  let partnerId: string | undefined;
+  let ownerId: string | undefined;
+  let memberId: string | undefined;
+
+  try {
+    const partner = await prisma.partner.create({
+      data: {
+        id: createId({ prefix: "pn_" }),
+        name: randomName("partner"),
+        email: randomPartnerEmail(),
+      },
+    });
+    partnerId = partner.id;
+
+    const owner = await createPartnerProfileAuth(partner);
+    ownerId = owner.userId;
+
+    const member = await createPartnerProfileAuth(partner, { role: "member" });
+    memberId = member.userId;
+
+    const { api: partnerApi, dispose } = await createBearerApiClient({
+      playwright,
+      token: owner.token,
+    });
+
+    try {
+      const { status, data } = await partnerApi.delete<{
+        id: string;
+        userId: string;
+        partnerId: string;
+        role: string;
+      }>(`/api/partner-profile/users?userId=${member.userId}`);
+
+      expect(status).toEqual(200);
+      expect(data).toMatchObject({
+        userId: member.userId,
+        partnerId: partner.id,
+        role: "member",
+      });
+
+      const [updatedMember, membership] = await Promise.all([
+        prisma.user.findUnique({
+          where: { id: member.userId },
+          select: { defaultPartnerId: true },
+        }),
+        prisma.partnerUser.findUnique({
+          where: {
+            userId_partnerId: {
+              userId: member.userId,
+              partnerId: partner.id,
+            },
+          },
+        }),
+      ]);
+
+      expect(updatedMember?.defaultPartnerId).toBeNull();
+      expect(membership).toBeNull();
+    } finally {
+      await dispose();
+    }
+  } finally {
+    if (ownerId) await prisma.user.delete({ where: { id: ownerId } });
+    if (memberId) await prisma.user.delete({ where: { id: memberId } });
+    if (partnerId) {
+      await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
+    }
+  }
+});
diff --git a/apps/web/playwright/api/partners/ban-partner.spec.ts b/apps/web/playwright/api/partners/ban-partner.spec.ts
index 2ee5ae7b5b9..d0f71fc4083 100644
--- a/apps/web/playwright/api/partners/ban-partner.spec.ts
+++ b/apps/web/playwright/api/partners/ban-partner.spec.ts
@@ -1,45 +1,9 @@
-import { conn } from "@/lib/planetscale";
-import { prisma } from "@/lib/prisma";
 import type { EnrolledPartnerProps } from "@/lib/types";
 import { nanoid } from "@dub/utils";
 import { expect } from "@playwright/test";
-import { randomName, randomPartnerEmail } from "../../utils";
+import { apiError } from "../../utils";
 import { test, type ApiClient } from "../fixtures";
-
-test.describe.configure({
-  mode: "parallel",
-});
-
-async function createPartner(
-  api: ApiClient,
-  overrides: Record<string, unknown> = {},
-) {
-  return api.post<EnrolledPartnerProps>("/api/partners", {
-    name: randomName(),
-    email: randomPartnerEmail(),
-    ...overrides,
-  });
-}
-
-async function deletePartner(partnerId: string | undefined) {
-  if (!partnerId) return;
-
-  await prisma.link.deleteMany({
-    where: {
-      partnerId,
-    },
-  });
-
-  await prisma.programEnrollment.deleteMany({
-    where: {
-      partnerId,
-    },
-  });
-
-  // Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
-  // bulkDeletePartners cleanup used by e2e cron.
-  await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
-}
+import { createPartner, deletePartner } from "./helpers";
 
 async function expectPartnerBanned(
   api: ApiClient,
@@ -136,16 +100,12 @@ test("POST /partners/ban – already banned", async ({ api, program }) => {
         partnerId,
         reason: "spam",
       }),
-    ).toEqual({
-      status: 400,
-      data: {
-        error: {
-          code: "bad_request",
-          message: "This partner is already banned from your program.",
-          doc_url: "https://dub.co/docs/api-reference/errors#bad-request",
-        },
-      },
-    });
+    ).toEqual(
+      apiError({
+        code: "bad_request",
+        message: "This partner is already banned from your program.",
+      }),
+    );
   } finally {
     await deletePartner(partnerId);
   }
@@ -159,16 +119,12 @@ test("POST /partners/ban – partner not found", async ({ api, program }) => {
       partnerId,
       reason: "fraud",
     }),
-  ).toEqual({
-    status: 404,
-    data: {
-      error: {
-        code: "not_found",
-        message: `Partner ${partnerId} is not enrolled in program ${program.id}.`,
-        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-      },
-    },
-  });
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message: `Partner ${partnerId} is not enrolled in program ${program.id}.`,
+    }),
+  );
 });
 
 test("POST /partners/ban – tenantId not found", async ({ api }) => {
@@ -179,44 +135,28 @@ test("POST /partners/ban – tenantId not found", async ({ api }) => {
       tenantId,
       reason: "fraud",
     }),
-  ).toEqual({
-    status: 404,
-    data: {
-      error: {
-        code: "not_found",
-        message: `Partner with tenantId ${tenantId} not found in program.`,
-        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-      },
-    },
-  });
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message: `Partner with tenantId ${tenantId} not found in program.`,
+    }),
+  );
 });
 
-const invalidReasonError = {
-  status: 422,
-  data: {
-    error: {
-      code: "unprocessable_entity",
-      message:
-        'invalid_value: reason: Invalid option: expected one of "tos_violation"|"inappropriate_content"|"fake_traffic"|"fraud"|"spam"|"brand_abuse"',
-      doc_url: "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-    },
-  },
-};
+const invalidReasonError = apiError({
+  code: "unprocessable_entity",
+  message:
+    'invalid_value: reason: Invalid option: expected one of "tos_violation"|"inappropriate_content"|"fake_traffic"|"fraud"|"spam"|"brand_abuse"',
+});
 
 const banErrorCases = [
   {
     name: "POST /partners/ban – missing partnerId and tenantId",
     body: { reason: "fraud" },
-    expected: {
-      status: 400,
-      data: {
-        error: {
-          code: "bad_request",
-          message: "Either `partnerId` or `tenantId` must be provided.",
-          doc_url: "https://dub.co/docs/api-reference/errors#bad-request",
-        },
-      },
-    },
+    expected: apiError({
+      code: "bad_request",
+      message: "Either `partnerId` or `tenantId` must be provided.",
+    }),
   },
   {
     name: "POST /partners/ban – missing reason",
diff --git a/apps/web/playwright/api/partners/get-or-create-partner.spec.ts b/apps/web/playwright/api/partners/get-or-create-partner.spec.ts
new file mode 100644
index 00000000000..2c6fdb43910
--- /dev/null
+++ b/apps/web/playwright/api/partners/get-or-create-partner.spec.ts
@@ -0,0 +1,54 @@
+import { createId } from "@/lib/api/create-id";
+import { getOrCreatePartner } from "@/lib/api/partners/get-or-create-partner";
+import { prisma } from "@/lib/prisma";
+import { expect } from "@playwright/test";
+import { randomPartnerEmail } from "../../utils";
+import { test } from "../fixtures";
+import { deletePartner } from "./helpers";
+
+test("getOrCreatePartner – concurrent same email shares one partner", async () => {
+  const email = randomPartnerEmail();
+
+  try {
+    const results = await Promise.all(
+      Array.from({ length: 5 }, () =>
+        getOrCreatePartner({
+          email,
+          create: {
+            id: createId({ prefix: "pn_" }),
+            name: email,
+            email,
+          },
+        }),
+      ),
+    );
+
+    const partnerIds = new Set(results.map((result) => result.partner.id));
+
+    expect(partnerIds.size).toBe(1);
+    expect(results.filter((result) => result.created)).toHaveLength(1);
+    expect(results.every((result) => result.partner.email === email)).toBe(
+      true,
+    );
+
+    const rows = await prisma.partner.findMany({
+      where: {
+        email,
+      },
+    });
+
+    expect(rows).toHaveLength(1);
+    expect(rows[0]?.id).toBe(results[0].partner.id);
+  } finally {
+    const rows = await prisma.partner.findMany({
+      where: {
+        email,
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    await Promise.all(rows.map((row) => deletePartner(row.id)));
+  }
+});
diff --git a/apps/web/playwright/api/partners/helpers.ts b/apps/web/playwright/api/partners/helpers.ts
new file mode 100644
index 00000000000..dc7cbf1f364
--- /dev/null
+++ b/apps/web/playwright/api/partners/helpers.ts
@@ -0,0 +1,116 @@
+import { createId } from "@/lib/api/create-id";
+import { conn } from "@/lib/planetscale";
+import { prisma } from "@/lib/prisma";
+import type { EnrolledPartnerProps } from "@/lib/types";
+import { DEFAULT_ADDITIONAL_PARTNER_LINKS } from "@/lib/zod/schemas/groups";
+import { nanoid, sleep } from "@dub/utils";
+import { randomName, randomPartnerEmail } from "../../utils";
+import type { ApiClient } from "../fixtures";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+export async function createPartner(
+  api: ApiClient,
+  overrides: Record<string, unknown> = {},
+) {
+  return api.post<EnrolledPartnerProps>("/api/partners", {
+    name: randomName(),
+    email: randomPartnerEmail(),
+    ...overrides,
+  });
+}
+
+export async function createGroupWithAdditionalLinks(programId: string) {
+  return prisma.partnerGroup.create({
+    data: {
+      id: createId({ prefix: "grp_" }),
+      programId,
+      slug: `pw-links-${nanoid(8).toLowerCase()}`,
+      name: randomName("links-group"),
+      maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+      additionalLinks: [
+        {
+          domain: "example.com",
+          path: "",
+          validationMode: "domain",
+        },
+      ],
+      partnerGroupDefaultLinks: {
+        create: {
+          id: createId({ prefix: "pgdl_" }),
+          programId,
+          domain: TEST_WORKSPACE.program.domain,
+          url: TEST_WORKSPACE.program.url,
+        },
+      },
+    },
+  });
+}
+
+function isRelationConstraintError(error: unknown) {
+  return (
+    typeof error === "object" &&
+    error !== null &&
+    "code" in error &&
+    (error.code === "P2014" || error.code === "P2003")
+  );
+}
+
+// Commissions/payouts/customers require ProgramEnrollment. Lead tracking also
+// queues create-partner-commission via QStash, so rows can appear after the
+// first deleteMany — retry until enrollment delete succeeds.
+export async function deletePartnerData(partnerId: string) {
+  await prisma.notificationEmail.deleteMany({
+    where: { partnerId },
+  });
+
+  await prisma.discountCode.deleteMany({
+    where: { partnerId },
+  });
+
+  const deadline = Date.now() + 15_000;
+
+  while (true) {
+    try {
+      await prisma.commission.deleteMany({
+        where: { partnerId },
+      });
+
+      await prisma.payout.deleteMany({
+        where: { partnerId },
+      });
+
+      await prisma.submittedLead.deleteMany({
+        where: { partnerId },
+      });
+
+      await prisma.customer.deleteMany({
+        where: { partnerId },
+      });
+
+      await prisma.link.deleteMany({
+        where: { partnerId },
+      });
+
+      await prisma.programEnrollment.deleteMany({
+        where: { partnerId },
+      });
+      return;
+    } catch (error) {
+      if (!isRelationConstraintError(error) || Date.now() >= deadline) {
+        throw error;
+      }
+
+      await sleep(250);
+    }
+  }
+}
+
+export async function deletePartner(partnerId: string | undefined) {
+  if (!partnerId) return;
+
+  await deletePartnerData(partnerId);
+
+  // Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
+  // bulkDeletePartners cleanup used by e2e cron.
+  await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
+}
diff --git a/apps/web/playwright/api/partners/partners.spec.ts b/apps/web/playwright/api/partners/partners.spec.ts
index 1fc27831ac6..cbbc82e0bd2 100644
--- a/apps/web/playwright/api/partners/partners.spec.ts
+++ b/apps/web/playwright/api/partners/partners.spec.ts
@@ -1,18 +1,13 @@
-import { conn } from "@/lib/planetscale";
-import { prisma } from "@/lib/prisma";
 import type { EnrolledPartnerProps } from "@/lib/types";
 import { EnrolledPartnerSchema as EnrolledPartnerSchemaDate } from "@/lib/zod/schemas/partners";
 import { nanoid } from "@dub/utils";
 import { expect } from "@playwright/test";
 import slugify from "@sindresorhus/slugify";
 import * as z from "zod/v4";
-import { randomName, randomPartnerEmail } from "../../utils";
-import { test, type ApiClient } from "../fixtures";
+import { apiError, randomName, randomPartnerEmail } from "../../utils";
+import { test } from "../fixtures";
 import { TEST_WORKSPACE } from "../setup-test-workspace";
-
-test.describe.configure({
-  mode: "parallel",
-});
+import { createPartner, deletePartner } from "./helpers";
 
 const EnrolledPartnerSchema = EnrolledPartnerSchemaDate.extend({
   createdAt: z.string(),
@@ -26,37 +21,6 @@ function reEscape(s: string) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-async function createPartner(
-  api: ApiClient,
-  overrides: Record<string, unknown> = {},
-) {
-  return api.post<EnrolledPartnerProps>("/api/partners", {
-    name: randomName(),
-    email: randomPartnerEmail(),
-    ...overrides,
-  });
-}
-
-async function deletePartner(partnerId: string | undefined) {
-  if (!partnerId) return;
-
-  await prisma.link.deleteMany({
-    where: {
-      partnerId,
-    },
-  });
-
-  await prisma.programEnrollment.deleteMany({
-    where: {
-      partnerId,
-    },
-  });
-
-  // Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
-  // bulkDeletePartners cleanup used by e2e cron.
-  await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);
-}
-
 test("POST /partners", async ({ api, program }) => {
   let partnerId: string | undefined;
 
@@ -175,18 +139,13 @@ test("POST /partners – invalid username", async ({ api }) => {
       email: randomPartnerEmail(),
       username: "invalid username",
     }),
-  ).toEqual({
-    status: 422,
-    data: {
-      error: {
-        code: "unprocessable_entity",
-        message:
-          "custom: username: Invalid username. Must be a URL-friendly string.",
-        doc_url:
-          "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-      },
-    },
-  });
+  ).toEqual(
+    apiError({
+      code: "unprocessable_entity",
+      message:
+        "custom: username: Invalid username. Must be a URL-friendly string.",
+    }),
+  );
 });
 
 test("POST /partners – linkProps.prefix on default link", async ({
diff --git a/apps/web/playwright/api/rewards/click-reward.spec.ts b/apps/web/playwright/api/rewards/click-reward.spec.ts
new file mode 100644
index 00000000000..cef34f9f028
--- /dev/null
+++ b/apps/web/playwright/api/rewards/click-reward.spec.ts
@@ -0,0 +1,183 @@
+import { getRewardAmount } from "@/lib/partners/get-reward-amount";
+import { resolveClickReward } from "@/lib/rewards/resolve-click-reward";
+import type { RewardConditionsArray } from "@/lib/types";
+import { expect } from "@playwright/test";
+import { EventType, Prisma, Reward, RewardStructure } from "@prisma/client";
+import { test } from "../fixtures";
+import { createReward, deleteReward, updateReward } from "./helpers";
+
+const countryInModifier: RewardConditionsArray = [
+  {
+    operator: "AND",
+    type: RewardStructure.flat,
+    amountInCents: 100,
+    conditions: [
+      {
+        entity: "customer",
+        attribute: "country",
+        operator: "in",
+        value: ["US", "GB", "AU"],
+      },
+    ],
+  },
+];
+
+function resolvedAmount(reward: Reward, country: string) {
+  const resolved = resolveClickReward({ reward, country });
+
+  return getRewardAmount({
+    type: resolved.type,
+    amountInCents: resolved.amountInCents,
+    amountInPercentage:
+      resolved.amountInPercentage != null
+        ? Number(resolved.amountInPercentage)
+        : null,
+  });
+}
+
+test.describe("Click reward resolution", () => {
+  // Shared reward; serial so modifiers can be updated between tests.
+  test.describe.configure({ mode: "serial" });
+
+  let rewardId: string | undefined;
+
+  test.beforeAll(async ({ program }) => {
+    const reward = await createReward({
+      programId: program.id,
+      event: EventType.click,
+      type: RewardStructure.flat,
+      amountInCents: 20,
+      modifiers: countryInModifier,
+    });
+
+    rewardId = reward.id;
+  });
+
+  test.afterAll(async () => {
+    await deleteReward(rewardId);
+  });
+
+  test("countries in modifier list get modifier amount; others get base", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: countryInModifier,
+    });
+
+    const testCases = [
+      { country: "US", expected: 100 },
+      { country: "GB", expected: 100 },
+      { country: "AU", expected: 100 },
+      { country: "CA", expected: 20 },
+      { country: "FR", expected: 20 },
+      { country: "DE", expected: 20 },
+      { country: "JP", expected: 20 },
+    ];
+
+    for (const { country, expected } of testCases) {
+      expect(resolvedAmount(reward, country)).toBe(expected);
+    }
+  });
+
+  test("equals_to country modifier matches only that country", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 100,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(resolvedAmount(reward, "US")).toBe(100);
+    expect(resolvedAmount(reward, "GB")).toBe(20);
+    expect(resolvedAmount(reward, "CA")).toBe(20);
+  });
+
+  test("not_in country modifier excludes listed countries", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 100,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "not_in",
+              value: ["US"],
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(resolvedAmount(reward, "US")).toBe(20);
+    expect(resolvedAmount(reward, "GB")).toBe(100);
+    expect(resolvedAmount(reward, "CA")).toBe(100);
+  });
+
+  test("null modifiers always use base amount", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: Prisma.JsonNull,
+    });
+
+    expect(reward.modifiers).toBeNull();
+    expect(resolvedAmount(reward, "US")).toBe(20);
+    expect(resolvedAmount(reward, "GB")).toBe(20);
+  });
+
+  test("overlapping modifier groups pick the highest amount", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 100,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 250,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "in",
+              value: ["US", "GB"],
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(resolvedAmount(reward, "US")).toBe(250);
+    expect(resolvedAmount(reward, "GB")).toBe(250);
+    expect(resolvedAmount(reward, "CA")).toBe(20);
+  });
+
+  test("invalid modifiers JSON falls back to base amount", async () => {
+    const reward = await updateReward(rewardId!, {
+      modifiers: {},
+    });
+
+    expect(resolvedAmount(reward, "US")).toBe(20);
+    expect(resolvedAmount(reward, "GB")).toBe(20);
+  });
+});
diff --git a/apps/web/playwright/api/rewards/helpers.ts b/apps/web/playwright/api/rewards/helpers.ts
new file mode 100644
index 00000000000..46d8ed823f5
--- /dev/null
+++ b/apps/web/playwright/api/rewards/helpers.ts
@@ -0,0 +1,36 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { Prisma, Reward } from "@prisma/client";
+
+export async function createReward(
+  data: Omit<Prisma.RewardUncheckedCreateInput, "id">,
+): Promise<Reward> {
+  return prisma.reward.create({
+    data: {
+      id: createId({ prefix: "rw_" }),
+      ...data,
+    },
+  });
+}
+
+export async function updateReward(
+  rewardId: string,
+  data: Prisma.RewardUncheckedUpdateInput,
+) {
+  return prisma.reward.update({
+    where: {
+      id: rewardId,
+    },
+    data,
+  });
+}
+
+export async function deleteReward(rewardId: string | undefined) {
+  if (!rewardId) return;
+
+  await prisma.reward.delete({
+    where: {
+      id: rewardId,
+    },
+  });
+}
diff --git a/apps/web/playwright/api/rewards/lead-reward.spec.ts b/apps/web/playwright/api/rewards/lead-reward.spec.ts
new file mode 100644
index 00000000000..d1a1d54473d
--- /dev/null
+++ b/apps/web/playwright/api/rewards/lead-reward.spec.ts
@@ -0,0 +1,781 @@
+import { prisma } from "@/lib/prisma";
+import type {
+  CommissionResponse,
+  Customer,
+  EnrolledPartnerProps,
+  LinkProps,
+  RewardConditionsArray,
+} from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { EventType, Prisma, RewardStructure } from "@prisma/client";
+
+import { randomCustomer } from "../../utils";
+import { deleteCommissionPartner } from "../commissions/helpers";
+import { trackClick, trackLead } from "../conversions/helpers";
+import { test, type ApiClient } from "../fixtures";
+import { createPartner } from "../partners/helpers";
+import { createReward, deleteReward, updateReward } from "./helpers";
+
+const BASE_AMOUNT = 100;
+const MODIFIER_AMOUNT = 500;
+
+type LeadRewardCtx = {
+  api: ApiClient;
+  partnerId: string;
+  programId: string;
+  workspaceId: string;
+  link: Pick<LinkProps, "id" | "domain" | "key">;
+};
+
+const planProMetadataModifier: RewardConditionsArray = [
+  {
+    operator: "AND",
+    type: RewardStructure.flat,
+    amountInCents: MODIFIER_AMOUNT,
+    conditions: [
+      {
+        entity: "lead",
+        attribute: "metadata",
+        metadataField: "plan",
+        operator: "equals_to",
+        value: "pro",
+      },
+    ],
+  },
+];
+
+function modifier(
+  conditions: RewardConditionsArray[number]["conditions"],
+  amountInCents = MODIFIER_AMOUNT,
+): RewardConditionsArray {
+  return [
+    {
+      operator: "AND",
+      type: RewardStructure.flat,
+      amountInCents,
+      conditions,
+    },
+  ];
+}
+
+async function resetPartnerState(
+  ctx: LeadRewardCtx,
+  { country = "US" }: { country?: string } = {},
+) {
+  await prisma.partner.update({
+    where: {
+      id: ctx.partnerId,
+    },
+    data: {
+      country,
+    },
+  });
+
+  await prisma.link.update({
+    where: {
+      id: ctx.link.id,
+    },
+    data: {
+      clicks: 0,
+      leads: 0,
+      conversions: 0,
+      sales: 0,
+      saleAmount: 0,
+    },
+  });
+
+  await prisma.programEnrollment.update({
+    where: {
+      partnerId_programId: {
+        partnerId: ctx.partnerId,
+        programId: ctx.programId,
+      },
+    },
+    data: {
+      totalCommissions: 0,
+    },
+  });
+}
+
+async function trackPartnerLead(
+  ctx: LeadRewardCtx,
+  overrides: Record<string, unknown> = {},
+): Promise<{ customerExternalId: string }> {
+  const { clickId } = await trackClick({
+    domain: ctx.link.domain,
+    key: ctx.link.key,
+  });
+
+  const { customer } = await trackLead({
+    clickId,
+    eventName: "Signup",
+    ...overrides,
+  });
+
+  return {
+    customerExternalId:
+      (overrides.customerExternalId as string | undefined) ??
+      customer.externalId,
+  };
+}
+
+async function expectLeadCommission(
+  ctx: LeadRewardCtx,
+  {
+    customerExternalId,
+    expectedEarnings,
+    expectedMetadata,
+  }: {
+    customerExternalId: string;
+    expectedEarnings: number;
+    expectedMetadata?: Record<string, unknown> | null;
+  },
+) {
+  let customerId: string | undefined;
+
+  await expect
+    .poll(async () => {
+      const customer = await prisma.customer.findUnique({
+        where: {
+          projectId_externalId: {
+            projectId: ctx.workspaceId,
+            externalId: customerExternalId,
+          },
+        },
+      });
+
+      if (!customer) {
+        return null;
+      }
+
+      customerId = customer.id;
+
+      const commission = await prisma.commission.findFirst({
+        where: {
+          partnerId: ctx.partnerId,
+          programId: ctx.programId,
+          type: "lead",
+          customerId,
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+      });
+
+      if (!commission) {
+        return null;
+      }
+
+      return {
+        earnings: Number(commission.earnings),
+        metadata: commission.metadata,
+      };
+    })
+    .toEqual({
+      earnings: expectedEarnings,
+      metadata: expectedMetadata === undefined ? null : expectedMetadata,
+    });
+
+  const listQuery = new URLSearchParams({
+    partnerId: ctx.partnerId,
+    type: "lead",
+    customerId: customerId!,
+  });
+
+  const { status, data: commissions } = await ctx.api.get<CommissionResponse[]>(
+    `/api/commissions?${listQuery}`,
+  );
+
+  expect(status).toEqual(200);
+  expect(commissions.length).toBeGreaterThan(0);
+  expect(commissions[0]).toMatchObject({
+    type: "lead",
+    earnings: expectedEarnings,
+    ...(expectedMetadata !== undefined ? { metadata: expectedMetadata } : {}),
+  });
+}
+
+async function expectNoCommission(
+  ctx: LeadRewardCtx,
+  { customerExternalId }: { customerExternalId: string },
+) {
+  // Give the create-partner-commission workflow time to run (and skip).
+  await sleep(5_000);
+
+  const customer = await prisma.customer.findUnique({
+    where: {
+      projectId_externalId: {
+        projectId: ctx.workspaceId,
+        externalId: customerExternalId,
+      },
+    },
+  });
+
+  expect(customer).toBeTruthy();
+
+  const commission = await prisma.commission.findFirst({
+    where: {
+      partnerId: ctx.partnerId,
+      programId: ctx.programId,
+      type: "lead",
+      customerId: customer!.id,
+    },
+  });
+
+  expect(commission).toBeNull();
+}
+
+async function expectLeadCommissionCount(
+  ctx: LeadRewardCtx,
+  {
+    customerExternalId,
+    count,
+  }: {
+    customerExternalId: string;
+    count: number;
+  },
+) {
+  const customer = await prisma.customer.findUniqueOrThrow({
+    where: {
+      projectId_externalId: {
+        projectId: ctx.workspaceId,
+        externalId: customerExternalId,
+      },
+    },
+  });
+
+  // Give a follow-up create-partner-commission workflow time to run (or skip).
+  await sleep(5_000);
+
+  await expect
+    .poll(async () => {
+      return prisma.commission.count({
+        where: {
+          partnerId: ctx.partnerId,
+          programId: ctx.programId,
+          type: "lead",
+          customerId: customer.id,
+        },
+      });
+    })
+    .toEqual(count);
+}
+
+test.describe("Lead rewards", () => {
+  // Shared reward + enrollment; serial so modifiers can be updated between tests.
+  // No retries: a failed case leaves shared reward/partner state that would flake on retry.
+  test.describe.configure({ mode: "serial", retries: 0 });
+
+  let rewardId: string | undefined;
+  let ctx: LeadRewardCtx | undefined;
+
+  test.beforeAll(async ({ api, program, workspace }) => {
+    const reward = await createReward({
+      programId: program.id,
+      event: EventType.lead,
+      type: RewardStructure.flat,
+      amountInCents: BASE_AMOUNT,
+      maxDuration: 0,
+    });
+
+    const { data } = await createPartner(api, {
+      groupId: program.defaultGroupId,
+      country: "US",
+    });
+
+    const partner = data as EnrolledPartnerProps;
+    expect(partner.links?.[0]).toBeTruthy();
+
+    rewardId = reward.id;
+    ctx = {
+      api,
+      partnerId: partner.id,
+      programId: program.id,
+      workspaceId: workspace.id,
+      link: partner.links![0],
+    };
+
+    // Detach the default group's lead reward so the first test has none.
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: partner.id,
+          programId: program.id,
+        },
+      },
+      data: {
+        leadRewardId: null,
+      },
+    });
+  });
+
+  test.afterAll(async () => {
+    await deleteCommissionPartner({ partnerId: ctx?.partnerId });
+    await deleteReward(rewardId);
+  });
+
+  test("no lead reward skips commission creation", async () => {
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectNoCommission(ctx!, { customerExternalId });
+  });
+
+  test("base reward with no conditions uses base amount", async () => {
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: ctx!.partnerId,
+          programId: ctx!.programId,
+        },
+      },
+      data: {
+        leadRewardId: rewardId!,
+      },
+    });
+
+    await updateReward(rewardId!, {
+      modifiers: Prisma.JsonNull,
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("does not create a second lead commission for the same customer and partner", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: Prisma.JsonNull,
+    });
+
+    const customer = randomCustomer();
+    const { customerExternalId } = await trackPartnerLead(ctx!, {
+      eventName: "Signup",
+      customerExternalId: customer.externalId,
+      customerEmail: customer.email,
+      customerName: customer.name,
+    });
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+
+    // Different eventName so /track/lead is not Redis-deduped; commission
+    // workflow should still skip because a lead commission already exists.
+    await trackPartnerLead(ctx!, {
+      eventName: "Requested demo",
+      customerExternalId: customer.externalId,
+      customerEmail: customer.email,
+      customerName: customer.name,
+    });
+    await expectLeadCommissionCount(ctx!, {
+      customerExternalId,
+      count: 1,
+    });
+  });
+
+  test("customer source equals_to tracked matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "source",
+          operator: "equals_to",
+          value: "tracked",
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer source equals_to submitted misses and uses base", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "source",
+          operator: "equals_to",
+          value: "submitted",
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("customer country equals_to US matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer country equals_to CA matches pre-created customer", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "CA",
+        },
+      ]),
+    });
+
+    const customer = randomCustomer();
+    const { status } = await ctx!.api.post<Customer>("/api/customers", {
+      ...customer,
+      country: "CA",
+    });
+    expect(status).toEqual(201);
+
+    const { customerExternalId } = await trackPartnerLead(ctx!, {
+      customerExternalId: customer.externalId,
+      customerEmail: customer.email,
+      customerName: customer.name,
+    });
+
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner country equals_to US matches", async () => {
+    await resetPartnerState(ctx!, { country: "US" });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner country equals_to US misses for SG partner", async () => {
+    await resetPartnerState(ctx!, { country: "SG" });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("partner totalClicks greater_than matches seeded clicks", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        clicks: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalClicks",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalClicks greater_than misses when clicks are zero", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalClicks",
+          operator: "greater_than",
+          value: 50,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("partner totalLeads greater_than matches seeded leads", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        leads: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalLeads",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalConversions greater_than matches seeded conversions", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        conversions: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalConversions",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalSaleAmount greater_than matches seeded saleAmount", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        saleAmount: 50_00,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalSaleAmount",
+          operator: "greater_than",
+          value: 40_00,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalCommissions greater_than matches seeded enrollment total", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: ctx!.partnerId,
+          programId: ctx!.programId,
+        },
+      },
+      data: {
+        totalCommissions: 50_00,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalCommissions",
+          operator: "greater_than",
+          value: 40_00,
+        },
+      ]),
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("lead metadata plan equals_to pro matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: planProMetadataModifier,
+    });
+
+    const metadata = { plan: "pro" };
+    const { customerExternalId } = await trackPartnerLead(ctx!, { metadata });
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: MODIFIER_AMOUNT,
+      expectedMetadata: metadata,
+    });
+  });
+
+  test("lead metadata plan equals_to pro misses without metadata", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: planProMetadataModifier,
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("when customer country is US and partner country is US", async () => {
+    await resetPartnerState(ctx!, { country: "US" });
+    await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 200,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 300,
+          conditions: [
+            {
+              entity: "partner",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+      ],
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: 300,
+    });
+  });
+
+  test("when customer country is US and partner country is not US", async () => {
+    await resetPartnerState(ctx!, { country: "SG" });
+    await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 200,
+          conditions: [
+            {
+              entity: "customer",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 300,
+          conditions: [
+            {
+              entity: "partner",
+              attribute: "country",
+              operator: "equals_to",
+              value: "US",
+            },
+          ],
+        },
+      ],
+    });
+
+    const { customerExternalId } = await trackPartnerLead(ctx!);
+    await expectLeadCommission(ctx!, {
+      customerExternalId,
+      expectedEarnings: 200,
+    });
+  });
+});
diff --git a/apps/web/playwright/api/rewards/sale-reward.spec.ts b/apps/web/playwright/api/rewards/sale-reward.spec.ts
new file mode 100644
index 00000000000..938903755c7
--- /dev/null
+++ b/apps/web/playwright/api/rewards/sale-reward.spec.ts
@@ -0,0 +1,1148 @@
+import { prisma } from "@/lib/prisma";
+import type {
+  CommissionResponse,
+  EnrolledPartnerProps,
+  LinkProps,
+  RewardConditionsArray,
+} from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { EventType, Prisma, RewardStructure } from "@prisma/client";
+
+import { deleteCommissionPartner } from "../commissions/helpers";
+import { trackClick, trackLead, trackSale } from "../conversions/helpers";
+import { test, type ApiClient } from "../fixtures";
+import { createPartner } from "../partners/helpers";
+import { createReward, deleteReward, updateReward } from "./helpers";
+
+const BASE_AMOUNT = 100;
+const MODIFIER_AMOUNT = 500;
+const SALE_AMOUNT = 1000;
+
+type SaleRewardCtx = {
+  api: ApiClient;
+  partnerId: string;
+  programId: string;
+  workspaceId: string;
+  link: Pick<LinkProps, "id" | "domain" | "key">;
+};
+
+const bookTitleMetadataModifier: RewardConditionsArray = [
+  {
+    operator: "AND",
+    type: RewardStructure.flat,
+    amountInCents: MODIFIER_AMOUNT,
+    conditions: [
+      {
+        entity: "sale",
+        attribute: "metadata",
+        metadataField: "bookTitle",
+        operator: "equals_to",
+        value: "THGTTG",
+      },
+    ],
+  },
+];
+
+function modifier(
+  conditions: RewardConditionsArray[number]["conditions"],
+  amountInCents = MODIFIER_AMOUNT,
+): RewardConditionsArray {
+  return [
+    {
+      operator: "AND",
+      type: RewardStructure.flat,
+      amountInCents,
+      conditions,
+    },
+  ];
+}
+
+async function resetPartnerState(
+  ctx: SaleRewardCtx,
+  { country = "US" }: { country?: string } = {},
+) {
+  await prisma.partner.update({
+    where: {
+      id: ctx.partnerId,
+    },
+    data: {
+      country,
+    },
+  });
+
+  await prisma.link.update({
+    where: {
+      id: ctx.link.id,
+    },
+    data: {
+      clicks: 0,
+      leads: 0,
+      conversions: 0,
+      sales: 0,
+      saleAmount: 0,
+    },
+  });
+
+  await prisma.programEnrollment.update({
+    where: {
+      partnerId_programId: {
+        partnerId: ctx.partnerId,
+        programId: ctx.programId,
+      },
+    },
+    data: {
+      totalCommissions: 0,
+    },
+  });
+}
+
+async function trackPartnerSale(
+  ctx: SaleRewardCtx,
+  overrides: Record<string, unknown> = {},
+): Promise<{
+  customerExternalId: string;
+  invoiceId: string;
+  amount: number;
+}> {
+  const customerExternalIdOverride = overrides.customerExternalId as
+    | string
+    | undefined;
+  const saleOverrides = { ...overrides };
+  delete saleOverrides.customerExternalId;
+  delete saleOverrides.customerEmail;
+  delete saleOverrides.customerName;
+
+  const { clickId } = await trackClick({
+    domain: ctx.link.domain,
+    key: ctx.link.key,
+  });
+
+  const { customer } = await trackLead({
+    clickId,
+    eventName: "Signup",
+    ...(customerExternalIdOverride
+      ? {
+          customerExternalId: customerExternalIdOverride,
+          customerEmail: overrides.customerEmail,
+          customerName: overrides.customerName,
+        }
+      : {}),
+  });
+
+  const customerExternalId = customerExternalIdOverride ?? customer.externalId;
+
+  const { invoiceId, amount } = await trackSale({
+    customerExternalId,
+    amount: SALE_AMOUNT,
+    ...saleOverrides,
+  });
+
+  return {
+    customerExternalId,
+    invoiceId,
+    amount,
+  };
+}
+
+async function trackSaleForCustomer(
+  ctx: SaleRewardCtx,
+  {
+    customerExternalId,
+    ...overrides
+  }: {
+    customerExternalId: string;
+  } & Record<string, unknown>,
+): Promise<{ invoiceId: string; amount: number }> {
+  return trackSale({
+    customerExternalId,
+    amount: SALE_AMOUNT,
+    ...overrides,
+  });
+}
+
+async function expectSaleCommission(
+  ctx: SaleRewardCtx,
+  {
+    invoiceId,
+    expectedEarnings,
+    expectedMetadata,
+  }: {
+    invoiceId: string;
+    expectedEarnings: number;
+    expectedMetadata?: Record<string, unknown> | null;
+  },
+) {
+  await expect
+    .poll(async () => {
+      const commission = await prisma.commission.findFirst({
+        where: {
+          partnerId: ctx.partnerId,
+          programId: ctx.programId,
+          type: "sale",
+          invoiceId,
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+      });
+
+      if (!commission) {
+        return null;
+      }
+
+      return {
+        earnings: Number(commission.earnings),
+        metadata: commission.metadata,
+      };
+    })
+    .toEqual({
+      earnings: expectedEarnings,
+      metadata: expectedMetadata === undefined ? null : expectedMetadata,
+    });
+
+  const listQuery = new URLSearchParams({
+    partnerId: ctx.partnerId,
+    type: "sale",
+    invoiceId,
+  });
+
+  const { status, data: commissions } = await ctx.api.get<CommissionResponse[]>(
+    `/api/commissions?${listQuery}`,
+  );
+
+  expect(status).toEqual(200);
+  expect(commissions.length).toBeGreaterThan(0);
+  expect(commissions[0]).toMatchObject({
+    type: "sale",
+    earnings: expectedEarnings,
+    invoiceId,
+    ...(expectedMetadata !== undefined ? { metadata: expectedMetadata } : {}),
+  });
+}
+
+async function expectNoSaleCommission(
+  ctx: SaleRewardCtx,
+  { invoiceId }: { invoiceId: string },
+) {
+  // Give the create-partner-commission workflow time to run (and skip).
+  await sleep(5_000);
+
+  const commission = await prisma.commission.findFirst({
+    where: {
+      partnerId: ctx.partnerId,
+      programId: ctx.programId,
+      type: "sale",
+      invoiceId,
+    },
+  });
+
+  expect(commission).toBeNull();
+}
+
+async function expectSaleCommissionCount(
+  ctx: SaleRewardCtx,
+  {
+    customerExternalId,
+    count,
+  }: {
+    customerExternalId: string;
+    count: number;
+  },
+) {
+  const customer = await prisma.customer.findUniqueOrThrow({
+    where: {
+      projectId_externalId: {
+        projectId: ctx.workspaceId,
+        externalId: customerExternalId,
+      },
+    },
+  });
+
+  // Give a follow-up create-partner-commission workflow time to run (or skip).
+  await sleep(5_000);
+
+  await expect
+    .poll(async () => {
+      return prisma.commission.count({
+        where: {
+          partnerId: ctx.partnerId,
+          programId: ctx.programId,
+          type: "sale",
+          customerId: customer.id,
+        },
+      });
+    })
+    .toEqual(count);
+}
+
+test.describe("Sale rewards", () => {
+  // Shared reward + enrollment; serial so modifiers can be updated between tests.
+  // No retries: a failed case leaves shared reward/partner state that would flake on retry.
+  test.describe.configure({ mode: "serial", retries: 0 });
+
+  let rewardId: string | undefined;
+  let ctx: SaleRewardCtx | undefined;
+
+  test.beforeAll(async ({ api, program, workspace }) => {
+    const reward = await createReward({
+      programId: program.id,
+      event: EventType.sale,
+      type: RewardStructure.flat,
+      amountInCents: BASE_AMOUNT,
+      maxDuration: null,
+    });
+
+    const { data } = await createPartner(api, {
+      groupId: program.defaultGroupId,
+      country: "US",
+    });
+
+    const partner = data as EnrolledPartnerProps;
+    expect(partner.links?.[0]).toBeTruthy();
+
+    rewardId = reward.id;
+    ctx = {
+      api,
+      partnerId: partner.id,
+      programId: program.id,
+      workspaceId: workspace.id,
+      link: partner.links![0],
+    };
+
+    // Detach default group rewards so the first test has none, and so
+    // track/lead does not enqueue a lead commission before sale jobs.
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: partner.id,
+          programId: program.id,
+        },
+      },
+      data: {
+        saleRewardId: null,
+        leadRewardId: null,
+      },
+    });
+  });
+
+  test.afterAll(async () => {
+    await deleteCommissionPartner({ partnerId: ctx?.partnerId });
+    await deleteReward(rewardId);
+  });
+
+  test("no sale reward skips commission creation", async () => {
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectNoSaleCommission(ctx!, { invoiceId });
+  });
+
+  test("base reward with no conditions uses base amount", async () => {
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: ctx!.partnerId,
+          programId: ctx!.programId,
+        },
+      },
+      data: {
+        saleRewardId: rewardId!,
+      },
+    });
+
+    await updateReward(rewardId!, {
+      modifiers: Prisma.JsonNull,
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("does not create a second sale commission when maxDuration is 0", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: Prisma.JsonNull,
+      maxDuration: 0,
+    });
+
+    const { customerExternalId, invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+
+    await trackSaleForCustomer(ctx!, { customerExternalId });
+    await expectSaleCommissionCount(ctx!, {
+      customerExternalId,
+      count: 1,
+    });
+
+    await updateReward(rewardId!, {
+      maxDuration: null,
+    });
+  });
+
+  test("customer source equals_to tracked matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "source",
+          operator: "equals_to",
+          value: "tracked",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer source equals_to submitted misses and uses base", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "source",
+          operator: "equals_to",
+          value: "submitted",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("customer country equals_to US matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer country equals_to SG matches after updating customer country", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "SG",
+        },
+      ]),
+    });
+
+    // track/sale requires customer.linkId; POST /api/customers alone leaves it
+    // null. Create via click+lead, then override country before the sale.
+    const { clickId } = await trackClick({
+      domain: ctx!.link.domain,
+      key: ctx!.link.key,
+    });
+    const { customer } = await trackLead({
+      clickId,
+      eventName: "Signup",
+    });
+
+    await prisma.customer.update({
+      where: {
+        projectId_externalId: {
+          projectId: ctx!.workspaceId,
+          externalId: customer.externalId,
+        },
+      },
+      data: {
+        country: "SG",
+      },
+    });
+
+    const { invoiceId } = await trackSale({
+      customerExternalId: customer.externalId,
+      amount: SALE_AMOUNT,
+    });
+
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer signupDate window matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "signupDate",
+          operator: "greater_than",
+          value: new Date("2026-02-16T00:00:00.000Z").getTime(),
+        },
+        {
+          entity: "customer",
+          attribute: "signupDate",
+          operator: "less_than",
+          value: new Date("2026-02-18T00:00:00.000Z").getTime(),
+        },
+      ]),
+    });
+
+    const { clickId } = await trackClick({
+      domain: ctx!.link.domain,
+      key: ctx!.link.key,
+    });
+    const { customer } = await trackLead({
+      clickId,
+      eventName: "Signup",
+    });
+
+    await prisma.customer.update({
+      where: {
+        projectId_externalId: {
+          projectId: ctx!.workspaceId,
+          externalId: customer.externalId,
+        },
+      },
+      data: {
+        createdAt: new Date("2026-02-17T00:00:00.000Z"),
+      },
+    });
+
+    const { invoiceId } = await trackSale({
+      customerExternalId: customer.externalId,
+      amount: SALE_AMOUNT,
+    });
+
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer signupDate window misses for current signup", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "signupDate",
+          operator: "greater_than",
+          value: new Date("2026-02-16T00:00:00.000Z").getTime(),
+        },
+        {
+          entity: "customer",
+          attribute: "signupDate",
+          operator: "less_than",
+          value: new Date("2026-02-18T00:00:00.000Z").getTime(),
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("customer subscriptionDurationMonths less_than_or_equal 3 matches first sale", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "subscriptionDurationMonths",
+          operator: "less_than_or_equal",
+          value: 3,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer subscriptionDurationMonths less_than_or_equal 3 misses after 4 months", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "subscriptionDurationMonths",
+          operator: "less_than_or_equal",
+          value: 3,
+        },
+      ]),
+    });
+
+    const { customerExternalId, invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+
+    const fourMonthsAgo = new Date();
+    fourMonthsAgo.setMonth(fourMonthsAgo.getMonth() - 4);
+
+    await prisma.commission.updateMany({
+      where: {
+        partnerId: ctx!.partnerId,
+        programId: ctx!.programId,
+        type: "sale",
+        invoiceId,
+      },
+      data: {
+        createdAt: fourMonthsAgo,
+      },
+    });
+
+    const second = await trackSaleForCustomer(ctx!, { customerExternalId });
+    await expectSaleCommission(ctx!, {
+      invoiceId: second.invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("customer subscriptionStartDate greater_than recent cutoff matches", async () => {
+    await resetPartnerState(ctx!);
+    const cutoff = Date.now() - 24 * 60 * 60 * 1000;
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "subscriptionStartDate",
+          operator: "greater_than",
+          value: cutoff,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("customer subscriptionStartDate greater_than future cutoff misses", async () => {
+    await resetPartnerState(ctx!);
+    const cutoff = Date.now() + 24 * 60 * 60 * 1000;
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "customer",
+          attribute: "subscriptionStartDate",
+          operator: "greater_than",
+          value: cutoff,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("partner country equals_to US matches", async () => {
+    await resetPartnerState(ctx!, { country: "US" });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner country equals_to US misses for SG partner", async () => {
+    await resetPartnerState(ctx!, { country: "SG" });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("partner totalClicks greater_than matches seeded clicks", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        clicks: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalClicks",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalClicks greater_than misses when clicks are zero", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalClicks",
+          operator: "greater_than",
+          value: 50,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("partner totalLeads greater_than matches seeded leads", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        leads: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalLeads",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalConversions greater_than matches seeded conversions", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        conversions: 50,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalConversions",
+          operator: "greater_than",
+          value: 40,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalSaleAmount greater_than matches seeded saleAmount", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.link.update({
+      where: {
+        id: ctx!.link.id,
+      },
+      data: {
+        saleAmount: 50_00,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalSaleAmount",
+          operator: "greater_than",
+          value: 40_00,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("partner totalCommissions greater_than matches seeded enrollment total", async () => {
+    await resetPartnerState(ctx!);
+    await prisma.programEnrollment.update({
+      where: {
+        partnerId_programId: {
+          partnerId: ctx!.partnerId,
+          programId: ctx!.programId,
+        },
+      },
+      data: {
+        totalCommissions: 50_00,
+      },
+    });
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "partner",
+          attribute: "totalCommissions",
+          operator: "greater_than",
+          value: 40_00,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("sale productId equals_to premiumProductId matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "productId",
+          operator: "equals_to",
+          value: "premiumProductId",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!, {
+      metadata: {
+        productId: "premiumProductId",
+      },
+    });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+      expectedMetadata: {
+        productId: "premiumProductId",
+      },
+    });
+  });
+
+  test("sale productId equals_to premiumProductId misses for regularProductId", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "productId",
+          operator: "equals_to",
+          value: "premiumProductId",
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!, {
+      metadata: {
+        productId: "regularProductId",
+      },
+    });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+      expectedMetadata: {
+        productId: "regularProductId",
+      },
+    });
+  });
+
+  test("sale amount greater_than 15000 matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "amount",
+          operator: "greater_than",
+          value: 15000,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!, {
+      amount: 17500,
+    });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("sale amount greater_than 15000 misses for default amount", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "amount",
+          operator: "greater_than",
+          value: 15000,
+        },
+      ]),
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("sale type equals_to new matches first sale and misses recurring", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "type",
+          operator: "equals_to",
+          value: "new",
+        },
+      ]),
+    });
+
+    const { customerExternalId, invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+
+    const second = await trackSaleForCustomer(ctx!, { customerExternalId });
+    await expectSaleCommission(ctx!, {
+      invoiceId: second.invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("sale type equals_to recurring misses first sale and matches second", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: modifier([
+        {
+          entity: "sale",
+          attribute: "type",
+          operator: "equals_to",
+          value: "recurring",
+        },
+      ]),
+    });
+
+    const { customerExternalId, invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+
+    const second = await trackSaleForCustomer(ctx!, { customerExternalId });
+    await expectSaleCommission(ctx!, {
+      invoiceId: second.invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+    });
+  });
+
+  test("sale metadata bookTitle equals_to THGTTG matches", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: bookTitleMetadataModifier,
+    });
+
+    const metadata = { bookTitle: "THGTTG" };
+    const { invoiceId } = await trackPartnerSale(ctx!, { metadata });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: MODIFIER_AMOUNT,
+      expectedMetadata: metadata,
+    });
+  });
+
+  test("sale metadata bookTitle equals_to THGTTG misses without metadata", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: bookTitleMetadataModifier,
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!);
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: BASE_AMOUNT,
+    });
+  });
+
+  test("when sale productId is premium and amount is greater than 15000", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 200,
+          conditions: [
+            {
+              entity: "sale",
+              attribute: "productId",
+              operator: "equals_to",
+              value: "premiumProductId",
+            },
+          ],
+        },
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 300,
+          conditions: [
+            {
+              entity: "sale",
+              attribute: "amount",
+              operator: "greater_than",
+              value: 15000,
+            },
+          ],
+        },
+      ],
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!, {
+      amount: 17500,
+      metadata: {
+        productId: "premiumProductId",
+      },
+    });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: 300,
+      expectedMetadata: {
+        productId: "premiumProductId",
+      },
+    });
+  });
+
+  test("when sale productId is premium and amount is not greater than 15000", async () => {
+    await resetPartnerState(ctx!);
+    await updateReward(rewardId!, {
+      modifiers: [
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 200,
+          conditions: [
+            {
+              entity: "sale",
+              attribute: "productId",
+              operator: "equals_to",
+              value: "premiumProductId",
+            },
+          ],
+        },
+        {
+          operator: "AND",
+          type: RewardStructure.flat,
+          amountInCents: 300,
+          conditions: [
+            {
+              entity: "sale",
+              attribute: "amount",
+              operator: "greater_than",
+              value: 15000,
+            },
+          ],
+        },
+      ],
+    });
+
+    const { invoiceId } = await trackPartnerSale(ctx!, {
+      amount: SALE_AMOUNT,
+      metadata: {
+        productId: "premiumProductId",
+      },
+    });
+    await expectSaleCommission(ctx!, {
+      invoiceId,
+      expectedEarnings: 200,
+      expectedMetadata: {
+        productId: "premiumProductId",
+      },
+    });
+  });
+});
diff --git a/apps/web/playwright/api/setup-test-workspace.ts b/apps/web/playwright/api/setup-test-workspace.ts
index 36cead52259..79b06a78889 100644
--- a/apps/web/playwright/api/setup-test-workspace.ts
+++ b/apps/web/playwright/api/setup-test-workspace.ts
@@ -5,9 +5,11 @@ import {
   DEFAULT_ADDITIONAL_PARTNER_LINKS,
   DEFAULT_PARTNER_GROUP,
 } from "@/lib/zod/schemas/groups";
+import { EventType, RewardStructure } from "@prisma/client";
 import { config as loadEnv } from "dotenv-flow";
 import { mkdir, writeFile } from "fs/promises";
 import path from "path";
+import { PLAYWRIGHT_API_BASE } from "./constants";
 
 loadEnv({
   silent: true,
@@ -30,10 +32,73 @@ export const TEST_WORKSPACE = {
     domain: "playwright-api.dub-internal-test.com",
     url: "https://example.com",
   },
+  shopify: {
+    storeId: "playwright-api.myshopify.com",
+  },
+} as const;
+
+export const TEST_COMMISSION_REWARDS = {
+  lead: {
+    id: "rw_playwright_api_lead",
+    event: EventType.lead,
+    type: RewardStructure.flat,
+    amountInCents: 1000,
+    modifiers: [
+      {
+        operator: "AND",
+        type: RewardStructure.flat,
+        amountInCents: 5000,
+        conditions: [
+          {
+            entity: "lead",
+            attribute: "metadata",
+            metadataField: "plan",
+            operator: "equals_to",
+            value: "pro",
+          },
+        ],
+      },
+    ],
+  },
+  sale: {
+    id: "rw_playwright_api_sale",
+    event: EventType.sale,
+    type: RewardStructure.flat,
+    amountInCents: 2500,
+    maxDuration: 0,
+    modifiers: [
+      {
+        operator: "AND",
+        type: RewardStructure.flat,
+        amountInCents: 5000,
+        conditions: [
+          {
+            entity: "sale",
+            attribute: "productId",
+            operator: "equals_to",
+            value: "sku_pro",
+          },
+        ],
+      },
+      {
+        operator: "AND",
+        type: RewardStructure.flat,
+        amountInCents: 7500,
+        conditions: [
+          {
+            entity: "sale",
+            attribute: "metadata",
+            metadataField: "plan",
+            operator: "equals_to",
+            value: "pro",
+          },
+        ],
+      },
+    ],
+  },
 } as const;
 
 const authFile = path.join(__dirname, "../.auth/api.json");
-const apiBaseURL = "http://localhost:8888";
 
 // Upserts a dedicated Playwright API user, workspace, membership,
 // RestrictedToken, and partner program. Safe to run repeatedly from globalSetup.
@@ -71,6 +136,8 @@ export async function setupTestWorkspace() {
       foldersLimit: 100,
       aiLimit: 1000,
       partnersLimit: 1000,
+      groupsLimit: 100,
+      shopifyStoreId: TEST_WORKSPACE.shopify.storeId,
     },
     create: {
       id: createId({ prefix: "ws_" }),
@@ -86,6 +153,8 @@ export async function setupTestWorkspace() {
       foldersLimit: 100,
       aiLimit: 1000,
       partnersLimit: 1000,
+      groupsLimit: 100,
+      shopifyStoreId: TEST_WORKSPACE.shopify.storeId,
     },
   });
 
@@ -153,7 +222,7 @@ export async function setupTestWorkspace() {
       {
         token,
         workspaceId: workspace.id,
-        baseURL: apiBaseURL,
+        baseURL: PLAYWRIGHT_API_BASE,
         userId: user.id,
         workspaceSlug: workspace.slug,
         programId,
@@ -257,6 +326,29 @@ async function setupTestProgram({
     },
   });
 
+  await Promise.all(
+    [TEST_COMMISSION_REWARDS.lead, TEST_COMMISSION_REWARDS.sale].map(
+      (reward) => {
+        const { id, ...data } = reward;
+        return prisma.reward.upsert({
+          where: {
+            id,
+          },
+          create: {
+            id,
+            programId: program.id,
+            groupId: program.defaultGroupId,
+            ...data,
+          },
+          update: {
+            ...data,
+            groupId: program.defaultGroupId,
+          },
+        });
+      },
+    ),
+  );
+
   const group = await prisma.partnerGroup.upsert({
     where: {
       programId_slug: {
@@ -271,10 +363,14 @@ async function setupTestProgram({
       name: DEFAULT_PARTNER_GROUP.name,
       color: DEFAULT_PARTNER_GROUP.color,
       maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+      leadRewardId: TEST_COMMISSION_REWARDS.lead.id,
+      saleRewardId: TEST_COMMISSION_REWARDS.sale.id,
     },
     update: {
       name: DEFAULT_PARTNER_GROUP.name,
       maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+      leadRewardId: TEST_COMMISSION_REWARDS.lead.id,
+      saleRewardId: TEST_COMMISSION_REWARDS.sale.id,
     },
   });
 
diff --git a/apps/web/playwright/api/shopify/helpers.ts b/apps/web/playwright/api/shopify/helpers.ts
new file mode 100644
index 00000000000..1d1f7ed79fa
--- /dev/null
+++ b/apps/web/playwright/api/shopify/helpers.ts
@@ -0,0 +1,169 @@
+import { createId } from "@/lib/api/create-id";
+import { prisma } from "@/lib/prisma";
+import type { Customer, EnrolledPartnerProps } from "@/lib/types";
+import { nanoid } from "@dub/utils";
+import { createHmac } from "crypto";
+import { PLAYWRIGHT_API_BASE } from "../constants";
+import type { ApiClient } from "../fixtures";
+import { TEST_WORKSPACE } from "../setup-test-workspace";
+
+export function shopifyOrderPayload({
+  checkoutToken,
+  amount = (Math.random() * 100).toFixed(2),
+  ...overrides
+}: {
+  checkoutToken: string;
+  amount?: string | number;
+} & Record<string, unknown>) {
+  return {
+    confirmation_number: nanoid(10),
+    checkout_token: checkoutToken,
+    customer: {
+      id: nanoid(10),
+      first_name: "John",
+      last_name: "Doe",
+      email: `john.doe.${nanoid(5)}@example.com`,
+    },
+    current_subtotal_price_set: {
+      shop_money: {
+        amount: String(amount),
+        currency_code: "USD",
+      },
+    },
+    discount_codes: [],
+    note_attributes: [],
+    billing_address: {
+      province: "California",
+      country_code: "US",
+    },
+    ...overrides,
+  };
+}
+
+function shopifyWebhookSignature(body: string) {
+  return createHmac("sha256", `${process.env.SHOPIFY_WEBHOOK_SECRET}`)
+    .update(body, "utf8")
+    .digest("base64");
+}
+
+export async function postShopifyPixel({
+  clickId,
+  checkoutToken,
+}: {
+  clickId?: string | null;
+  checkoutToken?: string;
+}) {
+  const response = await fetch(`${PLAYWRIGHT_API_BASE}/api/shopify/pixel`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      clickId,
+      checkoutToken,
+    }),
+  });
+
+  return {
+    status: response.status,
+    data: await response.json(),
+  };
+}
+
+export async function postShopifyOrdersPaidWebhook({
+  checkoutToken,
+  storeId = TEST_WORKSPACE.shopify.storeId,
+  existingCustomerId,
+  discountCode,
+  amount,
+  ...orderOverrides
+}: {
+  checkoutToken: string;
+  storeId?: string;
+  existingCustomerId?: string | null;
+  discountCode?: string | null;
+  amount?: string | number;
+} & Record<string, unknown>) {
+  const payload = shopifyOrderPayload({
+    checkoutToken,
+    amount,
+    ...(existingCustomerId && {
+      customer: { id: existingCustomerId },
+    }),
+    ...(discountCode && {
+      discount_codes: [{ code: discountCode }],
+    }),
+    ...orderOverrides,
+  });
+  const body = JSON.stringify(payload);
+  const signature = shopifyWebhookSignature(body);
+
+  const response = await fetch(
+    `${PLAYWRIGHT_API_BASE}/api/shopify/integration/webhook`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "x-shopify-topic": "orders/paid",
+        "x-shopify-shop-domain": storeId,
+        "x-shopify-hmac-sha256": signature,
+      },
+      body,
+    },
+  );
+
+  return {
+    status: response.status,
+    data: await response.text(),
+    payload,
+  };
+}
+
+export function partnerDefaultLink(partner: EnrolledPartnerProps) {
+  const link = partner.links?.[0];
+
+  if (!link?.id || !link.domain || !link.key) {
+    throw new Error("Partner was created without a default link.");
+  }
+
+  return link;
+}
+
+export async function createPartnerDiscountCode({
+  programId,
+  partnerId,
+  linkId,
+}: {
+  programId: string;
+  partnerId: string;
+  linkId: string;
+}) {
+  const code = `PW${nanoid(8).toUpperCase()}`;
+
+  await prisma.discountCode.create({
+    data: {
+      id: createId({ prefix: "dcode_" }),
+      code,
+      programId,
+      partnerId,
+      linkId,
+    },
+  });
+
+  return code;
+}
+
+export async function getCustomerByExternalId(
+  api: ApiClient,
+  externalId: string,
+) {
+  const { status, data } = await api.get<Customer[]>(
+    `/api/customers?externalId=${encodeURIComponent(externalId)}`,
+  );
+
+  if (status !== 200 || !Array.isArray(data) || data.length === 0) {
+    return undefined;
+  }
+
+  return data[0];
+}
diff --git a/apps/web/playwright/api/shopify/orders.spec.ts b/apps/web/playwright/api/shopify/orders.spec.ts
new file mode 100644
index 00000000000..fa777eae80c
--- /dev/null
+++ b/apps/web/playwright/api/shopify/orders.spec.ts
@@ -0,0 +1,165 @@
+import { nanoid } from "@dub/utils";
+import { expect } from "@playwright/test";
+import { randomName } from "../../utils";
+import { trackClick, trackLead } from "../conversions/helpers";
+import { test } from "../fixtures";
+import { createPartner, deletePartner } from "../partners/helpers";
+import {
+  createPartnerDiscountCode,
+  getCustomerByExternalId,
+  partnerDefaultLink,
+  postShopifyOrdersPaidWebhook,
+  postShopifyPixel,
+} from "./helpers";
+
+test("POST /shopify/pixel – skips when checkoutToken is missing", async () => {
+  const pixel = await postShopifyPixel({ clickId: nanoid(16) });
+
+  expect(pixel).toEqual({ status: 200, data: "OK" });
+});
+
+test("POST /shopify/integration/webhook – unknown shop", async () => {
+  const { status, data } = await postShopifyOrdersPaidWebhook({
+    checkoutToken: nanoid(10),
+    storeId: `${randomName("pw-shopify")}.myshopify.com`,
+  });
+
+  expect(status).toEqual(200);
+  expect(data).toMatch(/Workspace not found for shop: .+\. Skipping\.\.\./);
+});
+
+test("orders/paid – waits for pixel when there is no click, customer, or discount", async () => {
+  const { status, data } = await postShopifyOrdersPaidWebhook({
+    checkoutToken: nanoid(10),
+  });
+
+  expect(status).toEqual(200);
+  expect(data).toEqual("[Shopify] Waiting for pixel event to arrive...");
+});
+
+test.describe("Shopify orders/paid", () => {
+  test.describe.configure({ mode: "serial" });
+
+  let partnerId: string | undefined;
+  let clickId: string;
+  let discountCode: string;
+
+  test.beforeAll(async ({ api, program }) => {
+    const { data: partner } = await createPartner(api);
+    partnerId = partner.id;
+    const link = partnerDefaultLink(partner);
+
+    ({ clickId } = await trackClick({
+      domain: link.domain,
+      key: link.key,
+    }));
+
+    discountCode = await createPartnerDiscountCode({
+      programId: program.id,
+      partnerId: partner.id,
+      linkId: link.id,
+    });
+  });
+
+  test.afterAll(async () => {
+    await deletePartner(partnerId);
+  });
+
+  test("click first, then webhook", async () => {
+    const checkoutToken = nanoid(10);
+
+    const pixel = await postShopifyPixel({ clickId, checkoutToken });
+    expect(pixel).toEqual({ status: 200, data: "OK" });
+
+    const webhook = await postShopifyOrdersPaidWebhook({ checkoutToken });
+    expect(webhook.status).toEqual(200);
+    expect(webhook.data).toEqual(
+      `[Shopify] Click ID ${clickId} found. Order queued for processing.`,
+    );
+  });
+
+  test("webhook first, then click", async () => {
+    const checkoutToken = nanoid(10);
+
+    const webhook = await postShopifyOrdersPaidWebhook({ checkoutToken });
+    expect(webhook.status).toEqual(200);
+    expect(webhook.data).toEqual(
+      "[Shopify] Waiting for pixel event to arrive...",
+    );
+
+    const pixel = await postShopifyPixel({ clickId, checkoutToken });
+    expect(pixel).toEqual({ status: 200, data: "OK" });
+  });
+
+  test("click and webhook in parallel", async () => {
+    const checkoutToken = nanoid(10);
+
+    const [pixel, webhook] = await Promise.all([
+      postShopifyPixel({ clickId, checkoutToken }),
+      postShopifyOrdersPaidWebhook({ checkoutToken }),
+    ]);
+
+    expect(pixel).toEqual({ status: 200, data: "OK" });
+    expect(webhook.status).toEqual(200);
+    expect([
+      `[Shopify] Click ID ${clickId} found. Order queued for processing.`,
+      "[Shopify] Waiting for pixel event to arrive...",
+    ]).toContain(webhook.data);
+  });
+
+  test("webhook with dubClickId in note_attributes", async () => {
+    const checkoutToken = nanoid(10);
+
+    const webhook = await postShopifyOrdersPaidWebhook({
+      checkoutToken,
+      note_attributes: [{ name: "dubClickId", value: clickId }],
+    });
+
+    expect(webhook.status).toEqual(200);
+    expect(webhook.data).toEqual(
+      `[Shopify] Click ID ${clickId} found. Order queued for processing.`,
+    );
+  });
+
+  test("webhook with unknown dubClickId skips the order", async () => {
+    const checkoutToken = nanoid(10);
+
+    const webhook = await postShopifyOrdersPaidWebhook({
+      checkoutToken,
+      note_attributes: [{ name: "dubClickId", value: nanoid(16) }],
+    });
+
+    expect(webhook.status).toEqual(200);
+    expect(webhook.data).toEqual(
+      "[Shopify] Click event not found. Skipping the order...",
+    );
+  });
+
+  test("orders/paid – existing customer", async ({ api }) => {
+    const { customer } = await trackLead({ clickId });
+    const created = await getCustomerByExternalId(api, customer.externalId);
+    expect(created?.id).toEqual(expect.any(String));
+
+    const { status, data } = await postShopifyOrdersPaidWebhook({
+      checkoutToken: nanoid(10),
+      existingCustomerId: customer.externalId,
+    });
+
+    expect(status).toEqual(200);
+    expect(data).toEqual(
+      `[Shopify] Existing customer ${created!.id} found. Order queued for processing.`,
+    );
+  });
+
+  test("orders/paid – partner discount code", async () => {
+    const { status, data } = await postShopifyOrdersPaidWebhook({
+      checkoutToken: nanoid(10),
+      discountCode,
+    });
+
+    expect(status).toEqual(200);
+    expect(data).toEqual(
+      `[Shopify] Partner discount code ${discountCode} found. Order queued for processing.`,
+    );
+  });
+});
diff --git a/apps/web/playwright/api/tags/tags.spec.ts b/apps/web/playwright/api/tags/tags.spec.ts
index 7a51fe5adbb..787a7b6ecae 100644
--- a/apps/web/playwright/api/tags/tags.spec.ts
+++ b/apps/web/playwright/api/tags/tags.spec.ts
@@ -1,12 +1,8 @@
 import { expect } from "@playwright/test";
 import type { Tag } from "@prisma/client";
-import { randomName } from "../../utils";
+import { apiError, randomName } from "../../utils";
 import { test } from "../fixtures";
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("POST /tags", async ({ api }) => {
   let tagId: string | undefined;
 
@@ -36,35 +32,21 @@ const errorCases = [
       tag: "news",
       color: "invalid",
     },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message:
-            "invalid_value: color: Invalid color. Must be one of: red, yellow, green, blue, purple, brown, gray, pink", // TODO: update this to use RESOURCE_COLORS
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        "invalid_value: color: Invalid color. Must be one of: red, yellow, green, blue, purple, brown, gray, pink", // TODO: update this to use RESOURCE_COLORS
+    }),
   },
   {
     name: "POST /tags – without name",
     body: {
       color: "red",
     },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message: "custom: name: Name is required.",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message: "custom: name: Name is required.",
+    }),
   },
 ];
 
@@ -92,14 +74,12 @@ test("POST /tags – existing name", async ({ api }) => {
       color: "red",
     });
 
-    expect(status).toBe(409);
-    expect(error).toEqual({
-      error: {
+    expect({ status, data: error }).toEqual(
+      apiError({
         code: "conflict",
         message: "A tag with that name already exists.",
-        doc_url: "https://dub.co/docs/api-reference/errors#conflict",
-      },
-    });
+      }),
+    );
   } finally {
     if (tagId) await api.delete(`/api/tags/${tagId}`);
   }
diff --git a/apps/web/playwright/api/utm/utm.spec.ts b/apps/web/playwright/api/utm/utm.spec.ts
index cce166dbcf5..c747172b25d 100644
--- a/apps/web/playwright/api/utm/utm.spec.ts
+++ b/apps/web/playwright/api/utm/utm.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from "@playwright/test";
 import type { UtmTemplate } from "@prisma/client";
-import { randomName } from "../../utils";
+import { apiError, randomName } from "../../utils";
 import { test, type ApiClient } from "../fixtures";
 
 type UtmTemplateResponse = Pick<
@@ -49,10 +49,6 @@ async function deleteUtmTemplate(api: ApiClient, id: string | undefined) {
   await api.delete(`/api/utm/${id}`);
 }
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("POST /utm", async ({ api, workspace }) => {
   let id: string | undefined;
   const body = {
@@ -122,65 +118,37 @@ const errorCases = [
   {
     name: "POST /utm – missing name",
     body: {},
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message:
-            "invalid_type: name: Invalid input: expected string, received undefined",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        "invalid_type: name: Invalid input: expected string, received undefined",
+    }),
   },
   {
     name: "POST /utm – empty name",
     body: { name: "" },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message: "too_small: name: UTM name is required",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message: "too_small: name: UTM name is required",
+    }),
   },
   {
     name: "POST /utm – name too long",
     body: { name: "a".repeat(51) },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message:
-            "too_big: name: Too big: expected string to have <=50 characters",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        "too_big: name: Too big: expected string to have <=50 characters",
+    }),
   },
   {
     name: "POST /utm – utm_source too long",
     body: { name: randomName("utm"), utm_source: "a".repeat(256) },
-    expected: {
-      status: 422,
-      data: {
-        error: {
-          code: "unprocessable_entity",
-          message:
-            "too_big: utm_source: Too big: expected string to have <=255 characters",
-          doc_url:
-            "https://dub.co/docs/api-reference/errors#unprocessable-entity",
-        },
-      },
-    },
+    expected: apiError({
+      code: "unprocessable_entity",
+      message:
+        "too_big: utm_source: Too big: expected string to have <=255 characters",
+    }),
   },
 ];
 
@@ -204,14 +172,12 @@ test("POST /utm – existing name", async ({ api }) => {
       name: templateName,
     });
 
-    expect(status).toBe(409);
-    expect(error).toEqual({
-      error: {
+    expect({ status, data: error }).toEqual(
+      apiError({
         code: "conflict",
         message: "A template with that name already exists.",
-        doc_url: "https://dub.co/docs/api-reference/errors#conflict",
-      },
-    });
+      }),
+    );
   } finally {
     await deleteUtmTemplate(api, id);
   }
@@ -294,16 +260,12 @@ test("PATCH /utm/{id}", async ({ api }) => {
 test("PATCH /utm/{id} – not found", async ({ api }) => {
   expect(
     await api.patch("/api/utm/utm_missing", { name: randomName("utm") }),
-  ).toEqual({
-    status: 404,
-    data: {
-      error: {
-        code: "not_found",
-        message: "Template not found.",
-        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-      },
-    },
-  });
+  ).toEqual(
+    apiError({
+      code: "not_found",
+      message: "Template not found.",
+    }),
+  );
 });
 
 test("DELETE /utm/{id}", async ({ api }) => {
@@ -324,14 +286,10 @@ test("DELETE /utm/{id}", async ({ api }) => {
 });
 
 test("DELETE /utm/{id} – not found", async ({ api }) => {
-  expect(await api.delete("/api/utm/utm_missing")).toEqual({
-    status: 404,
-    data: {
-      error: {
-        code: "not_found",
-        message: "UTM template not found.",
-        doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-      },
-    },
-  });
+  expect(await api.delete("/api/utm/utm_missing")).toEqual(
+    apiError({
+      code: "not_found",
+      message: "UTM template not found.",
+    }),
+  );
 });
diff --git a/apps/web/playwright/api/workspaces/workspaces.spec.ts b/apps/web/playwright/api/workspaces/workspaces.spec.ts
index 524c4d98abc..a39cdd33550 100644
--- a/apps/web/playwright/api/workspaces/workspaces.spec.ts
+++ b/apps/web/playwright/api/workspaces/workspaces.spec.ts
@@ -2,13 +2,10 @@ import { WorkspaceSchema } from "@/lib/zod/schemas/workspaces";
 import { expect } from "@playwright/test";
 import type { Project } from "@prisma/client";
 import * as z from "zod/v4";
+import { apiError } from "../../utils";
 import { test } from "../fixtures";
 import { TEST_WORKSPACE } from "../setup-test-workspace";
 
-test.describe.configure({
-  mode: "parallel",
-});
-
 test("GET /workspaces/{idOrSlug} – by id", async ({ api, workspace }) => {
   const { status, data: workspaceFetched } = await api.get<Project>(
     `/api/workspaces/${workspace.id}`,
@@ -48,14 +45,10 @@ test("GET /workspaces/{idOrSlug} – by slug", async ({ api, workspace }) => {
 });
 
 test("GET /workspaces/{idOrSlug} – invalid slug or id", async ({ api }) => {
-  const { status, data: error } = await api.get(`/api/workspaces/xxxx`);
-
-  expect(status).toEqual(404);
-  expect(error).toStrictEqual({
-    error: {
+  expect(await api.get(`/api/workspaces/xxxx`)).toEqual(
+    apiError({
       code: "not_found",
       message: "Workspace not found.",
-      doc_url: "https://dub.co/docs/api-reference/errors#not-found",
-    },
-  });
+    }),
+  );
 });
diff --git a/apps/web/playwright/assert-local-database.ts b/apps/web/playwright/assert-local-database.ts
index 897f6279ba8..7359c68faa6 100644
--- a/apps/web/playwright/assert-local-database.ts
+++ b/apps/web/playwright/assert-local-database.ts
@@ -16,7 +16,7 @@ function assertUrl(
   if (!value) {
     if (required) {
       throw new Error(
-        `${name} is not set. Playwright tests require a local database. ${LOCAL_URL_HINT}`,
+        `${name} is not set. A local database is required. ${LOCAL_URL_HINT}`,
       );
     }
     return;
@@ -27,13 +27,13 @@ function assertUrl(
     hostname = hostnameFromDatabaseUrl(value);
   } catch {
     throw new Error(
-      `${name} is not a valid URL. Playwright tests require a local database. ${LOCAL_URL_HINT}`,
+      `${name} is not a valid URL. A local database is required. ${LOCAL_URL_HINT}`,
     );
   }
 
   if (!LOCAL_HOSTNAMES.has(hostname)) {
     throw new Error(
-      `Refusing to run Playwright tests: ${name} host "${hostname}" is not a local database. Only localhost / 127.0.0.1 / ::1 are allowed. ${LOCAL_URL_HINT}`,
+      `Refusing to proceed: ${name} host "${hostname}" is not a local database. Only localhost / 127.0.0.1 / ::1 are allowed. ${LOCAL_URL_HINT}`,
     );
   }
 }
diff --git a/apps/web/playwright/partners/auth.setup.ts b/apps/web/playwright/partners/auth.setup.ts
index 6c5b8f9b70b..c7c7c2843c1 100644
--- a/apps/web/playwright/partners/auth.setup.ts
+++ b/apps/web/playwright/partners/auth.setup.ts
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { nanoid } from "@dub/utils";
 import { expect, test } from "@playwright/test";
 import { extractOtp, waitForEmail } from "../mailhog";
@@ -15,18 +16,16 @@ test("sign up and verify new partner", async ({ page }) => {
 
   // Step 1: Enter email and reveal password field
   await page.locator('input[name="email"]').fill(email);
-  await page.getByRole("button", { name: "Sign Up" }).click();
+  await page.getByTestId(testIds.auth.signupSubmit).click();
 
   // Step 2: Enter password and submit
   const passwordInput = page.locator('input[name="password"]');
   await expect(passwordInput).toBeVisible();
   await passwordInput.fill(SIGNUP_PASSWORD);
-  await page.getByRole("button", { name: "Sign Up" }).click();
+  await page.getByTestId(testIds.auth.signupSubmit).click();
 
   // Step 3: Verify email via OTP from MailHog
-  await expect(
-    page.getByRole("heading", { name: "Verify your email address" }),
-  ).toBeVisible();
+  await expect(page.getByTestId(testIds.auth.verifyEmailHeading)).toBeVisible();
 
   const message = await waitForEmail(email);
   const otp = extractOtp(message);
diff --git a/apps/web/playwright/partners/login.spec.ts b/apps/web/playwright/partners/login.spec.ts
index 33cbbe72fe6..0b7a40736ef 100644
--- a/apps/web/playwright/partners/login.spec.ts
+++ b/apps/web/playwright/partners/login.spec.ts
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { expect, test } from "@playwright/test";
 import { env } from "../env";
 
@@ -12,30 +13,20 @@ test.describe("Partner Login", () => {
   test("login page renders correctly", async ({ page }) => {
     await page.goto("/login");
 
-    await expect(
-      page.getByRole("heading", {
-        name: "Log in to your Dub Partner account",
-      }),
-    ).toBeVisible();
+    await expect(page.getByTestId(testIds.auth.loginHeading)).toBeVisible();
 
     await expect(page.locator('input[name="email"]')).toBeVisible();
 
-    await expect(
-      page.getByRole("button", {
-        name: "Log in with email",
-      }),
-    ).toBeVisible();
+    await expect(page.getByTestId(testIds.auth.loginSubmit)).toBeVisible();
   });
 
   test("shows error for invalid email", async ({ page }) => {
     await page.goto("/login");
 
     await page.locator('input[name="email"]').fill("nonexistent@example.com");
-    await page.getByRole("button", { name: "Log in with email" }).click();
+    await page.getByTestId(testIds.auth.loginSubmit).click();
 
-    await expect(
-      page.getByText("No account found with that email address."),
-    ).toBeVisible();
+    await expect(page.getByTestId(testIds.auth.loginNoAccount)).toBeVisible();
   });
 
   test("login with email and password", async ({ page }) => {
@@ -43,14 +34,14 @@ test.describe("Partner Login", () => {
 
     // Enter email and submit to trigger account check
     await page.locator('input[name="email"]').fill(env.E2E_PARTNER_EMAIL);
-    await page.getByRole("button", { name: "Log in with email" }).click();
+    await page.getByTestId(testIds.auth.loginSubmit).click();
 
     // Wait for password field to appear
     await expect(page.locator('input[type="password"]')).toBeVisible();
 
     // Enter password and submit
     await page.locator('input[type="password"]').fill(env.E2E_PARTNER_PASSWORD);
-    await page.getByRole("button", { name: "Log in with password" }).click();
+    await page.getByTestId(testIds.auth.loginSubmit).click();
 
     // Verify redirect to authenticated area
     await page.waitForURL((url) =>
@@ -63,15 +54,15 @@ test.describe("Partner Login", () => {
     await page.goto("/login");
 
     await page.locator('input[name="email"]').fill(env.E2E_PARTNER_EMAIL);
-    await page.getByRole("button", { name: "Log in with email" }).click();
+    await page.getByTestId(testIds.auth.loginSubmit).click();
 
     await expect(page.locator('input[type="password"]')).toBeVisible();
 
     await page.locator('input[type="password"]').fill("wrongpassword123");
-    await page.getByRole("button", { name: "Log in with password" }).click();
+    await page.getByTestId(testIds.auth.loginSubmit).click();
 
     await expect(
-      page.getByText("Email or password is incorrect."),
+      page.getByTestId(testIds.auth.loginInvalidCredentials),
     ).toBeVisible();
   });
 });
diff --git a/apps/web/playwright/partners/onboarding.spec.ts b/apps/web/playwright/partners/onboarding.spec.ts
index d888115680d..07eb024839a 100644
--- a/apps/web/playwright/partners/onboarding.spec.ts
+++ b/apps/web/playwright/partners/onboarding.spec.ts
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { expect, test } from "@playwright/test";
 
 test.describe("Partner onboarding (unauthenticated)", () => {
@@ -13,12 +14,22 @@ test.describe("Partner onboarding", () => {
   test("onboarding page renders", async ({ page }) => {
     await page.goto("/onboarding");
 
-    await expect(page.getByText("Create your partner profile")).toBeVisible();
+    await expect(
+      page.getByTestId(testIds.partnerOnboarding.profile),
+    ).toBeVisible();
     await expect(page.locator('input[name="name"]').first()).toBeVisible();
-    await expect(page.getByText("Profile image").first()).toBeVisible();
-    await expect(page.getByText("About you").first()).toBeVisible();
-    await expect(page.getByText("Profile Type").first()).toBeVisible();
-    await expect(page.getByRole("button", { name: "Continue" })).toBeVisible();
+    await expect(
+      page.getByTestId(testIds.partnerOnboarding.profileImage),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId(testIds.partnerOnboarding.aboutYou),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId(testIds.partnerOnboarding.profileType),
+    ).toBeVisible();
+    await expect(
+      page.getByTestId(testIds.partnerOnboarding.continue),
+    ).toBeVisible();
   });
 
   test("profile submit redirects to platforms", async ({ page }) => {
@@ -26,14 +37,14 @@ test.describe("Partner onboarding", () => {
     await page.waitForLoadState("networkidle");
 
     const nameInput = page.locator('input[name="name"]');
-    const continueButton = page.getByRole("button", { name: "Continue" });
+    const continueButton = page.getByTestId(testIds.partnerOnboarding.continue);
 
     await nameInput.fill("E2E Onboarding Test");
     await continueButton.click();
 
     await page.waitForURL("/onboarding/platforms");
     await expect(
-      page.getByText("Your social and web platforms", { exact: true }),
+      page.getByTestId(testIds.partnerOnboarding.platforms),
     ).toBeVisible();
   });
 
@@ -42,15 +53,13 @@ test.describe("Partner onboarding", () => {
     await page.waitForLoadState("networkidle");
 
     const nameInput = page.locator('input[name="name"]').first();
-    const continueButton = page.getByRole("button", { name: "Continue" });
+    const continueButton = page.getByTestId(testIds.partnerOnboarding.continue);
 
     await nameInput.fill("E2E Onboarding Test");
     await continueButton.click();
     await page.waitForURL("/onboarding/platforms");
 
-    const skipLink = page.getByRole("link", {
-      name: "I'll complete this later",
-    });
+    const skipLink = page.getByTestId(testIds.partnerOnboarding.skip);
     await expect(skipLink).toBeVisible();
     await skipLink.click();
 
@@ -60,9 +69,7 @@ test.describe("Partner onboarding", () => {
   test("payouts step skip link goes to programs", async ({ page }) => {
     await page.goto("/onboarding/payouts");
 
-    const skipLink = page.getByRole("link", {
-      name: "I'll complete this later",
-    });
+    const skipLink = page.getByTestId(testIds.partnerOnboarding.skip);
     await expect(skipLink).toBeVisible();
     await skipLink.click();
 
diff --git a/apps/web/playwright/utils.ts b/apps/web/playwright/utils.ts
index d7cdcae455e..ae7c445c354 100644
--- a/apps/web/playwright/utils.ts
+++ b/apps/web/playwright/utils.ts
@@ -1,7 +1,27 @@
+import { ErrorCodes } from "@/lib/api/error-codes";
 import { generateRandomName } from "@/lib/names";
 import { nanoid } from "@dub/utils";
 import { expect } from "@playwright/test";
 
+export function apiError({
+  code,
+  message,
+}: {
+  code: keyof typeof ErrorCodes;
+  message: string;
+}) {
+  return {
+    status: ErrorCodes[code],
+    data: {
+      error: {
+        code,
+        message,
+        doc_url: `https://dub.co/docs/api-reference/errors#${code.replace("_", "-")}`,
+      },
+    },
+  };
+}
+
 export function randomName(prefix = "e2e", length = 5) {
   return `${prefix}-${nanoid(length)}`;
 }
diff --git a/apps/web/playwright/workspaces/auth.setup.ts b/apps/web/playwright/workspaces/auth.setup.ts
index 7cc850d464d..167c4da97f3 100644
--- a/apps/web/playwright/workspaces/auth.setup.ts
+++ b/apps/web/playwright/workspaces/auth.setup.ts
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { nanoid } from "@dub/utils";
 import { expect, test } from "@playwright/test";
 import { extractOtp, waitForEmail } from "../mailhog";
@@ -15,18 +16,16 @@ test("sign up new user for workspace onboarding", async ({ page }) => {
 
   // Step 1: Enter email and reveal password field
   await page.locator('input[name="email"]').fill(email);
-  await page.getByRole("button", { name: "Sign Up" }).click();
+  await page.getByTestId(testIds.auth.signupSubmit).click();
 
   // Step 2: Enter password and submit
   const passwordInput = page.locator('input[name="password"]');
   await expect(passwordInput).toBeVisible();
   await passwordInput.fill(SIGNUP_PASSWORD);
-  await page.getByRole("button", { name: "Sign Up" }).click();
+  await page.getByTestId(testIds.auth.signupSubmit).click();
 
   // Step 3: Verify email via OTP from MailHog
-  await expect(
-    page.getByRole("heading", { name: "Verify your email address" }),
-  ).toBeVisible();
+  await expect(page.getByTestId(testIds.auth.verifyEmailHeading)).toBeVisible();
 
   const message = await waitForEmail(email);
   const otp = extractOtp(message);
diff --git a/apps/web/playwright/workspaces/billing-trial.spec.ts b/apps/web/playwright/workspaces/billing-trial.spec.ts
index d6bb93605b9..7b526337941 100644
--- a/apps/web/playwright/workspaces/billing-trial.spec.ts
+++ b/apps/web/playwright/workspaces/billing-trial.spec.ts
@@ -1,4 +1,4 @@
-import { DUB_TRIAL_PERIOD_DAYS } from "@dub/utils";
+import { testIds } from "@/lib/e2e/test-ids";
 import { expect, test } from "@playwright/test";
 import {
   applyMockActivatedPaidPlan,
@@ -38,17 +38,11 @@ test.describe("Billing trial checkout", () => {
 
     try {
       await page.goto(`/${slug}/settings/billing/upgrade`);
-      await expect(
-        page.getByRole("heading", { name: "Plans", exact: true }),
-      ).toBeVisible({ timeout: 30_000 });
+      await expect(page.getByTestId(testIds.billing.plansHeading)).toBeVisible({
+        timeout: 30_000,
+      });
 
-      const proCard = page.getByRole("heading", { name: "Pro", exact: true });
-      await proCard
-        .locator("xpath=ancestor::div[contains(@class,'flex-col')][1]")
-        .getByRole("button", {
-          name: new RegExp(`Start ${DUB_TRIAL_PERIOD_DAYS}-day trial`, "i"),
-        })
-        .click();
+      await page.getByTestId(testIds.billing.planCta("pro")).click();
 
       await page.waitForURL(
         (u) => {
@@ -79,11 +73,11 @@ test.describe("Billing trial checkout", () => {
         .not.toBeNull();
 
       await expect(
-        page.getByRole("heading", { name: /Dub Pro looks good on you/i }),
+        page.getByTestId(testIds.billing.upgradedHeading),
       ).toBeVisible({ timeout: 15_000 });
 
-      await page.getByRole("button", { name: "View dashboard" }).click();
-      await expect(page.getByText("Free trial", { exact: true })).toBeVisible({
+      await page.getByTestId(testIds.billing.viewDashboard).click();
+      await expect(page.getByTestId(testIds.billing.freeTrial)).toBeVisible({
         timeout: 15_000,
       });
     } finally {
@@ -127,13 +121,11 @@ test.describe("Free trial user navigation", () => {
   }) => {
     await page.goto(`/${slug}/settings/billing`);
 
-    await expect(page.getByText(/Trial ends on/)).toBeVisible({
+    await expect(page.getByTestId(testIds.billing.trialBanner)).toBeVisible({
       timeout: 15_000,
     });
-    await expect(
-      page.getByRole("button", { name: "Start paid plan" }),
-    ).toBeVisible();
-    await expect(page.getByRole("link", { name: "View plans" })).toBeVisible();
+    await expect(page.getByTestId(testIds.billing.startPaidPlan)).toBeVisible();
+    await expect(page.getByTestId(testIds.billing.viewPlans)).toBeVisible();
   });
 
   test("upgrade page shows Activate plan for current Business plan", async ({
@@ -141,18 +133,12 @@ test.describe("Free trial user navigation", () => {
   }) => {
     await page.goto(`/${slug}/settings/billing/upgrade`);
 
-    await expect(
-      page.getByRole("heading", { name: "Plans", exact: true }),
-    ).toBeVisible({ timeout: 30_000 });
-
-    const businessCard = page.getByRole("heading", {
-      name: "Business",
-      exact: true,
+    await expect(page.getByTestId(testIds.billing.plansHeading)).toBeVisible({
+      timeout: 30_000,
     });
+
     await expect(
-      businessCard
-        .locator("xpath=ancestor::div[contains(@class,'flex-col')][1]")
-        .getByRole("button", { name: "Activate plan" }),
+      page.getByTestId(testIds.billing.planCta("business")),
     ).toBeVisible();
   });
 
@@ -176,17 +162,14 @@ test.describe("Free trial user navigation", () => {
 
     await page.goto(`/${slug}/settings/billing`);
 
-    await page.getByRole("button", { name: "Start paid plan" }).click();
-    const confirmModal = page.getByRole("dialog").filter({
-      has: page.getByRole("heading", { name: "Plan start confirmation" }),
-    });
-    await expect(confirmModal).toBeVisible();
+    await page.getByTestId(testIds.billing.startPaidPlan).click();
+    await expect(
+      page.getByTestId(testIds.billing.startPaidPlanHeading),
+    ).toBeVisible();
     await expect(
-      confirmModal.getByText(
-        "You'll be charged today and your trial will end.",
-      ),
+      page.getByTestId(testIds.billing.startPaidPlanNotice),
     ).toBeVisible();
-    await confirmModal.getByRole("button", { name: "Start paid plan" }).click();
+    await page.getByTestId(testIds.billing.confirmStartPaidPlan).click();
 
     await page.waitForURL((u) => {
       const url = new URL(u);
@@ -196,7 +179,7 @@ test.describe("Free trial user navigation", () => {
       );
     });
     await expect(
-      page.getByRole("heading", { name: /Dub Business looks good on you/i }),
+      page.getByTestId(testIds.billing.upgradedHeading),
     ).toBeVisible({ timeout: 15_000 });
   });
 });
diff --git a/apps/web/playwright/workspaces/onboarding-dub-links.spec.ts b/apps/web/playwright/workspaces/onboarding-dub-links.spec.ts
index c21d9d4c608..dd39c98f548 100644
--- a/apps/web/playwright/workspaces/onboarding-dub-links.spec.ts
+++ b/apps/web/playwright/workspaces/onboarding-dub-links.spec.ts
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { nanoid } from "@dub/utils";
 import { expect, test } from "@playwright/test";
 
@@ -14,36 +15,36 @@ test("complete workspace onboarding with Dub Links product", async ({
   // Welcome page
   await page.goto("/onboarding");
   await expect(
-    page.getByRole("heading", { name: "Welcome to Dub" }),
+    page.getByTestId(testIds.onboarding.stepWelcome),
   ).toBeVisible();
   await Promise.all([
     expect(page).toHaveURL(/\/onboarding\/workspace/, {
       timeout: STEP_NAV_TIMEOUT,
     }),
-    page.getByRole("button", { name: "Get started" }).click(),
+    page.getByTestId(testIds.onboarding.getStarted).click(),
   ]);
 
   // Workspace creation step
   await expect(
-    page.getByRole("heading", { name: "Create your workspace" }),
+    page.getByTestId(testIds.onboarding.stepWorkspace),
   ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
   // Fill workspace name (slug auto-generates)
-  await page.locator('input[id="name"]').fill(workspaceName);
+  await page.getByTestId(testIds.onboarding.workspaceName).fill(workspaceName);
 
   // Read the auto-generated slug for later assertions
-  const slug = await page.locator('input[id="slug"]').inputValue();
+  const slug = await page
+    .getByTestId(testIds.onboarding.workspaceSlug)
+    .inputValue();
   expect(slug).toBeTruthy();
 
-  const productsHeading = page.getByRole("heading", {
-    name: "What do you want to do with Dub?",
-  });
+  const productsHeading = page.getByTestId(testIds.onboarding.stepProducts);
 
   await Promise.all([
     expect(page).toHaveURL(/\/onboarding\/products/, {
       timeout: STEP_NAV_TIMEOUT,
     }),
-    page.getByRole("button", { name: "Create workspace" }).click(),
+    page.getByTestId(testIds.onboarding.createWorkspace).click(),
   ]);
   await expect(productsHeading).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
@@ -51,16 +52,14 @@ test("complete workspace onboarding with Dub Links product", async ({
     expect(page).toHaveURL(/\/onboarding\/domain/, {
       timeout: STEP_NAV_TIMEOUT,
     }),
-    page.getByRole("button", { name: "Continue with Dub Links" }).click(),
+    page.getByTestId(testIds.onboarding.productCta("links")).click(),
   ]);
 
   // Domain step — skip it
-  await expect(
-    page.getByRole("heading", { name: "Add a custom domain" }),
-  ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
-  const skipDomainCta = page.getByRole("button", {
-    name: "I'll do this later",
+  await expect(page.getByTestId(testIds.onboarding.stepDomain)).toBeVisible({
+    timeout: STEP_NAV_TIMEOUT,
   });
+  const skipDomainCta = page.getByTestId(testIds.onboarding.skipDomain);
   await expect(skipDomainCta).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
   await Promise.all([
     expect(page).toHaveURL(/\/onboarding\/plan/, {
@@ -70,9 +69,7 @@ test("complete workspace onboarding with Dub Links product", async ({
   ]);
 
   // Plan step — use free plan
-  const freePlanCta = page.getByRole("button", {
-    name: "Start for free, pick a plan later",
-  });
+  const freePlanCta = page.getByTestId(testIds.onboarding.freePlan);
   await expect(freePlanCta).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
   await Promise.all([
     expect(page).toHaveURL(/\/onboarding\/success/, {
@@ -83,16 +80,14 @@ test("complete workspace onboarding with Dub Links product", async ({
 
   // Success page
   await expect(
-    page.locator("h1").filter({ hasText: workspaceName }),
-  ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
+    page.getByTestId(testIds.onboarding.workspaceCreated),
+  ).toContainText(workspaceName, { timeout: STEP_NAV_TIMEOUT });
   await expect(
-    page.locator("h3").filter({ hasText: /^Complete setup$/ }),
+    page.getByTestId(testIds.onboarding.completeSetup),
   ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
   // Go to dashboard
-  const dashboardCta = page.getByRole("button", {
-    name: "Go to your dashboard",
-  });
+  const dashboardCta = page.getByTestId(testIds.onboarding.goToDashboard);
   await expect(dashboardCta).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
   const slugPathPattern = new RegExp(
     `/${slug.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?:/|$)`,
diff --git a/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts b/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
index f879253c8cf..8d3256147e3 100644
--- a/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
+++ b/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
@@ -1,5 +1,6 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import { nanoid } from "@dub/utils";
-import { expect, test } from "@playwright/test";
+import { expect, test, type Page } from "@playwright/test";
 import {
   finishOnboardingCheckoutWithoutStripeRedirect,
   installBillingCheckoutMocks,
@@ -10,6 +11,41 @@ const MINIMAL_PNG = Buffer.from(
   "base64",
 );
 
+/** Host Playwright intercepts for the R2 PUT. CI has no STORAGE_*. */
+const MOCK_SIGNED_URL = "https://storage.example.test/e2e-program-logo";
+const MOCK_DESTINATION_URL =
+  "https://assets.example.test/program-logos/e2e.png";
+
+/** Stubs POST /upload-url and the follow-up PUT so onboarding does not need R2. */
+async function installProgramLogoUploadMocks(page: Page) {
+  await page.route(
+    (url) => url.pathname.endsWith("/upload-url"),
+    async (route) => {
+      if (route.request().method() !== "POST") {
+        await route.continue();
+        return;
+      }
+      await route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({
+          key: "program-logos/e2e",
+          signedUrl: MOCK_SIGNED_URL,
+          destinationUrl: MOCK_DESTINATION_URL,
+        }),
+      });
+    },
+  );
+
+  await page.route(MOCK_SIGNED_URL, async (route) => {
+    if (route.request().method() !== "PUT") {
+      await route.continue();
+      return;
+    }
+    await route.fulfill({ status: 200, body: "" });
+  });
+}
+
 function randomOnboardingDomain() {
   const id = nanoid(10).replace(/_/g, "-").toLowerCase();
   return `e2e-${id}.invalid`;
@@ -38,30 +74,30 @@ test.describe("Dub Partners onboarding", () => {
     // Welcome page
     await page.goto("/onboarding");
     await expect(
-      page.getByRole("heading", { name: "Welcome to Dub" }),
+      page.getByTestId(testIds.onboarding.stepWelcome),
     ).toBeVisible();
     await Promise.all([
       expect(page).toHaveURL(/\/onboarding\/workspace/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByRole("button", { name: "Get started" }).click(),
+      page.getByTestId(testIds.onboarding.getStarted).click(),
     ]);
 
     // Workspace creation step
     await expect(
-      page.getByRole("heading", { name: "Create your workspace" }),
+      page.getByTestId(testIds.onboarding.stepWorkspace),
     ).toBeVisible();
 
     // Fill workspace name (slug auto-generates)
-    await page.locator('input[id="name"]').fill(workspaceName);
+    await page.getByTestId(testIds.onboarding.workspaceName).fill(workspaceName);
 
     // Read the auto-generated slug for later assertions
-    const slug = await page.locator('input[id="slug"]').inputValue();
+    const slug = await page
+      .getByTestId(testIds.onboarding.workspaceSlug)
+      .inputValue();
     expect(slug).toBeTruthy();
 
-    const productsHeading = page.getByRole("heading", {
-      name: "What do you want to do with Dub?",
-    });
+    const productsHeading = page.getByTestId(testIds.onboarding.stepProducts);
 
     // Navigation runs in onSuccess after POST + SWR mutate + session.update(); wait for API first (CI).
     const createWorkspacePost = page.waitForResponse(
@@ -70,7 +106,7 @@ test.describe("Dub Partners onboarding", () => {
         new URL(r.url()).pathname === "/api/workspaces",
       { timeout: STEP_NAV_TIMEOUT },
     );
-    await page.getByRole("button", { name: "Create workspace" }).click();
+    await page.getByTestId(testIds.onboarding.createWorkspace).click();
     const createWsRes = await createWorkspacePost;
     if (!createWsRes.ok()) {
       throw new Error(
@@ -87,97 +123,111 @@ test.describe("Dub Partners onboarding", () => {
       expect(page).toHaveURL(/\/onboarding\/domain/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByRole("button", { name: "Continue with Dub Partners" }).click(),
+      page.getByTestId(testIds.onboarding.productCta("partners")).click(),
     ]);
 
     // Domain step — connect a custom domain
-    await expect(
-      page.getByRole("heading", { name: "Add a custom domain" }),
-    ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
+    await expect(page.getByTestId(testIds.onboarding.stepDomain)).toBeVisible({
+      timeout: STEP_NAV_TIMEOUT,
+    });
     await Promise.all([
       expect(page).toHaveURL(/\/onboarding\/domain\/custom/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByRole("button", { name: "Connect domain" }).click(),
+      page.getByTestId(testIds.onboarding.connectDomain).click(),
     ]);
 
     await expect(
-      page.getByRole("heading", { name: "Connect a custom domain" }),
+      page.getByTestId(testIds.onboarding.stepDomainCustom),
     ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
-    await page.getByPlaceholder("go.acme.com").fill(customDomain);
-    await expect(page.getByText(/is ready to connect/i)).toBeVisible({
+    await page.getByTestId(testIds.onboarding.domainInput).fill(customDomain);
+    await expect(
+      page.getByTestId(testIds.onboarding.domainAvailable),
+    ).toBeVisible({
       timeout: 30_000,
     });
     await Promise.all([
       expect(page).toHaveURL(/\/onboarding\/program/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByRole("button", { name: "Add domain" }).click(),
+      page.getByTestId(testIds.onboarding.addDomain).click(),
     ]);
 
     // Partner program step
     await expect(
-      page.getByRole("heading", { name: "Create your partner program" }),
+      page.getByTestId(testIds.onboarding.stepProgram),
     ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
     await page
-      .getByTestId("onboarding-program-company-name")
+      .getByTestId(testIds.onboarding.programCompanyName)
       .fill(`Test Program ${nanoid(4)}`);
-    await page.getByTestId("onboarding-program-logo").setInputFiles({
+
+    await installProgramLogoUploadMocks(page);
+
+    const uploadUrlPost = page.waitForResponse(
+      (r) =>
+        r.request().method() === "POST" &&
+        new URL(r.url()).pathname.endsWith("/upload-url"),
+      { timeout: STEP_NAV_TIMEOUT },
+    );
+    await page.getByTestId(testIds.onboarding.programLogo).setInputFiles({
       name: "logo.png",
       mimeType: "image/png",
       buffer: MINIMAL_PNG,
     });
-    // skipping this for now since it's a bit flaky
-    // await expect
-    //   .poll(async () => page.locator('img[alt="Preview"]').count(), {
-    //     timeout: 30_000,
-    //   })
-    //   .toBeGreaterThan(0);
+    const uploadUrlRes = await uploadUrlPost;
+    if (!uploadUrlRes.ok()) {
+      throw new Error(
+        `Logo upload-url failed: HTTP ${uploadUrlRes.status()} ${await uploadUrlRes.text()}`,
+      );
+    }
+    await expect(
+      page.getByTestId(testIds.onboarding.programLogoUploaded),
+    ).toBeVisible({
+      timeout: 30_000,
+    });
 
     await page
-      .getByTestId("onboarding-program-destination-url")
+      .getByTestId(testIds.onboarding.programDestinationUrl)
       .fill("https://acme.com");
     await page
-      .getByTestId("onboarding-program-support-email")
+      .getByTestId(testIds.onboarding.programSupportEmail)
       .fill("support@acme.com");
     await Promise.all([
       expect(page).toHaveURL(/\/onboarding\/program\/reward/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByTestId("onboarding-program-continue").click(),
+      page.getByTestId(testIds.onboarding.programContinue).click(),
     ]);
 
     // Default reward — keep Sale / recurring / percentage defaults, set 30%
-    await expect(
-      page.getByRole("heading", { name: "Create your default reward" }),
-    ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
-    const pctInput = page.getByTestId("onboarding-reward-amount");
+    await expect(page.getByTestId(testIds.onboarding.stepReward)).toBeVisible({
+      timeout: STEP_NAV_TIMEOUT,
+    });
+    const pctInput = page.getByTestId(testIds.onboarding.rewardAmount);
     await expect(pctInput).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
     await pctInput.fill("30");
     await Promise.all([
       expect(page).toHaveURL(/\/onboarding\/plan/, {
         timeout: STEP_NAV_TIMEOUT,
       }),
-      page.getByTestId("onboarding-reward-continue").click(),
+      page.getByTestId(testIds.onboarding.rewardContinue).click(),
     ]);
 
     // Plan step — mocked checkout trial (no Stripe)
-    await expect(
-      page
-        .locator("h1")
-        .filter({ hasText: /Partners/i })
-        .filter({ hasText: /plan/i }),
-    ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
+    await expect(page.getByTestId(testIds.onboarding.stepPlan)).toBeVisible({
+      timeout: STEP_NAV_TIMEOUT,
+    });
 
     await installBillingCheckoutMocks(page, {
       slug,
       baseURL,
     });
 
-    // use testId instead (since plan-selector overrides UpgradePlanButton text)
-    const advancedPaidCta = page.getByTestId("onboarding-plan-cta-advanced");
+    const advancedPaidCta = page.getByTestId(
+      testIds.onboarding.planCta("advanced"),
+    );
     await expect(advancedPaidCta).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
     await expect(advancedPaidCta).toBeEnabled({ timeout: STEP_NAV_TIMEOUT });
 
@@ -198,15 +248,13 @@ test.describe("Dub Partners onboarding", () => {
     });
 
     await expect(
-      page.getByRole("heading", {
-        name: `The ${workspaceName} workspace has been created`,
-      }),
-    ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
+      page.getByTestId(testIds.onboarding.workspaceCreated),
+    ).toContainText(workspaceName, { timeout: STEP_NAV_TIMEOUT });
     await expect(
-      page.getByRole("button", { name: "Go to your dashboard" }),
+      page.getByTestId(testIds.onboarding.goToDashboard),
     ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
     await expect(
-      page.getByRole("heading", { name: "Complete setup" }),
+      page.getByTestId(testIds.onboarding.completeSetup),
     ).toBeVisible({ timeout: STEP_NAV_TIMEOUT });
 
     await expect
diff --git a/apps/web/prisma/schema/campaign.prisma b/apps/web/prisma/schema/campaign.prisma
index 7f94a4e0602..32192e4535a 100644
--- a/apps/web/prisma/schema/campaign.prisma
+++ b/apps/web/prisma/schema/campaign.prisma
@@ -18,28 +18,29 @@ enum CampaignStatus {
 }
 
 model Campaign {
-  id              String              @id
+  id              String               @id
   programId       String
-  workflowId      String?             @unique
+  workflowId      String?              @unique
   userId          String
-  qstashMessageId String?             @unique
+  qstashMessageId String?              @unique
   type            CampaignType
-  status          CampaignStatus      @default(draft)
+  status          CampaignStatus       @default(draft)
   name            String
   subject         String
-  preview         String?             @db.Text
+  preview         String?              @db.Text
   from            String?
-  bodyJson        Json                @db.Json
+  bodyJson        Json                 @db.Json
   scheduledAt     DateTime?
-  createdAt       DateTime            @default(now())
-  updatedAt       DateTime            @updatedAt
-  program         Program             @relation(fields: [programId], references: [id])
-  workflow        Workflow?           @relation(fields: [workflowId], references: [id], onDelete: Cascade)
+  createdAt       DateTime             @default(now())
+  updatedAt       DateTime             @updatedAt
+  program         Program              @relation(fields: [programId], references: [id])
+  workflow        Workflow?            @relation(fields: [workflowId], references: [id], onDelete: Cascade)
   groups          CampaignGroup[]
   partnerTags     CampaignPartnerTag[]
   emails          NotificationEmail[]
 
   @@index(programId)
+  @@index([type, status, scheduledAt])
 }
 
 model CampaignGroup {
diff --git a/apps/web/prisma/schema/commission.prisma b/apps/web/prisma/schema/commission.prisma
index ebe5879c162..8e7f50a552a 100644
--- a/apps/web/prisma/schema/commission.prisma
+++ b/apps/web/prisma/schema/commission.prisma
@@ -17,8 +17,25 @@ enum CommissionType {
   custom
 }
 
+enum CommissionSource {
+  api // track lead/sale API
+  user // manual creates with userId (manual commissions, bounty submission approvals, submitted leads/sales)
+  stripe
+  shopify
+  hubspot
+  appsflyer
+  singular
+  rewardful
+  partnerstack
+  firstpromoter
+  tolt
+  tapfiliate
+  lemonsqueezy
+  affiliatewp
+}
+
 model Commission {
-  id                 String           @id
+  id                 String            @id
   programId          String
   partnerId          String
   rewardId           String?
@@ -26,19 +43,21 @@ model Commission {
   payoutId           String?
   invoiceId          String? // only for sales (idempotency key, each sale event is associated with a unique invoice)
   customerId         String? // only for leads and sales
-  eventId            String?          @unique // only for leads and sales
-  description        String?
+  eventId            String?           @unique // only for leads and sales
+  description        String?           @db.Text
   type               CommissionType
   amount             Int // only for sales (amount of the sale event)
   quantity           Int // only for clicks/leads (quantity of the event)
-  earnings           Int              @default(0) // amount earned by the partner
-  currency           String           @default("usd")
-  status             CommissionStatus @default(pending)
+  earnings           Int               @default(0) // amount earned by the partner
+  currency           String            @default("usd")
+  status             CommissionStatus  @default(pending)
   userId             String? // user who created the manual commission
+  source             CommissionSource?
   sourceCommissionId String?
   sourcePartnerId    String?
-  createdAt          DateTime         @default(now())
-  updatedAt          DateTime         @updatedAt
+  metadata           Json?             @db.Json
+  createdAt          DateTime          @default(now())
+  updatedAt          DateTime          @updatedAt
 
   program           Program           @relation(fields: [programId], references: [id])
   partner           Partner           @relation(fields: [partnerId], references: [id])
@@ -59,7 +78,9 @@ model Commission {
   @@index(payoutId)
   @@index(customerId)
   @@index(linkId)
+  @@index(type)
   @@index(status)
   @@index(rewardId)
   @@index(userId)
+  @@index([status, payoutId, source]) // temp index for migration script
 }
diff --git a/apps/web/prisma/schema/discount.prisma b/apps/web/prisma/schema/discount.prisma
index 8d301001629..e9f438f2ac1 100644
--- a/apps/web/prisma/schema/discount.prisma
+++ b/apps/web/prisma/schema/discount.prisma
@@ -1,11 +1,13 @@
 enum DiscountProvider {
   stripe
   shopify
+  custom
 }
 
 model Discount {
   id                     String           @id
-  programId              String
+  programId              String?
+  groupId                String?
   amount                 Int              @default(0)
   type                   RewardStructure  @default(percentage)
   maxDuration            Int? // in months (0 -> one-time purchase, 1, 3, 6, 12, 24 -> months, null -> lifetime)
@@ -17,12 +19,15 @@ model Discount {
   createdAt              DateTime         @default(now())
   updatedAt              DateTime         @updatedAt
 
-  programEnrollments ProgramEnrollment[]
-  program            Program             @relation("ProgramDiscounts", fields: [programId], references: [id])
-  partnerGroup       PartnerGroup?
-  discountCodes      DiscountCode[]
+  programEnrollments     ProgramEnrollment[]
+  program                Program?            @relation("ProgramDiscounts", fields: [programId], references: [id])
+  partnerGroup           PartnerGroup?       @relation("GroupDiscounts", fields: [groupId], references: [id], onDelete: NoAction, onUpdate: NoAction) // Owning group
+  defaultForPartnerGroup PartnerGroup?       @relation("PartnerGroupDefaultDiscount") // Group that uses this as its default
+  discountCodes          DiscountCode[]
+  linkDiscounts          LinkReward[]
 
   @@index(programId)
+  @@index(groupId)
 }
 
 model DiscountCode {
diff --git a/apps/web/prisma/schema/domain.prisma b/apps/web/prisma/schema/domain.prisma
index 2e12039aae6..a390f9810f1 100644
--- a/apps/web/prisma/schema/domain.prisma
+++ b/apps/web/prisma/schema/domain.prisma
@@ -56,8 +56,6 @@ model DefaultDomains {
   ggllink     Boolean @default(true)
   figpage     Boolean @default(true)
   loooooooong Boolean @default(false)
-  fyicodeforafricaorg Boolean @default(true)
-  cfafyi Boolean @default(true)
   projectId   String  @unique
   project     Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
 }
@@ -68,6 +66,9 @@ enum EmailDomainStatus {
   failed
   temporary_failure
   not_started
+  // Resend aggregate statuses when send/receive (or dual sending CNAMEs) diverge
+  partially_verified
+  partially_failed
 }
 
 model EmailDomain {
diff --git a/apps/web/prisma/schema/group.prisma b/apps/web/prisma/schema/group.prisma
index 80b0606f223..e5b60715bb8 100644
--- a/apps/web/prisma/schema/group.prisma
+++ b/apps/web/prisma/schema/group.prisma
@@ -14,6 +14,7 @@ model PartnerGroup {
   leadRewardId                 String?              @unique
   saleRewardId                 String?              @unique
   referralRewardId             String?              @unique
+  customRewardId               String?              @unique
   discountId                   String?              @unique
   linkStructure                PartnerLinkStructure @default(short)
   additionalLinks              Json?                @db.Json
@@ -37,7 +38,10 @@ model PartnerGroup {
   leadReward               Reward?                   @relation("LeadReward", fields: [leadRewardId], references: [id])
   saleReward               Reward?                   @relation("SaleReward", fields: [saleRewardId], references: [id])
   referralReward           Reward?                   @relation("ReferralReward", fields: [referralRewardId], references: [id])
-  discount                 Discount?                 @relation(fields: [discountId], references: [id])
+  customReward             Reward?                   @relation("CustomReward", fields: [customRewardId], references: [id])
+  discount                 Discount?                 @relation("PartnerGroupDefaultDiscount", fields: [discountId], references: [id])
+  discounts                Discount[]                @relation("GroupDiscounts")
+  rewards                  Reward[]                  @relation("GroupRewards")
   partners                 ProgramEnrollment[]
   applications             ProgramApplication[]
   bounties                 BountyGroup[]
diff --git a/apps/web/prisma/schema/job.prisma b/apps/web/prisma/schema/job.prisma
index dbc55bae01b..3d626411212 100644
--- a/apps/web/prisma/schema/job.prisma
+++ b/apps/web/prisma/schema/job.prisma
@@ -1,15 +1,15 @@
 // Background jobs that could not be published to QStash (e.g. QStash outage).
 // The /api/cron/queue/retry cron republishes these and deletes them on success.
 model Job {
-  id           String    @id
-  name         String
-  payload      Json
-  options      Json? // dispatch options replayed verbatim: deduplicationId, retries, queue, flowControl, label
-  scheduledFor DateTime? // absolute time the job should run (derived from delay/notBefore at dispatch time)
-  attempts     Int       @default(0)
-  lastError    String?   @db.Text
-  createdAt    DateTime  @default(now())
-  updatedAt    DateTime  @updatedAt
+  id          String   @id
+  name        String
+  payload     Json
+  options     Json? // dispatch options replayed verbatim: deduplicationId, retries, queue, flowControl, label
+  scheduledAt DateTime @default(now()) // when we should publish the job
+  attempts    Int      @default(0)
+  lastError   String?  @db.Text
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
 
-  @@index([createdAt])
+  @@index([scheduledAt, attempts]) // retry cron: due jobs under the attempt cap
 }
diff --git a/apps/web/prisma/schema/link.prisma b/apps/web/prisma/schema/link.prisma
index 881a004bf4a..acfb384835e 100644
--- a/apps/web/prisma/schema/link.prisma
+++ b/apps/web/prisma/schema/link.prisma
@@ -91,6 +91,7 @@ model Link {
   customers                 Customer[]
   commissions               Commission[]
   fraudEvents               FraudEvent[]
+  linkReward                LinkReward?
 
   @@unique([domain, key]) // for getting a link by domain and key
   @@unique([projectId, externalId]) // for getting a link by externalId
diff --git a/apps/web/prisma/schema/partner.prisma b/apps/web/prisma/schema/partner.prisma
index 900a4f0ae4d..90d8710ffe5 100644
--- a/apps/web/prisma/schema/partner.prisma
+++ b/apps/web/prisma/schema/partner.prisma
@@ -83,6 +83,7 @@ model Partner {
   invoiceSettings     Json?
   changeHistoryLog    Json?
   referredByPartnerId String?
+  usersLimit          Int @default(10)
 
   programs                   ProgramEnrollment[]
   users                      PartnerUser[]
diff --git a/apps/web/prisma/schema/program.prisma b/apps/web/prisma/schema/program.prisma
index 3d86b344154..cf91a85609b 100644
--- a/apps/web/prisma/schema/program.prisma
+++ b/apps/web/prisma/schema/program.prisma
@@ -115,6 +115,7 @@ model ProgramEnrollment {
   leadRewardId     String?
   saleRewardId     String?
   referralRewardId String?
+  customRewardId   String?
   discountId       String?
   status           ProgramEnrollmentStatus @default(pending)
 
@@ -157,6 +158,7 @@ model ProgramEnrollment {
   leadReward         Reward?                  @relation("LeadRewardEnrollments", fields: [leadRewardId], references: [id])
   saleReward         Reward?                  @relation("SaleRewardEnrollments", fields: [saleRewardId], references: [id])
   referralReward     Reward?                  @relation("ReferralRewardEnrollments", fields: [referralRewardId], references: [id])
+  customReward       Reward?                  @relation("CustomRewardEnrollments", fields: [customRewardId], references: [id])
   discount           Discount?                @relation(fields: [discountId], references: [id])
   bountySubmissions  BountySubmission[]
   discountCodes      DiscountCode[]
@@ -194,5 +196,6 @@ model ProgramEnrollment {
   @@index(leadRewardId)
   @@index(saleRewardId)
   @@index(referralRewardId)
+  @@index(customRewardId)
   @@index(discountId)
 }
diff --git a/apps/web/prisma/schema/reward.prisma b/apps/web/prisma/schema/reward.prisma
index 71de7cf6121..35d79ba5e67 100644
--- a/apps/web/prisma/schema/reward.prisma
+++ b/apps/web/prisma/schema/reward.prisma
@@ -3,6 +3,7 @@ enum EventType {
   lead
   sale
   referral
+  custom
 }
 
 enum RewardStructure {
@@ -20,6 +21,7 @@ enum RewardSpendLimitInterval {
 model Reward {
   id                 String                    @id
   programId          String?
+  groupId            String?
   description        String?
   tooltipDescription String?                   @db.Text
   event              EventType
@@ -35,16 +37,45 @@ model Reward {
   updatedAt          DateTime                  @updatedAt
 
   program              Program?            @relation(fields: [programId], references: [id])
+  partnerGroup         PartnerGroup?       @relation("GroupRewards", fields: [groupId], references: [id], onDelete: NoAction, onUpdate: NoAction) // Owning group
   clickEnrollments     ProgramEnrollment[] @relation("ClickRewardEnrollments")
   leadEnrollments      ProgramEnrollment[] @relation("LeadRewardEnrollments")
   saleEnrollments      ProgramEnrollment[] @relation("SaleRewardEnrollments")
   referralEnrollments  ProgramEnrollment[] @relation("ReferralRewardEnrollments")
+  customEnrollments    ProgramEnrollment[] @relation("CustomRewardEnrollments")
   clickPartnerGroup    PartnerGroup?       @relation("ClickReward")
   leadPartnerGroup     PartnerGroup?       @relation("LeadReward")
   salePartnerGroup     PartnerGroup?       @relation("SaleReward")
   referralPartnerGroup PartnerGroup?       @relation("ReferralReward")
+  customPartnerGroup   PartnerGroup?       @relation("CustomReward")
   commissions          Commission[]
+  clickLinkRewards     LinkReward[]        @relation("ClickLinkRewards")
+  leadLinkRewards      LinkReward[]        @relation("LeadLinkRewards")
+  saleLinkRewards      LinkReward[]        @relation("SaleLinkRewards")
 
   @@index([programId, event])
   @@index(event) // used in aggregate-clicks cron job
+  @@index(groupId)
+}
+
+model LinkReward {
+  id            String   @id @default(cuid())
+  linkId        String   @unique
+  clickRewardId String?
+  leadRewardId  String?
+  saleRewardId  String?
+  discountId    String?
+  createdAt     DateTime @default(now())
+  updatedAt     DateTime @updatedAt
+
+  link        Link      @relation(fields: [linkId], references: [id], onDelete: Cascade)
+  clickReward Reward?   @relation("ClickLinkRewards", fields: [clickRewardId], references: [id])
+  leadReward  Reward?   @relation("LeadLinkRewards", fields: [leadRewardId], references: [id])
+  saleReward  Reward?   @relation("SaleLinkRewards", fields: [saleRewardId], references: [id])
+  discount    Discount? @relation(fields: [discountId], references: [id])
+
+  @@index(clickRewardId)
+  @@index(leadRewardId)
+  @@index(saleRewardId)
+  @@index(discountId)
 }
diff --git a/apps/web/prisma/schema/schema.prisma b/apps/web/prisma/schema/schema.prisma
index dda14954057..3e704a47332 100644
--- a/apps/web/prisma/schema/schema.prisma
+++ b/apps/web/prisma/schema/schema.prisma
@@ -56,9 +56,10 @@ model User {
   activityLogs            ActivityLog[]
   createdCommissions      Commission[]
 
-  @@index(sentMail)
-  @@index(source)
+  @@index(createdAt)
   @@index(defaultWorkspace)
+  @@index(source)
+  @@index(sentMail)
 }
 
 model Account {
diff --git a/apps/web/prisma/schema/workspace.prisma b/apps/web/prisma/schema/workspace.prisma
index e357a0eefbc..db6fc266448 100644
--- a/apps/web/prisma/schema/workspace.prisma
+++ b/apps/web/prisma/schema/workspace.prisma
@@ -77,6 +77,7 @@ model Project {
   createdAt        DateTime  @default(now())
   updatedAt        DateTime  @updatedAt
   usageLastChecked DateTime  @default(now())
+  disabledAt       DateTime?
 
   users                 ProjectUsers[]
   invites               ProjectInvite[]
diff --git a/apps/web/scripts/customers/beehiiv/fix-discount-codes.ts b/apps/web/scripts/customers/beehiiv/fix-discount-codes.ts
index bcaa077587a..ae9b574af7c 100644
--- a/apps/web/scripts/customers/beehiiv/fix-discount-codes.ts
+++ b/apps/web/scripts/customers/beehiiv/fix-discount-codes.ts
@@ -1,4 +1,6 @@
 import { prisma } from "@/lib/prisma";
+import { sleep } from "@dub/utils";
+
 import "dotenv-flow/config";
 import { stripeAppClient } from "../../../lib/stripe";
 
@@ -75,7 +77,7 @@ async function main() {
   }
 
   // sleep for 3 seconds
-  await new Promise((resolve) => setTimeout(resolve, 3000));
+  await sleep(3000);
 
   // recreate the discount codes (since it'll be deleted by promotion_code.updated webhook)
   const { count: createdDiscountCodesCount } =
diff --git a/apps/web/scripts/dev/benchmark-partner-search.ts b/apps/web/scripts/dev/benchmark-partner-search.ts
new file mode 100644
index 00000000000..e29151e2dfd
--- /dev/null
+++ b/apps/web/scripts/dev/benchmark-partner-search.ts
@@ -0,0 +1,596 @@
+/**
+ * Measures p99 latency of the relevance-ranked partner list for a program.
+ *
+ * Calls `getPartners` in process, not over HTTP, so the numbers exclude route
+ * handling, auth, and serialization. Treat them as a floor for the endpoint.
+ *
+ * --searchOnly times the provider's candidate query alone and skips the
+ * database. Use it to compare providers: they are the same remote services
+ * production would use, while the local database is not representative and
+ * dominates the end-to-end numbers. It also raises the --sampleSize ceiling,
+ * so high request counts can keep drawing fresh queries instead of repeating
+ * cached ones.
+ *
+ * To avoid measuring a warm cache it samples `--sampleSize` partners strided
+ * across the program and exhausts a field's queries before repeating any.
+ *
+ * Exits non-zero when a field produced no successful request, when the error rate
+ * exceeds `--maxErrorRate`, or when a p99 reaches `--thresholdMs`.
+ *
+ *   cd apps/web
+ *   pnpm run script dev/benchmark-partner-search --programId=prog_123 [--requests=1000]
+ *     [--sampleSize=100] [--concurrency=10] [--warmup=50] [--thresholdMs=1000] [--searchOnly]
+ *
+ * Requires TURBOPUFFER_API_KEY and an index backfilled for the program:
+ *   pnpm run script partners/backfill-partner-search --programId=prog_123
+ */
+
+import { getPartners } from "@/lib/api/partners/get-partners";
+import {
+  getPartnerSearchProvider,
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  partnerSearchDocumentSelect,
+  serializePartnerSearchDocument,
+  type PartnerSearchDocument,
+} from "@/lib/api/partners/search";
+import { prisma } from "@/lib/prisma";
+import {
+  parseNonNegativeInteger,
+  parsePositiveInteger,
+} from "@/scripts/utils/parse-cli-number";
+import { chunk } from "@dub/utils";
+import "dotenv-flow/config";
+
+const DEFAULT_REQUESTS = 1_000;
+const DEFAULT_WARMUP_REQUESTS = 50;
+const DEFAULT_CONCURRENCY = 10;
+const DEFAULT_PAGE_SIZE = 25;
+const DEFAULT_THRESHOLD_MS = 1_000;
+const MINIMUM_REQUESTS = 1_000;
+const DEFAULT_SAMPLE_SIZE = 100;
+// The sample bounds one setup hydration query per chunk; the end-to-end mode
+// keeps it small because the same database also serves the measured requests.
+const MAX_SAMPLE_SIZE = 1_000;
+const MAX_SEARCH_ONLY_SAMPLE_SIZE = 10_000;
+const SAMPLE_HYDRATION_CHUNK_SIZE = 1_000;
+const DEFAULT_MAX_ERROR_RATE = 0;
+
+interface BenchmarkArguments {
+  programId: string;
+  requests: number;
+  warmupRequests: number;
+  concurrency: number;
+  pageSize: number;
+  thresholdMs: number;
+  sampleSize: number;
+  maxErrorRate: number;
+  searchOnly: boolean;
+}
+
+interface SearchCase {
+  field: string;
+  query: string;
+}
+
+interface SearchCasePool {
+  field: string;
+  queries: string[];
+}
+
+interface BenchmarkResult {
+  field: string;
+  query: string;
+  latencyMs: number;
+  error: string | null;
+}
+
+function parsePercentage(value: string, flag: string): number {
+  const parsed = /^\d+(\.\d+)?$/.test(value) ? Number(value) : NaN;
+
+  if (!Number.isFinite(parsed) || parsed > 100) {
+    throw new Error(`${flag} must be between 0 and 100, received: "${value}"`);
+  }
+
+  return parsed;
+}
+
+function parseArguments(args: string[]): BenchmarkArguments {
+  let programId: string | undefined;
+  let requests = DEFAULT_REQUESTS;
+  let warmupRequests = DEFAULT_WARMUP_REQUESTS;
+  let concurrency = DEFAULT_CONCURRENCY;
+  let pageSize = DEFAULT_PAGE_SIZE;
+  let thresholdMs = DEFAULT_THRESHOLD_MS;
+  let sampleSize = DEFAULT_SAMPLE_SIZE;
+  let maxErrorRate = DEFAULT_MAX_ERROR_RATE;
+  let searchOnly = false;
+
+  for (const arg of args) {
+    if (arg.startsWith("--programId=")) {
+      programId = arg.slice("--programId=".length);
+    } else if (arg.startsWith("--requests=")) {
+      requests = parsePositiveInteger(
+        arg.slice("--requests=".length),
+        "--requests",
+      );
+    } else if (arg.startsWith("--warmup=")) {
+      warmupRequests = parseNonNegativeInteger(
+        arg.slice("--warmup=".length),
+        "--warmup",
+      );
+    } else if (arg.startsWith("--sampleSize=")) {
+      sampleSize = parsePositiveInteger(
+        arg.slice("--sampleSize=".length),
+        "--sampleSize",
+      );
+    } else if (arg.startsWith("--maxErrorRate=")) {
+      maxErrorRate = parsePercentage(
+        arg.slice("--maxErrorRate=".length),
+        "--maxErrorRate",
+      );
+    } else if (arg.startsWith("--concurrency=")) {
+      concurrency = parsePositiveInteger(
+        arg.slice("--concurrency=".length),
+        "--concurrency",
+      );
+    } else if (arg.startsWith("--pageSize=")) {
+      pageSize = parsePositiveInteger(
+        arg.slice("--pageSize=".length),
+        "--pageSize",
+      );
+    } else if (arg.startsWith("--thresholdMs=")) {
+      thresholdMs = parsePositiveInteger(
+        arg.slice("--thresholdMs=".length),
+        "--thresholdMs",
+      );
+    } else if (arg === "--searchOnly") {
+      searchOnly = true;
+    } else {
+      throw new Error(`Unknown argument: ${arg}`);
+    }
+  }
+
+  if (!programId) {
+    throw new Error("--programId is required.");
+  }
+  if (requests < MINIMUM_REQUESTS) {
+    throw new Error(
+      `--requests must be at least ${MINIMUM_REQUESTS} for a useful p99 measurement.`,
+    );
+  }
+  if (concurrency > requests) {
+    throw new Error("--concurrency cannot exceed --requests.");
+  }
+  if (pageSize > PARTNER_SEARCH_CANDIDATE_LIMIT) {
+    throw new Error(
+      `--pageSize cannot exceed ${PARTNER_SEARCH_CANDIDATE_LIMIT}.`,
+    );
+  }
+  const maxSampleSize = searchOnly
+    ? MAX_SEARCH_ONLY_SAMPLE_SIZE
+    : MAX_SAMPLE_SIZE;
+  if (sampleSize > maxSampleSize) {
+    throw new Error(
+      searchOnly
+        ? `--sampleSize cannot exceed ${MAX_SEARCH_ONLY_SAMPLE_SIZE}.`
+        : `--sampleSize cannot exceed ${MAX_SAMPLE_SIZE} (${MAX_SEARCH_ONLY_SAMPLE_SIZE} with --searchOnly).`,
+    );
+  }
+
+  return {
+    programId,
+    requests,
+    warmupRequests,
+    concurrency,
+    pageSize,
+    thresholdMs,
+    sampleSize,
+    maxErrorRate,
+    searchOnly,
+  };
+}
+
+function longestSearchToken(value: string): string {
+  const token = value
+    .split(/[^\p{L}\p{N}_]+/u)
+    .filter(Boolean)
+    .sort((left, right) => right.length - left.length)[0];
+
+  if (!token) {
+    throw new Error(`Could not derive a search query from "${value}".`);
+  }
+
+  return token.slice(0, 12);
+}
+
+function emailInfix(email: string): string {
+  const domain = email.split("@")[1];
+  if (!domain) {
+    return longestSearchToken(email);
+  }
+
+  const domainName = domain.split(".")[0];
+  return domainName.slice(0, Math.min(5, domainName.length));
+}
+
+function createSearchCases(document: PartnerSearchDocument): SearchCase[] {
+  const platformType = document.platformTypes[0];
+  const platformIdentifier = document.platformIdentifiers[0];
+  const linkKey = document.linkKeys[0];
+
+  if (
+    !document.email ||
+    !document.companyName ||
+    !document.description ||
+    !platformType ||
+    !platformIdentifier ||
+    !linkKey
+  ) {
+    throw new Error(
+      "The benchmark sample must have an email, company, description, platform, and link.",
+    );
+  }
+
+  return [
+    { field: "name", query: longestSearchToken(document.name) },
+    { field: "email infix", query: emailInfix(document.email) },
+    { field: "company", query: longestSearchToken(document.companyName) },
+    { field: "description", query: longestSearchToken(document.description) },
+    { field: "platform type", query: platformType },
+    {
+      field: "platform identifier",
+      query: longestSearchToken(platformIdentifier),
+    },
+    { field: "link key", query: linkKey },
+  ];
+}
+
+async function loadSearchCasePools(
+  programId: string,
+  sampleSize: number,
+  partnerCount: number,
+): Promise<SearchCasePool[]> {
+  const stride = Math.max(1, Math.floor(partnerCount / sampleSize));
+  const where = {
+    programId,
+    partner: {
+      email: { not: null },
+      companyName: { not: null },
+      description: { not: null },
+      platforms: { some: {} },
+    },
+    links: { some: {} },
+  };
+
+  // Striding across the program means scanning it, so resolve bare IDs first.
+  // Hydrating every row to keep one in `stride` exceeds MySQL's placeholder
+  // limit once a program reaches 100K partners.
+  const candidateIds = await prisma.programEnrollment.findMany({
+    where,
+    select: { id: true },
+    orderBy: { id: "asc" },
+    take: sampleSize * stride,
+  });
+
+  const sampledIds = candidateIds
+    .filter((_, index) => index % stride === 0)
+    .map(({ id }) => id);
+
+  // Chunked so the larger --searchOnly samples keep the IN clause bounded.
+  const sampled = (
+    await Promise.all(
+      chunk(sampledIds, SAMPLE_HYDRATION_CHUNK_SIZE).map((idChunk) =>
+        prisma.programEnrollment.findMany({
+          where: { id: { in: idChunk } },
+          select: partnerSearchDocumentSelect,
+        }),
+      ),
+    )
+  ).flat();
+
+  if (sampled.length === 0) {
+    throw new Error(
+      `No complete partner search document found for program ${programId}.`,
+    );
+  }
+
+  const queriesByField = new Map<string, Set<string>>();
+
+  for (const enrollment of sampled) {
+    const document = serializePartnerSearchDocument(enrollment);
+
+    for (const { field, query } of createSearchCases(document)) {
+      const queries = queriesByField.get(field) ?? new Set<string>();
+      queries.add(query);
+      queriesByField.set(field, queries);
+    }
+  }
+
+  return Array.from(queriesByField, ([field, queries]) => ({
+    field,
+    queries: Array.from(queries),
+  }));
+}
+
+function percentile(values: number[], quantile: number): number {
+  const sorted = [...values].sort((left, right) => left - right);
+  const index = Math.max(0, Math.ceil(sorted.length * quantile) - 1);
+  return sorted[index];
+}
+
+function getErrorMessage(error: unknown): string {
+  return error instanceof Error
+    ? `${error.name}: ${error.message}`
+    : String(error);
+}
+
+function formatLatency(value: number | null): string {
+  return value === null ? "n/a" : value.toFixed(1);
+}
+
+async function runWithConcurrency<T>(
+  count: number,
+  concurrency: number,
+  operation: (index: number) => Promise<T>,
+): Promise<T[]> {
+  const results = new Array<T>(count);
+  let nextIndex = 0;
+
+  async function worker() {
+    while (nextIndex < count) {
+      const index = nextIndex++;
+      results[index] = await operation(index);
+    }
+  }
+
+  await Promise.all(
+    Array.from({ length: Math.min(count, concurrency) }, () => worker()),
+  );
+
+  return results;
+}
+
+async function main() {
+  const options = parseArguments(process.argv.slice(2));
+  const searchProvider = getPartnerSearchProvider();
+
+  if (!searchProvider) {
+    throw new Error(
+      "Partner search provider is not configured. Implement and configure it before running the benchmark.",
+    );
+  }
+
+  const partnerCount = await prisma.programEnrollment.count({
+    where: { programId: options.programId },
+  });
+  if (partnerCount === 0) {
+    throw new Error(`Program ${options.programId} has 0 partners.`);
+  }
+
+  const pools = await loadSearchCasePools(
+    options.programId,
+    options.sampleSize,
+    partnerCount,
+  );
+
+  const runSearch = async (index: number): Promise<BenchmarkResult> => {
+    // Rotate fields on every request and advance that field's query once per
+    // full rotation, so consecutive requests never repeat a query until the
+    // pool is exhausted. Deterministic, so two runs issue the same work.
+    const pool = pools[index % pools.length];
+    const query =
+      pool.queries[Math.floor(index / pools.length) % pool.queries.length];
+    const searchCase: SearchCase = { field: pool.field, query };
+    const startedAt = performance.now();
+
+    try {
+      if (options.searchOnly) {
+        const { hits } = await searchProvider.searchCandidates({
+          programId: options.programId,
+          query: searchCase.query,
+          limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+        });
+
+        if (hits.length === 0) {
+          throw new Error(
+            `Search case "${searchCase.field}" returned no candidates for "${searchCase.query}".`,
+          );
+        }
+      } else {
+        // Opt out of the database fallback: a provider failure has to surface
+        // as an error here, not as a fast run measuring the wrong code path.
+        const partners = await getPartners(
+          {
+            programId: options.programId,
+            search: searchCase.query,
+            page: 1,
+            pageSize: options.pageSize,
+            sortBy: "relevance" as const,
+            sortOrder: "desc" as const,
+          },
+          { searchProvider, throwOnSearchError: true },
+        );
+
+        if (partners.length === 0) {
+          throw new Error(
+            `Search case "${searchCase.field}" returned no results for "${searchCase.query}".`,
+          );
+        }
+      }
+
+      return {
+        ...searchCase,
+        latencyMs: performance.now() - startedAt,
+        error: null,
+      };
+    } catch (error) {
+      return {
+        ...searchCase,
+        latencyMs: performance.now() - startedAt,
+        error: getErrorMessage(error),
+      };
+    }
+  };
+
+  console.log(`Partner search benchmark for program ${options.programId}`);
+  console.log(`${partnerCount.toLocaleString()} program partners`);
+  console.log(
+    `${options.requests.toLocaleString()} measured requests, ${options.warmupRequests.toLocaleString()} warm-up requests, concurrency ${options.concurrency}`,
+  );
+  const distinctQueries = pools.reduce(
+    (total, { queries }) => total + queries.length,
+    0,
+  );
+  const measuredPath = options.searchOnly
+    ? "queries the search provider directly (no database reads)"
+    : "runs the relevance-ranked partner list path";
+  console.log(
+    `Each request ${measuredPath} across ${pools.length} search cases, drawing from ${distinctQueries.toLocaleString()} distinct queries sampled from ${options.sampleSize.toLocaleString()} partners.`,
+  );
+  const warmupResults = await runWithConcurrency(
+    options.warmupRequests,
+    options.concurrency,
+    runSearch,
+  );
+  const warmupErrorCount = warmupResults.filter(({ error }) => error).length;
+  if (warmupErrorCount > 0) {
+    console.warn(
+      `${warmupErrorCount.toLocaleString()} of ${options.warmupRequests.toLocaleString()} warm-up requests failed. Continuing to collect measured results.`,
+    );
+  }
+
+  const startedAt = performance.now();
+  const results = await runWithConcurrency(
+    options.requests,
+    options.concurrency,
+    // Continue past the warm-up indices so the measured run does not reissue the
+    // queries the warm-up just cached.
+    (index) => runSearch(options.warmupRequests + index),
+  );
+  const elapsedMs = performance.now() - startedAt;
+  const successfulResults = results.filter(({ error }) => error === null);
+  const failedResults = results.filter(({ error }) => error !== null);
+  const latencies = successfulResults.map(({ latencyMs }) => latencyMs);
+  const mean =
+    latencies.length > 0
+      ? latencies.reduce((total, latency) => total + latency, 0) /
+        latencies.length
+      : null;
+  const p99 = latencies.length > 0 ? percentile(latencies, 0.99) : null;
+  const caseSummaries = pools.map(({ field, queries }) => {
+    const query = `${queries[0]}${queries.length > 1 ? ` (+${queries.length - 1})` : ""}`;
+    const caseResults = results.filter((result) => result.field === field);
+    const caseErrors = caseResults.filter(({ error }) => error !== null).length;
+    const caseLatencies = caseResults
+      .filter(({ error }) => error === null)
+      .map(({ latencyMs }) => latencyMs);
+
+    return {
+      field,
+      query,
+      samples: caseResults.length,
+      errors: caseErrors,
+      errorRate:
+        caseResults.length > 0 ? (caseErrors / caseResults.length) * 100 : 0,
+      p50Ms: caseLatencies.length > 0 ? percentile(caseLatencies, 0.5) : null,
+      p95Ms: caseLatencies.length > 0 ? percentile(caseLatencies, 0.95) : null,
+      p99Ms: caseLatencies.length > 0 ? percentile(caseLatencies, 0.99) : null,
+      maxMs: caseLatencies.length > 0 ? Math.max(...caseLatencies) : null,
+    };
+  });
+  const casesWithLatency = caseSummaries.filter(
+    (summary): summary is typeof summary & { p99Ms: number } =>
+      summary.p99Ms !== null,
+  );
+  const slowestCase = casesWithLatency.reduce<
+    (typeof casesWithLatency)[number] | null
+  >(
+    (slowest, current) =>
+      !slowest || current.p99Ms > slowest.p99Ms ? current : slowest,
+    null,
+  );
+
+  console.table(
+    caseSummaries.map(
+      ({ field, query, samples, errors, errorRate, ...latency }) => ({
+        field,
+        query,
+        samples,
+        errors,
+        errorRate: `${errorRate.toFixed(2)}%`,
+        ...Object.fromEntries(
+          Object.entries(latency).map(([key, value]) => [
+            key,
+            formatLatency(value),
+          ]),
+        ),
+      }),
+    ),
+  );
+
+  if (failedResults.length > 0) {
+    const errorCounts = new Map<string, number>();
+    for (const { error } of failedResults) {
+      errorCounts.set(error!, (errorCounts.get(error!) ?? 0) + 1);
+    }
+    console.table(
+      Array.from(errorCounts, ([error, count]) => ({ error, count })),
+    );
+  }
+
+  console.table({
+    samples: results.length,
+    successful: successfulResults.length,
+    errors: failedResults.length,
+    errorRate: `${((failedResults.length / results.length) * 100).toFixed(2)}%`,
+    meanMs: formatLatency(mean),
+    p50Ms: formatLatency(
+      latencies.length > 0 ? percentile(latencies, 0.5) : null,
+    ),
+    p95Ms: formatLatency(
+      latencies.length > 0 ? percentile(latencies, 0.95) : null,
+    ),
+    p99Ms: formatLatency(p99),
+    maxMs: formatLatency(latencies.length > 0 ? Math.max(...latencies) : null),
+    requestsPerSecond: ((options.requests * 1_000) / elapsedMs).toFixed(1),
+  });
+
+  const casesWithoutSamples = caseSummaries.filter(
+    ({ p99Ms }) => p99Ms === null,
+  );
+  if (casesWithoutSamples.length > 0) {
+    throw new Error(
+      `No successful requests for: ${casesWithoutSamples
+        .map(({ field }) => field)
+        .join(
+          ", ",
+        )}. There is no p99 to compare against the threshold. Check that the search index is backfilled for this program.`,
+    );
+  }
+
+  const errorRate = (failedResults.length / results.length) * 100;
+  if (errorRate > options.maxErrorRate) {
+    throw new Error(
+      `${failedResults.length.toLocaleString()} of ${results.length.toLocaleString()} measured requests failed (${errorRate.toFixed(2)}% error rate, --maxErrorRate=${options.maxErrorRate}).`,
+    );
+  }
+
+  if (slowestCase && slowestCase.p99Ms >= options.thresholdMs) {
+    throw new Error(
+      `${slowestCase.field} p99 latency ${slowestCase.p99Ms.toFixed(1)}ms did not meet the <${options.thresholdMs}ms threshold.`,
+    );
+  }
+
+  console.log(
+    `Completed: every search case has p99 latency below ${options.thresholdMs}ms${failedResults.length > 0 ? `, with a ${errorRate.toFixed(2)}% error rate within the --maxErrorRate=${options.maxErrorRate} allowance` : ""}.`,
+  );
+}
+
+main()
+  .catch((error) => {
+    console.error("Partner search benchmark failed:", error);
+    process.exitCode = 1;
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });
diff --git a/apps/web/scripts/dev/data.json b/apps/web/scripts/dev/data.json
index d245191c346..b8514342e19 100644
--- a/apps/web/scripts/dev/data.json
+++ b/apps/web/scripts/dev/data.json
@@ -60,6 +60,13 @@
       "verified": true
     }
   ],
+  "emailDomains": [
+    {
+      "id": "dom_1KETZ919F83ZJH6A80EMAILDOM",
+      "slug": "getacme.link",
+      "status": "verified"
+    }
+  ],
   "folders": [
     {
       "id": "fold_1K2J9DRWPPJ2F1RX53N92TSGB",
@@ -71,6 +78,7 @@
   "rewards": [
     {
       "id": "rw_1K2J9DRWPPJ2F1RX53N92TSGD",
+      "groupId": "grp_1K2J9DRWPPJ2F1RX53N92TSGC",
       "event": "lead",
       "type": "flat",
       "amountInCents": 1000,
@@ -80,6 +88,7 @@
     },
     {
       "id": "rw_1K2J9DRWPPJ2F1RX53N92TSGE",
+      "groupId": "grp_1K2J9DRWPPJ2F1RX53N92TSGC",
       "event": "sale",
       "type": "flat",
       "amountInCents": 3000,
diff --git a/apps/web/scripts/dev/debug-partner-search.ts b/apps/web/scripts/dev/debug-partner-search.ts
new file mode 100644
index 00000000000..9e0ff25ce88
--- /dev/null
+++ b/apps/web/scripts/dev/debug-partner-search.ts
@@ -0,0 +1,351 @@
+import {
+  getPartnerSearchableValues,
+  getPartnerSearchProvider,
+  normalizePartnerSearchQuery,
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  partnerSearchDocumentSelect,
+  serializePartnerSearchDocument,
+  type PartnerSearchDocument,
+  type PartnerSearchHit,
+} from "@/lib/api/partners/search";
+import { PARTNER_SEARCH_NAMESPACE } from "@/lib/api/partners/search/providers/turbopuffer";
+import { prisma } from "@/lib/prisma";
+import { parsePositiveInteger } from "@/scripts/utils/parse-cli-number";
+import { ProgramEnrollmentStatus } from "@prisma/client";
+import { Turbopuffer } from "@turbopuffer/turbopuffer";
+import "dotenv-flow/config";
+
+const DEFAULT_LIMIT = 10;
+const MAX_LIMIT = PARTNER_SEARCH_CANDIDATE_LIMIT;
+
+interface DebugArguments {
+  programId: string;
+  query: string;
+  limit: number;
+  status?: ProgramEnrollmentStatus;
+  searchOnly: boolean;
+}
+
+function parseArguments(args: string[]): DebugArguments {
+  let programId: string | undefined;
+  let query: string | undefined;
+  let limit = DEFAULT_LIMIT;
+  let status: ProgramEnrollmentStatus | undefined;
+  let searchOnly = false;
+
+  for (const arg of args) {
+    if (arg.startsWith("--programId=")) {
+      programId = arg.slice("--programId=".length);
+    } else if (arg.startsWith("--query=")) {
+      query = arg.slice("--query=".length);
+    } else if (arg.startsWith("--limit=")) {
+      limit = parsePositiveInteger(arg.slice("--limit=".length), "--limit");
+    } else if (arg.startsWith("--status=")) {
+      const value = arg.slice("--status=".length) as ProgramEnrollmentStatus;
+      if (!Object.values(ProgramEnrollmentStatus).includes(value)) {
+        throw new Error(
+          `--status must be one of: ${Object.values(ProgramEnrollmentStatus).join(", ")}.`,
+        );
+      }
+      status = value;
+    } else if (arg === "--searchOnly") {
+      searchOnly = true;
+    } else {
+      throw new Error(`Unknown argument: ${arg}`);
+    }
+  }
+
+  if (!programId) {
+    throw new Error("--programId is required.");
+  }
+  if (!query?.trim()) {
+    throw new Error("--query is required.");
+  }
+  if (limit > MAX_LIMIT) {
+    throw new Error(`--limit cannot exceed ${MAX_LIMIT}.`);
+  }
+  // Status lives on the enrollment row, so filtering by it needs the database.
+  if (searchOnly && status) {
+    throw new Error("--searchOnly cannot be combined with --status.");
+  }
+
+  return { programId, query, limit, status, searchOnly };
+}
+
+async function getDatabaseDocuments(
+  hits: PartnerSearchHit[],
+  status?: ProgramEnrollmentStatus,
+) {
+  const documentIds = Array.from(new Set(hits.map(({ id }) => id)));
+  const enrollments = await prisma.programEnrollment.findMany({
+    where: {
+      id: { in: documentIds },
+      ...(status ? { status } : {}),
+    },
+    select: partnerSearchDocumentSelect,
+  });
+
+  return new Map(
+    enrollments.map((enrollment) => {
+      const document = serializePartnerSearchDocument(enrollment);
+      return [document.id, document] as const;
+    }),
+  );
+}
+
+function containsLiteralQuery(
+  document: PartnerSearchDocument | undefined,
+  normalizedQuery: string,
+) {
+  return document
+    ? getPartnerSearchableValues(document).some((value) =>
+        normalizePartnerSearchQuery(value).includes(normalizedQuery),
+      )
+    : false;
+}
+
+const EMAIL_PATTERN = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
+
+/**
+ * Reads the indexed `searchText` back out of turbopuffer for the hits.
+ *
+ * Debug-only: `searchCandidates` asks for no attributes, because the API only
+ * ever needs IDs. This exists so --searchOnly can show what was indexed when the
+ * rows are not in the local database, such as a production index against a seeded one.
+ */
+async function fetchIndexedText(ids: string[]): Promise<Map<string, string>> {
+  const apiKey = process.env.TURBOPUFFER_API_KEY;
+
+  if (!apiKey || ids.length === 0) {
+    return new Map();
+  }
+
+  const namespace = new Turbopuffer({
+    apiKey,
+    region: "aws-us-east-1",
+  }).namespace(PARTNER_SEARCH_NAMESPACE);
+  const { rows } = await namespace.query({
+    rank_by: ["id", "asc"],
+    top_k: ids.length,
+    filters: ["id", "In", ids],
+    include_attributes: ["searchText"],
+  });
+
+  return new Map(
+    (rows ?? []).map((row) => [String(row.id), String(row.searchText ?? "")]),
+  );
+}
+
+const PLATFORM_TYPES = [
+  "website",
+  "youtube",
+  "twitter",
+  "linkedin",
+  "instagram",
+  "tiktok",
+];
+
+/**
+ * `searchText` joins the searchable values in order: partner ID, tenant ID,
+ * name, email, company, description, platform types, handles, link keys. Only
+ * the partner ID prefix, the email shape, and the platform enum are
+ * recoverable, so the split into identity / profile / platforms-and-keys is a
+ * heuristic. The tenant ID has no shape and stays in identity.
+ */
+function parseIndexedText(searchText: string) {
+  const tokens = searchText.split(" ").filter(Boolean);
+  const hasPartnerId = tokens[0]?.startsWith("pn_") ?? false;
+  const emailIndex = tokens.findIndex((token) => EMAIL_PATTERN.test(token));
+  // Without an email there is no boundary after the identity, so it is assumed
+  // to end at the fourth token, and the profile starts where the identity ends.
+  const identityEnd = emailIndex === -1 ? 4 : emailIndex;
+  const profileStart = emailIndex === -1 ? identityEnd : emailIndex + 1;
+  const platformIndex = tokens.findIndex(
+    (token, index) => index >= profileStart && PLATFORM_TYPES.includes(token),
+  );
+
+  return {
+    tokens,
+    identity: tokens.slice(hasPartnerId ? 1 : 0, identityEnd).join(" "),
+    email: emailIndex === -1 ? "" : tokens[emailIndex],
+    profile: tokens
+      .slice(profileStart, platformIndex === -1 ? undefined : platformIndex)
+      .join(" "),
+    platformsAndKeys:
+      platformIndex === -1 ? "" : tokens.slice(platformIndex).join(" "),
+  };
+}
+
+/**
+ * How often each query term occurs, and how long the document is. Both drive the
+ * BM25 score: term frequency raises it, and length normalization (b=0.75) pushes
+ * it back down, so a partner with many links can rank below a shorter document
+ * that matched fewer of the query's terms.
+ */
+function summarizeTermMatches(tokens: string[], normalizedQuery: string) {
+  const queryTerms = normalizedQuery.split(/\s+/u).filter(Boolean);
+
+  return queryTerms
+    .map((term) => {
+      const count = tokens.filter((token) => token.startsWith(term)).length;
+      return `${term}×${count}`;
+    })
+    .join(" ");
+}
+
+/**
+ * Everything the provider returns on its own: an ID and a score. Names, emails,
+ * and the literal-match check all come from the database, so --searchOnly trades
+ * them for a run that needs no DATABASE_URL.
+ */
+function reportProviderHits(
+  hits: PartnerSearchHit[],
+  indexedText: Map<string, string>,
+  normalizedQuery: string,
+) {
+  console.table(
+    hits.map((hit, index) => {
+      const parsed = parseIndexedText(indexedText.get(hit.id) ?? "");
+
+      return {
+        rank: index + 1,
+        score: hit.score?.toFixed(5),
+        identity: parsed.identity,
+        email: parsed.email,
+        docTokens: parsed.tokens.length,
+        queryTerms: summarizeTermMatches(parsed.tokens, normalizedQuery),
+      };
+    }),
+  );
+
+  if (indexedText.size === 0) {
+    return;
+  }
+
+  console.log("\nIndexed document per hit");
+  hits.forEach((hit, index) => {
+    const parsed = parseIndexedText(indexedText.get(hit.id) ?? "");
+    console.log(`\n${index + 1}. ${hit.id}`);
+    console.log(`   profile         ${parsed.profile.slice(0, 150) || "—"}`);
+    console.log(
+      `   platforms+keys  ${parsed.platformsAndKeys.slice(0, 150) || "—"}`,
+    );
+    // The parsed sections are heuristic. The raw text is the ground truth for
+    // checking what a document actually contains, so it is never truncated.
+    console.log(`   raw             ${indexedText.get(hit.id) ?? ""}`);
+  });
+}
+
+function reportResults({
+  label,
+  hits,
+  databaseDocuments,
+  normalizedQuery,
+}: {
+  label: string;
+  hits: PartnerSearchHit[];
+  databaseDocuments: Awaited<ReturnType<typeof getDatabaseDocuments>>;
+  normalizedQuery: string;
+}) {
+  console.log(`\n${label}`);
+  console.table(
+    hits.map((hit, index) => {
+      const databaseDocument = databaseDocuments.get(hit.id);
+
+      return {
+        rank: index + 1,
+        providerScore: hit.score,
+        containsLiteralQuery: containsLiteralQuery(
+          databaseDocument,
+          normalizedQuery,
+        ),
+        enrollmentId: hit.id,
+        partnerId: databaseDocument?.partnerId ?? "missing from database",
+        name: databaseDocument?.name ?? "missing from database",
+        email: databaseDocument?.email ?? null,
+        company: databaseDocument?.companyName ?? null,
+      };
+    }),
+  );
+}
+
+async function main() {
+  const { programId, query, limit, status, searchOnly } = parseArguments(
+    process.argv.slice(2),
+  );
+  const searchProvider = getPartnerSearchProvider();
+  if (!searchProvider) {
+    throw new Error("TURBOPUFFER_API_KEY is not configured.");
+  }
+
+  const startedAt = performance.now();
+
+  // Step 1: Fetch the same relevance candidates used by the website
+  const relevanceResult = await searchProvider.searchCandidates({
+    programId,
+    query,
+    limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+  });
+
+  const normalizedQuery = normalizePartnerSearchQuery(query);
+
+  if (searchOnly) {
+    console.log("Partner search debug summary");
+    console.table({
+      programId,
+      query,
+      normalizedQuery,
+      candidates: relevanceResult.hits.length,
+      elapsedMs: (performance.now() - startedAt).toFixed(1),
+    });
+
+    const pageHits = relevanceResult.hits.slice(0, limit);
+    const indexedText = await fetchIndexedText(pageHits.map(({ id }) => id));
+
+    console.log(
+      "\nProvider relevance order (provider only, no database reads)",
+    );
+    reportProviderHits(pageHits, indexedText, normalizedQuery);
+    return;
+  }
+
+  // Step 2: Apply the requested status while loading canonical database documents
+  const databaseDocuments = await getDatabaseDocuments(
+    relevanceResult.hits,
+    status,
+  );
+  const databaseMatchedHits = relevanceResult.hits.filter(({ id }) =>
+    databaseDocuments.has(id),
+  );
+  const filteredHits = databaseMatchedHits.slice(0, limit);
+
+  console.log("Partner search debug summary");
+  console.table({
+    programId,
+    query,
+    normalizedQuery,
+    status: status ?? "all",
+    candidates: relevanceResult.hits.length,
+    databaseMatches: databaseMatchedHits.length,
+    elapsedMs: (performance.now() - startedAt).toFixed(1),
+  });
+  console.log(
+    "Provider scores are provider-defined. Compare result order and database values across providers.",
+  );
+
+  reportResults({
+    label: "Provider relevance order",
+    hits: filteredHits,
+    databaseDocuments,
+    normalizedQuery,
+  });
+}
+
+main()
+  .catch((error) => {
+    console.error("Partner search debug failed:", error);
+    process.exitCode = 1;
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });
diff --git a/apps/web/scripts/dev/seed-100k-partners.ts b/apps/web/scripts/dev/seed-100k-partners.ts
new file mode 100644
index 00000000000..0383bdb34e7
--- /dev/null
+++ b/apps/web/scripts/dev/seed-100k-partners.ts
@@ -0,0 +1,722 @@
+/**
+ * Bulk-seeds partners for local development and partner-search benchmarking.
+ *
+ * Writes User, Partner, PartnerUser, ProgramEnrollment, PartnerPlatform, Link,
+ * and ProgramPartnerTag rows (every field the search index reads) in atomic
+ * chunks of CHUNK_SIZE partners, so 100K partners lands ~500K rows in seconds.
+ *
+ * Statuses, groups, and tags are spread across each partner so the filters have
+ * something to select on: seeding everything as approved and ungrouped makes a
+ * filtered search look correct while matching every row.
+ *
+ * Re-running with the same `--seed` collides. `seedFingerprint` is a deterministic
+ * hash of the program ID and `--seed`, so identical arguments regenerate identical
+ * emails, usernames, and link keys, all of which are unique columns. Pass a new
+ * `--seed` to add another batch; the script checks up front and says so rather than
+ * dying on a constraint error halfway through.
+ *
+ * This inserts login-capable users with a known password, so it refuses a non-local
+ * DATABASE_URL unless `--allowRemoteDatabase` is passed, and refuses a production
+ * environment (NODE_ENV/VERCEL_ENV) outright.
+ *
+ *   cd apps/web
+ *   pnpm run script dev/seed-100k-partners [--count=100000] [--programId=prog_123] [--seed=custom-seed]
+ *
+ * Seeded partners are not searchable until the index is backfilled:
+ *   pnpm run script partners/backfill-partner-search --programId=prog_123
+ */
+
+import { createId } from "@/lib/api/create-id";
+import { hashPassword } from "@/lib/auth/password";
+import { prisma } from "@/lib/prisma";
+import { parsePositiveInteger } from "@/scripts/utils/parse-cli-number";
+import { PlatformType, Prisma, ProgramEnrollmentStatus } from "@prisma/client";
+import { createHash } from "crypto";
+import "dotenv-flow/config";
+
+const DEFAULT_COUNT = 100_000;
+const MAX_COUNT = 1_000_000;
+const DEFAULT_SEED = "partners-search";
+const CHUNK_SIZE = 2_500;
+const LOCAL_DATABASE_HOSTS = new Set([
+  "localhost",
+  "127.0.0.1",
+  "0.0.0.0",
+  "::1",
+  "host.docker.internal",
+  "mysql",
+  "db",
+]);
+
+// prettier-ignore
+const FIRST_NAMES = [
+  "Alex", "Jordan", "Taylor", "Morgan", "Chris", "Sam", "Riley", "Casey", "Dakota", "Jamie",
+  "Avery", "Reese", "Skyler", "Quinn", "Rowan", "Peyton", "Finley", "Emerson", "Hayden", "Sage",
+  "Logan", "Jesse", "Harper", "Eden", "Kendall", "Devon", "Dallas", "Shiloh", "River", "Phoenix",
+  "Cameron", "Drew", "Eli", "Francis", "Greyson", "Hadley", "Jules", "Kai", "Lennon", "Marlowe",
+  "Adrian", "Blake", "Corey", "Delaney", "Ellis", "Frankie", "Gray", "Hollis", "Indigo", "Justice",
+  "Keegan", "Lane", "Micah", "Noel", "Oakley", "Parker", "Remy", "Sutton", "Tatum", "Wren",
+  "Arden", "Bellamy", "Campbell", "Darcy",
+];
+
+// prettier-ignore
+const LAST_NAMES = [
+  "Smith", "Johnson", "Williams", "Brown", "Jones", "Garcia", "Miller", "Davis", "Rodriguez", "Martinez",
+  "Hernandez", "Lopez", "Gonzalez", "Wilson", "Anderson", "Thomas", "Taylor", "Moore", "Jackson", "Martin",
+  "Lee", "Perez", "Thompson", "White", "Harris", "Sanchez", "Clark", "Ramirez", "Lewis", "Robinson",
+  "Walker", "Young", "Allen", "King", "Wright", "Scott", "Torres", "Nguyen", "Hill", "Flores",
+  "Okonkwo", "Bergstrom", "Castellano", "Dubois", "Eriksen", "Fitzgerald", "Grigoryan", "Halvorsen",
+  "Ibrahim", "Jankowski", "Kowalczyk", "Lindqvist", "Mbeki", "Nakamura", "Oyelaran", "Petrova",
+  "Quintero", "Rasmussen", "Silvestri", "Takahashi", "Ustinov", "Vasquez", "Whitfield", "Zielinski",
+];
+
+// Company names come from their own vocabulary rather than reusing the surname.
+// The benchmark queries a field's longest token, so `${lastName} ${suffix}`
+// mostly repeated the name field's queries and measured the same work twice.
+// Every prefix is longer than every suffix, so the prefix is what gets queried.
+// prettier-ignore
+const COMPANY_PREFIXES = [
+  "Brightwave", "Silverpine", "Northgate", "Blueshift", "Stonebridge", "Clearwater", "Ravenwood",
+  "Copperfield", "Emberline", "Frostpeak", "Hollowbrook", "Jadestone", "Kingfisher", "Moonstone",
+  "Nightingale", "Pinecrest", "Quicksilver", "Riverstone", "Sablewood", "Thornfield", "Umberwood",
+  "Whitestone", "Amberfall", "Bramblewood", "Cindershade", "Duskwater", "Elderbrook", "Glasshouse",
+  "Havenwood", "Ironbark", "Larkspire", "Meadowlark", "Opaline", "Pathfinder", "Quarrystone",
+  "Redcliffe", "Saltmarsh", "Tidewater", "Vireoglen", "Windrose",
+];
+
+// Every suffix is at most six characters and every prefix at least seven, so
+// the prefix is always the longest token.
+// prettier-ignore
+const COMPANY_SUFFIXES = [
+  "Tech", "Labs", "Media", "Agency", "Studio", "Global", "Cloud", "Group", "Growth", "Union",
+  "Works", "Forge", "Craft", "Point", "Scale", "Reach", "Signal", "Vector", "Summit", "Nexus",
+];
+
+// Email search queries the first five characters of the domain, so these are
+// distinct in their first five.
+// prettier-ignore
+const DOMAINS = [
+  "example.com", "techcorp.io", "marketing.co", "acme.dev", "growth.app",
+  "agency.net", "saas.com", "creator.xyz", "dub.co", "builder.build",
+  "pixelforge.io", "nimbus.dev", "quantum.co", "vertex.app", "zenith.net",
+  "orbital.io", "catalyst.co", "summit.dev", "horizon.app", "lumina.io",
+  "forgeworks.com", "bedrock.co", "kinetic.dev", "radiant.app", "stellar.io",
+  "thrive.co", "upstream.dev", "waveform.app", "yonder.io", "atlas.works",
+  "beacon.co", "cipher.dev", "delta.app", "ember.io", "fathom.co",
+  "gradient.dev", "harbor.app", "ignite.io", "juniper.co", "keystone.dev",
+];
+
+// prettier-ignore
+const COUNTRIES = ["US", "CA", "GB", "DE", "FR", "AU", "JP", "IN", "BR", "NL", "ES", "SE", "SG"];
+
+// A description's longest word becomes its benchmark query, so the specialty is
+// what has to vary, since every other word here is shorter than every specialty, and
+// the specialties differ within their first twelve characters (the query is
+// truncated there).
+const DESCRIPTION_TEMPLATES = [
+  "Affiliate marketer working across %s and paid growth.",
+  "Tech reviewer covering %s for a global audience.",
+  "Runs a weekly newsletter about %s and dev tools.",
+  "Builds long-form guides on %s for growing teams.",
+  "Advises brands on %s and referral links.",
+  "Hosts a podcast about %s and early-stage startups.",
+  "Writes deep dives into %s and modern web tooling.",
+  "Teaches short courses on %s to first-time founders.",
+];
+
+// prettier-ignore
+const DESCRIPTION_SPECIALTIES = [
+  "observability", "personalization", "authentication", "infrastructure", "orchestration",
+  "virtualization", "containerization", "cybersecurity", "documentation", "localization",
+  "monetization", "optimization", "provisioning", "segmentation", "subscriptions",
+  "tokenization", "visualization", "warehousing", "attribution", "benchmarking",
+  "collaboration", "deliverability", "forecasting", "reconciliation", "syndication",
+  "accessibility", "interoperability", "experimentation", "instrumentation", "productization",
+  "categorization", "deduplication", "geolocation", "hyperautomation", "internationalization",
+  "normalization", "partitioning", "replication",
+];
+
+// Weighted so most partners are approved, which is what the table shows by
+// default, while leaving enough of every other status to filter on.
+// prettier-ignore
+const STATUS_WEIGHTS: ProgramEnrollmentStatus[] = [
+  ...Array<ProgramEnrollmentStatus>(84).fill("approved"),
+  ...Array<ProgramEnrollmentStatus>(6).fill("pending"),
+  ...Array<ProgramEnrollmentStatus>(3).fill("rejected"),
+  ...Array<ProgramEnrollmentStatus>(3).fill("banned"),
+  ...Array<ProgramEnrollmentStatus>(2).fill("archived"),
+  ...Array<ProgramEnrollmentStatus>(2).fill("deactivated"),
+];
+
+// prettier-ignore
+const TAG_NAMES = [
+  "VIP", "Newsletter", "YouTube", "Enterprise", "Agency", "Beta", "Inactive", "High Intent",
+];
+
+const SEEDED_GROUP_NAMES = ["Creators", "Agencies", "Enterprise", "Affiliates"];
+
+const PLATFORM_TYPES: PlatformType[] = [
+  PlatformType.website,
+  PlatformType.youtube,
+  PlatformType.twitter,
+  PlatformType.linkedin,
+  PlatformType.instagram,
+  PlatformType.tiktok,
+];
+
+type SeedArguments = {
+  totalCount: number;
+  targetProgramId: string | null;
+  seed: string;
+  allowRemoteDatabase: boolean;
+};
+
+type PartnerChunk = {
+  users: Prisma.UserCreateManyInput[];
+  partners: Prisma.PartnerCreateManyInput[];
+  partnerUsers: Prisma.PartnerUserCreateManyInput[];
+  enrollments: Prisma.ProgramEnrollmentCreateManyInput[];
+  platforms: Prisma.PartnerPlatformCreateManyInput[];
+  links: Prisma.LinkCreateManyInput[];
+  programPartnerTags: Prisma.ProgramPartnerTagCreateManyInput[];
+};
+
+type GeneratePartnerChunkOptions = {
+  start: number;
+  end: number;
+  seedFingerprint: string;
+  passwordHash: string;
+  runStartedAt: Date;
+  programId: string;
+  programDomain: string | null;
+  workspaceId: string;
+  groupIds: (string | null)[];
+  tagIds: string[];
+};
+
+// FNV-1a with murmur3's fmix32 finalizer. Cheap enough to call several times
+// per partner, unlike a crypto hash. FNV-1a alone has weak avalanche, and this
+// is called with near-identical strings (same fingerprint and index, differing
+// only in the field label), whose outputs stay correlated: first and last names
+// stopped pairing independently and most of the 64×64 combinations never
+// occurred at all. The finalizer restores independence and stays deterministic.
+function hashToUint32(value: string): number {
+  let hash = 0x811c9dc5;
+
+  for (let i = 0; i < value.length; i++) {
+    hash = Math.imul(hash ^ value.charCodeAt(i), 0x01000193);
+  }
+
+  hash ^= hash >>> 16;
+  hash = Math.imul(hash, 0x85ebca6b);
+  hash ^= hash >>> 13;
+  hash = Math.imul(hash, 0xc2b2ae35);
+  hash ^= hash >>> 16;
+
+  return hash >>> 0;
+}
+
+function generatePartnerMetrics(index: number) {
+  const totalClicks = 100 + ((index * 37) % 50_000);
+  const leadRate = 0.05 + (index % 16) / 100;
+  const conversionRate = 0.1 + (index % 31) / 100;
+  const saleRate = 0.6 + (index % 31) / 100;
+  const totalLeads = Math.max(1, Math.floor(totalClicks * leadRate));
+  const totalConversions = Math.max(1, Math.floor(totalLeads * conversionRate));
+  const totalSales = Math.max(1, Math.floor(totalConversions * saleRate));
+  const averageOrderValueCents = 2_500 + ((index * 7_919) % 197_500);
+  const totalSaleAmount = BigInt(totalSales * averageOrderValueCents);
+  const commissionRatePercent = 5 + (index % 26);
+  const totalCommissions =
+    (totalSaleAmount * BigInt(commissionRatePercent)) / BigInt(100);
+
+  return {
+    totalClicks,
+    totalLeads,
+    totalConversions,
+    totalSales,
+    totalSaleAmount,
+    totalCommissions,
+    netRevenue: totalSaleAmount - totalCommissions,
+    earningsPerClick: Number(totalSaleAmount) / totalClicks,
+    averageLifetimeValue: Number(totalSaleAmount) / totalConversions,
+    clickToLeadRate: totalLeads / totalClicks,
+    clickToConversionRate: totalConversions / totalClicks,
+    leadToConversionRate: totalConversions / totalLeads,
+    returnOnAdSpend: Number(totalSaleAmount) / Number(totalCommissions),
+  } satisfies Partial<Prisma.ProgramEnrollmentCreateManyInput>;
+}
+
+// Args: --count=<number> (optional, default: 100000) - Total number of partners to seed.
+//       --programId=<id> (optional) - Target program ID to seed partners into.
+//       --seed=<string> (optional, default: "partners-search") - Seed string for deterministic generation.
+//       --allowRemoteDatabase (optional) - Permit seeding a non-local DATABASE_URL.
+const parseArguments = (args: string[]): SeedArguments => {
+  let totalCount = DEFAULT_COUNT;
+  let targetProgramId: string | null = null;
+  let seed = DEFAULT_SEED;
+  let allowRemoteDatabase = false;
+
+  for (const arg of args) {
+    if (arg.startsWith("--count=")) {
+      totalCount = parsePositiveInteger(
+        arg.slice("--count=".length),
+        "--count",
+      );
+    } else if (arg.startsWith("--programId=")) {
+      targetProgramId = arg.slice("--programId=".length);
+    } else if (arg.startsWith("--seed=")) {
+      seed = arg.slice("--seed=".length);
+    } else if (arg === "--allowRemoteDatabase") {
+      allowRemoteDatabase = true;
+    } else {
+      throw new Error(`Unknown argument: ${arg}`);
+    }
+  }
+
+  if (totalCount > MAX_COUNT) {
+    throw new Error(
+      `--count cannot exceed ${MAX_COUNT.toLocaleString()}. Run the script again with a new --seed to add more.`,
+    );
+  }
+
+  if (!seed || !/^[a-zA-Z0-9_-]{1,40}$/.test(seed)) {
+    throw new Error(
+      "--seed must contain 1-40 letters, numbers, underscores, or hyphens.",
+    );
+  }
+
+  if (targetProgramId === "") {
+    throw new Error("--programId cannot be empty.");
+  }
+
+  return { totalCount, targetProgramId, seed, allowRemoteDatabase };
+};
+
+// Refuse unless the host is local or the operator opts in explicitly.
+const assertSeedableDatabase = (allowRemoteDatabase: boolean) => {
+  const databaseUrl = process.env.DATABASE_URL;
+
+  if (!databaseUrl) {
+    throw new Error("DATABASE_URL is not set.");
+  }
+
+  // The host allowlist cannot tell a truly local database from a production
+  // one reached through a local tunnel, so a production environment refuses
+  // outright. --allowRemoteDatabase does not override this.
+  if (
+    process.env.NODE_ENV === "production" ||
+    process.env.VERCEL_ENV === "production"
+  ) {
+    throw new Error(
+      "Refusing to seed in a production environment. This script inserts users with a known password.",
+    );
+  }
+
+  let host: string;
+  try {
+    // `URL` keeps IPv6 hosts bracketed; strip them so "::1" matches.
+    host = new URL(databaseUrl).hostname.replace(/^\[|\]$/g, "");
+  } catch {
+    throw new Error("DATABASE_URL is not a valid connection URL.");
+  }
+
+  if (LOCAL_DATABASE_HOSTS.has(host)) {
+    return;
+  }
+
+  if (allowRemoteDatabase) {
+    console.warn(
+      `⚠️  Seeding the non-local database at "${host}" because --allowRemoteDatabase was passed.\n`,
+    );
+    return;
+  }
+
+  throw new Error(
+    `Refusing to seed the non-local database at "${host}". This script inserts users with a known password. Pass --allowRemoteDatabase if you are certain.`,
+  );
+};
+
+const resolveProgramId = async (targetProgramId: string | null) => {
+  if (targetProgramId) {
+    return targetProgramId;
+  }
+
+  const programs = await prisma.program.findMany({
+    take: 2,
+    select: { id: true, name: true },
+  });
+
+  if (programs.length > 1) {
+    throw new Error(
+      `Multiple programs found. Pass --programId=<id> to choose one (for example, ${programs[0].id} for "${programs[0].name}").`,
+    );
+  }
+
+  return programs[0]?.id ?? null;
+};
+
+const generatePartnerChunk = ({
+  start,
+  end,
+  seedFingerprint,
+  passwordHash,
+  runStartedAt,
+  programId,
+  programDomain,
+  workspaceId,
+  groupIds,
+  tagIds,
+}: GeneratePartnerChunkOptions): PartnerChunk => {
+  const users: Prisma.UserCreateManyInput[] = [];
+  const partners: Prisma.PartnerCreateManyInput[] = [];
+  const partnerUsers: Prisma.PartnerUserCreateManyInput[] = [];
+  const enrollments: Prisma.ProgramEnrollmentCreateManyInput[] = [];
+  const platforms: Prisma.PartnerPlatformCreateManyInput[] = [];
+  const links: Prisma.LinkCreateManyInput[] = [];
+  const programPartnerTags: Prisma.ProgramPartnerTagCreateManyInput[] = [];
+
+  // Pick from a pool by hashing rather than `index % pool.length`. The benchmark
+  // samples every Nth partner, so a stride sharing a factor with the pool size
+  // lands the whole sample on one entry: at 100K partners sampled 100 ways the
+  // stride is 1,000, and `index % 10` gave every sampled partner the same email
+  // domain. Hashing decorrelates the choice from the index and stays
+  // deterministic, so the same --seed still regenerates the same partners.
+  const pick = <T>(pool: T[], field: string, index: number): T =>
+    pool[hashToUint32(`${seedFingerprint}:${field}:${index}`) % pool.length];
+
+  for (let i = start; i < end; i++) {
+    const partnerId = createId({ prefix: "pn_" });
+    const userId = createId({ prefix: "user_" });
+    const enrollmentId = createId({ prefix: "pge_" });
+
+    const firstName = pick(FIRST_NAMES, "firstName", i);
+    const lastName = pick(LAST_NAMES, "lastName", i);
+    const name = `${firstName} ${lastName}`;
+
+    // Recognizable needles for manual search testing. The moduli are primes so
+    // they cannot line up with a benchmark stride and swallow the whole sample.
+    let emailPrefix: string;
+    if (i % 101 === 0) {
+      emailPrefix = `partner.${seedFingerprint}.${i}`;
+    } else if (i % 137 === 0) {
+      emailPrefix = `substringneedle.${seedFingerprint}.${i}`;
+    } else if (i % 79 === 0) {
+      emailPrefix = `tech.creator.${seedFingerprint}.${i}`;
+    } else if (i % 53 === 0) {
+      emailPrefix = `dub.affiliate.${seedFingerprint}.${i}`;
+    } else {
+      emailPrefix = `${firstName.toLowerCase()}.${lastName.toLowerCase()}.${seedFingerprint}.${i}`;
+    }
+
+    const domain = pick(DOMAINS, "domain", i);
+    const email = `${emailPrefix}@${domain}`;
+    const username = `${firstName.toLowerCase()}_${lastName.toLowerCase()}_${seedFingerprint}_${i}`;
+    const companyName = `${pick(COMPANY_PREFIXES, "companyPrefix", i)} ${pick(COMPANY_SUFFIXES, "companySuffix", i)}`;
+    const country = pick(COUNTRIES, "country", i);
+    const description = pick(DESCRIPTION_TEMPLATES, "description", i).replace(
+      "%s",
+      pick(DESCRIPTION_SPECIALTIES, "specialty", i),
+    );
+    // One minute earlier per partner, wrapping at a year (index 525,600).
+    const createdAt = new Date(
+      runStartedAt.getTime() - ((i * 60_000) % (365 * 86_400_000)),
+    );
+
+    users.push({
+      id: userId,
+      name,
+      email,
+      emailVerified: runStartedAt,
+      passwordHash,
+      defaultPartnerId: partnerId,
+      createdAt,
+    });
+
+    partners.push({
+      id: partnerId,
+      name,
+      username,
+      email,
+      description,
+      country,
+      companyName,
+      networkStatus: "approved",
+      createdAt,
+    });
+
+    partnerUsers.push({
+      userId,
+      partnerId,
+      role: "owner",
+      createdAt,
+    });
+
+    enrollments.push({
+      id: enrollmentId,
+      partnerId,
+      programId,
+      groupId: pick(groupIds, "groupId", i),
+      status: pick(STATUS_WEIGHTS, "status", i),
+      ...generatePartnerMetrics(i),
+      createdAt,
+    });
+
+    // 0-3 tags per partner, so the array filter has partners to include and
+    // partners to exclude rather than everything matching.
+    const tagCount = hashToUint32(`${seedFingerprint}:tagCount:${i}`) % 4;
+    const firstTag = hashToUint32(`${seedFingerprint}:tag:${i}`);
+    for (let t = 0; t < tagCount; t++) {
+      programPartnerTags.push({
+        programId,
+        partnerId,
+        partnerTagId: tagIds[(firstTag + t) % tagIds.length],
+      });
+    }
+
+    // Offsetting a hashed start keeps each partner's platform types distinct,
+    // which PartnerPlatform requires per partner.
+    const platformCount =
+      1 + (hashToUint32(`${seedFingerprint}:platformCount:${i}`) % 3);
+    const firstPlatform = hashToUint32(`${seedFingerprint}:platform:${i}`);
+    for (let p = 0; p < platformCount; p++) {
+      const platformType =
+        PLATFORM_TYPES[(firstPlatform + p) % PLATFORM_TYPES.length];
+      const identifier =
+        platformType === PlatformType.website
+          ? `https://www.${companyName.toLowerCase().replace(/[^a-z0-9]/g, "")}-${i}.${domain}`
+          : `@${firstName.toLowerCase()}_${lastName.toLowerCase()}_${i}`;
+
+      platforms.push({
+        partnerId,
+        type: platformType,
+        identifier,
+        subscribers: BigInt(100 + ((i * 37) % 50000)),
+        views: BigInt(500 + ((i * 123) % 500000)),
+        verifiedAt: createdAt,
+        createdAt,
+      });
+    }
+
+    const linkKey = `p-${seedFingerprint}-${i}`;
+    const linkDomain = programDomain || "dub.sh";
+    links.push({
+      id: createId({ prefix: "link_" }),
+      domain: linkDomain,
+      key: linkKey,
+      url: `https://${domain}/ref/${username}`,
+      shortLink: `https://${linkDomain}/${linkKey}`,
+      projectId: workspaceId,
+      programId,
+      partnerId,
+      createdAt,
+    });
+  }
+
+  return {
+    users,
+    partners,
+    partnerUsers,
+    enrollments,
+    platforms,
+    links,
+    programPartnerTags,
+  };
+};
+
+const insertPartnerChunk = async ({
+  users,
+  partners,
+  partnerUsers,
+  enrollments,
+  platforms,
+  links,
+  programPartnerTags,
+}: PartnerChunk) => {
+  // Keep every chunk atomic so a failed write cannot leave partial relations.
+  const [, partnerResult] = await prisma.$transaction([
+    prisma.user.createMany({ data: users }),
+    prisma.partner.createMany({ data: partners }),
+    prisma.partnerUser.createMany({ data: partnerUsers }),
+    prisma.programEnrollment.createMany({ data: enrollments }),
+    prisma.partnerPlatform.createMany({ data: platforms }),
+    prisma.link.createMany({ data: links }),
+    prisma.programPartnerTag.createMany({ data: programPartnerTags }),
+  ]);
+
+  return partnerResult.count;
+};
+
+// Generation is deterministic given (programId, seed), so index 0's link key is
+// always the same. Keyed on the link key rather than the email because the key
+// is built from the fingerprint and index alone, so editing the name or domain
+// pools changes index 0's email, which would let this miss an applied seed and
+// surface a raw constraint error partway through instead.
+const assertSeedNotAlreadyApplied = async (
+  partnerChunk: PartnerChunk,
+  seed: string,
+) => {
+  const firstLink = partnerChunk.links[0];
+
+  if (!firstLink) {
+    return;
+  }
+
+  const existing = await prisma.link.findUnique({
+    where: {
+      domain_key: { domain: firstLink.domain, key: firstLink.key },
+    },
+    select: { id: true },
+  });
+
+  if (existing) {
+    throw new Error(
+      `Seed "${seed}" has already been applied to this program (found ${firstLink.domain}/${firstLink.key}). Re-running would collide on unique emails, usernames, and link keys. Pass a different --seed to add another batch.`,
+    );
+  }
+};
+
+async function main() {
+  const { totalCount, targetProgramId, seed, allowRemoteDatabase } =
+    parseArguments(process.argv.slice(2));
+
+  assertSeedableDatabase(allowRemoteDatabase);
+
+  const resolvedProgramId = await resolveProgramId(targetProgramId);
+
+  console.log(
+    `\n🚀 Starting Partner Data Seed (Target Count: ${totalCount.toLocaleString()}, Seed: "${seed}")...`,
+  );
+
+  const program = resolvedProgramId
+    ? await prisma.program.findUnique({ where: { id: resolvedProgramId } })
+    : null;
+
+  if (!program) {
+    throw new Error(
+      "❌ No program found in database. Please run 'pnpm run script dev/seed' first to set up the default workspace and program.",
+    );
+  }
+
+  const workspace = await prisma.project.findUnique({
+    where: { id: program.workspaceId },
+  });
+
+  if (!workspace) {
+    throw new Error("❌ Program workspace not found.");
+  }
+
+  console.log(
+    `📍 Seeding partners for Program: "${program.name}" (${program.id})`,
+  );
+  console.log(`   Workspace: "${workspace.name}" (${workspace.id})\n`);
+
+  // Build the stable namespace shared by every generated chunk.
+  // Pre-compute the password hash for 'password' once to avoid computing
+  // a separate bcrypt hash for every generated partner.
+  const passwordHash = await hashPassword("password");
+  const seedNamespace = `${program.id}:${seed}`;
+  const seedFingerprint = createHash("sha256")
+    .update(seedNamespace)
+    .digest("hex")
+    .slice(0, 16);
+  const runStartedAt = new Date();
+
+  // Tags and groups are created once per run and reused, so filters have a
+  // small stable set of values to select on rather than one value per partner.
+  const tagIds = TAG_NAMES.map((_, index) => createId({ prefix: "ptag_" }));
+  const seededGroupIds = SEEDED_GROUP_NAMES.map(() =>
+    createId({ prefix: "grp_" }),
+  );
+
+  // The program's own default group, the seeded ones, and null, so "no group"
+  // is represented too, which is what a negated filter has to include.
+  const groupIds: (string | null)[] = [
+    program.defaultGroupId,
+    ...seededGroupIds,
+    null,
+  ];
+
+  // The duplicate-seed check runs before anything is written; running it
+  // after the tag and group writes would leave their rows behind on a rerun.
+  await assertSeedNotAlreadyApplied(
+    generatePartnerChunk({
+      start: 0,
+      end: Math.min(CHUNK_SIZE, totalCount),
+      seedFingerprint,
+      passwordHash,
+      runStartedAt,
+      programId: program.id,
+      programDomain: program.domain,
+      workspaceId: workspace.id,
+      groupIds,
+      tagIds,
+    }),
+    seed,
+  );
+
+  await prisma.partnerTag.createMany({
+    data: TAG_NAMES.map((name, index) => ({
+      id: tagIds[index],
+      programId: program.id,
+      name: `${name} ${seed}`,
+    })),
+  });
+
+  await prisma.partnerGroup.createMany({
+    data: SEEDED_GROUP_NAMES.map((name, index) => ({
+      id: seededGroupIds[index],
+      programId: program.id,
+      name: `${name} ${seed}`,
+      slug: `${name.toLowerCase()}-${seedFingerprint.slice(0, 6)}`,
+    })),
+  });
+
+  console.log(
+    `Created ${tagIds.length} tags and ${seededGroupIds.length} groups for filtering\n`,
+  );
+
+  const totalChunks = Math.ceil(totalCount / CHUNK_SIZE);
+  const startTime = Date.now();
+  let insertedPartners = 0;
+
+  for (let chunk = 0; chunk < totalChunks; chunk++) {
+    const chunkStart = chunk * CHUNK_SIZE;
+    const chunkEnd = Math.min(chunkStart + CHUNK_SIZE, totalCount);
+    const partnerChunk = generatePartnerChunk({
+      start: chunkStart,
+      end: chunkEnd,
+      seedFingerprint,
+      passwordHash,
+      runStartedAt,
+      programId: program.id,
+      programDomain: program.domain,
+      workspaceId: workspace.id,
+      groupIds,
+      tagIds,
+    });
+
+    const insertedInChunk = await insertPartnerChunk(partnerChunk);
+    insertedPartners += insertedInChunk;
+
+    const elapsedSec = ((Date.now() - startTime) / 1000).toFixed(1);
+    const progressPct = (((chunk + 1) / totalChunks) * 100).toFixed(0);
+    console.log(
+      `  [Chunk ${chunk + 1}/${totalChunks}] (${progressPct}%) Processed ${chunkEnd.toLocaleString()}/${totalCount.toLocaleString()} partners (${insertedInChunk.toLocaleString()} new)... (${elapsedSec}s elapsed)`,
+    );
+  }
+
+  const totalTimeSec = ((Date.now() - startTime) / 1000).toFixed(1);
+  console.log(
+    `\n✅ Seed complete: ${insertedPartners.toLocaleString()} partners inserted (${totalTimeSec}s).`,
+  );
+}
+
+main()
+  .catch((e) => {
+    console.error("❌ Error running partner seed script:", e);
+    process.exitCode = 1;
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });
diff --git a/apps/web/scripts/dev/seed.ts b/apps/web/scripts/dev/seed.ts
index 4683c622ba5..9da1884d562 100644
--- a/apps/web/scripts/dev/seed.ts
+++ b/apps/web/scripts/dev/seed.ts
@@ -3,6 +3,7 @@ import { hashPassword } from "@/lib/auth/password";
 import { prisma } from "@/lib/prisma";
 import {
   Domain,
+  EmailDomain,
   Folder,
   Integration,
   Partner,
@@ -18,7 +19,7 @@ import {
 import "dotenv-flow/config";
 import fs from "fs";
 import path from "path";
-import readline from "readline";
+import { assertLocalDatabaseEnv } from "../../playwright/assert-local-database";
 
 type Workspace = Pick<
   Project,
@@ -48,12 +49,15 @@ type Workspace = Pick<
 
 type DomainSeed = Pick<Domain, "id" | "slug" | "verified">;
 
+type EmailDomainSeed = Pick<EmailDomain, "id" | "slug" | "status">;
+
 type FolderSeed = Pick<Folder, "id" | "name" | "description" | "accessLevel">;
 
 type RewardSeed = Pick<
   Reward,
   | "id"
   | "programId"
+  | "groupId"
   | "event"
   | "type"
   | "amountInCents"
@@ -118,6 +122,7 @@ type SeedData = {
   workspace: Workspace;
   users: WorkspaceUser[];
   domains: DomainSeed[];
+  emailDomains: EmailDomainSeed[];
   folders: FolderSeed[];
   rewards: RewardSeed[];
   groups: GroupSeed[];
@@ -225,6 +230,33 @@ const createDomains = async (data: SeedData) => {
   console.log(`Created ${count} domains`);
 };
 
+// Create email domains
+const createEmailDomains = async (data: SeedData) => {
+  const { emailDomains, workspace, program } = data;
+
+  if (!emailDomains || emailDomains.length === 0) {
+    console.log("No email domains to insert");
+    return;
+  }
+
+  if (!program) {
+    console.log("Program is required to create email domains");
+    return;
+  }
+
+  const { count } = await prisma.emailDomain.createMany({
+    data: emailDomains.map((emailDomain) => ({
+      id: emailDomain.id,
+      slug: emailDomain.slug,
+      status: emailDomain.status,
+      workspaceId: workspace.id,
+      programId: program.id,
+    })),
+  });
+
+  console.log(`Created ${count} email domains`);
+};
+
 // Create folders
 const createFolders = async (data: SeedData) => {
   const { folders, workspace } = data;
@@ -265,6 +297,7 @@ const createRewards = async (data: SeedData) => {
     data: rewards.map((reward) => ({
       id: reward.id,
       programId: program.id,
+      groupId: reward.groupId ?? null,
       event: reward.event,
       type: reward.type,
       amountInCents: reward.amountInCents,
@@ -566,44 +599,14 @@ const truncate = async () => {
   console.log("Database truncated successfully");
 };
 
-// Ask for confirmation - requires typing "YES DELETE DATA"
-const askConfirmation = (question: string): Promise<boolean> => {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  return new Promise((resolve) => {
-    rl.question(
-      `${question}\nType "YES DELETE DATA" to confirm: `,
-      (answer) => {
-        rl.close();
-        resolve(answer === "YES DELETE DATA");
-      },
-    );
-  });
-};
-
 async function main() {
+  assertLocalDatabaseEnv();
+
   // Check for --truncate flag
   // process.argv[0] = node, process.argv[1] = script path, process.argv[2+] = arguments
   const shouldTruncate = process.argv.slice(2).includes("--truncate");
 
   if (shouldTruncate) {
-    console.log(
-      "\n⚠️  WARNING: This will delete ALL data from the database.\n",
-    );
-    console.log("⚠️  Make sure you are NOT on production database!\n");
-    const confirmed = await askConfirmation(
-      "Are you sure you want to delete ALL data from the database?",
-    );
-
-    if (!confirmed) {
-      console.log("\nTruncate canceled. Exiting...");
-      process.exit(0);
-    }
-
-    console.log("\n");
     await truncate();
     console.log("\n");
   }
@@ -615,6 +618,7 @@ async function main() {
   await createDomains(data);
   await createFolders(data);
   await createProgram(data);
+  await createEmailDomains(data);
   await createRewards(data);
   await createGroups(data);
   await createPartners(data);
diff --git a/apps/web/scripts/dev/simulate-shopify-conversion.ts b/apps/web/scripts/dev/simulate-shopify-conversion.ts
new file mode 100644
index 00000000000..420cb4194b9
--- /dev/null
+++ b/apps/web/scripts/dev/simulate-shopify-conversion.ts
@@ -0,0 +1,134 @@
+import "dotenv-flow/config";
+
+import { nanoid, sleep } from "@dub/utils";
+import { createHmac } from "crypto";
+
+async function main() {
+  const clickId = "RZjkGhi04FGxWjcK";
+  const checkoutToken = nanoid(10);
+  const storeId = "store.dub.co";
+  const existingCustomerId = null;
+  const discountCode = null;
+
+  await trackPixel({
+    clickId,
+    checkoutToken,
+  });
+
+  await sleep(4000);
+
+  await trackOrderPaid({
+    checkoutToken,
+    storeId,
+    existingCustomerId,
+    discountCode,
+  });
+}
+
+async function trackPixel({
+  clickId,
+  checkoutToken,
+}: {
+  clickId: string;
+  checkoutToken: string;
+}) {
+  const response = await fetch("http://localhost:8888/api/shopify/pixel", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      clickId,
+      checkoutToken,
+    }),
+  });
+
+  const data = await response.json();
+
+  console.log("trackPixel", data);
+}
+
+async function trackOrderPaid({
+  checkoutToken,
+  storeId,
+  existingCustomerId,
+  discountCode,
+}: {
+  checkoutToken: string;
+  storeId: string;
+  existingCustomerId?: string | null;
+  discountCode?: string | null;
+}) {
+  const payload = shopifyOrderPayload({
+    checkoutToken,
+    ...(existingCustomerId && {
+      customer: { id: existingCustomerId },
+    }),
+    ...(discountCode && {
+      discount_codes: [{ code: discountCode }],
+    }),
+  });
+
+  const body = JSON.stringify(payload);
+  const signature = shopifyWebhookSignature(body);
+
+  const response = await fetch(
+    "http://localhost:8888/api/shopify/integration/webhook",
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "x-shopify-topic": "orders/paid",
+        "x-shopify-shop-domain": storeId,
+        ...(signature && { "x-shopify-hmac-sha256": signature }),
+      },
+      body,
+    },
+  );
+
+  const data = await response.text();
+
+  console.log("trackOrderPaid", data);
+}
+
+function shopifyWebhookSignature(body: string) {
+  const secret = process.env.SHOPIFY_WEBHOOK_SECRET;
+
+  if (!secret) {
+    return undefined;
+  }
+
+  return createHmac("sha256", secret).update(body, "utf8").digest("base64");
+}
+
+function shopifyOrderPayload({
+  checkoutToken,
+  ...overrides
+}: {
+  checkoutToken: string;
+} & Record<string, unknown>) {
+  return {
+    confirmation_number: nanoid(10),
+    checkout_token: checkoutToken,
+    customer: {
+      id: nanoid(10),
+      first_name: "John",
+      last_name: "Doe",
+      email: `john.doe.${nanoid(5)}@example.com`,
+    },
+    current_subtotal_price_set: {
+      shop_money: {
+        amount: "72",
+        currency_code: "USD",
+      },
+    },
+    discount_codes: [],
+    billing_address: {
+      province: "California",
+      country_code: "US",
+    },
+    ...overrides,
+  };
+}
+
+main();
diff --git a/apps/web/scripts/dev/simulate-shopify-webhook.ts b/apps/web/scripts/dev/simulate-shopify-webhook.ts
deleted file mode 100644
index 85d233beb3a..00000000000
--- a/apps/web/scripts/dev/simulate-shopify-webhook.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import "dotenv-flow/config";
-
-import { orderSchema } from "@/lib/integrations/shopify/schema";
-import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
-
-async function main() {
-  const event = orderSchema.parse({
-    confirmation_number: "WDQ0YHYU32",
-    checkout_token: "20585787a5a40274b6b34511d2f637e92",
-    customer: {
-      id: 97773681707702,
-      first_name: "John",
-      last_name: "Doe",
-      email: "customer+2@dub-internal-test.com",
-    },
-    current_subtotal_price_set: {
-      shop_money: {
-        amount: "22.50",
-        currency_code: "USD",
-      },
-    },
-    discount_codes: [
-      {
-        code: "D1",
-      },
-    ],
-    billing_address: {
-      province: "California",
-      country_code: "US",
-    },
-  });
-
-  const response = await fetch(
-    `${APP_DOMAIN_WITH_NGROK}/api/shopify/integration/webhook`,
-    {
-      method: "POST",
-      body: JSON.stringify(event),
-      headers: {
-        "x-shopify-topic": "orders/paid",
-        "x-shopify-shop-domain": "dub-conversions.myshopify.com",
-      },
-    },
-  );
-
-  console.log(response.ok);
-}
-
-main();
diff --git a/apps/web/scripts/dub-partner-rewind.ts b/apps/web/scripts/dub-partner-rewind.ts
index defb4af0bd7..e2391a213f0 100644
--- a/apps/web/scripts/dub-partner-rewind.ts
+++ b/apps/web/scripts/dub-partner-rewind.ts
@@ -1,4 +1,4 @@
-import { EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
+import { PARTNER_NETWORK_EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
 import { prisma } from "@/lib/prisma";
 import { chunk, toCentsNumber } from "@dub/utils";
 import "dotenv-flow/config";
@@ -10,7 +10,7 @@ async function main() {
     by: ["partnerId"],
     where: {
       programId: {
-        notIn: EXCLUDED_PROGRAM_IDS,
+        notIn: PARTNER_NETWORK_EXCLUDED_PROGRAM_IDS,
       },
       totalCommissions: {
         gte: REWIND_EARNINGS_MINIMUM,
diff --git a/apps/web/scripts/fix-broken-partner-users.ts b/apps/web/scripts/fix-broken-partner-users.ts
index c22e06dc546..80d18b4503d 100644
--- a/apps/web/scripts/fix-broken-partner-users.ts
+++ b/apps/web/scripts/fix-broken-partner-users.ts
@@ -6,7 +6,7 @@ async function main() {
   while (true) {
     const partnerUserIds = await prisma.partnerUser.findMany({
       select: {
-        userId: true,
+        partnerId: true,
       },
       take: 5000,
       skip: batch * 5000,
@@ -14,27 +14,43 @@ async function main() {
     if (partnerUserIds.length === 0) {
       break;
     }
-    const users = await prisma.user.findMany({
+    const partners = await prisma.partner.findMany({
       where: {
         id: {
-          in: partnerUserIds.map((partnerUser) => partnerUser.userId),
+          in: partnerUserIds.map((partnerUser) => partnerUser.partnerId),
         },
       },
     });
-    const usersThatDontExist = partnerUserIds.filter(
-      (partnerUser) => !users.some((user) => user.id === partnerUser.userId),
+    const partnersThatDontExist = partnerUserIds.filter(
+      (partnerUser) =>
+        !partners.some((partner) => partner.id === partnerUser.partnerId),
     );
-    console.log(usersThatDontExist);
+    console.log(partnersThatDontExist);
 
-    if (usersThatDontExist.length > 0) {
+    if (partnersThatDontExist.length > 0) {
       const deletedPartnerUsers = await prisma.partnerUser.deleteMany({
         where: {
-          userId: {
-            in: usersThatDontExist.map((partnerUser) => partnerUser.userId),
+          partnerId: {
+            in: partnersThatDontExist.map(
+              (partnerUser) => partnerUser.partnerId,
+            ),
           },
         },
       });
       console.log(`Deleted ${deletedPartnerUsers.count} partner users`);
+      const updatedUsers = await prisma.user.updateMany({
+        where: {
+          defaultPartnerId: {
+            in: partnersThatDontExist.map(
+              (partnerUser) => partnerUser.partnerId,
+            ),
+          },
+        },
+        data: {
+          defaultPartnerId: null,
+        },
+      });
+      console.log(`Reset defaultPartnerId for ${updatedUsers.count} users`);
     }
     batch++;
   }
diff --git a/apps/web/scripts/migrations/backfill-commission-source.ts b/apps/web/scripts/migrations/backfill-commission-source.ts
new file mode 100644
index 00000000000..a0d3d3ebe9d
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-commission-source.ts
@@ -0,0 +1,53 @@
+import { prisma } from "@/lib/prisma";
+import { CommissionSource } from "@prisma/client";
+import "dotenv-flow/config";
+
+const BATCH_SIZE = 500;
+
+// Backfill Commission.source = user when:
+// - userId is set (manual / dashboard creates), or
+// - the commission is linked from a BountySubmission
+async function main() {
+  let totalUpdated = 0;
+
+  while (true) {
+    const commissions = await prisma.commission.findMany({
+      where: {
+        source: null,
+        userId: {
+          not: null,
+        },
+      },
+      select: {
+        id: true,
+      },
+      take: BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (commissions.length === 0) {
+      break;
+    }
+
+    const { count } = await prisma.commission.updateMany({
+      where: {
+        id: {
+          in: commissions.map(({ id }) => id),
+        },
+        source: null,
+      },
+      data: {
+        source: CommissionSource.user,
+      },
+    });
+
+    totalUpdated += count;
+    console.log(`Updated ${count} commissions (total: ${totalUpdated})`);
+  }
+
+  console.log(`Done. Set source=user on ${totalUpdated} commissions.`);
+}
+
+main();
diff --git a/apps/web/scripts/migrations/backfill-commissions-metadata.ts b/apps/web/scripts/migrations/backfill-commissions-metadata.ts
new file mode 100644
index 00000000000..efcecda97fb
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-commissions-metadata.ts
@@ -0,0 +1,253 @@
+import "dotenv-flow/config";
+
+import { prisma } from "@/lib/prisma";
+import { tb } from "@/lib/tinybird/client";
+import { sleep } from "@dub/utils";
+import { CommissionType, Prisma } from "@prisma/client";
+import * as z from "zod/v4";
+
+/*
+Pipe name: internal_get_events_metadata
+
+Create this once in Tinybird before running:
+
+SELECT event_id, metadata
+FROM dub_lead_events_mv
+WHERE event_id IN {{ Array(eventIds, 'String') }}
+  AND metadata != ''
+UNION ALL
+SELECT event_id, metadata
+FROM dub_sale_events_mv
+WHERE event_id IN {{ Array(eventIds, 'String') }}
+  AND metadata != ''
+*/
+
+const DRY_RUN = true;
+const BATCH_SIZE = 1000;
+const THROTTLE_MS = 1000;
+const LAST_CURSOR_ID: string | null = null; // Paste the last printed cursor id here to resume after a crash.
+const USER_METADATA_MAX_CHARS = 10_000; // Matches metadataSchema in lib/zod/schemas/misc.ts
+
+const getEventsMetadata = tb.buildPipe({
+  pipe: "internal_get_events_metadata",
+  parameters: z.object({
+    eventIds: z.string().array(),
+  }),
+  data: z.object({
+    event_id: z.string(),
+    metadata: z.string(),
+  }),
+});
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+// Tinybird event metadata is not always user-provided. Stripe/Shopify/importers
+// store full internal payloads; Commission.metadata is a public API field.
+// Match nested resource shapes (not just key names) to avoid false positives
+// from coincidental user metadata like { invoice: "in_123" }.
+function looksLikeInternalEventPayload(metadata: Record<string, unknown>) {
+  // Stripe webhook: { invoice } or { checkoutSession } — nested Stripe objects
+  if (
+    isPlainObject(metadata.invoice) ||
+    isPlainObject(metadata.checkoutSession)
+  ) {
+    return true;
+  }
+
+  // Shopify order body
+  if (
+    typeof metadata.checkout_token === "string" &&
+    typeof metadata.confirmation_number === "string" &&
+    isPlainObject(metadata.current_subtotal_price_set)
+  ) {
+    return true;
+  }
+
+  // Skip Rewardful/Tapfiliate/Tolt/PartnerStack fingerprints: oversized dumps
+  // are already dropped by USER_METADATA_MAX_CHARS, and small payloads are
+  // allowed through (avoids rejecting coincidental user keys).
+
+  return false;
+}
+
+function parseUserProvidedMetadata(
+  raw: string,
+): Record<string, unknown> | null {
+  if (raw.length > USER_METADATA_MAX_CHARS) {
+    return null;
+  }
+
+  const parsed: unknown = JSON.parse(raw);
+
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    return null;
+  }
+
+  const metadata = parsed as Record<string, unknown>;
+
+  if (
+    Object.keys(metadata).length === 0 ||
+    looksLikeInternalEventPayload(metadata)
+  ) {
+    return null;
+  }
+
+  return metadata;
+}
+
+async function main() {
+  console.log(
+    `DRY_RUN=${DRY_RUN} BATCH_SIZE=${BATCH_SIZE} THROTTLE_MS=${THROTTLE_MS}`,
+  );
+
+  let startingAfter = LAST_CURSOR_ID ?? undefined;
+  if (startingAfter) {
+    console.log(`Resuming from ${startingAfter}`);
+  }
+
+  let totalScanned = 0;
+  let totalUpdated = 0;
+  let totalSkipped = 0;
+  let totalErrors = 0;
+
+  while (true) {
+    const commissions = await prisma.commission.findMany({
+      where: {
+        type: {
+          in: [CommissionType.lead, CommissionType.sale],
+        },
+        eventId: {
+          not: null,
+        },
+        metadata: {
+          equals: Prisma.DbNull,
+        },
+        ...(startingAfter && {
+          id: {
+            gt: startingAfter,
+          },
+        }),
+      },
+      select: {
+        id: true,
+        eventId: true,
+        type: true,
+      },
+      take: BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (commissions.length === 0) {
+      break;
+    }
+
+    totalScanned += commissions.length;
+
+    const eventIds = commissions
+      .map((c) => c.eventId)
+      .filter((id): id is string => Boolean(id));
+
+    const { data: tbRows } = await getEventsMetadata({
+      eventIds,
+    });
+    const metadataByEventId = new Map(
+      tbRows.map((row) => [row.event_id, row.metadata]),
+    );
+
+    const updates: { id: string; metadata: Record<string, unknown> }[] = [];
+    let batchSkipped = 0;
+    let batchErrors = 0;
+
+    for (const commission of commissions) {
+      const raw = commission.eventId
+        ? metadataByEventId.get(commission.eventId)
+        : undefined;
+
+      if (!raw) {
+        batchSkipped++;
+        continue;
+      }
+
+      try {
+        const metadata = parseUserProvidedMetadata(raw);
+        if (!metadata) {
+          batchSkipped++;
+          continue;
+        }
+
+        updates.push({ id: commission.id, metadata });
+      } catch (error) {
+        batchErrors++;
+        console.error(
+          `Failed to parse metadata for commission ${commission.id} eventId=${commission.eventId}`,
+          error,
+        );
+      }
+    }
+
+    totalSkipped += batchSkipped;
+    totalErrors += batchErrors;
+
+    if (DRY_RUN) {
+      console.table(
+        updates.slice(0, 10).map((u) => {
+          const commission = commissions.find((c) => c.id === u.id)!;
+          return {
+            id: u.id,
+            eventId: commission.eventId,
+            type: commission.type,
+            metadata: u.metadata,
+          };
+        }),
+      );
+      totalUpdated += updates.length;
+      console.log(
+        `Batch: scanned=${commissions.length} would-update=${updates.length} skipped=${batchSkipped} errors=${batchErrors}`,
+      );
+    } else if (updates.length > 0) {
+      const updatedCount = await prisma.$executeRaw`
+        UPDATE Commission
+        SET
+          metadata = CASE id
+            ${Prisma.join(
+              updates.map(
+                (u) =>
+                  Prisma.sql`WHEN ${u.id} THEN ${JSON.stringify(u.metadata)}`,
+              ),
+              " ",
+            )}
+          END
+        WHERE id IN (${Prisma.join(updates.map((u) => u.id))})
+          AND metadata IS NULL
+      `;
+
+      totalUpdated += Number(updatedCount);
+      console.log(
+        `Batch: scanned=${commissions.length} updated=${updatedCount} skipped=${batchSkipped} errors=${batchErrors}`,
+      );
+    } else {
+      console.log(
+        `Batch: scanned=${commissions.length} updated=0 skipped=${batchSkipped} errors=${batchErrors}`,
+      );
+    }
+
+    startingAfter = commissions[commissions.length - 1].id;
+    console.log(`last cursor: ${startingAfter}`);
+
+    if (commissions.length < BATCH_SIZE) {
+      break;
+    }
+
+    await sleep(THROTTLE_MS);
+  }
+
+  console.log(
+    `Finished. scanned=${totalScanned} ${DRY_RUN ? "would-update" : "updated"}=${totalUpdated} skipped=${totalSkipped} errors=${totalErrors}`,
+  );
+}
+
+main();
diff --git a/apps/web/scripts/migrations/backfill-discount-group.ts b/apps/web/scripts/migrations/backfill-discount-group.ts
new file mode 100644
index 00000000000..f6f174665d8
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-discount-group.ts
@@ -0,0 +1,73 @@
+import "dotenv-flow/config";
+
+import { prisma } from "@/lib/prisma";
+
+const BATCH_SIZE = 100;
+
+async function main() {
+  let totalProcessed = 0;
+  let lastId: string | undefined;
+
+  while (true) {
+    const discounts = await prisma.discount.findMany({
+      where: {
+        groupId: null,
+        ...(lastId && {
+          id: {
+            gt: lastId,
+          },
+        }),
+      },
+      select: {
+        id: true,
+        defaultForPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+      },
+      take: BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (discounts.length === 0) {
+      break;
+    }
+
+    lastId = discounts[discounts.length - 1].id;
+
+    await Promise.all(
+      discounts.map((discount) => {
+        const groupId = discount.defaultForPartnerGroup?.id;
+
+        if (!groupId) {
+          console.log(`No group found for discount ${discount.id}`);
+          return;
+        }
+
+        return prisma.discount.update({
+          where: {
+            id: discount.id,
+          },
+          data: {
+            groupId,
+          },
+        });
+      }),
+    );
+
+    totalProcessed += discounts.length;
+
+    console.log(
+      `Backfilled ${discounts.length} discount groupIds (processed=${totalProcessed})`,
+    );
+  }
+
+  console.log(
+    `Done backfilling discount groupIds (processed=${totalProcessed})`,
+  );
+}
+
+main();
diff --git a/apps/web/scripts/migrations/backfill-reward-group.ts b/apps/web/scripts/migrations/backfill-reward-group.ts
new file mode 100644
index 00000000000..9fed9e46b15
--- /dev/null
+++ b/apps/web/scripts/migrations/backfill-reward-group.ts
@@ -0,0 +1,102 @@
+import "dotenv-flow/config";
+
+import { prisma } from "@/lib/prisma";
+import { EventType } from "@prisma/client";
+
+const BATCH_SIZE = 100;
+
+const EVENT_TO_PARTNER_GROUP = {
+  [EventType.click]: "clickPartnerGroup",
+  [EventType.lead]: "leadPartnerGroup",
+  [EventType.sale]: "salePartnerGroup",
+  [EventType.referral]: "referralPartnerGroup",
+  [EventType.custom]: "customPartnerGroup",
+} as const;
+
+async function main() {
+  let totalProcessed = 0;
+  let lastId: string | undefined;
+
+  while (true) {
+    const rewards = await prisma.reward.findMany({
+      where: {
+        groupId: null,
+        ...(lastId && {
+          id: {
+            gt: lastId,
+          },
+        }),
+      },
+      select: {
+        id: true,
+        event: true,
+        clickPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        leadPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        salePartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        referralPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+        customPartnerGroup: {
+          select: {
+            id: true,
+          },
+        },
+      },
+      take: BATCH_SIZE,
+      orderBy: {
+        id: "asc",
+      },
+    });
+
+    if (rewards.length === 0) {
+      break;
+    }
+
+    lastId = rewards[rewards.length - 1].id;
+
+    await Promise.all(
+      rewards.map((reward) => {
+        const groupRelation = EVENT_TO_PARTNER_GROUP[reward.event];
+        const groupId = reward[groupRelation]?.id;
+
+        if (!groupId) {
+          console.log(`No group found for reward ${reward.id}`);
+          return;
+        }
+
+        return prisma.reward.update({
+          where: {
+            id: reward.id,
+          },
+          data: {
+            groupId,
+          },
+        });
+      }),
+    );
+
+    totalProcessed += rewards.length;
+
+    console.log(
+      `Backfilled ${rewards.length} reward groupIds (processed=${totalProcessed})`,
+    );
+  }
+
+  console.log(`Done backfilling reward groupIds (processed=${totalProcessed})`);
+}
+
+main();
diff --git a/apps/web/scripts/migrations/expire-empty-scope-tokens.ts b/apps/web/scripts/migrations/expire-empty-scope-tokens.ts
new file mode 100644
index 00000000000..900229e29d6
--- /dev/null
+++ b/apps/web/scripts/migrations/expire-empty-scope-tokens.ts
@@ -0,0 +1,83 @@
+import "dotenv-flow/config";
+
+import { tokenCache } from "@/lib/auth/token-cache";
+import { prisma } from "@/lib/prisma";
+
+// Expire RestrictedTokens that have null or empty scopes.
+async function main() {
+  const now = new Date();
+
+  const tokens = await prisma.restrictedToken.findMany({
+    where: {
+      // Tokens with no scopes that have either never been used, or not used in the last 30 days
+      AND: [
+        { OR: [{ scopes: null }, { scopes: "" }] },
+        {
+          OR: [
+            { lastUsed: null },
+            {
+              lastUsed: {
+                lt: new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000),
+              },
+            },
+          ],
+        },
+      ],
+    },
+    orderBy: {
+      lastUsed: "asc",
+    },
+    include: {
+      project: {
+        select: {
+          name: true,
+          slug: true,
+          plan: true,
+          trialEndsAt: true,
+        },
+      },
+    },
+  });
+
+  console.table(
+    tokens.map(
+      ({ id, name, projectId, partialKey, lastUsed, scopes, project }) => ({
+        id,
+        name,
+        projectId,
+        workspace: project.name,
+        slug: project.slug,
+        plan: project.plan,
+        partialKey,
+        lastUsed,
+        scopes,
+      }),
+    ),
+  );
+
+  if (tokens.length === 0) {
+    console.log("No tokens to expire");
+    return;
+  }
+
+  const { count } = await prisma.restrictedToken.updateMany({
+    where: {
+      id: {
+        in: tokens.map((token) => token.id),
+      },
+    },
+    data: {
+      expires: now,
+    },
+  });
+
+  console.log(`Expired ${count} tokens`);
+
+  await tokenCache.expireMany({
+    hashedKeys: tokens.map((token) => token.hashedKey),
+  });
+
+  console.log(`Invalidated cache for ${tokens.length} tokens`);
+}
+
+main();
diff --git a/apps/web/scripts/misc/restore-program-enrollments.ts b/apps/web/scripts/misc/restore-program-enrollments.ts
index f3059816156..7a72a839de1 100644
--- a/apps/web/scripts/misc/restore-program-enrollments.ts
+++ b/apps/web/scripts/misc/restore-program-enrollments.ts
@@ -64,7 +64,7 @@ async function main() {
   if (commissionsToRestore.length > 0) {
     const { count: createdCommissionsCount } =
       await prisma.commission.createMany({
-        data: commissionsToRestore,
+        data: commissionsToRestore as never,
         skipDuplicates: true,
       });
     console.log(`Restored ${createdCommissionsCount} commissions`);
diff --git a/apps/web/scripts/partners/backfill-partner-search-args.ts b/apps/web/scripts/partners/backfill-partner-search-args.ts
new file mode 100644
index 00000000000..c57ff8f091b
--- /dev/null
+++ b/apps/web/scripts/partners/backfill-partner-search-args.ts
@@ -0,0 +1,84 @@
+import { parsePositiveInteger } from "@/scripts/utils/parse-cli-number";
+
+export const DEFAULT_BATCH_SIZE = 500;
+export const MAX_BATCH_SIZE = 1_000;
+
+export interface BackfillArguments {
+  programId?: string;
+  all: boolean;
+  batchSize: number;
+  after?: string;
+  afterProgram?: string;
+}
+
+/**
+ * Kept out of the script itself so the guardrails can be tested without the
+ * module executing a backfill on import.
+ */
+export function parseBackfillArguments(args: string[]): BackfillArguments {
+  let programId: string | undefined;
+  let all = false;
+  let batchSize = DEFAULT_BATCH_SIZE;
+  let after: string | undefined;
+  let afterProgram: string | undefined;
+
+  for (const arg of args) {
+    if (arg.startsWith("--programId=")) {
+      programId = arg.slice("--programId=".length);
+    } else if (arg === "--all") {
+      all = true;
+    } else if (arg.startsWith("--batchSize=")) {
+      batchSize = parsePositiveInteger(
+        arg.slice("--batchSize=".length),
+        "--batchSize",
+      );
+    } else if (arg.startsWith("--after=")) {
+      after = arg.slice("--after=".length);
+    } else if (arg.startsWith("--afterProgram=")) {
+      afterProgram = arg.slice("--afterProgram=".length);
+    } else {
+      throw new Error(`Unknown argument: ${arg}`);
+    }
+  }
+
+  // Indexing every program is ~1.6M writes against whichever namespace the
+  // configured key points at, so it has to be asked for rather than defaulted
+  // into by running the script bare.
+  if (!programId && !all) {
+    throw new Error(
+      "Pass --programId=<id> for one program, or --all for every program.",
+    );
+  }
+
+  if (programId && all) {
+    throw new Error("--programId and --all are mutually exclusive.");
+  }
+
+  if (programId === "") {
+    throw new Error("--programId cannot be empty.");
+  }
+
+  if (batchSize > MAX_BATCH_SIZE) {
+    throw new Error(`--batchSize cannot exceed ${MAX_BATCH_SIZE}.`);
+  }
+
+  if (after === "") {
+    throw new Error("--after cannot be empty.");
+  }
+
+  if (afterProgram === "") {
+    throw new Error("--afterProgram cannot be empty.");
+  }
+
+  if (afterProgram && !all) {
+    throw new Error("--afterProgram only applies to --all runs.");
+  }
+
+  // Without the program it belongs to, an enrollment cursor says nothing about
+  // where an --all run stopped.
+  if (all && after && !afterProgram) {
+    throw new Error("--after requires --afterProgram on an --all run.");
+  }
+
+  return { programId, all, batchSize, after, afterProgram };
+}
diff --git a/apps/web/scripts/partners/backfill-partner-search.ts b/apps/web/scripts/partners/backfill-partner-search.ts
new file mode 100644
index 00000000000..ea0f0aea5d8
--- /dev/null
+++ b/apps/web/scripts/partners/backfill-partner-search.ts
@@ -0,0 +1,272 @@
+/**
+ * Indexes partner enrollments into the configured search provider.
+ *
+ * Runs one program or every program. Pages by enrollment ID rather than offset,
+ * so per-batch cost stays flat across a 100K-partner program, and iterates
+ * programs in ID order so a resumed run picks up exactly where it stopped.
+ *
+ * Programs are the outer loop rather than one cursor over the whole table. A
+ * single global cursor would be simpler, but it leaves every program partially
+ * indexed until the entire run finishes, so no program is ever in a state worth
+ * trusting. Per-program means each finished program is genuinely done.
+ *
+ * The backfill only upserts. Documents whose enrollment was deleted are removed
+ * by rebuilding the index wholesale, not incrementally. Delete it and backfill
+ * again.
+ *
+ *   cd apps/web
+ *   pnpm run script partners/backfill-partner-search --programId=prog_123
+ *     [--batchSize=500] [--after=pge_123]
+ *
+ *   pnpm run script partners/backfill-partner-search --all
+ *     [--batchSize=500] [--afterProgram=prog_123 --after=pge_123]
+ *
+ * Requires TURBOPUFFER_API_KEY to be configured.
+ */
+
+import {
+  backfillPartnerSearch,
+  getPartnerSearchProvider,
+  type PartnerSearchBackfillProgress,
+} from "@/lib/api/partners/search";
+import { prisma } from "@/lib/prisma";
+import { parseBackfillArguments } from "@/scripts/partners/backfill-partner-search-args";
+import "dotenv-flow/config";
+
+const PROGRAM_PAGE_SIZE = 1_000;
+
+/**
+ * Every program ID in ID order, paged so a large account does not load them all
+ * in one query. Starts at `afterProgram` inclusive, because that program is the
+ * one a resumed run left partway through.
+ */
+async function* iterateProgramIds(afterProgram?: string) {
+  let cursor = afterProgram;
+  let inclusive = Boolean(afterProgram);
+
+  while (true) {
+    const programs = await prisma.program.findMany({
+      where: cursor ? { id: inclusive ? { gte: cursor } : { gt: cursor } } : {},
+      select: { id: true },
+      orderBy: { id: "asc" },
+      take: PROGRAM_PAGE_SIZE,
+    });
+
+    if (programs.length === 0) {
+      return;
+    }
+
+    for (const { id } of programs) {
+      yield id;
+    }
+
+    cursor = programs[programs.length - 1].id;
+    inclusive = false;
+
+    if (programs.length < PROGRAM_PAGE_SIZE) {
+      return;
+    }
+  }
+}
+
+// Tracks where to resume from, so a failure can print a command that skips
+// everything already indexed rather than starting the run over.
+const resumeState: { programId?: string; after?: string } = {};
+
+function createProgressReporter({
+  programId,
+  totalDocuments,
+  batchSize,
+  label,
+}: {
+  programId: string;
+  totalDocuments: number | null;
+  batchSize: number;
+  label: string;
+}) {
+  const totalChunks =
+    totalDocuments === null
+      ? null
+      : Math.max(1, Math.ceil(totalDocuments / batchSize));
+  const startTime = Date.now();
+  let chunk = 0;
+
+  return ({ processed, lastDocumentId }: PartnerSearchBackfillProgress) => {
+    resumeState.programId = programId;
+    resumeState.after = lastDocumentId;
+    chunk += 1;
+
+    const elapsedSec = ((Date.now() - startTime) / 1000).toFixed(1);
+
+    // `totalDocuments` is a snapshot from before the run, so enrollments
+    // written while it pages can push the final chunk past it, so the percentage
+    // is clamped rather than reporting >100%.
+    const progress =
+      totalDocuments === null
+        ? `chunk ${chunk}`
+        : `chunk ${chunk}/${totalChunks} (${Math.min(
+            100,
+            totalDocuments > 0 ? (processed / totalDocuments) * 100 : 100,
+          ).toFixed(0)}%)`;
+
+    console.log(
+      `${label} ${progress}: ${processed.toLocaleString()} indexed, through ${lastDocumentId} (${elapsedSec}s)`,
+    );
+  };
+}
+
+async function backfillProgram({
+  programId,
+  batchSize,
+  after,
+  label,
+  countDocuments,
+}: {
+  programId: string;
+  batchSize: number;
+  after?: string;
+  label: string;
+  countDocuments: boolean;
+}) {
+  // Skipped on --all runs: a count per program doubles the query count across
+  // thousands of programs to buy a percentage nobody is watching that closely.
+  const totalDocuments = countDocuments
+    ? await prisma.programEnrollment.count({
+        where: {
+          programId,
+          ...(after && { id: { gt: after } }),
+        },
+      })
+    : null;
+
+  if (totalDocuments !== null) {
+    console.log(`${totalDocuments.toLocaleString()} enrollments to index\n`);
+  }
+
+  const { processed } = await backfillPartnerSearch({
+    programId,
+    batchSize,
+    after,
+    onProgress: createProgressReporter({
+      programId,
+      totalDocuments,
+      batchSize,
+      label,
+    }),
+  });
+
+  return processed;
+}
+
+async function main() {
+  const { programId, all, batchSize, after, afterProgram } =
+    parseBackfillArguments(process.argv.slice(2));
+
+  if (!getPartnerSearchProvider()) {
+    throw new Error("TURBOPUFFER_API_KEY is not configured.");
+  }
+
+  const startTime = Date.now();
+
+  if (programId) {
+    resumeState.programId = programId;
+    resumeState.after = after;
+
+    console.log(`Starting partner search backfill for program ${programId}`);
+    console.log(
+      `Batch size: ${batchSize.toLocaleString()}${after ? `, resuming after ${after}` : ""}`,
+    );
+
+    const processed = await backfillProgram({
+      programId,
+      batchSize,
+      after,
+      label: `  [${programId}]`,
+      countDocuments: true,
+    });
+
+    console.log(
+      `\nPartner search backfill complete: ${processed.toLocaleString()} documents indexed.`,
+    );
+
+    return;
+  }
+
+  console.log("Starting partner search backfill for every program");
+  console.log(
+    `Batch size: ${batchSize.toLocaleString()}${
+      afterProgram
+        ? `, resuming at program ${afterProgram}${after ? ` after ${after}` : ""}`
+        : ""
+    }\n`,
+  );
+
+  let programCount = 0;
+  let totalProcessed = 0;
+
+  for await (const currentProgramId of iterateProgramIds(afterProgram)) {
+    programCount += 1;
+
+    // The enrollment cursor belongs to the program the run stopped inside, so
+    // it applies to that one only. Every program after it starts from scratch.
+    const programAfter = currentProgramId === afterProgram ? after : undefined;
+
+    resumeState.programId = currentProgramId;
+    resumeState.after = programAfter;
+
+    const processed = await backfillProgram({
+      programId: currentProgramId,
+      batchSize,
+      after: programAfter,
+      label: `  [${programCount}] ${currentProgramId}`,
+      countDocuments: false,
+    });
+
+    totalProcessed += processed;
+
+    console.log(
+      `[${programCount}] ${currentProgramId}: ${processed.toLocaleString()} indexed (${totalProcessed.toLocaleString()} total)`,
+    );
+  }
+
+  const elapsedMin = ((Date.now() - startTime) / 60_000).toFixed(1);
+  console.log(
+    `\nPartner search backfill complete: ${totalProcessed.toLocaleString()} documents across ${programCount.toLocaleString()} programs in ${elapsedMin} minutes.`,
+  );
+}
+
+main()
+  .catch((error) => {
+    console.error("Partner search backfill failed:", error);
+
+    if (resumeState.programId) {
+      const args = process.argv
+        .slice(2)
+        .filter(
+          (arg) =>
+            !arg.startsWith("--after=") && !arg.startsWith("--afterProgram="),
+        );
+
+      // An --all run needs both halves of the cursor. A single-program run
+      // already names its program, so it only needs the enrollment.
+      const resumeArgs = args.includes("--all")
+        ? [
+            ...args,
+            `--afterProgram=${resumeState.programId}`,
+            ...(resumeState.after ? [`--after=${resumeState.after}`] : []),
+          ]
+        : [
+            ...args,
+            ...(resumeState.after ? [`--after=${resumeState.after}`] : []),
+          ];
+
+      console.error(
+        `Resume with:\n  pnpm run script partners/backfill-partner-search ${resumeArgs.join(" ")}`,
+      );
+    }
+
+    process.exitCode = 1;
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });
diff --git a/apps/web/scripts/partners/delete-partner-search-index.ts b/apps/web/scripts/partners/delete-partner-search-index.ts
new file mode 100644
index 00000000000..711bd02a09e
--- /dev/null
+++ b/apps/web/scripts/partners/delete-partner-search-index.ts
@@ -0,0 +1,64 @@
+/**
+ * Empties a partner search namespace.
+ *
+ * Takes the namespace explicitly rather than reading the one the code writes to,
+ * so retiring an old version after a migration is possible, and requires it
+ * twice, because this is not recoverable without a backfill.
+ *
+ *   cd apps/web
+ *   pnpm run script partners/delete-partner-search-index
+ *     --indexName=partner-search-v2 --confirm=partner-search-v2
+ *
+ * Requires TURBOPUFFER_API_KEY.
+ */
+
+import { deleteTurbopufferPartnerSearchNamespace } from "@/lib/api/partners/search/providers/turbopuffer";
+import "dotenv-flow/config";
+
+interface DeletePartnerSearchIndexArguments {
+  indexName: string;
+}
+
+function parseArguments(args: string[]): DeletePartnerSearchIndexArguments {
+  let indexName: string | undefined;
+  let confirm: string | undefined;
+
+  for (const arg of args) {
+    if (arg.startsWith("--indexName=")) {
+      indexName = arg.slice("--indexName=".length);
+    } else if (arg.startsWith("--confirm=")) {
+      confirm = arg.slice("--confirm=".length);
+    } else {
+      throw new Error(`Unknown argument: ${arg}`);
+    }
+  }
+
+  if (!indexName || !/^[a-zA-Z0-9_-]{1,100}$/.test(indexName)) {
+    throw new Error(
+      "--indexName must contain 1-100 letters, numbers, underscores, or hyphens.",
+    );
+  }
+
+  if (confirm !== indexName) {
+    throw new Error(`Pass --confirm=${indexName} to confirm deletion.`);
+  }
+
+  return { indexName };
+}
+
+async function main() {
+  const { indexName } = parseArguments(process.argv.slice(2));
+
+  if (!process.env.TURBOPUFFER_API_KEY?.trim()) {
+    throw new Error("TURBOPUFFER_API_KEY is not configured.");
+  }
+
+  await deleteTurbopufferPartnerSearchNamespace({ namespaceName: indexName });
+
+  console.log(`Partner search cleanup complete: emptied ${indexName}.`);
+}
+
+main().catch((error) => {
+  console.error("Failed to delete partner search index:", error);
+  process.exitCode = 1;
+});
diff --git a/apps/web/scripts/partners/delete-program.ts b/apps/web/scripts/partners/delete-program.ts
index 4257cdc4e9d..cec7a11efde 100644
--- a/apps/web/scripts/partners/delete-program.ts
+++ b/apps/web/scripts/partners/delete-program.ts
@@ -1,7 +1,7 @@
 import { prisma } from "@/lib/prisma";
 import { R2_URL } from "@dub/utils";
 import "dotenv-flow/config";
-import { workspaceProductCache } from "../../lib/api/workspaces/workspace-product-cache";
+import { bulkDeleteLinks } from "../../lib/api/links";
 import { storage } from "../../lib/storage";
 
 async function main() {
@@ -9,94 +9,88 @@ async function main() {
     where: {
       id: "prog_xxx",
     },
-    include: {
-      workspace: true,
-    },
   });
 
-  await prisma.$transaction(
-    async (tx) => {
-      const deletedCommissions = await tx.commission.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
-      console.log("Deleted commissions", deletedCommissions);
-
-      const deletedPayouts = await tx.payout.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
-      console.log("Deleted payouts", deletedPayouts);
+  const deletedCommissions = await prisma.commission.deleteMany({
+    where: {
+      programId: program.id,
+    },
+  });
+  console.log("Deleted commissions", deletedCommissions);
 
-      const deletedRewards = await tx.reward.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
-      console.log("Deleted rewards", deletedRewards);
+  const deletedPayouts = await prisma.payout.deleteMany({
+    where: {
+      programId: program.id,
+    },
+  });
+  console.log("Deleted payouts", deletedPayouts);
 
-      const deletedDiscounts = await tx.discount.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
+  const deletedRewards = await prisma.reward.deleteMany({
+    where: {
+      programId: program.id,
+    },
+  });
+  console.log("Deleted rewards", deletedRewards);
 
-      console.log("Deleted discounts", deletedDiscounts);
+  const deletedDiscounts = await prisma.discount.deleteMany({
+    where: {
+      programId: program.id,
+    },
+  });
 
-      const deletedPartnerGroups = await tx.partnerGroup.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
-      console.log("Deleted partner groups", deletedPartnerGroups);
+  console.log("Deleted discounts", deletedDiscounts);
 
-      const deletedProgramEnrollments = await tx.programEnrollment.deleteMany({
-        where: {
-          programId: program.id,
-        },
-      });
-      console.log("Deleted program enrollments", deletedProgramEnrollments);
+  const links = await prisma.link.findMany({
+    where: {
+      programId: program.id,
+    },
+  });
+  await bulkDeleteLinks(links);
 
-      const deletedFolder = await tx.folder.delete({
-        where: {
-          id: program.defaultFolderId,
+  while (true) {
+    const customers = await prisma.customer.findMany({
+      where: {
+        programId: program.id,
+      },
+      take: 250,
+    });
+    if (customers.length === 0) break;
+    const deletedCustomers = await prisma.customer.deleteMany({
+      where: {
+        id: {
+          in: customers.map((customer) => customer.id),
         },
-      });
-      console.log("Deleted folder", deletedFolder);
+      },
+    });
+    console.log("Deleted customers", deletedCustomers);
+  }
 
-      const updatedLinks = await tx.link.updateMany({
-        where: {
-          programId: program.id,
-        },
-        data: {
-          programId: null,
-        },
-      });
-      console.log("Updated links", updatedLinks);
+  const deletedPartnerGroups = await prisma.partnerGroup.deleteMany({
+    where: {
+      programId: program.id,
+    },
+  });
+  console.log("Deleted partner groups", deletedPartnerGroups);
 
-      const updatedProject = await tx.project.update({
+  while (true) {
+    const programEnrollments = await prisma.programEnrollment.findMany({
+      where: {
+        programId: program.id,
+      },
+      take: 250,
+    });
+    if (programEnrollments.length === 0) break;
+    const deletedProgramEnrollments = await prisma.programEnrollment.deleteMany(
+      {
         where: {
-          id: program.workspaceId,
-        },
-        data: {
-          defaultProduct: "links",
-          defaultProgramId: null,
+          id: {
+            in: programEnrollments.map((enrollment) => enrollment.id),
+          },
         },
-      });
-      console.log("Updated project", updatedProject);
-    },
-    {
-      maxWait: 10000, // default: 2000
-      timeout: 20000, // default: 5000
-    },
-  );
-
-  await workspaceProductCache.set({
-    slug: program.workspace.slug,
-    product: "links",
-  });
+      },
+    );
+    console.log("Deleted program enrollments", deletedProgramEnrollments);
+  }
 
   if (program.logo) {
     const deletedLogo = await storage.delete({
@@ -105,6 +99,15 @@ async function main() {
 
     console.log("Deleted logo", deletedLogo);
   }
+
+  await prisma.project.update({
+    where: {
+      id: program.workspaceId,
+    },
+    data: {
+      defaultProgramId: null,
+    },
+  });
 }
 
 main();
diff --git a/apps/web/scripts/partners/fix-partner-groups.ts b/apps/web/scripts/partners/fix-partner-groups.ts
index 00e59af1850..c2f4fd4376c 100644
--- a/apps/web/scripts/partners/fix-partner-groups.ts
+++ b/apps/web/scripts/partners/fix-partner-groups.ts
@@ -49,6 +49,7 @@ async function main() {
       leadRewardId: group.leadRewardId,
       saleRewardId: group.saleRewardId,
       referralRewardId: group.referralRewardId,
+      customRewardId: group.customRewardId,
       discountId: group.discountId,
     },
   });
diff --git a/apps/web/scripts/programs/backfill-reuse-commission.ts b/apps/web/scripts/programs/backfill-reuse-commission.ts
index b8473ba5a6d..31610080942 100644
--- a/apps/web/scripts/programs/backfill-reuse-commission.ts
+++ b/apps/web/scripts/programs/backfill-reuse-commission.ts
@@ -17,6 +17,7 @@ import { CreatePartnerCommissionProps } from "@/lib/types";
 import { leadEventSchemaTB } from "@/lib/zod/schemas/leads";
 import { saleEventSchemaTB } from "@/lib/zod/schemas/sales";
 import { nanoid } from "@dub/utils";
+import { CommissionSource } from "@prisma/client";
 import "dotenv-flow/config";
 import * as z from "zod/v4";
 
@@ -128,6 +129,7 @@ async function main() {
         eventId: leadEventData.event_id,
         quantity: 1,
         createdAt: new Date(leadEventData.timestamp + "Z"), // add the "Z" to the timestamp to make it UTC
+        source: CommissionSource.api,
         context: {
           customer: { country: customer.country },
         },
@@ -183,6 +185,7 @@ async function main() {
           currency: saleEventData.currency,
           invoiceId: saleEventData.invoice_id,
           createdAt: new Date(saleEventData.timestamp + "Z"), // add the "Z" to the timestamp to make it UTC
+          source: CommissionSource.api,
           user,
           context: {
             customer: {
diff --git a/apps/web/scripts/reset-sent-mail.ts b/apps/web/scripts/reset-sent-mail.ts
index 3fa89da3be4..57980c484f6 100644
--- a/apps/web/scripts/reset-sent-mail.ts
+++ b/apps/web/scripts/reset-sent-mail.ts
@@ -7,6 +7,7 @@ async function main() {
       where: {
         sentMail: true,
       },
+      take: 1000,
     });
     if (usersToReset.length === 0) {
       console.log("No more users to reset");
diff --git a/apps/web/scripts/restore-banned-workspace.ts b/apps/web/scripts/restore-banned-workspace.ts
new file mode 100644
index 00000000000..0d2064c8d7d
--- /dev/null
+++ b/apps/web/scripts/restore-banned-workspace.ts
@@ -0,0 +1,135 @@
+import { generateRandomString } from "@/lib/api/utils/generate-random-string";
+import { prisma } from "@/lib/prisma";
+import { LEGAL_USER_ID, nanoid } from "@dub/utils";
+import "dotenv-flow/config";
+import { linkCache } from "../lib/api/links/cache";
+
+const WORKSPACE_ID = "ws_xxx";
+const WORKSPACE_NAME = "xxx";
+const WORKSPACE_SLUG = "xxx";
+const USER_ID = "user_xxx";
+
+const LINK_IDS = [];
+
+async function main() {
+  let workspace = await prisma.project.findUnique({
+    where: {
+      id: WORKSPACE_ID,
+    },
+  });
+
+  if (!workspace) {
+    workspace = await prisma.project.create({
+      data: {
+        id: WORKSPACE_ID,
+        name: WORKSPACE_NAME,
+        slug: WORKSPACE_SLUG,
+        billingCycleStart: new Date().getDate(),
+        invoicePrefix: generateRandomString(8),
+        inviteCode: nanoid(24),
+        defaultDomains: {
+          create: {},
+        },
+        users: {
+          create: {
+            userId: LEGAL_USER_ID,
+            role: "owner",
+            notificationPreference: {
+              create: {},
+            },
+          },
+        },
+      },
+    });
+
+    console.log(`Created workspace ${workspace.slug} (${workspace.id})`);
+  } else {
+    console.log(
+      `Workspace already exists: ${workspace.slug} (${workspace.id})`,
+    );
+
+    await prisma.projectUsers.upsert({
+      where: {
+        userId_projectId: {
+          userId: LEGAL_USER_ID,
+          projectId: WORKSPACE_ID,
+        },
+      },
+      create: {
+        userId: LEGAL_USER_ID,
+        projectId: WORKSPACE_ID,
+        role: "owner",
+        notificationPreference: {
+          create: {},
+        },
+      },
+      update: {
+        role: "owner",
+      },
+    });
+
+    console.log(`Added legal user ${LEGAL_USER_ID} as workspace owner`);
+  }
+
+  const links = await prisma.link.findMany({
+    where: {
+      id: {
+        in: LINK_IDS,
+      },
+    },
+    select: {
+      id: true,
+      domain: true,
+      key: true,
+      projectId: true,
+      userId: true,
+    },
+  });
+
+  const missingLinkIds = LINK_IDS.filter(
+    (id) => !links.some((link) => link.id === id),
+  );
+
+  if (missingLinkIds.length > 0) {
+    console.log(`Missing ${missingLinkIds.length} links:`, missingLinkIds);
+  }
+
+  console.table(links);
+
+  if (links.length === 0) {
+    console.log("No links found to restore.");
+    return;
+  }
+
+  const [redisRes, prismaRes] = await Promise.allSettled([
+    linkCache.expireMany(links),
+    prisma.link.updateMany({
+      where: {
+        id: {
+          in: links.map((link) => link.id),
+        },
+      },
+      data: {
+        projectId: WORKSPACE_ID,
+        userId: USER_ID,
+      },
+    }),
+  ]);
+
+  await prisma.project.update({
+    where: {
+      id: WORKSPACE_ID,
+    },
+    data: {
+      totalLinks: links.length,
+    },
+  });
+
+  console.log(
+    `Restored ${links.length} links to ${workspace.slug}`,
+    redisRes,
+    prismaRes,
+  );
+}
+
+main();
diff --git a/apps/web/scripts/send-batch-emails.ts b/apps/web/scripts/send-batch-emails.ts
index 0f8d8b39175..f3c63bfa011 100644
--- a/apps/web/scripts/send-batch-emails.ts
+++ b/apps/web/scripts/send-batch-emails.ts
@@ -1,113 +1,74 @@
-import { EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
 import { prisma } from "@/lib/prisma";
-import DubLaunchWeekDay5 from "@dub/email/templates/broadcasts/launch-week-day-5";
+import DubProductUpdateSummer26 from "@dub/email/templates/broadcasts/dub-product-update-summer26";
 import { chunk } from "@dub/utils";
 import "dotenv-flow/config";
 import { queueBatchEmail } from "../lib/email/queue-batch-email";
 import { generateUnsubscribeToken } from "../lib/email/unsubscribe-token";
 
 async function main() {
-  while (true) {
-    const usersWithPartners = await prisma.user.findMany({
-      where: {
-        sentMail: false,
-        defaultPartnerId: {
-          not: null,
-        },
-        partners: {
-          some: {},
-        },
-        notificationPreferences: {
-          partnerAccount: true,
-        },
+  const workspaces = await prisma.project.findMany({
+    where: {
+      defaultProgramId: {
+        not: null,
+      },
+      plan: {
+        in: ["advanced", "enterprise"],
       },
-      take: 5000,
-      include: {
-        partners: {
-          select: {
-            partner: {
-              select: {
-                id: true,
-                programs: {
-                  where: {
-                    programId: {
-                      in: EXCLUDED_PROGRAM_IDS,
-                    },
-                  },
-                },
-              },
+    },
+    include: {
+      users: {
+        where: {
+          user: {
+            email: {
+              not: null,
+            },
+            sentMail: false,
+            notificationPreferences: {
+              dubPartners: true,
             },
           },
         },
-      },
-    });
-    if (usersWithPartners.length === 0) {
-      console.log("No more users to notify");
-      break;
-    }
-
-    const programEnrollmentsByPartner = await prisma.programEnrollment.groupBy({
-      by: ["partnerId"],
-      where: {
-        partnerId: {
-          in: usersWithPartners.map((user) => user.defaultPartnerId!),
+        include: {
+          user: true,
         },
       },
-      _count: {
-        programId: true,
-      },
-    });
-
-    const programEnrollmentCountsByPartnerId =
-      programEnrollmentsByPartner.reduce(
-        (acc, { partnerId, _count }) => {
-          acc[partnerId] = _count.programId;
-          return acc;
-        },
-        {} as Record<string, number>,
-      );
+    },
+  });
 
-    const usersToNotify = usersWithPartners.filter((user) =>
-      user.partners.every(
-        ({ partner }) =>
-          !(
-            partner.programs.length > 0 &&
-            programEnrollmentCountsByPartnerId[partner.id] === 1
-          ),
-      ),
-    );
+  const usersToNotify = workspaces.flatMap((workspace) =>
+    workspace.users.map((user) => user.user),
+  );
 
-    console.log(`Found ${usersToNotify.length} users to notify`);
+  console.log(`Found ${usersToNotify.length} users to notify`);
 
-    const res = await queueBatchEmail<typeof DubLaunchWeekDay5>(
-      usersToNotify.map((user) => ({
-        to: user.email!,
-        variant: "marketing",
-        subject: "Introducing the Dub Network Referral Bonus",
-        templateName: "DubLaunchWeekDay5",
-        templateProps: {
-          email: user.email!,
-          unsubscribeUrl: `https://app.dub.co/unsubscribe/${generateUnsubscribeToken(user.email!)}`,
-        },
-      })),
-    );
+  const res = await queueBatchEmail<typeof DubProductUpdateSummer26>(
+    usersToNotify.map((user) => ({
+      to: user.email!,
+      variant: "marketing",
+      subject: "Dub.co Product Update: Summer 2026",
+      templateName: "DubProductUpdateSummer26",
+      templateProps: {
+        email: user.email!,
+        unsubscribeUrl: `https://app.dub.co/unsubscribe/${generateUnsubscribeToken(user.email!)}`,
+      },
+    })),
+  );
 
-    console.log(res);
+  console.log(res);
 
-    const chunkedUsersWithPartners = chunk(usersWithPartners, 1000);
-    for (const cu of chunkedUsersWithPartners) {
-      const res = await prisma.user.updateMany({
-        where: {
-          id: {
-            in: cu.map((u) => u.id),
-          },
-        },
-        data: {
-          sentMail: true,
+  const chunkedUsersToNotify = chunk(usersToNotify, 1000);
+  for (const cu of chunkedUsersToNotify) {
+    const res = await prisma.user.updateMany({
+      where: {
+        id: {
+          in: cu.map((u) => u.id),
         },
-      });
-      console.log(`Updated ${res.count} users to sentMail: true`);
-    }
+      },
+      data: {
+        sentMail: true,
+      },
+    });
+    console.log(`Updated ${res.count} users to sentMail: true`);
   }
 }
 
diff --git a/apps/web/scripts/stripe/fix-processed-payouts.ts b/apps/web/scripts/stripe/fix-processed-payouts.ts
deleted file mode 100644
index f8367b7a2ca..00000000000
--- a/apps/web/scripts/stripe/fix-processed-payouts.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { prisma } from "@/lib/prisma";
-import "dotenv-flow/config";
-import { stripeConnectClient } from "./connect-client";
-
-async function main() {
-  const partnersWithProcessingPayouts = await prisma.partner.findMany({
-    where: {
-      payouts: {
-        some: {
-          status: "processing",
-          stripeTransferId: null,
-          invoice: {
-            status: "completed",
-          },
-        },
-      },
-    },
-  });
-
-  console.log(
-    `Found ${partnersWithProcessingPayouts.length} partners with processing payouts`,
-  );
-
-  const results = await Promise.all(
-    partnersWithProcessingPayouts.map(async (partner) => {
-      try {
-        const stripeConnectAccount =
-          await stripeConnectClient.accounts.retrieve(partner.stripeConnectId!);
-        return {
-          partnerId: partner.id,
-          email: partner.email,
-          stripeConnectId: partner.stripeConnectId,
-          payoutsEnabledAt: partner.payoutsEnabledAt,
-          actualPayoutsEnabled: stripeConnectAccount.payouts_enabled,
-          transfersEnabled: stripeConnectAccount.capabilities?.transfers,
-          transfersEnabledStatus: stripeConnectAccount.capabilities?.transfers,
-        };
-      } catch (error) {
-        return null;
-      }
-    }),
-  );
-
-  console.table(results.filter((result) => result !== null));
-}
-
-main();
diff --git a/apps/web/scripts/stripe/fix-processing-payouts.ts b/apps/web/scripts/stripe/fix-processing-payouts.ts
new file mode 100644
index 00000000000..9d353a79c93
--- /dev/null
+++ b/apps/web/scripts/stripe/fix-processing-payouts.ts
@@ -0,0 +1,42 @@
+import { prisma } from "@/lib/prisma";
+import "dotenv-flow/config";
+
+async function main() {
+  const payoutsStuckInProcessing = await prisma.payout.findMany({
+    where: {
+      method: "stablecoin",
+      status: "processing",
+      stripeTransferId: null,
+      invoice: {
+        status: "completed",
+        // paid over 7 days ago
+        paidAt: {
+          lt: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000),
+        },
+      },
+    },
+    include: {
+      partner: true,
+      invoice: true,
+    },
+  });
+
+  console.log(
+    `Found ${payoutsStuckInProcessing.length} payouts stuck in processing`,
+  );
+
+  console.table(
+    payoutsStuckInProcessing.map(({ partner, invoice, ...payout }) => ({
+      partnerId: partner.id,
+      partnerEmail: partner.email,
+      payoutId: payout.id,
+      payoutAmount: payout.amount,
+      paidAt: invoice?.paidAt,
+      stripeChargeId: invoice?.stripeChargeMetadata?.["id"],
+    })),
+  );
+
+  // await markPayoutsAsProcessed(payoutsStuckInProcessing);
+}
+
+main();
diff --git a/apps/web/scripts/utils/parse-cli-number.ts b/apps/web/scripts/utils/parse-cli-number.ts
new file mode 100644
index 00000000000..0cef2f84bec
--- /dev/null
+++ b/apps/web/scripts/utils/parse-cli-number.ts
@@ -0,0 +1,43 @@
+const DIGITS_ONLY = /^\d+$/;
+
+/**
+ * Parses a CLI flag value as an integer of at least `minimum`.
+ *
+ * The digits-only check has to run before `Number()`, which on its own would
+ * silently accept hex (`0x10` → 16), scientific notation (`1e9` → 1000000000),
+ * decimals (`5.0` → 5), signs (`+5` → 5), and surrounding whitespace. A flag
+ * like `--count=1e9` should be a typo the operator hears about, not a billion
+ * rows. `Number.isSafeInteger` then rejects digit strings past 2^53 - 1, which
+ * cannot round-trip.
+ */
+function parseInteger(
+  value: string | undefined,
+  flag: string,
+  minimum: number,
+  expected: string,
+) {
+  const parsed =
+    value !== undefined && DIGITS_ONLY.test(value) ? Number(value) : NaN;
+
+  if (!Number.isSafeInteger(parsed) || parsed < minimum) {
+    throw new Error(
+      `${flag} must be ${expected}, received: ${
+        value === undefined ? "(missing)" : `"${value}"`
+      }`,
+    );
+  }
+
+  return parsed;
+}
+
+export function parsePositiveInteger(value: string | undefined, flag: string) {
+  return parseInteger(value, flag, 1, "a positive integer");
+}
+
+/** For flags where zero is meaningful, such as disabling benchmark warm-up. */
+export function parseNonNegativeInteger(
+  value: string | undefined,
+  flag: string,
+) {
+  return parseInteger(value, flag, 0, "a non-negative integer");
+}
diff --git a/apps/web/tests/analytics/advanced-filter-helpers.test.ts b/apps/web/tests/analytics/advanced-filter-helpers.test.ts
index 90134467c90..ad4b5b5ee00 100644
--- a/apps/web/tests/analytics/advanced-filter-helpers.test.ts
+++ b/apps/web/tests/analytics/advanced-filter-helpers.test.ts
@@ -294,6 +294,23 @@ describe("Advanced Filters - Unit Tests", () => {
       ]);
     });
 
+    test("eventName field", () => {
+      const result = buildAdvancedFilters({
+        eventName: {
+          operator: "IS_ONE_OF",
+          sqlOperator: "IN",
+          values: ["Sign up", "Purchase"],
+        },
+      });
+      expect(result).toEqual([
+        {
+          field: "eventName",
+          operator: "IN",
+          values: ["Sign up", "Purchase"],
+        },
+      ]);
+    });
+
     test("maintains insertion order", () => {
       const result = buildAdvancedFilters({
         device: { operator: "IS", sqlOperator: "IN", values: ["Mobile"] },
diff --git a/apps/web/tests/analytics/export-analytics-to-zip.test.ts b/apps/web/tests/analytics/export-analytics-to-zip.test.ts
index 46e2de96586..71d3bdbd308 100644
--- a/apps/web/tests/analytics/export-analytics-to-zip.test.ts
+++ b/apps/web/tests/analytics/export-analytics-to-zip.test.ts
@@ -96,6 +96,7 @@ describe("export-analytics-to-zip", () => {
           "os",
           "trigger",
           "triggers",
+          "event_names",
           "referers",
           "referer_urls",
           "top_folders",
@@ -144,6 +145,7 @@ describe("export-analytics-to-zip", () => {
           "os",
           "trigger",
           "triggers",
+          "event_names",
           "referers",
           "referer_urls",
           "top_folders",
diff --git a/apps/web/tests/analytics/verify-installation.test.ts b/apps/web/tests/analytics/verify-installation.test.ts
new file mode 100644
index 00000000000..628c902ee8e
--- /dev/null
+++ b/apps/web/tests/analytics/verify-installation.test.ts
@@ -0,0 +1,79 @@
+import { analyzeDubAnalyticsScript } from "@/lib/analytics/verify-installation";
+import { describe, expect, it } from "vitest";
+
+const pageWithScript = (attrs: string) =>
+  `<html><body><script src="https://www.dubcdn.com/analytics/script.js" ${attrs}></script></body></html>`;
+
+describe("analyzeDubAnalyticsScript", () => {
+  it("passes a basic Dub script without a required refer domain", () => {
+    expect(analyzeDubAnalyticsScript(pageWithScript("defer"))).toBe("ok");
+  });
+
+  it("requires data-domains.refer when a program domain is provided", () => {
+    expect(
+      analyzeDubAnalyticsScript(pageWithScript("defer"), {
+        referDomain: "refer.acme.com",
+      }),
+    ).toBe("missing_refer_domain");
+  });
+
+  it("accepts a matching data-domains refer value", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(`defer data-domains='{"refer":"refer.acme.com"}'`),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("ok");
+  });
+
+  it("accepts HTML-encoded data-domains JSON", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(
+          `defer data-domains="{&quot;refer&quot;:&quot;refer.acme.com&quot;}"`,
+        ),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("ok");
+  });
+
+  it("accepts data-domains with additional keys", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(
+          `defer data-domains='{"refer":"refer.acme.com","site":"site.acme.com"}'`,
+        ),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("ok");
+  });
+
+  it("rejects a data-domains refer value that does not match the program domain", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(`defer data-domains='{"refer":"other.link"}'`),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("missing_refer_domain");
+  });
+
+  it("normalizes protocol and casing when comparing refer domains", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(
+          `defer data-domains='{"refer":"https://Refer.Acme.com/"}'`,
+        ),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("ok");
+  });
+
+  it("accepts the legacy data-short-domain attribute", () => {
+    expect(
+      analyzeDubAnalyticsScript(
+        pageWithScript(`defer data-short-domain="refer.acme.com"`),
+        { referDomain: "refer.acme.com" },
+      ),
+    ).toBe("ok");
+  });
+});
diff --git a/apps/web/tests/campaigns/index.test.ts b/apps/web/tests/campaigns/index.test.ts
deleted file mode 100644
index 4fed75034f2..00000000000
--- a/apps/web/tests/campaigns/index.test.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-import { Campaign, CampaignList } from "@/lib/types";
-import { updateCampaignSchema } from "@/lib/zod/schemas/campaigns";
-import { E2E_PARTNER_GROUP } from "tests/utils/resource";
-import { afterAll, describe, expect, test } from "vitest";
-import * as z from "zod/v4";
-import { IntegrationHarness } from "../utils/integration";
-
-const campaign: z.infer<typeof updateCampaignSchema> = {
-  name: "Updated Test Campaign",
-  subject: "Updated Test Subject",
-  triggerConditions: [
-    {
-      attribute: "totalConversions",
-      operator: "gte",
-      value: 50,
-    },
-  ],
-  bodyJson: {
-    type: "doc",
-    content: [
-      {
-        type: "paragraph",
-        content: [
-          {
-            type: "text",
-            text: "Test campaign body",
-          },
-        ],
-      },
-    ],
-  },
-};
-
-const expectedCampaign: Partial<Campaign> = {
-  ...campaign,
-  type: "transactional",
-  status: expect.any(String),
-  preview: null,
-  from: null,
-  scheduledAt: null,
-  groups: [{ id: E2E_PARTNER_GROUP.id }],
-  partnerTags: [],
-  createdAt: expect.any(String),
-  updatedAt: expect.any(String),
-};
-
-describe.sequential("/campaigns/**", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  let campaignId = "";
-  const createdCampaignIds: string[] = [];
-
-  afterAll(async () => {
-    await Promise.all(createdCampaignIds.map((id) => h.deleteCampaign(id)));
-  });
-
-  test("POST /campaigns - create draft campaign", async () => {
-    const { status, data } = await http.post<{ id: string }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    if (data?.id) {
-      campaignId = data.id;
-      createdCampaignIds.push(data.id);
-    }
-
-    expect(status).toEqual(201);
-    expect(data).toMatchObject({
-      id: expect.any(String),
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - update campaign content", async () => {
-    const { status, data: updatedCampaign } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        ...campaign,
-        groupIds: [E2E_PARTNER_GROUP.id],
-      },
-    });
-
-    expect(status).toEqual(200);
-    expect(updatedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "draft",
-    });
-  });
-
-  test("GET /campaigns/[campaignId] - make sure the draft campaign is created", async () => {
-    const { status, data: fetchedCampaign } = await http.get<Campaign>({
-      path: `/campaigns/${campaignId}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(fetchedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "draft",
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - invalid partner tag IDs", async () => {
-    const { status, data } = await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        partnerTagIds: ["invalid-partner-tag-id"],
-      },
-    });
-
-    expect(status).toEqual(400);
-    expect(data).toMatchObject({
-      error: {
-        message: "Invalid partner tag IDs detected: invalid-partner-tag-id",
-        code: "bad_request",
-      },
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - clear partner tags", async () => {
-    const { status, data: updatedCampaign } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        partnerTagIds: null,
-      },
-    });
-
-    expect(status).toEqual(200);
-    expect(updatedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "draft",
-      partnerTags: [],
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - publish campaign", async () => {
-    const { status, data: publishedCampaign } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        status: "active",
-      },
-    });
-
-    expect(status).toEqual(200);
-    expect(publishedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "active",
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - pause campaign", async () => {
-    const { status, data: pausedCampaign } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        status: "paused",
-      },
-    });
-
-    expect(status).toEqual(200);
-    expect(pausedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "paused",
-    });
-  });
-
-  test("PATCH /campaigns/[campaignId] - resume campaign", async () => {
-    const { status, data: resumedCampaign } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        status: "active",
-      },
-    });
-
-    expect(status).toEqual(200);
-    expect(resumedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "active",
-    });
-  });
-
-  test("POST /campaigns/[campaignId]/duplicate - duplicate campaign", async () => {
-    const { status, data } = await http.post<{ id: string }>({
-      path: `/campaigns/${campaignId}/duplicate`,
-    });
-
-    if (data?.id) {
-      createdCampaignIds.push(data.id);
-    }
-
-    expect(status).toEqual(200);
-    expect(data.id).toBeDefined();
-
-    const { data: duplicatedCampaign } = await http.get<Campaign>({
-      path: `/campaigns/${data.id}`,
-    });
-
-    expect(duplicatedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: data.id,
-      name: `${expectedCampaign.name} (copy)`,
-      status: "draft",
-    });
-  });
-
-  test("GET /campaigns - list campaigns", async () => {
-    const { status, data: campaigns } = await http.get<CampaignList[]>({
-      path: "/campaigns",
-    });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(campaigns)).toBe(true);
-    expect(campaigns.length).toBeGreaterThan(0);
-
-    const campaign = campaigns.find((c) => c.id === campaignId);
-
-    expect(campaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-    });
-  });
-
-  test("GET /campaigns/[campaignId] - get single campaign", async () => {
-    const { status, data: fetchedCampaign } = await http.get<Campaign>({
-      path: `/campaigns/${campaignId}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(fetchedCampaign).toStrictEqual({
-      ...expectedCampaign,
-      id: campaignId,
-      status: "active",
-    });
-  });
-
-  test("DELETE /campaigns/[campaignId] - delete campaign", async () => {
-    const { status, data } = await http.delete<{ id: string }>({
-      path: `/campaigns/${campaignId}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(data).toStrictEqual({
-      id: campaignId,
-    });
-  });
-});
diff --git a/apps/web/tests/commissions/build-commission-description.test.ts b/apps/web/tests/commissions/build-commission-description.test.ts
new file mode 100644
index 00000000000..3823e948d26
--- /dev/null
+++ b/apps/web/tests/commissions/build-commission-description.test.ts
@@ -0,0 +1,440 @@
+import { buildCommissionDescription } from "@/lib/commissions/build-commission-description";
+import { RewardConditions, RewardProps } from "@/lib/types";
+import { describe, expect, test } from "vitest";
+
+function saleReward(
+  overrides: Partial<
+    Pick<
+      RewardProps,
+      | "event"
+      | "type"
+      | "amountInCents"
+      | "amountInPercentage"
+      | "maxDuration"
+      | "description"
+      | "spendLimitAmount"
+      | "spendLimitInterval"
+    >
+  > = {},
+): Pick<
+  RewardProps,
+  | "event"
+  | "type"
+  | "amountInCents"
+  | "amountInPercentage"
+  | "maxDuration"
+  | "description"
+  | "spendLimitAmount"
+  | "spendLimitInterval"
+> {
+  return {
+    event: "sale",
+    type: "percentage",
+    amountInCents: null,
+    amountInPercentage: 10,
+    maxDuration: 12,
+    description: null,
+    spendLimitAmount: null,
+    spendLimitInterval: null,
+    ...overrides,
+  };
+}
+
+describe("buildCommissionDescription", () => {
+  test("formats a base percentage sale reward", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward(),
+      }),
+    ).toBe("Earn 10% per sale for 1 year");
+  });
+
+  test("formats a base flat lead reward", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          event: "lead",
+          type: "flat",
+          amountInCents: 2500,
+          amountInPercentage: null,
+          maxDuration: null,
+        }),
+      }),
+    ).toBe("Earn $25 per lead");
+  });
+
+  test("formats a base click reward", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          event: "click",
+          type: "flat",
+          amountInCents: 50,
+          amountInPercentage: null,
+          maxDuration: null,
+        }),
+      }),
+    ).toBe("Earn $0.50 per click");
+  });
+
+  test("formats a first-sale reward", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          type: "flat",
+          amountInCents: 5000,
+          amountInPercentage: null,
+          maxDuration: 0,
+        }),
+      }),
+    ).toBe("Earn $50 for the first sale");
+  });
+
+  test("formats lifetime duration", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ maxDuration: null }),
+      }),
+    ).toBe("Earn 10% per sale for the customer's lifetime");
+  });
+
+  test("formats multi-month and multi-year durations", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ maxDuration: 1 }),
+      }),
+    ).toBe("Earn 10% per sale for 1 month");
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ maxDuration: 6 }),
+      }),
+    ).toBe("Earn 10% per sale for 6 months");
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ maxDuration: 24 }),
+      }),
+    ).toBe("Earn 10% per sale for 2 years");
+  });
+
+  test("ignores editable reward.description", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          description: "Custom marketing copy",
+        }),
+      }),
+    ).toBe("Earn 10% per sale for 1 year");
+  });
+
+  test("never prints an Up to range even when reward had modifiers", () => {
+    const reward = saleReward({
+      amountInPercentage: 10,
+    });
+
+    expect(
+      buildCommissionDescription({
+        reward,
+      }),
+    ).not.toContain("Up to");
+  });
+
+  test("appends matched condition clauses to the applied reward rate", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "flat",
+      amountInCents: 5000,
+      maxDuration: 0,
+      conditions: [
+        {
+          entity: "sale",
+          attribute: "productId",
+          operator: "equals_to",
+          value: "prod_premium",
+          label: "Premium Plan",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        // reward already resolved by determinePartnerReward
+        reward: saleReward({
+          type: "flat",
+          amountInCents: 5000,
+          amountInPercentage: null,
+          maxDuration: 0,
+        }),
+        matchedCondition,
+      }),
+    ).toBe("Earn $50 for the first sale if Sale Product ID is Premium Plan");
+  });
+
+  test("formats country names", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "percentage",
+      amountInPercentage: 20,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 20 }),
+        matchedCondition,
+      }),
+    ).toBe("Earn 20% per sale for 1 year if Customer Country is United States");
+  });
+
+  test("formats product label with is operator", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "percentage",
+      amountInPercentage: 20,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "sale",
+          attribute: "productId",
+          operator: "in",
+          value: ["prod_a", "prod_b"],
+          label: "Premium Plan",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 20 }),
+        matchedCondition,
+      }),
+    ).toBe("Earn 20% per sale for 1 year if Sale Product ID is Premium Plan");
+  });
+
+  test("formats currency attribute values", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "flat",
+      amountInCents: 6000,
+      maxDuration: 0,
+      conditions: [
+        {
+          entity: "sale",
+          attribute: "amount",
+          operator: "greater_than_or_equal",
+          value: 20000,
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          type: "flat",
+          amountInCents: 6000,
+          amountInPercentage: null,
+          maxDuration: 0,
+        }),
+        matchedCondition,
+      }),
+    ).toBe(
+      "Earn $60 for the first sale if Sale Amount is greater than or equal to $200.00",
+    );
+  });
+
+  test("formats metadata attributes", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "percentage",
+      amountInPercentage: 15,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "sale",
+          attribute: "metadata",
+          operator: "equals_to",
+          value: "enterprise",
+          metadataField: "plan",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 15 }),
+        matchedCondition,
+      }),
+    ).toBe('Earn 15% per sale for 1 year if Sale "plan" is enterprise');
+  });
+
+  test("joins AND conditions", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "flat",
+      amountInCents: 5000,
+      maxDuration: null,
+      conditions: [
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+        {
+          entity: "sale",
+          attribute: "productId",
+          operator: "equals_to",
+          value: "prod_premium",
+          label: "Premium Plan",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          type: "flat",
+          amountInCents: 5000,
+          amountInPercentage: null,
+          maxDuration: null,
+        }),
+        matchedCondition,
+      }),
+    ).toBe(
+      "Earn $50 per sale for the customer's lifetime if Customer Country is United States and Sale Product ID is Premium Plan",
+    );
+  });
+
+  test("joins OR conditions", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "OR",
+      type: "percentage",
+      amountInPercentage: 25,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "CA",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 25 }),
+        matchedCondition,
+      }),
+    ).toBe(
+      "Earn 25% per sale for 1 year if Customer Country is United States or Customer Country is Canada",
+    );
+  });
+
+  test("formats in arrays of country codes", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "percentage",
+      amountInPercentage: 20,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "customer",
+          attribute: "country",
+          operator: "in",
+          value: ["US", "CA", "GB"],
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 20 }),
+        matchedCondition,
+      }),
+    ).toBe(
+      "Earn 20% per sale for 1 year if Customer Country is one of United States, Canada, United Kingdom",
+    );
+  });
+
+  test("formats sale type option labels", () => {
+    const matchedCondition: RewardConditions = {
+      operator: "AND",
+      type: "percentage",
+      amountInPercentage: 5,
+      maxDuration: 12,
+      conditions: [
+        {
+          entity: "sale",
+          attribute: "type",
+          operator: "equals_to",
+          value: "recurring",
+        },
+      ],
+    };
+
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 5 }),
+        matchedCondition,
+      }),
+    ).toBe("Earn 5% per sale for 1 year if Sale Type is recurring");
+  });
+
+  test("appends capped-from/to suffix when earnings are capped", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          amountInPercentage: 20,
+          spendLimitAmount: 10000,
+          spendLimitInterval: "month",
+        }),
+        earnings: 15000,
+        cappedEarnings: 10000,
+      }),
+    ).toBe(
+      "Earn 20% per sale for 1 year, capped from $150 to $100 due to $100 per month spend limit",
+    );
+  });
+
+  test("appends capped-from/to without limit label when spend limit fields missing", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({ amountInPercentage: 20 }),
+        earnings: 5000,
+        cappedEarnings: 3000,
+      }),
+    ).toBe(
+      "Earn 20% per sale for 1 year, capped from $50 to $30 due to spend limit",
+    );
+  });
+
+  test("does not append spend limit suffix when earnings are not capped", () => {
+    expect(
+      buildCommissionDescription({
+        reward: saleReward({
+          amountInPercentage: 20,
+          spendLimitAmount: 10000,
+          spendLimitInterval: "month",
+        }),
+        earnings: 5000,
+        cappedEarnings: 5000,
+      }),
+    ).toBe("Earn 20% per sale for 1 year");
+  });
+});
diff --git a/apps/web/tests/commissions/calculate-sale-earnings.test.ts b/apps/web/tests/commissions/calculate-sale-earnings.test.ts
new file mode 100644
index 00000000000..0c9c149afaa
--- /dev/null
+++ b/apps/web/tests/commissions/calculate-sale-earnings.test.ts
@@ -0,0 +1,162 @@
+import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";
+import { describe, expect, test } from "vitest";
+
+describe("calculateSaleEarnings", () => {
+  describe("percentage – same as the old truncate path", () => {
+    test.each([
+      {
+        label: "whole cents: $10 sale at 20%",
+        saleAmount: 1000,
+        percent: 20,
+        expected: 200,
+      },
+      {
+        label: "whole cents: $10 sale at 50%",
+        saleAmount: 1000,
+        percent: 50,
+        expected: 500,
+      },
+      {
+        label: "whole cents: $19 sale at 10%",
+        saleAmount: 1900,
+        percent: 10,
+        expected: 190,
+      },
+      {
+        label: "1.4¢ truncates and rounds to the same value",
+        saleAmount: 7,
+        percent: 20,
+        expected: 1,
+      },
+      {
+        label: "0.4¢ stays 0 (below half a cent)",
+        saleAmount: 2,
+        percent: 20,
+        expected: 0,
+      },
+      {
+        label: "zero sale amount",
+        saleAmount: 0,
+        percent: 20,
+        expected: 0,
+      },
+      {
+        label: "zero percent",
+        saleAmount: 1000,
+        percent: 0,
+        expected: 0,
+      },
+    ])("$label → $expected", ({ saleAmount, percent, expected }) => {
+      expect(
+        calculateSaleEarnings({
+          reward: {
+            type: "percentage",
+            amountInCents: null,
+            amountInPercentage: percent,
+          },
+          sale: { amount: saleAmount, quantity: 1 },
+        }),
+      ).toBe(expected);
+    });
+  });
+
+  describe("percentage – half-up (new vs old truncate)", () => {
+    test.each([
+      {
+        label: "3¢ sale at 20% (ticket: 0.6¢, used to store 0)",
+        saleAmount: 3,
+        percent: 20,
+        expected: 1,
+      },
+      {
+        label: "15¢ sale at 10% (1.5¢, used to store 1)",
+        saleAmount: 15,
+        percent: 10,
+        expected: 2,
+      },
+      {
+        label: "1¢ sale at 50% (0.5¢, used to store 0)",
+        saleAmount: 1,
+        percent: 50,
+        expected: 1,
+      },
+      {
+        label: "500¢ at 2.9% (14.5¢; float 2.9/100 used to round to 14)",
+        saleAmount: 500,
+        percent: 2.9,
+        expected: 15,
+      },
+    ])("$label → $expected", ({ saleAmount, percent, expected }) => {
+      expect(
+        calculateSaleEarnings({
+          reward: {
+            type: "percentage",
+            amountInCents: null,
+            amountInPercentage: percent,
+          },
+          sale: { amount: saleAmount, quantity: 1 },
+        }),
+      ).toBe(expected);
+    });
+  });
+
+  test("percentage ignores quantity (uses sale amount only)", () => {
+    expect(
+      calculateSaleEarnings({
+        reward: {
+          type: "percentage",
+          amountInCents: null,
+          amountInPercentage: 20,
+        },
+        sale: { amount: 1000, quantity: 5 },
+      }),
+    ).toBe(200);
+  });
+
+  describe("flat", () => {
+    test.each([
+      {
+        label: "single sale",
+        amountInCents: 5000,
+        quantity: 1,
+        expected: 5000,
+      },
+      {
+        label: "quantity multiplies the flat amount",
+        amountInCents: 500,
+        quantity: 2,
+        expected: 1000,
+      },
+      {
+        label: "zero quantity",
+        amountInCents: 500,
+        quantity: 0,
+        expected: 0,
+      },
+    ])("$label → $expected", ({ amountInCents, quantity, expected }) => {
+      expect(
+        calculateSaleEarnings({
+          reward: {
+            type: "flat",
+            amountInCents,
+            amountInPercentage: null,
+          },
+          sale: { amount: 1000, quantity },
+        }),
+      ).toBe(expected);
+    });
+  });
+
+  test("returns 0 when reward type is neither flat nor percentage", () => {
+    expect(
+      calculateSaleEarnings({
+        reward: {
+          type: "unknown" as "flat",
+          amountInCents: 500,
+          amountInPercentage: 20,
+        },
+        sale: { amount: 1000, quantity: 1 },
+      }),
+    ).toBe(0);
+  });
+});
diff --git a/apps/web/tests/commissions/create-commission.test.ts b/apps/web/tests/commissions/create-commission.test.ts
deleted file mode 100644
index 04aae324f07..00000000000
--- a/apps/web/tests/commissions/create-commission.test.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { CommissionResponse } from "@/lib/types";
-import { describe, expect, test } from "vitest";
-import { randomCustomer, randomId } from "../utils/helpers";
-import { IntegrationHarness } from "../utils/integration";
-import {
-  E2E_CUSTOMER_ID,
-  E2E_LEAD_REWARD,
-  E2E_PARTNER,
-} from "../utils/resource";
-import { verifyCommission } from "../utils/verify-commission";
-
-const expectedQueuedResponse = {
-  success: true,
-  message: "Your commissions are being created and will appear shortly.",
-};
-
-const validationCases = [
-  {
-    name: "missing type field",
-    body: { partnerId: E2E_PARTNER.id, amount: 500 },
-    expectedStatus: 422,
-    expectedMessage: "invalid_union: type: Invalid input",
-  },
-  {
-    name: "invalid type value",
-    body: { type: "invalid", partnerId: E2E_PARTNER.id },
-    expectedStatus: 422,
-    expectedMessage: "invalid_union: type: Invalid input",
-  },
-  {
-    name: "custom commission with amount 0",
-    body: { type: "custom", partnerId: E2E_PARTNER.id, amount: 0 },
-    expectedStatus: 422,
-    expectedMessage: "too_small: amount: Too small: expected number to be >=1",
-  },
-  {
-    name: "sale commission missing saleAmount",
-    body: {
-      type: "sale",
-      partnerId: E2E_PARTNER.id,
-      customerId: E2E_CUSTOMER_ID,
-      importStripeInvoices: false,
-    },
-    expectedStatus: 422,
-    expectedMessage:
-      "custom: saleAmount: `saleAmount` is required when `importStripeInvoices` is false.",
-  },
-];
-
-validationCases.forEach(({ name, body, expectedStatus, expectedMessage }) => {
-  test(`POST /commissions - validation error: ${name}`, async (ctx) => {
-    const h = new IntegrationHarness(ctx);
-    const { http } = await h.init();
-    const response = await http.post<any>({ path: "/commissions", body });
-    expect(response.status).toEqual(expectedStatus);
-    expect(response.data.error.code).toEqual("unprocessable_entity");
-    expect(response.data.error.message).toEqual(expectedMessage);
-  });
-});
-
-describe.concurrent("POST /commissions", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  test("create custom commission with required fields", async () => {
-    const description = randomId();
-    const { status, data } = await http.post<any>({
-      path: "/commissions",
-      body: {
-        type: "custom",
-        partnerId: E2E_PARTNER.id,
-        amount: 500,
-        description,
-      },
-    });
-
-    expect(status).toEqual(202);
-    expect(data).toStrictEqual(expectedQueuedResponse);
-
-    await verifyCommission({
-      http,
-      description,
-      expectedEarnings: 500,
-      expectedType: "custom",
-      query: {
-        partnerId: E2E_PARTNER.id,
-        type: "custom",
-        sortBy: "createdAt",
-        sortOrder: "desc",
-      },
-    });
-  });
-
-  test("create lead commission", async () => {
-    const customer = randomCustomer();
-
-    const { status, data } = await http.post<any>({
-      path: "/commissions",
-      body: {
-        type: "lead",
-        partnerId: E2E_PARTNER.id,
-        customer: {
-          externalId: customer.externalId,
-          email: customer.email,
-          name: customer.name,
-          country: "US",
-        },
-      },
-    });
-
-    expect(status).toEqual(202);
-    expect(data).toStrictEqual(expectedQueuedResponse);
-
-    await verifyCommission({
-      http,
-      customerExternalId: customer.externalId,
-      expectedEarnings: E2E_LEAD_REWARD.modifiers[1].amountInCents,
-    });
-  });
-
-  test("create sale commission with a new customer", async () => {
-    const invoiceId = `INV_${randomId()}`;
-    const customer = randomCustomer();
-
-    const { status, data } = await http.post<any>({
-      path: "/commissions",
-      body: {
-        type: "sale",
-        partnerId: E2E_PARTNER.id,
-        saleAmount: 1000,
-        invoiceId,
-        customer: {
-          externalId: customer.externalId,
-          email: customer.email,
-          name: customer.name,
-          country: "US",
-        },
-      },
-    });
-
-    expect(status).toEqual(202);
-    expect(data).toStrictEqual(expectedQueuedResponse);
-
-    await verifyCommission({
-      http,
-      invoiceId,
-      expectedSaleAmount: 1000,
-      expectedEarnings: 5000, // Earn $50 per sale for 3 months
-    });
-  });
-
-  test("error when customer is not found", async () => {
-    const { status, data } = await http.post<any>({
-      path: "/commissions",
-      body: {
-        type: "sale",
-        partnerId: E2E_PARTNER.id,
-        customerId: "cus_nonexistent",
-        saleAmount: 1000,
-      },
-    });
-    expect(status).toEqual(404);
-    expect(data.error.code).toEqual("not_found");
-    expect(data.error.message).toContain("not found");
-  });
-
-  test("error when invoiceId already exists", async () => {
-    const { data: existingCommissions } = await http.get<CommissionResponse[]>({
-      path: "/commissions",
-      query: {
-        type: "sale",
-        sortBy: "createdAt",
-        sortOrder: "desc",
-        pageSize: "50",
-      },
-    });
-
-    const commissionWithInvoice = existingCommissions.find(
-      (c) => c.invoiceId != null,
-    );
-
-    expect(commissionWithInvoice).toBeDefined();
-
-    const { status, data } = await http.post<any>({
-      path: "/commissions",
-      body: {
-        type: "sale",
-        partnerId: E2E_PARTNER.id,
-        saleAmount: 1000,
-        invoiceId: commissionWithInvoice!.invoiceId,
-        customerId: E2E_CUSTOMER_ID,
-      },
-    });
-
-    expect(status).toEqual(409);
-    expect(data.error.code).toEqual("conflict");
-    expect(data.error.message).toContain(
-      "There is already a commission for the invoice",
-    );
-  });
-});
diff --git a/apps/web/tests/commissions/index.test.ts b/apps/web/tests/commissions/index.test.ts
index cb6c927b4da..4ec0048f265 100644
--- a/apps/web/tests/commissions/index.test.ts
+++ b/apps/web/tests/commissions/index.test.ts
@@ -16,6 +16,23 @@ const expectedCommission = {
   customer: expect.any(Object),
 };
 
+function expectCommissionResponse(
+  commission: CommissionResponse,
+  overrides: Record<string, unknown> = {},
+) {
+  expect(commission).toMatchObject({
+    ...expectedCommission,
+    ...overrides,
+  });
+  // metadata is nullable but must be present on workspace commission responses
+  expect(commission).toHaveProperty("metadata");
+  expect(
+    commission.metadata === null ||
+      (typeof commission.metadata === "object" &&
+        !Array.isArray(commission.metadata)),
+  ).toBe(true);
+}
+
 describe.sequential("/commissions/**", async () => {
   const h = new IntegrationHarness();
   const { http } = await h.init();
@@ -25,23 +42,41 @@ describe.sequential("/commissions/**", async () => {
   let testPaidCommissionId: string;
 
   test("GET /commissions", async () => {
-    const { status, data: commissions } = await http.get<CommissionResponse[]>({
+    const { status: saleCommissionStatus, data: saleCommissions } =
+      await http.get<CommissionResponse[]>({
+        path: "/commissions",
+        query: {
+          status: "processed",
+          type: "sale",
+          sortBy: "createdAt",
+          sortOrder: "desc",
+        },
+      });
+
+    expect(saleCommissionStatus).toEqual(200);
+    expect(Array.isArray(saleCommissions)).toBe(true);
+    expect(saleCommissions.length).toBeGreaterThan(0);
+    expectCommissionResponse(saleCommissions[0]);
+
+    const { status: leadStatus, data: leadCommissions } = await http.get<
+      CommissionResponse[]
+    >({
       path: "/commissions",
       query: {
         status: "processed",
+        type: "lead",
         sortBy: "createdAt",
         sortOrder: "desc",
       },
     });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(commissions)).toBe(true);
-    expect(commissions.length).toBeGreaterThan(0);
-    expect(commissions[0]).toMatchObject(expectedCommission);
+    expect(leadStatus).toEqual(200);
+    expect(Array.isArray(leadCommissions)).toBe(true);
+    expect(leadCommissions.length).toBeGreaterThan(0);
+    expectCommissionResponse(leadCommissions[0]);
 
     // Store the first sale and lead commission's ID for subsequent tests
-    testCommissionId = commissions.find((c) => c.type === "sale")!.id;
-    testLeadCommissionId = commissions.find((c) => c.type === "lead")!.id;
+    testCommissionId = saleCommissions[0].id;
+    testLeadCommissionId = leadCommissions[0].id;
   });
 
   test("GET /commissions with filters", async () => {
@@ -60,7 +95,7 @@ describe.sequential("/commissions/**", async () => {
     expect(paidStatus).toEqual(200);
     expect(Array.isArray(paidCommissions)).toBe(true);
     expect(paidCommissions.length).toBeGreaterThan(0);
-    expect(paidCommissions[0]).toMatchObject(expectedCommission);
+    expectCommissionResponse(paidCommissions[0]);
     testPaidCommissionId = paidCommissions[0].id;
   });
 
@@ -75,10 +110,7 @@ describe.sequential("/commissions/**", async () => {
     });
 
     expect(status).toEqual(200);
-    expect(commission).toMatchObject({
-      ...expectedCommission,
-      earnings: toUpdate.earnings,
-    });
+    expectCommissionResponse(commission, { earnings: toUpdate.earnings });
   });
 
   test("PATCH /commissions/{id} - update saleAmount", async () => {
@@ -92,10 +124,7 @@ describe.sequential("/commissions/**", async () => {
     });
 
     expect(status).toEqual(200);
-    expect(commission).toMatchObject({
-      ...expectedCommission,
-      amount: toUpdate.saleAmount,
-    });
+    expectCommissionResponse(commission, { amount: toUpdate.saleAmount });
   });
 
   test("PATCH /commissions/{id} - modifySaleAmount", async () => {
@@ -111,6 +140,7 @@ describe.sequential("/commissions/**", async () => {
 
     expect(status).toEqual(200);
     expect(commission.amount).toEqual(6000);
+    expectCommissionResponse(commission, { amount: 6000 });
   });
 
   test("PATCH /commissions/{id} - update amount (backward compatibility)", async () => {
@@ -124,10 +154,7 @@ describe.sequential("/commissions/**", async () => {
     });
 
     expect(status).toEqual(200);
-    expect(commission).toMatchObject({
-      ...expectedCommission,
-      amount: toUpdate.amount,
-    });
+    expectCommissionResponse(commission, { amount: toUpdate.amount });
   });
 
   test("PATCH /commissions/{id} - foreign currency conversion", async () => {
@@ -145,6 +172,7 @@ describe.sequential("/commissions/**", async () => {
     expect(commission.currency).toEqual("usd");
     expect(commission.amount).toBeGreaterThanOrEqual(900); // 900 cents
     expect(commission.amount).toBeLessThanOrEqual(1100); // 1100 cents
+    expectCommissionResponse(commission);
   });
 
   test("PATCH /commissions/{id} - error on lead commission", async () => {
@@ -186,9 +214,6 @@ describe.sequential("/commissions/**", async () => {
     });
 
     expect(status).toEqual(200);
-    expect(commission).toMatchObject({
-      ...expectedCommission,
-      status: toUpdate.status,
-    });
+    expectCommissionResponse(commission, { status: toUpdate.status });
   });
 });
diff --git a/apps/web/tests/commissions/metadata-filters.test.ts b/apps/web/tests/commissions/metadata-filters.test.ts
new file mode 100644
index 00000000000..b48592fff93
--- /dev/null
+++ b/apps/web/tests/commissions/metadata-filters.test.ts
@@ -0,0 +1,308 @@
+import {
+  buildCommissionMetadataWhere,
+  parseCommissionMetadataQuery,
+} from "@/lib/api/commissions/metadata-filters";
+import { DubApiError } from "@/lib/api/errors";
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+
+describe("parseCommissionMetadataQuery", () => {
+  it("returns undefined for absent, empty, or whitespace-only query", () => {
+    expect(parseCommissionMetadataQuery(undefined)).toBeUndefined();
+    expect(parseCommissionMetadataQuery("")).toBeUndefined();
+    expect(parseCommissionMetadataQuery("   ")).toBeUndefined();
+  });
+
+  it("parses = operator", () => {
+    expect(parseCommissionMetadataQuery("metadata['plan']='pro'")).toEqual({
+      logic: "AND",
+      filters: [{ key: "plan", op: "equals", value: "pro" }],
+    });
+  });
+
+  it("parses : as equals", () => {
+    expect(parseCommissionMetadataQuery("metadata['plan']:pro")).toEqual({
+      logic: "AND",
+      filters: [{ key: "plan", op: "equals", value: "pro" }],
+    });
+  });
+
+  it("parses != operator", () => {
+    expect(parseCommissionMetadataQuery("metadata['plan']!='free'")).toEqual({
+      logic: "AND",
+      filters: [{ key: "plan", op: "notEquals", value: "free" }],
+    });
+  });
+
+  it("parses AND connective", () => {
+    expect(
+      parseCommissionMetadataQuery(
+        "metadata['plan']='pro' AND metadata['tier']='gold'",
+      ),
+    ).toEqual({
+      logic: "AND",
+      filters: [
+        { key: "plan", op: "equals", value: "pro" },
+        { key: "tier", op: "equals", value: "gold" },
+      ],
+    });
+  });
+
+  it("parses OR connective (case-insensitive)", () => {
+    expect(
+      parseCommissionMetadataQuery(
+        "metadata['plan']='pro' or metadata['plan']='enterprise'",
+      ),
+    ).toEqual({
+      logic: "OR",
+      filters: [
+        { key: "plan", op: "equals", value: "pro" },
+        { key: "plan", op: "equals", value: "enterprise" },
+      ],
+    });
+  });
+
+  it("keeps and/or inside quoted values as part of a single condition", () => {
+    expect(
+      parseCommissionMetadataQuery("metadata['name']='Smith and Jones'"),
+    ).toEqual({
+      logic: "AND",
+      filters: [{ key: "name", op: "equals", value: "Smith and Jones" }],
+    });
+    expect(parseCommissionMetadataQuery("metadata['label']=\"A or B\"")).toEqual(
+      {
+        logic: "AND",
+        filters: [{ key: "label", op: "equals", value: "A or B" }],
+      },
+    );
+  });
+
+  it("parses AND/OR when a quoted value contains and/or", () => {
+    expect(
+      parseCommissionMetadataQuery(
+        "metadata['name']='Smith and Jones' AND metadata['plan']='pro'",
+      ),
+    ).toEqual({
+      logic: "AND",
+      filters: [
+        { key: "name", op: "equals", value: "Smith and Jones" },
+        { key: "plan", op: "equals", value: "pro" },
+      ],
+    });
+    expect(
+      parseCommissionMetadataQuery(
+        "metadata['label']=\"A or B\" OR metadata['plan']='enterprise'",
+      ),
+    ).toEqual({
+      logic: "OR",
+      filters: [
+        { key: "label", op: "equals", value: "A or B" },
+        { key: "plan", op: "equals", value: "enterprise" },
+      ],
+    });
+  });
+
+  it("rejects nested metadata keys", () => {
+    expect(() =>
+      parseCommissionMetadataQuery("metadata['a']['b']='value'"),
+    ).toThrow(DubApiError);
+    try {
+      parseCommissionMetadataQuery("metadata['a']['b']='value'");
+    } catch (error) {
+      expect(error).toBeInstanceOf(DubApiError);
+      expect((error as DubApiError).code).toBe("unprocessable_entity");
+    }
+  });
+
+  it("rejects dotted metadata keys with a charset message", () => {
+    expect(() =>
+      parseCommissionMetadataQuery("metadata['a.b']='value'"),
+    ).toThrow(DubApiError);
+
+    expect(() =>
+      parseCommissionMetadataQuery("metadata['order-id']='123'"),
+    ).toThrow(
+      "Invalid metadata query. Metadata keys may only contain letters, numbers, and underscores.",
+    );
+  });
+
+  it("rejects mixed AND and OR", () => {
+    expect(() =>
+      parseCommissionMetadataQuery(
+        "metadata['a']='1' AND metadata['b']='2' OR metadata['c']='3'",
+      ),
+    ).toThrow(DubApiError);
+    try {
+      parseCommissionMetadataQuery(
+        "metadata['a']='1' AND metadata['b']='2' OR metadata['c']='3'",
+      );
+    } catch (error) {
+      expect((error as DubApiError).message).toBe(
+        "Metadata query cannot mix AND and OR.",
+      );
+    }
+  });
+
+  it("rejects unsupported comparison operators", () => {
+    for (const query of [
+      "metadata['seats']>5",
+      "metadata['seats']<5",
+      "metadata['seats']>=5",
+      "metadata['seats']<=5",
+    ]) {
+      expect(() => parseCommissionMetadataQuery(query)).toThrow(DubApiError);
+      try {
+        parseCommissionMetadataQuery(query);
+      } catch (error) {
+        expect((error as DubApiError).message).toBe(
+          "Metadata query only supports `=` and `!=` operators.",
+        );
+      }
+    }
+  });
+
+  it("rejects double-equals and dangling connectives", () => {
+    for (const query of [
+      "metadata['plan']=='pro'",
+      "metadata['a']='1' AND",
+      "metadata['a']='1' AND ",
+      "metadata['a']='1' OR",
+      "metadata['a']='1' OR ",
+    ]) {
+      expect(() => parseCommissionMetadataQuery(query)).toThrow(DubApiError);
+    }
+
+    try {
+      parseCommissionMetadataQuery("metadata['plan']=='pro'");
+    } catch (error) {
+      expect((error as DubApiError).code).toBe("unprocessable_entity");
+      expect((error as DubApiError).message).toBe(
+        "Metadata query only supports `=` and `!=` operators.",
+      );
+    }
+
+    try {
+      parseCommissionMetadataQuery("metadata['a']='1' AND");
+    } catch (error) {
+      expect((error as DubApiError).code).toBe("unprocessable_entity");
+      expect((error as DubApiError).message).toBe("Invalid metadata query.");
+    }
+  });
+
+  it("rejects non-metadata fields and junk", () => {
+    expect(() => parseCommissionMetadataQuery("status:active")).toThrow(
+      DubApiError,
+    );
+    expect(() => parseCommissionMetadataQuery("not-a-query")).toThrow(
+      DubApiError,
+    );
+  });
+
+  it("preserves filter values containing --, ;, \\, /*, and */", () => {
+    expect(parseCommissionMetadataQuery("metadata['sku']='AB--12'")).toEqual({
+      logic: "AND",
+      filters: [{ key: "sku", op: "equals", value: "AB--12" }],
+    });
+    expect(
+      parseCommissionMetadataQuery("metadata['name']='Smith; Jane'"),
+    ).toEqual({
+      logic: "AND",
+      filters: [{ key: "name", op: "equals", value: "Smith; Jane" }],
+    });
+    expect(parseCommissionMetadataQuery("metadata['path']='a\\b'")).toEqual({
+      logic: "AND",
+      filters: [{ key: "path", op: "equals", value: "a\\b" }],
+    });
+    expect(
+      parseCommissionMetadataQuery("metadata['note']='/* comment */'"),
+    ).toEqual({
+      logic: "AND",
+      filters: [{ key: "note", op: "equals", value: "/* comment */" }],
+    });
+  });
+
+  it("allows up to 5 conditions and rejects more", () => {
+    const five = [
+      "metadata['a']='1'",
+      "metadata['b']='2'",
+      "metadata['c']='3'",
+      "metadata['d']='4'",
+      "metadata['e']='5'",
+    ].join(" AND ");
+    expect(parseCommissionMetadataQuery(five)?.filters).toHaveLength(5);
+
+    const six = `${five} AND metadata['f']='6'`;
+    expect(() => parseCommissionMetadataQuery(six)).toThrow(DubApiError);
+    try {
+      parseCommissionMetadataQuery(six);
+    } catch (error) {
+      expect((error as DubApiError).code).toBe("unprocessable_entity");
+      expect((error as DubApiError).message).toBe(
+        "Metadata query supports at most 5 conditions.",
+      );
+    }
+  });
+});
+
+describe("buildCommissionMetadataWhere", () => {
+  it("returns undefined for undefined input", () => {
+    expect(buildCommissionMetadataWhere(undefined)).toBeUndefined();
+  });
+
+  it("builds a single equals clause", () => {
+    expect(
+      buildCommissionMetadataWhere({
+        logic: "AND",
+        filters: [{ key: "plan", op: "equals", value: "pro" }],
+      }),
+    ).toEqual({
+      metadata: { path: "$.plan", equals: "pro" },
+    });
+  });
+
+  it("builds a single notEquals clause", () => {
+    expect(
+      buildCommissionMetadataWhere({
+        logic: "AND",
+        filters: [{ key: "plan", op: "notEquals", value: "free" }],
+      }),
+    ).toEqual({
+      metadata: { path: "$.plan", not: "free" },
+    });
+  });
+
+  it("builds AND of multiple clauses", () => {
+    expect(
+      buildCommissionMetadataWhere({
+        logic: "AND",
+        filters: [
+          { key: "plan", op: "equals", value: "pro" },
+          { key: "tier", op: "equals", value: "gold" },
+        ],
+      }),
+    ).toEqual({
+      AND: [
+        { metadata: { path: "$.plan", equals: "pro" } },
+        { metadata: { path: "$.tier", equals: "gold" } },
+      ],
+    });
+  });
+
+  it("builds OR of multiple clauses", () => {
+    expect(
+      buildCommissionMetadataWhere({
+        logic: "OR",
+        filters: [
+          { key: "plan", op: "equals", value: "pro" },
+          { key: "plan", op: "equals", value: "enterprise" },
+        ],
+      }),
+    ).toEqual({
+      OR: [
+        { metadata: { path: "$.plan", equals: "pro" } },
+        { metadata: { path: "$.plan", equals: "enterprise" } },
+      ],
+    });
+  });
+});
diff --git a/apps/web/tests/customers/format-customers-export.test.ts b/apps/web/tests/customers/format-customers-export.test.ts
new file mode 100644
index 00000000000..b34a18b2853
--- /dev/null
+++ b/apps/web/tests/customers/format-customers-export.test.ts
@@ -0,0 +1,94 @@
+import { obfuscateCustomerEmail } from "@/lib/api/partner-profile/obfuscate-customer-email";
+import { formatPartnerCustomersForExport } from "@/lib/customers/api/format-partner-customers-export";
+import { describe, expect, test, vi } from "vitest";
+
+vi.mock("@/lib/names", () => ({
+  generateRandomName: () => "Random Placeholder",
+}));
+
+const createdAt = new Date("2026-01-01T00:00:00.000Z");
+const firstSaleAt = new Date("2026-01-02T00:00:00.000Z");
+
+const partnerCustomer = {
+  id: "cus_123",
+  name: "Ada Lovelace",
+  email: "ada@example.com",
+  country: "US",
+  saleAmount: 12000,
+  createdAt,
+  subscriptionCanceledAt: null,
+  link: { shortLink: "https://dub.sh/ada", url: "https://example.com" },
+  commissions: [{ createdAt: firstSaleAt }],
+};
+
+describe("formatPartnerCustomersForExport", () => {
+  test("obfuscates email and omits name when sharing is off", () => {
+    const [row] = formatPartnerCustomersForExport(
+      [partnerCustomer],
+      ["id", "email", "name", "saleAmount"],
+      { customerDataSharingEnabledAt: null },
+    );
+
+    expect(row.email).toBe(obfuscateCustomerEmail("ada@example.com"));
+    expect(row).not.toHaveProperty("name");
+    expect(row.saleAmount).toBe("$120.00");
+  });
+
+  test("includes name and real email when sharing is enabled", () => {
+    const [row] = formatPartnerCustomersForExport(
+      [partnerCustomer],
+      ["id", "email", "name", "saleAmount"],
+      { customerDataSharingEnabledAt: new Date("2026-01-01") },
+    );
+
+    expect(row).toEqual({
+      id: "cus_123",
+      email: "ada@example.com",
+      name: "Ada Lovelace",
+      saleAmount: "$120.00",
+    });
+  });
+
+  test("exports an empty email when sharing is on and email is missing", () => {
+    const [row] = formatPartnerCustomersForExport(
+      [{ ...partnerCustomer, email: null }],
+      ["id", "email", "name"],
+      { customerDataSharingEnabledAt: new Date("2026-01-01") },
+    );
+
+    expect(row).toEqual({
+      id: "cus_123",
+      email: "",
+      name: "Ada Lovelace",
+    });
+  });
+
+  test("does not leak the customer name into email when sharing is off and email is missing", () => {
+    const [row] = formatPartnerCustomersForExport(
+      [{ ...partnerCustomer, email: null }],
+      ["id", "email", "name"],
+      { customerDataSharingEnabledAt: null },
+    );
+
+    expect(row.email).toBe("Random Placeholder");
+    expect(row.email).not.toBe("Ada Lovelace");
+    expect(row).not.toHaveProperty("name");
+  });
+
+  test("omits saleAmount when the program excludes LTV", () => {
+    const [row] = formatPartnerCustomersForExport(
+      [partnerCustomer],
+      ["id", "email", "saleAmount"],
+      {
+        customerDataSharingEnabledAt: new Date("2026-01-01"),
+        ltvExcluded: true,
+      },
+    );
+
+    expect(row).toEqual({
+      id: "cus_123",
+      email: "ada@example.com",
+    });
+    expect(row).not.toHaveProperty("saleAmount");
+  });
+});
diff --git a/apps/web/tests/discounts/index.test.ts b/apps/web/tests/discounts/index.test.ts
deleted file mode 100644
index b197a93a6dd..00000000000
--- a/apps/web/tests/discounts/index.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { CustomerEnriched } from "@/lib/types";
-import { E2E_CUSTOMER_WITH_DISCOUNT, E2E_DISCOUNT } from "tests/utils/resource";
-import { describe, expect, test } from "vitest";
-import { IntegrationHarness } from "../utils/integration";
-
-describe("Discounts", () => {
-  test("/customers?email=", async () => {
-    const h = new IntegrationHarness();
-    const { http } = await h.init();
-
-    const { status, data: customers } = await http.get<CustomerEnriched[]>({
-      path: `/customers?email=${E2E_CUSTOMER_WITH_DISCOUNT.email}&includeExpandedFields=true`,
-    });
-
-    expect(status).toEqual(200);
-    expect(customers[0].discount).toStrictEqual(E2E_DISCOUNT);
-  });
-
-  test("/customers?externalId=", async () => {
-    const h = new IntegrationHarness();
-    const { http } = await h.init();
-
-    const { status, data: customers } = await http.get<CustomerEnriched[]>({
-      path: `/customers?externalId=${E2E_CUSTOMER_WITH_DISCOUNT.externalId}&includeExpandedFields=true`,
-    });
-
-    expect(status).toEqual(200);
-    expect(customers[0].discount).toStrictEqual(E2E_DISCOUNT);
-  });
-
-  test("/customers/:id", async () => {
-    const h = new IntegrationHarness();
-    const { http } = await h.init();
-
-    const { status, data: customer } = await http.get<CustomerEnriched>({
-      path: `/customers/${E2E_CUSTOMER_WITH_DISCOUNT.id}?includeExpandedFields=true`,
-    });
-
-    expect(status).toEqual(200);
-    expect(customer.discount).toStrictEqual(E2E_DISCOUNT);
-  });
-});
diff --git a/apps/web/tests/discounts/restricted-discount-code-schema.test.ts b/apps/web/tests/discounts/restricted-discount-code-schema.test.ts
new file mode 100644
index 00000000000..1d8d37910f0
--- /dev/null
+++ b/apps/web/tests/discounts/restricted-discount-code-schema.test.ts
@@ -0,0 +1,55 @@
+import {
+  createDiscountCodeSchema,
+  restrictedDiscountCodeSchema,
+} from "@/lib/zod/schemas/discount";
+import { describe, expect, it } from "vitest";
+
+describe("restrictedDiscountCodeSchema", () => {
+  it("rejects characters outside letters, numbers, dashes, and underscores", () => {
+    const result = restrictedDiscountCodeSchema.safeParse({
+      code: "NOT VALID!",
+    });
+
+    expect(result.success).toBe(false);
+
+    if (!result.success) {
+      expect(result.error.issues[0]?.message).toBe(
+        "Code can only contain letters, numbers, dashes, and underscores.",
+      );
+    }
+  });
+
+  it("accepts letters, numbers, dashes, and underscores", () => {
+    expect(
+      restrictedDiscountCodeSchema.parse({ code: "PARTNER_10-OFF" }).code,
+    ).toBe("PARTNER_10-OFF");
+  });
+});
+
+describe("createDiscountCodeSchema", () => {
+  it("allows any characters so custom provider codes are not rejected up front", () => {
+    expect(
+      createDiscountCodeSchema.parse({
+        partnerId: "pn_x",
+        linkId: "link_x",
+        code: "SAVE@10.OFF!",
+      }).code,
+    ).toBe("SAVE@10.OFF!");
+  });
+
+  it("still rejects codes longer than 100 characters", () => {
+    const result = createDiscountCodeSchema.safeParse({
+      partnerId: "pn_x",
+      linkId: "link_x",
+      code: "A".repeat(101),
+    });
+
+    expect(result.success).toBe(false);
+
+    if (!result.success) {
+      expect(result.error.issues[0]?.message).toBe(
+        "Code must be 100 characters or fewer.",
+      );
+    }
+  });
+});
diff --git a/apps/web/tests/links/update-link.test.ts b/apps/web/tests/links/update-link.test.ts
index 3dd59b1e7f5..e9b55f2bf39 100644
--- a/apps/web/tests/links/update-link.test.ts
+++ b/apps/web/tests/links/update-link.test.ts
@@ -285,6 +285,95 @@ describe.sequential("PATCH /links/{linkId} - UTM parameters", async () => {
   });
 });
 
+describe.sequential(
+  "PATCH /links/{linkId} - clear externalId and tenantId",
+  async () => {
+    const h = new IntegrationHarness();
+    const { http } = await h.init();
+
+    let link: Link;
+
+    beforeAll(async () => {
+      const { data } = await http.post<Link>({
+        path: "/links",
+        body: {
+          url,
+          domain,
+          externalId: randomId(),
+          tenantId: randomId(),
+        },
+      });
+      link = data;
+    });
+
+    afterAll(async () => {
+      await h.deleteLink(link.id);
+    });
+
+    test("clear externalId with empty string", async () => {
+      const { status, data: updated } = await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { externalId: "" },
+      });
+
+      expect(status).toEqual(200);
+      expect(updated.externalId).toEqual(null);
+
+      const { data: fetched } = await http.get<Link>({
+        path: `/links/${link.id}`,
+      });
+
+      expect(fetched.externalId).toEqual(null);
+    });
+
+    test("clear externalId with null", async () => {
+      await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { externalId: randomId() },
+      });
+
+      const { status, data: updated } = await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { externalId: null },
+      });
+
+      expect(status).toEqual(200);
+      expect(updated.externalId).toEqual(null);
+    });
+
+    test("clear tenantId with empty string", async () => {
+      const { status, data: updated } = await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { tenantId: "" },
+      });
+
+      expect(status).toEqual(200);
+      expect(updated.tenantId).toEqual(null);
+
+      const { data: fetched } = await http.get<Link>({
+        path: `/links/${link.id}`,
+      });
+
+      expect(fetched.tenantId).toEqual(null);
+    });
+
+    test("clear tenantId with null", async () => {
+      await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { tenantId: randomId() },
+      });
+
+      const { status, data: updated } = await http.patch<Link>({
+        path: `/links/${link.id}`,
+        body: { tenantId: null },
+      });
+
+      expect(status).toEqual(200);
+      expect(updated.tenantId).toEqual(null);
+    });
+  },
+);
+
 describe.sequential(
   "PUT /links/{linkId} (backwards compatibility)",
   async () => {
diff --git a/apps/web/tests/misc/apply-group-utm-to-link.test.ts b/apps/web/tests/misc/apply-group-utm-to-link.test.ts
new file mode 100644
index 00000000000..b9acb19736c
--- /dev/null
+++ b/apps/web/tests/misc/apply-group-utm-to-link.test.ts
@@ -0,0 +1,126 @@
+import { applyGroupUtmToLink } from "@/lib/api/utm/apply-group-utm-to-link";
+import { ProcessedLinkProps } from "@/lib/types";
+import { describe, expect, it } from "vitest";
+
+const baseLink = {
+  domain: "dub.sh",
+  key: "abc1234",
+  url: "https://example.com/path?foo=bar",
+  projectId: "ws_test",
+} as ProcessedLinkProps;
+
+const template = {
+  utm_source: "{{PARTNER_NAME}}",
+  utm_medium: "affiliate",
+  utm_campaign: "{{PARTNER_LINK_KEY}}",
+  utm_term: null,
+  utm_content: null,
+  ref: "partner-{{PARTNER_LINK_KEY}}",
+};
+
+describe("applyGroupUtmToLink", () => {
+  it("returns the link unchanged when there is no UTM template", () => {
+    expect(
+      applyGroupUtmToLink({
+        link: baseLink,
+        utmTemplate: null,
+        partnerName: "John Doe",
+      }),
+    ).toBe(baseLink);
+
+    expect(
+      applyGroupUtmToLink({
+        link: baseLink,
+        utmTemplate: undefined,
+        partnerName: "John Doe",
+      }),
+    ).toBe(baseLink);
+  });
+
+  it("resolves macros with the final processed link key (not partner name)", () => {
+    const result = applyGroupUtmToLink({
+      link: baseLink,
+      utmTemplate: template,
+      partnerName: "John Doe",
+    });
+
+    const parsed = new URL(result.url);
+    expect(parsed.searchParams.get("utm_source")).toBe("John Doe");
+    expect(parsed.searchParams.get("utm_medium")).toBe("affiliate");
+    expect(parsed.searchParams.get("utm_campaign")).toBe("abc1234");
+    expect(parsed.searchParams.get("ref")).toBe("partner-abc1234");
+    expect(parsed.searchParams.get("foo")).toBe("bar");
+
+    expect(result.utm_source).toBe("John Doe");
+    expect(result.utm_medium).toBe("affiliate");
+    expect(result.utm_campaign).toBe("abc1234");
+    expect(result).not.toHaveProperty("ref");
+  });
+
+  it("uses link.key as partnerName fallback when partnerName is missing", () => {
+    const result = applyGroupUtmToLink({
+      link: baseLink,
+      utmTemplate: template,
+      partnerName: null,
+    });
+
+    expect(new URL(result.url).searchParams.get("utm_source")).toBe("abc1234");
+  });
+
+  it("overwrites unresolved macros already present on the destination URL", () => {
+    const result = applyGroupUtmToLink({
+      link: {
+        ...baseLink,
+        url: "https://example.com/?utm_source={{PARTNER_NAME}}&utm_campaign={{PARTNER_LINK_KEY}}&foo=1",
+      },
+      utmTemplate: template,
+      partnerName: "John Doe",
+    });
+
+    const parsed = new URL(result.url);
+    expect(parsed.searchParams.get("utm_source")).toBe("John Doe");
+    expect(parsed.searchParams.get("utm_campaign")).toBe("abc1234");
+    expect(parsed.searchParams.get("foo")).toBe("1");
+    expect(parsed.searchParams.get("utm_source")).not.toContain("{{");
+  });
+
+  it("overwrites existing static UTM params on the destination URL", () => {
+    const result = applyGroupUtmToLink({
+      link: {
+        ...baseLink,
+        url: "https://example.com/?utm_source=old-source&utm_campaign=old-campaign",
+      },
+      utmTemplate: template,
+      partnerName: "John Doe",
+    });
+
+    const parsed = new URL(result.url);
+    expect(parsed.searchParams.get("utm_source")).toBe("John Doe");
+    expect(parsed.searchParams.get("utm_campaign")).toBe("abc1234");
+  });
+
+  it("simulates create-without-key: random key must win over partner name for PARTNER_LINK_KEY", () => {
+    // Mimics processLink assigning getRandomKey() after the request omitted key.
+    const processedLink = {
+      ...baseLink,
+      key: "x7k9m2p",
+      url: "https://example.com/",
+    } as ProcessedLinkProps;
+
+    const result = applyGroupUtmToLink({
+      link: processedLink,
+      utmTemplate: {
+        ...template,
+        utm_source: "{{PARTNER_LINK_KEY}}",
+        utm_campaign: "{{PARTNER_NAME}}",
+      },
+      partnerName: "John Doe",
+    });
+
+    const parsed = new URL(result.url);
+    expect(parsed.searchParams.get("utm_source")).toBe("x7k9m2p");
+    expect(parsed.searchParams.get("utm_campaign")).toBe("John Doe");
+    // Regression: old create paths fell back partnerLinkKey to partner name.
+    expect(parsed.searchParams.get("utm_source")).not.toBe("John Doe");
+  });
+});
diff --git a/apps/web/tests/misc/base64.test.ts b/apps/web/tests/misc/base64.test.ts
index 1d6fce9b7f0..9668a5f8fde 100644
--- a/apps/web/tests/misc/base64.test.ts
+++ b/apps/web/tests/misc/base64.test.ts
@@ -1,4 +1,7 @@
-import { base64ImageSchema } from "@/lib/zod/schemas/images";
+import {
+  base64ImageSchema,
+  invalidImageFormatMessage,
+} from "@/lib/zod/schemas/images";
 import { describe, expect, it } from "vitest";
 
 describe("base64ImageSchema", () => {
@@ -10,20 +13,29 @@ describe("base64ImageSchema", () => {
     ).resolves.not.toThrow();
   });
 
+  it("should validate a correct base64 AVIF image", async () => {
+    // ISO BMFF ftyp box with the avif brand — enough for file-type detection
+    const avifHeader = Buffer.alloc(64);
+    avifHeader.writeUInt32BE(0x1c, 0);
+    avifHeader.write("ftypavif", 4);
+    const validAvifImage = `data:image/avif;base64,${avifHeader.toString("base64")}`;
+    await expect(
+      base64ImageSchema.parseAsync(validAvifImage),
+    ).resolves.not.toThrow();
+  });
+
   it("should reject an invalid image type", async () => {
     const invalidImageType =
       "data:image/invalid;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==";
     await expect(
       base64ImageSchema.parseAsync(invalidImageType),
-    ).rejects.toThrow(
-      "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
-    );
+    ).rejects.toThrow(invalidImageFormatMessage);
   });
 
   it("should reject malformed base64 data", async () => {
     const malformedBase64 = "data:image/png;base64,invalid-base64-data";
     await expect(base64ImageSchema.parseAsync(malformedBase64)).rejects.toThrow(
-      "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+      invalidImageFormatMessage,
     );
   });
 
@@ -31,7 +43,7 @@ describe("base64ImageSchema", () => {
     const noPrefix =
       "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==";
     await expect(base64ImageSchema.parseAsync(noPrefix)).rejects.toThrow(
-      "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+      invalidImageFormatMessage,
     );
   });
 
@@ -41,7 +53,7 @@ describe("base64ImageSchema", () => {
       "data:image/png;base64," +
       Buffer.from("This is not an image").toString("base64");
     await expect(base64ImageSchema.parseAsync(textContent)).rejects.toThrow(
-      "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+      invalidImageFormatMessage,
     );
   });
 
@@ -70,7 +82,7 @@ describe("base64ImageSchema", () => {
         ).toString("base64");
 
       await expect(base64ImageSchema.parseAsync(xssPayload)).rejects.toThrow(
-        "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
+        invalidImageFormatMessage,
       );
     });
 
@@ -100,9 +112,7 @@ describe("base64ImageSchema", () => {
 
       await expect(
         base64ImageSchema.parseAsync(phishingPayload),
-      ).rejects.toThrow(
-        "Invalid image format, supports only png, jpeg, jpg, gif, webp.",
-      );
+      ).rejects.toThrow(invalidImageFormatMessage);
     });
   });
 });
diff --git a/apps/web/tests/misc/create-signed-upload-url.test.ts b/apps/web/tests/misc/create-signed-upload-url.test.ts
new file mode 100644
index 00000000000..5b0222651e5
--- /dev/null
+++ b/apps/web/tests/misc/create-signed-upload-url.test.ts
@@ -0,0 +1,291 @@
+import { DubApiError } from "@/lib/api/errors";
+import { storage } from "@/lib/storage";
+import { createSignedUploadUrl } from "@/lib/storage/create-signed-upload-url";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
+import { validateSignedUpload } from "@/lib/storage/validate-signed-upload";
+import { R2_URL } from "@dub/utils";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+
+vi.mock("@/lib/storage", () => ({
+  storage: {
+    getSignedUploadUrl: vi.fn(),
+  },
+}));
+
+const getSignedUploadUrlMock = vi.mocked(storage.getSignedUploadUrl);
+
+describe("createSignedUploadUrl", () => {
+  const key = "programs/prog_123/lander/image_abc";
+  const signedUrl = "https://signed.example.test/upload";
+
+  beforeEach(() => {
+    getSignedUploadUrlMock.mockReset();
+    getSignedUploadUrlMock.mockResolvedValue(signedUrl);
+  });
+
+  it("returns a signed URL and destination URL", async () => {
+    const result = await createSignedUploadUrl({
+      key,
+      contentType: "image/png",
+      contentLength: 1024,
+    });
+
+    expect(result).toEqual({
+      key,
+      signedUrl,
+      destinationUrl: `${R2_URL}/${key}`,
+    });
+    expect(getSignedUploadUrlMock).toHaveBeenCalledWith({
+      key,
+      bucket: "public",
+      contentType: "image/png",
+      contentLength: 1024,
+    });
+  });
+
+  it("forwards the private bucket to the signer", async () => {
+    await createSignedUploadUrl({
+      key: "messages/prog_123/file.pdf",
+      contentType: "application/pdf",
+      contentLength: 2048,
+      bucket: "private",
+    });
+
+    expect(getSignedUploadUrlMock).toHaveBeenCalledWith({
+      key: "messages/prog_123/file.pdf",
+      bucket: "private",
+      contentType: "application/pdf",
+      contentLength: 2048,
+    });
+  });
+
+  it.each([
+    "integrationScreenshots",
+    "programLogos",
+    "programApplicationImages",
+    "programCampaignImages",
+    "programLanderImages",
+    "programResourceLogos",
+    "programResourceFiles",
+    "bountySubmissionImages",
+    "resumes",
+  ] as const satisfies ReadonlyArray<keyof typeof UPLOAD_POLICIES>)(
+    "pins Content-Type and Content-Length into the signer for %s",
+    async (policy) => {
+      const contentType = UPLOAD_POLICIES[policy].contentTypes[0];
+      const contentLength = 2048;
+
+      await createSignedUploadUrl({
+        key: `public/${policy}/ok`,
+        contentType,
+        contentLength,
+      });
+
+      expect(getSignedUploadUrlMock).toHaveBeenCalledWith({
+        key: `public/${policy}/ok`,
+        bucket: "public",
+        contentType,
+        contentLength,
+      });
+    },
+  );
+});
+
+describe("validateSignedUpload", () => {
+  it("accepts an allowed upload", () => {
+    expect(
+      validateSignedUpload({
+        policy: "programLanderImages",
+        contentType: "image/png",
+        contentLength: 1024,
+      }),
+    ).toEqual(UPLOAD_POLICIES.programLanderImages);
+  });
+
+  it("rejects image/svg+xml for bounty submission images", () => {
+    expect(() =>
+      validateSignedUpload({
+        policy: "bountySubmissionImages",
+        contentType: "image/svg+xml",
+        contentLength: 1024,
+      }),
+    ).toThrow(
+      expect.objectContaining({
+        code: "unprocessable_entity",
+        message: expect.stringContaining("Invalid content type"),
+      } satisfies Partial<DubApiError>),
+    );
+  });
+
+  it("rejects content types not allowed by the policy", () => {
+    expect(() =>
+      validateSignedUpload({
+        policy: "programLogos",
+        contentType: "image/svg+xml",
+        contentLength: 1024,
+      }),
+    ).toThrow(
+      expect.objectContaining({
+        code: "unprocessable_entity",
+        message: expect.stringContaining("Invalid content type"),
+      } satisfies Partial<DubApiError>),
+    );
+  });
+
+  it("rejects an empty content type", () => {
+    expect(() =>
+      validateSignedUpload({
+        policy: "programLogos",
+        contentType: "",
+        contentLength: 1024,
+      }),
+    ).toThrow(DubApiError);
+  });
+
+  it("rejects non-positive and non-integer content lengths", () => {
+    for (const contentLength of [0, -1, 1.5, Number.NaN]) {
+      expect(() =>
+        validateSignedUpload({
+          policy: "programLogos",
+          contentType: "image/png",
+          contentLength,
+        }),
+      ).toThrow(
+        expect.objectContaining({
+          code: "unprocessable_entity",
+          message: "contentLength must be a positive integer.",
+        }),
+      );
+    }
+  });
+
+  it("rejects files larger than the policy max", () => {
+    const maxBytes = UPLOAD_POLICIES.programLogos.maxBytes;
+
+    expect(() =>
+      validateSignedUpload({
+        policy: "programLogos",
+        contentType: "image/png",
+        contentLength: maxBytes + 1,
+      }),
+    ).toThrow(
+      expect.objectContaining({
+        code: "unprocessable_entity",
+        message: "File size exceeds the maximum allowed size of 5MB",
+      }),
+    );
+  });
+
+  it("allows uploads at the exact policy size limit", () => {
+    const maxBytes = UPLOAD_POLICIES.programLogos.maxBytes;
+
+    expect(
+      validateSignedUpload({
+        policy: "programLogos",
+        contentType: "image/avif",
+        contentLength: maxBytes,
+      }),
+    ).toEqual(UPLOAD_POLICIES.programLogos);
+  });
+
+  // Stored XSS on dubassets.com: unsigned Content-Type let clients PUT text/html.
+  describe("Content-Type pinning (XSS regression)", () => {
+    const publicPolicies = [
+      "integrationScreenshots",
+      "programLogos",
+      "programApplicationImages",
+      "programCampaignImages",
+      "programLanderImages",
+      "programResourceLogos",
+      "programResourceFiles",
+      "bountySubmissionImages",
+      "resumes",
+    ] as const satisfies ReadonlyArray<keyof typeof UPLOAD_POLICIES>;
+
+    const xssContentTypes = [
+      "text/html",
+      "text/html;charset=utf-8",
+      "application/xhtml+xml",
+      "image/svg+xml", // only some policies allow SVG; still XSS-capable when allowed
+    ] as const;
+
+    it("never allowlists text/html (or HTML charset variants) on any policy", () => {
+      for (const [name, policy] of Object.entries(UPLOAD_POLICIES)) {
+        expect(
+          policy.contentTypes,
+          `${name} must not allow text/html`,
+        ).not.toContain("text/html");
+        expect(
+          policy.contentTypes.some((type) =>
+            type.toLowerCase().startsWith("text/html"),
+          ),
+          `${name} must not allow text/html*`,
+        ).toBe(false);
+      }
+    });
+
+    it.each(publicPolicies)(
+      "rejects text/html for public policy %s",
+      (policy) => {
+        expect(() =>
+          validateSignedUpload({
+            policy,
+            contentType: "text/html",
+            contentLength: 128,
+          }),
+        ).toThrow(
+          expect.objectContaining({
+            code: "unprocessable_entity",
+            message: expect.stringContaining("Invalid content type"),
+          } satisfies Partial<DubApiError>),
+        );
+      },
+    );
+
+    it("rejects text/html for private message attachment policies", () => {
+      for (const policy of [
+        "programMessageAttachments",
+        "partnerMessageAttachments",
+      ] as const) {
+        expect(() =>
+          validateSignedUpload({
+            policy,
+            contentType: "text/html",
+            contentLength: 128,
+          }),
+        ).toThrow(
+          expect.objectContaining({
+            code: "unprocessable_entity",
+            message: expect.stringContaining("Invalid content type"),
+          } satisfies Partial<DubApiError>),
+        );
+      }
+    });
+
+    it("rejects HTML/scriptable types that are outside each public policy allowlist", () => {
+      for (const policy of publicPolicies) {
+        const allowed = new Set<string>(UPLOAD_POLICIES[policy].contentTypes);
+
+        for (const contentType of xssContentTypes) {
+          if (allowed.has(contentType)) {
+            continue;
+          }
+
+          expect(() =>
+            validateSignedUpload({
+              policy,
+              contentType,
+              contentLength: 128,
+            }),
+          ).toThrow(
+            expect.objectContaining({
+              code: "unprocessable_entity",
+            } satisfies Partial<DubApiError>),
+          );
+        }
+      }
+    });
+  });
+});
diff --git a/apps/web/tests/misc/filter-active-group-bounties.test.ts b/apps/web/tests/misc/filter-active-group-bounties.test.ts
index 2bd238df98b..3366f0cf6ef 100644
--- a/apps/web/tests/misc/filter-active-group-bounties.test.ts
+++ b/apps/web/tests/misc/filter-active-group-bounties.test.ts
@@ -16,6 +16,7 @@ function makeCandidate(
     endsAt: Date | null;
     archivedAt: Date | null;
     groups: { groupId: string }[];
+    partnerTags: { partnerTagId: string }[];
   }> = {},
 ) {
   return {
@@ -26,6 +27,7 @@ function makeCandidate(
     endsAt: null,
     archivedAt: null,
     groups: [],
+    partnerTags: [],
     ...overrides,
   };
 }
@@ -151,4 +153,51 @@ describe("filterActiveGroupBounties", () => {
     });
     expect(result.map((b) => b.id)).toEqual(["bnty_4", "bnty_5"]);
   });
+
+  it("excludes tag-scoped bounties with no groups", () => {
+    const bounty = makeCandidate({
+      partnerTags: [{ partnerTagId: "ptag_1" }],
+    });
+    const result = filterActiveGroupBounties([bounty], {
+      groupId: GROUP_ID,
+      now: NOW,
+    });
+    expect(result).toHaveLength(0);
+  });
+
+  it("excludes tag-scoped bounties even when groups match", () => {
+    const bounty = makeCandidate({
+      groups: [{ groupId: GROUP_ID }],
+      partnerTags: [{ partnerTagId: "ptag_1" }],
+    });
+    const result = filterActiveGroupBounties([bounty], {
+      groupId: GROUP_ID,
+      now: NOW,
+    });
+    expect(result).toHaveLength(0);
+  });
+
+  it("includes group-scoped bounties with empty partnerTags", () => {
+    const bounty = makeCandidate({
+      groups: [{ groupId: GROUP_ID }],
+      partnerTags: [],
+    });
+    const result = filterActiveGroupBounties([bounty], {
+      groupId: GROUP_ID,
+      now: NOW,
+    });
+    expect(result).toHaveLength(1);
+  });
+
+  it("includes global bounties with empty partnerTags", () => {
+    const bounty = makeCandidate({
+      groups: [],
+      partnerTags: [],
+    });
+    const result = filterActiveGroupBounties([bounty], {
+      groupId: GROUP_ID,
+      now: NOW,
+    });
+    expect(result).toHaveLength(1);
+  });
 });
diff --git a/apps/web/tests/misc/google-ads-api-error.test.ts b/apps/web/tests/misc/google-ads-api-error.test.ts
new file mode 100644
index 00000000000..869a6f221f5
--- /dev/null
+++ b/apps/web/tests/misc/google-ads-api-error.test.ts
@@ -0,0 +1,57 @@
+import {
+  formatApiErrorDetail,
+  isGoogleAdsPermissionDenied,
+} from "@/lib/integrations/google-ads/api";
+import { describe, expect, it } from "vitest";
+
+// searchStream 403s arrive as a JSON array. The human message omits the
+// authorization error-code enum that retry classification depends on.
+const permissionDeniedWithoutCodeInMessage = [
+  {
+    error: {
+      code: 403,
+      message: "The caller does not have permission",
+      status: "PERMISSION_DENIED",
+      details: [
+        {
+          "@type":
+            "type.googleapis.com/google.ads.googleads.v22.errors.GoogleAdsFailure",
+          errors: [
+            {
+              errorCode: {
+                authorizationError: "USER_PERMISSION_DENIED",
+              },
+              message:
+                "User doesn't have permission to access customer. Note: If you're accessing a client customer, the manager's customer id must be set in the 'login-customer-id' header.",
+            },
+          ],
+          requestId: "RWSdEB8C1WuiLgZl38biSQ",
+        },
+      ],
+    },
+  },
+];
+
+describe("formatApiErrorDetail", () => {
+  it("preserves USER_PERMISSION_DENIED when the message omits the error code", () => {
+    const adsMessage =
+      permissionDeniedWithoutCodeInMessage[0].error.details[0].errors[0]
+        .message;
+
+    expect(adsMessage).not.toContain("USER_PERMISSION_DENIED");
+
+    const detail = formatApiErrorDetail(
+      permissionDeniedWithoutCodeInMessage,
+      "",
+    );
+
+    expect(detail).toContain("USER_PERMISSION_DENIED");
+    expect(
+      isGoogleAdsPermissionDenied(
+        new Error(
+          `[Google Ads API] Request failed for searchStream (403): ${detail}`,
+        ),
+      ),
+    ).toBe(true);
+  });
+});
diff --git a/apps/web/tests/misc/google-ads-lead-event-filter.test.ts b/apps/web/tests/misc/google-ads-lead-event-filter.test.ts
new file mode 100644
index 00000000000..71bb7e95961
--- /dev/null
+++ b/apps/web/tests/misc/google-ads-lead-event-filter.test.ts
@@ -0,0 +1,122 @@
+import {
+  getGoogleAdsEventMappingsError,
+  resolveGoogleAdsConversionMapping,
+} from "@/lib/integrations/google-ads/utils";
+import { describe, expect, it } from "vitest";
+
+const signUpAction = "customers/1/conversionActions/signup";
+const trialAction = "customers/1/conversionActions/trial";
+const purchaseAction = "customers/1/conversionActions/purchase";
+
+describe("resolveGoogleAdsConversionMapping", () => {
+  it("returns null when no mappings are configured", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [],
+        eventName: "Sign Up",
+      }),
+    ).toBeNull();
+  });
+
+  it("matches a catch-all mapping with empty event names", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [{ conversionAction: signUpAction, eventNames: [] }],
+        eventName: "Sign Up",
+      }),
+    ).toEqual({ conversionAction: signUpAction, eventNames: [] });
+  });
+
+  it("matches a mapping by event name", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [
+          { conversionAction: signUpAction, eventNames: ["Sign Up"] },
+          { conversionAction: trialAction, eventNames: ["Started Trial"] },
+        ],
+        eventName: "Started Trial",
+      }),
+    ).toEqual({
+      conversionAction: trialAction,
+      eventNames: ["Started Trial"],
+    });
+  });
+
+  it("prefers a specific event-name mapping over a catch-all", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [
+          { conversionAction: purchaseAction, eventNames: [] },
+          { conversionAction: signUpAction, eventNames: ["Sign Up"] },
+        ],
+        eventName: "Sign Up",
+      }),
+    ).toEqual({
+      conversionAction: signUpAction,
+      eventNames: ["Sign Up"],
+    });
+  });
+
+  it("returns null when no mapping matches the event name", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [{ conversionAction: signUpAction, eventNames: ["Sign Up"] }],
+        eventName: "Demo Booked",
+      }),
+    ).toBeNull();
+  });
+
+  it("skips unnamed events unless a catch-all mapping exists", () => {
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [{ conversionAction: signUpAction, eventNames: ["Sign Up"] }],
+        eventName: undefined,
+      }),
+    ).toBeNull();
+
+    expect(
+      resolveGoogleAdsConversionMapping({
+        mappings: [{ conversionAction: signUpAction, eventNames: [] }],
+        eventName: undefined,
+      }),
+    ).toEqual({ conversionAction: signUpAction, eventNames: [] });
+  });
+});
+
+describe("getGoogleAdsEventMappingsError", () => {
+  it("returns null when event names are unique", () => {
+    expect(
+      getGoogleAdsEventMappingsError([
+        { conversionAction: signUpAction, eventNames: ["Sign Up"] },
+        { conversionAction: trialAction, eventNames: ["Started Trial"] },
+      ]),
+    ).toBeNull();
+  });
+
+  it("rejects the same event name on multiple conversion actions", () => {
+    expect(
+      getGoogleAdsEventMappingsError([
+        { conversionAction: signUpAction, eventNames: ["Sign Up"] },
+        { conversionAction: trialAction, eventNames: ["Sign Up"] },
+      ]),
+    ).toContain("Sign Up");
+  });
+
+  it("rejects the same conversion action more than once", () => {
+    expect(
+      getGoogleAdsEventMappingsError([
+        { conversionAction: signUpAction, eventNames: ["Sign Up"] },
+        { conversionAction: signUpAction, eventNames: ["Started Trial"] },
+      ]),
+    ).toBe("Each conversion action can only be used once.");
+  });
+
+  it("rejects more than one catch-all mapping", () => {
+    expect(
+      getGoogleAdsEventMappingsError([
+        { conversionAction: signUpAction, eventNames: [] },
+        { conversionAction: trialAction, eventNames: [] },
+      ]),
+    ).toBe("Only one conversion action can receive unmatched events.");
+  });
+});
diff --git a/apps/web/tests/misc/magic-bytes.test.ts b/apps/web/tests/misc/magic-bytes.test.ts
new file mode 100644
index 00000000000..3c987429e3b
--- /dev/null
+++ b/apps/web/tests/misc/magic-bytes.test.ts
@@ -0,0 +1,265 @@
+import {
+  decideQuarantine,
+  detectMimeFromMagicBytes,
+  isUserUploadKey,
+  mimeMatchesContentType,
+} from "@/lib/storage/magic-bytes";
+import { describe, expect, it } from "vitest";
+
+function bytes(...values: number[]) {
+  return new Uint8Array(values);
+}
+
+describe("detectMimeFromMagicBytes", () => {
+  it("detects JPEG", () => {
+    expect(detectMimeFromMagicBytes(bytes(0xff, 0xd8, 0xff, 0xe0))).toBe(
+      "image/jpeg",
+    );
+  });
+
+  it("detects PNG", () => {
+    expect(
+      detectMimeFromMagicBytes(
+        bytes(0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a),
+      ),
+    ).toBe("image/png");
+  });
+
+  it("detects PDF", () => {
+    expect(
+      detectMimeFromMagicBytes(bytes(0x25, 0x50, 0x44, 0x46, 0x2d, 0x31)),
+    ).toBe("application/pdf");
+  });
+
+  it("detects HTML", () => {
+    const html = new TextEncoder().encode("<!DOCTYPE html><html>");
+    expect(detectMimeFromMagicBytes(html)).toBe("text/html");
+  });
+
+  it("detects OLE compound storage", () => {
+    expect(
+      detectMimeFromMagicBytes(
+        bytes(0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1, 0x00),
+      ),
+    ).toBe("application/x-ole-storage");
+  });
+});
+
+describe("mimeMatchesContentType", () => {
+  it("matches jpeg aliases", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "image/jpeg",
+        contentType: "image/jpg",
+      }),
+    ).toBe(true);
+  });
+
+  it("allows zip magic for docx", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "application/zip",
+        contentType:
+          "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+      }),
+    ).toBe(true);
+  });
+
+  it("does not treat zip magic as legacy msword", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "application/zip",
+        contentType: "application/msword",
+      }),
+    ).toBe(false);
+  });
+
+  it("allows OLE magic for msword and xls", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "application/x-ole-storage",
+        contentType: "application/msword",
+      }),
+    ).toBe(true);
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "application/x-ole-storage",
+        contentType: "application/vnd.ms-excel",
+      }),
+    ).toBe(true);
+  });
+
+  it("allows text types with no detected magic", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: null,
+        contentType: "text/plain",
+      }),
+    ).toBe(true);
+    expect(
+      mimeMatchesContentType({
+        detectedMime: null,
+        contentType: "text/csv",
+      }),
+    ).toBe(true);
+  });
+
+  it("rejects png declared as html body", () => {
+    expect(
+      mimeMatchesContentType({
+        detectedMime: "text/html",
+        contentType: "image/png",
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("decideQuarantine", () => {
+  it("skips non user-upload prefixes", () => {
+    const decision = decideQuarantine({
+      key: "customers/avatar.png",
+      contentType: "image/png",
+      bytes: bytes(0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a),
+    });
+    expect(decision.action).toBe("skip");
+  });
+
+  it("allows matching PNG on programs/", () => {
+    expect(isUserUploadKey("programs/prog_x/emails/image_abc")).toBe(true);
+    const decision = decideQuarantine({
+      key: "programs/prog_x/emails/image_abc",
+      contentType: "image/png",
+      bytes: bytes(0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a),
+    });
+    expect(decision).toMatchObject({
+      action: "allow",
+      reason: "magic_bytes_match",
+    });
+  });
+
+  it("quarantines HTML uploaded as image/png", () => {
+    const html = new TextEncoder().encode("<!DOCTYPE html><html>xss</html>");
+    const decision = decideQuarantine({
+      key: "integration-screenshots/abc",
+      contentType: "image/png",
+      bytes: html,
+    });
+    expect(decision.action).toBe("quarantine");
+    if (decision.action === "quarantine") {
+      expect(decision.detectedMime).toBe("text/html");
+      expect(decision.reason).toBe("magic_bytes_mismatch");
+    }
+  });
+
+  it("quarantines dangerous content types", () => {
+    const decision = decideQuarantine({
+      key: "program-logos/logo",
+      contentType: "text/html",
+      bytes: bytes(0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a),
+    });
+    expect(decision.action).toBe("quarantine");
+    if (decision.action === "quarantine") {
+      expect(decision.reason).toBe("dangerous_content_type");
+    }
+  });
+
+  it("allows text/plain and text/csv under programs/", () => {
+    const plain = decideQuarantine({
+      key: "programs/prog_x/files/notes-abcd.txt",
+      contentType: "text/plain",
+      bytes: new TextEncoder().encode("hello partner resources"),
+    });
+    expect(plain).toMatchObject({
+      action: "allow",
+      reason: "magic_bytes_match",
+    });
+
+    const csv = decideQuarantine({
+      key: "programs/prog_x/files/export-abcd.csv",
+      contentType: "text/csv",
+      bytes: new TextEncoder().encode("name,email\nAda,ada@example.com\n"),
+    });
+    expect(csv).toMatchObject({
+      action: "allow",
+      reason: "magic_bytes_match",
+    });
+  });
+
+  it("quarantines HTML declared as text/plain", () => {
+    const html = new TextEncoder().encode("<!DOCTYPE html><html>xss</html>");
+    const decision = decideQuarantine({
+      key: "programs/prog_x/files/notes-abcd.txt",
+      contentType: "text/plain",
+      bytes: html,
+    });
+    expect(decision.action).toBe("quarantine");
+    if (decision.action === "quarantine") {
+      expect(decision.detectedMime).toBe("text/html");
+      expect(decision.reason).toBe("magic_bytes_mismatch");
+    }
+  });
+
+  it("allows legacy doc/xls OLE under programs/", () => {
+    const ole = bytes(0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1, 0x00);
+    expect(
+      decideQuarantine({
+        key: "programs/prog_x/files/brief-abcd.doc",
+        contentType: "application/msword",
+        bytes: ole,
+      }),
+    ).toMatchObject({
+      action: "allow",
+      reason: "magic_bytes_match",
+    });
+    expect(
+      decideQuarantine({
+        key: "programs/prog_x/files/sheet-abcd.xls",
+        contentType: "application/vnd.ms-excel",
+        bytes: ole,
+      }),
+    ).toMatchObject({
+      action: "allow",
+      reason: "magic_bytes_match",
+    });
+  });
+
+  it("allows safe magic when Content-Type is missing or octet-stream", () => {
+    const png = bytes(0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a);
+    expect(
+      decideQuarantine({
+        key: "programs/prog_x/emails/image_abc",
+        contentType: null,
+        bytes: png,
+      }),
+    ).toMatchObject({
+      action: "allow",
+      reason: "safe_magic_missing_content_type",
+    });
+    expect(
+      decideQuarantine({
+        key: "programs/prog_x/emails/image_abc",
+        contentType: "application/octet-stream",
+        bytes: png,
+      }),
+    ).toMatchObject({
+      action: "allow",
+      reason: "safe_magic_missing_content_type",
+    });
+  });
+
+  it("quarantines zip/svg when Content-Type is missing", () => {
+    const zip = decideQuarantine({
+      key: "programs/prog_x/files/archive-abcd.zip",
+      contentType: null,
+      bytes: bytes(0x50, 0x4b, 0x03, 0x04),
+    });
+    expect(zip.action).toBe("quarantine");
+
+    const svg = decideQuarantine({
+      key: "programs/prog_x/logos/mark-abcd.svg",
+      contentType: null,
+      bytes: new TextEncoder().encode('<svg xmlns="http://www.w3.org/2000/svg"/>'),
+    });
+    expect(svg.action).toBe("quarantine");
+  });
+});
diff --git a/apps/web/tests/misc/scraped-count-schema.test.ts b/apps/web/tests/misc/scraped-count-schema.test.ts
new file mode 100644
index 00000000000..09da077b9ef
--- /dev/null
+++ b/apps/web/tests/misc/scraped-count-schema.test.ts
@@ -0,0 +1,21 @@
+import { scrapedCountSchema } from "@/lib/api/scrape-creators/schema";
+import { describe, expect, it } from "vitest";
+
+describe("scrapedCountSchema", () => {
+  it("rounds abbreviated-count float artifacts to the nearest integer", () => {
+    expect(scrapedCountSchema.parse(16.1 * 1000)).toBe(16100);
+    expect(scrapedCountSchema.parse(16099.999999999998)).toBe(16100);
+    expect(BigInt(scrapedCountSchema.parse(16.1 * 1000))).toBe(16100n);
+  });
+
+  it("passes integers through unchanged", () => {
+    expect(scrapedCountSchema.parse(0)).toBe(0);
+    expect(scrapedCountSchema.parse(16100)).toBe(16100);
+    expect(scrapedCountSchema.parse(1_000_000)).toBe(1_000_000);
+  });
+
+  it("coerces null and undefined to 0", () => {
+    expect(scrapedCountSchema.parse(null)).toBe(0);
+    expect(scrapedCountSchema.parse(undefined)).toBe(0);
+  });
+});
diff --git a/apps/web/tests/misc/smart-truncate.test.ts b/apps/web/tests/misc/smart-truncate.test.ts
new file mode 100644
index 00000000000..5fbb838dec5
--- /dev/null
+++ b/apps/web/tests/misc/smart-truncate.test.ts
@@ -0,0 +1,175 @@
+import { smartTruncate } from "@dub/utils";
+import { describe, expect, it } from "vitest";
+
+const LIMIT = 33;
+
+describe("smartTruncate", () => {
+  describe("protocol handling", () => {
+    it("strips https:// and returns the pretty URL when it fits", () => {
+      expect(smartTruncate("https://refer.acme.com/partner", LIMIT)).toBe(
+        "refer.acme.com/partner",
+      );
+      expect(smartTruncate("https://refer.acme.com/f6s", LIMIT)).toBe(
+        "refer.acme.com/f6s",
+      );
+      expect(smartTruncate("https://refer.acme.com/twitter", LIMIT)).toBe(
+        "refer.acme.com/twitter",
+      );
+    });
+
+    it("strips http:// the same way", () => {
+      expect(smartTruncate("http://refer.acme.com/partner", LIMIT)).toBe(
+        "refer.acme.com/partner",
+      );
+    });
+
+    it("leaves already-pretty URLs unchanged when they fit", () => {
+      expect(smartTruncate("refer.acme.com/partner", LIMIT)).toBe(
+        "refer.acme.com/partner",
+      );
+    });
+
+    it("produces the same output for stored and pretty inputs", () => {
+      const stored =
+        "https://acme.com/super-long-path-that-is-way-too-long-and-should-be-truncated";
+      const pretty =
+        "acme.com/super-long-path-that-is-way-too-long-and-should-be-truncated";
+
+      expect(smartTruncate(stored, LIMIT)).toBe(smartTruncate(pretty, LIMIT));
+    });
+
+    it("preserves www. on custom domains", () => {
+      expect(smartTruncate("https://www.acme.com/launch", LIMIT)).toBe(
+        "www.acme.com/launch",
+      );
+    });
+  });
+
+  describe("short links that fit after stripping the protocol", () => {
+    it("keeps default nanoid, dub.link, .dub.link, and branded domains", () => {
+      expect(smartTruncate("https://dub.sh/xYz9AbC", LIMIT)).toBe(
+        "dub.sh/xYz9AbC",
+      );
+      expect(smartTruncate("https://dub.link/abcde", LIMIT)).toBe(
+        "dub.link/abcde",
+      );
+      expect(smartTruncate("https://acme.dub.link/promo", LIMIT)).toBe(
+        "acme.dub.link/promo",
+      );
+      expect(smartTruncate("https://git.new/dub", LIMIT)).toBe("git.new/dub");
+    });
+
+    it("keeps dotted, hyphenated, and underscored keys", () => {
+      expect(smartTruncate("https://acme.com/file.name", LIMIT)).toBe(
+        "acme.com/file.name",
+      );
+      expect(smartTruncate("https://acme.com/launch-2024", LIMIT)).toBe(
+        "acme.com/launch-2024",
+      );
+      expect(smartTruncate("https://acme.com/my_link", LIMIT)).toBe(
+        "acme.com/my_link",
+      );
+    });
+
+    it("keeps prefixed and nested keys that fit", () => {
+      expect(smartTruncate("https://dub.sh/gh/xYz9AbC", LIMIT)).toBe(
+        "dub.sh/gh/xYz9AbC",
+      );
+      expect(smartTruncate("https://acme.com/linkedin/more/path", LIMIT)).toBe(
+        "acme.com/linkedin/more/path",
+      );
+    });
+  });
+
+  describe("root domain links", () => {
+    it("strips the protocol and does not append a slash", () => {
+      expect(smartTruncate("https://acme.com", LIMIT)).toBe("acme.com");
+    });
+
+    it("truncates a long apex while preserving the TLD", () => {
+      expect(
+        smartTruncate("https://verylongcustomapexdomainnamehere.com", LIMIT),
+      ).toBe("verylongcustomapexdomainnam...com");
+    });
+  });
+
+  describe("path-first truncation", () => {
+    it("keeps a short key and TLD-truncates a long domain", () => {
+      expect(
+        smartTruncate("https://superlongcustomdomainnamehere.com/x", LIMIT),
+      ).toBe("superlongcustomdomainname...com/x");
+    });
+
+    it("keeps a short domain and left-truncates a long key", () => {
+      expect(
+        smartTruncate(
+          "https://acme.com/super-long-path-that-is-way-too-long-and-should-be-truncated",
+          LIMIT,
+        ),
+      ).toBe("acme.com/super-long-path-that-...");
+    });
+
+    it("truncates both when domain and path overflow", () => {
+      expect(
+        smartTruncate(
+          "https://acmesuperlongdomain.com/super-long-path-that-is-way-too-long-and-should-be-truncated",
+          LIMIT,
+        ),
+      ).toBe("ac...com/super-long-path-that-...");
+    });
+
+    it("left-truncates nested keys from the start", () => {
+      expect(
+        smartTruncate(
+          "https://acme.com/linkedin/more/path/that/is/very/long",
+          LIMIT,
+        ),
+      ).toBe("acme.com/linkedin/more/path/th...");
+    });
+  });
+
+  describe("punycode and case-sensitive keys", () => {
+    it("parses punycode hosts and keys without decoding them", () => {
+      expect(smartTruncate("https://xn--n3h.com/xn--fsq", LIMIT)).toBe(
+        "xn--n3h.com/xn--fsq",
+      );
+      expect(
+        smartTruncate(
+          "https://xn--n3h.com/xn--longpunycodekeythatexceedsthelimit",
+          LIMIT,
+        ),
+      ).toBe("xn...com/xn--longpunycodekeyth...");
+    });
+
+    it("treats case-sensitive encoded keys as a normal path", () => {
+      expect(smartTruncate("https://acme.co/cAsE-sensitive-TeSt", LIMIT)).toBe(
+        "acme.co/cAsE-sensitive-TeSt",
+      );
+      expect(
+        smartTruncate(
+          "https://acme.co/VeryLongCaseSensitiveEncodedKeyValueHere",
+          LIMIT,
+        ),
+      ).toBe("acme.co/VeryLongCaseSensitive...");
+    });
+  });
+
+  describe("length budget", () => {
+    it("never exceeds maxLength when truncation runs", () => {
+      const inputs = [
+        "https://refer.acme.com/partner-name-that-is-quite-long",
+        "https://acmesuperlongdomain.com/super-long-path-that-is-way-too-long-and-should-be-truncated",
+        "https://verylongcustomapexdomainnamehere.com",
+        "https://superlongcustomdomainnamehere.com/x",
+        "https://acme.com/linkedin/more/path/that/is/very/long",
+        "https://xn--n3h.com/xn--longpunycodekeythatexceedsthelimit",
+        "http://acmesuperlongdomain.com/gh/prefixed-key-that-is-also-very-long",
+      ];
+
+      for (const input of inputs) {
+        const output = smartTruncate(input, LIMIT);
+        expect(output.length).toBeLessThanOrEqual(LIMIT);
+      }
+    });
+  });
+});
diff --git a/apps/web/tests/partner-groups/index.test.ts b/apps/web/tests/partner-groups/index.test.ts
index 994ece04281..452af3ae8a1 100644
--- a/apps/web/tests/partner-groups/index.test.ts
+++ b/apps/web/tests/partner-groups/index.test.ts
@@ -29,6 +29,7 @@ const expectedGroup: Partial<GroupProps> = {
   leadReward: null,
   saleReward: null,
   referralReward: null,
+  customReward: null,
   discount: null,
   maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
   linkStructure: "short",
diff --git a/apps/web/tests/partner-groups/lander-markdown.test.ts b/apps/web/tests/partner-groups/lander-markdown.test.ts
new file mode 100644
index 00000000000..d212afc0ab4
--- /dev/null
+++ b/apps/web/tests/partner-groups/lander-markdown.test.ts
@@ -0,0 +1,66 @@
+import {
+  LANDER_MARKDOWN_ALLOWED_ELEMENTS,
+  LANDER_RICH_TEXT_FEATURES,
+} from "@/ui/partners/lander/lander-markdown";
+import { describe, expect, test } from "vitest";
+
+type LanderRichTextFeature = (typeof LANDER_RICH_TEXT_FEATURES)[number];
+
+const FEATURE_FOR_ELEMENT: Record<string, LanderRichTextFeature | null> = {
+  h1: "headings",
+  h2: "headings",
+  h3: "headings",
+  h4: "headings",
+  h5: "headings",
+  h6: "headings",
+  strong: "bold",
+  em: "italic",
+  del: "strike",
+  a: "links",
+  ul: "lists",
+  ol: "lists",
+  li: "lists",
+  blockquote: "quote",
+  code: null,
+  table: "tables",
+  thead: "tables",
+  tbody: "tables",
+  tr: "tables",
+  th: "tables",
+  td: "tables",
+  p: null,
+  br: null,
+  hr: null,
+  pre: null,
+  input: null,
+  img: null,
+};
+
+describe("lander markdown", () => {
+  test("every renderable element has a matching editor feature", () => {
+    const missing = LANDER_MARKDOWN_ALLOWED_ELEMENTS.filter((element) => {
+      const feature = FEATURE_FOR_ELEMENT[element];
+      return (
+        feature !== null &&
+        !LANDER_RICH_TEXT_FEATURES.includes(feature as LanderRichTextFeature)
+      );
+    });
+
+    expect(missing).toEqual([]);
+  });
+
+  test("every renderable element is accounted for in the mapping", () => {
+    const unmapped = LANDER_MARKDOWN_ALLOWED_ELEMENTS.filter(
+      (element) => !(element in FEATURE_FOR_ELEMENT),
+    );
+
+    expect(unmapped).toEqual([]);
+  });
+
+  test.each(["img", "del", "hr", "pre", "code", "input"])(
+    "keeps rendering %s",
+    (element) => {
+      expect(LANDER_MARKDOWN_ALLOWED_ELEMENTS).toContain(element);
+    },
+  );
+});
diff --git a/apps/web/tests/partners/applications/approve-reject-partner-application.test.ts b/apps/web/tests/partners/applications/approve-reject-partner-application.test.ts
deleted file mode 100644
index cabfd33347c..00000000000
--- a/apps/web/tests/partners/applications/approve-reject-partner-application.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { generateRandomName } from "@/lib/names";
-import { Partner } from "@prisma/client";
-import { describe, expect, test } from "vitest";
-import { randomPartnerEmail } from "../../utils/helpers";
-import { IntegrationHarness } from "../../utils/integration";
-import { E2E_PARTNER_GROUP } from "../../utils/resource";
-
-describe.sequential(
-  "POST /partners/applications/reject and /approve",
-  async () => {
-    const h = new IntegrationHarness();
-    const { http } = await h.init();
-
-    test("reject then approve the same partner after E2E pending reset", async () => {
-      const partner = {
-        name: generateRandomName(),
-        email: randomPartnerEmail(),
-        groupId: E2E_PARTNER_GROUP.id,
-        country: "US" as const,
-      };
-
-      const { data: created, status: createStatus } = await http.post<Partner>({
-        path: "/partners",
-        body: partner,
-      });
-
-      expect(createStatus).toEqual(201);
-      const partnerId = created.id;
-
-      const { status: seedStatus } = await http.post<{
-        partnerId: string;
-        programApplicationId: string;
-        reset: boolean;
-      }>({
-        path: "/e2e/partners/pending-program-application",
-        body: { partnerId, groupId: E2E_PARTNER_GROUP.id },
-      });
-      expect(seedStatus).toEqual(200);
-
-      const { data: rejectData, status: rejectStatus } = await http.post<{
-        partnerId: string;
-      }>({
-        path: "/partners/applications/reject",
-        body: {
-          partnerId,
-          rejectionReason: "other",
-          rejectionNote: "e2e: first rejection",
-          reapplicationTimeframe: "standard" as const,
-        },
-      });
-      expect(rejectStatus).toEqual(200);
-      expect(rejectData.partnerId).toBe(partnerId);
-
-      const { status: duplicateRejectStatus } = await http.post({
-        path: "/partners/applications/reject",
-        body: {
-          partnerId,
-          rejectionReason: "other",
-          rejectionNote: "e2e: should fail",
-          reapplicationTimeframe: "standard" as const,
-        },
-      });
-      expect(duplicateRejectStatus).toEqual(400);
-
-      const { status: resetStatus } = await http.post({
-        path: "/e2e/partners/pending-program-application",
-        body: { partnerId, groupId: E2E_PARTNER_GROUP.id },
-      });
-      expect(resetStatus).toEqual(200);
-
-      const { data: approveData, status: approveStatus } = await http.post<{
-        partnerId: string;
-      }>({
-        path: "/partners/applications/approve",
-        body: {
-          partnerId,
-          groupId: E2E_PARTNER_GROUP.id,
-        },
-      });
-      expect(approveStatus).toEqual(200);
-      expect(approveData.partnerId).toBe(partnerId);
-
-      const { data: enrolled, status: getStatus } = await http.get<{
-        id: string;
-        status: string;
-      }>({
-        path: `/partners/${partnerId}`,
-      });
-      expect(getStatus).toEqual(200);
-      expect(enrolled.id).toBe(partnerId);
-      expect(enrolled.status).toBe("approved");
-    });
-  },
-);
diff --git a/apps/web/tests/partners/applications/list-partner-applications.test.ts b/apps/web/tests/partners/applications/list-partner-applications.test.ts
deleted file mode 100644
index 63c9524674a..00000000000
--- a/apps/web/tests/partners/applications/list-partner-applications.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { PartnerApplicationProps } from "@/lib/types";
-import { PartnerApplicationSchema } from "@/lib/zod/schemas/program-application";
-import { describe, expect, test } from "vitest";
-import { IntegrationHarness } from "../../utils/integration";
-import { E2E_PARTNER_GROUP, E2E_PARTNERS } from "../../utils/resource";
-
-describe.sequential("GET /partners/applications", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  test("returns a list of pending partner applications", async () => {
-    const { data, status } = await http.get<PartnerApplicationProps[]>({
-      path: "/partners/applications",
-    });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(data)).toBe(true);
-
-    data.forEach((application) => {
-      const parsed = PartnerApplicationSchema.parse(application);
-      expect(parsed.partner.status).toBe("pending");
-    });
-  });
-
-  test("filters applications by country", async () => {
-    const country = E2E_PARTNERS[0]!.country;
-
-    const { data, status } = await http.get<PartnerApplicationProps[]>({
-      path: "/partners/applications",
-      query: { country },
-    });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(data)).toBe(true);
-
-    data.forEach((application) => {
-      const parsed = PartnerApplicationSchema.parse(application);
-      expect(parsed.partner.country).toBe(country);
-      expect(parsed.partner.status).toBe("pending");
-    });
-  });
-
-  test("filters applications by groupId", async () => {
-    const { data, status } = await http.get<PartnerApplicationProps[]>({
-      path: "/partners/applications",
-      query: { groupId: E2E_PARTNER_GROUP.id },
-    });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(data)).toBe(true);
-
-    data.forEach((application) => {
-      const parsed = PartnerApplicationSchema.parse(application);
-      expect(parsed.partner.groupId).toBe(E2E_PARTNER_GROUP.id);
-      expect(parsed.partner.status).toBe("pending");
-    });
-  });
-
-  test("respects pageSize pagination", async () => {
-    const { data, status } = await http.get<PartnerApplicationProps[]>({
-      path: "/partners/applications",
-      query: { page: "1", pageSize: "1" },
-    });
-
-    expect(status).toEqual(200);
-    expect(Array.isArray(data)).toBe(true);
-    expect(data.length).toBeLessThanOrEqual(1);
-
-    data.forEach((application) => {
-      PartnerApplicationSchema.parse(application);
-    });
-  });
-});
diff --git a/apps/web/tests/partners/backfill-partner-search-args.test.ts b/apps/web/tests/partners/backfill-partner-search-args.test.ts
new file mode 100644
index 00000000000..a42ffc3a960
--- /dev/null
+++ b/apps/web/tests/partners/backfill-partner-search-args.test.ts
@@ -0,0 +1,103 @@
+import {
+  DEFAULT_BATCH_SIZE,
+  MAX_BATCH_SIZE,
+  parseBackfillArguments,
+} from "@/scripts/partners/backfill-partner-search-args";
+import { describe, expect, it } from "vitest";
+
+describe("parseBackfillArguments", () => {
+  it("refuses to run bare, so a full backfill cannot start by accident", () => {
+    expect(() => parseBackfillArguments([])).toThrow(
+      "Pass --programId=<id> for one program, or --all for every program.",
+    );
+  });
+
+  it("takes a single program", () => {
+    expect(parseBackfillArguments(["--programId=prog_1"])).toEqual({
+      programId: "prog_1",
+      all: false,
+      batchSize: DEFAULT_BATCH_SIZE,
+      after: undefined,
+      afterProgram: undefined,
+    });
+  });
+
+  it("takes every program behind an explicit flag", () => {
+    expect(parseBackfillArguments(["--all"])).toEqual({
+      programId: undefined,
+      all: true,
+      batchSize: DEFAULT_BATCH_SIZE,
+      after: undefined,
+      afterProgram: undefined,
+    });
+  });
+
+  it("rejects one program and every program together", () => {
+    expect(() =>
+      parseBackfillArguments(["--programId=prog_1", "--all"]),
+    ).toThrow("--programId and --all are mutually exclusive.");
+  });
+
+  it("resumes a single-program run from an enrollment", () => {
+    expect(
+      parseBackfillArguments(["--programId=prog_1", "--after=pge_9"]),
+    ).toMatchObject({
+      programId: "prog_1",
+      after: "pge_9",
+    });
+  });
+
+  it("resumes an --all run from both halves of the cursor", () => {
+    expect(
+      parseBackfillArguments([
+        "--all",
+        "--afterProgram=prog_5",
+        "--after=pge_9",
+      ]),
+    ).toMatchObject({
+      all: true,
+      afterProgram: "prog_5",
+      after: "pge_9",
+    });
+  });
+
+  it("rejects an enrollment cursor with no program on an --all run", () => {
+    expect(() => parseBackfillArguments(["--all", "--after=pge_9"])).toThrow(
+      "--after requires --afterProgram on an --all run.",
+    );
+  });
+
+  it("rejects a program cursor on a single-program run", () => {
+    expect(() =>
+      parseBackfillArguments(["--programId=prog_1", "--afterProgram=prog_5"]),
+    ).toThrow("--afterProgram only applies to --all runs.");
+  });
+
+  it("rejects empty cursors, which would silently mean no cursor", () => {
+    expect(() => parseBackfillArguments(["--all", "--afterProgram="])).toThrow(
+      "--afterProgram cannot be empty.",
+    );
+    expect(() =>
+      parseBackfillArguments(["--programId=prog_1", "--after="]),
+    ).toThrow("--after cannot be empty.");
+    expect(() => parseBackfillArguments(["--programId="])).toThrow(
+      "Pass --programId=<id> for one program, or --all for every program.",
+    );
+  });
+
+  it("caps the batch size", () => {
+    expect(
+      parseBackfillArguments(["--all", `--batchSize=${MAX_BATCH_SIZE}`]),
+    ).toMatchObject({ batchSize: MAX_BATCH_SIZE });
+
+    expect(() =>
+      parseBackfillArguments(["--all", `--batchSize=${MAX_BATCH_SIZE + 1}`]),
+    ).toThrow(`--batchSize cannot exceed ${MAX_BATCH_SIZE}.`);
+  });
+
+  it("rejects an unknown argument rather than ignoring it", () => {
+    expect(() => parseBackfillArguments(["--all", "--dryRun"])).toThrow(
+      "Unknown argument: --dryRun",
+    );
+  });
+});
diff --git a/apps/web/tests/partners/create-partner-link.test.ts b/apps/web/tests/partners/create-partner-link.test.ts
index dedcbea5166..a1f599cf087 100644
--- a/apps/web/tests/partners/create-partner-link.test.ts
+++ b/apps/web/tests/partners/create-partner-link.test.ts
@@ -1,3 +1,4 @@
+import { nanoid } from "@dub/utils";
 import { Link } from "@prisma/client";
 import { expect, onTestFinished, test } from "vitest";
 import { IntegrationHarness } from "../utils/integration";
@@ -24,3 +25,28 @@ test("POST /api/partners/links", async () => {
   expect(LinkSchema.strict().parse(link)).toBeTruthy();
   expect(link).toStrictEqual(partnerLink);
 });
+
+test("POST /api/partners/links with a URL outside additionalLinks", async () => {
+  const h = new IntegrationHarness();
+  const { http } = await h.init();
+  const url = `https://github.com/dubinc/${nanoid()}`;
+
+  onTestFinished(async () => {
+    await h.deleteLink(link.id);
+  });
+
+  const { status, data: link } = await http.post<Link>({
+    path: "/partners/links",
+    body: {
+      partnerId: E2E_PARTNER.id,
+      url,
+    },
+  });
+
+  expect(status).toEqual(201);
+  expect(LinkSchema.strict().parse(link)).toBeTruthy();
+  expect(link).toStrictEqual({
+    ...partnerLink,
+    url,
+  });
+});
diff --git a/apps/web/tests/partners/get-partners-count-search.test.ts b/apps/web/tests/partners/get-partners-count-search.test.ts
new file mode 100644
index 00000000000..1d0e0e2b2c1
--- /dev/null
+++ b/apps/web/tests/partners/get-partners-count-search.test.ts
@@ -0,0 +1,341 @@
+import { getPartnersCount } from "@/lib/api/partners/get-partners-count";
+import {
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  PartnerSearchProvider,
+} from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  count: vi.fn(),
+  enrollmentGroupBy: vi.fn(),
+  partnerGroupBy: vi.fn(),
+  partnerTagGroupBy: vi.fn(),
+  applicationEventGroupBy: vi.fn(),
+  programFindUnique: vi.fn(),
+}));
+
+vi.mock("@/lib/prisma", () => ({
+  sanitizeFullTextSearch: (value: string) => value,
+  prisma: {
+    programEnrollment: {
+      count: mocks.count,
+      groupBy: mocks.enrollmentGroupBy,
+    },
+    partner: { groupBy: mocks.partnerGroupBy, findUnique: vi.fn() },
+    programPartnerTag: { groupBy: mocks.partnerTagGroupBy },
+    programApplicationEvent: { groupBy: mocks.applicationEventGroupBy },
+    program: { findUnique: mocks.programFindUnique },
+  },
+}));
+
+function createSearchProvider(total = 12_000): PartnerSearchProvider {
+  return {
+    searchCandidates: vi.fn().mockResolvedValue({
+      hits: [{ id: "pge_2" }, { id: "pge_1" }],
+    }),
+    countCandidates: vi.fn().mockResolvedValue(total),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  };
+}
+
+describe("getPartnersCount search", () => {
+  beforeEach(() => {
+    for (const mock of Object.values(mocks)) {
+      mock.mockReset();
+    }
+  });
+
+  it("counts a pasted program short link by its key", async () => {
+    const searchProvider = createSearchProvider(1);
+    mocks.programFindUnique.mockResolvedValue({ domain: "go.acme.com" });
+
+    const count = await getPartnersCount<number>(
+      {
+        programId: "prog_test",
+        search: "https://go.acme.com/partner",
+        status: "approved",
+      },
+      { searchProvider },
+    );
+
+    expect(count).toBe(1);
+    expect(searchProvider.searchCandidates).toHaveBeenCalledWith(
+      expect.objectContaining({ query: "partner" }),
+    );
+    expect(searchProvider.countCandidates).toHaveBeenCalledWith(
+      expect.objectContaining({ query: "partner" }),
+    );
+  });
+
+  it("reports the truncated candidate count when the total exceeds the candidate ceiling", async () => {
+    const searchProvider = createSearchProvider(12_000);
+    mocks.count.mockResolvedValue(PARTNER_SEARCH_CANDIDATE_LIMIT);
+
+    const count = await getPartnersCount<number>(
+      {
+        programId: "prog_test",
+        search: "examp",
+        status: "approved",
+        country: ["CA"],
+      },
+      { searchProvider },
+    );
+
+    expect(count).toBe(PARTNER_SEARCH_CANDIDATE_LIMIT);
+    expect(searchProvider.countCandidates).toHaveBeenCalledWith({
+      programId: "prog_test",
+      query: "examp",
+      limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+      filters: {
+        status: { values: ["approved"], exclude: false },
+        groupId: undefined,
+        country: { values: ["CA"], exclude: false },
+        partnerTagIds: undefined,
+      },
+    });
+    expect(mocks.count).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    ["a tenant ID", { tenantId: "tenant_1" }],
+    ["explicit partner IDs", { partnerIds: ["pn_1"] }],
+    ["a metric range", { totalClicksMin: 10 }],
+    ["a referral filter", { referredByPartnerId: "pn_referrer" }],
+  ])(
+    "falls back to the database count when the provider cannot see %s",
+    async (_label, extra) => {
+      // The aggregation only knows the filters it was given, so counting with
+      // one of these applied would over-count.
+      const searchProvider = createSearchProvider(12_000);
+      mocks.count.mockResolvedValue(2);
+
+      const count = await getPartnersCount<number>(
+        { programId: "prog_test", search: "examp", ...extra },
+        { searchProvider },
+      );
+
+      expect(count).toBe(2);
+      expect(searchProvider.countCandidates).not.toHaveBeenCalled();
+      expect(mocks.count).toHaveBeenCalled();
+    },
+  );
+
+  it("falls back to the database count when the provider declines to count", async () => {
+    const searchProvider = createSearchProvider();
+    (
+      searchProvider.countCandidates as ReturnType<typeof vi.fn>
+    ).mockResolvedValue(null);
+    mocks.count.mockResolvedValue(5);
+
+    const count = await getPartnersCount<number>(
+      { programId: "prog_test", search: "a" },
+      { searchProvider },
+    );
+
+    expect(count).toBe(5);
+  });
+
+  it("falls back to the database count when the aggregation fails", async () => {
+    const searchProvider = createSearchProvider();
+    (
+      searchProvider.countCandidates as ReturnType<typeof vi.fn>
+    ).mockRejectedValue(new Error("aggregation down"));
+    mocks.count.mockResolvedValue(2);
+    vi.spyOn(console, "error").mockImplementation(() => {});
+
+    const count = await getPartnersCount<number>(
+      { programId: "prog_test", search: "examp" },
+      { searchProvider },
+    );
+
+    expect(count).toBe(2);
+  });
+
+  it("groups database-filtered relevance candidates", async () => {
+    const searchProvider = createSearchProvider();
+    mocks.enrollmentGroupBy.mockResolvedValue([
+      { status: "approved", _count: 1 },
+    ]);
+
+    const groups = await getPartnersCount<{ status: string; _count: number }[]>(
+      { programId: "prog_test", search: "examp", groupBy: "status" },
+      { searchProvider },
+    );
+
+    expect(mocks.enrollmentGroupBy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        by: ["status"],
+        where: expect.objectContaining({
+          programId: "prog_test",
+          id: { in: ["pge_2", "pge_1"] },
+        }),
+      }),
+    );
+    expect(groups).toEqual(
+      expect.arrayContaining([
+        { status: "approved", _count: 1 },
+        { status: "pending", _count: 0 },
+      ]),
+    );
+  });
+
+  it("scopes every database grouping path to relevance candidates", async () => {
+    const searchProvider = createSearchProvider();
+    mocks.partnerGroupBy.mockResolvedValue([]);
+    mocks.partnerTagGroupBy.mockResolvedValue([]);
+    mocks.applicationEventGroupBy.mockResolvedValue([]);
+
+    await getPartnersCount(
+      {
+        programId: "prog_test",
+        search: "examp",
+        groupBy: "country",
+      },
+      { searchProvider },
+    );
+    expect(mocks.partnerGroupBy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          programs: {
+            some: expect.objectContaining({
+              id: { in: ["pge_2", "pge_1"] },
+            }),
+          },
+        }),
+      }),
+    );
+
+    await getPartnersCount(
+      {
+        programId: "prog_test",
+        search: "examp",
+        groupBy: "partnerTagId",
+      },
+      { searchProvider },
+    );
+    expect(mocks.partnerTagGroupBy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          programEnrollment: expect.objectContaining({
+            id: { in: ["pge_2", "pge_1"] },
+          }),
+        }),
+      }),
+    );
+
+    await getPartnersCount(
+      {
+        programId: "prog_test",
+        search: "examp",
+        groupBy: "referredByPartnerId",
+      },
+      { searchProvider },
+    );
+    expect(mocks.applicationEventGroupBy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          programEnrollment: expect.objectContaining({
+            id: { in: ["pge_2", "pge_1"] },
+          }),
+        }),
+      }),
+    );
+  });
+
+  it("does not re-apply the database full-text search to grouped counts", async () => {
+    // The provider already resolved the query into candidate IDs. ANDing the
+    // database full-text predicate on top would drop every match the database
+    // cannot find on its own, which is exactly what the search index is for.
+    mocks.enrollmentGroupBy.mockResolvedValue([]);
+    mocks.partnerGroupBy.mockResolvedValue([]);
+    mocks.partnerTagGroupBy.mockResolvedValue([]);
+    mocks.applicationEventGroupBy.mockResolvedValue([]);
+    mocks.count.mockResolvedValue(0);
+
+    const groupings = [
+      { groupBy: "status", mock: mocks.enrollmentGroupBy, extra: {} },
+      { groupBy: "groupId", mock: mocks.enrollmentGroupBy, extra: {} },
+      { groupBy: "country", mock: mocks.partnerGroupBy, extra: {} },
+      { groupBy: "partnerTagId", mock: mocks.partnerTagGroupBy, extra: {} },
+      {
+        groupBy: "referredByPartnerId",
+        mock: mocks.applicationEventGroupBy,
+        extra: {},
+      },
+      // The ungrouped count only reaches the database when a database-only
+      // filter forces it to.
+      { groupBy: undefined, mock: mocks.count, extra: { totalClicksMin: 1 } },
+    ] as const;
+
+    for (const { groupBy, mock, extra } of groupings) {
+      mock.mockClear();
+
+      await getPartnersCount(
+        {
+          programId: "prog_test",
+          search: "examp",
+          ...extra,
+          ...(groupBy && { groupBy }),
+        },
+        { searchProvider: createSearchProvider() },
+      );
+
+      const { where } = mock.mock.calls.at(-1)![0];
+      expect(
+        JSON.stringify(where),
+        `groupBy: ${groupBy ?? "none"}`,
+      ).not.toContain('"search":"examp"');
+      expect(JSON.stringify(where), `groupBy: ${groupBy ?? "none"}`).toContain(
+        '"id":{"in":["pge_2","pge_1"]}',
+      );
+    }
+  });
+
+  it("keeps the database full-text search when no provider is configured", async () => {
+    mocks.enrollmentGroupBy.mockResolvedValue([]);
+
+    await getPartnersCount(
+      { programId: "prog_test", search: "examp", groupBy: "status" },
+      { searchProvider: null },
+    );
+
+    const { where } = mocks.enrollmentGroupBy.mock.calls.at(-1)![0];
+    expect(JSON.stringify(where)).toContain('"search":"examp"');
+  });
+
+  it("falls back to the database search path when the provider fails", async () => {
+    const searchProvider = createSearchProvider();
+    vi.mocked(searchProvider.searchCandidates).mockRejectedValue(
+      new Error("Provider Connection Timeout"),
+    );
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    mocks.count.mockResolvedValue(7);
+
+    const count = await getPartnersCount<number>(
+      { programId: "prog_test", search: "examp" },
+      { searchProvider },
+    );
+
+    expect(count).toBe(7);
+
+    const { where } = mocks.count.mock.calls.at(-1)![0];
+    expect(where.id).toBeUndefined();
+    expect(JSON.stringify(where)).toContain('"search":"examp"');
+    vi.mocked(console.error).mockRestore();
+  });
+
+  it("surfaces provider errors when the caller opts out of the fallback", async () => {
+    const searchProvider = createSearchProvider();
+    vi.mocked(searchProvider.searchCandidates).mockRejectedValue(
+      new Error("Provider Connection Timeout"),
+    );
+
+    await expect(
+      getPartnersCount<number>(
+        { programId: "prog_test", search: "examp" },
+        { searchProvider, throwOnSearchError: true },
+      ),
+    ).rejects.toThrow("Provider Connection Timeout");
+  });
+});
diff --git a/apps/web/tests/partners/get-partners-route-query.test.ts b/apps/web/tests/partners/get-partners-route-query.test.ts
new file mode 100644
index 00000000000..a59f71f129b
--- /dev/null
+++ b/apps/web/tests/partners/get-partners-route-query.test.ts
@@ -0,0 +1,91 @@
+import {
+  getPartnersRouteQuerySchema,
+  partnersExportQuerySchema,
+} from "@/lib/zod/schemas/partners";
+import { describe, expect, it } from "vitest";
+
+const accepts = (params: Record<string, unknown>) =>
+  getPartnersRouteQuerySchema.safeParse(params).success;
+
+describe("getPartnersRouteQuerySchema", () => {
+  it("accepts the shapes the partners table sends", () => {
+    expect(accepts({ sortBy: "relevance", search: "examp" })).toBe(true);
+    expect(
+      accepts({ sortBy: "relevance", search: "examp", sortOrder: "desc" }),
+    ).toBe(true);
+    expect(accepts({ search: "examp" })).toBe(true);
+    expect(accepts({ sortBy: "totalClicks", sortOrder: "asc" })).toBe(true);
+    expect(accepts({ email: "partner@example.com" })).toBe(true);
+    expect(accepts({ tenantId: "tenant_1" })).toBe(true);
+  });
+
+  it("still accepts the legacy sort aliases", () => {
+    for (const sortBy of [
+      "clicks",
+      "leads",
+      "conversions",
+      "sales",
+      "saleAmount",
+      "totalSales",
+    ]) {
+      expect(accepts({ sortBy })).toBe(true);
+    }
+  });
+
+  it("rejects relevance without a query the provider can rank", () => {
+    expect(accepts({ sortBy: "relevance" })).toBe(false);
+    expect(accepts({ sortBy: "relevance", search: "" })).toBe(false);
+    expect(accepts({ sortBy: "relevance", search: "   " })).toBe(false);
+  });
+
+  it("rejects relevance alongside an exact email lookup", () => {
+    expect(
+      accepts({ sortBy: "relevance", search: "examp", email: "a@b.co" }),
+    ).toBe(false);
+  });
+
+  it("rejects relevance alongside a tenant filter", () => {
+    expect(
+      accepts({ sortBy: "relevance", search: "examp", tenantId: "t_1" }),
+    ).toBe(false);
+  });
+
+  it("rejects ascending relevance", () => {
+    expect(
+      accepts({ sortBy: "relevance", search: "examp", sortOrder: "asc" }),
+    ).toBe(false);
+  });
+
+  it("explains why the request was rejected", () => {
+    const result = getPartnersRouteQuerySchema.safeParse({
+      sortBy: "relevance",
+    });
+
+    expect(result.success).toBe(false);
+    expect(result.error?.issues[0].message).toContain(
+      "sortBy=relevance requires a non-empty search",
+    );
+  });
+});
+
+describe("partnersExportQuerySchema", () => {
+  // Exports do not apply the search field: its provider results are capped at
+  // the candidate ceiling, so exporting them would silently truncate the file.
+  it("strips the search field", () => {
+    const result = partnersExportQuerySchema.safeParse({
+      sortBy: "totalSaleAmount",
+      search: "examp",
+    });
+
+    expect(result.success).toBe(true);
+    expect(result.data).not.toHaveProperty("search");
+  });
+
+  it("rejects relevance, which cannot exist without a search", () => {
+    expect(
+      partnersExportQuerySchema.safeParse({
+        sortBy: "relevance",
+      }).success,
+    ).toBe(false);
+  });
+});
diff --git a/apps/web/tests/partners/get-partners-search.test.ts b/apps/web/tests/partners/get-partners-search.test.ts
new file mode 100644
index 00000000000..2d53955e6ec
--- /dev/null
+++ b/apps/web/tests/partners/get-partners-search.test.ts
@@ -0,0 +1,315 @@
+import { getPartners } from "@/lib/api/partners/get-partners";
+import {
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  PartnerSearchProvider,
+} from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  findMany: vi.fn(),
+  programFindUnique: vi.fn(),
+}));
+
+vi.mock("@/lib/prisma", () => ({
+  sanitizeFullTextSearch: (value: string) => value,
+  prisma: {
+    programEnrollment: {
+      findMany: mocks.findMany,
+    },
+    program: { findUnique: mocks.programFindUnique },
+  },
+}));
+
+function enrollment(id: string, partnerId: string) {
+  return {
+    id,
+    programId: "prog_test",
+    partnerId,
+    createdAt: new Date("2026-01-01T00:00:00.000Z"),
+    totalSaleAmount: BigInt(0),
+    totalCommissions: BigInt(0),
+    partner: {
+      id: partnerId,
+      platforms: [],
+    },
+    links: [],
+    programPartnerTags: [],
+  };
+}
+
+function createSearchProvider(
+  hits: { id: string }[] = [],
+): PartnerSearchProvider {
+  return {
+    searchCandidates: vi.fn().mockResolvedValue({ hits }),
+    countCandidates: vi.fn(),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  };
+}
+
+describe("getPartners search", () => {
+  beforeEach(() => {
+    mocks.findMany.mockReset();
+    mocks.programFindUnique.mockReset();
+  });
+
+  it("searches a pasted program short link by its key", async () => {
+    mocks.findMany.mockResolvedValue([enrollment("pge_1", "pn_1")]);
+    mocks.programFindUnique.mockResolvedValue({ domain: "go.acme.com" });
+    const searchProvider = createSearchProvider([{ id: "pge_1" }]);
+
+    await getPartners(
+      {
+        programId: "prog_test",
+        search: "https://go.acme.com/partner",
+        page: 1,
+        pageSize: 25,
+        sortBy: "totalSaleAmount",
+        sortOrder: "desc",
+      },
+      { searchProvider },
+    );
+
+    expect(searchProvider.searchCandidates).toHaveBeenCalledWith(
+      expect.objectContaining({ query: "partner" }),
+    );
+  });
+
+  it("hydrates only tags that still belong to the program", async () => {
+    // Deleting a tag nulls its programId first and removes the associations
+    // in a later job, so the relation must filter on the tag, not the link.
+    mocks.findMany.mockResolvedValue([enrollment("pge_1", "pn_1")]);
+
+    await getPartners(
+      {
+        programId: "prog_test",
+        page: 1,
+        pageSize: 25,
+        sortBy: "totalSaleAmount",
+        sortOrder: "desc",
+      },
+      { searchProvider: null },
+    );
+
+    const { include } = mocks.findMany.mock.calls.at(-1)![0];
+    expect(include.programPartnerTags).toEqual({
+      where: { partnerTag: { programId: "prog_test" } },
+      include: { partnerTag: true },
+    });
+  });
+
+  it("keeps a tenant filter on the database search path", async () => {
+    // tenantId predates the search provider, so `tenantId` + `search` still
+    // resolves entirely in the database rather than inheriting the candidate
+    // ceiling.
+    mocks.findMany.mockResolvedValue([enrollment("pge_1", "pn_1")]);
+    const searchProvider = createSearchProvider([{ id: "pge_1" }]);
+
+    await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        tenantId: "tenant_1",
+        page: 1,
+        pageSize: 25,
+        sortBy: "totalSaleAmount",
+        sortOrder: "desc",
+      },
+      { searchProvider },
+    );
+
+    expect(searchProvider.searchCandidates).not.toHaveBeenCalled();
+
+    const { where } = mocks.findMany.mock.calls.at(-1)![0];
+    expect(where).toMatchObject({ tenantId: "tenant_1" });
+    expect(where.id).toBeUndefined();
+    expect(JSON.stringify(where)).toContain('"search":"examp"');
+  });
+
+  it("lets the database filter, sort, and paginate search candidates", async () => {
+    mocks.findMany.mockResolvedValue([
+      enrollment("pge_1", "pn_1"),
+      enrollment("pge_2", "pn_2"),
+    ]);
+    const searchProvider = createSearchProvider([
+      { id: "pge_2" },
+      { id: "pge_1" },
+    ]);
+
+    const partners = await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        page: 1,
+        pageSize: 25,
+        sortBy: "totalSaleAmount",
+        sortOrder: "desc",
+        status: "approved",
+      },
+      { searchProvider },
+    );
+
+    // The status filter reaches the provider, so it narrows before the ranking
+    // truncates rather than after.
+    expect(searchProvider.searchCandidates).toHaveBeenCalledWith({
+      programId: "prog_test",
+      query: "examp",
+      limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+      filters: {
+        status: { values: ["approved"], exclude: false },
+        groupId: undefined,
+        country: undefined,
+        partnerTagIds: undefined,
+      },
+    });
+    expect(mocks.findMany).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          programId: "prog_test",
+          status: "approved",
+          id: { in: ["pge_2", "pge_1"] },
+        }),
+        take: 25,
+        skip: 0,
+        orderBy: { totalSaleAmount: "desc" },
+      }),
+    );
+    expect(partners.map(({ id }) => id)).toEqual(["pn_1", "pn_2"]);
+  });
+
+  it("hydrates only the requested page, in relevance order", async () => {
+    // Relevance order cannot be expressed in SQL, so the page is chosen in
+    // memory. The first query resolves surviving candidates as bare IDs; only
+    // the page itself is hydrated.
+    mocks.findMany
+      .mockResolvedValueOnce([{ id: "pge_3" }, { id: "pge_1" }])
+      .mockResolvedValueOnce([enrollment("pge_3", "pn_3")]);
+    const searchProvider = createSearchProvider([
+      { id: "pge_1" },
+      { id: "pge_2" },
+      { id: "pge_3" },
+    ]);
+
+    const partners = await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        page: 2,
+        pageSize: 1,
+        sortBy: "relevance",
+        sortOrder: "desc",
+      },
+      { searchProvider },
+    );
+
+    const [idQuery] = mocks.findMany.mock.calls[0];
+    expect(idQuery.select).toEqual({ id: true });
+    expect(idQuery.include).toBeUndefined();
+
+    // pge_1 ranks first and lands on page 1, so page 2 hydrates only pge_3.
+    // The candidate filters stay on the query so IDs from another program
+    // cannot leak through.
+    const [pageQuery] = mocks.findMany.mock.calls[1];
+    expect(pageQuery.where).toMatchObject({
+      programId: "prog_test",
+      id: { in: ["pge_3"] },
+    });
+    expect(pageQuery.include).toBeDefined();
+    expect(pageQuery.take).toBeUndefined();
+
+    expect(partners.map(({ id }) => id)).toEqual(["pn_3"]);
+  });
+
+  it("skips the hydration query when the page is empty", async () => {
+    mocks.findMany.mockResolvedValueOnce([{ id: "pge_1" }]);
+    const searchProvider = createSearchProvider([{ id: "pge_1" }]);
+
+    const partners = await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        page: 5,
+        pageSize: 25,
+        sortBy: "relevance",
+        sortOrder: "desc",
+      },
+      { searchProvider },
+    );
+
+    expect(partners).toEqual([]);
+    expect(mocks.findMany).toHaveBeenCalledTimes(1);
+  });
+
+  it("falls back to the database search path when the provider fails", async () => {
+    const searchProvider = createSearchProvider();
+    vi.mocked(searchProvider.searchCandidates).mockRejectedValue(
+      new Error("Provider Connection Timeout"),
+    );
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    mocks.findMany.mockResolvedValue([enrollment("pge_1", "pn_1")]);
+
+    const partners = await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        page: 1,
+        pageSize: 25,
+        sortBy: "totalSaleAmount",
+        sortOrder: "desc",
+      },
+      { searchProvider },
+    );
+
+    expect(partners).toHaveLength(1);
+
+    // The database keeps its own search predicate and no candidate filter.
+    const { where } = mocks.findMany.mock.calls.at(-1)![0];
+    expect(where.id).toBeUndefined();
+    expect(JSON.stringify(where)).toContain('"search":"examp"');
+    vi.mocked(console.error).mockRestore();
+  });
+
+  it("surfaces provider errors when the caller opts out of the fallback", async () => {
+    const searchProvider = createSearchProvider();
+    vi.mocked(searchProvider.searchCandidates).mockRejectedValue(
+      new Error("Provider Connection Timeout"),
+    );
+
+    await expect(
+      getPartners(
+        {
+          programId: "prog_test",
+          search: "examp",
+          page: 1,
+          pageSize: 25,
+          sortBy: "totalSaleAmount",
+          sortOrder: "desc",
+        },
+        { searchProvider, throwOnSearchError: true },
+      ),
+    ).rejects.toThrow("Provider Connection Timeout");
+  });
+
+  it("uses the existing database sort when relevance has no provider", async () => {
+    mocks.findMany.mockResolvedValue([]);
+
+    await getPartners(
+      {
+        programId: "prog_test",
+        search: "examp",
+        page: 1,
+        pageSize: 25,
+        sortBy: "relevance",
+        sortOrder: "desc",
+      },
+      { searchProvider: null },
+    );
+
+    expect(mocks.findMany).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderBy: { totalSaleAmount: "desc" },
+      }),
+    );
+  });
+});
diff --git a/apps/web/tests/partners/get-reporting-period.test.ts b/apps/web/tests/partners/get-reporting-period.test.ts
new file mode 100644
index 00000000000..576dc610b71
--- /dev/null
+++ b/apps/web/tests/partners/get-reporting-period.test.ts
@@ -0,0 +1,40 @@
+import { getReportingPeriod } from "@/lib/jobs/handlers/send-partner-program-summary-job";
+import { describe, expect, it } from "vitest";
+
+describe("getReportingPeriod", () => {
+  it("returns UTC month bounds for a mid-year month", () => {
+    const period = getReportingPeriod("2026-08");
+
+    expect(period.month).toBe("August 2026");
+    expect(period.currentMonth.toISOString()).toBe("2026-08-01T00:00:00.000Z");
+    expect(period.previousMonth.toISOString()).toBe("2026-07-01T00:00:00.000Z");
+    expect(period.start).toBe("2026-08-01T00:00:00.000Z");
+    expect(period.end).toBe("2026-08-31T23:59:59.999Z");
+  });
+
+  it("rolls the previous month into the prior year for January", () => {
+    const period = getReportingPeriod("2026-01");
+
+    expect(period.month).toBe("January 2026");
+    expect(period.currentMonth.toISOString()).toBe("2026-01-01T00:00:00.000Z");
+    expect(period.previousMonth.toISOString()).toBe("2025-12-01T00:00:00.000Z");
+    expect(period.start).toBe("2026-01-01T00:00:00.000Z");
+    expect(period.end).toBe("2026-01-31T23:59:59.999Z");
+  });
+
+  it("uses the last day of February for a non-leap year", () => {
+    const period = getReportingPeriod("2025-02");
+
+    expect(period.month).toBe("February 2025");
+    expect(period.start).toBe("2025-02-01T00:00:00.000Z");
+    expect(period.end).toBe("2025-02-28T23:59:59.999Z");
+  });
+
+  it("uses the last day of February for a leap year", () => {
+    const period = getReportingPeriod("2024-02");
+
+    expect(period.month).toBe("February 2024");
+    expect(period.start).toBe("2024-02-01T00:00:00.000Z");
+    expect(period.end).toBe("2024-02-29T23:59:59.999Z");
+  });
+});
diff --git a/apps/web/tests/partners/partner-email-search-where.test.ts b/apps/web/tests/partners/partner-email-search-where.test.ts
new file mode 100644
index 00000000000..a66c6880cf2
--- /dev/null
+++ b/apps/web/tests/partners/partner-email-search-where.test.ts
@@ -0,0 +1,36 @@
+import { buildPartnerEmailSearchWhere } from "@/lib/api/partners/program-enrollment-query";
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("@/lib/prisma", () => ({
+  sanitizeFullTextSearch: (value: string) => value,
+}));
+
+describe("buildPartnerEmailSearchWhere", () => {
+  // The candidate path decides the exact routes on the trimmed value, so this
+  // builder must judge the same value: a pasted " pn_… " is routed to the
+  // database as an exact ID, and an untrimmed exact match would find nothing.
+  it.each([
+    [
+      "a padded partner ID",
+      " pn_dlszeepb38rvcnrfbd0srkzb ",
+      { id: "pn_dlszeepb38rvcnrfbd0srkzb" },
+    ],
+    ["a padded email", " steven@dub.co ", { email: "steven@dub.co" }],
+  ])("trims %s before the exact match", (_label, search, expected) => {
+    expect(buildPartnerEmailSearchWhere({ search })).toEqual(expected);
+  });
+
+  it("full-text searches the trimmed free text", () => {
+    expect(buildPartnerEmailSearchWhere({ search: " steven " })).toEqual({
+      OR: [
+        { email: { search: "steven" } },
+        { name: { search: "steven" } },
+        { companyName: { search: "steven" } },
+      ],
+    });
+  });
+
+  it("treats a blank search as absent", () => {
+    expect(buildPartnerEmailSearchWhere({ search: "   " })).toEqual({});
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-backfill.test.ts b/apps/web/tests/partners/partner-search-backfill.test.ts
new file mode 100644
index 00000000000..0e69d05d439
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-backfill.test.ts
@@ -0,0 +1,131 @@
+import {
+  backfillPartnerSearch,
+  partnerSearchDocumentSelect,
+  type PartnerSearchDocumentSource,
+  type PartnerSearchProvider,
+} from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  findMany: vi.fn(),
+}));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: {
+    programEnrollment: {
+      findMany: mocks.findMany,
+    },
+  },
+}));
+
+function createSource(id: string): PartnerSearchDocumentSource {
+  return {
+    id,
+    programId: "prog_test",
+    partnerId: `pn_${id}`,
+    status: "approved" as const,
+    tenantId: null,
+    groupId: null,
+    partner: {
+      name: "Rafi Hasan",
+      email: "partner@example.com",
+      companyName: "Dub Partners",
+      description: "Developer tools educator",
+      country: null,
+      platforms: [],
+    },
+    links: [],
+    programPartnerTags: [],
+  };
+}
+
+function createProvider(): PartnerSearchProvider {
+  return {
+    searchCandidates: vi.fn(),
+    countCandidates: vi.fn(),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  };
+}
+
+describe("backfillPartnerSearch", () => {
+  beforeEach(() => {
+    mocks.findMany.mockReset();
+  });
+
+  it("indexes documents in keyset-paginated batches", async () => {
+    const searchProvider = createProvider();
+    const onProgress = vi.fn();
+    mocks.findMany
+      .mockResolvedValueOnce([createSource("pge_1"), createSource("pge_2")])
+      .mockResolvedValueOnce([createSource("pge_3")]);
+
+    const result = await backfillPartnerSearch({
+      programId: "prog_test",
+      batchSize: 2,
+      searchProvider,
+      onProgress,
+    });
+
+    expect(mocks.findMany).toHaveBeenNthCalledWith(1, {
+      where: { programId: "prog_test" },
+      select: partnerSearchDocumentSelect,
+      orderBy: { id: "asc" },
+      take: 2,
+    });
+    expect(mocks.findMany).toHaveBeenNthCalledWith(2, {
+      where: {
+        programId: "prog_test",
+        id: { gt: "pge_2" },
+      },
+      select: partnerSearchDocumentSelect,
+      orderBy: { id: "asc" },
+      take: 2,
+    });
+    expect(searchProvider.upsert).toHaveBeenCalledTimes(2);
+    expect(onProgress).toHaveBeenLastCalledWith({
+      batchSize: 1,
+      processed: 3,
+      lastDocumentId: "pge_3",
+    });
+    expect(result).toEqual({
+      processed: 3,
+      lastDocumentId: "pge_3",
+    });
+  });
+
+  it("resumes after a document ID", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValue([]);
+
+    const result = await backfillPartnerSearch({
+      programId: "prog_test",
+      after: "pge_100",
+      searchProvider,
+    });
+
+    expect(mocks.findMany).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: {
+          programId: "prog_test",
+          id: { gt: "pge_100" },
+        },
+      }),
+    );
+    expect(result).toEqual({
+      processed: 0,
+      lastDocumentId: "pge_100",
+    });
+  });
+
+  it("requires a configured provider", async () => {
+    await expect(
+      backfillPartnerSearch({
+        programId: "prog_test",
+        searchProvider: null,
+      }),
+    ).rejects.toThrow("Partner search provider is not configured.");
+
+    expect(mocks.findMany).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-document.test.ts b/apps/web/tests/partners/partner-search-document.test.ts
new file mode 100644
index 00000000000..010318c3c00
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-document.test.ts
@@ -0,0 +1,55 @@
+import {
+  PartnerSearchDocumentSource,
+  serializePartnerSearchDocument,
+} from "@/lib/api/partners/search";
+import { describe, expect, it } from "vitest";
+
+const source: PartnerSearchDocumentSource = {
+  id: "pge_test",
+  programId: "prog_test",
+  partnerId: "pn_test",
+  status: "approved" as const,
+  tenantId: null,
+  groupId: "grp_test",
+  partner: {
+    name: "Rafi Hasan",
+    email: "partner@example.com",
+    companyName: "Dub Partners",
+    description: "Developer tools educator",
+    country: "US",
+    platforms: [
+      {
+        type: "website",
+        identifier: "https://rafi.dev",
+      },
+      {
+        type: "twitter",
+        identifier: "@rafi-on-x",
+      },
+    ],
+  },
+  links: [{ key: "rafi" }, { key: "rafi-tools" }],
+  programPartnerTags: [{ partnerTagId: "ptag_a" }, { partnerTagId: "ptag_a" }],
+};
+
+describe("serializePartnerSearchDocument", () => {
+  it("serializes all partner search fields", () => {
+    expect(serializePartnerSearchDocument(source)).toEqual({
+      id: "pge_test",
+      programId: "prog_test",
+      partnerId: "pn_test",
+      name: "Rafi Hasan",
+      email: "partner@example.com",
+      companyName: "Dub Partners",
+      description: "Developer tools educator",
+      platformTypes: ["website", "twitter"],
+      platformIdentifiers: ["https://rafi.dev", "@rafi-on-x"],
+      linkKeys: ["rafi", "rafi-tools"],
+      status: "approved",
+      tenantId: null,
+      groupId: "grp_test",
+      country: "US",
+      partnerTagIds: ["ptag_a"],
+    });
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-find-candidates.test.ts b/apps/web/tests/partners/partner-search-find-candidates.test.ts
new file mode 100644
index 00000000000..e06bc59b640
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-find-candidates.test.ts
@@ -0,0 +1,102 @@
+import type { PartnerSearchProvider } from "@/lib/api/partners/search";
+import { findPartnerSearchCandidates } from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({ findUnique: vi.fn() }));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: { partner: { findUnique: mocks.findUnique } },
+}));
+
+function createProvider(
+  searchCandidates = vi.fn().mockResolvedValue({ hits: [{ id: "pge_1" }] }),
+) {
+  return {
+    searchCandidates,
+    countCandidates: vi.fn(),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  } as unknown as PartnerSearchProvider & {
+    searchCandidates: typeof searchCandidates;
+  };
+}
+
+const query = (search: string) => ({
+  programId: "prog_1",
+  query: search,
+  limit: 10,
+});
+
+describe("findPartnerSearchCandidates", () => {
+  beforeEach(() => {
+    mocks.findUnique.mockReset();
+    vi.spyOn(console, "error").mockImplementation(() => {});
+  });
+
+  it("answers a known email from the database, without calling the provider", async () => {
+    mocks.findUnique.mockResolvedValue({ id: "pn_1" });
+    const provider = createProvider();
+
+    await expect(
+      findPartnerSearchCandidates(provider, query("steven@dub.co")),
+    ).resolves.toBeNull();
+
+    expect(mocks.findUnique).toHaveBeenCalledWith({
+      where: { email: "steven@dub.co" },
+      select: { id: true },
+    });
+    expect(provider.searchCandidates).not.toHaveBeenCalled();
+  });
+
+  it("falls back to the provider when no partner has that address", async () => {
+    // `steven@dub.co` on the way to `steven@dub.com` is a complete address that
+    // matches nothing, and n-grams still find the longer one.
+    mocks.findUnique.mockResolvedValue(null);
+    const provider = createProvider();
+
+    await expect(
+      findPartnerSearchCandidates(provider, query("steven@dub.co")),
+    ).resolves.toEqual({ hits: [{ id: "pge_1" }] });
+
+    expect(provider.searchCandidates).toHaveBeenCalledOnce();
+  });
+
+  it.each([
+    ["half-typed", "steven@"],
+    ["domain only", "@dub.co"],
+    ["no dot in the domain", "steven@dub"],
+    ["a name", "steven tey"],
+  ])(
+    "does not treat %s as an address, so the database is not queried",
+    async (_label, search) => {
+      const provider = createProvider();
+
+      await findPartnerSearchCandidates(provider, query(search));
+
+      expect(mocks.findUnique).not.toHaveBeenCalled();
+      expect(provider.searchCandidates).toHaveBeenCalledOnce();
+    },
+  );
+
+  it("degrades to the database search path when the provider throws", async () => {
+    const provider = createProvider(
+      vi.fn().mockRejectedValue(new Error("down")),
+    );
+
+    await expect(
+      findPartnerSearchCandidates(provider, query("steven")),
+    ).resolves.toBeNull();
+  });
+
+  it("surfaces provider failures when the caller opts in", async () => {
+    const provider = createProvider(
+      vi.fn().mockRejectedValue(new Error("down")),
+    );
+
+    await expect(
+      findPartnerSearchCandidates(provider, query("steven"), {
+        throwOnError: true,
+      }),
+    ).rejects.toThrow("down");
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-order.test.ts b/apps/web/tests/partners/partner-search-order.test.ts
new file mode 100644
index 00000000000..de3cd2fd44a
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-order.test.ts
@@ -0,0 +1,21 @@
+import { orderByPartnerSearchHits } from "@/lib/api/partners/search";
+import { describe, expect, it } from "vitest";
+
+describe("orderByPartnerSearchHits", () => {
+  it("restores provider order and ignores missing records", () => {
+    const records = [
+      { id: "pge_1", name: "First" },
+      { id: "pge_2", name: "Second" },
+    ];
+    const hits = [
+      { id: "pge_2", partnerId: "pn_2" },
+      { id: "pge_missing", partnerId: "pn_missing" },
+      { id: "pge_1", partnerId: "pn_1" },
+    ];
+
+    expect(orderByPartnerSearchHits(records, hits)).toEqual([
+      { id: "pge_2", name: "Second" },
+      { id: "pge_1", name: "First" },
+    ]);
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-provider-switches.test.ts b/apps/web/tests/partners/partner-search-provider-switches.test.ts
new file mode 100644
index 00000000000..78e2db08cee
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-provider-switches.test.ts
@@ -0,0 +1,79 @@
+import {
+  getPartnerSearchProvider,
+  getPartnerSearchReadProvider,
+  isPartnerSearchReadEnabled,
+} from "@/lib/api/partners/search";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@/lib/api/partners/search/providers/turbopuffer", () => ({
+  createTurbopufferPartnerSearchProvider: () => ({
+    searchCandidates: vi.fn(),
+    countCandidates: vi.fn(),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  }),
+}));
+
+const originalEnv = { ...process.env };
+
+describe("partner search switches", () => {
+  beforeEach(() => {
+    delete process.env.TURBOPUFFER_API_KEY;
+    delete process.env.PARTNER_SEARCH_READ_ENABLED;
+  });
+
+  afterEach(() => {
+    process.env = { ...originalEnv };
+  });
+
+  it("writes nowhere until the key is configured", () => {
+    expect(getPartnerSearchProvider()).toBeNull();
+  });
+
+  // The rollout depends on this. Syncs have to run for the whole backfill
+  // before the index is complete enough to read, so the key alone must not
+  // turn reads on.
+  it("keeps reads on the database when only the key is configured", () => {
+    process.env.TURBOPUFFER_API_KEY = "tpuf_test";
+
+    expect(getPartnerSearchProvider()).not.toBeNull();
+    expect(isPartnerSearchReadEnabled()).toBe(false);
+    expect(getPartnerSearchReadProvider()).toBeNull();
+  });
+
+  it("reads from the index once both switches are on", () => {
+    process.env.TURBOPUFFER_API_KEY = "tpuf_test";
+    process.env.PARTNER_SEARCH_READ_ENABLED = "true";
+
+    expect(getPartnerSearchReadProvider()).not.toBeNull();
+  });
+
+  // The point of the split: clearing the read flag stops search without
+  // stopping indexing, so deletions keep being applied while rolled back and
+  // coming back needs no rebuild.
+  it("keeps writing while reads are switched off", () => {
+    process.env.TURBOPUFFER_API_KEY = "tpuf_test";
+    process.env.PARTNER_SEARCH_READ_ENABLED = "false";
+
+    expect(getPartnerSearchReadProvider()).toBeNull();
+    expect(getPartnerSearchProvider()).not.toBeNull();
+  });
+
+  // Otherwise the read flag alone would look enabled with no index behind it,
+  // which is the one combination that returns empty results rather than
+  // falling back.
+  it("cannot read without a key, however the read flag is set", () => {
+    process.env.PARTNER_SEARCH_READ_ENABLED = "true";
+
+    expect(getPartnerSearchReadProvider()).toBeNull();
+  });
+
+  it('treats anything other than "true" as off', () => {
+    process.env.TURBOPUFFER_API_KEY = "tpuf_test";
+
+    for (const value of ["", "false", "1", "yes", "TRUE"]) {
+      process.env.PARTNER_SEARCH_READ_ENABLED = value;
+      expect(getPartnerSearchReadProvider()).toBeNull();
+    }
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-query.test.ts b/apps/web/tests/partners/partner-search-query.test.ts
new file mode 100644
index 00000000000..497b4cf8c50
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-query.test.ts
@@ -0,0 +1,152 @@
+import {
+  buildPartnerSearchCandidateQuery,
+  isLinkShapedQuery,
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  stripProgramDomain,
+} from "@/lib/api/partners/search";
+import { describe, expect, it } from "vitest";
+
+const defaultInput = {
+  programId: "prog_test",
+  search: "  examp  ",
+  page: 3,
+  pageSize: 25,
+  sortBy: "totalSaleAmount" as const,
+  sortOrder: "desc" as const,
+};
+
+describe("buildPartnerSearchCandidateQuery", () => {
+  it("builds a provider-neutral relevance candidate request", () => {
+    expect(buildPartnerSearchCandidateQuery(defaultInput)).toEqual({
+      programId: "prog_test",
+      query: "examp",
+      limit: PARTNER_SEARCH_CANDIDATE_LIMIT,
+      filters: {
+        status: undefined,
+        groupId: undefined,
+        country: undefined,
+        partnerTagIds: undefined,
+      },
+    });
+  });
+
+  it("passes the discrete filters through, with exclusion", () => {
+    expect(
+      buildPartnerSearchCandidateQuery({
+        ...defaultInput,
+        status: "approved",
+        groupId: ["grp_1", "grp_2"],
+        country: "US",
+        countryOperator: "NOT IN",
+        partnerTagId: ["ptag_1"],
+      }),
+    ).toMatchObject({
+      filters: {
+        status: { values: ["approved"], exclude: false },
+        groupId: { values: ["grp_1", "grp_2"], exclude: false },
+        // Exclusion also matches partners with no country, matching the
+        // database's OR against IS NULL.
+        country: { values: ["US"], exclude: true },
+        partnerTagIds: { values: ["ptag_1"], exclude: false },
+      },
+    });
+  });
+
+  it.each([
+    ["missing search", { ...defaultInput, search: undefined }],
+    ["empty search", { ...defaultInput, search: "   " }],
+    ["exact email", { ...defaultInput, email: "partner@example.com" }],
+    ["tenant ID", { ...defaultInput, tenantId: "tenant_test" }],
+  ])("keeps %s on the database path", (_name, input) => {
+    expect(buildPartnerSearchCandidateQuery(input)).toBeNull();
+  });
+
+  describe("pasted partner IDs", () => {
+    it.each([
+      ["24-char suffix, the production minimum", "pn_dlszeepb38rvcnrfbd0srkzb"],
+      ["25-char suffix, the common case", "pn_1K0NM7HCN944PEMZ3CQPH43H8"],
+    ])(
+      "keeps %s on the database, which has it as a primary key",
+      (_label, search) => {
+        expect(
+          buildPartnerSearchCandidateQuery({ programId: "prog_1", search }),
+        ).toBeNull();
+      },
+    );
+
+    it.each([
+      ["a bare prefix", "pn_"],
+      ["a partial ID", "pn_dls"],
+      ["one character short of the minimum", "pn_dlszeepb38rvcnrfbd0srkz"],
+      ["an ID with a space", "pn_dlszeepb38rvcnrfbd0srkzb other"],
+    ])("sends %s to the provider", (_label, search) => {
+      expect(
+        buildPartnerSearchCandidateQuery({ programId: "prog_1", search }),
+      ).toMatchObject({ query: search });
+    });
+  });
+});
+
+describe("isLinkShapedQuery", () => {
+  it.each([
+    "go.acme.com/partner",
+    "https://go.acme.com/partner",
+    "www.go.acme.com/partner",
+    "go.acme.com",
+    "  go.acme.com/partner  ",
+  ])("recognizes %s", (query) => {
+    expect(isLinkShapedQuery(query)).toBe(true);
+  });
+
+  it.each(["steven", "steven tey", "steven@dub.co", "pn_123", "acme/partner"])(
+    "does not recognize %s",
+    (query) => {
+      expect(isLinkShapedQuery(query)).toBe(false);
+    },
+  );
+});
+
+describe("stripProgramDomain", () => {
+  const domain = "go.acme.com";
+
+  it.each([
+    ["go.acme.com/partner", "partner"],
+    ["go.acme.com/partner/", "partner"],
+    ["https://go.acme.com/partner", "partner"],
+    ["https://go.acme.com/partner/", "partner"],
+    ["http://www.go.acme.com/partner", "partner"],
+    ["GO.ACME.COM/Partner", "Partner"],
+    ["go.acme.com/partner?utm_source=x", "partner"],
+    ["go.acme.com/partner/?utm_source=x", "partner"],
+    ["go.acme.com/partner#top", "partner"],
+    ["go.acme.com/partner/#top", "partner"],
+    ["go.acme.com/nested/partner", "nested/partner"],
+    ["go.acme.com/nested/partner/", "nested/partner"],
+    ["  go.acme.com/partner  ", "partner"],
+  ])("reduces %s to its key", (query, key) => {
+    expect(stripProgramDomain(query, domain)).toBe(key);
+  });
+
+  it("matches a program domain stored with www.", () => {
+    expect(stripProgramDomain("go.acme.com/partner", "www.go.acme.com")).toBe(
+      "partner",
+    );
+  });
+
+  it.each([
+    ["another domain", "dub.sh/partner"],
+    ["a longer host", "app.go.acme.com/partner"],
+    ["the bare domain", "go.acme.com"],
+    ["the bare domain with a slash", "go.acme.com/"],
+    ["a plain word", "partner"],
+    ["an email", "steven@go.acme.com"],
+  ])("leaves %s unchanged", (_label, query) => {
+    expect(stripProgramDomain(query, domain)).toBe(query);
+  });
+
+  it("leaves the query unchanged when the program has no domain", () => {
+    expect(stripProgramDomain("go.acme.com/partner", null)).toBe(
+      "go.acme.com/partner",
+    );
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-resilience.test.ts b/apps/web/tests/partners/partner-search-resilience.test.ts
new file mode 100644
index 00000000000..a76739d17ba
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-resilience.test.ts
@@ -0,0 +1,37 @@
+import { withTransientRetry } from "@/lib/api/partners/search/providers/resilience";
+import { APIError } from "@turbopuffer/turbopuffer";
+import { describe, expect, it, vi } from "vitest";
+
+const apiError = (status: number) =>
+  new APIError(status, {}, `status ${status}`, new Headers());
+
+const failingOnce = (error: unknown) =>
+  vi
+    .fn()
+    .mockRejectedValueOnce(error)
+    .mockResolvedValueOnce("ok");
+
+describe("withTransientRetry", () => {
+  it.each([
+    ["a rate limit", apiError(429)],
+    ["a server error", apiError(503)],
+    ["a network failure", new Error("fetch failed")],
+  ])("retries %s", async (_label, error) => {
+    const operation = failingOnce(error);
+
+    await expect(withTransientRetry(operation)).resolves.toBe("ok");
+    expect(operation).toHaveBeenCalledTimes(2);
+  });
+
+  it.each([
+    // The status comes from the typed error, not the message, so digits in an
+    // ordinary message cannot make a permanent failure look transient.
+    ["a message that merely contains 500", new Error("wrote 500 documents")],
+    ["a client error", apiError(400)],
+  ])("does not retry %s", async (_label, error) => {
+    const operation = vi.fn().mockRejectedValue(error);
+
+    await expect(withTransientRetry(operation)).rejects.toBe(error);
+    expect(operation).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-resolve-query.test.ts b/apps/web/tests/partners/partner-search-resolve-query.test.ts
new file mode 100644
index 00000000000..4602dc4efcb
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-resolve-query.test.ts
@@ -0,0 +1,71 @@
+import { resolvePartnerSearchCandidateQuery } from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({ findUnique: vi.fn() }));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: { program: { findUnique: mocks.findUnique } },
+}));
+
+const input = (search: string) => ({
+  programId: "prog_test",
+  search,
+  page: 1,
+  pageSize: 25,
+  sortBy: "totalSaleAmount" as const,
+  sortOrder: "desc" as const,
+});
+
+describe("resolvePartnerSearchCandidateQuery", () => {
+  beforeEach(() => {
+    mocks.findUnique.mockReset();
+  });
+
+  it("reduces a link on the program domain to its key", async () => {
+    mocks.findUnique.mockResolvedValue({ domain: "go.acme.com" });
+
+    const query = await resolvePartnerSearchCandidateQuery(
+      input("https://go.acme.com/partner"),
+    );
+
+    expect(query?.query).toBe("partner");
+    expect(mocks.findUnique).toHaveBeenCalledWith({
+      where: { id: "prog_test" },
+      select: { domain: true },
+    });
+  });
+
+  it("keeps a link on another domain", async () => {
+    mocks.findUnique.mockResolvedValue({ domain: "go.acme.com" });
+
+    const query = await resolvePartnerSearchCandidateQuery(
+      input("dub.sh/partner"),
+    );
+
+    expect(query?.query).toBe("dub.sh/partner");
+  });
+
+  it("keeps the link when the program is not found", async () => {
+    mocks.findUnique.mockResolvedValue(null);
+
+    const query = await resolvePartnerSearchCandidateQuery(
+      input("go.acme.com/partner"),
+    );
+
+    expect(query?.query).toBe("go.acme.com/partner");
+  });
+
+  it("does not look the program up for a plain query", async () => {
+    const query = await resolvePartnerSearchCandidateQuery(input("steven"));
+
+    expect(query?.query).toBe("steven");
+    expect(mocks.findUnique).not.toHaveBeenCalled();
+  });
+
+  it("returns null when there is no candidate query", async () => {
+    await expect(resolvePartnerSearchCandidateQuery(input(""))).resolves.toBe(
+      null,
+    );
+    expect(mocks.findUnique).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-sync-job.test.ts b/apps/web/tests/partners/partner-search-sync-job.test.ts
new file mode 100644
index 00000000000..8906e5f8b09
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-sync-job.test.ts
@@ -0,0 +1,167 @@
+import { partnerSearchSyncJob } from "@/lib/jobs/handlers/partner-search-sync-job";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+// A small batch size keeps the pagination cases readable.
+const BATCH_SIZE = 3;
+
+const mocks = vi.hoisted(() => ({
+  getPartnerSearchProvider: vi.fn(),
+  syncPartnerSearchDocuments: vi.fn(),
+  syncPartnerEnrollments: vi.fn(),
+}));
+
+vi.mock("@/lib/api/partners/search", () => ({
+  PARTNER_SEARCH_SYNC_BATCH_SIZE: 3,
+  getPartnerSearchProvider: mocks.getPartnerSearchProvider,
+  syncPartnerSearchDocuments: mocks.syncPartnerSearchDocuments,
+  syncPartnerEnrollments: mocks.syncPartnerEnrollments,
+}));
+
+const searchProvider = { name: "turbopuffer" };
+
+describe("partnerSearchSyncJob", () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    mocks.getPartnerSearchProvider.mockReset().mockReturnValue(searchProvider);
+    mocks.syncPartnerSearchDocuments
+      .mockReset()
+      .mockResolvedValue({ upserted: 0, deleted: 0 });
+    mocks.syncPartnerEnrollments
+      .mockReset()
+      .mockResolvedValue({ upserted: 0, lastEnrollmentId: null });
+  });
+
+  it("skips entirely when no provider is configured", async () => {
+    mocks.getPartnerSearchProvider.mockReturnValue(null);
+
+    await partnerSearchSyncJob.execute({
+      type: "enrollments",
+      enrollmentIds: ["pge_1"],
+    });
+
+    expect(mocks.syncPartnerSearchDocuments).not.toHaveBeenCalled();
+    expect(mocks.syncPartnerEnrollments).not.toHaveBeenCalled();
+  });
+
+  it("syncs the enrollment ids it is given", async () => {
+    await partnerSearchSyncJob.execute({
+      type: "enrollments",
+      enrollmentIds: ["pge_1", "pge_2"],
+    });
+
+    expect(mocks.syncPartnerSearchDocuments).toHaveBeenCalledWith({
+      enrollmentIds: ["pge_1", "pge_2"],
+      searchProvider,
+    });
+    expect(mocks.syncPartnerEnrollments).not.toHaveBeenCalled();
+  });
+
+  it("syncs a partner fan-out in one read", async () => {
+    mocks.syncPartnerEnrollments.mockResolvedValue({
+      upserted: 2,
+      lastEnrollmentId: "pge_2",
+    });
+
+    await partnerSearchSyncJob.execute({
+      type: "partners",
+      partnerIds: ["pn_1"],
+    });
+
+    expect(mocks.syncPartnerEnrollments).toHaveBeenCalledWith({
+      partnerIds: ["pn_1"],
+      programId: undefined,
+      after: undefined,
+      take: BATCH_SIZE,
+      searchProvider,
+    });
+    expect(mocks.syncPartnerSearchDocuments).not.toHaveBeenCalled();
+  });
+
+  it("continues from the last enrollment when a page comes back full", async () => {
+    const dispatch = vi
+      .spyOn(partnerSearchSyncJob, "dispatch")
+      .mockResolvedValue({ status: "published", messageId: "msg_1" });
+
+    mocks.syncPartnerEnrollments.mockResolvedValue({
+      upserted: BATCH_SIZE,
+      lastEnrollmentId: "pge_3",
+    });
+
+    await partnerSearchSyncJob.execute({
+      type: "partners",
+      partnerIds: ["pn_1"],
+      programId: "prog_1",
+    });
+
+    expect(dispatch).toHaveBeenCalledWith(
+      {
+        type: "partners",
+        partnerIds: ["pn_1"],
+        programId: "prog_1",
+        after: "pge_3",
+      },
+      { delay: 1 },
+    );
+  });
+
+  it("stops when a page comes back short", async () => {
+    const dispatch = vi
+      .spyOn(partnerSearchSyncJob, "dispatch")
+      .mockResolvedValue({ status: "published", messageId: "msg_1" });
+
+    mocks.syncPartnerEnrollments.mockResolvedValue({
+      upserted: 2,
+      lastEnrollmentId: "pge_2",
+    });
+
+    await partnerSearchSyncJob.execute({
+      type: "partners",
+      partnerIds: ["pn_1"],
+    });
+
+    expect(dispatch).not.toHaveBeenCalled();
+  });
+
+  it("does not sync or continue when a partner has no enrollments", async () => {
+    const dispatch = vi
+      .spyOn(partnerSearchSyncJob, "dispatch")
+      .mockResolvedValue({ status: "published", messageId: "msg_1" });
+
+    mocks.syncPartnerEnrollments.mockResolvedValue({
+      upserted: 0,
+      lastEnrollmentId: null,
+    });
+
+    await partnerSearchSyncJob.execute({
+      type: "partners",
+      partnerIds: ["pn_1"],
+    });
+
+    expect(dispatch).not.toHaveBeenCalled();
+  });
+
+  it("rejects a payload with no ids, so an empty fan-out cannot be queued", async () => {
+    await expect(
+      partnerSearchSyncJob.execute({ type: "enrollments", enrollmentIds: [] }),
+    ).rejects.toThrow();
+
+    await expect(
+      partnerSearchSyncJob.execute({ type: "partners", partnerIds: [] }),
+    ).rejects.toThrow();
+  });
+
+  it("rejects a payload larger than one batch", async () => {
+    await expect(
+      partnerSearchSyncJob.execute({
+        type: "enrollments",
+        enrollmentIds: ["pge_1", "pge_2", "pge_3", "pge_4"],
+      }),
+    ).rejects.toThrow();
+  });
+
+  it("rejects an unknown payload shape", async () => {
+    await expect(
+      partnerSearchSyncJob.execute({ enrollmentIds: ["pge_1"] }),
+    ).rejects.toThrow();
+  });
+});
diff --git a/apps/web/tests/partners/partner-search-sync.test.ts b/apps/web/tests/partners/partner-search-sync.test.ts
new file mode 100644
index 00000000000..c75dd074db5
--- /dev/null
+++ b/apps/web/tests/partners/partner-search-sync.test.ts
@@ -0,0 +1,264 @@
+import {
+  partnerSearchDocumentSelect,
+  syncPartnerEnrollments,
+  syncPartnerSearchDocuments,
+  type PartnerSearchDocumentSource,
+  type PartnerSearchProvider,
+} from "@/lib/api/partners/search";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  findMany: vi.fn(),
+}));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: {
+    programEnrollment: {
+      findMany: mocks.findMany,
+    },
+  },
+}));
+
+function createSource(
+  id: string,
+  overrides: Partial<PartnerSearchDocumentSource> = {},
+): PartnerSearchDocumentSource {
+  return {
+    id,
+    programId: "prog_test",
+    partnerId: `pn_${id}`,
+    status: "approved" as const,
+    tenantId: null,
+    groupId: null,
+    partner: {
+      name: "Rafi Hasan",
+      email: "partner@example.com",
+      companyName: "Dub Partners",
+      description: "Developer tools educator",
+      country: null,
+      platforms: [],
+    },
+    links: [],
+    programPartnerTags: [],
+    ...overrides,
+  };
+}
+
+function createProvider(): PartnerSearchProvider {
+  return {
+    searchCandidates: vi.fn(),
+    countCandidates: vi.fn(),
+    upsert: vi.fn(),
+    delete: vi.fn(),
+  };
+}
+
+describe("syncPartnerSearchDocuments", () => {
+  beforeEach(() => {
+    mocks.findMany.mockReset();
+  });
+
+  it("upserts the enrollments the database still has", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([
+      createSource("pge_1"),
+      createSource("pge_2"),
+    ]);
+
+    const result = await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_1", "pge_2"],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 2, deleted: 0 });
+    expect(searchProvider.delete).not.toHaveBeenCalled();
+    expect(searchProvider.upsert).toHaveBeenCalledTimes(1);
+    expect(
+      vi.mocked(searchProvider.upsert).mock.calls[0][0].map(({ id }) => id),
+    ).toEqual(["pge_1", "pge_2"]);
+  });
+
+  it("deletes the enrollments the database no longer has", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([createSource("pge_1")]);
+
+    const result = await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_1", "pge_deleted"],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 1, deleted: 1 });
+    expect(searchProvider.delete).toHaveBeenCalledWith(["pge_deleted"]);
+  });
+
+  it("deletes without upserting when every enrollment is gone", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([]);
+
+    const result = await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_gone"],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 0, deleted: 1 });
+    expect(searchProvider.upsert).not.toHaveBeenCalled();
+    expect(searchProvider.delete).toHaveBeenCalledWith(["pge_gone"]);
+  });
+
+  it("deduplicates the requested ids so one enrollment is written once", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([createSource("pge_1")]);
+
+    await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_1", "pge_1", "pge_1"],
+      searchProvider,
+    });
+
+    expect(mocks.findMany.mock.calls[0][0].where.id.in).toEqual(["pge_1"]);
+    expect(vi.mocked(searchProvider.upsert).mock.calls[0][0]).toHaveLength(1);
+  });
+
+  it("does not touch the database when no provider is configured", async () => {
+    const result = await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_1"],
+      searchProvider: null,
+    });
+
+    expect(result).toEqual({ upserted: 0, deleted: 0 });
+    expect(mocks.findMany).not.toHaveBeenCalled();
+  });
+
+  it("does not touch the database when there is nothing to sync", async () => {
+    const searchProvider = createProvider();
+
+    const result = await syncPartnerSearchDocuments({
+      enrollmentIds: [],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 0, deleted: 0 });
+    expect(mocks.findMany).not.toHaveBeenCalled();
+  });
+
+  it("serializes the document the index stores", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([
+      createSource("pge_1", {
+        partner: {
+          name: "Rafi Hasan",
+          email: "rafi@example.com",
+          companyName: null,
+          description: null,
+          country: "US",
+          platforms: [{ type: "youtube" as const, identifier: "rafi" }],
+        },
+        programPartnerTags: [{ partnerTagId: "ptag_1" }],
+      }),
+    ]);
+
+    await syncPartnerSearchDocuments({
+      enrollmentIds: ["pge_1"],
+      searchProvider,
+    });
+
+    expect(vi.mocked(searchProvider.upsert).mock.calls[0][0][0]).toMatchObject({
+      id: "pge_1",
+      country: "US",
+      partnerTagIds: ["ptag_1"],
+      platformIdentifiers: ["rafi"],
+    });
+  });
+});
+
+describe("syncPartnerEnrollments", () => {
+  beforeEach(() => {
+    mocks.findMany.mockReset();
+  });
+
+  it("reads and upserts one page of documents in a single query", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([
+      createSource("pge_1"),
+      createSource("pge_2"),
+    ]);
+
+    const result = await syncPartnerEnrollments({
+      partnerIds: ["pn_1"],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 2, lastEnrollmentId: "pge_2" });
+    expect(mocks.findMany).toHaveBeenCalledTimes(1);
+    expect(mocks.findMany.mock.calls[0][0].where).toEqual({
+      partnerId: { in: ["pn_1"] },
+    });
+    expect(mocks.findMany.mock.calls[0][0]).toMatchObject({
+      select: partnerSearchDocumentSelect,
+      orderBy: { id: "asc" },
+    });
+    expect(
+      vi.mocked(searchProvider.upsert).mock.calls[0][0].map(({ id }) => id),
+    ).toEqual(["pge_1", "pge_2"]);
+    expect(searchProvider.delete).not.toHaveBeenCalled();
+  });
+
+  it("narrows to a single program when one is given", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([createSource("pge_1")]);
+
+    await syncPartnerEnrollments({
+      partnerIds: ["pn_1"],
+      programId: "prog_test",
+      searchProvider,
+    });
+
+    expect(mocks.findMany.mock.calls[0][0].where).toEqual({
+      partnerId: { in: ["pn_1"] },
+      programId: "prog_test",
+    });
+  });
+
+  it("pages past the cursor so a large fan-out can resume", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([createSource("pge_3")]);
+
+    await syncPartnerEnrollments({
+      partnerIds: ["pn_1"],
+      after: "pge_2",
+      take: 2,
+      searchProvider,
+    });
+
+    const { where, take } = mocks.findMany.mock.calls[0][0];
+    expect(where).toEqual({
+      partnerId: { in: ["pn_1"] },
+      id: { gt: "pge_2" },
+    });
+    expect(take).toBe(2);
+  });
+
+  it("does not write when the page is empty", async () => {
+    const searchProvider = createProvider();
+    mocks.findMany.mockResolvedValueOnce([]);
+
+    const result = await syncPartnerEnrollments({
+      partnerIds: ["pn_1"],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 0, lastEnrollmentId: null });
+    expect(searchProvider.upsert).not.toHaveBeenCalled();
+  });
+
+  it("does not query when there are no partners", async () => {
+    const searchProvider = createProvider();
+
+    const result = await syncPartnerEnrollments({
+      partnerIds: [],
+      searchProvider,
+    });
+
+    expect(result).toEqual({ upserted: 0, lastEnrollmentId: null });
+    expect(mocks.findMany).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/web/tests/partners/queue-partner-search-sync.test.ts b/apps/web/tests/partners/queue-partner-search-sync.test.ts
new file mode 100644
index 00000000000..62e9a628c70
--- /dev/null
+++ b/apps/web/tests/partners/queue-partner-search-sync.test.ts
@@ -0,0 +1,262 @@
+import {
+  PARTNER_SEARCH_SYNC_DELAY_SECONDS,
+  queuePartnerSearchSync,
+  queuePartnerSearchSyncForLinks,
+} from "@/lib/api/partners/queue-partner-search-sync";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const BATCH_SIZE = 3;
+
+const mocks = vi.hoisted(() => ({
+  getPartnerSearchProvider: vi.fn(),
+  dispatchBatch: vi.fn(),
+}));
+
+vi.mock("@/lib/api/partners/search", () => ({
+  PARTNER_SEARCH_SYNC_BATCH_SIZE: 3,
+  getPartnerSearchProvider: mocks.getPartnerSearchProvider,
+}));
+
+vi.mock("@/lib/jobs/handlers/partner-search-sync-job", () => ({
+  partnerSearchSyncJob: {
+    dispatchBatch: mocks.dispatchBatch,
+  },
+}));
+
+/** The options the dispatcher computed for each payload it queued. */
+function dispatchedWithOptions() {
+  const [payloads, getOptions] = mocks.dispatchBatch.mock.calls[0];
+
+  return payloads.map((payload: unknown, index: number) => ({
+    payload,
+    options: getOptions?.(payload, index),
+  }));
+}
+
+describe("queuePartnerSearchSync", () => {
+  beforeEach(() => {
+    mocks.getPartnerSearchProvider
+      .mockReset()
+      .mockReturnValue({ name: "turbopuffer" });
+    mocks.dispatchBatch.mockReset().mockResolvedValue({
+      published: 1,
+      deferred: 0,
+      failed: 0,
+      results: [],
+    });
+  });
+
+  it("queues nothing when no provider is configured", async () => {
+    mocks.getPartnerSearchProvider.mockReturnValue(null);
+
+    await queuePartnerSearchSync({ enrollmentIds: ["pge_1"] });
+
+    expect(mocks.dispatchBatch).not.toHaveBeenCalled();
+  });
+
+  it("queues nothing when there is nothing to sync", async () => {
+    await queuePartnerSearchSync({ enrollmentIds: [], partnerIds: [] });
+
+    expect(mocks.dispatchBatch).not.toHaveBeenCalled();
+  });
+
+  it("deduplicates ids before queueing", async () => {
+    await queuePartnerSearchSync({ enrollmentIds: ["pge_1", "pge_1"] });
+
+    expect(mocks.dispatchBatch.mock.calls[0][0]).toEqual([
+      { type: "enrollments", enrollmentIds: ["pge_1"] },
+    ]);
+  });
+
+  it("chunks past the batch size so no payload exceeds what the job accepts", async () => {
+    await queuePartnerSearchSync({
+      enrollmentIds: ["pge_1", "pge_2", "pge_3", "pge_4"],
+    });
+
+    expect(mocks.dispatchBatch.mock.calls[0][0]).toEqual([
+      { type: "enrollments", enrollmentIds: ["pge_1", "pge_2", "pge_3"] },
+      { type: "enrollments", enrollmentIds: ["pge_4"] },
+    ]);
+  });
+
+  it("queues both shapes when a caller has enrollments and partners", async () => {
+    await queuePartnerSearchSync({
+      enrollmentIds: ["pge_1"],
+      partnerIds: ["pn_1"],
+      programId: "prog_1",
+    });
+
+    expect(mocks.dispatchBatch.mock.calls[0][0]).toEqual([
+      { type: "enrollments", enrollmentIds: ["pge_1"] },
+      { type: "partners", partnerIds: ["pn_1"], programId: "prog_1" },
+    ]);
+  });
+
+  // QStash suppresses a repeated key for ten minutes from the first publish,
+  // not just while one is pending, so keying by subject would drop the second of
+  // two changes rather than collapse them.
+  it("never deduplicates, so a later change cannot be dropped", async () => {
+    await queuePartnerSearchSync({ enrollmentIds: ["pge_1"] });
+    await queuePartnerSearchSync({ enrollmentIds: ["pge_1"] });
+
+    expect(mocks.dispatchBatch).toHaveBeenCalledTimes(2);
+
+    for (const [, getOptions] of mocks.dispatchBatch.mock.calls) {
+      const options = getOptions(
+        { type: "enrollments", enrollmentIds: ["pge_1"] },
+        0,
+      );
+      expect(options.deduplicationId).toBeUndefined();
+      expect(options.delay).toBe(PARTNER_SEARCH_SYNC_DELAY_SECONDS);
+    }
+  });
+
+  it("swallows a dispatch failure so it cannot break the mutation that queued it", async () => {
+    mocks.dispatchBatch.mockRejectedValue(new Error("qstash unreachable"));
+
+    await expect(
+      queuePartnerSearchSync({ enrollmentIds: ["pge_1"] }),
+    ).resolves.toBeUndefined();
+  });
+
+  it("never builds a payload larger than the job's batch size", async () => {
+    await queuePartnerSearchSync({
+      partnerIds: Array.from({ length: 7 }, (_, index) => `pn_${index}`),
+    });
+
+    for (const payload of mocks.dispatchBatch.mock.calls[0][0]) {
+      expect(payload.partnerIds.length).toBeLessThanOrEqual(BATCH_SIZE);
+    }
+  });
+});
+
+describe("queuePartnerSearchSyncForLinks", () => {
+  beforeEach(() => {
+    mocks.getPartnerSearchProvider
+      .mockReset()
+      .mockReturnValue({ name: "turbopuffer" });
+    mocks.dispatchBatch.mockReset().mockResolvedValue({
+      published: 1,
+      deferred: 0,
+      failed: 0,
+      results: [],
+    });
+  });
+
+  // The bulk link helpers call this on every write, including workspace-link
+  // imports of a hundred thousand rows. Those carry no partner, so this must
+  // cost nothing rather than being guarded at each call site.
+  it("queues nothing for links with no program or partner", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: null, partnerId: null },
+      { programId: "prog_1", partnerId: null },
+      { programId: null, partnerId: "pn_1" },
+    ]);
+
+    expect(mocks.dispatchBatch).not.toHaveBeenCalled();
+  });
+
+  it("queues one payload per program, not per link", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: "prog_1", partnerId: "pn_1" },
+      { programId: "prog_1", partnerId: "pn_2" },
+      { programId: "prog_1", partnerId: "pn_1" },
+      { programId: "prog_2", partnerId: "pn_3" },
+    ]);
+
+    expect(mocks.dispatchBatch).toHaveBeenCalledTimes(2);
+
+    const queued = mocks.dispatchBatch.mock.calls.map(
+      ([payloads]) => payloads[0],
+    );
+
+    expect(queued).toEqual([
+      { type: "partners", partnerIds: ["pn_1", "pn_2"], programId: "prog_1" },
+      { type: "partners", partnerIds: ["pn_3"], programId: "prog_2" },
+    ]);
+  });
+
+  it("passes an explicit delay through", async () => {
+    await queuePartnerSearchSyncForLinks(
+      [{ programId: "prog_1", partnerId: "pn_1" }],
+      { delay: 60 },
+    );
+
+    const [, getOptions] = mocks.dispatchBatch.mock.calls[0];
+
+    expect(
+      getOptions({ type: "partners", partnerIds: ["pn_1"] }, 0).delay,
+    ).toBe(60);
+  });
+
+  it("defaults to the interactive delay when none is given", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: "prog_1", partnerId: "pn_1" },
+    ]);
+
+    const [, getOptions] = mocks.dispatchBatch.mock.calls[0];
+
+    expect(
+      getOptions({ type: "partners", partnerIds: ["pn_1"] }, 0).delay,
+    ).toBe(PARTNER_SEARCH_SYNC_DELAY_SECONDS);
+  });
+
+  it("queues nothing for an empty link set", async () => {
+    await queuePartnerSearchSyncForLinks([]);
+
+    expect(mocks.dispatchBatch).not.toHaveBeenCalled();
+  });
+});
+
+describe("queuePartnerSearchSyncForLinks: ownership transfer", () => {
+  beforeEach(() => {
+    mocks.getPartnerSearchProvider
+      .mockReset()
+      .mockReturnValue({ name: "turbopuffer" });
+    mocks.dispatchBatch.mockReset().mockResolvedValue({
+      published: 1,
+      deferred: 0,
+      failed: 0,
+      results: [],
+    });
+  });
+
+  // A link update can rewrite partnerId, so the former owner has to be
+  // re-serialized without the link. Syncing only the new owner would leave it
+  // searchable under a partner who no longer has it.
+  it("syncs both owners when a link moves between partners", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: "prog_1", partnerId: "pn_old" },
+      { programId: "prog_1", partnerId: "pn_new" },
+    ]);
+
+    expect(mocks.dispatchBatch.mock.calls[0][0]).toEqual([
+      {
+        type: "partners",
+        partnerIds: ["pn_old", "pn_new"],
+        programId: "prog_1",
+      },
+    ]);
+  });
+
+  it("syncs both programs when a link moves across programs", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: "prog_old", partnerId: "pn_1" },
+      { programId: "prog_new", partnerId: "pn_1" },
+    ]);
+
+    expect(mocks.dispatchBatch).toHaveBeenCalledTimes(2);
+  });
+
+  // An unowned link gaining a partner has no former owner to re-serialize.
+  it("skips the null side when a link gains its first owner", async () => {
+    await queuePartnerSearchSyncForLinks([
+      { programId: null, partnerId: null },
+      { programId: "prog_1", partnerId: "pn_1" },
+    ]);
+
+    expect(mocks.dispatchBatch.mock.calls[0][0]).toEqual([
+      { type: "partners", partnerIds: ["pn_1"], programId: "prog_1" },
+    ]);
+  });
+});
diff --git a/apps/web/tests/partners/turbopuffer-partner-search-provider.test.ts b/apps/web/tests/partners/turbopuffer-partner-search-provider.test.ts
new file mode 100644
index 00000000000..cbc217b6d89
--- /dev/null
+++ b/apps/web/tests/partners/turbopuffer-partner-search-provider.test.ts
@@ -0,0 +1,485 @@
+import {
+  PARTNER_SEARCH_CANDIDATE_LIMIT,
+  type PartnerSearchDocument,
+} from "@/lib/api/partners/search";
+import {
+  createTurbopufferPartnerSearchProvider,
+  deleteTurbopufferPartnerSearchNamespace,
+  PARTNER_SEARCH_NAMESPACE,
+  type TurbopufferNamespace,
+} from "@/lib/api/partners/search/providers/turbopuffer";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const document: PartnerSearchDocument = {
+  id: "pge_test",
+  programId: "prog_test",
+  partnerId: "pn_test",
+  name: "Rafi Hasan",
+  email: "partner@example.com",
+  companyName: "Hasan Labs",
+  description: "Affiliate marketer",
+  platformTypes: ["youtube"],
+  platformIdentifiers: ["@rafi"],
+  linkKeys: ["rafi-link"],
+  status: "approved",
+  groupId: "grp_test",
+  country: "US",
+  partnerTagIds: ["ptag_a", "ptag_b"],
+};
+
+const mocks = vi.hoisted(() => ({
+  write: vi.fn(),
+  multiQuery: vi.fn(),
+  query: vi.fn(),
+  deleteAll: vi.fn(),
+}));
+
+function createNamespaceMock(): TurbopufferNamespace {
+  return {
+    write: mocks.write,
+    multiQuery: mocks.multiQuery,
+    query: mocks.query,
+    deleteAll: mocks.deleteAll,
+  } as unknown as TurbopufferNamespace;
+}
+
+function branchesOf(call: number = 0) {
+  const [{ queries }] = mocks.multiQuery.mock.calls[call];
+  return {
+    all: queries,
+    // Located by attribute rather than position, so adding a branch does not
+    // break every assertion.
+    rankedOn: (attribute: string) =>
+      queries.filter((branch: any) => branch.rank_by[0] === attribute),
+    filteredOn: (attribute: string) =>
+      queries.filter((branch: any) =>
+        JSON.stringify(branch.filters).includes(
+          `["${attribute}","ContainsAllTokens"`,
+        ),
+      ),
+  };
+}
+
+function createProvider() {
+  return createTurbopufferPartnerSearchProvider({
+    namespace: createNamespaceMock(),
+    namespaceName: "test-namespace",
+  });
+}
+
+describe("Turbopuffer partner search provider", () => {
+  beforeEach(() => {
+    for (const mock of Object.values(mocks)) {
+      mock.mockReset();
+    }
+    mocks.write.mockResolvedValue({ rows_affected: 1 });
+    mocks.multiQuery.mockResolvedValue({ results: [] });
+    mocks.query.mockResolvedValue({ aggregations: { total: 12_000 } });
+  });
+
+  // In afterEach rather than the test body, so a failed assertion cannot leak
+  // a stubbed env var into later tests.
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
+
+  it("indexes identity fields separately, and only those fields", async () => {
+    await createProvider().upsert([document]);
+
+    const [{ upsert_rows, schema }] = mocks.write.mock.calls[0];
+    const [row] = upsert_rows;
+
+    expect(row.identityText).toBe(
+      "pn_test rafi hasan partner@example.com hasan labs",
+    );
+    // Description, platforms, and links stay out, so a name cannot be
+    // out-weighted by how much else a partner has.
+    for (const value of [
+      "affiliate marketer",
+      "youtube",
+      "@rafi",
+      "rafi-link",
+    ]) {
+      expect(row.identityText).not.toContain(value);
+    }
+    // ContainsAllTokens reads the BM25 index, so no text attribute needs a
+    // filter index, and turbopuffer bills FTS + filterable at 200%.
+    expect(schema.identityText.filterable).toBeUndefined();
+    expect(schema.emailNgrams.filterable).toBeUndefined();
+    expect(schema.programId).toMatchObject({ filterable: true });
+  });
+
+  it("flattens every searchable field into one BM25 attribute", async () => {
+    await createProvider().upsert([document]);
+
+    const [{ upsert_rows, schema }] = mocks.write.mock.calls[0];
+    expect(upsert_rows).toHaveLength(1);
+
+    const [row] = upsert_rows;
+    expect(row.id).toBe("pge_test");
+    expect(row.programId).toBe("prog_test");
+    for (const value of [
+      "rafi hasan",
+      "partner@example.com",
+      "hasan labs",
+      "affiliate marketer",
+      "youtube",
+      "@rafi",
+      "rafi-link",
+    ]) {
+      expect(row.searchText).toContain(value);
+    }
+  });
+
+  it("pins a tokenizer that splits URLs into their components", async () => {
+    // The default tokenizer keeps a URL as one token, so "scottdigital" cannot
+    // match "https://www.scottdigital-42.techcorp.io"
+    // and websites + partner links are all searchable here
+    await createProvider().upsert([document]);
+
+    const [{ schema }] = mocks.write.mock.calls[0];
+    expect(schema.searchText.full_text_search).toMatchObject({
+      tokenizer: "word_v2",
+    });
+    expect(schema.emailNgrams.full_text_search).toEqual({
+      tokenizer: "word_v2",
+    });
+  });
+
+  it("always searches identity separately, so single-word queries can rank", async () => {
+    // A single-token last_as_prefix query scores every match at exactly 1, so
+    // the broad branch returns them unordered. Matching an identity field puts a
+    // document in two branches, which is what the rank fusion orders on.
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "rafi",
+      limit: 10,
+    });
+
+    const [{ queries }] = mocks.multiQuery.mock.calls[0];
+    expect(queries.map((branch: any) => branch.rank_by[0])).toEqual(
+      expect.arrayContaining(["searchText", "identityText"]),
+    );
+  });
+
+  it("scopes both branches to the program and matches prefixes", async () => {
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "rafi",
+      limit: 10,
+    });
+
+    const [{ queries }] = mocks.multiQuery.mock.calls[0];
+    const [textBranch] = queries;
+
+    expect(textBranch.rank_by).toEqual([
+      "searchText",
+      "BM25",
+      "rafi",
+      { last_as_prefix: true },
+    ]);
+    expect(textBranch.filters).toEqual(["programId", "Eq", "prog_test"]);
+
+    for (const branch of queries) {
+      expect(JSON.stringify(branch.filters)).toContain("prog_test");
+      expect(branch.top_k).toBe(10);
+    }
+  });
+
+  it("adds an all-terms branch for a multi-word query", async () => {
+    // BM25 alone does not require every word, and length normalization can rank
+    // a long document matching both words below a short one matching only the
+    // first. This branch admits only documents containing every term.
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "steven tey",
+      limit: 10,
+    });
+
+    const [allTermsBranch] = branchesOf().filteredOn("identityText");
+    expect(allTermsBranch.rank_by).toEqual([
+      "identityText",
+      "BM25",
+      "steven tey",
+      { last_as_prefix: true },
+    ]);
+    expect(allTermsBranch.filters).toEqual([
+      "And",
+      [
+        ["programId", "Eq", "prog_test"],
+        [
+          "identityText",
+          "ContainsAllTokens",
+          "steven tey",
+          { last_as_prefix: true },
+        ],
+      ],
+    ]);
+  });
+
+  it("keeps the last token a prefix while it is still being typed", async () => {
+    // An exact-token filter would match nothing for a half-typed final word, so
+    // the all-terms boost would vanish exactly while the user is typing.
+    // Measured on the production index: "steven te" puts Steven Tey at rank 2
+    // with the prefix and rank 4 without it.
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "steven te",
+      limit: 10,
+    });
+
+    const [allTermsBranch] = branchesOf().filteredOn("identityText");
+
+    expect(allTermsBranch.filters[1][1]).toEqual([
+      "identityText",
+      "ContainsAllTokens",
+      "steven te",
+      { last_as_prefix: true },
+    ]);
+  });
+
+  it("skips the all-terms branch for a single-word query", async () => {
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "steven",
+      limit: 10,
+    });
+
+    expect(branchesOf().filteredOn("identityText")).toHaveLength(0);
+  });
+
+  it("narrows every branch with the discrete filters", async () => {
+    // The filters have to sit inside each branch: applying them after the
+    // ranking truncates is what made a broad query with country=US return 85
+    // rows out of 7,698 real matches.
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 10,
+      filters: {
+        status: { values: ["approved"] },
+        country: { values: ["US", "CA"], exclude: true },
+        partnerTagIds: { values: ["ptag_1"] },
+      },
+    });
+
+    const [{ queries }] = mocks.multiQuery.mock.calls[0];
+    expect(queries.length).toBeGreaterThan(1);
+
+    for (const branch of queries) {
+      const filters = JSON.stringify(branch.filters);
+      expect(filters).toContain('["programId","Eq","prog_test"]');
+      expect(filters).toContain('["status","In",["approved"]]');
+      // Exclusion uses NotIn, which also matches documents that omit country.
+      expect(filters).toContain('["country","NotIn",["US","CA"]]');
+      expect(filters).toContain('["partnerTagIds","ContainsAny",["ptag_1"]]');
+    }
+  });
+
+  it("omits absent filters rather than sending empty clauses", async () => {
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 10,
+      filters: { status: undefined, country: { values: [] } },
+    });
+
+    const [{ queries }] = mocks.multiQuery.mock.calls[0];
+    for (const branch of queries) {
+      expect(JSON.stringify(branch.filters)).not.toContain('"country"');
+    }
+  });
+
+  it("requires every trigram on the n-gram branch", async () => {
+    // BM25 alone would score a document sharing a single trigram, which is how
+    // an unrelated address looks like a partial-email match.
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 10,
+    });
+
+    const [ngramBranch] = branchesOf().rankedOn("emailNgrams");
+    expect(ngramBranch.rank_by).toEqual(["emailNgrams", "BM25", "exa xam amp"]);
+    expect(ngramBranch.filters).toEqual([
+      "And",
+      [
+        ["programId", "Eq", "prog_test"],
+        ["emailNgrams", "ContainsAllTokens", "exa xam amp"],
+      ],
+    ]);
+  });
+
+  it("skips the n-gram branch when the query cannot produce trigrams", async () => {
+    await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "hi",
+      limit: 10,
+    });
+
+    expect(branchesOf().rankedOn("emailNgrams")).toHaveLength(0);
+  });
+
+  it("fuses branches by rank, boosting documents found by both", async () => {
+    // Raw $dist values are incomparable across branches, so they must not
+    // decide the order: pge_2 carries the highest raw score but only one
+    // branch found it, while both branches found pge_1.
+    mocks.multiQuery.mockResolvedValue({
+      results: [
+        { rows: [{ id: "pge_1", $dist: 0.4 }] },
+        {
+          rows: [
+            { id: "pge_2", $dist: 7.6 },
+            { id: "pge_1", $dist: 0.9 },
+          ],
+        },
+      ],
+    });
+
+    const { hits } = await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 10,
+    });
+
+    expect(hits.map(({ id }) => id)).toEqual(["pge_1", "pge_2"]);
+    // RRF: rank 1 + rank 2 across branches vs rank 1 in one branch.
+    expect(hits[0].score).toBeCloseTo(1 / 61 + 1 / 62, 10);
+    expect(hits[1].score).toBeCloseTo(1 / 61, 10);
+  });
+
+  it("breaks cross-branch rank ties deterministically by ID", async () => {
+    mocks.multiQuery.mockResolvedValue({
+      results: [
+        { rows: [{ id: "pge_b", $dist: 9.5 }] },
+        { rows: [{ id: "pge_a", $dist: 0.2 }] },
+      ],
+    });
+
+    const { hits } = await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 10,
+    });
+
+    expect(hits.map(({ id }) => id)).toEqual(["pge_a", "pge_b"]);
+  });
+
+  it("never returns more than the requested limit", async () => {
+    mocks.multiQuery.mockResolvedValue({
+      results: [
+        { rows: [{ id: "pge_1", $dist: 0.5 }] },
+        { rows: [{ id: "pge_2", $dist: 0.4 }] },
+      ],
+    });
+
+    const { hits } = await createProvider().searchCandidates({
+      programId: "prog_test",
+      query: "examp",
+      limit: 1,
+    });
+
+    expect(hits).toHaveLength(1);
+  });
+
+  it("rejects a limit above the candidate ceiling", async () => {
+    await expect(
+      createProvider().searchCandidates({
+        programId: "prog_test",
+        query: "rafi",
+        limit: PARTNER_SEARCH_CANDIDATE_LIMIT + 1,
+      }),
+    ).rejects.toThrow("Partner search candidate limit");
+  });
+
+  it("counts a three-character prefix, the shortest it will answer", async () => {
+    const total = await createProvider().countCandidates({
+      programId: "prog_test",
+      query: "ale",
+      limit: 10,
+    });
+
+    expect(total).toBe(12_000);
+  });
+
+  it("returns null when the response carries no aggregate", async () => {
+    // Zero would render an unanswered count as an exact empty result.
+    mocks.query.mockResolvedValue({});
+
+    await expect(
+      createProvider().countCandidates({
+        programId: "prog_test",
+        query: "creator",
+        limit: 10,
+      }),
+    ).resolves.toBeNull();
+  });
+
+  it("counts matches without the candidate ceiling", async () => {
+    const total = await createProvider().countCandidates({
+      programId: "prog_test",
+      query: "creator",
+      limit: 10,
+      filters: { status: { values: ["approved"] } },
+    });
+
+    expect(total).toBe(12_000);
+
+    const [request] = mocks.query.mock.calls[0];
+    expect(request.aggregate_by).toEqual({ total: ["Count"] });
+    // One clause covers both text branches, since identityText holds a subset
+    // of what searchText holds.
+    const filters = JSON.stringify(request.filters);
+    expect(filters).toContain('["searchText","ContainsAnyToken","creator"');
+    expect(filters).toContain('["status","In",["approved"]]');
+  });
+
+  it.each([
+    ["a single character", "a"],
+    ["a half-typed final token", "steven a"],
+  ])(
+    "declines to count %s, which the prefix expands too far",
+    async (_label, query) => {
+      // Measured against 626K documents: a one-character prefix takes the
+      // aggregation from ~50ms to ~1.2s, past the deadline every time.
+      const total = await createProvider().countCandidates({
+        programId: "prog_test",
+        query,
+        limit: 10,
+      });
+
+      expect(total).toBeNull();
+      expect(mocks.query).not.toHaveBeenCalled();
+    },
+  );
+
+  it("deletes by document ID", async () => {
+    await createProvider().delete(["pge_1", "pge_2"]);
+
+    expect(mocks.write).toHaveBeenCalledWith({
+      deletes: ["pge_1", "pge_2"],
+    });
+  });
+
+  it("empties the namespace", async () => {
+    mocks.deleteAll.mockResolvedValue({});
+
+    const result = await deleteTurbopufferPartnerSearchNamespace({
+      namespace: createNamespaceMock(),
+      namespaceName: "test-namespace",
+    });
+
+    expect(mocks.deleteAll).toHaveBeenCalledOnce();
+    expect(result).toEqual({ namespaceName: "test-namespace" });
+  });
+
+  it("uses the pinned namespace when none is passed", async () => {
+    mocks.deleteAll.mockResolvedValue({});
+
+    const { namespaceName } = await deleteTurbopufferPartnerSearchNamespace({
+      namespace: createNamespaceMock(),
+    });
+
+    expect(namespaceName).toBe(PARTNER_SEARCH_NAMESPACE);
+  });
+});
diff --git a/apps/web/tests/payouts/send-payout-reminder.test.ts b/apps/web/tests/payouts/send-payout-reminder.test.ts
new file mode 100644
index 00000000000..8573151d395
--- /dev/null
+++ b/apps/web/tests/payouts/send-payout-reminder.test.ts
@@ -0,0 +1,665 @@
+import { MIN_PAYOUT_AMOUNT_FOR_REMINDERS } from "@/lib/constants/misc";
+import { PAYOUT_SUPPORTED_COUNTRIES } from "@/lib/constants/payouts-supported-countries";
+import { sendPayoutReminder } from "@/lib/payouts/send-payout-reminder";
+import { ACME_PROGRAM_ID, DEMO_PROGRAM_ID } from "@dub/utils";
+import { PayoutStatus, ProgramPayoutMode } from "@prisma/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const BATCH_SIZE = 500;
+const NOW = new Date("2026-09-24T09:00:00.000Z");
+
+const mocks = vi.hoisted(() => ({
+  groupBy: vi.fn(),
+  partnerFindMany: vi.fn(),
+  programFindMany: vi.fn(),
+  partnerUpdateMany: vi.fn(),
+  queueBatchEmail: vi.fn(),
+}));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: {
+    payout: {
+      groupBy: mocks.groupBy,
+    },
+    partner: {
+      findMany: mocks.partnerFindMany,
+      updateMany: mocks.partnerUpdateMany,
+    },
+    program: {
+      findMany: mocks.programFindMany,
+    },
+  },
+}));
+
+vi.mock("@/lib/email/queue-batch-email", () => ({
+  queueBatchEmail: mocks.queueBatchEmail,
+}));
+
+function payoutGroup({
+  partnerId,
+  programId,
+  amount,
+}: {
+  partnerId: string;
+  programId: string;
+  amount: number;
+}) {
+  return {
+    partnerId,
+    programId,
+    _sum: { amount },
+  };
+}
+
+function partner({ id, email }: { id: string; email: string | null }) {
+  return {
+    id,
+    name: `Partner ${id}`,
+    email,
+  };
+}
+
+function program({ id }: { id: string }) {
+  return {
+    id,
+    name: `Program ${id}`,
+    logo: `https://example.com/${id}.png`,
+  };
+}
+
+const THREE_DAYS_MS = 3 * 24 * 60 * 60 * 1000;
+const supportedCountry = PAYOUT_SUPPORTED_COUNTRIES[0].code;
+const unsupportedCountry = "ZZ";
+
+type ReminderCandidate = {
+  status: PayoutStatus;
+  programId: string;
+  amount: number;
+  payoutsEnabledAt: Date | null;
+  country: string | null;
+  connectPayoutsLastRemindedAt: Date | null;
+};
+
+const eligibleReminder: ReminderCandidate = {
+  status: PayoutStatus.pending,
+  programId: "prog_real",
+  amount: MIN_PAYOUT_AMOUNT_FOR_REMINDERS,
+  payoutsEnabledAt: null,
+  country: null,
+  connectPayoutsLastRemindedAt: null,
+};
+
+function matchesReminderFilters(
+  where: {
+    status?: { in?: PayoutStatus[] };
+    programId?: { notIn?: string[] };
+    amount?: { gte?: number };
+    partner?: {
+      payoutsEnabledAt?: Date | null;
+      AND?: Array<{
+        OR?: Array<{
+          country?: string | null | { in?: string[] };
+          connectPayoutsLastRemindedAt?: Date | null | { lte?: Date };
+        }>;
+      }>;
+    };
+  },
+  candidate: ReminderCandidate,
+) {
+  if (!where.status?.in) {
+    throw new Error("Missing status filter");
+  }
+
+  if (!where.status.in.includes(candidate.status)) {
+    return false;
+  }
+
+  if (!where.programId?.notIn) {
+    throw new Error("Missing program filter");
+  }
+
+  if (where.programId.notIn.includes(candidate.programId)) {
+    return false;
+  }
+
+  if (typeof where.amount?.gte !== "number") {
+    throw new Error("Missing amount filter");
+  }
+
+  if (candidate.amount < where.amount.gte) {
+    return false;
+  }
+
+  const partner = where.partner;
+
+  if (!partner || partner.payoutsEnabledAt !== null) {
+    throw new Error("Missing payoutsEnabledAt filter");
+  }
+
+  if (candidate.payoutsEnabledAt !== null) {
+    return false;
+  }
+
+  const countryOr = partner.AND?.find((clause) =>
+    clause.OR?.some((item) => "country" in item),
+  )?.OR;
+  const remindedOr = partner.AND?.find((clause) =>
+    clause.OR?.some((item) => "connectPayoutsLastRemindedAt" in item),
+  )?.OR;
+
+  if (!countryOr || !remindedOr) {
+    throw new Error("Missing partner country or reminder filter");
+  }
+
+  const countryMatches = countryOr.some((clause) => {
+    if (clause.country === null) {
+      return candidate.country === null;
+    }
+
+    if (
+      clause.country &&
+      typeof clause.country === "object" &&
+      clause.country.in
+    ) {
+      return (
+        candidate.country !== null &&
+        clause.country.in.includes(candidate.country)
+      );
+    }
+
+    return false;
+  });
+
+  if (!countryMatches) {
+    return false;
+  }
+
+  return remindedOr.some((clause) => {
+    const remindedAt = clause.connectPayoutsLastRemindedAt;
+
+    if (remindedAt === null) {
+      return candidate.connectPayoutsLastRemindedAt === null;
+    }
+
+    if (
+      !(remindedAt instanceof Date) &&
+      remindedAt?.lte instanceof Date &&
+      candidate.connectPayoutsLastRemindedAt !== null
+    ) {
+      return (
+        candidate.connectPayoutsLastRemindedAt.getTime() <=
+        remindedAt.lte.getTime()
+      );
+    }
+
+    return false;
+  });
+}
+
+function matchesProgramEnrollmentFilter(
+  filter: {
+    OR: Array<{
+      program?: { payoutMode: ProgramPayoutMode };
+      tenantId?: string | null;
+    }>;
+  },
+  enrollment: {
+    payoutMode: ProgramPayoutMode;
+    tenantId: string | null;
+  },
+) {
+  return filter.OR.some((clause) => {
+    if (clause.program && clause.program.payoutMode !== enrollment.payoutMode) {
+      return false;
+    }
+
+    if ("tenantId" in clause && clause.tenantId !== enrollment.tenantId) {
+      return false;
+    }
+
+    return true;
+  });
+}
+
+describe("sendPayoutReminder", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(NOW);
+
+    mocks.groupBy.mockReset().mockResolvedValue([]);
+    mocks.partnerFindMany.mockReset().mockResolvedValue([]);
+    mocks.programFindMany.mockReset().mockResolvedValue([]);
+    mocks.partnerUpdateMany.mockReset().mockResolvedValue({ count: 0 });
+    mocks.queueBatchEmail.mockReset().mockResolvedValue([]);
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("returns without emailing when no payouts match", async () => {
+    await expect(sendPayoutReminder()).resolves.toBeUndefined();
+
+    expect(mocks.groupBy).toHaveBeenCalledOnce();
+
+    expect(mocks.partnerFindMany).not.toHaveBeenCalled();
+    expect(mocks.queueBatchEmail).not.toHaveBeenCalled();
+    expect(mocks.partnerUpdateMany).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    {
+      label: "pending status",
+      patch: { status: PayoutStatus.pending },
+      included: true,
+    },
+    {
+      label: "processing status",
+      patch: { status: PayoutStatus.processing },
+      included: true,
+    },
+    {
+      label: "processed status",
+      patch: { status: PayoutStatus.processed },
+      included: true,
+    },
+    {
+      label: "failed status",
+      patch: { status: PayoutStatus.failed },
+      included: true,
+    },
+    {
+      label: "sent status",
+      patch: { status: PayoutStatus.sent },
+      included: false,
+    },
+    {
+      label: "completed status",
+      patch: { status: PayoutStatus.completed },
+      included: false,
+    },
+    {
+      label: "canceled status",
+      patch: { status: PayoutStatus.canceled },
+      included: false,
+    },
+    {
+      label: "Acme program",
+      patch: { programId: ACME_PROGRAM_ID },
+      included: false,
+    },
+    {
+      label: "demo program",
+      patch: { programId: DEMO_PROGRAM_ID },
+      included: false,
+    },
+    {
+      label: "payouts already connected",
+      patch: { payoutsEnabledAt: NOW },
+      included: false,
+    },
+    {
+      label: "missing country",
+      patch: { country: null },
+      included: true,
+    },
+    {
+      label: "supported country",
+      patch: { country: supportedCountry },
+      included: true,
+    },
+    {
+      label: "unsupported country",
+      patch: { country: unsupportedCountry },
+      included: false,
+    },
+    {
+      label: "never reminded",
+      patch: { connectPayoutsLastRemindedAt: null },
+      included: true,
+    },
+    {
+      label: "reminded exactly 3 days ago",
+      patch: {
+        connectPayoutsLastRemindedAt: new Date(NOW.getTime() - THREE_DAYS_MS),
+      },
+      included: true,
+    },
+    {
+      label: "reminded more than 3 days ago",
+      patch: {
+        connectPayoutsLastRemindedAt: new Date(
+          NOW.getTime() - THREE_DAYS_MS - 1,
+        ),
+      },
+      included: true,
+    },
+    {
+      label: "reminded within 3 days",
+      patch: {
+        connectPayoutsLastRemindedAt: new Date(
+          NOW.getTime() - THREE_DAYS_MS + 1,
+        ),
+      },
+      included: false,
+    },
+    {
+      label: "amount at the minimum",
+      patch: { amount: MIN_PAYOUT_AMOUNT_FOR_REMINDERS },
+      included: true,
+    },
+    {
+      label: "amount below the minimum",
+      patch: { amount: MIN_PAYOUT_AMOUNT_FOR_REMINDERS - 1 },
+      included: false,
+    },
+  ])("$label is included: $included", async ({ patch, included }) => {
+    await sendPayoutReminder();
+
+    const { where } = mocks.groupBy.mock.calls[0][0];
+
+    expect(
+      matchesReminderFilters(where, { ...eligibleReminder, ...patch }),
+    ).toBe(included);
+  });
+
+  it.each([
+    {
+      payoutMode: ProgramPayoutMode.internal,
+      tenantId: "tenant_1",
+      included: true,
+    },
+    {
+      payoutMode: ProgramPayoutMode.internal,
+      tenantId: null,
+      included: true,
+    },
+    {
+      payoutMode: ProgramPayoutMode.external,
+      tenantId: "tenant_1",
+      included: false,
+    },
+    {
+      payoutMode: ProgramPayoutMode.external,
+      tenantId: null,
+      included: false,
+    },
+    {
+      payoutMode: ProgramPayoutMode.hybrid,
+      tenantId: "tenant_1",
+      included: false,
+    },
+    {
+      payoutMode: ProgramPayoutMode.hybrid,
+      tenantId: null,
+      included: true,
+    },
+  ])(
+    "payout mode $payoutMode with tenantId $tenantId is included: $included",
+    async ({ payoutMode, tenantId, included }) => {
+      await sendPayoutReminder();
+
+      const { where } = mocks.groupBy.mock.calls[0][0];
+
+      expect(
+        matchesProgramEnrollmentFilter(where.programEnrollment, {
+          payoutMode,
+          tenantId,
+        }),
+      ).toBe(included);
+    },
+  );
+
+  it("sends one reminder per partner and records when they were reminded", async () => {
+    mocks.groupBy
+      .mockResolvedValueOnce([{ partnerId: "pn_1" }, { partnerId: "pn_2" }])
+      .mockResolvedValueOnce([
+        payoutGroup({
+          partnerId: "pn_1",
+          programId: "prog_a",
+          amount: 2500,
+        }),
+        payoutGroup({
+          partnerId: "pn_1",
+          programId: "prog_b",
+          amount: 1500,
+        }),
+        payoutGroup({
+          partnerId: "pn_2",
+          programId: "prog_a",
+          amount: 1000,
+        }),
+      ]);
+    mocks.partnerFindMany.mockResolvedValue([
+      partner({ id: "pn_1", email: "one@example.com" }),
+      partner({ id: "pn_2", email: "two@example.com" }),
+    ]);
+    mocks.programFindMany.mockResolvedValue([
+      program({ id: "prog_a" }),
+      program({ id: "prog_b" }),
+    ]);
+
+    await expect(sendPayoutReminder()).resolves.toBeUndefined();
+
+    expect(mocks.groupBy).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({
+        by: ["partnerId"],
+        orderBy: { partnerId: "asc" },
+        take: BATCH_SIZE,
+      }),
+    );
+    expect(mocks.groupBy).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        by: ["partnerId", "programId"],
+        where: expect.objectContaining({
+          partnerId: { in: ["pn_1", "pn_2"] },
+        }),
+      }),
+    );
+    expect(mocks.partnerFindMany).toHaveBeenCalledWith({
+      where: {
+        id: {
+          in: ["pn_1", "pn_1", "pn_2"],
+        },
+        OR: [
+          {
+            users: {
+              none: {},
+            },
+          },
+          {
+            users: {
+              some: {
+                notificationPreferences: {
+                  connectPayoutReminder: true,
+                },
+              },
+            },
+          },
+        ],
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+      },
+    });
+    expect(mocks.programFindMany).toHaveBeenCalledWith({
+      where: {
+        id: {
+          in: ["prog_a", "prog_b", "prog_a"],
+        },
+      },
+      select: {
+        id: true,
+        name: true,
+        logo: true,
+      },
+    });
+    expect(mocks.queueBatchEmail).toHaveBeenCalledWith(
+      [
+        {
+          variant: "notifications",
+          to: "one@example.com",
+          subject: "Connect your payout details on Dub Partners",
+          templateName: "ConnectPayoutReminder",
+          templateProps: {
+            email: "one@example.com",
+            programs: [
+              {
+                id: "prog_a",
+                name: "Program prog_a",
+                logo: "https://example.com/prog_a.png",
+                amount: 2500,
+              },
+              {
+                id: "prog_b",
+                name: "Program prog_b",
+                logo: "https://example.com/prog_b.png",
+                amount: 1500,
+              },
+            ],
+          },
+        },
+        {
+          variant: "notifications",
+          to: "two@example.com",
+          subject: "Connect your payout details on Dub Partners",
+          templateName: "ConnectPayoutReminder",
+          templateProps: {
+            email: "two@example.com",
+            programs: [
+              {
+                id: "prog_a",
+                name: "Program prog_a",
+                logo: "https://example.com/prog_a.png",
+                amount: 1000,
+              },
+            ],
+          },
+        },
+      ],
+      {
+        idempotencyKey: "payout-reminders-2026-09-24-1",
+      },
+    );
+    expect(mocks.partnerUpdateMany).toHaveBeenCalledWith({
+      where: {
+        id: {
+          in: ["pn_1", "pn_2"],
+        },
+      },
+      data: {
+        connectPayoutsLastRemindedAt: NOW,
+      },
+    });
+  });
+
+  it("skips partners with no email and partners excluded by notification preferences", async () => {
+    mocks.groupBy
+      .mockResolvedValueOnce([
+        { partnerId: "pn_no_email" },
+        { partnerId: "pn_opted_out" },
+        { partnerId: "pn_ok" },
+      ])
+      .mockResolvedValueOnce([
+        payoutGroup({
+          partnerId: "pn_no_email",
+          programId: "prog_a",
+          amount: 2000,
+        }),
+        payoutGroup({
+          partnerId: "pn_opted_out",
+          programId: "prog_a",
+          amount: 2000,
+        }),
+        payoutGroup({
+          partnerId: "pn_ok",
+          programId: "prog_a",
+          amount: 2000,
+        }),
+      ]);
+    mocks.partnerFindMany.mockResolvedValue([
+      partner({ id: "pn_no_email", email: null }),
+      partner({ id: "pn_ok", email: "ok@example.com" }),
+    ]);
+    mocks.programFindMany.mockResolvedValue([program({ id: "prog_a" })]);
+
+    await expect(sendPayoutReminder()).resolves.toBeUndefined();
+
+    expect(mocks.queueBatchEmail).toHaveBeenCalledWith(
+      [
+        expect.objectContaining({
+          to: "ok@example.com",
+        }),
+      ],
+      {
+        idempotencyKey: "payout-reminders-2026-09-24-1",
+      },
+    );
+    expect(mocks.partnerUpdateMany).toHaveBeenCalledWith({
+      where: {
+        id: {
+          in: ["pn_ok"],
+        },
+      },
+      data: {
+        connectPayoutsLastRemindedAt: NOW,
+      },
+    });
+  });
+
+  it("returns the last partner id when the batch is full", async () => {
+    const partnerIds = Array.from({ length: BATCH_SIZE }, (_, index) => ({
+      partnerId: `pn_${index}`,
+    }));
+
+    mocks.groupBy.mockResolvedValueOnce(partnerIds).mockResolvedValueOnce([
+      payoutGroup({
+        partnerId: "pn_0",
+        programId: "prog_a",
+        amount: 1000,
+      }),
+    ]);
+    mocks.partnerFindMany.mockResolvedValue([
+      partner({ id: "pn_0", email: "zero@example.com" }),
+    ]);
+    mocks.programFindMany.mockResolvedValue([program({ id: "prog_a" })]);
+
+    await expect(sendPayoutReminder()).resolves.toBe("pn_499");
+  });
+
+  it("continues after the partner id from the previous batch", async () => {
+    mocks.groupBy
+      .mockResolvedValueOnce([{ partnerId: "pn_11" }])
+      .mockResolvedValueOnce([
+        payoutGroup({
+          partnerId: "pn_11",
+          programId: "prog_a",
+          amount: 1000,
+        }),
+      ]);
+    mocks.partnerFindMany.mockResolvedValue([
+      partner({ id: "pn_11", email: "eleven@example.com" }),
+    ]);
+    mocks.programFindMany.mockResolvedValue([program({ id: "prog_a" })]);
+
+    await sendPayoutReminder({ afterPartnerId: "pn_10", batchNumber: 2 });
+
+    expect(mocks.groupBy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        by: ["partnerId"],
+        where: expect.objectContaining({
+          partnerId: {
+            gt: "pn_10",
+          },
+        }),
+      }),
+    );
+    expect(mocks.queueBatchEmail).toHaveBeenCalledWith(expect.any(Array), {
+      idempotencyKey: "payout-reminders-2026-09-24-2",
+    });
+  });
+});
diff --git a/apps/web/tests/redirects/index.test.ts b/apps/web/tests/redirects/index.test.ts
index 803fb80a415..b292ab5c5d1 100644
--- a/apps/web/tests/redirects/index.test.ts
+++ b/apps/web/tests/redirects/index.test.ts
@@ -9,6 +9,7 @@ const fetchOptions: RequestInit = {
   redirect: "manual",
   headers: {
     "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)",
+    "x-e2e-redirect-test": "true",
   },
 };
 
@@ -59,276 +60,272 @@ async function assertRedirectWithDubIdCookie(
   expect(dubIdCookie).toMatch(/Max-Age=3600\b/i);
 }
 
-describe.runIf(env.CI)("Link Redirects", async () => {
-  const h = new IntegrationHarness();
+describe.runIf(env.CI && env.VERCEL_ENV !== "Production")(
+  "Link Redirects",
+  async () => {
+    const h = new IntegrationHarness();
 
-  test("root", async () => {
-    const response = await fetch(h.baseUrl, fetchOptions);
+    test("root", async () => {
+      const response = await fetch(h.baseUrl, fetchOptions);
 
-    // the location should start with "https://dub.co"
-    expect(response.headers.get("location")).toMatch(/^https:\/\/dub\.co\//);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(301);
-  });
-
-  test("regular", async () => {
-    const response = await fetch(`${h.baseUrl}/checkly-check`, fetchOptions);
-
-    expect(response.headers.get("location")).toBe("https://www.checklyhq.com/");
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      // the location should start with "https://dub.co"
+      expect(response.headers.get("location")).toMatch(/^https:\/\/dub\.co\//);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(301);
+    });
 
-  test("disabled link", async () => {
-    const response = await fetch(`${h.baseUrl}/disabled`, fetchOptions);
+    test("regular", async () => {
+      const response = await fetch(`${h.baseUrl}/checkly-check`, fetchOptions);
 
-    // Special case for disabled/notfound links since we're using redirect() from next/navigation:
-    // - doesn't support x-powered-by header
-    // - uses 307 status code instead of 302
-    // This is the same as case-sensitive (incorrect) key test below.
-    expect(response.headers.get("location")).toBe("https://dub.co/links");
-    expect(response.status).toBe(307);
-  });
+      expect(response.headers.get("location")).toBe(
+        "https://www.checklyhq.com/",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with slash", async () => {
-    const response = await fetch(`${h.baseUrl}/checkly/check`, fetchOptions);
+    test("with slash", async () => {
+      const response = await fetch(`${h.baseUrl}/checkly/check`, fetchOptions);
 
-    expect(response.headers.get("location")).toBe("https://www.checklyhq.com/");
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("location")).toBe(
+        "https://www.checklyhq.com/",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("korean unicode key", async () => {
-    const hangulKey = "한글링크테스트";
-    const url = new URL(h.baseUrl);
-    url.pathname = `/${hangulKey}`;
+    test("korean unicode key", async () => {
+      const hangulKey = "한글링크테스트";
+      const url = new URL(h.baseUrl);
+      url.pathname = `/${hangulKey}`;
 
-    const response = await fetch(url.href, fetchOptions);
+      const response = await fetch(url.href, fetchOptions);
 
-    expect(response.headers.get("location")).toBe(
-      "https://youtu.be/9bZkp7q19f0",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("location")).toBe(
+        "https://youtu.be/9bZkp7q19f0",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("hebrew unicode key", async () => {
-    const hebrewKey = "שלום";
-    const url = new URL(h.baseUrl);
-    url.pathname = `/${hebrewKey}`;
+    test("hebrew unicode key", async () => {
+      const hebrewKey = "שלום";
+      const url = new URL(h.baseUrl);
+      url.pathname = `/${hebrewKey}`;
 
-    const response = await fetch(url.href, fetchOptions);
+      const response = await fetch(url.href, fetchOptions);
 
-    expect(response.headers.get("location")).toBe(
-      "https://youtube.com/shorts/IdP2WdnJK1o",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("location")).toBe(
+        "https://youtube.com/shorts/IdP2WdnJK1o",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with dub_id", async () => {
-    await assertRedirectWithDubIdCookie(h.baseUrl, "conversion-tracking");
-  });
+    test("with dub_id", async () => {
+      await assertRedirectWithDubIdCookie(h.baseUrl, "conversion-tracking");
+    });
 
-  test("with dub_id (and slash in key)", async () => {
-    await assertRedirectWithDubIdCookie(h.baseUrl, "conversion/tracking");
-  });
+    test("with dub_id (and slash in key)", async () => {
+      await assertRedirectWithDubIdCookie(h.baseUrl, "conversion/tracking");
+    });
 
-  test("with dub_id and via", async () => {
-    await assertRedirectWithDubIdCookie(h.baseUrl, "track-test", {
-      via: "track-test",
+    test("with dub_id and via", async () => {
+      await assertRedirectWithDubIdCookie(h.baseUrl, "track-test", {
+        via: "track-test",
+      });
     });
-  });
 
-  test("with dub_client_reference_id", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/client_reference_id`,
-      fetchOptions,
-    );
-
-    // the location should contain `?client_reference_id=dub_id_` query param
-    expect(response.headers.get("location")).toMatch(
-      /client_reference_id=dub_id_[a-zA-Z0-9]+/,
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+    test("with dub_client_reference_id", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/client_reference_id`,
+        fetchOptions,
+      );
+
+      // the location should contain `?client_reference_id=dub_id_` query param
+      expect(response.headers.get("location")).toMatch(
+        /client_reference_id=dub_id_[a-zA-Z0-9]+/,
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with passthrough query", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/checkly-check-passthrough?utm_source=checkly`,
-      fetchOptions,
-    );
-
-    expect(response.headers.get("location")).toBe(
-      "https://www.checklyhq.com/?utm_source=checkly&utm_medium=social&utm_campaign=checks",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+    test("with passthrough query", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/checkly-check-passthrough?utm_source=checkly`,
+        fetchOptions,
+      );
+
+      expect(response.headers.get("location")).toBe(
+        "https://www.checklyhq.com/?utm_source=checkly&utm_medium=social&utm_campaign=checks",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with complex query", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/checkly-check-query`,
-      fetchOptions,
-    );
-
-    expect(response.headers.get("location")).toBe(
-      "https://guides.apple.com/?ug=CglEVUIgR3VpZGUSDgjZMhDEo%2BGA%2BZKqpJUBEg4I2TIQw7y33%2B%2B6ifL%2BARIOCNkyEJC988jqgIrQjQESDgjZMhCB%2B7XSiPTwrfUBEg4I2TIQ5J25xZOynPDxARINCNkyENuVr4POz8aMcBIOCMI7EK36pfjQuerJ0gESDQjCOxDSuurnjM6T7mASDQjCOxD3vr%2F%2Fkq%2FLqUwSDQjCOxCg9cK%2BjeOhnS4%3D",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+    test("with complex query", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/checkly-check-query`,
+        fetchOptions,
+      );
+
+      expect(response.headers.get("location")).toBe(
+        "https://guides.apple.com/?ug=CglEVUIgR3VpZGUSDgjZMhDEo%2BGA%2BZKqpJUBEg4I2TIQw7y33%2B%2B6ifL%2BARIOCNkyEJC988jqgIrQjQESDgjZMhCB%2B7XSiPTwrfUBEg4I2TIQ5J25xZOynPDxARINCNkyENuVr4POz8aMcBIOCMI7EK36pfjQuerJ0gESDQjCOxDSuurnjM6T7mASDQjCOxD3vr%2F%2Fkq%2FLqUwSDQjCOxCg9cK%2BjeOhnS4%3D",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("appsflyer tracking url", async () => {
-    const response = await fetch(`${h.baseUrl}/appsflyer`, fetchOptions);
+    test("appsflyer tracking url", async () => {
+      const response = await fetch(`${h.baseUrl}/appsflyer`, fetchOptions);
 
-    // location to include clickid, af_siteid query params
-    expect(response.headers.get("location")).toMatch(/pid=dubinc_int/);
-    expect(response.headers.get("location")).toMatch(/clickid=[a-zA-Z0-9]+/);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      // location to include clickid, af_siteid query params
+      expect(response.headers.get("location")).toMatch(/pid=dubinc_int/);
+      expect(response.headers.get("location")).toMatch(/clickid=[a-zA-Z0-9]+/);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("singular tracking url", async () => {
-    const response = await fetch(`${h.baseUrl}/singular`, fetchOptions);
+    test("singular tracking url", async () => {
+      const response = await fetch(`${h.baseUrl}/singular`, fetchOptions);
 
-    // location to include  cl, ua, ip query params
-    expect(response.headers.get("location")).toMatch(/cl=[a-zA-Z0-9]+/);
-    expect(response.headers.get("location")).toMatch(/ua=[a-zA-Z0-9]+/);
-    expect(response.headers.get("location")).toMatch(/ip=[a-zA-Z0-9]+/);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      // location to include  cl, ua, ip query params
+      expect(response.headers.get("location")).toMatch(/cl=[a-zA-Z0-9]+/);
+      expect(response.headers.get("location")).toMatch(/ua=[a-zA-Z0-9]+/);
+      expect(response.headers.get("location")).toMatch(/ip=[a-zA-Z0-9]+/);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("singular polyfill wpcn & wpcl params", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/singular-polyfill`,
-      fetchOptions,
-    );
+    test("singular polyfill wpcn & wpcl params", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/singular-polyfill`,
+        fetchOptions,
+      );
 
-    const location = response.headers.get("location");
-    expect(location).toBeTruthy();
+      const location = response.headers.get("location");
+      expect(location).toBeTruthy();
 
-    const url = new URL(location!);
+      const url = new URL(location!);
 
-    // wpcn should be replaced from {via} template to actual via value
-    expect(url.searchParams.get("wpcn")).toBe("singular-polyfill");
+      // wpcn should be replaced from {via} template to actual via value
+      expect(url.searchParams.get("wpcn")).toBe("singular-polyfill");
 
-    // wpcl should be replaced from {dub_id} template to actual dub_id value
-    expect(url.searchParams.get("wpcl")).toMatch(/^[a-zA-Z0-9]+$/);
+      // wpcl should be replaced from {dub_id} template to actual dub_id value
+      expect(url.searchParams.get("wpcl")).toMatch(/^[a-zA-Z0-9]+$/);
 
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("google play store url", async () => {
-    const response = await fetch(`${h.baseUrl}/gps`, fetchOptions);
-    const location = response.headers.get("location");
+    test("google play store url", async () => {
+      const response = await fetch(`${h.baseUrl}/gps`, fetchOptions);
+      const location = response.headers.get("location");
 
-    expect(response.status).toBe(302);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(location).toBeTruthy();
+      expect(response.status).toBe(302);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(location).toBeTruthy();
 
-    const url = new URL(location!);
-    const referrerEncoded = url.searchParams.get("referrer");
-    expect(referrerEncoded).toBeTruthy();
+      const url = new URL(location!);
+      const referrerEncoded = url.searchParams.get("referrer");
+      expect(referrerEncoded).toBeTruthy();
 
-    const referrer = decodeURIComponent(referrerEncoded!);
-    const params = new URLSearchParams(referrer);
+      const referrer = decodeURIComponent(referrerEncoded!);
+      const params = new URLSearchParams(referrer);
 
-    expect(params.get("deepLink")).toBe("https://dub.sh/gps");
-  });
+      expect(params.get("deepLink")).toBe("https://dub.sh/gps");
+    });
 
-  test("google play store url with existing referrer", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/gps-with-referrer`,
-      fetchOptions,
-    );
-    const location = response.headers.get("location");
+    test("google play store url with existing referrer", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/gps-with-referrer`,
+        fetchOptions,
+      );
+      const location = response.headers.get("location");
 
-    expect(response.status).toBe(302);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(location).toBeTruthy();
+      expect(response.status).toBe(302);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(location).toBeTruthy();
 
-    const url = new URL(location!);
-    const referrerEncoded = url.searchParams.get("referrer");
-    expect(referrerEncoded).toBeTruthy();
+      const url = new URL(location!);
+      const referrerEncoded = url.searchParams.get("referrer");
+      expect(referrerEncoded).toBeTruthy();
 
-    const referrer = decodeURIComponent(referrerEncoded!);
-    const params = new URLSearchParams(referrer);
+      const referrer = decodeURIComponent(referrerEncoded!);
+      const params = new URLSearchParams(referrer);
 
-    expect(params.get("utm_source")).toBe("google");
-    expect(params.get("deepLink")).toBe("https://dub.sh/gps-with-referrer");
-  });
+      expect(params.get("utm_source")).toBe("google");
+      expect(params.get("deepLink")).toBe("https://dub.sh/gps-with-referrer");
+    });
 
-  test("query params with no value", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/query-params-no-value`,
-      fetchOptions,
-    );
-
-    expect(response.headers.get("location")).toBe(
-      "https://dub.co/blog?emptyquery",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+    test("query params with no value", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/query-params-no-value`,
+        fetchOptions,
+      );
+
+      expect(response.headers.get("location")).toBe(
+        "https://dub.co/blog?emptyquery",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with case-sensitive (correct) key", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/cAsE-sensitive-test`,
-      fetchOptions,
-    );
-
-    expect(response.headers.get("location")).toBe(
-      "https://dub.co/changelog/case-insensitive-links",
-    );
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+    test("with case-sensitive (correct) key", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/cAsE-sensitive-test`,
+        fetchOptions,
+      );
+
+      expect(response.headers.get("location")).toBe(
+        "https://dub.co/changelog/case-insensitive-links",
+      );
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("with case-sensitive (incorrect) key", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/case-sensitive-test`,
-      fetchOptions,
-    );
+    test("with case-sensitive (incorrect) key", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/case-sensitive-test`,
+        fetchOptions,
+      );
 
-    expect(response.headers.get("location")).toBe("https://dub.co/links");
-    expect(response.status).toBe(307);
-  });
+      expect(response.headers.get("location")).toBe("https://dub.co/links");
+      expect(response.status).toBe(307);
+    });
 
-  test("with case-sensitive key (and dub_id)", async () => {
-    await assertRedirectWithDubIdCookie(h.baseUrl, "cAsE-sensitive-TeSt");
-  });
+    test("with case-sensitive key (and dub_id)", async () => {
+      await assertRedirectWithDubIdCookie(h.baseUrl, "cAsE-sensitive-TeSt");
+    });
 
-  test("with password", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/password/check?pw=dub`,
-      fetchOptions,
-    );
+    test("with password", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/password/check?pw=dub`,
+        fetchOptions,
+      );
 
-    expect(response.headers.get("location")).toBe("https://dub.co/");
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("location")).toBe("https://dub.co/");
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("unsupported key", async () => {
-    const response = await fetch(`${h.baseUrl}/wp-admin.php`, fetchOptions);
+    test("unsupported key", async () => {
+      const response = await fetch(`${h.baseUrl}/wp-admin.php`, fetchOptions);
 
-    expect(response.headers.get("location")).toMatch(/\/\?dub-no-track=1$/);
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
+      expect(response.headers.get("location")).toMatch(/\/\?dub-no-track=1$/);
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
 
-  test("redirection url", async () => {
-    const response = await fetch(
-      `${h.baseUrl}/redir-url-test?${REDIRECTION_QUERY_PARAM}=https://dub.co/blog`,
-      fetchOptions,
-    );
+    test("redirection url", async () => {
+      const response = await fetch(
+        `${h.baseUrl}/redir-url-test?${REDIRECTION_QUERY_PARAM}=https://dub.co/blog`,
+        fetchOptions,
+      );
 
-    expect(response.headers.get("location")).toBe("https://dub.co/blog");
-    expect(response.headers.get("x-powered-by")).toBe(poweredBy);
-    expect(response.status).toBe(302);
-  });
-});
+      expect(response.headers.get("location")).toBe("https://dub.co/blog");
+      expect(response.headers.get("x-powered-by")).toBe(poweredBy);
+      expect(response.status).toBe(302);
+    });
+  },
+);
diff --git a/apps/web/tests/rewards/click-reward.test.ts b/apps/web/tests/rewards/click-reward.test.ts
deleted file mode 100644
index 9ce0035c94b..00000000000
--- a/apps/web/tests/rewards/click-reward.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { serializeReward } from "@/lib/api/partners/serialize-reward";
-import { getRewardAmount } from "@/lib/partners/get-reward-amount";
-import { Reward } from "@prisma/client";
-import { describe, expect, test, vi } from "vitest";
-import { resolveClickReward } from "../../app/(ee)/api/cron/aggregate-clicks/resolve-click-reward-amount";
-import { IntegrationHarness } from "../utils/integration";
-
-// Mock server-only module
-vi.mock("server-only", () => ({}));
-
-const REWARD_ID = "rw_ZE0KAEtZuOGwNHtoVm1U0JpF";
-
-describe.sequential("Click reward resolution", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  // Fetch the reward from the API
-  const { status, data: reward } = await http.get<Reward>({
-    path: `/rewards/${REWARD_ID}`,
-  });
-
-  if (status !== 200 || !reward) {
-    throw new Error(`Failed to fetch reward from API: ${status}`);
-  }
-
-  test("countries in modifier list (US, GB, AU) get modifier amount", () => {
-    // The reward has modifiers: US, GB, AU should get 100 cents
-    const modifierCountries = ["US", "GB", "AU"];
-
-    modifierCountries.forEach((country) => {
-      const clickReward = resolveClickReward({
-        reward,
-        country,
-      });
-
-      const amount = getRewardAmount(serializeReward(clickReward));
-
-      expect(amount).toBe(100);
-    });
-  });
-
-  test("countries not in modifier list get base amount", () => {
-    // The reward base amount is 20 cents
-    // Countries not in the modifier list should get the base amount
-    const otherCountries = ["CA", "FR", "DE", "JP"];
-
-    otherCountries.forEach((country) => {
-      const clickReward = resolveClickReward({
-        reward,
-        country,
-      });
-
-      const amount = getRewardAmount(serializeReward(clickReward));
-
-      expect(amount).toBe(20);
-    });
-  });
-
-  test("all countries return expected amounts", () => {
-    // Test all countries to ensure correct behavior
-    const testCases = [
-      { country: "US", expected: 100 },
-      { country: "GB", expected: 100 },
-      { country: "AU", expected: 100 },
-      { country: "CA", expected: 20 },
-      { country: "FR", expected: 20 },
-      { country: "DE", expected: 20 },
-      { country: "JP", expected: 20 },
-    ];
-
-    testCases.forEach(({ country, expected }) => {
-      const clickReward = resolveClickReward({
-        reward,
-        country,
-      });
-
-      const amount = getRewardAmount(serializeReward(clickReward));
-
-      expect(amount).toBe(expected);
-    });
-  });
-});
diff --git a/apps/web/tests/rewards/custom-reward-cadence.test.ts b/apps/web/tests/rewards/custom-reward-cadence.test.ts
new file mode 100644
index 00000000000..86a84d297ed
--- /dev/null
+++ b/apps/web/tests/rewards/custom-reward-cadence.test.ts
@@ -0,0 +1,285 @@
+import {
+  buildCommissionIdempotencyKey,
+  formatCommissionDescription,
+  getUtcPeriodDate,
+  hasRewardMaxDurationElapsed,
+  isCadenceDue,
+  isCustomRewardStartDateInPast,
+  isEventBasedReward,
+} from "@/lib/api/rewards/custom-reward-utils";
+import type { CustomRewardConfig } from "@/lib/types";
+import { customRewardConfigSchema } from "@/lib/zod/schemas/rewards";
+import { createHash } from "crypto";
+import { describe, expect, test } from "vitest";
+
+const monthlyConfig: CustomRewardConfig = {
+  frequency: "month",
+  interval: 1,
+  anchorDate: "2026-01-31",
+};
+
+const weeklyConfig: CustomRewardConfig = {
+  frequency: "week",
+  interval: 1,
+  anchorDate: "2026-04-06", // Monday
+};
+
+const biweeklyConfig: CustomRewardConfig = {
+  frequency: "week",
+  interval: 2,
+  anchorDate: "2026-04-06",
+};
+
+const dailyConfig: CustomRewardConfig = {
+  frequency: "day",
+  interval: 1,
+  anchorDate: "2026-04-01",
+};
+
+const quarterlyConfig: CustomRewardConfig = {
+  frequency: "month",
+  interval: 3,
+  anchorDate: "2026-01-15",
+};
+
+const yearlyConfig: CustomRewardConfig = {
+  frequency: "year",
+  interval: 1,
+  anchorDate: "2026-01-01",
+};
+
+describe("isCadenceDue", () => {
+  test("daily is due every day on/after anchor", () => {
+    expect(isCadenceDue(dailyConfig, "2026-03-31")).toBe(false);
+    expect(isCadenceDue(dailyConfig, "2026-04-01")).toBe(true);
+    expect(isCadenceDue(dailyConfig, "2026-04-02")).toBe(true);
+  });
+
+  test("weekly is due every 7 days from anchor", () => {
+    expect(isCadenceDue(weeklyConfig, "2026-04-06")).toBe(true);
+    expect(isCadenceDue(weeklyConfig, "2026-04-07")).toBe(false);
+    expect(isCadenceDue(weeklyConfig, "2026-04-13")).toBe(true);
+  });
+
+  test("biweekly is due every 14 days from anchor", () => {
+    expect(isCadenceDue(biweeklyConfig, "2026-04-06")).toBe(true);
+    expect(isCadenceDue(biweeklyConfig, "2026-04-13")).toBe(false);
+    expect(isCadenceDue(biweeklyConfig, "2026-04-20")).toBe(true);
+    expect(isCadenceDue(biweeklyConfig, "2026-04-27")).toBe(false);
+  });
+
+  test("monthly clamps short months to last day", () => {
+    expect(isCadenceDue(monthlyConfig, "2026-01-31")).toBe(true);
+    expect(isCadenceDue(monthlyConfig, "2026-02-28")).toBe(true);
+    expect(isCadenceDue(monthlyConfig, "2026-02-27")).toBe(false);
+    expect(isCadenceDue(monthlyConfig, "2026-03-31")).toBe(true);
+  });
+
+  test("quarterly is due every 3 months on the same day", () => {
+    expect(isCadenceDue(quarterlyConfig, "2026-01-15")).toBe(true);
+    expect(isCadenceDue(quarterlyConfig, "2026-02-15")).toBe(false);
+    expect(isCadenceDue(quarterlyConfig, "2026-04-15")).toBe(true);
+    expect(isCadenceDue(quarterlyConfig, "2026-07-15")).toBe(true);
+  });
+
+  test("yearly is due on the same month and day", () => {
+    expect(isCadenceDue(yearlyConfig, "2026-01-01")).toBe(true);
+    expect(isCadenceDue(yearlyConfig, "2026-01-02")).toBe(false);
+    expect(isCadenceDue(yearlyConfig, "2027-01-01")).toBe(true);
+  });
+
+  test("before anchorDate is never due", () => {
+    expect(isCadenceDue(weeklyConfig, "2026-04-05")).toBe(false);
+    expect(isCadenceDue(monthlyConfig, "2025-12-31")).toBe(false);
+  });
+
+  test("no backfill: past cadence ticks are not due after the period", () => {
+    // Scanner only evaluates today's UTC date; a missed tick stays not due.
+    expect(isCadenceDue(monthlyConfig, "2026-01-30")).toBe(false);
+    expect(isCadenceDue(biweeklyConfig, "2026-04-14")).toBe(false);
+  });
+});
+
+describe("buildCommissionIdempotencyKey", () => {
+  test("is a deterministic sha256 of custom_reward_partner_period", () => {
+    const invoiceId = buildCommissionIdempotencyKey({
+      rewardId: "rw_123",
+      partnerId: "pn_456",
+      periodDate: "2026-04-15",
+    });
+
+    const expected = createHash("sha256")
+      .update("custom_rw_123_pn_456_2026-04-15")
+      .digest("hex");
+
+    expect(invoiceId).toBe(expected);
+  });
+
+  test("does not collide with Stripe invoice ids", () => {
+    const invoiceId = buildCommissionIdempotencyKey({
+      rewardId: "rw_1",
+      partnerId: "pn_1",
+      periodDate: "2026-01-01",
+    });
+
+    expect(invoiceId.startsWith("in_")).toBe(false);
+  });
+});
+
+describe("formatCommissionDescription", () => {
+  test("formats period label from UTC calendar month", () => {
+    // UTC midnight on the 1st is still the prior local month in US timezones.
+    expect(
+      formatCommissionDescription({
+        amountInCents: 1000,
+        frequency: "month",
+        interval: 1,
+        periodDate: "2026-09-01",
+      }),
+    ).toBe("$10 monthly · Sep 2026");
+  });
+
+  test("uses the full UTC date for daily and weekly periods", () => {
+    expect(
+      formatCommissionDescription({
+        amountInCents: 1000,
+        frequency: "day",
+        interval: 1,
+        periodDate: "2026-04-15",
+      }),
+    ).toBe("$10 daily · Apr 15, 2026");
+
+    expect(
+      formatCommissionDescription({
+        amountInCents: 1000,
+        frequency: "week",
+        interval: 1,
+        periodDate: "2026-04-06",
+      }),
+    ).toBe("$10 weekly · Apr 6, 2026");
+  });
+
+  test("uses preset labels for biweekly and quarterly", () => {
+    expect(
+      formatCommissionDescription({
+        amountInCents: 2500,
+        frequency: "week",
+        interval: 2,
+        periodDate: "2026-04-06",
+      }),
+    ).toBe("$25 biweekly · Apr 6, 2026");
+
+    expect(
+      formatCommissionDescription({
+        amountInCents: 5000,
+        frequency: "month",
+        interval: 3,
+        periodDate: "2026-01-15",
+      }),
+    ).toBe("$50 quarterly · Jan 2026");
+  });
+
+  test("falls back to every N units for non-preset intervals", () => {
+    expect(
+      formatCommissionDescription({
+        amountInCents: 1000,
+        frequency: "day",
+        interval: 5,
+        periodDate: "2026-04-15",
+      }),
+    ).toBe("$10 every 5 days · Apr 15, 2026");
+  });
+});
+
+describe("hasRewardMaxDurationElapsed", () => {
+  test("null maxDuration never elapses", () => {
+    expect(
+      hasRewardMaxDurationElapsed({
+        firstCommissionAt: new Date("2026-01-01T00:00:00.000Z"),
+        maxDuration: null,
+        periodDate: "2027-01-01",
+      }),
+    ).toBe(false);
+  });
+
+  test("elapses after N months from first commission", () => {
+    expect(
+      hasRewardMaxDurationElapsed({
+        firstCommissionAt: new Date("2026-01-15T00:00:00.000Z"),
+        maxDuration: 12,
+        periodDate: "2026-12-15",
+      }),
+    ).toBe(false);
+
+    expect(
+      hasRewardMaxDurationElapsed({
+        firstCommissionAt: new Date("2026-01-15T00:00:00.000Z"),
+        maxDuration: 12,
+        periodDate: "2027-01-15",
+      }),
+    ).toBe(true);
+  });
+
+  test("counts UTC calendar months when period is midnight on the 1st", () => {
+    // Jan 31 → Mar 1 is 1 full UTC month. Local US fields can read that as 0.
+    expect(
+      hasRewardMaxDurationElapsed({
+        firstCommissionAt: new Date("2026-01-31T00:00:00.000Z"),
+        maxDuration: 1,
+        periodDate: "2026-03-01",
+      }),
+    ).toBe(true);
+  });
+});
+
+describe("isEventBasedReward", () => {
+  test("excludes custom rewards", () => {
+    expect(isEventBasedReward({ event: "sale" })).toBe(true);
+    expect(isEventBasedReward({ event: "referral" })).toBe(true);
+    expect(isEventBasedReward({ event: "custom" })).toBe(false);
+  });
+});
+
+describe("isCustomRewardStartDateInPast", () => {
+  test("accepts today and future dates", () => {
+    expect(isCustomRewardStartDateInPast(getUtcPeriodDate())).toBe(false);
+    expect(isCustomRewardStartDateInPast("2099-01-01")).toBe(false);
+  });
+
+  test("rejects a past date", () => {
+    expect(isCustomRewardStartDateInPast("2020-01-01")).toBe(true);
+  });
+});
+
+describe("customRewardConfigSchema.anchorDate", () => {
+  const base = { frequency: "month" as const, interval: 1 };
+
+  test("accepts valid YYYY-MM-DD calendar dates", () => {
+    expect(
+      customRewardConfigSchema.parse({ ...base, anchorDate: "2026-01-31" })
+        .anchorDate,
+    ).toBe("2026-01-31");
+    expect(
+      customRewardConfigSchema.parse({ ...base, anchorDate: "2024-02-29" })
+        .anchorDate,
+    ).toBe("2024-02-29");
+  });
+
+  test("rejects impossible month-end dates", () => {
+    expect(
+      customRewardConfigSchema.safeParse({ ...base, anchorDate: "2026-02-31" })
+        .success,
+    ).toBe(false);
+    expect(
+      customRewardConfigSchema.safeParse({ ...base, anchorDate: "2026-04-31" })
+        .success,
+    ).toBe(false);
+  });
+
+  test("rejects leap-day dates in non-leap years", () => {
+    expect(
+      customRewardConfigSchema.safeParse({ ...base, anchorDate: "2025-02-29" })
+        .success,
+    ).toBe(false);
+  });
+});
diff --git a/apps/web/tests/rewards/determine-partner-rewards.test.ts b/apps/web/tests/rewards/determine-partner-rewards.test.ts
new file mode 100644
index 00000000000..7762f8b3f8e
--- /dev/null
+++ b/apps/web/tests/rewards/determine-partner-rewards.test.ts
@@ -0,0 +1,388 @@
+import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";
+import { determinePartnerRewards } from "@/lib/partners/determine-partner-reward";
+import { RewardContext } from "@/lib/types";
+import { Prisma, Reward } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  findUnique: vi.fn(),
+}));
+
+vi.mock("server-only", () => ({}));
+
+vi.mock("@/lib/prisma", () => ({
+  prisma: {
+    linkReward: {
+      findUnique: mocks.findUnique,
+    },
+  },
+}));
+
+const ADDON_PRODUCT_ID = "prod_abc";
+const OTHER_PRODUCT_ID = "prod_other";
+const LINK_ID = "link_test";
+
+function saleReward(overrides: Partial<Reward> = {}): Reward {
+  return {
+    id: "rw_test",
+    programId: "prog_test",
+    groupId: "grp_test",
+    description: null,
+    tooltipDescription: null,
+    event: "sale",
+    type: "percentage",
+    amountInCents: null,
+    amountInPercentage: new Prisma.Decimal(30),
+    maxDuration: 12,
+    modifiers: null,
+    config: null,
+    spendLimitAmount: null,
+    spendLimitInterval: null,
+    createdAt: new Date("2026-01-01"),
+    updatedAt: new Date("2026-01-01"),
+    ...overrides,
+  };
+}
+
+function enrollment(
+  saleRewardValue: Reward | null,
+  { linkId }: { linkId?: string | null } = {},
+) {
+  return {
+    partner: { country: null },
+    links: linkId ? [{ id: linkId } as any] : null,
+    totalCommissions: 0,
+    saleReward: saleRewardValue,
+  };
+}
+
+function mockLinkSaleReward(saleRewardValue: Reward | null) {
+  mocks.findUnique.mockResolvedValue({
+    clickReward: null,
+    leadReward: null,
+    saleReward: saleRewardValue,
+  });
+}
+
+function productIdModifier({
+  id,
+  productId,
+  amountInPercentage,
+}: {
+  id: string;
+  productId: string;
+  amountInPercentage: number;
+}) {
+  return {
+    id,
+    type: "percentage" as const,
+    operator: "AND" as const,
+    conditions: [
+      {
+        value: productId,
+        entity: "sale" as const,
+        operator: "equals_to" as const,
+        attribute: "productId" as const,
+      },
+    ],
+    amountInPercentage,
+  };
+}
+
+function determineRewards({
+  saleReward: saleRewardValue,
+  context,
+  amount = 20000,
+  quantity = 1,
+  linkId = null,
+}: {
+  saleReward: Reward | null;
+  context?: RewardContext;
+  amount?: number;
+  quantity?: number;
+  linkId?: string | null;
+}) {
+  return determinePartnerRewards({
+    event: "sale",
+    programEnrollment: enrollment(saleRewardValue, { linkId }),
+    ...(context ? { context } : {}),
+    amount,
+    quantity,
+    linkId,
+  });
+}
+
+describe("determinePartnerRewards", () => {
+  beforeEach(() => {
+    mocks.findUnique.mockReset();
+    mocks.findUnique.mockResolvedValue(null);
+  });
+
+  test("does not multiply a flat reward by Stripe line quantity", async () => {
+    const rewards = await determineRewards({
+      saleReward: saleReward({
+        modifiers: [
+          {
+            id: "product-zero-percent",
+            type: "percentage",
+            operator: "AND",
+            conditions: [
+              {
+                value: [ADDON_PRODUCT_ID, "prod_xyz"],
+                entity: "sale",
+                operator: "in",
+                attribute: "productId",
+              },
+            ],
+            maxDuration: 12,
+            amountInPercentage: 0,
+          },
+          {
+            id: "amount-gte-200",
+            type: "flat",
+            operator: "AND",
+            conditions: [
+              {
+                value: 20000,
+                entity: "sale",
+                operator: "greater_than_or_equal",
+                attribute: "amount",
+              },
+            ],
+            maxDuration: 0,
+            amountInCents: 6000,
+          },
+        ],
+      }),
+      context: {
+        sale: {
+          amount: 20000,
+          products: [
+            {
+              id: ADDON_PRODUCT_ID,
+              amount: 20000,
+              quantity: 200,
+            },
+          ],
+        },
+      },
+    });
+
+    expect(mocks.findUnique).not.toHaveBeenCalled();
+    expect(rewards).toHaveLength(1);
+    expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });
+    expect(rewards[0].reward.type).toBe("flat");
+    expect(rewards[0].reward.amountInCents).toBe(6000);
+    expect(rewards[0].matchedCondition).toMatchObject({
+      type: "flat",
+      amountInCents: 6000,
+      maxDuration: 0,
+    });
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[0].reward,
+        sale: rewards[0].sale,
+      }),
+    ).toBe(6000);
+  });
+
+  test("applies percentage rewards to the line total, ignoring line quantity", async () => {
+    const rewards = await determineRewards({
+      saleReward: saleReward({
+        modifiers: [
+          {
+            type: "percentage",
+            operator: "AND",
+            amountInPercentage: 10,
+            conditions: [
+              {
+                entity: "sale",
+                attribute: "productId",
+                operator: "equals_to",
+                value: ADDON_PRODUCT_ID,
+              },
+            ],
+          },
+        ],
+      }),
+      context: {
+        sale: {
+          products: [
+            {
+              id: ADDON_PRODUCT_ID,
+              amount: 20000,
+              quantity: 200,
+            },
+          ],
+        },
+      },
+    });
+
+    expect(rewards).toHaveLength(1);
+    expect(rewards[0].sale.quantity).toBe(1);
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[0].reward,
+        sale: rewards[0].sale,
+      }),
+    ).toBe(2000);
+  });
+
+  test("uses the sale quantity when there is no productId modifier", async () => {
+    const rewards = await determineRewards({
+      saleReward: saleReward({
+        type: "flat",
+        amountInCents: 500,
+        amountInPercentage: null,
+      }),
+      context: {
+        sale: {
+          products: [
+            {
+              id: ADDON_PRODUCT_ID,
+              amount: 20000,
+              quantity: 200,
+            },
+          ],
+        },
+      },
+    });
+
+    expect(rewards).toHaveLength(1);
+    expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });
+    expect(rewards[0].matchedCondition).toBeNull();
+  });
+
+  test("uses LinkReward.saleReward when it differs from the enrollment reward", async () => {
+    const enrollmentReward = saleReward({
+      id: "rw_enrollment",
+      amountInPercentage: new Prisma.Decimal(30),
+    });
+    const linkOverride = saleReward({
+      id: "rw_link",
+      amountInPercentage: new Prisma.Decimal(50),
+    });
+    mockLinkSaleReward(linkOverride);
+
+    const rewards = await determineRewards({
+      saleReward: enrollmentReward,
+      linkId: LINK_ID,
+      amount: 20000,
+      quantity: 1,
+    });
+
+    expect(mocks.findUnique).toHaveBeenCalledWith({
+      where: {
+        linkId: LINK_ID,
+      },
+      select: {
+        saleReward: true,
+      },
+    });
+    expect(rewards).toHaveLength(1);
+    expect(rewards[0].reward.id).toBe("rw_link");
+    expect(rewards[0].reward.amountInPercentage).toBe(50);
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[0].reward,
+        sale: rewards[0].sale,
+      }),
+    ).toBe(10000);
+  });
+
+  test("falls back to the enrollment reward when the link has no sale override", async () => {
+    mockLinkSaleReward(null);
+
+    const rewards = await determineRewards({
+      saleReward: saleReward({
+        id: "rw_enrollment",
+        amountInPercentage: new Prisma.Decimal(30),
+      }),
+      linkId: LINK_ID,
+      amount: 20000,
+      quantity: 1,
+    });
+
+    expect(mocks.findUnique).toHaveBeenCalledOnce();
+    expect(rewards).toHaveLength(1);
+    expect(rewards[0].reward.id).toBe("rw_enrollment");
+    expect(rewards[0].reward.amountInPercentage).toBe(30);
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[0].reward,
+        sale: rewards[0].sale,
+      }),
+    ).toBe(6000);
+  });
+
+  test("applies the link sale reward's product rates when splitting Stripe line items", async () => {
+    const enrollmentReward = saleReward({
+      id: "rw_enrollment",
+      amountInPercentage: new Prisma.Decimal(30),
+      modifiers: [
+        productIdModifier({
+          id: "enrollment-addon-zero",
+          productId: ADDON_PRODUCT_ID,
+          amountInPercentage: 0,
+        }),
+      ],
+    });
+    const linkOverride = saleReward({
+      id: "rw_link",
+      amountInPercentage: new Prisma.Decimal(20),
+      modifiers: [
+        productIdModifier({
+          id: "link-addon-fifty",
+          productId: ADDON_PRODUCT_ID,
+          amountInPercentage: 50,
+        }),
+      ],
+    });
+    mockLinkSaleReward(linkOverride);
+
+    const rewards = await determineRewards({
+      saleReward: enrollmentReward,
+      linkId: LINK_ID,
+      context: {
+        sale: {
+          products: [
+            {
+              id: ADDON_PRODUCT_ID,
+              amount: 20000,
+              quantity: 1,
+            },
+            {
+              id: OTHER_PRODUCT_ID,
+              amount: 10000,
+              quantity: 1,
+            },
+          ],
+        },
+      },
+      amount: 30000,
+      quantity: 1,
+    });
+
+    expect(rewards).toHaveLength(2);
+    expect(rewards.map((item) => item.reward.id)).toEqual([
+      "rw_link",
+      "rw_link",
+    ]);
+    expect(rewards[0].sale).toEqual({ amount: 20000, quantity: 1 });
+    expect(rewards[0].reward.amountInPercentage).toBe(50);
+    expect(rewards[1].sale).toEqual({ amount: 10000, quantity: 1 });
+    expect(rewards[1].reward.amountInPercentage).toBe(20);
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[0].reward,
+        sale: rewards[0].sale,
+      }),
+    ).toBe(10000);
+    expect(
+      calculateSaleEarnings({
+        reward: rewards[1].reward,
+        sale: rewards[1].sale,
+      }),
+    ).toBe(2000);
+  });
+});
diff --git a/apps/web/tests/rewards/format-reward-condition.test.ts b/apps/web/tests/rewards/format-reward-condition.test.ts
new file mode 100644
index 00000000000..9188f012d26
--- /dev/null
+++ b/apps/web/tests/rewards/format-reward-condition.test.ts
@@ -0,0 +1,156 @@
+import {
+  formatRewardConditionClause,
+  formatRewardConditionParts,
+} from "@/lib/rewards/format-reward-condition";
+import { describe, expect, test } from "vitest";
+
+describe("formatRewardConditionParts", () => {
+  test("formats country names", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Customer",
+      attributeLabel: "Country",
+      operatorLabel: "is",
+      valueLabel: "United States",
+    });
+  });
+
+  test("uses product label with is operator", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "sale",
+          attribute: "productId",
+          operator: "in",
+          value: ["prod_a", "prod_b"],
+          label: "Premium Plan",
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Sale",
+      attributeLabel: "Product ID",
+      operatorLabel: "is",
+      valueLabel: "Premium Plan",
+    });
+  });
+
+  test("formats metadata field names", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "sale",
+          attribute: "metadata",
+          operator: "equals_to",
+          value: "enterprise",
+          metadataField: "plan",
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Sale",
+      attributeLabel: '"plan"',
+      operatorLabel: "is",
+      valueLabel: "enterprise",
+    });
+  });
+
+  test("formats currency values", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "sale",
+          attribute: "amount",
+          operator: "greater_than_or_equal",
+          value: 20000,
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Sale",
+      attributeLabel: "Amount",
+      operatorLabel: "is greater than or equal to",
+      valueLabel: "$200.00",
+    });
+  });
+
+  test("formats a valid zero numeric value", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "partner",
+          attribute: "totalClicks",
+          operator: "equals_to",
+          value: 0,
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Partner",
+      attributeLabel: "Total Clicks",
+      operatorLabel: "is",
+      valueLabel: "0",
+    });
+  });
+
+  test("formats a valid zero currency value", () => {
+    expect(
+      formatRewardConditionParts({
+        event: "sale",
+        condition: {
+          entity: "sale",
+          attribute: "amount",
+          operator: "greater_than_or_equal",
+          value: 0,
+        },
+      }),
+    ).toEqual({
+      entityLabel: "Sale",
+      attributeLabel: "Amount",
+      operatorLabel: "is greater than or equal to",
+      valueLabel: "$0.00",
+    });
+  });
+});
+
+describe("formatRewardConditionClause", () => {
+  test("joins parts with if/and conjunctions", () => {
+    expect(
+      formatRewardConditionClause({
+        event: "sale",
+        operator: "AND",
+        isFirst: true,
+        condition: {
+          entity: "customer",
+          attribute: "country",
+          operator: "equals_to",
+          value: "US",
+        },
+      }),
+    ).toBe("if Customer Country is United States");
+
+    expect(
+      formatRewardConditionClause({
+        event: "sale",
+        operator: "AND",
+        isFirst: false,
+        condition: {
+          entity: "sale",
+          attribute: "productId",
+          operator: "equals_to",
+          value: "prod_premium",
+          label: "Premium Plan",
+        },
+      }),
+    ).toBe("and Sale Product ID is Premium Plan");
+  });
+});
diff --git a/apps/web/tests/rewards/get-reward-max-duration-for-context.test.ts b/apps/web/tests/rewards/get-reward-max-duration-for-context.test.ts
new file mode 100644
index 00000000000..3c1b782b55f
--- /dev/null
+++ b/apps/web/tests/rewards/get-reward-max-duration-for-context.test.ts
@@ -0,0 +1,147 @@
+import { getRewardMaxDurationForContext } from "@/lib/partners/determine-partner-reward";
+import { describe, expect, test, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+
+const RECURRING_PRODUCT_ID = "prod_recurring";
+
+const modifiers = [
+  {
+    id: "amount-below-threshold",
+    type: "flat" as const,
+    operator: "AND" as const,
+    conditions: [
+      {
+        value: 2000,
+        entity: "sale" as const,
+        operator: "less_than" as const,
+        attribute: "amount" as const,
+      },
+    ],
+    maxDuration: 0,
+    amountInCents: 0,
+  },
+  {
+    id: "recurring-product",
+    type: "percentage" as const,
+    operator: "AND" as const,
+    conditions: [
+      {
+        value: RECURRING_PRODUCT_ID,
+        entity: "sale" as const,
+        operator: "equals_to" as const,
+        attribute: "productId" as const,
+      },
+    ],
+    maxDuration: null,
+    amountInPercentage: 40,
+  },
+];
+
+const oneTimeReward = {
+  maxDuration: 0,
+  modifiers: null,
+};
+
+const rewardWithModifiers = {
+  maxDuration: 0,
+  modifiers,
+};
+
+function shouldSkipForOriginalOneTimeReward(maxDuration: number | null) {
+  return typeof maxDuration === "number" && maxDuration === 0;
+}
+
+describe("getRewardMaxDurationForContext", () => {
+  test("returns row maxDuration when there are no modifiers", () => {
+    expect(
+      getRewardMaxDurationForContext({
+        reward: oneTimeReward,
+        context: { sale: { amount: 3000 } },
+      }),
+    ).toBe(0);
+  });
+
+  test("returns row maxDuration when context is missing", () => {
+    expect(
+      getRewardMaxDurationForContext({
+        reward: rewardWithModifiers,
+      }),
+    ).toBe(0);
+  });
+
+  test("returns lifetime maxDuration when a matching modifier overrides it", () => {
+    expect(
+      getRewardMaxDurationForContext({
+        reward: rewardWithModifiers,
+        context: {
+          sale: {
+            amount: 847,
+            productId: RECURRING_PRODUCT_ID,
+          },
+        },
+      }),
+    ).toBeNull();
+  });
+
+  test("returns row maxDuration when no modifier matches", () => {
+    expect(
+      getRewardMaxDurationForContext({
+        reward: rewardWithModifiers,
+        context: {
+          sale: { amount: 3000 },
+        },
+      }),
+    ).toBe(0);
+  });
+
+  test("returns the matched one-time modifier for a sale below the amount threshold", () => {
+    expect(
+      getRewardMaxDurationForContext({
+        reward: rewardWithModifiers,
+        context: {
+          sale: { amount: 500 },
+        },
+      }),
+    ).toBe(0);
+  });
+});
+
+describe("original-reward skip after a reward ID change", () => {
+  test("plain one-time original reward still skips a later sale", () => {
+    const originalMaxDuration = getRewardMaxDurationForContext({
+      reward: oneTimeReward,
+      context: { sale: { amount: 1000 } },
+    });
+
+    expect(originalMaxDuration).toBe(0);
+    expect(shouldSkipForOriginalOneTimeReward(originalMaxDuration)).toBe(true);
+  });
+
+  test("does not skip when the original reward resolves to a lifetime maxDuration", () => {
+    const originalMaxDuration = getRewardMaxDurationForContext({
+      reward: rewardWithModifiers,
+      context: {
+        sale: {
+          amount: 847,
+          productId: RECURRING_PRODUCT_ID,
+        },
+      },
+    });
+
+    expect(originalMaxDuration).toBeNull();
+    expect(shouldSkipForOriginalOneTimeReward(originalMaxDuration)).toBe(false);
+  });
+
+  test("still skips when the original reward resolves to a one-time maxDuration", () => {
+    const originalMaxDuration = getRewardMaxDurationForContext({
+      reward: rewardWithModifiers,
+      context: {
+        sale: { amount: 3000 },
+      },
+    });
+
+    expect(originalMaxDuration).toBe(0);
+    expect(shouldSkipForOriginalOneTimeReward(originalMaxDuration)).toBe(true);
+  });
+});
diff --git a/apps/web/tests/rewards/lead-reward.test.ts b/apps/web/tests/rewards/lead-reward.test.ts
deleted file mode 100644
index abf28bc9064..00000000000
--- a/apps/web/tests/rewards/lead-reward.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { TrackLeadResponse } from "@/lib/types";
-import { randomCustomer } from "tests/utils/helpers";
-import {
-  E2E_LEAD_REWARD,
-  E2E_PARTNERS,
-  E2E_TRACK_CLICK_HEADERS,
-} from "tests/utils/resource";
-import { verifyCommission } from "tests/utils/verify-commission";
-import { describe, expect, test } from "vitest";
-import { IntegrationHarness } from "../utils/integration";
-
-describe.concurrent("Lead rewards", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  test("when customer country is US and partner country is US", async () => {
-    // Track the click
-    const clickResponse = await http.post<{ clickId: string }>({
-      path: "/track/click",
-      headers: E2E_TRACK_CLICK_HEADERS,
-      body: E2E_PARTNERS[0].shortLink,
-    });
-
-    expect(clickResponse.status).toEqual(200);
-
-    const clickId = clickResponse.data.clickId;
-    const customer = randomCustomer();
-
-    // Track the lead
-    const trackLeadResponse = await http.post<TrackLeadResponse>({
-      path: "/track/lead",
-      body: {
-        clickId,
-        eventName: "Signup",
-        customerExternalId: customer.externalId,
-        customerName: customer.name,
-        customerEmail: customer.email,
-        customerAvatar: customer.avatar,
-      },
-    });
-
-    expect(trackLeadResponse.status).toEqual(200);
-
-    // Verify the commission
-    await verifyCommission({
-      http,
-      customerExternalId: customer.externalId,
-      expectedEarnings: E2E_LEAD_REWARD.modifiers[1].amountInCents,
-    });
-  });
-
-  test("when customer country is US and partner country is not US", async () => {
-    // Track the click
-    const clickResponse = await http.post<{ clickId: string }>({
-      path: "/track/click",
-      headers: E2E_TRACK_CLICK_HEADERS,
-      body: {
-        ...E2E_PARTNERS[1].shortLink,
-      },
-    });
-
-    expect(clickResponse.status).toEqual(200);
-
-    const clickId = clickResponse.data.clickId;
-    const customer = randomCustomer();
-
-    // Track the lead
-    const trackLeadResponse = await http.post<TrackLeadResponse>({
-      path: "/track/lead",
-      body: {
-        clickId,
-        eventName: "Signup",
-        customerExternalId: customer.externalId,
-        customerName: customer.name,
-        customerEmail: customer.email,
-        customerAvatar: customer.avatar,
-      },
-    });
-
-    expect(trackLeadResponse.status).toEqual(200);
-
-    // Verify the commission
-    await verifyCommission({
-      http,
-      customerExternalId: customer.externalId,
-      expectedEarnings: E2E_LEAD_REWARD.modifiers[0].amountInCents,
-    });
-  });
-});
diff --git a/apps/web/tests/rewards/resolve-partner-assigned-item.test.ts b/apps/web/tests/rewards/resolve-partner-assigned-item.test.ts
new file mode 100644
index 00000000000..43e557ff309
--- /dev/null
+++ b/apps/web/tests/rewards/resolve-partner-assigned-item.test.ts
@@ -0,0 +1,88 @@
+import { resolvePartnerAssignedItem } from "@/lib/rewards/resolve-partner-assigned-item";
+import { describe, expect, test } from "vitest";
+
+const groupDefault = { id: "rw_default" };
+const override = { id: "rw_override" };
+
+describe("resolvePartnerAssignedItem", () => {
+  test("uses the listed item and marks defaults as not overrides", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: groupDefault.id,
+        groupDefault,
+        itemsById: new Map([[groupDefault.id, groupDefault]]),
+        loading: false,
+      }),
+    ).toEqual({
+      item: groupDefault,
+      isOverride: false,
+    });
+  });
+
+  test("preserves isOverride for a resolved non-default assignment", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: override.id,
+        groupDefault,
+        itemsById: new Map([[override.id, override]]),
+        loading: false,
+      }),
+    ).toEqual({
+      item: override,
+      isOverride: true,
+    });
+  });
+
+  test("falls back to the group default when the assigned id matches it", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: groupDefault.id,
+        groupDefault,
+        itemsById: new Map(),
+        loading: false,
+      }),
+    ).toEqual({
+      item: groupDefault,
+      isOverride: false,
+    });
+  });
+
+  test("falls back to the group default while the list request is loading", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: override.id,
+        groupDefault,
+        itemsById: new Map(),
+        loading: true,
+      }),
+    ).toEqual({
+      item: groupDefault,
+      isOverride: false,
+    });
+  });
+
+  test("keeps a missing non-default override absent after loading", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: override.id,
+        groupDefault,
+        itemsById: new Map(),
+        loading: false,
+      }),
+    ).toBeNull();
+  });
+
+  test("uses the group default when no partner assignment is set", () => {
+    expect(
+      resolvePartnerAssignedItem({
+        assignedId: null,
+        groupDefault,
+        itemsById: new Map(),
+        loading: false,
+      }),
+    ).toEqual({
+      item: groupDefault,
+      isOverride: false,
+    });
+  });
+});
diff --git a/apps/web/tests/rewards/sale-reward.test.ts b/apps/web/tests/rewards/sale-reward.test.ts
deleted file mode 100644
index fa0c166e4a2..00000000000
--- a/apps/web/tests/rewards/sale-reward.test.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import { TrackLeadResponse, TrackSaleResponse } from "@/lib/types";
-import {
-  randomCustomer,
-  randomId,
-  randomSaleAmount,
-} from "tests/utils/helpers";
-import {
-  E2E_CUSTOMER_COUNTRY_CONDITIONS_EXTERNAL_ID,
-  E2E_CUSTOMER_SIGNUP_DATE_CONDITIONS_EXTERNAL_ID,
-  E2E_PARTNERS,
-  E2E_SALE_REWARD,
-  E2E_TRACK_CLICK_HEADERS,
-} from "tests/utils/resource";
-import { verifyCommission } from "tests/utils/verify-commission";
-import { describe, expect, test } from "vitest";
-import { IntegrationHarness } from "../utils/integration";
-
-describe("Sale rewards with conditions", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  const clickResponse = await http.post<{ clickId: string }>({
-    path: "/track/click",
-    headers: E2E_TRACK_CLICK_HEADERS,
-    body: E2E_PARTNERS[0].shortLink,
-  });
-  expect(clickResponse.status).toEqual(200);
-  const clickId = clickResponse.data.clickId;
-  const newCustomer = randomCustomer();
-  const trackLeadResponse = await http.post<TrackLeadResponse>({
-    path: "/track/lead",
-    body: {
-      clickId,
-      eventName: "Signup",
-      customerExternalId: newCustomer.externalId,
-      customerName: newCustomer.name,
-      customerEmail: newCustomer.email,
-      customerAvatar: newCustomer.avatar,
-      mode: "wait",
-    },
-  });
-  expect(trackLeadResponse.status).toEqual(200);
-
-  const randomSale = (eventName = "Payment") => ({
-    eventName,
-    currency: "usd",
-    paymentProcessor: "stripe",
-    amount: randomSaleAmount(),
-    invoiceId: `INV_${randomId()}`,
-  });
-
-  describe.sequential("sequential track/sale tests", () => {
-    test("when {Sale} {Type} is {new} vs {recurring}", async () => {
-      const sale = randomSale("E2E first sale");
-
-      const trackSaleResponse = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: newCustomer.externalId,
-        },
-      });
-
-      expect(trackSaleResponse.status).toEqual(200);
-
-      await new Promise((resolve) => setTimeout(resolve, 3000));
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[5].amountInCents!,
-      });
-
-      // no need to verify second sale since it will be verified below
-      // in the {Customer} {Subscription Duration} is {less than or equal to} {3} test
-    });
-
-    test("when {Customer} {Subscription Duration} is {less than or equal to} {3}", async () => {
-      const sale = randomSale("E2E customer subscription duration condition");
-      const trackSaleResponse = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: newCustomer.externalId,
-        },
-      });
-
-      expect(trackSaleResponse.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[3].amountInCents!,
-      });
-    });
-  });
-
-  describe.concurrent("concurrent track/sale tests", () => {
-    // skipping this for now because we're using a newCustomer for each test,
-    // and {Customer} {Subscription Duration} is {less than or equal to} {3} blocks the base case
-    test.skip("When {Sale} {Product ID} is {regularProductId}", async () => {
-      const sale = randomSale("E2E base condition");
-
-      const response = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: newCustomer.externalId,
-          metadata: {
-            productId: "regularProductId",
-          },
-        },
-      });
-
-      expect(response.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.amountInCents,
-      });
-    });
-
-    test("When {Sale} {Product ID} is {premiumProductId}", async () => {
-      const sale = randomSale("E2E sale product ID condition");
-
-      const response = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: newCustomer.externalId,
-          metadata: {
-            productId: "premiumProductId",
-          },
-        },
-      });
-
-      expect(response.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[0].amountInCents!,
-      });
-    });
-
-    test("When {Sale} {Amount} is greater than {15000}", async () => {
-      const sale = randomSale("E2E sale amount condition");
-
-      const response = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          amount: 17500,
-          customerExternalId: newCustomer.externalId,
-          metadata: {
-            productId: "premiumProductId",
-          },
-        },
-      });
-
-      expect(response.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[1].amountInCents!,
-      });
-    });
-
-    test("when {Customer} {Country} is {SG}", async () => {
-      const sale = randomSale("E2E customer country condition");
-
-      const trackSaleResponse = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: E2E_CUSTOMER_COUNTRY_CONDITIONS_EXTERNAL_ID,
-        },
-      });
-
-      expect(trackSaleResponse.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[2].amountInCents!,
-      });
-    });
-
-    test("when {Customer} {Signup Date} is {greater than} {Feb 16, 2026} AND {less than} {Feb 18, 2026}", async () => {
-      const sale = randomSale("E2E customer signup date condition");
-
-      const trackSaleResponse = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: E2E_CUSTOMER_SIGNUP_DATE_CONDITIONS_EXTERNAL_ID,
-        },
-      });
-
-      expect(trackSaleResponse.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[4].amountInCents!,
-      });
-    });
-
-    test("when {Sale} {Metadata} {Key} is {Value}", async () => {
-      const sale = randomSale("E2E sale metadata key-value condition");
-
-      const trackSaleResponse = await http.post<TrackSaleResponse>({
-        path: "/track/sale",
-        body: {
-          ...sale,
-          customerExternalId: newCustomer.externalId,
-          metadata: {
-            bookTitle: "THGTTG",
-          },
-        },
-      });
-
-      expect(trackSaleResponse.status).toEqual(200);
-
-      await verifyCommission({
-        http,
-        invoiceId: sale.invoiceId,
-        expectedEarnings: E2E_SALE_REWARD.modifiers[6].amountInCents!,
-      });
-    });
-  });
-});
diff --git a/apps/web/tests/scripts/parse-cli-number.test.ts b/apps/web/tests/scripts/parse-cli-number.test.ts
new file mode 100644
index 00000000000..942b7f56531
--- /dev/null
+++ b/apps/web/tests/scripts/parse-cli-number.test.ts
@@ -0,0 +1,70 @@
+import {
+  parseNonNegativeInteger,
+  parsePositiveInteger,
+} from "@/scripts/utils/parse-cli-number";
+import { describe, expect, it } from "vitest";
+
+describe("parsePositiveInteger", () => {
+  it("parses plain digit strings", () => {
+    expect(parsePositiveInteger("1", "--count")).toBe(1);
+    expect(parsePositiveInteger("100000", "--count")).toBe(100_000);
+    expect(parsePositiveInteger("007", "--count")).toBe(7);
+  });
+
+  it.each([
+    ["0x10", "hex"],
+    ["1e9", "scientific notation"],
+    ["5.0", "decimal"],
+    ["+5", "explicit sign"],
+    [" 5 ", "surrounding whitespace"],
+    ["Infinity", "infinity"],
+    ["9007199254740992", "above Number.MAX_SAFE_INTEGER"],
+  ])("rejects %s (%s)", (value) => {
+    expect(() => parsePositiveInteger(value, "--count")).toThrow(
+      "--count must be a positive integer",
+    );
+  });
+
+  it.each([["0"], ["-1"], [""], ["abc"]])("rejects %j", (value) => {
+    expect(() => parsePositiveInteger(value, "--count")).toThrow(
+      "--count must be a positive integer",
+    );
+  });
+
+  it("reports the offending value and the flag name", () => {
+    expect(() => parsePositiveInteger("1e9", "--requests")).toThrow(
+      '--requests must be a positive integer, received: "1e9"',
+    );
+    expect(() => parsePositiveInteger(undefined, "--requests")).toThrow(
+      "--requests must be a positive integer, received: (missing)",
+    );
+  });
+});
+
+describe("parseNonNegativeInteger", () => {
+  it("accepts zero, which parsePositiveInteger rejects", () => {
+    expect(parseNonNegativeInteger("0", "--warmup")).toBe(0);
+    expect(() => parsePositiveInteger("0", "--warmup")).toThrow(
+      "--warmup must be a positive integer",
+    );
+  });
+
+  it("parses plain digit strings", () => {
+    expect(parseNonNegativeInteger("50", "--warmup")).toBe(50);
+  });
+
+  it.each([["0x10"], ["1e9"], ["5.0"], ["+5"], [" 5 "], ["-1"], [""], ["abc"]])(
+    "applies the same coercion guard to %j",
+    (value) => {
+      expect(() => parseNonNegativeInteger(value, "--warmup")).toThrow(
+        "--warmup must be a non-negative integer",
+      );
+    },
+  );
+
+  it("reports the offending value and the flag name", () => {
+    expect(() => parseNonNegativeInteger("abc", "--warmup")).toThrow(
+      '--warmup must be a non-negative integer, received: "abc"',
+    );
+  });
+});
diff --git a/apps/web/tests/setupTests.ts b/apps/web/tests/setupTests.ts
index 4d6837a3262..06ca1b636b4 100644
--- a/apps/web/tests/setupTests.ts
+++ b/apps/web/tests/setupTests.ts
@@ -1,5 +1,6 @@
 import crypto from "node:crypto";
 import { vi } from "vitest";
+import { getTrustedSourcesHeaders } from "./utils/trusted-sources";
 
 Object.defineProperty(globalThis, "crypto", {
   value: crypto,
@@ -47,3 +48,35 @@ vi.mock("@axiomhq/nextjs", () => ({
   createOnRequestError: vi.fn(() => vi.fn()),
   transformMiddlewareRequest: vi.fn(() => []),
 }));
+
+// Attach Vercel Trusted Sources OIDC header to requests against the e2e
+// deployment. Tokens are minted on demand from the GitHub Actions runner.
+const originalFetch = globalThis.fetch.bind(globalThis);
+const e2eBaseUrl = process.env.E2E_BASE_URL?.replace(/\/$/, "");
+
+globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
+  const requestUrl =
+    typeof input === "string"
+      ? input
+      : input instanceof URL
+        ? input.href
+        : input.url;
+
+  if (!e2eBaseUrl || !requestUrl.startsWith(e2eBaseUrl)) {
+    return originalFetch(input, init);
+  }
+
+  const trustedHeaders = await getTrustedSourcesHeaders(originalFetch);
+  if (Object.keys(trustedHeaders).length === 0) {
+    return originalFetch(input, init);
+  }
+
+  const headers = new Headers(
+    init?.headers ?? (input instanceof Request ? input.headers : undefined),
+  );
+  for (const [key, value] of Object.entries(trustedHeaders)) {
+    headers.set(key, value);
+  }
+
+  return originalFetch(input, { ...init, headers });
+}) as typeof fetch;
diff --git a/apps/web/tests/tokens/get-granted-scopes-for-role.test.ts b/apps/web/tests/tokens/get-granted-scopes-for-role.test.ts
new file mode 100644
index 00000000000..5b301f53ed0
--- /dev/null
+++ b/apps/web/tests/tokens/get-granted-scopes-for-role.test.ts
@@ -0,0 +1,130 @@
+import { OAUTH_SCOPES } from "@/lib/api/oauth/constants";
+import {
+  getDisplayedScopesForRole,
+  getGrantedScopesForRole,
+  getMissingScopesForRole,
+} from "@/lib/api/tokens/scopes";
+import { WorkspaceRole } from "@prisma/client";
+import { describe, expect, test } from "vitest";
+
+const ALL_OAUTH_SCOPES = [...OAUTH_SCOPES];
+
+const OWNER_ONLY_OAUTH_SCOPES = ["domains.write", "webhooks.write"];
+
+const READ_OAUTH_SCOPES = ALL_OAUTH_SCOPES.filter(
+  (scope) => scope === "user.read" || scope.endsWith(".read"),
+);
+
+describe("getGrantedScopesForRole", () => {
+  test("owner is granted every requested OAuth scope including user.read", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ALL_OAUTH_SCOPES,
+        role: "owner",
+      }),
+    ).toEqual(ALL_OAUTH_SCOPES);
+  });
+
+  test("member is granted write scopes except owner-only ones", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ALL_OAUTH_SCOPES,
+        role: "member",
+      }),
+    ).toEqual(
+      ALL_OAUTH_SCOPES.filter(
+        (scope) => !OWNER_ONLY_OAUTH_SCOPES.includes(scope),
+      ),
+    );
+  });
+
+  test.each(["viewer", "billing"] as const)(
+    "%s is only granted read OAuth scopes and user.read",
+    (role: WorkspaceRole) => {
+      expect(
+        getGrantedScopesForRole({
+          scopes: ALL_OAUTH_SCOPES,
+          role,
+        }),
+      ).toEqual(READ_OAUTH_SCOPES);
+    },
+  );
+
+  test("always grants user.read even when other requested scopes are not allowed", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ["user.read", "domains.write", "webhooks.write"],
+        role: "viewer",
+      }),
+    ).toEqual(["user.read"]);
+  });
+
+  test("drops unknown scopes", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ["links.read", "not.a.scope", "user.read"],
+        role: "owner",
+      }),
+    ).toEqual(["links.read", "user.read"]);
+  });
+
+  test("preserves the order of requested scopes", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ["user.read", "webhooks.write", "links.read"],
+        role: "owner",
+      }),
+    ).toEqual(["user.read", "webhooks.write", "links.read"]);
+  });
+
+  test("returns an empty array when no requested scopes can be granted", () => {
+    expect(
+      getGrantedScopesForRole({
+        scopes: ["domains.write", "webhooks.write"],
+        role: "billing",
+      }),
+    ).toEqual([]);
+  });
+
+  test("member is granted domains.read and not domains.write when both are requested", () => {
+    const scopes = ["domains.read", "domains.write"];
+
+    expect(
+      getGrantedScopesForRole({
+        scopes,
+        role: "member",
+      }),
+    ).toEqual(["domains.read"]);
+
+    expect(
+      getMissingScopesForRole({
+        scopes,
+        role: "member",
+      }),
+    ).toEqual(["domains.write"]);
+
+    expect(
+      getDisplayedScopesForRole({
+        scopes,
+        role: "member",
+      }),
+    ).toEqual([
+      { scope: "domains.read", missing: false },
+      { scope: "domains.write", missing: true },
+    ]);
+  });
+
+  test("surfaces granted domains.read when domains.write is requested first", () => {
+    const scopes = ["domains.write", "domains.read"];
+
+    expect(
+      getDisplayedScopesForRole({
+        scopes,
+        role: "member",
+      }),
+    ).toEqual([
+      { scope: "domains.write", missing: true },
+      { scope: "domains.read", missing: false },
+    ]);
+  });
+});
diff --git a/apps/web/tests/tracks/track-click.test.ts b/apps/web/tests/tracks/track-click.test.ts
index cd376cd2791..110dca595ae 100644
--- a/apps/web/tests/tracks/track-click.test.ts
+++ b/apps/web/tests/tracks/track-click.test.ts
@@ -19,7 +19,6 @@ const expectValidClickResponse = ({
       partner: expect.objectContaining({
         id: expect.any(String),
         name: expect.any(String),
-        image: expect.any(String),
       }),
     }),
     ...(hasDiscount && {
@@ -27,16 +26,13 @@ const expectValidClickResponse = ({
         id: expect.any(String),
         amount: expect.any(Number),
         type: expect.any(String),
-        maxDuration: expect.any(Number),
-        couponId: expect.any(String),
-        couponTestId: expect.any(String),
       }),
     }),
   });
 
   // Check nullish fields separately if partner exists
   if (hasPartner && response.data.partner) {
-    const { groupId, tenantId } = response.data.partner;
+    const { groupId, tenantId, image } = response.data.partner;
     expect(
       groupId === null || groupId === undefined || typeof groupId === "string",
     ).toBe(true);
@@ -45,6 +41,16 @@ const expectValidClickResponse = ({
         tenantId === undefined ||
         typeof tenantId === "string",
     ).toBe(true);
+    expect(image === null || typeof image === "string").toBe(true);
+  }
+
+  if (hasDiscount && response.data.discount) {
+    const { maxDuration, couponId, couponTestId } = response.data.discount;
+    expect(maxDuration === null || typeof maxDuration === "number").toBe(true);
+    expect(couponId === null || typeof couponId === "string").toBe(true);
+    expect(couponTestId === null || typeof couponTestId === "string").toBe(
+      true,
+    );
   }
 };
 
diff --git a/apps/web/tests/utils/env.ts b/apps/web/tests/utils/env.ts
index 06462a0dffe..94845cb5ea1 100644
--- a/apps/web/tests/utils/env.ts
+++ b/apps/web/tests/utils/env.ts
@@ -10,6 +10,7 @@ export const integrationTestEnv = z.object({
     .string()
     .default("false")
     .transform((v) => v === "true"),
+  VERCEL_ENV: z.string().optional(),
 });
 
 export const env = integrationTestEnv.parse(process.env);
diff --git a/apps/web/tests/utils/resource.ts b/apps/web/tests/utils/resource.ts
index 6eae6c1557f..1bbc4e1ef49 100644
--- a/apps/web/tests/utils/resource.ts
+++ b/apps/web/tests/utils/resource.ts
@@ -239,7 +239,7 @@ export const E2E_PARTNER = {
 
 export const E2E_PARTNER_GROUP = {
   id: "grp_1K2E25381GVMG7HHM057TB92F",
-  url: "https://acme.dub.sh/",
+  url: "https://acme.dub.sh",
 };
 
 export const E2E_PARTNERS = [
diff --git a/apps/web/tests/utils/trusted-sources.ts b/apps/web/tests/utils/trusted-sources.ts
new file mode 100644
index 00000000000..39cabefb1d0
--- /dev/null
+++ b/apps/web/tests/utils/trusted-sources.ts
@@ -0,0 +1,151 @@
+const TRUSTED_OIDC_HEADER = "x-vercel-trusted-oidc-idp-token";
+const EARLY_REFRESH_MS = 60_000;
+const OIDC_MINT_ATTEMPTS = 3;
+const OIDC_MINT_RETRY_DELAY_MS = 500;
+const RETRYABLE_OIDC_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+type FetchFn = typeof fetch;
+
+let cachedToken: string | null = null;
+let cachedExpiresAtMs = 0;
+let inflight: Promise<string | null> | null = null;
+
+/**
+ * Headers that bypass Vercel Deployment Protection via Trusted Sources.
+ *
+ * GitHub Actions OIDC tokens last 5 minutes, so we mint on demand from the
+ * runner (`ACTIONS_ID_TOKEN_REQUEST_*`) and refresh before expiry. Falls back
+ * to `VERCEL_OIDC_TOKEN` for local runs against a protected preview.
+ *
+ * @see https://vercel.com/docs/deployment-protection/methods-to-bypass-deployment-protection/trusted-sources
+ */
+export async function getTrustedSourcesHeaders(
+  fetchFn: FetchFn = fetch,
+): Promise<Record<string, string>> {
+  const token = await getOidcToken(fetchFn);
+  if (!token) return {};
+  return { [TRUSTED_OIDC_HEADER]: token };
+}
+
+async function getOidcToken(fetchFn: FetchFn): Promise<string | null> {
+  const now = Date.now();
+  if (cachedToken && now < cachedExpiresAtMs - EARLY_REFRESH_MS) {
+    return cachedToken;
+  }
+
+  if (inflight) return inflight;
+
+  inflight = (async () => {
+    try {
+      const minted = await mintFromGitHubActionsRunner(fetchFn);
+      if (minted) {
+        cachedToken = minted.token;
+        cachedExpiresAtMs = minted.expiresAtMs;
+        return minted.token;
+      }
+
+      const envToken = process.env.VERCEL_OIDC_TOKEN;
+      if (envToken) {
+        cachedToken = envToken;
+        cachedExpiresAtMs = Number.POSITIVE_INFINITY;
+        return envToken;
+      }
+
+      return null;
+    } finally {
+      inflight = null;
+    }
+  })();
+
+  return inflight;
+}
+
+async function mintFromGitHubActionsRunner(
+  fetchFn: FetchFn,
+): Promise<{ token: string; expiresAtMs: number } | null> {
+  const url = process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
+  const requestToken = process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
+  if (!url || !requestToken) return null;
+
+  let lastError: unknown;
+  for (let attempt = 1; attempt <= OIDC_MINT_ATTEMPTS; attempt++) {
+    try {
+      return await mintOidcToken(fetchFn, url, requestToken);
+    } catch (error) {
+      lastError = error;
+      if (!isRetryableOidcMintError(error) || attempt === OIDC_MINT_ATTEMPTS) {
+        throw error;
+      }
+
+      await new Promise((resolve) =>
+        setTimeout(resolve, OIDC_MINT_RETRY_DELAY_MS * 2 ** (attempt - 1)),
+      );
+    }
+  }
+
+  throw lastError;
+}
+
+async function mintOidcToken(
+  fetchFn: FetchFn,
+  url: string,
+  requestToken: string,
+): Promise<{ token: string; expiresAtMs: number }> {
+  const res = await fetchFn(url, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${requestToken}`,
+      Accept: "application/json",
+    },
+  });
+
+  if (!res.ok) {
+    throw new OidcMintError(
+      `Failed to mint GitHub Actions OIDC token: ${res.status} ${res.statusText}`,
+      RETRYABLE_OIDC_STATUS.has(res.status),
+    );
+  }
+
+  const body = (await res.json()) as { value?: string };
+  const token = body.value;
+  if (!token) {
+    throw new OidcMintError(
+      "Failed to mint GitHub Actions OIDC token: empty/invalid response body",
+      false,
+    );
+  }
+
+  return { token, expiresAtMs: readJwtExpMs(token) };
+}
+
+class OidcMintError extends Error {
+  constructor(
+    message: string,
+    readonly retryable: boolean,
+  ) {
+    super(message);
+  }
+}
+
+function isRetryableOidcMintError(error: unknown): boolean {
+  if (error instanceof OidcMintError) return error.retryable;
+  // Network / fetch failures (TypeError, aborted connections, etc.)
+  return true;
+}
+
+function readJwtExpMs(jwt: string): number {
+  const fallback = Date.now() + 5 * 60 * 1000;
+  const parts = jwt.split(".");
+  if (parts.length !== 3) return fallback;
+
+  try {
+    const payload = JSON.parse(
+      Buffer.from(parts[1], "base64url").toString("utf8"),
+    );
+    if (typeof payload?.exp === "number") return payload.exp * 1000;
+  } catch {
+    // ignore — use fallback
+  }
+
+  return fallback;
+}
diff --git a/apps/web/tests/utils/verify-commission.ts b/apps/web/tests/utils/verify-commission.ts
index 5251d95c044..0f54483d794 100644
--- a/apps/web/tests/utils/verify-commission.ts
+++ b/apps/web/tests/utils/verify-commission.ts
@@ -3,7 +3,9 @@ import {
   VITEST_TEST_TIMEOUT_MS,
 } from "@/lib/constants/misc";
 import { CommissionResponse, Customer } from "@/lib/types";
+import { sleep } from "@dub/utils";
 import { expect } from "vitest";
+
 import { HttpClient } from "./http";
 
 interface VerifyCommissionProps {
@@ -14,6 +16,7 @@ interface VerifyCommissionProps {
   expectedSaleAmount?: number;
   expectedEarnings: number;
   expectedType?: string;
+  expectedMetadata?: CommissionResponse["metadata"];
   query?: Record<string, string>; // to pass additional query params to GET /commissions
 }
 
@@ -25,6 +28,7 @@ export const verifyCommission = async ({
   expectedSaleAmount,
   expectedEarnings,
   expectedType,
+  expectedMetadata,
   query: queryOverrides,
 }: VerifyCommissionProps) => {
   let customerId: string | undefined;
@@ -95,13 +99,15 @@ export const verifyCommission = async ({
         expect(commission.type).toEqual(expectedType);
       }
 
+      if (expectedMetadata !== undefined) {
+        expect(commission.metadata).toEqual(expectedMetadata);
+      }
+
       return;
     }
 
     // Wait before next poll
-    await new Promise((resolve) =>
-      setTimeout(resolve, VITEST_POLL_INTERVAL_MS),
-    );
+    await sleep(VITEST_POLL_INTERVAL_MS);
   }
 
   // Timeout reached - fail the test
diff --git a/apps/web/tests/utils/verify-fraud-event.ts b/apps/web/tests/utils/verify-fraud-event.ts
index fa098545dfe..8e8ae154714 100644
--- a/apps/web/tests/utils/verify-fraud-event.ts
+++ b/apps/web/tests/utils/verify-fraud-event.ts
@@ -1,5 +1,6 @@
 import { Customer } from "@/lib/types";
 import { fraudEventSchemas } from "@/lib/zod/schemas/fraud";
+import { sleep } from "@dub/utils";
 import { FraudRuleType, Partner } from "@prisma/client";
 import { HttpClient } from "tests/utils/http";
 import { expect } from "vitest";
@@ -54,9 +55,7 @@ export const verifyFraudEvent = async ({
     }
 
     // Wait before next poll
-    await new Promise((resolve) =>
-      setTimeout(resolve, VITEST_POLL_INTERVAL_MS),
-    );
+    await sleep(VITEST_POLL_INTERVAL_MS);
   }
 
   if (!fraudEvent) {
diff --git a/apps/web/tests/webhooks/index.test.ts b/apps/web/tests/webhooks/index.test.ts
index 863522a25f9..368180c6398 100644
--- a/apps/web/tests/webhooks/index.test.ts
+++ b/apps/web/tests/webhooks/index.test.ts
@@ -11,8 +11,12 @@ import type { WebhookTrigger } from "@/lib/webhook/types";
 import { BountySchema } from "@/lib/zod/schemas/bounties";
 import { CommissionWebhookSchema } from "@/lib/zod/schemas/commissions";
 import { CustomerSchema } from "@/lib/zod/schemas/customers";
+import { DiscountCodeWebhookSchema } from "@/lib/zod/schemas/discount";
 import { linkEventSchema } from "@/lib/zod/schemas/links";
-import { EnrolledPartnerSchema } from "@/lib/zod/schemas/partners";
+import {
+  EnrolledPartnerSchema,
+  partnerMergedWebhookSchema,
+} from "@/lib/zod/schemas/partners";
 import { payoutWebhookEventSchema } from "@/lib/zod/schemas/payouts";
 import { partnerApplicationWebhookSchema } from "@/lib/zod/schemas/program-application";
 import { describe, expect, test } from "vitest";
@@ -95,10 +99,13 @@ const eventSchemas: Record<WebhookTrigger, z.ZodSchema> = {
   "sale.created": saleWebhookEventSchemaExtended,
   "partner.application_submitted": partnerApplicationWebhookSchema,
   "partner.enrolled": enrolledPartnerSchemaExtended,
+  "partner.merged": partnerMergedWebhookSchema,
   "commission.created": commissionWebhookEventSchemaExtended,
   "bounty.created": bountyWebhookEventSchemaExtended,
   "bounty.updated": bountyWebhookEventSchemaExtended,
   "payout.confirmed": payoutWebhookEventSchemaExtended,
+  "discount_code.created": DiscountCodeWebhookSchema,
+  "discount_code.deleted": DiscountCodeWebhookSchema,
 };
 
 describe("Webhooks", () => {
diff --git a/apps/web/tests/workflows/award-bounty-workflow.test.ts b/apps/web/tests/workflows/award-bounty-workflow.test.ts
index bac3149795a..f8074fff9ce 100644
--- a/apps/web/tests/workflows/award-bounty-workflow.test.ts
+++ b/apps/web/tests/workflows/award-bounty-workflow.test.ts
@@ -1,7 +1,9 @@
 import { EnrolledPartnerProps } from "@/lib/types";
+import { sleep } from "@dub/utils";
 import { Bounty } from "@prisma/client";
 import { E2E_PARTNER_GROUP } from "tests/utils/resource";
 import { describe, expect, onTestFinished, test } from "vitest";
+
 import { randomPartnerEmail } from "../utils/helpers";
 import { IntegrationHarness } from "../utils/integration";
 import { deleteBountyAndSubmissions } from "./utils/delete-bounty-and-submissions";
@@ -122,7 +124,7 @@ describe.sequential("Workflow - AwardBounty", async () => {
 
     await trackE2ELead(http, partnerLink);
 
-    await new Promise((resolve) => setTimeout(resolve, 10000));
+    await sleep(10000);
 
     const { data: submissions } = await http.get<any[]>({
       path: `/bounties/${bounty.id}/submissions`,
@@ -196,7 +198,7 @@ describe.sequential("Workflow - AwardBounty", async () => {
 
     await trackE2ELead(http, partnerLink);
 
-    await new Promise((resolve) => setTimeout(resolve, 10000));
+    await sleep(10000);
 
     const { data: submissions } = await http.get<any[]>({
       path: `/bounties/${bounty.id}/submissions`,
diff --git a/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts
new file mode 100644
index 00000000000..dd25e797f48
--- /dev/null
+++ b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts
@@ -0,0 +1,158 @@
+import {
+  VITEST_POLL_INTERVAL_MS,
+  VITEST_TEST_TIMEOUT_MS,
+} from "@/lib/constants/misc";
+import { EnrolledPartnerProps } from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { describe, expect, test } from "vitest";
+
+import { randomPartnerEmail } from "../utils/helpers";
+import { IntegrationHarness } from "../utils/integration";
+import { E2E_PARTNER_GROUP } from "../utils/resource";
+import { verifyMergeCompleted } from "./utils/verify-merge-completed";
+
+describe.sequential("Workflow - MergePartnerAccounts", async () => {
+  const h = new IntegrationHarness();
+  const { http } = await h.init();
+
+  // Creates a partner enrolled (approved) in the Acme program with a default link.
+  async function createEnrolledPartner(label: string) {
+    const { status, data: partner } = await http.post<EnrolledPartnerProps>({
+      path: "/partners",
+      body: {
+        name: `E2E Merge ${label}`,
+        email: randomPartnerEmail(),
+        groupId: E2E_PARTNER_GROUP.id,
+      },
+    });
+
+    expect(status).toEqual(201);
+    expect(partner.links).not.toBeNull();
+    expect(partner.links!.length).toBeGreaterThan(0);
+
+    return partner;
+  }
+
+  test(
+    "Overlap merge transfers child data and deletes source",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const source = await createEnrolledPartner("source");
+      const target = await createEnrolledPartner("target");
+      const sourceLinkId = source.links![0].id;
+
+      const { status: triggerStatus, data: triggerRes } = await http.post<{
+        workflowRunId?: string;
+      }>({
+        path: "/e2e/trigger-merge-accounts",
+        body: { sourceEmail: source.email, targetEmail: target.email },
+      });
+
+      expect(triggerStatus).toEqual(200);
+      expect(triggerRes).not.toBeNull();
+
+      const merged = await verifyMergeCompleted({
+        http,
+        sourcePartnerId: source.id,
+        targetPartnerId: target.id,
+        expectedLinkId: sourceLinkId,
+      });
+
+      expect(merged.links!.map((link) => link.id)).toContain(sourceLinkId);
+    },
+  );
+
+  test(
+    "Overlap merge upgrades target status from pending to approved",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const sourcePartner = await createEnrolledPartner("upgrade-source");
+      const targetPartner = await createEnrolledPartner("upgrade-target");
+
+      const { status: pendingStatus } = await http.post({
+        path: "/e2e/partners/pending-program-application",
+        body: { partnerId: targetPartner.id },
+      });
+      expect(pendingStatus).toEqual(200);
+
+      const { status: triggerStatus } = await http.post({
+        path: "/e2e/trigger-merge-accounts",
+        body: {
+          sourceEmail: sourcePartner.email,
+          targetEmail: targetPartner.email,
+        },
+      });
+      expect(triggerStatus).toEqual(200);
+
+      const startTime = Date.now();
+      let lastTargetStatus: string | undefined;
+
+      while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
+        const [sourceRes, targetRes] = await Promise.all([
+          http.get({ path: `/partners/${sourcePartner.id}` }),
+          http.get<EnrolledPartnerProps>({
+            path: `/partners/${targetPartner.id}`,
+          }),
+        ]);
+
+        lastTargetStatus =
+          targetRes.status === 200 ? targetRes.data.status : undefined;
+
+        if (sourceRes.status === 404 && lastTargetStatus === "approved") {
+          expect(lastTargetStatus).toBe("approved");
+          return;
+        }
+
+        await sleep(VITEST_POLL_INTERVAL_MS);
+      }
+
+      throw new Error(
+        `Target status was not upgraded to approved within ${VITEST_TEST_TIMEOUT_MS / 1000}s. ` +
+          `Last seen status: ${lastTargetStatus}`,
+      );
+    },
+  );
+
+  test(
+    "Repeat merge is rejected once the source is already merged",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const source = await createEnrolledPartner("repeat-source");
+      const target = await createEnrolledPartner("repeat-target");
+      const sourceLinkId = source.links![0].id;
+
+      const { status: firstTrigger } = await http.post({
+        path: "/e2e/trigger-merge-accounts",
+        body: { sourceEmail: source.email, targetEmail: target.email },
+      });
+      expect(firstTrigger).toEqual(200);
+
+      await verifyMergeCompleted({
+        http,
+        sourcePartnerId: source.id,
+        targetPartnerId: target.id,
+        expectedLinkId: sourceLinkId,
+      });
+
+      const { data: afterFirst } = await http.get<EnrolledPartnerProps>({
+        path: `/partners/${target.id}`,
+      });
+      const linkCountAfterFirst = afterFirst.links!.length;
+
+      // The source partner no longer exists, so triggering again is rejected by
+      // the guard (both partners must be enrolled in the Acme program) - the
+      // merge can't be double-processed.
+      const { status: secondTrigger } = await http.post({
+        path: "/e2e/trigger-merge-accounts",
+        body: { sourceEmail: source.email, targetEmail: target.email },
+      });
+      expect(secondTrigger).toEqual(400);
+
+      const { data: afterSecond } = await http.get<EnrolledPartnerProps>({
+        path: `/partners/${target.id}`,
+      });
+
+      expect(afterSecond.links!.length).toBe(linkCountAfterFirst);
+    },
+  );
+});
diff --git a/apps/web/tests/workflows/move-group-workflow.test.ts b/apps/web/tests/workflows/move-group-workflow.test.ts
deleted file mode 100644
index f0192d76c4a..00000000000
--- a/apps/web/tests/workflows/move-group-workflow.test.ts
+++ /dev/null
@@ -1,789 +0,0 @@
-import { EnrolledPartnerProps } from "@/lib/types";
-import { RESOURCE_COLORS } from "@/ui/colors";
-import { randomValue } from "@dub/utils";
-import { PartnerGroup } from "@prisma/client";
-import { E2E_PARTNER } from "tests/utils/resource";
-import { describe, expect, onTestFinished, test } from "vitest";
-import { randomPartnerEmail } from "../utils/helpers";
-import { IntegrationHarness } from "../utils/integration";
-import { trackE2ELead } from "./utils/track-e2e-lead";
-import { verifyPartnerGroupMove } from "./utils/verify-partner-group-move";
-
-async function cleanupOrphanedGroup(
-  http: any,
-  slug: string,
-  allGroups: PartnerGroup[],
-) {
-  const orphan = allGroups.find((g) => g.slug === slug);
-  if (orphan) await http.delete({ path: `/groups/${orphan.id}` });
-}
-
-describe.sequential("Workflow - MoveGroup", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  const { data: allGroupsForCleanup } = await http.get<PartnerGroup[]>({
-    path: "/groups",
-  });
-
-  test("Workflow is created when move rules are configured", async () => {
-    const slug = "e2e-target-config";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { status: targetStatus, data: targetGroup } =
-      await http.post<PartnerGroup>({
-        path: "/groups",
-        body: {
-          name: "E2E Target Group - Config Test",
-          slug,
-          color: randomValue(RESOURCE_COLORS),
-        },
-      });
-
-    expect(targetStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${targetGroup.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${targetGroup.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 3, max: 5 },
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: targetGroup.id },
-    });
-
-    expect(workflow).not.toBeNull();
-    expect(workflow.disabledAt).toBeNull();
-
-    const workflowActions = workflow.actions as any[];
-    expect(workflowActions).toHaveLength(1);
-    expect(workflowActions[0].type).toBe("moveGroup");
-    expect(workflowActions[0].data.groupId).toBe(targetGroup.id);
-
-    const workflowConditions = workflow.triggerConditions as any[];
-    expect(workflowConditions).toHaveLength(1);
-    expect(workflowConditions[0].attribute).toBe("totalLeads");
-    expect(workflowConditions[0].operator).toBe("between");
-    expect(workflowConditions[0].value).toStrictEqual({ min: 3, max: 5 });
-  });
-
-  test("Workflow is deleted when move rules are removed", async () => {
-    const slug = "e2e-remove-rules";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { status: groupStatus, data: group } = await http.post<PartnerGroup>({
-      path: "/groups",
-      body: {
-        name: "E2E Group - Remove Rules",
-        slug,
-        color: randomValue(RESOURCE_COLORS),
-      },
-    });
-
-    expect(groupStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${group.id}` });
-    });
-
-    const { status: addStatus } = await http.patch({
-      path: `/groups/${group.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 2, max: 3 },
-          },
-        ],
-      },
-    });
-
-    expect(addStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: group.id },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const { status: removeStatus } = await http.patch({
-      path: `/groups/${group.id}`,
-      body: {
-        moveRules: [],
-      },
-    });
-
-    expect(removeStatus).toEqual(200);
-
-    await new Promise((resolve) => setTimeout(resolve, 5000));
-
-    const { data: deletedWorkflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: group.id },
-    });
-
-    expect(deletedWorkflow).toBeNull();
-  });
-
-  test("Disabled workflow doesn't execute partner move", async () => {
-    const slug = "e2e-target-disabled";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { data: existingGroups } = await http.get<PartnerGroup[]>({
-      path: "/groups",
-    });
-
-    expect(existingGroups.length).toBeGreaterThan(0);
-    const sourceGroup = existingGroups[0];
-
-    const { status: targetStatus, data: targetGroup } =
-      await http.post<PartnerGroup>({
-        path: "/groups",
-        body: {
-          name: "E2E Target Group - Disabled Move",
-          slug,
-          color: randomValue(RESOURCE_COLORS),
-        },
-      });
-
-    expect(targetStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${targetGroup.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${targetGroup.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 2, max: 3 },
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: targetGroup.id },
-    });
-
-    expect(workflow).not.toBeNull();
-    expect(workflow.disabledAt).toBeNull();
-
-    await http.patch({
-      path: `/e2e/workflows/${workflow.id}`,
-      body: { disabledAt: new Date().toISOString() },
-    });
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - Disabled Move",
-          email: randomPartnerEmail(),
-          groupId: sourceGroup.id,
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-    expect(partner.links).not.toBeNull();
-
-    const partnerLink = partner.links![0];
-
-    await trackE2ELead(http, partnerLink);
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-
-    const { data: partnerAfter } = await http.get<EnrolledPartnerProps>({
-      path: `/partners/${partner.id}`,
-    });
-
-    expect(partnerAfter.groupId).toBe(sourceGroup.id);
-  });
-
-  test("Workflow doesn't execute when conditions are not met", async () => {
-    const slug = "e2e-target-not-met";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { data: existingGroups } = await http.get<PartnerGroup[]>({
-      path: "/groups",
-    });
-
-    expect(existingGroups.length).toBeGreaterThan(0);
-    const sourceGroup = existingGroups[0];
-
-    const { status: targetStatus, data: targetGroup } =
-      await http.post<PartnerGroup>({
-        path: "/groups",
-        body: {
-          name: "E2E Target Group - Not Met",
-          slug,
-          color: randomValue(RESOURCE_COLORS),
-        },
-      });
-
-    expect(targetStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${targetGroup.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${targetGroup.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 4, max: 5 },
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - Not Met",
-          email: randomPartnerEmail(),
-          groupId: sourceGroup.id,
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-    expect(partner.links).not.toBeNull();
-
-    const partnerLink = partner.links![0];
-
-    await trackE2ELead(http, partnerLink);
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-
-    const { data: partnerAfter } = await http.get<EnrolledPartnerProps>({
-      path: `/partners/${partner.id}`,
-    });
-
-    expect(partnerAfter.groupId).toBe(sourceGroup.id);
-  });
-
-  test(
-    "Workflow executes when conditions are met - partner moves to target group",
-    { timeout: 90000 },
-    async () => {
-      const slug = "e2e-target-exec";
-      await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-      const { data: existingGroups } = await http.get<PartnerGroup[]>({
-        path: "/groups",
-      });
-
-      expect(existingGroups.length).toBeGreaterThan(0);
-      const sourceGroup = existingGroups[0];
-
-      const { status: targetStatus, data: targetGroup } =
-        await http.post<PartnerGroup>({
-          path: "/groups",
-          body: {
-            name: "E2E Target Group - Move Execution",
-            slug,
-            color: randomValue(RESOURCE_COLORS),
-          },
-        });
-
-      expect(targetStatus).toEqual(201);
-
-      onTestFinished(async () => {
-        await http.delete({ path: `/groups/${targetGroup.id}` });
-      });
-
-      const { status: patchStatus } = await http.patch({
-        path: `/groups/${targetGroup.id}`,
-        body: {
-          moveRules: [
-            {
-              attribute: "totalLeads",
-              operator: "between",
-              value: { min: 1, max: 2 },
-            },
-          ],
-        },
-      });
-
-      expect(patchStatus).toEqual(200);
-
-      const { status: partnerStatus, data: partner } =
-        await http.post<EnrolledPartnerProps>({
-          path: "/partners",
-          body: {
-            name: "E2E Test Partner - Move Execution",
-            email: randomPartnerEmail(),
-            groupId: sourceGroup.id,
-          },
-        });
-
-      expect(partnerStatus).toEqual(201);
-      expect(partner.links).not.toBeNull();
-      expect(partner.groupId).toBe(sourceGroup.id);
-
-      const partnerLink = partner.links![0];
-
-      await trackE2ELead(http, partnerLink);
-
-      await verifyPartnerGroupMove({
-        http,
-        partnerId: partner.id,
-        expectedGroupId: targetGroup.id,
-      });
-    },
-  );
-
-  test(
-    "No duplicate group moves on multiple triggers",
-    { timeout: 90000 },
-    async () => {
-      const slug = "e2e-target-no-dup";
-      await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-      const { data: existingGroups } = await http.get<PartnerGroup[]>({
-        path: "/groups",
-      });
-
-      expect(existingGroups.length).toBeGreaterThan(0);
-      const sourceGroup = existingGroups[0];
-
-      const { status: targetStatus, data: targetGroup } =
-        await http.post<PartnerGroup>({
-          path: "/groups",
-          body: {
-            name: "E2E Target Group - No Dup Move",
-            slug,
-            color: randomValue(RESOURCE_COLORS),
-          },
-        });
-
-      expect(targetStatus).toEqual(201);
-
-      onTestFinished(async () => {
-        await http.delete({ path: `/groups/${targetGroup.id}` });
-      });
-
-      const { status: patchStatus } = await http.patch({
-        path: `/groups/${targetGroup.id}`,
-        body: {
-          moveRules: [
-            {
-              attribute: "totalLeads",
-              operator: "between",
-              value: { min: 1, max: 2 },
-            },
-          ],
-        },
-      });
-
-      expect(patchStatus).toEqual(200);
-
-      const { status: partnerStatus, data: partner } =
-        await http.post<EnrolledPartnerProps>({
-          path: "/partners",
-          body: {
-            name: "E2E Test Partner - No Dup Move",
-            email: randomPartnerEmail(),
-            groupId: sourceGroup.id,
-          },
-        });
-
-      expect(partnerStatus).toEqual(201);
-      expect(partner.links).not.toBeNull();
-
-      const partnerLink = partner.links![0];
-
-      await trackE2ELead(http, partnerLink);
-
-      await verifyPartnerGroupMove({
-        http,
-        partnerId: partner.id,
-        expectedGroupId: targetGroup.id,
-      });
-
-      const { data: partnerAfter } = await http.get<EnrolledPartnerProps>({
-        path: `/partners/${partner.id}`,
-      });
-
-      expect(partnerAfter.groupId).toBe(targetGroup.id);
-    },
-  );
-
-  test("Multiple move rules can be configured (AND operator)", async () => {
-    const slug = "e2e-multi-rules";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { status: groupStatus, data: group } = await http.post<PartnerGroup>({
-      path: "/groups",
-      body: {
-        name: "E2E Group - Multiple Rules",
-        slug,
-        color: randomValue(RESOURCE_COLORS),
-      },
-    });
-
-    expect(groupStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${group.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${group.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 2, max: 3 },
-          },
-          {
-            attribute: "totalConversions",
-            operator: "between",
-            value: { min: 1, max: 2 },
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: group.id },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const workflowConditions = workflow.triggerConditions as any[];
-    expect(workflowConditions).toHaveLength(2);
-    expect(workflowConditions[0].attribute).toBe("totalLeads");
-    expect(workflowConditions[0].value).toStrictEqual({ min: 2, max: 3 });
-    expect(workflowConditions[1].attribute).toBe("totalConversions");
-    expect(workflowConditions[1].value).toStrictEqual({ min: 1, max: 2 });
-  });
-
-  test("Metric + partnerGroup move rules create workflow with both conditions", async () => {
-    const slug = "e2e-partner-group-config";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-    const { data: existingGroups } = await http.get<PartnerGroup[]>({
-      path: "/groups",
-    });
-
-    expect(existingGroups.length).toBeGreaterThan(0);
-    const sourceGroup = existingGroups[0];
-
-    const { status: groupStatus, data: group } = await http.post<PartnerGroup>({
-      path: "/groups",
-      body: {
-        name: "E2E Group - Partner Group Config",
-        slug,
-        color: randomValue(RESOURCE_COLORS),
-      },
-    });
-
-    expect(groupStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${group.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${group.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 2, max: 3 },
-          },
-          {
-            attribute: "partnerGroup",
-            operator: "eq",
-            value: sourceGroup.id,
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { groupId: group.id },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const workflowConditions = workflow.triggerConditions as any[];
-    expect(workflowConditions).toHaveLength(2);
-    expect(workflowConditions[0].attribute).toBe("totalLeads");
-    expect(workflowConditions[0].operator).toBe("between");
-    expect(workflowConditions[0].value).toStrictEqual({ min: 2, max: 3 });
-    expect(workflowConditions[1].attribute).toBe("partnerGroup");
-    expect(workflowConditions[1].operator).toBe("eq");
-    expect(workflowConditions[1].value).toBe(sourceGroup.id);
-  });
-
-  test(
-    "Workflow executes when partnerGroup matches source group",
-    { timeout: 90000 },
-    async () => {
-      const slug = "e2e-partner-group-match";
-      await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-
-      const { data: existingGroups } = await http.get<PartnerGroup[]>({
-        path: "/groups",
-      });
-
-      expect(existingGroups.length).toBeGreaterThan(0);
-      const sourceGroup = existingGroups[0];
-
-      const { status: targetStatus, data: targetGroup } =
-        await http.post<PartnerGroup>({
-          path: "/groups",
-          body: {
-            name: "E2E Target Group - Partner Group Match",
-            slug,
-            color: randomValue(RESOURCE_COLORS),
-          },
-        });
-
-      expect(targetStatus).toEqual(201);
-
-      onTestFinished(async () => {
-        await http.delete({ path: `/groups/${targetGroup.id}` });
-      });
-
-      const { status: patchStatus } = await http.patch({
-        path: `/groups/${targetGroup.id}`,
-        body: {
-          moveRules: [
-            {
-              attribute: "totalLeads",
-              operator: "between",
-              value: { min: 1, max: 2 },
-            },
-            {
-              attribute: "partnerGroup",
-              operator: "eq",
-              value: sourceGroup.id,
-            },
-          ],
-        },
-      });
-
-      expect(patchStatus).toEqual(200);
-
-      const { status: partnerStatus, data: partner } =
-        await http.post<EnrolledPartnerProps>({
-          path: "/partners",
-          body: {
-            name: "E2E Test Partner - Partner Group Match",
-            email: randomPartnerEmail(),
-            groupId: sourceGroup.id,
-          },
-        });
-
-      expect(partnerStatus).toEqual(201);
-      expect(partner.links).not.toBeNull();
-      expect(partner.groupId).toBe(sourceGroup.id);
-
-      const partnerLink = partner.links![0];
-
-      await trackE2ELead(http, partnerLink);
-
-      await verifyPartnerGroupMove({
-        http,
-        partnerId: partner.id,
-        expectedGroupId: targetGroup.id,
-      });
-    },
-  );
-
-  test("Workflow doesn't execute when partnerGroup does not match source group", async () => {
-    const slug = "e2e-partner-group-mismatch";
-    const sourceSlug = "e2e-partner-group-mismatch-src";
-    await cleanupOrphanedGroup(http, slug, allGroupsForCleanup);
-    await cleanupOrphanedGroup(http, sourceSlug, allGroupsForCleanup);
-
-    const { data: existingGroups } = await http.get<PartnerGroup[]>({
-      path: "/groups",
-    });
-
-    expect(existingGroups.length).toBeGreaterThan(0);
-    const allowedSourceGroup = existingGroups[0];
-
-    const { status: nonMatchingSourceStatus, data: nonMatchingSourceGroup } =
-      await http.post<PartnerGroup>({
-        path: "/groups",
-        body: {
-          name: "E2E Source Group - Partner Group Mismatch",
-          slug: sourceSlug,
-          color: randomValue(RESOURCE_COLORS),
-        },
-      });
-
-    expect(nonMatchingSourceStatus).toEqual(201);
-
-    const { status: targetStatus, data: targetGroup } =
-      await http.post<PartnerGroup>({
-        path: "/groups",
-        body: {
-          name: "E2E Target Group - Partner Group Mismatch",
-          slug,
-          color: randomValue(RESOURCE_COLORS),
-        },
-      });
-
-    expect(targetStatus).toEqual(201);
-
-    onTestFinished(async () => {
-      await http.delete({ path: `/groups/${targetGroup.id}` });
-      await http.delete({ path: `/groups/${nonMatchingSourceGroup.id}` });
-    });
-
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${targetGroup.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "between",
-            value: { min: 1, max: 2 },
-          },
-          {
-            attribute: "partnerGroup",
-            operator: "eq",
-            value: allowedSourceGroup.id,
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - Partner Group Mismatch",
-          email: randomPartnerEmail(),
-          groupId: nonMatchingSourceGroup.id,
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-    expect(partner.links).not.toBeNull();
-    expect(partner.groupId).toBe(nonMatchingSourceGroup.id);
-
-    const partnerLink = partner.links![0];
-
-    await trackE2ELead(http, partnerLink);
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-
-    const { data: partnerAfter } = await http.get<EnrolledPartnerProps>({
-      path: `/partners/${partner.id}`,
-    });
-
-    expect(partnerAfter.groupId).toBe(nonMatchingSourceGroup.id);
-  });
-
-  test("Workflow skips partner with groupMoveDisabledAt set", async () => {
-    const slug = "e2e-target-skip-partner-move";
-
-    // Get the current group of E2E_PARTNER
-    const { data: partner, status: partnerStatus } = await http.get<
-      EnrolledPartnerProps & { groupMoveDisabledAt: Date }
-    >({
-      path: `/partners/${E2E_PARTNER.id}`,
-    });
-
-    expect(partnerStatus).toEqual(200);
-    expect(partner).not.toBeNull();
-    expect(partner.groupMoveDisabledAt).not.toBeNull();
-
-    const partnerLink = partner.links![0];
-
-    // Create a new group
-    const { data: targetGroup } = await http.post<PartnerGroup>({
-      path: "/groups",
-      body: {
-        name: "E2E Target Group - Skip Partner Move",
-        slug,
-        color: randomValue(RESOURCE_COLORS),
-      },
-    });
-
-    expect(targetGroup).not.toBeNull();
-
-    onTestFinished(async () => {
-      await http.delete({
-        path: `/groups/${targetGroup.id}`,
-      });
-    });
-
-    // Update the group with move rule
-    const { status: patchStatus } = await http.patch({
-      path: `/groups/${targetGroup.id}`,
-      body: {
-        moveRules: [
-          {
-            attribute: "totalLeads",
-            operator: "gte",
-            value: 1000,
-          },
-        ],
-      },
-    });
-
-    expect(patchStatus).toEqual(200);
-
-    await trackE2ELead(http, partnerLink);
-
-    await verifyPartnerGroupMove({
-      http,
-      partnerId: partner.id,
-      expectedGroupId: partner.groupId!,
-    });
-
-    const { data: partnerAfter } = await http.get<
-      EnrolledPartnerProps & { groupMoveDisabledAt: Date }
-    >({
-      path: `/partners/${partner.id}`,
-    });
-
-    expect(partnerAfter.groupId).toBe(partner.groupId);
-    expect(partnerAfter.groupMoveDisabledAt).not.toBeNull();
-  });
-});
diff --git a/apps/web/tests/workflows/reattribute-customer-workflow.test.ts b/apps/web/tests/workflows/reattribute-customer-workflow.test.ts
new file mode 100644
index 00000000000..adea2e08d73
--- /dev/null
+++ b/apps/web/tests/workflows/reattribute-customer-workflow.test.ts
@@ -0,0 +1,254 @@
+import {
+  VITEST_POLL_INTERVAL_MS,
+  VITEST_TEST_TIMEOUT_MS,
+} from "@/lib/constants/misc";
+import {
+  CommissionResponse,
+  Customer,
+  CustomerEnriched,
+  EnrolledPartnerProps,
+} from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { describe, expect, onTestFinished, test } from "vitest";
+
+import { randomCustomer, randomPartnerEmail } from "../utils/helpers";
+import { IntegrationHarness } from "../utils/integration";
+import { E2E_PARTNER_GROUP } from "../utils/resource";
+import { trackE2ELead } from "./utils/track-e2e-lead";
+import { verifyReattributeCompleted } from "./utils/verify-reattribute-completed";
+
+describe.sequential("Workflow - ReattributeCustomer", async () => {
+  const h = new IntegrationHarness();
+  const { http } = await h.init();
+
+  async function createEnrolledPartner(label: string) {
+    const { status, data: partner } = await http.post<EnrolledPartnerProps>({
+      path: "/partners",
+      body: {
+        name: `E2E Reattribute ${label}`,
+        email: randomPartnerEmail(),
+        groupId: E2E_PARTNER_GROUP.id,
+      },
+    });
+
+    expect(status).toEqual(201);
+    expect(partner.links).not.toBeNull();
+    expect(partner.links!.length).toBeGreaterThan(0);
+
+    return partner;
+  }
+
+  async function createManualCustomer() {
+    const body = {
+      ...randomCustomer(),
+      country: "US",
+    };
+
+    const { status, data: customer } = await http.post<Customer>({
+      path: "/customers",
+      body,
+    });
+
+    expect(status).toEqual(201);
+    return customer;
+  }
+
+  function cleanupCustomers(...ids: Array<string | undefined>) {
+    onTestFinished(async () => {
+      await Promise.all(
+        ids
+          .filter((id): id is string => Boolean(id))
+          .map((id) => h.deleteCustomer(id).catch(() => undefined)),
+      );
+    });
+  }
+
+  async function waitForCustomerByExternalId(externalId: string) {
+    const startTime = Date.now();
+
+    while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
+      const { status, data: customers } = await http.get<CustomerEnriched[]>({
+        path: "/customers",
+        query: {
+          externalId,
+          includeExpandedFields: "true",
+        },
+      });
+
+      if (status === 200 && customers.length > 0) {
+        return customers[0];
+      }
+
+      await sleep(VITEST_POLL_INTERVAL_MS);
+    }
+
+    throw new Error(
+      `Customer with externalId ${externalId} was not found within ${VITEST_TEST_TIMEOUT_MS / 1000}s.`,
+    );
+  }
+
+  async function tryFindCommissions(
+    customerId: string,
+    maxWaitMs = 30_000,
+  ): Promise<CommissionResponse[]> {
+    const startTime = Date.now();
+
+    while (Date.now() - startTime < maxWaitMs) {
+      const { status, data: commissions } = await http.get<
+        CommissionResponse[]
+      >({
+        path: "/commissions",
+        query: { customerId },
+      });
+
+      if (status === 200 && commissions.length > 0) {
+        return commissions;
+      }
+
+      await sleep(VITEST_POLL_INTERVAL_MS);
+    }
+
+    return [];
+  }
+
+  test(
+    "Fast path reattributes a manual customer in place",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const partner = await createEnrolledPartner("fast-path");
+      const targetLink = partner.links![0];
+      const customer = await createManualCustomer();
+      cleanupCustomers(customer.id);
+
+      const { status, data: reattributed } = await http.post<CustomerEnriched>({
+        path: `/customers/${customer.id}/reattribute`,
+        body: {
+          partnerId: partner.id,
+          linkId: targetLink.id,
+        },
+      });
+
+      expect(status).toEqual(200);
+      expect(reattributed.id).toEqual(customer.id);
+      expect(reattributed.partner?.id).toEqual(partner.id);
+      expect(reattributed.link?.id).toEqual(targetLink.id);
+
+      const { status: getStatus, data: fetched } =
+        await http.get<CustomerEnriched>({
+          path: `/customers/${customer.id}`,
+          query: { includeExpandedFields: "true" },
+        });
+
+      expect(getStatus).toEqual(200);
+      expect(fetched.id).toEqual(customer.id);
+      expect(fetched.partner?.id).toEqual(partner.id);
+      expect(fetched.link?.id).toEqual(targetLink.id);
+    },
+  );
+
+  test(
+    "Lead reattribute creates a new customer and moves attribution",
+    { timeout: VITEST_TEST_TIMEOUT_MS * 2 },
+    async () => {
+      const sourcePartner = await createEnrolledPartner("lead-source");
+      const targetPartner = await createEnrolledPartner("lead-target");
+      const sourceLink = sourcePartner.links![0];
+      const targetLink = targetPartner.links![0];
+
+      const { customerExternalId } = await trackE2ELead(http, sourceLink);
+      const sourceCustomer =
+        await waitForCustomerByExternalId(customerExternalId);
+      cleanupCustomers(sourceCustomer.id);
+
+      expect(sourceCustomer.partner?.id).toEqual(sourcePartner.id);
+      expect(sourceCustomer.link?.id).toEqual(sourceLink.id);
+
+      const existingCommissions = await tryFindCommissions(sourceCustomer.id);
+
+      const { status, data: reattributed } = await http.post<CustomerEnriched>({
+        path: `/customers/${sourceCustomer.id}/reattribute`,
+        body: {
+          partnerId: targetPartner.id,
+          linkId: targetLink.id,
+        },
+      });
+
+      expect(status).toEqual(200);
+      expect(reattributed.id).not.toEqual(sourceCustomer.id);
+      cleanupCustomers(reattributed.id);
+
+      await verifyReattributeCompleted({
+        http,
+        oldCustomerId: sourceCustomer.id,
+        newCustomerId: reattributed.id,
+        targetPartnerId: targetPartner.id,
+        targetLinkId: targetLink.id,
+        expectTransferredCommission: existingCommissions.length > 0,
+      });
+    },
+  );
+
+  test(
+    "Reattributing to the same partner is rejected",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const partner = await createEnrolledPartner("noop");
+      const targetLink = partner.links![0];
+      const customer = await createManualCustomer();
+      cleanupCustomers(customer.id);
+
+      const { status: firstStatus } = await http.post<CustomerEnriched>({
+        path: `/customers/${customer.id}/reattribute`,
+        body: {
+          partnerId: partner.id,
+          linkId: targetLink.id,
+        },
+      });
+      expect(firstStatus).toEqual(200);
+
+      const { status, data } = await http.post({
+        path: `/customers/${customer.id}/reattribute`,
+        body: {
+          partnerId: partner.id,
+          linkId: targetLink.id,
+        },
+      });
+
+      expect(status).toEqual(400);
+      expect(data).toMatchObject({
+        error: {
+          code: "bad_request",
+          message: `Customer "${customer.id}" is already attributed to the partner "${partner.id}".`,
+        },
+      });
+    },
+  );
+
+  test(
+    "Reattributing with a link that does not belong to the partner is rejected",
+    { timeout: VITEST_TEST_TIMEOUT_MS },
+    async () => {
+      const partner = await createEnrolledPartner("bad-link-partner");
+      const otherPartner = await createEnrolledPartner("bad-link-other");
+      const customer = await createManualCustomer();
+      cleanupCustomers(customer.id);
+
+      const { status, data } = await http.post({
+        path: `/customers/${customer.id}/reattribute`,
+        body: {
+          partnerId: partner.id,
+          linkId: otherPartner.links![0].id,
+        },
+      });
+
+      expect(status).toEqual(422);
+      expect(data).toMatchObject({
+        error: {
+          code: "unprocessable_entity",
+          message:
+            "The selected referral link does not belong to this partner in the program.",
+        },
+      });
+    },
+  );
+});
diff --git a/apps/web/tests/workflows/send-campaign-workflow.test.ts b/apps/web/tests/workflows/send-campaign-workflow.test.ts
deleted file mode 100644
index e8dcd031321..00000000000
--- a/apps/web/tests/workflows/send-campaign-workflow.test.ts
+++ /dev/null
@@ -1,876 +0,0 @@
-import { EnrolledPartnerProps } from "@/lib/types";
-import { Campaign } from "@prisma/client";
-import { subHours } from "date-fns";
-import { describe, expect, onTestFinished, test } from "vitest";
-import { randomPartnerEmail } from "../utils/helpers";
-import { IntegrationHarness } from "../utils/integration";
-import { E2E_USER_ID } from "../utils/resource";
-import { verifyCampaignSent } from "./utils/verify-campaign-sent";
-
-describe.sequential("Workflow - SendCampaign", async () => {
-  const h = new IntegrationHarness();
-  const { http } = await h.init();
-
-  test("Workflow is created when transactional campaign is published", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-    expect(campaign.id).toBeDefined();
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    const { status: updateStatus } = await http.patch<Campaign>({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E Test Campaign",
-        subject: "Welcome to our program!",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [
-                {
-                  type: "text",
-                  text: "Thank you for joining!",
-                },
-              ],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-      },
-    });
-
-    expect(updateStatus).toEqual(200);
-
-    const { status: publishStatus, data: publishedCampaign } =
-      await http.patch<Campaign>({
-        path: `/campaigns/${campaignId}`,
-        body: {
-          status: "active",
-        },
-      });
-
-    expect(publishStatus).toEqual(200);
-    expect(publishedCampaign.status).toBe("active");
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-    expect(workflow.disabledAt).toBeNull();
-
-    const workflowActions = workflow.actions as any[];
-    expect(workflowActions[0].type).toBe("sendCampaign");
-    expect(workflowActions[0].data.campaignId).toBe(campaignId);
-  });
-
-  test("Workflow doesn't execute when campaign is in draft", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    const { status: updateStatus, data: updatedCampaign } =
-      await http.patch<Campaign>({
-        path: `/campaigns/${campaignId}`,
-        body: {
-          name: "E2E Draft Campaign",
-          subject: "This should not be sent",
-          bodyJson: {
-            type: "doc",
-            content: [
-              {
-                type: "paragraph",
-                content: [
-                  {
-                    type: "text",
-                    text: "Draft content",
-                  },
-                ],
-              },
-            ],
-          },
-          triggerConditions: [
-            {
-              attribute: "partnerEnrolledDays",
-              operator: "gte",
-              value: 1,
-            },
-          ],
-        },
-      });
-
-    expect(updateStatus).toEqual(200);
-    expect(updatedCampaign.status).toBe("draft");
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-    expect(workflow.disabledAt).not.toBeNull();
-  });
-
-  test("Cron executes send campaign workflow", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E Cron Campaign",
-        subject: "Welcome!",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Test content" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const { status, data } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(data.message).toContain("Finished executing workflow");
-  });
-
-  test("Cron skips disabled send campaign workflow", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E Disabled Cron Campaign",
-        subject: "Should not be sent",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Test" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    // Disable workflow via E2E endpoint
-    await http.patch({
-      path: `/e2e/workflows/${workflow.id}`,
-      body: { disabledAt: new Date().toISOString() },
-    });
-
-    const { status, data } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(data.message).toContain("disabled");
-
-    const { data: emailsSent } = await http.get<any[]>({
-      path: "/e2e/notification-emails",
-      query: { campaignId },
-    });
-
-    expect(emailsSent).toHaveLength(0);
-  });
-
-  test("Cron processes eligible partner enrollment", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E Send Campaign",
-        subject: "Welcome partner!",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Hello!" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - Campaign Send",
-          email: randomPartnerEmail(),
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-
-    // Backdate the enrollment to 18h ago so it falls in the cron window
-    await http.patch({
-      path: "/e2e/enrollments",
-      body: {
-        partnerId: partner.id,
-        createdAt: subHours(new Date(), 18).toISOString(),
-      },
-    });
-
-    const { status, data } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(data.message).toContain("Finished executing workflow");
-  });
-
-  test("Cron doesn't send campaign when partner doesn't meet conditions", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E No Match Campaign",
-        subject: "Should not be sent",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Test" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    // Create a partner enrolled just now — doesn't match the 12-24h window
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - No Match",
-          email: randomPartnerEmail(),
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-
-    const { status, data: triggerData } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(triggerData.message).toContain("Finished executing workflow");
-
-    const { data: emailsSent } = await http.get<any[]>({
-      path: "/e2e/notification-emails",
-      query: { campaignId, partnerId: partner.id },
-    });
-
-    expect(emailsSent).toHaveLength(0);
-  });
-
-  test("No duplicate campaign sends on multiple cron executions", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await http.delete({
-        path: "/e2e/notification-emails",
-        query: { campaignId },
-      });
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E No Dup Campaign",
-        subject: "No duplicates!",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Hello!" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - No Dup Campaign",
-          email: randomPartnerEmail(),
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-
-    // Backdate enrollment to match the cron window
-    await http.patch({
-      path: "/e2e/enrollments",
-      body: {
-        partnerId: partner.id,
-        createdAt: subHours(new Date(), 18).toISOString(),
-      },
-    });
-
-    // Pre-insert a notification email to simulate a previous send
-    const { data: existingEmail } = await http.post<any>({
-      path: "/e2e/notification-emails",
-      body: {
-        campaignId,
-        partnerId: partner.id,
-        recipientUserId: E2E_USER_ID,
-      },
-    });
-
-    expect(existingEmail).not.toBeNull();
-
-    // Trigger the workflow — should skip this partner (already sent)
-    const { status, data: triggerData } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(triggerData.message).toContain("Finished executing workflow");
-
-    // Verify still only 1 notification email (no duplicate)
-    const { data: emails } = await http.get<any[]>({
-      path: "/e2e/notification-emails",
-      query: { campaignId, partnerId: partner.id },
-    });
-
-    expect(emails).toHaveLength(1);
-    expect(emails[0].id).toBe(existingEmail.id);
-  });
-
-  test("Campaign workflow configuration can be updated", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E Campaign Config Test",
-        subject: "Test",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Test" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-    const conditions1 = workflow.triggerConditions as any[];
-    expect(conditions1[0].value).toBe(1);
-
-    const { status: pauseStatus, data: pausedCampaign } =
-      await http.patch<Campaign>({
-        path: `/campaigns/${campaignId}`,
-        body: {
-          status: "paused",
-        },
-      });
-
-    expect(pauseStatus).toEqual(200);
-    expect(pausedCampaign.status).toBe("paused");
-
-    const { data: pausedWorkflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(pausedWorkflow.disabledAt).not.toBeNull();
-  });
-
-  test("Campaign supports mixed enrollment and metric conditions", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    const { status: updateStatus, data: updatedCampaign } =
-      await http.patch<Campaign>({
-        path: `/campaigns/${campaignId}`,
-        body: {
-          name: "E2E Mixed Conditions Campaign",
-          subject: "Still no leads after 30 days",
-          bodyJson: {
-            type: "doc",
-            content: [
-              {
-                type: "paragraph",
-                content: [{ type: "text", text: "Let's get those leads!" }],
-              },
-            ],
-          },
-          triggerConditions: [
-            {
-              attribute: "partnerEnrolledDays",
-              operator: "gte",
-              value: 30,
-            },
-            {
-              attribute: "totalLeads",
-              operator: "lte",
-              value: 0,
-            },
-          ],
-          status: "active",
-        },
-      });
-
-    expect(updateStatus).toEqual(200);
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-    expect(workflow.disabledAt).toBeNull();
-
-    const conditions = workflow.triggerConditions as any[];
-    expect(conditions).toHaveLength(2);
-    expect(conditions[0]).toMatchObject({
-      attribute: "partnerEnrolledDays",
-      operator: "gte",
-      value: 30,
-    });
-    expect(conditions[1]).toMatchObject({
-      attribute: "totalLeads",
-      operator: "lte",
-      value: 0,
-    });
-
-    // Response shape exposes the full conditions array
-    expect((updatedCampaign as any).triggerConditions).toEqual(conditions);
-  });
-
-  test(
-    "Cron sends campaign when all conditions are met (AND)",
-    { timeout: 90000 },
-    async () => {
-      const { status: createStatus, data: campaign } = await http.post<{
-        id: string;
-      }>({
-        path: "/campaigns",
-        body: {
-          type: "transactional",
-        },
-      });
-
-      expect(createStatus).toEqual(201);
-
-      const campaignId = campaign.id;
-
-      onTestFinished(async () => {
-        await http.delete({
-          path: "/e2e/notification-emails",
-          query: { campaignId },
-        });
-        await h.deleteCampaign(campaignId);
-      });
-
-      await http.patch({
-        path: `/campaigns/${campaignId}`,
-        body: {
-          name: "E2E AND Match Campaign",
-          subject: "You got a lead!",
-          bodyJson: {
-            type: "doc",
-            content: [
-              {
-                type: "paragraph",
-                content: [{ type: "text", text: "Congrats on your first lead!" }],
-              },
-            ],
-          },
-          triggerConditions: [
-            {
-              attribute: "partnerEnrolledDays",
-              operator: "gte",
-              value: 1,
-            },
-            {
-              attribute: "totalLeads",
-              operator: "gte",
-              value: 1,
-            },
-          ],
-          status: "active",
-        },
-      });
-
-      const { data: workflow } = await http.get<any>({
-        path: "/e2e/workflows",
-        query: { campaignId },
-      });
-
-      expect(workflow).not.toBeNull();
-
-      const { status: partnerStatus, data: partner } =
-        await http.post<EnrolledPartnerProps>({
-          path: "/partners",
-          body: {
-            name: "E2E Test Partner - AND Match",
-            email: randomPartnerEmail(),
-          },
-        });
-
-      expect(partnerStatus).toEqual(201);
-      expect(partner.links).not.toBeNull();
-
-      // API-created partners have no PartnerUser, and campaign emails only
-      // go to users with an email. Create one and set link.leads directly so
-      // the cron AND conditions are met without racing Tinybird waitUntil.
-      const { status: enrollmentStatus } = await http.patch({
-        path: "/e2e/enrollments",
-        body: {
-          partnerId: partner.id,
-          createdAt: subHours(new Date(), 18).toISOString(),
-          leads: 1,
-          createUser: true,
-        },
-      });
-
-      expect(enrollmentStatus).toEqual(200);
-
-      const { status, data } = await http.post<{ message: string }>({
-        path: `/e2e/trigger-workflow/${workflow.id}`,
-      });
-
-      expect(status).toEqual(200);
-      expect(data.message).toContain("Finished executing workflow");
-
-      await verifyCampaignSent({
-        http,
-        campaignId,
-        partnerId: partner.id,
-      });
-    },
-  );
-
-  test("Cron doesn't send when metric condition fails (AND)", async () => {
-    const { status: createStatus, data: campaign } = await http.post<{
-      id: string;
-    }>({
-      path: "/campaigns",
-      body: {
-        type: "transactional",
-      },
-    });
-
-    expect(createStatus).toEqual(201);
-
-    const campaignId = campaign.id;
-
-    onTestFinished(async () => {
-      await h.deleteCampaign(campaignId);
-    });
-
-    await http.patch({
-      path: `/campaigns/${campaignId}`,
-      body: {
-        name: "E2E AND Partial Match Campaign",
-        subject: "Should not be sent",
-        bodyJson: {
-          type: "doc",
-          content: [
-            {
-              type: "paragraph",
-              content: [{ type: "text", text: "Test" }],
-            },
-          ],
-        },
-        triggerConditions: [
-          {
-            attribute: "partnerEnrolledDays",
-            operator: "gte",
-            value: 1,
-          },
-          {
-            attribute: "totalLeads",
-            operator: "gte",
-            value: 1,
-          },
-        ],
-        status: "active",
-      },
-    });
-
-    const { data: workflow } = await http.get<any>({
-      path: "/e2e/workflows",
-      query: { campaignId },
-    });
-
-    expect(workflow).not.toBeNull();
-
-    const { status: partnerStatus, data: partner } =
-      await http.post<EnrolledPartnerProps>({
-        path: "/partners",
-        body: {
-          name: "E2E Test Partner - AND Partial",
-          email: randomPartnerEmail(),
-        },
-      });
-
-    expect(partnerStatus).toEqual(201);
-
-    // Enrollment window matches, but totalLeads is 0 — AND fails
-    await http.patch({
-      path: "/e2e/enrollments",
-      body: {
-        partnerId: partner.id,
-        createdAt: subHours(new Date(), 18).toISOString(),
-      },
-    });
-
-    const { status, data: triggerData } = await http.post<{ message: string }>({
-      path: `/e2e/trigger-workflow/${workflow.id}`,
-    });
-
-    expect(status).toEqual(200);
-    expect(triggerData.message).toContain("Finished executing workflow");
-
-    const { data: emailsSent } = await http.get<any[]>({
-      path: "/e2e/notification-emails",
-      query: { campaignId, partnerId: partner.id },
-    });
-
-    expect(emailsSent).toHaveLength(0);
-  });
-});
diff --git a/apps/web/tests/workflows/utils/track-e2e-lead.ts b/apps/web/tests/workflows/utils/track-e2e-lead.ts
index 1452fb5ece9..88c02555dc6 100644
--- a/apps/web/tests/workflows/utils/track-e2e-lead.ts
+++ b/apps/web/tests/workflows/utils/track-e2e-lead.ts
@@ -4,7 +4,16 @@ import { E2E_TRACK_CLICK_HEADERS } from "../../utils/resource";
 export async function trackE2ELead(
   http: any,
   partnerLink: { domain: string; key: string },
+  overrides?: {
+    customerExternalId?: string;
+    customerEmail?: string;
+  },
 ) {
+  const customerExternalId =
+    overrides?.customerExternalId ?? `e2e-customer-${Date.now()}`;
+  const customerEmail =
+    overrides?.customerEmail ?? `${customerExternalId}@example.com`;
+
   const { status: clickStatus, data: clickData } = await http.post({
     path: "/track/click",
     headers: E2E_TRACK_CLICK_HEADERS,
@@ -22,10 +31,16 @@ export async function trackE2ELead(
     body: {
       clickId: clickData.clickId,
       eventName: `Signup-${Date.now()}`,
-      customerExternalId: `e2e-customer-${Date.now()}`,
-      customerEmail: `customer@example.com`,
+      customerExternalId,
+      customerEmail,
     },
   });
 
   expect(leadStatus).toEqual(200);
+
+  return {
+    customerExternalId,
+    customerEmail,
+    clickId: clickData.clickId as string,
+  };
 }
diff --git a/apps/web/tests/workflows/utils/verify-bounty-submission.ts b/apps/web/tests/workflows/utils/verify-bounty-submission.ts
index 674de440120..796cebbb02b 100644
--- a/apps/web/tests/workflows/utils/verify-bounty-submission.ts
+++ b/apps/web/tests/workflows/utils/verify-bounty-submission.ts
@@ -2,7 +2,9 @@ import {
   VITEST_POLL_INTERVAL_MS,
   VITEST_TEST_TIMEOUT_MS,
 } from "@/lib/constants/misc";
+import { sleep } from "@dub/utils";
 import { expect } from "vitest";
+
 import { HttpClient } from "../../utils/http";
 
 interface VerifyBountySubmissionProps {
@@ -56,9 +58,7 @@ export const verifyBountySubmission = async ({
       return submission;
     }
 
-    await new Promise((resolve) =>
-      setTimeout(resolve, VITEST_POLL_INTERVAL_MS),
-    );
+    await sleep(VITEST_POLL_INTERVAL_MS);
   }
 
   const lastState = lastSubmission
diff --git a/apps/web/tests/workflows/utils/verify-campaign-sent.ts b/apps/web/tests/workflows/utils/verify-campaign-sent.ts
deleted file mode 100644
index aa8a433748e..00000000000
--- a/apps/web/tests/workflows/utils/verify-campaign-sent.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
-  VITEST_POLL_INTERVAL_MS,
-  VITEST_TEST_TIMEOUT_MS,
-} from "@/lib/constants/misc";
-import { expect } from "vitest";
-import { HttpClient } from "../../utils/http";
-
-interface VerifyCampaignSentProps {
-  http: HttpClient;
-  campaignId: string;
-  partnerId: string;
-}
-
-export const verifyCampaignSent = async ({
-  http,
-  campaignId,
-  partnerId,
-}: VerifyCampaignSentProps) => {
-  const startTime = Date.now();
-
-  while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
-    const { data: emails } = await http.get<any[]>({
-      path: "/e2e/notification-emails",
-      query: { campaignId, partnerId },
-    });
-
-    const emailSent = emails?.[0];
-
-    if (emailSent) {
-      expect(emailSent.type).toBe("Campaign");
-      expect(emailSent.campaignId).toBe(campaignId);
-      expect(emailSent.partnerId).toBe(partnerId);
-      return emailSent;
-    }
-
-    await new Promise((resolve) =>
-      setTimeout(resolve, VITEST_POLL_INTERVAL_MS),
-    );
-  }
-
-  throw new Error(
-    `Campaign email not found within ${VITEST_TEST_TIMEOUT_MS / 1000} seconds. ` +
-      `campaignId: ${campaignId}, partnerId: ${partnerId}`,
-  );
-};
diff --git a/apps/web/tests/workflows/utils/verify-merge-completed.ts b/apps/web/tests/workflows/utils/verify-merge-completed.ts
new file mode 100644
index 00000000000..aae5c062ed6
--- /dev/null
+++ b/apps/web/tests/workflows/utils/verify-merge-completed.ts
@@ -0,0 +1,64 @@
+import {
+  VITEST_POLL_INTERVAL_MS,
+  VITEST_TEST_TIMEOUT_MS,
+} from "@/lib/constants/misc";
+import { EnrolledPartnerProps } from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { expect } from "vitest";
+
+import { HttpClient } from "../../utils/http";
+
+interface VerifyMergeCompletedProps {
+  http: HttpClient;
+  sourcePartnerId: string;
+  targetPartnerId: string;
+  // A link id that belonged to the source partner and should end up on the target
+  expectedLinkId: string;
+}
+
+/**
+ * Polls until the merge-partner-accounts workflow has finished:
+ * - the source partner is deleted (GET /partners/:id returns 404), and
+ * - the target partner now owns the source's moved link.
+ */
+export const verifyMergeCompleted = async ({
+  http,
+  sourcePartnerId,
+  targetPartnerId,
+  expectedLinkId,
+}: VerifyMergeCompletedProps) => {
+  const startTime = Date.now();
+
+  let lastSourceStatus: number | null = null;
+  let lastTargetLinkIds: string[] = [];
+
+  while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
+    const [sourceRes, targetRes] = await Promise.all([
+      http.get<{ error?: unknown }>({ path: `/partners/${sourcePartnerId}` }),
+      http.get<EnrolledPartnerProps>({ path: `/partners/${targetPartnerId}` }),
+    ]);
+
+    lastSourceStatus = sourceRes.status;
+
+    const sourceDeleted = sourceRes.status === 404;
+    const targetLinks =
+      targetRes.status === 200 ? targetRes.data.links ?? [] : [];
+    lastTargetLinkIds = targetLinks.map((link) => link.id);
+    const targetOwnsLink = lastTargetLinkIds.includes(expectedLinkId);
+
+    if (sourceDeleted && targetOwnsLink) {
+      expect(sourceRes.status).toBe(404);
+      expect(lastTargetLinkIds).toContain(expectedLinkId);
+      return targetRes.data;
+    }
+
+    await sleep(VITEST_POLL_INTERVAL_MS);
+  }
+
+  throw new Error(
+    `Merge did not complete within ${VITEST_TEST_TIMEOUT_MS / 1000} seconds. ` +
+      `sourcePartnerId: ${sourcePartnerId} (last status: ${lastSourceStatus}), ` +
+      `targetPartnerId: ${targetPartnerId}, expectedLinkId: ${expectedLinkId}. ` +
+      `Last seen target link ids: [${lastTargetLinkIds.join(", ")}]`,
+  );
+};
diff --git a/apps/web/tests/workflows/utils/verify-partner-group-move.ts b/apps/web/tests/workflows/utils/verify-partner-group-move.ts
deleted file mode 100644
index 2a9bd2a6aa2..00000000000
--- a/apps/web/tests/workflows/utils/verify-partner-group-move.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-  VITEST_POLL_INTERVAL_MS,
-  VITEST_TEST_TIMEOUT_MS,
-} from "@/lib/constants/misc";
-import { EnrolledPartnerProps } from "@/lib/types";
-import { expect } from "vitest";
-import { HttpClient } from "../../utils/http";
-
-interface VerifyPartnerGroupMoveProps {
-  http: HttpClient;
-  partnerId: string;
-  expectedGroupId: string;
-  query?: Record<string, string>;
-}
-
-export const verifyPartnerGroupMove = async ({
-  http,
-  partnerId,
-  expectedGroupId,
-  query = {},
-}: VerifyPartnerGroupMoveProps) => {
-  const startTime = Date.now();
-  let lastGroupId: string | null = null;
-
-  while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
-    const { data: partner } = await http.get<EnrolledPartnerProps>({
-      path: `/partners/${partnerId}`,
-      query,
-    });
-
-    lastGroupId = partner?.groupId ?? null;
-
-    if (partner?.groupId === expectedGroupId) {
-      expect(partner.groupId).toBe(expectedGroupId);
-      return partner;
-    }
-
-    await new Promise((resolve) =>
-      setTimeout(resolve, VITEST_POLL_INTERVAL_MS),
-    );
-  }
-
-  throw new Error(
-    `Partner group move not found within ${VITEST_TEST_TIMEOUT_MS / 1000} seconds. ` +
-      `partnerId: ${partnerId}, expectedGroupId: ${expectedGroupId}. ` +
-      `Last seen groupId: ${lastGroupId}`,
-  );
-};
diff --git a/apps/web/tests/workflows/utils/verify-reattribute-completed.ts b/apps/web/tests/workflows/utils/verify-reattribute-completed.ts
new file mode 100644
index 00000000000..98ba787a518
--- /dev/null
+++ b/apps/web/tests/workflows/utils/verify-reattribute-completed.ts
@@ -0,0 +1,102 @@
+import {
+  VITEST_POLL_INTERVAL_MS,
+  VITEST_TEST_TIMEOUT_MS,
+} from "@/lib/constants/misc";
+import { CommissionResponse, CustomerEnriched } from "@/lib/types";
+import { sleep } from "@dub/utils";
+import { expect } from "vitest";
+
+import { HttpClient } from "../../utils/http";
+
+interface VerifyReattributeCompletedProps {
+  http: HttpClient;
+  oldCustomerId: string;
+  newCustomerId: string;
+  targetPartnerId: string;
+  targetLinkId: string;
+  expectTransferredCommission?: boolean;
+}
+
+/**
+ * Polls until the reattribute-customer workflow has finished:
+ * - the new customer is attributed to the target partner/link
+ * - the old customer remains as a retired stub
+ * - optional: an unpaid commission moved to the new customer
+ */
+export const verifyReattributeCompleted = async ({
+  http,
+  oldCustomerId,
+  newCustomerId,
+  targetPartnerId,
+  targetLinkId,
+  expectTransferredCommission = false,
+}: VerifyReattributeCompletedProps) => {
+  const startTime = Date.now();
+
+  let lastNewPartnerId: string | undefined;
+  let lastNewLinkId: string | undefined;
+  let lastOldName: string | undefined;
+
+  while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {
+    const [newRes, oldRes, commissionsRes] = await Promise.all([
+      http.get<CustomerEnriched>({
+        path: `/customers/${newCustomerId}`,
+        query: { includeExpandedFields: "true" },
+      }),
+      http.get<CustomerEnriched>({
+        path: `/customers/${oldCustomerId}`,
+        query: { includeExpandedFields: "true" },
+      }),
+      expectTransferredCommission
+        ? http.get<CommissionResponse[]>({
+            path: "/commissions",
+            query: { customerId: newCustomerId },
+          })
+        : Promise.resolve({ status: 200, data: [] as CommissionResponse[] }),
+    ]);
+
+    lastNewPartnerId =
+      newRes.status === 200 ? newRes.data.partner?.id : undefined;
+    lastNewLinkId = newRes.status === 200 ? newRes.data.link?.id : undefined;
+    lastOldName =
+      oldRes.status === 200 ? oldRes.data.name ?? undefined : undefined;
+
+    const newAttributed =
+      newRes.status === 200 &&
+      lastNewPartnerId === targetPartnerId &&
+      lastNewLinkId === targetLinkId;
+
+    const oldStubbed =
+      oldRes.status === 200 &&
+      Boolean(oldRes.data.name?.endsWith(" (old)")) &&
+      !oldRes.data.partner &&
+      oldRes.data.stripeCustomerId == null;
+
+    const commissionMoved =
+      !expectTransferredCommission ||
+      (commissionsRes.status === 200 &&
+        commissionsRes.data.some(
+          (commission) =>
+            commission.customer?.id === newCustomerId &&
+            commission.partner?.id === targetPartnerId,
+        ));
+
+    if (newAttributed && oldStubbed && commissionMoved) {
+      expect(lastNewPartnerId).toBe(targetPartnerId);
+      expect(lastNewLinkId).toBe(targetLinkId);
+      expect(oldRes.data.name).toMatch(/ \(old\)$/);
+      return {
+        newCustomer: newRes.data,
+        oldCustomer: oldRes.data,
+      };
+    }
+
+    await sleep(VITEST_POLL_INTERVAL_MS);
+  }
+
+  throw new Error(
+    `Reattribution did not complete within ${VITEST_TEST_TIMEOUT_MS / 1000}s. ` +
+      `newCustomerId: ${newCustomerId} (partner: ${lastNewPartnerId}, link: ${lastNewLinkId}), ` +
+      `oldCustomerId: ${oldCustomerId} (name: ${lastOldName}).`,
+  );
+};
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 8d9d479a08f..85734462009 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -8,6 +8,7 @@
     "baseUrl": ".",
     "paths": {
       "@/pages/*": ["pages/*"],
+      "@/scripts/*": ["scripts/*"],
       "@/styles/*": ["styles/*"],
       "@/ui/*": ["ui/*"],
       "@/lib/*": ["lib/*"]
diff --git a/apps/web/ui/account/upload-avatar.tsx b/apps/web/ui/account/upload-avatar.tsx
index 81e79f03fff..8537a0d5fd3 100644
--- a/apps/web/ui/account/upload-avatar.tsx
+++ b/apps/web/ui/account/upload-avatar.tsx
@@ -87,8 +87,8 @@ export default function UploadAvatar({
 
       <div className="flex flex-col items-start justify-start gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-6 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 sm:py-3">
         <p className="text-sm text-neutral-500">
-          Square image recommended. Accepted file types: .png, .jpg. Max file
-          size: 2MB.
+          Square image recommended. Accepted file types: .png, .jpg, .webp,
+          .avif. Max file size: 2MB.
         </p>
         <div className="shrink-0">
           <Button
diff --git a/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx
new file mode 100644
index 00000000000..40c3f13d7f3
--- /dev/null
+++ b/apps/web/ui/activity-logs/action-renderers/partner-reward-changed-renderer.tsx
@@ -0,0 +1,227 @@
+import {
+  ActivityLog,
+  DiscountProps,
+  LinkProps,
+  RewardProps,
+} from "@/lib/types";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import { linkConstructor } from "@dub/utils";
+import { Fragment, ReactNode } from "react";
+import { ActivityValueChip, UserChip } from "../activity-entry-chips";
+
+type RewardSnapshot = Pick<
+  RewardProps,
+  | "id"
+  | "event"
+  | "type"
+  | "amountInCents"
+  | "amountInPercentage"
+  | "maxDuration"
+  | "description"
+  | "tooltipDescription"
+  | "modifiers"
+  | "config"
+  | "spendLimitAmount"
+  | "spendLimitInterval"
+>;
+
+type DiscountSnapshot = Pick<
+  DiscountProps,
+  "id" | "amount" | "type" | "maxDuration" | "description"
+>;
+
+type FieldDiff<T> = {
+  old: T | { id: string } | null;
+  new: T | { id: string } | null;
+};
+
+const REWARD_FIELDS = [
+  { key: "clickReward", label: "Click reward" },
+  { key: "leadReward", label: "Lead reward" },
+  { key: "saleReward", label: "Sale reward" },
+] as const;
+
+function Label({ children }: { children: ReactNode }) {
+  return (
+    <span className="text-sm font-medium text-neutral-800">{children}</span>
+  );
+}
+
+function getChangeVerb(oldValue: unknown, newValue: unknown) {
+  if (!newValue) {
+    return "removed";
+  }
+
+  if (!oldValue) {
+    return "set to";
+  }
+
+  return "updated to";
+}
+
+function isRewardSnapshot(value: unknown): value is RewardSnapshot {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "event" in value &&
+    typeof value.event === "string"
+  );
+}
+
+function isDiscountSnapshot(value: unknown): value is DiscountSnapshot {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "amount" in value &&
+    "type" in value
+  );
+}
+
+function isLinkSnapshot(
+  value: unknown,
+): value is Pick<LinkProps, "id" | "domain" | "key"> {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "domain" in value &&
+    "key" in value &&
+    typeof (value as Pick<LinkProps, "domain">).domain === "string" &&
+    typeof (value as Pick<LinkProps, "key">).key === "string"
+  );
+}
+
+function OnLink({ log }: { log: ActivityLog }) {
+  const diff = log.changeSet?.link as
+    | FieldDiff<Pick<LinkProps, "id" | "domain" | "key">>
+    | undefined;
+  const link = diff?.new ?? diff?.old;
+
+  if (!isLinkSnapshot(link)) {
+    return null;
+  }
+
+  return (
+    <>
+      <Label>on</Label>
+      <ActivityValueChip>
+        {linkConstructor({
+          domain: link.domain,
+          key: link.key,
+          pretty: true,
+        })}
+      </ActivityValueChip>
+    </>
+  );
+}
+
+function RewardValueChip({ value }: { value: unknown }) {
+  return (
+    <ActivityValueChip>
+      {isRewardSnapshot(value) ? (
+        <ProgramRewardDescription reward={value} showModifiersTooltip={false} />
+      ) : (
+        "Deleted reward"
+      )}
+    </ActivityValueChip>
+  );
+}
+
+function DiscountValueChip({ value }: { value: unknown }) {
+  return (
+    <ActivityValueChip>
+      {isDiscountSnapshot(value)
+        ? formatDiscountDescription(value)
+        : "Deleted discount"}
+    </ActivityValueChip>
+  );
+}
+
+function ByUser({ user }: { user: ActivityLog["user"] }) {
+  if (!user) {
+    return null;
+  }
+
+  return (
+    <>
+      <Label>by</Label>
+      <UserChip user={user} />
+    </>
+  );
+}
+
+export function PartnerRewardChangedRenderer({ log }: { log: ActivityLog }) {
+  const changes = REWARD_FIELDS.flatMap(({ key, label }) => {
+    const diff = log.changeSet?.[key] as FieldDiff<RewardSnapshot> | undefined;
+
+    if (!diff) {
+      return [];
+    }
+
+    const verb = getChangeVerb(diff.old, diff.new);
+
+    return [
+      {
+        key,
+        label,
+        verb,
+        value: verb === "removed" ? null : diff.new,
+      },
+    ];
+  });
+
+  if (changes.length === 0) {
+    return (
+      <>
+        <span>Reward updated</span>
+        <OnLink log={log} />
+        <ByUser user={log.user} />
+      </>
+    );
+  }
+
+  return (
+    <>
+      {changes.map((change, index) => (
+        <Fragment key={change.key}>
+          {index > 0 ? <Label>and</Label> : null}
+          <Label>
+            {change.label} {change.verb}
+          </Label>
+          {change.value ? <RewardValueChip value={change.value} /> : null}
+        </Fragment>
+      ))}
+      <OnLink log={log} />
+      <ByUser user={log.user} />
+    </>
+  );
+}
+
+export function PartnerDiscountChangedRenderer({ log }: { log: ActivityLog }) {
+  const discountChange = log.changeSet?.discount as
+    | FieldDiff<DiscountSnapshot>
+    | undefined;
+
+  if (!discountChange) {
+    return (
+      <>
+        <span>Discount updated</span>
+        <OnLink log={log} />
+        <ByUser user={log.user} />
+      </>
+    );
+  }
+
+  const verb = getChangeVerb(discountChange.old, discountChange.new);
+
+  return (
+    <>
+      <Label>Discount {verb}</Label>
+      {verb !== "removed" ? (
+        <DiscountValueChip value={discountChange.new} />
+      ) : null}
+      <OnLink log={log} />
+      <ByUser user={log.user} />
+    </>
+  );
+}
diff --git a/apps/web/ui/activity-logs/activity-entry-chips.tsx b/apps/web/ui/activity-logs/activity-entry-chips.tsx
index 1b007ac91bb..454de90b1ca 100644
--- a/apps/web/ui/activity-logs/activity-entry-chips.tsx
+++ b/apps/web/ui/activity-logs/activity-entry-chips.tsx
@@ -47,6 +47,19 @@ function ActivityChip({ children, className }: ActivityChipProps) {
   );
 }
 
+export function ActivityValueChip({ children, className }: ActivityChipProps) {
+  return (
+    <ActivityChip
+      className={cn(
+        "max-w-full whitespace-normal text-left font-normal leading-5",
+        className,
+      )}
+    >
+      {children}
+    </ActivityChip>
+  );
+}
+
 export function GroupPill({ name, color }: GroupPillProps) {
   const colorClassName = color
     ? getResourceColorData(color)?.groupVariants
diff --git a/apps/web/ui/activity-logs/activity-feed.tsx b/apps/web/ui/activity-logs/activity-feed.tsx
index 4c59f099f64..5ad4b49dced 100644
--- a/apps/web/ui/activity-logs/activity-feed.tsx
+++ b/apps/web/ui/activity-logs/activity-feed.tsx
@@ -14,6 +14,7 @@ const ACTIVITY_ITEM_MAP: Record<
   leadReward: RewardActivityItem,
   saleReward: RewardActivityItem,
   referralReward: RewardActivityItem,
+  customReward: RewardActivityItem,
 };
 
 interface ActivityFeedProps {
diff --git a/apps/web/ui/activity-logs/activity-log-registry.tsx b/apps/web/ui/activity-logs/activity-log-registry.tsx
index 0c971ccd151..364c40bb17a 100644
--- a/apps/web/ui/activity-logs/activity-log-registry.tsx
+++ b/apps/web/ui/activity-logs/activity-log-registry.tsx
@@ -2,6 +2,7 @@ import { ActivityLog, ActivityLogAction } from "@/lib/types";
 import {
   CircleDotted,
   CircleInfo,
+  DiscountCode,
   FileSend,
   MoneyBill2,
   Pen2,
@@ -11,6 +12,10 @@ import {
 import { CircleMinus, CirclePlusIcon } from "lucide-react";
 import { ComponentType, ReactNode } from "react";
 import { PartnerGroupChangedRenderer } from "./action-renderers/partner-group-changed-renderer";
+import {
+  PartnerDiscountChangedRenderer,
+  PartnerRewardChangedRenderer,
+} from "./action-renderers/partner-reward-changed-renderer";
 import { PartnerStatusChangedRenderer } from "./action-renderers/partner-status-changed-renderer";
 import { RewardActivityRenderer } from "./action-renderers/reward-activity-renderer";
 import { SubmittedLeadCreatedRenderer } from "./action-renderers/submitted-lead-created-renderer";
@@ -39,6 +44,10 @@ const ACTIVITY_LOG_ICONS: Partial<
   Record<ActivityLogAction, ComponentType<{ className?: string }>>
 > = {
   "partner.groupChanged": UserArrowRight,
+  "partner.rewardChanged": MoneyBill2,
+  "partner.discountChanged": DiscountCode,
+  "link.rewardChanged": MoneyBill2,
+  "link.discountChanged": DiscountCode,
   ...Object.fromEntries(
     PARTNER_STATUS_ACTIONS.map((action) => [action, CircleDotted]),
   ),
@@ -67,6 +76,22 @@ const ACTIVITY_LOG_REGISTRY: Array<{
     action: "partner.groupChanged",
     renderer: PartnerGroupChangedRenderer,
   },
+  {
+    action: "partner.rewardChanged",
+    renderer: PartnerRewardChangedRenderer,
+  },
+  {
+    action: "partner.discountChanged",
+    renderer: PartnerDiscountChangedRenderer,
+  },
+  {
+    action: "link.rewardChanged",
+    renderer: PartnerRewardChangedRenderer,
+  },
+  {
+    action: "link.discountChanged",
+    renderer: PartnerDiscountChangedRenderer,
+  },
   ...PARTNER_STATUS_ACTIONS.map((action) => ({
     action,
     renderer: PartnerStatusChangedRenderer,
diff --git a/apps/web/ui/activity-logs/commission-activity.tsx b/apps/web/ui/activity-logs/commission-activity.tsx
index 12d2b8d88a0..4697034c795 100644
--- a/apps/web/ui/activity-logs/commission-activity.tsx
+++ b/apps/web/ui/activity-logs/commission-activity.tsx
@@ -61,6 +61,31 @@ function parseChangeSet(log: ActivityLog) {
   };
 }
 
+function getCommissionNote({
+  description,
+  reward,
+  createdAt,
+}: Pick<CommissionDetail, "description" | "reward" | "createdAt">) {
+  let text = description;
+
+  if (!text && reward) {
+    const amount =
+      reward.type === "percentage"
+        ? `${reward.amountInPercentage ?? 0}%`
+        : currencyFormatter(reward.amountInCents ?? 0, {
+            trailingZeroDisplay: "stripIfInteger",
+          });
+
+    text = `Earn ${amount} per ${reward.event}`;
+  }
+
+  if (!text) {
+    return undefined;
+  }
+
+  return <CommentCardDisplay timestamp={createdAt} text={text} />;
+}
+
 export function CommissionActivity({
   commission,
   slug,
@@ -103,6 +128,7 @@ export function CommissionActivity({
           key: "created",
           icon: CommissionStatusBadges[commission.status].icon,
           timestamp: commission.createdAt,
+          note: getCommissionNote(commission),
           children: (
             <>
               <span className="text-sm text-neutral-700">
@@ -121,32 +147,7 @@ export function CommissionActivity({
           key: "created",
           icon: CommissionStatusBadges["pending"].icon,
           timestamp: commission.createdAt,
-          note: (() => {
-            const text =
-              commission.description ||
-              (commission.reward
-                ? `Earn ${
-                    commission.reward.type === "percentage"
-                      ? `${commission.reward.amountInPercentage ?? 0}%`
-                      : currencyFormatter(
-                          commission.reward.amountInCents ?? 0,
-                          {
-                            trailingZeroDisplay: "stripIfInteger",
-                          },
-                        )
-                  } per ${commission.reward.event}`
-                : null);
-
-            if (!text) return undefined;
-
-            return (
-              <CommentCardDisplay
-                timestamp={commission.createdAt}
-                text={text}
-              />
-            );
-          })(),
-
+          note: getCommissionNote(commission),
           children: (
             <>
               <span className="text-sm text-neutral-700">Commission</span>
@@ -193,7 +194,9 @@ export function CommissionActivity({
         <span className="text-sm text-neutral-500">by</span>
         <div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">
           <UserAvatar user={log.user} className="size-4" />
-          <span className="text-[13px] text-neutral-700">{log.user.name}</span>
+          <span className="text-[13px] text-neutral-700">
+            {log.user.name || log.user.email || "Deleted user"}
+          </span>
         </div>
       </>
     ) : null;
diff --git a/apps/web/ui/analytics/device-icon.tsx b/apps/web/ui/analytics/device-icon.tsx
index 56cdbac8161..5e16221a741 100644
--- a/apps/web/ui/analytics/device-icon.tsx
+++ b/apps/web/ui/analytics/device-icon.tsx
@@ -12,6 +12,7 @@ import {
   Watch,
   Window,
 } from "@dub/ui/icons";
+import { cn } from "@dub/utils";
 import { TRIGGER_DISPLAY } from "./trigger-display";
 
 export function DeviceIcon({
@@ -56,7 +57,8 @@ export function DeviceIcon({
             alt={display}
             width={20}
             height={20}
-            className={className}
+            // Non-square sources (e.g. Facebook/Instagram at 3:2) squash without this
+            className={cn(className, "object-cover")}
           />
         );
     }
diff --git a/apps/web/ui/analytics/events/events-table.tsx b/apps/web/ui/analytics/events/events-table.tsx
index 32ffa96fb4a..2fbf5aab1ed 100644
--- a/apps/web/ui/analytics/events/events-table.tsx
+++ b/apps/web/ui/analytics/events/events-table.tsx
@@ -253,6 +253,11 @@ export default function EventsTable({
           id: "event",
           header: "Event",
           accessorKey: "eventName",
+          meta: {
+            filterParams: ({ getValue }) => ({
+              eventName: getValue(),
+            }),
+          },
           cell: ({ getValue }) =>
             getValue() ? (
               <span className="truncate" title={getValue()}>
diff --git a/apps/web/ui/analytics/use-analytics-filters.tsx b/apps/web/ui/analytics/use-analytics-filters.tsx
index e9041b57bec..5eb07f4ab03 100644
--- a/apps/web/ui/analytics/use-analytics-filters.tsx
+++ b/apps/web/ui/analytics/use-analytics-filters.tsx
@@ -17,6 +17,7 @@ import {
   UTM_PARAMETERS,
 } from "@dub/ui";
 import {
+  Bolt,
   Calendar6,
   Cube,
   CursorRays,
@@ -339,6 +340,11 @@ export function useAnalyticsFilters({
     omitGroupByFilterKey: true,
     context,
   });
+  const { data: eventNames } = useAnalyticsFilterOption("event_names", {
+    disabled: !isRequested("eventName") || selectedTab === "clicks",
+    omitGroupByFilterKey: true,
+    context,
+  });
   const { data: referers } = useAnalyticsFilterOption("referers", {
     disabled: !isRequested("referer"),
     omitGroupByFilterKey: true,
@@ -771,6 +777,18 @@ export function useAnalyticsFilters({
               separatorAfter: true,
             },
           ]),
+      {
+        key: "eventName",
+        icon: Bolt,
+        label: "Event name",
+        hideInFilterDropdown: selectedTab === "clicks",
+        options:
+          eventNames?.map(({ eventName, ...rest }) => ({
+            value: eventName,
+            label: eventName,
+            right: getFilterOptionTotal(rest),
+          })) ?? null,
+      },
       {
         key: "referer",
         icon: ReferredVia,
@@ -895,6 +913,8 @@ export function useAnalyticsFilters({
       devices,
       browsers,
       os,
+      eventNames,
+      selectedTab,
       referers,
       refererUrls,
       baseUrls,
diff --git a/apps/web/ui/auth/login/email-sign-in.tsx b/apps/web/ui/auth/login/email-sign-in.tsx
index 2a622ea4db1..59c5a1a9f02 100644
--- a/apps/web/ui/auth/login/email-sign-in.tsx
+++ b/apps/web/ui/auth/login/email-sign-in.tsx
@@ -1,4 +1,5 @@
 import { checkAccountExistsAction } from "@/lib/actions/check-account-exists";
+import { testIds } from "@/lib/e2e/test-ids";
 import { Button, Input, useCurrentSubdomain, useMediaQuery } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { signIn } from "next-auth/react";
@@ -66,7 +67,9 @@ export const EmailSignIn = ({ next }: { next?: string }) => {
 
             if (!accountExists) {
               setClickedMethod(undefined);
-              toast.error("No account found with that email address.");
+              toast.error("No account found with that email address.", {
+                testId: testIds.auth.loginNoAccount,
+              });
               return;
             }
           }
@@ -83,7 +86,9 @@ export const EmailSignIn = ({ next }: { next?: string }) => {
 
           if (!accountExists) {
             setClickedMethod(undefined);
-            toast.error("No account found with that email address.");
+            toast.error("No account found with that email address.", {
+              testId: testIds.auth.loginNoAccount,
+            });
             return;
           }
 
@@ -100,8 +105,12 @@ export const EmailSignIn = ({ next }: { next?: string }) => {
             return;
           }
 
-          if (!response.ok && response.error) {
-            if (errorCodes[response.error]) {
+          if (response.error) {
+            if (response.error === "invalid-credentials") {
+              toast.error(errorCodes[response.error], {
+                testId: testIds.auth.loginInvalidCredentials,
+              });
+            } else if (errorCodes[response.error]) {
               toast.error(errorCodes[response.error]);
             } else {
               toast.error(response.error);
@@ -176,6 +185,7 @@ export const EmailSignIn = ({ next }: { next?: string }) => {
         )}
 
         <Button
+          data-testid={testIds.auth.loginSubmit}
           text={`Log in with ${password ? "password" : "email"}`}
           {...(authMethod !== "email" && {
             type: "button",
diff --git a/apps/web/ui/auth/register/signup-email.tsx b/apps/web/ui/auth/register/signup-email.tsx
index 3c42385017f..ea5a61a9aca 100644
--- a/apps/web/ui/auth/register/signup-email.tsx
+++ b/apps/web/ui/auth/register/signup-email.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { sendOtpAction } from "@/lib/actions/send-otp";
+import { testIds } from "@/lib/e2e/test-ids";
 import { signUpSchema } from "@/lib/zod/schemas/auth";
 import { PasswordRequirements } from "@/ui/shared/password-requirements";
 import { Button, Input, useCurrentSubdomain, useMediaQuery } from "@dub/ui";
@@ -107,6 +108,7 @@ export const SignUpEmail = () => {
           text={isPending ? "Submitting..." : "Sign Up"}
           disabled={isPending}
           loading={isPending}
+          data-testid={testIds.auth.signupSubmit}
         />
       </div>
     </form>
diff --git a/apps/web/ui/customers/customer-activity-list.tsx b/apps/web/ui/customers/customer-activity-list.tsx
index 7166f524e52..e1f3b0cf957 100644
--- a/apps/web/ui/customers/customer-activity-list.tsx
+++ b/apps/web/ui/customers/customer-activity-list.tsx
@@ -1,7 +1,12 @@
 import { CustomerActivityResponse } from "@/lib/types";
 import { DynamicTooltipWrapper, LinkLogo, TimestampTooltip } from "@dub/ui";
 import { CursorRays, MoneyBill2, UserCheck } from "@dub/ui/icons";
-import { formatDateTimeSmart, getApexDomain, getPrettyUrl } from "@dub/utils";
+import {
+  currencyFormatter,
+  formatDateTimeSmart,
+  getApexDomain,
+  getPrettyUrl,
+} from "@dub/utils";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { MetadataViewer } from "../analytics/events/metadata-viewer";
@@ -99,7 +104,16 @@ const activityData = {
     content: (event) => {
       return (
         <div className="flex flex-col gap-1">
-          <span>{event.eventName || "New sale"}</span>
+          <span className="flex min-w-0 items-center gap-1.5">
+            <span className="truncate">{event.eventName || "New sale"}</span>
+            {event.sale?.amount != null && (
+              <span className="shrink-0 rounded-md bg-neutral-100 px-1.5 py-1 font-mono text-xs leading-none text-neutral-700">
+                {currencyFormatter(event.sale.amount, {
+                  trailingZeroDisplay: "stripIfInteger",
+                })}
+              </span>
+            )}
+          </span>
           {event.metadata && <MetadataViewer metadata={event.metadata} />}
         </div>
       );
diff --git a/apps/web/ui/customers/customer-details-column.tsx b/apps/web/ui/customers/customer-details-column.tsx
index 5d6a2134f48..93d80403a66 100644
--- a/apps/web/ui/customers/customer-details-column.tsx
+++ b/apps/web/ui/customers/customer-details-column.tsx
@@ -1,3 +1,4 @@
+import useWorkspace from "@/lib/swr/use-workspace";
 import { CustomerActivityResponse, CustomerEnriched } from "@/lib/types";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
 import {
@@ -7,6 +8,8 @@ import {
   Envelope,
   Globe,
   Hyperlink,
+  MoneyBill2,
+  Shuffle,
   TimestampTooltip,
   Tooltip,
   useCurrentProduct,
@@ -16,14 +19,16 @@ import {
   capitalize,
   cn,
   COUNTRIES,
+  currencyFormatter,
   getParamsFromURL,
   getPrettyUrl,
 } from "@dub/utils";
 import { Pencil } from "lucide-react";
-import { useParams } from "next/navigation";
-import { Fragment, HTMLProps, useMemo } from "react";
+import { useParams, usePathname, useRouter } from "next/navigation";
+import { Fragment, HTMLProps, useCallback, useMemo } from "react";
 import { DeviceIcon } from "../analytics/device-icon";
 import { useEditCustomerModal } from "../modals/edit-customer-modal";
+import { useReattributeCustomerModal } from "../modals/reattribute-customer-modal";
 import { ConditionalLink } from "../shared/conditional-link";
 import { CustomerAvatar } from "./customer-avatar";
 
@@ -31,17 +36,35 @@ export function CustomerDetailsColumn({
   customer,
   customerActivity,
   isCustomerActivityLoading,
-  workspaceSlug,
 }: {
   customer?: CustomerEnriched;
   customerActivity?: CustomerActivityResponse;
   isCustomerActivityLoading: boolean;
-  workspaceSlug?: string;
 }) {
-  const { programSlug } = useParams<{ programSlug: string }>();
   const { product } = useCurrentProduct();
+  const { programSlug } = useParams<{ programSlug: string }>();
+  const { slug: workspaceSlug, defaultProgramId } = useWorkspace();
+  const pathname = usePathname();
+  const router = useRouter();
 
   const { EditCustomerModal, openEditCustomerModal } = useEditCustomerModal();
+  const { ReattributeCustomerModal, openReattributeCustomerModal } =
+    useReattributeCustomerModal();
+
+  const handleReattributeCustomer = useCallback(() => {
+    if (customer) {
+      openReattributeCustomerModal(customer, {
+        onSuccess: (updatedCustomer) => {
+          if (
+            updatedCustomer.id !== customer.id &&
+            pathname.includes(customer.id)
+          ) {
+            router.push(pathname.replace(customer.id, updatedCustomer.id));
+          }
+        },
+      });
+    }
+  }, [customer, openReattributeCustomerModal, pathname, router]);
 
   const basicFields = [
     customer?.email
@@ -97,6 +120,21 @@ export function CustomerDetailsColumn({
           ),
         }
       : null,
+
+    customer?.saleAmount != null
+      ? {
+          id: "ltv",
+          icon: <MoneyBill2 className="size-3.5 shrink-0" />,
+          text: (
+            <span>
+              LTV:{" "}
+              {currencyFormatter(customer.saleAmount, {
+                trailingZeroDisplay: "stripIfInteger",
+              })}
+            </span>
+          ),
+        }
+      : null,
   ].filter((field): field is NonNullable<typeof field> => field !== null);
 
   const partner = customer?.partner;
@@ -116,6 +154,7 @@ export function CustomerDetailsColumn({
   return (
     <>
       <EditCustomerModal />
+      <ReattributeCustomerModal />
       <div className="grid grid-cols-1 gap-6 overflow-hidden whitespace-nowrap text-sm text-neutral-900">
         <div className="border-border-subtle flex flex-col divide-y divide-neutral-200 rounded-xl border bg-white">
           <div className="p-4">
@@ -300,56 +339,75 @@ export function CustomerDetailsColumn({
           </div>
         </div>
 
-        {(link || !customer) && (
-          <div className="border-border-subtle rounded-lg border p-4">
-            <h2 className="text-content-emphasis mb-2.5 text-sm font-semibold">
-              Referral {partner ? "partner" : "link"}
+        <div className="border-border-subtle rounded-lg border p-4">
+          <div className="flex flex-col gap-2">
+            <h2 className="text-content-emphasis text-sm font-semibold">
+              Referral link
             </h2>
-
-            {partner && (
-              <div className="mb-4 flex items-center gap-2">
-                <PartnerAvatar partner={partner} className="size-5" />
+            {!customer || isCustomerActivityLoading ? (
+              <div className="h-5 w-12 animate-pulse rounded-md bg-neutral-100" />
+            ) : link ? (
+              <div className="flex items-center gap-1.5 text-xs">
+                <Hyperlink className="size-3.5 shrink-0" />
                 <ConditionalLink
                   href={
                     workspaceSlug
-                      ? `/${workspaceSlug}/program/partners/${partner.id}`
-                      : undefined
+                      ? `/${workspaceSlug}/links/${link.domain}/${link.key}`
+                      : programSlug
+                        ? `/programs/${programSlug}/analytics?linkId=${link.id}`
+                        : undefined
                   }
                   target="_blank"
-                  className="min-w-0 overflow-hidden truncate text-xs font-semibold"
+                  className="min-w-0 overflow-hidden truncate"
                 >
-                  {partner.name}
+                  {getPrettyUrl(link.shortLink)}
                 </ConditionalLink>
               </div>
+            ) : (
+              <span>-</span>
             )}
+          </div>
 
-            <div className="flex flex-col gap-2 text-xs">
-              {partner && <DetailHeading>Referral link</DetailHeading>}
-              {!customer || isCustomerActivityLoading ? (
-                <div className="h-5 w-12 animate-pulse rounded-md bg-neutral-100" />
-              ) : link ? (
-                <div className="flex items-center gap-1.5">
-                  <Hyperlink className="size-3.5 shrink-0" />
-                  <ConditionalLink
-                    href={
-                      workspaceSlug
-                        ? `/${workspaceSlug}/links/${link.domain}/${link.key}`
-                        : programSlug
-                          ? `/programs/${programSlug}/analytics?linkId=${link.id}`
-                          : undefined
-                    }
-                    target="_blank"
-                    className="min-w-0 overflow-hidden truncate"
-                  >
-                    {getPrettyUrl(link.shortLink)}
-                  </ConditionalLink>
+          {customer && workspaceSlug && defaultProgramId && (
+            <div className="mt-4 flex flex-col gap-2">
+              <h2 className="text-content-emphasis text-sm font-semibold">
+                Referral partner
+              </h2>
+
+              {partner ? (
+                <div className="flex items-center justify-between">
+                  <div className="flex items-center gap-2">
+                    <PartnerAvatar partner={partner} className="size-5" />
+                    <ConditionalLink
+                      href={`/${workspaceSlug}/program/partners/${partner.id}`}
+                      target="_blank"
+                      className="min-w-0 overflow-hidden truncate text-xs font-semibold"
+                    >
+                      {partner.name}
+                    </ConditionalLink>
+                  </div>
+                  <Button
+                    variant="secondary"
+                    icon={<Shuffle className="size-3.5" />}
+                    text="Switch"
+                    className="h-7 w-fit rounded-lg px-2"
+                    onClick={handleReattributeCustomer}
+                  />
                 </div>
               ) : (
-                <span>-</span>
+                <div className="text-xs text-neutral-500">
+                  Not attributed to a partner.{" "}
+                  <button
+                    className="underline decoration-dotted underline-offset-2 hover:text-neutral-700"
+                    onClick={handleReattributeCustomer}
+                  >
+                    Attribute now.
+                  </button>
+                </div>
               )}
             </div>
-          </div>
-        )}
+          )}
+        </div>
       </div>
     </>
   );
diff --git a/apps/web/ui/customers/customer-selector.tsx b/apps/web/ui/customers/customer-selector.tsx
index 9c7f41ac94c..49f411eb64e 100644
--- a/apps/web/ui/customers/customer-selector.tsx
+++ b/apps/web/ui/customers/customer-selector.tsx
@@ -103,11 +103,7 @@ export function CustomerSelector({
         }
         caret={true}
         placeholder={variant === "header" ? "" : "Select customer"}
-        searchPlaceholder={
-          variant === "header"
-            ? "Search customers..."
-            : "Search or create customer..."
-        }
+        searchPlaceholder="Search by email, name, or ID"
         onSearchChange={setSearch}
         {...(variant !== "header" && {
           createLabel: (search: string) =>
diff --git a/apps/web/ui/customers/customer-stats.tsx b/apps/web/ui/customers/customer-stats.tsx
index c3a08c1a664..2655b7f6c16 100644
--- a/apps/web/ui/customers/customer-stats.tsx
+++ b/apps/web/ui/customers/customer-stats.tsx
@@ -63,9 +63,11 @@ export function CustomerStats({
       {
         label: "Lifetime value",
         value: customer ? (
-          <div className="flex items-center gap-1">
-            {currencyFormatter(customer.saleAmount ?? 0)}
-            <span className="text-xs text-neutral-500">
+          <div className="flex min-w-0 flex-wrap items-baseline gap-x-1 gap-y-0.5">
+            <span className="truncate">
+              {currencyFormatter(customer.saleAmount ?? 0)}
+            </span>
+            <span className="text-xs font-normal text-neutral-500">
               ({nFormatter(customer.sales ?? 0, { full: true })}{" "}
               {pluralize("sale", customer.sales ?? 0)})
             </span>
@@ -97,7 +99,8 @@ export function CustomerStats({
     <div className="@container/stats">
       <div
         className={cn(
-          "@xs/stats:grid-cols-[repeat(var(--cols),1fr)] grid grid-cols-1 ring-4 ring-black/5",
+          // 2x2 on narrow viewports; 4-up only when each cell has room for labels
+          "@[560px]/stats:grid-cols-[repeat(var(--cols),minmax(0,1fr))] grid grid-cols-2 ring-4 ring-black/5",
           "gap-px overflow-hidden rounded-xl border border-neutral-200 bg-neutral-200",
         )}
         style={
@@ -114,18 +117,20 @@ export function CustomerStats({
               href={href ?? "#"}
               target="_blank"
               className={cn(
-                "group relative flex flex-col bg-white p-3",
-                href && "transition-colors duration-150 hover:bg-neutral-50",
+                "group relative flex min-w-0 flex-col gap-0.5 bg-white p-3",
+                href && "pr-8 transition-colors duration-150 hover:bg-neutral-50",
               )}
             >
               {href && (
                 <ArrowUpRight2 className="text-content-subtle absolute right-3 top-3 size-3.5 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
               )}
-              <span className="text-xs text-neutral-500">{label}</span>
+              <span className="text-xs leading-tight text-neutral-500">
+                {label}
+              </span>
               {value === undefined ? (
                 <div className="h-5 w-16 animate-pulse rounded-md bg-neutral-200" />
               ) : (
-                <span className="text-content-emphasis text-sm font-medium">
+                <span className="text-content-emphasis min-w-0 text-sm font-medium leading-snug">
                   {value}
                 </span>
               )}
diff --git a/apps/web/ui/customers/customers-table/customers-table.tsx b/apps/web/ui/customers/customers-table/customers-table.tsx
index 176a8984d02..32ef7450970 100644
--- a/apps/web/ui/customers/customers-table/customers-table.tsx
+++ b/apps/web/ui/customers/customers-table/customers-table.tsx
@@ -511,8 +511,8 @@ function CustomersFilters({
           onSelectedFilterChange={setSelectedFilter}
         />
         <SearchBoxPersisted
-          placeholder="Search by email or name"
-          inputClassName="md:w-[16rem]"
+          placeholder="Search by email, name, or ID"
+          inputClassName="md:w-[18rem]"
         />
       </div>
       <AnimatedSizeContainer height>
diff --git a/apps/web/ui/customers/partner-customers-menu-popover.tsx b/apps/web/ui/customers/partner-customers-menu-popover.tsx
new file mode 100644
index 00000000000..1ff88443d4e
--- /dev/null
+++ b/apps/web/ui/customers/partner-customers-menu-popover.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import { useExportPartnerCustomersModal } from "@/ui/modals/export-partner-customers-modal";
+import { ThreeDots } from "@/ui/shared/icons";
+import { Button, Download, IconMenu, Popover } from "@dub/ui";
+import { useState } from "react";
+
+export function PartnerCustomersMenuPopover() {
+  const [openPopover, setOpenPopover] = useState(false);
+
+  const { ExportPartnerCustomersModal, setShowExportPartnerCustomersModal } =
+    useExportPartnerCustomersModal();
+
+  return (
+    <>
+      <ExportPartnerCustomersModal />
+      <Popover
+        content={
+          <div className="w-full md:w-52">
+            <div className="grid gap-px p-2">
+              <p className="mb-1.5 mt-1 flex items-center gap-2 px-1 text-xs font-medium text-neutral-500">
+                Export Customers
+              </p>
+              <button
+                onClick={() => {
+                  setOpenPopover(false);
+                  setShowExportPartnerCustomersModal(true);
+                }}
+                className="w-full rounded-md p-2 hover:bg-neutral-100 active:bg-neutral-200"
+              >
+                <IconMenu
+                  text="Export as CSV"
+                  icon={<Download className="h-4 w-4" />}
+                />
+              </button>
+            </div>
+          </div>
+        }
+        openPopover={openPopover}
+        setOpenPopover={setOpenPopover}
+        align="end"
+      >
+        <Button
+          onClick={() => setOpenPopover(!openPopover)}
+          variant="secondary"
+          className="h-8 w-auto px-1.5 sm:h-9"
+          icon={<ThreeDots className="h-5 w-5 text-neutral-500" />}
+          aria-label="Customer export options"
+        />
+      </Popover>
+    </>
+  );
+}
diff --git a/apps/web/ui/domains/add-edit-domain-form.tsx b/apps/web/ui/domains/add-edit-domain-form.tsx
index 1e4a1bb7f6b..75f2c6da898 100644
--- a/apps/web/ui/domains/add-edit-domain-form.tsx
+++ b/apps/web/ui/domains/add-edit-domain-form.tsx
@@ -1,4 +1,5 @@
 import { isValidDomain } from "@/lib/api/domains/is-valid-domain";
+import { testIds } from "@/lib/e2e/test-ids";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { DomainProps } from "@/lib/types";
@@ -121,6 +122,8 @@ export function AddEditDomainForm({
   initialDomain,
   fixedDomainSuffix,
   isOnboardingSubdomainFlow = false,
+  submitTestId,
+  domainInputTestId,
 }: {
   props?: DomainProps;
   onSuccess?: (data: DomainProps) => void;
@@ -128,6 +131,8 @@ export function AddEditDomainForm({
   fixedDomainSuffix?: string;
   initialDomain?: string;
   isOnboardingSubdomainFlow?: boolean;
+  submitTestId?: string;
+  domainInputTestId?: string;
 }) {
   const { id: workspaceId, plan } = useWorkspace();
   const [lockDomain, setLockDomain] = useState(true);
@@ -462,6 +467,7 @@ export function AddEditDomainForm({
                       className="block w-full rounded-md border-0 text-neutral-900 placeholder-neutral-400 focus:outline-none focus:ring-0 sm:text-sm"
                       placeholder="go.acme.com"
                       autoFocus={!isMobile}
+                      data-testid={domainInputTestId}
                     />
                   )}
                 </div>
@@ -471,7 +477,13 @@ export function AddEditDomainForm({
                   transition={{ ease: "easeInOut", duration: 0.1 }}
                 >
                   <div className="flex items-center justify-between gap-4 p-2 text-sm">
-                    <p>
+                    <p
+                      data-testid={
+                        domainStatus === "available"
+                          ? testIds.onboarding.domainAvailable
+                          : undefined
+                      }
+                    >
                       {domainStatus !== "idle" ? (
                         domainStatus === "invalid" ||
                         domainStatus === "error" ? (
@@ -743,6 +755,7 @@ export function AddEditDomainForm({
           text={props ? "Save changes" : "Add domain"}
           disabled={saveDisabled}
           loading={isSubmitting}
+          data-testid={submitTestId}
         />
       </div>
     </form>
diff --git a/apps/web/ui/domains/domain-card-title-column.tsx b/apps/web/ui/domains/domain-card-title-column.tsx
index 31157c9ec07..09ca9505578 100644
--- a/apps/web/ui/domains/domain-card-title-column.tsx
+++ b/apps/web/ui/domains/domain-card-title-column.tsx
@@ -1,4 +1,5 @@
-import { ArrowTurnRight2, Flag2, Globe } from "@dub/ui/icons";
+import { Tooltip } from "@dub/ui";
+import { ArrowTurnRight2, ConnectedDots4, Flag2, Globe } from "@dub/ui/icons";
 import { cn, getPrettyUrl, punycode } from "@dub/utils";
 
 export function DomainCardTitleColumn({
@@ -7,6 +8,7 @@ export function DomainCardTitleColumn({
   url,
   description,
   primary = false,
+  program = false,
   defaultDomain = false,
 }: {
   domain: string;
@@ -14,6 +16,7 @@ export function DomainCardTitleColumn({
   url?: string | null;
   description?: string;
   primary?: boolean;
+  program?: boolean;
   defaultDomain?: boolean;
 }) {
   return (
@@ -45,12 +48,24 @@ export function DomainCardTitleColumn({
           >
             {punycode(domain)}
           </a>
-          {primary ? (
-            <span className="xs:px-3 xs:py-1 flex items-center gap-1 rounded-full bg-sky-400/[.15] px-1.5 py-0.5 text-xs font-medium text-sky-600">
-              <Flag2 className="hidden h-3 w-3 sm:block" />
-              Primary
-            </span>
-          ) : null}
+          <div className="flex items-center gap-1">
+            {primary ? (
+              <Tooltip content="This is the [primary domain](https://dub.co/help/article/how-to-set-primary-domain) that Dub defaults to in the [link builder](https://dub.co/help/article/dub-link-builder) and the [Links API](https://dub.co/docs/concepts/links/introduction).">
+                <span className="xs:px-3 xs:py-1 flex cursor-help items-center gap-1 rounded-full bg-sky-400/[.15] px-1.5 py-0.5 text-xs font-medium text-sky-600">
+                  <Flag2 className="hidden h-3 w-3 sm:block" />
+                  Primary
+                </span>
+              </Tooltip>
+            ) : null}
+            {program ? (
+              <Tooltip content="This domain is the [referral link domain](https://dub.co/help/article/partner-link-settings#changing-your-referral-link-domain) for your [partner program](https://dub.co/partners).">
+                <span className="xs:px-3 xs:py-1 flex cursor-help items-center gap-1 rounded-full bg-violet-400/[.15] px-1.5 py-0.5 text-xs font-medium text-violet-600">
+                  <ConnectedDots4 className="hidden h-3 w-3 sm:block" />
+                  Program
+                </span>
+              </Tooltip>
+            ) : null}
+          </div>
         </div>
         {(!defaultDomain || description) && (
           <div className="mt-1 flex items-center gap-1 text-xs">
diff --git a/apps/web/ui/domains/domain-card.tsx b/apps/web/ui/domains/domain-card.tsx
index 3b1f3ea2296..5539577935b 100644
--- a/apps/web/ui/domains/domain-card.tsx
+++ b/apps/web/ui/domains/domain-card.tsx
@@ -1,15 +1,18 @@
 import { clientAccessCheck } from "@/lib/client-access-check";
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
+import { mutatePrefix } from "@/lib/swr/mutate";
 import useDomains from "@/lib/swr/use-domains";
+import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   DomainProps,
   DomainVerificationStatusProps,
   LinkProps,
 } from "@/lib/types";
+import { Callout } from "@/ui/shared/callout";
 import { CheckCircleFill, Delete, Repeat, ThreeDots } from "@/ui/shared/icons";
 import {
   Button,
-  CircleCheck,
   Copy,
   Popover,
   Refresh2,
@@ -22,6 +25,7 @@ import {
 } from "@dub/ui";
 import {
   CircleHalfDottedClock,
+  ConnectedDots4,
   CursorRays,
   Flag2,
   Gear,
@@ -44,9 +48,10 @@ import Link from "next/link";
 import { useSearchParams } from "next/navigation";
 import { useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
-import useSWRImmutable from "swr/immutable";
+import useSWR from "swr";
 import { useAddEditDomainModal } from "../modals/add-edit-domain-modal";
 import { useArchiveDomainModal } from "../modals/archive-domain-modal";
+import { useChangeProgramDomainModal } from "../modals/change-program-domain-modal";
 import { useDeleteDomainModal } from "../modals/delete-domain-modal";
 import { useDomainAutoRenewalModal } from "../modals/domain-auto-renewal-modal";
 import { useLinkBuilder } from "../modals/link-builder";
@@ -62,18 +67,24 @@ export default function DomainCard({ props }: { props: DomainProps }) {
   const isDubProvisioned = !!registeredDomain;
 
   const { id: workspaceId, slug } = useWorkspace();
+  const { program } = useProgram();
 
   const domainRef = useRef<HTMLDivElement>(null);
   const isVisible = useInViewport(domainRef, { defaultValue: true });
 
-  const { data, isValidating, mutate } = useSWRImmutable<{
+  const { data, isValidating, mutate } = useSWR<{
     status: DomainVerificationStatusProps;
     response: any;
+    domainConnect?: DomainConnectDiscovery | null;
   }>(
     workspaceId &&
       isVisible &&
       `/api/domains/${domain}/verify?workspaceId=${workspaceId}`,
     fetcher,
+    {
+      revalidateOnFocus: false,
+      dedupingInterval: 5000,
+    },
   );
 
   const verificationData = useMemo(() => {
@@ -81,9 +92,11 @@ export default function DomainCard({ props }: { props: DomainProps }) {
       return {
         status: "Valid Configuration",
         response: null,
+        domainConnect: null,
       } as {
         status: DomainVerificationStatusProps;
         response: any;
+        domainConnect?: DomainConnectDiscovery | null;
       };
     }
     return data;
@@ -127,9 +140,9 @@ export default function DomainCard({ props }: { props: DomainProps }) {
         onPointerLeave={() => setGroupHover(false)}
       >
         {isDubProvisioned && (
-          <div className="flex items-center justify-between gap-2 rounded-t-xl border-b border-neutral-100 bg-neutral-50 px-5 py-2 text-xs">
-            <div className="flex items-center gap-2">
-              <div className="flex items-center gap-1.5">
+          <div className="flex flex-wrap items-center gap-x-3 gap-y-1.5 rounded-t-xl border-b border-neutral-100 bg-neutral-50 px-4 py-2 text-xs sm:px-5">
+            <div className="flex min-w-0 flex-1 flex-wrap items-center gap-x-2 gap-y-1">
+              <div className="flex shrink-0 items-center gap-1.5">
                 <Wordmark className="h-4" />
                 <span className="font-medium text-neutral-900">
                   Provisioned by Dub
@@ -138,8 +151,9 @@ export default function DomainCard({ props }: { props: DomainProps }) {
 
               {expiresAt && (
                 <button
+                  type="button"
                   className={cn(
-                    "flex items-center gap-1 decoration-dotted underline-offset-2 hover:underline",
+                    "flex items-center gap-1 whitespace-nowrap decoration-dotted underline-offset-2 hover:underline",
                     isExpired
                       ? "text-red-600"
                       : autoRenew
@@ -151,9 +165,9 @@ export default function DomainCard({ props }: { props: DomainProps }) {
                   }}
                 >
                   {autoRenew ? (
-                    <Repeat className="size-3.5" />
+                    <Repeat className="size-3.5 shrink-0" />
                   ) : (
-                    <CircleHalfDottedClock className="size-3.5" />
+                    <CircleHalfDottedClock className="size-3.5 shrink-0" />
                   )}
                   <span className="text-xs font-medium">
                     {autoRenew
@@ -167,7 +181,7 @@ export default function DomainCard({ props }: { props: DomainProps }) {
             <a
               href="https://dub.co/help/article/free-dot-link-domain"
               target="_blank"
-              className="text-neutral-500 underline transition-colors hover:text-neutral-800"
+              className="ml-auto shrink-0 text-neutral-500 underline transition-colors hover:text-neutral-800"
             >
               Learn more
             </a>
@@ -180,6 +194,7 @@ export default function DomainCard({ props }: { props: DomainProps }) {
               icon={tab === "active" ? Globe : Archive}
               url={props.link?.url}
               primary={primary}
+              program={program?.domain === domain}
             />
 
             {/* Clicks */}
@@ -301,22 +316,25 @@ export default function DomainCard({ props }: { props: DomainProps }) {
           >
             {verificationData ? (
               verificationData.status === "Valid Configuration" ? (
-                <div className="mt-6 flex items-center gap-2 text-pretty rounded-lg bg-green-100/80 p-3 text-sm text-green-600">
-                  <CircleCheck className="h-5 w-5 shrink-0" />
-                  <div>
-                    Good news! Your DNS records are set up correctly, but it can
-                    take some time for them to propagate globally.{" "}
-                    <Link
-                      href="https://dub.co/help/article/how-to-add-custom-domain#how-long-do-i-have-to-wait-for-my-domain-to-work"
-                      target="_blank"
-                      className="underline transition-colors hover:text-green-800"
-                    >
-                      Learn more.
-                    </Link>
-                  </div>
-                </div>
+                <Callout variant="success" size={2} className="mt-6">
+                  Good news! Your DNS records are set up correctly, but it can
+                  take some time for them to propagate globally.{" "}
+                  <Link
+                    href="https://dub.co/help/article/how-to-add-custom-domain#how-long-do-i-have-to-wait-for-my-domain-to-work"
+                    target="_blank"
+                    className="underline transition-colors hover:text-green-800"
+                  >
+                    Learn more.
+                  </Link>
+                </Callout>
               ) : (
-                <DomainConfiguration data={verificationData} />
+                <DomainConfiguration
+                  data={verificationData}
+                  domainConnect={verificationData.domainConnect}
+                  domain={domain}
+                  workspaceId={workspaceId ?? undefined}
+                  workspaceSlug={slug ?? undefined}
+                />
               )
             ) : (
               <div className="mt-6 h-6 w-32 animate-pulse rounded-md bg-neutral-200" />
@@ -346,7 +364,8 @@ function DomainCardMenu({
   autoRenew: boolean;
   openDomainRenewalModal: (enable: boolean) => void;
 }) {
-  const { role } = useWorkspace();
+  const { id: workspaceId, role, defaultProgramId } = useWorkspace();
+  const { program } = useProgram();
   const { isMobile } = useMediaQuery();
   const { activeWorkspaceDomains } = useDomains();
   const [openPopover, setOpenPopover] = useState(false);
@@ -354,6 +373,12 @@ function DomainCardMenu({
 
   const { primary, archived, slug: domain, registeredDomain } = props;
   const isDubProvisioned = !!registeredDomain;
+  const canSetAsProgramDomain = Boolean(
+    defaultProgramId &&
+      program?.domain &&
+      program.domain !== domain &&
+      !archived,
+  );
 
   const permissionsError = clientAccessCheck({
     action: "domains.write",
@@ -375,6 +400,27 @@ function DomainCardMenu({
       props,
     });
 
+  const { setShowChangeDomainModal, ChangeDomainModal } =
+    useChangeProgramDomainModal({
+      newDomain: domain,
+      onConfirm: async () => {
+        const response = await fetch(
+          `/api/domains/${domain}/program?workspaceId=${workspaceId}`,
+          {
+            method: "POST",
+          },
+        );
+
+        if (!response.ok) {
+          const { error } = await response.json();
+          throw new Error(error.message);
+        }
+
+        await mutatePrefix(["/api/domains", "/api/programs", "/api/groups"]);
+        toast.success(`Successfully set ${domain} as the program domain.`);
+      },
+    });
+
   const { setShowArchiveDomainModal, ArchiveDomainModal } =
     useArchiveDomainModal({
       props,
@@ -410,6 +456,7 @@ function DomainCardMenu({
       <LinkQRModal />
       <AddEditDomainModal />
       <PrimaryDomainModal />
+      <ChangeDomainModal />
       <ArchiveDomainModal />
       <DeleteDomainModal />
       <TransferDomainModal />
@@ -541,6 +588,18 @@ function DomainCardMenu({
                     className="h-9 justify-start px-2 font-medium"
                   />
                 )}
+                {canSetAsProgramDomain && (
+                  <Button
+                    text="Set Program Domain"
+                    variant="outline"
+                    onClick={() => {
+                      setOpenPopover(false);
+                      setShowChangeDomainModal(true);
+                    }}
+                    icon={<ConnectedDots4 className="h-4 w-4" />}
+                    className="h-9 justify-start px-2 font-medium"
+                  />
+                )}
                 {!isDubProvisioned && (
                   <Button
                     text="Transfer"
diff --git a/apps/web/ui/domains/domain-configuration.tsx b/apps/web/ui/domains/domain-configuration.tsx
index a15208448cc..6b79b0743af 100644
--- a/apps/web/ui/domains/domain-configuration.tsx
+++ b/apps/web/ui/domains/domain-configuration.tsx
@@ -1,23 +1,108 @@
+"use client";
+
+import { clientAccessCheck } from "@/lib/client-access-check";
+import { isAllowedSyncUXOrigin } from "@/lib/domain-connect/allowed-origins";
+import {
+  DUB_CUSTOM_DOMAIN_A_RECORD,
+  DUB_CUSTOM_DOMAIN_CNAME,
+} from "@/lib/domain-connect/constants";
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
+import useWorkspace from "@/lib/swr/use-workspace";
 import { DomainVerificationStatusProps } from "@/lib/types";
-import { CircleInfo, CopyButton, TabSelect } from "@dub/ui";
+import { useForwardDnsInstructionsModal } from "@/ui/modals/forward-dns-instructions-modal";
+import {
+  Button,
+  CircleInfo,
+  Cloudflare,
+  CopyButton,
+  TabSelect,
+  Vercel,
+} from "@dub/ui";
+import { EnvelopeArrowRight } from "@dub/ui/icons";
 import { cn, getSubdomain } from "@dub/utils";
+import { usePathname } from "next/navigation";
 import { Fragment, useState } from "react";
+import { toast } from "sonner";
 
 export default function DomainConfiguration({
   data,
+  domainConnect,
+  domain,
+  workspaceId,
+  workspaceSlug,
 }: {
   data: { status: DomainVerificationStatusProps; response: any };
+  domainConnect?: DomainConnectDiscovery | null;
+  domain?: string;
+  workspaceId?: string;
+  workspaceSlug?: string;
 }) {
+  const pathname = usePathname();
+  const { role } = useWorkspace();
   const { domainJson, configJson } = data.response;
   const subdomain = getSubdomain(domainJson.name, domainJson.apexName);
-  const [recordType, setRecordType] = useState(!!subdomain ? "CNAME" : "A");
+  const [recordType, setRecordType] = useState<"A" | "CNAME">(
+    !!subdomain ? "CNAME" : "A",
+  );
+  const [autoLoading, setAutoLoading] = useState(false);
+
+  const { error: permissionsError } = clientAccessCheck({
+    action: "domains.write",
+    role,
+  });
+
+  const { ForwardDnsInstructionsModal, setShowForwardDnsModal } =
+    useForwardDnsInstructionsModal({
+      domain: domain ?? "",
+      recordType,
+      workspaceId: workspaceId ?? "",
+      endpoint:
+        domain && workspaceId
+          ? `/api/domains/${encodeURIComponent(domain)}/forward-instructions?workspaceId=${workspaceId}`
+          : "",
+    });
+
+  const handleAutoConfigure = async () => {
+    if (!domain || !workspaceId) return;
+    setAutoLoading(true);
+    try {
+      const res = await fetch(
+        `/api/domains/${encodeURIComponent(domain)}/domain-connect/apply?workspaceId=${workspaceId}`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            returnTo: pathname ?? `/${workspaceSlug}/settings/domains`,
+          }),
+        },
+      );
+      const json = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        toast.error(json?.error?.message ?? "Could not start auto configure.");
+        return;
+      }
+      if (json?.applyUrl) {
+        if (!isAllowedSyncUXOrigin(json.applyUrl as string)) {
+          toast.error("Invalid redirect URL from server.");
+          return;
+        }
+        window.location.assign(json.applyUrl as string);
+        return;
+      }
+      toast.error("Could not start auto configure.");
+    } catch {
+      toast.error("Could not start auto configure.");
+    } finally {
+      setAutoLoading(false);
+    }
+  };
 
   if (data.status === "Conflicting DNS Records") {
     return (
       <div className="pt-5">
         <div className="flex justify-start space-x-4">
           <div className="ease border-b-2 border-black pb-1 text-sm text-black transition-all duration-150">
-            {configJson?.conflicts.some((x) => x.type === "A")
+            {configJson?.conflicts.some((x: { type: string }) => x.type === "A")
               ? "A Record (recommended)"
               : "CNAME Record (recommended)"}
           </div>
@@ -46,7 +131,10 @@ export default function DomainConfiguration({
             {
               type: recordType,
               name: recordType === "A" ? "@" : subdomain ?? "www",
-              value: recordType === "A" ? `76.76.21.21` : `cname.dub.co`,
+              value:
+                recordType === "A"
+                  ? DUB_CUSTOM_DOMAIN_A_RECORD
+                  : DUB_CUSTOM_DOMAIN_CNAME,
               ttl: "86400",
             },
           ]}
@@ -68,6 +156,11 @@ export default function DomainConfiguration({
       ? domainJson.verification.find((x: any) => x.type === "TXT")
       : undefined;
 
+  const providerLabel =
+    domainConnect?.providerKind === "cloudflare" ? "Cloudflare" : "Vercel";
+  const ProviderIcon =
+    domainConnect?.providerKind === "cloudflare" ? Cloudflare : Vercel;
+
   return (
     <div className="pt-2">
       <div className="-ml-1.5 border-b border-neutral-200">
@@ -94,7 +187,10 @@ export default function DomainConfiguration({
           {
             type: recordType,
             name: recordType === "A" ? "@" : subdomain ?? "www",
-            value: recordType === "A" ? `76.76.21.21` : `cname.dub.co`,
+            value:
+              recordType === "A"
+                ? DUB_CUSTOM_DOMAIN_A_RECORD
+                : DUB_CUSTOM_DOMAIN_CNAME,
             ttl: "86400",
           },
           ...(txtVerification
@@ -118,6 +214,43 @@ export default function DomainConfiguration({
             : undefined
         }
       />
+
+      {(domainConnect || (domain && workspaceId)) && (
+        <div className="mt-4 flex flex-wrap gap-2">
+          {domainConnect && domain && workspaceId && (
+            <Button
+              type="button"
+              variant="secondary"
+              text={`Auto configure with ${providerLabel}`}
+              icon={
+                <ProviderIcon
+                  className={cn(
+                    "size-4 shrink-0",
+                    domainConnect.providerKind === "cloudflare"
+                      ? "text-[#F6821F]"
+                      : "text-black",
+                  )}
+                />
+              }
+              className="w-fit"
+              onClick={handleAutoConfigure}
+              loading={autoLoading}
+            />
+          )}
+          {domain && workspaceId && (
+            <Button
+              type="button"
+              variant="secondary"
+              text="Forward instructions"
+              icon={<EnvelopeArrowRight className="size-4 shrink-0" />}
+              className="w-fit"
+              onClick={() => setShowForwardDnsModal(true)}
+              disabledTooltip={permissionsError || undefined}
+            />
+          )}
+        </div>
+      )}
+      <ForwardDnsInstructionsModal />
     </div>
   );
 }
diff --git a/apps/web/ui/guides/integrations.ts b/apps/web/ui/guides/integrations.ts
index bad5247cd39..890f4ee82c5 100644
--- a/apps/web/ui/guides/integrations.ts
+++ b/apps/web/ui/guides/integrations.ts
@@ -29,6 +29,7 @@ export type IntegrationGuide = {
   recommended?: boolean;
   content?: string;
   url: string;
+  stepLabel?: string;
 };
 
 export const sections: {
@@ -56,6 +57,142 @@ export const sections: {
   },
 ];
 
+export type StackItem = {
+  id: string;
+  title: string;
+  icon: any;
+  iconProps?: {
+    fullSize?: boolean;
+  };
+  guideKeys: string[];
+  type: IntegrationType;
+};
+
+export const stackItems: StackItem[] = [
+  {
+    id: "react",
+    title: "React",
+    icon: React,
+    guideKeys: ["react"],
+    type: "client-sdk",
+  },
+  {
+    id: "gtm",
+    title: "Google Tag Manager",
+    icon: GoogleTagManager,
+    guideKeys: ["gtm-client-sdk", "gtm-track-lead", "gtm-track-sale"],
+    type: "client-sdk",
+  },
+  {
+    id: "framer",
+    title: "Framer",
+    icon: Framer,
+    guideKeys: ["framer"],
+    type: "client-sdk",
+  },
+  {
+    id: "wordpress",
+    title: "WordPress",
+    icon: Wordpress,
+    guideKeys: ["wordpress"],
+    type: "client-sdk",
+  },
+  {
+    id: "webflow",
+    title: "Webflow",
+    icon: Webflow,
+    guideKeys: ["webflow"],
+    type: "client-sdk",
+  },
+  {
+    id: "shopify",
+    title: "Shopify",
+    icon: Shopify,
+    guideKeys: ["shopify"],
+    type: "client-sdk",
+  },
+  {
+    id: "stripe-checkout",
+    title: "Stripe Checkout",
+    icon: StripeIcon,
+    iconProps: { fullSize: true },
+    guideKeys: ["stripe-checkout"],
+    type: "track-sale",
+  },
+  {
+    id: "stripe-payment-links",
+    title: "Stripe Payment Links",
+    icon: StripeIcon,
+    iconProps: { fullSize: true },
+    guideKeys: ["stripe-payment-links"],
+    type: "track-sale",
+  },
+  {
+    id: "stripe-customers",
+    title: "Stripe Customers",
+    icon: StripeIcon,
+    iconProps: { fullSize: true },
+    guideKeys: ["stripe-customers"],
+    type: "track-sale",
+  },
+  {
+    id: "segment",
+    title: "Segment",
+    icon: Segment,
+    guideKeys: ["segment-track-lead", "segment-track-sale"],
+    type: "track-lead",
+  },
+  {
+    id: "clerk",
+    title: "Clerk",
+    icon: Clerk,
+    guideKeys: ["clerk"],
+    type: "track-lead",
+  },
+  {
+    id: "better-auth",
+    title: "Better Auth",
+    icon: BetterAuth,
+    guideKeys: ["better-auth"],
+    type: "track-lead",
+  },
+  {
+    id: "next-auth",
+    title: "NextAuth.js",
+    icon: NextAuth,
+    guideKeys: ["next-auth"],
+    type: "track-lead",
+  },
+  {
+    id: "supabase",
+    title: "Supabase",
+    icon: Supabase,
+    guideKeys: ["supabase"],
+    type: "track-lead",
+  },
+  {
+    id: "auth0",
+    title: "Auth0",
+    icon: Auth0,
+    guideKeys: ["auth0"],
+    type: "track-lead",
+  },
+  {
+    id: "appwrite",
+    title: "Appwrite",
+    icon: Appwrite,
+    guideKeys: ["appwrite"],
+    type: "track-lead",
+  },
+  {
+    id: "custom",
+    title: "Custom integration",
+    icon: CodeEditor,
+    guideKeys: ["manual-client-sdk", "manual-track-lead"],
+    type: "client-sdk",
+  },
+];
+
 export const guides: IntegrationGuide[] = [
   // Client SDK
   {
@@ -116,7 +253,8 @@ export const guides: IntegrationGuide[] = [
     title: "Custom Integration",
     description: "Manual Lead Tracking",
     icon: CodeEditor,
-    url: "https://dub.co/docs/conversions/leads/introduction",
+    url: "https://dub.co/docs/quickstart/server",
+    stepLabel: "Server-side",
   },
   {
     type: "track-lead",
@@ -233,6 +371,7 @@ export const guides: IntegrationGuide[] = [
     title: "Custom Integration",
     description: "Manual Sale Tracking",
     icon: CodeEditor,
-    url: "https://dub.co/docs/conversions/sales/introduction",
+    url: "https://dub.co/docs/quickstart/server",
+    stepLabel: "Server-side",
   },
 ];
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index d5da8a07f84..82530fd6675 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -66,6 +66,7 @@ import { LinesY } from "./icons/lines-y";
 import { User } from "./icons/user";
 import { SidebarNav, SidebarNavAreas, SidebarNavGroups } from "./sidebar-nav";
 import { SidebarUsage } from "./sidebar-usage";
+import { SpecialNewsContent } from "./special-news-content";
 import { useProgramApplicationsCount } from "./use-program-applications-count";
 import { WorkspaceDropdown } from "./workspace-dropdown";
 
@@ -74,6 +75,7 @@ type SidebarNavData = {
   pathname: string;
   queryString: string;
   defaultProduct?: "program" | "links";
+  hasProgram?: boolean;
   session?: Session | null;
   pendingPayoutsCount?: number;
   applicationsCount?: number;
@@ -81,6 +83,7 @@ type SidebarNavData = {
   unreadMessagesCount?: number;
   pendingFraudEventsCount?: number;
   pendingLeadsCount?: number;
+  submittedLeadsEnabled?: boolean;
   partnerNetworkEnabled?: boolean;
 };
 
@@ -88,11 +91,13 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
   slug,
   pathname,
   defaultProduct,
+  hasProgram,
 }) => {
   const programGroup = {
     name: "Partner Program",
-    description:
-      "Kickstart viral product-led growth with powerful, branded referral and affiliate programs.",
+    description: hasProgram
+      ? "Manage, grow, and measure the performance of your partner program."
+      : "Kickstart viral product-led growth with powerful, branded referral and affiliate programs.",
     learnMoreHref: "https://dub.co/partners",
     icon: ConnectedDots4,
     href: slug ? `/${slug}/program` : "/program",
@@ -128,6 +133,7 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
     unreadMessagesCount,
     pendingFraudEventsCount,
     pendingLeadsCount,
+    submittedLeadsEnabled,
     partnerNetworkEnabled,
   }) => ({
     title: "Partner Program",
@@ -216,11 +222,6 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
             name: "Customers",
             icon: User,
             href: `/${slug}/program/customers`,
-            badge: pendingLeadsCount
-              ? pendingLeadsCount > 99
-                ? "99+"
-                : pendingLeadsCount
-              : undefined,
           },
           {
             name: "Commissions",
@@ -257,6 +258,20 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
             icon: PaperPlane,
             href: `/${slug}/program/campaigns` as `/${string}`,
           },
+          ...(submittedLeadsEnabled
+            ? [
+                {
+                  name: "Submitted Leads",
+                  icon: UserPlus,
+                  href: `/${slug}/program/leads` as `/${string}`,
+                  badge: pendingLeadsCount
+                    ? pendingLeadsCount > 99
+                      ? "99+"
+                      : pendingLeadsCount
+                    : undefined,
+                },
+              ]
+            : []),
           {
             name: "Resources",
             icon: LifeRing,
@@ -295,7 +310,6 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
   // short links
   links: ({ slug, pathname, queryString }) => ({
     title: "Short Links",
-    showNews: true,
     direction: "left",
     content: [
       {
@@ -570,9 +584,6 @@ export function AppSidebarNav({
     () => router.push(`/${slug}/${defaultProduct}`),
     {
       enabled: currentArea === "workspaceSettings",
-      priority: 2,
-      modal: false,
-      sheet: false,
     },
   );
 
@@ -650,6 +661,9 @@ export function AppSidebarNav({
       </Link>
     ) : null;
 
+  const freePlanOrTrial =
+    plan && (plan === "free" || isWorkspaceBillingTrialActive(trialEndsAt));
+
   return (
     <SidebarNav
       groups={NAV_GROUPS}
@@ -663,26 +677,39 @@ export function AppSidebarNav({
         }),
         session: session || undefined,
         defaultProduct,
+        hasProgram: Boolean(defaultProgramId),
         pendingPayoutsCount: pendingPayoutsCount?.[0]?.count ?? 0,
         applicationsCount,
         submittedBountiesCount,
         unreadMessagesCount,
         pendingFraudEventsCount,
         pendingLeadsCount,
+        submittedLeadsEnabled: Boolean(
+          defaultProgramId &&
+            SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(defaultProgramId),
+        ),
         partnerNetworkEnabled:
           program && program.partnerNetworkEnabledAt !== null,
       }}
+      switcher={<WorkspaceDropdown />}
       toolContent={toolContent}
+      bottomContent={
+        AppBottomContent || freePlanOrTrial ? (
+          <>
+            <div className="px-3 pb-2">{AppBottomContent}</div>
+            {freePlanOrTrial && <SidebarUsage />}
+          </>
+        ) : undefined
+      }
       newsContent={
-        plan &&
-        (plan === "free" || isWorkspaceBillingTrialActive(trialEndsAt) ? (
-          <SidebarUsage />
-        ) : (
+        currentArea === "program" &&
+        defaultProgramId &&
+        !["enterprise", "advanced"].includes(plan ?? "") ? (
+          <SpecialNewsContent />
+        ) : !freePlanOrTrial && currentArea === "links" ? (
           newsContent
-        ))
+        ) : undefined
       }
-      switcher={<WorkspaceDropdown />}
-      bottom={<div className="px-3 pb-2">{AppBottomContent}</div>}
     />
   );
 }
diff --git a/apps/web/ui/layout/sidebar/help-button.tsx b/apps/web/ui/layout/sidebar/help-button.tsx
index e0c37d20769..719694a8cc7 100644
--- a/apps/web/ui/layout/sidebar/help-button.tsx
+++ b/apps/web/ui/layout/sidebar/help-button.tsx
@@ -1,15 +1,27 @@
-import { CircleQuestion } from "@dub/ui";
+"use client";
+
 import { cn } from "@dub/utils";
+import { useState } from "react";
+import { CircleQuestion } from "./icons/circle-question";
 
-export async function HelpButton({
+export function HelpButton({
   variant = "default",
 }: {
   variant?: "default" | "secondary";
 }) {
+  const [hovered, setHovered] = useState(false);
+
   return (
     <a
       href="https://dub.co/contact/support"
       target="_blank"
+      aria-label="Help"
+      onPointerEnter={() => setHovered(true)}
+      onPointerLeave={() => setHovered(false)}
+      onFocus={(e) =>
+        e.currentTarget.matches(":focus-visible") && setHovered(true)
+      }
+      onBlur={() => setHovered(false)}
       className={cn(
         "shrink-0 items-center justify-center rounded-lg",
         variant === "secondary"
@@ -17,7 +29,11 @@ export async function HelpButton({
           : "text-content-default hover:bg-bg-inverted/5 flex size-11",
       )}
     >
-      <CircleQuestion className="size-5" strokeWidth={2} />
+      <CircleQuestion
+        className="size-5"
+        strokeWidth={2}
+        data-hovered={hovered}
+      />
     </a>
   );
 }
diff --git a/apps/web/ui/layout/sidebar/icons/circle-question.tsx b/apps/web/ui/layout/sidebar/icons/circle-question.tsx
new file mode 100644
index 00000000000..ae49f6d68a9
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/circle-question.tsx
@@ -0,0 +1,96 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import {
+  clearStyles,
+  easeInOut,
+  easeOutBack,
+  useIconAnimation,
+} from "./use-icon-animation";
+
+const DURATION = 900;
+
+// Trace the hook of the question mark (0 → TRACE_END), then the dot lands
+// with a little bounce, carrying the momentum of the stroke (→ 1).
+const TRACE_END = 0.5;
+
+function frame(svg: SVGSVGElement, t: number) {
+  const hook = svg.querySelector<SVGPathElement>("[data-hook]")!;
+  const dot = svg.querySelector<SVGPathElement>("[data-dot]")!;
+
+  // pathLength="1" on the hook makes a dash of 1 cover it exactly, so the
+  // offset is the fraction still hidden. The dash is only applied while
+  // animating: leaving it on at rest nicks the end of the stroke.
+  hook.style.strokeDasharray = "1";
+
+  if (t < TRACE_END) {
+    hook.style.strokeDashoffset = String(1 - easeInOut(t / TRACE_END));
+    dot.style.opacity = "0";
+    dot.style.transform = "scale(0)";
+  } else {
+    hook.style.strokeDashoffset = "0";
+    const k = easeOutBack((t - TRACE_END) / (1 - TRACE_END));
+    // Overshoots past 1 on the way in, then settles: pushed down by the
+    // stroke arriving from above, scaled up past full size, and back.
+    dot.style.opacity = "1";
+    dot.style.transform = `translateY(${(k - 1) * 1.25}px) scale(${k})`;
+  }
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-hook]"), [
+    "strokeDasharray",
+    "strokeDashoffset",
+  ]);
+  clearStyles(svg.querySelectorAll("[data-dot]"), ["opacity", "transform"]);
+}
+
+export function CircleQuestion({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
+      {...rest}
+    >
+      <g fill="currentColor">
+        <circle
+          cx="9"
+          cy="9"
+          fill="none"
+          r="7.25"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <path
+          data-hook
+          d="M6.925,6.619c.388-1.057,1.294-1.492,2.18-1.492,.895,0,1.818,.638,1.818,1.808,0,1.784-1.816,1.468-2.096,3.065"
+          pathLength={1}
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <path
+          data-dot
+          d="M8.791,13.567c-.552,0-1-.449-1-1s.448-1,1-1,1,.449,1,1-.448,1-1,1Z"
+          fill="currentColor"
+          stroke="none"
+          className="[transform-box:fill-box] [transform-origin:center]"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/compass.tsx b/apps/web/ui/layout/sidebar/icons/compass.tsx
index 4561136d4b9..c1fe764b496 100644
--- a/apps/web/ui/layout/sidebar/icons/compass.tsx
+++ b/apps/web/ui/layout/sidebar/icons/compass.tsx
@@ -1,40 +1,64 @@
-import { SVGProps, useEffect, useRef } from "react";
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import {
+  clearStyles,
+  easeInOut,
+  easeOut,
+  useIconAnimation,
+} from "./use-icon-animation";
+
+const DURATION = 550;
+
+// Needle swings wide one way, back past center, then settles. Each segment
+// is [end offset (0..1), target angle in degrees, easing].
+const SWING: [number, number, (t: number) => number][] = [
+  [0.45, 48, easeInOut],
+  [0.8, -18, easeInOut],
+  [1, 0, easeOut],
+];
+
+function needleAngle(t: number) {
+  let from = 0;
+  let segStart = 0;
+  for (const [end, to, ease] of SWING) {
+    if (t < end)
+      return from + (to - from) * ease((t - segStart) / (end - segStart));
+    from = to;
+    segStart = end;
+  }
+  return 0;
+}
+
+function frame(svg: SVGSVGElement, t: number) {
+  svg.querySelector<SVGPathElement>("[data-needle]")!.style.transform =
+    `rotate(${needleAngle(t)}deg)`;
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-needle]"), ["transform"]);
+}
 
 export function Compass({
   "data-hovered": hovered,
+  className,
   ...rest
 }: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
-  const ref = useRef<SVGPathElement>(null);
-
-  useEffect(() => {
-    if (!ref.current) return;
-
-    if (hovered) {
-      ref.current.animate(
-        [
-          { transform: "rotate(0)" },
-          { transform: "rotate(20deg)" },
-          { transform: "rotate(-20deg)" },
-          { transform: "rotate(0)" },
-        ],
-        {
-          duration: 300,
-        },
-      );
-    }
-  }, [hovered]);
+  const play = useIconAnimation(DURATION, frame, reset);
 
   return (
     <svg
+      aria-hidden="true"
       height="18"
       width="18"
       viewBox="0 0 18 18"
       xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
       {...rest}
     >
       <g fill="currentColor">
         <path
-          ref={ref}
+          data-needle
           d="M12.536,5.464l-1.806,4.214c-.202,.472-.578,.848-1.05,1.05l-4.214,1.806,1.806-4.214c.202-.472,.578-.848,1.05-1.05l4.214-1.806Z"
           fill="none"
           stroke="currentColor"
diff --git a/apps/web/ui/layout/sidebar/icons/connected-dots4.tsx b/apps/web/ui/layout/sidebar/icons/connected-dots4.tsx
index 7100c9a547f..72c94f2d495 100644
--- a/apps/web/ui/layout/sidebar/icons/connected-dots4.tsx
+++ b/apps/web/ui/layout/sidebar/icons/connected-dots4.tsx
@@ -1,117 +1,90 @@
-import { SVGProps, useEffect, useRef } from "react";
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import { clearStyles, pulse, useIconAnimation } from "./use-icon-animation";
+
+// Each circle pulses for PULSE ms; the next one starts STAGGER ms after the
+// previous, clockwise from the top.
+const PULSE = 380;
+const STAGGER = 90;
+const DURATION = PULSE + STAGGER * 3;
+
+const GROW = 0.3;
+const STROKE_WIDTH = 1.5;
+
+const dots = (svg: SVGSVGElement) =>
+  svg.querySelectorAll<SVGCircleElement>("[data-dot]");
+
+function frame(svg: SVGSVGElement, t: number) {
+  const elapsed = t * DURATION;
+  dots(svg).forEach((dot, i) => {
+    const scale = 1 + GROW * pulse((elapsed - i * STAGGER) / PULSE);
+    dot.style.transform = `scale(${scale})`;
+    // Keep the stroke visually constant while the circle scales.
+    dot.style.strokeWidth = String(STROKE_WIDTH / scale);
+  });
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(dots(svg), ["transform", "strokeWidth"]);
+}
 
 export function ConnectedDots4({
   "data-hovered": hovered,
+  className,
   ...rest
 }: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
-  const ref = useRef<SVGSVGElement>(null);
-
-  useEffect(() => {
-    if (!ref.current) return;
-
-    if (hovered) {
-      ref.current.animate(
-        [{ transform: "rotate(0)" }, { transform: "rotate(180deg)" }],
-        {
-          duration: 300,
-        },
-      );
-    }
-  }, [hovered]);
+  const play = useIconAnimation(DURATION, frame, reset);
 
   return (
     <svg
+      aria-hidden="true"
       height="18"
       width="18"
       viewBox="0 0 18 18"
       xmlns="http://www.w3.org/2000/svg"
-      ref={ref}
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
       {...rest}
     >
-      <g fill="currentColor">
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="4.664"
-          x2="7.586"
-          y1="7.586"
-          y2="4.664"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="10.414"
-          x2="13.336"
-          y1="4.664"
-          y2="7.586"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="13.336"
-          x2="10.414"
-          y1="10.414"
-          y2="13.336"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="7.586"
-          x2="4.664"
-          y1="13.336"
-          y2="10.414"
-        />
+      <g
+        fill="none"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth={STROKE_WIDTH}
+      >
+        <line x1="4.664" x2="7.586" y1="7.586" y2="4.664" />
+        <line x1="10.414" x2="13.336" y1="4.664" y2="7.586" />
+        <line x1="13.336" x2="10.414" y1="10.414" y2="13.336" />
+        <line x1="7.586" x2="4.664" y1="13.336" y2="10.414" />
+        {/* Each circle scales from the point nearest the icon's center. */}
         <circle
+          data-dot
           cx="9"
           cy="3.25"
-          fill="none"
           r="2"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:50%_100%]"
         />
         <circle
-          cx="3.25"
+          data-dot
+          cx="14.75"
           cy="9"
-          fill="none"
           r="2"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:0%_50%]"
         />
         <circle
+          data-dot
           cx="9"
           cy="14.75"
-          fill="none"
           r="2"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:50%_0%]"
         />
         <circle
-          cx="14.75"
+          data-dot
+          cx="3.25"
           cy="9"
-          fill="none"
           r="2"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:100%_50%]"
         />
       </g>
     </svg>
diff --git a/apps/web/ui/layout/sidebar/icons/gift.tsx b/apps/web/ui/layout/sidebar/icons/gift.tsx
new file mode 100644
index 00000000000..9b9fd1a73cb
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/gift.tsx
@@ -0,0 +1,81 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import { clearStyles, easeInOut, useIconAnimation } from "./use-icon-animation";
+
+const DURATION = 850;
+
+// Lift to open (0 → LIFT_END), hold still (→ HOLD_END), then close (→ 1).
+const LIFT_END = 0.42;
+const HOLD_END = 0.66;
+
+// How far open (0..1) the gift is at a given point in the timeline.
+function openAmount(t: number) {
+  if (t < LIFT_END) return easeInOut(t / LIFT_END);
+  if (t < HOLD_END) return 1;
+  return 1 - easeInOut((t - HOLD_END) / (1 - HOLD_END));
+}
+
+// Lid (bow + ribbon band) lifts and tilts; box tilts the opposite way so the
+// two halves read as separating.
+const lidTransform = (k: number) =>
+  `translate(${-0.5 * k}px, ${-3.75 * k}px) rotate(${-16 * k}deg)`;
+const boxTransform = (k: number) =>
+  `translate(${0.5 * k}px, ${0.75 * k}px) rotate(${6 * k}deg)`;
+
+function frame(svg: SVGSVGElement, t: number) {
+  const k = openAmount(t);
+  svg.querySelector<SVGGElement>("[data-lid]")!.style.transform =
+    lidTransform(k);
+  svg.querySelector<SVGGElement>("[data-box]")!.style.transform =
+    boxTransform(k);
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-lid],[data-box]"), ["transform"]);
+}
+
+export function Gift({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
+      {...rest}
+    >
+      <g
+        fill="none"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      >
+        <g
+          data-box
+          className="[transform-box:fill-box] [transform-origin:0%_100%]"
+        >
+          <path d="M9 8.25V16.25" />
+          <path d="M14.25 14.25V8.25H3.75V14.25C3.75 15.355 4.645 16.25 5.75 16.25H12.25C13.355 16.25 14.25 15.355 14.25 14.25Z" />
+        </g>
+        <g
+          data-lid
+          className="[transform-box:fill-box] [transform-origin:100%_100%]"
+        >
+          <path d="M9 5.25V8.25" />
+          <path d="M3.75 3.5C3.75 2.534 4.534 1.75 5.5 1.75C8.089 1.75 9 5.25 9 5.25H5.5C4.534 5.25 3.75 4.466 3.75 3.5Z" />
+          <path d="M12.5 5.25H9C9 5.25 9.911 1.75 12.5 1.75C13.466 1.75 14.25 2.534 14.25 3.5C14.25 4.466 13.466 5.25 12.5 5.25Z" />
+          <path d="M15.25 5.25H2.75C2.19772 5.25 1.75 5.69772 1.75 6.25V7.25C1.75 7.80228 2.19772 8.25 2.75 8.25H15.25C15.8023 8.25 16.25 7.80228 16.25 7.25V6.25C16.25 5.69772 15.8023 5.25 15.25 5.25Z" />
+        </g>
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/grid.tsx b/apps/web/ui/layout/sidebar/icons/grid.tsx
new file mode 100644
index 00000000000..c68f5ceb8da
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/grid.tsx
@@ -0,0 +1,99 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import { clearStyles, pulse, useIconAnimation } from "./use-icon-animation";
+
+// Each square pulses for PULSE ms; the next starts STAGGER ms after the
+// previous, clockwise from the top-left.
+const PULSE = 380;
+const STAGGER = 90;
+const DURATION = PULSE + STAGGER * 3;
+
+const GROW = 0.2;
+const STROKE_WIDTH = 1.5;
+
+const squares = (svg: SVGSVGElement) =>
+  svg.querySelectorAll<SVGRectElement>("[data-square]");
+
+function frame(svg: SVGSVGElement, t: number) {
+  const elapsed = t * DURATION;
+  squares(svg).forEach((square, i) => {
+    const scale = 1 + GROW * pulse((elapsed - i * STAGGER) / PULSE);
+    square.style.transform = `scale(${scale})`;
+    // Keep the stroke visually constant while the square scales.
+    square.style.strokeWidth = String(STROKE_WIDTH / scale);
+  });
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(squares(svg), ["transform", "strokeWidth"]);
+}
+
+export function GridIcon({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn(
+        "overflow-visible [&_rect]:[transform-box:fill-box] [&_rect]:[transform-origin:center]",
+        className,
+      )}
+      {...rest}
+    >
+      <g
+        fill="none"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth={STROKE_WIDTH}
+      >
+        {/* DOM order is clockwise from the top-left. */}
+        <rect
+          data-square
+          height="4.5"
+          width="4.5"
+          rx="1"
+          ry="1"
+          x="2.75"
+          y="2.75"
+        />
+        <rect
+          data-square
+          height="4.5"
+          width="4.5"
+          rx="1"
+          ry="1"
+          x="10.75"
+          y="2.75"
+        />
+        <rect
+          data-square
+          height="4.5"
+          width="4.5"
+          rx="1"
+          ry="1"
+          x="10.75"
+          y="10.75"
+        />
+        <rect
+          data-square
+          height="4.5"
+          width="4.5"
+          rx="1"
+          ry="1"
+          x="2.75"
+          y="10.75"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/money-bills2.tsx b/apps/web/ui/layout/sidebar/icons/money-bills2.tsx
new file mode 100644
index 00000000000..a6a12e53916
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/money-bills2.tsx
@@ -0,0 +1,130 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import {
+  clearStyles,
+  easeOut,
+  easeOutBack,
+  segment,
+  useIconAnimation,
+} from "./use-icon-animation";
+
+const DURATION = 900;
+
+// Timeline (fractions of DURATION): the bill fades in while sliding down
+// into place, then the center circle, the two small dots, and finally the
+// top line pop in, each with a slight overshoot.
+const BILL = [0, 0.35] as const;
+const CIRCLE = [0.28, 0.58] as const;
+const DOTS: [number, number][] = [
+  [0.44, 0.7],
+  [0.52, 0.78],
+];
+const LINE = [0.66, 1] as const;
+
+const BILL_DROP = 2;
+
+function frame(svg: SVGSVGElement, t: number) {
+  const bill = svg.querySelector<SVGRectElement>("[data-bill]")!;
+  const circle = svg.querySelector<SVGCircleElement>("[data-circle]")!;
+  const dots = svg.querySelectorAll<SVGCircleElement>("[data-dot]");
+  const line = svg.querySelector<SVGLineElement>("[data-line]")!;
+
+  const b = easeOut(segment(t, ...BILL));
+  bill.style.opacity = String(b);
+  bill.style.transform = `translateY(${(b - 1) * BILL_DROP}px)`;
+
+  circle.style.transform = `scale(${easeOutBack(segment(t, ...CIRCLE))})`;
+
+  dots.forEach((dot, i) => {
+    dot.style.transform = `scale(${easeOutBack(segment(t, DOTS[i][0], DOTS[i][1]))})`;
+  });
+
+  line.style.transform = `scale(${easeOutBack(segment(t, ...LINE))})`;
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-bill]"), ["opacity", "transform"]);
+  clearStyles(svg.querySelectorAll("[data-circle],[data-dot],[data-line]"), [
+    "transform",
+  ]);
+}
+
+export function MoneyBills2({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn(
+        "overflow-visible [&_*]:[transform-box:fill-box] [&_*]:[transform-origin:center]",
+        className,
+      )}
+      {...rest}
+    >
+      <g fill="currentColor">
+        <rect
+          data-bill
+          height="10.5"
+          width="14.5"
+          fill="none"
+          rx="2"
+          ry="2"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          x="1.75"
+          y="4.75"
+        />
+        <circle
+          data-circle
+          cx="9"
+          cy="10"
+          fill="none"
+          r="2"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <circle
+          data-dot
+          cx="4.25"
+          cy="10"
+          fill="currentColor"
+          r=".75"
+          stroke="none"
+        />
+        <circle
+          data-dot
+          cx="13.75"
+          cy="10"
+          fill="currentColor"
+          r=".75"
+          stroke="none"
+        />
+        <line
+          data-line
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          x1="3.75"
+          x2="14.25"
+          y1="1.75"
+          y2="1.75"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/msgs.tsx b/apps/web/ui/layout/sidebar/icons/msgs.tsx
new file mode 100644
index 00000000000..b45f283eaa8
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/msgs.tsx
@@ -0,0 +1,71 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import { clearStyles, useIconAnimation } from "./use-icon-animation";
+
+const DURATION = 600;
+
+// Each bubble wags around its pointed corner: a decaying sine, a couple of
+// cycles, the right bubble trailing the left slightly.
+const AMPLITUDE_DEG = 7;
+const CYCLES = 2;
+const RIGHT_DELAY = 0.12;
+
+function wag(t: number) {
+  if (t <= 0 || t >= 1) return 0;
+  const decay = (1 - t) ** 2;
+  return AMPLITUDE_DEG * decay * Math.sin(t * CYCLES * 2 * Math.PI);
+}
+
+function frame(svg: SVGSVGElement, t: number) {
+  const left = svg.querySelector<SVGPathElement>("[data-left]")!;
+  const right = svg.querySelector<SVGPathElement>("[data-right]")!;
+
+  left.style.transform = `rotate(${wag(t)}deg)`;
+  right.style.transform = `rotate(${-wag(t - RIGHT_DELAY)}deg)`;
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-left],[data-right]"), ["transform"]);
+}
+
+export function Msgs({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
+      {...rest}
+    >
+      <g
+        fill="none"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      >
+        {/* Left bubble: its tail points to the bottom-left. */}
+        <path
+          data-left
+          d="M12.337,4.767c-1.095-1.806-3.074-3.017-5.34-3.017C3.547,1.75,.75,4.547,.75,7.998c0,1.136,.308,2.199,.839,3.117,.37,.695-.045,2.337-.839,3.13,1.077,.058,2.497-.428,3.13-.839,.421,.243,1.09,.566,1.964,.731,.112,.021,.232,.017,.346,.032"
+          className="[transform-box:fill-box] [transform-origin:0%_100%]"
+        />
+        {/* Right bubble: its tail points to the bottom-right. */}
+        <path
+          data-right
+          d="M12.75,7.246c2.485,0,4.5,2.015,4.5,4.5,0,.819-.222,1.584-.604,2.246-.267,.5,.033,1.683,.604,2.255-.776,.042-1.798-.309-2.255-.604-.303,.175-.785,.407-1.415,.527-.269,.051-.547,.078-.831,.078-2.486,0-4.5-2.015-4.5-4.5,0-2.486,2.015-4.5,4.5-4.5Z"
+          className="[transform-box:fill-box] [transform-origin:100%_100%]"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/square-user-sparkle2.tsx b/apps/web/ui/layout/sidebar/icons/square-user-sparkle2.tsx
new file mode 100644
index 00000000000..dac2f88835c
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/square-user-sparkle2.tsx
@@ -0,0 +1,103 @@
+import { cn } from "@dub/utils";
+import { SVGProps } from "react";
+import {
+  clearStyles,
+  easeOut,
+  easeOutBack,
+  segment,
+  useIconAnimation,
+} from "./use-icon-animation";
+
+const DURATION = 900;
+
+// Timeline (fractions of DURATION): the body rises in, the head drops in
+// with a small bounce, and the sparkle pops in last.
+const BODY = [0, 0.38] as const;
+const HEAD = [0.18, 0.62] as const;
+const STAR = [0.62, 1] as const;
+
+function frame(svg: SVGSVGElement, t: number) {
+  const body = svg.querySelector<SVGPathElement>("[data-body]")!;
+  const head = svg.querySelector<SVGCircleElement>("[data-head]")!;
+  const star = svg.querySelector<SVGPathElement>("[data-star]")!;
+
+  const b = easeOut(segment(t, ...BODY));
+  body.style.opacity = String(b);
+  body.style.transform = `scaleY(${b})`;
+
+  // Overshoots past 1, so the head lands slightly low and springs back up.
+  const h = easeOutBack(segment(t, ...HEAD));
+  head.style.opacity = h > 0 ? "1" : "0";
+  head.style.transform = `translateY(${(h - 1) * 1.5}px) scale(${h})`;
+
+  const s = easeOutBack(segment(t, ...STAR));
+  star.style.transform = `scale(${s})`;
+}
+
+function reset(svg: SVGSVGElement) {
+  clearStyles(svg.querySelectorAll("[data-body],[data-head],[data-star]"), [
+    "opacity",
+    "transform",
+  ]);
+}
+
+export function SquareUserSparkle2({
+  "data-hovered": hovered,
+  className,
+  ...rest
+}: { "data-hovered"?: boolean } & SVGProps<SVGSVGElement>) {
+  const play = useIconAnimation(DURATION, frame, reset);
+
+  return (
+    <svg
+      aria-hidden="true"
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      ref={hovered ? play : null}
+      className={cn("overflow-visible", className)}
+      {...rest}
+    >
+      <g fill="currentColor">
+        <path
+          d="M10.266,2.75H4.75c-1.105,0-2,.896-2,2V13.25c0,1.104,.895,2,2,2H13.25c1.105,0,2-.896,2-2V7.688"
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <path
+          data-body
+          d="M5.126,15.25c.444-1.725,2.01-3,3.874-3s3.43,1.275,3.874,3"
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:50%_100%]"
+        />
+        <circle
+          data-head
+          cx="9"
+          cy="7.75"
+          fill="none"
+          r="2"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          className="[transform-box:fill-box] [transform-origin:center]"
+        />
+        <path
+          data-star
+          d="M17.589,2.388l-1.515-.506-.505-1.515c-.164-.49-.975-.49-1.139,0l-.505,1.515-1.515,.506c-.245,.081-.41,.311-.41,.569s.165,.488,.41,.569l1.515,.506,.505,1.515c.082,.245,.312,.41,.57,.41s.487-.165,.57-.41l.505-1.515,1.515-.506c.245-.081,.41-.311,.41-.569s-.165-.487-.41-.569h0Z"
+          fill="currentColor"
+          stroke="none"
+          className="[transform-box:fill-box] [transform-origin:center]"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/icons/use-icon-animation.ts b/apps/web/ui/layout/sidebar/icons/use-icon-animation.ts
new file mode 100644
index 00000000000..3bd2689bd16
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/icons/use-icon-animation.ts
@@ -0,0 +1,81 @@
+import { cubicBezier } from "motion";
+import { useCallback, useRef } from "react";
+
+export const easeInOut = cubicBezier(0.645, 0.045, 0.355, 1);
+export const easeOut = cubicBezier(0.215, 0.61, 0.355, 1);
+export const easeOutBack = cubicBezier(0.34, 1.56, 0.64, 1);
+
+/** 0 → 1 → 0 over [0, 1], eased both ways. 0 outside the window. */
+export function pulse(t: number) {
+  if (t <= 0 || t >= 1) return 0;
+  return t < 0.5 ? easeInOut(t * 2) : easeInOut((1 - t) * 2);
+}
+
+/** Progress of a sub-window [from, to] of the timeline, clamped to [0, 1]. */
+export function segment(t: number, from: number, to: number) {
+  return Math.min(Math.max((t - from) / (to - from), 0), 1);
+}
+
+export function prefersReducedMotion() {
+  return (
+    typeof window !== "undefined" &&
+    window.matchMedia("(prefers-reduced-motion: reduce)").matches
+  );
+}
+
+/**
+ * Drives a hover animation for a sidebar icon with requestAnimationFrame.
+ *
+ * Returns a ref callback: attach it to the `<svg>` only while hovered
+ * (`ref={hovered ? play : null}`) so React invokes it on each hover start.
+ * A hover that lands while a run is in progress is ignored, so quickly
+ * hovering out and back in doesn't restart the animation midway.
+ *
+ * Styles are set directly per frame rather than via the Web Animations API,
+ * which promotes the animated elements to a compositor layer and softens
+ * their strokes. `frame` receives progress in [0, 1); `reset` runs once the
+ * animation finishes and must clear every inline style `frame` set, so the
+ * rest state renders exactly like the static icon.
+ */
+export function useIconAnimation(
+  duration: number,
+  frame: (svg: SVGSVGElement, t: number) => void,
+  reset: (svg: SVGSVGElement) => void,
+) {
+  const frameRef = useRef<number | null>(null);
+
+  return useCallback(
+    (svg: SVGSVGElement | null) => {
+      if (!svg || prefersReducedMotion()) return;
+      if (frameRef.current !== null) return;
+
+      const start = performance.now();
+
+      const tick = (now: number) => {
+        const t = (now - start) / duration;
+
+        if (t >= 1 || !svg.isConnected) {
+          reset(svg);
+          frameRef.current = null;
+          return;
+        }
+
+        frame(svg, t);
+        frameRef.current = requestAnimationFrame(tick);
+      };
+
+      frameRef.current = requestAnimationFrame(tick);
+    },
+    [duration, frame, reset],
+  );
+}
+
+/** Clears every inline style previously set on the given elements. */
+export function clearStyles(
+  elements: Iterable<SVGElement>,
+  props: (keyof CSSStyleDeclaration & string)[],
+) {
+  for (const el of elements) {
+    for (const prop of props) el.style[prop as any] = "";
+  }
+}
diff --git a/apps/web/ui/layout/sidebar/news.tsx b/apps/web/ui/layout/sidebar/news.tsx
index 48d90dfe46e..05619aa5663 100644
--- a/apps/web/ui/layout/sidebar/news.tsx
+++ b/apps/web/ui/layout/sidebar/news.tsx
@@ -41,7 +41,7 @@ export function News({ articles }: { articles: NewsArticle[] }) {
     <div
       className={cn(
         "group overflow-hidden border-t border-neutral-200 p-3 pt-6 transition-all duration-200",
-        cardCount > 0 ? "hover:pt-10" : "pt-3",
+        cardCount > 1 ? "hover:pt-10" : "pt-3",
       )}
       data-active={cardCount !== 0}
     >
@@ -274,14 +274,29 @@ function NewsCard({
         </div>
         <div className="relative mt-3 aspect-[16/9] w-full shrink-0 overflow-hidden rounded border border-neutral-200 bg-neutral-100">
           {image && (
-            <Image
-              src={image}
-              alt=""
-              fill
-              sizes="10vw"
-              className="rounded object-cover object-center"
-              draggable={false}
-            />
+            <Link
+              href={href || "https://dub.co"}
+              target="_blank"
+              className="absolute inset-0"
+              onClick={(e) => {
+                e.stopPropagation();
+                if (
+                  drag.current.maxDelta >
+                  (ref.current?.clientWidth ?? 0) / 10
+                ) {
+                  e.preventDefault();
+                }
+              }}
+            >
+              <Image
+                src={image}
+                alt=""
+                fill
+                sizes="10vw"
+                className="rounded object-cover object-center"
+                draggable={false}
+              />
+            </Link>
           )}
         </div>
         <div
diff --git a/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx b/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
index bed4d990546..e557adc0613 100644
--- a/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
+++ b/apps/web/ui/layout/sidebar/partner-program-dropdown.tsx
@@ -125,7 +125,7 @@ export function PartnerProgramDropdown() {
                 className="size-5 flex-none shrink-0 overflow-hidden rounded-full"
               />
             )}
-            <div className="text-content-emphasis min-w-0 truncate text-lg font-semibold">
+            <div className="text-content-emphasis min-w-0 truncate text-lg font-semibold leading-7">
               {selectedProgram?.name || "Your programs"}
             </div>
           </div>
@@ -141,10 +141,17 @@ export function PartnerProgramDropdown() {
 
 function PartnerDropdownPlaceholder() {
   return (
-    <div className="flex w-full animate-pulse items-center gap-x-2.5 rounded-lg px-2 py-1.5">
-      <div className="size-6 animate-pulse rounded-full bg-neutral-200" />
-      <div className="h-7 w-28 grow animate-pulse rounded-md bg-neutral-200" />
-      <ChevronsUpDown className="h-4 w-4 text-neutral-400" aria-hidden="true" />
+    <div className="mb-3">
+      <div className="flex w-full items-center justify-between rounded-lg px-2 py-1.5">
+        <div className="flex min-w-0 items-center gap-x-2.5 pr-2">
+          <div className="size-5 shrink-0 animate-pulse rounded-full bg-neutral-200" />
+          <div className="h-7 w-28 animate-pulse rounded-md bg-neutral-200" />
+        </div>
+        <ChevronsUpDown
+          className="size-4 shrink-0 text-neutral-400"
+          aria-hidden="true"
+        />
+      </div>
     </div>
   );
 }
diff --git a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
index d89a9c2162f..496ab2c1b98 100644
--- a/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/partners-sidebar-nav.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useProgramMessagesCount } from "@/lib/messages/hooks/use-program-messages-count";
+import { SUBMITTED_LEADS_ENABLED_PROGRAM_IDS } from "@/lib/submitted-leads/constants";
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import { usePartnerProgramBounties } from "@/lib/swr/use-partner-program-bounties";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
@@ -15,26 +16,27 @@ import {
   ColorPalette2,
   Gauge6,
   Gear2,
-  Gift,
-  GridIcon,
-  MoneyBills2,
-  Msgs,
   Nodes4,
   ShieldCheck,
   Shop,
-  SquareUserSparkle2,
   Trophy,
   UserCheck,
+  UserPlus,
   Users2,
   Webhook,
 } from "@dub/ui/icons";
 import { cn } from "@dub/utils";
 import Link from "next/link";
 import { useParams, usePathname } from "next/navigation";
-import { ReactNode, useMemo } from "react";
+import { ReactNode, useMemo, useState } from "react";
 import { CursorRays } from "./icons/cursor-rays";
+import { Gift } from "./icons/gift";
+import { GridIcon } from "./icons/grid";
 import { Hyperlink } from "./icons/hyperlink";
 import { LinesY } from "./icons/lines-y";
+import { MoneyBills2 } from "./icons/money-bills2";
+import { Msgs } from "./icons/msgs";
+import { SquareUserSparkle2 } from "./icons/square-user-sparkle2";
 import { User } from "./icons/user";
 import { PartnerProgramDropdown } from "./partner-program-dropdown";
 import { PayoutStats } from "./payout-stats";
@@ -58,6 +60,7 @@ type SidebarNavData = {
   showDetailedAnalytics?: boolean;
   postbacksEnabled?: boolean;
   hasReferralReward?: boolean;
+  submittedLeadsEnabled?: boolean;
   newsContent?: ReactNode;
 };
 
@@ -83,9 +86,9 @@ const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({
     active: pathname.startsWith("/payouts"),
   },
   {
-    name: "Partner profile",
+    name: "Profile settings",
     description:
-      "Build a great partner profile and get noticed in our partner network.",
+      "Customize your profile, invite your team, and manage your notifications.",
     icon: SquareUserSparkle2,
     href: "/profile",
     active: pathname.startsWith("/profile"),
@@ -137,7 +140,6 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
     title: <PartnerProgramDropdown />,
     content: PROGRAMS_CONTENT({ invitationsCount }),
     direction: "left",
-    showNews: true,
   }),
 
   marketplace: ({ isMobile, invitationsCount }) => ({
@@ -203,6 +205,7 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
     programBountiesCount,
     showDetailedAnalytics,
     hasReferralReward,
+    submittedLeadsEnabled,
   }) => ({
     title: <PartnerProgramDropdown />,
     content: [
@@ -275,6 +278,16 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
                 : programBountiesCount || undefined,
             locked: isUnapproved,
           },
+          ...(submittedLeadsEnabled
+            ? [
+                {
+                  name: "Submitted Leads",
+                  icon: UserPlus as Icon,
+                  href: `/programs/${programSlug}/leads` as `/${string}`,
+                  locked: isUnapproved,
+                },
+              ]
+            : []),
           ...(hasReferralReward
             ? [
                 {
@@ -392,17 +405,25 @@ export function PartnersSidebarNav({
 
   const referralsActive =
     pathname === "/referrals" || pathname.startsWith("/referrals/");
+  const [referralsHovered, setReferralsHovered] = useState(false);
 
   const composedToolContent = (
     <div className="flex flex-col items-center gap-3">
       <Link
         href="/referrals"
+        aria-label="Referrals"
+        onPointerEnter={() => setReferralsHovered(true)}
+        onPointerLeave={() => setReferralsHovered(false)}
+        onFocus={(e) =>
+          e.currentTarget.matches(":focus-visible") && setReferralsHovered(true)
+        }
+        onBlur={() => setReferralsHovered(false)}
         className={cn(
           "text-content-default flex size-11 shrink-0 items-center justify-center rounded-lg",
           referralsActive ? "bg-white" : "hover:bg-bg-inverted/5",
         )}
       >
-        <Gift className="size-5" />
+        <Gift className="size-5" data-hovered={referralsHovered} />
       </Link>
       {toolContent}
     </div>
@@ -425,11 +446,15 @@ export function PartnersSidebarNav({
         showDetailedAnalytics,
         postbacksEnabled: partner?.featureFlags?.postbacks,
         hasReferralReward: !!programEnrollment?.referralRewardId,
+        submittedLeadsEnabled: programEnrollment?.programId
+          ? SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(
+              programEnrollment.programId,
+            )
+          : false,
         newsContent,
       }}
       toolContent={composedToolContent}
-      newsContent={newsContent}
-      bottom={
+      bottomContent={
         isEnrolledProgramPage ? (
           <ProgramHelpSupport />
         ) : (
diff --git a/apps/web/ui/layout/sidebar/refer-button.tsx b/apps/web/ui/layout/sidebar/refer-button.tsx
index a80d65c8481..ad2064d4252 100644
--- a/apps/web/ui/layout/sidebar/refer-button.tsx
+++ b/apps/web/ui/layout/sidebar/refer-button.tsx
@@ -1,12 +1,12 @@
 "use client";
 
 import { useLocalStorage, useMediaQuery } from "@dub/ui";
-import { Gift } from "@dub/ui/icons";
 import { cn } from "@dub/utils/src";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { AffiliateProgramPopup } from "./affiliate-program-popup";
+import { Gift } from "./icons/gift";
 
 export function ReferButton({
   affiliatePopupEnabled = false,
@@ -15,18 +15,26 @@ export function ReferButton({
 }) {
   const { width } = useMediaQuery();
   const [linkRef, setLinkRef] = useState<HTMLAnchorElement | null>(null);
+  const [hovered, setHovered] = useState(false);
 
   return (
     <>
       <Link
         ref={affiliatePopupEnabled ? setLinkRef : undefined}
         href="/account/settings/referrals"
+        aria-label="Referrals"
+        onPointerEnter={() => setHovered(true)}
+        onPointerLeave={() => setHovered(false)}
+        onFocus={(e) =>
+          e.currentTarget.matches(":focus-visible") && setHovered(true)
+        }
+        onBlur={() => setHovered(false)}
         className={cn(
           "animate-fade-in hover:bg-bg-inverted/5 active:bg-bg-inverted/10 flex size-11 shrink-0 items-center justify-center rounded-lg transition-colors duration-150",
           "outline-none focus-visible:ring-2 focus-visible:ring-black/50",
         )}
       >
-        <Gift className="text-content-default size-5" />
+        <Gift className="text-content-default size-5" data-hovered={hovered} />
       </Link>
       {affiliatePopupEnabled && width && width >= 768 && (
         <AffiliateProgramPopupWrapper referenceElement={linkRef} />
diff --git a/apps/web/ui/layout/sidebar/sidebar-nav.tsx b/apps/web/ui/layout/sidebar/sidebar-nav.tsx
index b761d71a1af..f7cd1acd4fd 100644
--- a/apps/web/ui/layout/sidebar/sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/sidebar-nav.tsx
@@ -67,7 +67,6 @@ export type SidebarNavAreas<T extends Record<any, any>> = Record<
   (args: T) => {
     title?: string | ReactNode;
     backHref?: string;
-    showNews?: boolean; // show news segment – TODO: enable this for Partner Program too
     hideSwitcherIcons?: boolean; // hide workspace switcher + product icons for this area
     direction?: "left" | "right";
     // can either be a list of items, or a ReactNode
@@ -89,19 +88,19 @@ export function SidebarNav<T extends Record<any, any>>({
   areas,
   currentArea,
   data,
+  switcher,
   toolContent,
+  bottomContent,
   newsContent,
-  switcher,
-  bottom,
 }: {
   groups: SidebarNavGroups<T>;
   areas: SidebarNavAreas<T>;
   currentArea: string | null;
   data: T;
+  switcher?: ReactNode;
   toolContent?: ReactNode;
+  bottomContent?: ReactNode;
   newsContent?: ReactNode;
-  switcher?: ReactNode;
-  bottom?: ReactNode;
 }) {
   return (
     <div
@@ -156,7 +155,7 @@ export function SidebarNav<T extends Record<any, any>>({
               data={data}
               currentArea={currentArea}
               newsContent={newsContent}
-              bottom={bottom}
+              bottomContent={bottomContent}
             />
           </div>
         </nav>
@@ -170,17 +169,16 @@ function SidebarAreasPanel<T extends Record<any, any>>({
   data,
   currentArea,
   newsContent,
-  bottom,
+  bottomContent,
 }: {
   areas: SidebarNavAreas<T>;
   data: T;
   currentArea: string | null;
   newsContent?: ReactNode;
-  bottom?: ReactNode;
+  bottomContent?: ReactNode;
 }) {
   const scrollRef = useRef<HTMLDivElement>(null);
   const { scrollProgress, updateScrollProgress } = useScrollProgress(scrollRef);
-  const showNews = currentArea && areas[currentArea]?.(data).showNews;
 
   return (
     <div className="flex h-full w-[calc(var(--sidebar-areas-width)-0.5rem)] flex-col rounded-xl bg-neutral-100">
@@ -264,8 +262,7 @@ function SidebarAreasPanel<T extends Record<any, any>>({
         height
         className="flex flex-shrink-0 flex-col gap-2 rounded-b-xl"
       >
-        {bottom}
-        {showNews && newsContent}
+        {bottomContent ? bottomContent : newsContent}
       </AnimatedSizeContainer>
     </div>
   );
@@ -352,8 +349,13 @@ function NavGroupItem({
           <Link
             ref={Popup ? setElement : undefined}
             href={href}
+            aria-label={name}
             onPointerEnter={() => setHovered(true)}
             onPointerLeave={() => setHovered(false)}
+            onFocus={(e) =>
+              e.currentTarget.matches(":focus-visible") && setHovered(true)
+            }
+            onBlur={() => setHovered(false)}
             onClick={onClick}
             className={cn(
               "relative flex size-11 items-center justify-center rounded-lg transition-colors duration-150",
diff --git a/apps/web/ui/layout/sidebar/sidebar-usage.tsx b/apps/web/ui/layout/sidebar/sidebar-usage.tsx
index 5c3cfb75595..4d765c212e9 100644
--- a/apps/web/ui/layout/sidebar/sidebar-usage.tsx
+++ b/apps/web/ui/layout/sidebar/sidebar-usage.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { clientAccessCheck } from "@/lib/client-access-check";
+import { testIds } from "@/lib/e2e/test-ids";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { useRetryPaymentModal } from "@/ui/modals/retry-payment-modal";
 import { useStartPaidPlanModal } from "@/ui/modals/start-paid-plan-modal";
@@ -124,7 +125,10 @@ function UsageInner() {
         <div className="border-t border-neutral-300/80 p-3">
           {isTrial ? (
             <div className="flex items-center justify-between gap-2">
-              <span className="text-sm font-semibold text-neutral-900">
+              <span
+                className="text-sm font-semibold text-neutral-900"
+                data-testid={testIds.billing.freeTrial}
+              >
                 Free trial
               </span>
 
diff --git a/apps/web/ui/layout/sidebar/special-news-content.tsx b/apps/web/ui/layout/sidebar/special-news-content.tsx
new file mode 100644
index 00000000000..09044263944
--- /dev/null
+++ b/apps/web/ui/layout/sidebar/special-news-content.tsx
@@ -0,0 +1,17 @@
+import { News } from "./news";
+
+export function SpecialNewsContent() {
+  return (
+    <News
+      articles={[
+        {
+          href: "https://dub.co/startups",
+          title: "Dub Startup Program 🚀",
+          summary:
+            "50% off our yearly Advanced plan – our biggest discount ever.",
+          image: "https://assets.dub.co/og/startups.jpg",
+        },
+      ]}
+    />
+  );
+}
diff --git a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
index 09402872c00..09ceaeca02b 100644
--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx
@@ -5,7 +5,7 @@ import useWorkspaces from "@/lib/swr/use-workspaces";
 import { PlanProps, WorkspaceProps } from "@/lib/types";
 import { ModalContext } from "@/ui/modals/modal-provider";
 import { getUserAvatarUrl } from "@/ui/users/user-avatar";
-import { BlurImage, Popover, ScrollContainer } from "@dub/ui";
+import { BlurImage, Popover, ScrollContainer, StatusBadge } from "@dub/ui";
 import { Check2, Gear, Plus, UserPlus } from "@dub/ui/icons";
 import { cn, isLegacyBusinessPlan, pluralize } from "@dub/utils";
 import { useSession } from "next-auth/react";
@@ -60,6 +60,7 @@ export function WorkspaceDropdown() {
     slug: string;
     image: string;
     plan: PlanProps;
+    disabledAt?: Date | string | null;
   };
 
   const [openPopover, setOpenPopover] = useState(false);
@@ -122,6 +123,7 @@ function WorkspaceList({
     slug?: string; // undefined if the user is on the personal account
     image: string;
     plan: PlanProps;
+    disabledAt?: Date | string | null;
   };
   workspaces: WorkspaceProps[];
   setOpenPopover: (open: boolean) => void;
@@ -165,8 +167,20 @@ function WorkspaceList({
             draggable={false}
           />
           <div className="min-w-0">
-            <div className="truncate text-base font-medium leading-5 text-neutral-900 sm:text-sm">
-              {selected.name}
+            <div className="flex min-w-0 items-center gap-1.5">
+              <div className="min-w-0 truncate text-base font-medium leading-5 text-neutral-900 sm:text-sm">
+                {selected.name}
+              </div>
+              {selected.disabledAt && (
+                <StatusBadge
+                  variant="neutral"
+                  size="sm"
+                  icon={null}
+                  className="shrink-0"
+                >
+                  Disabled
+                </StatusBadge>
+              )}
             </div>
             {selected.slug && (
               <div
@@ -214,13 +228,13 @@ function WorkspaceList({
             Workspaces
           </p>
           <div className="flex flex-col gap-0.5">
-            {workspaces.map(({ id, name, slug, logo }) => {
+            {workspaces.map(({ id, name, slug, logo, disabledAt }) => {
               const isActive = selected.slug === slug;
               return (
                 <Link
                   key={slug}
                   className={cn(
-                    "relative flex w-full items-center gap-x-2 rounded-md px-2 py-2 transition-all duration-75",
+                    "flex w-full items-center gap-x-2 rounded-md px-2 py-2 transition-all duration-75",
                     "hover:bg-neutral-200/50 active:bg-neutral-200/80",
                     "outline-none focus-visible:ring-2 focus-visible:ring-black/50",
                     isActive && "bg-neutral-200/50",
@@ -237,13 +251,24 @@ function WorkspaceList({
                     className="size-5 shrink-0 overflow-hidden rounded-full"
                     draggable={false}
                   />
-                  <span className="block truncate text-base leading-5 text-neutral-900 sm:max-w-[140px] sm:text-sm">
+                  <span className="min-w-0 flex-1 truncate text-base leading-5 text-neutral-900 sm:text-sm">
                     {name}
                   </span>
-                  {selected.slug === slug ? (
-                    <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-black">
-                      <Check2 className="size-4" aria-hidden="true" />
-                    </span>
+                  {disabledAt && (
+                    <StatusBadge
+                      variant="neutral"
+                      size="sm"
+                      icon={null}
+                      className="shrink-0"
+                    >
+                      Disabled
+                    </StatusBadge>
+                  )}
+                  {isActive ? (
+                    <Check2
+                      className="size-4 shrink-0 text-black"
+                      aria-hidden="true"
+                    />
                   ) : null}
                 </Link>
               );
diff --git a/apps/web/ui/layout/upgrade-banner.tsx b/apps/web/ui/layout/upgrade-banner.tsx
index a5cb31fcec0..ffa813fec05 100644
--- a/apps/web/ui/layout/upgrade-banner.tsx
+++ b/apps/web/ui/layout/upgrade-banner.tsx
@@ -83,7 +83,7 @@ export function UpgradeBanner() {
         initial={{ transform: "translateY(-100%)" }}
         animate={{ transform: "translateY(0)" }}
         className={cn(
-          "fixed left-0 right-0 top-0 z-50 flex items-center justify-center overflow-hidden px-6 py-2 text-white sm:h-12 sm:py-0",
+          "fixed left-0 right-0 top-0 z-30 flex items-center justify-center overflow-hidden px-6 py-2 text-white sm:h-12 sm:py-0",
           needsUpgrade ? "bg-amber-600" : "bg-red-600",
         )}
       >
diff --git a/apps/web/ui/links/link-builder/use-link-builder-submit.tsx b/apps/web/ui/links/link-builder/use-link-builder-submit.tsx
index caaeb4cf0c3..7fb337d95b0 100644
--- a/apps/web/ui/links/link-builder/use-link-builder-submit.tsx
+++ b/apps/web/ui/links/link-builder/use-link-builder-submit.tsx
@@ -37,6 +37,8 @@ export function useLinkBuilderSubmit({
         expiredUrl: rest.expiredUrl || null,
         ios: rest.ios || null,
         android: rest.android || null,
+        externalId: rest.externalId || null,
+        tenantId: rest.tenantId || null,
 
         // Create partner links
         ...(partnerId
diff --git a/apps/web/ui/links/links-container.tsx b/apps/web/ui/links/links-container.tsx
index e24ce1bc3bd..9efb5e2ee78 100644
--- a/apps/web/ui/links/links-container.tsx
+++ b/apps/web/ui/links/links-container.tsx
@@ -18,6 +18,7 @@ import {
 } from "react";
 import { PageWidthWrapper } from "../layout/page-width-wrapper";
 import { AnimatedEmptyState } from "../shared/animated-empty-state";
+import { Callout } from "../shared/callout";
 import { LinkCard } from "./link-card";
 import LinkCardPlaceholder from "./link-card-placeholder";
 import { LinkSelectionProvider } from "./link-selection-provider";
@@ -108,9 +109,9 @@ function LinksList({
     <LinksListContext.Provider value={{ openMenuLinkId, setOpenMenuLinkId }}>
       <LinkSelectionProvider links={links}>
         {error ? (
-          <div className="rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-800">
+          <Callout variant="error" size={2}>
             {errorMessage}
-          </div>
+          </Callout>
         ) : !links || links.length ? (
           // Cards
           <CardList variant={compact ? "compact" : "loose"} loading={loading}>
diff --git a/apps/web/ui/messages/message-attachments.tsx b/apps/web/ui/messages/message-attachments.tsx
index e966467aa22..c7785d50674 100644
--- a/apps/web/ui/messages/message-attachments.tsx
+++ b/apps/web/ui/messages/message-attachments.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import {
-  getAttachmentTypeLabel,
   isPreviewableImageType,
   sortMessageAttachments,
 } from "@/lib/messages/utils";
+import { getMimeTypeLabel } from "@/lib/storage/upload-policies";
 import { MessageAttachment } from "@/lib/types";
 import { formatFileSize } from "@dub/utils";
 import { cn } from "@dub/utils/src";
@@ -148,7 +148,7 @@ function FileTypeBadge({ type }: { type: string }) {
       )}
     >
       <File className="size-3 shrink-0" />
-      <span>{getAttachmentTypeLabel(type)}</span>
+      <span>{getMimeTypeLabel(type)}</span>
     </div>
   );
 }
diff --git a/apps/web/ui/messages/message-markdown.tsx b/apps/web/ui/messages/message-markdown.tsx
index 9b9c1106ecc..b17c47cf1d9 100644
--- a/apps/web/ui/messages/message-markdown.tsx
+++ b/apps/web/ui/messages/message-markdown.tsx
@@ -1,3 +1,4 @@
+import { Tooltip } from "@dub/ui";
 import { cn } from "@dub/utils";
 import ReactMarkdown from "react-markdown";
 import "react-medium-image-zoom/dist/styles.css";
@@ -16,13 +17,13 @@ export function MessageMarkdown({
   return (
     <ReactMarkdown
       className={cn(
-        "prose prose-sm prose-neutral max-w-none transition-all",
+        "prose prose-sm prose-neutral max-w-none break-words transition-all [overflow-wrap:anywhere]",
         "prose-headings:font-semibold prose-headings:border-b prose-headings:pb-2",
         "prose-h1:text-2xl prose-h1:font-bold prose-h1:mt-8 prose-h1:mb-4",
         "prose-h2:text-xl prose-h2:font-semibold prose-h2:mt-6 prose-h2:mb-3",
         "prose-h3:text-lg prose-h3:font-semibold prose-h3:mt-4 prose-h3:mb-2",
         "prose-h4:text-base prose-h4:font-semibold prose-h4:mt-3 prose-h4:mb-1",
-        "prose-p:leading-5 prose-p:mb-4 prose-p:m-2.5",
+        "prose-p:leading-5 prose-p:m-0 [&_p+p]:mt-2",
         "prose-a:font-medium prose-a:underline prose-a:underline-offset-2",
         "prose-strong:font-semibold",
         "prose-em:italic",
@@ -38,15 +39,15 @@ export function MessageMarkdown({
         invert
           ? [
               "prose-headings:text-white prose-headings:border-neutral-600",
-              "prose-p:text-neutral-200",
-              "prose-a:text-neutral-300 hover:prose-a:text-neutral-100",
+              "prose-p:text-white",
+              "prose-a:text-white hover:prose-a:text-white/80",
               "prose-strong:text-white",
-              "prose-em:text-neutral-200",
-              "prose-code:text-neutral-100 prose-code:bg-neutral-800",
+              "prose-em:text-white",
+              "prose-code:text-white prose-code:bg-neutral-800",
               "prose-pre:bg-neutral-800 prose-pre:border-neutral-600",
-              "prose-blockquote:border-neutral-500 prose-blockquote:text-neutral-300",
-              "prose-ul:text-neutral-200",
-              "prose-ol:text-neutral-200",
+              "prose-blockquote:border-neutral-500 prose-blockquote:text-white",
+              "prose-ul:text-white",
+              "prose-ol:text-white",
               "prose-hr:border-neutral-600",
               "prose-img:border-neutral-600",
             ]
@@ -80,7 +81,15 @@ export function MessageMarkdown({
       ]}
       components={{
         a: ({ node, ...props }) => (
-          <a {...props} target="_blank" rel="noopener noreferrer" />
+          <Tooltip
+            content={
+              <span className="text-content-default block max-w-[200px] break-all px-2.5 py-1.5 text-xs">
+                {props.href}
+              </span>
+            }
+          >
+            <a {...props} target="_blank" rel="noopener noreferrer" />
+          </Tooltip>
         ),
         img: ({ node, ...props }) => <ZoomImage {...props} />,
         p: ({ node, children, ...props }) => {
diff --git a/apps/web/ui/messages/messages-panel.tsx b/apps/web/ui/messages/messages-panel.tsx
index 58adce41b6f..71cd3289497 100644
--- a/apps/web/ui/messages/messages-panel.tsx
+++ b/apps/web/ui/messages/messages-panel.tsx
@@ -164,6 +164,10 @@ export function MessagesPanel({
                 const isFirstFromSender =
                   idx === 0 || !isMessageSameSender(message, messages[idx - 1]);
 
+                // Messages continuing a sender's group sit tighter together:
+                // trims the container's 8px gap down to 2px
+                const isGroupedWithPrevious = !isFirstFromSender && !isNewTime;
+
                 return (
                   <Fragment
                     key={`${new Date(message.createdAt).getTime()}-${message.senderUserId}-${message.senderPartnerId}`}
@@ -199,6 +203,7 @@ export function MessagesPanel({
                         showStatusIndicator={showStatusIndicator}
                         isNewTime={isNewTime}
                         isFirstFromSender={isFirstFromSender}
+                        isGroupedWithPrevious={isGroupedWithPrevious}
                         isNew={isNew}
                         program={program}
                       />
@@ -210,6 +215,7 @@ export function MessagesPanel({
                             ? "origin-bottom-right flex-row-reverse"
                             : "origin-bottom-left",
                           isNew && "animate-scale-in-fade",
+                          isGroupedWithPrevious && "-mt-1.5",
                         )}
                       >
                         {/* Avatar */}
@@ -244,7 +250,7 @@ export function MessagesPanel({
                           {message.text && (
                             <div
                               className={cn(
-                                "max-w-[min(100%,512px)] rounded-xl px-4 py-2.5 text-sm",
+                                "min-w-0 max-w-[min(100%,512px)] rounded-xl px-4 py-2.5 text-sm",
                                 isMySide
                                   ? "rounded-br bg-neutral-700"
                                   : "rounded-bl bg-neutral-100",
@@ -438,6 +444,7 @@ function CampaignMessage({
   showStatusIndicator,
   isNewTime,
   isFirstFromSender,
+  isGroupedWithPrevious,
   isNew,
   program,
 }: {
@@ -448,6 +455,7 @@ function CampaignMessage({
   showStatusIndicator: boolean;
   isNewTime: boolean;
   isFirstFromSender: boolean;
+  isGroupedWithPrevious: boolean;
   isNew: boolean;
   program?: Pick<ProgramProps, "logo" | "name"> | null;
 }) {
@@ -461,6 +469,7 @@ function CampaignMessage({
           ? "origin-bottom-right flex-row-reverse"
           : "origin-bottom-left",
         isNew && "animate-scale-in-fade",
+        isGroupedWithPrevious && "-mt-1.5",
       )}
     >
       <MessageAvatar sender={sender} program={program} message={message} />
@@ -484,7 +493,7 @@ function CampaignMessage({
 
         <div
           className={cn(
-            "max-w-[min(100%,512px)] rounded-xl text-sm",
+            "min-w-0 max-w-[min(100%,512px)] rounded-xl text-sm",
             isMySide
               ? "text-content-inverted rounded-br bg-neutral-700"
               : "text-content-default rounded-bl bg-neutral-100",
@@ -530,7 +539,7 @@ function CampaignMessage({
             <div
               className={cn(
                 "max-w-lg overflow-hidden",
-                isExpanded ? "px-2 py-2.5" : "max-h-0 px-2 py-0",
+                isExpanded ? "px-4 py-2.5" : "max-h-0 px-4 py-0",
               )}
             >
               <MessageMarkdown invert={isMySide}>
diff --git a/apps/web/ui/modals/add-discount-code-modal.tsx b/apps/web/ui/modals/add-discount-code-modal.tsx
index 7c7750be0e0..6a28466359d 100644
--- a/apps/web/ui/modals/add-discount-code-modal.tsx
+++ b/apps/web/ui/modals/add-discount-code-modal.tsx
@@ -10,7 +10,9 @@ import {
   Modal,
   useCopyToClipboard,
 } from "@dub/ui";
+import { CircleWarning, TriangleWarning } from "@dub/ui/icons";
 import { cn, getPrettyUrl } from "@dub/utils";
+import { DiscountProvider } from "@prisma/client";
 import { Tag } from "lucide-react";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -28,12 +30,14 @@ interface AddDiscountCodeModalProps {
   showModal: boolean;
   setShowModal: (showModal: boolean) => void;
   partner: EnrolledPartnerProps;
+  getDiscountProvider: (linkId: string) => DiscountProvider | null;
 }
 
 const AddDiscountCodeModal = ({
   showModal,
   setShowModal,
   partner,
+  getDiscountProvider,
 }: AddDiscountCodeModalProps) => {
   const [search, setSearch] = useState("");
   const [isOpen, setIsOpen] = useState(false);
@@ -50,7 +54,18 @@ const AddDiscountCodeModal = ({
     },
   });
 
-  const [linkId] = watch(["linkId"]);
+  const [linkId, code] = watch(["linkId", "code"]);
+
+  const provider = linkId ? getDiscountProvider(linkId) : null;
+  const restrictsCodeFormat =
+    provider === DiscountProvider.stripe ||
+    provider === DiscountProvider.shopify;
+  const trimmedCode = (code ?? "").trim();
+  // Stripe and Shopify only allow letters, numbers, dashes, and underscores.
+  const codeToCreate = restrictsCodeFormat
+    ? trimmedCode.replace(/\s+/g, "-").replace(/[^a-zA-Z0-9\-_]/g, "")
+    : trimmedCode;
+  const codeWillChange = restrictsCodeFormat && codeToCreate !== trimmedCode;
 
   // Get partner links for the dropdown
   const partnerLinks = partner.links || [];
@@ -75,10 +90,15 @@ const AddDiscountCodeModal = ({
   }, [partnerLinks, debouncedSearch]);
 
   const onSubmit = async (formData: FormData) => {
+    if (!provider) {
+      return;
+    }
+
     await makeRequest("/api/discount-codes", {
       method: "POST",
       body: {
         ...formData,
+        code: codeToCreate,
         partnerId: partner.id,
       },
       onSuccess: async (data) => {
@@ -206,6 +226,23 @@ const AddDiscountCodeModal = ({
                   placeholder={partner.name.split(" ")[0].toUpperCase()}
                 />
               </div>
+              {codeWillChange &&
+                (codeToCreate ? (
+                  <p className="flex items-center gap-1.5 text-xs text-neutral-500">
+                    <TriangleWarning className="size-3.5 shrink-0 text-amber-500" />
+                    <span className="min-w-0">
+                      Will be created as{" "}
+                      <code className="break-all rounded-md bg-neutral-100 px-1.5 py-0.5 font-mono text-neutral-800">
+                        {codeToCreate}
+                      </code>
+                    </span>
+                  </p>
+                ) : (
+                  <p className="flex items-center gap-1.5 text-xs text-red-600">
+                    <CircleWarning className="size-3.5 shrink-0" />
+                    Use letters, numbers, dashes, or underscores
+                  </p>
+                ))}
               <p className="text-xs text-neutral-500">
                 Discount codes cannot be edited after creation
               </p>
@@ -226,7 +263,7 @@ const AddDiscountCodeModal = ({
             }
             className="h-8 w-fit pl-2.5 pr-1.5"
             loading={isSubmitting}
-            disabled={!linkId}
+            disabled={!linkId || !provider || (codeWillChange && !codeToCreate)}
           />
         </div>
       </form>
@@ -236,8 +273,10 @@ const AddDiscountCodeModal = ({
 
 export function useAddDiscountCodeModal({
   partner,
+  getDiscountProvider,
 }: {
   partner: EnrolledPartnerProps;
+  getDiscountProvider: (linkId: string) => DiscountProvider | null;
 }) {
   const [showAddDiscountCodeModal, setShowAddDiscountCodeModal] =
     useState(false);
@@ -248,9 +287,15 @@ export function useAddDiscountCodeModal({
         showModal={showAddDiscountCodeModal}
         setShowModal={setShowAddDiscountCodeModal}
         partner={partner}
+        getDiscountProvider={getDiscountProvider}
       />
     );
-  }, [showAddDiscountCodeModal, setShowAddDiscountCodeModal, partner]);
+  }, [
+    showAddDiscountCodeModal,
+    setShowAddDiscountCodeModal,
+    partner,
+    getDiscountProvider,
+  ]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/add-edit-token-modal.tsx b/apps/web/ui/modals/add-edit-token-modal.tsx
index e08c2a38cbb..547e3aeff20 100644
--- a/apps/web/ui/modals/add-edit-token-modal.tsx
+++ b/apps/web/ui/modals/add-edit-token-modal.tsx
@@ -130,8 +130,19 @@ function AddEditTokenModal({
   };
 
   const { name, scopes } = data;
-  const buttonDisabled =
-    (!name || token?.name === name) && token?.scopes === scopes;
+  const selectedScopes = Object.values(scopes).filter(Boolean);
+
+  let disabledReason: string | null = null;
+
+  if (selectedScopes.length === 0) {
+    disabledReason = "Select at least one permission.";
+  } else if (!name) {
+    disabledReason = "Enter a name.";
+  } else if (token?.name === name && token?.scopes === scopes) {
+    disabledReason = "No changes have been made.";
+  }
+
+  const buttonDisabled = disabledReason !== null;
 
   const scopesByResources = transformScopesForUI(
     getScopesByResourceForRole(role),
@@ -314,6 +325,7 @@ function AddEditTokenModal({
           <Button
             text={token ? "Save changes" : "Create API key"}
             disabled={buttonDisabled}
+            disabledTooltip={disabledReason}
             loading={saving}
           />
         </form>
diff --git a/apps/web/ui/modals/add-partner-link-modal.tsx b/apps/web/ui/modals/add-partner-link-modal.tsx
index bc29bf122a6..7cd41f6800a 100644
--- a/apps/web/ui/modals/add-partner-link-modal.tsx
+++ b/apps/web/ui/modals/add-partner-link-modal.tsx
@@ -1,23 +1,34 @@
-import { extractUtmParams } from "@/lib/api/utm/extract-utm-params";
-import useGroup from "@/lib/swr/use-group";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
+import { mutatePrefix } from "@/lib/swr/mutate";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { EnrolledPartnerProps, LinkProps } from "@/lib/types";
-import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
+import { createPartnerLinkSchemaInternal } from "@/lib/zod/schemas/partners";
+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
+import { DiscountSelector } from "@/ui/partners/rewards/discount-selector";
+import { RewardSelector } from "@/ui/partners/rewards/reward-selector";
+import { useCustomRewardAndDiscountOptions } from "@/ui/partners/rewards/use-custom-reward-and-discount-options";
 import {
+  AnimatedSizeContainer,
   ArrowTurnLeft,
   Button,
   InfoTooltip,
   Modal,
+  Tooltip,
+  TooltipContent,
   useCopyToClipboard,
+  useLatestCallback,
   useMediaQuery,
 } from "@dub/ui";
-import { constructURLFromUTMParams } from "@dub/utils";
-import { UtmTemplate } from "@prisma/client";
-import { useCallback, useMemo, useRef, useState } from "react";
-import { useForm } from "react-hook-form";
+import { cn } from "@dub/utils";
+import { ChevronDown } from "lucide-react";
+import { motion } from "motion/react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { mutate } from "swr";
+import * as z from "zod/v4";
 import { X } from "../shared/icons";
 
 interface AddPartnerLinkModalProps {
@@ -27,10 +38,15 @@ interface AddPartnerLinkModalProps {
   partner: Pick<EnrolledPartnerProps, "id" | "email" | "groupId">;
 }
 
-interface FormData {
-  key: string;
-  url: string;
-}
+type FormData = Pick<
+  z.infer<typeof createPartnerLinkSchemaInternal>,
+  | "key"
+  | "url"
+  | "clickRewardId"
+  | "leadRewardId"
+  | "saleRewardId"
+  | "discountId"
+>;
 
 const AddPartnerLinkModal = ({
   showModal,
@@ -40,27 +56,60 @@ const AddPartnerLinkModal = ({
 }: AddPartnerLinkModalProps) => {
   const { program } = useProgram();
   const { isMobile } = useMediaQuery();
-  const { id: workspaceId } = useWorkspace();
+  const { id: workspaceId, plan } = useWorkspace();
+  const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
+  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+    useAdvancedUpsellModal();
   const [, copyToClipboard] = useCopyToClipboard();
   const formRef = useRef<HTMLFormElement>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [showOverrides, setShowOverrides] = useState(false);
 
-  const { register, handleSubmit, watch } = useForm<FormData>({
-    defaultValues: {
-      key: "",
-      url: program?.url || "",
-    },
+  const {
+    clickRewards,
+    saleRewards,
+    leadRewards,
+    discounts,
+    groupClickRewardId,
+    groupLeadRewardId,
+    groupSaleRewardId,
+    groupDiscountId,
+  } = useCustomRewardAndDiscountOptions({
+    partnerGroupId: partner.groupId,
   });
 
-  const { group: partnerGroup } = useGroup({
-    groupIdOrSlug: partner.groupId ?? DEFAULT_PARTNER_GROUP.slug,
-  });
+  const { register, handleSubmit, watch, setValue, control } =
+    useForm<FormData>({
+      defaultValues: {
+        key: "",
+        url: program?.url || "",
+        clickRewardId: null,
+        leadRewardId: null,
+        saleRewardId: null,
+        discountId: null,
+      },
+    });
 
-  const [key, url] = watch(["key", "url"]);
+  const key = watch("key");
+  const prevShowModal = useRef(showModal);
+
+  useEffect(() => {
+    if (showModal && !prevShowModal.current) {
+      setValue("key", "");
+      setValue("url", program?.url || "");
+      setValue("clickRewardId", null);
+      setValue("leadRewardId", null);
+      setValue("saleRewardId", null);
+      setValue("discountId", null);
+      setShowOverrides(false);
+      setErrorMessage(null);
+    }
+    prevShowModal.current = showModal;
+  }, [showModal, program?.url, setValue]);
 
   const onSubmit = async (formData: FormData) => {
-    if (!program?.id || !partner.id) {
+    if (!partner.id) {
       return;
     }
 
@@ -68,27 +117,24 @@ const AddPartnerLinkModal = ({
     setErrorMessage(null);
 
     try {
-      const response = await fetch(`/api/links?workspaceId=${workspaceId}`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          ...formData,
-          partnerId: partner.id,
-          programId: program.id,
-          domain: program.domain,
-          url: constructURLFromUTMParams(
-            url,
-            extractUtmParams(partnerGroup?.utmTemplate as UtmTemplate),
-          ),
-          ...extractUtmParams(partnerGroup?.utmTemplate as UtmTemplate, {
-            excludeRef: true,
+      const response = await fetch(
+        `/api/partners/links?workspaceId=${workspaceId}`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            partnerId: partner.id,
+            key: formData.key,
+            url: formData.url || undefined,
+            clickRewardId: formData.clickRewardId || undefined,
+            leadRewardId: formData.leadRewardId || undefined,
+            saleRewardId: formData.saleRewardId || undefined,
+            discountId: formData.discountId || undefined,
           }),
-          trackConversion: true,
-          folderId: program.defaultFolderId,
-        }),
-      });
+        },
+      );
 
       const data = await response.json();
 
@@ -96,7 +142,10 @@ const AddPartnerLinkModal = ({
         throw new Error(data.error.message);
       }
 
-      await mutate(`/api/partners/${partner.id}?workspaceId=${workspaceId}`);
+      await Promise.all([
+        mutatePrefix("/api/partners/links"),
+        mutate(`/api/partners/${partner.id}?workspaceId=${workspaceId}`),
+      ]);
       toast.success("Link created successfully!");
       onSuccess?.(data);
       setShowModal(false);
@@ -114,8 +163,9 @@ const AddPartnerLinkModal = ({
     <Modal
       showModal={showModal}
       setShowModal={setShowModal}
-      className="max-w-lg"
+      className="max-w-lg overflow-visible"
     >
+      {advancedUpsellModal}
       <form ref={formRef} onSubmit={handleSubmit(onSubmit)}>
         <div className="flex flex-col items-start justify-between gap-4 px-6 py-4">
           <div className="flex w-full items-center justify-between">
@@ -135,9 +185,9 @@ const AddPartnerLinkModal = ({
                 <div className="flex items-center gap-2">
                   <label
                     htmlFor="key"
-                    className="block text-sm font-medium text-neutral-700"
+                    className="text-content-emphasis block text-sm font-medium"
                   >
-                    Short Link
+                    Short link
                   </label>
 
                   <InfoTooltip content="This is the short link that will redirect to your destination URL. [Learn more.](https://dub.co/help/article/how-to-create-link)" />
@@ -172,7 +222,7 @@ const AddPartnerLinkModal = ({
               <div className="flex items-center gap-2">
                 <label
                   htmlFor="url"
-                  className="block text-sm font-medium text-neutral-700"
+                  className="text-content-emphasis block text-sm font-medium"
                 >
                   Destination URL
                 </label>
@@ -189,10 +239,111 @@ const AddPartnerLinkModal = ({
                 />
               </div>
             </div>
+
+            <div className="flex flex-col">
+              <Tooltip
+                content={
+                  !canUseAdvancedRewardLogic ? (
+                    <TooltipContent
+                      title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+                      cta="Upgrade to Advanced"
+                      onClick={() => setShowAdvancedUpsellModal(true)}
+                    />
+                  ) : undefined
+                }
+              >
+                <button
+                  type="button"
+                  className={cn(
+                    "flex w-full items-center gap-2",
+                    !canUseAdvancedRewardLogic &&
+                      "cursor-not-allowed opacity-50",
+                  )}
+                  onClick={() => {
+                    if (!canUseAdvancedRewardLogic) {
+                      return;
+                    }
+                    setShowOverrides(!showOverrides);
+                  }}
+                >
+                  <p className="text-sm text-neutral-600">
+                    {showOverrides ? "Hide" : "Show"} rewards and discount
+                    overrides
+                  </p>
+                  <motion.div
+                    animate={{ rotate: showOverrides ? 180 : 0 }}
+                    className="text-neutral-600"
+                  >
+                    <ChevronDown className="size-4" />
+                  </motion.div>
+                </button>
+              </Tooltip>
+
+              <AnimatedSizeContainer height className="-mx-1 overflow-visible">
+                {showOverrides && canUseAdvancedRewardLogic && (
+                  <div className="flex flex-col gap-6 px-1 pt-4">
+                    <Controller
+                      control={control}
+                      name="saleRewardId"
+                      render={({ field }) => (
+                        <RewardSelector
+                          label="Sale reward"
+                          options={saleRewards}
+                          selectedId={field.value ?? groupSaleRewardId}
+                          onChange={field.onChange}
+                        />
+                      )}
+                    />
+                    <Controller
+                      control={control}
+                      name="leadRewardId"
+                      render={({ field }) => (
+                        <RewardSelector
+                          label="Lead reward"
+                          options={leadRewards}
+                          selectedId={field.value ?? groupLeadRewardId}
+                          onChange={field.onChange}
+                        />
+                      )}
+                    />
+                    <Controller
+                      control={control}
+                      name="clickRewardId"
+                      render={({ field }) => (
+                        <RewardSelector
+                          label="Click reward"
+                          options={clickRewards}
+                          selectedId={field.value ?? groupClickRewardId}
+                          onChange={field.onChange}
+                        />
+                      )}
+                    />
+                    <Controller
+                      control={control}
+                      name="discountId"
+                      render={({ field }) => (
+                        <DiscountSelector
+                          options={discounts}
+                          selectedId={field.value ?? groupDiscountId}
+                          onChange={field.onChange}
+                        />
+                      )}
+                    />
+                  </div>
+                )}
+              </AnimatedSizeContainer>
+            </div>
           </div>
         </div>
-
-        <div className="flex items-center justify-end border-t border-neutral-200 bg-neutral-50 p-4">
+        <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 p-4 sm:rounded-b-2xl">
+          <Button
+            type="button"
+            variant="secondary"
+            text="Cancel"
+            className="h-8 w-fit px-3"
+            onClick={() => setShowModal(false)}
+            disabled={isSubmitting}
+          />
           <Button
             type="submit"
             text={
@@ -222,16 +373,23 @@ export function useAddPartnerLinkModal({
 }) {
   const [showAddPartnerLinkModal, setShowAddPartnerLinkModal] = useState(false);
 
+  const onSuccessCallback = useLatestCallback(onSuccess);
+
   const AddPartnerLinkModalCallback = useCallback(() => {
     return (
       <AddPartnerLinkModal
         showModal={showAddPartnerLinkModal}
         setShowModal={setShowAddPartnerLinkModal}
-        onSuccess={onSuccess}
+        onSuccess={onSuccessCallback}
         partner={partner}
       />
     );
-  }, [showAddPartnerLinkModal, setShowAddPartnerLinkModal, partner]);
+  }, [
+    showAddPartnerLinkModal,
+    setShowAddPartnerLinkModal,
+    onSuccessCallback,
+    partner,
+  ]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/add-payment-method-modal.tsx b/apps/web/ui/modals/add-payment-method-modal.tsx
index 45e0b20caf8..e7d5389add9 100644
--- a/apps/web/ui/modals/add-payment-method-modal.tsx
+++ b/apps/web/ui/modals/add-payment-method-modal.tsx
@@ -1,6 +1,9 @@
 "use client";
 
-import { DIRECT_DEBIT_PAYMENT_TYPES_INFO } from "@/lib/constants/payouts";
+import {
+  DIRECT_DEBIT_PAYMENT_TYPES_INFO,
+  SEPA_ENABLED_WORKSPACE_IDS,
+} from "@/lib/constants/payouts";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { X } from "@/ui/shared/icons";
 import { AnimatedSizeContainer, GreekTemple, Modal } from "@dub/ui";
@@ -36,7 +39,7 @@ function AddPaymentMethodModalInner({
   setShowAddPaymentMethodModal: Dispatch<SetStateAction<boolean>>;
 }) {
   const router = useRouter();
-  const { slug, plan } = useWorkspace();
+  const { id: workspaceId, slug, plan } = useWorkspace();
   const [isLoading, setIsLoading] = useState(false);
 
   const addPaymentMethod = async (type: Stripe.PaymentMethod.Type) => {
@@ -117,7 +120,10 @@ function AddPaymentMethodModalInner({
                   className="group flex flex-col items-center justify-end gap-4 rounded-lg bg-neutral-200/40 p-8 px-2 py-4 transition-colors duration-100 hover:bg-neutral-200/60 disabled:cursor-not-allowed disabled:opacity-50"
                   onClick={() => addPaymentMethod(type)}
                   disabled={
-                    isLoading || (enterpriseOnly && plan !== "enterprise")
+                    isLoading ||
+                    (enterpriseOnly &&
+                      plan !== "enterprise" &&
+                      !SEPA_ENABLED_WORKSPACE_IDS.has(workspaceId || ""))
                   }
                 >
                   <span
diff --git a/apps/web/ui/modals/archive-partner-modal.tsx b/apps/web/ui/modals/archive-partner-modal.tsx
index b6c152461a9..9018e70a68c 100644
--- a/apps/web/ui/modals/archive-partner-modal.tsx
+++ b/apps/web/ui/modals/archive-partner-modal.tsx
@@ -117,7 +117,7 @@ export function useArchivePartnerModal({
         partner={partner}
       />
     );
-  }, [showArchivePartnerModal, setShowArchivePartnerModal, partner]);
+  }, [showArchivePartnerModal, setShowArchivePartnerModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/ban-partner-modal.tsx b/apps/web/ui/modals/ban-partner-modal.tsx
index 3256a50c45f..bf2664059d6 100644
--- a/apps/web/ui/modals/ban-partner-modal.tsx
+++ b/apps/web/ui/modals/ban-partner-modal.tsx
@@ -8,7 +8,7 @@ import {
 } from "@/lib/zod/schemas/partners";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
-import { Button, InfoTooltip, Modal, Switch } from "@dub/ui";
+import { Button, InfoTooltip, Modal, Switch, useLatestCallback } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { motion } from "motion/react";
 import { useAction } from "next-safe-action/hooks";
@@ -254,16 +254,18 @@ export function useBanPartnerModal({
 }) {
   const [showBanPartnerModal, setShowBanPartnerModal] = useState(false);
 
+  const onConfirmCallback = useLatestCallback(onConfirm);
+
   const BanPartnerModalCallback = useCallback(() => {
     return (
       <BanPartnerModal
         showBanPartnerModal={showBanPartnerModal}
         setShowBanPartnerModal={setShowBanPartnerModal}
         partner={partner}
-        onConfirm={onConfirm}
+        onConfirm={onConfirmCallback}
       />
     );
-  }, [showBanPartnerModal, setShowBanPartnerModal, partner, onConfirm]);
+  }, [showBanPartnerModal, setShowBanPartnerModal, onConfirmCallback]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/bulk-ban-partners-modal.tsx b/apps/web/ui/modals/bulk-ban-partners-modal.tsx
index b3b42de3f57..b1d3a0f1c0f 100644
--- a/apps/web/ui/modals/bulk-ban-partners-modal.tsx
+++ b/apps/web/ui/modals/bulk-ban-partners-modal.tsx
@@ -7,7 +7,7 @@ import {
   bulkBanPartnersSchema,
 } from "@/lib/zod/schemas/partners";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
-import { Button, Modal } from "@dub/ui";
+import { Button, Modal, useLatestCallback } from "@dub/ui";
 import { cn, pluralize } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
 import {
@@ -287,20 +287,21 @@ export function useBulkBanPartnersModal({
   const [showBulkBanPartnersModal, setShowBulkBanPartnersModal] =
     useState(false);
 
+  const onConfirmCallback = useLatestCallback(onConfirm);
+
   const BulkBanPartnersModalCallback = useCallback(() => {
     return (
       <BulkBanPartnersModal
         showBulkBanPartnersModal={showBulkBanPartnersModal}
         setShowBulkBanPartnersModal={setShowBulkBanPartnersModal}
         partners={partners}
-        onConfirm={onConfirm}
+        onConfirm={onConfirmCallback}
       />
     );
   }, [
     showBulkBanPartnersModal,
     setShowBulkBanPartnersModal,
-    partners,
-    onConfirm,
+    onConfirmCallback,
   ]);
 
   return useMemo(
diff --git a/apps/web/ui/modals/bulk-resolve-fraud-groups-modal.tsx b/apps/web/ui/modals/bulk-resolve-fraud-groups-modal.tsx
index 45e3997fb60..fd43d6be347 100644
--- a/apps/web/ui/modals/bulk-resolve-fraud-groups-modal.tsx
+++ b/apps/web/ui/modals/bulk-resolve-fraud-groups-modal.tsx
@@ -6,7 +6,7 @@ import {
   MAX_RESOLUTION_REASON_LENGTH,
 } from "@/lib/zod/schemas/fraud";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
-import { Button, Modal } from "@dub/ui";
+import { Button, Modal, useLatestCallback } from "@dub/ui";
 import { cn, pluralize } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
 import {
@@ -202,20 +202,21 @@ export function useBulkResolveFraudGroupsModal({
   const [showBulkResolveFraudGroupsModal, setShowBulkResolveFraudGroupsModal] =
     useState(false);
 
+  const onConfirmCallback = useLatestCallback(onConfirm);
+
   const BulkResolveFraudGroupsModalCallback = useCallback(() => {
     return (
       <BulkResolveFraudGroupsModal
         showBulkResolveFraudGroupsModal={showBulkResolveFraudGroupsModal}
         setShowBulkResolveFraudGroupsModal={setShowBulkResolveFraudGroupsModal}
         fraudGroups={fraudGroups}
-        onConfirm={onConfirm}
+        onConfirm={onConfirmCallback}
       />
     );
   }, [
     showBulkResolveFraudGroupsModal,
     setShowBulkResolveFraudGroupsModal,
-    fraudGroups,
-    onConfirm,
+    onConfirmCallback,
   ]);
 
   return useMemo(
diff --git a/apps/web/ui/modals/cancel-subscription-modal.tsx b/apps/web/ui/modals/cancel-subscription-modal.tsx
new file mode 100644
index 00000000000..d470a372778
--- /dev/null
+++ b/apps/web/ui/modals/cancel-subscription-modal.tsx
@@ -0,0 +1,228 @@
+"use client";
+
+import {
+  STRIPE_CANCELLATION_COMMENT_MAX_LENGTH,
+  STRIPE_CANCELLATION_FEEDBACK,
+  STRIPE_CANCELLATION_FEEDBACK_LABELS,
+  type StripeCancellationFeedback,
+} from "@/lib/stripe/cancellation-feedback";
+import { Button, Modal } from "@dub/ui";
+import { cn } from "@dub/utils";
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+
+function CancelSubscriptionModal({
+  showCancelSubscriptionModal,
+  setShowCancelSubscriptionModal,
+  billingCycleEndsAt,
+  onConfirm,
+}: {
+  showCancelSubscriptionModal: boolean;
+  setShowCancelSubscriptionModal: Dispatch<SetStateAction<boolean>>;
+  billingCycleEndsAt?: Date | string | null;
+  onConfirm: (data: {
+    feedback: StripeCancellationFeedback;
+    comment: string;
+  }) => Promise<void>;
+}) {
+  const [isLoading, setIsLoading] = useState(false);
+  const [feedback, setFeedback] = useState<StripeCancellationFeedback | "">(
+    "",
+  );
+  const [comment, setComment] = useState("");
+
+  useEffect(() => {
+    if (!showCancelSubscriptionModal) {
+      setFeedback("");
+      setComment("");
+      setIsLoading(false);
+    }
+  }, [showCancelSubscriptionModal]);
+
+  const canSubmit = Boolean(feedback) && comment.trim().length > 0;
+
+  const handleConfirm = async () => {
+    if (isLoading || !feedback || !comment.trim()) {
+      return;
+    }
+
+    setIsLoading(true);
+    try {
+      await onConfirm({
+        feedback,
+        comment: comment.trim(),
+      });
+      setShowCancelSubscriptionModal(false);
+    } catch {
+      // Error toast is handled by the caller
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <Modal
+      showModal={showCancelSubscriptionModal}
+      setShowModal={setShowCancelSubscriptionModal}
+      className="max-w-md"
+    >
+      <div className="divide-y divide-neutral-200">
+        <div className="p-4 sm:px-6">
+          <h3 className="text-content-emphasis text-lg font-medium">
+            Cancel subscription
+          </h3>
+        </div>
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            handleConfirm();
+          }}
+        >
+          <div className="flex flex-col gap-4 px-4 py-6 sm:px-6">
+            <p className="text-sm text-neutral-600">
+              Your subscription will be scheduled for cancellation at the end of
+              your current billing period
+              {billingCycleEndsAt ? (
+                <span className="font-medium text-neutral-900">
+                  {" "}
+                  (
+                  {new Date(billingCycleEndsAt).toLocaleDateString("en-US", {
+                    month: "long",
+                    day: "numeric",
+                    year: "numeric",
+                  })}
+                  )
+                </span>
+              ) : null}
+              . You will keep access until then.
+            </p>
+
+            <div>
+              <label
+                htmlFor="cancellation-feedback"
+                className="block text-sm font-medium text-neutral-900"
+              >
+                Reason for canceling
+              </label>
+              <div className="relative mt-1.5 rounded-md shadow-sm">
+                <select
+                  id="cancellation-feedback"
+                  name="feedback"
+                  required
+                  value={feedback}
+                  disabled={isLoading}
+                  onChange={(e) =>
+                    setFeedback(e.target.value as StripeCancellationFeedback)
+                  }
+                  className="block w-full rounded-md border-neutral-300 text-neutral-900 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+                >
+                  <option value="" disabled>
+                    Select a reason
+                  </option>
+                  {STRIPE_CANCELLATION_FEEDBACK.map((value) => (
+                    <option value={value} key={value}>
+                      {STRIPE_CANCELLATION_FEEDBACK_LABELS[value]}
+                    </option>
+                  ))}
+                </select>
+              </div>
+            </div>
+
+            <div>
+              <div className="flex items-center justify-between">
+                <label
+                  htmlFor="cancellation-comment"
+                  className="block text-sm font-medium text-neutral-900"
+                >
+                  Additional details
+                </label>
+                <span className="text-xs tabular-nums text-neutral-400">
+                  {comment.length}/{STRIPE_CANCELLATION_COMMENT_MAX_LENGTH}
+                </span>
+              </div>
+              <textarea
+                id="cancellation-comment"
+                name="comment"
+                required
+                rows={4}
+                maxLength={STRIPE_CANCELLATION_COMMENT_MAX_LENGTH}
+                placeholder="Tell us more about why you're canceling..."
+                value={comment}
+                disabled={isLoading}
+                onChange={(e) => setComment(e.target.value)}
+                className={cn(
+                  "mt-1.5 block w-full resize-y rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400",
+                  "focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
+                )}
+              />
+            </div>
+          </div>
+          <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-4 py-4 sm:px-6">
+            <Button
+              type="button"
+              variant="secondary"
+              className="h-8 w-fit"
+              text="Not now"
+              disabled={isLoading}
+              onClick={() => setShowCancelSubscriptionModal(false)}
+            />
+            <Button
+              type="submit"
+              variant="primary"
+              className="h-8 w-fit"
+              text="Cancel subscription"
+              loading={isLoading}
+              disabled={!canSubmit}
+            />
+          </div>
+        </form>
+      </div>
+    </Modal>
+  );
+}
+
+export function useCancelSubscriptionModal({
+  billingCycleEndsAt,
+  onConfirm,
+}: {
+  billingCycleEndsAt?: Date | string | null;
+  onConfirm: (data: {
+    feedback: StripeCancellationFeedback;
+    comment: string;
+  }) => Promise<void>;
+}) {
+  const [showCancelSubscriptionModal, setShowCancelSubscriptionModal] =
+    useState(false);
+
+  const onConfirmRef = useRef(onConfirm);
+  onConfirmRef.current = onConfirm;
+
+  const billingCycleEndsAtRef = useRef(billingCycleEndsAt);
+  billingCycleEndsAtRef.current = billingCycleEndsAt;
+
+  const CancelSubscriptionModalCallback = useCallback(() => {
+    return (
+      <CancelSubscriptionModal
+        showCancelSubscriptionModal={showCancelSubscriptionModal}
+        setShowCancelSubscriptionModal={setShowCancelSubscriptionModal}
+        billingCycleEndsAt={billingCycleEndsAtRef.current}
+        onConfirm={(data) => onConfirmRef.current(data)}
+      />
+    );
+  }, [showCancelSubscriptionModal]);
+
+  return useMemo(
+    () => ({
+      setShowCancelSubscriptionModal,
+      CancelSubscriptionModal: CancelSubscriptionModalCallback,
+    }),
+    [setShowCancelSubscriptionModal, CancelSubscriptionModalCallback],
+  );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/change-program-domain-modal.tsx b/apps/web/ui/modals/change-program-domain-modal.tsx
similarity index 95%
rename from apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/change-program-domain-modal.tsx
rename to apps/web/ui/modals/change-program-domain-modal.tsx
index f84b9abaeaf..379ab7fb659 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/links/change-program-domain-modal.tsx
+++ b/apps/web/ui/modals/change-program-domain-modal.tsx
@@ -8,6 +8,7 @@ import {
   useMemo,
   useState,
 } from "react";
+import { toast } from "sonner";
 
 type ChangeProgramDomainModalProps = {
   showChangeDomainModal: boolean;
@@ -42,6 +43,12 @@ function ChangeProgramDomainModalInner({
     try {
       await onConfirm();
       setShowChangeDomainModal(false);
+    } catch (error) {
+      toast.error(
+        error instanceof Error
+          ? error.message
+          : "Failed to change the program domain. Please try again or contact support at dub.co/support",
+      );
     } finally {
       setConfirming(false);
     }
@@ -53,7 +60,7 @@ function ChangeProgramDomainModalInner({
     <>
       <div className="space-y-2 border-b border-neutral-200 p-4 sm:p-6">
         <h3 className="text-lg font-medium leading-none">
-          Switching to a different program domain
+          Changing your referral link domain
         </h3>
       </div>
 
diff --git a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
index 2d7cb9c5bf1..ac988fec09f 100644
--- a/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
+++ b/apps/web/ui/modals/confirm-approve-bounty-submission-modal.tsx
@@ -1,15 +1,13 @@
 "use client";
 
-import { approveBountySubmissionAction } from "@/lib/actions/partners/approve-bounty-submission";
 import { calculateSocialMetricsRewardAmount } from "@/lib/bounty/rewards";
 import { resolveBountyDetails } from "@/lib/bounty/utils";
 import { mutatePrefix } from "@/lib/swr/mutate";
-import useWorkspace from "@/lib/swr/use-workspace";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { BountyProps, BountySubmissionProps } from "@/lib/types";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
 import { Button, Modal } from "@dub/ui";
 import { currencyFormatter } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
 
@@ -30,24 +28,8 @@ function ConfirmApproveBountySubmissionModal({
   rewardAmount,
   onApproveSuccess,
 }: ConfirmApproveBountySubmissionModalProps) {
-  const { id: workspaceId } = useWorkspace();
-
-  const { executeAsync: approveBountySubmission, isPending } = useAction(
-    approveBountySubmissionAction,
-    {
-      onSuccess: async () => {
-        setShowModal(false);
-        toast.success("Bounty submission approved successfully!");
-        if (bounty?.id) {
-          await mutatePrefix(`/api/bounties/${bounty.id}/submissions`);
-        }
-        onApproveSuccess?.();
-      },
-      onError({ error }) {
-        toast.error(error.serverError);
-      },
-    },
-  );
+  const { makeRequest: approveBountySubmission, isSubmitting } =
+    useApiMutation();
 
   const commissionAmountCents = useMemo(() => {
     const bountyInfo = bounty ? resolveBountyDetails(bounty) : null;
@@ -64,12 +46,23 @@ function ConfirmApproveBountySubmissionModal({
   }, [bounty, submission, rewardAmount]);
 
   const handleApprove = async () => {
-    if (!workspaceId || !submission?.id) return;
-    await approveBountySubmission({
-      workspaceId,
-      submissionId: submission.id,
-      rewardAmount: rewardAmount != null ? rewardAmount * 100 : null,
-    });
+    if (!submission?.id || !submission.bountyId) return;
+
+    await approveBountySubmission(
+      `/api/bounties/${submission.bountyId}/submissions/${submission.id}/approve`,
+      {
+        method: "POST",
+        body: {
+          rewardAmount: rewardAmount != null ? rewardAmount * 100 : null,
+        },
+        onSuccess: async () => {
+          setShowModal(false);
+          toast.success("Bounty submission approved successfully!");
+          await mutatePrefix(`/api/bounties/${submission.bountyId}/submissions`);
+          onApproveSuccess?.();
+        },
+      },
+    );
   };
 
   return (
@@ -136,14 +129,14 @@ function ConfirmApproveBountySubmissionModal({
               text="Cancel"
               className="h-8 w-fit"
               onClick={() => setShowModal(false)}
-              disabled={isPending}
+              disabled={isSubmitting}
             />
             <Button
               type="button"
               variant="primary"
               text="Approve"
               className="h-8 w-fit"
-              loading={isPending}
+              loading={isSubmitting}
               onClick={handleApprove}
             />
           </div>
diff --git a/apps/web/ui/modals/confirm-reward-change-modal.tsx b/apps/web/ui/modals/confirm-reward-change-modal.tsx
index 6cf35011ebc..345927845c3 100644
--- a/apps/web/ui/modals/confirm-reward-change-modal.tsx
+++ b/apps/web/ui/modals/confirm-reward-change-modal.tsx
@@ -6,13 +6,36 @@ import { ProgramRewardDescription } from "@/ui/partners/program-reward-descripti
 import { REWARD_EVENT_DESCRIPTIONS } from "@/ui/partners/rewards/reward-event-descriptions";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
 import { Button, Modal } from "@dub/ui";
-import { cn, pluralize } from "@dub/utils";
-import { EventType } from "@prisma/client";
-import { useEffect, useState } from "react";
+import { cn, nFormatter, pluralize } from "@dub/utils";
+import { useCallback, useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { PartnerEmailNotificationTooltipHelper } from "../shared/partner-email-notification-tooltip-helper";
 
 export type RewardChangeAction = "created" | "updated" | "deleted";
+type RewardNotificationTarget = "group" | "partner" | "link";
+
+function shouldNotifyRewardChange({
+  action,
+  target,
+  isDefault = false,
+  partnerCount,
+}: {
+  action: RewardChangeAction;
+  target: RewardNotificationTarget;
+  isDefault?: boolean;
+  partnerCount?: number;
+}): boolean {
+  if (target === "partner" || target === "link") {
+    return true;
+  }
+
+  // Creating a non-default reward never assigns partners automatically.
+  if (action === "created" && !isDefault) {
+    return false;
+  }
+
+  return partnerCount == null || partnerCount > 0;
+}
 
 const TITLES: Record<RewardChangeAction, string> = {
   created: "Create reward",
@@ -26,46 +49,104 @@ const CONFIRM_TEXT: Record<RewardChangeAction, string> = {
   deleted: "Delete reward",
 };
 
+const GROUP_CHANGE_COPY: Record<RewardChangeAction, string> = {
+  created: "added to",
+  updated: "updated for",
+  deleted: "removed from",
+};
+
 type ConfirmRewardChangeFormData = {
   activityDescription: string;
 };
 
-type ConfirmRewardChangeModalProps = {
-  showModal: boolean;
-  setShowModal: (show: boolean) => void;
+type RewardSnapshot = Pick<
+  RewardProps,
+  | "description"
+  | "event"
+  | "maxDuration"
+  | "modifiers"
+  | "tooltipDescription"
+  | "type"
+  | "amountInCents"
+  | "amountInPercentage"
+  | "config"
+  | "spendLimitAmount"
+  | "spendLimitInterval"
+>;
+
+type ConfirmRewardChangeOptions = {
   action: RewardChangeAction;
-  event: EventType;
-  reward: Pick<
-    RewardProps,
-    | "description"
-    | "event"
-    | "maxDuration"
-    | "modifiers"
-    | "tooltipDescription"
-    | "type"
-    | "amountInCents"
-    | "amountInPercentage"
-    | "config"
-    | "spendLimitAmount"
-    | "spendLimitInterval"
-  >;
+  target: RewardNotificationTarget;
+  isDefault?: boolean;
+  reward: RewardSnapshot;
   partnerCount?: number;
   onConfirm: (activityDescription?: string) => Promise<void>;
   isPending?: boolean;
 };
 
+type ConfirmRewardChangeModalProps = ConfirmRewardChangeOptions & {
+  showModal: boolean;
+  setShowModal: (show: boolean) => void;
+};
+
+function getDescription({
+  action,
+  target,
+  partnerCount,
+}: {
+  action: RewardChangeAction;
+  target: RewardNotificationTarget;
+  partnerCount?: number;
+}) {
+  if (target === "partner") {
+    return (
+      <>
+        The reward below will be updated for this partner, and they will be{" "}
+        <PartnerEmailNotificationTooltipHelper />.
+      </>
+    );
+  }
+
+  if (target === "link") {
+    return (
+      <>
+        The reward below will be updated for this link, and the partner will be{" "}
+        <PartnerEmailNotificationTooltipHelper />.
+      </>
+    );
+  }
+
+  return (
+    <>
+      The reward below will be {GROUP_CHANGE_COPY[action]} the group
+      {partnerCount && partnerCount > 0 ? (
+        <>
+          , and {nFormatter(partnerCount, { full: true })}{" "}
+          {pluralize("partner", partnerCount)} will be{" "}
+          <PartnerEmailNotificationTooltipHelper />
+        </>
+      ) : (
+        ""
+      )}
+      .
+    </>
+  );
+}
+
 export function ConfirmRewardChangeModal({
   showModal,
   setShowModal,
   action,
-  event,
   reward,
   partnerCount,
+  target,
   onConfirm,
   isPending = false,
 }: ConfirmRewardChangeModalProps) {
   const [isLoading, setIsLoading] = useState(false);
-  const { icon: Icon, title } = REWARD_EVENT_DESCRIPTIONS[event];
+  const { icon: Icon, title } = REWARD_EVENT_DESCRIPTIONS[reward.event];
+  const messageLabel =
+    target === "group" ? "Message to partners" : "Message to partner";
 
   const {
     register,
@@ -85,12 +166,6 @@ export function ConfirmRewardChangeModal({
     }
   }, [showModal, reset]);
 
-  const change = {
-    created: "added to",
-    updated: "updated for",
-    deleted: "removed from",
-  }[action];
-
   const onSubmit = handleSubmit(async ({ activityDescription }) => {
     setIsLoading(true);
     try {
@@ -114,16 +189,7 @@ export function ConfirmRewardChangeModal({
             {TITLES[action]}
           </h3>
           <p className="text-content-subtle mt-1 text-sm">
-            The reward below will be {change} the group
-            {partnerCount && partnerCount > 0 ? (
-              <>
-                , and {partnerCount} {pluralize("partner", partnerCount)} will
-                be <PartnerEmailNotificationTooltipHelper />
-              </>
-            ) : (
-              ""
-            )}
-            .
+            {getDescription({ action, target, partnerCount })}
           </p>
 
           <div className="mt-4 rounded-lg border border-neutral-200 bg-neutral-100 p-3">
@@ -140,45 +206,47 @@ export function ConfirmRewardChangeModal({
             </div>
           </div>
 
-          <div className="mt-4">
-            <div className="flex items-center justify-between">
-              <label
-                htmlFor="activityDescription"
-                className="text-content-emphasis text-sm font-medium"
-              >
-                Message to partners
-                <span className="ml-1 font-normal text-neutral-500">
-                  (optional)
-                </span>
-              </label>
-              <MaxCharactersCounter
-                name="activityDescription"
+          {(partnerCount == null || partnerCount > 0) && (
+            <div className="mt-4">
+              <div className="flex items-center justify-between">
+                <label
+                  htmlFor="activityDescription"
+                  className="text-content-emphasis text-sm font-medium"
+                >
+                  {messageLabel}
+                  <span className="ml-1 font-normal text-neutral-500">
+                    (optional)
+                  </span>
+                </label>
+                <MaxCharactersCounter
+                  name="activityDescription"
+                  maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
+                  control={control}
+                />
+              </div>
+              <textarea
+                id="activityDescription"
+                rows={3}
                 maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
-                control={control}
+                placeholder="Add context about this change..."
+                className={cn(
+                  "mt-2 block w-full rounded-md border-neutral-300 text-sm text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500",
+                  errors.activityDescription && "border-red-600",
+                )}
+                {...register("activityDescription", {
+                  maxLength: {
+                    value: REWARD_CHANGE_DESCRIPTION_MAX_LENGTH,
+                    message: `Must be ${REWARD_CHANGE_DESCRIPTION_MAX_LENGTH} characters or fewer`,
+                  },
+                })}
               />
-            </div>
-            <textarea
-              id="activityDescription"
-              rows={3}
-              maxLength={REWARD_CHANGE_DESCRIPTION_MAX_LENGTH}
-              placeholder="Add context about this change..."
-              className={cn(
-                "mt-2 block w-full rounded-md border-neutral-300 text-sm text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500",
-                errors.activityDescription && "border-red-600",
+              {errors.activityDescription && (
+                <p className="mt-1 text-xs text-red-600">
+                  {errors.activityDescription.message}
+                </p>
               )}
-              {...register("activityDescription", {
-                maxLength: {
-                  value: REWARD_CHANGE_DESCRIPTION_MAX_LENGTH,
-                  message: `Must be ${REWARD_CHANGE_DESCRIPTION_MAX_LENGTH} characters or fewer`,
-                },
-              })}
-            />
-            {errors.activityDescription && (
-              <p className="mt-1 text-xs text-red-600">
-                {errors.activityDescription.message}
-              </p>
-            )}
-          </div>
+            </div>
+          )}
         </div>
 
         <div className="border-border-subtle flex items-center justify-end gap-2 border-t px-5 py-4">
@@ -204,37 +272,40 @@ export function ConfirmRewardChangeModal({
 }
 
 export function useConfirmRewardChangeModal() {
-  const [state, setState] = useState<{
-    action: RewardChangeAction;
-    event: EventType;
-    reward: ConfirmRewardChangeModalProps["reward"];
-    onConfirm: (activityDescription?: string) => Promise<void>;
-    isPending?: boolean;
-    partnerCount?: number;
-  } | null>(null);
+  const [state, setState] = useState<ConfirmRewardChangeOptions | null>(null);
+
+  const confirmRewardChange = useCallback(
+    async (options: ConfirmRewardChangeOptions) => {
+      // Destructive deletes always use the modal, even when no partners are
+      // assigned (partnerCount === 0 would otherwise skip notification copy).
+      if (options.action !== "deleted") {
+        const shouldNotify = shouldNotifyRewardChange({
+          action: options.action,
+          target: options.target,
+          isDefault: options.isDefault,
+          partnerCount: options.partnerCount,
+        });
+
+        if (!shouldNotify) {
+          await options.onConfirm();
+          return;
+        }
+      }
+
+      setState(options);
+    },
+    [],
+  );
 
   return {
-    openConfirmRewardChangeModal: (options: {
-      action: RewardChangeAction;
-      event: EventType;
-      reward: ConfirmRewardChangeModalProps["reward"];
-      partnerCount?: number;
-      onConfirm: (activityDescription?: string) => Promise<void>;
-      isPending?: boolean;
-    }) => setState(options),
-    closeConfirmRewardChangeModal: () => setState(null),
+    confirmRewardChange,
     ConfirmRewardChangeModal: state ? (
       <ConfirmRewardChangeModal
         showModal
         setShowModal={(show) => {
           if (!show) setState(null);
         }}
-        action={state.action}
-        event={state.event}
-        reward={state.reward}
-        partnerCount={state.partnerCount}
-        onConfirm={state.onConfirm}
-        isPending={state.isPending}
+        {...state}
       />
     ) : null,
   };
diff --git a/apps/web/ui/modals/deactivate-partner-modal.tsx b/apps/web/ui/modals/deactivate-partner-modal.tsx
index 41010480336..56689216286 100644
--- a/apps/web/ui/modals/deactivate-partner-modal.tsx
+++ b/apps/web/ui/modals/deactivate-partner-modal.tsx
@@ -162,7 +162,7 @@ export function useDeactivatePartnerModal({
         partner={partner}
       />
     );
-  }, [showDeactivatePartnerModal, setShowDeactivatePartnerModal, partner]);
+  }, [showDeactivatePartnerModal, setShowDeactivatePartnerModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/delete-discount-code-modal.tsx b/apps/web/ui/modals/delete-discount-code-modal.tsx
index 0406cb06054..64a55d6efea 100644
--- a/apps/web/ui/modals/delete-discount-code-modal.tsx
+++ b/apps/web/ui/modals/delete-discount-code-modal.tsx
@@ -3,7 +3,7 @@ import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { DiscountCodeProps } from "@/lib/types";
 import { Button, Modal, useMediaQuery } from "@dub/ui";
 import { Tag } from "@dub/ui/icons";
-import { FormEvent } from "react";
+import { FormEvent, useEffect, useState } from "react";
 import { toast } from "sonner";
 
 interface DeleteDiscountCodeModalProps {
@@ -12,6 +12,8 @@ interface DeleteDiscountCodeModalProps {
   setShowModal: (showModal: boolean) => void;
 }
 
+const DELETE_DISCOUNT_CODE_CONFIRMATION = "delete discount code";
+
 export const DeleteDiscountCodeModal = ({
   discountCode,
   showModal,
@@ -19,6 +21,11 @@ export const DeleteDiscountCodeModal = ({
 }: DeleteDiscountCodeModalProps) => {
   const { isMobile } = useMediaQuery();
   const { makeRequest: deleteDiscountCode, isSubmitting } = useApiMutation();
+  const [inputValue, setInputValue] = useState("");
+
+  useEffect(() => {
+    setInputValue("");
+  }, [showModal, discountCode.id]);
 
   const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
@@ -62,7 +69,10 @@ export const DeleteDiscountCodeModal = ({
               <div className="flex items-center gap-2">
                 <p className="text-content-emphasis block text-sm font-medium">
                   To verify, type{" "}
-                  <span className="font-semibold">delete code</span> below
+                  <span className="font-semibold">
+                    {DELETE_DISCOUNT_CODE_CONFIRMATION}
+                  </span>{" "}
+                  below
                 </p>
               </div>
 
@@ -75,7 +85,9 @@ export const DeleteDiscountCodeModal = ({
                     className="block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
                     aria-invalid="true"
                     autoFocus={!isMobile}
-                    pattern="delete code"
+                    pattern={DELETE_DISCOUNT_CODE_CONFIRMATION}
+                    value={inputValue}
+                    onChange={(e) => setInputValue(e.target.value)}
                   />
                 </div>
               </div>
@@ -96,6 +108,7 @@ export const DeleteDiscountCodeModal = ({
               text="Delete discount code"
               variant="danger"
               loading={isSubmitting}
+              disabled={inputValue !== DELETE_DISCOUNT_CODE_CONFIRMATION}
               className="h-9 w-fit"
             />
           </div>
diff --git a/apps/web/ui/modals/delete-domain-modal.tsx b/apps/web/ui/modals/delete-domain-modal.tsx
index e222c5057d1..3534b5720b4 100644
--- a/apps/web/ui/modals/delete-domain-modal.tsx
+++ b/apps/web/ui/modals/delete-domain-modal.tsx
@@ -119,6 +119,7 @@ function DeleteDomainModal({
 
 export function useDeleteDomainModal({ props }: { props?: DomainProps }) {
   const [showDeleteDomainModal, setShowDeleteDomainModal] = useState(false);
+  const hasProps = Boolean(props);
 
   const DeleteDomainModalCallback = useCallback(() => {
     return props ? (
@@ -128,7 +129,7 @@ export function useDeleteDomainModal({ props }: { props?: DomainProps }) {
         props={props}
       />
     ) : null;
-  }, [showDeleteDomainModal, props]);
+  }, [showDeleteDomainModal, hasProps]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/delete-email-domain-modal.tsx b/apps/web/ui/modals/delete-email-domain-modal.tsx
index 5656b268a00..4b01d15cc6c 100644
--- a/apps/web/ui/modals/delete-email-domain-modal.tsx
+++ b/apps/web/ui/modals/delete-email-domain-modal.tsx
@@ -1,7 +1,7 @@
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { EmailDomainProps } from "@/lib/types";
-import { Button, Modal, useMediaQuery } from "@dub/ui";
+import { Button, Modal, useLatestCallback, useMediaQuery } from "@dub/ui";
 import { FormEvent, useCallback, useMemo, useState } from "react";
 import { toast } from "sonner";
 
@@ -125,20 +125,21 @@ export function useDeleteEmailDomainModal(
   const [showDeleteEmailDomainModal, setShowDeleteEmailDomainModal] =
     useState(false);
 
+  const onDeleteCallback = useLatestCallback(onDelete);
+
   const DeleteEmailDomainModalCallback = useCallback(() => {
     return (
       <DeleteEmailDomainModal
         showModal={showDeleteEmailDomainModal}
         setShowModal={setShowDeleteEmailDomainModal}
         emailDomain={emailDomain}
-        onDelete={onDelete}
+        onDelete={onDeleteCallback}
       />
     );
   }, [
     showDeleteEmailDomainModal,
     setShowDeleteEmailDomainModal,
-    onDelete,
-    emailDomain,
+    onDeleteCallback,
   ]);
 
   return useMemo(
diff --git a/apps/web/ui/modals/delete-group-modal.tsx b/apps/web/ui/modals/delete-group-modal.tsx
index d1db3233760..4a93895bbbb 100644
--- a/apps/web/ui/modals/delete-group-modal.tsx
+++ b/apps/web/ui/modals/delete-group-modal.tsx
@@ -7,10 +7,16 @@ import { Users } from "lucide-react";
 import { FormEvent, useCallback, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { GroupColorCircle } from "../partners/groups/group-color-circle";
-import { PartnerEmailNotificationTooltipHelper } from "../shared/partner-email-notification-tooltip-helper";
+
+type DeleteGroupModalGroup = Pick<
+  GroupExtendedProps,
+  "id" | "name" | "color"
+> & {
+  partnersCount: number;
+};
 
 interface DeleteGroupModalProps {
-  group: Pick<GroupExtendedProps, "id" | "name" | "color" | "totalPartners">;
+  group: DeleteGroupModalGroup;
   showModal: boolean;
   setShowModal: (showModal: boolean) => void;
   onDelete?: () => void;
@@ -33,6 +39,7 @@ const DeleteGroupModal = ({
       onSuccess: async () => {
         setShowModal(false);
         await mutatePrefix("/api/groups");
+        await mutatePrefix("/api/partners/count");
         toast.success("Group deleted successfully!");
         onDelete?.();
       },
@@ -59,8 +66,8 @@ const DeleteGroupModal = ({
               <div className="flex items-center gap-2">
                 <Users className="size-4" />
                 <span className="text-content-default text-sm font-medium">
-                  {group.totalPartners}{" "}
-                  {pluralize("partner", group.totalPartners)}
+                  {group.partnersCount}{" "}
+                  {pluralize("partner", group.partnersCount)}
                 </span>
               </div>
             </div>
@@ -71,25 +78,6 @@ const DeleteGroupModal = ({
               <ul className="mt-0.5 list-outside list-disc space-y-px pl-4">
                 <li>Rewards created for this group will be deleted.</li>
                 <li>Discount created for this group will be deleted.</li>
-
-                {group.totalPartners && group.totalPartners > 0 ? (
-                  <>
-                    <li>
-                      Partners in this group will be moved to your{" "}
-                      <strong>Default</strong> group.
-                    </li>
-                    <li>
-                      Partners in this group will have their rewards and
-                      discount updated to the <strong>Default</strong> group
-                      settings.
-                    </li>
-                    <li>
-                      Partners in this group will be{" "}
-                      <PartnerEmailNotificationTooltipHelper /> about the
-                      change.
-                    </li>
-                  </>
-                ) : null}
               </ul>
 
               <p className="mt-4">
@@ -150,7 +138,7 @@ const DeleteGroupModal = ({
 };
 
 export function useDeleteGroupModal(
-  group: Pick<GroupExtendedProps, "id" | "name" | "color" | "totalPartners">,
+  group: DeleteGroupModalGroup,
   onDelete?: () => void,
 ) {
   const [showDeleteGroupModal, setShowDeleteGroupModal] = useState(false);
diff --git a/apps/web/ui/modals/delete-partner-modal.tsx b/apps/web/ui/modals/delete-partner-modal.tsx
index 7e078fe234c..4a8603ee8b9 100644
--- a/apps/web/ui/modals/delete-partner-modal.tsx
+++ b/apps/web/ui/modals/delete-partner-modal.tsx
@@ -177,7 +177,7 @@ export function useDeletePartnerModal({
         partner={partner}
       />
     );
-  }, [showDeletePartnerModal, setShowDeletePartnerModal, partner]);
+  }, [showDeletePartnerModal, setShowDeletePartnerModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/delete-token-modal.tsx b/apps/web/ui/modals/delete-token-modal.tsx
index 88eb95a947f..f523bbded0f 100644
--- a/apps/web/ui/modals/delete-token-modal.tsx
+++ b/apps/web/ui/modals/delete-token-modal.tsx
@@ -1,7 +1,7 @@
 import useWorkspace from "@/lib/swr/use-workspace";
 import { TokenProps } from "@/lib/types";
+import { Callout } from "@/ui/shared/callout";
 import { Button, Key, Modal, Tooltip, useMediaQuery } from "@dub/ui";
-import { TriangleWarning } from "@dub/ui/icons";
 import { timeAgo } from "@dub/utils";
 import {
   Dispatch,
@@ -89,20 +89,19 @@ function DeleteTokenModal({
         className="flex flex-col space-y-4 bg-neutral-50 px-4 py-4 sm:px-6"
       >
         {token.lastUsed && (
-          <div className="flex items-start gap-3 rounded-lg border border-amber-200 bg-amber-50 p-4">
-            <TriangleWarning className="mt-0.5 size-4 shrink-0 text-amber-600" />
+          <Callout variant="warn" size={2}>
             <div className="space-y-1">
-              <h3 className="text-sm font-semibold text-amber-900">
+              <h3 className="font-semibold">
                 This key is actively in use (last used{" "}
                 {timeAgo(token.lastUsed, { withAgo: true })})
               </h3>
-              <p className="text-sm text-amber-900">
+              <p>
                 Deleting this key will immediately break any integrations,
                 tracking, or API requests that depend on it. Are you sure you
                 want to continue?
               </p>
             </div>
-          </div>
+          </Callout>
         )}
 
         <div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2">
diff --git a/apps/web/ui/modals/domain-auto-renewal-modal.tsx b/apps/web/ui/modals/domain-auto-renewal-modal.tsx
index 2699a330682..7303c11dc0c 100644
--- a/apps/web/ui/modals/domain-auto-renewal-modal.tsx
+++ b/apps/web/ui/modals/domain-auto-renewal-modal.tsx
@@ -152,7 +152,6 @@ export function useDomainAutoRenewalModal({ domain }: { domain: DomainProps }) {
   }, [
     showDomainAutoRenewalModal,
     setShowDomainAutoRenewalModal,
-    domain,
     enableAutoRenewal,
   ]);
 
diff --git a/apps/web/ui/modals/edit-customer-modal.tsx b/apps/web/ui/modals/edit-customer-modal.tsx
index 7596b07b499..c82411bb1fc 100644
--- a/apps/web/ui/modals/edit-customer-modal.tsx
+++ b/apps/web/ui/modals/edit-customer-modal.tsx
@@ -3,7 +3,7 @@ import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { CustomerEnriched, CustomerProps } from "@/lib/types";
 import { updateCustomerBodySchema } from "@/lib/zod/schemas/customers";
 import { Button, Modal, useMediaQuery } from "@dub/ui";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import * as z from "zod/v4";
@@ -173,11 +173,7 @@ export function useEditCustomerModal() {
     setCustomer(customer);
   }
 
-  function closeEditCustomerModal() {
-    setCustomer(null);
-  }
-
-  function EditCustomerModalWrapper() {
+  const EditCustomerModalWrapper = useCallback(() => {
     if (!customer) return null;
 
     return (
@@ -185,15 +181,14 @@ export function useEditCustomerModal() {
         customer={customer}
         showModal
         setShowModal={(show) => {
-          if (!show) closeEditCustomerModal();
+          if (!show) setCustomer(null);
         }}
       />
     );
-  }
+  }, [customer]);
 
   return {
     openEditCustomerModal,
-    closeEditCustomerModal,
     EditCustomerModal: EditCustomerModalWrapper,
     isEditCustomerModalOpen: customer !== null,
   };
diff --git a/apps/web/ui/modals/edit-partner-discount-modal.tsx b/apps/web/ui/modals/edit-partner-discount-modal.tsx
new file mode 100644
index 00000000000..d6131f5ddcd
--- /dev/null
+++ b/apps/web/ui/modals/edit-partner-discount-modal.tsx
@@ -0,0 +1,429 @@
+"use client";
+
+import { parseActionError } from "@/lib/actions/parse-action-errors";
+import { deleteDiscountAction } from "@/lib/actions/partners/delete-discount";
+import { updatePartnerEnrollmentAction } from "@/lib/actions/partners/update-partner-enrollment";
+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
+import { useDiscounts } from "@/lib/swr/use-discounts";
+import useGroup from "@/lib/swr/use-group";
+import { ProgramPartnerLinkExtended } from "@/lib/swr/use-program-partner-links";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { DiscountProps, EnrolledPartnerProps, GroupProps } from "@/lib/types";
+import { DiscountSheet } from "@/ui/partners/discounts/add-edit-discount-sheet";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { KeepPartnerInGroupNotice } from "@/ui/partners/keep-partner-in-group-notice";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import { AdditionalRewardOptionList } from "@/ui/partners/rewards/additional-reward-option-list";
+import { ArrowTurnRight2, Button, Modal } from "@dub/ui";
+import { DiscountCode } from "@dub/ui/icons";
+import { cn, getPrettyUrl } from "@dub/utils";
+import { useAction } from "next-safe-action/hooks";
+import Link from "next/link";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { toast } from "sonner";
+
+type PartnerLink = ProgramPartnerLinkExtended;
+type PartnerDiscountOverridePartner = Pick<
+  EnrolledPartnerProps,
+  "id" | "name" | "email" | "image" | "groupId" | "discountId"
+>;
+
+export type PartnerDiscountOverrideTarget =
+  | {
+      type: "partner";
+      partner: PartnerDiscountOverridePartner;
+    }
+  | {
+      type: "link";
+      link: PartnerLink;
+      partner: PartnerDiscountOverridePartner;
+    };
+
+/** What the target currently inherits or overrides. */
+function getEffectiveDiscountId({
+  target,
+  groupDefaultDiscountId,
+}: {
+  target: PartnerDiscountOverrideTarget;
+  groupDefaultDiscountId: string | null | undefined;
+}) {
+  if (target.type === "partner") {
+    return target.partner.discountId ?? groupDefaultDiscountId ?? null;
+  }
+
+  return (
+    target.link.discount ??
+    target.partner.discountId ??
+    groupDefaultDiscountId ??
+    null
+  );
+}
+
+interface EditPartnerDiscountModalProps {
+  showModal: boolean;
+  setShowModal: (showModal: boolean) => void;
+  target: PartnerDiscountOverrideTarget;
+  group?: GroupProps | null;
+}
+
+function EditPartnerDiscountModal({
+  showModal,
+  setShowModal,
+  target,
+  group: groupProp,
+}: EditPartnerDiscountModalProps) {
+  const { partner } = target;
+
+  const [selectedDiscountId, setSelectedDiscountId] = useState<string | null>(
+    null,
+  );
+  const [hasInitializedSelection, setHasInitializedSelection] = useState(false);
+  const [activeSheet, setActiveSheet] = useState<{
+    discount: DiscountProps | null;
+  } | null>(null);
+
+  const { id: workspaceId, slug } = useWorkspace();
+  const { group: fetchedGroup } = useGroup({
+    groupIdOrSlug: partner.groupId ?? undefined,
+  });
+  const group = groupProp ?? fetchedGroup;
+  const { discounts, loading: discountsLoading } = useDiscounts(
+    {
+      groupId: partner.groupId,
+    },
+    {
+      revalidateOnFocus: true,
+    },
+  );
+
+  const { makeRequest: updatePartnerLink, isSubmitting: isUpdatingLink } =
+    useApiMutation();
+
+  const { executeAsync: updateEnrollment, isPending: isUpdatingEnrollment } =
+    useAction(updatePartnerEnrollmentAction, {
+      onSuccess: async () => {
+        setShowModal(false);
+        toast.success("Discount updated");
+        await mutatePrefix(["/api/partners", "/api/discounts"]);
+      },
+      onError({ error }) {
+        toast.error(parseActionError(error, "Failed to update discount"));
+      },
+    });
+
+  const { executeAsync: deleteDiscount, isPending: isDeleting } = useAction(
+    deleteDiscountAction,
+    {
+      onSuccess: async () => {
+        toast.success("Discount deleted!");
+        await mutatePrefix(["/api/discounts", "/api/partners", "/api/groups"]);
+      },
+      onError({ error }) {
+        toast.error(error.serverError ?? "Failed to delete discount");
+      },
+    },
+  );
+
+  const groupDefaultDiscountId = group?.discount?.id;
+  const effectiveDiscountId = getEffectiveDiscountId({
+    target,
+    groupDefaultDiscountId,
+  });
+  const isSubmitting = isUpdatingLink || isUpdatingEnrollment || isDeleting;
+
+  const sortedDiscounts = useMemo(() => {
+    return [...(discounts ?? [])].sort((a, b) => {
+      if (a.id === groupDefaultDiscountId) return -1;
+      if (b.id === groupDefaultDiscountId) return 1;
+      return 0;
+    });
+  }, [discounts, groupDefaultDiscountId]);
+
+  const options = useMemo(
+    () =>
+      sortedDiscounts.map((discount) => {
+        const isGroup = discount.id === groupDefaultDiscountId;
+        const description = formatDiscountDescription(discount);
+
+        return {
+          id: discount.id,
+          isGroup,
+          partnersCount: discount.partnersCount,
+          searchValue: isGroup ? `${description} group` : description,
+          label: <ProgramRewardDescription discount={discount} />,
+        };
+      }),
+    [sortedDiscounts, groupDefaultDiscountId],
+  );
+
+  useEffect(() => {
+    if (!showModal) {
+      setSelectedDiscountId(null);
+      setHasInitializedSelection(false);
+      setActiveSheet(null);
+      return;
+    }
+
+    if (hasInitializedSelection) {
+      return;
+    }
+
+    if (effectiveDiscountId || !discountsLoading) {
+      setSelectedDiscountId(effectiveDiscountId);
+      setHasInitializedSelection(true);
+    }
+  }, [
+    showModal,
+    hasInitializedSelection,
+    effectiveDiscountId,
+    discountsLoading,
+  ]);
+
+  const openDiscountSheet = useCallback(
+    (discount: DiscountProps | null = null) => {
+      setActiveSheet({ discount });
+    },
+    [],
+  );
+
+  const onSubmit = useCallback(
+    async (e: React.FormEvent) => {
+      e.preventDefault();
+
+      if (!selectedDiscountId) {
+        return;
+      }
+
+      if (selectedDiscountId === effectiveDiscountId) {
+        setShowModal(false);
+        return;
+      }
+
+      if (target.type === "partner") {
+        if (!workspaceId) {
+          return;
+        }
+
+        await updateEnrollment({
+          workspaceId,
+          partnerId: partner.id,
+          discountId: selectedDiscountId,
+        });
+        return;
+      }
+
+      await updatePartnerLink(`/api/partners/links/${target.link.id}`, {
+        method: "PATCH",
+        body: {
+          discountId: selectedDiscountId,
+        },
+        onSuccess: async () => {
+          setShowModal(false);
+          toast.success("Discount updated");
+          await mutatePrefix(["/api/partners", "/api/partners/links"]);
+        },
+      });
+    },
+    [
+      selectedDiscountId,
+      workspaceId,
+      effectiveDiscountId,
+      setShowModal,
+      updateEnrollment,
+      updatePartnerLink,
+      target,
+      partner.id,
+    ],
+  );
+
+  const handleDelete = useCallback(
+    async (discountId: string) => {
+      if (!workspaceId || discountId === groupDefaultDiscountId) {
+        return;
+      }
+
+      if (!confirm("Are you sure you want to delete this discount?")) {
+        return;
+      }
+
+      await deleteDiscount({
+        workspaceId,
+        discountId,
+      });
+
+      if (selectedDiscountId === discountId) {
+        setSelectedDiscountId(groupDefaultDiscountId ?? null);
+      }
+    },
+    [workspaceId, deleteDiscount, selectedDiscountId, groupDefaultDiscountId],
+  );
+
+  return (
+    <Modal
+      showModal={showModal}
+      setShowModal={setShowModal}
+      className="max-w-[540px]"
+      preventDefaultClose={activeSheet != null}
+    >
+      {activeSheet && (
+        <DiscountSheet
+          key={activeSheet.discount?.id ?? "new"}
+          nested
+          isOpen
+          setIsOpen={(value) => {
+            const nextOpen = typeof value === "function" ? value(true) : value;
+            if (!nextOpen) {
+              setActiveSheet(null);
+            }
+          }}
+          discount={activeSheet.discount ?? undefined}
+          isDefault={activeSheet.discount ? undefined : false}
+          groupIdOrSlug={partner.groupId}
+          onCreated={setSelectedDiscountId}
+        />
+      )}
+      <form onSubmit={onSubmit}>
+        <div className="flex w-full items-center justify-between gap-3 border-b border-neutral-200 px-6 py-4">
+          <h3 className="text-lg font-semibold tracking-tight">
+            Edit discount
+          </h3>
+          <Button
+            type="button"
+            variant="secondary"
+            text="Create discount"
+            icon={<DiscountCode className="size-4" />}
+            className="h-8 w-fit px-3"
+            onClick={() => openDiscountSheet()}
+          />
+        </div>
+
+        <div className="min-h-[120px] px-4 py-4">
+          {discountsLoading ? (
+            <div className="flex flex-col gap-2">
+              {Array.from({ length: 3 }).map((_, index) => (
+                <div
+                  key={index}
+                  className="h-10 animate-pulse rounded-lg bg-neutral-100"
+                />
+              ))}
+            </div>
+          ) : (
+            <AdditionalRewardOptionList
+              options={options}
+              selectedId={selectedDiscountId}
+              onSelect={setSelectedDiscountId}
+              onEdit={(id) => {
+                const discount = sortedDiscounts.find((item) => item.id === id);
+                if (discount) {
+                  openDiscountSheet(discount);
+                }
+              }}
+              onDelete={group ? handleDelete : undefined}
+              searchPlaceholder="Search discounts..."
+              emptyLabel={
+                options.length === 0
+                  ? "No discounts available. Create one to get started."
+                  : "No discounts found"
+              }
+              onCreate={() => openDiscountSheet()}
+              createLabel="Create discount"
+              showModal={showModal}
+            />
+          )}
+        </div>
+
+        <div className="border-border-subtle flex items-center justify-between gap-4 border-t px-4 py-4">
+          <div className="flex min-w-0 items-center gap-2">
+            <PartnerAvatar partner={partner} className="size-6 shrink-0" />
+            <div className="min-w-0 leading-tight">
+              <div className="flex min-w-0 items-center gap-2">
+                <Link
+                  href={`/${slug}/program/partners/${partner.id}`}
+                  target="_blank"
+                  className={cn(
+                    "min-w-0 cursor-alias truncate text-xs font-medium text-neutral-900 decoration-dotted hover:underline",
+                    target.type !== "link" && "text-sm",
+                  )}
+                >
+                  {partner.name}
+                </Link>
+                <KeepPartnerInGroupNotice offerType="discount" />
+              </div>
+              {target.type === "link" && (
+                <Link
+                  href={`/${slug}/links/${getPrettyUrl(target.link.shortLink)}`}
+                  target="_blank"
+                  className="flex cursor-alias items-center gap-1 truncate text-[11px] text-neutral-500 decoration-dotted hover:underline"
+                >
+                  <ArrowTurnRight2 className="size-3" />
+                  {getPrettyUrl(
+                    constructPartnerLink({ group, link: target.link }),
+                  )}
+                </Link>
+              )}
+            </div>
+          </div>
+          <div className="flex shrink-0 items-center gap-2">
+            <Button
+              type="button"
+              variant="secondary"
+              text="Cancel"
+              className="h-8 w-fit px-3"
+              onClick={() => setShowModal(false)}
+              disabled={isSubmitting}
+            />
+            <Button
+              type="submit"
+              text="Save"
+              className="h-8 w-fit px-3"
+              loading={isSubmitting}
+              disabled={!selectedDiscountId || options.length === 0}
+            />
+          </div>
+        </div>
+      </form>
+    </Modal>
+  );
+}
+
+export function useEditPartnerDiscountModal({
+  target,
+  group,
+}: {
+  target: PartnerDiscountOverrideTarget | null;
+  group?: GroupProps | null;
+}) {
+  const [showModal, setShowModal] = useState(false);
+  const propsRef = useRef({ target, group });
+  const lastTargetRef = useRef(target);
+  propsRef.current = { target, group };
+  if (target) {
+    lastTargetRef.current = target;
+  }
+
+  const EditPartnerDiscountModalCallback = useCallback(() => {
+    const { group: currentGroup } = propsRef.current;
+    const currentTarget = propsRef.current.target ?? lastTargetRef.current;
+
+    if (!currentTarget) {
+      return null;
+    }
+
+    return (
+      <EditPartnerDiscountModal
+        showModal={showModal}
+        setShowModal={setShowModal}
+        target={currentTarget}
+        group={currentGroup}
+      />
+    );
+  }, [showModal]);
+
+  return {
+    setShowEditPartnerDiscountModal: setShowModal,
+    EditPartnerDiscountModal: EditPartnerDiscountModalCallback,
+  };
+}
diff --git a/apps/web/ui/modals/edit-partner-reward-modal.tsx b/apps/web/ui/modals/edit-partner-reward-modal.tsx
new file mode 100644
index 00000000000..6737646f86d
--- /dev/null
+++ b/apps/web/ui/modals/edit-partner-reward-modal.tsx
@@ -0,0 +1,527 @@
+"use client";
+
+import { parseActionError } from "@/lib/actions/parse-action-errors";
+import { deleteRewardAction } from "@/lib/actions/partners/delete-reward";
+import { updatePartnerEnrollmentAction } from "@/lib/actions/partners/update-partner-enrollment";
+import { constructPartnerLink } from "@/lib/partners/construct-partner-link";
+import { mutatePrefix } from "@/lib/swr/mutate";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
+import useGroup from "@/lib/swr/use-group";
+import { ProgramPartnerLinkExtended } from "@/lib/swr/use-program-partner-links";
+import { useRewards } from "@/lib/swr/use-rewards";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { EnrolledPartnerProps, GroupProps, RewardProps } from "@/lib/types";
+import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";
+import { useConfirmRewardChangeModal } from "@/ui/modals/confirm-reward-change-modal";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
+import { KeepPartnerInGroupNotice } from "@/ui/partners/keep-partner-in-group-notice";
+import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import { RewardSheet } from "@/ui/partners/rewards/add-edit-reward-sheet";
+import { AdditionalRewardOptionList } from "@/ui/partners/rewards/additional-reward-option-list";
+import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
+import { ArrowTurnRight2, Button, Modal } from "@dub/ui";
+import { cn, getPrettyUrl } from "@dub/utils";
+import { useAction } from "next-safe-action/hooks";
+import Link from "next/link";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { toast } from "sonner";
+
+type PartnerLink = ProgramPartnerLinkExtended;
+type OverrideRewardEvent = "sale" | "lead" | "click";
+
+type PartnerRewardOverridePartner = Pick<
+  EnrolledPartnerProps,
+  | "id"
+  | "name"
+  | "email"
+  | "image"
+  | "groupId"
+  | "clickRewardId"
+  | "leadRewardId"
+  | "saleRewardId"
+>;
+
+export type PartnerRewardOverrideTarget =
+  | {
+      type: "partner";
+      partner: PartnerRewardOverridePartner;
+    }
+  | {
+      type: "link";
+      link: PartnerLink;
+      partner: PartnerRewardOverridePartner;
+    };
+
+function getGroupRewardId(
+  group: GroupProps | null | undefined,
+  event: OverrideRewardEvent,
+) {
+  return {
+    sale: group?.saleReward?.id,
+    lead: group?.leadReward?.id,
+    click: group?.clickReward?.id,
+  }[event];
+}
+
+function getPartnerRewardId(
+  partner: PartnerRewardOverridePartner,
+  event: OverrideRewardEvent,
+) {
+  return {
+    sale: partner.saleRewardId,
+    lead: partner.leadRewardId,
+    click: partner.clickRewardId,
+  }[event];
+}
+
+function getLinkRewardId(link: PartnerLink, event: OverrideRewardEvent) {
+  return (
+    {
+      sale: link.saleReward,
+      lead: link.leadReward,
+      click: link.clickReward,
+    }[event] ?? null
+  );
+}
+
+function getSelectedRewardId({
+  target,
+  event,
+  groupRewardId,
+}: {
+  target: PartnerRewardOverrideTarget;
+  event: OverrideRewardEvent;
+  groupRewardId: string | null | undefined;
+}) {
+  if (target.type === "partner") {
+    return getPartnerRewardId(target.partner, event) ?? groupRewardId ?? null;
+  }
+
+  return (
+    getLinkRewardId(target.link, event) ??
+    getPartnerRewardId(target.partner, event) ??
+    groupRewardId ??
+    null
+  );
+}
+
+interface EditPartnerRewardModalProps {
+  showModal: boolean;
+  setShowModal: (showModal: boolean) => void;
+  event: OverrideRewardEvent;
+  target: PartnerRewardOverrideTarget;
+  group?: GroupProps | null;
+}
+
+function EditPartnerRewardModal({
+  showModal,
+  setShowModal,
+  event,
+  target,
+  group: groupProp,
+}: EditPartnerRewardModalProps) {
+  const { partner } = target;
+
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const [rewardSheet, setRewardSheet] = useState<{
+    reward: RewardProps | null;
+  } | null>(null);
+  const [isRewardSheetOpen, setIsRewardSheetOpen] = useState(false);
+
+  const { id: workspaceId, slug } = useWorkspace();
+  const { rewards, loading: rewardsLoading } = useRewards(
+    {
+      groupId: partner.groupId,
+    },
+    {
+      revalidateOnFocus: true,
+    },
+  );
+  const { group: fetchedGroup } = useGroup({
+    groupIdOrSlug: partner.groupId ?? undefined,
+  });
+  const group = groupProp ?? fetchedGroup;
+  const { ConfirmRewardChangeModal, confirmRewardChange } =
+    useConfirmRewardChangeModal();
+
+  const { makeRequest: updatePartnerLink, isSubmitting: isUpdatingLink } =
+    useApiMutation();
+
+  const { executeAsync: updateEnrollment, isPending: isUpdatingEnrollment } =
+    useAction(updatePartnerEnrollmentAction, {
+      onSuccess: async () => {
+        setShowModal(false);
+        toast.success("Reward updated");
+        await mutatePrefix(["/api/partners", "/api/rewards"]);
+      },
+      onError({ error }) {
+        toast.error(parseActionError(error, "Failed to update reward"));
+      },
+    });
+
+  const { executeAsync: deleteReward, isPending: isDeleting } = useAction(
+    deleteRewardAction,
+    {
+      onSuccess: async () => {
+        toast.success("Reward deleted!");
+        await mutatePrefix(["/api/rewards", "/api/partners", "/api/groups"]);
+      },
+      onError({ error }) {
+        toast.error(error.serverError ?? "Failed to delete reward");
+      },
+    },
+  );
+
+  const groupRewardId = getGroupRewardId(group, event);
+  const CreateIcon = REWARD_EVENT_ICON[event];
+
+  const eventRewards = useMemo(() => {
+    return (rewards ?? [])
+      .filter((reward) => reward.event === event)
+      .sort((a, b) => {
+        if (a.id === groupRewardId) return -1;
+        if (b.id === groupRewardId) return 1;
+        return 0;
+      });
+  }, [rewards, event, groupRewardId]);
+
+  const currentId = getSelectedRewardId({
+    target,
+    event,
+    groupRewardId,
+  });
+  const resolvedSelectedId = selectedId ?? currentId;
+  const hasChanges = resolvedSelectedId !== currentId;
+  const isSubmitting = isUpdatingLink || isUpdatingEnrollment;
+
+  const options = useMemo(
+    () =>
+      eventRewards.map((reward) => {
+        const isGroup = reward.id === groupRewardId;
+        const description = formatRewardDescription(reward);
+
+        return {
+          id: reward.id,
+          isGroup,
+          partnersCount: reward.partnersCount,
+          searchValue: isGroup ? `${description} group` : description,
+          label: (
+            <ProgramRewardDescription
+              reward={reward}
+              amountClassName="font-normal"
+            />
+          ),
+        };
+      }),
+    [eventRewards, groupRewardId],
+  );
+
+  useEffect(() => {
+    if (showModal) {
+      return;
+    }
+
+    setIsRewardSheetOpen(false);
+    setRewardSheet(null);
+    setSelectedId(null);
+  }, [showModal]);
+
+  const openRewardSheet = useCallback((reward: RewardProps | null = null) => {
+    setRewardSheet({ reward });
+    setIsRewardSheetOpen(true);
+  }, []);
+
+  const persistOverride = useCallback(
+    async (activityDescription?: string) => {
+      const rewardIdColumn = REWARD_EVENT_COLUMN_MAPPING[event];
+
+      if (target.type === "partner") {
+        if (!workspaceId) {
+          return;
+        }
+
+        await updateEnrollment({
+          workspaceId,
+          partnerId: partner.id,
+          [rewardIdColumn]: resolvedSelectedId,
+          activityDescription,
+        });
+        return;
+      }
+
+      await updatePartnerLink(`/api/partners/links/${target.link.id}`, {
+        method: "PATCH",
+        body: {
+          [rewardIdColumn]: resolvedSelectedId,
+          activityDescription,
+        },
+        onSuccess: async () => {
+          setShowModal(false);
+          toast.success("Reward updated");
+          await mutatePrefix(["/api/partners", "/api/partners/links"]);
+        },
+      });
+    },
+    [
+      workspaceId,
+      event,
+      resolvedSelectedId,
+      updateEnrollment,
+      updatePartnerLink,
+      target,
+      partner.id,
+      setShowModal,
+    ],
+  );
+
+  const onSubmit = useCallback(
+    async (e: React.FormEvent) => {
+      e.preventDefault();
+
+      if (!resolvedSelectedId) {
+        return;
+      }
+
+      const selectedReward = eventRewards.find(
+        (item) => item.id === resolvedSelectedId,
+      );
+
+      if (!selectedReward) {
+        return;
+      }
+
+      if (!hasChanges) {
+        setShowModal(false);
+        return;
+      }
+
+      await confirmRewardChange({
+        action: "updated",
+        target: target.type,
+        reward: selectedReward,
+        isPending: isSubmitting,
+        onConfirm: persistOverride,
+      });
+    },
+    [
+      resolvedSelectedId,
+      hasChanges,
+      eventRewards,
+      setShowModal,
+      confirmRewardChange,
+      target.type,
+      isSubmitting,
+      persistOverride,
+    ],
+  );
+
+  const handleDelete = useCallback(
+    async (rewardId: string) => {
+      const reward = eventRewards.find((item) => item.id === rewardId);
+      if (!reward || !workspaceId || reward.id === groupRewardId) {
+        return;
+      }
+
+      await confirmRewardChange({
+        action: "deleted",
+        target: "group",
+        isDefault: false,
+        reward,
+        partnerCount: reward.partnersCount ?? undefined,
+        isPending: isDeleting,
+        onConfirm: async (activityDescription) => {
+          await deleteReward({
+            workspaceId,
+            rewardId,
+            activityDescription,
+          });
+
+          if (resolvedSelectedId === rewardId) {
+            setSelectedId(groupRewardId ?? null);
+          }
+        },
+      });
+    },
+    [
+      eventRewards,
+      workspaceId,
+      confirmRewardChange,
+      groupRewardId,
+      isDeleting,
+      deleteReward,
+      resolvedSelectedId,
+    ],
+  );
+
+  return (
+    <Modal
+      showModal={showModal}
+      setShowModal={setShowModal}
+      className="max-w-[540px]"
+      preventDefaultClose={isRewardSheetOpen}
+    >
+      {ConfirmRewardChangeModal}
+      {rewardSheet && (
+        <RewardSheet
+          key={rewardSheet.reward?.id ?? "new"}
+          nested
+          isOpen={isRewardSheetOpen}
+          setIsOpen={setIsRewardSheetOpen}
+          event={rewardSheet.reward?.event ?? event}
+          reward={rewardSheet.reward ?? undefined}
+          isDefault={rewardSheet.reward ? undefined : false}
+          groupIdOrSlug={partner.groupId}
+          onCreated={setSelectedId}
+        />
+      )}
+      <form onSubmit={onSubmit}>
+        <div className="flex w-full items-center justify-between gap-3 border-b border-neutral-200 px-6 py-4">
+          <h3 className="text-lg font-semibold tracking-tight">
+            Edit {event} reward
+          </h3>
+          <Button
+            type="button"
+            variant="secondary"
+            text="Create reward"
+            icon={<CreateIcon className="size-4" />}
+            className="h-8 w-fit px-3"
+            onClick={() => openRewardSheet()}
+          />
+        </div>
+
+        <div className="min-h-[120px] px-4 py-4">
+          {rewardsLoading ? (
+            <div className="flex flex-col gap-2">
+              {Array.from({ length: 3 }).map((_, index) => (
+                <div
+                  key={index}
+                  className="h-10 animate-pulse rounded-lg bg-neutral-100"
+                />
+              ))}
+            </div>
+          ) : (
+            <AdditionalRewardOptionList
+              options={options}
+              selectedId={resolvedSelectedId}
+              onSelect={setSelectedId}
+              onEdit={(id) => {
+                const reward = eventRewards.find((item) => item.id === id);
+                if (reward) {
+                  openRewardSheet(reward);
+                }
+              }}
+              onDelete={group ? handleDelete : undefined}
+              searchPlaceholder="Search rewards..."
+              emptyLabel={
+                options.length === 0
+                  ? `No ${event} rewards available. Create one to get started.`
+                  : "No rewards found"
+              }
+              onCreate={() => openRewardSheet()}
+              createLabel="Create reward"
+              showModal={showModal}
+            />
+          )}
+        </div>
+
+        <div className="border-border-subtle flex items-center justify-between gap-4 border-t px-4 py-4">
+          <div className="flex min-w-0 items-center gap-2">
+            <PartnerAvatar partner={partner} className="size-6 shrink-0" />
+            <div className="min-w-0 leading-tight">
+              <div className="flex min-w-0 items-center gap-2">
+                <Link
+                  href={`/${slug}/program/partners/${partner.id}`}
+                  target="_blank"
+                  className={cn(
+                    "min-w-0 cursor-alias truncate text-xs font-medium text-neutral-900 decoration-dotted hover:underline",
+                    target.type !== "link" && "text-sm",
+                  )}
+                >
+                  {partner.name}
+                </Link>
+                <KeepPartnerInGroupNotice offerType="reward" />
+              </div>
+              {target.type === "link" && (
+                <Link
+                  href={`/${slug}/links/${getPrettyUrl(target.link.shortLink)}`}
+                  target="_blank"
+                  className="flex cursor-alias items-center gap-1 truncate text-[11px] text-neutral-500 decoration-dotted hover:underline"
+                >
+                  <ArrowTurnRight2 className="size-3" />
+                  {getPrettyUrl(
+                    constructPartnerLink({ group, link: target.link }),
+                  )}
+                </Link>
+              )}
+            </div>
+          </div>
+          <div className="flex shrink-0 items-center gap-2">
+            <Button
+              type="button"
+              variant="secondary"
+              text="Cancel"
+              className="h-8 w-fit px-3"
+              onClick={() => setShowModal(false)}
+              disabled={isSubmitting}
+            />
+            <Button
+              type="submit"
+              text="Save"
+              className="h-8 w-fit px-3"
+              loading={isSubmitting}
+              disabled={
+                !resolvedSelectedId || options.length === 0 || !hasChanges
+              }
+            />
+          </div>
+        </div>
+      </form>
+    </Modal>
+  );
+}
+
+export function useEditPartnerRewardModal({
+  event,
+  target,
+  group,
+}: {
+  event: OverrideRewardEvent;
+  target: PartnerRewardOverrideTarget | null;
+  group?: GroupProps | null;
+}) {
+  const [showModal, setShowModal] = useState(false);
+  const propsRef = useRef({ event, target, group });
+  const lastTargetRef = useRef(target);
+  propsRef.current = { event, target, group };
+  if (target) {
+    lastTargetRef.current = target;
+  }
+
+  const EditPartnerRewardModalCallback = useCallback(() => {
+    const { event: currentEvent, group: currentGroup } = propsRef.current;
+    const currentTarget = propsRef.current.target ?? lastTargetRef.current;
+
+    if (!currentTarget) {
+      return null;
+    }
+
+    return (
+      <EditPartnerRewardModal
+        showModal={showModal}
+        setShowModal={setShowModal}
+        event={currentEvent}
+        target={currentTarget}
+        group={currentGroup}
+      />
+    );
+  }, [showModal]);
+
+  return useMemo(
+    () => ({
+      setShowEditPartnerRewardModal: setShowModal,
+      EditPartnerRewardModal: EditPartnerRewardModalCallback,
+    }),
+    [EditPartnerRewardModalCallback],
+  );
+}
diff --git a/apps/web/ui/modals/edit-submitted-lead-modal.tsx b/apps/web/ui/modals/edit-submitted-lead-modal.tsx
index 9ad03adaaea..ab9f24cd136 100644
--- a/apps/web/ui/modals/edit-submitted-lead-modal.tsx
+++ b/apps/web/ui/modals/edit-submitted-lead-modal.tsx
@@ -9,7 +9,7 @@ import { CountryCombobox } from "@/ui/partners/country-combobox";
 import { Button, Modal, useMediaQuery } from "@dub/ui";
 import { COUNTRIES } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { toast } from "sonner";
 import * as z from "zod/v4";
@@ -55,7 +55,7 @@ function EditSubmittedLeadModal({
   const { isMobile } = useMediaQuery();
   const { id: workspaceId, defaultProgramId } = useWorkspace();
 
-  const customFormData = lead.formData ?? [];
+  const customFormData = lead.formData;
 
   const {
     register,
@@ -186,7 +186,7 @@ function EditSubmittedLeadModal({
               </div>
 
               {/* Custom form data fields */}
-              {customFormData.map((field) => {
+              {customFormData?.map((field) => {
                 const keyPath = `formData.${field.key}` as const;
 
                 if (field.type === "textarea") {
@@ -293,11 +293,7 @@ export function useEditSubmittedLeadModal() {
     setLead(lead);
   }
 
-  function closeEditSubmittedLeadModal() {
-    setLead(null);
-  }
-
-  function EditSubmittedLeadModalWrapper() {
+  const EditSubmittedLeadModalWrapper = useCallback(() => {
     if (!lead) return null;
 
     return (
@@ -305,15 +301,14 @@ export function useEditSubmittedLeadModal() {
         lead={lead}
         showModal
         setShowModal={(show) => {
-          if (!show) closeEditSubmittedLeadModal();
+          if (!show) setLead(null);
         }}
       />
     );
-  }
+  }, [lead]);
 
   return {
     openEditSubmittedLeadModal,
-    closeEditSubmittedLeadModal,
     EditSubmittedLeadModal: EditSubmittedLeadModalWrapper,
     isEditSubmittedLeadModalOpen: lead !== null,
   };
diff --git a/apps/web/ui/modals/export-partner-customers-modal.tsx b/apps/web/ui/modals/export-partner-customers-modal.tsx
new file mode 100644
index 00000000000..12e81b26c37
--- /dev/null
+++ b/apps/web/ui/modals/export-partner-customers-modal.tsx
@@ -0,0 +1,255 @@
+"use client";
+
+import { generateExportFilename } from "@/lib/api/utils/generate-export-filename";
+import { CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS } from "@/lib/constants/partner-profile";
+import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
+import {
+  PARTNER_CUSTOMER_EXPORT_COLUMNS,
+  PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS,
+} from "@/lib/zod/schemas/partner-profile";
+import {
+  Button,
+  Checkbox,
+  InfoTooltip,
+  Modal,
+  Switch,
+  useRouterStuff,
+} from "@dub/ui";
+import { useSession } from "next-auth/react";
+import { useParams } from "next/navigation";
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useId,
+  useMemo,
+  useState,
+} from "react";
+import { Controller, useForm } from "react-hook-form";
+import { toast } from "sonner";
+
+interface FormData {
+  columns: string[];
+  useFilters: boolean;
+}
+
+function ExportPartnerCustomersModal({
+  showExportPartnerCustomersModal,
+  setShowExportPartnerCustomersModal,
+}: {
+  showExportPartnerCustomersModal: boolean;
+  setShowExportPartnerCustomersModal: Dispatch<SetStateAction<boolean>>;
+}) {
+  const { programSlug } = useParams<{ programSlug: string }>();
+  const { data: session } = useSession();
+  const { programEnrollment } = useProgramEnrollment();
+  const { getQueryString } = useRouterStuff();
+
+  const columnCheckboxId = useId();
+
+  const ltvExcluded = CUSTOMER_LTV_EXCLUDED_PROGRAM_IDS.includes(
+    programEnrollment?.programId ?? "",
+  );
+  const sharingEnabled = Boolean(
+    programEnrollment?.customerDataSharingEnabledAt,
+  );
+
+  const {
+    control,
+    handleSubmit,
+    formState: { isSubmitting },
+  } = useForm<FormData>({
+    defaultValues: {
+      columns: PARTNER_CUSTOMER_EXPORT_DEFAULT_COLUMNS,
+      useFilters: true,
+    },
+  });
+
+  const visibleColumns = useMemo(() => {
+    return PARTNER_CUSTOMER_EXPORT_COLUMNS.filter((col) => {
+      if (col.id === "name" && !sharingEnabled) {
+        return false;
+      }
+      if (col.id === "saleAmount" && ltvExcluded) {
+        return false;
+      }
+      return true;
+    }).sort((a, b) => a.order - b.order);
+  }, [sharingEnabled, ltvExcluded]);
+
+  const onSubmit = handleSubmit(async (data) => {
+    if (!programSlug) {
+      return;
+    }
+
+    const visibleIds = new Set<string>(visibleColumns.map((col) => col.id));
+    const columns = data.columns.filter((column) => visibleIds.has(column));
+
+    if (columns.length === 0) {
+      toast.error("Select at least one column.");
+      return;
+    }
+
+    const lid = toast.loading("Exporting customers...");
+
+    try {
+      const baseParams: Record<string, string> = {
+        columns: columns.join(","),
+      };
+
+      const queryString = data.useFilters
+        ? getQueryString(baseParams, {
+            include: ["search", "country", "linkId", "sortBy", "sortOrder"],
+          })
+        : `?${new URLSearchParams(baseParams).toString()}`;
+
+      const response = await fetch(
+        `/api/partner-profile/programs/${programSlug}/customers/export${queryString}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        },
+      );
+
+      if (!response.ok) {
+        const body = await response.json();
+        throw new Error(body.error?.message ?? "Customer export failed");
+      }
+
+      if (response.status === 202) {
+        toast.success(
+          `Your export is being processed and we'll send you an email (${session?.user?.email}) when it's ready to download.`,
+        );
+        setShowExportPartnerCustomersModal(false);
+        return;
+      }
+
+      const blob = await response.blob();
+      const url = window.URL.createObjectURL(blob);
+      const a = document.createElement("a");
+      a.href = url;
+
+      a.download = generateExportFilename("customers");
+      a.click();
+      window.URL.revokeObjectURL(url);
+
+      toast.success("Customers exported successfully");
+      setShowExportPartnerCustomersModal(false);
+    } catch (error) {
+      toast.error(
+        error instanceof Error ? error.message : "Customer export failed",
+      );
+    } finally {
+      toast.dismiss(lid);
+    }
+  });
+
+  return (
+    <Modal
+      showModal={showExportPartnerCustomersModal}
+      setShowModal={setShowExportPartnerCustomersModal}
+    >
+      <div className="border-b border-neutral-200 p-4 sm:p-6">
+        <h3 className="text-lg font-medium leading-none">Export customers</h3>
+      </div>
+
+      <form onSubmit={onSubmit}>
+        <div className="bg-neutral-50 p-4 sm:p-6">
+          <div className="space-y-4">
+            <div>
+              <p className="mb-2 block text-sm font-medium text-neutral-700">
+                Columns
+              </p>
+              <Controller
+                name="columns"
+                control={control}
+                render={({ field }) => (
+                  <div className="xs:grid-cols-2 grid grid-cols-1 gap-x-4 gap-y-2">
+                    {visibleColumns.map(({ id, label }) => (
+                      <div key={id} className="group flex gap-2">
+                        <Checkbox
+                          value={id}
+                          id={`${columnCheckboxId}-${id}`}
+                          checked={field.value.includes(id)}
+                          onCheckedChange={(checked) => {
+                            field.onChange(
+                              checked
+                                ? [...field.value, id]
+                                : field.value.filter((value) => value !== id),
+                            );
+                          }}
+                        />
+                        <label
+                          htmlFor={`${columnCheckboxId}-${id}`}
+                          className="select-none text-sm font-medium text-neutral-600 group-hover:text-neutral-800"
+                        >
+                          {label}
+                        </label>
+                      </div>
+                    ))}
+                  </div>
+                )}
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className="border-t border-neutral-200 bg-neutral-50 px-4 py-4 sm:px-6">
+          <Controller
+            name="useFilters"
+            control={control}
+            render={({ field }) => (
+              <div className="flex items-center justify-between gap-2">
+                <span className="flex select-none items-center gap-2 text-sm font-medium text-neutral-600 group-hover:text-neutral-800">
+                  Apply current filters
+                  <InfoTooltip content="Filter exported customers by your currently selected filters" />
+                </span>
+                <Switch checked={field.value} fn={field.onChange} />
+              </div>
+            )}
+          />
+        </div>
+
+        <div className="flex items-center justify-end gap-2 border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">
+          <Button
+            onClick={() => setShowExportPartnerCustomersModal(false)}
+            variant="secondary"
+            text="Cancel"
+            className="h-8 w-fit px-3"
+            type="button"
+          />
+          <Button
+            type="submit"
+            loading={isSubmitting}
+            text="Export customers"
+            className="h-8 w-fit px-3"
+          />
+        </div>
+      </form>
+    </Modal>
+  );
+}
+
+export function useExportPartnerCustomersModal() {
+  const [showExportPartnerCustomersModal, setShowExportPartnerCustomersModal] =
+    useState(false);
+
+  const ExportPartnerCustomersModalCallback = useCallback(() => {
+    return (
+      <ExportPartnerCustomersModal
+        showExportPartnerCustomersModal={showExportPartnerCustomersModal}
+        setShowExportPartnerCustomersModal={setShowExportPartnerCustomersModal}
+      />
+    );
+  }, [showExportPartnerCustomersModal, setShowExportPartnerCustomersModal]);
+
+  return useMemo(
+    () => ({
+      setShowExportPartnerCustomersModal,
+      ExportPartnerCustomersModal: ExportPartnerCustomersModalCallback,
+    }),
+    [setShowExportPartnerCustomersModal, ExportPartnerCustomersModalCallback],
+  );
+}
diff --git a/apps/web/ui/modals/export-partners-modal.tsx b/apps/web/ui/modals/export-partners-modal.tsx
index 1e4cd2271cd..4d3ca14a57c 100644
--- a/apps/web/ui/modals/export-partners-modal.tsx
+++ b/apps/web/ui/modals/export-partners-modal.tsx
@@ -8,7 +8,6 @@ import {
 import {
   Button,
   Checkbox,
-  InfoTooltip,
   Modal,
   Switch,
   useRouterStuff,
@@ -72,7 +71,13 @@ function ExportPartnersModal({
       };
 
       const searchParams = data.useFilters
-        ? getQueryString(params)
+        ? getQueryString(params, {
+            exclude: [
+              "search",
+              // Relevance only exists for searches, which exports skip
+              ...(searchParamsObj.sortBy === "relevance" ? ["sortBy"] : []),
+            ],
+          })
         : "?" + new URLSearchParams(params);
 
       const response = await fetch(`/api/partners/export${searchParams}`, {
@@ -167,11 +172,16 @@ function ExportPartnersModal({
             name="useFilters"
             control={control}
             render={({ field }) => (
-              <div className="flex items-center justify-between gap-2">
-                <span className="flex select-none items-center gap-2 text-sm font-medium text-neutral-600 group-hover:text-neutral-800">
-                  Apply current filters
-                  <InfoTooltip content="Filter exported partners by your currently selected filters" />
-                </span>
+              <div className="flex items-start justify-between gap-2">
+                <div className="flex select-none flex-col gap-1">
+                  <span className="text-sm font-medium text-neutral-600 group-hover:text-neutral-800">
+                    Apply current filters
+                  </span>
+                  <span className="text-xs text-neutral-500">
+                    Filter exported partners by your currently selected
+                    filters. The search field is not included.
+                  </span>
+                </div>
                 <Switch checked={field.value} fn={field.onChange} />
               </div>
             )}
diff --git a/apps/web/ui/modals/forward-dns-instructions-modal.tsx b/apps/web/ui/modals/forward-dns-instructions-modal.tsx
new file mode 100644
index 00000000000..74d375e50ba
--- /dev/null
+++ b/apps/web/ui/modals/forward-dns-instructions-modal.tsx
@@ -0,0 +1,137 @@
+"use client";
+
+import { Button, Modal, useMediaQuery } from "@dub/ui";
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useMemo,
+  useState,
+} from "react";
+import { toast } from "sonner";
+
+type ForwardDnsInstructionsModalProps = {
+  domain: string;
+  workspaceId: string;
+  endpoint: string;
+  recordType?: "A" | "CNAME";
+};
+
+function ForwardDnsInstructionsModal({
+  showModal,
+  setShowModal,
+  domain,
+  endpoint,
+  recordType,
+}: {
+  showModal: boolean;
+  setShowModal: Dispatch<SetStateAction<boolean>>;
+} & ForwardDnsInstructionsModalProps) {
+  const { isMobile } = useMediaQuery();
+  const [email, setEmail] = useState("");
+  const [loading, setLoading] = useState(false);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setLoading(true);
+    try {
+      const body: { email: string; recordType?: "A" | "CNAME" } = { email };
+      if (recordType) {
+        body.recordType = recordType;
+      }
+      const res = await fetch(endpoint, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body),
+      });
+      const json = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        toast.error(json?.error?.message ?? "Failed to send instructions.");
+        return;
+      }
+      toast.success(`DNS instructions sent to ${email}`);
+      setShowModal(false);
+      setEmail("");
+    } catch {
+      toast.error("Failed to send instructions.");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Modal showModal={showModal} setShowModal={setShowModal}>
+      <div className="space-y-1 border-b border-neutral-200 px-4 py-4 sm:px-6">
+        <h3 className="text-lg font-medium">Forward DNS instructions</h3>
+        <p className="text-sm text-neutral-500">
+          Enter an email address to send the DNS records needed to configure{" "}
+          <span className="font-medium text-neutral-700">{domain}</span>.
+        </p>
+      </div>
+
+      <form
+        onSubmit={handleSubmit}
+        className="flex flex-col gap-4 bg-neutral-50 px-4 py-6 sm:px-6"
+      >
+        <div>
+          <label
+            htmlFor="forward-email"
+            className="block text-sm font-medium text-neutral-700"
+          >
+            Email address
+          </label>
+          <input
+            id="forward-email"
+            type="email"
+            required
+            autoFocus={!isMobile}
+            autoComplete="off"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            placeholder="admin@example.com"
+            className="mt-1 block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+          />
+        </div>
+
+        <Button
+          type="submit"
+          text="Send instructions"
+          loading={loading}
+          disabled={!email}
+        />
+      </form>
+    </Modal>
+  );
+}
+
+export function useForwardDnsInstructionsModal(
+  props: ForwardDnsInstructionsModalProps,
+) {
+  const [showModal, setShowModal] = useState(false);
+
+  const Modal = useCallback(
+    () => (
+      <ForwardDnsInstructionsModal
+        showModal={showModal}
+        setShowModal={setShowModal}
+        {...props}
+      />
+    ),
+    [
+      showModal,
+      props.domain,
+      props.endpoint,
+      props.recordType,
+      props.workspaceId,
+    ],
+  );
+
+  return useMemo(
+    () => ({
+      setShowForwardDnsModal: setShowModal,
+      ForwardDnsInstructionsModal: Modal,
+    }),
+    [setShowModal, Modal],
+  );
+}
diff --git a/apps/web/ui/modals/import-bitly-modal.tsx b/apps/web/ui/modals/import-bitly-modal.tsx
index e2c6506298d..221f85c6aa0 100644
--- a/apps/web/ui/modals/import-bitly-modal.tsx
+++ b/apps/web/ui/modals/import-bitly-modal.tsx
@@ -14,7 +14,7 @@ import {
 import { fetcher } from "@dub/utils";
 import { ArrowRight, ServerOff } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -25,6 +25,7 @@ import {
 } from "react";
 import { toast } from "sonner";
 import useSWRImmutable from "swr/immutable";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportBitlyModal({
   showImportBitlyModal,
@@ -34,7 +35,6 @@ function ImportBitlyModal({
   setShowImportBitlyModal: Dispatch<SetStateAction<boolean>>;
 }) {
   const router = useRouter();
-  const searchParams = useSearchParams();
   const { folderId } = useCurrentFolderId();
   const { id: workspaceId } = useWorkspace();
   const [importing, setImporting] = useState(false);
@@ -81,13 +81,10 @@ function ImportBitlyModal({
   const [selectedGroupTags, setSelectedGroupTags] = useState<string[]>([]);
 
   useEffect(() => {
-    if (searchParams?.get("import") === "bitly") {
+    if (showImportBitlyModal && groups !== undefined) {
       mutate();
-      setShowImportBitlyModal(true);
-    } else {
-      setShowImportBitlyModal(false);
     }
-  }, [searchParams]);
+  }, [showImportBitlyModal]);
 
   const isSelected = (domain: string) => {
     return selectedDomains.find((d) => d.domain === domain) ? true : false;
@@ -291,7 +288,8 @@ function ImportBitlyModal({
 }
 
 export function useImportBitlyModal() {
-  const [showImportBitlyModal, setShowImportBitlyModal] = useState(false);
+  const [showImportBitlyModal, setShowImportBitlyModal] =
+    useImportModalParam("bitly");
 
   const ImportBitlyModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-csv-modal/index.tsx b/apps/web/ui/modals/import-csv-modal/index.tsx
index 5024922a184..21d61614edd 100644
--- a/apps/web/ui/modals/import-csv-modal/index.tsx
+++ b/apps/web/ui/modals/import-csv-modal/index.tsx
@@ -12,7 +12,7 @@ import {
 } from "@dub/ui";
 import { TableIcon } from "@dub/ui/icons";
 import { ArrowRight } from "lucide-react";
-import { useParams, useRouter, useSearchParams } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -31,6 +31,7 @@ import {
 } from "react-hook-form";
 import { toast } from "sonner";
 import { mutate } from "swr";
+import { useImportModalParam } from "../use-import-modal-param";
 import { FieldMapping } from "./field-mapping";
 import { SelectFile } from "./select-file";
 
@@ -97,16 +98,10 @@ function ImportCsvModal({
   const router = useRouter();
   const { slug } = useParams() as { slug?: string };
   const { queryParams } = useRouterStuff();
-  const searchParams = useSearchParams();
   const { id: workspaceId } = useWorkspace();
 
   const { folderId } = useCurrentFolderId();
 
-  useEffect(
-    () => setShowImportCsvModal(searchParams?.get("import") === "csv"),
-    [searchParams],
-  );
-
   const {
     control,
     watch,
@@ -270,7 +265,8 @@ function ImportCsvModal({
 }
 
 export function useImportCsvModal() {
-  const [showImportCsvModal, setShowImportCsvModal] = useState(false);
+  const [showImportCsvModal, setShowImportCsvModal] =
+    useImportModalParam("csv");
 
   const ImportCsvModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-firstpromoter-modal.tsx b/apps/web/ui/modals/import-firstpromoter-modal.tsx
index b4e871668d0..f898198d80d 100644
--- a/apps/web/ui/modals/import-firstpromoter-modal.tsx
+++ b/apps/web/ui/modals/import-firstpromoter-modal.tsx
@@ -4,17 +4,17 @@ import { X } from "@/ui/shared/icons";
 import { Button, Logo, Modal, useMediaQuery, useRouterStuff } from "@dub/ui";
 import { ArrowRight } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
   useCallback,
-  useEffect,
   useMemo,
   useState,
 } from "react";
 import { toast } from "sonner";
 import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportFirstPromoterModal({
   showImportFirstPromoterModal,
@@ -180,17 +180,7 @@ function CredentialsForm({ onClose }: { onClose: () => void }) {
 
 export function useImportFirstPromoterModal() {
   const [showImportFirstPromoterModal, setShowImportFirstPromoterModal] =
-    useState(false);
-  const searchParams = useSearchParams();
-
-  // Sync the modal state with the `?import=` query param here in the hook
-  // rather than in the modal itself, which remounts on every open/close
-  // and would re-open from a stale param mid-navigation
-  useEffect(() => {
-    setShowImportFirstPromoterModal(
-      searchParams?.get("import") === "firstpromoter",
-    );
-  }, [searchParams]);
+    useImportModalParam("firstpromoter");
 
   const ImportFirstPromoterModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-lemonsqueezy-modal.tsx b/apps/web/ui/modals/import-lemonsqueezy-modal.tsx
new file mode 100644
index 00000000000..1481d373376
--- /dev/null
+++ b/apps/web/ui/modals/import-lemonsqueezy-modal.tsx
@@ -0,0 +1,339 @@
+import { setLemonSqueezyTokenAction } from "@/lib/actions/partners/set-lemonsqueezy-token";
+import { startLemonSqueezyImportAction } from "@/lib/actions/partners/start-lemonsqueezy-import";
+import { LemonSqueezyStore } from "@/lib/lemonsqueezy/types";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { X } from "@/ui/shared/icons";
+import {
+  Button,
+  Check2,
+  Logo,
+  Modal,
+  ScrollContainer,
+  useMediaQuery,
+  useRouterStuff,
+} from "@dub/ui";
+import { cn, nFormatter } from "@dub/utils";
+import { ArrowRight } from "lucide-react";
+import { AnimatePresence, motion } from "motion/react";
+import { useAction } from "next-safe-action/hooks";
+import { useRouter } from "next/navigation";
+import {
+  Dispatch,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
+import { toast } from "sonner";
+import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
+
+type Step = "set-token" | "select-store";
+
+function ImportLemonSqueezyModal({
+  showImportLemonSqueezyModal,
+  setShowImportLemonSqueezyModal,
+}: {
+  showImportLemonSqueezyModal: boolean;
+  setShowImportLemonSqueezyModal: Dispatch<SetStateAction<boolean>>;
+}) {
+  const { queryParams } = useRouterStuff();
+  const [step, setStep] = useState<Step>("set-token");
+  const [stores, setStores] = useState<LemonSqueezyStore[]>([]);
+
+  // Reset the step and stores when the modal is closed
+  useEffect(() => {
+    if (!showImportLemonSqueezyModal) {
+      setStep("set-token");
+      setStores([]);
+    }
+  }, [showImportLemonSqueezyModal]);
+
+  return (
+    <Modal
+      showModal={showImportLemonSqueezyModal}
+      setShowModal={setShowImportLemonSqueezyModal}
+      onClose={() =>
+        queryParams({
+          del: "import",
+        })
+      }
+    >
+      <Button
+        variant="outline"
+        icon={<X className="size-5" />}
+        className="absolute right-4 top-4 h-auto w-fit p-1"
+        onClick={() => {
+          setShowImportLemonSqueezyModal(false);
+          queryParams({
+            del: "import",
+          });
+        }}
+      />
+      <div className="flex flex-col items-center justify-center space-y-3 border-b border-neutral-200 px-4 py-8 sm:px-16">
+        <div className="flex items-center space-x-3 py-4">
+          <img
+            src="https://assets.dub.co/misc/icons/lemonsqueezy.svg"
+            alt="Lemon Squeezy logo"
+            className="h-10 w-10"
+          />
+          <ArrowRight className="h-5 w-5 text-neutral-600" />
+          <Logo />
+        </div>
+        <h3 className="text-lg font-medium">
+          Import your Lemon Squeezy program
+        </h3>
+        <MarkdownDescription className="text-center text-sm text-neutral-500">
+          [Migrate your existing Lemon Squeezy
+          program](https://dub.co/help/article/migrating-from-lemonsqueezy),
+          partners, and historical stats into Dub in just a few clicks.
+        </MarkdownDescription>
+      </div>
+
+      <div className="flex flex-col space-y-6 bg-neutral-50 px-4 py-8 text-left sm:px-16">
+        <AnimatePresence mode="wait">
+          {step === "set-token" ? (
+            <motion.div
+              key="token-form"
+              initial={{ opacity: 0, x: 20 }}
+              animate={{ opacity: 1, x: 0 }}
+              exit={{ opacity: 0, x: -20 }}
+              transition={{ duration: 0.2, ease: "easeInOut" }}
+            >
+              <TokenForm setStep={setStep} setStores={setStores} />
+            </motion.div>
+          ) : (
+            <motion.div
+              key="select-store"
+              initial={{ opacity: 0, x: 20 }}
+              animate={{ opacity: 1, x: 0 }}
+              exit={{ opacity: 0, x: -20 }}
+              transition={{ duration: 0.2, ease: "easeInOut" }}
+            >
+              <SelectStore
+                stores={stores}
+                onClose={() => {
+                  setShowImportLemonSqueezyModal(false);
+                  queryParams({
+                    del: "import",
+                  });
+                }}
+              />
+            </motion.div>
+          )}
+        </AnimatePresence>
+      </div>
+    </Modal>
+  );
+}
+
+function TokenForm({
+  setStep,
+  setStores,
+}: {
+  setStep: Dispatch<SetStateAction<Step>>;
+  setStores: Dispatch<SetStateAction<LemonSqueezyStore[]>>;
+}) {
+  const { isMobile } = useMediaQuery();
+  const { id: workspaceId } = useWorkspace();
+
+  const [apiKey, setApiKey] = useState("");
+
+  const { executeAsync, isPending } = useAction(setLemonSqueezyTokenAction, {
+    onSuccess: ({ data }) => {
+      if (data?.stores?.length) {
+        setStores(data.stores);
+        setStep("select-store");
+      } else {
+        toast.error("No Lemon Squeezy stores are available for this API key.");
+      }
+    },
+    onError: ({ error }) => {
+      toast.error(
+        error.serverError ?? "Failed to fetch Lemon Squeezy stores.",
+      );
+    },
+  });
+
+  const onSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+
+    if (!workspaceId || !apiKey) {
+      return;
+    }
+
+    await executeAsync({
+      workspaceId,
+      apiKey,
+    });
+  };
+
+  return (
+    <form onSubmit={onSubmit} className="flex flex-col space-y-4">
+      <div>
+        <label
+          htmlFor="apiKey"
+          className="block text-sm font-medium text-neutral-700"
+        >
+          Lemon Squeezy API Key
+        </label>
+        <input
+          type="password"
+          id="apiKey"
+          value={apiKey}
+          autoFocus={!isMobile}
+          onChange={(e) => setApiKey(e.target.value)}
+          className="mt-1 block w-full rounded-md border border-neutral-200 px-3 py-2 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+          required
+        />
+        <p className="mt-1.5 text-xs text-neutral-500">
+          You can create an API key in your{" "}
+          <a
+            href="https://app.lemonsqueezy.com/settings/api"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-blue-500 hover:text-blue-600"
+          >
+            Lemon Squeezy settings
+          </a>
+          . Use a live-mode key for production migrations.
+        </p>
+      </div>
+
+      <Button
+        text={isPending ? "Fetching stores..." : "Fetch stores"}
+        loading={isPending}
+        disabled={!apiKey}
+      />
+    </form>
+  );
+}
+
+function SelectStore({
+  stores,
+  onClose,
+}: {
+  stores: LemonSqueezyStore[];
+  onClose: () => void;
+}) {
+  const router = useRouter();
+  const { id: workspaceId, slug } = useWorkspace();
+
+  const [selectedStoreId, setSelectedStoreId] = useState<string | null>(
+    stores.length === 1 ? stores[0].id : null,
+  );
+
+  const { executeAsync, isPending } = useAction(startLemonSqueezyImportAction, {
+    onSuccess: () => {
+      onClose();
+      toast.success(
+        "Successfully added program to import queue! We will send you an email when your program has been fully imported.",
+      );
+      router.push(`/${slug}/program/partners`);
+    },
+    onError: ({ error }) => {
+      toast.error(
+        error.serverError ?? "Failed to start the Lemon Squeezy import.",
+      );
+    },
+  });
+
+  const onSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+
+    if (!workspaceId || !selectedStoreId) {
+      return;
+    }
+
+    await executeAsync({
+      workspaceId,
+      storeId: selectedStoreId,
+    });
+  };
+
+  return (
+    <form onSubmit={onSubmit} className="flex flex-col space-y-6">
+      <div className="space-y-2">
+        <label className="block text-sm font-medium text-neutral-700">
+          Choose a store to import
+        </label>
+
+        <ScrollContainer className="max-h-[280px] rounded-lg border border-neutral-200 bg-white">
+          <div className="flex w-full flex-col gap-1 p-1">
+            {stores.map((store) => {
+              const checked = selectedStoreId === store.id;
+
+              return (
+                <button
+                  key={store.id}
+                  type="button"
+                  onClick={() => setSelectedStoreId(store.id)}
+                  className={cn(
+                    "flex cursor-pointer select-none items-center gap-3 rounded-md px-3 py-2.5 text-left text-sm text-neutral-700",
+                    "hover:bg-neutral-100",
+                    checked && "bg-neutral-100",
+                  )}
+                >
+                  <div
+                    className={cn(
+                      "border-border-emphasis flex size-4 shrink-0 items-center justify-center rounded-full border bg-white transition-colors duration-75",
+                      checked && "border-neutral-900 bg-neutral-900",
+                    )}
+                  >
+                    <Check2
+                      className={cn(
+                        "size-2.5 text-white transition-[transform,opacity] duration-75",
+                        !checked && "scale-75 opacity-0",
+                      )}
+                    />
+                  </div>
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="min-w-0 truncate font-medium">
+                      {store.name}
+                    </span>
+                    <span className="truncate text-xs text-neutral-500">
+                      {store.domain || store.url}
+                      {store.total_sales != null
+                        ? ` · ${nFormatter(store.total_sales, { full: true })} sales`
+                        : ""}
+                    </span>
+                  </div>
+                </button>
+              );
+            })}
+          </div>
+        </ScrollContainer>
+      </div>
+
+      <Button
+        text="Import program"
+        disabled={!selectedStoreId}
+        loading={isPending}
+        className="w-full justify-center"
+      />
+    </form>
+  );
+}
+
+export function useImportLemonSqueezyModal() {
+  const [showImportLemonSqueezyModal, setShowImportLemonSqueezyModal] =
+    useImportModalParam("lemonsqueezy");
+
+  const ImportLemonSqueezyModalCallback = useCallback(() => {
+    return (
+      <ImportLemonSqueezyModal
+        showImportLemonSqueezyModal={showImportLemonSqueezyModal}
+        setShowImportLemonSqueezyModal={setShowImportLemonSqueezyModal}
+      />
+    );
+  }, [showImportLemonSqueezyModal, setShowImportLemonSqueezyModal]);
+
+  return useMemo(
+    () => ({
+      setShowImportLemonSqueezyModal,
+      ImportLemonSqueezyModal: ImportLemonSqueezyModalCallback,
+    }),
+    [setShowImportLemonSqueezyModal, ImportLemonSqueezyModalCallback],
+  );
+}
diff --git a/apps/web/ui/modals/import-partnerstack-modal.tsx b/apps/web/ui/modals/import-partnerstack-modal.tsx
index c25dd1118a8..295aea399fd 100644
--- a/apps/web/ui/modals/import-partnerstack-modal.tsx
+++ b/apps/web/ui/modals/import-partnerstack-modal.tsx
@@ -4,16 +4,11 @@ import { X } from "@/ui/shared/icons";
 import { Button, Logo, Modal, useMediaQuery, useRouterStuff } from "@dub/ui";
 import { ArrowRight } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
-import { useRouter, useSearchParams } from "next/navigation";
-import {
-  Dispatch,
-  SetStateAction,
-  useCallback,
-  useEffect,
-  useState,
-} from "react";
+import { useRouter } from "next/navigation";
+import { Dispatch, SetStateAction, useCallback, useState } from "react";
 import { toast } from "sonner";
 import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportPartnerStackModal({
   showImportPartnerStackModal,
@@ -173,17 +168,7 @@ function TokenForm({ onClose }: { onClose: () => void }) {
 
 export function useImportPartnerStackModal() {
   const [showImportPartnerStackModal, setShowImportPartnerStackModal] =
-    useState(false);
-  const searchParams = useSearchParams();
-
-  // Sync the modal state with the `?import=` query param here in the hook
-  // rather than in the modal itself, which remounts on every open/close
-  // and would re-open from a stale param mid-navigation
-  useEffect(() => {
-    setShowImportPartnerStackModal(
-      searchParams?.get("import") === "partnerstack",
-    );
-  }, [searchParams]);
+    useImportModalParam("partnerstack");
 
   const ImportPartnerStackModalCallback = useCallback(
     () => (
diff --git a/apps/web/ui/modals/import-rebrandly-modal.tsx b/apps/web/ui/modals/import-rebrandly-modal.tsx
index 22b0e4888f9..0dc8503ae5b 100644
--- a/apps/web/ui/modals/import-rebrandly-modal.tsx
+++ b/apps/web/ui/modals/import-rebrandly-modal.tsx
@@ -16,7 +16,7 @@ import {
 import { fetcher, nFormatter } from "@dub/utils";
 import { ArrowRight, ChevronDown } from "lucide-react";
 import { motion } from "motion/react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -27,6 +27,7 @@ import {
 } from "react";
 import { toast } from "sonner";
 import useSWRImmutable from "swr/immutable";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportRebrandlyModal({
   showImportRebrandlyModal,
@@ -37,7 +38,6 @@ function ImportRebrandlyModal({
 }) {
   const router = useRouter();
   const { id: workspaceId, slug } = useWorkspace();
-  const searchParams = useSearchParams();
 
   const { folderId } = useCurrentFolderId();
 
@@ -77,13 +77,10 @@ function ImportRebrandlyModal({
   const [importing, setImporting] = useState(false);
 
   useEffect(() => {
-    if (searchParams?.get("import") === "rebrandly") {
+    if (showImportRebrandlyModal && domains !== null) {
       mutate();
-      setShowImportRebrandlyModal(true);
-    } else {
-      setShowImportRebrandlyModal(false);
     }
-  }, [searchParams]);
+  }, [showImportRebrandlyModal]);
 
   const isSelected = (domain: string) => {
     return selectedDomains.find((d) => d.domain === domain) ? true : false;
@@ -307,7 +304,7 @@ function ImportRebrandlyModal({
 
 export function useImportRebrandlyModal() {
   const [showImportRebrandlyModal, setShowImportRebrandlyModal] =
-    useState(false);
+    useImportModalParam("rebrandly");
 
   const ImportRebrandlyModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-rewardful-modal.tsx b/apps/web/ui/modals/import-rewardful-modal.tsx
index ab2571e0a5f..7e62af24f0a 100644
--- a/apps/web/ui/modals/import-rewardful-modal.tsx
+++ b/apps/web/ui/modals/import-rewardful-modal.tsx
@@ -3,6 +3,7 @@ import { startRewardfulImportAction } from "@/lib/actions/partners/start-rewardf
 import { RewardfulCampaign } from "@/lib/rewardful/types";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
+import { X } from "@/ui/shared/icons";
 import {
   AnimatedSizeContainer,
   Button,
@@ -16,12 +17,11 @@ import {
   useMediaQuery,
   useRouterStuff,
 } from "@dub/ui";
-import { X } from "@/ui/shared/icons";
 import { cn, currencyFormatter, fetcher } from "@dub/utils";
 import { Command } from "cmdk";
 import { ArrowRight, ServerOff, Users } from "lucide-react";
 import { useAction } from "next-safe-action/hooks";
-import { useParams, useRouter, useSearchParams } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -34,6 +34,7 @@ import { toast } from "sonner";
 import useSWRImmutable from "swr/immutable";
 import { useDebounce } from "use-debounce";
 import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportRewardfulModal({
   showImportRewardfulModal,
@@ -532,15 +533,7 @@ function CampaignsStep({
 
 export function useImportRewardfulModal() {
   const [showImportRewardfulModal, setShowImportRewardfulModal] =
-    useState(false);
-  const searchParams = useSearchParams();
-
-  // Sync the modal state with the `?import=` query param here in the hook
-  // rather than in the modal itself, which remounts on every open/close
-  // and would re-open from a stale param mid-navigation
-  useEffect(() => {
-    setShowImportRewardfulModal(searchParams?.get("import") === "rewardful");
-  }, [searchParams]);
+    useImportModalParam("rewardful");
 
   const ImportRewardfulModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-short-modal.tsx b/apps/web/ui/modals/import-short-modal.tsx
index a47986babc3..23b2e2633de 100644
--- a/apps/web/ui/modals/import-short-modal.tsx
+++ b/apps/web/ui/modals/import-short-modal.tsx
@@ -14,7 +14,7 @@ import {
 } from "@dub/ui";
 import { cn, fetcher, nFormatter } from "@dub/utils";
 import { ArrowRight, ServerOff } from "lucide-react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -25,6 +25,7 @@ import {
 } from "react";
 import { toast } from "sonner";
 import useSWRImmutable from "swr/immutable";
+import { useImportModalParam } from "./use-import-modal-param";
 
 function ImportShortModal({
   showImportShortModal,
@@ -35,7 +36,6 @@ function ImportShortModal({
 }) {
   const router = useRouter();
   const { id: workspaceId, slug } = useWorkspace();
-  const searchParams = useSearchParams();
 
   const { folderId } = useCurrentFolderId();
 
@@ -67,13 +67,10 @@ function ImportShortModal({
   const [importing, setImporting] = useState(false);
 
   useEffect(() => {
-    if (searchParams?.get("import") === "short") {
+    if (showImportShortModal && domains !== undefined) {
       mutate();
-      setShowImportShortModal(true);
-    } else {
-      setShowImportShortModal(false);
     }
-  }, [searchParams]);
+  }, [showImportShortModal]);
 
   const isSelected = (domain: string) => {
     return selectedDomains.find((d) => d.domain === domain) ? true : false;
@@ -276,7 +273,8 @@ function ImportShortModal({
 }
 
 export function useImportShortModal() {
-  const [showImportShortModal, setShowImportShortModal] = useState(false);
+  const [showImportShortModal, setShowImportShortModal] =
+    useImportModalParam("short");
 
   const ImportShortModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-tapfiliate-modal.tsx b/apps/web/ui/modals/import-tapfiliate-modal.tsx
index 48199c6f8ae..c95be440c11 100644
--- a/apps/web/ui/modals/import-tapfiliate-modal.tsx
+++ b/apps/web/ui/modals/import-tapfiliate-modal.tsx
@@ -16,7 +16,7 @@ import { cn } from "@dub/utils";
 import { ArrowRight } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
 import { useAction } from "next-safe-action/hooks";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
@@ -27,6 +27,7 @@ import {
 } from "react";
 import { toast } from "sonner";
 import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
 
 type Step = "set-token" | "select-program";
 
@@ -305,15 +306,7 @@ function SelectProgram({
 
 export function useImportTapfiliateModal() {
   const [showImportTapfiliateModal, setShowImportTapfiliateModal] =
-    useState(false);
-  const searchParams = useSearchParams();
-
-  // Sync the modal state with the `?import=` query param here in the hook
-  // rather than in the modal itself, which remounts on every open/close
-  // and would re-open from a stale param mid-navigation
-  useEffect(() => {
-    setShowImportTapfiliateModal(searchParams?.get("import") === "tapfiliate");
-  }, [searchParams]);
+    useImportModalParam("tapfiliate");
 
   const ImportTapfiliateModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/import-tolt-modal.tsx b/apps/web/ui/modals/import-tolt-modal.tsx
index e8ae98ca4e4..b175c9b2195 100644
--- a/apps/web/ui/modals/import-tolt-modal.tsx
+++ b/apps/web/ui/modals/import-tolt-modal.tsx
@@ -7,17 +7,17 @@ import { Button, Logo, Modal, useMediaQuery, useRouterStuff } from "@dub/ui";
 import { ArrowRight } from "lucide-react";
 import { AnimatePresence, motion } from "motion/react";
 import { useAction } from "next-safe-action/hooks";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import {
   Dispatch,
   SetStateAction,
   useCallback,
-  useEffect,
   useMemo,
   useState,
 } from "react";
 import { toast } from "sonner";
 import { MarkdownDescription } from "../shared/markdown-description";
+import { useImportModalParam } from "./use-import-modal-param";
 
 type Step = "set-token" | "program-info";
 
@@ -294,15 +294,8 @@ function ProgramInfo({
 }
 
 export function useImportToltModal() {
-  const [showImportToltModal, setShowImportToltModal] = useState(false);
-  const searchParams = useSearchParams();
-
-  // Sync the modal state with the `?import=` query param here in the hook
-  // rather than in the modal itself, which remounts on every open/close
-  // and would re-open from a stale param mid-navigation
-  useEffect(() => {
-    setShowImportToltModal(searchParams?.get("import") === "tolt");
-  }, [searchParams]);
+  const [showImportToltModal, setShowImportToltModal] =
+    useImportModalParam("tolt");
 
   const ImportToltModalCallback = useCallback(() => {
     return (
diff --git a/apps/web/ui/modals/link-builder/ab-testing-modal.tsx b/apps/web/ui/modals/link-builder/ab-testing-modal.tsx
index ce913db69d8..839fa26b4be 100644
--- a/apps/web/ui/modals/link-builder/ab-testing-modal.tsx
+++ b/apps/web/ui/modals/link-builder/ab-testing-modal.tsx
@@ -8,6 +8,7 @@ import { useLinkBuilderKeyboardShortcut } from "@/ui/links/link-builder/use-link
 import { useAvailableDomains } from "@/ui/links/use-available-domains";
 import { useEndABTestingModal } from "@/ui/modals/link-builder/ab-testing/end-ab-testing-modal";
 import { BusinessBadgeTooltip } from "@/ui/shared/business-badge-tooltip";
+import { Callout } from "@/ui/shared/callout";
 import { X } from "@/ui/shared/icons";
 import {
   AnimatedSizeContainer,
@@ -16,7 +17,6 @@ import {
   InfoTooltip,
   Modal,
   Tooltip,
-  TriangleWarning,
 } from "@dub/ui";
 import {
   cn,
@@ -421,13 +421,10 @@ function ABTestingModal({
         </div>
 
         {testVariantsParent && (
-          <div className="mt-6 flex items-start gap-2 rounded-lg border border-amber-200 bg-amber-50 p-4">
-            <TriangleWarning className="mt-0.5 size-4 shrink-0 text-amber-600" />
-            <p className="text-sm font-medium text-amber-900">
-              Changing the original A/B test settings will impact your future
-              analytics and event tracking.
-            </p>
-          </div>
+          <Callout variant="warn" size={2} className="mt-6">
+            Changing the original A/B test settings will impact your future
+            analytics and event tracking.
+          </Callout>
         )}
 
         <div className="mt-4 flex items-center justify-between">
diff --git a/apps/web/ui/modals/link-builder/index.tsx b/apps/web/ui/modals/link-builder/index.tsx
index d0429c5a36f..70fea28267e 100644
--- a/apps/web/ui/modals/link-builder/index.tsx
+++ b/apps/web/ui/modals/link-builder/index.tsx
@@ -307,19 +307,13 @@ export function CreateLinkButton({
         shortcut="C"
         disabledTooltip={
           exceededLinks ? (
-            trialActive ? (
-              <TooltipContent
-                title="Your workspace has exceeded its monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
-                cta="Start paid plan"
-                onClick={() => openTrialLimitModal("links")}
-              />
-            ) : (
-              <TooltipContent
-                title="Your workspace has exceeded its monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
-                cta="Upgrade plan"
-                href={`/${slug}/upgrade`}
-              />
-            )
+            <TooltipContent
+              title="Your workspace have exceeded your monthly links limit. We're still collecting data on your existing links, but you need to upgrade to create more links."
+              cta={trialActive ? "Start paid plan" : "Upgrade plan"}
+              {...(trialActive
+                ? { onClick: () => openTrialLimitModal("links") }
+                : { href: `/${slug}/upgrade` })}
+            />
           ) : (
             permissionsError || undefined
           )
diff --git a/apps/web/ui/modals/partner-link-modal.tsx b/apps/web/ui/modals/partner-link-modal.tsx
index ce228bc3efd..53a409be6ab 100644
--- a/apps/web/ui/modals/partner-link-modal.tsx
+++ b/apps/web/ui/modals/partner-link-modal.tsx
@@ -183,13 +183,21 @@ function PartnerLinkModalContent({
     };
   }, [programEnrollment]);
 
-  const destinationDomains = useMemo(
-    () =>
-      additionalLinks
-        .map((link) => link.domain)
-        .filter((d): d is string => d != null),
-    [additionalLinks],
-  );
+  const destinationDomains = useMemo(() => {
+    const domains = additionalLinks
+      .map((link) => link.domain)
+      .filter((d): d is string => d != null);
+
+    if (domains.length > 0) {
+      return domains;
+    }
+
+    const programUrlDomain = programEnrollment?.program?.url
+      ? getDomainWithoutWWW(programEnrollment.program.url)
+      : null;
+
+    return programUrlDomain ? [programUrlDomain] : [];
+  }, [additionalLinks, programEnrollment?.program?.url]);
 
   const [destinationDomain, setDestinationDomain] = useState(
     link
diff --git a/apps/web/ui/modals/plan-change-confirmation-modal.tsx b/apps/web/ui/modals/plan-change-confirmation-modal.tsx
index 5e3463725d3..beedac30083 100644
--- a/apps/web/ui/modals/plan-change-confirmation-modal.tsx
+++ b/apps/web/ui/modals/plan-change-confirmation-modal.tsx
@@ -239,7 +239,11 @@ function PlanChangeConfirmationModal({
           onClick={async () => {
             if (isSubmitting) return;
             setIsSubmitting(true);
-            await onConfirm();
+            try {
+              await onConfirm();
+            } finally {
+              setIsSubmitting(false);
+            }
           }}
         />
       </div>
diff --git a/apps/web/ui/modals/reactivate-partner-modal.tsx b/apps/web/ui/modals/reactivate-partner-modal.tsx
index 3b8595713a3..be3755b1812 100644
--- a/apps/web/ui/modals/reactivate-partner-modal.tsx
+++ b/apps/web/ui/modals/reactivate-partner-modal.tsx
@@ -113,7 +113,7 @@ export function useReactivatePartnerModal({
         partner={partner}
       />
     );
-  }, [showReactivatePartnerModal, setShowReactivatePartnerModal, partner]);
+  }, [showReactivatePartnerModal, setShowReactivatePartnerModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/reattribute-customer-modal.tsx b/apps/web/ui/modals/reattribute-customer-modal.tsx
new file mode 100644
index 00000000000..d4ad479f7c1
--- /dev/null
+++ b/apps/web/ui/modals/reattribute-customer-modal.tsx
@@ -0,0 +1,324 @@
+"use client";
+
+import { mutatePrefix } from "@/lib/swr/mutate";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { CommissionsCount, CustomerEnriched, CustomerProps } from "@/lib/types";
+import { PartnerLinkSelector } from "@/ui/partners/partner-link-selector";
+import { PartnerSelector } from "@/ui/partners/partner-selector";
+import { AnimatedSizeContainer, Button, Checkbox, Modal } from "@dub/ui";
+import { currencyFormatter, fetcher } from "@dub/utils";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import useSWR from "swr";
+
+type FormData = {
+  partnerId: string | null;
+  linkId: string | null;
+  createClawback: boolean;
+};
+
+type ReattributeCustomerModalProps = {
+  showModal: boolean;
+  setShowModal: (showModal: boolean) => void;
+  customer: Pick<CustomerEnriched, "id" | "partner" | "link">;
+  onSuccess?: (customer: CustomerProps) => void;
+};
+
+function ReattributeCustomerModal({
+  showModal,
+  setShowModal,
+  customer,
+  onSuccess,
+}: ReattributeCustomerModalProps) {
+  const { id: workspaceId } = useWorkspace();
+  const { makeRequest, isSubmitting } = useApiMutation<CustomerProps>();
+  const [verification, setVerification] = useState("");
+
+  const {
+    watch,
+    setValue,
+    handleSubmit,
+    reset,
+    formState: { isDirty },
+  } = useForm<FormData>({
+    defaultValues: {
+      partnerId: customer.partner?.id ?? null,
+      linkId: customer.link?.id ?? null,
+      createClawback: false,
+    },
+  });
+
+  const [partnerId, linkId, createClawback] = watch([
+    "partnerId",
+    "linkId",
+    "createClawback",
+  ]);
+
+  useEffect(() => {
+    if (showModal) {
+      reset({
+        partnerId: customer.partner?.id ?? null,
+        linkId: customer.link?.id ?? null,
+        createClawback: false,
+      });
+      setVerification("");
+    }
+  }, [showModal, customer, reset]);
+
+  const {
+    data: commissionsCount,
+    error: commissionsCountError,
+    mutate: retryCommissionsCount,
+    isValidating: isCommissionsCountValidating,
+  } = useSWR<CommissionsCount>(
+    workspaceId && customer.id && showModal
+      ? `/api/commissions/count?${new URLSearchParams({
+          customerId: customer.id,
+          workspaceId,
+          interval: "all",
+        })}`
+      : null,
+    fetcher,
+  );
+
+  const paidEarnings = commissionsCount?.paid?.earnings ?? 0;
+  const showClawback = !commissionsCountError && paidEarnings > 0;
+  const currentPartnerId = customer.partner?.id ?? null;
+  const isPartnerDifferent =
+    Boolean(partnerId) && partnerId !== currentPartnerId;
+  const confirmationText = "confirm attribute customer";
+  const isVerified = verification === confirmationText;
+
+  const onSubmit = async (data: FormData) => {
+    if (!isPartnerDifferent || !data.partnerId || !data.linkId || !isVerified) {
+      return;
+    }
+
+    await makeRequest(`/api/customers/${customer.id}/reattribute`, {
+      method: "POST",
+      body: {
+        partnerId: data.partnerId,
+        linkId: data.linkId,
+        createClawback: data.createClawback,
+      },
+      onSuccess: async (updatedCustomer) => {
+        toast.success("Customer reattributed. Analytics will update shortly.");
+        setShowModal(false);
+        await Promise.all([
+          mutatePrefix("/api/customers"),
+          mutatePrefix("/api/commissions"),
+        ]);
+        onSuccess?.(updatedCustomer);
+      },
+    });
+  };
+
+  return (
+    <Modal showModal={showModal} setShowModal={setShowModal}>
+      <div className="flex items-center justify-between gap-2 border-b border-neutral-200 px-4 py-4 sm:px-6">
+        <h3 className="text-lg font-medium">Attribute to partner</h3>
+      </div>
+
+      <div className="bg-neutral-50">
+        <form
+          onSubmit={(e) => {
+            e.stopPropagation();
+            return handleSubmit(onSubmit)(e);
+          }}
+        >
+          <AnimatedSizeContainer
+            height
+            className="flex flex-col"
+            transition={{ type: "spring", stiffness: 400, damping: 35 }}
+          >
+            <div className="flex flex-col gap-6 px-4 py-6 text-left sm:px-6">
+              <div>
+                <label className="text-sm font-medium text-neutral-600">
+                  Partner
+                </label>
+                <div className="mt-1.5">
+                  <PartnerSelector
+                    selectedPartnerId={partnerId}
+                    setSelectedPartnerId={(id) => {
+                      setValue("partnerId", id, { shouldDirty: true });
+                      setValue(
+                        "linkId",
+                        id === currentPartnerId
+                          ? customer.link?.id ?? null
+                          : null,
+                        { shouldDirty: true },
+                      );
+                    }}
+                  />
+                </div>
+                {currentPartnerId && (
+                  <p className="mt-1.5 text-xs text-neutral-500">
+                    Attribute this customer to a different partner. Unpaid
+                    commissions will be transferred to the new partner as well.
+                  </p>
+                )}
+              </div>
+
+              {isPartnerDifferent && (
+                <>
+                  <div>
+                    <label className="text-sm font-medium text-neutral-600">
+                      Referral link
+                    </label>
+                    <div className="mt-1.5">
+                      <PartnerLinkSelector
+                        selectedLinkId={linkId}
+                        partnerId={partnerId}
+                        showDestinationUrl={false}
+                        setSelectedLinkId={(id) =>
+                          setValue("linkId", id, { shouldDirty: true })
+                        }
+                      />
+                    </div>
+                  </div>
+
+                  <div>
+                    <label
+                      htmlFor="verification"
+                      className="text-sm font-medium text-neutral-600"
+                    >
+                      To verify, type{" "}
+                      <span className="font-semibold text-neutral-800">
+                        {confirmationText}
+                      </span>{" "}
+                      below
+                    </label>
+                    <input
+                      type="text"
+                      name="verification"
+                      id="verification"
+                      pattern={confirmationText}
+                      required
+                      autoComplete="off"
+                      placeholder={confirmationText}
+                      value={verification}
+                      onChange={(e) => setVerification(e.target.value)}
+                      className="mt-1.5 block w-full rounded-lg border border-neutral-200 bg-white px-3 py-2.5 text-sm text-neutral-900 placeholder-neutral-400 shadow-sm transition-colors focus:border-neutral-400 focus:outline-none focus:ring-2 focus:ring-neutral-200"
+                    />
+                  </div>
+
+                  {showClawback && (
+                    <label className="flex items-start gap-2.5 rounded-lg border border-neutral-200 bg-white p-4 shadow-sm">
+                      <Checkbox
+                        checked={createClawback}
+                        onCheckedChange={(checked) =>
+                          setValue("createClawback", checked === true, {
+                            shouldDirty: true,
+                          })
+                        }
+                        className="mt-0.5 data-[state=checked]:bg-black"
+                      />
+                      <span className="text-sm text-neutral-700">
+                        Create a clawback for the{" "}
+                        <span className="font-medium text-neutral-900">
+                          {currencyFormatter(paidEarnings)}
+                        </span>{" "}
+                        in commissions that were already paid to the previous
+                        partner.
+                      </span>
+                    </label>
+                  )}
+                </>
+              )}
+
+              {commissionsCountError && (
+                <div className="flex items-center justify-between gap-3 rounded-lg border border-neutral-200 bg-white p-4 shadow-sm">
+                  <p className="text-sm text-neutral-700">
+                    Failed to load paid commissions. Retry before saving.
+                  </p>
+                  <Button
+                    type="button"
+                    variant="secondary"
+                    text="Retry"
+                    className="h-8 w-fit shrink-0"
+                    loading={isCommissionsCountValidating}
+                    onClick={() => retryCommissionsCount()}
+                  />
+                </div>
+              )}
+            </div>
+          </AnimatedSizeContainer>
+
+          <div className="flex items-center justify-end gap-2 border-t border-neutral-200 px-4 py-4 sm:px-6">
+            <Button
+              type="button"
+              variant="secondary"
+              text="Cancel"
+              className="h-9 w-fit"
+              onClick={() => setShowModal(false)}
+              disabled={isSubmitting}
+            />
+            <Button
+              type="submit"
+              variant="primary"
+              text="Save"
+              className="h-9 w-fit"
+              loading={isSubmitting}
+              disabled={
+                !isDirty ||
+                !isPartnerDifferent ||
+                !linkId ||
+                Boolean(commissionsCountError) ||
+                !isVerified
+              }
+            />
+          </div>
+        </form>
+      </div>
+    </Modal>
+  );
+}
+
+export function useReattributeCustomerModal() {
+  const [customer, setCustomer] = useState<CustomerEnriched | null>(null);
+  const [onSuccess, setOnSuccess] = useState<
+    ((customer: CustomerProps) => void) | undefined
+  >();
+
+  const openReattributeCustomerModal = useCallback(
+    (
+      nextCustomer: CustomerEnriched,
+      options?: { onSuccess?: (customer: CustomerProps) => void },
+    ) => {
+      setCustomer(nextCustomer);
+      setOnSuccess(() => options?.onSuccess);
+    },
+    [],
+  );
+
+  const ReattributeCustomerModalCallback = useCallback(() => {
+    if (!customer) {
+      return null;
+    }
+
+    return (
+      <ReattributeCustomerModal
+        customer={customer}
+        showModal
+        setShowModal={(show) => {
+          if (!show) {
+            setCustomer(null);
+            setOnSuccess(undefined);
+          }
+        }}
+        onSuccess={onSuccess}
+      />
+    );
+  }, [customer, onSuccess]);
+
+  return useMemo(
+    () => ({
+      openReattributeCustomerModal,
+      ReattributeCustomerModal: ReattributeCustomerModalCallback,
+      isReattributeCustomerModalOpen: customer !== null,
+    }),
+    [openReattributeCustomerModal, ReattributeCustomerModalCallback, customer],
+  );
+}
diff --git a/apps/web/ui/modals/register-domain-modal.tsx b/apps/web/ui/modals/register-domain-modal.tsx
index d3bb13d675a..3a203a28092 100644
--- a/apps/web/ui/modals/register-domain-modal.tsx
+++ b/apps/web/ui/modals/register-domain-modal.tsx
@@ -1,4 +1,4 @@
-import { Modal, useRouterStuff } from "@dub/ui";
+import { Modal, useLatestCallback, useRouterStuff } from "@dub/ui";
 import { useCallback, useMemo, useState } from "react";
 import { RegisterDomainForm } from "../domains/register-domain-form";
 
@@ -46,17 +46,26 @@ const RegisterDomain = ({
 export function useRegisterDomainModal(
   props: Omit<RegisterDomainProps, "showModal" | "setShowModal"> = {},
 ) {
+  const { onSuccess, setRegisteredParam } = props;
   const [showRegisterDomainModal, setShowRegisterDomainModal] = useState(false);
 
+  const onSuccessCallback = useLatestCallback(onSuccess);
+
   const RegisterDomainModal = useCallback(() => {
     return (
       <RegisterDomain
         showModal={showRegisterDomainModal}
         setShowModal={setShowRegisterDomainModal}
-        {...props}
+        onSuccess={onSuccessCallback}
+        setRegisteredParam={setRegisteredParam}
       />
     );
-  }, [showRegisterDomainModal, setShowRegisterDomainModal, props]);
+  }, [
+    showRegisterDomainModal,
+    setShowRegisterDomainModal,
+    onSuccessCallback,
+    setRegisteredParam,
+  ]);
 
   return useMemo(
     () => ({ setShowRegisterDomainModal, RegisterDomainModal }),
diff --git a/apps/web/ui/modals/remove-workspace-user-modal.tsx b/apps/web/ui/modals/remove-workspace-user-modal.tsx
index a6960c25270..f161ade0e78 100644
--- a/apps/web/ui/modals/remove-workspace-user-modal.tsx
+++ b/apps/web/ui/modals/remove-workspace-user-modal.tsx
@@ -1,9 +1,9 @@
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { TokenProps, UserProps } from "@/lib/types";
+import { Callout } from "@/ui/shared/callout";
 import { UserAvatar } from "@/ui/users/user-avatar";
 import { Button, Modal, useMediaQuery } from "@dub/ui";
-import { TriangleWarning } from "@dub/ui/icons";
 import { fetcher, timeAgo } from "@dub/utils";
 import { useSession } from "next-auth/react";
 import { useRouter, useSearchParams } from "next/navigation";
@@ -91,40 +91,34 @@ function RemoveWorkspaceUserModal({
   const content = (
     <>
       {restrictedTokens && restrictedTokens.length > 0 && (
-        <div className="space-y-3 rounded-lg border border-amber-200 bg-amber-50 p-4">
-          <div className="flex-shrink-0">
-            <TriangleWarning className="size-5 text-amber-600" />
-          </div>
-
-          <h3 className="text-sm font-semibold leading-5 text-amber-900">
-            Warning: Active tokens detected
-          </h3>
-
-          <p className="text-sm font-normal text-amber-900">
-            {self ? "You have" : "This user has"} {restrictedTokens.length}{" "}
-            active tokens. {self ? "Leaving" : "Removing this user"} will
-            invalidate these tokens and may disrupt the integration.
-          </p>
+        <Callout variant="warn" size={2}>
+          <div className="space-y-3">
+            <h3 className="font-semibold">Warning: Active tokens detected</h3>
+
+            <p>
+              {self ? "You have" : "This user has"} {restrictedTokens.length}{" "}
+              active tokens. {self ? "Leaving" : "Removing this user"} will
+              invalidate these tokens and may disrupt the integration.
+            </p>
 
-          <div>
-            <ul className="mt-6 space-y-2">
+            <ul className="space-y-2">
               {restrictedTokens.map((token, index) => (
                 <li key={index} className="flex items-center justify-between">
                   <a
                     href={`/${slug}/settings/tokens`}
                     target="_blank"
-                    className="line-clamp-1 text-sm font-medium leading-4 text-amber-900 underline underline-offset-2 hover:text-amber-700"
+                    className="line-clamp-1 font-medium underline underline-offset-2 hover:text-amber-700"
                   >
                     {token.name}
                   </a>
-                  <span className="whitespace-nowrap text-xs font-normal leading-4 text-amber-700">
+                  <span className="whitespace-nowrap text-xs text-amber-700">
                     used {timeAgo(token.lastUsed, { withAgo: true })}
                   </span>
                 </li>
               ))}
             </ul>
           </div>
-        </div>
+        </Callout>
       )}
 
       <div className="relative flex items-center gap-2 space-x-3 rounded-md border border-neutral-300 bg-white px-4 py-2">
@@ -239,7 +233,7 @@ export function useRemoveWorkspaceUserModal({ user }: { user: UserProps }) {
         user={user}
       />
     );
-  }, [showRemoveWorkspaceUserModal, setShowRemoveWorkspaceUserModal, user]);
+  }, [showRemoveWorkspaceUserModal, setShowRemoveWorkspaceUserModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/send-test-webhook-modal.tsx b/apps/web/ui/modals/send-test-webhook-modal.tsx
index cec9ee9f239..2df29f8edf0 100644
--- a/apps/web/ui/modals/send-test-webhook-modal.tsx
+++ b/apps/web/ui/modals/send-test-webhook-modal.tsx
@@ -1,7 +1,7 @@
 import { sendTestWebhookEvent } from "@/lib/actions/send-test-webhook";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { WebhookProps } from "@/lib/types";
-import { WEBHOOK_TRIGGER_DESCRIPTIONS } from "@/lib/webhook/constants";
+import { WEBHOOK_TRIGGERS } from "@/lib/webhook/constants";
 import type { WebhookTrigger } from "@/lib/webhook/types";
 import { Button, Combobox, ComboboxOption, Modal } from "@dub/ui";
 import { useAction } from "next-safe-action/hooks";
@@ -38,13 +38,6 @@ function SendTestWebhookModal({
     },
   });
 
-  const triggers = Object.entries(WEBHOOK_TRIGGER_DESCRIPTIONS).map(
-    ([key, value]) => ({
-      value: key,
-      label: value,
-    }),
-  );
-
   return (
     <Modal
       showModal={showSendTestWebhookModal}
@@ -77,12 +70,17 @@ function SendTestWebhookModal({
 
           <div className="mt-4">
             <Combobox
-              options={triggers}
+              options={WEBHOOK_TRIGGERS.map((trigger) => ({
+                value: trigger,
+                label: trigger,
+              }))}
               selected={selectedTrigger}
               setSelected={setSelectedTrigger}
               placeholder="Select a webhook event"
               matchTriggerWidth
               caret
+              labelProps={{ className: "font-mono text-sm text-neutral-800" }}
+              optionClassName="font-mono"
             />
           </div>
         </div>
diff --git a/apps/web/ui/modals/share-dashboard-modal.tsx b/apps/web/ui/modals/share-dashboard-modal.tsx
index 65db3bb119c..1bf63cd1def 100644
--- a/apps/web/ui/modals/share-dashboard-modal.tsx
+++ b/apps/web/ui/modals/share-dashboard-modal.tsx
@@ -500,7 +500,7 @@ export function useShareDashboardModal(props: ShareDashboardModalInnerProps) {
         {...props}
       />
     );
-  }, [showShareDashboardModal, setShowShareDashboardModal, props]);
+  }, [showShareDashboardModal, setShowShareDashboardModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/start-paid-plan-modal.tsx b/apps/web/ui/modals/start-paid-plan-modal.tsx
index a7fc2772ee3..f515accdafe 100644
--- a/apps/web/ui/modals/start-paid-plan-modal.tsx
+++ b/apps/web/ui/modals/start-paid-plan-modal.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { Button, Modal, useRouterStuff } from "@dub/ui";
 import { getPlanDetails } from "@dub/utils";
@@ -83,7 +84,10 @@ function StartPaidPlanModal({
       className="max-w-md"
     >
       <div className="sm:py-4.5 border-b border-neutral-200 px-4 py-3 sm:px-6">
-        <h3 className="text-lg font-medium text-neutral-900">
+        <h3
+          className="text-lg font-medium text-neutral-900"
+          data-testid={testIds.billing.startPaidPlanHeading}
+        >
           Plan start confirmation
         </h3>
       </div>
@@ -110,7 +114,10 @@ function StartPaidPlanModal({
             </div>
           )}
         </div>
-        <p className="text-sm text-neutral-600">
+        <p
+          className="text-sm text-neutral-600"
+          data-testid={testIds.billing.startPaidPlanNotice}
+        >
           You&apos;ll be charged today and your trial will end.
         </p>
       </div>
@@ -130,6 +137,7 @@ function StartPaidPlanModal({
           loading={isSubmitting}
           disabled={isSubmitting}
           onClick={handleConfirm}
+          data-testid={testIds.billing.confirmStartPaidPlan}
         />
       </div>
     </Modal>
diff --git a/apps/web/ui/modals/unban-partner-modal.tsx b/apps/web/ui/modals/unban-partner-modal.tsx
index e57d59cbf55..1dcd1632211 100644
--- a/apps/web/ui/modals/unban-partner-modal.tsx
+++ b/apps/web/ui/modals/unban-partner-modal.tsx
@@ -156,7 +156,7 @@ export function useUnbanPartnerModal({
         partner={partner}
       />
     );
-  }, [showUnbanPartnerModal, setShowUnbanPartnerModal, partner]);
+  }, [showUnbanPartnerModal, setShowUnbanPartnerModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/update-workspace-user-role.tsx b/apps/web/ui/modals/update-workspace-user-role.tsx
index e3e3dcc3c71..94686888dd5 100644
--- a/apps/web/ui/modals/update-workspace-user-role.tsx
+++ b/apps/web/ui/modals/update-workspace-user-role.tsx
@@ -136,7 +136,7 @@ export function useWorkspaceUserRoleModal({
         role={role}
       />
     );
-  }, [showWorkspaceUserRoleModal, setShowWorkspaceUserRoleModal, user, role]);
+  }, [showWorkspaceUserRoleModal, setShowWorkspaceUserRoleModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/modals/upgraded-modal.tsx b/apps/web/ui/modals/upgraded-modal.tsx
index 0b36739531d..81b473b905e 100644
--- a/apps/web/ui/modals/upgraded-modal.tsx
+++ b/apps/web/ui/modals/upgraded-modal.tsx
@@ -1,3 +1,4 @@
+import { testIds } from "@/lib/e2e/test-ids";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { useWorkspaceStore } from "@/lib/swr/use-workspace-store";
 import { Button, Modal, useRouterStuff, useScrollProgress } from "@dub/ui";
@@ -130,7 +131,10 @@ function UpgradedModal({
               onScroll={updateScrollProgress}
               className="scrollbar-hide max-h-[calc(100vh-400px)] overflow-y-auto pb-6 text-left"
             >
-              <h1 className="text-lg font-semibold text-neutral-900">
+              <h1
+                className="text-lg font-semibold text-neutral-900"
+                data-testid={testIds.billing.upgradedHeading}
+              >
                 Dub {plan?.name} looks good on you!
               </h1>
               <p className="mt-2 text-sm text-neutral-600">
@@ -173,6 +177,7 @@ function UpgradedModal({
           <Button
             type="button"
             variant={showDotLinkClaimUi ? "secondary" : "primary"}
+            data-testid={testIds.billing.viewDashboard}
             text={
               showDotLinkClaimUi
                 ? "No thanks, take me to the dashboard"
diff --git a/apps/web/ui/modals/use-import-modal-param.ts b/apps/web/ui/modals/use-import-modal-param.ts
new file mode 100644
index 00000000000..8c11cbffc2a
--- /dev/null
+++ b/apps/web/ui/modals/use-import-modal-param.ts
@@ -0,0 +1,18 @@
+import { useSearchParams } from "next/navigation";
+import { Dispatch, SetStateAction, useEffect, useState } from "react";
+
+// Keeps an import modal's show state in sync with the `?import=` query param
+// at the hook level rather than in the modal component itself, which remounts
+// on every open/close and would re-open from a stale param mid-navigation
+export function useImportModalParam(
+  provider: string,
+): [boolean, Dispatch<SetStateAction<boolean>>] {
+  const [showModal, setShowModal] = useState(false);
+  const searchParams = useSearchParams();
+
+  useEffect(() => {
+    setShowModal(searchParams?.get("import") === provider);
+  }, [searchParams, provider]);
+
+  return [showModal, setShowModal];
+}
diff --git a/apps/web/ui/oauth-apps/add-edit-app-form.tsx b/apps/web/ui/oauth-apps/add-edit-app-form.tsx
index 2581a260674..07c56c9a9ec 100644
--- a/apps/web/ui/oauth-apps/add-edit-app-form.tsx
+++ b/apps/web/ui/oauth-apps/add-edit-app-form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { clientAccessCheck } from "@/lib/client-access-check";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   NewOAuthApp,
@@ -19,7 +20,7 @@ import {
   Switch,
   useEnterSubmit,
 } from "@dub/ui";
-import { cn, nanoid } from "@dub/utils";
+import { cn, nanoid, toErrorMessage } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
 import { Paperclip, Trash2 } from "lucide-react";
 import { Reorder } from "motion/react";
@@ -29,6 +30,9 @@ import TextareaAutosize from "react-textarea-autosize";
 import { toast } from "sonner";
 import { mutate } from "swr";
 
+const { contentTypes, maxBytes } = UPLOAD_POLICIES.integrationScreenshots;
+const maxFileSizeMB = maxBytes / (1024 * 1024);
+
 const defaultValues: NewOAuthApp = {
   name: "",
   slug: "",
@@ -166,43 +170,64 @@ export default function AddOAuthAppForm({
   const handleUpload = async (file: File) => {
     setScreenshots((prev) => [...prev, { file, uploading: true }]);
 
-    const response = await fetch(`/api/workspaces/${workspaceId}/upload-url`, {
-      method: "POST",
-      body: JSON.stringify({
-        folder: "integration-screenshots",
-      }),
-    });
-
-    if (!response.ok) {
-      toast.error("Failed to get signed URL for screenshot upload.");
-      return;
-    }
+    const removePendingScreenshot = () => {
+      setScreenshots((prev) =>
+        prev.filter((screenshot) => screenshot.file !== file),
+      );
+    };
+
+    try {
+      const response = await fetch(
+        `/api/workspaces/${workspaceId}/upload-url`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            folder: "integrationScreenshots",
+            contentType: file.type,
+            contentLength: file.size,
+          }),
+        },
+      );
 
-    const { signedUrl, key } = await response.json();
+      if (!response.ok) {
+        const { error } = await response.json();
+        toast.error(toErrorMessage(error));
+        removePendingScreenshot();
+        return;
+      }
 
-    const uploadResponse = await fetch(signedUrl, {
-      method: "PUT",
-      body: file,
-      headers: {
-        "Content-Type": file.type,
-        "Content-Length": file.size.toString(),
-      },
-    });
+      const { key, signedUrl } = await response.json();
+
+      const uploadResponse = await fetch(signedUrl, {
+        method: "PUT",
+        body: file,
+        headers: {
+          "Content-Type": file.type,
+          "Content-Length": file.size.toString(),
+        },
+      });
+
+      if (!uploadResponse.ok) {
+        toast.error("Failed to upload screenshot.");
+        removePendingScreenshot();
+        return;
+      }
 
-    if (!uploadResponse.ok) {
-      const result = await uploadResponse.json();
-      toast.error(result.error.message || "Failed to upload screenshot.");
-      return;
+      toast.success(`${file.name} uploaded!`);
+      setScreenshots((prev) =>
+        prev.map((screenshot) =>
+          screenshot.file === file
+            ? { ...screenshot, uploading: false, key }
+            : screenshot,
+        ),
+      );
+    } catch (e) {
+      toast.error(toErrorMessage(e));
+      removePendingScreenshot();
     }
-
-    toast.success(`${file.name} uploaded!`);
-    setScreenshots((prev) =>
-      prev.map((screenshot) =>
-        screenshot.file === file
-          ? { ...screenshot, uploading: false, key }
-          : screenshot,
-      ),
-    );
   };
 
   const {
@@ -233,7 +258,7 @@ export default function AddOAuthAppForm({
       >
         <div>
           <FileUpload
-            accept="images"
+            acceptedFileTypes={contentTypes}
             className="h-24 w-24 rounded-full border border-neutral-300"
             iconClassName="w-5 h-5"
             variant="plain"
@@ -244,7 +269,7 @@ export default function AddOAuthAppForm({
             }
             onChange={({ src }) => setData({ ...data, logo: src })}
             content={null}
-            maxFileSizeMB={2}
+            maxFileSizeMB={maxFileSizeMB}
             disabled={!canManageApp}
           />
         </div>
@@ -410,14 +435,14 @@ export default function AddOAuthAppForm({
           </Reorder.Group>
 
           <FileUpload
-            accept="images"
+            acceptedFileTypes={contentTypes}
             className="mt-2 aspect-[5/1] w-full rounded-md border border-dashed border-neutral-300"
             iconClassName="w-5 h-5"
             variant="plain"
             onChange={async ({ file }) => await handleUpload(file)}
             content="Drag and drop or click to upload screenshots"
             disabled={!canManageApp || screenshots.length >= 4}
-            maxFileSizeMB={2}
+            maxFileSizeMB={maxFileSizeMB}
           />
         </div>
 
diff --git a/apps/web/ui/oauth-apps/add-edit-integration-form.tsx b/apps/web/ui/oauth-apps/add-edit-integration-form.tsx
index 8c912d12192..4004fd737e8 100644
--- a/apps/web/ui/oauth-apps/add-edit-integration-form.tsx
+++ b/apps/web/ui/oauth-apps/add-edit-integration-form.tsx
@@ -3,6 +3,7 @@
 import { addEditIntegration } from "@/lib/actions/add-edit-integration";
 import { normalizeWorkspaceId } from "@/lib/api/workspaces/workspace-id";
 import { clientAccessCheck } from "@/lib/client-access-check";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { NewOrExistingIntegration } from "@/lib/types";
 import {
@@ -15,7 +16,7 @@ import {
   RichTextToolbar,
   useEnterSubmit,
 } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { cn, toErrorMessage } from "@dub/utils";
 import slugify from "@sindresorhus/slugify";
 import { Paperclip, Trash2 } from "lucide-react";
 import { Reorder } from "motion/react";
@@ -24,6 +25,9 @@ import { useEffect, useRef, useState } from "react";
 import TextareaAutosize from "react-textarea-autosize";
 import { toast } from "sonner";
 
+const { contentTypes, maxBytes } = UPLOAD_POLICIES.integrationScreenshots;
+const maxFileSizeMB = maxBytes / (1024 * 1024);
+
 export default function AddEditIntegrationForm({
   integration,
 }: {
@@ -65,43 +69,64 @@ export default function AddEditIntegrationForm({
   const handleUpload = async (file: File) => {
     setScreenshots((prev) => [...prev, { file, uploading: true }]);
 
-    const response = await fetch(`/api/workspaces/${workspaceId}/upload-url`, {
-      method: "POST",
-      body: JSON.stringify({
-        folder: "integration-screenshots",
-      }),
-    });
+    const removePendingScreenshot = () => {
+      setScreenshots((prev) =>
+        prev.filter((screenshot) => screenshot.file !== file),
+      );
+    };
 
-    if (!response.ok) {
-      toast.error("Failed to get signed URL for screenshot upload.");
-      return;
-    }
+    try {
+      const response = await fetch(
+        `/api/workspaces/${workspaceId}/upload-url`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            folder: "integrationScreenshots",
+            contentType: file.type,
+            contentLength: file.size,
+          }),
+        },
+      );
 
-    const { signedUrl, key } = await response.json();
+      if (!response.ok) {
+        const { error } = await response.json();
+        toast.error(toErrorMessage(error));
+        removePendingScreenshot();
+        return;
+      }
 
-    const uploadResponse = await fetch(signedUrl, {
-      method: "PUT",
-      body: file,
-      headers: {
-        "Content-Type": file.type,
-        "Content-Length": file.size.toString(),
-      },
-    });
+      const { key, signedUrl } = await response.json();
 
-    if (!uploadResponse.ok) {
-      const result = await uploadResponse.json();
-      toast.error(result.error.message || "Failed to upload screenshot.");
-      return;
-    }
+      const uploadResponse = await fetch(signedUrl, {
+        method: "PUT",
+        body: file,
+        headers: {
+          "Content-Type": file.type,
+          "Content-Length": file.size.toString(),
+        },
+      });
+
+      if (!uploadResponse.ok) {
+        toast.error("Failed to upload screenshot.");
+        removePendingScreenshot();
+        return;
+      }
 
-    toast.success(`${file.name} uploaded!`);
-    setScreenshots((prev) =>
-      prev.map((screenshot) =>
-        screenshot.file === file
-          ? { ...screenshot, uploading: false, key }
-          : screenshot,
-      ),
-    );
+      toast.success(`${file.name} uploaded!`);
+      setScreenshots((prev) =>
+        prev.map((screenshot) =>
+          screenshot.file === file
+            ? { ...screenshot, uploading: false, key }
+            : screenshot,
+        ),
+      );
+    } catch (e) {
+      toast.error(toErrorMessage(e));
+      removePendingScreenshot();
+    }
   };
 
   const { name, slug, description, readme, developer, website, logo } = data;
@@ -139,7 +164,7 @@ export default function AddEditIntegrationForm({
       >
         <div>
           <FileUpload
-            accept="images"
+            acceptedFileTypes={contentTypes}
             className="h-24 w-24 rounded-full border border-neutral-300"
             iconClassName="w-5 h-5"
             variant="plain"
@@ -150,7 +175,7 @@ export default function AddEditIntegrationForm({
             }
             onChange={({ src }) => setData({ ...data, logo: src })}
             content={null}
-            maxFileSizeMB={2}
+            maxFileSizeMB={maxFileSizeMB}
             disabled={!canManageApp}
           />
         </div>
@@ -258,7 +283,7 @@ export default function AddEditIntegrationForm({
             >
               <div
                 className={cn(
-                  "border-border-subtle overflow-hidden rounded-md border border-neutral-300 shadow-sm focus-within:border-neutral-500 focus-within:ring-1 focus-within:ring-neutral-500",
+                  "border-border-subtle overflow-hidden rounded-md border shadow-sm focus-within:border-neutral-500 focus-within:ring-1 focus-within:ring-neutral-500",
                   !canManageApp && "cursor-not-allowed bg-neutral-50",
                 )}
               >
@@ -316,14 +341,14 @@ export default function AddEditIntegrationForm({
           </Reorder.Group>
 
           <FileUpload
-            accept="images"
+            acceptedFileTypes={contentTypes}
             className="mt-2 aspect-[5/1] w-full rounded-md border border-dashed border-neutral-300"
             iconClassName="w-5 h-5"
             variant="plain"
             onChange={async ({ file }) => await handleUpload(file)}
             content="Drag and drop or click to upload screenshots"
             disabled={!canManageApp || screenshots.length >= 4}
-            maxFileSizeMB={2}
+            maxFileSizeMB={maxFileSizeMB}
           />
         </div>
 
diff --git a/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx b/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
index 73a86d2b65f..04971051bd8 100644
--- a/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
+++ b/apps/web/ui/partners/bounties/claim-bounty-sheet.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { createBountySubmissionAction } from "@/lib/actions/partners/create-bounty-submission";
 import { uploadBountySubmissionFileAction } from "@/lib/actions/partners/upload-bounty-submission-file";
 import {
@@ -9,6 +10,7 @@ import {
 } from "@/lib/bounty/constants";
 import { getPeriodLabel } from "@/lib/bounty/periods";
 import { resolveBountyDetails } from "@/lib/bounty/utils";
+import { UPLOAD_POLICIES } from "@/lib/storage/upload-policies";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useProgramEnrollment from "@/lib/swr/use-program-enrollment";
 import { PartnerBountyProps } from "@/lib/types";
@@ -22,7 +24,7 @@ import {
   Sheet,
   Trash,
 } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { cn, toErrorMessage } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
 import { Dispatch, SetStateAction, useEffect, useRef, useState } from "react";
 import { FormProvider, useForm } from "react-hook-form";
@@ -101,7 +103,9 @@ function ImagesField({
       });
 
       if (!result?.data) {
-        toast.error("Failed to get signed upload URL.");
+        toast.error(
+          parseActionError(result ?? {}, "Failed to get signed upload URL."),
+        );
         setFiles((prev) => {
           const updated = prev.filter((f) => f.id !== newFile.id);
           onUploadingChange(updated.some((f) => f.uploading));
@@ -152,10 +156,8 @@ function ImagesField({
         syncToForm(updated);
         return updated;
       });
-    } catch {
-      toast.error(
-        "An unexpected error occurred while uploading. Please try again.",
-      );
+    } catch (e) {
+      toast.error(toErrorMessage(e));
       setFiles((prev) => {
         const updated = prev.filter((f) => f.id !== newFile.id);
         onUploadingChange(updated.some((f) => f.uploading));
@@ -213,19 +215,21 @@ function ImagesField({
         ))}
 
         <FileUpload
-          accept="images"
+          acceptedFileTypes={
+            UPLOAD_POLICIES.bountySubmissionImages.contentTypes
+          }
           className={cn(
             "border-border-subtle h-full w-auto rounded-md border",
             files.length > 0 ? "aspect-square" : "aspect-[unset] w-full",
           )}
           iconClassName="size-5 shrink-0"
           variant="plain"
-          content={
-            files.length > 0 ? null : "SVG, JPG, PNG or WEBP\nMax size 5MB"
-          }
+          content={files.length > 0 ? null : "JPG, PNG or WEBP\nMax size 5MB"}
           onChange={async ({ file }) => await handleUpload(file)}
           disabled={files.length >= maxFiles}
-          maxFileSizeMB={5}
+          maxFileSizeMB={
+            UPLOAD_POLICIES.bountySubmissionImages.maxBytes / (1024 * 1024)
+          }
         />
       </div>
     </div>
diff --git a/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx b/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
index e0b9fd58edc..b5bfe9dc152 100644
--- a/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
+++ b/apps/web/ui/partners/bounties/reject-bounty-submission-modal.tsx
@@ -1,18 +1,15 @@
-import { rejectBountySubmissionAction } from "@/lib/actions/partners/reject-bounty-submission";
 import {
   BOUNTY_MAX_SUBMISSION_REJECTION_NOTE_LENGTH,
   REJECT_BOUNTY_SUBMISSION_REASONS,
 } from "@/lib/bounty/constants";
 import { mutatePrefix } from "@/lib/swr/mutate";
-import useBounty from "@/lib/swr/use-bounty";
-import useWorkspace from "@/lib/swr/use-workspace";
+import { useApiMutation } from "@/lib/swr/use-api-mutation";
 import { BountySubmissionProps } from "@/lib/types";
 import { rejectBountySubmissionBodySchema } from "@/lib/zod/schemas/bounties";
 import { MaxCharactersCounter } from "@/ui/shared/max-characters-counter";
 import { Button, Modal, useKeyboardShortcut } from "@dub/ui";
 import { cn } from "@dub/utils";
-import { useAction } from "next-safe-action/hooks";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import * as z from "zod/v4";
@@ -30,12 +27,11 @@ const RejectBountySubmissionModal = ({
   setShowModal,
   onReject,
 }: RejectBountySubmissionModalProps) => {
-  const { bounty } = useBounty();
-  const workspace = useWorkspace();
+  const { makeRequest: rejectBountySubmission, isSubmitting } =
+    useApiMutation();
 
   const {
     register,
-    watch,
     getValues,
     control,
     formState: { errors },
@@ -46,35 +42,39 @@ const RejectBountySubmissionModal = ({
     },
   });
 
-  const { executeAsync: rejectBountySubmission, isPending } = useAction(
-    rejectBountySubmissionAction,
-    {
-      onSuccess: () => {
-        toast.success("Bounty submission rejected successfully!");
-        setShowModal(false);
-        onReject ? onReject() : null;
-        mutatePrefix(`/api/bounties/${bounty?.id}/submissions`);
-      },
-      onError({ error }) {
-        toast.error(error.serverError);
-      },
-    },
-  );
-
   const handleReject = useCallback(async () => {
-    if (!workspace.id || !submission?.id) {
+    if (!submission?.id || !submission.bountyId) {
       return;
     }
 
     const formData = getValues();
 
-    await rejectBountySubmission({
-      ...formData,
-      rejectionReason: formData.rejectionReason,
-      workspaceId: workspace.id,
-      submissionId: submission.id,
-    });
-  }, [workspace.id, submission?.id, getValues, rejectBountySubmission]);
+    await rejectBountySubmission(
+      `/api/bounties/${submission.bountyId}/submissions/${submission.id}/reject`,
+      {
+        method: "POST",
+        body: {
+          rejectionReason: formData.rejectionReason || undefined,
+          rejectionNote: formData.rejectionNote,
+        },
+        onSuccess: async () => {
+          toast.success("Bounty submission rejected successfully!");
+          setShowModal(false);
+          onReject?.();
+          await mutatePrefix(
+            `/api/bounties/${submission.bountyId}/submissions`,
+          );
+        },
+      },
+    );
+  }, [
+    submission?.id,
+    submission.bountyId,
+    getValues,
+    rejectBountySubmission,
+    setShowModal,
+    onReject,
+  ]);
 
   // Handle keyboard shortcut for Reject button
   useKeyboardShortcut("r", handleReject, {
@@ -105,7 +105,7 @@ const RejectBountySubmissionModal = ({
               <select
                 id="rejectionReason"
                 {...register("rejectionReason")}
-                disabled={isPending}
+                disabled={isSubmitting}
                 className={cn(
                   "block w-full rounded-md border-neutral-300 text-neutral-900 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
                   errors.rejectionReason &&
@@ -174,7 +174,7 @@ const RejectBountySubmissionModal = ({
             text="Cancel"
             className="h-9 w-fit"
             onClick={() => setShowModal(false)}
-            disabled={isPending}
+            disabled={isSubmitting}
           />
           <Button
             type="button"
@@ -182,7 +182,7 @@ const RejectBountySubmissionModal = ({
             variant="danger"
             shortcut="R"
             className="h-9 w-fit"
-            loading={isPending}
+            loading={isSubmitting}
             onClick={handleReject}
           />
         </div>
@@ -197,22 +197,16 @@ export function useRejectBountySubmissionModal(
 ) {
   const [showRejectModal, setShowRejectModal] = useState(false);
 
-  const RejectBountySubmissionModalCallback = useCallback(() => {
-    return (
+  return {
+    setShowRejectModal,
+    RejectBountySubmissionModal: showRejectModal ? (
       <RejectBountySubmissionModal
+        key={submission.id}
         showModal={showRejectModal}
         setShowModal={setShowRejectModal}
         submission={submission}
         onReject={onReject}
       />
-    );
-  }, [showRejectModal, setShowRejectModal, onReject, submission]);
-
-  return useMemo(
-    () => ({
-      setShowRejectModal,
-      RejectBountySubmissionModal: RejectBountySubmissionModalCallback,
-    }),
-    [setShowRejectModal, RejectBountySubmissionModalCallback],
-  );
+    ) : null,
+  };
 }
diff --git a/apps/web/ui/partners/confirm-payouts-sheet.tsx b/apps/web/ui/partners/confirm-payouts-sheet.tsx
index 385b9e8e848..05599f3a18f 100644
--- a/apps/web/ui/partners/confirm-payouts-sheet.tsx
+++ b/apps/web/ui/partners/confirm-payouts-sheet.tsx
@@ -24,6 +24,7 @@ import usePaymentMethods from "@/lib/swr/use-payment-methods";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { PayoutResponse } from "@/lib/types";
+import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
 import { X } from "@/ui/shared/icons";
 import {
   Button,
@@ -49,6 +50,7 @@ import {
   currencyFormatter,
   fetcher,
   formatDate,
+  isWorkspaceBillingTrialActive,
   nFormatter,
   pluralize,
   truncate,
@@ -89,6 +91,7 @@ function ConfirmPayoutsSheetContent() {
     defaultProgramId,
     payoutsUsage,
     payoutsLimit,
+    trialEndsAt,
     payoutFee,
     payoutFeeWaiverLimit,
     payoutFeeWaiverUsage,
@@ -808,6 +811,9 @@ function ConfirmPayoutsSheetContent() {
     action: "payouts.write",
     customPermissionDescription: "confirm payouts",
   });
+  const { openTrialLimitModal, TrialLimitActivateModal } =
+    useTrialLimitActivateModal();
+  const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
 
   const [isTouchDevice, setIsTouchDevice] = useState(false);
 
@@ -816,159 +822,164 @@ function ConfirmPayoutsSheetContent() {
   }, []);
 
   return (
-    <div className="flex h-full flex-col">
-      <div className="flex h-16 items-center justify-between border-b border-neutral-200 px-6 py-4">
-        <Sheet.Title className="text-lg font-semibold">
-          Confirm payouts
-        </Sheet.Title>
-        <Sheet.Close asChild>
-          <Button
-            variant="outline"
-            icon={<X className="size-5" />}
-            className="h-auto w-fit p-1"
-          />
-        </Sheet.Close>
-      </div>
+    <>
+      <TrialLimitActivateModal />
+      <div className="flex h-full flex-col">
+        <div className="flex h-16 items-center justify-between border-b border-neutral-200 px-6 py-4">
+          <Sheet.Title className="text-lg font-semibold">
+            Confirm payouts
+          </Sheet.Title>
+          <Sheet.Close asChild>
+            <Button
+              variant="outline"
+              icon={<X className="size-5" />}
+              className="h-auto w-fit p-1"
+            />
+          </Sheet.Close>
+        </div>
 
-      <div className="flex-1 overflow-y-auto">
-        <div className="flex flex-col gap-4 p-6">
-          <div className="text-base font-medium text-neutral-900">
-            Invoice details
-          </div>
-          <div className="grid grid-cols-3 gap-2 text-sm">
-            {invoiceData.map(({ key, value, tooltipContent }) => (
-              <Fragment key={key}>
-                <div
-                  className={cn(
-                    "flex items-center py-0.5 font-medium text-neutral-500",
-                    tooltipContent &&
-                      "cursor-help underline decoration-dotted underline-offset-2",
-                  )}
-                >
-                  <DynamicTooltipWrapper
-                    tooltipProps={
-                      tooltipContent
-                        ? {
-                            content: tooltipContent,
-                          }
-                        : undefined
-                    }
+        <div className="flex-1 overflow-y-auto">
+          <div className="flex flex-col gap-4 p-6">
+            <div className="text-base font-medium text-neutral-900">
+              Invoice details
+            </div>
+            <div className="grid grid-cols-3 gap-2 text-sm">
+              {invoiceData.map(({ key, value, tooltipContent }) => (
+                <Fragment key={key}>
+                  <div
+                    className={cn(
+                      "flex items-center py-0.5 font-medium text-neutral-500",
+                      tooltipContent &&
+                        "cursor-help underline decoration-dotted underline-offset-2",
+                    )}
                   >
-                    {key}
-                  </DynamicTooltipWrapper>
-                </div>
-                <div className="col-span-2 flex items-center text-neutral-800">
-                  {value}
-                </div>
-              </Fragment>
-            ))}
+                    <DynamicTooltipWrapper
+                      tooltipProps={
+                        tooltipContent
+                          ? {
+                              content: tooltipContent,
+                            }
+                          : undefined
+                      }
+                    >
+                      {key}
+                    </DynamicTooltipWrapper>
+                  </div>
+                  <div className="col-span-2 flex items-center text-neutral-800">
+                    {value}
+                  </div>
+                </Fragment>
+              ))}
+            </div>
           </div>
-        </div>
 
-        <div className="px-6 py-3">
-          <Table {...table} />
+          <div className="px-6 py-3">
+            <Table {...table} />
+          </div>
         </div>
-      </div>
 
-      <div className="flex flex-col gap-3 border-t border-neutral-200 px-5 py-4">
-        <ConfirmPayoutsButton
-          onClick={async () => {
-            if (!workspaceId || !selectedPaymentMethod) {
-              return false;
+        <div className="flex flex-col gap-3 border-t border-neutral-200 px-5 py-4">
+          <ConfirmPayoutsButton
+            onClick={async () => {
+              if (!workspaceId || !selectedPaymentMethod) {
+                return false;
+              }
+
+              const result = await confirmPayouts({
+                workspaceId,
+                paymentMethodId: selectedPaymentMethod.id.replace("-fast", ""),
+                fastSettlement: selectedPaymentMethod.fastSettlement,
+                cutoffPeriod,
+                ...(isExplicitSelectionMode
+                  ? { selectedPayoutIds: resolvedSelectedPayoutIds }
+                  : excludedPayoutIds.length > 0
+                    ? { excludedPayoutIds }
+                    : {}),
+                amount: amount ?? 0,
+                fee: fee ?? 0,
+                total: total ?? 0,
+              });
+
+              if (!result?.data?.invoiceId) return false;
+
+              setTimeout(
+                () =>
+                  result?.data?.invoiceId &&
+                  router.push(
+                    `/${slug}/program/payouts/success?invoiceId=${result.data.invoiceId}`,
+                  ),
+                1000,
+              );
+
+              return true;
+            }}
+            text={
+              amount && amount > 0
+                ? `${isTouchDevice ? "Press" : "Click"} and hold to confirm ${currencyFormatter(amount)} payout`
+                : `${isTouchDevice ? "Press" : "Click"} and hold to confirm payout`
             }
-
-            const result = await confirmPayouts({
-              workspaceId,
-              paymentMethodId: selectedPaymentMethod.id.replace("-fast", ""),
-              fastSettlement: selectedPaymentMethod.fastSettlement,
-              cutoffPeriod,
-              ...(isExplicitSelectionMode
-                ? { selectedPayoutIds: resolvedSelectedPayoutIds }
-                : excludedPayoutIds.length > 0
-                  ? { excludedPayoutIds }
-                  : {}),
-              amount: amount ?? 0,
-              fee: fee ?? 0,
-              total: total ?? 0,
-            });
-
-            if (!result?.data?.invoiceId) return false;
-
-            setTimeout(
-              () =>
-                result?.data?.invoiceId &&
-                router.push(
-                  `/${slug}/program/payouts/success?invoiceId=${result.data.invoiceId}`,
-                ),
-              1000,
-            );
-
-            return true;
-          }}
-          text={
-            amount && amount > 0
-              ? `${isTouchDevice ? "Press" : "Click"} and hold to confirm ${currencyFormatter(amount)} payout`
-              : `${isTouchDevice ? "Press" : "Click"} and hold to confirm payout`
-          }
-          disabled={
-            eligiblePayoutsLoading ||
-            eligiblePayoutsSummaryLoading ||
-            !selectedPaymentMethod ||
-            amount === 0
-          }
-          disabledTooltip={
-            plan &&
-            typeof payoutsUsage === "number" &&
-            typeof payoutsLimit === "number" &&
-            typeof amount === "number" &&
-            payoutsUsage + amount > payoutsLimit ? (
-              <TooltipContent
-                title={exceededLimitError({
-                  plan,
-                  planPeriod,
-                  limit: payoutsLimit,
-                  type: "payouts",
-                })}
-                cta="Upgrade"
-                href={`/${slug}/settings/billing/upgrade?planPeriod=yearly`}
-              />
-            ) : amount && amount < INVOICE_MIN_PAYOUT_AMOUNT_CENTS ? (
-              "Your payout total is less than the minimum invoice amount of $10."
-            ) : (
-              permissionsError || undefined
-            )
-          }
-        />
-        {commissionsCount && commissionsCount.hold.count > 0 && (
-          <div className="flex items-center justify-center gap-2 text-sm text-neutral-600">
-            <span>
-              Excluding{" "}
-              <span className="font-medium text-neutral-800">
-                {nFormatter(commissionsCount.hold.count, { full: true })}
-              </span>
-              {` on hold ${pluralize("commission", commissionsCount.hold.count)} `}
-              <span className="font-medium text-neutral-800">
-                (
-                {currencyFormatter(commissionsCount.hold.earnings, {
-                  trailingZeroDisplay: "stripIfInteger",
-                })}
-                )
+            disabled={
+              eligiblePayoutsLoading ||
+              eligiblePayoutsSummaryLoading ||
+              !selectedPaymentMethod ||
+              amount === 0
+            }
+            disabledTooltip={
+              plan &&
+              typeof payoutsUsage === "number" &&
+              typeof payoutsLimit === "number" &&
+              typeof amount === "number" &&
+              payoutsUsage + amount > payoutsLimit ? (
+                <TooltipContent
+                  title={exceededLimitError({
+                    plan,
+                    planPeriod,
+                    limit: payoutsLimit,
+                    type: "payouts",
+                  })}
+                  cta={trialActive ? "Start paid plan" : "Upgrade plan"}
+                  {...(trialActive
+                    ? { onClick: () => openTrialLimitModal("payouts") }
+                    : { href: `/${slug}/upgrade` })}
+                />
+              ) : amount && amount < INVOICE_MIN_PAYOUT_AMOUNT_CENTS ? (
+                "Your payout total is less than the minimum invoice amount of $10."
+              ) : (
+                permissionsError || undefined
+              )
+            }
+          />
+          {commissionsCount && commissionsCount.hold.count > 0 && (
+            <div className="flex items-center justify-center gap-2 text-sm text-neutral-600">
+              <span>
+                Excluding{" "}
+                <span className="font-medium text-neutral-800">
+                  {nFormatter(commissionsCount.hold.count, { full: true })}
+                </span>
+                {` on hold ${pluralize("commission", commissionsCount.hold.count)} `}
+                <span className="font-medium text-neutral-800">
+                  (
+                  {currencyFormatter(commissionsCount.hold.earnings, {
+                    trailingZeroDisplay: "stripIfInteger",
+                  })}
+                  )
+                </span>
               </span>
-            </span>
-            <a
-              href={`/${slug}/program/commissions?status=hold`}
-              target="_blank"
-            >
-              <Button
-                variant="secondary"
-                text="Review"
-                className="h-7 w-fit cursor-alias rounded-md border border-neutral-200 px-2 text-sm"
-              />
-            </a>
-          </div>
-        )}
+              <a
+                href={`/${slug}/program/commissions?status=hold`}
+                target="_blank"
+              >
+                <Button
+                  variant="secondary"
+                  text="Review"
+                  className="h-7 w-fit cursor-alias rounded-md border border-neutral-200 px-2 text-sm"
+                />
+              </a>
+            </div>
+          )}
+        </div>
       </div>
-    </div>
+    </>
   );
 }
 
diff --git a/apps/web/ui/partners/custom-reward-description.tsx b/apps/web/ui/partners/custom-reward-description.tsx
new file mode 100644
index 00000000000..adaaf9a6005
--- /dev/null
+++ b/apps/web/ui/partners/custom-reward-description.tsx
@@ -0,0 +1,89 @@
+import { formatCadenceLabel } from "@/lib/api/rewards/custom-reward-utils";
+import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
+import { RewardProps } from "@/lib/types";
+import { customRewardConfigSchema } from "@/lib/zod/schemas/rewards";
+import { cn } from "@dub/utils";
+
+type CustomRewardDescriptionInput = Pick<
+  RewardProps,
+  "type" | "amountInCents" | "amountInPercentage" | "maxDuration" | "config"
+>;
+
+export function getCustomRewardDescriptionParts(
+  reward: CustomRewardDescriptionInput,
+) {
+  const amount = constructRewardAmount(reward);
+  const parsed = customRewardConfigSchema.safeParse(reward.config);
+  const config = parsed.success ? parsed.data : undefined;
+
+  const cadenceLabel = config
+    ? formatCadenceLabel({
+        frequency: config.frequency,
+        interval: config.interval,
+      })
+    : "on a schedule";
+
+  const durationLabel =
+    reward.maxDuration == null
+      ? null
+      : reward.maxDuration % 12 === 0
+        ? `${reward.maxDuration / 12} year${reward.maxDuration / 12 > 1 ? "s" : ""}`
+        : `${reward.maxDuration} month${reward.maxDuration > 1 ? "s" : ""}`;
+
+  return {
+    amount,
+    cadenceLabel,
+    durationLabel,
+  };
+}
+
+export function formatCustomRewardDescription(
+  reward: CustomRewardDescriptionInput,
+  { includeEarnPrefix = true }: { includeEarnPrefix?: boolean } = {},
+) {
+  const { amount, cadenceLabel, durationLabel } =
+    getCustomRewardDescriptionParts(reward);
+
+  return [
+    includeEarnPrefix ? "Earn" : null,
+    amount,
+    cadenceLabel,
+    durationLabel ? `for ${durationLabel}` : null,
+  ]
+    .filter(Boolean)
+    .join(" ");
+}
+
+export function CustomRewardDescription({
+  reward,
+  amountClassName,
+  periodClassName,
+  includeEarnPrefix = true,
+}: {
+  reward: CustomRewardDescriptionInput;
+  amountClassName?: string;
+  periodClassName?: string;
+  includeEarnPrefix?: boolean;
+}) {
+  const { amount, cadenceLabel, durationLabel } =
+    getCustomRewardDescriptionParts(reward);
+
+  return (
+    <>
+      {includeEarnPrefix ? <>Earn </> : null}
+      <strong className={cn("font-semibold lowercase", amountClassName)}>
+        {amount}
+      </strong>{" "}
+      {cadenceLabel}
+      {durationLabel ? (
+        <>
+          {" "}
+          for{" "}
+          <strong className={cn("font-semibold", periodClassName)}>
+            {durationLabel}
+          </strong>
+        </>
+      ) : null}
+    </>
+  );
+}
diff --git a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
index 38725bfd01f..e8279d301b0 100644
--- a/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
+++ b/apps/web/ui/partners/discounts/add-edit-discount-sheet.tsx
@@ -5,6 +5,8 @@ import { deleteDiscountAction } from "@/lib/actions/partners/delete-discount";
 import { updateDiscountAction } from "@/lib/actions/partners/update-discount";
 import { constructDiscountAmount } from "@/lib/api/sales/construct-discount-amount";
 import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
+import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import useGroup from "@/lib/swr/use-group";
 import useProgram from "@/lib/swr/use-program";
 import useWorkspace from "@/lib/swr/use-workspace";
@@ -25,6 +27,7 @@ import {
   Sheet,
   Switch,
   Tooltip,
+  TooltipContent,
   useRouterStuff,
 } from "@dub/ui";
 import { CircleCheck, StripeIcon, Tag } from "@dub/ui/icons";
@@ -51,6 +54,9 @@ interface DiscountSheetProps {
   setIsOpen: Dispatch<SetStateAction<boolean>>;
   discount?: DiscountProps;
   defaultDiscountValues?: DiscountProps;
+  groupIdOrSlug?: string | null;
+  isDefault?: boolean;
+  onCreated?: (id: string) => void;
 }
 
 type FormData = z.infer<typeof createDiscountSchema>;
@@ -76,12 +82,44 @@ function DiscountSheetContent({
   setIsOpen,
   discount,
   defaultDiscountValues,
-}: DiscountSheetProps) {
+  groupIdOrSlug,
+  isDefault = true,
+  onCreated,
+  nested,
+}: DiscountSheetProps & {
+  nested?: boolean;
+}) {
   const formRef = useRef<HTMLFormElement>(null);
 
-  const { group, mutateGroup } = useGroup();
+  const { group, mutateGroup } = useGroup({
+    groupIdOrSlug: groupIdOrSlug ?? undefined,
+  });
   const { mutate: mutateProgram } = useProgram();
-  const { id: workspaceId, defaultProgramId } = useWorkspace();
+  const {
+    id: workspaceId,
+    defaultProgramId,
+    slug: workspaceSlug,
+    plan,
+  } = useWorkspace({
+    // lower dedupingInterval + revalidateOnFocus in case user upgrades their plan in another tab
+    swrOpts: {
+      dedupingInterval: 2000,
+      revalidateOnFocus: true,
+    },
+  });
+  const { canUseAdvancedRewardLogic } = getPlanCapabilities(plan);
+
+  // Infer when omitted (create via useDiscountSheet defaults true). Group pages
+  // pass isDefault from whether the discount is the group's default.
+  const effectiveIsDefault =
+    isDefault === false
+      ? false
+      : discount && group
+        ? discount.id === group.discount?.id
+        : isDefault;
+
+  const showPartnerAndLinkUpsell =
+    !discount && !effectiveIsDefault && !canUseAdvancedRewardLogic;
 
   const isEdit = Boolean(discount?.id);
 
@@ -123,6 +161,7 @@ function DiscountSheetContent({
       couponTestId: defaultValuesSource.couponTestId,
       autoProvision: Boolean(defaultValuesSource.autoProvisionEnabledAt),
       provider: discountProvider,
+      isDefault: effectiveIsDefault,
     },
   });
 
@@ -144,11 +183,17 @@ function DiscountSheetContent({
   const { executeAsync: createDiscount, isPending: isCreating } = useAction(
     createDiscountAction,
     {
-      onSuccess: async () => {
+      onSuccess: async ({ data }) => {
+        if (data?.id) {
+          onCreated?.(data.id);
+        }
         setIsOpen(false);
         toast.success("Discount created!");
         await mutateProgram();
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/discounts"),
+        );
       },
       onError({ error }) {
         if (error.serverError) {
@@ -185,6 +230,9 @@ function DiscountSheetContent({
         toast.success("Discount updated!");
         await mutateProgram();
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/discounts"),
+        );
       },
       onError({ error }) {
         toast.error(error.serverError);
@@ -200,6 +248,9 @@ function DiscountSheetContent({
         toast.success("Discount deleted!");
         await mutate(`/api/programs/${defaultProgramId}`);
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/discounts"),
+        );
       },
       onError({ error }) {
         toast.error(error.serverError);
@@ -208,7 +259,12 @@ function DiscountSheetContent({
   );
 
   const onSubmit = async (data: FormData) => {
-    if (!workspaceId || !defaultProgramId || !group) {
+    if (
+      !workspaceId ||
+      !defaultProgramId ||
+      !group ||
+      showPartnerAndLinkUpsell
+    ) {
       return;
     }
 
@@ -229,6 +285,7 @@ function DiscountSheetContent({
       amount: data.type === "flat" ? data.amount * 100 : data.amount || 0,
       maxDuration:
         Number(data.maxDuration) === Infinity ? null : data.maxDuration,
+      isDefault: effectiveIsDefault,
     });
   };
 
@@ -302,7 +359,10 @@ function DiscountSheetContent({
                               onProviderChange(e);
                               setUseExistingCoupon(false);
                               setUseStripeTestCouponId(false);
-                              if (e.target.value === DiscountProvider.shopify) {
+                              if (
+                                e.target.value === DiscountProvider.shopify ||
+                                e.target.value === DiscountProvider.custom
+                              ) {
                                 setValue("couponId", "");
                                 setValue("couponTestId", "");
                               }
@@ -315,6 +375,7 @@ function DiscountSheetContent({
                         <option value={DiscountProvider.shopify}>
                           Shopify
                         </option>
+                        <option value={DiscountProvider.custom}>Custom</option>
                       </select>
                     </div>
                   </div>
@@ -456,6 +517,10 @@ function DiscountSheetContent({
                   <>
                     {effectiveProvider === DiscountProvider.shopify ? (
                       <Shopify className="h-7 w-auto" />
+                    ) : effectiveProvider === DiscountProvider.custom ? (
+                      <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+                        <Tag className="size-4 text-neutral-800" />
+                      </div>
                     ) : (
                       <StripeIcon className="size-7" />
                     )}
@@ -550,14 +615,20 @@ function DiscountSheetContent({
             </div>
           </div>
 
-          <VerticalLine />
-
-          {group && <RewardDiscountPartnersCard groupId={group.id} />}
+          {group && (effectiveIsDefault || Boolean(discount)) && (
+            <>
+              <VerticalLine />
+              <RewardDiscountPartnersCard
+                groupId={group.id}
+                discountId={discount?.id}
+              />
+            </>
+          )}
         </div>
 
         <div className="flex items-center justify-between border-t border-neutral-200 p-5">
           <div>
-            {discount && (
+            {discount && !(nested && effectiveIsDefault) && (
               <Button
                 type="button"
                 variant="outline"
@@ -585,6 +656,16 @@ function DiscountSheetContent({
               className="w-fit"
               loading={isCreating || isUpdating}
               disabled={(!discount && amount == null) || isDeleting}
+              disabledTooltip={
+                showPartnerAndLinkUpsell ? (
+                  <TooltipContent
+                    title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+                    cta="Upgrade to Advanced"
+                    href={`/${workspaceSlug}/upgrade?plan=advanced&showAdvancedUpsellModal=true`}
+                    target="_blank"
+                  />
+                ) : undefined
+              }
             />
           </div>
         </div>
@@ -667,14 +748,14 @@ export function DiscountSheet({
   const setIsOpen: DiscountSheetProps["setIsOpen"] = (value) => {
     const nextOpen = typeof value === "function" ? value(isOpen) : value;
     rest.setIsOpen(value);
-    if (!nextOpen) {
+    if (!nextOpen && !nested) {
       queryParams({ del: "discountId", scroll: false });
     }
   };
 
   return (
     <Sheet open={isOpen} onOpenChange={setIsOpen} nested={nested}>
-      <DiscountSheetContent {...rest} setIsOpen={setIsOpen} />
+      <DiscountSheetContent {...rest} nested={nested} setIsOpen={setIsOpen} />
     </Sheet>
   );
 }
diff --git a/apps/web/ui/partners/discounts/discount-code-badge.tsx b/apps/web/ui/partners/discounts/discount-code-badge.tsx
index e91310f4aef..4faa833e93e 100644
--- a/apps/web/ui/partners/discounts/discount-code-badge.tsx
+++ b/apps/web/ui/partners/discounts/discount-code-badge.tsx
@@ -1,5 +1,6 @@
 import { Tag, Tooltip, useCopyToClipboard } from "@dub/ui";
 import { cn } from "@dub/utils";
+import { useRef, useState } from "react";
 import { toast } from "sonner";
 
 export function DiscountCodeBadge({
@@ -14,18 +15,27 @@ export function DiscountCodeBadge({
   const [copied, copyToClipboard] = useCopyToClipboard();
   const isDisabled = !!disabledAt;
 
+  // Only show the full code in a tooltip when it's actually truncated
+  const codeRef = useRef<HTMLDivElement>(null);
+  const [isClipped, setIsClipped] = useState(false);
+  const measureClipped = () => {
+    const el = codeRef.current;
+    setIsClipped(!!el && el.scrollWidth > el.clientWidth);
+  };
+
   const content = (
     <>
       <Tag
         className={cn(
-          "size-3",
+          "size-3 shrink-0",
           isDisabled ? "text-neutral-500" : "text-green-700",
         )}
         strokeWidth={1.5}
       />
       <div
+        ref={codeRef}
         className={cn(
-          "text-xs font-medium",
+          "min-w-0 truncate text-xs font-medium",
           isDisabled
             ? "text-neutral-500 line-through"
             : "text-green-700 decoration-dotted underline-offset-2 transition-colors group-hover/discountcode:underline",
@@ -38,8 +48,16 @@ export function DiscountCodeBadge({
 
   if (isDisabled) {
     return (
-      <Tooltip content={disabledTooltip}>
-        <div className="flex w-fit cursor-help items-center gap-1 rounded-lg bg-neutral-100 px-2 py-1">
+      <Tooltip
+        content={
+          isClipped ? `\`${code}\`\n\n${disabledTooltip}` : disabledTooltip
+        }
+      >
+        <div
+          className="flex w-fit max-w-full cursor-help items-center gap-1 rounded-lg bg-neutral-100 px-2 py-1"
+          onPointerEnter={measureClipped}
+          onFocus={measureClipped}
+        >
           {content}
         </div>
       </Tooltip>
@@ -47,22 +65,33 @@ export function DiscountCodeBadge({
   }
 
   return (
-    <button
-      type="button"
-      className={cn(
-        "group/discountcode relative flex w-fit cursor-copy items-center gap-1 rounded-lg bg-green-200 px-2 py-1",
-        "transition-colors duration-150 hover:bg-green-300/80",
-        copied && "cursor-default",
-      )}
-      onClick={() =>
-        copyToClipboard(code, {
-          onSuccess: () => {
-            toast.success("Copied discount code to clipboard");
-          },
-        })
+    <Tooltip
+      disabled={!isClipped}
+      content={
+        <div className="max-w-xs break-all px-3 py-2 text-sm text-neutral-600">
+          {code}
+        </div>
       }
     >
-      {content}
-    </button>
+      <button
+        type="button"
+        className={cn(
+          "group/discountcode relative flex w-fit max-w-full cursor-copy items-center gap-1 rounded-lg bg-green-200 px-2 py-1",
+          "transition-colors duration-150 hover:bg-green-300/80",
+          copied && "cursor-default",
+        )}
+        onPointerEnter={measureClipped}
+        onFocus={measureClipped}
+        onClick={() =>
+          copyToClipboard(code, {
+            onSuccess: () => {
+              toast.success("Copied discount code to clipboard");
+            },
+          })
+        }
+      >
+        {content}
+      </button>
+    </Tooltip>
   );
 }
diff --git a/apps/web/ui/partners/discounts/discount-code-tooltip.tsx b/apps/web/ui/partners/discounts/discount-code-tooltip.tsx
new file mode 100644
index 00000000000..15de2c981e6
--- /dev/null
+++ b/apps/web/ui/partners/discounts/discount-code-tooltip.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { DiscountProps } from "@/lib/types";
+import { DiscountCode, Tooltip } from "@dub/ui";
+import { PropsWithChildren } from "react";
+import { formatDiscountDescription } from "../format-discount-description";
+
+type DiscountTooltipDiscount = Pick<
+  DiscountProps,
+  "amount" | "type" | "maxDuration" | "description"
+>;
+
+export function DiscountCodeTooltip({
+  discount,
+  children,
+}: PropsWithChildren<{
+  discount?: DiscountTooltipDiscount | null;
+}>) {
+  return (
+    <Tooltip content={<DiscountCodeTooltipContent discount={discount} />}>
+      {children}
+    </Tooltip>
+  );
+}
+
+function DiscountCodeTooltipContent({
+  discount,
+}: {
+  discount?: DiscountTooltipDiscount | null;
+}) {
+  const description = discount ? formatDiscountDescription(discount) : null;
+
+  return (
+    <div className="w-64">
+      {description && (
+        <div className="p-1">
+          <div className="flex flex-col gap-2 rounded-md border border-neutral-200 bg-neutral-100 p-2">
+            <DiscountCode className="size-3.5 shrink-0 text-neutral-800" />
+            <p className="text-xs font-semibold leading-4 tracking-tight text-neutral-700">
+              {description}
+            </p>
+          </div>
+        </div>
+      )}
+      <p className="px-3 pb-2 pt-1 text-xs font-medium leading-4 tracking-tight text-neutral-600">
+        Sales made with this code are tracked and credited to you.{" "}
+        <a
+          href="https://dub.co/help/article/dual-sided-incentives"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="underline underline-offset-2"
+          onClick={(e) => e.stopPropagation()}
+        >
+          Learn more
+        </a>
+      </p>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/format-reward-description.ts b/apps/web/ui/partners/format-reward-description.ts
index bc043108e97..270b7921f68 100644
--- a/apps/web/ui/partners/format-reward-description.ts
+++ b/apps/web/ui/partners/format-reward-description.ts
@@ -4,14 +4,26 @@ import {
   PARTNER_REFERRAL_PERCENTAGE_TRIGGERS,
   PartnerReferralPercentageTrigger,
 } from "@/lib/partner-referrals/constants";
+import { getSpendLimitDescriptionParts } from "@/lib/rewards/reward-spend-limit";
 import { RewardProps } from "@/lib/types";
 import { referralRewardConfigSchema } from "@/lib/zod/schemas/rewards";
 import { currencyFormatter } from "@dub/utils";
 import { RewardSpendLimitInterval } from "@prisma/client";
-import { getSpendLimitDescriptionParts } from "./program-reward-spend-limit";
+import { formatCustomRewardDescription } from "./custom-reward-description";
 
 export function formatRewardDescription(
-  reward: RewardProps,
+  reward: Pick<
+    RewardProps,
+    | "description"
+    | "event"
+    | "type"
+    | "amountInCents"
+    | "amountInPercentage"
+    | "maxDuration"
+    | "config"
+    | "spendLimitAmount"
+    | "spendLimitInterval"
+  >,
   { includeEarnPrefix = true }: { includeEarnPrefix?: boolean } = {},
 ) {
   if (reward.description) {
@@ -22,6 +34,10 @@ export function formatRewardDescription(
     return formatReferralRewardDescription(reward, { includeEarnPrefix });
   }
 
+  if (reward.event === "custom") {
+    return formatCustomRewardDescription(reward, { includeEarnPrefix });
+  }
+
   const rewardAmount = constructRewardAmount(reward);
 
   const parts: string[] = [];
@@ -62,7 +78,10 @@ export function formatRewardDescription(
 }
 
 function formatReferralRewardDescription(
-  reward: RewardProps,
+  reward: Pick<
+    RewardProps,
+    "type" | "amountInCents" | "amountInPercentage" | "maxDuration" | "config"
+  >,
   { includeEarnPrefix }: { includeEarnPrefix: boolean },
 ) {
   const rewardAmount = constructRewardAmount(reward);
diff --git a/apps/web/ui/partners/fraud-risks/partner-application-risk-summary-modal.tsx b/apps/web/ui/partners/fraud-risks/partner-application-risk-summary-modal.tsx
index bff173dbead..83f90ae5053 100644
--- a/apps/web/ui/partners/fraud-risks/partner-application-risk-summary-modal.tsx
+++ b/apps/web/ui/partners/fraud-risks/partner-application-risk-summary-modal.tsx
@@ -13,6 +13,7 @@ import {
   useState,
 } from "react";
 import { PartnerApplicationFraudSeverityIndicator } from "./partner-application-fraud-severity-indicator";
+import { RiskDisclaimerBanner } from "./risk-disclaimer-banner";
 
 interface PartnerApplicationRiskSummaryModalProps {
   showModal: boolean;
@@ -47,6 +48,10 @@ function PartnerApplicationRiskSummaryModal({
       </div>
 
       <div className="flex flex-col gap-6 bg-white p-4 sm:p-6">
+        {severity === "high" && (
+          <RiskDisclaimerBanner className="gap-2 px-3 py-2" />
+        )}
+
         <PartnerApplicationFraudSeverityIndicator severity={severity} />
 
         <ul className="space-y-4">
diff --git a/apps/web/ui/partners/fraud-risks/partner-application-risk-summary.tsx b/apps/web/ui/partners/fraud-risks/partner-application-risk-summary.tsx
index f04d9720171..e850a7230a3 100644
--- a/apps/web/ui/partners/fraud-risks/partner-application-risk-summary.tsx
+++ b/apps/web/ui/partners/fraud-risks/partner-application-risk-summary.tsx
@@ -11,8 +11,6 @@ import Link from "next/link";
 import { useAdvancedUpsellModal } from "../advanced-upsell-modal";
 import { PartnerApplicationFraudSeverityIndicator } from "./partner-application-fraud-severity-indicator";
 import { usePartnerApplicationRiskSummaryModal } from "./partner-application-risk-summary-modal";
-import { PartnerCrossProgramSummary } from "./partner-cross-program-summary";
-import { RiskDisclaimerBanner } from "./risk-disclaimer-banner";
 
 interface PartnerApplicationRiskSummaryProps {
   partner: {
@@ -88,17 +86,6 @@ export function PartnerApplicationRiskSummary({
         </ul>
       </div>
 
-      <div className="flex flex-col gap-3 p-4">
-        <h3 className="text-content-emphasis text-sm font-semibold">
-          Program owner activity
-        </h3>
-        <PartnerCrossProgramSummary partnerId={partner.id} />
-
-        {severity === "high" && (
-          <RiskDisclaimerBanner className="gap-2 px-3 py-2" />
-        )}
-      </div>
-
       <PartnerApplicationRiskSummaryModal />
     </>
   );
diff --git a/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx b/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
similarity index 66%
rename from apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx
rename to apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
index 8fe10c09127..87692ef237b 100644
--- a/apps/web/ui/partners/fraud-risks/partner-cross-program-summary.tsx
+++ b/apps/web/ui/partners/fraud-risks/partner-network-activity-summary.tsx
@@ -1,25 +1,41 @@
 "use client";
 
-import { usePartnerCrossProgramSummary } from "@/lib/swr/use-partner-cross-program-summary";
+import useWorkspace from "@/lib/swr/use-workspace";
+import { partnerNetworkActivitySummarySchema } from "@/lib/zod/schemas/partners";
 import { ActivityRing, User, UserCheck, UserXmark } from "@dub/ui";
+import { fetcher } from "@dub/utils";
+import useSWR from "swr";
+import * as z from "zod/v4";
 
-export function PartnerCrossProgramSummary({
+type NetworkActivitySummary = z.infer<
+  typeof partnerNetworkActivitySummarySchema
+>;
+
+export function PartnerNetworkActivitySummary({
   partnerId,
 }: {
   partnerId: string;
 }) {
-  const { crossProgramSummary, isLoading } = usePartnerCrossProgramSummary({
-    partnerId,
-  });
+  const { id: workspaceId } = useWorkspace();
+
+  const { data, isLoading } = useSWR<NetworkActivitySummary>(
+    workspaceId
+      ? `/api/partners/${partnerId}/network-activity?workspaceId=${workspaceId}`
+      : null,
+    fetcher,
+    {
+      revalidateOnMount: true,
+    },
+  );
 
-  if (isLoading || !crossProgramSummary) {
+  if (!data || isLoading) {
     return <LoadingSkeleton />;
   }
 
-  const { totalPrograms, activePrograms, bannedPrograms } = crossProgramSummary;
+  const { totalPrograms, activePrograms, bannedPrograms } = data;
 
   return (
-    <div className="flex items-center gap-3">
+    <div className="flex w-full items-center gap-3">
       <ActivityRing
         positiveValue={activePrograms}
         negativeValue={bannedPrograms}
@@ -56,8 +72,12 @@ function StatRow({
     <div className="flex items-center justify-between gap-6">
       <span className="text-xs font-medium text-neutral-700">{label}</span>
       <div className="flex items-center gap-1 text-xs">
-        <span className="font-semibold text-neutral-800">{value}</span>
-        <span className="font-medium text-neutral-500">of {total}</span>
+        <span className="font-semibold tabular-nums text-neutral-800">
+          {value}
+        </span>
+        <span className="font-medium tabular-nums text-neutral-500">
+          of {total}
+        </span>
       </div>
     </div>
   );
@@ -65,7 +85,7 @@ function StatRow({
 
 function LoadingSkeleton() {
   return (
-    <div className="flex items-center gap-3">
+    <div className="flex w-full items-center gap-3">
       <div className="size-10 shrink-0 animate-pulse rounded-full bg-neutral-200" />
       <div className="flex min-w-0 grow flex-col gap-[5px]">
         <div className="flex items-center justify-between gap-6">
diff --git a/apps/web/ui/partners/fraud-risks/risk-disclaimer-banner.tsx b/apps/web/ui/partners/fraud-risks/risk-disclaimer-banner.tsx
index 3aabd7b9dec..ba92fa5c4de 100644
--- a/apps/web/ui/partners/fraud-risks/risk-disclaimer-banner.tsx
+++ b/apps/web/ui/partners/fraud-risks/risk-disclaimer-banner.tsx
@@ -1,28 +1,18 @@
-import { TriangleWarning } from "@dub/ui/icons";
-import { cn } from "@dub/utils";
+import { Callout } from "../../shared/callout";
 
 export function RiskDisclaimerBanner({ className }: { className?: string }) {
   return (
-    <div
-      className={cn(
-        "flex items-start gap-3 rounded-lg border border-amber-200 bg-amber-50 px-4 py-2.5",
-        className,
-      )}
-    >
-      <TriangleWarning className="mt-0.5 size-4 shrink-0 text-amber-600" />
-      <p className="flex-1 text-sm text-amber-900">
-        We recommend reviewing the risk events thoroughly before taking action.
-        Unresolved events expire after 30 days, except confirmed network-level
-        bans.{" "}
-        <a
-          href="https://dub.co/help/article/risk-monitoring"
-          target="_blank"
-          className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
-        >
-          Learn more
-        </a>
-        .
-      </p>
-    </div>
+    <Callout variant="warn" size={2} className={className}>
+      We recommend reviewing the risk events thoroughly before taking action.
+      Unresolved events expire after 30 days, except confirmed network-level
+      bans.{" "}
+      <a
+        href="https://dub.co/help/article/risk-monitoring"
+        target="_blank"
+        className="font-medium underline underline-offset-2 transition-colors hover:text-neutral-800"
+      >
+        Learn more
+      </a>
+    </Callout>
   );
 }
diff --git a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
index 0a615d351a8..8899a597422 100644
--- a/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
+++ b/apps/web/ui/partners/fraud-risks/risk-review-sheet.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { FRAUD_RULES_BY_TYPE } from "@/lib/api/fraud/constants";
+import { clientAccessCheck } from "@/lib/client-access-check";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { FraudGroupProps } from "@/lib/types";
@@ -29,7 +30,7 @@ import useSWR from "swr";
 import { AssociatedCommissionsTable } from "./associated-commissions-table";
 import { FraudEventsTableWrapper } from "./fraud-events-tables";
 import { useMarkAllAsFraudModal } from "./mark-all-as-fraud-modal";
-import { PartnerCrossProgramSummary } from "./partner-cross-program-summary";
+import { PartnerNetworkActivitySummary } from "./partner-network-activity-summary";
 import { RequestDetailsBanner } from "./request-details-banner";
 import { useResolveFraudGroupModal } from "./resolve-fraud-group-modal";
 import { ResolvedRiskEventsTable } from "./resolved-risk-events-table";
@@ -63,7 +64,19 @@ function RiskReviewSheetContent({
   onNext,
 }: RiskReviewSheetProps) {
   const { partner, user } = fraudGroup;
-  const { slug, id: workspaceId } = useWorkspace();
+  const { slug, id: workspaceId, role } = useWorkspace();
+
+  const partnersPermissionsError = clientAccessCheck({
+    action: "partners.write",
+    role,
+    customPermissionDescription: "review risk events",
+  }).error;
+
+  const messagesPermissionsError = clientAccessCheck({
+    action: "messages.write",
+    role,
+    customPermissionDescription: "message partners",
+  }).error;
 
   const showCommissionsOnHold =
     fraudGroup.status === "pending" &&
@@ -128,6 +141,7 @@ function RiskReviewSheetContent({
   // Resolve/ban/reject shortcuts
   useKeyboardShortcut("r", () => setShowResolveFraudGroupModal(true), {
     sheet: true,
+    enabled: !partnersPermissionsError,
   });
 
   useKeyboardShortcut(
@@ -139,7 +153,7 @@ function RiskReviewSheetContent({
         setShowBanPartnerModal(true);
       }
     },
-    { sheet: true },
+    { sheet: true, enabled: !partnersPermissionsError },
   );
 
   const fraudRuleInfo = FRAUD_RULES_BY_TYPE[fraudGroup.type];
@@ -159,17 +173,27 @@ function RiskReviewSheetContent({
           </Sheet.Title>
 
           <div className="flex items-center gap-2">
-            <Link
-              href={`/${slug}/program/messages/${partner.id}`}
-              target="_blank"
-              className={cn(
-                buttonVariants({ variant: "secondary" }),
-                "flex h-9 items-center gap-2 whitespace-nowrap rounded-lg border px-3 text-sm font-medium",
-              )}
-            >
-              <Msgs className="size-4 shrink-0" />
-              <span className="hidden sm:inline">Message</span>
-            </Link>
+            {messagesPermissionsError ? (
+              <Button
+                variant="secondary"
+                text="Message"
+                icon={<Msgs className="size-4 shrink-0" />}
+                disabledTooltip={messagesPermissionsError}
+                className="h-9 w-fit px-3"
+              />
+            ) : (
+              <Link
+                href={`/${slug}/program/messages/${partner.id}`}
+                target="_blank"
+                className={cn(
+                  buttonVariants({ variant: "secondary" }),
+                  "flex h-9 items-center gap-2 whitespace-nowrap rounded-lg border px-3 text-sm font-medium",
+                )}
+              >
+                <Msgs className="size-4 shrink-0" />
+                <span className="hidden sm:inline">Message</span>
+              </Link>
+            )}
 
             <div className="flex items-center">
               <Button
@@ -226,12 +250,12 @@ function RiskReviewSheetContent({
                 </div>
               </Link>
 
-              <div className="bg-bg-muted border-border-subtle flex flex-col gap-3 rounded-xl border px-4 py-3 sm:shrink-0">
+              <div className="bg-bg-muted border-border-subtle flex flex-col gap-3 rounded-xl border px-4 py-3 sm:w-80 sm:shrink-0">
                 <h2 className="text-content-default text-sm font-semibold leading-5">
-                  Program owner activity
+                  Network activity
                 </h2>
                 <div className="flex flex-col gap-2">
-                  <PartnerCrossProgramSummary partnerId={partner.id} />
+                  <PartnerNetworkActivitySummary partnerId={partner.id} />
                 </div>
               </div>
             </div>
@@ -355,6 +379,7 @@ function RiskReviewSheetContent({
                 shortcut="R"
                 onClick={() => setShowResolveFraudGroupModal(true)}
                 className="h-8 w-fit rounded-lg"
+                disabledTooltip={partnersPermissionsError || undefined}
               />
 
               {partner.status === "pending" ? (
@@ -365,6 +390,7 @@ function RiskReviewSheetContent({
                   variant="danger"
                   onClick={() => setShowRejectPartnerApplicationModal(true)}
                   className="h-8 w-fit rounded-lg"
+                  disabledTooltip={partnersPermissionsError || undefined}
                 />
               ) : (
                 <Button
@@ -374,6 +400,7 @@ function RiskReviewSheetContent({
                   variant="danger"
                   onClick={() => setShowBanPartnerModal(true)}
                   className="h-8 w-fit rounded-lg"
+                  disabledTooltip={partnersPermissionsError || undefined}
                 />
               )}
             </div>
diff --git a/apps/web/ui/partners/groups/custom-rewards-accordion.tsx b/apps/web/ui/partners/groups/custom-rewards-accordion.tsx
new file mode 100644
index 00000000000..4322899f663
--- /dev/null
+++ b/apps/web/ui/partners/groups/custom-rewards-accordion.tsx
@@ -0,0 +1,166 @@
+"use client";
+
+import { useDiscounts } from "@/lib/swr/use-discounts";
+import { useRewards } from "@/lib/swr/use-rewards";
+import type { DiscountProps, GroupProps, RewardProps } from "@/lib/types";
+import { ProgramRewardDescription } from "@/ui/partners/program-reward-description";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+  AnimatedSizeContainer,
+  Users,
+  useRouterStuff,
+} from "@dub/ui";
+import { cn, pluralize } from "@dub/utils";
+import { motion } from "motion/react";
+import { ReactNode } from "react";
+
+const DEFAULT_REWARD_FIELD = {
+  sale: "saleReward",
+  lead: "leadReward",
+  click: "clickReward",
+} as const satisfies Record<string, keyof GroupProps>;
+
+type CustomRewardEvent = keyof typeof DEFAULT_REWARD_FIELD;
+
+type CustomItemsAccordionProps = {
+  group: GroupProps;
+  event?: RewardProps["event"];
+};
+
+export function CustomItemsAccordion({
+  group,
+  event,
+}: CustomItemsAccordionProps) {
+  if (!event) {
+    return <CustomDiscountsAccordion group={group} />;
+  }
+
+  if (event !== "sale" && event !== "lead" && event !== "click") {
+    return null;
+  }
+
+  return <CustomRewardsAccordion group={group} event={event} />;
+}
+
+function CustomRewardsAccordion({
+  group,
+  event,
+}: {
+  group: GroupProps;
+  event: CustomRewardEvent;
+}) {
+  const { queryParams } = useRouterStuff();
+  const { rewards } = useRewards({ groupId: group.id });
+  const defaultReward = group[DEFAULT_REWARD_FIELD[event]];
+
+  const items = (rewards ?? []).filter(
+    (reward) => reward.event === event && reward.id !== defaultReward?.id,
+  );
+
+  return (
+    <ItemsAccordion
+      label={`${items.length} custom ${event} ${pluralize("reward", items.length)}`}
+      items={items}
+      renderItem={(reward) => <ProgramRewardDescription reward={reward} />}
+      onSelect={(reward) => {
+        queryParams({
+          set: { rewardId: reward.id },
+          scroll: false,
+        });
+      }}
+    />
+  );
+}
+
+function CustomDiscountsAccordion({ group }: { group: GroupProps }) {
+  const { queryParams } = useRouterStuff();
+  const { discounts } = useDiscounts({ groupId: group.id });
+
+  const items = (discounts ?? []).filter(
+    (discount) => discount.id !== group.discount?.id,
+  );
+
+  return (
+    <ItemsAccordion
+      label={`${items.length} custom ${pluralize("discount", items.length)}`}
+      items={items}
+      renderItem={(discount) => (
+        <ProgramRewardDescription discount={discount} />
+      )}
+      onSelect={(discount) => {
+        queryParams({
+          set: { discountId: discount.id },
+          scroll: false,
+        });
+      }}
+    />
+  );
+}
+
+type AccordionRow = Pick<RewardProps | DiscountProps, "id">;
+
+function ItemsAccordion<T extends AccordionRow>({
+  label,
+  items,
+  renderItem,
+  onSelect,
+}: {
+  label: string;
+  items: T[];
+  renderItem: (item: T) => ReactNode;
+  onSelect: (item: T) => void;
+}) {
+  return (
+    <div className={cn("px-2", items.length > 0 && "relative z-10 -mt-px")}>
+      <AnimatedSizeContainer
+        height
+        className={cn(
+          items.length > 0 && "rounded-b-lg border border-neutral-200 bg-white",
+        )}
+      >
+        {items.length > 0 ? (
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            transition={{ duration: 0.2, ease: "easeOut" }}
+          >
+            <Accordion type="single" collapsible className="p-1">
+              <AccordionItem value="items" className="border-none py-0">
+                <AccordionTrigger
+                  onClick={(e) => e.stopPropagation()}
+                  className="h-7 py-0 pl-1.5 pr-2 text-xs font-medium tracking-tight text-neutral-600 hover:no-underline sm:text-xs [&>svg]:size-2.5 [&>svg]:text-neutral-600"
+                >
+                  <span className="flex items-center gap-2">
+                    <Users className="size-3.5" />
+                    {label}
+                  </span>
+                </AccordionTrigger>
+                <AccordionContent className="pb-0 pt-0 text-xs text-neutral-600 sm:text-xs">
+                  <div className="flex flex-col">
+                    {items.map((item) => (
+                      <button
+                        key={item.id}
+                        type="button"
+                        onClick={(e) => {
+                          e.preventDefault();
+                          e.stopPropagation();
+                          onSelect(item);
+                        }}
+                        className="w-full rounded-md px-1.5 py-1.5 text-left text-xs text-neutral-600 hover:bg-neutral-50"
+                      >
+                        {renderItem(item)}
+                      </button>
+                    ))}
+                  </div>
+                </AccordionContent>
+              </AccordionItem>
+            </Accordion>
+          </motion.div>
+        ) : null}
+      </AnimatedSizeContainer>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/groups/design/application-form/fields/image-upload-field.tsx b/apps/web/ui/partners/groups/design/application-form/fields/image-upload-field.tsx
index bf336f783e4..23cceee7c3f 100644
--- a/apps/web/ui/partners/groups/design/application-form/fields/image-upload-field.tsx
+++ b/apps/web/ui/partners/groups/design/application-form/fields/image-upload-field.tsx
@@ -47,7 +47,11 @@ function ImageUploadFieldContent({
   controllerField: { value: any; onChange: (value: any) => void };
   maxImages: number;
   error: boolean;
-  uploadFile: (params: { programSlug: string }) => Promise<any>;
+  uploadFile: (params: {
+    programSlug: string;
+    contentType: string;
+    contentLength: number;
+  }) => Promise<any>;
   onStatusChange?: (loading: boolean) => void;
 }) {
   const currentValue = controllerField.value || [];
@@ -173,10 +177,17 @@ function ImageUploadFieldContent({
     try {
       const result = await uploadFile({
         programSlug,
+        contentType: file.type,
+        contentLength: file.size,
       });
 
       if (!result?.data) {
-        toast.error("Failed to upload image. Please try again.");
+        toast.error(
+          parseActionError(
+            result ?? {},
+            "Failed to upload image. Please try again.",
+          ),
+        );
         setFiles((prev) => prev.filter((f) => f.id !== newFile.id));
         return;
       }
diff --git a/apps/web/ui/partners/groups/design/branding-form.tsx b/apps/web/ui/partners/groups/design/branding-form.tsx
index 493d11c679b..a3badda73d6 100644
--- a/apps/web/ui/partners/groups/design/branding-form.tsx
+++ b/apps/web/ui/partners/groups/design/branding-form.tsx
@@ -20,6 +20,7 @@ import {
   MenuItem,
   Popover,
   ToggleGroup,
+  Tooltip,
   useLocalStorage,
   useRouterStuff,
 } from "@dub/ui";
@@ -409,9 +410,11 @@ function Drafts({
   draft: DraftData | null;
   setDraft: (draft: DraftData | null) => void;
 }) {
+  const { group } = useBrandingContext();
   const {
     setValue,
     getValues,
+    reset,
     formState: { isDirty },
   } = useBrandingFormContext();
 
@@ -454,8 +457,48 @@ function Drafts({
     return () => clearInterval(interval);
   }, [isDirty]);
 
+  const discardDraft = () => {
+    reset({
+      logo: group.logo ?? null,
+      wordmark: group.wordmark ?? null,
+      brandColor: group.brandColor ?? null,
+      applicationFormData:
+        group.applicationFormData ?? defaultApplicationFormData(group.program),
+      landerData: group.landerData ?? { blocks: [] },
+    });
+    setDraft(null);
+  };
+
   return isDirty ? (
-    <span className="text-content-muted text-sm">Unsaved draft</span>
+    <Tooltip
+      content={({ setOpen }) => (
+        <div className="w-screen p-2 sm:w-48">
+          <MenuItem
+            variant="danger"
+            onClick={() => {
+              if (
+                !window.confirm(
+                  "Are you sure you want to discard this draft?",
+                )
+              )
+                return;
+
+              discardDraft();
+              setOpen(false);
+            }}
+          >
+            Discard draft
+          </MenuItem>
+        </div>
+      )}
+    >
+      <button
+        type="button"
+        className="text-content-muted hover:text-content-emphasis cursor-help text-sm underline decoration-dotted underline-offset-2 transition-colors"
+      >
+        Unsaved draft
+      </button>
+    </Tooltip>
   ) : null;
 }
 
diff --git a/apps/web/ui/partners/groups/design/lander/lander-rich-text-editor.tsx b/apps/web/ui/partners/groups/design/lander/lander-rich-text-editor.tsx
new file mode 100644
index 00000000000..d64471652b8
--- /dev/null
+++ b/apps/web/ui/partners/groups/design/lander/lander-rich-text-editor.tsx
@@ -0,0 +1,87 @@
+"use client";
+
+import { LANDER_RICH_TEXT_FEATURES } from "@/ui/partners/lander/lander-markdown";
+import {
+  RichTextArea,
+  RichTextProvider,
+  RichTextToolbar,
+  useRichTextLength,
+} from "@dub/ui";
+import { cn, nFormatter } from "@dub/utils";
+import { useEffect, useRef } from "react";
+
+export function LanderRichTextEditor({
+  id,
+  value,
+  onChange,
+  placeholder = "Start typing...",
+  error,
+  editorClassName,
+  maxLength,
+  onTextLengthChange,
+}: {
+  id?: string;
+  value?: string;
+  onChange: (value: string) => void;
+  placeholder?: string;
+  error?: boolean;
+  editorClassName?: string;
+  maxLength?: number;
+  onTextLengthChange?: (length: number) => void;
+}) {
+  return (
+    <RichTextProvider
+      features={[...LANDER_RICH_TEXT_FEATURES]}
+      markdown
+      style="relaxed"
+      placeholder={placeholder}
+      editorProps={id ? { attributes: { id } } : undefined}
+      editorClassName={cn(
+        "block max-h-64 min-h-16 overflow-auto scrollbar-hide w-full resize-none border-none p-3 text-base sm:text-sm",
+        editorClassName,
+      )}
+      initialValue={value ?? ""}
+      onChange={(editor) => onChange((editor as any).getMarkdown() || "")}
+    >
+      <div
+        className={cn(
+          "overflow-hidden rounded-md border border-neutral-300 shadow-sm focus-within:border-neutral-500 focus-within:ring-1 focus-within:ring-neutral-500",
+          error &&
+            "border-red-600 focus-within:border-red-500 focus-within:ring-red-600",
+        )}
+      >
+        <div className="flex flex-col">
+          <RichTextArea />
+          <RichTextToolbar className="flex-wrap px-1 pb-1" />
+        </div>
+      </div>
+      <TextLength maxLength={maxLength} onChange={onTextLengthChange} />
+    </RichTextProvider>
+  );
+}
+
+function TextLength({
+  maxLength,
+  onChange,
+}: {
+  maxLength?: number;
+  onChange?: (length: number) => void;
+}) {
+  const length = useRichTextLength();
+
+  const onChangeRef = useRef(onChange);
+  onChangeRef.current = onChange;
+
+  useEffect(() => {
+    onChangeRef.current?.(length);
+  }, [length]);
+
+  return maxLength === undefined ? null : (
+    <div className="mt-1 text-left">
+      <span className="text-content-subtle text-xs tabular-nums">
+        {nFormatter(length, { full: true })} /{" "}
+        {nFormatter(maxLength, { full: true })}
+      </span>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/groups/design/lander/modals/accordion-block-modal.tsx b/apps/web/ui/partners/groups/design/lander/modals/accordion-block-modal.tsx
index 9cf6a422cc6..49f538f54a2 100644
--- a/apps/web/ui/partners/groups/design/lander/modals/accordion-block-modal.tsx
+++ b/apps/web/ui/partners/groups/design/lander/modals/accordion-block-modal.tsx
@@ -10,10 +10,13 @@ import {
 } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { Dispatch, SetStateAction, useId, useRef } from "react";
-import { useForm } from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
 import { v4 as uuid } from "uuid";
 import * as z from "zod/v4";
 import { EditList, ExpandableEditListItem } from "../../edit-list";
+import { LanderRichTextEditor } from "../lander-rich-text-editor";
+
+const ACCORDION_ITEM_CONTENT_MAX_LENGTH = 1000;
 
 type AccordionBlockData = z.infer<
   typeof programLanderAccordionBlockSchema
@@ -31,7 +34,7 @@ export function AccordionBlockModal(props: AccordionBlockModalProps) {
     <Modal
       showModal={props.showModal}
       setShowModal={props.setShowModal}
-      className=""
+      className="max-w-2xl"
     >
       <AccordionBlockModalInner {...props} />
     </Modal>
@@ -48,6 +51,7 @@ function AccordionBlockModalInner({
   const {
     handleSubmit,
     register,
+    control,
     watch,
     setValue,
     formState: { errors },
@@ -66,6 +70,8 @@ function AccordionBlockModalInner({
 
   const fields = watch("items");
 
+  const contentLengthsRef = useRef<Record<string, number>>({});
+
   const scrollRef = useRef<HTMLDivElement>(null);
   const { scrollProgress, updateScrollProgress } = useScrollProgress(scrollRef);
 
@@ -198,20 +204,38 @@ function AccordionBlockModalInner({
                         >
                           Content
                         </label>
-                        <div className="mt-2 rounded-md shadow-sm">
-                          <textarea
-                            id={`${id}-${field.id}-content`}
-                            rows={3}
-                            maxLength={1000}
-                            placeholder="Start typing"
-                            className={cn(
-                              "block max-h-32 min-h-16 w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-                              fieldErrors?.content &&
-                                "border-red-600 focus:border-red-500 focus:ring-red-600",
+                        <div className="mt-2">
+                          <Controller
+                            control={control}
+                            name={`items.${index}.content`}
+                            rules={{
+                              validate: () => {
+                                const length =
+                                  contentLengthsRef.current[field.id] ?? 0;
+                                if (!length) return "Content is required";
+                                if (
+                                  length > ACCORDION_ITEM_CONTENT_MAX_LENGTH
+                                ) {
+                                  return `Content must be less than ${ACCORDION_ITEM_CONTENT_MAX_LENGTH} characters`;
+                                }
+                                return true;
+                              },
+                            }}
+                            render={({ field: contentField }) => (
+                              <LanderRichTextEditor
+                                key={field.id}
+                                id={`${id}-${field.id}-content`}
+                                value={contentField.value}
+                                onChange={contentField.onChange}
+                                placeholder="Start typing"
+                                error={Boolean(fieldErrors?.content)}
+                                editorClassName="max-h-32 min-h-16"
+                                maxLength={ACCORDION_ITEM_CONTENT_MAX_LENGTH}
+                                onTextLengthChange={(length) => {
+                                  contentLengthsRef.current[field.id] = length;
+                                }}
+                              />
                             )}
-                            {...register(`items.${index}.content`, {
-                              required: "Content is required",
-                            })}
                           />
                         </div>
                       </div>
diff --git a/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx b/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
index 98943cd7130..5d16fb0e982 100644
--- a/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
+++ b/apps/web/ui/partners/groups/design/lander/modals/image-block-modal.tsx
@@ -1,8 +1,9 @@
+import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { uploadLanderImageAction } from "@/lib/actions/partners/upload-lander-image";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { programLanderImageBlockSchema } from "@/lib/zod/schemas/program-lander";
 import { Button, FileUpload, Modal } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { cn, toErrorMessage } from "@dub/utils";
 import { useAction } from "next-safe-action/hooks";
 import { Dispatch, SetStateAction, useId, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
@@ -33,7 +34,7 @@ function ImageBlockModalInner({
 }: ImageBlockModalProps) {
   const id = useId();
 
-  const { id: workspaceId, defaultProgramId } = useWorkspace();
+  const { id: workspaceId } = useWorkspace();
 
   const {
     handleSubmit,
@@ -56,9 +57,15 @@ function ImageBlockModalInner({
     try {
       const result = await executeAsync({
         workspaceId: workspaceId!,
+        contentType: file.type,
+        contentLength: file.size,
       });
 
-      if (!result?.data) throw new Error("Failed to get signed upload URL");
+      if (!result?.data) {
+        throw new Error(
+          parseActionError(result ?? {}, "Failed to get signed upload URL"),
+        );
+      }
 
       const { signedUrl, destinationUrl } = result.data;
 
@@ -75,7 +82,7 @@ function ImageBlockModalInner({
 
       setValue("url", destinationUrl, { shouldDirty: true });
     } catch (e) {
-      toast.error("Failed to upload image");
+      toast.error(toErrorMessage(e));
       console.error("Failed to upload image", e);
     } finally {
       setIsUploading(false);
@@ -141,7 +148,7 @@ function ImageBlockModalInner({
                   readFile
                   loading={isUploading}
                   onChange={({ file }) => handleUpload(file)}
-                  content="SVG, JPG, PNG, or WEBP, max size of 5MB"
+                  content="SVG, JPG, PNG, WEBP, or AVIF, max size of 5MB"
                   maxFileSizeMB={5}
                 />
               )}
diff --git a/apps/web/ui/partners/groups/design/lander/modals/text-block-modal.tsx b/apps/web/ui/partners/groups/design/lander/modals/text-block-modal.tsx
index 26ee2a90ebb..261a3b3dc3b 100644
--- a/apps/web/ui/partners/groups/design/lander/modals/text-block-modal.tsx
+++ b/apps/web/ui/partners/groups/design/lander/modals/text-block-modal.tsx
@@ -1,17 +1,13 @@
 "use client";
 
 import { programLanderTextBlockSchema } from "@/lib/zod/schemas/program-lander";
-import {
-  Button,
-  MarkdownIcon,
-  Modal,
-  useEnterSubmit,
-  useMediaQuery,
-} from "@dub/ui";
-import { cn } from "@dub/utils";
-import { Dispatch, SetStateAction, useId } from "react";
-import { useForm } from "react-hook-form";
+import { Button, Modal, useMediaQuery } from "@dub/ui";
+import { Dispatch, SetStateAction, useId, useRef } from "react";
+import { Controller, useForm } from "react-hook-form";
 import * as z from "zod/v4";
+import { LanderRichTextEditor } from "../lander-rich-text-editor";
+
+const TEXT_BLOCK_CONTENT_MAX_LENGTH = 10000;
 
 type TextBlockData = z.infer<typeof programLanderTextBlockSchema>["data"];
 
@@ -24,7 +20,11 @@ type TextBlockModalProps = {
 
 export function TextBlockModal(props: TextBlockModalProps) {
   return (
-    <Modal showModal={props.showModal} setShowModal={props.setShowModal}>
+    <Modal
+      showModal={props.showModal}
+      setShowModal={props.setShowModal}
+      className="max-w-2xl"
+    >
       <TextBlockModalInner {...props} />
     </Modal>
   );
@@ -40,12 +40,13 @@ function TextBlockModalInner({
   const {
     handleSubmit,
     register,
+    control,
     formState: { errors },
   } = useForm<TextBlockData>({
     defaultValues,
   });
 
-  const { handleKeyDown } = useEnterSubmit();
+  const contentLengthRef = useRef(0);
 
   return (
     <>
@@ -91,30 +92,34 @@ function TextBlockModalInner({
             >
               Content
             </label>
-            <div className="mt-2 rounded-md shadow-sm">
-              <textarea
-                id={`${id}-content`}
-                rows={12}
-                maxLength={10000}
-                onKeyDown={handleKeyDown}
-                placeholder="Start typing..."
-                className={cn(
-                  "block max-h-64 min-h-16 w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
-                  errors.content &&
-                    "border-red-600 focus:border-red-500 focus:ring-red-600",
+            <div className="mt-2">
+              <Controller
+                control={control}
+                name="content"
+                rules={{
+                  validate: () => {
+                    const length = contentLengthRef.current;
+                    if (!length) return "Content is required";
+                    if (length > TEXT_BLOCK_CONTENT_MAX_LENGTH) {
+                      return `Content must be less than ${TEXT_BLOCK_CONTENT_MAX_LENGTH} characters`;
+                    }
+                    return true;
+                  },
+                }}
+                render={({ field }) => (
+                  <LanderRichTextEditor
+                    id={`${id}-content`}
+                    value={field.value}
+                    onChange={field.onChange}
+                    error={Boolean(errors.content)}
+                    maxLength={TEXT_BLOCK_CONTENT_MAX_LENGTH}
+                    onTextLengthChange={(length) =>
+                      (contentLengthRef.current = length)
+                    }
+                  />
                 )}
-                {...register("content", { required: "Content is required" })}
               />
             </div>
-            <a
-              href="https://www.markdownguide.org/extended-syntax/#tables"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-content-subtle mt-1 flex items-center gap-1 text-xs"
-            >
-              <MarkdownIcon role="presentation" className="h-3 w-auto" />
-              <span className="sr-only">MarkdownIcon</span> supported
-            </a>
           </div>
 
           <div className="flex items-center justify-end gap-2">
diff --git a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
index 46cb98394d0..ef23fbcd4c4 100644
--- a/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
+++ b/apps/web/ui/partners/groups/reward-discount-partners-card.tsx
@@ -11,12 +11,27 @@ import { useParams } from "next/navigation";
 import { useState } from "react";
 import { RewardIconSquare } from "../rewards/reward-icon-square";
 
-export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
+export function RewardDiscountPartnersCard({
+  groupId,
+  rewardId,
+  discountId,
+}: {
+  groupId: string;
+  rewardId?: string;
+  discountId?: string;
+}) {
   const [isExpanded, setIsExpanded] = useState<boolean>(false);
 
+  const assignmentFilter = {
+    ...(rewardId && { rewardId }),
+    ...(discountId && { discountId }),
+  };
+
   const { partnersCount } = usePartnersCount<number | undefined>({
     groupId,
     status: "approved",
+    ignoreParams: true,
+    ...assignmentFilter,
   });
 
   const { partners } = usePartners({
@@ -24,6 +39,7 @@ export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
       groupId,
       status: "approved",
       pageSize: 10,
+      ...assignmentFilter,
     },
   });
 
@@ -81,6 +97,8 @@ export function RewardDiscountPartnersCard({ groupId }: { groupId: string }) {
             partners={partners}
             partnersCount={partnersCount || 0}
             groupId={groupId}
+            rewardId={rewardId}
+            discountId={discountId}
           />
         </div>
       </motion.div>
@@ -92,10 +110,14 @@ function PartnersCompactTable({
   partners,
   partnersCount,
   groupId,
+  rewardId,
+  discountId,
 }: {
   partners?: EnrolledPartnerProps[];
   partnersCount: number;
   groupId: string;
+  rewardId?: string;
+  discountId?: string;
 }) {
   const { slug } = useParams<{ slug: string }>();
 
@@ -133,8 +155,22 @@ function PartnersCompactTable({
       cn("border-l-0", columnId !== "menu" && "max-w-0 truncate"),
     resourceName: (p: boolean) => `partner${p ? "s" : ""}`,
     rowCount: partners?.length || 0,
+    onRowClick: (row) =>
+      window.open(`/${slug}/program/partners/${row.original.id}`, "_blank"),
+    onRowAuxClick: (row) =>
+      window.open(`/${slug}/program/partners/${row.original.id}`, "_blank"),
   });
 
+  const viewAllParams = new URLSearchParams({ groupId });
+
+  if (rewardId) {
+    viewAllParams.set("rewardId", rewardId);
+  }
+
+  if (discountId) {
+    viewAllParams.set("discountId", discountId);
+  }
+
   return (
     <div className="relative">
       {partners?.length ? (
@@ -148,7 +184,7 @@ function PartnersCompactTable({
           {partnersCount > 10 && (
             <div className="mt-2 flex justify-end">
               <Link
-                href={`/${slug}/program/partners?groupId=${groupId}`}
+                href={`/${slug}/program/partners?${viewAllParams.toString()}`}
                 target="_blank"
               >
                 <Button
diff --git a/apps/web/ui/partners/keep-partner-in-group-notice.tsx b/apps/web/ui/partners/keep-partner-in-group-notice.tsx
new file mode 100644
index 00000000000..6b3d8a440dc
--- /dev/null
+++ b/apps/web/ui/partners/keep-partner-in-group-notice.tsx
@@ -0,0 +1,23 @@
+"use client";
+
+import { Tooltip } from "@dub/ui";
+import { Workflow } from "@dub/ui/icons";
+
+export function KeepPartnerInGroupNotice({
+  offerType,
+}: {
+  offerType: "reward" | "discount";
+}) {
+  return (
+    <Tooltip
+      content={`When a custom ${offerType} is set, the partner will be kept in their current group so future [group move rules](https://dub.co/help/article/partner-groups#group-move-rules) can't move them and break their custom ${offerType}.`}
+    >
+      <span
+        className="inline-flex shrink-0 cursor-help rounded-md border border-neutral-200 bg-neutral-100 p-0.5 text-neutral-400"
+        aria-label="Group move rules disabled"
+      >
+        <Workflow className="size-3.5" />
+      </span>
+    </Tooltip>
+  );
+}
diff --git a/apps/web/ui/partners/lander/blocks/block-markdown.tsx b/apps/web/ui/partners/lander/blocks/block-markdown.tsx
index 041f0e9a402..9b7d6a96cf4 100644
--- a/apps/web/ui/partners/lander/blocks/block-markdown.tsx
+++ b/apps/web/ui/partners/lander/blocks/block-markdown.tsx
@@ -1,7 +1,10 @@
+import { LANDER_MARKDOWN_ALLOWED_ELEMENTS } from "@/ui/partners/lander/lander-markdown";
 import { cn } from "@dub/utils";
 import Markdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 
+export { LANDER_MARKDOWN_ALLOWED_ELEMENTS };
+
 export function BlockMarkdown({
   className,
   children,
@@ -22,6 +25,8 @@ export function BlockMarkdown({
     >
       <Markdown
         remarkPlugins={[remarkGfm]}
+        unwrapDisallowed
+        allowedElements={LANDER_MARKDOWN_ALLOWED_ELEMENTS}
         components={{
           a: ({ node, ...props }) => (
             <a {...props} target="_blank" rel="noopener noreferrer" />
diff --git a/apps/web/ui/partners/lander/lander-markdown.ts b/apps/web/ui/partners/lander/lander-markdown.ts
new file mode 100644
index 00000000000..a23c106892e
--- /dev/null
+++ b/apps/web/ui/partners/lander/lander-markdown.ts
@@ -0,0 +1,40 @@
+export const LANDER_RICH_TEXT_FEATURES = [
+  "headings",
+  "bold",
+  "italic",
+  "strike",
+  "links",
+  "lists",
+  "tables",
+  "quote",
+] as const;
+
+export const LANDER_MARKDOWN_ALLOWED_ELEMENTS = [
+  "p",
+  "br",
+  "strong",
+  "em",
+  "del",
+  "a",
+  "img",
+  "hr",
+  "ul",
+  "ol",
+  "li",
+  "input",
+  "blockquote",
+  "pre",
+  "code",
+  "table",
+  "thead",
+  "tbody",
+  "tr",
+  "th",
+  "td",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+] as const;
diff --git a/apps/web/ui/partners/lander/lander-rewards.tsx b/apps/web/ui/partners/lander/lander-rewards.tsx
index 50a633d2c2c..018c493405c 100644
--- a/apps/web/ui/partners/lander/lander-rewards.tsx
+++ b/apps/web/ui/partners/lander/lander-rewards.tsx
@@ -1,12 +1,13 @@
 "use client";
 
+import { isEventBasedReward } from "@/lib/api/rewards/custom-reward-utils";
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import {
   DiscountProps,
   GroupBountySummaryProps,
   RewardProps,
 } from "@/lib/types";
-import { Gift, Heart, Icon, Trophy } from "@dub/ui";
+import { DiscountCode, Heart, Icon, Trophy } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { PropsWithChildren, useState } from "react";
 import { formatDiscountDescription } from "../format-discount-description";
@@ -27,6 +28,10 @@ export function LanderRewards({
   className?: string;
 }) {
   const sortedFilteredRewards = rewards.filter((reward) => {
+    if (!isEventBasedReward(reward)) {
+      return false;
+    }
+
     const rawAmount =
       reward.type === "flat" ? reward.amountInCents : reward.amountInPercentage;
 
@@ -67,7 +72,9 @@ export function LanderRewards({
             ))}
 
             {discount && (
-              <Item icon={Gift}>{formatDiscountDescription(discount)}</Item>
+              <Item icon={DiscountCode}>
+                {formatDiscountDescription(discount)}
+              </Item>
             )}
           </ul>
         </div>
diff --git a/apps/web/ui/partners/merge-accounts/merge-account-form.tsx b/apps/web/ui/partners/merge-accounts/merge-account-form.tsx
index 4c6ccce7892..103c18dfe5a 100644
--- a/apps/web/ui/partners/merge-accounts/merge-account-form.tsx
+++ b/apps/web/ui/partners/merge-accounts/merge-account-form.tsx
@@ -1,8 +1,9 @@
 import { mergePartnerAccountsAction } from "@/lib/actions/partners/merge-partner-accounts";
 import useUser from "@/lib/swr/use-user";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
+import { Callout } from "@/ui/shared/callout";
 import { Button } from "@dub/ui";
-import { AlertTriangle, ArrowDown } from "lucide-react";
+import { ArrowDown } from "lucide-react";
 import { signOut } from "next-auth/react";
 import { useAction } from "next-safe-action/hooks";
 import { toast } from "sonner";
@@ -100,22 +101,22 @@ export function MergeAccountForm({
           </div>
         </AccountInputGroup>
 
-        <div className="mt-2 flex flex-col gap-3 rounded-lg border border-amber-200 bg-amber-50 px-5 py-4">
-          <AlertTriangle className="size-4 text-amber-600" />
-          <h3 className="text-sm font-semibold leading-5 text-amber-900">
-            This action can't be undone.
-          </h3>
-          <p className="text-sm font-normal leading-5 text-amber-900">
-            All data — including links, commissions, and payouts from{" "}
-            {sourceAccount.email} will be transferred to {targetAccount.email}.
-            Duplicate bounty submissions from {sourceAccount.email} will also be
-            deleted.
-            <br />
-            <br />
-            After the merge, {sourceAccount.email} will be permanently deleted.
-            If you're unsure, please contact our support team before proceeding.
-          </p>
-        </div>
+        <Callout variant="warn" size={2} className="mt-2">
+          <div className="space-y-3">
+            <h3 className="font-semibold">This action can't be undone.</h3>
+            <p>
+              All data — including links, commissions, and payouts from{" "}
+              {sourceAccount.email} will be transferred to{" "}
+              {targetAccount.email}. Duplicate bounty submissions from{" "}
+              {sourceAccount.email} will also be deleted.
+              <br />
+              <br />
+              After the merge, {sourceAccount.email} will be permanently
+              deleted. If you're unsure, please contact our support team before
+              proceeding.
+            </p>
+          </div>
+        </Callout>
       </div>
 
       <div className="flex items-center justify-between gap-4">
diff --git a/apps/web/ui/partners/partner-advanced-settings-modal.tsx b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
index 381c419f04d..3b4c342ab8e 100644
--- a/apps/web/ui/partners/partner-advanced-settings-modal.tsx
+++ b/apps/web/ui/partners/partner-advanced-settings-modal.tsx
@@ -282,11 +282,7 @@ export function usePartnerAdvancedSettingsModal({
         partner={partner}
       />
     );
-  }, [
-    showPartnerAdvancedSettingsModal,
-    setShowPartnerAdvancedSettingsModal,
-    partner,
-  ]);
+  }, [showPartnerAdvancedSettingsModal, setShowPartnerAdvancedSettingsModal]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/ui/partners/partner-info-cards.tsx b/apps/web/ui/partners/partner-info-cards.tsx
index cb1c5ae8c65..66760374f49 100644
--- a/apps/web/ui/partners/partner-info-cards.tsx
+++ b/apps/web/ui/partners/partner-info-cards.tsx
@@ -1,18 +1,22 @@
 import { useAttributeReferringPartnerModal } from "@/lib/partner-referrals/components/attribute-referring-partner-modal";
 import { usePartnerReferral } from "@/lib/partner-referrals/hooks/use-partner-referral";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import useGroup from "@/lib/swr/use-group";
+import { usePartnerRewards } from "@/lib/swr/use-partner-rewards";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   AdminNetworkPartner,
   BountyListProps,
   EnrolledPartnerExtendedProps,
   NetworkPartnerProps,
-  RewardProps,
 } from "@/lib/types";
 import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
 import { INACTIVE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";
 import { usePartnerEnrollmentHistorySheet } from "@/ui/activity-logs/partner-enrollment-history-sheet";
+import { useEditPartnerDiscountModal } from "@/ui/modals/edit-partner-discount-modal";
+import { useEditPartnerRewardModal } from "@/ui/modals/edit-partner-reward-modal";
+import { useAdvancedUpsellModal } from "@/ui/partners/advanced-upsell-modal";
 import {
   Button,
   CalendarIcon,
@@ -21,6 +25,7 @@ import {
   Heart,
   OfficeBuilding,
   TimestampTooltip,
+  TooltipContent,
   Trophy,
 } from "@dub/ui";
 import {
@@ -31,15 +36,17 @@ import {
 } from "@dub/ui/icons";
 import {
   COUNTRIES,
+  cn,
   fetcher,
   formatDate,
   formatDateTimeSmart,
 } from "@dub/utils";
 import { CircleMinus } from "lucide-react";
 import Link from "next/link";
-import { Fragment, ReactNode, createElement } from "react";
+import { Fragment, ReactNode, createElement, useState } from "react";
 import useSWR from "swr";
 import { PartnerApplicationRiskSummary } from "./fraud-risks/partner-application-risk-summary";
+import { PartnerNetworkActivitySummary } from "./fraud-risks/partner-network-activity-summary";
 import {
   PartnerApplicationRiskBanner,
   PartnerRiskBanner,
@@ -61,6 +68,8 @@ import {
   useUpdatePartnerTagsModal,
 } from "./update-partner-tags-modal";
 
+const MAX_VISIBLE_BOUNTIES = 3;
+
 type PartnerInfoCardsProps = {
   showFraudIndicator?: boolean;
   showApplicationRiskAnalysis?: boolean;
@@ -100,7 +109,14 @@ export function PartnerInfoCards({
 }: PartnerInfoCardsProps) {
   const { id: workspaceId, slug: workspaceSlug, plan } = useWorkspace();
 
-  const { canCreateReferralReward } = getPlanCapabilities(plan);
+  const {
+    canCreateReferralReward,
+    canManageFraudEvents,
+    canUseAdvancedRewardLogic,
+  } = getPlanCapabilities(plan);
+
+  const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+    useAdvancedUpsellModal();
 
   const isEnrolled = type === "enrolled" || type === undefined;
   const isNetwork = type === "network";
@@ -123,6 +139,34 @@ export function PartnerInfoCards({
     { keepPreviousData: false },
   );
 
+  const enrolledPartner =
+    isEnrolled && partner ? (partner as EnrolledPartnerExtendedProps) : null;
+
+  const { rewards: displayedRewards, discount: displayedDiscount } =
+    usePartnerRewards({
+      partner: enrolledPartner,
+      group,
+    });
+
+  const [rewardEvent, setRewardEvent] = useState<"sale" | "lead" | "click">(
+    "sale",
+  );
+
+  const partnerRewardTarget = enrolledPartner
+    ? { type: "partner" as const, partner: enrolledPartner }
+    : null;
+
+  const { EditPartnerRewardModal, setShowEditPartnerRewardModal } =
+    useEditPartnerRewardModal({
+      event: rewardEvent,
+      target: partnerRewardTarget,
+    });
+
+  const { EditPartnerDiscountModal, setShowEditPartnerDiscountModal } =
+    useEditPartnerDiscountModal({
+      target: partnerRewardTarget,
+    });
+
   const { data: bounties, error: errorBounties } = useSWR<BountyListProps[]>(
     workspaceId && partner && isEnrolled
       ? `/api/bounties?workspaceId=${workspaceId}&partnerId=${partner.id}`
@@ -243,6 +287,9 @@ export function PartnerInfoCards({
 
   return (
     <div className="flex flex-col gap-4">
+      {advancedUpsellModal}
+      <EditPartnerRewardModal />
+      <EditPartnerDiscountModal />
       <div className="overflow-hidden rounded-xl bg-red-100">
         {partner &&
           isEnrolled &&
@@ -373,6 +420,17 @@ export function PartnerInfoCards({
           {partner && isEnrolled && showApplicationRiskAnalysis && (
             <PartnerApplicationRiskSummary partner={partner} />
           )}
+          {partner &&
+            isEnrolled &&
+            showApplicationRiskAnalysis &&
+            canManageFraudEvents && (
+              <div className="flex flex-col gap-3 p-4">
+                <h3 className="text-content-emphasis text-sm font-semibold">
+                  Network activity
+                </h3>
+                <PartnerNetworkActivitySummary partnerId={partner.id} />
+              </div>
+            )}
         </div>
       </div>
 
@@ -423,21 +481,35 @@ export function PartnerInfoCards({
                   Rewards
                 </h3>
                 {group ? (
-                  group.clickReward ||
-                  group.leadReward ||
-                  group.saleReward ||
-                  group.discount ? (
+                  displayedRewards.length > 0 || displayedDiscount ? (
                     <ProgramRewardList
-                      rewards={[
-                        group.clickReward,
-                        group.leadReward,
-                        group.saleReward,
-                        group.referralReward,
-                      ].filter((r): r is RewardProps => r !== null)}
-                      discount={group.discount}
+                      rewards={displayedRewards}
+                      discount={displayedDiscount}
                       variant="plain"
                       className="text-content-subtle gap-2 text-xs leading-4"
                       iconClassName="size-3.5"
+                      editDisabledTooltip={
+                        !canUseAdvancedRewardLogic ? (
+                          <TooltipContent
+                            title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+                            cta="Upgrade to Advanced"
+                            onClick={() => setShowAdvancedUpsellModal(true)}
+                          />
+                        ) : undefined
+                      }
+                      onEditReward={(reward) => {
+                        if (
+                          reward.event === "sale" ||
+                          reward.event === "lead" ||
+                          reward.event === "click"
+                        ) {
+                          setRewardEvent(reward.event);
+                          setShowEditPartnerRewardModal(true);
+                        }
+                      }}
+                      onEditDiscount={() => {
+                        setShowEditPartnerDiscountModal(true);
+                      }}
                     />
                   ) : (
                     <span className="text-content-subtle text-xs">
@@ -449,44 +521,11 @@ export function PartnerInfoCards({
                 )}
               </div>
               {/* Eligible bounties */}
-              <div className="flex flex-col gap-2">
-                <h3 className="text-content-emphasis text-sm font-semibold">
-                  Eligible Bounties
-                </h3>
-                {bounties ? (
-                  bounties.length ? (
-                    <div className="flex flex-col gap-2">
-                      {bounties.map((bounty) => {
-                        const Icon =
-                          bounty.type === "performance" ? Trophy : Heart;
-                        return (
-                          <Link
-                            key={bounty.id}
-                            target="_blank"
-                            href={`/${workspaceSlug}/program/bounties/${bounty.id}`}
-                            className="text-content-subtle flex cursor-alias items-center gap-2 decoration-dotted underline-offset-2 hover:underline"
-                          >
-                            <Icon className="size-3.5 shrink-0" />
-                            <span className="text-xs font-medium">
-                              {bounty.name}
-                            </span>
-                          </Link>
-                        );
-                      })}
-                    </div>
-                  ) : (
-                    <p className="text-content-subtle text-xs">
-                      No eligible bounties
-                    </p>
-                  )
-                ) : errorBounties ? (
-                  <p className="text-content-subtle text-xs">
-                    Failed to load bounties
-                  </p>
-                ) : (
-                  <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
-                )}
-              </div>
+              <EligibleBounties
+                bounties={bounties}
+                errorBounties={errorBounties}
+                workspaceSlug={workspaceSlug}
+              />
             </>
           )}
         </div>
@@ -495,6 +534,70 @@ export function PartnerInfoCards({
   );
 }
 
+function EligibleBounties({
+  bounties,
+  errorBounties,
+  workspaceSlug,
+}: {
+  bounties: BountyListProps[] | undefined;
+  errorBounties: unknown;
+  workspaceSlug: string | undefined;
+}) {
+  const [showAllBounties, setShowAllBounties] = useState(false);
+  const shouldCollapseBounties = (bounties?.length ?? 0) > MAX_VISIBLE_BOUNTIES;
+
+  return (
+    <div className="flex flex-col gap-2">
+      <h3 className="text-content-emphasis text-sm font-semibold">
+        Eligible Bounties
+      </h3>
+      {bounties ? (
+        bounties.length ? (
+          <div>
+            <div className="flex flex-col gap-2">
+              {(shouldCollapseBounties && !showAllBounties
+                ? bounties.slice(0, MAX_VISIBLE_BOUNTIES)
+                : bounties
+              ).map((bounty) => {
+                const Icon = bounty.type === "performance" ? Trophy : Heart;
+                return (
+                  <Link
+                    key={bounty.id}
+                    target="_blank"
+                    href={`/${workspaceSlug}/program/bounties/${bounty.id}`}
+                    className="text-content-subtle flex cursor-alias items-center gap-2 decoration-dotted underline-offset-2 hover:underline"
+                  >
+                    <Icon className="size-3.5 shrink-0" />
+                    <span className="text-xs font-medium">{bounty.name}</span>
+                  </Link>
+                );
+              })}
+            </div>
+            {shouldCollapseBounties && (
+              <button
+                type="button"
+                className={cn(
+                  "mt-3 flex h-6 w-fit items-center justify-center rounded-md px-1.5 text-xs font-medium tracking-[-0.02em] text-neutral-900 transition-colors",
+                  "bg-neutral-200/50 hover:bg-neutral-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-300",
+                )}
+                onClick={() => setShowAllBounties((current) => !current)}
+              >
+                {showAllBounties ? "View less bounties" : "View all bounties"}
+              </button>
+            )}
+          </div>
+        ) : (
+          <p className="text-content-subtle text-xs">No eligible bounties</p>
+        )
+      ) : errorBounties ? (
+        <p className="text-content-subtle text-xs">Failed to load bounties</p>
+      ) : (
+        <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />
+      )}
+    </div>
+  );
+}
+
 function TagsList({ partner }: { partner: EnrolledPartnerExtendedProps }) {
   const { showUpdatePartnerTagsModal, setShowUpdatePartnerTagsModal } =
     useUpdatePartnerTagsModal();
diff --git a/apps/web/ui/partners/partner-link-selector.tsx b/apps/web/ui/partners/partner-link-selector.tsx
index 58a776a55bd..9111e0aa98c 100644
--- a/apps/web/ui/partners/partner-link-selector.tsx
+++ b/apps/web/ui/partners/partner-link-selector.tsx
@@ -1,5 +1,6 @@
 import useLink from "@/lib/swr/use-link";
 import useLinks from "@/lib/swr/use-links";
+import usePartner from "@/lib/swr/use-partner";
 import useProgram from "@/lib/swr/use-program";
 import { LinkProps } from "@/lib/types";
 import { Combobox, LinkLogo, Tooltip } from "@dub/ui";
@@ -8,7 +9,12 @@ import { cn, getApexDomain, linkConstructor } from "@dub/utils";
 import { ReactNode, useEffect, useMemo, useState } from "react";
 import { useDebounce } from "use-debounce";
 
-const getLinkOption = (link: LinkProps) => ({
+type PartnerLinkOption = Pick<
+  LinkProps,
+  "id" | "domain" | "key" | "url" | "saleAmount"
+>;
+
+const getLinkOption = (link: PartnerLinkOption) => ({
   value: link.id,
   label: linkConstructor({ ...link, pretty: true }),
   icon: (
@@ -44,8 +50,11 @@ export function PartnerLinkSelector({
   const [search, setSearch] = useState("");
   const [debouncedSearch] = useDebounce(search, 500);
   const { program } = useProgram();
+  const { partner, loading: partnerLoading } = usePartner({
+    partnerId: partnerId ?? null,
+  });
 
-  const { links, isValidating } = useLinks(
+  const { links: workspaceLinks, isValidating } = useLinks(
     {
       folderId: program?.defaultFolderId ?? undefined,
       domain: program?.domain ?? undefined,
@@ -60,7 +69,26 @@ export function PartnerLinkSelector({
     },
   );
 
-  const { link: selectedLink } = useLink(selectedLinkId ?? "");
+  // Partner referral links live on the enrollment. `/api/links` can return
+  // none of them when folder/domain filters from the current page don't match.
+  const links = partnerId
+    ? partner
+      ? partner.links ?? []
+      : undefined
+    : workspaceLinks;
+
+  const { link: selectedLinkFromApi } = useLink(
+    partnerId || !selectedLinkId ? "" : selectedLinkId,
+  );
+
+  const selectedLink = useMemo(() => {
+    if (!selectedLinkId) return null;
+    return (
+      links?.find((link) => link.id === selectedLinkId) ??
+      selectedLinkFromApi ??
+      null
+    );
+  }, [links, selectedLinkFromApi, selectedLinkId]);
 
   const options = useMemo(
     () => links?.map((link) => getLinkOption(link)),
@@ -85,9 +113,11 @@ export function PartnerLinkSelector({
     return getLinkOption(selectedLink);
   }, [selectedLink]);
 
+  const isLoadingLinks = partnerId ? partnerLoading : isValidating;
+
   const showLoadingPlaceholder =
     (selectedLinkId && !selectedLink) ||
-    (!selectedLinkId && isValidating && !links);
+    (!selectedLinkId && isLoadingLinks && !links);
 
   return (
     <>
@@ -122,7 +152,7 @@ export function PartnerLinkSelector({
           ),
           disabledTooltip,
         }}
-        shouldFilter={false}
+        shouldFilter={Boolean(partnerId)}
         onCreate={onCreate}
         createLabel={(search) =>
           `Create "${search.startsWith(program?.domain + "/") ? search : program?.domain + "/" + search}"`
diff --git a/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx b/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx
index b002e352bf1..8ac30fff515 100644
--- a/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx
+++ b/apps/web/ui/partners/payouts/bank-account-requirements-modal.tsx
@@ -2,9 +2,9 @@
 
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import { Button, Modal } from "@dub/ui";
-import { TriangleWarning } from "@dub/ui/icons";
 import { COUNTRIES, COUNTRY_CURRENCY_CODES } from "@dub/utils";
 import { Dispatch, SetStateAction, useMemo, useState } from "react";
+import { Callout } from "../../shared/callout";
 import { Markdown } from "../../shared/markdown";
 
 function BankAccountRequirementsModal({
@@ -40,13 +40,10 @@ function BankAccountRequirementsModal({
       </div>
 
       <div className="flex flex-col gap-6 border-t border-neutral-200 bg-neutral-50 p-6">
-        <div className="flex flex-col gap-2.5 rounded-lg border border-amber-200 bg-amber-50 p-3">
-          <TriangleWarning className="size-3.5 text-amber-500" />
-          <p className="text-sm leading-5 text-amber-900">
-            If your bank account does not meet these requirements, payouts may
-            be delayed or rejected.
-          </p>
-        </div>
+        <Callout variant="warn" size={2}>
+          If your bank account does not meet these requirements, payouts may be
+          delayed or rejected.
+        </Callout>
 
         <div className="flex flex-col gap-2 text-sm text-neutral-800">
           <p className="font-semibold">Requirements:</p>
diff --git a/apps/web/ui/partners/payouts/stablecoin-payout-modal.tsx b/apps/web/ui/partners/payouts/stablecoin-payout-modal.tsx
index 1b2f1ba58db..d51c6199be6 100644
--- a/apps/web/ui/partners/payouts/stablecoin-payout-modal.tsx
+++ b/apps/web/ui/partners/payouts/stablecoin-payout-modal.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { Callout } from "@/ui/shared/callout";
 import { MarkdownDescription } from "@/ui/shared/markdown-description";
 import { Badge, Button, CircleDollar3, Modal, ShimmerDots } from "@dub/ui";
-import { TriangleWarning } from "@dub/ui/icons";
 import { Dispatch, SetStateAction, useMemo, useState } from "react";
 
 function StablecoinPayoutModal({
@@ -94,18 +94,15 @@ function StablecoinPayoutModal({
             waiting up to 15 business days with your bank account.
           </MarkdownDescription>
 
-          <div className="mt-4 flex flex-col gap-2.5 rounded-lg border border-amber-200 bg-amber-50 p-3">
-            <TriangleWarning className="size-3.5 text-amber-500" />
-            <p className="text-sm leading-5 text-amber-900">
-              Make sure to triple-check that you’ve entered the{" "}
-              <strong className="underline underline-offset-2">
-                correct stablecoin wallet address and network
-              </strong>{" "}
-              when connecting your wallet. Since stablecoin payouts are
-              irreversible, incorrect details may result in payout failures and
-              lost funds.
-            </p>
-          </div>
+          <Callout variant="warn" size={2} className="mt-4">
+            Make sure to triple-check that you’ve entered the{" "}
+            <strong className="underline underline-offset-2">
+              correct stablecoin wallet address and network
+            </strong>{" "}
+            when connecting your wallet. Since stablecoin payouts are
+            irreversible, incorrect details may result in payout failures and
+            lost funds.
+          </Callout>
 
           <div className="mt-2">
             <label className="mb-4 flex cursor-pointer gap-3 rounded-lg border border-neutral-300 p-3">
diff --git a/apps/web/ui/partners/program-application-sheet.tsx b/apps/web/ui/partners/program-application-sheet.tsx
index bbac4fb78bc..6ca06cd861a 100644
--- a/apps/web/ui/partners/program-application-sheet.tsx
+++ b/apps/web/ui/partners/program-application-sheet.tsx
@@ -4,10 +4,7 @@ import { parseActionError } from "@/lib/actions/parse-action-errors";
 import { createProgramApplicationAction } from "@/lib/actions/partners/create-program-application";
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import { ProgramEnrollmentProps, ProgramProps } from "@/lib/types";
-import {
-  DEFAULT_PARTNER_GROUP,
-  PartnerProgramGroupSchema,
-} from "@/lib/zod/schemas/groups";
+import { PartnerProgramGroupSchema } from "@/lib/zod/schemas/groups";
 import { createProgramApplicationSchema } from "@/lib/zod/schemas/programs";
 import { X } from "@/ui/shared/icons";
 import {
@@ -55,24 +52,11 @@ function ProgramApplicationSheetContent({
   programEnrollment,
   ...rest
 }: ProgramApplicationSheetProps) {
-  const groupIdOrSlug =
-    programEnrollment?.groupId ||
-    program?.defaultGroupId ||
-    DEFAULT_PARTNER_GROUP.slug;
-
-  const {
-    data: group,
-    isLoading: isGroupLoading,
-    error: groupError,
-  } = useSWR<z.infer<typeof PartnerProgramGroupSchema>>(
-    groupIdOrSlug
-      ? `/api/partner-profile/programs/${program.id}/groups/${groupIdOrSlug}`
-      : null,
-    fetcher,
-    {
-      keepPreviousData: true,
-    },
-  );
+  const { data: group, error: groupError } = useSWR<
+    z.infer<typeof PartnerProgramGroupSchema>
+  >(`/api/partner-profile/programs/${program.id}/default-group`, fetcher, {
+    keepPreviousData: true,
+  });
 
   return group ? (
     <ProgramApplicationSheetForm
diff --git a/apps/web/ui/partners/program-link-configuration.tsx b/apps/web/ui/partners/program-link-configuration.tsx
index dac204de31a..5f076f8e16d 100644
--- a/apps/web/ui/partners/program-link-configuration.tsx
+++ b/apps/web/ui/partners/program-link-configuration.tsx
@@ -1,3 +1,4 @@
+import type { DomainConnectDiscovery } from "@/lib/domain-connect/types";
 import { getLinkStructureOptions } from "@/lib/partners/get-link-structure-options";
 import { mutatePrefix } from "@/lib/swr/mutate";
 import useDomains from "@/lib/swr/use-domains";
@@ -588,11 +589,12 @@ function DomainOnboardingSelection({
   domain,
   onDomainChange,
 }: DomainProps & { onBack: () => void }) {
-  const { id: workspaceId } = useWorkspace();
+  const { id: workspaceId, slug: workspaceSlug } = useWorkspace();
 
   const { data: verificationData } = useSWRImmutable<{
     status: DomainVerificationStatusProps;
     response: any;
+    domainConnect?: DomainConnectDiscovery | null;
   }>(
     workspaceId && domain
       ? `/api/domains/${domain}/verify?workspaceId=${workspaceId}`
@@ -623,7 +625,13 @@ function DomainOnboardingSelection({
               transition={{ duration: 0.2 }}
               className="mt-6 overflow-hidden rounded-md border border-neutral-200 bg-neutral-50 px-5 pb-5"
             >
-              <DomainConfiguration data={verificationData} />
+              <DomainConfiguration
+                data={verificationData}
+                domainConnect={verificationData.domainConnect}
+                domain={domain ?? undefined}
+                workspaceId={workspaceId ?? undefined}
+                workspaceSlug={workspaceSlug ?? undefined}
+              />
             </motion.div>
           )}
       </AnimatePresence>
diff --git a/apps/web/ui/partners/program-reward-description.tsx b/apps/web/ui/partners/program-reward-description.tsx
index 4570e312d7f..6e0ff7fd3e3 100644
--- a/apps/web/ui/partners/program-reward-description.tsx
+++ b/apps/web/ui/partners/program-reward-description.tsx
@@ -8,6 +8,7 @@ import {
 import { DiscountProps, RewardProps } from "@/lib/types";
 import { referralRewardConfigSchema } from "@/lib/zod/schemas/rewards";
 import { cn, currencyFormatter } from "@dub/utils";
+import { CustomRewardDescription } from "./custom-reward-description";
 import { ProgramRewardModifiersTooltip } from "./program-reward-modifiers-tooltip";
 import { ProgramRewardSpendLimit } from "./program-reward-spend-limit";
 
@@ -48,6 +49,12 @@ export function ProgramRewardDescription({
                 amountClassName={amountClassName}
                 periodClassName={periodClassName}
               />
+            ) : reward.event === "custom" ? (
+              <CustomRewardDescription
+                reward={reward}
+                amountClassName={amountClassName}
+                periodClassName={periodClassName}
+              />
             ) : (
               <>
                 Earn{" "}
diff --git a/apps/web/ui/partners/program-reward-list.tsx b/apps/web/ui/partners/program-reward-list.tsx
index 8ad22d2f730..a3db874c82b 100644
--- a/apps/web/ui/partners/program-reward-list.tsx
+++ b/apps/web/ui/partners/program-reward-list.tsx
@@ -2,14 +2,25 @@
 
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import { DiscountProps, RewardProps } from "@/lib/types";
-import { Button, Gift, Icon } from "@dub/ui";
+import { Button, DiscountCode, Icon, Tooltip } from "@dub/ui";
 import { cn } from "@dub/utils";
 import Link from "next/link";
 import { useParams } from "next/navigation";
-import { PropsWithChildren } from "react";
+import { PropsWithChildren, ReactNode } from "react";
 import { formatDiscountDescription } from "./format-discount-description";
 import { ProgramRewardDescription } from "./program-reward-description";
 import { REWARD_EVENT_ICON } from "./rewards/reward-event-icon";
+import { RewardOverrideIcon } from "./rewards/reward-override-icon";
+
+const EDITABLE_REWARD_EVENTS = new Set(["sale", "lead", "click"]);
+
+type RewardListItem = RewardProps & {
+  isOverride?: boolean;
+};
+
+type DiscountListItem = DiscountProps & {
+  isOverride?: boolean;
+};
 
 export function ProgramRewardList({
   rewards,
@@ -18,13 +29,19 @@ export function ProgramRewardList({
   className,
   iconClassName,
   showModifiersTooltip = true,
+  onEditReward,
+  onEditDiscount,
+  editDisabledTooltip,
 }: {
-  rewards: RewardProps[];
-  discount?: DiscountProps | null;
+  rewards: RewardListItem[];
+  discount?: DiscountListItem | null;
   variant?: "default" | "plain";
   className?: string;
   iconClassName?: string;
   showModifiersTooltip?: boolean;
+  onEditReward?: (reward: RewardProps) => void;
+  onEditDiscount?: (discount: DiscountProps) => void;
+  editDisabledTooltip?: ReactNode;
 }) {
   const { programSlug } = useParams();
   const sortedFilteredRewards = rewards.filter((r) => getRewardAmount(r) >= 0);
@@ -58,21 +75,55 @@ export function ProgramRewardList({
         className,
       )}
     >
-      {sortedFilteredRewards.map((reward) => (
+      {sortedFilteredRewards.map((reward) => {
+        const canEdit =
+          onEditReward && EDITABLE_REWARD_EVENTS.has(reward.event);
+
+        return (
+          <Item
+            key={reward.id}
+            icon={REWARD_EVENT_ICON[reward.event]}
+            iconClassName={iconClassName}
+            overrideTooltip={
+              reward.isOverride
+                ? `This partner has a ${reward.event} reward override`
+                : undefined
+            }
+            action={
+              canEdit ? (
+                <EditAction
+                  disabledTooltip={editDisabledTooltip}
+                  onClick={() => onEditReward(reward)}
+                />
+              ) : undefined
+            }
+          >
+            <ProgramRewardDescription
+              reward={reward}
+              showModifiersTooltip={showModifiersTooltip}
+            />
+          </Item>
+        );
+      })}
+
+      {discount && (
         <Item
-          key={reward.id}
-          icon={REWARD_EVENT_ICON[reward.event]}
+          icon={DiscountCode}
           iconClassName={iconClassName}
+          overrideTooltip={
+            discount.isOverride
+              ? "This partner has a discount override"
+              : undefined
+          }
+          action={
+            onEditDiscount ? (
+              <EditAction
+                disabledTooltip={editDisabledTooltip}
+                onClick={() => onEditDiscount(discount)}
+              />
+            ) : undefined
+          }
         >
-          <ProgramRewardDescription
-            reward={reward}
-            showModifiersTooltip={showModifiersTooltip}
-          />
-        </Item>
-      ))}
-
-      {discount && (
-        <Item icon={Gift} iconClassName={iconClassName}>
           {formatDiscountDescription(discount)}
         </Item>
       )}
@@ -80,15 +131,73 @@ export function ProgramRewardList({
   );
 }
 
+function EditAction({
+  onClick,
+  disabledTooltip,
+}: {
+  onClick: () => void;
+  disabledTooltip?: ReactNode;
+}) {
+  const button = (
+    <button
+      type="button"
+      className={cn(
+        "text-content-subtle shrink-0 text-xs font-medium",
+        disabledTooltip
+          ? "cursor-not-allowed opacity-50"
+          : "hover:text-content-default",
+      )}
+      aria-disabled={Boolean(disabledTooltip) || undefined}
+      onClick={disabledTooltip ? undefined : onClick}
+    >
+      Edit
+    </button>
+  );
+
+  if (!disabledTooltip) {
+    return button;
+  }
+
+  return <Tooltip content={disabledTooltip}>{button}</Tooltip>;
+}
+
 const Item = ({
   icon: Icon,
   children,
   iconClassName,
-}: PropsWithChildren<{ icon: Icon; iconClassName?: string }>) => {
+  overrideTooltip,
+  action,
+}: PropsWithChildren<{
+  icon: Icon;
+  iconClassName?: string;
+  overrideTooltip?: string;
+  action?: ReactNode;
+}>) => {
+  const icon = (
+    <div className="relative shrink-0 py-px">
+      <Icon className={cn("block size-4", iconClassName)} />
+      {overrideTooltip && <RewardOverrideIcon />}
+    </div>
+  );
+
   return (
     <li className="flex items-start gap-2">
-      <Icon className={cn("size-4 shrink-0 translate-y-px", iconClassName)} />
-      <div>{children}</div>
+      {overrideTooltip ? (
+        <Tooltip
+          disableHoverableContent
+          content={
+            <div className="whitespace-nowrap px-3 py-2 text-sm text-neutral-600">
+              {overrideTooltip}
+            </div>
+          }
+        >
+          {icon}
+        </Tooltip>
+      ) : (
+        icon
+      )}
+      <div className="min-w-0 flex-1">{children}</div>
+      {action}
     </li>
   );
 };
diff --git a/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx b/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
index 45e2c72b9c0..b4326bf0323 100644
--- a/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
+++ b/apps/web/ui/partners/program-reward-modifiers-tooltip.tsx
@@ -2,21 +2,10 @@
 
 import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
+import { formatRewardConditionParts } from "@/lib/rewards/format-reward-condition";
 import { RewardCondition, RewardConditions, RewardProps } from "@/lib/types";
-import {
-  CONDITION_OPERATOR_LABELS,
-  REWARD_CONDITIONS,
-} from "@/lib/zod/schemas/rewards";
 import { InfoTooltip, useScrollProgress } from "@dub/ui";
-import {
-  COUNTRIES,
-  capitalize,
-  cn,
-  currencyFormatter,
-  formatDateTime,
-  pluralize,
-} from "@dub/utils";
-import { formatDuration } from "date-fns";
+import { capitalize, cn, pluralize } from "@dub/utils";
 import { useRef } from "react";
 
 interface ProgramRewardModifiersTooltipProps {
@@ -159,67 +148,20 @@ const RewardItem = ({
       {conditions && conditions.length > 0 && (
         <ul className="ml-1 text-xs font-medium text-neutral-600">
           {conditions.map((condition, idx) => {
-            const entity = REWARD_CONDITIONS[reward.event].entities.find(
-              (e) => e.id === condition.entity,
-            );
-            const attribute = entity?.attributes?.find(
-              (a) => a.id === condition.attribute,
-            );
+            const { entityLabel, attributeLabel, operatorLabel, valueLabel } =
+              formatRewardConditionParts({
+                condition,
+                event: reward.event,
+              });
 
             return (
               <li key={idx} className="flex items-start gap-1">
                 <span className="shrink-0 text-lg leading-none">&bull;</span>
                 <span className="min-w-0">
-                  {idx === 0 ? "If" : capitalize(operator)}{" "}
-                  {capitalize(condition.entity)}{" "}
-                  {(condition.entity === "lead" ||
-                    condition.entity === "sale") &&
-                  condition.attribute === "metadata" &&
-                  condition.metadataField?.trim()
-                    ? `"${condition.metadataField.trim()}"`
-                    : capitalize(attribute?.label)}{" "}
-                  {condition.label
-                    ? "is" // if custom label is set, use "is" instead of the actual operator to sound more natural
-                    : CONDITION_OPERATOR_LABELS[condition.operator]}{" "}
-                  {condition.value &&
-                    (condition.attribute === "country"
-                      ? // Country names
-                        Array.isArray(condition.value)
-                        ? (condition.value as any[])
-                            .map((v) => COUNTRIES[v?.toString()] ?? v)
-                            .join(", ")
-                        : COUNTRIES[condition.value?.toString()] ??
-                          condition.value
-                      : condition.attribute === "subscriptionDurationMonths"
-                        ? formatSubscriptionDuration(Number(condition.value))
-                        : condition.attribute === "productId" &&
-                            condition.label?.trim()
-                          ? condition.label.trim()
-                          : // Non-country value(s)
-                            Array.isArray(condition.value)
-                            ? // Basic array
-                              (attribute?.options
-                                ? (condition.value as string[] | number[]).map(
-                                    (v) =>
-                                      attribute.options?.find((o) => o.id === v)
-                                        ?.label ?? v,
-                                  )
-                                : condition.value
-                              ).join(", ")
-                            : attribute?.type === "currency"
-                              ? // Currency value
-                                currencyFormatter(Number(condition.value))
-                              : attribute?.type === "date"
-                                ? // Date+time value
-                                  formatDateTime(
-                                    new Date(Number(condition.value)),
-                                  )
-                                : // Everything else
-                                  attribute?.options
-                                  ? attribute.options.find(
-                                      (o) => o.id === condition.value,
-                                    )?.label ?? condition.value.toString()
-                                  : condition.value.toString())}
+                  {idx === 0 ? "If" : capitalize(operator)} {entityLabel}{" "}
+                  {attributeLabel} {operatorLabel}
+                  {/* Omit empty formatter output; still show valid zeros. */}
+                  {valueLabel ? ` ${valueLabel}` : null}
                 </span>
               </li>
             );
@@ -229,9 +171,3 @@ const RewardItem = ({
     </div>
   );
 };
-
-function formatSubscriptionDuration(v: number): string {
-  return formatDuration(
-    v >= 12 ? { years: Math.floor(v / 12), months: v % 12 } : { months: v },
-  );
-}
diff --git a/apps/web/ui/partners/program-reward-spend-limit.tsx b/apps/web/ui/partners/program-reward-spend-limit.tsx
index ab63f9bf755..1f544abf36f 100644
--- a/apps/web/ui/partners/program-reward-spend-limit.tsx
+++ b/apps/web/ui/partners/program-reward-spend-limit.tsx
@@ -1,24 +1,6 @@
-import { RewardProps } from "@/lib/types";
-import { currencyFormatter } from "@dub/utils";
+import { getSpendLimitDescriptionParts } from "@/lib/rewards/reward-spend-limit";
 import { EventType, RewardSpendLimitInterval } from "@prisma/client";
 
-export function getSpendLimitDescriptionParts({
-  spendLimitAmount,
-  spendLimitInterval,
-}: Pick<RewardProps, "spendLimitAmount" | "spendLimitInterval">) {
-  if (spendLimitAmount == null || spendLimitInterval == null) {
-    return null;
-  }
-
-  return {
-    amount: currencyFormatter(spendLimitAmount, {
-      trailingZeroDisplay: "stripIfInteger",
-    }),
-    interval:
-      spendLimitInterval === "allTime" ? "" : `per ${spendLimitInterval}`,
-  };
-}
-
 export function ProgramRewardSpendLimit({
   event,
   spendLimitAmount,
@@ -45,43 +27,3 @@ export function ProgramRewardSpendLimit({
     .filter(Boolean)
     .join(" ");
 }
-
-export function buildCommissionDescription({
-  earnings,
-  cappedEarnings,
-  reward,
-}: {
-  earnings: number;
-  cappedEarnings: number;
-  reward: Pick<
-    RewardProps,
-    | "event"
-    | "type"
-    | "amountInCents"
-    | "amountInPercentage"
-    | "spendLimitAmount"
-    | "spendLimitInterval"
-  >;
-}) {
-  if (earnings <= cappedEarnings) {
-    return null;
-  }
-
-  const limitParts = getSpendLimitDescriptionParts({
-    spendLimitAmount: reward.spendLimitAmount,
-    spendLimitInterval: reward.spendLimitInterval,
-  });
-
-  if (!limitParts) {
-    return null;
-  }
-
-  const amount =
-    reward.type === "percentage"
-      ? `${reward.amountInPercentage ?? 0}%`
-      : currencyFormatter(reward.amountInCents ?? 0, {
-          trailingZeroDisplay: "stripIfInteger",
-        });
-
-  return `Earn ${amount} per ${reward.event} up to ${limitParts.amount} ${limitParts.interval}`;
-}
diff --git a/apps/web/ui/partners/program-rewards-panel.tsx b/apps/web/ui/partners/program-rewards-panel.tsx
index d83e7de3196..0ce19df526c 100644
--- a/apps/web/ui/partners/program-rewards-panel.tsx
+++ b/apps/web/ui/partners/program-rewards-panel.tsx
@@ -3,9 +3,10 @@
 import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
 import { getRewardAmount } from "@/lib/partners/get-reward-amount";
 import { DiscountProps, RewardProps } from "@/lib/types";
-import { Gift, Tooltip } from "@dub/ui";
+import { DiscountCode, Tooltip } from "@dub/ui";
 import { HelpCircle } from "lucide-react";
 import { memo } from "react";
+import { CustomRewardDescription } from "./custom-reward-description";
 import { formatDiscountDescription } from "./format-discount-description";
 import { ProgramRewardModifiersTooltipContent } from "./program-reward-modifiers-tooltip";
 import { REWARD_EVENT_ICON } from "./rewards/reward-event-icon";
@@ -37,46 +38,53 @@ export const ProgramRewardsPanel = memo(
     const rewardItems = [
       ...sortedFilteredRewards.map((reward) => ({
         icon: REWARD_EVENT_ICON[reward.event],
-        label: reward.description || (
-          <>
-            {constructRewardAmount(reward)}{" "}
-            {reward.event === "sale" && reward.maxDuration === 0 ? (
-              <>for the first sale</>
-            ) : (
-              <>per {reward.event}</>
-            )}
-            {reward.maxDuration === null ? (
-              <>
-                {" "}
-                for the{" "}
-                <strong className="font-semibold">customer's lifetime</strong>
-              </>
-            ) : reward.maxDuration && reward.maxDuration > 1 ? (
-              <>
-                {" "}
-                for{" "}
-                <strong className="font-semibold">
-                  {reward.maxDuration % 12 === 0
-                    ? `${reward.maxDuration / 12} year${reward.maxDuration / 12 > 1 ? "s" : ""}`
-                    : `${reward.maxDuration} months`}
-                </strong>
-              </>
-            ) : null}
-            {!!reward.modifiers?.length && (
-              // whitespace-nowrap keeps the tooltip icon attached to the last
-              // word of the description so it never wraps on its own line
-              <span className="whitespace-nowrap">
-                {" "}
-                <CustomRewardModifiersTooltip reward={reward} />
-              </span>
-            )}
-          </>
-        ),
+        label:
+          reward.description ||
+          (reward.event === "custom" ? (
+            <CustomRewardDescription
+              reward={reward}
+              includeEarnPrefix={false}
+            />
+          ) : (
+            <>
+              {constructRewardAmount(reward)}{" "}
+              {reward.event === "sale" && reward.maxDuration === 0 ? (
+                <>for the first sale</>
+              ) : (
+                <>per {reward.event}</>
+              )}
+              {reward.maxDuration === null ? (
+                <>
+                  {" "}
+                  for the{" "}
+                  <strong className="font-semibold">customer's lifetime</strong>
+                </>
+              ) : reward.maxDuration && reward.maxDuration > 1 ? (
+                <>
+                  {" "}
+                  for{" "}
+                  <strong className="font-semibold">
+                    {reward.maxDuration % 12 === 0
+                      ? `${reward.maxDuration / 12} year${reward.maxDuration / 12 > 1 ? "s" : ""}`
+                      : `${reward.maxDuration} months`}
+                  </strong>
+                </>
+              ) : null}
+              {!!reward.modifiers?.length && (
+                // whitespace-nowrap keeps the tooltip icon attached to the last
+                // word of the description so it never wraps on its own line
+                <span className="whitespace-nowrap">
+                  {" "}
+                  <CustomRewardModifiersTooltip reward={reward} />
+                </span>
+              )}
+            </>
+          )),
       })),
       ...(discount
         ? [
             {
-              icon: Gift,
+              icon: DiscountCode,
               label: formatDiscountDescription(discount),
             },
           ]
diff --git a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
index 9dc0d980f64..22898682995 100644
--- a/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
+++ b/apps/web/ui/partners/rewards/add-edit-reward-sheet.tsx
@@ -8,14 +8,16 @@ import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
 import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
 import { ReferralRewardConfig } from "@/lib/partner-referrals/types";
 import { getPlanCapabilities } from "@/lib/plan-capabilities";
+import { PARTNER_LEVEL_REWARDS_PLAN_ERROR } from "@/lib/rewards/constants";
 import useGroup from "@/lib/swr/use-group";
-import usePartnersCount from "@/lib/swr/use-partners-count";
 import useProgram from "@/lib/swr/use-program";
+import { useRewards } from "@/lib/swr/use-rewards";
 import useWorkspace from "@/lib/swr/use-workspace";
 import { RewardConditionsArray, RewardProps } from "@/lib/types";
 import { RECURRING_MAX_DURATIONS } from "@/lib/zod/schemas/misc";
 import {
   createOrUpdateRewardSchema,
+  customRewardConfigSchema,
   REWARD_CONDITION_ATTRIBUTES,
   REWARD_DESCRIPTION_MAX_LENGTH,
   REWARD_TOOLTIP_DESCRIPTION_MAX_LENGTH,
@@ -41,9 +43,9 @@ import { motion } from "motion/react";
 import { useAction } from "next-safe-action/hooks";
 import {
   Dispatch,
-  MutableRefObject,
   PropsWithChildren,
   ReactNode,
+  RefObject,
   SetStateAction,
   useContext,
   useEffect,
@@ -69,6 +71,7 @@ import {
   AIRewardPreviewFrame,
   useAIRewardBuilder,
 } from "./ai-reward-builder";
+import { CustomRewardBuilder } from "./custom-reward-builder";
 import { PartnerReferralRewardBuilder } from "./partner-referral-reward-builder";
 import { RewardIconSquare } from "./reward-icon-square";
 import { RewardPreviewCard } from "./reward-preview-card";
@@ -79,10 +82,14 @@ interface RewardSheetProps {
   event: EventType;
   reward?: RewardProps;
   defaultRewardValues?: RewardProps;
+  groupIdOrSlug?: string | null;
+  isDefault?: boolean;
+  onCreated?: (id: string) => void;
 }
 
 // Special form schema to allow for empty condition fields when adding a new condition
 const formSchema = createOrUpdateRewardSchema.extend({
+  config: z.any().nullish(),
   modifiers: z
     .array(
       rewardConditionsSchema.extend({
@@ -137,7 +144,11 @@ function referralConfigToApi(
 export const getRewardPayload = ({ data }: { data: FormData }) => {
   let modifiers: RewardConditionsArray | null = null;
   const config =
-    data.event === "referral" ? referralConfigToApi(data.config) : null;
+    data.event === "referral"
+      ? referralConfigToApi(data.config)
+      : data.event === "custom"
+        ? customRewardConfigSchema.parse(data.config)
+        : null;
 
   if (data.modifiers?.length) {
     modifiers = rewardConditionsArraySchema.parse(
@@ -205,20 +216,44 @@ function RewardSheetContent({
   event,
   reward,
   defaultRewardValues,
+  groupIdOrSlug,
+  isDefault = true,
+  onCreated,
+  nested,
   hasPendingChangesRef,
 }: RewardSheetProps & {
-  hasPendingChangesRef: MutableRefObject<boolean>;
+  nested?: boolean;
+  hasPendingChangesRef: RefObject<boolean>;
 }) {
-  const { group, mutateGroup } = useGroup();
-  const { partnersCount, loading, isValidating } = usePartnersCount<
-    number | undefined
-  >({
+  const { group, mutateGroup } = useGroup({
+    groupIdOrSlug: groupIdOrSlug ?? undefined,
+  });
+  const { rewards } = useRewards({
     groupId: group?.id,
-    status: "approved",
   });
-  const partnerCountForConfirm =
-    group?.id && !loading && !isValidating ? partnersCount : undefined;
-  const { openConfirmRewardChangeModal, ConfirmRewardChangeModal } =
+
+  // Infer when omitted (create via useRewardSheet defaults true). Group pages
+  // pass isDefault from whether the reward is the group's default for that event.
+  const effectiveIsDefault =
+    isDefault === false
+      ? false
+      : reward && group
+        ? [
+            group.clickReward?.id,
+            group.leadReward?.id,
+            group.saleReward?.id,
+            group.referralReward?.id,
+            group.customReward?.id,
+          ].includes(reward.id)
+        : isDefault;
+
+  const partnerCountForConfirm = reward
+    ? rewards?.find((item) => item.id === reward.id)?.partnersCount ?? undefined
+    : effectiveIsDefault
+      ? undefined
+      : 0;
+
+  const { confirmRewardChange, ConfirmRewardChangeModal } =
     useConfirmRewardChangeModal();
 
   const {
@@ -226,6 +261,7 @@ function RewardSheetContent({
     slug: workspaceSlug,
     defaultProgramId,
     plan,
+    flags,
   } = useWorkspace({
     // lower dedupingInterval + revalidateOnFocus in case user upgrades their plan in another tab
     swrOpts: {
@@ -236,7 +272,6 @@ function RewardSheetContent({
 
   const formRef = useRef<HTMLFormElement>(null);
   const { mutate: mutateProgram } = useProgram();
-  const { queryParams } = useRouterStuff();
 
   const defaultValuesSource = reward || defaultRewardValues;
 
@@ -245,13 +280,18 @@ function RewardSheetContent({
       event,
       type:
         defaultValuesSource?.type ??
-        (event === "click" || event === "lead" ? "flat" : "percentage"),
+        (event === "click" || event === "lead" || event === "custom"
+          ? "flat"
+          : "percentage"),
       maxDuration: defaultValuesSource
         ? defaultValuesSource.maxDuration === null
           ? Infinity
           : defaultValuesSource.maxDuration
         : Infinity,
-      config: referralConfigFromApi(defaultValuesSource?.config),
+      config:
+        event === "custom"
+          ? defaultValuesSource?.config
+          : referralConfigFromApi(defaultValuesSource?.config),
       amountInCents:
         defaultValuesSource?.amountInCents != null
           ? defaultValuesSource.amountInCents / 100
@@ -335,13 +375,12 @@ function RewardSheetContent({
 
   // Compute amount based on type
   const amount = type === "flat" ? amountInCents : amountInPercentage;
-  const {
-    canCreateReferralReward,
-    canSetRewardSpendLimit,
-    canUseAdvancedRewardLogic,
-  } = getPlanCapabilities(plan);
+  const { canCreateReferralReward, canUseAdvancedRewardLogic } =
+    getPlanCapabilities(plan);
 
-  const aiEvent = selectedEvent === "referral" ? "sale" : selectedEvent;
+  const isAiRewardEvent =
+    selectedEvent !== "referral" && selectedEvent !== "custom";
+  const aiEvent = isAiRewardEvent ? selectedEvent : "sale";
   const aiBuilder = useAIRewardBuilder({
     event: aiEvent,
     getValues: () => getValues() as Record<string, unknown>,
@@ -351,21 +390,27 @@ function RewardSheetContent({
   hasPendingChangesRef.current = isDirty || aiBuilder.isReviewing;
 
   const spendLimitEnabled =
-    canSetRewardSpendLimit && spendLimitInterval != null;
+    flags?.rewardSpendLimit && spendLimitInterval != null;
   const hasIncompleteMainSpendLimit =
-    canSetRewardSpendLimit &&
+    flags?.rewardSpendLimit &&
     spendLimitInterval != null &&
     (spendLimitAmount == null || isNaN(spendLimitAmount));
 
   const { executeAsync: createReward, isPending: isCreating } = useAction(
     createRewardAction,
     {
-      onSuccess: async () => {
+      onSuccess: async ({ data }) => {
         hasPendingChangesRef.current = false;
+        if (data?.id) {
+          onCreated?.(data.id);
+        }
         setIsOpen(false);
         toast.success("Reward created!");
         await mutateProgram();
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/rewards"),
+        );
       },
       onError({ error }) {
         toast.error(parseActionError(error, "Failed to create reward"));
@@ -378,10 +423,13 @@ function RewardSheetContent({
     {
       onSuccess: async () => {
         hasPendingChangesRef.current = false;
-        queryParams({ del: "rewardId" });
+        setIsOpen(false);
         toast.success("Reward updated!");
         await mutateProgram();
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/rewards"),
+        );
       },
       onError({ error }) {
         toast.error(parseActionError(error, "Failed to update reward"));
@@ -398,6 +446,9 @@ function RewardSheetContent({
         toast.success("Reward deleted!");
         await mutate(`/api/programs/${defaultProgramId}`);
         await mutateGroup();
+        await mutate(
+          (key) => typeof key === "string" && key.startsWith("/api/rewards"),
+        );
       },
       onError({ error }) {
         toast.error(error.serverError);
@@ -407,6 +458,8 @@ function RewardSheetContent({
 
   const [showAdvancedUpsell, setShowAdvancedUpsell] = useState(false);
   const showReferralUpsell = event === "referral" && !canCreateReferralReward;
+  const showPartnerAndLinkUpsell =
+    !reward && !effectiveIsDefault && !canUseAdvancedRewardLogic;
 
   useEffect(() => {
     if (modifiers?.length && !canUseAdvancedRewardLogic) {
@@ -422,12 +475,13 @@ function RewardSheetContent({
       !defaultProgramId ||
       showAdvancedUpsell ||
       showReferralUpsell ||
+      showPartnerAndLinkUpsell ||
       !group
     ) {
       return;
     }
 
-    let payload: ReturnType<typeof getRewardPayload> | null = null;
+    let payload: ReturnType<typeof getRewardPayload>;
 
     try {
       payload = {
@@ -446,22 +500,24 @@ function RewardSheetContent({
       return;
     }
 
-    openConfirmRewardChangeModal({
+    await confirmRewardChange({
       action: reward ? "updated" : "created",
-      event,
-      reward: payload!,
+      target: "group",
+      isDefault: effectiveIsDefault,
+      reward: payload,
       partnerCount: partnerCountForConfirm,
       isPending: isCreating || isUpdating,
       onConfirm: async (activityDescription) => {
         if (!reward) {
           await createReward({
-            ...payload!,
+            ...payload,
             groupId: group.id,
             activityDescription,
+            isDefault: effectiveIsDefault,
           });
         } else {
           await updateReward({
-            ...payload!,
+            ...payload,
             rewardId: reward.id,
             activityDescription,
           });
@@ -470,14 +526,15 @@ function RewardSheetContent({
     });
   };
 
-  const onDelete = () => {
+  const onDelete = async () => {
     if (!workspaceId || !defaultProgramId || !reward) {
       return;
     }
 
-    openConfirmRewardChangeModal({
+    await confirmRewardChange({
       action: "deleted",
-      event: reward.event,
+      target: "group",
+      isDefault: effectiveIsDefault,
       reward,
       partnerCount: partnerCountForConfirm,
       isPending: isDeleting,
@@ -513,10 +570,10 @@ function RewardSheetContent({
           </div>
 
           <div className="flex flex-1 flex-col overflow-y-auto p-6">
-            {selectedEvent !== "referral" && (
+            {isAiRewardEvent && (
               <AIRewardInput event={selectedEvent} builder={aiBuilder} />
             )}
-            {selectedEvent !== "referral" ? (
+            {isAiRewardEvent ? (
               <AIRewardPreviewFrame builder={aiBuilder}>
                 <RewardSheetCard
                   title={
@@ -598,7 +655,7 @@ function RewardSheetContent({
                             {modifiers?.length ? (
                               <> for all other {selectedEvent}s</>
                             ) : null}
-                            {canSetRewardSpendLimit ? (
+                            {flags?.rewardSpendLimit ? (
                               <>
                                 {", "}with{" "}
                                 <InlineBadgePopover
@@ -809,7 +866,11 @@ function RewardSheetContent({
                     <div className="flex min-w-0 items-center justify-between">
                       <div className="flex min-w-0 items-center gap-2.5">
                         <RewardIconSquare icon={MoneyBills2} />
-                        <PartnerReferralRewardBuilder />
+                        {selectedEvent === "custom" ? (
+                          <CustomRewardBuilder />
+                        ) : (
+                          <PartnerReferralRewardBuilder />
+                        )}
                       </div>
                       <Tooltip
                         content={"Add a custom reward description"}
@@ -913,17 +974,20 @@ function RewardSheetContent({
             <VerticalLine />
             <RewardPreviewCard />
 
-            {group && (
+            {group && (effectiveIsDefault || Boolean(reward)) && (
               <>
                 <VerticalLine />
-                <RewardDiscountPartnersCard groupId={group.id} />
+                <RewardDiscountPartnersCard
+                  groupId={group.id}
+                  rewardId={reward?.id}
+                />
               </>
             )}
           </div>
 
           <div className="flex items-center justify-between border-t border-neutral-200 p-5">
             <div>
-              {reward && (
+              {reward && !(nested && effectiveIsDefault) && (
                 <Button
                   type="button"
                   variant="outline"
@@ -958,7 +1022,7 @@ function RewardSheetContent({
                   isDeleting ||
                   isCreating ||
                   isUpdating ||
-                  (selectedEvent !== "referral" && aiBuilder.isReviewing)
+                  (isAiRewardEvent && aiBuilder.isReviewing)
                 }
                 disabledTooltip={
                   showReferralUpsell ? (
@@ -968,6 +1032,13 @@ function RewardSheetContent({
                       href={`/${workspaceSlug}/upgrade?plan=advanced&showAdvancedUpsellModal=true`}
                       target="_blank"
                     />
+                  ) : showPartnerAndLinkUpsell ? (
+                    <TooltipContent
+                      title={PARTNER_LEVEL_REWARDS_PLAN_ERROR}
+                      cta="Upgrade to Advanced"
+                      href={`/${workspaceSlug}/upgrade?plan=advanced&showAdvancedUpsellModal=true`}
+                      target="_blank"
+                    />
                   ) : showAdvancedUpsell ? (
                     <TooltipContent
                       title="[Advanced reward structures](https://dub.co/help/article/partner-rewards#adding-reward-conditions) are only available on the Advanced plan and above."
@@ -975,7 +1046,7 @@ function RewardSheetContent({
                       href={`/${workspaceSlug}/upgrade?plan=advanced&showAdvancedUpsellModal=true`}
                       target="_blank"
                     />
-                  ) : selectedEvent !== "referral" && aiBuilder.isReviewing ? (
+                  ) : isAiRewardEvent && aiBuilder.isReviewing ? (
                     "Accept or discard the generated reward before saving."
                   ) : undefined
                 }
@@ -1123,7 +1194,7 @@ export function RewardSheet({
 
     rest.setIsOpen(value);
 
-    if (!nextOpen) {
+    if (!nextOpen && !nested) {
       queryParams({ del: "rewardId" });
     }
   };
@@ -1157,6 +1228,7 @@ export function RewardSheet({
     >
       <RewardSheetContent
         {...rest}
+        nested={nested}
         setIsOpen={setIsOpen}
         hasPendingChangesRef={hasPendingChangesRef}
       />
diff --git a/apps/web/ui/partners/rewards/additional-reward-option-list.tsx b/apps/web/ui/partners/rewards/additional-reward-option-list.tsx
new file mode 100644
index 00000000000..337309eaf2f
--- /dev/null
+++ b/apps/web/ui/partners/rewards/additional-reward-option-list.tsx
@@ -0,0 +1,289 @@
+"use client";
+
+import { GroupBadge } from "@/ui/partners/rewards/group-badge";
+import { ThreeDots } from "@/ui/shared/icons";
+import {
+  AnimatedSizeContainer,
+  Button,
+  MenuItem,
+  Popover,
+  Users,
+  useMediaQuery,
+  useScrollProgress,
+} from "@dub/ui";
+import { Pen2, Plus2, Trash } from "@dub/ui/icons";
+import { cn, nFormatter } from "@dub/utils";
+import { Command } from "cmdk";
+import { ReactNode, useEffect, useMemo, useRef, useState } from "react";
+
+export type AdditionalRewardOption = {
+  id: string;
+  label: ReactNode;
+  searchValue: string;
+  isGroup?: boolean;
+  partnersCount?: number | null;
+};
+
+const createItemClassName =
+  "group/button flex h-10 cursor-pointer items-center justify-start gap-2 rounded-lg px-2.5 data-[selected=true]:bg-black/[0.03]";
+
+export function AdditionalRewardOptionList({
+  options,
+  selectedId,
+  onSelect,
+  onEdit,
+  onDelete,
+  searchPlaceholder,
+  emptyLabel,
+  onCreate,
+  createLabel,
+  showModal,
+}: {
+  options: AdditionalRewardOption[];
+  selectedId: string | null | undefined;
+  onSelect: (id: string) => void;
+  onEdit?: (id: string) => void;
+  onDelete?: (id: string) => void;
+  searchPlaceholder: string;
+  emptyLabel: string;
+  onCreate?: () => void;
+  createLabel?: string;
+  showModal?: boolean;
+}) {
+  const [search, setSearch] = useState("");
+  const { isMobile } = useMediaQuery();
+  const inputRef = useRef<HTMLInputElement>(null);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const { scrollProgress, updateScrollProgress } = useScrollProgress(scrollRef);
+  const wasModalOpenRef = useRef(false);
+
+  useEffect(() => {
+    if (showModal === undefined) {
+      return;
+    }
+
+    if (showModal) {
+      if (!wasModalOpenRef.current) {
+        setSearch("");
+      }
+      wasModalOpenRef.current = true;
+    } else {
+      wasModalOpenRef.current = false;
+      setSearch("");
+    }
+  }, [showModal]);
+
+  useEffect(() => {
+    if (showModal === false) {
+      return;
+    }
+
+    inputRef.current &&
+      !isMobile &&
+      setTimeout(() => inputRef.current?.focus(), 10);
+  }, [isMobile, showModal]);
+
+  const normalizedSearch = search.trim().toLowerCase();
+
+  const filteredOptions = useMemo(() => {
+    if (!normalizedSearch) {
+      return options;
+    }
+
+    return options.filter((option) =>
+      option.searchValue.toLowerCase().includes(normalizedSearch),
+    );
+  }, [options, normalizedSearch]);
+
+  const showCreate =
+    Boolean(normalizedSearch) &&
+    filteredOptions.length === 0 &&
+    Boolean(onCreate) &&
+    Boolean(createLabel);
+
+  return (
+    <AnimatedSizeContainer
+      height
+      transition={{ ease: "easeOut", duration: 0.1 }}
+      className="pointer-events-auto -m-1 overflow-clip"
+    >
+      <Command loop shouldFilter={false} className="p-1 pb-2">
+        <Command.Input
+          ref={inputRef}
+          placeholder={searchPlaceholder}
+          value={search}
+          onValueChange={setSearch}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.preventDefault();
+            }
+          }}
+          className="border-border-default placeholder:text-content-muted w-full rounded-lg border px-2.5 py-2 focus:border-neutral-500 focus:outline-none focus:ring-1 focus:ring-neutral-500 sm:text-sm"
+        />
+        <div className="relative">
+          <div
+            ref={scrollRef}
+            onScroll={updateScrollProgress}
+            className="scrollbar-hide max-h-[calc(100dvh-250px)] overflow-y-auto"
+          >
+            <Command.List className="mt-4">
+              {filteredOptions.map((option) => (
+                <Command.Item
+                  key={option.id}
+                  value={`${option.searchValue} ${option.id}`}
+                  onSelect={() => onSelect(option.id)}
+                  onMouseDown={(e) => {
+                    // Keep the search input focused when selecting with mouse
+                    e.preventDefault();
+                  }}
+                  className="cursor-pointer outline-none"
+                >
+                  <AdditionalRewardOptionRow
+                    option={option}
+                    selected={option.id === selectedId}
+                    onEdit={onEdit}
+                    onDelete={onDelete}
+                  />
+                </Command.Item>
+              ))}
+
+              {showCreate && (
+                <Command.Item
+                  className={createItemClassName}
+                  value={`create::${search}`}
+                  forceMount
+                  onMouseDown={(e) => {
+                    e.preventDefault();
+                  }}
+                  onSelect={() => {
+                    onCreate?.();
+                  }}
+                >
+                  <Plus2 className="size-3.5 shrink-0" />
+                  <span className="min-w-0 truncate text-sm font-medium">
+                    {createLabel}
+                  </span>
+                </Command.Item>
+              )}
+
+              {filteredOptions.length === 0 && (
+                <div className="text-content-default flex select-none flex-col items-center justify-center gap-2 py-12">
+                  <span className="text-sm font-medium">{emptyLabel}</span>
+                </div>
+              )}
+            </Command.List>
+          </div>
+
+          <div
+            className="pointer-events-none absolute bottom-0 left-0 hidden h-16 w-full bg-gradient-to-t from-white sm:block"
+            style={{ opacity: 1 - Math.pow(scrollProgress, 2) }}
+          />
+        </div>
+      </Command>
+    </AnimatedSizeContainer>
+  );
+}
+
+function AdditionalRewardOptionRow({
+  option,
+  selected,
+  onEdit,
+  onDelete,
+}: {
+  option: AdditionalRewardOption;
+  selected: boolean;
+  onEdit?: (id: string) => void;
+  onDelete?: (id: string) => void;
+}) {
+  const [openPopover, setOpenPopover] = useState(false);
+  const canDelete = Boolean(onDelete) && !option.isGroup;
+  const showActions = Boolean(onEdit || canDelete);
+
+  return (
+    <div
+      className={cn(
+        "group flex items-center gap-3 rounded-lg py-2 pl-2.5 pr-1.5 transition-colors hover:bg-neutral-100",
+        selected && "bg-transparent",
+      )}
+    >
+      <div className="flex min-w-0 flex-1 items-center gap-3">
+        <span
+          aria-hidden
+          className="border-primary text-primary flex size-3.5 shrink-0 items-center justify-center rounded-full border"
+        >
+          {selected && <span className="size-2.5 rounded-full bg-current" />}
+        </span>
+        <div className="text-content-default min-w-0 flex-1 text-sm leading-5">
+          {option.label}
+        </div>
+      </div>
+
+      <div
+        className="flex w-[92px] shrink-0 items-center justify-between"
+        onPointerDown={(e) => e.stopPropagation()}
+        onClick={(e) => e.stopPropagation()}
+      >
+        <div className="flex items-center gap-1">
+          <Users className="size-3.5 shrink-0 text-neutral-500" />
+          {option.isGroup ? (
+            <GroupBadge />
+          ) : (
+            <span className="text-content-default text-sm font-medium tabular-nums">
+              {nFormatter(option.partnersCount ?? 0, { full: true })}
+            </span>
+          )}
+        </div>
+
+        {showActions ? (
+          <Popover
+            align="end"
+            openPopover={openPopover}
+            setOpenPopover={setOpenPopover}
+            content={
+              <div className="flex min-w-32 flex-col gap-1 p-1">
+                {onEdit && (
+                  <MenuItem
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      setOpenPopover(false);
+                      onEdit(option.id);
+                    }}
+                    icon={<Pen2 className="size-4" />}
+                  >
+                    Edit
+                  </MenuItem>
+                )}
+                {canDelete && (
+                  <MenuItem
+                    variant="danger"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      setOpenPopover(false);
+                      onDelete?.(option.id);
+                    }}
+                    icon={<Trash className="size-4" />}
+                  >
+                    Delete
+                  </MenuItem>
+                )}
+              </div>
+            }
+          >
+            <Button
+              type="button"
+              variant="outline"
+              icon={<ThreeDots className="size-3.5" />}
+              className="size-6 rounded-lg border-transparent p-0 hover:bg-black/5"
+              onClick={(e) => {
+                e.stopPropagation();
+                setOpenPopover(!openPopover);
+              }}
+            />
+          </Popover>
+        ) : (
+          <div className="size-6" />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/ai-reward-builder.tsx b/apps/web/ui/partners/rewards/ai-reward-builder.tsx
index 015d4811b70..e72979b34b8 100644
--- a/apps/web/ui/partners/rewards/ai-reward-builder.tsx
+++ b/apps/web/ui/partners/rewards/ai-reward-builder.tsx
@@ -37,14 +37,24 @@ const CHROME_ENTER_MS = 240;
 
 type BuilderPhase = "idle" | "streaming" | "review" | "error";
 
+type DraftCondition = NonNullable<
+  NonNullable<AIRewardDraft["modifiers"]>[number]["conditions"]
+>[number];
+
+type DraftModifier = NonNullable<AIRewardDraft["modifiers"]>[number] & {
+  conditions?: Array<DraftCondition | null | undefined>;
+};
+
 function buildRewardFormValuesFromDraft({
   draft,
   event,
   current,
   finalize = false,
 }: {
-  draft: AIRewardDraft | Partial<AIRewardDraft>;
-  event: Exclude<EventType, "referral">;
+  draft: Omit<Partial<AIRewardDraft>, "modifiers"> & {
+    modifiers?: Array<DraftModifier | null | undefined>;
+  };
+  event: Exclude<EventType, "referral" | "custom">;
   current: Record<string, unknown>;
   finalize?: boolean;
 }): Record<string, unknown> | null {
@@ -77,11 +87,27 @@ function buildRewardFormValuesFromDraft({
     next.maxDuration = maxDuration;
   }
 
-  const modifiers = draft.modifiers?.filter((m) => m.conditions?.length);
-  if (!modifiers?.length) {
+  const modifiers = (draft.modifiers ?? [])
+    .map((modifier) => {
+      if (!modifier) return null;
+
+      const conditions = (modifier.conditions ?? []).filter(
+        (condition): condition is DraftCondition => condition != null,
+      );
+
+      if (!conditions.length) return null;
+
+      return { ...modifier, conditions };
+    })
+    .filter((modifier): modifier is NonNullable<typeof modifier> =>
+      Boolean(modifier),
+    );
+
+  if (!modifiers.length) {
     // Only clear stale conditions on the final draft so partial streams do not wipe them.
+    // Empty array (not undefined) so react-hook-form useFieldArray syncs and unmounts rows.
     if (finalize) {
-      next.modifiers = undefined;
+      next.modifiers = [];
     }
     return next;
   }
@@ -136,7 +162,7 @@ export function useAIRewardBuilder({
   getValues,
   reset,
 }: {
-  event: Exclude<EventType, "referral">;
+  event: Exclude<EventType, "referral" | "custom">;
   getValues: () => Record<string, unknown>;
   reset: (
     values: Record<string, unknown>,
@@ -387,7 +413,7 @@ export function AIRewardInput({
   event,
   builder,
 }: {
-  event: Exclude<EventType, "referral">;
+  event: Exclude<EventType, "referral" | "custom">;
   builder: AIRewardBuilderState;
 }) {
   const shouldReduceMotion = useReducedMotion();
@@ -930,7 +956,11 @@ function SkeletonPill({ className }: { className?: string }) {
   );
 }
 
-function ReviewSkeletons({ event }: { event: Exclude<EventType, "referral"> }) {
+function ReviewSkeletons({
+  event,
+}: {
+  event: Exclude<EventType, "referral" | "custom">;
+}) {
   return (
     <div className="border-border-subtle rounded-xl border bg-white text-sm shadow-sm">
       <div className="flex items-start gap-2.5 p-2.5">
diff --git a/apps/web/ui/partners/rewards/custom-reward-builder.tsx b/apps/web/ui/partners/rewards/custom-reward-builder.tsx
new file mode 100644
index 00000000000..3b0960d81f3
--- /dev/null
+++ b/apps/web/ui/partners/rewards/custom-reward-builder.tsx
@@ -0,0 +1,233 @@
+"use client";
+
+import { getUtcPeriodDate } from "@/lib/api/rewards/custom-reward-utils";
+import { constructRewardAmount } from "@/lib/api/sales/construct-reward-amount";
+import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";
+import type { CustomRewardConfig } from "@/lib/types";
+import { RECURRING_MAX_DURATIONS } from "@/lib/zod/schemas/misc";
+import {
+  CUSTOM_REWARD_CADENCE_PRESETS,
+  customRewardConfigSchema,
+} from "@/lib/zod/schemas/rewards";
+import { DatePicker } from "@dub/ui";
+import { cn, pluralize } from "@dub/utils";
+import { useContext, useEffect, useMemo } from "react";
+import { DurationPopoverContent } from "../../shared/duration-popover-content";
+import {
+  InlineBadgePopover,
+  InlineBadgePopoverContext,
+  InlineBadgePopoverMenu,
+} from "../../shared/inline-badge-popover";
+import { useAddEditRewardForm } from "./add-edit-reward-sheet";
+
+function parseCustomConfig(config: unknown): CustomRewardConfig | null {
+  const parsed = customRewardConfigSchema.safeParse(config);
+  return parsed.success ? parsed.data : null;
+}
+
+function getCadencePresetValue(config: CustomRewardConfig | null) {
+  if (!config) {
+    return "monthly";
+  }
+
+  const preset = CUSTOM_REWARD_CADENCE_PRESETS.find(
+    (p) => p.frequency === config.frequency && p.interval === config.interval,
+  );
+
+  return preset?.value ?? "monthly";
+}
+
+export function CustomRewardBuilder() {
+  const { watch, setValue } = useAddEditRewardForm();
+
+  const [amountInCents, config, maxDuration] = watch([
+    "amountInCents",
+    "config",
+    "maxDuration",
+  ]);
+
+  const customConfig = useMemo(() => parseCustomConfig(config), [config]);
+  const cadenceValue = getCadencePresetValue(customConfig);
+
+  useEffect(() => {
+    setValue("type", "flat", { shouldDirty: false });
+
+    if (customConfig) {
+      return;
+    }
+
+    const monthly = CUSTOM_REWARD_CADENCE_PRESETS.find(
+      (p) => p.value === "monthly",
+    )!;
+
+    setValue(
+      "config",
+      {
+        frequency: monthly.frequency,
+        interval: monthly.interval,
+        anchorDate: getUtcPeriodDate(),
+      },
+      { shouldDirty: false },
+    );
+  }, [customConfig, setValue]);
+
+  const amountLabel =
+    amountInCents != null && !Number.isNaN(amountInCents)
+      ? constructRewardAmount({
+          type: "flat",
+          amountInCents: amountInCents * 100,
+          amountInPercentage: null,
+          maxDuration: null,
+        })
+      : "amount";
+
+  const cadenceLabel =
+    CUSTOM_REWARD_CADENCE_PRESETS.find(
+      (p) => p.value === cadenceValue,
+    )?.label.toLowerCase() ?? "monthly";
+
+  const durationLabel =
+    maxDuration === Infinity || maxDuration == null
+      ? "indefinitely"
+      : `for ${maxDuration} ${pluralize("month", Number(maxDuration))}`;
+
+  const minAnchorDate = useMemo(
+    () => new Date(`${getUtcPeriodDate()}T12:00:00`),
+    [],
+  );
+
+  const anchorDate = customConfig?.anchorDate
+    ? new Date(`${customConfig.anchorDate}T12:00:00`)
+    : undefined;
+
+  return (
+    <span className="leading-relaxed">
+      Pay{" "}
+      <InlineBadgePopover text={amountLabel} invalid={amountInCents == null}>
+        <AmountInput />
+      </InlineBadgePopover>{" "}
+      <InlineBadgePopover text={cadenceLabel}>
+        <InlineBadgePopoverMenu
+          selectedValue={cadenceValue}
+          onSelect={(value) => {
+            const preset = CUSTOM_REWARD_CADENCE_PRESETS.find(
+              (p) => p.value === value,
+            );
+            if (!preset) {
+              return;
+            }
+
+            setValue(
+              "config",
+              {
+                frequency: preset.frequency,
+                interval: preset.interval,
+                anchorDate: customConfig?.anchorDate ?? getUtcPeriodDate(),
+              },
+              { shouldDirty: true },
+            );
+          }}
+          items={CUSTOM_REWARD_CADENCE_PRESETS.map((preset) => ({
+            text: preset.label,
+            value: preset.value,
+          }))}
+        />
+      </InlineBadgePopover>
+      , starting{" "}
+      <DatePicker
+        value={anchorDate}
+        onChange={(date) => {
+          if (!date) {
+            return;
+          }
+
+          const year = date.getFullYear();
+          const month = String(date.getMonth() + 1).padStart(2, "0");
+          const day = String(date.getDate()).padStart(2, "0");
+          const nextAnchorDate = `${year}-${month}-${day}`;
+
+          if (nextAnchorDate < getUtcPeriodDate()) {
+            return;
+          }
+
+          setValue(
+            "config",
+            {
+              frequency: customConfig?.frequency ?? "month",
+              interval: customConfig?.interval ?? 1,
+              anchorDate: nextAnchorDate,
+            },
+            { shouldDirty: true },
+          );
+        }}
+        placeholder="Select date"
+        invalid={!customConfig?.anchorDate}
+        fromDate={minAnchorDate}
+        disabledDays={{ before: minAnchorDate }}
+        trigger={({ displayValue, placeholder, invalid }) => (
+          <button
+            type="button"
+            className={cn(
+              "inline-block rounded px-1.5 text-left text-sm font-semibold transition-colors",
+              invalid
+                ? "bg-orange-50 text-orange-500 hover:bg-orange-100 data-[state=open]:bg-orange-100"
+                : "bg-blue-50 text-blue-700 hover:bg-blue-100 data-[state=open]:bg-blue-100",
+            )}
+          >
+            {displayValue ?? placeholder}
+          </button>
+        )}
+      />{" "}
+      <InlineBadgePopover text={durationLabel}>
+        <DurationPopoverContent
+          value={
+            maxDuration === Infinity || maxDuration == null
+              ? Infinity
+              : Number(maxDuration)
+          }
+          onChange={(value) =>
+            setValue("maxDuration", value === Infinity ? null : value, {
+              shouldDirty: true,
+            })
+          }
+          presetDurations={RECURRING_MAX_DURATIONS.filter(
+            (v) => v !== 0 && v !== 1,
+          )}
+          minValue={1}
+          hideLifetime
+        />
+      </InlineBadgePopover>
+    </span>
+  );
+}
+
+function AmountInput() {
+  const { register } = useAddEditRewardForm();
+  const { setIsOpen } = useContext(InlineBadgePopoverContext);
+
+  return (
+    <div className="relative rounded-md shadow-sm">
+      <span className="absolute inset-y-0 left-0 flex items-center pl-1.5 text-sm text-neutral-500">
+        $
+      </span>
+      <input
+        className="block w-full rounded-md border-neutral-300 pl-4 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+        placeholder="0.00"
+        {...register("amountInCents", {
+          required: true,
+          setValueAs: (value: string) => (value === "" ? undefined : +value),
+          min: 0,
+          onChange: handleMoneyInputChange,
+        })}
+        onKeyDown={(e) => {
+          if (e.key === "Enter") {
+            e.preventDefault();
+            setIsOpen(false);
+            return;
+          }
+          handleMoneyKeyDown(e);
+        }}
+      />
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/discount-selector.tsx b/apps/web/ui/partners/rewards/discount-selector.tsx
new file mode 100644
index 00000000000..b0476a399fa
--- /dev/null
+++ b/apps/web/ui/partners/rewards/discount-selector.tsx
@@ -0,0 +1,70 @@
+import { GroupBadge } from "@/ui/partners/rewards/group-badge";
+import { Combobox, ComboboxOption } from "@dub/ui";
+import { cn } from "@dub/utils";
+
+export type DiscountSelectorOption = ComboboxOption<{
+  isGroup?: boolean;
+  partnersCount?: number | null;
+}>;
+
+export function DiscountSelector({
+  options,
+  selectedId,
+  onChange,
+}: {
+  options: DiscountSelectorOption[];
+  selectedId: string | null | undefined;
+  onChange: (id: string | null) => void;
+}) {
+  const selected =
+    options.find((option) => option.value === selectedId) ?? null;
+
+  return (
+    <div className="flex flex-col gap-2">
+      <label className="text-content-emphasis block text-sm font-medium">
+        Discount
+      </label>
+      <Combobox
+        selected={selected}
+        setSelected={(option) => {
+          if (!option) {
+            onChange(null);
+            return;
+          }
+
+          onChange(option.meta?.isGroup ? null : option.value);
+        }}
+        options={options}
+        caret
+        hideSearch
+        shouldFilter={false}
+        matchTriggerWidth
+        placeholder="None"
+        popoverProps={{
+          contentClassName: "w-[var(--radix-popover-trigger-width)]",
+        }}
+        buttonProps={{
+          className: cn(
+            "w-full h-10 justify-start px-3",
+            "data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500",
+            "focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",
+          ),
+        }}
+        labelProps={{
+          className:
+            "flex min-w-0 items-center justify-between gap-2 overflow-hidden",
+        }}
+        optionRight={(option) =>
+          option.meta?.isGroup ? <GroupBadge /> : undefined
+        }
+      >
+        {selected ? (
+          <>
+            <span className="min-w-0 truncate">{selected.label}</span>
+            {selected.meta?.isGroup && <GroupBadge />}
+          </>
+        ) : null}
+      </Combobox>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/group-badge.tsx b/apps/web/ui/partners/rewards/group-badge.tsx
new file mode 100644
index 00000000000..002dbbb2304
--- /dev/null
+++ b/apps/web/ui/partners/rewards/group-badge.tsx
@@ -0,0 +1,7 @@
+export function GroupBadge() {
+  return (
+    <span className="rounded-md bg-neutral-200 px-1.5 py-0.5 text-xs font-semibold text-neutral-600">
+      Group
+    </span>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/reward-event-descriptions.tsx b/apps/web/ui/partners/rewards/reward-event-descriptions.tsx
index 3b963fc0edc..0232c722b67 100644
--- a/apps/web/ui/partners/rewards/reward-event-descriptions.tsx
+++ b/apps/web/ui/partners/rewards/reward-event-descriptions.tsx
@@ -1,4 +1,11 @@
-import { CursorRays, Icon, InvoiceDollar, Nodes4, UserPlus } from "@dub/ui";
+import {
+  CalendarDays,
+  CursorRays,
+  Icon,
+  InvoiceDollar,
+  Nodes4,
+  UserPlus,
+} from "@dub/ui";
 import { EventType } from "@prisma/client";
 
 export const REWARD_EVENT_DESCRIPTIONS: Record<
@@ -42,4 +49,12 @@ export const REWARD_EVENT_DESCRIPTIONS: Record<
     bestFor: "driving partner growth to your program",
     learnMoreHref: "https://dub.co/help/article/partner-referrals",
   },
+  custom: {
+    icon: CalendarDays,
+    title: "Custom reward",
+    description: "Pay a fixed amount on a regular cadence",
+    bestFor: "retainers and scheduled partner payments",
+    learnMoreHref:
+      "https://dub.co/help/article/retainer-rewards",
+  },
 };
diff --git a/apps/web/ui/partners/rewards/reward-event-icon.tsx b/apps/web/ui/partners/rewards/reward-event-icon.tsx
index a1d7683bc88..66d0d12fa10 100644
--- a/apps/web/ui/partners/rewards/reward-event-icon.tsx
+++ b/apps/web/ui/partners/rewards/reward-event-icon.tsx
@@ -1,8 +1,15 @@
-import { CursorRays, InvoiceDollar, Nodes4, UserPlus } from "@dub/ui/icons";
+import {
+  CalendarDays,
+  CursorRays,
+  InvoiceDollar,
+  Nodes4,
+  UserPlus,
+} from "@dub/ui/icons";
 
 export const REWARD_EVENT_ICON = {
   click: CursorRays,
   lead: UserPlus,
   sale: InvoiceDollar,
   referral: Nodes4,
+  custom: CalendarDays,
 };
diff --git a/apps/web/ui/partners/rewards/reward-override-icon.tsx b/apps/web/ui/partners/rewards/reward-override-icon.tsx
new file mode 100644
index 00000000000..7e671e292cd
--- /dev/null
+++ b/apps/web/ui/partners/rewards/reward-override-icon.tsx
@@ -0,0 +1,29 @@
+import { cn } from "@dub/utils";
+
+export function RewardOverrideIcon({
+  ringClassName = "stroke-white",
+}: {
+  /** Ring color around the dot; should match the background the icon sits on */
+  ringClassName?: string;
+}) {
+  return (
+    <span aria-hidden className="absolute right-0 top-0 size-1">
+      <svg
+        width="8"
+        height="8"
+        viewBox="0 0 8 8"
+        fill="none"
+        className="absolute inset-[-50%] overflow-visible"
+      >
+        <circle
+          cx="4"
+          cy="4"
+          r="3"
+          fill="#155DFC"
+          strokeWidth="2"
+          className={cn("transition-colors", ringClassName)}
+        />
+      </svg>
+    </span>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/reward-presets.ts b/apps/web/ui/partners/rewards/reward-presets.ts
index 70e9fa87796..ad5b17d1a28 100644
--- a/apps/web/ui/partners/rewards/reward-presets.ts
+++ b/apps/web/ui/partners/rewards/reward-presets.ts
@@ -8,7 +8,7 @@ export type RewardPreset = {
 };
 
 export const REWARD_PRESETS: Partial<
-  Record<Exclude<EventType, "referral">, RewardPreset[]>
+  Record<Exclude<EventType, "referral" | "custom">, RewardPreset[]>
 > = {
   sale: [
     {
diff --git a/apps/web/ui/partners/rewards/reward-preview-card.tsx b/apps/web/ui/partners/rewards/reward-preview-card.tsx
index 6cfa919a6e7..06b97a3d33d 100644
--- a/apps/web/ui/partners/rewards/reward-preview-card.tsx
+++ b/apps/web/ui/partners/rewards/reward-preview-card.tsx
@@ -1,3 +1,4 @@
+import { isEventBasedReward } from "@/lib/api/rewards/custom-reward-utils";
 import { EnrolledPartnerProps } from "@/lib/types";
 import { PartnerAvatar } from "@/ui/partners/partner-avatar";
 import { Button, Table, useTable } from "@dub/ui";
@@ -52,18 +53,20 @@ export function RewardPreviewCard() {
         <span className="text-content-emphasis flex items-center gap-2.5 text-sm font-semibold">
           Reward preview
         </span>
-        <div className="flex items-center gap-2">
-          <span className="text-xs font-semibold text-neutral-500">
-            {hasConditions ? "Base reward quality" : "Reward quality"}
-          </span>
-          <RewardQualityIndicator
-            event={reward.event}
-            quality={quality}
-            tooltipFooter={
-              hasConditions ? "Based on default reward only" : undefined
-            }
-          />
-        </div>
+        {isEventBasedReward(reward) && (
+          <div className="flex items-center gap-2">
+            <span className="text-xs font-semibold text-neutral-500">
+              {hasConditions ? "Base reward quality" : "Reward quality"}
+            </span>
+            <RewardQualityIndicator
+              event={reward.event}
+              quality={quality}
+              tooltipFooter={
+                hasConditions ? "Based on default reward only" : undefined
+              }
+            />
+          </div>
+        )}
       </div>
 
       <div className="border-border-subtle bg-bg-default -mx-px rounded-xl border-x border-t p-4">
diff --git a/apps/web/ui/partners/rewards/reward-quality.tsx b/apps/web/ui/partners/rewards/reward-quality.tsx
index 1089034b773..68569970748 100644
--- a/apps/web/ui/partners/rewards/reward-quality.tsx
+++ b/apps/web/ui/partners/rewards/reward-quality.tsx
@@ -38,6 +38,32 @@ export const getRewardQuality = ({
     return "strong";
   }
 
+  if (event === "referral") {
+    if (type === "flat") {
+      if (amountInCents == null || Number.isNaN(amountInCents)) {
+        return null;
+      }
+
+      return "limited";
+    }
+
+    if (type !== "percentage") {
+      return null;
+    }
+
+    if (amountInPercentage == null || Number.isNaN(amountInPercentage)) {
+      return null;
+    }
+
+    if (maxDuration === 1) {
+      return "limited";
+    }
+
+    if (amountInPercentage < 3) return "low";
+    if (amountInPercentage <= 5) return "good";
+    return "strong";
+  }
+
   if (event !== "sale" || !type) {
     return null;
   }
@@ -234,7 +260,7 @@ function getRewardQualityTooltipCopy({
     return {
       title: "Reward quality",
       description:
-        event === "click" || event === "lead"
+        event === "click" || event === "lead" || event === "referral"
           ? "Set amount to evaluate this reward"
           : "Set amount and duration to evaluate this reward",
     };
diff --git a/apps/web/ui/partners/rewards/reward-selector.tsx b/apps/web/ui/partners/rewards/reward-selector.tsx
new file mode 100644
index 00000000000..c341b561504
--- /dev/null
+++ b/apps/web/ui/partners/rewards/reward-selector.tsx
@@ -0,0 +1,72 @@
+import { GroupBadge } from "@/ui/partners/rewards/group-badge";
+import { Combobox, ComboboxOption } from "@dub/ui";
+import { cn } from "@dub/utils";
+
+export type RewardSelectorOption = ComboboxOption<{
+  isGroup?: boolean;
+  partnersCount?: number | null;
+}>;
+
+export function RewardSelector({
+  label,
+  options,
+  selectedId,
+  onChange,
+}: {
+  label: string;
+  options: RewardSelectorOption[];
+  selectedId: string | null | undefined;
+  onChange: (id: string | null) => void;
+}) {
+  const selected =
+    options.find((option) => option.value === selectedId) ?? null;
+
+  return (
+    <div className="flex flex-col gap-2">
+      <label className="text-content-emphasis block text-sm font-medium">
+        {label}
+      </label>
+      <Combobox
+        selected={selected}
+        setSelected={(option) => {
+          if (!option) {
+            onChange(null);
+            return;
+          }
+
+          onChange(option.meta?.isGroup ? null : option.value);
+        }}
+        options={options}
+        caret
+        hideSearch
+        shouldFilter={false}
+        matchTriggerWidth
+        placeholder="None"
+        popoverProps={{
+          contentClassName: "w-[var(--radix-popover-trigger-width)]",
+        }}
+        buttonProps={{
+          className: cn(
+            "w-full h-10 justify-start px-3",
+            "data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500",
+            "focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",
+          ),
+        }}
+        labelProps={{
+          className:
+            "flex min-w-0 items-center justify-between gap-2 overflow-hidden",
+        }}
+        optionRight={(option) =>
+          option.meta?.isGroup ? <GroupBadge /> : undefined
+        }
+      >
+        {selected ? (
+          <>
+            <span className="min-w-0 truncate">{selected.label}</span>
+            {selected.meta?.isGroup && <GroupBadge />}
+          </>
+        ) : null}
+      </Combobox>
+    </div>
+  );
+}
diff --git a/apps/web/ui/partners/rewards/rewards-logic.tsx b/apps/web/ui/partners/rewards/rewards-logic.tsx
index c3b31ca4fc4..86b0bc52fd1 100644
--- a/apps/web/ui/partners/rewards/rewards-logic.tsx
+++ b/apps/web/ui/partners/rewards/rewards-logic.tsx
@@ -386,25 +386,27 @@ function ConditionLogic({
     name: ["event", conditionKey, `${modifierKey}.operator`],
   });
 
+  const [displayProductLabel, setDisplayProductLabel] = useState(false);
+
   const entities = REWARD_CONDITIONS[event].entities;
-  const entity = condition.entity
+  const entity = condition?.entity
     ? entities.find((e) => e.id === condition.entity)
     : undefined;
 
   const attribute =
-    entity && condition.attribute
+    entity && condition?.attribute
       ? entity.attributes.find((a) => a.id === condition.attribute)
       : undefined;
 
   const attributeType = attribute?.type ?? "string";
 
   const isMetadataCondition =
-    (condition.entity === "lead" || condition.entity === "sale") &&
-    condition.attribute === "metadata";
+    (condition?.entity === "lead" || condition?.entity === "sale") &&
+    condition?.attribute === "metadata";
 
   const isMetadataNumeric =
     isMetadataCondition &&
-    !!condition.operator &&
+    !!condition?.operator &&
     METADATA_NUMBER_CONDITION_OPERATORS.includes(condition.operator);
 
   const icon = entity
@@ -417,18 +419,17 @@ function ConditionLogic({
     : ArrowTurnRight2;
 
   const isArrayValue =
-    condition.operator === "in" || condition.operator === "not_in";
+    condition?.operator === "in" || condition?.operator === "not_in";
 
   const isContainsOperator =
-    condition.operator === "contains" || condition.operator === "not_contains";
-
-  const [displayProductLabel, setDisplayProductLabel] = useState(false);
+    condition?.operator === "contains" ||
+    condition?.operator === "not_contains";
 
   // Auto-set operator to "equals_to" for customer.source
   const isCustomerSourceCondition =
-    condition.entity === "customer" && condition.attribute === "source";
+    condition?.entity === "customer" && condition?.attribute === "source";
   const isSaleTypeCondition =
-    condition.entity === "sale" && condition.attribute === "type";
+    condition?.entity === "sale" && condition?.attribute === "type";
 
   const availableConditionOperators: (typeof CONDITION_OPERATORS)[number][] =
     attributeType === "metadata"
@@ -443,6 +444,7 @@ function ConditionLogic({
 
   useEffect(() => {
     if (
+      condition &&
       isMetadataCondition &&
       condition.operator &&
       !METADATA_CONDITION_OPERATORS.includes(condition.operator)
@@ -461,7 +463,7 @@ function ConditionLogic({
     }
   }, [
     isMetadataCondition,
-    condition.operator,
+    condition?.operator,
     condition,
     conditionKey,
     setValue,
@@ -469,6 +471,7 @@ function ConditionLogic({
 
   useEffect(() => {
     if (
+      condition &&
       (isCustomerSourceCondition || isSaleTypeCondition) &&
       condition.operator !== "equals_to"
     ) {
@@ -486,19 +489,21 @@ function ConditionLogic({
   }, [
     isCustomerSourceCondition,
     isSaleTypeCondition,
-    condition.operator,
+    condition?.operator,
     condition,
     conditionKey,
     setValue,
   ]);
 
+  if (!condition) return null;
+
   return (
     <div className="flex w-full flex-col">
       <div className="flex items-center justify-between p-2.5">
         <div className="flex items-center gap-1.5">
           <RewardIconSquare icon={icon} />
           <span className="text-content-emphasis font-medium leading-relaxed">
-            {conditionIndex === 0 ? "If" : capitalize(operator.toLowerCase())}{" "}
+            {conditionIndex === 0 ? "If" : capitalize(operator?.toLowerCase())}{" "}
             <InlineBadgePopover
               text={capitalize(condition.entity) || "Select item"}
               invalid={!condition.entity}
@@ -556,19 +561,10 @@ function ConditionLogic({
                         },
                       )
                     }
-                    items={entity.attributes
-                      .filter(
-                        (attribute) =>
-                          attribute.id !== "source" ||
-                          (program &&
-                            SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(
-                              program.id,
-                            )),
-                      )
-                      .map((attribute) => ({
-                        text: attribute.label,
-                        value: attribute.id,
-                      }))}
+                    items={entity.attributes.map((attribute) => ({
+                      text: attribute.label,
+                      value: attribute.id,
+                    }))}
                   />
                 </InlineBadgePopover>{" "}
                 {isMetadataCondition && (
@@ -772,10 +768,25 @@ function ConditionLogic({
                               condition.value,
                               isArrayValue,
                             )}
-                            items={attribute.options.map(({ id, label }) => ({
-                              text: label,
-                              value: id,
-                            }))}
+                            items={attribute.options
+                              .filter(({ id }) => {
+                                if (
+                                  isCustomerSourceCondition &&
+                                  id === "submitted"
+                                ) {
+                                  return (
+                                    program &&
+                                    SUBMITTED_LEADS_ENABLED_PROGRAM_IDS.includes(
+                                      program.id,
+                                    )
+                                  );
+                                }
+                                return true;
+                              })
+                              .map(({ id, label }) => ({
+                                text: label,
+                                value: id,
+                              }))}
                             onSelect={(value) => {
                               setValue(conditionKey, {
                                 ...condition,
diff --git a/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.ts b/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.ts
new file mode 100644
index 00000000000..b17fbf5d62c
--- /dev/null
+++ b/apps/web/ui/partners/rewards/use-custom-reward-and-discount-options.ts
@@ -0,0 +1,87 @@
+import { useDiscounts } from "@/lib/swr/use-discounts";
+import useGroup from "@/lib/swr/use-group";
+import { useRewards } from "@/lib/swr/use-rewards";
+import { EnrolledPartnerProps } from "@/lib/types";
+import { REWARD_EVENT_COLUMN_MAPPING } from "@/lib/zod/schemas/rewards";
+import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
+import { formatRewardDescription } from "@/ui/partners/format-reward-description";
+import { DiscountSelectorOption } from "@/ui/partners/rewards/discount-selector";
+import { RewardSelectorOption } from "@/ui/partners/rewards/reward-selector";
+import { useMemo } from "react";
+
+export function useCustomRewardAndDiscountOptions({
+  partnerGroupId,
+}: {
+  partnerGroupId: EnrolledPartnerProps["groupId"];
+}) {
+  const { group } = useGroup({ groupIdOrSlug: partnerGroupId ?? undefined });
+  const { rewards } = useRewards({ groupId: partnerGroupId });
+  const { discounts } = useDiscounts({ groupId: partnerGroupId });
+
+  return useMemo(() => {
+    const clickRewards: RewardSelectorOption[] = [];
+    const saleRewards: RewardSelectorOption[] = [];
+    const leadRewards: RewardSelectorOption[] = [];
+
+    const optionsByColumn = {
+      [REWARD_EVENT_COLUMN_MAPPING.click]: clickRewards,
+      [REWARD_EVENT_COLUMN_MAPPING.lead]: leadRewards,
+      [REWARD_EVENT_COLUMN_MAPPING.sale]: saleRewards,
+    };
+
+    const groupRewardIds = {
+      click: group?.clickReward?.id,
+      lead: group?.leadReward?.id,
+      sale: group?.saleReward?.id,
+    };
+
+    for (const reward of rewards ?? []) {
+      if (!["click", "lead", "sale"].includes(reward.event)) {
+        continue;
+      }
+
+      const groupRewardId = groupRewardIds[reward.event];
+
+      optionsByColumn[REWARD_EVENT_COLUMN_MAPPING[reward.event]].push({
+        value: reward.id,
+        label: formatRewardDescription(reward),
+        first: reward.id === groupRewardId,
+        meta: {
+          isGroup: reward.id === groupRewardId,
+          partnersCount: reward.partnersCount,
+        },
+      });
+    }
+
+    const groupDiscountId = group?.discount?.id;
+    const discountOptions: DiscountSelectorOption[] = (discounts ?? []).map(
+      (discount) => ({
+        value: discount.id,
+        label: formatDiscountDescription(discount),
+        first: discount.id === groupDiscountId,
+        meta: {
+          isGroup: discount.id === groupDiscountId,
+          partnersCount: discount.partnersCount,
+        },
+      }),
+    );
+
+    return {
+      clickRewards,
+      saleRewards,
+      leadRewards,
+      discounts: discountOptions,
+      groupClickRewardId: groupRewardIds.click,
+      groupLeadRewardId: groupRewardIds.lead,
+      groupSaleRewardId: groupRewardIds.sale,
+      groupDiscountId,
+    };
+  }, [
+    rewards,
+    discounts,
+    group?.clickReward?.id,
+    group?.leadReward?.id,
+    group?.saleReward?.id,
+    group?.discount?.id,
+  ]);
+}
diff --git a/apps/web/ui/postbacks/postback-secret-modal.tsx b/apps/web/ui/postbacks/postback-secret-modal.tsx
index d43734b7e9b..ffd58efed15 100644
--- a/apps/web/ui/postbacks/postback-secret-modal.tsx
+++ b/apps/web/ui/postbacks/postback-secret-modal.tsx
@@ -85,10 +85,13 @@ export function usePostbackSecretModal() {
     setState({ show: false, secret: "" });
   }
 
-  function PostbackSecretModalWrapper() {
-    if (!state.show) return null;
-
-    return (
+  return {
+    openPostbackSecretModal,
+    closePostbackSecretModal,
+    // Return an element (rendered as `{PostbackSecretModal}`) rather than a
+    // per-render component type, which would remount the modal – and reset its
+    // state – on every parent render
+    PostbackSecretModal: (
       <PostbackSecretModal
         showModal={state.show}
         setShowModal={(show) => {
@@ -97,13 +100,7 @@ export function usePostbackSecretModal() {
         }}
         secret={state.secret}
       />
-    );
-  }
-
-  return {
-    openPostbackSecretModal,
-    closePostbackSecretModal,
-    PostbackSecretModal: PostbackSecretModalWrapper,
+    ),
     isPostbackSecretModalOpen: state.show,
   };
 }
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-apply-button.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-apply-button.tsx
new file mode 100644
index 00000000000..095c94a82d1
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-apply-button.tsx
@@ -0,0 +1,32 @@
+"use client";
+
+import { Button } from "@dub/ui";
+import { fetcher, PARTNERS_DOMAIN } from "@dub/utils";
+import useSWR from "swr";
+
+export function MarketplaceExternalApplyButton({
+  programSlug,
+}: {
+  programSlug: string;
+}) {
+  const { data: session } = useSWR("/api/auth/session", fetcher, {
+    dedupingInterval: 60000,
+  });
+
+  return (
+    <a
+      href={
+        session && Object.keys(session).length > 0
+          ? `${PARTNERS_DOMAIN}/marketplace/${programSlug}`
+          : `${PARTNERS_DOMAIN}/${programSlug}/apply`
+      }
+      target="_blank"
+      className="inline-block"
+    >
+      <Button
+        text="Apply"
+        className="h-9 w-fit rounded-lg px-5 text-sm font-medium"
+      />
+    </a>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-filters.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-filters.tsx
new file mode 100644
index 00000000000..5d474d4f4fa
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-filters.tsx
@@ -0,0 +1,181 @@
+import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
+import {
+  MARKETPLACE_REWARD_TYPES,
+  type MarketplaceRewardType,
+} from "@/ui/program-marketplace/utils/constants";
+import { buildExternalMarketplaceFilterHref } from "@/ui/program-marketplace/utils/urls";
+import { Check } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { Category } from "@prisma/client";
+import Link from "next/link";
+import type { ReactNode } from "react";
+
+export function MarketplaceExternalFilterSidebar({
+  basePath,
+  activeCategory,
+  activeRewardType,
+  categoryCounts,
+  rewardTypeCounts,
+  search,
+  sortBy,
+  sortOrder,
+}: {
+  basePath: string;
+  activeCategory?: Category;
+  activeRewardType?: MarketplaceRewardType;
+  categoryCounts: { category: Category; count: number }[];
+  rewardTypeCounts: {
+    type: MarketplaceRewardType;
+    count: number;
+  }[];
+  search?: string;
+  sortBy?: string;
+  sortOrder?: string;
+}) {
+  const buildHref = (params: {
+    category?: Category | null;
+    rewardType?: MarketplaceRewardType | null;
+  }) =>
+    buildExternalMarketplaceFilterHref({
+      basePath,
+      activeRewardType,
+      search,
+      sortBy,
+      sortOrder,
+      ...params,
+    });
+
+  return (
+    <aside className="w-full shrink-0 lg:w-56">
+      <div className="flex flex-col gap-6">
+        <FilterSection title="Reward type">
+          {rewardTypeCounts.map(({ type, count }) => (
+            <FilterLink
+              key={type}
+              href={buildHref({
+                rewardType: activeRewardType === type ? null : type,
+              })}
+              active={activeRewardType === type}
+              count={count}
+            >
+              {MARKETPLACE_REWARD_TYPES[type]}
+            </FilterLink>
+          ))}
+        </FilterSection>
+
+        <FilterSection title="Category">
+          {categoryCounts.map(({ category, count }) => (
+            <FilterLink
+              key={category}
+              href={buildHref({
+                category: activeCategory === category ? null : category,
+              })}
+              active={activeCategory === category}
+              count={count}
+            >
+              {PROGRAM_CATEGORIES_MAP[category]?.label ??
+                category.replaceAll("_", " ")}
+            </FilterLink>
+          ))}
+        </FilterSection>
+      </div>
+    </aside>
+  );
+}
+
+export function MarketplaceExternalFilterSidebarSkeleton() {
+  return (
+    <aside className="w-full shrink-0 lg:w-56">
+      <div className="flex flex-col gap-6">
+        {[4, 6].map((rows, sectionIndex) => (
+          <div key={sectionIndex} className="flex flex-col gap-1">
+            <div className="px-2 py-2">
+              <div className="h-4 w-20 animate-pulse rounded bg-neutral-200" />
+            </div>
+            <div className="flex flex-col gap-1">
+              {[...Array(rows)].map((_, index) => (
+                <div
+                  key={index}
+                  className="flex items-center gap-3 px-2 py-2"
+                  aria-hidden
+                >
+                  <div className="size-4 shrink-0 animate-pulse rounded border border-neutral-200 bg-neutral-200" />
+                  <div className="h-3 flex-1 animate-pulse rounded bg-neutral-200" />
+                  <div className="h-3 w-4 shrink-0 animate-pulse rounded bg-neutral-200" />
+                </div>
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+    </aside>
+  );
+}
+
+function FilterSection({
+  title,
+  children,
+}: {
+  title: string;
+  children: ReactNode;
+}) {
+  return (
+    <div className="flex flex-col gap-1">
+      <span className="text-content-emphasis px-2 py-2 text-sm font-semibold">
+        {title}
+      </span>
+      <div className="flex flex-col gap-1">{children}</div>
+    </div>
+  );
+}
+
+function FilterLink({
+  href,
+  active,
+  count,
+  children,
+}: {
+  href: string;
+  active: boolean;
+  count: number;
+  children: ReactNode;
+}) {
+  return (
+    <Link
+      href={href}
+      className={cn(
+        "flex items-center gap-3 rounded-md px-2 py-2 text-xs font-medium text-neutral-600 transition-colors hover:bg-neutral-100",
+        active && "bg-neutral-100",
+      )}
+    >
+      <div
+        className={cn(
+          "flex h-4 w-4 shrink-0 items-center justify-center rounded border",
+          active ? "border-neutral-900 bg-neutral-900" : "border-neutral-300",
+        )}
+      >
+        {active ? <Check className="h-3 w-3 text-white" /> : null}
+      </div>
+      <span className="min-w-0 flex-1 truncate">{children}</span>
+      <span className="shrink-0 text-xs tabular-nums text-neutral-400">
+        {count}
+      </span>
+    </Link>
+  );
+}
+
+export function getMarketplaceExternalBasePath({
+  segments,
+}: {
+  segments: string[];
+}) {
+  if (segments.length === 1 && segments[0] === "all") {
+    return "/marketplace/all";
+  }
+
+  if (segments.length === 2 && segments[0] === "c") {
+    return `/marketplace/c/${segments[1]}`;
+  }
+
+  return "/marketplace/all";
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-header.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-header.tsx
new file mode 100644
index 00000000000..c76538ece23
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-header.tsx
@@ -0,0 +1,35 @@
+"use client";
+
+import { NavMobile, Nav as NavUI, Shop, Wordmark } from "@dub/ui";
+import Link from "next/link";
+
+const DUB_HOME_HREF = "https://dub.co/home";
+
+function MarketplaceLogo() {
+  return (
+    <div className="flex items-center gap-2.5">
+      <Link
+        href={DUB_HOME_HREF}
+        className="transition-opacity hover:opacity-80"
+      >
+        <Wordmark className="h-6" />
+      </Link>
+      <span className="text-lg font-light text-neutral-300">|</span>
+      <Link
+        href="/marketplace"
+        className="flex items-center gap-2 text-sm font-medium text-neutral-500 transition-opacity hover:opacity-80"
+      >
+        <Shop className="size-3.5" /> Program Marketplace
+      </Link>
+    </div>
+  );
+}
+
+export function MarketplaceExternalHeader() {
+  return (
+    <>
+      <NavMobile navItems={[]} />
+      <NavUI staticDomain="dub.co" navItems={[]} logo={<MarketplaceLogo />} />
+    </>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-home-page.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-home-page.tsx
new file mode 100644
index 00000000000..d8b36c54a82
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-home-page.tsx
@@ -0,0 +1,34 @@
+import { getMarketplaceProgramsSummary } from "@/lib/fetchers/get-marketplace-programs-summary";
+import { FeaturedPrograms } from "../featured-programs";
+import { MARKETPLACE_HOME_ROWS } from "../home-sections";
+import { MarketplaceCategoriesSection } from "../marketplace-categories-section";
+import { MarketplaceProgramRow } from "../marketplace-program-row";
+import { MarketplaceExternalShell } from "./marketplace-external-shell";
+
+export async function MarketplaceExternalHomePage() {
+  const summary = await getMarketplaceProgramsSummary();
+
+  return (
+    <MarketplaceExternalShell variant="home">
+      <div className="flex flex-col gap-10">
+        <div className="-mx-4 -mt-8 px-2 sm:-mx-6 lg:-mx-8">
+          <FeaturedPrograms
+            programs={summary.featuredPrograms}
+            externalMarketplace
+          />
+        </div>
+        <MarketplaceCategoriesSection />
+        {MARKETPLACE_HOME_ROWS.map((row, index) => (
+          <MarketplaceProgramRow
+            key={row.key}
+            title={row.title}
+            viewAllHref={row.viewAllHref}
+            showViewAllCard={row.showViewAllCard}
+            externalMarketplace
+            programs={summary.categories[row.key] ?? summary[row.key]}
+          />
+        ))}
+      </div>
+    </MarketplaceExternalShell>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-list-page-client.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-list-page-client.tsx
new file mode 100644
index 00000000000..75ee97c110f
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-list-page-client.tsx
@@ -0,0 +1,288 @@
+"use client";
+
+import { EXTERNAL_MARKETPLACE_PAGE_SIZE } from "@/lib/marketplace/parse-public-marketplace-query";
+import { NetworkProgramProps } from "@/lib/types";
+import { getPublicNetworkProgramsQuerySchema } from "@/lib/zod/schemas/program-network";
+import { useRouterStuff } from "@dub/ui";
+import { cn, fetcher } from "@dub/utils";
+import { Category } from "@prisma/client";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import {
+  Dispatch,
+  ReactNode,
+  SetStateAction,
+  Suspense,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
+import useSWR from "swr";
+import * as z from "zod/v4";
+import { MarketplaceListToolbar } from "../marketplace-list-toolbar";
+import {
+  MarketplaceProgramGrid,
+  MarketplaceProgramGridEmpty,
+  MarketplaceProgramGridSkeleton,
+} from "../marketplace-program-grid";
+import { type MarketplaceRewardType } from "../utils/constants";
+import {
+  MarketplaceExternalFilterSidebar,
+  MarketplaceExternalFilterSidebarSkeleton,
+} from "./marketplace-external-filters";
+
+const PAGE_SIZE = EXTERNAL_MARKETPLACE_PAGE_SIZE;
+
+type FilterCounts = {
+  categories: { category: Category; count: number }[];
+  rewardTypes: {
+    type: MarketplaceRewardType;
+    count: number;
+  }[];
+};
+
+type ProgramCounts = FilterCounts & { total: number };
+
+type ParsedQuery = z.infer<typeof getPublicNetworkProgramsQuerySchema>;
+
+type QueryState = {
+  hasParams: boolean;
+  queryString: string | null;
+  data: ParsedQuery;
+};
+
+// query params that switch the page from its server-rendered default into a
+// client-fetched (SWR) view; `category` is part of the static route, not a param
+const PARAM_KEYS = ["rewardType", "search", "sortBy", "sortOrder", "page"];
+
+function pickString(value: string | string[] | undefined) {
+  return typeof value === "string" ? value : undefined;
+}
+
+type SharedProps = {
+  basePath: string;
+  fixedCategory?: Category;
+  initialCounts: ProgramCounts;
+  defaultGrid: ReactNode;
+  defaultSidebar: ReactNode;
+};
+
+export function MarketplaceExternalListPageClient({
+  basePath,
+  fixedCategory,
+  initialCounts,
+  defaultGrid,
+  defaultSidebar,
+}: SharedProps) {
+  const [query, setQuery] = useState<QueryState | null>(null);
+
+  const hasParams = query?.hasParams ?? false;
+  const queryString = query?.queryString ?? null;
+
+  const { data: fetchedPrograms, isValidating } = useSWR<NetworkProgramProps[]>(
+    queryString ? `/api/marketplace/programs${queryString}` : null,
+    fetcher,
+    { revalidateOnFocus: false, keepPreviousData: true },
+  );
+
+  const { data: fetchedCounts } = useSWR<ProgramCounts>(
+    queryString ? `/api/marketplace/programs/counts${queryString}` : null,
+    fetcher,
+    { revalidateOnFocus: false, keepPreviousData: true },
+  );
+
+  const rewardType = query?.data.rewardType;
+  const search = query?.data.search;
+  const sortBy = query?.data.sortBy;
+  const sortOrder = query?.data.sortOrder;
+  const page = query?.data.page ?? 1;
+
+  const counts = (hasParams ? fetchedCounts : initialCounts) ?? initialCounts;
+  const isLoadingCounts = hasParams && !fetchedCounts;
+  const totalPages = Math.max(1, Math.ceil(counts.total / PAGE_SIZE));
+
+  const sidebar = !hasParams ? (
+    defaultSidebar
+  ) : isLoadingCounts ? (
+    <MarketplaceExternalFilterSidebarSkeleton />
+  ) : (
+    <MarketplaceExternalFilterSidebar
+      basePath={basePath}
+      activeCategory={fixedCategory}
+      activeRewardType={rewardType}
+      categoryCounts={counts.categories}
+      rewardTypeCounts={counts.rewardTypes}
+      search={search}
+      sortBy={sortBy}
+      sortOrder={sortOrder}
+    />
+  );
+
+  const grid = !hasParams ? (
+    defaultGrid
+  ) : !fetchedPrograms ? (
+    <MarketplaceProgramGridSkeleton />
+  ) : fetchedPrograms.length > 0 ? (
+    <MarketplaceProgramGrid
+      programs={fetchedPrograms}
+      externalMarketplace
+      className={cn(isValidating && "opacity-50")}
+    />
+  ) : (
+    <MarketplaceProgramGridEmpty />
+  );
+
+  return (
+    <>
+      <Suspense fallback={null}>
+        <MarketplaceParamSync
+          basePath={basePath}
+          fixedCategory={fixedCategory}
+          onChange={setQuery}
+        />
+      </Suspense>
+
+      <div className="flex flex-col gap-8 lg:flex-row lg:items-start lg:gap-10">
+        <div className="hidden shrink-0 lg:block">{sidebar}</div>
+        <div className="@container/page flex min-w-0 flex-1 flex-col gap-6">
+          <Suspense fallback={<MarketplaceListToolbarSkeleton />}>
+            <MarketplaceListToolbar
+              variant="external"
+              basePath={basePath}
+              activeCategory={fixedCategory}
+              categoryCounts={counts.categories}
+              rewardTypeCounts={counts.rewardTypes}
+            />
+          </Suspense>
+
+          {grid}
+
+          <MarketplacePagination
+            basePath={basePath}
+            totalPages={totalPages}
+            page={page}
+            rewardType={rewardType}
+            search={search}
+            sortBy={sortBy}
+            sortOrder={sortOrder}
+          />
+        </div>
+      </div>
+    </>
+  );
+}
+
+function MarketplaceParamSync({
+  basePath,
+  fixedCategory,
+  onChange,
+}: {
+  basePath: string;
+  fixedCategory?: Category;
+  onChange: Dispatch<SetStateAction<QueryState | null>>;
+}) {
+  const router = useRouter();
+  const { getQueryString, searchParamsObj } = useRouterStuff();
+
+  const hasParams = PARAM_KEYS.some((key) => {
+    const value = searchParamsObj[key];
+    return typeof value === "string" && value !== "";
+  });
+
+  const parsed = useMemo(
+    () =>
+      getPublicNetworkProgramsQuerySchema.safeParse({
+        rewardType: pickString(searchParamsObj.rewardType),
+        search: pickString(searchParamsObj.search),
+        sortBy: pickString(searchParamsObj.sortBy),
+        sortOrder: pickString(searchParamsObj.sortOrder),
+        page: pickString(searchParamsObj.page),
+        pageSize: PAGE_SIZE,
+        ...(fixedCategory ? { category: fixedCategory } : {}),
+      }),
+    [fixedCategory, searchParamsObj],
+  );
+
+  const queryString =
+    parsed.success && hasParams
+      ? getQueryString({
+          ...(fixedCategory ? { category: fixedCategory } : {}),
+          pageSize: String(PAGE_SIZE),
+        })
+      : null;
+
+  useEffect(() => {
+    if (!parsed.success) {
+      router.replace(basePath);
+      return;
+    }
+
+    onChange({ hasParams, queryString, data: parsed.data });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [basePath, hasParams, queryString, parsed.success, router]);
+
+  return null;
+}
+
+function MarketplacePagination({
+  basePath,
+  totalPages,
+  page,
+  rewardType,
+  search,
+  sortBy,
+  sortOrder,
+}: {
+  basePath: string;
+  totalPages: number;
+  page: number;
+  rewardType?: string;
+  search?: string;
+  sortBy?: string;
+  sortOrder?: string;
+}) {
+  if (totalPages <= 1) return null;
+
+  return (
+    <div className="flex items-center justify-center gap-2">
+      {Array.from({ length: totalPages }, (_, index) => {
+        const pageNumber = index + 1;
+        const queryParams = new URLSearchParams();
+
+        if (rewardType) queryParams.set("rewardType", rewardType);
+        if (search) queryParams.set("search", search);
+        if (sortBy && sortBy !== "popularity")
+          queryParams.set("sortBy", sortBy);
+        if (sortOrder && sortOrder !== "desc")
+          queryParams.set("sortOrder", sortOrder);
+        if (pageNumber > 1) queryParams.set("page", String(pageNumber));
+
+        const query = queryParams.toString();
+
+        return (
+          <Link
+            key={pageNumber}
+            href={`${basePath}${query ? `?${query}` : ""}`}
+            className={
+              pageNumber === page
+                ? "rounded-lg bg-neutral-900 px-3 py-1.5 text-sm font-medium text-white"
+                : "border-border-subtle hover:bg-bg-subtle rounded-lg border px-3 py-1.5 text-sm font-medium"
+            }
+          >
+            {pageNumber}
+          </Link>
+        );
+      })}
+    </div>
+  );
+}
+
+function MarketplaceListToolbarSkeleton() {
+  return (
+    <div className="grid grid-cols-2 gap-4 lg:flex lg:items-center lg:justify-between lg:gap-6">
+      <div className="h-9 w-full animate-pulse rounded-lg bg-neutral-100 lg:hidden" />
+      <div className="hidden h-9 w-44 animate-pulse rounded-lg bg-neutral-100 lg:block" />
+      <div className="h-9 w-full animate-pulse rounded-lg bg-neutral-100 lg:w-[19rem]" />
+    </div>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-list-page.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-list-page.tsx
new file mode 100644
index 00000000000..48d27d87b0b
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-list-page.tsx
@@ -0,0 +1,77 @@
+import { getNetworkProgramCounts } from "@/lib/fetchers/get-network-program-counts";
+import { getPublicNetworkPrograms } from "@/lib/fetchers/get-public-network-programs";
+import { EXTERNAL_MARKETPLACE_PAGE_SIZE } from "@/lib/marketplace/parse-public-marketplace-query";
+import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
+import { Category } from "@prisma/client";
+import {
+  MarketplaceProgramGrid,
+  MarketplaceProgramGridEmpty,
+} from "../marketplace-program-grid";
+import {
+  getMarketplaceExternalBasePath,
+  MarketplaceExternalFilterSidebar,
+} from "./marketplace-external-filters";
+import { MarketplaceExternalListPageClient } from "./marketplace-external-list-page-client";
+import { MarketplaceExternalShell } from "./marketplace-external-shell";
+
+export async function MarketplaceExternalListPage({
+  segments,
+  fixedCategory,
+}: {
+  segments: string[];
+  fixedCategory?: Category;
+}) {
+  const basePath = getMarketplaceExternalBasePath({ segments });
+  const categoryMeta = fixedCategory
+    ? PROGRAM_CATEGORIES_MAP[fixedCategory]
+    : undefined;
+
+  const [initialPrograms, initialCounts] = await Promise.all([
+    getPublicNetworkPrograms({
+      category: fixedCategory,
+      page: 1,
+      pageSize: EXTERNAL_MARKETPLACE_PAGE_SIZE,
+    }),
+    getNetworkProgramCounts({ category: fixedCategory }),
+  ]);
+
+  const defaultSidebar = (
+    <MarketplaceExternalFilterSidebar
+      basePath={basePath}
+      activeCategory={fixedCategory}
+      categoryCounts={initialCounts.categories}
+      rewardTypeCounts={initialCounts.rewardTypes}
+    />
+  );
+
+  const defaultGrid =
+    initialPrograms.length > 0 ? (
+      <MarketplaceProgramGrid programs={initialPrograms} externalMarketplace />
+    ) : (
+      <MarketplaceProgramGridEmpty />
+    );
+
+  return (
+    <MarketplaceExternalShell
+      variant="list"
+      title={
+        categoryMeta ? (
+          <>
+            {categoryMeta.label} SaaS
+            <br />
+            affiliate programs
+          </>
+        ) : undefined
+      }
+      description={categoryMeta?.listPageDescription}
+    >
+      <MarketplaceExternalListPageClient
+        basePath={basePath}
+        fixedCategory={fixedCategory}
+        initialCounts={initialCounts}
+        defaultGrid={defaultGrid}
+        defaultSidebar={defaultSidebar}
+      />
+    </MarketplaceExternalShell>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-program-page.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-program-page.tsx
new file mode 100644
index 00000000000..7ff3b60b93a
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-program-page.tsx
@@ -0,0 +1,54 @@
+import { getNetworkProgram } from "@/lib/fetchers/get-network-program";
+import { ApplicationAnalytics } from "@/ui/application-analytics";
+import { MarketplaceProgramDetailBody } from "@/ui/program-marketplace/marketplace-program-detail-body";
+import { MarketplaceProgramDetailsLayout } from "@/ui/program-marketplace/marketplace-program-details-layout";
+import { MarketplaceProgramHero } from "@/ui/program-marketplace/marketplace-program-hero";
+import { getMarketplaceAllHref } from "@/ui/program-marketplace/utils/urls";
+import { ChevronLeft } from "@dub/ui";
+import Link from "next/link";
+import { redirect } from "next/navigation";
+import { MarketplaceExternalApplyButton } from "./marketplace-external-apply-button";
+import { MarketplaceExternalShell } from "./marketplace-external-shell";
+
+export async function MarketplaceExternalProgramPage({
+  programSlug,
+}: {
+  programSlug: string;
+}) {
+  const program = await getNetworkProgram({
+    slug: programSlug,
+  });
+
+  if (!program) {
+    redirect("/marketplace");
+  }
+
+  return (
+    <>
+      <ApplicationAnalytics />
+      <MarketplaceExternalShell variant="none">
+        <MarketplaceProgramDetailsLayout
+          header={
+            <Link
+              href={getMarketplaceAllHref()}
+              className="group inline-flex items-center gap-1 text-xs font-medium text-neutral-800 transition-colors hover:text-neutral-500"
+            >
+              <ChevronLeft className="size-[10px] text-neutral-500 transition-transform group-hover:-translate-x-0.5" />
+              All Programs
+            </Link>
+          }
+          hero={
+            <MarketplaceProgramHero
+              program={program}
+              applySlot={
+                <MarketplaceExternalApplyButton programSlug={program.slug} />
+              }
+            />
+          }
+        >
+          <MarketplaceProgramDetailBody program={program} />
+        </MarketplaceProgramDetailsLayout>
+      </MarketplaceExternalShell>
+    </>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-router.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-router.tsx
new file mode 100644
index 00000000000..db7d0a5f0d0
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-router.tsx
@@ -0,0 +1,38 @@
+import { notFound } from "next/navigation";
+import { slugToCategory } from "../utils/urls";
+import { MarketplaceExternalHomePage } from "./marketplace-external-home-page";
+import { MarketplaceExternalListPage } from "./marketplace-external-list-page";
+import { MarketplaceExternalProgramPage } from "./marketplace-external-program-page";
+
+export async function MarketplaceExternalRouter({
+  segments,
+}: {
+  segments: string[];
+}) {
+  if (segments.length === 0) {
+    return <MarketplaceExternalHomePage />;
+  }
+
+  if (segments.length === 1 && segments[0] === "all") {
+    return <MarketplaceExternalListPage segments={segments} />;
+  }
+
+  if (segments.length === 2 && segments[0] === "c") {
+    const category = slugToCategory(segments[1]);
+
+    if (category) {
+      return (
+        <MarketplaceExternalListPage
+          segments={segments}
+          fixedCategory={category}
+        />
+      );
+    }
+  }
+
+  if (segments.length === 1) {
+    return <MarketplaceExternalProgramPage programSlug={segments[0]} />;
+  }
+
+  notFound();
+}
diff --git a/apps/web/ui/program-marketplace/external/marketplace-external-shell.tsx b/apps/web/ui/program-marketplace/external/marketplace-external-shell.tsx
new file mode 100644
index 00000000000..23757c242f2
--- /dev/null
+++ b/apps/web/ui/program-marketplace/external/marketplace-external-shell.tsx
@@ -0,0 +1,61 @@
+import { cn } from "@dub/utils";
+import { ReactNode } from "react";
+
+const CONTAINER_CLASS = "mx-auto w-full max-w-screen-xl px-4 sm:px-6 lg:px-8";
+
+export function MarketplaceExternalShell({
+  variant = "home",
+  title,
+  description,
+  children,
+}: {
+  variant?: "home" | "list" | "none";
+  title?: ReactNode;
+  description?: string;
+  children: ReactNode;
+}) {
+  if (variant === "none") {
+    return (
+      <div className={cn(CONTAINER_CLASS, "relative z-10 pb-10 pt-6")}>
+        {children}
+      </div>
+    );
+  }
+
+  const resolvedTitle =
+    title ??
+    (variant === "home" ? (
+      <>
+        Best SaaS affiliate
+        <br />
+        programs in {new Date().getFullYear()}
+      </>
+    ) : (
+      <>
+        Discover your
+        <br />
+        next partnership
+      </>
+    ));
+
+  const resolvedDescription =
+    description ??
+    "Explore the variety of SaaS affiliate programs in the Dub Program Marketplace and start monetizing your traffic/audience today.";
+
+  return (
+    <div className="relative z-10 flex flex-col">
+      <div className={cn(CONTAINER_CLASS, "pb-12 pt-20")}>
+        <div className="flex flex-col gap-4">
+          <h1 className="font-display text-[50px] font-medium leading-[1.1] text-neutral-900">
+            {resolvedTitle}
+          </h1>
+          <p className="max-w-2xl text-lg font-normal text-neutral-600">
+            {resolvedDescription}
+          </p>
+        </div>
+      </div>
+      <div className="h-px w-full bg-neutral-200" />
+      <div className={cn(CONTAINER_CLASS, "py-10")}>{children}</div>
+    </div>
+  );
+}
diff --git a/apps/web/ui/program-marketplace/featured-program-card.tsx b/apps/web/ui/program-marketplace/featured-program-card.tsx
index 0cb6bdd7f33..3eebd5f1ed8 100644
--- a/apps/web/ui/program-marketplace/featured-program-card.tsx
+++ b/apps/web/ui/program-marketplace/featured-program-card.tsx
@@ -1,15 +1,9 @@
 import { NetworkProgramProps } from "@/lib/types";
 import {
-  ProgramCategory,
-  programCategorySurfaceClassName,
-} from "@/ui/program-marketplace/program-category";
-import { ProgramRewardsDisplay } from "@/ui/program-marketplace/program-rewards-display";
-import {
-  getMarketplaceAllHref,
-  getMarketplaceCategoryHref,
-  getMarketplaceProgramHref,
-} from "@/ui/program-marketplace/utils/urls";
-import { Tooltip } from "@dub/ui";
+  MarketplaceRewardsLabel,
+  ProgramRewardsDisplay,
+} from "@/ui/program-marketplace/program-rewards-display";
+import { getMarketplaceAllHref } from "@/ui/program-marketplace/utils/urls";
 import { ArrowUpRight, Globe } from "@dub/ui/icons";
 import { OG_AVATAR_URL, getDomainWithoutWWW } from "@dub/utils";
 import Link from "next/link";
@@ -40,14 +34,15 @@ export function getFeaturedCardBackground(index: number) {
 
 export function FeaturedProgramCard({
   program,
-  showStatus = true,
+  externalMarketplace = false,
   colorIndex = 0,
 }: {
   program: NetworkProgramProps;
-  showStatus?: boolean;
+  externalMarketplace?: boolean;
   colorIndex?: number;
 }) {
   const router = useRouter();
+  const rewards = program.rewards;
 
   // Derive the tint from the program's image
   // Fall back to the palette if extraction is blocked
@@ -57,7 +52,7 @@ export function FeaturedProgramCard({
   const backgroundColor = accentColor ?? getFeaturedCardBackground(colorIndex);
 
   return (
-    <article className="relative flex h-full flex-col-reverse gap-4 overflow-hidden rounded-2xl p-2 sm:min-h-[340px] sm:flex-row">
+    <article className="relative flex h-full flex-col-reverse gap-4 overflow-hidden rounded-2xl border border-neutral-100 p-2 sm:min-h-[340px] sm:flex-row">
       <div
         aria-hidden
         className="pointer-events-none absolute inset-0 z-0 transition-opacity duration-500 ease-out"
@@ -65,7 +60,7 @@ export function FeaturedProgramCard({
       />
 
       <Link
-        href={getMarketplaceProgramHref(program.slug)}
+        href={`/marketplace/${program.slug}`}
         className="absolute inset-0 z-10 rounded-2xl"
         aria-label={`View ${program.name}`}
       />
@@ -78,7 +73,9 @@ export function FeaturedProgramCard({
             className="size-12 rounded-full border-4 border-neutral-100 sm:border sm:border-black/5"
           />
 
-          {showStatus ? <ProgramStatusBadge program={program} /> : null}
+          {!externalMarketplace ? (
+            <ProgramStatusBadge program={program} />
+          ) : null}
         </div>
 
         <div className="flex flex-col pt-4 sm:mt-auto sm:pt-10">
@@ -92,69 +89,23 @@ export function FeaturedProgramCard({
           </div>
 
           <div className="pointer-events-auto relative z-30 mt-5 flex flex-wrap gap-x-8 gap-y-4">
-            {Boolean(program.rewards?.length) && (
-              <div>
-                <span className="block text-xs font-medium text-neutral-400">
-                  Rewards
-                </span>
+            {rewards?.length ? (
+              <div className="min-w-0">
+                <MarketplaceRewardsLabel
+                  count={rewards.length}
+                  className="text-xs font-medium text-neutral-400"
+                />
                 <ProgramRewardsDisplay
-                  iconsOnly
-                  rewards={program.rewards}
+                  rewards={rewards}
                   onRewardClick={(reward) =>
                     router.push(
                       getMarketplaceAllHref({ rewardType: reward.event }),
                     )
                   }
                   className="mt-2 min-h-6"
-                  iconClassName="text-neutral-900"
                 />
               </div>
-            )}
-            {Boolean(program.categories.length) && (
-              <div className="min-w-0">
-                <span className="block text-xs font-medium text-neutral-400">
-                  Category
-                </span>
-                <div className="mt-2 flex min-h-6 items-center gap-1.5">
-                  {program.categories
-                    .slice(0, 1)
-                    ?.map((category) => (
-                      <ProgramCategory
-                        key={category}
-                        category={category}
-                        variant="surface"
-                        onClick={() =>
-                          router.push(getMarketplaceCategoryHref(category))
-                        }
-                      />
-                    ))}
-                  {program.categories.length > 1 && (
-                    <Tooltip
-                      content={
-                        <div className="flex flex-col gap-1 p-1">
-                          {program.categories.slice(1).map((category) => (
-                            <ProgramCategory
-                              key={category}
-                              category={category}
-                              variant="surface"
-                              onClick={() =>
-                                router.push(
-                                  getMarketplaceCategoryHref(category),
-                                )
-                              }
-                            />
-                          ))}
-                        </div>
-                      }
-                    >
-                      <div className={programCategorySurfaceClassName}>
-                        +{program.categories.length - 1}
-                      </div>
-                    </Tooltip>
-                  )}
-                </div>
-              </div>
-            )}
+            ) : null}
             {program.url && (
               <div className="basis-full sm:basis-auto">
                 <span className="block text-xs font-medium text-neutral-400">
@@ -215,14 +166,7 @@ export function FeaturedProgramCardSkeleton() {
           <div className="mt-5 flex flex-wrap gap-x-8 gap-y-4">
             <div>
               <div className="h-4 w-12 animate-pulse rounded bg-neutral-200" />
-              <div className="mt-2 flex gap-1.5">
-                <div className="size-4 animate-pulse rounded bg-neutral-200" />
-                <div className="size-4 animate-pulse rounded bg-neutral-200" />
-              </div>
-            </div>
-            <div>
-              <div className="h-4 w-14 animate-pulse rounded bg-neutral-200" />
-              <div className="mt-2 h-5 w-24 animate-pulse rounded-full bg-neutral-200" />
+              <div className="mt-2 h-5 w-40 animate-pulse rounded bg-neutral-200" />
             </div>
             <div className="basis-full sm:basis-auto">
               <div className="h-4 w-12 animate-pulse rounded bg-neutral-200" />
diff --git a/apps/web/ui/program-marketplace/featured-programs.tsx b/apps/web/ui/program-marketplace/featured-programs.tsx
index c8ac44b354b..e39b6f70696 100644
--- a/apps/web/ui/program-marketplace/featured-programs.tsx
+++ b/apps/web/ui/program-marketplace/featured-programs.tsx
@@ -17,14 +17,14 @@ import {
 const FEATURED_PROGRAMS_API_PATH = "/api/network/programs?featured=true";
 
 type FeaturedProgramsProps = {
-  showStatus?: boolean;
+  externalMarketplace?: boolean;
 } & (
   | { programs: NetworkProgramProps[]; apiPath?: never }
   | { apiPath?: string; programs?: never }
 );
 
 export function FeaturedPrograms({
-  showStatus = true,
+  externalMarketplace = false,
   ...props
 }: FeaturedProgramsProps) {
   const apiPath =
@@ -55,7 +55,7 @@ export function FeaturedPrograms({
               <CarouselItem key={program.id} className="basis-full">
                 <FeaturedProgramCard
                   program={program}
-                  showStatus={showStatus}
+                  externalMarketplace={externalMarketplace}
                   colorIndex={index}
                 />
               </CarouselItem>
@@ -64,9 +64,7 @@ export function FeaturedPrograms({
             <FeaturedProgramsSkeletonItems />
           )}
         </CarouselContent>
-        <div className="mt-2">
-          <CarouselNavBar />
-        </div>
+        <FeaturedProgramsNavBar count={programs?.length ?? 6} />
       </Carousel>
     </div>
   );
@@ -75,15 +73,24 @@ export function FeaturedPrograms({
 export function FeaturedProgramsSkeleton() {
   return (
     <div>
-      <Carousel opts={{ loop: true }}>
+      <Carousel autoplay={{ delay: 5000 }} opts={{ loop: true }}>
         <CarouselContent className="items-stretch">
           <FeaturedProgramsSkeletonItems />
         </CarouselContent>
+        <FeaturedProgramsNavBar count={6} />
       </Carousel>
     </div>
   );
 }
 
+function FeaturedProgramsNavBar({ count }: { count: number }) {
+  return (
+    <div className="mt-2 min-h-2.5 sm:min-h-[18px]">
+      <CarouselNavBar count={count} />
+    </div>
+  );
+}
+
 function FeaturedProgramsSkeletonItems() {
   return (
     <>
diff --git a/apps/web/ui/program-marketplace/home-sections.ts b/apps/web/ui/program-marketplace/home-sections.ts
index 61f478cb998..7bfd486050c 100644
--- a/apps/web/ui/program-marketplace/home-sections.ts
+++ b/apps/web/ui/program-marketplace/home-sections.ts
@@ -14,7 +14,7 @@ export type MarketplaceHomeRow = {
 
 const featuredHomeRows: MarketplaceHomeRow[] = [
   {
-    key: "most-popular",
+    key: "mostPopular",
     title: "Most popular",
     viewAllHref: getMarketplaceAllHref({
       sortBy: "popularity",
@@ -23,7 +23,7 @@ const featuredHomeRows: MarketplaceHomeRow[] = [
     showViewAllCard: true,
   },
   {
-    key: "new",
+    key: "newPrograms",
     title: "New",
     viewAllHref: getMarketplaceAllHref({
       sortBy: "recency",
diff --git a/apps/web/ui/program-marketplace/marketplace-program-grid.tsx b/apps/web/ui/program-marketplace/marketplace-program-grid.tsx
index d9ac0b4aa6b..bba6c0e4cf7 100644
--- a/apps/web/ui/program-marketplace/marketplace-program-grid.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-program-grid.tsx
@@ -7,11 +7,11 @@ import {
 
 export function MarketplaceProgramGrid({
   programs,
-  showStatus = true,
+  externalMarketplace = false,
   className,
 }: {
   programs: NetworkProgramProps[];
-  showStatus?: boolean;
+  externalMarketplace?: boolean;
   className?: string;
 }) {
   return (
@@ -26,7 +26,7 @@ export function MarketplaceProgramGrid({
         <MarketplaceProgramCard
           key={program.id}
           program={program}
-          showStatus={showStatus}
+          externalMarketplace={externalMarketplace}
         />
       ))}
     </div>
diff --git a/apps/web/ui/program-marketplace/marketplace-program-hero.tsx b/apps/web/ui/program-marketplace/marketplace-program-hero.tsx
index dd8e891c270..554feb3f106 100644
--- a/apps/web/ui/program-marketplace/marketplace-program-hero.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-program-hero.tsx
@@ -62,7 +62,7 @@ export function MarketplaceProgramHero({
           src={program.logo || `${OG_AVATAR_URL}${program.name}`}
           alt={program.name}
           className={cn(
-            "size-16 rounded-full border border-black/5",
+            "size-16 shrink-0 rounded-full border border-black/5 object-cover",
             hasBanner && "-mt-8 border-4 border-neutral-100",
           )}
         />
diff --git a/apps/web/ui/program-marketplace/marketplace-program-row.tsx b/apps/web/ui/program-marketplace/marketplace-program-row.tsx
index 19e67c51fe4..c6d90f50af4 100644
--- a/apps/web/ui/program-marketplace/marketplace-program-row.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-program-row.tsx
@@ -3,9 +3,7 @@
 import { NetworkProgramProps } from "@/lib/types";
 import { Carousel, CarouselContent, CarouselItem, useCarousel } from "@dub/ui";
 import { ChevronLeft, ChevronRight } from "@dub/ui/icons";
-import { cn, fetcher } from "@dub/utils";
 import Link from "next/link";
-import useSWR from "swr";
 import { MarketplaceViewAllCard } from "./marketplace-view-all-card";
 import {
   MarketplaceProgramCard,
@@ -16,7 +14,7 @@ type MarketplaceProgramRowProps = {
   title: string;
   viewAllHref: string;
   showViewAllCard?: boolean;
-  showStatus?: boolean;
+  externalMarketplace?: boolean;
   variant?: "default" | "home";
   programs?: NetworkProgramProps[];
   apiPath?: string;
@@ -57,31 +55,13 @@ export function MarketplaceProgramRow({
   title,
   viewAllHref,
   showViewAllCard = false,
-  showStatus = true,
-  variant = "default",
-  ...props
+  externalMarketplace = false,
+  programs,
 }: MarketplaceProgramRowProps) {
-  const { data: fetchedPrograms, error } = useSWR<NetworkProgramProps[]>(
-    props.apiPath ?? null,
-    fetcher,
-    { revalidateOnFocus: false, keepPreviousData: true },
-  );
-
-  const programs = props.programs ?? fetchedPrograms;
-  const isHome = variant === "home";
-
-  const carouselItemClassName = cn(
-    "pl-0",
-    isHome
-      ? "basis-[310px] sm:basis-[419px]"
-      : "basis-[280px] md:basis-[320px]",
-  );
-
-  const cardClassName = isHome
-    ? "h-[260px] w-[310px] sm:h-[284px] sm:w-[419px] sm:p-8"
-    : undefined;
+  const carouselItemClassName = "pl-0 basis-[310px] sm:basis-[419px]";
+  const cardClassName = "h-[260px] w-[310px] sm:h-[284px] sm:w-[419px] sm:p-8";
 
-  if (error || programs?.length === 0) {
+  if (programs && programs.length === 0) {
     return null;
   }
 
@@ -114,7 +94,7 @@ export function MarketplaceProgramRow({
                 >
                   <MarketplaceProgramCard
                     program={program}
-                    showStatus={showStatus}
+                    externalMarketplace={externalMarketplace}
                     className={cardClassName}
                   />
                 </CarouselItem>
diff --git a/apps/web/ui/program-marketplace/marketplace-router.tsx b/apps/web/ui/program-marketplace/marketplace-router.tsx
index 7d200ba1cc8..2286766f598 100644
--- a/apps/web/ui/program-marketplace/marketplace-router.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-router.tsx
@@ -1,10 +1,7 @@
 import { PROGRAM_CATEGORIES_MAP } from "@/lib/network/program-categories";
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import {
-  getMarketplaceHref,
-  slugToCategory,
-} from "@/ui/program-marketplace/utils/urls";
+import { slugToCategory } from "@/ui/program-marketplace/utils/urls";
 import { ChevronRight, Shop } from "@dub/ui";
 import { Category } from "@prisma/client";
 import Link from "next/link";
@@ -23,7 +20,7 @@ function MarketplaceListTitle({ category }: { category?: Category }) {
     <div className="flex items-center gap-1.5">
       <div className="flex items-center gap-1">
         <Link
-          href={getMarketplaceHref()}
+          href="/marketplace"
           aria-label="Back to marketplace"
           className="bg-bg-subtle hover:bg-bg-emphasis flex size-8 shrink-0 items-center justify-center rounded-lg transition-[transform,background-color] duration-150 active:scale-95"
         >
diff --git a/apps/web/ui/program-marketplace/marketplace-sidebar-filters.tsx b/apps/web/ui/program-marketplace/marketplace-sidebar-filters.tsx
index e3e051fe508..56455742e84 100644
--- a/apps/web/ui/program-marketplace/marketplace-sidebar-filters.tsx
+++ b/apps/web/ui/program-marketplace/marketplace-sidebar-filters.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import { getMarketplaceHref } from "@/ui/program-marketplace/utils/urls";
 import { ChevronLeft, Filter, useKeyboardShortcut } from "@dub/ui";
 import { cn } from "@dub/utils";
 import Link from "next/link";
@@ -24,7 +23,7 @@ export function MarketplaceSidebarFilters() {
   return (
     <div className="flex flex-col gap-2">
       <Link
-        href={getMarketplaceHref()}
+        href="/marketplace"
         className={cn(
           "group flex w-full items-center gap-3 rounded-lg px-2 py-1.5 text-sm font-medium text-neutral-800 transition-all duration-75",
           "hover:bg-neutral-200/50 active:bg-neutral-200/80",
diff --git a/apps/web/ui/program-marketplace/pages/marketplace-home-page.tsx b/apps/web/ui/program-marketplace/pages/marketplace-home-page.tsx
index 44af6e1def4..4398519e500 100644
--- a/apps/web/ui/program-marketplace/pages/marketplace-home-page.tsx
+++ b/apps/web/ui/program-marketplace/pages/marketplace-home-page.tsx
@@ -1,9 +1,7 @@
 "use client";
 
-import type { NetworkProgramProps } from "@/lib/types";
 import { MarketplaceProgramsSummarySchema } from "@/lib/zod/schemas/program-network";
 import { fetcher } from "@dub/utils";
-import { Category } from "@prisma/client";
 import useSWR from "swr";
 import type * as z from "zod/v4";
 import {
@@ -18,21 +16,6 @@ type MarketplaceProgramsSummary = z.infer<
   typeof MarketplaceProgramsSummarySchema
 >;
 
-function getRowPrograms(
-  summary: MarketplaceProgramsSummary,
-  rowKey: string,
-): NetworkProgramProps[] {
-  if (rowKey === "most-popular") {
-    return summary.mostPopular;
-  }
-
-  if (rowKey === "new") {
-    return summary.newPrograms;
-  }
-
-  return summary.categories[rowKey as Category] ?? [];
-}
-
 export function MarketplaceHomePage() {
   const { data: summary } = useSWR<MarketplaceProgramsSummary>(
     "/api/network/programs/summary",
@@ -51,11 +34,14 @@ export function MarketplaceHomePage() {
       {MARKETPLACE_HOME_ROWS.map((row) => (
         <MarketplaceProgramRow
           key={row.key}
-          variant="home"
           title={row.title}
           viewAllHref={row.viewAllHref}
           showViewAllCard={row.showViewAllCard}
-          programs={summary ? getRowPrograms(summary, row.key) : undefined}
+          programs={
+            summary
+              ? summary.categories[row.key] ?? summary[row.key]
+              : undefined
+          }
         />
       ))}
     </div>
diff --git a/apps/web/ui/program-marketplace/pages/marketplace-program-page.tsx b/apps/web/ui/program-marketplace/pages/marketplace-program-page.tsx
index d99378a091d..3f5e8ebe9f8 100644
--- a/apps/web/ui/program-marketplace/pages/marketplace-program-page.tsx
+++ b/apps/web/ui/program-marketplace/pages/marketplace-program-page.tsx
@@ -1,5 +1,4 @@
 import { getNetworkProgram } from "@/lib/fetchers/get-network-program";
-import { prisma } from "@/lib/prisma";
 import { ApplicationAnalytics } from "@/ui/application-analytics";
 import { PageContent } from "@/ui/layout/page-content";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
@@ -8,43 +7,11 @@ import { MarketplaceProgramDetailsLayout } from "@/ui/program-marketplace/market
 import { MarketplaceProgramHero } from "@/ui/program-marketplace/marketplace-program-hero";
 import { MarketplaceProgramPageSkeleton } from "@/ui/program-marketplace/marketplace-program-page-skeleton";
 import { ChevronRight, Shop } from "@dub/ui";
-import { Category } from "@prisma/client";
 import Link from "next/link";
 import { redirect } from "next/navigation";
 import { Suspense } from "react";
 import { MarketplaceProgramHeaderControls } from "../marketplace-program-header-controls";
 import { ProgramStatusBadge } from "../program-status-badge";
-import { getMarketplaceHref } from "../utils/urls";
-
-export const revalidate = 3600; // 1 hour
-
-export async function generateMarketplaceProgramStaticParams() {
-  const programs = await prisma.program.findMany({
-    where: {
-      addedToMarketplaceAt: {
-        not: null,
-      },
-    },
-    select: {
-      slug: true,
-    },
-  });
-
-  const categoryPages = Object.values(Category).map((category) => ({
-    segments: ["c", category.toLowerCase()],
-  }));
-
-  const programPages = programs.map((program) => ({
-    segments: [program.slug],
-  }));
-
-  return [
-    { segments: [] },
-    { segments: ["all"] },
-    ...categoryPages,
-    ...programPages,
-  ];
-}
 
 export function MarketplaceProgramPage({
   programSlug,
@@ -68,7 +35,7 @@ async function MarketplaceProgramPageContent({
   });
 
   if (!program) {
-    redirect(getMarketplaceHref());
+    redirect("/marketplace");
   }
 
   return (
@@ -77,7 +44,7 @@ async function MarketplaceProgramPageContent({
         <div className="flex items-center gap-1.5">
           <div className="flex items-center gap-1">
             <Link
-              href={getMarketplaceHref()}
+              href="/marketplace"
               aria-label="Back to marketplace"
               className="bg-bg-subtle hover:bg-bg-emphasis flex size-8 shrink-0 items-center justify-center rounded-lg transition-[transform,background-color] duration-150 active:scale-95"
             >
diff --git a/apps/web/ui/program-marketplace/program-card.tsx b/apps/web/ui/program-marketplace/program-card.tsx
index fb3d87dedf1..718302a1b1f 100644
--- a/apps/web/ui/program-marketplace/program-card.tsx
+++ b/apps/web/ui/program-marketplace/program-card.tsx
@@ -1,14 +1,11 @@
 "use client";
 
 import { NetworkProgramProps } from "@/lib/types";
-import { ProgramCategory } from "@/ui/program-marketplace/program-category";
-import { ProgramRewardsDisplay } from "@/ui/program-marketplace/program-rewards-display";
 import {
-  getMarketplaceAllHref,
-  getMarketplaceCategoryHref,
-  getMarketplaceProgramHref,
-} from "@/ui/program-marketplace/utils/urls";
-import { Tooltip } from "@dub/ui";
+  MarketplaceRewardsLabel,
+  ProgramRewardsDisplay,
+} from "@/ui/program-marketplace/program-rewards-display";
+import { getMarketplaceAllHref } from "@/ui/program-marketplace/utils/urls";
 import { OG_AVATAR_URL, cn } from "@dub/utils";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
@@ -16,20 +13,21 @@ import { ProgramStatusBadge } from "./program-status-badge";
 
 export function MarketplaceProgramCard({
   program,
-  showStatus = true,
+  externalMarketplace = false,
   className,
 }: {
   program: NetworkProgramProps;
-  showStatus?: boolean;
+  externalMarketplace?: boolean;
   className?: string;
 }) {
   const router = useRouter();
+  const rewards = program.rewards;
 
   return (
     <Link
-      href={getMarketplaceProgramHref(program.slug)}
+      href={`/marketplace/${program.slug}`}
       className={cn(
-        "border-border-subtle hover:drop-shadow-card-hover flex h-full flex-col rounded-xl border bg-white p-4 transition-[filter] sm:p-6",
+        "border-border-subtle hover:drop-shadow-card-hover flex h-full min-w-0 flex-col overflow-hidden rounded-xl border bg-white p-4 transition-[filter] sm:p-6",
         className,
       )}
     >
@@ -40,10 +38,10 @@ export function MarketplaceProgramCard({
           className="size-12 shrink-0 rounded-full object-cover"
         />
 
-        {showStatus ? <ProgramStatusBadge program={program} /> : null}
+        {!externalMarketplace ? <ProgramStatusBadge program={program} /> : null}
       </div>
 
-      <div className="mt-6 flex flex-col sm:mt-8">
+      <div className="mt-6 flex min-w-0 flex-col sm:mt-8">
         <h3 className="text-content-emphasis text-base font-semibold">
           {program.name}
         </h3>
@@ -53,65 +51,21 @@ export function MarketplaceProgramCard({
             `${program.name} is a program in the Dub Partner Network. Join the network to start partnering with them.`}
         </div>
 
-        <div className="mt-5 flex gap-4">
-          {Boolean(program.rewards?.length) && (
-            <div>
-              <span className="text-content-muted block text-xs font-medium">
-                Rewards
-              </span>
-              <ProgramRewardsDisplay
-                rewards={program.rewards}
-                onRewardClick={(reward) =>
-                  router.push(
-                    getMarketplaceAllHref({ rewardType: reward.event }),
-                  )
-                }
-                className="mt-2"
-              />
-            </div>
-          )}
-          {Boolean(program.categories.length) && (
-            <div className="hidden min-w-0 sm:block">
-              <span className="text-content-muted block text-xs font-medium">
-                Category
-              </span>
-              <div className="mt-2 flex items-center gap-1.5">
-                {program.categories
-                  .slice(0, 1)
-                  ?.map((category) => (
-                    <ProgramCategory
-                      key={category}
-                      category={category}
-                      onClick={() =>
-                        router.push(getMarketplaceCategoryHref(category))
-                      }
-                    />
-                  ))}
-                {program.categories.length > 1 && (
-                  <Tooltip
-                    content={
-                      <div className="flex flex-col gap-0.5 p-2">
-                        {program.categories.slice(1).map((category) => (
-                          <ProgramCategory
-                            key={category}
-                            category={category}
-                            onClick={() =>
-                              router.push(getMarketplaceCategoryHref(category))
-                            }
-                          />
-                        ))}
-                      </div>
-                    }
-                  >
-                    <div className="text-content-subtle -ml-1.5 flex size-6 items-center justify-center rounded-md text-xs font-medium">
-                      +{program.categories.length - 1}
-                    </div>
-                  </Tooltip>
-                )}
-              </div>
-            </div>
-          )}
-        </div>
+        {rewards?.length ? (
+          <div className="mt-5 w-full min-w-0">
+            <MarketplaceRewardsLabel
+              count={rewards.length}
+              className="text-content-muted text-xs font-medium"
+            />
+            <ProgramRewardsDisplay
+              rewards={rewards}
+              onRewardClick={(reward) =>
+                router.push(getMarketplaceAllHref({ rewardType: reward.event }))
+              }
+              className="mt-2"
+            />
+          </div>
+        ) : null}
       </div>
     </Link>
   );
@@ -143,7 +97,7 @@ export function MarketplaceProgramCardSkeleton({
           <div className="h-4 w-3/4 animate-pulse rounded bg-neutral-200" />
         </div>
 
-        {/* Rewards/Category section - matches actual card structure */}
+        {/* Rewards section - matches actual card structure */}
         <div className="mt-4 flex gap-4">
           <div>
             <div className="h-3.5 w-12 animate-pulse rounded bg-neutral-200" />
diff --git a/apps/web/ui/program-marketplace/program-marketplace-banner.tsx b/apps/web/ui/program-marketplace/program-marketplace-banner.tsx
index 872502285d2..07ef04d4795 100644
--- a/apps/web/ui/program-marketplace/program-marketplace-banner.tsx
+++ b/apps/web/ui/program-marketplace/program-marketplace-banner.tsx
@@ -2,7 +2,6 @@
 
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import { useProgramMarketplacePromo } from "@/ui/program-marketplace/use-program-marketplace-promo";
-import { getMarketplaceHref } from "@/ui/program-marketplace/utils/urls";
 import { X } from "@/ui/shared/icons";
 import { Button, Grid, buttonVariants } from "@dub/ui";
 import { cn } from "@dub/utils";
@@ -69,7 +68,7 @@ export function ProgramMarketplaceBanner() {
 
               <div className="flex items-center gap-2 p-3 sm:px-2 sm:py-0">
                 <Link
-                  href={getMarketplaceHref()}
+                  href="/marketplace"
                   className={cn(
                     buttonVariants({ variant: "primary" }),
                     "flex h-8 w-fit items-center justify-center whitespace-nowrap rounded-lg border px-3 text-sm",
diff --git a/apps/web/ui/program-marketplace/program-marketplace-card.tsx b/apps/web/ui/program-marketplace/program-marketplace-card.tsx
index f22ebdbed94..b0d0e97b976 100644
--- a/apps/web/ui/program-marketplace/program-marketplace-card.tsx
+++ b/apps/web/ui/program-marketplace/program-marketplace-card.tsx
@@ -2,7 +2,6 @@
 
 import usePartnerProfile from "@/lib/swr/use-partner-profile";
 import { useProgramMarketplacePromo } from "@/ui/program-marketplace/use-program-marketplace-promo";
-import { getMarketplaceHref } from "@/ui/program-marketplace/utils/urls";
 import { Grid, buttonVariants } from "@dub/ui";
 import { cn } from "@dub/utils";
 import { AnimatePresence, motion } from "motion/react";
@@ -55,7 +54,7 @@ export function ProgramMarketplaceCard() {
             </div>
 
             <Link
-              href={getMarketplaceHref()}
+              href="/marketplace"
               className={cn(
                 buttonVariants({ variant: "primary" }),
                 "flex h-6 w-fit items-center justify-center whitespace-nowrap rounded-md border px-1.5 text-xs",
diff --git a/apps/web/ui/program-marketplace/program-rewards-display.tsx b/apps/web/ui/program-marketplace/program-rewards-display.tsx
index 9fe4a7f359d..a0a8cdfe4c7 100644
--- a/apps/web/ui/program-marketplace/program-rewards-display.tsx
+++ b/apps/web/ui/program-marketplace/program-rewards-display.tsx
@@ -2,27 +2,44 @@ import { DiscountProps, RewardProps } from "@/lib/types";
 import { formatDiscountDescription } from "@/ui/partners/format-discount-description";
 import { formatRewardDescription } from "@/ui/partners/format-reward-description";
 import { REWARD_EVENT_ICON } from "@/ui/partners/rewards/reward-event-icon";
-import { Gift, Icon } from "@dub/ui";
+import { DiscountCode, Icon } from "@dub/ui";
 import { cn } from "@dub/utils";
 import * as HoverCard from "@radix-ui/react-hover-card";
-import { ProgramRewardIcon } from "./program-reward-icon";
 
 type RewardItem = {
   id: string;
+  event: RewardProps["event"] | "discount";
   icon: Icon;
   description: string;
   onClick?: () => void;
 };
 
+export function MarketplaceRewardsLabel({
+  count,
+  className,
+}: {
+  count: number;
+  className?: string;
+}) {
+  return (
+    <span className={cn("flex items-center gap-1", className)}>
+      Rewards
+      {count > 1 ? (
+        <span className="flex h-4 min-w-4 items-center justify-center rounded-md bg-[#EDEDED] px-1 text-xs font-semibold leading-4 tracking-[-0.02em] text-[#404040]">
+          {count}
+        </span>
+      ) : null}
+    </span>
+  );
+}
+
 interface ProgramRewardsDisplayProps {
   rewards?: RewardProps[] | null;
   discount?: DiscountProps | null;
   isDarkImage?: boolean;
-  iconsOnly?: boolean;
   className?: string;
   onRewardClick?: (reward: RewardProps) => void;
   onDiscountClick?: (discount: DiscountProps) => void;
-  iconClassName?: string;
   descriptionClassName?: string;
 }
 
@@ -30,21 +47,18 @@ export function ProgramRewardsDisplay({
   rewards,
   discount,
   isDarkImage = false,
-  iconsOnly = false,
   className,
   onRewardClick,
   onDiscountClick,
-  iconClassName,
   descriptionClassName,
 }: ProgramRewardsDisplayProps) {
-  // Concatenate rewards and discount into a single array
   const items: RewardItem[] = [];
 
-  // Add rewards
   if (rewards) {
     rewards.forEach((reward) => {
       items.push({
         id: reward.id,
+        event: reward.event,
         icon: REWARD_EVENT_ICON[reward.event],
         description: formatRewardDescription(reward, {
           includeEarnPrefix: false,
@@ -54,104 +68,93 @@ export function ProgramRewardsDisplay({
     });
   }
 
-  // Add discount if present
   if (discount) {
     items.push({
       id: "discount",
-      icon: Gift,
+      event: "discount",
+      icon: DiscountCode,
       description: formatDiscountDescription(discount),
       onClick: onDiscountClick ? () => onDiscountClick(discount) : undefined,
     });
   }
 
-  // shouldn't happen, but just in case
   if (items.length === 0) return null;
 
-  if (iconsOnly) {
-    return (
-      <div className={cn("flex min-h-6 items-center gap-1.5", className)}>
-        {items.map((item) => (
-          <ProgramRewardIcon
-            key={item.id}
-            icon={item.icon}
-            description={item.description}
-            onClick={item.onClick}
-            className={cn(isDarkImage && "text-content-inverted")}
-            iconClassName={cn("text-neutral-600", iconClassName)}
-          />
-        ))}
-      </div>
-    );
-  }
+  const featuredItem =
+    items.find((item) => item.event === "sale") ??
+    items.find((item) => item.event === "lead") ??
+    items.find((item) => item.event === "click") ??
+    items[0];
+
+  return (
+    <div className={cn("w-full min-w-0", className)}>
+      <RewardExpandedItem
+        item={featuredItem}
+        isDarkImage={isDarkImage}
+        descriptionClassName={descriptionClassName}
+      />
+    </div>
+  );
+}
+
+function RewardExpandedItem({
+  item,
+  isDarkImage,
+  descriptionClassName,
+}: {
+  item: RewardItem;
+  isDarkImage: boolean;
+  descriptionClassName?: string;
+}) {
+  const As = item.onClick ? "button" : "div";
 
-  // If there's only one item, show the full description
-  if (items.length === 1) {
-    const item = items[0];
-    const As = item.onClick ? "button" : "div";
-    return (
-      <HoverCard.Root openDelay={100}>
-        <HoverCard.Portal>
-          <HoverCard.Content
-            side="bottom"
-            sideOffset={8}
-            className="animate-slide-up-fade z-[99] flex items-center gap-2 overflow-hidden rounded-xl border border-neutral-200 bg-white p-2 text-xs text-neutral-700 shadow-sm"
+  return (
+    <HoverCard.Root openDelay={100}>
+      <HoverCard.Portal>
+        <HoverCard.Content
+          side="bottom"
+          sideOffset={8}
+          className="animate-slide-up-fade z-[99] flex max-w-xs items-center gap-2 overflow-hidden rounded-xl border border-neutral-200 bg-white p-2 text-xs text-neutral-700 shadow-sm"
+        >
+          <item.icon className="text-content-default size-4 shrink-0" />
+          <span>{item.description}</span>
+        </HoverCard.Content>
+      </HoverCard.Portal>
+      <HoverCard.Trigger asChild>
+        <As
+          {...(item.onClick && {
+            type: "button",
+            onClick: (e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              item.onClick?.();
+            },
+          })}
+          className={cn(
+            "flex min-w-0 max-w-full items-center gap-1 overflow-hidden pr-1",
+            item.onClick &&
+              "hover:bg-bg-subtle active:bg-bg-emphasis rounded-md transition-colors",
+          )}
+        >
+          <div
+            className={cn(
+              "text-content-default flex size-6 shrink-0 items-center justify-center rounded-md",
+              isDarkImage && "text-content-inverted",
+            )}
           >
-            <item.icon className="text-content-default size-4" />
-            <span>{item.description}</span>
-          </HoverCard.Content>
-        </HoverCard.Portal>
-        <HoverCard.Trigger>
-          <As
-            {...(item.onClick && {
-              type: "button",
-              onClick: (e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                item.onClick?.();
-              },
-            })}
+            <item.icon className="size-4" />
+          </div>
+          <span
             className={cn(
-              "-ml-1 flex items-center gap-1 pr-1",
-              item.onClick &&
-                "hover:bg-bg-subtle active:bg-bg-emphasis rounded-md transition-colors",
-              className,
+              "min-w-0 max-w-full truncate text-sm font-normal leading-5 tracking-[-0.02em] text-black",
+              isDarkImage && "text-content-inverted",
+              descriptionClassName,
             )}
           >
-            <div
-              className={cn(
-                "text-content-default flex size-6 items-center justify-center rounded-md",
-                isDarkImage && "text-content-inverted",
-              )}
-            >
-              <item.icon className="size-4" />
-            </div>
-            <span
-              className={cn(
-                "text-content-default max-w-[120px] truncate text-sm font-medium sm:max-w-[160px]",
-                isDarkImage && "text-content-inverted",
-                descriptionClassName,
-              )}
-            >
-              {item.description}
-            </span>
-          </As>
-        </HoverCard.Trigger>
-      </HoverCard.Root>
-    );
-  }
-
-  // If there are multiple items, show icons with tooltips
-  return (
-    <div className={cn("-ml-1 flex items-center gap-1.5", className)}>
-      {items.map((item) => (
-        <ProgramRewardIcon
-          key={item.id}
-          icon={item.icon}
-          description={item.description}
-          onClick={item.onClick}
-          className={cn(isDarkImage && "text-content-inverted", iconClassName)}
-        />
-      ))}
-    </div>
+            {item.description}
+          </span>
+        </As>
+      </HoverCard.Trigger>
+    </HoverCard.Root>
   );
 }
diff --git a/apps/web/ui/program-marketplace/utils/default-exports.ts b/apps/web/ui/program-marketplace/utils/default-exports.ts
new file mode 100644
index 00000000000..c1f8782a4ff
--- /dev/null
+++ b/apps/web/ui/program-marketplace/utils/default-exports.ts
@@ -0,0 +1,32 @@
+import { prisma } from "@/lib/prisma";
+import { Category } from "@prisma/client";
+
+export const revalidate = 3600;
+
+export async function generateStaticParams() {
+  const programs = await prisma.program.findMany({
+    where: {
+      addedToMarketplaceAt: {
+        not: null,
+      },
+    },
+    select: {
+      slug: true,
+    },
+  });
+
+  const categoryPages = Object.values(Category).map((category) => ({
+    segments: ["c", category.toLowerCase()],
+  }));
+
+  const programPages = programs.map((program) => ({
+    segments: [program.slug],
+  }));
+
+  return [
+    { segments: [] },
+    { segments: ["all"] },
+    ...categoryPages,
+    ...programPages,
+  ];
+}
diff --git a/apps/web/ui/program-marketplace/utils/urls.ts b/apps/web/ui/program-marketplace/utils/urls.ts
index c09ab1a56a8..2f70cc4b6c6 100644
--- a/apps/web/ui/program-marketplace/utils/urls.ts
+++ b/apps/web/ui/program-marketplace/utils/urls.ts
@@ -34,14 +34,10 @@ function buildMarketplaceHref(
   return `${path}${queryString ? `?${queryString}` : ""}`;
 }
 
-export function getMarketplaceHref() {
-  return MARKETPLACE_BASE;
-}
-
 export function getMarketplaceAllHref(
   params?: Record<string, string | undefined>,
 ) {
-  return buildMarketplaceHref(`${MARKETPLACE_BASE}/all`, params);
+  return buildMarketplaceHref("/marketplace/all", params);
 }
 
 export function getPreservedMarketplaceSearchParams(
@@ -62,37 +58,11 @@ export function getMarketplaceCategoryHref(
   params?: Record<string, string | undefined>,
 ) {
   return buildMarketplaceHref(
-    `${MARKETPLACE_BASE}/c/${category.toLowerCase()}`,
+    `/marketplace/c/${category.toLowerCase()}`,
     params,
   );
 }
 
-export function getMarketplaceProgramHref(programSlug: string) {
-  return `${MARKETPLACE_BASE}/${programSlug}`;
-}
-
-export function getMarketplacePathFromSlug(slug?: string[]) {
-  const segments = slug ?? [];
-
-  if (segments.length === 0) {
-    return MARKETPLACE_BASE;
-  }
-
-  return `${MARKETPLACE_BASE}/${segments.join("/")}`;
-}
-
-export function getMarketplaceCanonicalUrl(pathname: string) {
-  return `https://dub.co${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
-}
-
-function getMarketplacePartnersProgramUrl(programSlug: string) {
-  return `https://partners.dub.co${getMarketplaceProgramHref(programSlug)}`;
-}
-
-export function getMarketplacePublicApplyHref(programSlug: string) {
-  return getMarketplacePartnersProgramUrl(programSlug);
-}
-
 export function getMarketplaceCategoryFromPathname(
   pathname: string,
 ): Category | null {
diff --git a/apps/web/ui/shared/callout.tsx b/apps/web/ui/shared/callout.tsx
new file mode 100644
index 00000000000..d403a6c07be
--- /dev/null
+++ b/apps/web/ui/shared/callout.tsx
@@ -0,0 +1,64 @@
+import { CircleCheck, CircleInfo, TriangleWarning } from "@dub/ui";
+import { cn } from "@dub/utils";
+import { PropsWithChildren } from "react";
+
+const calloutVariants = {
+  success: {
+    icon: CircleCheck,
+    containerClassName: "border-green-200 bg-green-50 text-green-900",
+    iconClassName: "text-green-600",
+  },
+  info: {
+    icon: CircleInfo,
+    containerClassName: "border-blue-200 bg-blue-50 text-blue-900",
+    iconClassName: "text-blue-600",
+  },
+  warn: {
+    icon: TriangleWarning,
+    containerClassName: "border-amber-200 bg-amber-50 text-amber-900",
+    iconClassName: "text-amber-600",
+  },
+  error: {
+    icon: TriangleWarning,
+    containerClassName: "border-red-200 bg-red-50 text-red-900",
+    iconClassName: "text-red-600",
+  },
+  neutral: {
+    icon: CircleInfo,
+    containerClassName: "border-neutral-200 bg-neutral-50 text-neutral-900",
+    iconClassName: "text-neutral-600",
+  },
+};
+
+export function Callout({
+  variant = "neutral",
+  size = 2,
+  className,
+  children,
+}: PropsWithChildren<{
+  variant?: keyof typeof calloutVariants;
+  size?: 1 | 2;
+  className?: string;
+}>) {
+  const {
+    icon: Icon,
+    containerClassName,
+    iconClassName,
+  } = calloutVariants[variant];
+
+  return (
+    <div
+      className={cn(
+        "flex items-start gap-2.5 rounded-[10px] border text-sm font-normal",
+        size === 2 ? "px-4 py-3" : "px-3 py-2",
+        containerClassName,
+        className,
+      )}
+    >
+      <div className="flex h-5 shrink-0 items-center">
+        <Icon className={cn("size-3.5", iconClassName)} />
+      </div>
+      <div className="min-w-0">{children}</div>
+    </div>
+  );
+}
diff --git a/apps/web/ui/shared/duration-popover-content.tsx b/apps/web/ui/shared/duration-popover-content.tsx
index 8413b90eea4..67567e47ca2 100644
--- a/apps/web/ui/shared/duration-popover-content.tsx
+++ b/apps/web/ui/shared/duration-popover-content.tsx
@@ -14,6 +14,7 @@ type DurationPopoverContentProps = {
   presetDurations: number[];
   partnerReferralReward?: boolean;
   presetsOnly?: boolean;
+  hideLifetime?: boolean;
   unit?: "days" | "months";
   minValue?: number;
 };
@@ -24,6 +25,7 @@ export function DurationPopoverContent({
   presetDurations,
   partnerReferralReward,
   presetsOnly = false,
+  hideLifetime = false,
   unit = "months",
   minValue = 0,
 }: DurationPopoverContentProps) {
@@ -142,7 +144,11 @@ export function DurationPopoverContent({
               }
               if (e.key === "Enter") {
                 e.preventDefault();
-                if (!presetsOnly && customDurationInput === "0") {
+                if (
+                  !presetsOnly &&
+                  minValue === 0 &&
+                  customDurationInput === "0"
+                ) {
                   onChange(0);
                   setCustomDurationInput("");
                   setShowCustomInput(false);
@@ -187,14 +193,16 @@ export function DurationPopoverContent({
         setCustomDurationInput("");
       }}
       items={[
-        ...(!presetsOnly && !partnerReferralReward
+        ...(!presetsOnly && !partnerReferralReward && minValue === 0
           ? [{ text: "one time", value: "0" }]
           : []),
         ...presetItems,
         ...(!presetsOnly
           ? [
               {
-                text: `for the ${partnerReferralReward ? "referred partner's" : "customer's"} lifetime`,
+                text: hideLifetime
+                  ? "Indefinitely"
+                  : `for the ${partnerReferralReward ? "referred partner's" : "customer's"} lifetime`,
                 value: "Infinity",
               },
             ]
diff --git a/apps/web/ui/shared/emoji-picker.tsx b/apps/web/ui/shared/emoji-picker.tsx
index 2b91a9e2889..05d3bdeefa3 100644
--- a/apps/web/ui/shared/emoji-picker.tsx
+++ b/apps/web/ui/shared/emoji-picker.tsx
@@ -82,18 +82,18 @@ export function EmojiPicker({
       }}
       content={
         <div
-          className="isolate flex h-[300px] w-fit flex-col"
+          className="isolate flex h-[300px] w-full flex-col sm:w-fit"
           onKeyDownCapture={handleBackspaceClose}
         >
           <EmojiPickerBase.Root
-            className="flex min-h-0 flex-1 flex-col"
+            className="flex min-h-0 w-full flex-1 flex-col"
             onEmojiSelect={({ emoji }) => {
               onSelect(emoji);
               setOpenPopover(false);
             }}
           >
-            <EmojiPickerBase.Search className="border-border-default focus:border-border-default z-10 rounded-t-lg border-0 border-b bg-white px-3 py-2.5 text-base outline-none placeholder:text-neutral-400 focus:ring-0 sm:text-sm" />
-            <EmojiPickerBase.Viewport className="outline-hidden relative flex-1">
+            <EmojiPickerBase.Search className="border-border-default focus:border-border-default z-10 w-full border-0 border-b bg-white px-3 py-2.5 text-base outline-none placeholder:text-neutral-400 focus:ring-0 sm:rounded-t-lg sm:text-sm" />
+            <EmojiPickerBase.Viewport className="outline-hidden relative w-full flex-1">
               <EmojiPickerBase.Loading className="absolute inset-0 flex items-center justify-center text-sm text-neutral-400">
                 Loading…
               </EmojiPickerBase.Loading>
@@ -101,24 +101,24 @@ export function EmojiPicker({
                 No emoji found.
               </EmojiPickerBase.Empty>
               <EmojiPickerBase.List
-                className="select-none pb-1.5"
+                className="w-full select-none pb-1.5"
                 components={{
                   CategoryHeader: ({ category, ...props }) => (
                     <div
-                      className="text-content-subtle bg-white px-3 pb-1.5 pt-3 text-xs font-medium"
+                      className="text-content-subtle w-full bg-white px-3 pb-1.5 pt-3 text-xs font-medium"
                       {...props}
                     >
                       {category.label}
                     </div>
                   ),
                   Row: ({ children, ...props }) => (
-                    <div className="scroll-my-1.5 px-1.5" {...props}>
+                    <div className="w-full scroll-my-1.5 px-1.5" {...props}>
                       {children}
                     </div>
                   ),
                   Emoji: ({ emoji, ...props }) => (
                     <button
-                      className="flex size-7 items-center justify-center rounded-md text-lg data-[active]:bg-neutral-100"
+                      className="flex aspect-square w-[10%] shrink-0 items-center justify-center rounded-md text-xl data-[active]:bg-neutral-100 sm:aspect-auto sm:size-7 sm:w-auto sm:text-lg"
                       {...props}
                     >
                       {emoji.emoji}
diff --git a/apps/web/ui/shared/inline-emoji-menu.tsx b/apps/web/ui/shared/inline-emoji-menu.tsx
new file mode 100644
index 00000000000..00edc11e50d
--- /dev/null
+++ b/apps/web/ui/shared/inline-emoji-menu.tsx
@@ -0,0 +1,359 @@
+"use client";
+
+import { useRichTextContext } from "@dub/ui";
+import { cn } from "@dub/utils";
+import {
+  autoUpdate,
+  flip,
+  FloatingPortal,
+  offset,
+  shift,
+  useFloating,
+} from "@floating-ui/react";
+import { gemoji } from "gemoji";
+import {
+  forwardRef,
+  useEffect,
+  useId,
+  useImperativeHandle,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+
+type EmojiShortcode = {
+  emoji: string;
+  shortcode: string;
+};
+
+const RESULT_LIMIT = 20;
+
+const primaryShortcodes: EmojiShortcode[] = gemoji.map((entry) => ({
+  emoji: entry.emoji,
+  shortcode: entry.names[0],
+}));
+
+const allShortcodes: EmojiShortcode[] = gemoji.flatMap((entry) =>
+  entry.names.map((shortcode) => ({
+    emoji: entry.emoji,
+    shortcode,
+  })),
+);
+
+function searchEmojiShortcodes(query: string) {
+  const normalized = query.toLowerCase();
+
+  if (!normalized) return primaryShortcodes.slice(0, RESULT_LIMIT);
+
+  return allShortcodes
+    .filter((item) => item.shortcode.startsWith(normalized))
+    .sort((a, b) => {
+      if (a.shortcode.length !== b.shortcode.length) {
+        return a.shortcode.length - b.shortcode.length;
+      }
+      return a.shortcode.localeCompare(b.shortcode);
+    })
+    .slice(0, RESULT_LIMIT);
+}
+
+const EMOJI_TOKEN = /(?:^|[\s\0\n]):([a-z0-9_+-]*)$/i;
+
+// `\0` is a one-character stand-in for leaf nodes, so the index matches a
+// ProseMirror parent offset.
+function matchEmojiToken(textBeforeCaret: string) {
+  const match = textBeforeCaret.match(EMOJI_TOKEN);
+  if (!match || match.index === undefined) return null;
+
+  return {
+    query: match[1],
+    colonIndex: match.index + match[0].lastIndexOf(":"),
+  };
+}
+
+type RichTextEditor = NonNullable<
+  ReturnType<typeof useRichTextContext>["editor"]
+>;
+
+type EmojiToken = {
+  query: string;
+  from: number;
+  to: number;
+};
+
+export type InlineEmojiAutocompleteHandle = {
+  onKeyDown: (event: KeyboardEvent) => boolean;
+};
+
+function readEmojiToken(editor: RichTextEditor): EmojiToken | null {
+  const { selection } = editor.state;
+  if (!selection.empty) return null;
+
+  const { $from } = selection;
+  // `\0` stands in for leaf nodes (hard breaks) and is one character, so the
+  // string index lines up with the parent offset.
+  const textBeforeCaret = $from.parent.textBetween(
+    0,
+    $from.parentOffset,
+    "\n",
+    "\0",
+  );
+  const match = matchEmojiToken(textBeforeCaret);
+  if (!match) return null;
+
+  return {
+    query: match.query,
+    from: $from.start() + match.colonIndex,
+    to: $from.pos,
+  };
+}
+
+export const InlineEmojiAutocomplete = forwardRef<
+  InlineEmojiAutocompleteHandle,
+  { suspended?: boolean }
+>(function InlineEmojiAutocomplete({ suspended = false }, ref) {
+  const { editor } = useRichTextContext();
+  const listboxId = useId();
+  const [token, setToken] = useState<EmojiToken | null>(null);
+  const [dismissed, setDismissed] = useState(false);
+  const [activeIndex, setActiveIndex] = useState(0);
+  const activeIndexRef = useRef(0);
+  const menuRef = useRef<HTMLDivElement | null>(null);
+
+  const query = token?.query ?? "";
+  const results = useMemo(
+    () =>
+      token && !dismissed && !suspended ? searchEmojiShortcodes(query) : [],
+    [token, dismissed, suspended, query],
+  );
+  const open = results.length > 0;
+  const activeIndexClamped = results.length
+    ? Math.min(activeIndex, results.length - 1)
+    : 0;
+  const activeOptionId = `${listboxId}-option-${activeIndexClamped}`;
+
+  const { refs, floatingStyles, update } = useFloating({
+    open,
+    placement: "top-start",
+    strategy: "fixed",
+    middleware: [offset(6), flip(), shift({ padding: 8 })],
+    whileElementsMounted: autoUpdate,
+  });
+
+  useEffect(() => {
+    if (suspended) setDismissed(true);
+  }, [suspended]);
+
+  useEffect(() => {
+    if (!editor) return;
+
+    const syncToken = () => {
+      const next = readEmojiToken(editor);
+      setToken((current) =>
+        current?.query === next?.query &&
+        current?.from === next?.from &&
+        current?.to === next?.to
+          ? current
+          : next,
+      );
+      if (!next) setDismissed(false);
+    };
+
+    syncToken();
+    editor.on("update", syncToken);
+    editor.on("selectionUpdate", syncToken);
+
+    return () => {
+      editor.off("update", syncToken);
+      editor.off("selectionUpdate", syncToken);
+    };
+  }, [editor]);
+
+  useEffect(() => {
+    activeIndexRef.current = 0;
+    setActiveIndex(0);
+  }, [query]);
+
+  useLayoutEffect(() => {
+    if (!open || !editor) return;
+
+    refs.setPositionReference({
+      getBoundingClientRect: () => {
+        const coords = editor.view.coordsAtPos(editor.state.selection.from);
+        return new DOMRect(
+          coords.left,
+          coords.top,
+          coords.right - coords.left,
+          coords.bottom - coords.top,
+        );
+      },
+    });
+  }, [open, editor, token?.from, token?.to, refs]);
+
+  useEffect(() => {
+    if (!open) return;
+
+    const viewport = window.visualViewport;
+    if (!viewport) return;
+
+    const onViewportChange = () => update();
+    viewport.addEventListener("resize", onViewportChange);
+    viewport.addEventListener("scroll", onViewportChange);
+
+    return () => {
+      viewport.removeEventListener("resize", onViewportChange);
+      viewport.removeEventListener("scroll", onViewportChange);
+    };
+  }, [open, update]);
+
+  useEffect(() => {
+    if (!open || !editor) return;
+
+    const onPointerDown = (event: PointerEvent) => {
+      const target = event.target;
+      if (!(target instanceof Node)) return;
+      if (menuRef.current?.contains(target)) return;
+      if (editor.view.dom.contains(target)) return;
+      setDismissed(true);
+    };
+
+    document.addEventListener("pointerdown", onPointerDown, true);
+    return () =>
+      document.removeEventListener("pointerdown", onPointerDown, true);
+  }, [open, editor]);
+
+  useEffect(() => {
+    if (!open) return;
+    menuRef.current
+      ?.querySelector<HTMLElement>(`[data-index="${activeIndexClamped}"]`)
+      ?.scrollIntoView({ block: "nearest" });
+  }, [open, activeIndexClamped, query]);
+
+  useEffect(() => {
+    if (!open || !editor) return;
+
+    const dom = editor.view.dom;
+    dom.setAttribute("aria-controls", listboxId);
+    dom.setAttribute("aria-expanded", "true");
+    dom.setAttribute("aria-autocomplete", "list");
+    dom.setAttribute("aria-activedescendant", activeOptionId);
+
+    return () => {
+      dom.removeAttribute("aria-controls");
+      dom.removeAttribute("aria-expanded");
+      dom.removeAttribute("aria-autocomplete");
+      dom.removeAttribute("aria-activedescendant");
+    };
+  }, [open, editor, listboxId, activeOptionId]);
+
+  const selectIndex = (index: number) => {
+    const next = results[index];
+    if (!next || !editor || !token) return;
+
+    editor
+      .chain()
+      .focus()
+      .deleteRange({ from: token.from, to: token.to })
+      .insertContent(next.emoji)
+      .run();
+  };
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      onKeyDown: (event) => {
+        if (!open || event.isComposing) return false;
+
+        if (event.key === "ArrowDown") {
+          event.preventDefault();
+          const next = (activeIndexRef.current + 1) % results.length;
+          activeIndexRef.current = next;
+          setActiveIndex(next);
+          return true;
+        }
+
+        if (event.key === "ArrowUp") {
+          event.preventDefault();
+          const next =
+            (activeIndexRef.current - 1 + results.length) % results.length;
+          activeIndexRef.current = next;
+          setActiveIndex(next);
+          return true;
+        }
+
+        if (
+          (event.key === "Enter" && !event.metaKey && !event.ctrlKey) ||
+          event.key === "Tab"
+        ) {
+          event.preventDefault();
+          const index = Math.min(
+            activeIndexRef.current,
+            Math.max(results.length - 1, 0),
+          );
+          selectIndex(index);
+          return true;
+        }
+
+        if (event.key === "Escape") {
+          event.preventDefault();
+          setDismissed(true);
+          return true;
+        }
+
+        return false;
+      },
+    }),
+    [open, results, editor, token],
+  );
+
+  if (!open) return null;
+
+  return (
+    <FloatingPortal>
+      <div
+        ref={(node) => {
+          menuRef.current = node;
+          refs.setFloating(node);
+        }}
+        id={listboxId}
+        style={floatingStyles}
+        role="listbox"
+        aria-label="Emoji suggestions"
+        onMouseDown={(event) => event.preventDefault()}
+        className="border-border-subtle bg-bg-default z-[60] flex max-h-52 w-max min-w-40 max-w-[min(18rem,calc(100vw-16px))] flex-col overflow-y-auto rounded-lg border p-1 shadow-sm"
+      >
+        {results.map((item, index) => {
+          const selected = index === activeIndexClamped;
+
+          return (
+            <button
+              key={item.shortcode}
+              id={`${listboxId}-option-${index}`}
+              type="button"
+              role="option"
+              aria-selected={selected}
+              data-index={index}
+              data-selected={selected}
+              onPointerEnter={() => {
+                activeIndexRef.current = index;
+                setActiveIndex(index);
+              }}
+              onClick={() => selectIndex(index)}
+              className={cn(
+                "flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm",
+                "data-[selected=true]:bg-bg-subtle",
+              )}
+            >
+              <span className="w-5 shrink-0 text-center text-base leading-none">
+                {item.emoji}
+              </span>
+              <span className="text-content-subtle truncate">
+                {item.shortcode}
+              </span>
+            </button>
+          );
+        })}
+      </div>
+    </FloatingPortal>
+  );
+});
diff --git a/apps/web/ui/shared/message-input.tsx b/apps/web/ui/shared/message-input.tsx
index c261d86af9f..5d61304f761 100644
--- a/apps/web/ui/shared/message-input.tsx
+++ b/apps/web/ui/shared/message-input.tsx
@@ -1,12 +1,12 @@
+import { clientAccessCheck } from "@/lib/client-access-check";
 import {
   MAX_ATTACHMENTS_PER_MESSAGE,
   MAX_MESSAGE_LENGTH,
 } from "@/lib/messages/constants";
-import { messageAttachmentInputSchema } from "@/lib/messages/schemas";
-import {
-  getAttachmentTypeLabel,
-  isPreviewableImageType,
-} from "@/lib/messages/utils";
+import { type MessageAttachmentInput } from "@/lib/messages/schemas";
+import { isPreviewableImageType } from "@/lib/messages/utils";
+import { getMimeTypeLabel } from "@/lib/storage/upload-policies";
+import useWorkspace from "@/lib/swr/use-workspace";
 import {
   ArrowTurnLeft,
   Button,
@@ -31,14 +31,14 @@ import {
   type RefObject,
 } from "react";
 import { toast } from "sonner";
-import * as z from "zod/v4";
 import { ATTACHMENT_MIME_TYPE_COLOR } from "../messages/message-attachments";
 import { EmojiPicker } from "../shared/emoji-picker";
+import {
+  InlineEmojiAutocomplete,
+  type InlineEmojiAutocompleteHandle,
+} from "../shared/inline-emoji-menu";
 
-export type PendingAttachment = Omit<
-  z.infer<typeof messageAttachmentInputSchema>,
-  "storageKey"
-> & {
+export type PendingAttachment = Omit<MessageAttachmentInput, "storageKey"> & {
   id: string;
   file: File;
   storageKey?: string;
@@ -61,7 +61,7 @@ export function MessageInput({
 }: {
   onSendMessage: (
     message: string,
-    attachments: z.infer<typeof messageAttachmentInputSchema>[],
+    attachments: MessageAttachmentInput[],
   ) => void | false;
   defaultValue?: string;
   onCancel?: () => void;
@@ -75,24 +75,21 @@ export function MessageInput({
   allowedFileTypes?: readonly string[];
   maxAttachments?: number;
 }) {
+  const { id: workspaceId, role } = useWorkspace();
+  const permissionsError = workspaceId
+    ? clientAccessCheck({
+        action: "messages.write",
+        role,
+        customPermissionDescription: "send messages",
+      }).error
+    : false;
+
   const richTextRef = useRef<{ setContent: (content: any) => void }>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
+  const emojiAutocompleteRef = useRef<InlineEmojiAutocompleteHandle>(null);
   const [typedMessage, setTypedMessage] = useState(defaultValue || "");
-  const [emojiPickerOpen, setEmojiPickerOpenState] = useState(false);
+  const [emojiPickerOpen, setEmojiPickerOpen] = useState(false);
   const [dragActive, setDragActive] = useState(false);
-  const [cursorRect, setCursorRect] = useState<{
-    top: number;
-    bottom: number;
-    left: number;
-    right: number;
-  } | null>(null);
-  const stripColonOnEmojiPickRef = useRef(false);
-
-  const setEmojiPickerOpen = useCallback((open: boolean) => {
-    stripColonOnEmojiPickRef.current = false;
-    if (!open) setCursorRect(null);
-    setEmojiPickerOpenState(open);
-  }, []);
 
   const hasCompletedAttachments = attachments.some(
     (a) => !a.uploading && a.storageKey,
@@ -102,7 +99,12 @@ export function MessageInput({
   const isTooLong = typedMessage.trim().length >= MAX_MESSAGE_LENGTH;
 
   const isSendDisabled =
-    (!hasText && !hasCompletedAttachments) || isTooLong || hasUploading;
+    Boolean(permissionsError) ||
+    (!hasText && !hasCompletedAttachments) ||
+    isTooLong ||
+    hasUploading;
+
+  const canAddFiles = Boolean(onAddFiles) && !permissionsError;
 
   const sendMessage = () => {
     if (isSendDisabled) return;
@@ -181,11 +183,11 @@ export function MessageInput({
       )}
       onDragOver={(e) => {
         handleDragEvent(e);
-        if (onAddFiles) setDragActive(true);
+        if (canAddFiles) setDragActive(true);
       }}
       onDragEnter={(e) => {
         handleDragEvent(e);
-        if (onAddFiles) setDragActive(true);
+        if (canAddFiles) setDragActive(true);
       }}
       onDragLeave={(e) => {
         handleDragEvent(e);
@@ -194,13 +196,13 @@ export function MessageInput({
       onDrop={(e) => {
         handleDragEvent(e);
         setDragActive(false);
-        if (e.dataTransfer.files?.length) {
+        if (canAddFiles && e.dataTransfer.files?.length) {
           handleFiles(e.dataTransfer.files);
         }
       }}
     >
       {/* Drag overlay */}
-      {dragActive && onAddFiles && (
+      {dragActive && canAddFiles && (
         <div className="absolute inset-0 z-10 flex items-center justify-center rounded-xl border-2 border-dashed border-neutral-400 bg-neutral-50/90">
           <div className="text-center">
             <p className="text-sm font-medium text-neutral-600">
@@ -217,41 +219,21 @@ export function MessageInput({
         style="condensed"
         markdown
         autoFocus={autoFocus}
+        editable={!permissionsError}
         placeholder={placeholder}
         editorClassName="block max-h-[min(40dvh,15rem)] w-full resize-none border-none overflow-auto scrollbar-hide p-3 text-base sm:max-h-64 sm:text-sm md:max-h-80 lg:max-h-96"
         initialValue={defaultValue}
         onChange={(editor) => setTypedMessage((editor as any).getMarkdown())}
         editorProps={{
           handleDOMEvents: {
-            keydown: (view, e) => {
+            keydown: (_view, e) => {
               if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
                 e.preventDefault();
                 e.stopPropagation();
                 sendMessage();
                 return false;
               }
-              if (e.key === ":" && !e.metaKey && !e.ctrlKey && !e.altKey) {
-                const { $from } = view.state.selection;
-                const afterHardBreak =
-                  $from.nodeBefore?.type.name === "hardBreak";
-                const atBlockStart = $from.parentOffset === 0;
-                const afterWhitespace =
-                  $from.parentOffset > 0 &&
-                  /\s/.test(
-                    $from.parent.textBetween(
-                      $from.parentOffset - 1,
-                      $from.parentOffset,
-                    ),
-                  );
-                if (atBlockStart || afterWhitespace || afterHardBreak) {
-                  const coords = view.coordsAtPos(view.state.selection.from);
-                  setCursorRect(coords);
-                  setTimeout(() => {
-                    stripColonOnEmojiPickRef.current = true;
-                    setEmojiPickerOpenState(true);
-                  }, 0);
-                }
-              }
+              if (emojiAutocompleteRef.current?.onKeyDown(e)) return true;
             },
           },
         }}
@@ -259,6 +241,10 @@ export function MessageInput({
         <div className="relative">
           <RichTextArea />
           <MessageInputEditorOverflowFades />
+          <InlineEmojiAutocomplete
+            ref={emojiAutocompleteRef}
+            suspended={emojiPickerOpen}
+          />
         </div>
 
         {/* Attachment preview strip */}
@@ -276,12 +262,11 @@ export function MessageInput({
 
         <div className="flex items-center justify-between gap-4 p-3">
           <MessageInputToolbar
+            disabled={Boolean(permissionsError)}
             emojiPickerOpen={emojiPickerOpen}
             setEmojiPickerOpen={setEmojiPickerOpen}
-            stripColonOnEmojiPickRef={stripColonOnEmojiPickRef}
-            cursorRect={cursorRect}
             onAttachClick={
-              onAddFiles ? () => fileInputRef.current?.click() : undefined
+              canAddFiles ? () => fileInputRef.current?.click() : undefined
             }
           />
           <div className="flex items-center justify-between gap-2">
@@ -331,11 +316,13 @@ export function MessageInput({
               }
               disabled={isSendDisabled}
               disabledTooltip={
-                isTooLong
-                  ? `Message must be less than ${nFormatter(MAX_MESSAGE_LENGTH)} characters`
-                  : hasUploading
-                    ? "Please wait for uploads to complete"
-                    : undefined
+                permissionsError
+                  ? permissionsError
+                  : isTooLong
+                    ? `Message must be less than ${nFormatter(MAX_MESSAGE_LENGTH)} characters`
+                    : hasUploading
+                      ? "Please wait for uploads to complete"
+                      : undefined
               }
               onClick={sendMessage}
               className="h-8 w-fit rounded-lg px-4"
@@ -370,7 +357,7 @@ function getUnsupportedFileTypeMessage(allowedFileTypes: readonly string[]) {
   }
 
   const allowedLabels = formatList(
-    allowedFileTypes.map((type) => getAttachmentTypeLabel(type)),
+    allowedFileTypes.map((type) => getMimeTypeLabel(type)),
   );
 
   return `File type not supported. Upload a ${allowedLabels}.`;
@@ -445,7 +432,7 @@ function AttachmentChip({
         )}
       >
         <File className="size-3 shrink-0" />
-        <span>{getAttachmentTypeLabel(attachment.type)}</span>
+        <span>{getMimeTypeLabel(attachment.type)}</span>
       </div>
 
       <div className="flex min-w-0 max-w-[120px] flex-col">
@@ -551,56 +538,37 @@ function MessageInputEditorOverflowFades() {
 }
 
 function MessageInputToolbar({
+  disabled,
   emojiPickerOpen,
   setEmojiPickerOpen,
-  stripColonOnEmojiPickRef,
-  cursorRect,
   onAttachClick,
 }: {
+  disabled?: boolean;
   emojiPickerOpen: boolean;
   setEmojiPickerOpen: (open: boolean) => void;
-  stripColonOnEmojiPickRef: { current: boolean };
-  cursorRect: {
-    top: number;
-    bottom: number;
-    left: number;
-    right: number;
-  } | null;
   onAttachClick?: () => void;
 }) {
   const { editor } = useRichTextContext();
 
   return (
     <RichTextToolbar
+      className={disabled ? "pointer-events-none opacity-50" : undefined}
       toolsStart={
         <EmojiPicker
           openPopover={emojiPickerOpen}
           setOpenPopover={setEmojiPickerOpen}
           onKeyboardDismissFocusEditor={() => editor?.commands.focus()}
-          anchorRect={cursorRect}
           onSelect={(emoji) => {
-            if (!editor) return;
-            const stripColon = stripColonOnEmojiPickRef.current;
-            stripColonOnEmojiPickRef.current = false;
-
-            const { from } = editor.state.selection;
-            if (
-              stripColon &&
-              from > 0 &&
-              editor.state.doc.textBetween(from - 1, from) === ":"
-            ) {
-              editor
-                .chain()
-                .deleteRange({ from: from - 1, to: from })
-                .insertContent(emoji)
-                .run();
-            } else {
-              editor.chain().insertContent(emoji).run();
-            }
+            if (!editor || disabled) return;
+            editor.chain().insertContent(emoji).run();
             setTimeout(() => editor.commands.focus(), 0);
           }}
         >
-          <RichTextToolbarButton icon={FaceSmile} label="Emoji" />
+          <RichTextToolbarButton
+            icon={FaceSmile}
+            label="Emoji"
+            disabled={disabled}
+          />
         </EmojiPicker>
       }
       toolsEnd={
@@ -609,6 +577,7 @@ function MessageInputToolbar({
             icon={Paperclip}
             label="Attach file"
             onClick={onAttachClick}
+            disabled={disabled}
           />
         ) : undefined
       }
diff --git a/apps/web/ui/shared/search-box.tsx b/apps/web/ui/shared/search-box.tsx
index 505a1257569..05828cb5f57 100644
--- a/apps/web/ui/shared/search-box.tsx
+++ b/apps/web/ui/shared/search-box.tsx
@@ -96,6 +96,8 @@ export const SearchBox = forwardRef(
         {showClearButton && value.length > 0 && (
           <button
             onClick={() => {
+              // Or a pending keystroke lands after this and restores the term.
+              debounced.cancel();
               onChange("");
               onChangeDebounced?.("");
             }}
@@ -111,10 +113,15 @@ export const SearchBox = forwardRef(
 
 export function SearchBoxPersisted({
   urlParam = "search",
+  resetParamsOnChange = [],
   onChange,
   onChangeDebounced,
   ...props
-}: { urlParam?: string } & Partial<SearchBoxProps>) {
+}: {
+  urlParam?: string;
+  /** Params to clear whenever the search changes, e.g. a stale sort. */
+  resetParamsOnChange?: string[];
+} & Partial<SearchBoxProps>) {
   const { queryParams, searchParams } = useRouterStuff();
 
   const [value, setValue] = useState(searchParams.get(urlParam) ?? "");
@@ -122,11 +129,16 @@ export function SearchBoxPersisted({
 
   // Set URL param when debounced value changes
   useEffect(() => {
-    if (searchParams.get(urlParam) ?? "" !== debouncedValue)
+    // Parens matter: `!==` binds tighter than `??`, so without them this reads
+    // `get() ?? ("" !== debouncedValue)` and never skips.
+    if ((searchParams.get(urlParam) ?? "") !== debouncedValue)
       queryParams(
         debouncedValue === ""
-          ? { del: [urlParam, "page"] }
-          : { set: { [urlParam]: debouncedValue }, del: "page" },
+          ? { del: [urlParam, "page", ...resetParamsOnChange] }
+          : {
+              set: { [urlParam]: debouncedValue },
+              del: ["page", ...resetParamsOnChange],
+            },
       );
   }, [debouncedValue]);
 
@@ -134,7 +146,8 @@ export function SearchBoxPersisted({
   useEffect(() => {
     const search = searchParams.get(urlParam);
     // Only update if the value and debouncedValue are synced (the user isn't actively typing)
-    if ((search ?? "" !== value) && value === debouncedValue)
+    // Same precedence trap.
+    if ((search ?? "") !== value && value === debouncedValue)
       setValue(search ?? "");
   }, [searchParams.get(urlParam)]);
 
diff --git a/apps/web/ui/support/chat-interface.tsx b/apps/web/ui/support/chat-interface.tsx
index 346663ff154..eef0c8ad32d 100644
--- a/apps/web/ui/support/chat-interface.tsx
+++ b/apps/web/ui/support/chat-interface.tsx
@@ -154,6 +154,7 @@ export function ChatInterface({
           const last = current[current.length - 1];
           return last.role === "user" ? current.slice(0, -1) : current;
         });
+        setPendingImages(pendingSendRef.current);
         pendingSendRef.current = null;
       }
       return;
@@ -244,6 +245,9 @@ export function ChatInterface({
       pendingImagesRef.current.forEach((image) =>
         URL.revokeObjectURL(image.previewUrl),
       );
+      pendingSendRef.current?.forEach((image) =>
+        URL.revokeObjectURL(image.previewUrl),
+      );
     };
   }, []);
 
@@ -348,6 +352,7 @@ export function ChatInterface({
       }
 
       setInput("");
+      setPendingImages([]);
       textareaRef.current?.focus();
     } catch (err) {
       sendingRef.current = false;
diff --git a/apps/web/ui/webhooks/webhook-trigger-selector.tsx b/apps/web/ui/webhooks/webhook-trigger-selector.tsx
index b1841d1e7b9..2d43f05d64d 100644
--- a/apps/web/ui/webhooks/webhook-trigger-selector.tsx
+++ b/apps/web/ui/webhooks/webhook-trigger-selector.tsx
@@ -162,10 +162,10 @@ export function WebhookTriggerSelector({
   };
 
   return (
-    <div className="flex flex-col gap-2">
+    <div className="flex flex-col gap-3">
       {availableTriggers.map((trigger) => (
         <div key={trigger}>
-          <div className="group flex gap-2">
+          <div className="group flex items-start gap-2">
             <Checkbox
               value={trigger}
               id={trigger}
@@ -175,9 +175,17 @@ export function WebhookTriggerSelector({
             />
             <label
               htmlFor={trigger}
-              className="flex select-none items-center gap-2 text-sm text-neutral-600 group-hover:text-neutral-800"
+              className={cn(
+                "flex min-w-0 select-none flex-col",
+                disabled ? "cursor-not-allowed" : "cursor-pointer",
+              )}
             >
-              {WEBHOOK_TRIGGER_DESCRIPTIONS[trigger]}
+              <span className="font-mono text-sm font-medium leading-5 text-neutral-800 group-hover:text-neutral-900">
+                {trigger}
+              </span>
+              <span className="text-[11px] leading-snug text-neutral-500">
+                {WEBHOOK_TRIGGER_DESCRIPTIONS[trigger]}
+              </span>
             </label>
           </div>
 
diff --git a/apps/web/ui/workspaces/create-workspace-form.tsx b/apps/web/ui/workspaces/create-workspace-form.tsx
index 94c2dbdef66..03a14a4d0e8 100644
--- a/apps/web/ui/workspaces/create-workspace-form.tsx
+++ b/apps/web/ui/workspaces/create-workspace-form.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import { testIds } from "@/lib/e2e/test-ids";
 import { isGenericEmail } from "@/lib/email/is-generic-email";
 import { AlertCircleFill } from "@/ui/shared/icons";
 import { Button, buttonVariants, FileUpload, useMediaQuery } from "@dub/ui";
@@ -115,6 +116,7 @@ export function CreateWorkspaceForm({
         <div className="mt-2 flex rounded-md shadow-sm">
           <input
             id="name"
+            data-testid={testIds.onboarding.workspaceName}
             type="text"
             autoFocus={!isMobile}
             autoComplete="off"
@@ -143,6 +145,7 @@ export function CreateWorkspaceForm({
           </span>
           <input
             id="slug"
+            data-testid={testIds.onboarding.workspaceSlug}
             type="text"
             required
             autoComplete="off"
@@ -245,6 +248,7 @@ export function CreateWorkspaceForm({
       <Button
         loading={isSubmitting || isSubmitSuccessful}
         text="Create workspace"
+        data-testid={testIds.onboarding.createWorkspace}
       />
     </form>
   );
diff --git a/apps/web/ui/workspaces/plan-badge.tsx b/apps/web/ui/workspaces/plan-badge.tsx
index f28c964cb75..fba19fbec68 100644
--- a/apps/web/ui/workspaces/plan-badge.tsx
+++ b/apps/web/ui/workspaces/plan-badge.tsx
@@ -7,14 +7,14 @@ export default function PlanBadge({ plan }: { plan: PlanProps }) {
     <Badge
       variant={
         plan === "enterprise"
-          ? "violet"
+          ? "violetGradient"
           : plan === "advanced"
-            ? "amber"
+            ? "amberGradient"
             : plan.startsWith("business")
-              ? "sky"
+              ? "blueGradient"
               : plan === "pro"
-                ? "blue"
-                : "black"
+                ? "blueGradient"
+                : "neutralGradient"
       }
     >
       {capitalize(plan)}
diff --git a/apps/web/ui/workspaces/subscription-menu.tsx b/apps/web/ui/workspaces/subscription-menu.tsx
index 42aa22b66fe..2333b37c212 100644
--- a/apps/web/ui/workspaces/subscription-menu.tsx
+++ b/apps/web/ui/workspaces/subscription-menu.tsx
@@ -2,6 +2,7 @@
 
 import { clientAccessCheck } from "@/lib/client-access-check";
 import { wouldLosePartnerAccess } from "@/lib/plans/has-partner-access";
+import type { StripeCancellationFeedback } from "@/lib/stripe/cancellation-feedback";
 import useWorkspace from "@/lib/swr/use-workspace";
 import {
   Button,
@@ -11,12 +12,12 @@ import {
   SquareXmark,
   StripeIcon,
 } from "@dub/ui";
-import { cn } from "@dub/utils";
+import { cn, sleep } from "@dub/utils";
 import { Command } from "cmdk";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
-import { useConfirmModal } from "../modals/confirm-modal";
+import { useCancelSubscriptionModal } from "../modals/cancel-subscription-modal";
 import { usePlanChangeConfirmationModal } from "../modals/plan-change-confirmation-modal";
 import { ThreeDots } from "../shared/icons";
 
@@ -60,16 +61,24 @@ export default function SubscriptionMenu() {
       });
   };
 
-  const handleCancellation = async () => {
+  const handleCancellation = async ({
+    feedback,
+    comment,
+  }: {
+    feedback: StripeCancellationFeedback;
+    comment: string;
+  }) => {
     setIsOpen(false);
     setClicked(true);
     return fetch(`/api/workspaces/${workspaceId}/billing/cancel`, {
       method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ feedback, comment }),
     })
       .then(async (res) => {
         if (res.ok) {
           // sleep for 2 seconds to make sure Stripe webhook was received, and then mutate
-          await new Promise((resolve) => setTimeout(resolve, 2000));
+          await sleep(2000);
           await mutate();
           toast.success(
             "Your subscription has been scheduled for cancellation at the end of the current period.",
@@ -77,6 +86,7 @@ export default function SubscriptionMenu() {
         } else {
           const { error } = await res.json();
           toast.error(error.message);
+          throw new Error(error.message);
         }
       })
       .finally(() => {
@@ -90,52 +100,29 @@ export default function SubscriptionMenu() {
     defaultProgramId &&
     wouldLosePartnerAccess({ currentPlan: plan, newPlan: null });
 
+  const { setShowCancelSubscriptionModal, CancelSubscriptionModal } =
+    useCancelSubscriptionModal({
+      billingCycleEndsAt,
+      onConfirm: handleCancellation,
+    });
+
   const { setShowPlanChangeConfirmationModal, PlanChangeConfirmationModal } =
     usePlanChangeConfirmationModal({
       newPlan: "free",
       newPeriod: "monthly",
       newTier: 1,
       onConfirm: async () => {
-        await handleCancellation();
         setShowPlanChangeConfirmationModal(false);
+        setShowCancelSubscriptionModal(true);
       },
     });
-  const { setShowConfirmModal, confirmModal } = useConfirmModal({
-    title: "Cancel subscription",
-    description: (
-      <p>
-        Your subscription will be scheduled for cancellation at the end of your
-        current billing period
-        {billingCycleEndsAt ? (
-          <span className="font-medium text-neutral-900">
-            {" "}
-            (
-            {new Date(billingCycleEndsAt).toLocaleDateString("en-US", {
-              month: "long",
-              day: "numeric",
-              year: "numeric",
-            })}
-            )
-          </span>
-        ) : (
-          ""
-        )}
-        . You will keep access until then.
-      </p>
-    ),
-    cancelText: "Not now",
-    confirmText: "Cancel subscription",
-    onConfirm: async () => {
-      await handleCancellation();
-    },
-  });
 
-  const handlehandleCancellation = () => {
+  const handleCancelSubscription = () => {
     setIsOpen(false);
     if (losesPartnerAccess) {
       setShowPlanChangeConfirmationModal(true);
     } else {
-      setShowConfirmModal(true);
+      setShowCancelSubscriptionModal(true);
     }
   };
 
@@ -146,7 +133,7 @@ export default function SubscriptionMenu() {
   return (
     <>
       <PlanChangeConfirmationModal />
-      {confirmModal}
+      <CancelSubscriptionModal />
       <Popover
         openPopover={isOpen}
         setOpenPopover={setIsOpen}
@@ -162,7 +149,7 @@ export default function SubscriptionMenu() {
               <MenuItem
                 icon={SquareXmark}
                 label="Cancel subscription"
-                onSelect={handlehandleCancellation}
+                onSelect={handleCancelSubscription}
                 disabledTooltip={
                   subscriptionCanceledAt
                     ? "Your subscription has already been scheduled for cancellation."
diff --git a/apps/web/ui/workspaces/upload-logo.tsx b/apps/web/ui/workspaces/upload-logo.tsx
index f8e69846179..af289df58f2 100644
--- a/apps/web/ui/workspaces/upload-logo.tsx
+++ b/apps/web/ui/workspaces/upload-logo.tsx
@@ -72,8 +72,8 @@ export default function UploadLogo() {
 
       <div className="flex flex-col items-start justify-between gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 sm:py-3">
         <p className="text-sm text-neutral-500">
-          Square image recommended. Accepted file types: .png, .jpg. Max file
-          size: 2MB.
+          Square image recommended. Accepted file types: .png, .jpg, .webp,
+          .avif. Max file size: 2MB.
         </p>
         <div className="shrink-0">
           <Button
diff --git a/apps/web/vercel.json b/apps/web/vercel.json
index 35588c8ed5d..e6296f6f7b7 100644
--- a/apps/web/vercel.json
+++ b/apps/web/vercel.json
@@ -91,6 +91,14 @@
     {
       "path": "/api/cron/queue/retry",
       "schedule": "* * * * *"
+    },
+    {
+      "path": "/api/cron/campaigns/queue-scheduled",
+      "schedule": "* * * * *"
+    },
+    {
+      "path": "/api/cron/rewards/queue-custom-commissions",
+      "schedule": "0 0 * * *"
     }
   ],
   "functions": {
diff --git a/packages/email/src/send-via-resend.ts b/packages/email/src/send-via-resend.ts
index aaf6a4c838b..d26014bb1cf 100644
--- a/packages/email/src/send-via-resend.ts
+++ b/packages/email/src/send-via-resend.ts
@@ -3,6 +3,35 @@ import { resend } from "./resend";
 import { VARIANT_TO_FROM_MAP } from "./resend/constants";
 import { ResendBulkEmailOptions, ResendEmailOptions } from "./resend/types";
 
+// Resend 422s reserved test domains:
+// https://resend.com/docs/knowledge-base/what-email-addresses-to-use-for-testing
+const RESEND_BLOCKED_DOMAINS = [
+  "example.com",
+  "example.net",
+  "example.org",
+  "test.com",
+] as const;
+
+const isResendBlockedRecipient = (to: string) => {
+  const domain = to.toLowerCase().trim().split("@").at(1);
+  if (!domain) return false;
+
+  return RESEND_BLOCKED_DOMAINS.some(
+    (blocked) => domain === blocked || domain.endsWith(`.${blocked}`),
+  );
+};
+
+// Keep batch cardinality so callers can zip Resend IDs by index.
+// delivered+label@resend.dev is a Resend test sink (no real inbox).
+const rewriteBlockedRecipient = (to: string) => {
+  if (!isResendBlockedRecipient(to)) return to;
+
+  const username = to.toLowerCase().trim().split("@").at(0) || "unknown";
+  const rewritten = `delivered+${username}@resend.dev`;
+  console.info(`Rewriting reserved Resend recipient ${to} → ${rewritten}`);
+  return rewritten;
+};
+
 const resendEmailForOptions = (
   opts: ResendEmailOptions,
 ): CreateEmailOptions => {
@@ -27,7 +56,7 @@ const resendEmailForOptions = (
   // Build base options without rendered outputs (react/text)
   // CreateEmailOptions requires at least one of react or text
   const baseOptions = {
-    to: isPreviewEnv ? "delivered@resend.dev" : to,
+    to: isPreviewEnv ? "delivered@resend.dev" : rewriteBlockedRecipient(to),
     from: from || VARIANT_TO_FROM_MAP[variant],
     subject: `${subject}${isPreviewEnv && gitBranch ? ` [${gitBranch}]` : ""}`,
     bcc,
diff --git a/packages/email/src/templates/broadcasts/dub-product-update-summer26.tsx b/packages/email/src/templates/broadcasts/dub-product-update-summer26.tsx
new file mode 100644
index 00000000000..bd555938e8f
--- /dev/null
+++ b/packages/email/src/templates/broadcasts/dub-product-update-summer26.tsx
@@ -0,0 +1,373 @@
+import { DUB_WORDMARK } from "@dub/utils";
+import {
+  Body,
+  Container,
+  Head,
+  Heading,
+  Hr,
+  Html,
+  Img,
+  Link,
+  Preview,
+  Section,
+  Tailwind,
+  Text,
+} from "@react-email/components";
+import { Footer } from "../../components/footer";
+
+export default function DubProductUpdateSummer26({
+  email = "panic@thedis.co",
+  unsubscribeUrl = "https://app.dub.co/account/settings",
+}: {
+  email: string;
+  unsubscribeUrl: string;
+}) {
+  return (
+    <Html>
+      <Head>
+        <style>{`
+          @media only screen and (max-width: 600px) {
+            .email-container {
+              padding-left: 16px !important;
+              padding-right: 16px !important;
+            }
+          }
+        `}</style>
+      </Head>
+      <Preview>
+        Bounties/email campaigns improvements, custom metadata rewards,
+        retainer-style custom rewards, improved yearly pricing, and other
+        updates.
+      </Preview>
+      <Tailwind>
+        <Body className="mx-auto my-auto bg-white font-sans">
+          <Container className="email-container mx-auto my-10 max-w-[600px] px-10 py-5">
+            <Section className="mt-2 text-center">
+              <Img
+                src={DUB_WORDMARK}
+                width="65"
+                height="32"
+                alt="Dub"
+                style={{
+                  display: "block",
+                  margin: "0 auto",
+                }}
+              />
+            </Section>
+
+            <Heading className="mx-0 mb-2 mt-8 p-0 text-center text-2xl font-semibold text-black">
+              Dub.co Product Update (Summer '26)
+            </Heading>
+
+            <Text className="mx-auto mb-8 mt-0 max-w-sm text-center text-base leading-6 text-neutral-600">
+              Here are some of the exciting new features that we've shipped over
+              the last few months 👇
+            </Text>
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/bounties-campaigns-improvements"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/bounties-campaigns-improvements.jpg"
+                  width={560}
+                  height={320}
+                  alt="Improvements to bounties and email campaigns"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                1. Improvements to bounties and email campaigns
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now:
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Scope bounties and email campaigns by partner tags
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Set dynamic start dates for bounties
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Combine multiple conditions for transactional email campaigns
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/bounties-campaigns-improvements"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/reward-metadata-conditions"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/reward-metadata-conditions.jpg"
+                  width={560}
+                  height={320}
+                  alt="Reward partners based on custom metadata"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                2. Custom metadata rewards + AI reward builder
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now customize partner rewards based on any{" "}
+                <code>metadata</code> you attach to tracking events – e.g.
+                different revshare rates for <code>trade</code> vs{" "}
+                <code>deposit</code> events.
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                We also added an{" "}
+                <Link
+                  href="https://ship.dub.co/ai-reward-builder"
+                  className="font-medium text-black underline"
+                >
+                  AI reward builder
+                </Link>
+                : describe the structure you want, and we'll generate the reward
+                automatically.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/reward-metadata-conditions"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/retainer-rewards"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/retainer-rewards.jpg"
+                  width={560}
+                  height={320}
+                  alt="Retainer-style custom rewards"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                3. Retainer-style custom rewards
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now pay partners a fixed amount on a regular cadence –
+                daily, weekly, biweekly, monthly, quarterly, or yearly.
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                Ideal for retainer-style agreements in exchange for ongoing
+                promotion or sponsorship placements.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/retainer-rewards"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/improved-yearly-pricing"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/improved-yearly-pricing.jpg"
+                  width={560}
+                  height={320}
+                  alt="Improved yearly pricing"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                4. Improved yearly pricing
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You now get 12x usage upfront with any yearly plan – on top of a
+                10% annual discount.
+              </Text>
+
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                E.g. a Business yearly plan includes 3M tracked events/year
+                instead of 250K/month, which is helpful when your traffic
+                fluctuates month to month.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/improved-yearly-pricing"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-8">
+              <Link
+                href="https://ship.dub.co/domain-connect"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/domain%20authorization.jpg"
+                  width={560}
+                  height={320}
+                  alt="One-click DNS setup with Domain Connect"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                5. Other updates
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/domain-connect"
+                  className="font-medium text-black underline"
+                >
+                  One-click DNS setup with Domain Connect
+                </Link>{" "}
+                for domains hosted on Vercel or Cloudflare
+                <br />•{" "}
+                <Link
+                  href="https://ship.dub.co/improve-link-clicked-webhook"
+                  className="font-medium text-black underline"
+                >
+                  Improved <code>link.clicked</code> webhooks
+                </Link>{" "}
+                – trigger for all links, specific folders, or specific links
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/domain-connect"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Text className="mx-0 mb-2 mt-0 text-sm italic leading-6 text-neutral-600">
+              Have any feedback about these new features? Just reply to this
+              email – I'd love to hear from you! 💪
+            </Text>
+            <Text className="mx-0 mb-2 mt-0 text-sm italic leading-6 text-neutral-600">
+              Steven from Dub.co
+            </Text>
+
+            <Section className="mx-auto max-w-[400px] text-center">
+              <Footer email={email} marketing unsubscribeUrl={unsubscribeUrl} />
+            </Section>
+          </Container>
+        </Body>
+      </Tailwind>
+    </Html>
+  );
+}
diff --git a/packages/email/src/templates/broadcasts/dub-startup-program-announcement.tsx b/packages/email/src/templates/broadcasts/dub-startup-program-announcement.tsx
new file mode 100644
index 00000000000..769a049d6e4
--- /dev/null
+++ b/packages/email/src/templates/broadcasts/dub-startup-program-announcement.tsx
@@ -0,0 +1,485 @@
+import { DUB_WORDMARK } from "@dub/utils";
+import {
+  Body,
+  Container,
+  Head,
+  Heading,
+  Hr,
+  Html,
+  Img,
+  Link,
+  Preview,
+  Section,
+  Tailwind,
+  Text,
+} from "@react-email/components";
+import { Footer } from "../../components/footer";
+
+export default function DubStartupProgramAnnouncement({
+  email = "panic@thedis.co",
+  unsubscribeUrl = "https://app.dub.co/account/settings",
+}: {
+  email: string;
+  unsubscribeUrl: string;
+}) {
+  return (
+    <Html>
+      <Head>
+        <style>{`
+          @media only screen and (max-width: 600px) {
+            .email-container {
+              padding-left: 16px !important;
+              padding-right: 16px !important;
+            }
+          }
+        `}</style>
+      </Head>
+      <Preview>
+        Get 50% off our yearly Advanced plan + 25% off in year 2 – our biggest
+        discount ever.
+      </Preview>
+      <Tailwind>
+        <Body className="mx-auto my-auto bg-white font-sans">
+          <Container className="email-container mx-auto my-10 max-w-[600px] px-10 py-5">
+            <Section className="mt-2 text-center">
+              <Img
+                src={DUB_WORDMARK}
+                width="65"
+                height="32"
+                alt="Dub"
+                style={{
+                  display: "block",
+                  margin: "0 auto",
+                }}
+              />
+            </Section>
+
+            <Heading className="mx-0 mb-2 mt-8 p-0 text-center text-2xl font-semibold text-black">
+              Introducing the Dub Startup Program 🚀
+            </Heading>
+
+            <Text className="mx-auto mb-8 mt-0 max-w-sm text-center text-base leading-6 text-neutral-600">
+              Get 50% off our yearly Advanced plan + 25% off in year 2 – our
+              biggest discount ever.
+            </Text>
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/startups"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/og/startups.jpg"
+                  width={560}
+                  height={320}
+                  alt="Dub Startup Program"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Text className="mx-0 my-2 text-sm leading-6 text-neutral-600">
+                We're excited to launch our Startup Program, which offers a 50%
+                discount on our yearly Advanced plan + 25% off in year 2 – our
+                biggest discount ever.
+              </Text>
+
+              <Text className="mx-0 my-2 text-sm leading-6 text-neutral-600">
+                The Advanced plan also gives you access to additional features,
+                including:
+              </Text>
+
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/embedded-referrals"
+                  className="font-medium text-black underline"
+                >
+                  Embedded referral dashboard
+                </Link>
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/partner-rewards"
+                  className="font-medium text-black underline"
+                >
+                  Advanced reward structures
+                </Link>{" "}
+                +{" "}
+                <Link
+                  href="https://ship.dub.co/group-move-rules"
+                  className="font-medium text-black underline"
+                >
+                  Group move rules
+                </Link>
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/partner-referral-rewards"
+                  className="font-medium text-black underline"
+                >
+                  Partner referrals
+                </Link>
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/risk-monitoring"
+                  className="font-medium text-black underline"
+                >
+                  Risk monitoring
+                </Link>
+              </Text>
+              <Text className="mx-0 mb-4 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/email-campaigns"
+                  className="font-medium text-black underline"
+                >
+                  Email campaigns
+                </Link>{" "}
+                +{" "}
+                <Link
+                  href="https://ship.dub.co/messaging-partners"
+                  className="font-medium text-black underline"
+                >
+                  Messaging center
+                </Link>
+              </Text>
+
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/startups"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Apply to the Dub Startup Program
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/bounties-campaigns-improvements"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/bounties-campaigns-improvements.jpg"
+                  width={560}
+                  height={320}
+                  alt="Improvements to bounties and email campaigns"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                2. Improvements to bounties and email campaigns
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now:
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Scope bounties and email campaigns by partner tags
+              </Text>
+              <Text className="mx-0 mb-1 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Set dynamic start dates for bounties
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 pl-4 text-sm leading-6 text-neutral-600">
+                • Combine multiple conditions for transactional email campaigns
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/bounties-campaigns-improvements"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/reward-metadata-conditions"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/reward-metadata-conditions.jpg"
+                  width={560}
+                  height={320}
+                  alt="Reward partners based on custom metadata"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                3. Custom metadata rewards + AI reward builder
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now customize partner rewards based on any{" "}
+                <code>metadata</code> you attach to tracking events – e.g.
+                different revshare rates for <code>trade</code> vs{" "}
+                <code>deposit</code> events.
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                We also added an{" "}
+                <Link
+                  href="https://ship.dub.co/ai-reward-builder"
+                  className="font-medium text-black underline"
+                >
+                  AI reward builder
+                </Link>
+                : describe the structure you want, and we'll generate the reward
+                automatically.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/reward-metadata-conditions"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/retainer-rewards"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/retainer-rewards.jpg"
+                  width={560}
+                  height={320}
+                  alt="Retainer-style custom rewards"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                4. Retainer-style custom rewards
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You can now pay partners a fixed amount on a regular cadence –
+                daily, weekly, biweekly, monthly, quarterly, or yearly.
+              </Text>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                Ideal for retainer-style agreements in exchange for ongoing
+                promotion or sponsorship placements.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/retainer-rewards"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-6">
+              <Link
+                href="https://ship.dub.co/improved-yearly-pricing"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/improved-yearly-pricing.jpg"
+                  width={560}
+                  height={320}
+                  alt="Improved yearly pricing"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                5. Improved yearly pricing
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                You now get 12x usage upfront with any yearly plan – on top of a
+                10% annual discount.
+              </Text>
+
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                E.g. a Business yearly plan includes 3M tracked events/year
+                instead of 250K/month, which is helpful when your traffic
+                fluctuates month to month.
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/improved-yearly-pricing"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Section className="mb-8">
+              <Link
+                href="https://ship.dub.co/domain-connect"
+                style={{ textDecoration: "none" }}
+              >
+                <Img
+                  src="https://assets.dub.co/cms/domain%20authorization.jpg"
+                  width={560}
+                  height={320}
+                  alt="One-click DNS setup with Domain Connect"
+                  className="mb-3 w-full rounded-lg"
+                  style={{
+                    display: "block",
+                    maxWidth: "100%",
+                    height: "auto",
+                    borderRadius: "8px",
+                  }}
+                />
+              </Link>
+              <Heading className="mx-0 mb-2 mt-0 p-0 text-base font-semibold text-black">
+                6. Other updates
+              </Heading>
+              <Text className="mx-0 mb-2 mt-0 text-sm leading-6 text-neutral-600">
+                •{" "}
+                <Link
+                  href="https://ship.dub.co/domain-connect"
+                  className="font-medium text-black underline"
+                >
+                  One-click DNS setup with Domain Connect
+                </Link>{" "}
+                for domains hosted on Vercel or Cloudflare
+                <br />•{" "}
+                <Link
+                  href="https://ship.dub.co/improve-link-clicked-webhook"
+                  className="font-medium text-black underline"
+                >
+                  Improved <code>link.clicked</code> webhooks
+                </Link>{" "}
+                – trigger for all links, specific folders, or specific links
+              </Text>
+              <Section className="mt-4 text-center">
+                <Link
+                  href="https://ship.dub.co/domain-connect"
+                  className="block w-full rounded-lg bg-neutral-900 py-2.5 text-center text-sm font-medium text-white no-underline"
+                  style={{
+                    backgroundColor: "#171717",
+                    color: "#ffffff",
+                    borderRadius: "8px",
+                    padding: "10px 16px",
+                    textDecoration: "none",
+                    fontWeight: "500",
+                    fontSize: "14px",
+                    width: "100%",
+                    boxSizing: "border-box",
+                  }}
+                >
+                  Learn more
+                </Link>
+              </Section>
+            </Section>
+
+            <Hr className="mx-0 my-5 w-full border border-neutral-200" />
+
+            <Text className="mx-0 mb-2 mt-0 text-sm italic leading-6 text-neutral-600">
+              Have any feedback about these new features? Just reply to this
+              email – I'd love to hear from you! 💪
+            </Text>
+            <Text className="mx-0 mb-2 mt-0 text-sm italic leading-6 text-neutral-600">
+              Steven from Dub.co
+            </Text>
+
+            <Section className="mx-auto max-w-[400px] text-center">
+              <Footer email={email} marketing unsubscribeUrl={unsubscribeUrl} />
+            </Section>
+          </Container>
+        </Body>
+      </Tailwind>
+    </Html>
+  );
+}
diff --git a/packages/email/src/templates/campaign-email.tsx b/packages/email/src/templates/campaign-email.tsx
index 57ebb169452..be197227816 100644
--- a/packages/email/src/templates/campaign-email.tsx
+++ b/packages/email/src/templates/campaign-email.tsx
@@ -13,6 +13,10 @@ import {
   Text,
 } from "@react-email/components";
 
+// Body text color. renderCampaignEmailHTML applies it inline to list item text
+// as well, since list items are colored for their bullets/numbers.
+export const CAMPAIGN_EMAIL_TEXT_COLOR = "#000000";
+
 export default function CampaignEmail({
   program = {
     name: "Acme",
@@ -76,7 +80,11 @@ export default function CampaignEmail({
 
             <Section>
               <div
-                style={{ fontSize: "14px", lineHeight: 1.7142857 }}
+                style={{
+                  fontSize: "14px",
+                  lineHeight: 1.7142857,
+                  color: CAMPAIGN_EMAIL_TEXT_COLOR,
+                }}
                 dangerouslySetInnerHTML={{ __html: styledHtml }}
               />
             </Section>
diff --git a/packages/email/src/templates/domain-dns-instructions.tsx b/packages/email/src/templates/domain-dns-instructions.tsx
new file mode 100644
index 00000000000..7f01f29ba31
--- /dev/null
+++ b/packages/email/src/templates/domain-dns-instructions.tsx
@@ -0,0 +1,107 @@
+import { DUB_WORDMARK } from "@dub/utils";
+import {
+  Body,
+  Column,
+  Container,
+  Head,
+  Heading,
+  Html,
+  Img,
+  Preview,
+  Row,
+  Section,
+  Tailwind,
+  Text,
+} from "@react-email/components";
+import { Footer } from "../components/footer";
+
+type DnsRecord = {
+  type: string;
+  name: string;
+  value: string;
+};
+
+export default function DomainDnsInstructions({
+  email = "admin@acme.com",
+  domain = "go.acme.com",
+  records = [
+    { type: "A", name: "@", value: "76.76.21.21" },
+    { type: "TXT", name: "_vercel", value: "vc-domain-verify=abc123" },
+  ],
+  senderEmail = "someone@example.com",
+}: {
+  email: string;
+  domain: string;
+  records: DnsRecord[];
+  senderEmail: string;
+}) {
+  return (
+    <Html>
+      <Head />
+      <Preview>DNS instructions for {domain}</Preview>
+      <Tailwind>
+        <Body className="mx-auto my-auto bg-white font-sans">
+          <Container className="mx-auto my-10 max-w-[600px] rounded border border-solid border-neutral-200 px-10 py-5">
+            <Section className="mt-8">
+              <Img src={DUB_WORDMARK} height="32" alt="Dub" />
+            </Section>
+            <Heading className="mx-0 my-7 p-0 text-lg font-medium text-black">
+              DNS configuration for {domain}
+            </Heading>
+            <Text className="text-sm leading-6 text-black">
+              <strong>{senderEmail}</strong> forwarded you the DNS records
+              needed to connect <strong>{domain}</strong> to Dub. Add the
+              records below to your DNS provider to complete the setup.
+            </Text>
+
+            <Section className="mt-6 rounded-lg bg-neutral-100 px-4 py-3">
+              <Row>
+                <Column className="w-16">
+                  <Text className="m-0 text-xs font-semibold text-neutral-500">
+                    TYPE
+                  </Text>
+                </Column>
+                <Column className="w-24">
+                  <Text className="m-0 text-xs font-semibold text-neutral-500">
+                    NAME
+                  </Text>
+                </Column>
+                <Column>
+                  <Text className="m-0 text-xs font-semibold text-neutral-500">
+                    VALUE
+                  </Text>
+                </Column>
+              </Row>
+
+              {records.map((record, idx) => (
+                <Row key={idx} className="border-t border-neutral-200">
+                  <Column className="w-16 py-2">
+                    <Text className="m-0 font-mono text-xs text-black">
+                      {record.type}
+                    </Text>
+                  </Column>
+                  <Column className="w-24 py-2">
+                    <Text className="m-0 font-mono text-xs text-black">
+                      {record.name}
+                    </Text>
+                  </Column>
+                  <Column className="py-2">
+                    <Text className="m-0 break-all font-mono text-xs text-black">
+                      {record.value}
+                    </Text>
+                  </Column>
+                </Row>
+              ))}
+            </Section>
+
+            <Text className="text-sm leading-6 text-neutral-500">
+              DNS changes can take up to 24-48 hours to propagate fully.
+            </Text>
+
+            <Footer email={email} />
+          </Container>
+        </Body>
+      </Tailwind>
+    </Html>
+  );
+}
diff --git a/packages/email/src/templates/email-domain-status-changed.tsx b/packages/email/src/templates/email-domain-status-changed.tsx
index c88a9332f44..de0cd6b59ab 100644
--- a/packages/email/src/templates/email-domain-status-changed.tsx
+++ b/packages/email/src/templates/email-domain-status-changed.tsx
@@ -19,7 +19,9 @@ export type EmailDomainStatus =
   | "verified"
   | "failed"
   | "temporary_failure"
-  | "not_started";
+  | "not_started"
+  | "partially_verified"
+  | "partially_failed";
 
 export default function EmailDomainStatusChanged({
   email = "panic@thedis.co",
@@ -35,8 +37,14 @@ export default function EmailDomainStatusChanged({
   newStatus: EmailDomainStatus;
 }) {
   const isVerified = newStatus === "verified";
-  const isFailed = newStatus === "failed" || newStatus === "temporary_failure";
-  const isPending = newStatus === "pending" || newStatus === "not_started";
+  const isFailed =
+    newStatus === "failed" ||
+    newStatus === "temporary_failure" ||
+    newStatus === "partially_failed";
+  const isPending =
+    newStatus === "pending" ||
+    newStatus === "not_started" ||
+    newStatus === "partially_verified";
 
   const heading = isVerified
     ? "Your email domain has been successfully verified"
diff --git a/packages/email/src/templates/new-lead-submitted.tsx b/packages/email/src/templates/new-lead-submitted.tsx
index c9f6d4bdb96..d3df2220311 100644
--- a/packages/email/src/templates/new-lead-submitted.tsx
+++ b/packages/email/src/templates/new-lead-submitted.tsx
@@ -58,7 +58,7 @@ export default function NewLeadSubmitted({
     image: string | null;
   };
 }) {
-  const leadUrl = `https://app.dub.co/${workspace.slug}/program/customers/leads?leadId=${lead.id}`;
+  const leadUrl = `https://app.dub.co/${workspace.slug}/program/leads?leadId=${lead.id}`;
 
   return (
     <Html>
diff --git a/packages/email/src/templates/partner-program-summary.tsx b/packages/email/src/templates/partner-program-summary.tsx
index 3bb55f07a0c..c0d701088ad 100644
--- a/packages/email/src/templates/partner-program-summary.tsx
+++ b/packages/email/src/templates/partner-program-summary.tsx
@@ -2,7 +2,6 @@ import {
   currencyFormatter,
   DUB_LOGO,
   DUB_WORDMARK,
-  formatDate,
   nFormatter,
 } from "@dub/utils";
 import {
@@ -11,7 +10,6 @@ import {
   Container,
   Head,
   Heading,
-  Hr,
   Html,
   Img,
   Link,
@@ -23,15 +21,18 @@ import {
 } from "@react-email/components";
 import { Footer } from "../components/footer";
 
+const PARTNERS_URL = "https://partners.dub.co";
+
+// The top programs get a card with full stats, the rest are listed in a compact table
+const MAX_PROGRAM_CARDS = 3;
+
 const ICONS = {
+  earnings: "https://assets.dub.co/misc/icons/nucleo/money-bills.png",
   clicks: "https://assets.dub.co/misc/icons/nucleo/cursor-rays.png",
   leads: "https://assets.dub.co/misc/icons/nucleo/user-plus.png",
   sales: "https://assets.dub.co/misc/icons/nucleo/invoice-dollar.png",
-  earnings: "https://assets.dub.co/misc/icons/nucleo/money-bills.png",
 } as const;
 
-type Icon = keyof typeof ICONS;
-
 const percentStateMap = {
   positive: {
     color: "bg-green-50 text-green-700",
@@ -42,11 +43,33 @@ const percentStateMap = {
     sign: "-",
   },
   neutral: {
-    color: "bg-neutral-50 text-neutral-700",
+    color: "bg-neutral-100 text-neutral-700",
     sign: "",
   },
 };
 
+type MonthMetrics = {
+  earnings: number;
+  clicks: number;
+  leads: number;
+  sales: number;
+};
+
+type ProgramSummary = {
+  id: string;
+  name: string;
+  logo: string | null;
+  slug: string;
+  previousMonth: MonthMetrics;
+  currentMonth: MonthMetrics;
+};
+
+type ReportingPeriod = {
+  month: string;
+  start: string;
+  end: string;
+};
+
 function getPercentChange(current: number, previous: number) {
   if (previous === 0) {
     return current === 0 ? 0 : 100;
@@ -55,11 +78,7 @@ function getPercentChange(current: number, previous: number) {
   return Math.round(((current - previous) / Math.abs(previous)) * 100);
 }
 
-function getPercentState(percent?: number) {
-  if (typeof percent !== "number") {
-    return percentStateMap.neutral;
-  }
-
+function getPercentState(percent: number) {
   if (percent > 0) {
     return percentStateMap.positive;
   }
@@ -71,192 +90,122 @@ function getPercentState(percent?: number) {
   return percentStateMap.neutral;
 }
 
-export default function PartnerProgramSummary({
-  program = {
-    name: "Acme",
-    logo: DUB_LOGO,
-    slug: "acme",
-  },
-  partner = {
-    email: "panic@thedis.co",
-    createdAt: new Date(),
-  },
-  previousMonth = {
-    earnings: 12500,
-    clicks: 200,
-    leads: 50,
-    sales: 25,
+function getProgramLogo(program: Pick<ProgramSummary, "logo">) {
+  return program.logo || DUB_LOGO;
+}
+
+function getProgramUrl(
+  program: Pick<ProgramSummary, "slug">,
+  reportingPeriod: ReportingPeriod,
+) {
+  return `${PARTNERS_URL}/programs/${program.slug}?start=${reportingPeriod.start}&end=${reportingPeriod.end}`;
+}
+
+const SAMPLE_METRICS = {
+  previousMonth: {
+    earnings: 100000,
+    clicks: 364,
+    leads: 182,
+    sales: 102,
   },
-  currentMonth = {
-    earnings: 12850,
-    clicks: 210,
-    leads: 45,
-    sales: 25,
+  currentMonth: {
+    earnings: 100000,
+    clicks: 400,
+    leads: 200,
+    sales: 100,
   },
-  lifetime = {
-    earnings: 11241050,
-    clicks: 398585,
-    leads: 23409,
-    sales: 1492,
+};
+
+const SAMPLE_PROGRAMS: ProgramSummary[] = [
+  "Framer",
+  "Acme",
+  "Guideless",
+  "Granola",
+  "Fillout",
+  "Firecrawl",
+  "Wispr Flow",
+  "Superhuman",
+  "Dub",
+  "Tella",
+].map((name, index) => ({
+  id: `prog_${index + 1}`,
+  name,
+  logo: null,
+  slug: name.toLowerCase().replace(/\s+/g, "-"),
+  previousMonth: SAMPLE_METRICS.previousMonth,
+  currentMonth: {
+    ...SAMPLE_METRICS.currentMonth,
+    earnings: Math.max(0, 100000 - index * 20000),
   },
+}));
+
+export default function PartnerProgramSummary({
+  email = "panic@thedis.co",
   reportingPeriod = {
-    month: "May 2025",
-    start: "2025-05-01T00:00:00.000Z",
-    end: "2025-05-31T23:59:59.999Z",
+    month: "August 2026",
+    start: "2026-08-01T00:00:00.000Z",
+    end: "2026-08-31T23:59:59.999Z",
   },
+  programs = SAMPLE_PROGRAMS,
 }: {
-  program: {
-    name: string;
-    logo: string | null;
-    slug: string;
-  };
-  partner: {
-    email: string | null;
-    createdAt: Date;
-  };
-  previousMonth: {
-    earnings: number;
-    clicks: number;
-    leads: number;
-    sales: number;
-  };
-  currentMonth: {
-    earnings: number;
-    clicks: number;
-    leads: number;
-    sales: number;
-  };
-  lifetime: {
-    earnings: number;
-    clicks: number;
-    leads: number;
-    sales: number;
-  };
-  reportingPeriod: {
-    month: string;
-    start: string;
-    end: string;
-  };
+  email: string;
+  reportingPeriod: ReportingPeriod;
+  programs: ProgramSummary[];
 }) {
-  const monthlyStats = [
-    {
-      title: "Earnings",
-      value: currencyFormatter(currentMonth.earnings),
-      percent: getPercentChange(currentMonth.earnings, previousMonth.earnings),
-    },
-    {
-      title: "Clicks",
-      value: nFormatter(currentMonth.clicks),
-      percent: getPercentChange(currentMonth.clicks, previousMonth.clicks),
-    },
-    {
-      title: "Leads",
-      value: nFormatter(currentMonth.leads),
-      percent: getPercentChange(currentMonth.leads, previousMonth.leads),
-    },
-    {
-      title: "Sales",
-      value: nFormatter(currentMonth.sales),
-      percent: getPercentChange(currentMonth.sales, previousMonth.sales),
-    },
-  ];
-
-  const lifetimeStats = [
-    {
-      title: "Earnings",
-      value: currencyFormatter(lifetime.earnings),
-    },
-    {
-      title: "Clicks",
-      value: nFormatter(lifetime.clicks),
-    },
-    {
-      title: "Leads",
-      value: nFormatter(lifetime.leads),
-    },
-    {
-      title: "Sales",
-      value: nFormatter(lifetime.sales),
-    },
-  ];
-
-  const previewText = monthlyStats
-    .map(
-      ({ title, value, percent }) =>
-        `${title.toUpperCase()} ${value} (${getPercentState(percent).sign}${Math.abs(percent)}%)`,
-    )
-    .join(" | ");
+  const programCards = programs.slice(0, MAX_PROGRAM_CARDS);
+  const programRows = programs.slice(MAX_PROGRAM_CARDS);
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
+      <Preview>
+        See how you performed across your top Dub programs in{" "}
+        {reportingPeriod.month}, compared with the previous month.
+      </Preview>
       <Tailwind>
         <Body className="mx-auto my-auto bg-white font-sans">
-          <Container className="mx-auto my-10 max-w-[600px] space-y-10 px-3 py-5">
+          <Container className="mx-auto my-10 max-w-[600px] px-10 py-5">
             <Section className="mt-8">
-              <Img src={DUB_WORDMARK} height="32" alt={program.name} />
+              <Img src={DUB_WORDMARK} height="32" alt="Dub" />
             </Section>
 
-            <Heading className="mx-0 mt-[40px] p-0 text-lg font-medium text-black">
-              {program.name} partner program monthly summary (
-              {reportingPeriod.month})
+            <Heading className="mx-0 mb-1 mt-10 p-0 text-lg font-semibold leading-7 text-neutral-800">
+              {reportingPeriod.month} program summary
             </Heading>
 
-            <Section className="mt-6 rounded-xl border border-solid border-neutral-200 bg-neutral-50">
-              <Section className="rounded-t-xl px-6 py-5">
-                <div className="flex items-center">
-                  <Img
-                    src={program.logo || DUB_WORDMARK}
-                    alt={program.name}
-                    height="32"
-                    width="32"
-                    className="mr-4 rounded-md"
-                  />
-
-                  <div>
-                    <div className="text-base font-semibold leading-tight text-neutral-800">
-                      {program.name}
-                    </div>
-                    <div className="text-xs font-medium text-neutral-500">
-                      Partner since{" "}
-                      {formatDate(partner.createdAt, { month: "short" })}
-                    </div>
-                  </div>
-                </div>
-              </Section>
-
-              <Section className="space-y-6 rounded-xl border-t border-solid border-neutral-200 bg-white p-6">
-                <Section>
-                  <Heading className="mb-4 mt-0 text-base font-semibold leading-6 text-neutral-800">
-                    Stats for {reportingPeriod.month} (vs previous month)
-                  </Heading>
-
-                  <StatsGrid stats={monthlyStats} />
-                </Section>
-
-                <Hr className="mx-0 my-8 w-full border border-neutral-200" />
-
-                <Section>
-                  <Heading className="mb-4 mt-0 text-base font-semibold leading-6 text-neutral-800">
-                    All-time Performance
-                  </Heading>
-
-                  <StatsGrid stats={lifetimeStats} />
-                </Section>
-
-                <Section className="mt-8 text-center">
-                  <Link
-                    href={`https://partners.dub.co/programs/${program.slug}?start=${reportingPeriod.start}&end=${reportingPeriod.end}`}
-                    className="box-border block w-full rounded-lg bg-black px-0 py-4 text-center text-sm font-semibold leading-none text-white no-underline"
-                  >
-                    View dashboard
-                  </Link>
-                </Section>
-              </Section>
+            <Text className="m-0 text-sm leading-5 text-neutral-600">
+              See how you performed across your top Dub programs, compared with
+              the previous month.
+            </Text>
+
+            {programCards.map((program) => (
+              <ProgramCard
+                key={program.id}
+                program={program}
+                reportingPeriod={reportingPeriod}
+              />
+            ))}
+
+            {programRows.length > 0 && (
+              <ProgramTable
+                programs={programRows}
+                reportingPeriod={reportingPeriod}
+              />
+            )}
+
+            <Section className="mt-5">
+              <Link
+                href={`${PARTNERS_URL}/programs`}
+                className="box-border inline-block rounded-lg bg-neutral-900 px-3.5 py-2 text-sm font-medium leading-5 text-white no-underline"
+              >
+                View all programs
+              </Link>
             </Section>
 
-            <Footer email={partner.email!} />
+            <Footer
+              email={email}
+              notificationSettingsUrl={`${PARTNERS_URL}/profile/notifications`}
+            />
           </Container>
         </Body>
       </Tailwind>
@@ -264,73 +213,227 @@ export default function PartnerProgramSummary({
   );
 }
 
-const StatsGrid = ({
-  stats,
+const ProgramCard = ({
+  program,
+  reportingPeriod,
 }: {
-  stats: {
-    title: string;
-    value: number | string;
-    percent?: number;
-  }[];
+  program: ProgramSummary;
+  reportingPeriod: ReportingPeriod;
 }) => {
+  const { previousMonth, currentMonth } = program;
+
+  const stats = [
+    {
+      title: "Earnings",
+      icon: ICONS.earnings,
+      value: currencyFormatter(currentMonth.earnings),
+      percent: getPercentChange(currentMonth.earnings, previousMonth.earnings),
+    },
+    {
+      title: "Clicks",
+      icon: ICONS.clicks,
+      value: nFormatter(currentMonth.clicks),
+      percent: getPercentChange(currentMonth.clicks, previousMonth.clicks),
+    },
+    {
+      title: "Leads",
+      icon: ICONS.leads,
+      value: nFormatter(currentMonth.leads),
+      percent: getPercentChange(currentMonth.leads, previousMonth.leads),
+    },
+    {
+      title: "Sales",
+      icon: ICONS.sales,
+      value: nFormatter(currentMonth.sales),
+      percent: getPercentChange(currentMonth.sales, previousMonth.sales),
+    },
+  ];
+
   return (
-    <>
-      {[0, 2].map((startIndex) => (
-        <Row
-          key={startIndex}
-          style={{
-            width: "100%",
-            ...(startIndex === 2 && { marginTop: "32px" }),
-          }}
-        >
-          <Column width="50%">
-            <Stats {...stats[startIndex]} />
+    <Section className="mt-5 rounded-xl border border-solid border-neutral-200 bg-neutral-50">
+      <Section className="rounded-t-xl px-3 py-2.5">
+        <Row>
+          <Column width={28} valign="middle">
+            <Img
+              src={getProgramLogo(program)}
+              width="20"
+              height="20"
+              alt={program.name}
+              className="rounded-full"
+            />
+          </Column>
+          <Column
+            valign="middle"
+            className="text-sm font-semibold leading-5 text-neutral-800"
+          >
+            {program.name}
           </Column>
-          <Column width="50%">
-            <Stats {...stats[startIndex + 1]} />
+          <Column align="right" valign="middle">
+            <Link
+              href={getProgramUrl(program, reportingPeriod)}
+              className="box-border inline-block rounded-lg bg-neutral-900 px-2.5 py-1 text-sm font-medium leading-5 text-white no-underline"
+              style={{ whiteSpace: "nowrap" }}
+            >
+              View dashboard
+            </Link>
           </Column>
         </Row>
-      ))}
-    </>
+      </Section>
+
+      <Section className="rounded-xl border-t border-solid border-neutral-200 bg-white p-4">
+        {[0, 2].map((startIndex) => (
+          <Row
+            key={startIndex}
+            style={{
+              width: "100%",
+              ...(startIndex === 2 && { marginTop: "20px" }),
+            }}
+          >
+            <Column width="50%" style={{ paddingRight: "12px" }}>
+              <Stat {...stats[startIndex]} />
+            </Column>
+            <Column width="50%" style={{ paddingLeft: "12px" }}>
+              <Stat {...stats[startIndex + 1]} />
+            </Column>
+          </Row>
+        ))}
+      </Section>
+    </Section>
   );
 };
 
-const Stats = ({
+const Stat = ({
   title,
+  icon,
   value,
   percent,
 }: {
   title: string;
-  value: number | string;
-  percent?: number;
+  icon: string;
+  value: string;
+  percent: number;
+}) => {
+  return (
+    <Row>
+      <Column width={48} valign="middle">
+        <div className="box-border h-9 w-9 rounded-md border border-solid border-neutral-200 text-center leading-9">
+          <Img
+            src={icon}
+            alt={title}
+            width="18"
+            height="18"
+            className="inline-block align-middle"
+          />
+        </div>
+      </Column>
+      <Column valign="middle">
+        <Text className="m-0 text-xs font-medium leading-4 text-neutral-500">
+          {title}
+        </Text>
+        <Text className="m-0 text-sm font-medium leading-5 text-neutral-800">
+          {value}
+          <PercentBadge percent={percent} className="ml-1.5" />
+        </Text>
+      </Column>
+    </Row>
+  );
+};
+
+const PercentBadge = ({
+  percent,
+  className,
+}: {
+  percent: number;
+  className?: string;
 }) => {
-  const icon = ICONS[title.toLowerCase() as Icon];
   const { color, sign } = getPercentState(percent);
 
   return (
-    <div className="flex flex-row items-center bg-white p-0">
-      <div className="flex rounded-md bg-neutral-100 p-3">
-        <Img src={icon} alt={title} className="h-4 w-4" draggable={false} />
-      </div>
-      <div className="ml-3">
-        <p className="mb-0 mt-0 text-left text-xs font-medium text-neutral-500">
-          {title}
-        </p>
-        <div className="flex items-center">
-          <p className="m-0 text-left text-lg font-medium text-neutral-800">
-            {value}
-          </p>
-
-          {typeof percent === "number" && (
-            <Text
-              className={`m-0 ml-2 rounded text-xs font-medium ${color} m-auto px-1.5 py-0.5`}
-            >
-              {sign}
-              {Math.abs(percent)}%
-            </Text>
-          )}
-        </div>
-      </div>
-    </div>
+    <span
+      className={`rounded px-1 py-0.5 text-xs font-medium leading-4 ${color} ${className ?? ""}`}
+    >
+      {/* "–" means no change compared to the previous month */}
+      {percent === 0 ? "–" : `${sign}${Math.abs(percent)}%`}
+    </span>
+  );
+};
+
+const ProgramTable = ({
+  programs,
+  reportingPeriod,
+}: {
+  programs: ProgramSummary[];
+  reportingPeriod: ReportingPeriod;
+}) => {
+  return (
+    <Section className="mt-5">
+      <Row>
+        <Column className="pb-2.5 text-xs font-medium leading-4 text-neutral-500">
+          Program
+        </Column>
+        <Column
+          align="right"
+          className="pb-2.5 text-xs font-medium leading-4 text-neutral-500"
+        >
+          Earnings
+        </Column>
+        <Column
+          width={48}
+          className="pb-2.5 pl-5 text-xs font-medium leading-4 text-neutral-500"
+        >
+          Change
+        </Column>
+      </Row>
+
+      {programs.map((program) => {
+        const programUrl = getProgramUrl(program, reportingPeriod);
+
+        return (
+          <Row key={program.id}>
+            <Column className="py-2.5">
+              <Row>
+                <Column width={28} valign="middle">
+                  <Link href={programUrl}>
+                    <Img
+                      src={getProgramLogo(program)}
+                      width="20"
+                      height="20"
+                      alt={program.name}
+                      className="rounded-full"
+                    />
+                  </Link>
+                </Column>
+                <Column valign="middle">
+                  <Link
+                    href={programUrl}
+                    className="text-sm font-semibold leading-5 text-neutral-800 no-underline"
+                  >
+                    {program.name}
+                  </Link>
+                </Column>
+              </Row>
+            </Column>
+            <Column align="right" valign="middle" className="py-2.5">
+              <Link
+                href={programUrl}
+                className="text-sm leading-5 text-neutral-800 no-underline"
+              >
+                {currencyFormatter(program.currentMonth.earnings)}
+              </Link>
+            </Column>
+            <Column width={48} valign="middle" className="py-2.5 pl-5">
+              <Link href={programUrl} className="no-underline">
+                <PercentBadge
+                  percent={getPercentChange(
+                    program.currentMonth.earnings,
+                    program.previousMonth.earnings,
+                  )}
+                />
+              </Link>
+            </Column>
+          </Row>
+        );
+      })}
+    </Section>
   );
 };
diff --git a/packages/email/src/templates/program-imported.tsx b/packages/email/src/templates/program-imported.tsx
index 4cc378779fc..eaba774d1dc 100644
--- a/packages/email/src/templates/program-imported.tsx
+++ b/packages/email/src/templates/program-imported.tsx
@@ -31,7 +31,8 @@ export default function ProgramImported({
     | "Tolt"
     | "PartnerStack"
     | "FirstPromoter"
-    | "Tapfiliate";
+    | "Tapfiliate"
+    | "Lemon Squeezy";
   workspace: {
     slug: string;
   };
diff --git a/packages/embeds/core/LICENSE.md b/packages/embeds/core/LICENSE.md
new file mode 100644
index 00000000000..196fc0578c1
--- /dev/null
+++ b/packages/embeds/core/LICENSE.md
@@ -0,0 +1,28 @@
+@dub/embed-core is licensed under the MIT License.
+
+This grant applies to all published versions of this package, including
+previously published versions.
+
+---
+
+MIT License
+
+Copyright (c) 2024-present Dub Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/embeds/core/README.md b/packages/embeds/core/README.md
index 14c42c41517..f94f5586911 100644
--- a/packages/embeds/core/README.md
+++ b/packages/embeds/core/README.md
@@ -9,3 +9,7 @@ To install the package, run:
 ```bash
 pnpm i @dub/embed-core
 ```
+
+## License
+
+[MIT](./LICENSE.md)
diff --git a/packages/embeds/core/package.json b/packages/embeds/core/package.json
index f394d5d125e..71fdb157d4c 100644
--- a/packages/embeds/core/package.json
+++ b/packages/embeds/core/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@dub/embed-core",
   "description": "Vanilla JS core script that embeds Dub's dashboards.",
-  "version": "0.0.18",
+  "version": "0.0.19",
+  "license": "MIT",
   "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
diff --git a/packages/embeds/react/LICENSE.md b/packages/embeds/react/LICENSE.md
new file mode 100644
index 00000000000..67998e41bb3
--- /dev/null
+++ b/packages/embeds/react/LICENSE.md
@@ -0,0 +1,28 @@
+@dub/embed-react is licensed under the MIT License.
+
+This grant applies to all published versions of this package, including
+previously published versions.
+
+---
+
+MIT License
+
+Copyright (c) 2024-present Dub Technologies, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/embeds/react/README.md b/packages/embeds/react/README.md
index ae368ee459f..0b241c66fc2 100644
--- a/packages/embeds/react/README.md
+++ b/packages/embeds/react/README.md
@@ -9,3 +9,7 @@ To install the package, run:
 ```bash
 pnpm i @dub/embed-react
 ```
+
+## License
+
+[MIT](./LICENSE.md)
diff --git a/packages/embeds/react/package.json b/packages/embeds/react/package.json
index 10631627e1c..4c75c9c47db 100644
--- a/packages/embeds/react/package.json
+++ b/packages/embeds/react/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@dub/embed-react",
   "description": "Embed React components for Dub.",
-  "version": "0.0.18",
+  "version": "0.0.19",
+  "license": "MIT",
   "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
diff --git a/packages/tinybird/datasources/dub_regular_links_metadata_latest.datasource b/packages/tinybird/datasources/dub_regular_links_metadata_latest.datasource
deleted file mode 100644
index 131462e8c84..00000000000
--- a/packages/tinybird/datasources/dub_regular_links_metadata_latest.datasource
+++ /dev/null
@@ -1,21 +0,0 @@
-
-SCHEMA >
-    `timestamp` DateTime,
-    `link_id` String,
-    `domain` String,
-    `key` String,
-    `url` String,
-    `tag_ids` Array(String),
-    `workspace_id` String,
-    `created_at` DateTime64(3),
-    `deleted` UInt8,
-    `program_id` String,
-    `tenant_id` String,
-    `partner_id` String,
-    `folder_id` String,
-    `partner_group_id` String,
-    `partner_tag_ids` Array(String) DEFAULT []
-
-ENGINE "ReplacingMergeTree"
-ENGINE_PARTITION_KEY "toYYYYMM(timestamp)"
-ENGINE_SORTING_KEY "link_id"
diff --git a/packages/tinybird/materializations/dub_regular_links_metadata_pipe.pipe b/packages/tinybird/materializations/dub_regular_links_metadata_pipe.pipe
deleted file mode 100644
index 3ff42fea1ff..00000000000
--- a/packages/tinybird/materializations/dub_regular_links_metadata_pipe.pipe
+++ /dev/null
@@ -1,9 +0,0 @@
-NODE mv
-SQL >
-
-    SELECT * FROM dub_links_metadata WHERE domain not in ['buff.ly', 'sms.cal.com']
-
-TYPE materialized
-DATASOURCE dub_regular_links_metadata_latest
-
-
diff --git a/packages/tinybird/pipes/v3_usage.pipe b/packages/tinybird/pipes/v3_usage.pipe
index 2510cc80d09..8c730d9525f 100644
--- a/packages/tinybird/pipes/v3_usage.pipe
+++ b/packages/tinybird/pipes/v3_usage.pipe
@@ -31,7 +31,7 @@ SQL >
     SELECT
         toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3) AS interval,
         {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
-        uniq(*) AS events
+        count(*) AS events
     FROM
         (
             -- Click events
@@ -100,7 +100,7 @@ SQL >
     SELECT
         toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3) AS interval,
         {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
-        uniq(*) as links
+        count(*) as links
     FROM dub_links_metadata_latest FINAL
     WHERE
         workspace_id
diff --git a/packages/tinybird/pipes/v4_count.pipe b/packages/tinybird/pipes/v4_count.pipe
index e59db2a82f4..9ac8830645e 100644
--- a/packages/tinybird/pipes/v4_count.pipe
+++ b/packages/tinybird/pipes/v4_count.pipe
@@ -261,6 +261,7 @@ SQL >
         {% if defined(device) %} AND device = {{ device }} {% end %}
         {% if defined(browser) %} AND browser = {{ browser }} {% end %}
         {% if defined(os) %} AND os = {{ os }} {% end %}
+        {% if defined(eventName) %} AND event_name = {{ eventName }} {% end %}
         {% if defined(referer) %} AND referer = {{ referer }} {% end %}
         {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
         {% if defined(utm_source) %}
@@ -332,6 +333,10 @@ SQL >
                         {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
                         {% end %}
+                    {% elif field == 'eventName' %}
+                        {% if operator == 'IN' %} AND event_name IN {{ Array(values, 'String') }}
+                        {% elif operator == 'NOT IN' %} AND event_name NOT IN {{ Array(values, 'String') }}
+                        {% end %}
                     {% elif field == 'referer' %}
                         {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
@@ -464,6 +469,7 @@ SQL >
                 {% if defined(device) %} AND se.device = {{ device }} {% end %}
                 {% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
                 {% if defined(os) %} AND se.os = {{ os }} {% end %}
+            {% if defined(eventName) %} AND se.event_name = {{ eventName }} {% end %}
                 {% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
                 {% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
                 {% if defined(utm_source) %}
@@ -535,6 +541,10 @@ SQL >
                                 {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}
                                 {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}
                                 {% end %}
+                            {% elif field == 'eventName' %}
+                                {% if operator == 'IN' %} AND se.event_name IN {{ Array(values, 'String') }}
+                                {% elif operator == 'NOT IN' %} AND se.event_name NOT IN {{ Array(values, 'String') }}
+                                {% end %}
                             {% elif field == 'referer' %}
                                 {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}
                                 {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}
diff --git a/packages/tinybird/pipes/v4_events.pipe b/packages/tinybird/pipes/v4_events.pipe
index a34901c1216..3a05a7f1d1b 100644
--- a/packages/tinybird/pipes/v4_events.pipe
+++ b/packages/tinybird/pipes/v4_events.pipe
@@ -283,6 +283,7 @@ SQL >
         {% if defined(device) %} AND device = {{ device }} {% end %}
         {% if defined(browser) %} AND browser = {{ browser }} {% end %}
         {% if defined(os) %} AND os = {{ os }} {% end %}
+        {% if defined(eventName) %} AND event_name = {{ eventName }} {% end %}
         {% if defined(referer) %} AND referer = {{ referer }} {% end %}
         {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
         {% if defined(utm_source) %}
@@ -354,6 +355,10 @@ SQL >
                         {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
                         {% end %}
+                    {% elif field == 'eventName' %}
+                        {% if operator == 'IN' %} AND event_name IN {{ Array(values, 'String') }}
+                        {% elif operator == 'NOT IN' %} AND event_name NOT IN {{ Array(values, 'String') }}
+                        {% end %}
                     {% elif field == 'referer' %}
                         {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
@@ -482,6 +487,7 @@ SQL >
                 {% if defined(device) %} AND se.device = {{ device }} {% end %}
                 {% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
                 {% if defined(os) %} AND se.os = {{ os }} {% end %}
+            {% if defined(eventName) %} AND se.event_name = {{ eventName }} {% end %}
                 {% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
                 {% if defined(refererUrl) %}
                     AND splitByString('?', se.referer_url)[1] = {{ refererUrl }}
@@ -561,6 +567,10 @@ SQL >
                                 {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}
                                 {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}
                                 {% end %}
+                            {% elif field == 'eventName' %}
+                                {% if operator == 'IN' %} AND se.event_name IN {{ Array(values, 'String') }}
+                                {% elif operator == 'NOT IN' %} AND se.event_name NOT IN {{ Array(values, 'String') }}
+                                {% end %}
                             {% elif field == 'referer' %}
                                 {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}
                                 {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}
diff --git a/packages/tinybird/pipes/v4_group_by.pipe b/packages/tinybird/pipes/v4_group_by.pipe
index 3891c358005..25e4f07073b 100644
--- a/packages/tinybird/pipes/v4_group_by.pipe
+++ b/packages/tinybird/pipes/v4_group_by.pipe
@@ -118,6 +118,8 @@ SQL >
             os,
             {{ String(groupBy) }} = 'triggers',
             trigger,
+            {{ String(groupBy) }} = 'event_names',
+            '',
             link_id
         ) AS groupByField,
         {% if String(groupBy) == 'cities' %} country, CONCAT(country, '-', region) as region,
@@ -343,6 +345,8 @@ SQL >
             os,
             {{ String(groupBy) }} = 'triggers',
             trigger,
+            {{ String(groupBy) }} = 'event_names',
+            event_name,
             link_id
         ) AS groupByField,
         {% if String(groupBy) == 'cities' %} country, CONCAT(country, '-', region) as region,
@@ -375,6 +379,7 @@ SQL >
         {% if defined(device) %} AND device = {{ device }} {% end %}
         {% if defined(browser) %} AND browser = {{ browser }} {% end %}
         {% if defined(os) %} AND os = {{ os }} {% end %}
+        {% if defined(eventName) %} AND event_name = {{ eventName }} {% end %}
         {% if defined(referer) %} AND referer = {{ referer }} {% end %}
         {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
         {% if defined(utm_source) %}
@@ -446,6 +451,10 @@ SQL >
                         {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
                         {% end %}
+                    {% elif field == 'eventName' %}
+                        {% if operator == 'IN' %} AND event_name IN {{ Array(values, 'String') }}
+                        {% elif operator == 'NOT IN' %} AND event_name NOT IN {{ Array(values, 'String') }}
+                        {% end %}
                     {% elif field == 'referer' %}
                         {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
@@ -578,6 +587,8 @@ SQL >
             os,
             {{ String(groupBy) }} = 'triggers',
             trigger,
+            {{ String(groupBy) }} = 'event_names',
+            event_name,
             link_id
         ) AS groupByField,
         {% if String(groupBy) == 'cities' %} country, CONCAT(country, '-', region) as region,
@@ -626,6 +637,7 @@ SQL >
             {% if defined(device) %} AND se.device = {{ device }} {% end %}
             {% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
             {% if defined(os) %} AND se.os = {{ os }} {% end %}
+            {% if defined(eventName) %} AND se.event_name = {{ eventName }} {% end %}
             {% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
             {% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
             {% if defined(utm_source) %}
@@ -697,6 +709,10 @@ SQL >
                             {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}
                             {% end %}
+                        {% elif field == 'eventName' %}
+                            {% if operator == 'IN' %} AND se.event_name IN {{ Array(values, 'String') }}
+                            {% elif operator == 'NOT IN' %} AND se.event_name NOT IN {{ Array(values, 'String') }}
+                            {% end %}
                         {% elif field == 'referer' %}
                             {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}
diff --git a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
index 0c2bcdea12f..c5ecf5a0913 100644
--- a/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
+++ b/packages/tinybird/pipes/v4_group_by_link_metadata.pipe
@@ -252,6 +252,7 @@ SQL >
         {% if defined(device) %} AND device = {{ device }} {% end %}
         {% if defined(browser) %} AND browser = {{ browser }} {% end %}
         {% if defined(os) %} AND os = {{ os }} {% end %}
+        {% if defined(eventName) %} AND event_name = {{ eventName }} {% end %}
         {% if defined(referer) %} AND referer = {{ referer }} {% end %}
         {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
         {% if defined(utm_source) %}
@@ -306,6 +307,10 @@ SQL >
                         {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
                         {% end %}
+                    {% elif field == 'eventName' %}
+                        {% if operator == 'IN' %} AND event_name IN {{ Array(values, 'String') }}
+                        {% elif operator == 'NOT IN' %} AND event_name NOT IN {{ Array(values, 'String') }}
+                        {% end %}
                     {% elif field == 'referer' %}
                         {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
@@ -439,6 +444,7 @@ SQL >
             {% if defined(device) %} AND se.device = {{ device }} {% end %}
             {% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
             {% if defined(os) %} AND se.os = {{ os }} {% end %}
+            {% if defined(eventName) %} AND se.event_name = {{ eventName }} {% end %}
             {% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
             {% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
             {% if defined(utm_source) %}
@@ -493,6 +499,10 @@ SQL >
                             {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}
                             {% end %}
+                        {% elif field == 'eventName' %}
+                            {% if operator == 'IN' %} AND se.event_name IN {{ Array(values, 'String') }}
+                            {% elif operator == 'NOT IN' %} AND se.event_name NOT IN {{ Array(values, 'String') }}
+                            {% end %}
                         {% elif field == 'referer' %}
                             {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}
diff --git a/packages/tinybird/pipes/v4_timeseries.pipe b/packages/tinybird/pipes/v4_timeseries.pipe
index f9c3c9874b4..0aefe2a91ee 100644
--- a/packages/tinybird/pipes/v4_timeseries.pipe
+++ b/packages/tinybird/pipes/v4_timeseries.pipe
@@ -161,7 +161,7 @@ SQL >
             )
         {% else %} toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3)
         {% end %} AS interval,
-        uniq(click_id) as clicks
+        count(*) as clicks
     FROM
         {% if defined(customerId) %} dub_click_events_id
         {% else %} dub_click_events_mv
@@ -319,7 +319,7 @@ SQL >
             )
         {% else %} toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3)
         {% end %} AS interval,
-        uniq(*) as leads
+        count(*) as leads
     FROM dub_lead_events_mv
     WHERE
         true
@@ -346,6 +346,7 @@ SQL >
         {% if defined(device) %} AND device = {{ device }} {% end %}
         {% if defined(browser) %} AND browser = {{ browser }} {% end %}
         {% if defined(os) %} AND os = {{ os }} {% end %}
+        {% if defined(eventName) %} AND event_name = {{ eventName }} {% end %}
         {% if defined(referer) %} AND referer = {{ referer }} {% end %}
         {% if defined(refererUrl) %} AND splitByString('?', referer_url)[1] = {{ refererUrl }} {% end %}
         {% if defined(utm_source) %}
@@ -400,6 +401,10 @@ SQL >
                         {% if operator == 'IN' %} AND trigger IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND trigger NOT IN {{ Array(values, 'String') }}
                         {% end %}
+                    {% elif field == 'eventName' %}
+                        {% if operator == 'IN' %} AND event_name IN {{ Array(values, 'String') }}
+                        {% elif operator == 'NOT IN' %} AND event_name NOT IN {{ Array(values, 'String') }}
+                        {% end %}
                     {% elif field == 'referer' %}
                         {% if operator == 'IN' %} AND referer IN {{ Array(values, 'String') }}
                         {% elif operator == 'NOT IN' %} AND referer NOT IN {{ Array(values, 'String') }}
@@ -531,7 +536,7 @@ SQL >
         {% else %}
             toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3)
         {% end %} AS interval,
-        uniq(*) AS sales,
+        count(*) AS sales,
         sum(amount) AS amount
     FROM
     (
@@ -589,6 +594,7 @@ SQL >
             {% if defined(device) %} AND se.device = {{ device }} {% end %}
             {% if defined(browser) %} AND se.browser = {{ browser }} {% end %}
             {% if defined(os) %} AND se.os = {{ os }} {% end %}
+            {% if defined(eventName) %} AND se.event_name = {{ eventName }} {% end %}
             {% if defined(referer) %} AND se.referer = {{ referer }} {% end %}
             {% if defined(refererUrl) %} AND splitByString('?', se.referer_url)[1] = {{ refererUrl }} {% end %}
             {% if defined(utm_source) %}
@@ -643,6 +649,10 @@ SQL >
                             {% if operator == 'IN' %} AND se.trigger IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.trigger NOT IN {{ Array(values, 'String') }}
                             {% end %}
+                        {% elif field == 'eventName' %}
+                            {% if operator == 'IN' %} AND se.event_name IN {{ Array(values, 'String') }}
+                            {% elif operator == 'NOT IN' %} AND se.event_name NOT IN {{ Array(values, 'String') }}
+                            {% end %}
                         {% elif field == 'referer' %}
                             {% if operator == 'IN' %} AND se.referer IN {{ Array(values, 'String') }}
                             {% elif operator == 'NOT IN' %} AND se.referer NOT IN {{ Array(values, 'String') }}
diff --git a/packages/tinybird/pipes/v3_usage_latest.pipe b/packages/tinybird/pipes/v4_usage.pipe
similarity index 73%
rename from packages/tinybird/pipes/v3_usage_latest.pipe
rename to packages/tinybird/pipes/v4_usage.pipe
index 8f6fa33ad74..cbc8895de56 100644
--- a/packages/tinybird/pipes/v3_usage_latest.pipe
+++ b/packages/tinybird/pipes/v4_usage.pipe
@@ -1,7 +1,32 @@
+NODE month_intervals
+SQL >
+
+%
+        WITH
+            toStartOfMonth(
+                toDateTime64({{ DateTime64(start, '2025-09-03 00:00:00.000') }}, 3),
+                {{ String(timezone, 'UTC') }}
+            ) AS start,
+            toStartOfMonth(
+                toDateTime64({{ DateTime64(end, '2025-10-03 00:00:00.000') }}, 3),
+                {{ String(timezone, 'UTC') }}
+            ) AS
+        end,
+        dateDiff('month', start, end) + 1 AS months_diff
+        SELECT
+            arrayJoin(
+                arrayMap(
+                    x -> toDateTime64(start + toIntervalMonth(x), 3, {{ String(timezone, 'UTC') }}),
+                    range(0, months_diff)
+                )
+            ) as interval
+
+
+
 NODE day_intervals
 SQL >
 
-    %
+%
         WITH
             toStartOfDay(
                 toDateTime64({{ DateTime64(start, '2025-09-03 00:00:00.000') }}, 3),
@@ -27,11 +52,18 @@ SQL >
 NODE usage_events_data
 SQL >
 
-    %
+%
     SELECT
-        toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3) AS interval,
+        {% if granularity == "month" %}
+            toDateTime64(
+                toStartOfMonth(timestamp, {{ String(timezone, 'UTC') }}),
+                3,
+                {{ String(timezone, 'UTC') }}
+            )
+        {% else %} toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3)
+        {% end %} AS interval,
         {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
-        uniq(*) AS events
+        count(*) AS events
     FROM
         (
             -- Click events
@@ -52,9 +84,7 @@ SQL >
                 AND timestamp < {{ DateTime(end, '2025-10-03 00:00:00') }}
                 {% if defined(folderId) %} AND folder_id = {{ folderId }} {% end %}
                 {% if defined(domain) %} AND domain IN {{ Array(domain, 'String') }} {% end %}
-
             UNION ALL
-
             -- Lead events
             SELECT e.timestamp{% if defined(groupBy) %}, {% if groupBy == 'folder_id' %} m.folder_id {% else %} e.domain {% end %}, {% end %}
             FROM dub_lead_events_mv e
@@ -65,9 +95,7 @@ SQL >
                 AND timestamp < {{ DateTime(end, '2025-10-03 00:00:00') }}
                 {% if defined(folderId) %} AND folder_id = {{ folderId }} {% end %}
                 {% if defined(domain) %} AND domain IN {{ Array(domain, 'String') }} {% end %}
-
             UNION ALL
-
             -- Sale events
             SELECT e.timestamp{% if defined(groupBy) %}, {% if groupBy == 'folder_id' %} m.folder_id {% else %} e.domain {% end %}, {% end %}
             FROM dub_sale_events_mv e
@@ -87,12 +115,15 @@ SQL >
 NODE usage_events
 SQL >
 
-    %
+%
         SELECT
             formatDateTime(interval, '%FT%T.000%z') as date,
             {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
             events as value
-        FROM day_intervals
+        FROM
+            {% if granularity == "month" %} month_intervals
+            {% else %} day_intervals
+            {% end %}
         LEFT JOIN usage_events_data USING interval
 
 
@@ -100,11 +131,18 @@ SQL >
 NODE usage_links_data
 SQL >
 
-    %
+%
     SELECT
-        toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3) AS interval,
+        {% if granularity == "month" %}
+            toDateTime64(
+                toStartOfMonth(timestamp, {{ String(timezone, 'UTC') }}),
+                3,
+                {{ String(timezone, 'UTC') }}
+            )
+        {% else %} toDateTime64(toStartOfDay(timestamp, {{ String(timezone, 'UTC') }}), 3)
+        {% end %} AS interval,
         {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
-        uniq(*) as links
+        count(*) as links
     FROM dub_links_metadata_latest FINAL
     WHERE
         workspace_id
@@ -116,8 +154,8 @@ SQL >
                 required=True,
             )
         }}
-        AND created_at >= {{ DateTime(start, '2025-09-03 00:00:00') }}
-        AND created_at < {{ DateTime(end, '2025-10-03 00:00:00') }}
+        AND toDateTime64(timestamp, 3) >= {{ DateTime(start, '2025-09-03 00:00:00') }}
+        AND toDateTime64(timestamp, 3) < {{ DateTime(end, '2025-10-03 00:00:00') }}
         {% if defined(folderId) %} AND folder_id = {{ folderId }}
         {% end %}
         {% if defined(domain) %} AND domain IN {{ Array(domain, 'String') }} {% end %}
@@ -129,12 +167,15 @@ SQL >
 NODE usage_links
 SQL >
 
-    %
+%
         SELECT
           formatDateTime(interval, '%FT%T.000%z') as date,
           {% if defined(groupBy) %} {% if groupBy == 'folder_id' %} folder_id {% else %} domain {% end %}, {% end %}
           links as value
-        FROM day_intervals
+        FROM
+            {% if granularity == "month" %} month_intervals
+            {% else %} day_intervals
+            {% end %}
         LEFT JOIN usage_links_data USING interval
 
 
@@ -142,7 +183,7 @@ SQL >
 NODE endpoint
 SQL >
 
-    %
+%
     SELECT * FROM {% if resource == 'events' %} usage_events {% else %} usage_links {% end %}
 
 TYPE ENDPOINT
diff --git a/packages/tinybird/tinybird.config.json b/packages/tinybird/tinybird.config.json
deleted file mode 100644
index 60750eeff36..00000000000
--- a/packages/tinybird/tinybird.config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "dev_mode": "manual",
-  "folder": "."
-}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 78626b06f9a..23014d03334 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dub/ui",
   "description": "UI components for Dub",
-  "version": "0.3.17",
+  "version": "0.3.20",
   "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -77,6 +77,7 @@
     "@tiptap/extension-image": "^3.15.3",
     "@tiptap/extension-link": "^3.15.3",
     "@tiptap/extension-mention": "^3.15.3",
+    "@tiptap/extension-table": "^3.15.3",
     "@tiptap/extensions": "^3.15.3",
     "@tiptap/markdown": "^3.15.3",
     "@tiptap/pm": "^3.15.3",
diff --git a/packages/ui/src/badge.tsx b/packages/ui/src/badge.tsx
index cfca9751fc8..4efcecf34a5 100644
--- a/packages/ui/src/badge.tsx
+++ b/packages/ui/src/badge.tsx
@@ -16,10 +16,16 @@ const badgeVariants = cva(
         gray: "border-neutral-200 bg-neutral-100 text-neutral-800",
         neutral: "border-neutral-400 text-neutral-500",
         amber: "border-amber-200 bg-amber-100 text-amber-800",
-        blueGradient:
-          "bg-gradient-to-r from-blue-100 via-blue-100/50 to-blue-100 border border-blue-200 text-blue-900",
         rainbow:
           "bg-gradient-to-r from-violet-600 to-pink-600 text-white border-transparent",
+        blueGradient:
+          "bg-gradient-to-r from-blue-100 via-blue-100/50 to-blue-100 border border-blue-200 text-blue-900",
+        amberGradient:
+          "bg-gradient-to-r from-amber-100 via-amber-100/50 to-amber-100 border border-amber-200 text-amber-800",
+        violetGradient:
+          "bg-gradient-to-r from-violet-100 via-violet-100/50 to-violet-100 border border-violet-200 text-violet-900",
+        neutralGradient:
+          "bg-gradient-to-r from-neutral-100 via-neutral-100/50 to-neutral-100 border border-neutral-200 text-neutral-800",
       },
     },
     defaultVariants: {
diff --git a/packages/ui/src/carousel/carousel.tsx b/packages/ui/src/carousel/carousel.tsx
index 489429208e7..58c001e81a7 100644
--- a/packages/ui/src/carousel/carousel.tsx
+++ b/packages/ui/src/carousel/carousel.tsx
@@ -172,6 +172,7 @@ const Carousel = forwardRef<
           carouselRef,
           api: api,
           opts,
+          autoplay,
           orientation:
             orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
           scrollPrev,
diff --git a/packages/ui/src/carousel/nav-bar.tsx b/packages/ui/src/carousel/nav-bar.tsx
index 25ad5ac19b7..36f8bfcf242 100644
--- a/packages/ui/src/carousel/nav-bar.tsx
+++ b/packages/ui/src/carousel/nav-bar.tsx
@@ -21,11 +21,22 @@ const CarouselNavBarVariants = cva(
 export const CarouselNavBar = ({
   variant = "simple",
   className,
-}: VariantProps<typeof CarouselNavBarVariants> & { className?: string }) => {
-  const { scrollNext, scrollPrev, canScrollNext, canScrollPrev, api } =
-    useCarousel();
+  count,
+}: VariantProps<typeof CarouselNavBarVariants> & {
+  className?: string;
+  count?: number;
+}) => {
+  const {
+    scrollNext,
+    scrollPrev,
+    canScrollNext,
+    canScrollPrev,
+    api,
+    autoplay: autoplayConfig,
+  } = useCarousel();
 
-  const autoplay = api?.plugins()?.autoplay;
+  const autoplayPlugin = api?.plugins()?.autoplay;
+  const showAutoplayTrack = Boolean(autoplayConfig);
 
   const [selectedIndex, setSelectedIndex] = React.useState(0);
 
@@ -37,22 +48,24 @@ export const CarouselNavBar = ({
 
   const stopAutoplayAnd = React.useCallback(
     (fn: () => void) => () => {
-      if (autoplay && autoplay.isPlaying()) autoplay.stop();
+      if (autoplayPlugin && autoplayPlugin.isPlaying()) autoplayPlugin.stop();
       fn();
     },
-    [autoplay],
+    [autoplayPlugin],
   );
 
   React.useEffect(() => {
     if (!api) return;
 
     onSelect(api);
-    setIsPlaying(autoplay?.isPlaying() ?? false);
+    setIsPlaying(autoplayPlugin?.isPlaying() ?? false);
     api.on("reInit", onSelect);
     api.on("select", onSelect);
     api.on("autoplay:play", () => setIsPlaying(true));
     api.on("autoplay:stop", () => setIsPlaying(false));
-  }, [api, autoplay, onSelect]);
+  }, [api, autoplayPlugin, onSelect]);
+
+  const slideCount = count ?? api?.slideNodes().length ?? 0;
 
   return (
     <div className={cn(CarouselNavBarVariants({ variant }), className)}>
@@ -67,19 +80,23 @@ export const CarouselNavBar = ({
         </button>
       )}
 
-      {api != null && (
-        <div className="flex items-center gap-1">
-          {api.slideNodes().map((_, idx) => (
+      {slideCount > 0 && (
+        <div className="flex min-h-2.5 items-center gap-1 sm:min-h-[18px]">
+          {Array.from({ length: slideCount }).map((_, idx) => (
             <button
               key={idx}
-              onClick={stopAutoplayAnd(() => api.scrollTo(idx))}
-              className="rounded-full p-0.5 hover:bg-neutral-100 active:bg-neutral-200 sm:p-1.5"
+              onClick={
+                api ? stopAutoplayAnd(() => api.scrollTo(idx)) : undefined
+              }
+              className="flex items-center justify-center rounded-full p-0.5 leading-none hover:bg-neutral-100 active:bg-neutral-200 sm:p-1.5"
             >
               <div
                 className={cn(
-                  "relative isolate h-1.5 w-1.5 overflow-hidden rounded-full transition-all",
+                  "relative isolate h-1.5 w-1.5 overflow-hidden rounded-full",
                   idx === selectedIndex ? "bg-black" : "bg-black/20",
-                  isPlaying && idx === selectedIndex && "w-6 bg-black/20",
+                  showAutoplayTrack &&
+                    idx === selectedIndex &&
+                    "w-6 bg-black/20",
                 )}
               >
                 {isPlaying && idx === selectedIndex && (
@@ -89,7 +106,7 @@ export const CarouselNavBar = ({
                     transition={{
                       type: "tween",
                       duration:
-                        ((autoplay?.options.delay ??
+                        ((autoplayPlugin?.options.delay ??
                           AUTOPLAY_DEFAULT_DELAY) as number) / 1000,
                     }}
                     className="animate-fill-width h-full w-full rounded-full bg-black"
diff --git a/packages/ui/src/combobox/index.tsx b/packages/ui/src/combobox/index.tsx
index 2dba53ec702..7a4f14c3474 100644
--- a/packages/ui/src/combobox/index.tsx
+++ b/packages/ui/src/combobox/index.tsx
@@ -238,6 +238,7 @@ export function Combobox({
       setOpenPopover={setIsOpen}
       align="start"
       side={side}
+      collisionPadding={8}
       forceDropdown={forceDropdown}
       onWheel={(e) => {
         // Allows scrolling to work when the popover's in a modal
diff --git a/packages/ui/src/content.ts b/packages/ui/src/content.ts
index 356411b5355..9b4da99926b 100644
--- a/packages/ui/src/content.ts
+++ b/packages/ui/src/content.ts
@@ -17,6 +17,7 @@ import {
   Php,
   Python,
   Ruby,
+  Shop,
   Toggle2,
   Twitter,
   Typescript,
@@ -140,17 +141,17 @@ export const SOLUTIONS: NavItemChildren = [
 
 export const RESOURCES = [
   {
-    icon: LifeRing,
+    icon: withFillVariant(Book2),
+    title: "Docs",
+    description: "Developer documentation",
+    href: "/docs",
+  },
+  {
+    icon: withFillVariant(LifeRing),
     title: "Help Center",
     description: "Answers to your questions",
     href: "/help",
   },
-  {
-    icon: Book2,
-    title: "Docs",
-    description: "Platform documentation",
-    href: "/docs",
-  },
   {
     icon: withFillVariant(Users),
     title: "About",
@@ -158,35 +159,41 @@ export const RESOURCES = [
     href: "/about",
   },
   {
-    icon: Briefcase,
+    icon: withFillVariant(Briefcase),
     title: "Careers",
     description: "Join our global, remote team",
     href: "/careers",
   },
   {
-    icon: Feather,
+    icon: withFillVariant(Feather),
     title: "Blog",
     description: "Insights and stories",
     href: "/blog",
   },
   {
-    icon: BulletList,
+    icon: withFillVariant(BulletList),
     title: "Changelog",
     description: "Releases and updates",
     href: "/changelog",
   },
   {
     icon: Logo,
-    title: "Brand Guidelines",
+    title: "Dub Brand",
     description: "Logos, wordmark, etc.",
     href: "/brand",
   },
   {
-    icon: Envelope,
+    icon: withFillVariant(Envelope),
     title: "Contact",
     description: "Reach out to support or sales",
     href: "/contact",
   },
+  {
+    icon: withFillVariant(Shop),
+    title: "Program Marketplace",
+    description: "Browse our available partner programs",
+    href: "/marketplace",
+  },
 ];
 
 export const COMPARE_PAGES = [
diff --git a/packages/ui/src/copy-text.tsx b/packages/ui/src/copy-text.tsx
index 916673e4022..0585362f536 100644
--- a/packages/ui/src/copy-text.tsx
+++ b/packages/ui/src/copy-text.tsx
@@ -1,32 +1,33 @@
 "use client";
 
 import { cn } from "@dub/utils";
-import { ReactNode } from "react";
+import { ComponentPropsWithoutRef, forwardRef, ReactNode } from "react";
 import { toast } from "sonner";
 import { useCopyToClipboard } from "./hooks";
 
-export function CopyText({
-  value,
-  children,
-  className,
-  successMessage,
-}: {
-  value: string;
-  children: ReactNode;
-  className?: string;
-  successMessage?: string;
-}) {
+// Forwards its ref and props so it can be used as a Radix `asChild` trigger (e.g. inside a Tooltip)
+export const CopyText = forwardRef<
+  HTMLButtonElement,
+  Omit<ComponentPropsWithoutRef<"button">, "value" | "children"> & {
+    value: string;
+    children: ReactNode;
+    successMessage?: string;
+  }
+>(({ value, children, className, successMessage, onClick, ...rest }, ref) => {
   const [copied, copyToClipboard] = useCopyToClipboard();
 
   return (
     <button
+      ref={ref}
+      type="button"
+      {...rest}
       onClick={(e) => {
+        onClick?.(e);
         e.stopPropagation();
         toast.promise(copyToClipboard(value), {
           success: successMessage || "Copied to clipboard!",
         });
       }}
-      type="button"
       className={cn(
         "cursor-copy text-sm text-neutral-700 decoration-dotted underline-offset-2 hover:underline",
         copied && "cursor-default",
@@ -36,4 +37,6 @@ export function CopyText({
       {children}
     </button>
   );
-}
+});
+
+CopyText.displayName = "CopyText";
diff --git a/packages/ui/src/date-picker/date-picker.tsx b/packages/ui/src/date-picker/date-picker.tsx
index 78135495a54..2d96a351613 100644
--- a/packages/ui/src/date-picker/date-picker.tsx
+++ b/packages/ui/src/date-picker/date-picker.tsx
@@ -36,6 +36,7 @@ export function DatePicker({
   trigger: customTrigger,
   renderContent,
   disabled,
+  disabledDays,
   locale = enUS,
   placeholder = "Select date",
   hasError,
@@ -69,6 +70,7 @@ export function DatePicker({
       selected={selected}
       onSelect={onSelect}
       locale={locale}
+      disabled={disabledDays}
       {...props}
       defaultMonth={selected}
     />
diff --git a/packages/ui/src/file-upload.tsx b/packages/ui/src/file-upload.tsx
index 49654508866..48bea7e358d 100644
--- a/packages/ui/src/file-upload.tsx
+++ b/packages/ui/src/file-upload.tsx
@@ -22,14 +22,23 @@ const documentTypes = [
   "text/csv", // .csv
 ];
 
+const imageExtensionMimeTypes: Record<string, string> = {
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  webp: "image/webp",
+  avif: "image/avif",
+  svg: "image/svg+xml",
+};
+
 const acceptFileTypes: Record<
   AcceptedFileFormats,
   { types: string[]; errorMessage?: string }
 > = {
   any: { types: [] },
   images: {
-    types: ["image/png", "image/jpeg"],
-    errorMessage: "File type not supported (.png or .jpg only)",
+    types: ["image/png", "image/jpeg", "image/webp", "image/avif"],
+    errorMessage: "File type not supported (.png, .jpg, .webp, or .avif only)",
   },
   csv: {
     types: ["text/csv"],
@@ -41,8 +50,15 @@ const acceptFileTypes: Record<
   },
   // TODO: allow custom `accept` prop so we don't need specific options here
   programResourceImages: {
-    types: ["image/svg+xml", "image/png", "image/jpeg", "image/webp"],
-    errorMessage: "File type not supported (.svg, .png, .jpg, or .webp only)",
+    types: [
+      "image/svg+xml",
+      "image/png",
+      "image/jpeg",
+      "image/webp",
+      "image/avif",
+    ],
+    errorMessage:
+      "File type not supported (.svg, .png, .jpg, .webp, or .avif only)",
   },
   programResourceFiles: {
     types: [
@@ -50,11 +66,12 @@ const acceptFileTypes: Record<
       "image/png",
       "image/jpeg",
       "image/webp",
+      "image/avif",
       ...documentTypes,
       "application/zip",
     ],
     errorMessage:
-      "File type not supported (.svg, .png, .jpg, .webp, document, or zip files only)",
+      "File type not supported (.svg, .png, .jpg, .webp, .avif, document, or zip files only)",
   },
 };
 
@@ -91,7 +108,11 @@ type FileUploadReadFileProps =
 
 export type FileUploadProps = FileUploadReadFileProps & {
   id?: string;
-  accept: AcceptedFileFormats;
+  accept?: AcceptedFileFormats;
+  /**
+   * When set, overrides the MIME types from the `accept` preset.
+   */
+  acceptedFileTypes?: readonly string[];
   className?: string;
   iconClassName?: string;
   previewClassName?: string;
@@ -158,6 +179,7 @@ export function FileUpload({
   icon: Icon = CloudUpload,
   customPreview,
   accept = "any",
+  acceptedFileTypes,
   imageSrc,
   loading = false,
   clickToUpload = true,
@@ -177,6 +199,9 @@ export function FileUpload({
     setImageError(false);
   }, [imageSrc]);
 
+  const resolvedAcceptedTypes =
+    acceptedFileTypes ?? acceptFileTypes[accept].types;
+
   const onFileChange = async (
     e: React.ChangeEvent<HTMLInputElement> | DragEvent,
   ) => {
@@ -193,23 +218,35 @@ export function FileUpload({
       return;
     }
 
-    const acceptedTypes = acceptFileTypes[accept].types;
+    const extension = file.name.split(".").pop()?.toLowerCase();
+    const mimeType =
+      file.type || (extension ? imageExtensionMimeTypes[extension] : "") || "";
 
-    if (acceptedTypes.length && !acceptedTypes.includes(file.type)) {
+    if (
+      resolvedAcceptedTypes.length &&
+      !resolvedAcceptedTypes.includes(mimeType)
+    ) {
       toast.error(
-        acceptFileTypes[accept].errorMessage ?? "File type not supported",
+        acceptedFileTypes
+          ? "File type not supported"
+          : acceptFileTypes[accept].errorMessage ?? "File type not supported",
       );
       return;
     }
 
-    let fileToUse = file;
+    let fileToUse =
+      !file.type && mimeType
+        ? new File([file], file.name, { type: mimeType })
+        : file;
 
     // Add image resizing logic
-    if (targetResolution && file.type.startsWith("image/")) {
+    if (targetResolution && mimeType.startsWith("image/")) {
       try {
-        const resizedFile = await resizeImage(file, targetResolution);
+        const resizedFile = await resizeImage(fileToUse, targetResolution);
         const blob = await fetch(resizedFile).then((r) => r.blob());
-        fileToUse = new File([blob], file.name, { type: file.type });
+        fileToUse = new File([blob], fileToUse.name, {
+          type: blob.type || "image/jpeg",
+        });
       } catch (error) {
         console.error("Error resizing image:", error);
         // Fallback to original file if resize fails
@@ -330,7 +367,7 @@ export function FileUpload({
             id={id}
             key={fileName} // Gets us a fresh input every time a file is uploaded
             type="file"
-            accept={acceptFileTypes[accept].types.join(",")}
+            accept={resolvedAcceptedTypes.join(",")}
             onChange={onFileChange}
             disabled={disabled}
             data-testid={dataTestId}
diff --git a/packages/ui/src/footer.tsx b/packages/ui/src/footer.tsx
index fdbac18e33c..1dc4046c516 100644
--- a/packages/ui/src/footer.tsx
+++ b/packages/ui/src/footer.tsx
@@ -81,17 +81,18 @@ const navigation = {
     { name: "Contact", href: "/contact" },
     { name: "Privacy", href: "/privacy" },
   ],
-  compare: COMPARE_PAGES.map(({ name, slug }) => ({
-    name,
-    href: `/compare/${slug}`,
-    product: "links",
-  })).concat(
-    ["Rewardful", "PartnerStack", "FirstPromoter", "Tolt"].map((name) => ({
+  compare: [
+    ...["Rewardful", "PartnerStack", "FirstPromoter", "Tolt"].map((name) => ({
       name,
       href: `/blog/dub-vs-${name.toLowerCase()}`,
       product: "partners",
     })),
-  ),
+    ...COMPARE_PAGES.map(({ name, slug }) => ({
+      name,
+      href: `/compare/${slug}`,
+      product: "links",
+    })),
+  ],
 };
 
 const linkListHeaderClassName = "text-sm font-medium text-neutral-900";
diff --git a/packages/ui/src/hooks/index.ts b/packages/ui/src/hooks/index.ts
index a02d957afec..2e36db2cfa1 100644
--- a/packages/ui/src/hooks/index.ts
+++ b/packages/ui/src/hooks/index.ts
@@ -10,6 +10,7 @@ export * from "./use-in-viewport";
 export * from "./use-input-focused";
 export * from "./use-intersection-observer";
 export * from "./use-keyboard-shortcut";
+export * from "./use-latest-callback";
 export * from "./use-local-storage";
 export * from "./use-media-query";
 export * from "./use-optimistic-update";
diff --git a/packages/ui/src/hooks/use-current-subdomain.ts b/packages/ui/src/hooks/use-current-subdomain.ts
index bcd67478dae..cd06b4ae000 100644
--- a/packages/ui/src/hooks/use-current-subdomain.ts
+++ b/packages/ui/src/hooks/use-current-subdomain.ts
@@ -1,4 +1,4 @@
-import { ADMIN_HOSTNAMES, APP_HOSTNAMES, PARTNERS_HOSTNAMES } from "@dub/utils";
+import { ADMIN_HOSTNAMES, PARTNERS_HOSTNAMES } from "@dub/utils";
 import { useEffect, useState } from "react";
 
 export function useCurrentSubdomain() {
@@ -7,12 +7,12 @@ export function useCurrentSubdomain() {
   >(null);
   useEffect(() => {
     const hostname = window.location.hostname;
-    if (APP_HOSTNAMES.has(hostname)) {
-      setSubdomain("app");
-    } else if (PARTNERS_HOSTNAMES.has(hostname)) {
+    if (PARTNERS_HOSTNAMES.has(hostname)) {
       setSubdomain("partners");
     } else if (ADMIN_HOSTNAMES.has(hostname)) {
       setSubdomain("admin");
+    } else {
+      setSubdomain("app");
     }
   }, []);
 
diff --git a/packages/ui/src/hooks/use-keyboard-shortcut.tsx b/packages/ui/src/hooks/use-keyboard-shortcut.tsx
index a87f4ef34a7..ce7477bce7e 100644
--- a/packages/ui/src/hooks/use-keyboard-shortcut.tsx
+++ b/packages/ui/src/hooks/use-keyboard-shortcut.tsx
@@ -57,6 +57,10 @@ export function useKeyboardShortcut(
     (e: KeyboardEvent) => {
       if (options.enabled === false) return;
 
+      // Skip if another handler already consumed this key (e.g. Radix
+      // popovers/menus/dialogs close on Escape in the capture phase).
+      if (e.defaultPrevented) return;
+
       const target = e.target as HTMLElement;
       const existingModalBackdrop = document.getElementById("modal-backdrop");
       const existingSheetBackdrop = document.querySelector(
diff --git a/packages/ui/src/hooks/use-latest-callback.ts b/packages/ui/src/hooks/use-latest-callback.ts
new file mode 100644
index 00000000000..573864f6696
--- /dev/null
+++ b/packages/ui/src/hooks/use-latest-callback.ts
@@ -0,0 +1,24 @@
+import { useCallback, useEffect, useLayoutEffect, useRef } from "react";
+
+const useIsomorphicLayoutEffect =
+  typeof window !== "undefined" ? useLayoutEffect : useEffect;
+
+/**
+ * Returns a stable function that always invokes the latest `callback`,
+ * so it can be passed to memoized children (or used in effects) without
+ * their identity changing when the callback is recreated by the caller.
+ */
+export function useLatestCallback<T extends (...args: any[]) => any>(
+  callback: T | undefined,
+) {
+  const callbackRef = useRef(callback);
+
+  useIsomorphicLayoutEffect(() => {
+    callbackRef.current = callback;
+  });
+
+  return useCallback(
+    (...args: Parameters<T>) => callbackRef.current?.(...args) as ReturnType<T>,
+    [],
+  );
+}
diff --git a/packages/ui/src/icons/chatgpt-icon.tsx b/packages/ui/src/icons/chatgpt-icon.tsx
new file mode 100644
index 00000000000..056700a4de9
--- /dev/null
+++ b/packages/ui/src/icons/chatgpt-icon.tsx
@@ -0,0 +1,20 @@
+import { SVGProps } from "react";
+
+export function ChatGPTIcon({ className, ...props }: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={className}
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M5.36963 5.09598V3.76597C5.36963 3.65396 5.4113 3.56992 5.50837 3.51399L8.15859 1.97399C8.51933 1.764 8.94948 1.66605 9.39341 1.66605C11.0584 1.66605 12.113 2.96808 12.113 4.35402C12.113 4.452 12.113 4.56401 12.0991 4.67602L9.35177 3.05199C9.1853 2.95404 9.01873 2.95404 8.85225 3.05199L5.36963 5.09598ZM11.5579 10.276V7.09795C11.5579 6.9019 11.4746 6.76191 11.3081 6.66393L7.82552 4.61994L8.96327 3.9619C9.06037 3.90596 9.14365 3.90596 9.24076 3.9619L11.8909 5.5019C12.6541 5.94995 13.1674 6.9019 13.1674 7.82585C13.1674 8.88981 12.5431 9.86986 11.5579 10.2759V10.276ZM4.55101 7.47604L3.41326 6.80407C3.31618 6.74814 3.27451 6.66408 3.27451 6.55206V3.47209C3.27451 1.97414 4.41226 0.840056 5.95243 0.840056C6.53526 0.840056 7.07627 1.0361 7.53426 1.38609L4.80088 2.98214C4.63443 3.08009 4.55115 3.22008 4.55115 3.41616V7.47615L4.55101 7.47604ZM6.99999 8.90399L5.36963 7.98002V6.02009L6.99999 5.09612L8.63023 6.02009V7.98002L6.99999 8.90399ZM8.04754 13.1601C7.46474 13.1601 6.92373 12.964 6.46574 12.6141L9.19909 11.018C9.36557 10.92 9.44885 10.78 9.44885 10.584V6.52397L10.6005 7.19593C10.6976 7.25186 10.7393 7.33589 10.7393 7.44794V10.5279C10.7393 12.0259 9.58759 13.1599 8.04754 13.1599V13.1601ZM4.75913 10.0381L2.10891 8.4981C1.34572 8.05002 0.832414 7.0981 0.832414 6.17412C0.832414 5.09612 1.47068 4.13014 2.45575 3.7241V6.91608C2.45575 7.11213 2.53906 7.25212 2.7055 7.3501L6.17434 9.38003L5.03659 10.0381C4.93951 10.094 4.8562 10.094 4.75913 10.0381ZM4.60659 12.3341C3.03869 12.3341 1.88703 11.1441 1.88703 9.67405C1.88703 9.56204 1.90094 9.45003 1.91473 9.33801L4.64811 10.9341C4.81456 11.032 4.98115 11.032 5.1476 10.9341L8.63023 8.90414V10.2341C8.63023 10.3462 8.58859 10.4302 8.49148 10.4861L5.8413 12.0261C5.48053 12.2361 5.05038 12.3341 4.60644 12.3341H4.60659ZM8.04754 14C9.72645 14 11.1278 12.796 11.447 11.2C13.001 10.794 14 9.32395 14 7.82599C14 6.84594 13.5838 5.89402 12.8345 5.20799C12.9039 4.91397 12.9455 4.61994 12.9455 4.32607C12.9455 2.32409 11.336 0.825992 9.4767 0.825992C9.10216 0.825992 8.74139 0.881926 8.38061 1.008C7.75614 0.391974 6.89588 0 5.95243 0C4.27355 0 2.87224 1.20393 2.55299 2.79998C0.999007 3.20602 0 4.67602 0 6.17398C0 7.15403 0.416207 8.10595 1.16548 8.79198C1.09611 9.086 1.05447 9.38003 1.05447 9.67393C1.05447 11.6759 2.66401 13.174 4.52328 13.174C4.89784 13.174 5.25861 13.118 5.61939 12.992C6.24371 13.608 7.10397 14 8.04754 14Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/claude.tsx b/packages/ui/src/icons/claude.tsx
new file mode 100644
index 00000000000..d95d66a1e1a
--- /dev/null
+++ b/packages/ui/src/icons/claude.tsx
@@ -0,0 +1,20 @@
+import { SVGProps } from "react";
+
+export function Claude({ className, ...props }: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={className}
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M2.74703 9.30994L5.50162 7.7653L5.54703 7.63L5.50162 7.55468H5.36541L4.90379 7.52657L3.32973 7.48446L1.96757 7.42829L0.643244 7.35806L0.31027 7.28784L0 6.87361L0.0302703 6.66999L0.31027 6.48043L0.711351 6.51554L1.59676 6.57871L2.92865 6.66999L3.88973 6.72616L5.32 6.87361H5.54703L5.5773 6.78233L5.50162 6.72616L5.44108 6.66999L4.06379 5.73619L2.57297 4.75326L1.79351 4.18456L1.3773 3.89669L1.1654 3.62989L1.0746 3.04012L1.45297 2.61886L1.96757 2.65396L2.09621 2.68907L2.61838 3.08927L3.73081 3.95286L5.18379 5.02006L5.39568 5.19558L5.481 5.138L5.49405 5.09729L5.39568 4.93581L4.60865 3.51053L3.76865 2.05717L3.39027 1.45336L3.29189 1.09529C3.25378 0.945017 3.23135 0.820697 3.23135 0.666999L3.6627 0.0772318L3.90486 0L4.48757 0.0772318L4.72973 0.287864L5.09297 1.11635L5.67566 2.41525L6.58381 4.18456L6.84863 4.71113L6.99244 5.19558L7.04542 5.34303H7.13619V5.25878L7.2119 4.26179L7.3481 3.04012L7.48434 1.4674L7.5297 1.02507L7.74917 0.491475L8.1881 0.203611L8.52863 0.365095L8.80863 0.765296L8.77083 1.02507L8.60434 2.10632L8.27893 3.7984L8.06702 4.93581H8.1881L8.3319 4.78836L8.90702 4.03009L9.8681 2.82247L10.2919 2.34503L10.7914 1.81845L11.1092 1.5657H11.7146L12.1535 2.22568L11.9568 2.90672L11.3362 3.69308L10.8216 4.36008L10.0838 5.34862L9.62595 6.14342L9.667 6.209L9.77732 6.19959L11.4421 5.84153L12.3427 5.68002L13.4173 5.49749L13.9016 5.72219L13.9546 5.95386L13.7654 6.42426L12.6151 6.7051L11.2681 6.97894L9.26223 7.45114L9.24 7.469L9.26621 7.50786L10.1708 7.58979L10.5568 7.61085H11.5027L13.266 7.74424L13.7276 8.04614L14 8.41826L13.9546 8.7061L13.2432 9.06422L12.2897 8.83954L10.0573 8.30592L9.29298 8.11636H9.18702V8.17953L9.82268 8.80443L10.9957 9.85757L12.4562 11.2197L12.5319 11.5567L12.3427 11.8234L12.146 11.7954L10.8595 10.8265L10.36 10.3912L9.24 9.44334H9.16434V9.54162L9.42161 9.92074L10.7914 11.978L10.8595 12.6099L10.7611 12.8134L10.4054 12.9398L10.0195 12.8696L9.2097 11.7392L8.38488 10.4754L7.71893 9.338L7.63851 9.38879L7.24214 13.6209L7.06054 13.8385L6.63678 14L6.28107 13.7332L6.0919 13.2979L6.28107 12.4343L6.5081 11.3109L6.6897 10.4192L6.85619 9.30994L6.95789 8.93934L6.94893 8.91453L6.86767 8.92819L6.03137 10.0752L4.76 11.7954L3.75351 12.8696L3.51135 12.9679L3.09514 12.7502L3.13297 12.3641L3.36757 12.0201L4.76 10.2507L5.6 9.14844L6.14141 8.5157L6.13609 8.42419L6.10624 8.42162L2.40649 10.8335L1.74811 10.9178L1.46054 10.651L1.49838 10.2156L1.6346 10.0752L2.74703 9.30994Z"
+        fill="#D97757"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/cloudflare.tsx b/packages/ui/src/icons/cloudflare.tsx
new file mode 100644
index 00000000000..10759056047
--- /dev/null
+++ b/packages/ui/src/icons/cloudflare.tsx
@@ -0,0 +1,16 @@
+export function Cloudflare({ className }: { className?: string }) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 640 640"
+      width="16"
+      height="16"
+      className={className}
+    >
+      <path
+        fill="currentColor"
+        d="M407.9 383.9L177.1 381C176.4 381 175.7 380.8 175.1 380.5C174.5 380.2 173.9 379.7 173.5 379.1C173.1 378.5 172.8 377.8 172.8 377.1C172.8 376.4 172.8 375.7 173 375C173.4 373.9 174.1 372.9 175.1 372.2C176.1 371.5 177.2 371 178.4 371L411.3 368.1C438.9 366.8 468.8 344.5 479.3 317.3L492.6 282.8C493 281.9 493.1 280.9 493.1 279.9C493.1 279.4 493 278.8 492.9 278.3C485.5 246.1 467.9 217.2 442.6 196C417.3 174.8 385.9 162.3 352.9 160.5C319.9 158.7 287.3 167.8 259.9 186.2C232.5 204.6 211.9 231.5 201.1 262.7C189.8 254.2 176.2 249.4 162.1 249C148 248.6 134.1 252.5 122.3 260.4C110.5 268.3 101.5 279.5 96.4 292.7C91.3 305.9 90.5 320.3 94 334C41.7 335.5-.2 378.1-.2 430.5C-.2 435.2 .1 439.8 .8 444.5C1 445.6 1.5 446.6 2.3 447.3C3.1 448 4.2 448.4 5.2 448.4L431.3 448.5C431.3 448.5 431.4 448.5 431.4 448.5C432.6 448.5 433.7 448.1 434.7 447.4C435.7 446.7 436.3 445.7 436.7 444.5L440 433.2C443.9 419.8 442.4 407.4 435.9 398.3C429.9 389.9 419.8 385 407.7 384.4zM513.8 285.1C511.7 285.1 509.5 285.2 507.4 285.3C506.6 285.4 505.9 285.6 505.3 286.1C504.7 286.6 504.3 287.2 504 287.9L494.9 319.1C491 332.5 492.5 344.9 499 354C505 362.4 515.1 367.3 527.2 367.9L576.4 370.8C577.1 370.8 577.8 371 578.4 371.3C579 371.6 579.5 372.1 579.9 372.7C580.3 373.3 580.6 374 580.7 374.7C580.8 375.4 580.7 376.2 580.5 376.8C580.1 377.9 579.4 378.9 578.4 379.6C577.4 380.3 576.3 380.8 575.1 380.8L524 383.7C496.2 385 466.3 407.3 455.9 434.5L452.2 444.1C452 444.5 452 444.9 452 445.4C452 445.9 452.2 446.2 452.4 446.6C452.6 447 453 447.3 453.3 447.5C453.6 447.7 454.1 447.8 454.5 447.8C454.5 447.8 454.6 447.8 454.6 447.8L630.5 447.8C631.5 447.8 632.5 447.5 633.3 446.9C634.1 446.3 634.7 445.4 635 444.5C638.1 433.4 639.7 422 639.7 410.5C639.7 341.2 583.2 285 513.6 285z"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/cursor.tsx b/packages/ui/src/icons/cursor.tsx
new file mode 100644
index 00000000000..244e4f7ff46
--- /dev/null
+++ b/packages/ui/src/icons/cursor.tsx
@@ -0,0 +1,36 @@
+import { SVGProps } from "react";
+
+export function Cursor({ className, ...props }: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={className}
+      width="14"
+      height="14"
+      viewBox="515 5 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M522 12L528.102 15.5034C528.065 15.568 528.01 15.6231 527.943 15.6617L522.24 18.9362C522.092 19.0213 521.909 19.0213 521.761 18.9362L516.058 15.6617C515.99 15.6231 515.936 15.568 515.898 15.5034L522 12Z"
+        fill="#72716D"
+      />
+      <path
+        d="M522 5V12L515.899 15.5034C515.861 15.4388 515.84 15.3643 515.84 15.2871V8.71289C515.84 8.55828 515.923 8.41574 516.058 8.3383L521.761 5.06379C521.835 5.02126 521.918 5 522 5H522Z"
+        fill="#55544F"
+      />
+      <path
+        d="M528.102 8.49659C528.065 8.43201 528.01 8.37688 527.943 8.3383L522.24 5.06379C522.166 5.02126 522.083 5 522 5V12L528.102 15.5034C528.14 15.4388 528.161 15.3643 528.161 15.2871V8.71289C528.161 8.63545 528.14 8.56143 528.102 8.49659H528.102Z"
+        fill="#43413C"
+      />
+      <path
+        d="M527.675 8.74172C527.709 8.80104 527.714 8.87717 527.675 8.9449L522.136 18.4849C522.099 18.5495 522 18.523 522 18.4487V12.1622C522 12.112 521.986 12.0637 521.962 12.0215L527.675 8.74146H527.675V8.74172Z"
+        fill="#D6D5D2"
+      />
+      <path
+        d="M527.675 8.74173L521.962 12.0217C521.938 11.9797 521.903 11.944 521.859 11.9188L516.384 8.77559C516.319 8.73858 516.346 8.64014 516.421 8.64014H527.498C527.577 8.64014 527.641 8.6824 527.675 8.74173Z"
+        fill="white"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/grok.tsx b/packages/ui/src/icons/grok.tsx
new file mode 100644
index 00000000000..96a7c02d078
--- /dev/null
+++ b/packages/ui/src/icons/grok.tsx
@@ -0,0 +1,24 @@
+import { SVGProps } from "react";
+
+export function Grok({ className, ...props }: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={className}
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M5.44911 8.92664L10.1503 5.45205C10.3808 5.28172 10.7103 5.34815 10.8201 5.61275C11.3981 7.00813 11.1399 8.68503 9.98986 9.83638C8.83991 10.9877 7.23983 11.2402 5.77734 10.6651L4.17969 11.4057C6.47119 12.9739 9.2538 12.5861 10.9926 10.844C12.3719 9.46305 12.7991 7.58077 12.3996 5.88338L12.4032 5.88698C11.824 3.39341 12.5457 2.3967 14.0239 0.358586C14.0588 0.310261 14.0938 0.261936 14.1288 0.212402L12.1836 2.15991V2.15387L5.44792 8.92787"
+        fill="currentColor"
+      />
+      <path
+        d="M4.47813 9.77072C2.83339 8.19772 3.11697 5.76333 4.52034 4.35951C5.55808 3.32051 7.25832 2.89646 8.74253 3.51985L10.3366 2.78289C10.0494 2.57509 9.68133 2.35159 9.259 2.19453C7.35004 1.40804 5.06456 1.79947 3.51276 3.35192C2.02009 4.84637 1.55068 7.14424 2.35675 9.10504C2.95889 10.5705 1.97182 11.6071 0.977507 12.6533C0.625153 13.0242 0.271593 13.3951 -0.0131836 13.7877L4.4769 9.77191"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/index.tsx b/packages/ui/src/icons/index.tsx
index 7d1a8e1ee5e..c11143997c3 100644
--- a/packages/ui/src/icons/index.tsx
+++ b/packages/ui/src/icons/index.tsx
@@ -37,9 +37,14 @@ export * from "./loading-spinner";
 export * from "./anthropic";
 export * from "./beehiiv";
 export * from "./bing";
+export * from "./chatgpt-icon";
+export * from "./claude";
+export * from "./cloudflare";
+export * from "./cursor";
 export * from "./facebook";
 export * from "./github";
 export * from "./google";
+export * from "./grok";
 export * from "./instagram";
 export * from "./linkedin";
 export * from "./openai";
@@ -50,6 +55,7 @@ export * from "./slack-colorful";
 export * from "./tiktok";
 export * from "./twitter";
 export * from "./unsplash";
+export * from "./vercel";
 export * from "./veriff";
 export * from "./youtube";
 
diff --git a/packages/ui/src/icons/nucleo/calendar.tsx b/packages/ui/src/icons/nucleo/calendar.tsx
index a105a942ef3..8e85c2ac393 100644
--- a/packages/ui/src/icons/nucleo/calendar.tsx
+++ b/packages/ui/src/icons/nucleo/calendar.tsx
@@ -9,53 +9,17 @@ export function CalendarIcon(props: SVGProps<SVGSVGElement>) {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <g fill="currentColor">
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="5.75"
-          x2="5.75"
-          y1="2.75"
-          y2=".75"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="12.25"
-          x2="12.25"
-          y1="2.75"
-          y2=".75"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="2.25"
-          x2="15.75"
-          y1="6.25"
-          y2="6.25"
-        />
-        <rect
-          height="12.5"
-          width="13.5"
-          fill="none"
-          rx="2"
-          ry="2"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x="2.25"
-          y="2.75"
-        />
+      <g
+        fill="none"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      >
+        <line x1="5.75" y1="3.25" x2="5.75" y2="1.25" />
+        <line x1="12.25" y1="3.25" x2="12.25" y2="1.25" />
+        <rect x="2.25" y="3.25" width="13.5" height="12.5" rx="2" ry="2" />
+        <line x1="2.25" y1="6.75" x2="15.75" y2="6.75" />
       </g>
     </svg>
   );
diff --git a/packages/ui/src/icons/nucleo/chat-task.tsx b/packages/ui/src/icons/nucleo/chat-task.tsx
new file mode 100644
index 00000000000..fa5c8a07042
--- /dev/null
+++ b/packages/ui/src/icons/nucleo/chat-task.tsx
@@ -0,0 +1,43 @@
+import { SVGProps } from "react";
+
+export function ChatTask(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <g fill="currentColor">
+        <line
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          x1="9.75"
+          x2="12.25"
+          y1="11.75"
+          y2="11.75"
+        />
+        <polyline
+          fill="none"
+          points="5.75 11.75 8.25 9.25 5.75 6.75"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <path
+          d="m9,1.75C4.996,1.75,1.75,4.996,1.75,9c0,1.319.358,2.552.973,3.617.43.806-.053,2.712-.973,3.633,1.25.068,2.897-.497,3.633-.973.489.282,1.264.656,2.279.848.433.082.881.125,1.338.125,4.004,0,7.25-3.246,7.25-7.25S13.004,1.75,9,1.75Z"
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/nucleo/circle-dashed.tsx b/packages/ui/src/icons/nucleo/circle-dashed.tsx
new file mode 100644
index 00000000000..190d0ebd3e4
--- /dev/null
+++ b/packages/ui/src/icons/nucleo/circle-dashed.tsx
@@ -0,0 +1,48 @@
+import { SVGProps } from "react";
+
+export function CircleDashed(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <g fill="currentColor">
+        <path
+          d="M4.988,3.711c-.243,0-.48-.117-.625-.334-.229-.345-.137-.811,.208-1.04,.88-.586,1.851-.986,2.884-1.187,.406-.079,.801,.186,.88,.593,.079,.407-.187,.8-.593,.879-.838,.163-1.625,.487-2.339,.962-.128,.085-.272,.126-.415,.126Z"
+          fill="currentColor"
+        />
+        <path
+          d="M1.88,8.381c-.047,0-.095-.004-.143-.013-.406-.078-.673-.471-.595-.878,.201-1.053,.606-2.04,1.204-2.933,.229-.344,.694-.437,1.04-.207,.345,.23,.437,.696,.206,1.041-.484,.725-.813,1.526-.978,2.381-.068,.359-.383,.609-.735,.609Z"
+          fill="currentColor"
+        />
+        <path
+          d="M7.6,16.864c-.048,0-.096-.004-.145-.014-1.033-.201-2.004-.601-2.884-1.187-.345-.229-.438-.695-.208-1.04,.229-.344,.694-.439,1.04-.208,.714,.476,1.501,.8,2.339,.962,.406,.079,.672,.473,.593,.879-.069,.358-.384,.607-.735,.607Z"
+          fill="currentColor"
+        />
+        <path
+          d="M2.971,13.776c-.242,0-.479-.117-.624-.333-.598-.893-1.003-1.879-1.204-2.933-.078-.407,.188-.8,.595-.878,.408-.076,.801,.188,.878,.596,.164,.855,.493,1.656,.978,2.381,.23,.344,.139,.81-.206,1.041-.128,.085-.273,.126-.416,.126Z"
+          fill="currentColor"
+        />
+        <path
+          d="M13.012,3.711c-.143,0-.287-.041-.415-.126-.714-.476-1.501-.8-2.339-.962-.406-.079-.672-.473-.593-.879s.475-.668,.88-.593c1.033,.201,2.004,.601,2.884,1.187,.345,.229,.438,.695,.208,1.04-.145,.217-.382,.334-.625,.334Z"
+          fill="currentColor"
+        />
+        <path
+          d="M16.12,8.381c-.353,0-.667-.25-.735-.609-.164-.855-.493-1.656-.978-2.381-.23-.344-.139-.81,.206-1.041s.811-.137,1.04,.207c.598,.893,1.003,1.879,1.204,2.933,.078,.407-.188,.8-.595,.878-.048,.009-.096,.013-.143,.013Z"
+          fill="currentColor"
+        />
+        <path
+          d="M10.4,16.864c-.352,0-.666-.249-.735-.607-.079-.407,.187-.8,.593-.879,.838-.163,1.625-.487,2.339-.962,.346-.231,.811-.136,1.04,.208,.229,.345,.137,.811-.208,1.04-.88,.586-1.851,.986-2.884,1.187-.049,.009-.097,.014-.145,.014Z"
+          fill="currentColor"
+        />
+        <path
+          d="M15.029,13.776c-.143,0-.288-.041-.416-.126-.345-.23-.437-.696-.206-1.041,.484-.725,.813-1.526,.978-2.381,.077-.407,.47-.671,.878-.596,.406,.078,.673,.471,.595,.878-.201,1.053-.606,2.04-1.204,2.933-.145,.216-.382,.333-.624,.333Z"
+          fill="currentColor"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/nucleo/discount.tsx b/packages/ui/src/icons/nucleo/discount-code.tsx
similarity index 65%
rename from packages/ui/src/icons/nucleo/discount.tsx
rename to packages/ui/src/icons/nucleo/discount-code.tsx
index d8df05f79c5..f54abdd2934 100644
--- a/packages/ui/src/icons/nucleo/discount.tsx
+++ b/packages/ui/src/icons/nucleo/discount-code.tsx
@@ -1,6 +1,6 @@
 import { SVGProps } from "react";
 
-export function Discount(props: SVGProps<SVGSVGElement>) {
+export function DiscountCode(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
       height="18"
@@ -11,7 +11,7 @@ export function Discount(props: SVGProps<SVGSVGElement>) {
     >
       <g fill="currentColor">
         <path
-          d="M15.718,8.293l-1.468-1.468v-2.075c0-.552-.448-1-1-1h-2.075l-1.468-1.468c-.391-.39-1.024-.39-1.414,0l-1.468,1.468h-2.075c-.552,0-1,.448-1,1v2.075l-1.468,1.468c-.391,.39-.391,1.024,0,1.414l1.468,1.468v2.075c0,.552,.448,1,1,1h2.075l1.468,1.468c.391,.39,1.024,.39,1.414,0l1.468-1.468h2.075c.552,0,1-.448,1-1v-2.075l1.468-1.468c.391-.39,.391-1.024,0-1.414Z"
+          d="M14.25,3.75h-10.5c-.966,0-1.75,.784-1.75,1.75v1.25c1.105,0,2,.895,2,2s-.895,2-2,2v1.25c0,.966,.784,1.75,1.75,1.75h10.5c.966,0,1.75-.784,1.75-1.75v-1.25c-1.105,0-2-.895-2-2s.895-2,2-2v-1.25c0-.966-.784-1.75-1.75-1.75Z"
           fill="none"
           stroke="currentColor"
           strokeLinecap="round"
diff --git a/packages/ui/src/icons/nucleo/folder-shield.tsx b/packages/ui/src/icons/nucleo/folder-shield.tsx
index 94dbccec697..55049339ad4 100644
--- a/packages/ui/src/icons/nucleo/folder-shield.tsx
+++ b/packages/ui/src/icons/nucleo/folder-shield.tsx
@@ -4,33 +4,27 @@ export function FolderShield(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="17"
-      height="16"
+      width="18"
+      height="18"
       fill="none"
-      viewBox="0 0 17 16"
+      viewBox="0 0 18 18"
       {...props}
     >
-      <g clipPath="url(#clip0_563_3026)">
-        <g
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-        >
-          <path d="M2.667 7.778V4.222c0-.982.795-1.778 1.777-1.778H6.18c.54 0 1.049.245 1.386.665l.536.669h4.788c.982 0 1.778.795 1.778 1.778v2.056"></path>
-          <path d="M14.65 7.612A1.77 1.77 0 0012.889 6H4.444c-.982 0-1.777.796-1.777 1.778v4c0 .981.795 1.778 1.777 1.778h4.477"></path>
-          <path d="M13.556 9.556L16 10.666v2.614c0 1.369-2.444 2.053-2.444 2.053s-2.445-.684-2.445-2.053v-2.613l2.444-1.111z"></path>
-        </g>
+      <g
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      >
+        <path d="M2.25 8.75V4.75C2.25 3.645 3.145 2.75 4.25 2.75H6.20099C6.80799 2.75 7.38099 3.02499 7.76099 3.49799L8.36401 4.25H13.75C14.855 4.25 15.75 5.145 15.75 6.25V8.56299"></path>
+        <path d="M15.731 8.56299C15.636 7.54699 14.791 6.75 13.75 6.75H4.25C3.145 6.75 2.25 7.646 2.25 8.75V13.25C2.25 14.354 3.145 15.25 4.25 15.25H8.26221"></path>
+        <path
+          d="M14 10.75L11.25 12V14.94C11.25 16.48 14 17.25 14 17.25V10.75Z"
+          fill="currentColor"
+          stroke="none"
+        ></path>
+        <path d="M14 10.75L16.75 12V14.94C16.75 16.48 14 17.25 14 17.25C14 17.25 11.25 16.48 11.25 14.94V12L14 10.75Z"></path>
       </g>
-      <defs>
-        <clipPath id="clip0_563_3026">
-          <path
-            fill="#fff"
-            d="M0 0H16V16H0z"
-            transform="translate(.667)"
-          ></path>
-        </clipPath>
-      </defs>
     </svg>
   );
 }
diff --git a/packages/ui/src/icons/nucleo/index.ts b/packages/ui/src/icons/nucleo/index.ts
index 0023550cb2a..909344d4f15 100644
--- a/packages/ui/src/icons/nucleo/index.ts
+++ b/packages/ui/src/icons/nucleo/index.ts
@@ -34,14 +34,16 @@ export * from "./caret-up";
 export * from "./chart-activity2";
 export * from "./chart-area2";
 export * from "./chart-line";
+export * from "./chat-task";
 export * from "./check";
 export * from "./check2";
-export { CheckboxIcon } from "./checkbox";
+export * from "./checkbox";
 export * from "./chevron-left";
 export * from "./chevron-right";
 export * from "./chevron-up";
 export * from "./circle-arrow-right";
 export * from "./circle-check";
+export * from "./circle-dashed";
 export * from "./circle-dollar";
 export * from "./circle-dollar-out";
 export * from "./circle-dollar3";
@@ -75,7 +77,7 @@ export * from "./database-key";
 export * from "./desktop";
 export * from "./diamond-turn-right";
 export * from "./directions";
-export * from "./discount";
+export * from "./discount-code";
 export * from "./dots";
 export * from "./download";
 export * from "./duplicate";
@@ -140,6 +142,7 @@ export * from "./input-password-pointer";
 export * from "./input-search";
 export * from "./invoice-dollar";
 export * from "./key";
+export * from "./layers-3";
 export * from "./layout-sidebar";
 export * from "./license";
 export * from "./life-ring";
@@ -167,6 +170,7 @@ export * from "./msgs";
 export * from "./msgs-dotted";
 export * from "./nodes-4";
 export * from "./note";
+export * from "./numbered-list";
 export * from "./office-building";
 export * from "./page2";
 export * from "./paintbrush";
@@ -182,6 +186,7 @@ export * from "./plus2";
 export * from "./post";
 export * from "./pyramid";
 export * from "./qrcode";
+export * from "./quote";
 export * from "./receipt2";
 export * from "./referred-via";
 export * from "./refresh2";
diff --git a/packages/ui/src/icons/nucleo/layers-3.tsx b/packages/ui/src/icons/nucleo/layers-3.tsx
new file mode 100644
index 00000000000..847c755c834
--- /dev/null
+++ b/packages/ui/src/icons/nucleo/layers-3.tsx
@@ -0,0 +1,45 @@
+import { SVGProps } from "react";
+
+export function Layers3({
+  variant = "outline",
+  ...props
+}: SVGProps<SVGSVGElement> & { variant?: "outline" | "fill" }) {
+  return (
+    <svg
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      {variant === "fill" ? (
+        <g fill="currentColor">
+          <path
+            d="M15.685,4.423L9.816,1.333c-.511-.271-1.121-.27-1.631,0L2.315,4.423c-.494,.26-.801,.769-.801,1.327s.307,1.067,.801,1.327l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091c.494-.26,.801-.769,.801-1.327s-.307-1.067-.801-1.327Z"
+            fill="currentColor"
+          />
+          <path
+            d="M15.736,8.25c-.414,0-.75,.336-.75,.75l-5.87,3.091c-.072,.038-.158,.038-.232,0l-5.87-3.091c0-.414-.336-.75-.75-.75s-.75,.336-.75,.75c0,.559,.307,1.067,.801,1.327l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091c.494-.26,.801-.769,.801-1.327,0-.414-.336-.75-.75-.75Z"
+            fill="currentColor"
+          />
+          <path
+            d="M15.736,11.5c-.414,0-.75,.336-.75,.75l-5.87,3.091c-.072,.038-.158,.038-.232,0l-5.87-3.091c0-.414-.336-.75-.75-.75s-.75,.336-.75,.75c0,.559,.307,1.067,.801,1.327l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091c.494-.26,.801-.769,.801-1.327,0-.414-.336-.75-.75-.75Z"
+            fill="currentColor"
+          />
+        </g>
+      ) : (
+        <g
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        >
+          <path d="M15.685,4.423L9.816,1.333c-.511-.271-1.121-.27-1.631,0L2.315,4.423c-.494,.26-.801,.769-.801,1.327s.307,1.067,.801,1.327l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091c.494-.26,.801-.769,.801-1.327s-.307-1.067-.801-1.327Z" />
+          <path d="M2.25,9.75l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091" />
+          <path d="M2.25,13l5.869,3.09c.255,.135,.536,.203,.816,.203s.56-.067,.815-.202l5.87-3.091" />
+        </g>
+      )}
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/nucleo/numbered-list.tsx b/packages/ui/src/icons/nucleo/numbered-list.tsx
new file mode 100644
index 00000000000..334fcfc0c3d
--- /dev/null
+++ b/packages/ui/src/icons/nucleo/numbered-list.tsx
@@ -0,0 +1,54 @@
+import { SVGProps } from "react";
+
+export function NumberedList(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <g fill="currentColor">
+        <path
+          d="M2.5,11.661c.259-.921,1.152-1.425,2.116-1.411,.965,.014,1.872,.446,1.929,1.411s-.965,1.612-2.023,2.044c-1.058,.432-1.936,.835-2.023,2.044H6.548"
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+        <line
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          x1="9.5"
+          x2="16.25"
+          y1="5.25"
+          y2="5.25"
+        />
+        <line
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+          x1="9.5"
+          x2="16.25"
+          y1="12.75"
+          y2="12.75"
+        />
+        <path
+          d="M4.75,7.5V2s-.63,1.108-1.967,1.364"
+          fill="none"
+          stroke="currentColor"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth="1.5"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/nucleo/quote.tsx b/packages/ui/src/icons/nucleo/quote.tsx
new file mode 100644
index 00000000000..132bf893080
--- /dev/null
+++ b/packages/ui/src/icons/nucleo/quote.tsx
@@ -0,0 +1,22 @@
+import { SVGProps } from "react";
+
+export function Quote(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      height="18"
+      width="18"
+      viewBox="0 0 18 18"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <g fill="currentColor">
+        <path d="M15.25,15H2.75c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75H15.25c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Z" />
+        <path d="M15.25,11.5H2.75c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75H15.25c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Z" />
+        <path d="M15.25,8h-3c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75h3c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Z" />
+        <path d="M15.25,4.5h-3c-.414,0-.75-.336-.75-.75s.336-.75,.75-.75h3c.414,0,.75,.336,.75,.75s-.336,.75-.75,.75Z" />
+        <path d="M4.75,5h-1.202c.151-1.066,.645-1.355,1.147-1.551,.387-.15,.578-.585,.428-.971s-.589-.575-.971-.427c-1.469,.571-2.152,1.747-2.152,3.699v1.5c0,.414,.336,.75,.75,.75h2c.414,0,.75-.336,.75-.75v-1.5c0-.414-.336-.75-.75-.75Z" />
+        <path d="M9.25,5h-1.202c.151-1.066,.645-1.355,1.147-1.551,.387-.15,.578-.585,.428-.971-.149-.386-.588-.575-.971-.427-1.469,.571-2.152,1.747-2.152,3.699v1.5c0,.414,.336,.75,.75,.75h2c.414,0,.75-.336,.75-.75v-1.5c0-.414-.336-.75-.75-.75Z" />
+      </g>
+    </svg>
+  );
+}
diff --git a/packages/ui/src/icons/nucleo/shop.tsx b/packages/ui/src/icons/nucleo/shop.tsx
index f6791289261..45124f5fad0 100644
--- a/packages/ui/src/icons/nucleo/shop.tsx
+++ b/packages/ui/src/icons/nucleo/shop.tsx
@@ -1,6 +1,9 @@
 import { SVGProps } from "react";
 
-export function Shop(props: SVGProps<SVGSVGElement>) {
+export function Shop({
+  variant = "outline",
+  ...props
+}: SVGProps<SVGSVGElement> & { variant?: "outline" | "fill" }) {
   return (
     <svg
       height="18"
@@ -10,55 +13,72 @@ export function Shop(props: SVGProps<SVGSVGElement>) {
       {...props}
     >
       <g fill="currentColor">
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="3.75"
-          x2="3.75"
-          y1="16.25"
-          y2="9.5"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="14.25"
-          x2="14.25"
-          y1="9.5"
-          y2="16.25"
-        />
-        <line
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-          x1="1.75"
-          x2="16.25"
-          y1="16.25"
-          y2="16.25"
-        />
-        <path
-          d="M13.668,1.75H4.331c-.359,0-.691,.193-.869,.505l-1.706,2.995c.475,1.031,1.51,1.75,2.72,1.75,.908,0,1.712-.412,2.262-1.049,.55,.637,1.354,1.049,2.262,1.049s1.711-.411,2.261-1.048c.55,.637,1.354,1.048,2.261,1.048,1.209,0,2.245-.719,2.72-1.75l-1.704-2.995c-.178-.312-.51-.505-.869-.505Z"
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-        />
-        <path
-          d="M7.25,16v-3c0-.966,.784-1.75,1.75-1.75h0c.966,0,1.75,.784,1.75,1.75v3"
-          fill="none"
-          stroke="currentColor"
-          strokeLinecap="round"
-          strokeLinejoin="round"
-          strokeWidth="1.5"
-        />
+        {variant === "fill" ? (
+          <>
+            <path
+              d="M16.25 15.5H15V9.95837C15 9.54437 14.664 9.20837 14.25 9.20837C13.836 9.20837 13.5 9.54437 13.5 9.95837V15.5H11V13C11 11.896 10.105 11 9 11C7.895 11 7 11.896 7 13V15.5H4.5V9.95837C4.5 9.54437 4.164 9.20837 3.75 9.20837C3.336 9.20837 3 9.54437 3 9.95837V15.5H1.75C1.336 15.5 1 15.836 1 16.25C1 16.664 1.336 17 1.75 17H16.25C16.664 17 17 16.664 17 16.25C17 15.836 16.664 15.5 16.25 15.5Z"
+              fill="currentColor"
+            />
+            <path
+              d="M3.098 1.37878C3.23139 1.1446 3.48018 1 3.74968 1H14.2507C14.5203 1 14.7692 1.14475 14.9026 1.37912L16.8939 4.87912C17.0135 5.08929 17.0244 5.34422 16.9232 5.56383C16.3317 6.84764 15.0378 7.75 13.522 7.75C12.6655 7.75 11.8852 7.45793 11.2611 6.97852C10.6372 7.45789 9.8573 7.75 8.99998 7.75C8.14246 7.75 7.36202 7.4572 6.73799 6.97761C6.11397 7.4572 5.33352 7.75 4.476 7.75C2.95904 7.75 1.66621 6.84751 1.0748 5.56383C0.973561 5.34409 0.984544 5.08901 1.10429 4.87878L3.098 1.37878Z"
+              clipRule="evenodd"
+              fill="currentColor"
+              fillRule="evenodd"
+            />
+          </>
+        ) : (
+          <>
+            <line
+              fill="none"
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="1.5"
+              x1="3.75"
+              x2="3.75"
+              y1="16.25"
+              y2="9.5"
+            />
+            <line
+              fill="none"
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="1.5"
+              x1="14.25"
+              x2="14.25"
+              y1="9.5"
+              y2="16.25"
+            />
+            <line
+              fill="none"
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="1.5"
+              x1="1.75"
+              x2="16.25"
+              y1="16.25"
+              y2="16.25"
+            />
+            <path
+              d="M13.668,1.75H4.331c-.359,0-.691,.193-.869,.505l-1.706,2.995c.475,1.031,1.51,1.75,2.72,1.75,.908,0,1.712-.412,2.262-1.049,.55,.637,1.354,1.049,2.262,1.049s1.711-.411,2.261-1.048c.55,.637,1.354,1.048,2.261,1.048,1.209,0,2.245-.719,2.72-1.75l-1.704-2.995c-.178-.312-.51-.505-.869-.505Z"
+              fill="none"
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="1.5"
+            />
+            <path
+              d="M7.25,16v-3c0-.966,.784-1.75,1.75-1.75h0c.966,0,1.75,.784,1.75,1.75v3"
+              fill="none"
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="1.5"
+            />
+          </>
+        )}
       </g>
     </svg>
   );
diff --git a/packages/ui/src/icons/plan-feature-icons.tsx b/packages/ui/src/icons/plan-feature-icons.tsx
index 0551b19b278..27cf16b563e 100644
--- a/packages/ui/src/icons/plan-feature-icons.tsx
+++ b/packages/ui/src/icons/plan-feature-icons.tsx
@@ -22,6 +22,7 @@ import {
   Plug2,
   Receipt2,
   ShieldKeyhole,
+  Shop,
   Shuffle,
   Sparkle3,
   SquareLayoutGrid5,
@@ -77,4 +78,5 @@ export const PLAN_FEATURE_ICONS = {
   partnergroups: Users6,
   partnerreferrals: Nodes4,
   embeddedreferrals: SquareLayoutGrid5,
+  marketplace: Shop,
 };
diff --git a/packages/ui/src/icons/sort-order.tsx b/packages/ui/src/icons/sort-order.tsx
index 4654f722b7b..1735cfd470e 100644
--- a/packages/ui/src/icons/sort-order.tsx
+++ b/packages/ui/src/icons/sort-order.tsx
@@ -19,7 +19,6 @@ export function SortOrder({
       xmlns="http://www.w3.org/2000/svg"
     >
       <motion.path
-        className={cn(!order && "opacity-40")}
         animate={{ d: order === "asc" ? downPath : upPath }}
         stroke="currentColor"
         strokeWidth="1.5"
@@ -27,7 +26,7 @@ export function SortOrder({
         strokeLinejoin="round"
       />
       <motion.path
-        className="opacity-40"
+        className={cn(order && "opacity-40")}
         animate={{ d: order === "asc" ? upPath : downPath }}
         stroke="currentColor"
         strokeWidth="1.5"
diff --git a/packages/ui/src/icons/vercel.tsx b/packages/ui/src/icons/vercel.tsx
new file mode 100644
index 00000000000..ab3b5840466
--- /dev/null
+++ b/packages/ui/src/icons/vercel.tsx
@@ -0,0 +1,19 @@
+export function Vercel({ className }: { className?: string }) {
+  return (
+    <svg
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M8 1L16 15H0L8 1Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/packages/ui/src/modal.tsx b/packages/ui/src/modal.tsx
index d80560391c3..b680abe652f 100644
--- a/packages/ui/src/modal.tsx
+++ b/packages/ui/src/modal.tsx
@@ -73,6 +73,7 @@ export function Modal({
               "fixed bottom-0 left-0 right-0 z-50 flex flex-col",
               "rounded-t-[10px] border-t border-neutral-200 bg-white",
               className,
+              "max-w-none",
             )}
           >
             <div className="scrollbar-hide flex-1 overflow-y-auto rounded-t-[10px] bg-inherit">
diff --git a/packages/ui/src/nav/content/program-marketplace.tsx b/packages/ui/src/nav/content/program-marketplace.tsx
new file mode 100644
index 00000000000..400f24b7e70
--- /dev/null
+++ b/packages/ui/src/nav/content/program-marketplace.tsx
@@ -0,0 +1,142 @@
+import { cn, createHref } from "@dub/utils";
+import { Link as NavigationMenuLink } from "@radix-ui/react-navigation-menu";
+import { motion, useReducedMotion } from "motion/react";
+import Link from "next/link";
+import { Grid } from "../../grid";
+import { NAV_UTM_PARAMS } from "./shared";
+
+// left, top, size and rotation (in px/deg) within the 614 × 104 logo canvas
+const LOGO_SLOTS = [
+  { left: 405, top: 22, size: 24, rotate: 0, logo: "beehiiv" },
+  { left: 461, top: 1, size: 38, rotate: 0, logo: "wisprflow" },
+  { left: 307.28, top: 24.83, size: 33, rotate: -6.57, logo: "granola" },
+  { left: 342, top: 55, size: 30, rotate: 0, logo: "superhuman" },
+  { left: 410.5, top: 64.5, size: 31, rotate: 0, logo: "polymarket" },
+  { left: 573.5, top: 39.5, size: 39, rotate: 0, logo: "viktor" },
+  { left: 448, top: 31, size: 34, rotate: 0, logo: "framer" },
+  { left: 526.5, top: 26.5, size: 33, rotate: 0, logo: "flora" },
+  { left: 93.5, top: 19.5, size: 41, rotate: 0, logo: "dub" },
+  { left: 162.5, top: 11.5, size: 29, rotate: 0, logo: "superpower" },
+  { left: 2.05, top: 28.03, size: 38, rotate: -6.57, logo: "chatbase" },
+  { left: 36.5, top: 58.5, size: 35, rotate: 0, logo: "copper" },
+  { left: 106, top: 69, size: 34, rotate: 0, logo: "anything" },
+  { left: 268.5, top: 43.5, size: 43, rotate: 0, logo: "tradezella" },
+  { left: 146, top: 38, size: 32, rotate: 0, logo: "buffer" },
+  { left: 225.5, top: 34.5, size: 29, rotate: 0, logo: "coderabbit" },
+];
+
+const LOGO_SIZES = LOGO_SLOTS.map(({ size }) => size);
+const MIN_LOGO_SIZE = Math.min(...LOGO_SIZES);
+const MAX_LOGO_SIZE = Math.max(...LOGO_SIZES);
+
+function getDepth(size: number) {
+  return (size - MIN_LOGO_SIZE) / (MAX_LOGO_SIZE - MIN_LOGO_SIZE);
+}
+
+// deterministic (so it matches between server and client) per-slot drift, to
+// make the logos bob around like they're floating in water – the closer a logo
+// is, the more it moves, which sells the parallax
+function getDrift(index: number, depth: number) {
+  const amplitude = 0.6 + depth * 0.8;
+  const x = Math.sin(index * 12.9898) * 6 * amplitude;
+  const y = Math.cos(index * 78.233) * 4.5 * amplitude;
+
+  return {
+    x: [0, x, -x * 0.6, 0],
+    y: [0, y, -y, 0],
+    duration: 9 + (index % 5),
+    delay: -(1.5 + index * 0.7),
+  };
+}
+
+function ProgramMarketplaceLogos() {
+  const reducedMotion = useReducedMotion();
+
+  return (
+    <div
+      aria-hidden
+      className="pointer-events-none absolute right-6 top-1/2 h-[104px] w-[614px] -translate-y-1/2"
+    >
+      {LOGO_SLOTS.map(({ left, top, size, rotate, logo }, index) => {
+        const depth = getDepth(size);
+        const { x, y, duration, delay } = getDrift(index, depth);
+
+        return (
+          <motion.div
+            key={index}
+            className="absolute"
+            style={{ left, top, width: size, height: size }}
+            animate={reducedMotion ? undefined : { x, y }}
+            transition={{
+              duration,
+              delay,
+              repeat: Infinity,
+              ease: "easeInOut",
+            }}
+          >
+            <div
+              className="relative size-full overflow-hidden rounded-full border border-neutral-50 bg-neutral-200 dark:border-white/10 dark:bg-white/10"
+              style={{
+                // closer logos get a slightly stronger (but still faint) shadow
+                boxShadow: `0 ${1 + depth}px ${4 + depth * 4}px rgba(0,0,0,${(0.02 + depth * 0.05).toFixed(3)})`,
+                ...(rotate ? { transform: `rotate(${rotate}deg)` } : {}),
+              }}
+            >
+              <img
+                src={`https://assets.dub.co/companies/icons/${logo}.svg`}
+                alt={`${logo} logo`}
+                decoding="async"
+                className="size-full object-cover"
+              />
+              <div className="pointer-events-none absolute inset-0 rounded-full border-[0.5px] border-white/30" />
+            </div>
+          </motion.div>
+        );
+      })}
+    </div>
+  );
+}
+
+export function ProgramMarketplaceSection({ domain }: { domain: string }) {
+  return (
+    <NavigationMenuLink asChild>
+      <Link
+        href={createHref("/marketplace", domain, {
+          ...NAV_UTM_PARAMS,
+          utm_campaign: domain,
+          utm_content: "Program Marketplace",
+        })}
+        className={cn(
+          "group relative isolate flex items-center overflow-hidden bg-neutral-50 px-6 py-3 transition-colors duration-75",
+          "hover:bg-neutral-100 dark:border-white/[0.15] dark:bg-white/[0.03] dark:hover:bg-white/[0.06]",
+        )}
+      >
+        {/* offset so a horizontal cell edge sits just below the middle of the bar */}
+        <Grid
+          cellSize={60}
+          patternOffset={[-12, -32]}
+          className="text-neutral-200/60 [mask-image:linear-gradient(90deg,transparent_20%,black)] dark:text-white/10"
+        />
+
+        <ProgramMarketplaceLogos />
+
+        <div className="relative flex flex-col justify-center">
+          <div className="flex items-center gap-1.5">
+            <span className="text-sm font-semibold text-neutral-900 dark:text-white">
+              Program Marketplace
+            </span>
+            <span className="flex h-4 items-center rounded-md bg-blue-100 px-1 text-xs font-semibold text-blue-600 dark:bg-blue-500/20 dark:text-blue-300">
+              NEW
+            </span>
+          </div>
+          <p className="text-xs font-medium text-neutral-500 dark:text-white/60">
+            Browse our top affiliate programs{" "}
+            <span className="inline-block transition-transform duration-150 group-hover:translate-x-0.5">
+              →
+            </span>
+          </p>
+        </div>
+      </Link>
+    </NavigationMenuLink>
+  );
+}
diff --git a/packages/ui/src/nav/content/resources-content.tsx b/packages/ui/src/nav/content/resources-content.tsx
index 1dc6b7011e7..139260976f5 100644
--- a/packages/ui/src/nav/content/resources-content.tsx
+++ b/packages/ui/src/nav/content/resources-content.tsx
@@ -1,142 +1,73 @@
 import { cn, createHref } from "@dub/utils";
-import { Link as NavigationMenuLink } from "@radix-ui/react-navigation-menu";
-import Link from "next/link";
 import { RESOURCES } from "../../content";
-import { Grid } from "../../grid";
-import { Book2, LifeRing } from "../../icons";
+import { ProgramMarketplaceSection } from "./program-marketplace";
 import {
   ContentLinkCard,
   NAV_UTM_PARAMS,
   contentHeadingClassName,
 } from "./shared";
 
-const mainLinks = [
+const COLUMNS = [
   {
-    icon: Book2,
-    title: "Docs",
-    description: "Platform documentation",
-    thumbnail: "https://assets.dub.co/misc/docs-thumbnail.jpg",
-    href: "/docs",
+    heading: "Help and Support",
+    titles: ["Docs", "Help Center", "Contact"],
   },
   {
-    icon: LifeRing,
-    title: "Help Center",
-    description: "Answers to your questions",
-    thumbnail: "https://assets.dub.co/misc/help-thumbnail.jpg",
-    href: "/help",
+    heading: "Company",
+    titles: ["About", "Careers", "Dub Brand"],
+  },
+  {
+    heading: "Updates",
+    titles: ["Blog", "Changelog"],
   },
 ];
 
 export function ResourcesContent({ domain }: { domain: string }) {
   return (
-    <div className="grid w-[1020px] grid-cols-[0.9fr,0.55fr,0.55fr] divide-x divide-neutral-200 dark:divide-white/20">
-      <div className="flex h-full flex-col p-4">
-        <p className={cn(contentHeadingClassName, "mb-4 ml-2")}>Explore</p>
-        <div className="grid grow grid-cols-2 gap-4">
-          {mainLinks.map(({ icon: Icon, title, description, href }) => (
-            <NavigationMenuLink key={title} asChild>
-              <Link
-                key={title}
-                href={createHref(href, domain, {
-                  ...NAV_UTM_PARAMS,
-                  utm_campaign: domain,
-                  utm_content: title,
-                })}
-                className={cn(
-                  "group relative isolate z-0 flex flex-col justify-between overflow-hidden rounded-xl border border-neutral-100 bg-neutral-50 px-5 py-4 transition-colors duration-75",
-                  "dark:border-white/20 dark:bg-neutral-900",
-                )}
-              >
-                <div className="absolute inset-0 opacity-0 transition-opacity duration-150 group-hover:opacity-100">
-                  <div className="absolute -inset-[25%] -skew-y-12 [mask-image:linear-gradient(225deg,black,transparent_50%)]">
-                    <Grid
-                      cellSize={46}
-                      patternOffset={[0, -14]}
-                      className="translate-y-2 text-[#ad1f3288] transition-transform duration-150 ease-out group-hover:translate-y-0"
+    <div className="w-[1020px] bg-neutral-50 dark:bg-white/[0.03]">
+      <div className="relative">
+        <div className="grid grid-cols-3 divide-x divide-neutral-200 rounded-b-[20px] bg-white dark:divide-white/20 dark:bg-black">
+          {COLUMNS.map(({ heading, titles }) => (
+            <div key={heading} className="px-6 py-4">
+              <p className={cn(contentHeadingClassName, "mb-2")}>{heading}</p>
+              <div className="flex flex-col gap-0.5">
+                {RESOURCES.filter(({ title }) => titles.includes(title)).map(
+                  ({ icon: Icon, title, description, href }) => (
+                    <ContentLinkCard
+                      key={href}
+                      className="-mx-2"
+                      href={createHref(href, domain, {
+                        ...NAV_UTM_PARAMS,
+                        utm_campaign: domain,
+                        utm_content: title,
+                      })}
+                      icon={
+                        <div className="shrink-0 rounded-md border border-neutral-200 bg-white/50 p-2 dark:border-white/20 dark:bg-white/10">
+                          <Icon
+                            variant="fill"
+                            className="size-4 text-neutral-600 transition-colors dark:text-white/60"
+                          />
+                        </div>
+                      }
+                      title={title}
+                      description={description}
                     />
-                  </div>
-                  <div
-                    className={cn(
-                      "absolute -inset-[10%] opacity-10 blur-[50px] dark:brightness-150",
-                      "bg-[conic-gradient(#F35066_0deg,#F35066_117deg,#9071F9_180deg,#5182FC_240deg,#F35066_360deg)]",
-                    )}
-                  />
-                </div>
-                <Icon
-                  variant="fill"
-                  className="relative size-5 text-neutral-700 dark:text-white/60"
-                />
-                <div className="relative">
-                  <span className="text-sm font-medium text-neutral-900 dark:text-white">
-                    {title}
-                  </span>
-                  <p className="mt-2 text-xs text-neutral-500 dark:text-white/60">
-                    {description}
-                  </p>
-                </div>
-              </Link>
-            </NavigationMenuLink>
+                  ),
+                )}
+              </div>
+            </div>
           ))}
         </div>
-      </div>
 
-      <div className="px-6 py-4">
-        <p className={cn(contentHeadingClassName, "mb-2")}>Company</p>
-        <div className="flex flex-col gap-0.5">
-          {RESOURCES.filter(({ title }) =>
-            ["About", "Careers", "Brand Guidelines", "Contact"].includes(title),
-          ).map(({ icon: Icon, title, description, href }) => (
-            <ContentLinkCard
-              key={href}
-              className="-mx-2"
-              href={createHref(href, domain, {
-                ...NAV_UTM_PARAMS,
-                utm_campaign: domain,
-                utm_content: title,
-              })}
-              icon={
-                <div className="shrink-0 rounded-md border border-neutral-200 bg-white/50 p-2.5 dark:border-white/20 dark:bg-white/10">
-                  <Icon
-                    variant="fill"
-                    className="size-4 text-neutral-600 transition-colors dark:text-white/60"
-                  />
-                </div>
-              }
-              title={title}
-              description={description}
-            />
-          ))}
+        {/* bottom hairline drawn as a clipped full border, so it keeps full
+            strength around the curled corners (border-b alone tapers there);
+            kept outside the grid so divide-x doesn't add a border to it */}
+        <div className="pointer-events-none absolute -inset-x-px bottom-0 h-5 overflow-hidden">
+          <div className="absolute inset-x-0 bottom-0 h-10 rounded-b-[21px] border border-neutral-200 dark:border-white/20" />
         </div>
       </div>
 
-      <div className="px-6 py-4">
-        <p className={cn(contentHeadingClassName, "mb-2")}>Updates</p>
-        <div className="flex flex-col gap-0.5">
-          {RESOURCES.filter(({ title }) =>
-            ["Blog", "Changelog"].includes(title),
-          ).map(({ icon: Icon, title, description, href }) => (
-            <ContentLinkCard
-              key={href}
-              className="-mx-2"
-              href={createHref(href, domain, {
-                ...NAV_UTM_PARAMS,
-                utm_campaign: domain,
-                utm_content: title,
-              })}
-              icon={
-                <div className="shrink-0 rounded-md border border-neutral-200 bg-white/50 p-2.5 dark:border-white/20 dark:bg-white/10">
-                  <Icon
-                    variant="fill"
-                    className="size-4 text-neutral-600 transition-colors dark:text-white/60"
-                  />
-                </div>
-              }
-              title={title}
-              description={description}
-            />
-          ))}
-        </div>
-      </div>
+      <ProgramMarketplaceSection domain={domain} />
     </div>
   );
 }
diff --git a/packages/ui/src/nav/nav-mobile.tsx b/packages/ui/src/nav/nav-mobile.tsx
index d9a40ed7afc..7eee44ae4f6 100644
--- a/packages/ui/src/nav/nav-mobile.tsx
+++ b/packages/ui/src/nav/nav-mobile.tsx
@@ -15,7 +15,7 @@ import {
   DubLinksIcon,
   DubPartnersIcon,
 } from "../icons";
-import { navItems, type NavTheme } from "./nav";
+import { navItems, type NavItem, type NavTheme } from "./nav";
 
 const specialIcons: Record<string, ReactNode> = {
   "Dub Links": (
@@ -43,9 +43,11 @@ const specialIcons: Record<string, ReactNode> = {
 export function NavMobile({
   theme = "light",
   staticDomain,
+  navItems: items = navItems,
 }: {
   theme?: NavTheme;
   staticDomain?: string;
+  navItems?: NavItem[];
 }) {
   let { domain = "dub.co" } = useParams() as { domain: string };
   if (staticDomain) {
@@ -110,7 +112,7 @@ export function NavMobile({
         )}
       >
         <ul className="grid divide-y divide-neutral-200 dark:divide-white/[0.15]">
-          {navItems.map(({ name, href, childItems }, idx) => (
+          {items.map(({ name, href, childItems }, idx) => (
             <MobileNavItem
               key={idx}
               name={name}
diff --git a/packages/ui/src/nav/nav.tsx b/packages/ui/src/nav/nav.tsx
index 18f4f74a8c6..7426ba7ddbb 100644
--- a/packages/ui/src/nav/nav.tsx
+++ b/packages/ui/src/nav/nav.tsx
@@ -6,6 +6,7 @@ import { motion } from "motion/react";
 import Link from "next/link";
 import { useParams, usePathname } from "next/navigation";
 import {
+  ComponentType,
   PropsWithChildren,
   ReactNode,
   SVGProps,
@@ -15,7 +16,12 @@ import {
 } from "react";
 import useSWR from "swr";
 import { buttonVariants } from "../button";
-import { FEATURES_LIST, RESOURCES, SOLUTIONS } from "../content";
+import {
+  FEATURES_LIST,
+  RESOURCES,
+  SOLUTIONS,
+  type NavItemChildren,
+} from "../content";
 import { useScroll } from "../hooks";
 import { MaxWidthWrapper } from "../max-width-wrapper";
 import { NavWordmark } from "../nav-wordmark";
@@ -29,7 +35,16 @@ export const NavContext = createContext<{ theme: NavTheme }>({
   theme: "light",
 });
 
-export const navItems = [
+export type NavItem = {
+  name: string;
+  href?: string;
+  segments?: string[];
+  content?: ComponentType<{ domain: string }>;
+  childItems?: NavItemChildren;
+  mobileOnly?: boolean;
+};
+
+export const navItems: NavItem[] = [
   {
     name: "Product",
     content: ProductContent,
@@ -68,6 +83,7 @@ export const navItems = [
       "/blog",
       "/changelog",
       "/contact",
+      "/marketplace",
     ],
   },
   {
@@ -123,11 +139,13 @@ export function Nav({
   theme = "light",
   staticDomain,
   maxWidthWrapperClassName,
+  navItems: items = navItems,
   logo,
 }: {
   theme?: NavTheme;
   staticDomain?: string;
   maxWidthWrapperClassName?: string;
+  navItems?: NavItem[];
   logo?: ReactNode;
 }) {
   let { domain = "dub.co" } = useParams() as { domain: string };
@@ -212,9 +230,8 @@ export function Nav({
                 className="group/nav relative flex"
                 onMouseLeave={() => {
                   const list = navListRef.current;
-                  const openTrigger = list?.querySelector<HTMLElement>(
-                    "[data-state=open]",
-                  );
+                  const openTrigger =
+                    list?.querySelector<HTMLElement>("[data-state=open]");
                   // Keep the pill on the open trigger so it doesn't flicker into the dropdown
                   if (list && openTrigger) {
                     setHoverStyle(getHoverStyle(list, openTrigger));
@@ -228,7 +245,7 @@ export function Nav({
                   animate={hoverStyle}
                   transition={pillSpring}
                 />
-                {navItems
+                {items
                   .filter(({ mobileOnly }) => !mobileOnly)
                   .map(({ name, href, segments, content: Content }) => {
                     const isActive = (segments ?? []).some((segment) =>
@@ -280,7 +297,10 @@ export function Nav({
                   className={cn(
                     "relative flex origin-top justify-start overflow-hidden rounded-[20px] border border-neutral-200 bg-white shadow-md dark:border-white/[0.15] dark:bg-black",
                     "data-[state=closed]:animate-scale-out-content data-[state=open]:animate-scale-in-content",
-                    "h-[var(--radix-navigation-menu-viewport-height)] w-[var(--radix-navigation-menu-viewport-width)] transition-[width,height]",
+                    // +2px: Radix measures the content's border-box, but this element's
+                    // 1px borders eat into it (border-box sizing), clipping fixed-width
+                    // content by 2px on the right/bottom
+                    "h-[calc(var(--radix-navigation-menu-viewport-height)_+_2px)] w-[calc(var(--radix-navigation-menu-viewport-width)_+_2px)] transition-[width,height]",
                   )}
                 />
               </div>
diff --git a/packages/ui/src/popover.tsx b/packages/ui/src/popover.tsx
index 3194624e02d..4fb0b7349cc 100644
--- a/packages/ui/src/popover.tsx
+++ b/packages/ui/src/popover.tsx
@@ -23,6 +23,7 @@ export type PopoverProps = PropsWithChildren<{
   onEscapeKeyDown?: (event: KeyboardEvent) => void;
   onWheel?: WheelEventHandler;
   sideOffset?: number;
+  collisionPadding?: PopoverPrimitive.PopoverContentProps["collisionPadding"];
   anchor?: ReactNode;
 }>;
 
@@ -43,6 +44,7 @@ export function Popover({
   onEscapeKeyDown,
   onWheel,
   sideOffset = 8,
+  collisionPadding,
   anchor,
 }: PopoverProps) {
   const { isMobile } = useMediaQuery();
@@ -103,6 +105,7 @@ export function Popover({
           )}
           sticky={sticky}
           collisionBoundary={collisionBoundary}
+          collisionPadding={collisionPadding}
           onOpenAutoFocus={onOpenAutoFocus}
           onCloseAutoFocus={onCloseAutoFocus}
           onEscapeKeyDown={onEscapeKeyDown}
diff --git a/packages/ui/src/rich-text-area/index.tsx b/packages/ui/src/rich-text-area/index.tsx
index 25f7619623d..4de0ce77f0f 100644
--- a/packages/ui/src/rich-text-area/index.tsx
+++ b/packages/ui/src/rich-text-area/index.tsx
@@ -3,6 +3,7 @@ import { EditorContent, EditorContentProps } from "@tiptap/react";
 import { LoadingSpinner } from "../icons";
 import { useRichTextContext } from "./rich-text-provider";
 
+export * from "./link-modal";
 export * from "./rich-text-provider";
 export * from "./rich-text-toolbar";
 
diff --git a/packages/ui/src/rich-text-area/link-hover-tooltip.tsx b/packages/ui/src/rich-text-area/link-hover-tooltip.tsx
new file mode 100644
index 00000000000..9dfe8dc9132
--- /dev/null
+++ b/packages/ui/src/rich-text-area/link-hover-tooltip.tsx
@@ -0,0 +1,76 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { createPortal } from "react-dom";
+import { useRichTextContext } from "./rich-text-provider";
+
+/**
+ * Tooltip that shows a link's full URL when hovering it inside the editor.
+ * The editor's anchors are rendered by ProseMirror (outside React), so this
+ * tracks hover via DOM events rather than wrapping the elements.
+ */
+export function RichTextLinkHoverTooltip() {
+  const { editor, linkModalState } = useRichTextContext();
+  const [hovered, setHovered] = useState<{
+    href: string;
+    rect: DOMRect;
+  } | null>(null);
+
+  useEffect(() => {
+    if (!editor) return;
+
+    const dom = editor.view.dom as HTMLElement;
+
+    const onMouseOver = (e: MouseEvent) => {
+      const anchor =
+        e.target instanceof Element ? e.target.closest("a[href]") : null;
+
+      if (anchor && dom.contains(anchor)) {
+        setHovered({
+          href: anchor.getAttribute("href") ?? "",
+          rect: anchor.getBoundingClientRect(),
+        });
+      }
+    };
+
+    const onMouseOut = (e: MouseEvent) => {
+      const anchor =
+        e.target instanceof Element ? e.target.closest("a[href]") : null;
+      const toAnchor =
+        e.relatedTarget instanceof Element
+          ? e.relatedTarget.closest("a[href]")
+          : null;
+
+      if (anchor && anchor !== toAnchor) setHovered(null);
+    };
+
+    const clear = () => setHovered(null);
+
+    dom.addEventListener("mouseover", onMouseOver);
+    dom.addEventListener("mouseout", onMouseOut);
+    window.addEventListener("scroll", clear, true);
+
+    return () => {
+      dom.removeEventListener("mouseover", onMouseOver);
+      dom.removeEventListener("mouseout", onMouseOut);
+      window.removeEventListener("scroll", clear, true);
+    };
+  }, [editor]);
+
+  if (!hovered || linkModalState) return null;
+
+  return createPortal(
+    <div
+      className="pointer-events-none fixed z-[99] -translate-x-1/2 -translate-y-full"
+      style={{
+        left: hovered.rect.left + hovered.rect.width / 2,
+        top: hovered.rect.top - 8,
+      }}
+    >
+      <div className="animate-slide-up-fade border-border-default bg-bg-default text-content-default max-w-[200px] break-all rounded-xl border px-2.5 py-1.5 text-xs shadow-sm">
+        {hovered.href}
+      </div>
+    </div>,
+    document.body,
+  );
+}
diff --git a/packages/ui/src/rich-text-area/link-modal.tsx b/packages/ui/src/rich-text-area/link-modal.tsx
new file mode 100644
index 00000000000..5a643fcfd4e
--- /dev/null
+++ b/packages/ui/src/rich-text-area/link-modal.tsx
@@ -0,0 +1,170 @@
+"use client";
+
+import { isSafeLinkHref } from "@dub/utils";
+import { FormEvent, useState } from "react";
+import { toast } from "sonner";
+import { Button } from "../button";
+import { useMediaQuery } from "../hooks";
+import { Modal } from "../modal";
+import {
+  RichTextLinkModalState,
+  useRichTextContext,
+} from "./rich-text-provider";
+
+/**
+ * Prefixes `https://` when the value doesn't already have a usable scheme,
+ * so users can enter e.g. "dub.co" or "https://dub.co" interchangeably.
+ */
+export function normalizeLinkHref(value: string) {
+  const trimmed = value.trim();
+  if (!trimmed) return trimmed;
+  if (isSafeLinkHref(trimmed)) return trimmed;
+  if (/^(https?:\/\/|mailto:)/i.test(trimmed)) return trimmed;
+  return `https://${trimmed}`;
+}
+
+export function RichTextLinkModal() {
+  const { linkModalState } = useRichTextContext();
+
+  return linkModalState ? (
+    <RichTextLinkModalInner state={linkModalState} />
+  ) : null;
+}
+
+function RichTextLinkModalInner({ state }: { state: RichTextLinkModalState }) {
+  const { editor, setLinkModalState } = useRichTextContext();
+  const { isMobile } = useMediaQuery();
+
+  const [text, setText] = useState(state.text);
+  const [href, setHref] = useState(state.href);
+
+  const isEditing = Boolean(state.href);
+
+  const close = () => {
+    setLinkModalState(null);
+    setTimeout(() => editor?.commands.focus(), 0);
+  };
+
+  const handleSave = (e: FormEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (!editor) return;
+
+    const finalHref = normalizeLinkHref(href);
+
+    if (!isSafeLinkHref(finalHref)) {
+      toast.error(
+        "Enter a full URL starting with http://, https://, or mailto: (e.g. https://dub.co).",
+      );
+      return;
+    }
+
+    const trimmedText = text.trim();
+    const chain = editor
+      .chain()
+      .focus()
+      .setTextSelection({ from: state.from, to: state.to });
+
+    if (trimmedText && trimmedText === state.text.trim()) {
+      chain.setLink({ href: finalHref });
+    } else {
+      chain.insertContent([
+        {
+          type: "text",
+          text: trimmedText || finalHref,
+          marks: [{ type: "link", attrs: { href: finalHref } }],
+        },
+      ]);
+    }
+
+    chain.run();
+
+    setLinkModalState(null);
+  };
+
+  const handleDelete = () => {
+    if (!editor) return;
+
+    editor
+      .chain()
+      .focus()
+      .setTextSelection({ from: state.from, to: state.to })
+      .unsetLink()
+      .run();
+
+    setLinkModalState(null);
+  };
+
+  return (
+    <Modal showModal setShowModal={() => close()}>
+      <div className="border-b border-neutral-200 px-6 py-4">
+        <h3 className="text-lg font-medium">
+          {isEditing ? "Edit link" : "Add link"}
+        </h3>
+      </div>
+
+      <form
+        onSubmit={handleSave}
+        className="bg-neutral-50 sm:rounded-b-2xl"
+        autoComplete="off"
+      >
+        <div className="flex flex-col gap-6 px-6 py-6">
+          <label>
+            <span className="block text-sm font-medium text-neutral-700">
+              Text
+            </span>
+            <input
+              type="text"
+              value={text}
+              autoFocus={!isMobile}
+              onChange={(e) => setText(e.target.value)}
+              className="mt-2 block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+            />
+          </label>
+
+          <label>
+            <span className="block text-sm font-medium text-neutral-700">
+              Link
+            </span>
+            <input
+              type="text"
+              value={href}
+              placeholder="https://dub.co"
+              onChange={(e) => setHref(e.target.value)}
+              onBlur={() => setHref((href) => normalizeLinkHref(href))}
+              className="mt-2 block w-full rounded-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
+            />
+          </label>
+        </div>
+
+        <div className="flex items-center justify-between gap-2 border-t border-neutral-200 px-6 py-4">
+          {isEditing ? (
+            <Button
+              variant="outline"
+              text="Delete link"
+              onClick={handleDelete}
+              className="h-9 w-fit px-4"
+            />
+          ) : (
+            <div />
+          )}
+
+          <div className="flex items-center gap-2">
+            <Button
+              variant="secondary"
+              text="Cancel"
+              onClick={close}
+              className="h-9 w-fit px-4"
+            />
+            <Button
+              variant="primary"
+              text="Save"
+              disabled={!href.trim()}
+              className="h-9 w-fit px-4"
+            />
+          </div>
+        </div>
+      </form>
+    </Modal>
+  );
+}
diff --git a/packages/ui/src/rich-text-area/rich-text-provider.tsx b/packages/ui/src/rich-text-area/rich-text-provider.tsx
index 575f6dd82e6..d1b9f51568a 100644
--- a/packages/ui/src/rich-text-area/rich-text-provider.tsx
+++ b/packages/ui/src/rich-text-area/rich-text-provider.tsx
@@ -3,22 +3,28 @@ import FileHandler from "@tiptap/extension-file-handler";
 import Image from "@tiptap/extension-image";
 import Link from "@tiptap/extension-link";
 import Mention from "@tiptap/extension-mention";
+import { TableKit } from "@tiptap/extension-table";
 import { Placeholder } from "@tiptap/extensions";
 import { Markdown } from "@tiptap/markdown";
-import { Editor, useEditor } from "@tiptap/react";
+import { Editor, useEditor, useEditorState } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 import {
   PropsWithChildren,
   createContext,
   forwardRef,
+  useCallback,
   useContext,
   useEffect,
   useImperativeHandle,
   useMemo,
+  useRef,
   useState,
 } from "react";
 import { configureCampaignEditorImage } from "./campaign-editor-image";
-import { suggestions } from "./variables";
+import { RichTextLinkHoverTooltip } from "./link-hover-tooltip";
+import { RichTextLinkModal } from "./link-modal";
+import { TableHoverControls } from "./table-hover-controls";
+import { RichTextVariableInfo, suggestions } from "./variables";
 
 export const PROSE_STYLES = {
   default: "prose-p:my-2 prose-ul:my-2 prose-ol:my-2",
@@ -27,7 +33,7 @@ export const PROSE_STYLES = {
   relaxed: "",
 } as const;
 
-const FEATURES = [
+const CORE_FEATURES = [
   "images",
   "variables",
   "links",
@@ -37,7 +43,15 @@ const FEATURES = [
   "strike",
 ] as const;
 
-export const DEFAULT_RICH_TEXT_FEATURES = FEATURES;
+const FEATURES = [
+  ...CORE_FEATURES,
+  "lists",
+  "tables",
+  "quote",
+  "code",
+] as const;
+
+export const DEFAULT_RICH_TEXT_FEATURES = CORE_FEATURES;
 
 const OPTIONAL_FEATURES = ["imageControls"] as const;
 
@@ -53,7 +67,9 @@ type RichTextProviderProps = PropsWithChildren<{
   style?: keyof typeof PROSE_STYLES;
   onChange?: (editor: Editor) => void;
   uploadImage?: (file: File) => Promise<string | null>;
+  imageAccept?: string;
   variables?: string[];
+  variableInfo?: Record<string, RichTextVariableInfo>;
   editable?: boolean;
   autoFocus?: boolean;
 
@@ -61,16 +77,26 @@ type RichTextProviderProps = PropsWithChildren<{
   editorClassName?: string;
 }>;
 
+export type RichTextLinkModalState = {
+  from: number;
+  to: number;
+  text: string;
+  href: string;
+};
+
 export const RichTextContext = createContext<
   | (Pick<
       RichTextProviderProps,
-      "features" | "markdown" | "variables" | "editable"
+      "features" | "markdown" | "variables" | "editable" | "imageAccept"
     > & {
       editor: Editor | null;
       isUploading: boolean;
       handleImageUpload:
         | ((file: File, currentEditor: Editor, pos: number) => Promise<void>)
         | null;
+      linkModalState: RichTextLinkModalState | null;
+      setLinkModalState: (state: RichTextLinkModalState | null) => void;
+      openLinkModal: (pos?: number) => void;
     })
   | null
 >(null);
@@ -86,14 +112,16 @@ export const RichTextProvider = forwardRef<
   (
     {
       children,
-      features = FEATURES as any,
+      features = DEFAULT_RICH_TEXT_FEATURES as any,
       markdown = false,
       style = "default",
       placeholder = "Start typing...",
       uploadImage,
+      imageAccept,
       editable,
       autoFocus,
       variables,
+      variableInfo,
       initialValue,
       onChange,
       editorProps,
@@ -103,6 +131,32 @@ export const RichTextProvider = forwardRef<
   ) => {
     const [isUploading, setIsUploading] = useState(false);
 
+    const [linkModalState, setLinkModalState] =
+      useState<RichTextLinkModalState | null>(null);
+
+    // Ref to avoid stale closures in editorProps handlers below
+    const editorRef = useRef<Editor | null>(null);
+
+    const openLinkModal = useCallback((pos?: number) => {
+      const editor = editorRef.current;
+      if (!editor) return;
+
+      const chain = editor.chain();
+      if (pos !== undefined) chain.setTextSelection(pos);
+      chain.run();
+
+      if (editor.isActive("link")) editor.chain().extendMarkRange("link").run();
+
+      const { from, to } = editor.state.selection;
+
+      setLinkModalState({
+        from,
+        to,
+        text: editor.state.doc.textBetween(from, to, " "),
+        href: editor.getAttributes("link").href ?? "",
+      });
+    }, []);
+
     const handleImageUpload = useMemo(
       () =>
         uploadImage
@@ -149,10 +203,26 @@ export const RichTextProvider = forwardRef<
           link: false,
         }),
 
+        ...(features.includes("tables")
+          ? [
+              TableKit.configure({
+                table: {
+                  resizable: false,
+                  HTMLAttributes: {
+                    class: "w-full border-separate border-spacing-0",
+                  },
+                },
+              }),
+            ]
+          : []),
+
         ...(features.includes("links")
           ? [
               Link.extend({
                 inclusive: false,
+              }).configure({
+                // Clicking a link opens the edit modal instead of the URL
+                openOnClick: false,
               }),
             ]
           : []),
@@ -250,24 +320,46 @@ export const RichTextProvider = forwardRef<
                     : `{{${node.attrs.id}}}`;
                 },
               }).configure({
-                suggestion: suggestions(variables),
+                suggestion: suggestions(variables, variableInfo),
               }),
             ]
           : []),
       ],
       editorProps: {
+        ...editorProps,
         attributes: {
           ...editorProps?.attributes,
           class: cn(
             "max-w-none focus:outline-none",
             "prose prose-sm prose-neutral",
+            // Tiptap wraps each list item's content in a <p>, which Typography treats as a
+            // "loose" list and gives paragraph spacing. Zero it so items sit 4px apart (the
+            // <li> margins), and match the bullet color to the ordered list counters.
+            "[&_li>p]:my-0 marker:prose-ul:text-neutral-500",
+            features.includes("tables") &&
+              "[&_table]:my-3 [&_table]:overflow-hidden [&_table]:rounded-xl [&_table]:border [&_table]:border-neutral-200 [&_th]:border-b [&_th]:border-r [&_td]:border-b [&_td]:border-r [&_th]:border-neutral-200 [&_td]:border-neutral-200 [&_th]:bg-neutral-50 [&_th]:px-4 [&_td]:px-4 [&_th]:py-3 [&_td]:py-3 [&_th]:align-top [&_td]:align-top [&_th]:text-left [&_th]:font-semibold [&_th]:text-neutral-900 [&_td]:text-neutral-600 [&_th:last-child]:border-r-0 [&_td:last-child]:border-r-0 [&_tr:last-child>*]:border-b-0 [&_th>p]:my-0 [&_td>p]:my-0",
             PROSE_STYLES[style],
             "[&_.ProseMirror-selectednode]:outline [&_.ProseMirror-selectednode]:outline-2 [&_.ProseMirror-selectednode]:outline-blue-500 [&_.ProseMirror-selectednode]:outline-offset-2",
             "[&_.ProseMirror-selectednode:has(img)]:outline-none",
             editorClassName,
           ),
         },
-        ...editorProps,
+        handleClick: (view, pos, event) => {
+          if (editorProps?.handleClick?.(view, pos, event)) return true;
+
+          // Open the link edit modal when clicking a link in the editor
+          if (
+            view.editable &&
+            features.includes("links") &&
+            event.target instanceof Element &&
+            event.target.closest("a[href]")
+          ) {
+            openLinkModal(pos);
+            return true;
+          }
+
+          return false;
+        },
       },
       content: initialValue,
       contentType: markdown ? "markdown" : undefined,
@@ -275,6 +367,8 @@ export const RichTextProvider = forwardRef<
       immediatelyRender: false,
     });
 
+    editorRef.current = editor;
+
     useEffect(() => {
       editor?.setEditable(editable ?? true);
     }, [editor, editable]);
@@ -292,12 +386,27 @@ export const RichTextProvider = forwardRef<
           markdown,
           editable,
           variables,
+          imageAccept,
           editor,
           isUploading,
           handleImageUpload,
+          linkModalState,
+          setLinkModalState,
+          openLinkModal,
         }}
       >
         {children}
+
+        {features.includes("links") && (
+          <>
+            <RichTextLinkModal />
+            <RichTextLinkHoverTooltip />
+          </>
+        )}
+
+        {features.includes("tables") && (editable ?? true) && (
+          <TableHoverControls />
+        )}
       </RichTextContext.Provider>
     );
   },
@@ -313,3 +422,15 @@ export function useRichTextContext() {
 
   return context;
 }
+
+export function useRichTextLength() {
+  const { editor } = useRichTextContext();
+
+  return (
+    useEditorState({
+      editor,
+      selector: ({ editor }) =>
+        editor?.getText({ blockSeparator: "" }).length ?? 0,
+    }) ?? 0
+  );
+}
diff --git a/packages/ui/src/rich-text-area/rich-text-toolbar.tsx b/packages/ui/src/rich-text-area/rich-text-toolbar.tsx
index 53c5dcb1ab4..5d9b7d3d341 100644
--- a/packages/ui/src/rich-text-area/rich-text-toolbar.tsx
+++ b/packages/ui/src/rich-text-area/rich-text-toolbar.tsx
@@ -4,11 +4,16 @@ import { ReactNode, forwardRef, useRef } from "react";
 import { toast } from "sonner";
 import {
   AtSign,
+  BulletList,
+  Code,
   Heading1,
   Heading2,
   Hyperlink,
   Icon,
   ImageIcon,
+  NumberedList,
+  Quote,
+  TableIcon,
   TextBold,
   TextItalic,
   TextStrike,
@@ -24,7 +29,7 @@ export function RichTextToolbar({
   toolsEnd?: ReactNode;
   className?: string;
 }) {
-  const { editor, features, handleImageUpload, isUploading } =
+  const { editor, features, handleImageUpload, isUploading, imageAccept } =
     useRichTextContext();
 
   const editorState = useEditorState({
@@ -35,6 +40,10 @@ export function RichTextToolbar({
       isStrike: Boolean(editor?.isActive("strike")),
       isHeading1: Boolean(editor?.isActive("heading", { level: 1 })),
       isHeading2: Boolean(editor?.isActive("heading", { level: 2 })),
+      isBulletList: Boolean(editor?.isActive("bulletList")),
+      isOrderedList: Boolean(editor?.isActive("orderedList")),
+      isBlockquote: Boolean(editor?.isActive("blockquote")),
+      isCode: Boolean(editor?.isActive("code")),
       isSelection: editor?.state.selection.from !== editor?.state.selection.to,
     }),
   });
@@ -95,6 +104,52 @@ export function RichTextToolbar({
           />
         </>
       )}
+      {features?.includes("lists") && (
+        <>
+          <RichTextToolbarButton
+            icon={BulletList}
+            label="Bullet list"
+            isActive={editorState?.isBulletList}
+            onClick={() => editor?.chain().focus().toggleBulletList().run()}
+          />
+          <RichTextToolbarButton
+            icon={NumberedList}
+            label="Numbered list"
+            isActive={editorState?.isOrderedList}
+            onClick={() => editor?.chain().focus().toggleOrderedList().run()}
+          />
+        </>
+      )}
+      {features?.includes("tables") && (
+        <RichTextToolbarButton
+          icon={TableIcon}
+          label="Table"
+          isActive={false}
+          onClick={() =>
+            editor
+              ?.chain()
+              .focus()
+              .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+              .run()
+          }
+        />
+      )}
+      {features?.includes("quote") && (
+        <RichTextToolbarButton
+          icon={Quote}
+          label="Quote"
+          isActive={editorState?.isBlockquote}
+          onClick={() => editor?.chain().focus().toggleBlockquote().run()}
+        />
+      )}
+      {features?.includes("code") && (
+        <RichTextToolbarButton
+          icon={Code}
+          label="Inline code"
+          isActive={editorState?.isCode}
+          onClick={() => editor?.chain().focus().toggleCode().run()}
+        />
+      )}
       {features?.includes("links") && <LinkButton />}
       {features?.includes("variables") && (
         <RichTextToolbarButton
@@ -116,6 +171,7 @@ export function RichTextToolbar({
           <input
             ref={inputImageRef}
             type="file"
+            accept={imageAccept}
             className="hidden"
             onChange={(e) => {
               const file = e.target.files?.[0];
@@ -140,14 +196,12 @@ export function RichTextToolbar({
 }
 
 function LinkButton() {
-  const { editor, features } = useRichTextContext();
+  const { editor, features, openLinkModal } = useRichTextContext();
   const imageControlsEnabled = features?.includes("imageControls");
 
   const editorState = useEditorState({
     editor,
     selector: ({ editor }) => ({
-      isTextSelection:
-        editor?.state.selection.from !== editor?.state.selection.to,
       isImageSelected: Boolean(editor?.isActive("image")),
       isLinkActive: Boolean(
         editor?.isActive("link") ||
@@ -158,10 +212,11 @@ function LinkButton() {
     }),
   });
 
-  const canLink =
-    editorState?.isTextSelection ||
-    editorState?.isLinkActive ||
-    (imageControlsEnabled && editorState?.isImageSelected);
+  const canLink = Boolean(
+    editor &&
+      (!editorState?.isImageSelected ||
+        (imageControlsEnabled && editorState?.isImageSelected)),
+  );
 
   return (
     <RichTextToolbarButton
@@ -207,30 +262,7 @@ function LinkButton() {
           return;
         }
 
-        const previousUrl = editor.getAttributes("link").href;
-
-        const url = window.prompt("Link URL", previousUrl);
-
-        if (url === null) return;
-
-        if (!url.trim()) {
-          editor.chain().focus().extendMarkRange("link").unsetLink().run();
-          return;
-        }
-
-        if (!isSafeLinkHref(url.trim())) {
-          toast.error(
-            "Enter a full URL starting with http://, https://, or mailto: (e.g. https://dub.co).",
-          );
-          return;
-        }
-
-        editor
-          .chain()
-          .focus()
-          .extendMarkRange("link")
-          .setLink({ href: url.trim() })
-          .run();
+        openLinkModal();
       }}
       disabled={!canLink}
     />
diff --git a/packages/ui/src/rich-text-area/table-hover-controls.tsx b/packages/ui/src/rich-text-area/table-hover-controls.tsx
new file mode 100644
index 00000000000..41700543aab
--- /dev/null
+++ b/packages/ui/src/rich-text-area/table-hover-controls.tsx
@@ -0,0 +1,543 @@
+"use client";
+
+import { cn } from "@dub/utils";
+import type { Editor } from "@tiptap/react";
+import { CSSProperties, ReactNode, useEffect, useState } from "react";
+import { createPortal } from "react-dom";
+import { GripDotsVertical, Plus } from "../icons";
+import { useRichTextContext } from "./rich-text-provider";
+
+const CONTROL_ATTR = "data-table-controls";
+const EDGE_PX = 10;
+
+type HoverZone =
+  | {
+      kind: "add-row";
+      table: HTMLTableElement;
+    }
+  | {
+      kind: "add-col";
+      table: HTMLTableElement;
+    }
+  | {
+      kind: "row";
+      table: HTMLTableElement;
+      row: HTMLTableRowElement;
+      cell: HTMLTableCellElement;
+    }
+  | {
+      kind: "col";
+      table: HTMLTableElement;
+      cell: HTMLTableCellElement;
+    };
+
+type MenuState = {
+  kind: "row" | "col";
+  cellPos: number;
+};
+
+export function TableHoverControls() {
+  const { editor, editable } = useRichTextContext();
+  const [zone, setZone] = useState<HoverZone | null>(null);
+  const [menu, setMenu] = useState<MenuState | null>(null);
+  const [, setTick] = useState(0);
+
+  useEffect(() => {
+    if (!editor || editable === false) return;
+
+    const remasure = () => setTick((value) => value + 1);
+    const editorDom = editor.view.dom as HTMLElement;
+
+    const onMouseMove = (event: MouseEvent) => {
+      const el = document.elementFromPoint(event.clientX, event.clientY);
+      if (el instanceof Element && el.closest(`[${CONTROL_ATTR}]`)) return;
+      if (menu) return;
+
+      setZone(getHoverZone(event.clientX, event.clientY, editorDom));
+    };
+
+    document.addEventListener("mousemove", onMouseMove);
+    window.addEventListener("scroll", remasure, true);
+    window.addEventListener("resize", remasure);
+    editor.on("update", remasure);
+
+    return () => {
+      document.removeEventListener("mousemove", onMouseMove);
+      window.removeEventListener("scroll", remasure, true);
+      window.removeEventListener("resize", remasure);
+      editor.off("update", remasure);
+    };
+  }, [editor, editable, menu]);
+
+  useEffect(() => {
+    if (!menu) return;
+
+    const onPointerDown = (event: PointerEvent) => {
+      if (
+        event.target instanceof Element &&
+        event.target.closest(`[${CONTROL_ATTR}]`)
+      ) {
+        return;
+      }
+      setMenu(null);
+    };
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === "Escape") setMenu(null);
+    };
+
+    document.addEventListener("pointerdown", onPointerDown);
+    document.addEventListener("keydown", onKeyDown);
+    return () => {
+      document.removeEventListener("pointerdown", onPointerDown);
+      document.removeEventListener("keydown", onKeyDown);
+    };
+  }, [menu]);
+
+  if (!editor || editable === false || !zone?.table.isConnected) {
+    return null;
+  }
+
+  const tableRect = zone.table.getBoundingClientRect();
+  const visible = intersectRect(
+    tableRect,
+    (editor.view.dom as HTMLElement).getBoundingClientRect(),
+  );
+
+  const runOnCell = (cellPos: number, command: () => void) => {
+    editor.chain().focus().setTextSelection(cellPos).run();
+    command();
+    setMenu(null);
+    setZone(null);
+  };
+
+  const lastRowCell = zone.table.rows[zone.table.rows.length - 1]?.cells[0];
+  const lastColCell =
+    zone.table.rows[0]?.cells[zone.table.rows[0].cells.length - 1];
+
+  const addRowPos = visible && {
+    x: visible.left + visible.width / 2,
+    y: tableRect.bottom,
+  };
+
+  const addColPos = visible && {
+    x: tableRect.right,
+    y: visible.top + visible.height / 2,
+  };
+
+  let menuPos: { top: number; left: number } | null = null;
+  if (menu && zone.kind === "row") {
+    const rowRect = zone.row.getBoundingClientRect();
+    menuPos = {
+      top: rowRect.top + rowRect.height / 2,
+      left: tableRect.left - 16,
+    };
+  } else if (menu && zone.kind === "col") {
+    const colRect = getColumnRect(zone.table, zone.cell.cellIndex);
+    if (colRect) {
+      menuPos = {
+        top: tableRect.top - 16,
+        left: colRect.left + colRect.width / 2,
+      };
+    }
+  }
+
+  return createPortal(
+    <div className="pointer-events-none fixed inset-0 z-[99]">
+      {zone.kind === "add-row" && lastRowCell && addRowPos && (
+        <ControlButton
+          label="Add row"
+          style={{
+            top: addRowPos.y,
+            left: addRowPos.x,
+            transform: "translate(-50%, -50%)",
+          }}
+          onClick={() =>
+            runOnCell(posAtCell(editor, lastRowCell), () =>
+              editor.chain().focus().addRowAfter().run(),
+            )
+          }
+        >
+          <Plus className="size-3.5" />
+        </ControlButton>
+      )}
+
+      {zone.kind === "add-col" && lastColCell && addColPos && (
+        <ControlButton
+          label="Add column"
+          style={{
+            top: addColPos.y,
+            left: addColPos.x,
+            transform: "translate(-50%, -50%)",
+          }}
+          onClick={() =>
+            runOnCell(posAtCell(editor, lastColCell), () =>
+              editor.chain().focus().addColumnAfter().run(),
+            )
+          }
+        >
+          <Plus className="size-3.5" />
+        </ControlButton>
+      )}
+
+      {zone.kind === "row" && (
+        <RowHandle editor={editor} zone={zone} menu={menu} setMenu={setMenu} />
+      )}
+
+      {zone.kind === "col" && (
+        <ColumnHandle
+          editor={editor}
+          zone={zone}
+          menu={menu}
+          setMenu={setMenu}
+        />
+      )}
+
+      {menu && menuPos && (
+        <div
+          data-table-controls=""
+          className="pointer-events-auto absolute min-w-36 rounded-lg border border-neutral-200 bg-white p-1 shadow-md"
+          style={{
+            top: menuPos.top,
+            left: menuPos.left,
+            transform:
+              menu.kind === "row"
+                ? "translate(-100%, -50%)"
+                : "translate(-50%, -100%)",
+          }}
+        >
+          {menu.kind === "row" ? (
+            <>
+              <MenuButton
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().addRowBefore().run(),
+                  )
+                }
+              >
+                Insert row above
+              </MenuButton>
+              <MenuButton
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().addRowAfter().run(),
+                  )
+                }
+              >
+                Insert row below
+              </MenuButton>
+              <MenuButton
+                danger
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().deleteRow().run(),
+                  )
+                }
+              >
+                Delete row
+              </MenuButton>
+              <div className="my-1 h-px bg-neutral-200" />
+              <MenuButton
+                danger
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().deleteTable().run(),
+                  )
+                }
+              >
+                Delete table
+              </MenuButton>
+            </>
+          ) : (
+            <>
+              <MenuButton
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().addColumnBefore().run(),
+                  )
+                }
+              >
+                Insert column left
+              </MenuButton>
+              <MenuButton
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().addColumnAfter().run(),
+                  )
+                }
+              >
+                Insert column right
+              </MenuButton>
+              <MenuButton
+                danger
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().deleteColumn().run(),
+                  )
+                }
+              >
+                Delete column
+              </MenuButton>
+              <div className="my-1 h-px bg-neutral-200" />
+              <MenuButton
+                danger
+                onClick={() =>
+                  runOnCell(menu.cellPos, () =>
+                    editor.chain().focus().deleteTable().run(),
+                  )
+                }
+              >
+                Delete table
+              </MenuButton>
+            </>
+          )}
+        </div>
+      )}
+    </div>,
+    document.body,
+  );
+}
+
+function RowHandle({
+  editor,
+  zone,
+  menu,
+  setMenu,
+}: {
+  editor: Editor;
+  zone: Extract<HoverZone, { kind: "row" }>;
+  menu: MenuState | null;
+  setMenu: (menu: MenuState | null) => void;
+}) {
+  const tableRect = zone.table.getBoundingClientRect();
+  const rowRect = zone.row.getBoundingClientRect();
+
+  return (
+    <ControlButton
+      label="Row options"
+      style={{
+        top: rowRect.top + rowRect.height / 2,
+        left: tableRect.left,
+        transform: "translate(-50%, -50%)",
+      }}
+      active={menu?.kind === "row"}
+      onClick={() => {
+        const cellPos = posAtCell(editor, zone.cell);
+        setMenu(menu?.kind === "row" ? null : { kind: "row", cellPos });
+      }}
+    >
+      <GripDotsVertical className="size-3.5" />
+    </ControlButton>
+  );
+}
+
+function ColumnHandle({
+  editor,
+  zone,
+  menu,
+  setMenu,
+}: {
+  editor: Editor;
+  zone: Extract<HoverZone, { kind: "col" }>;
+  menu: MenuState | null;
+  setMenu: (menu: MenuState | null) => void;
+}) {
+  const tableRect = zone.table.getBoundingClientRect();
+  const colRect = getColumnRect(zone.table, zone.cell.cellIndex);
+  if (!colRect) return null;
+
+  return (
+    <ControlButton
+      label="Column options"
+      style={{
+        top: tableRect.top,
+        left: colRect.left + colRect.width / 2,
+        transform: "translate(-50%, -50%)",
+      }}
+      active={menu?.kind === "col"}
+      onClick={() => {
+        const cellPos = posAtCell(editor, zone.cell);
+        setMenu(menu?.kind === "col" ? null : { kind: "col", cellPos });
+      }}
+    >
+      <GripDotsVertical className="size-3.5 rotate-90" />
+    </ControlButton>
+  );
+}
+
+function ControlButton({
+  label,
+  style,
+  active,
+  onClick,
+  children,
+}: {
+  label: string;
+  style: CSSProperties;
+  active?: boolean;
+  onClick: () => void;
+  children: ReactNode;
+}) {
+  return (
+    <button
+      type="button"
+      title={label}
+      style={style}
+      data-table-controls=""
+      onMouseDown={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+      }}
+      onClick={onClick}
+      className={cn(
+        "pointer-events-auto absolute flex size-5 items-center justify-center rounded-md border bg-white text-neutral-500 shadow-sm",
+        "hover:bg-neutral-50 hover:text-neutral-800",
+        active
+          ? "border-neutral-300 bg-neutral-50 text-neutral-800"
+          : "border-neutral-200",
+      )}
+    >
+      {children}
+      <span className="sr-only">{label}</span>
+    </button>
+  );
+}
+
+function MenuButton({
+  children,
+  onClick,
+  danger,
+}: {
+  children: ReactNode;
+  onClick: () => void;
+  danger?: boolean;
+}) {
+  return (
+    <button
+      type="button"
+      onMouseDown={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+      }}
+      onClick={onClick}
+      className={cn(
+        "flex h-8 w-full items-center rounded-md px-2 text-left text-xs font-medium",
+        danger
+          ? "text-red-600 hover:bg-red-50"
+          : "text-neutral-700 hover:bg-neutral-50",
+      )}
+    >
+      {children}
+    </button>
+  );
+}
+
+function getHoverZone(
+  x: number,
+  y: number,
+  editorDom: HTMLElement,
+): HoverZone | null {
+  const clip = editorDom.getBoundingClientRect();
+  const tables = editorDom.querySelectorAll("table");
+
+  for (const table of tables) {
+    if (!(table instanceof HTMLTableElement)) continue;
+
+    const rect = table.getBoundingClientRect();
+    const visible = intersectRect(rect, clip);
+    if (!visible) continue;
+
+    const nearVisible =
+      x >= visible.left - EDGE_PX &&
+      x <= visible.right + EDGE_PX &&
+      y >= visible.top - EDGE_PX &&
+      y <= visible.bottom + EDGE_PX;
+
+    if (!nearVisible) continue;
+
+    const distBottom = Math.abs(y - rect.bottom);
+    const distRight = Math.abs(x - rect.right);
+    const distLeft = Math.abs(x - rect.left);
+    const distTop = Math.abs(y - rect.top);
+    const alongX = x >= visible.left && x <= visible.right;
+    const alongY = y >= visible.top && y <= visible.bottom;
+    const bottomVisible = rect.bottom >= clip.top && rect.bottom <= clip.bottom;
+    const rightVisible = rect.right >= clip.left && rect.right <= clip.right;
+    const leftVisible = rect.left >= clip.left && rect.left <= clip.right;
+    const topVisible = rect.top >= clip.top && rect.top <= clip.bottom;
+
+    if (
+      bottomVisible &&
+      alongX &&
+      distBottom <= EDGE_PX &&
+      distBottom <= distRight
+    ) {
+      return { kind: "add-row", table };
+    }
+
+    if (
+      rightVisible &&
+      alongY &&
+      distRight <= EDGE_PX &&
+      distRight <= distBottom
+    ) {
+      return { kind: "add-col", table };
+    }
+
+    if (leftVisible && alongY && distLeft <= EDGE_PX && distLeft < distRight) {
+      const row =
+        [...table.rows].find((candidate) => {
+          const rowRect = candidate.getBoundingClientRect();
+          return y >= rowRect.top && y <= rowRect.bottom;
+        }) ?? null;
+      const cell = row?.cells[0];
+      if (row && cell) return { kind: "row", table, row, cell };
+    }
+
+    if (topVisible && alongX && distTop <= EDGE_PX && distTop < distBottom) {
+      const header = table.rows[0];
+      const cell = header
+        ? [...header.cells].find((candidate) => {
+            const cellRect = candidate.getBoundingClientRect();
+            return x >= cellRect.left && x <= cellRect.right;
+          }) ?? null
+        : null;
+      if (cell) return { kind: "col", table, cell };
+    }
+  }
+
+  return null;
+}
+
+function posAtCell(editor: Editor, cell: HTMLTableCellElement) {
+  return editor.view.posAtDOM(cell, 0);
+}
+
+function intersectRect(a: DOMRect, b: DOMRect) {
+  const left = Math.max(a.left, b.left);
+  const right = Math.min(a.right, b.right);
+  const top = Math.max(a.top, b.top);
+  const bottom = Math.min(a.bottom, b.bottom);
+
+  if (left >= right || top >= bottom) return null;
+
+  return new DOMRect(left, top, right - left, bottom - top);
+}
+
+function getColumnRect(table: HTMLTableElement, columnIndex: number) {
+  const cells = [...table.rows]
+    .map((row) => row.cells[columnIndex])
+    .filter(Boolean);
+
+  if (!cells.length) return null;
+
+  const first = cells[0].getBoundingClientRect();
+  const last = cells[cells.length - 1].getBoundingClientRect();
+
+  return new DOMRect(
+    first.left,
+    first.top,
+    first.width,
+    last.bottom - first.top,
+  );
+}
diff --git a/packages/ui/src/rich-text-area/variables.tsx b/packages/ui/src/rich-text-area/variables.tsx
index ae58daea17f..08483695aef 100644
--- a/packages/ui/src/rich-text-area/variables.tsx
+++ b/packages/ui/src/rich-text-area/variables.tsx
@@ -11,6 +11,12 @@ import {
 import { Button } from "../button";
 import { Input } from "../input";
 
+export type RichTextVariableInfo = {
+  description?: string;
+  example?: string;
+  hideExample?: boolean;
+};
+
 const updatePosition = (editor: Editor, element: HTMLElement) => {
   const virtualElement = {
     getBoundingClientRect: () =>
@@ -33,7 +39,10 @@ const updatePosition = (editor: Editor, element: HTMLElement) => {
   });
 };
 
-export const suggestions = (variables: string[]) => ({
+export const suggestions = (
+  variables: string[],
+  variableInfo?: Record<string, RichTextVariableInfo>,
+) => ({
   items: ({ query }: { query: string }) => {
     const q = query.trim().toLowerCase();
     if (!q) return variables.slice(0, 10);
@@ -60,7 +69,7 @@ export const suggestions = (variables: string[]) => ({
         command?: (props: any) => void;
       }) => {
         component = new ReactRenderer(Menu, {
-          props,
+          props: { ...props, variableInfo },
           editor: props.editor,
         });
 
@@ -74,7 +83,7 @@ export const suggestions = (variables: string[]) => ({
       },
 
       onUpdate(props: any) {
-        component.updateProps(props);
+        component.updateProps({ ...props, variableInfo });
 
         if (!props.clientRect) return;
 
@@ -102,7 +111,7 @@ export const suggestions = (variables: string[]) => ({
 });
 
 const menuItemClassName = cn(
-  "flex cursor-pointer select-none items-center gap-2 whitespace-nowrap rounded-md px-2 py-1 font-mono text-sm text-neutral-950",
+  "flex cursor-pointer select-none items-center gap-2 whitespace-nowrap rounded-md px-2 py-1 text-sm text-neutral-950",
   "data-[selected=true]:bg-neutral-100",
 );
 
@@ -111,9 +120,11 @@ const Menu = forwardRef(
     {
       items,
       command,
+      variableInfo,
     }: {
       items: string[];
       command: (props: any) => void;
+      variableInfo?: Record<string, RichTextVariableInfo>;
     },
     ref,
   ) => {
@@ -241,22 +252,63 @@ const Menu = forwardRef(
       );
     }
 
+    const hasInfo = items.some(
+      (item) =>
+        variableInfo?.[item]?.description || variableInfo?.[item]?.example,
+    );
+
     return (
-      <div className="border-border-subtle flex flex-col rounded-lg border bg-white p-1 shadow-sm">
+      <div
+        className={cn(
+          "border-border-subtle flex flex-col rounded-lg border bg-white p-1 shadow-sm",
+          hasInfo && "w-96",
+        )}
+      >
         {items.length ? (
-          items.map((item, index) => (
-            <button
-              key={index}
-              type="button"
-              onMouseDown={(e) => e.preventDefault()}
-              onClick={() => selectVar(item)}
-              data-selected={selectedIndex === index}
-              onPointerEnter={() => setSelectedIndex(index)}
-              className={menuItemClassName}
-            >
-              {item}
-            </button>
-          ))
+          items.map((item, index) => {
+            const info = variableInfo?.[item];
+            const example = info?.hideExample ? undefined : info?.example;
+
+            return (
+              <button
+                key={index}
+                type="button"
+                onMouseDown={(e) => e.preventDefault()}
+                onClick={() => selectVar(item)}
+                data-selected={selectedIndex === index}
+                onPointerEnter={() => setSelectedIndex(index)}
+                className={cn(
+                  menuItemClassName,
+                  info ? "items-start whitespace-normal py-1" : "font-mono",
+                )}
+              >
+                {info ? (
+                  <div className="flex min-w-0 flex-col text-left">
+                    <span className="font-mono text-sm leading-5">{item}</span>
+                    {info.description || example ? (
+                      <span className="text-xs font-normal leading-4">
+                        {info.description ? (
+                          <span className="text-content-subtle">
+                            {info.description}
+                          </span>
+                        ) : null}
+                        {info.description && example ? (
+                          <span className="text-content-muted"> · </span>
+                        ) : null}
+                        {example ? (
+                          <span className="text-content-default">
+                            {example}
+                          </span>
+                        ) : null}
+                      </span>
+                    ) : null}
+                  </div>
+                ) : (
+                  item
+                )}
+              </button>
+            );
+          })
         ) : (
           <div
             className={cn(menuItemClassName, "text-content-subtle font-sans")}
diff --git a/packages/ui/src/smart-datetime-picker.tsx b/packages/ui/src/smart-datetime-picker.tsx
index f6ef1a7247b..cac5206821c 100644
--- a/packages/ui/src/smart-datetime-picker.tsx
+++ b/packages/ui/src/smart-datetime-picker.tsx
@@ -5,6 +5,7 @@ import {
   parseDateTime,
 } from "@dub/utils";
 import { useEffect, useId, useRef } from "react";
+import { CalendarIcon } from "./icons";
 
 interface SmartDateTimePickerProps {
   value: Date | null | undefined;
@@ -27,6 +28,23 @@ export function SmartDateTimePicker({
 }: SmartDateTimePickerProps) {
   const id = useId();
   const inputRef = useRef<HTMLInputElement>(null);
+  const nativeInputRef = useRef<HTMLInputElement>(null);
+
+  // Opens the browser's own date/time popover for the (visually hidden) native input
+  const openNativePicker = () => {
+    const input = nativeInputRef.current;
+    if (!input) return;
+
+    // Safari only dismisses the picker when its input loses focus, so the input
+    // has to be focused first or the picker can't be closed
+    input.focus();
+
+    try {
+      input.showPicker();
+    } catch {
+      // Browsers without showPicker support: the focused input still takes keyboard entry
+    }
+  };
 
   // Hacky fix to focus the input automatically, not sure why autoFocus doesn't work here
   useEffect(() => {
@@ -80,22 +98,36 @@ export function SmartDateTimePicker({
               }
             }
           }}
-          className="flex-1 border-none bg-transparent text-neutral-900 placeholder-neutral-400 focus:outline-none focus:ring-0 sm:text-sm"
-        />
-        <input
-          type="datetime-local"
-          id={`${id}-datetime-local`}
-          required={required}
-          value={value ? getDateTimeLocal(value) : ""}
-          onChange={(e) => {
-            const date = new Date(e.target.value);
-            onChange(date);
-            if (inputRef.current) {
-              inputRef.current.value = formatDateTime(date);
-            }
-          }}
-          className="w-[40px] border-none bg-transparent text-neutral-500 focus:outline-none focus:ring-0 sm:text-sm"
+          className="min-w-0 flex-1 border-none bg-transparent text-neutral-900 placeholder-neutral-400 focus:outline-none focus:ring-0 sm:text-sm"
         />
+        <div className="relative shrink-0 self-stretch">
+          <button
+            type="button"
+            onClick={openNativePicker}
+            aria-label="Open date picker"
+            className="flex h-full items-center px-3 text-neutral-500 transition-colors hover:text-neutral-700 focus:outline-none"
+          >
+            <CalendarIcon className="size-4 flex-none" aria-hidden />
+          </button>
+          {/* Kept in the layout (but invisible) so the native popover anchors to the icon */}
+          <input
+            ref={nativeInputRef}
+            type="datetime-local"
+            id={`${id}-datetime-local`}
+            required={required}
+            tabIndex={-1}
+            aria-label="Date and time"
+            value={value ? getDateTimeLocal(value) : ""}
+            onChange={(e) => {
+              const date = new Date(e.target.value);
+              onChange(date);
+              if (inputRef.current) {
+                inputRef.current.value = formatDateTime(date);
+              }
+            }}
+            className="pointer-events-none absolute inset-0 size-full opacity-0"
+          />
+        </div>
       </div>
     </div>
   );
diff --git a/packages/ui/src/table/table.tsx b/packages/ui/src/table/table.tsx
index 413f2579feb..ce18d38c90b 100644
--- a/packages/ui/src/table/table.tsx
+++ b/packages/ui/src/table/table.tsx
@@ -580,6 +580,7 @@ export function Table<T>({
                                 header.column.id === "select"
                                   ? "flex size-full items-center justify-center"
                                   : "flex items-center gap-2",
+                                isSortableColumn && "group/sort",
                               )}
                               {...(isSortableColumn && {
                                 type: "button",
@@ -616,13 +617,21 @@ export function Table<T>({
                                       </HeaderWithTooltip>
                                     );
                                   })()}
-                              {isSortableColumn &&
-                                sortBy === header.column.id && (
-                                  <SortOrder
-                                    className="h-3 w-3 shrink-0"
-                                    order={sortOrder || "desc"}
-                                  />
-                                )}
+                              {isSortableColumn && (
+                                <SortOrder
+                                  className={cn(
+                                    "h-3 w-3 shrink-0",
+                                    sortBy === header.column.id
+                                      ? "text-neutral-950"
+                                      : "text-neutral-300 group-hover/sort:text-neutral-400",
+                                  )}
+                                  order={
+                                    sortBy === header.column.id
+                                      ? sortOrder || "desc"
+                                      : null
+                                  }
+                                />
+                              )}
                             </ButtonOrDiv>
                           </div>
                           {enableColumnResizing &&
diff --git a/packages/ui/src/utm-builder.tsx b/packages/ui/src/utm-builder.tsx
index cc1bd86c9be..c014dd6e72d 100644
--- a/packages/ui/src/utm-builder.tsx
+++ b/packages/ui/src/utm-builder.tsx
@@ -1,7 +1,17 @@
 "use client";
 
 import { cn } from "@dub/utils";
-import { ReactNode, useEffect, useId, useRef, useState } from "react";
+import {
+  CSSProperties,
+  KeyboardEvent,
+  ReactNode,
+  Ref,
+  useEffect,
+  useId,
+  useRef,
+  useState,
+} from "react";
+import { createPortal } from "react-dom";
 import { useMediaQuery } from "./hooks/use-media-query";
 import {
   Flag6,
@@ -58,6 +68,265 @@ export const UTM_PARAMETERS = [
   },
 ] as const;
 
+export type UTMSuggestion = {
+  value: string;
+  description?: string;
+};
+
+function getOpenMacroToken(
+  value: string,
+  caret: number,
+): { start: number; query: string } | null {
+  const before = value.slice(0, caret);
+  const openIdx = before.lastIndexOf("{{");
+  if (openIdx === -1) return null;
+
+  const afterOpen = before.slice(openIdx + 2);
+  if (afterOpen.includes("}")) return null;
+
+  return { start: openIdx, query: afterOpen };
+}
+
+function filterSuggestions(
+  suggestions: UTMSuggestion[],
+  query: string,
+): UTMSuggestion[] {
+  const q = query.toLowerCase();
+  if (!q) return suggestions;
+
+  return suggestions.filter((s) => {
+    const value = s.value.toLowerCase();
+    return value.includes(q) || value.slice(2).startsWith(q);
+  });
+}
+
+function UTMInput({
+  id,
+  inputRef,
+  placeholder,
+  disabled,
+  disabledTooltip,
+  value,
+  onChange,
+  suggestions,
+}: {
+  id: string;
+  inputRef?: Ref<HTMLInputElement>;
+  placeholder: string;
+  disabled?: boolean;
+  disabledTooltip?: string | ReactNode;
+  value: string;
+  onChange: (value: string) => void;
+  suggestions?: UTMSuggestion[];
+}) {
+  const localRef = useRef<HTMLInputElement | null>(null);
+  const blurTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  const [menuOpen, setMenuOpen] = useState(false);
+  const [query, setQuery] = useState("");
+  const [highlightedIndex, setHighlightedIndex] = useState(0);
+  const [menuStyle, setMenuStyle] = useState<CSSProperties>({});
+
+  const filtered =
+    suggestions && menuOpen ? filterSuggestions(suggestions, query) : [];
+
+  const setInputRef = (el: HTMLInputElement | null) => {
+    localRef.current = el;
+    if (!inputRef) return;
+    if (typeof inputRef === "function") {
+      inputRef(el);
+    } else {
+      inputRef.current = el;
+    }
+  };
+
+  const updateMenuPosition = () => {
+    const el = localRef.current;
+    if (!el) return;
+    const rect = el.getBoundingClientRect();
+    setMenuStyle({
+      position: "fixed",
+      top: rect.bottom + 4,
+      left: rect.left,
+      width: rect.width,
+      zIndex: 50,
+    });
+  };
+
+  const updateAutocomplete = (nextValue: string, caret: number) => {
+    if (!suggestions?.length) {
+      setMenuOpen(false);
+      return;
+    }
+
+    const token = getOpenMacroToken(nextValue, caret);
+    setQuery(token ? token.query : nextValue);
+    setHighlightedIndex(0);
+    updateMenuPosition();
+    setMenuOpen(true);
+  };
+
+  const insertSuggestion = (suggestion: UTMSuggestion) => {
+    const input = localRef.current;
+    const caret = input?.selectionStart ?? value.length;
+    const token = getOpenMacroToken(value, caret);
+
+    const nextValue = token
+      ? value.slice(0, token.start) + suggestion.value + value.slice(caret)
+      : suggestion.value;
+    const nextCaret = token
+      ? token.start + suggestion.value.length
+      : suggestion.value.length;
+
+    onChange(nextValue);
+    setMenuOpen(false);
+
+    requestAnimationFrame(() => {
+      const el = localRef.current;
+      if (!el) return;
+      el.focus();
+      el.setSelectionRange(nextCaret, nextCaret);
+    });
+  };
+
+  const onKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (!menuOpen || filtered.length === 0) return;
+
+    if (e.key === "ArrowDown") {
+      e.preventDefault();
+      setHighlightedIndex((i) => (i + 1) % filtered.length);
+      return;
+    }
+
+    if (e.key === "ArrowUp") {
+      e.preventDefault();
+      setHighlightedIndex((i) => (i - 1 + filtered.length) % filtered.length);
+      return;
+    }
+
+    if (e.key === "Enter") {
+      e.preventDefault();
+      insertSuggestion(filtered[highlightedIndex]);
+      return;
+    }
+
+    if (e.key === "Escape") {
+      e.preventDefault();
+      setMenuOpen(false);
+    }
+  };
+
+  useEffect(() => {
+    return () => {
+      if (blurTimeoutRef.current) clearTimeout(blurTimeoutRef.current);
+    };
+  }, []);
+
+  useEffect(() => {
+    setHighlightedIndex(0);
+  }, [query]);
+
+  useEffect(() => {
+    if (!menuOpen) return;
+
+    const onScrollOrResize = () => updateMenuPosition();
+    window.addEventListener("resize", onScrollOrResize);
+    window.addEventListener("scroll", onScrollOrResize, true);
+    return () => {
+      window.removeEventListener("resize", onScrollOrResize);
+      window.removeEventListener("scroll", onScrollOrResize, true);
+    };
+  }, [menuOpen]);
+
+  return (
+    <div className="relative min-w-0 grow">
+      <DynamicTooltipWrapper
+        tooltipProps={
+          disabledTooltip
+            ? {
+                content: disabledTooltip,
+                disableHoverableContent: true,
+              }
+            : undefined
+        }
+      >
+        <input
+          type="text"
+          id={id}
+          ref={setInputRef}
+          placeholder={placeholder}
+          disabled={disabled || Boolean(disabledTooltip)}
+          className="size-full rounded-r-md border border-neutral-300 placeholder-neutral-400 focus:border-neutral-500 focus:ring-neutral-500 disabled:cursor-not-allowed sm:text-sm"
+          value={value}
+          onChange={(e) => {
+            const nextValue = e.target.value;
+            onChange(nextValue);
+            updateAutocomplete(
+              nextValue,
+              e.target.selectionStart ?? nextValue.length,
+            );
+          }}
+          onSelect={(e) => {
+            const target = e.currentTarget;
+            updateAutocomplete(
+              target.value,
+              target.selectionStart ?? target.value.length,
+            );
+          }}
+          onKeyDown={onKeyDown}
+          onBlur={() => {
+            blurTimeoutRef.current = setTimeout(() => setMenuOpen(false), 150);
+          }}
+          onFocus={(e) => {
+            if (blurTimeoutRef.current) {
+              clearTimeout(blurTimeoutRef.current);
+              blurTimeoutRef.current = null;
+            }
+            updateAutocomplete(
+              e.currentTarget.value,
+              e.currentTarget.selectionStart ?? e.currentTarget.value.length,
+            );
+          }}
+        />
+      </DynamicTooltipWrapper>
+
+      {menuOpen &&
+        filtered.length > 0 &&
+        createPortal(
+          <div
+            style={menuStyle}
+            className="border-border-subtle flex flex-col rounded-lg border bg-white p-1 shadow-sm"
+          >
+            {filtered.map((suggestion, index) => (
+              <button
+                key={suggestion.value}
+                type="button"
+                onMouseDown={(e) => e.preventDefault()}
+                onClick={() => insertSuggestion(suggestion)}
+                onPointerEnter={() => setHighlightedIndex(index)}
+                data-selected={highlightedIndex === index}
+                className={cn(
+                  "flex cursor-pointer select-none flex-col items-start gap-0.5 rounded-md px-2 py-1.5 text-left",
+                  "data-[selected=true]:bg-neutral-100",
+                )}
+              >
+                <span className="font-mono text-sm text-neutral-950">
+                  {suggestion.value}
+                </span>
+                {suggestion.description && (
+                  <span className="text-content-subtle text-xs">
+                    {suggestion.description}
+                  </span>
+                )}
+              </button>
+            ))}
+          </div>,
+          document.body,
+        )}
+    </div>
+  );
+}
+
 export function UTMBuilder({
   values,
   onChange,
@@ -65,6 +334,7 @@ export function UTMBuilder({
   autoFocus,
   disabledTooltip,
   className,
+  suggestions,
 }: {
   values: Record<
     (typeof UTM_PARAMETERS)[number]["key"],
@@ -78,6 +348,7 @@ export function UTMBuilder({
   autoFocus?: boolean;
   disabledTooltip?: string | ReactNode;
   className?: string;
+  suggestions?: UTMSuggestion[];
 }) {
   const { isMobile } = useMediaQuery();
 
@@ -129,29 +400,16 @@ export function UTMBuilder({
                     </label>
                   </div>
                 </Tooltip>
-                <div className="min-w-0 grow">
-                  <DynamicTooltipWrapper
-                    tooltipProps={
-                      disabledTooltip
-                        ? {
-                            content: disabledTooltip,
-                            disableHoverableContent: true,
-                          }
-                        : undefined
-                    }
-                  >
-                    <input
-                      type="text"
-                      id={`${id}-${key}`}
-                      ref={idx === 0 ? inputRef : undefined}
-                      placeholder={placeholder}
-                      disabled={disabled || Boolean(disabledTooltip)}
-                      className="size-full rounded-r-md border border-neutral-300 placeholder-neutral-400 focus:border-neutral-500 focus:ring-neutral-500 disabled:cursor-not-allowed sm:text-sm"
-                      value={values[key] || ""}
-                      onChange={(e) => onChange(key, e.target.value)}
-                    />
-                  </DynamicTooltipWrapper>
-                </div>
+                <UTMInput
+                  id={`${id}-${key}`}
+                  inputRef={idx === 0 ? inputRef : undefined}
+                  placeholder={placeholder}
+                  disabled={disabled}
+                  disabledTooltip={disabledTooltip}
+                  value={values[key] || ""}
+                  onChange={(value) => onChange(key, value)}
+                  suggestions={suggestions}
+                />
               </div>
             </div>
           );
diff --git a/packages/utils/package.json b/packages/utils/package.json
index e9801b9ee50..2ce7474fe01 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dub/utils",
   "description": "Utility functions and constants for Dub",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "sideEffects": false,
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
diff --git a/packages/utils/src/constants/dub-domains.ts b/packages/utils/src/constants/dub-domains.ts
index f53afec7333..0894e1dc078 100644
--- a/packages/utils/src/constants/dub-domains.ts
+++ b/packages/utils/src/constants/dub-domains.ts
@@ -19,7 +19,7 @@ export const DUB_DOMAINS = [
     primary: false,
     archived: false,
     placeholder: "https://chat.openai.com/g/g-UGjKKONEe-domainsgpt",
-    allowedHostnames: ["openai.com", "chatgpt.com"],
+    allowedHostnames: ["openai.com", "chatgpt.com", "chatgpt.site"],
     description: "Branded domain for ChatGPT links (convos, custom GPTs).",
     projectId: DUB_WORKSPACE_ID,
   },
diff --git a/packages/utils/src/constants/main.ts b/packages/utils/src/constants/main.ts
index ee0182d6bd9..2b640c82483 100644
--- a/packages/utils/src/constants/main.ts
+++ b/packages/utils/src/constants/main.ts
@@ -1,30 +1,5 @@
 export const SHORT_DOMAIN = "dub.sh";
 
-export const APP_HOSTNAMES = new Set([
-  "app.dub.co",
-  "preview.dub.co",
-  ...(process.env.NEXT_PUBLIC_APP_HOSTNAMES?.split(",").map((h) => h.trim()) ??
-    []),
-  "localhost:8888",
-  "localhost",
-]);
-
-export const APP_DOMAIN =
-  process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
-    ? "https://app.dub.co"
-    : process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
-      ? "https://preview.dub.co"
-      : "http://localhost:8888";
-
-export const APP_DOMAIN_WITH_NGROK =
-  process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
-    ? "https://app.dub.co"
-    : process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
-      ? process.env.VERCEL_URL
-        ? `https://${process.env.VERCEL_URL}`
-        : "https://preview.dub.co"
-      : process.env.NEXT_PUBLIC_NGROK_URL || "http://localhost:8888";
-
 export const API_HOSTNAMES = new Set([
   "api.dub.co",
   "api-staging.dub.co",
@@ -67,6 +42,28 @@ export const PARTNERS_DOMAIN_WITH_NGROK =
       ? "https://partners-staging.dub.co"
       : process.env.NEXT_PUBLIC_NGROK_URL || "http://partners.localhost:8888";
 
+export const APP_DOMAIN =
+  process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
+    ? "https://app.dub.co"
+    : process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
+      ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL || "preview.dub.co"}`
+      : "http://localhost:8888";
+
+export const APP_DOMAIN_WITH_NGROK =
+  process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
+    ? "https://app.dub.co"
+    : process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
+      ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL || "preview.dub.co"}`
+      : process.env.NEXT_PUBLIC_NGROK_URL || "http://localhost:8888";
+
+export const isAppHostname = (hostname: string) => {
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === "preview") {
+    // pattern of our preview URLs are always "dub-<random-string>.dub.co"
+    return hostname.startsWith("dub-") && hostname.endsWith(".dub.co");
+  }
+  return new Set(["app.dub.co", "localhost:8888", "localhost"]).has(hostname);
+};
+
 export const DUB_LOGO = "https://assets.dub.co/logo.png";
 export const DUB_LOGO_SQUARE = "https://assets.dub.co/logo-square.png";
 export const DUB_QR_LOGO = "https://assets.dub.co/logo.png";
@@ -76,6 +73,8 @@ export const DUB_THUMBNAIL = "https://assets.dub.co/thumbnail.jpg";
 export const DUB_WORKSPACE_ID = "cl7pj5kq4006835rbjlt2ofka";
 export const ACME_WORKSPACE_ID = "clrei1gld0002vs9mzn93p8ik";
 export const ACME_PROGRAM_ID = "prog_CYCu7IMAapjkRpTnr8F1azjN";
+export const DEMO_WORKSPACE_ID = "ws_1M0ZVT8Y8C8J2GXFC125KGYCQ";
+export const DEMO_PROGRAM_ID = "prog_1M14W60JQ1ZQY65X6694D45W0";
 export const LEGAL_WORKSPACE_ID = "clrflia0j0000vs7sqfhz9c7q";
 export const LEGAL_USER_ID = "clqei1lgc0000vsnzi01pbf47";
 
diff --git a/packages/utils/src/constants/pricing/pricing-plan-main-features.ts b/packages/utils/src/constants/pricing/pricing-plan-main-features.ts
index 290df6a3703..e9a03e8796b 100644
--- a/packages/utils/src/constants/pricing/pricing-plan-main-features.ts
+++ b/packages/utils/src/constants/pricing/pricing-plan-main-features.ts
@@ -415,20 +415,20 @@ export const getPricingPlanMainFeatures = (
           },
           {
             id: "partnergroups",
-            text: "Access to Partner Network",
+            text: "Partner Network access",
             tooltip: {
               title:
                 "Get access to our network of 7,000+ top affiliates to recruit from and grow your program.",
             },
           },
           {
-            id: "partners",
-            text: "Featured in Program Marketplace",
+            id: "marketplace",
+            text: "Program Marketplace listing",
             tooltip: {
               title:
                 "Get featured in front of our network of 250,000+ total affiliates and receive 10x more applications.",
               cta: "Learn more ↗",
-              href: "https://dub.co/help/article/program-marketplace",
+              href: "https://dub.co/marketplace",
             },
           },
           {
diff --git a/packages/utils/src/functions/domains.ts b/packages/utils/src/functions/domains.ts
index fb6fc9cb484..cbcc8c11d3a 100644
--- a/packages/utils/src/functions/domains.ts
+++ b/packages/utils/src/functions/domains.ts
@@ -85,3 +85,15 @@ export const getDomainWithoutWWW = (url: string) => {
 export const isDubDomain = (domain: string) => {
   return DUB_DOMAINS.some((d) => d.slug === domain);
 };
+
+export const isGoogleClickTrackerDomain = (domain: string) => {
+  // accepts both the full domain and the subdomain
+  return [
+    "dub.sh",
+    "dub.link",
+    "imx.gg",
+    "wlst.gg",
+    "wshlst.gg",
+    "lnch.gg",
+  ].some((d) => d === domain || domain.endsWith(`.${d}`));
+};
diff --git a/packages/utils/src/functions/fetch-with-retry.ts b/packages/utils/src/functions/fetch-with-retry.ts
index f5716d59b2d..4687de70b8d 100644
--- a/packages/utils/src/functions/fetch-with-retry.ts
+++ b/packages/utils/src/functions/fetch-with-retry.ts
@@ -1,3 +1,4 @@
+import { sleep } from "./sleep";
 export async function fetchWithRetry(
   input: RequestInfo | URL,
   init?: RequestInit | undefined,
@@ -32,7 +33,7 @@ export async function fetchWithRetry(
       // Handle rate limiting and server errors
       if (response.status === 429 || response.status >= 500) {
         const delay = retryDelay + Math.pow(i, 2) * 50;
-        await new Promise((resolve) => setTimeout(resolve, delay));
+        await sleep(delay);
         continue;
       }
 
@@ -66,7 +67,7 @@ export async function fetchWithRetry(
 
       // For network errors or timeouts, wait and retry
       const delay = retryDelay + Math.pow(i, 2) * 50;
-      await new Promise((resolve) => setTimeout(resolve, delay));
+      await sleep(delay);
     }
   }
 
diff --git a/packages/utils/src/functions/index.ts b/packages/utils/src/functions/index.ts
index a6661f6853f..24f815dc7dd 100644
--- a/packages/utils/src/functions/index.ts
+++ b/packages/utils/src/functions/index.ts
@@ -36,11 +36,14 @@ export * from "./punycode";
 export * from "./random-value";
 export * from "./regex-escape";
 export * from "./resize-image";
+export * from "./sleep";
 export * from "./smart-truncate";
 export * from "./stable-sort";
 export * from "./text-fetcher";
 export * from "./time-ago";
 export * from "./to-cents-number";
+export * from "./to-error-message";
 export * from "./trim";
 export * from "./truncate";
+export * from "./unique";
 export * from "./urls";
diff --git a/packages/utils/src/functions/promises.ts b/packages/utils/src/functions/promises.ts
index adf3842c648..91799818ef0 100644
--- a/packages/utils/src/functions/promises.ts
+++ b/packages/utils/src/functions/promises.ts
@@ -6,6 +6,10 @@ export const isRejected = <T>(
   p: PromiseSettledResult<T>,
 ): p is PromiseRejectedResult => p.status === "rejected";
 
+export function serializeError(error: unknown) {
+  return error instanceof Error ? error.message : String(error);
+}
+
 export function logPromiseResults<T>(
   results: PromiseSettledResult<T>[],
   options?: {
@@ -26,11 +30,7 @@ export function logPromiseResults<T>(
       console.log(`${label}${id} succeeded.`);
     } else {
       failureCount++;
-      const reason =
-        result.reason instanceof Error
-          ? result.reason.message
-          : String(result.reason);
-      console.error(`${label}${id} failed: ${reason}`);
+      console.error(`${label}${id} failed: ${serializeError(result.reason)}`);
     }
   }
 
diff --git a/packages/utils/src/functions/sleep.ts b/packages/utils/src/functions/sleep.ts
new file mode 100644
index 00000000000..7ce4b4098e4
--- /dev/null
+++ b/packages/utils/src/functions/sleep.ts
@@ -0,0 +1,2 @@
+export const sleep = (ms: number) =>
+  new Promise<void>((resolve) => setTimeout(resolve, ms));
diff --git a/packages/utils/src/functions/smart-truncate.ts b/packages/utils/src/functions/smart-truncate.ts
index e5815c2a000..4b1b27add68 100644
--- a/packages/utils/src/functions/smart-truncate.ts
+++ b/packages/utils/src/functions/smart-truncate.ts
@@ -1,40 +1,51 @@
-/* 
+/*
     smart truncation algorithm that dynamically adjusts based on the length of the domain and the path
     it gives priority to the path and truncates the domain if it's too long
     at minimum the domain should still show 8 characters though
+    strips http(s):// so stored shortLinks parse as domain/key
 */
 
 import { truncate } from "./truncate";
 
-// Function to truncate domain while preserving TLD
+// Truncate domain while preserving TLD. maxLength is the total output budget.
 const truncateDomain = (domain: string, maxLength: number): string => {
+  if (domain.length <= maxLength) {
+    return domain;
+  }
+
   const parts = domain.split(".");
   const tld = parts.pop() || "";
   const rest = parts.join(".");
+  const restBudget = maxLength - 3 - tld.length;
 
-  return `${rest.slice(0, maxLength)}...${tld}`;
+  if (!rest || restBudget <= 0) {
+    return truncate(domain, maxLength) ?? domain;
+  }
+
+  return `${rest.slice(0, restBudget)}...${tld}`;
 };
 
 export const smartTruncate = (link: string, maxLength: number): string => {
-  if (link.length <= maxLength) {
-    return link;
-  }
+  const pretty = link.replace(/^https?:\/\//, "");
 
-  const [domain, ...pathParts] = link.split("/");
-  const path = pathParts.join("/");
-  const minDomainLength = 8;
+  if (pretty.length <= maxLength) return pretty;
 
-  // calculate max path length
-  const maxPathLength = maxLength - minDomainLength;
+  const [domain, ...pathParts] = pretty.split("/");
+  const path = pathParts.join("/");
 
-  // Truncate path
-  const truncatedPath = truncate(path, maxPathLength)!;
+  // Root domain links have no path — never append "/"
+  if (!path) return truncateDomain(domain, maxLength);
 
-  // Truncate domain if necessary, preserving TLD
-  const truncatedDomain = truncateDomain(
-    domain,
-    maxLength - truncatedPath.length,
-  );
+  const minDomainLength = 8;
+  const maxPathLength = Math.max(maxLength - minDomainLength - 1, 0);
+  const truncatedPath =
+    maxPathLength > 0 ? truncate(path, maxPathLength) ?? "" : "";
+
+  const domainBudget = Math.max(maxLength - truncatedPath.length - 1, 0);
+  const truncatedDomain =
+    domain.length <= domainBudget
+      ? domain
+      : truncateDomain(domain, domainBudget);
 
   return `${truncatedDomain}/${truncatedPath}`;
 };
diff --git a/packages/utils/src/functions/to-error-message.ts b/packages/utils/src/functions/to-error-message.ts
new file mode 100644
index 00000000000..53326b6174a
--- /dev/null
+++ b/packages/utils/src/functions/to-error-message.ts
@@ -0,0 +1,22 @@
+export function toErrorMessage(
+  error: unknown,
+  fallback = "Something went wrong.",
+): string {
+  if (error instanceof Error) {
+    return error.message || fallback;
+  }
+
+  if (typeof error === "string" && error) {
+    return error;
+  }
+
+  if (typeof error === "object" && error !== null && "message" in error) {
+    const { message } = error;
+
+    if (typeof message === "string" && message) {
+      return message;
+    }
+  }
+
+  return fallback;
+}
diff --git a/packages/utils/src/functions/unique.ts b/packages/utils/src/functions/unique.ts
new file mode 100644
index 00000000000..05c00ac7373
--- /dev/null
+++ b/packages/utils/src/functions/unique.ts
@@ -0,0 +1,3 @@
+export const unique = <T>(values: T[] | null | undefined): T[] => {
+  return Array.from(new Set(values ?? []));
+};
diff --git a/packages/workers/r2-object-created/README.md b/packages/workers/r2-object-created/README.md
new file mode 100644
index 00000000000..3bf816925b3
--- /dev/null
+++ b/packages/workers/r2-object-created/README.md
@@ -0,0 +1,26 @@
+# r2-object-created Worker (thin forwarder)
+
+Cloudflare Queue **push** consumer that forwards each R2 `object-create` notification to Next.js. Magic-byte validation, delete-on-mismatch, and Axiom logging run in the app.
+
+## Quick Edit
+
+1. Paste [`worker.js`](./worker.js) into Workers Quick Edit → Deploy.
+2. Settings → Bindings / Variables / Secrets (below).
+3. Confirm public R2 bucket **Event notification** `object-create` → matching queue.
+
+## Bindings
+
+| Type              | Name                               | Value                                                     |
+| ----------------- | ---------------------------------- | --------------------------------------------------------- |
+| Queues (consumer) | —                                  | `r2-object-created` or `-dev`                             |
+| Variable          | `DUB_WEBHOOK_URL`                  | `https://<host>/api/cloudflare/webhook/r2-object-created` |
+| Secret            | `CLOUDFLARE_WORKER_WEBHOOK_SECRET` | Same as Next.js `CLOUDFLARE_WORKER_WEBHOOK_SECRET`        |
+
+No R2 or Axiom bindings on the Worker — Next.js uses `STORAGE_*` and Axiom already.
+
+## Flow
+
+```text
+R2 object-create → Queue → Worker → POST /api/cloudflare/webhook/r2-object-created
+  → magic-byte check → delete public object on mismatch → Axiom
+```
diff --git a/packages/workers/r2-object-created/worker.js b/packages/workers/r2-object-created/worker.js
new file mode 100644
index 00000000000..003bf8ce007
--- /dev/null
+++ b/packages/workers/r2-object-created/worker.js
@@ -0,0 +1,72 @@
+/**
+ *
+ * Thin Cloudflare Worker: queue push → forward each R2 notification to Next.js.
+ * Magic-byte validation + delete-on-mismatch live in Next.js, not here.
+ *
+ * - Variable DUB_WEBHOOK_URL  e.g. https://app.dub.co/api/cloudflare/webhook/r2-object-created
+ * - Secret CLOUDFLARE_WORKER_WEBHOOK_SECRET  (same value as Next.js env)
+ */
+
+function parseBody(body) {
+  if (typeof body === "string") {
+    return JSON.parse(body);
+  }
+
+  if (body && typeof body === "object") {
+    return body;
+  }
+
+  throw new Error("Unexpected queue message body type");
+}
+
+async function forwardToNextjs(env, notification) {
+  const url = env.DUB_WEBHOOK_URL;
+  const secret = env.CLOUDFLARE_WORKER_WEBHOOK_SECRET;
+
+  if (!url || !secret) {
+    throw new Error(
+      "DUB_WEBHOOK_URL and CLOUDFLARE_WORKER_WEBHOOK_SECRET must be set",
+    );
+  }
+
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${secret}`,
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ notification }),
+  });
+
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(
+      `Next.js webhook failed (${response.status}): ${text.slice(0, 500)}`,
+    );
+  }
+
+  return response.json().catch(() => ({}));
+}
+
+export default {
+  async fetch() {
+    return new Response("r2-object-created forwarder ok");
+  },
+
+  async queue(batch, env) {
+    for (const message of batch.messages) {
+      try {
+        const notification = parseBody(message.body);
+        const result = await forwardToNextjs(env, notification);
+        console.info("forwarded r2 notification", {
+          key: notification?.object?.key,
+          result,
+        });
+        message.ack();
+      } catch (error) {
+        console.error("forward failed", error);
+        message.retry();
+      }
+    }
+  },
+};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1925b54eefb..6eb36ee3bfc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,11 +39,11 @@ importers:
         specifier: ^3.0.1
         version: 3.0.1(zod@4.3.5)
       '@ai-sdk/react':
-        specifier: ^3.0.3
-        version: 3.0.3(react@19.1.3)(zod@4.3.5)
+        specifier: ^4.0.110
+        version: 4.0.110(react@19.1.3)(zod@4.3.5)
       '@ai-sdk/rsc':
-        specifier: ^2.0.3
-        version: 2.0.3(react@19.1.3)(zod@4.3.5)
+        specifier: ^3.0.107
+        version: 3.0.107(react@19.1.3)(zod@4.3.5)
       '@axiomhq/js':
         specifier: ^1.3.1
         version: 1.3.1
@@ -140,6 +140,9 @@ importers:
       '@tiptap/static-renderer':
         specifier: ^3.15.3
         version: 3.15.3(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3)(react-dom@19.1.3(react@19.1.3))(react@19.1.3)
+      '@turbopuffer/turbopuffer':
+        specifier: ^2.8.0
+        version: 2.8.0
       '@types/base-x':
         specifier: ^3.0.10
         version: 3.0.10
@@ -154,10 +157,10 @@ importers:
         version: 2.11.0
       '@upstash/ratelimit':
         specifier: ^2.0.6
-        version: 2.0.6(@upstash/redis@1.35.3)
+        version: 2.0.6(@upstash/redis@1.38.2)
       '@upstash/redis':
         specifier: ^1.35.3
-        version: 1.35.3
+        version: 1.38.2
       '@upstash/vector':
         specifier: ^1.2.2
         version: 1.2.2
@@ -204,8 +207,8 @@ importers:
         specifier: ^3.3.0
         version: 3.3.0(react@19.1.3)
       ai:
-        specifier: ^6.0.3
-        version: 6.0.3(zod@4.3.5)
+        specifier: ^7.0.107
+        version: 7.0.107(zod@4.3.5)
       aws4fetch:
         specifier: ^1.0.19
         version: 1.0.19
@@ -251,6 +254,9 @@ importers:
       geist:
         specifier: ^1.3.1
         version: 1.3.1(next@15.5.8(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.1.3(react@19.1.3))(react@19.1.3))
+      gemoji:
+        specifier: 8.1.0
+        version: 8.1.0
       he:
         specifier: ^1.2.0
         version: 1.2.0
@@ -672,7 +678,7 @@ importers:
     dependencies:
       '@hubspot/cli':
         specifier: ^7.6.2
-        version: 7.6.2(@babel/core@7.24.5)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.11.9)(terser@5.27.0))
+        version: 7.6.2(@babel/core@7.28.4)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.11.9)(terser@5.27.0))
     devDependencies:
       '@types/node':
         specifier: 18.11.9
@@ -804,6 +810,9 @@ importers:
       '@tiptap/extension-mention':
         specifier: ^3.15.3
         version: 3.15.3(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3)(@tiptap/suggestion@3.0.9(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3))
+      '@tiptap/extension-table':
+        specifier: ^3.15.3
+        version: 3.15.3(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3)
       '@tiptap/extensions':
         specifier: ^3.15.3
         version: 3.15.3(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3)
@@ -1023,9 +1032,15 @@ packages:
     peerDependencies:
       zod: ^3.25.76 || ^4.1.8
 
-  '@ai-sdk/gateway@3.0.2':
-    resolution: {integrity: sha512-giJEg9ob45htbu3iautK+2kvplY2JnTj7ir4wZzYSQWvqGatWfBBfDuNCU5wSJt9BCGjymM5ZS9ziD42JGCZBw==}
-    engines: {node: '>=18'}
+  '@ai-sdk/gateway@4.0.87':
+    resolution: {integrity: sha512-6wJmX/D5OO7tvDJbtFdXdBuRt8AkCnW+FLK+W35UHe/tHgolAa4hclXtJcMSYnlTDy/t5DNRgdesVaoMXtwzow==}
+    engines: {node: '>=22'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/mcp@2.0.54':
+    resolution: {integrity: sha512-Q9o7KCyPNRrC7VhBtbnZh2OiApNbFhsNupjDQLW6P/y3xV6l9HES2KWeu0905T9IH6HurN6ckJwRXE0PnLL7Mg==}
+    engines: {node: '>=22'}
     peerDependencies:
       zod: ^3.25.76 || ^4.1.8
 
@@ -1035,19 +1050,29 @@ packages:
     peerDependencies:
       zod: ^3.25.76 || ^4.1.8
 
+  '@ai-sdk/provider-utils@5.0.45':
+    resolution: {integrity: sha512-gLuaCups8OCIRz3eO6WWz5op7VLYNNtFzyH0sWUr0FE9v7cTxR0qxDpQdrKnGcql+9WWttobjnZsJVsuEbsPQQ==}
+    engines: {node: '>=22'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
   '@ai-sdk/provider@3.0.0':
     resolution: {integrity: sha512-m9ka3ptkPQbaHHZHqDXDF9C9B5/Mav0KTdky1k2HZ3/nrW2t1AgObxIVPyGDWQNS9FXT/FS6PIoSjpcP/No8rQ==}
     engines: {node: '>=18'}
 
-  '@ai-sdk/react@3.0.3':
-    resolution: {integrity: sha512-mLIgQuBdIX9gxCYQN3Pv/J8ARoFreIKYr/TVQtI+FwEzejuGFimTyhDln7UIBfrnm3Mpn1xENIWZfDfCRF7wkw==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider@4.0.17':
+    resolution: {integrity: sha512-VYMBxIQdcHqbIf1j+YZlI9Ati6LZ4wJe0GGd4z4a5H/KxTggjeOiyaVYTnfF7LHZK5jMQ+rofmzz4QPqf++NUw==}
+    engines: {node: '>=22'}
+
+  '@ai-sdk/react@4.0.110':
+    resolution: {integrity: sha512-5WSYzAwdnECdDekICJjj2e83793YYNAcTk8yAEvt/sxme1NXTE3OWr3QLSJPjkyOaa6XAmJ6iE/R9l+2YvcI3Q==}
+    engines: {node: '>=22'}
     peerDependencies:
       react: ^18 || ~19.0.1 || ~19.1.2 || ^19.2.1
 
-  '@ai-sdk/rsc@2.0.3':
-    resolution: {integrity: sha512-1+kZs8+Xkdv/0IuOB98lskb9nEwVufvk+sgMQKFXMgFTMm8gvItFQxiiqfPfcFBHTRgXHOVtb/4KOqdTfLqMnQ==}
-    engines: {node: '>=18'}
+  '@ai-sdk/rsc@3.0.107':
+    resolution: {integrity: sha512-x8JgLYzKXM0Ql2nSV4rW+4fbCSROlQm8ut+VU1noP4ILv6j27dz8JlWmwKYyhofDyno8kxwKmgHNijeP9Crapg==}
+    engines: {node: '>=22'}
     peerDependencies:
       react: ^18 || ~19.0.1 || ~19.1.2 || ^19.2.1
       zod: ^3.25.76 || ^4.1.8
@@ -4289,99 +4314,116 @@ packages:
   '@react-email/body@0.2.1':
     resolution: {integrity: sha512-ljDiQiJDu/Fq//vSIIP0z5Nuvt4+DX1RqGasstChDGJB/14ogd4VdNS9aacoede/ZjGy3o3Qb+cxyS+XgM6SwQ==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/button@0.2.1':
     resolution: {integrity: sha512-qXyj7RZLE7POy9BMKSoqQ00tOXThjOZSUnI2Yu9i29IHngPlmrNayIWBoVKtElES7OWwypUcpiajwi1mUWx6/A==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/code-block@0.2.1':
     resolution: {integrity: sha512-M3B7JpVH4ytgn83/ujRR1k1DQHvTeABiDM61OvAbjLRPhC/5KLHU5KkzIbbuGIrjWwxAbL1kSQzU8MhLEtSxyw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/code-inline@0.0.6':
     resolution: {integrity: sha512-jfhebvv3dVsp3OdPgKXnk8+e2pBiDVZejDOBFzBa/IblrAJ9cQDkN6rBD5IyEg8hTOxwbw3iaI/yZFmDmIguIA==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/column@0.0.14':
     resolution: {integrity: sha512-f+W+Bk2AjNO77zynE33rHuQhyqVICx4RYtGX9NKsGUg0wWjdGP0qAuIkhx9Rnmk4/hFMo1fUrtYNqca9fwJdHg==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/components@1.0.8':
     resolution: {integrity: sha512-zY81ED6o5MWMzBkr9uZFuT24lWarT+xIbOZxI6C9dsFmCWBczM8IE1BgOI8rhpUK4JcYVDy1uKxYAFqsx2Bc4w==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/container@0.0.16':
     resolution: {integrity: sha512-QWBB56RkkU0AJ9h+qy33gfT5iuZknPC7Un/IjZv9B0QmMIK+WWacc0cH6y2SV5Cv/b99hU94fjEMOOO4enpkbQ==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/font@0.0.10':
     resolution: {integrity: sha512-0urVSgCmQIfx5r7Xc586miBnQUVnGp3OTYUm8m5pwtQRdTRO5XrTtEfNJ3JhYhSOruV0nD8fd+dXtKXobum6tA==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/head@0.0.13':
     resolution: {integrity: sha512-AJg6le/08Gz4tm+6MtKXqtNNyKHzmooOCdmtqmWxD7FxoAdU1eVcizhtQ0gcnVaY6ethEyE/hnEzQxt1zu5Kog==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/heading@0.0.16':
     resolution: {integrity: sha512-jmsKnQm1ykpBzw4hCYHwBkt5pW2jScXffPeEH5ZRF5tZeF5b1pvlFTO9han7C0pCkZYo1kEvWiRtx69yfCIwuw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/hr@0.0.12':
     resolution: {integrity: sha512-TwmOmBDibavUQpXBxpmZYi2Iks/yeZOzFYh+di9EltMSnEabH8dMZXrl+pxNXzCgZ2XE8HY7VmUL65Lenfu5PA==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/html@0.0.12':
     resolution: {integrity: sha512-KTShZesan+UsreU7PDUV90afrZwU5TLwYlALuCSU0OT+/U8lULNNbAUekg+tGwCnOfIKYtpDPKkAMRdYlqUznw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/img@0.0.12':
     resolution: {integrity: sha512-sRCpEARNVTf3FQhZOC+JTvu5r6ubiYWkT0ucYXg8ctkyi4G8QG+jgYPiNUqVeTLA2STOfmPM/nrk1nb84y6CPQ==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/link@0.0.13':
     resolution: {integrity: sha512-lkWc/NjOcefRZMkQoSDDbuKBEBDES9aXnFEOuPH845wD3TxPwh+QTf0fStuzjoRLUZWpHnio4z7qGGRYusn/sw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/markdown@0.0.18':
     resolution: {integrity: sha512-gSuYK5fsMbGk87jDebqQ6fa2fKcWlkf2Dkva8kMONqLgGCq8/0d+ZQYMEJsdidIeBo3kmsnHZPrwdFB4HgjUXg==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/preview-server@5.2.8':
     resolution: {integrity: sha512-drQ0C7vi7P0uE7Ox1Cyiujsx0oqp2RbIscOdSBR5qvzw3EKjlGbW2pWjQ000cjxTq3Si7lqlRKhOIF8MzOnqHw==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   '@react-email/preview@0.0.14':
     resolution: {integrity: sha512-aYK8q0IPkBXyMsbpMXgxazwHxYJxTrXrV95GFuu2HbEiIToMwSyUgb8HDFYwPqqfV03/jbwqlsXmFxsOd+VNaw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
@@ -4395,18 +4437,21 @@ packages:
   '@react-email/row@0.0.13':
     resolution: {integrity: sha512-bYnOac40vIKCId7IkwuLAAsa3fKfSfqCvv6epJKmPE0JBuu5qI4FHFCl9o9dVpIIS08s/ub+Y/txoMt0dYziGw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/section@0.0.17':
     resolution: {integrity: sha512-qNl65ye3W0Rd5udhdORzTV9ezjb+GFqQQSae03NDzXtmJq6sqVXNWNiVolAjvJNypim+zGXmv6J9TcV5aNtE/w==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
   '@react-email/tailwind@2.0.5':
     resolution: {integrity: sha512-7Ey+kiWliJdxPMCLYsdDts8ffp4idlP//w4Ui3q/A5kokVaLSNKG8DOg/8qAuzWmRiGwNQVOKBk7PXNlK5W+sg==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       '@react-email/body': 0.2.1
       '@react-email/button': 0.2.1
@@ -4445,6 +4490,7 @@ packages:
   '@react-email/text@0.1.6':
     resolution: {integrity: sha512-TYqkioRS45wTR5il3dYk/SbUjjEdhSwh9BtRNB99qNH1pXAwA45H7rAuxehiu8iJQJH0IyIr+6n62gBz9ezmsw==}
     engines: {node: '>=20.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
     peerDependencies:
       react: ^18.0 || ^19.0 || ^19.0.0-rc
 
@@ -5400,6 +5446,7 @@ packages:
 
   '@team-plain/typescript-sdk@5.9.0':
     resolution: {integrity: sha512-AHSXyt1kDt74m9YKZBCRCd6cQjB8QjUNr9cehtR2QHzZ/8yXJPzawPJDqOQ3ms5KvwuYrBx2qT3e6C/zrQ5UtA==}
+    deprecated: This package is now deprecated. Please use @team-plain/graphql, @team-plain/webhooks and @team-plain/ui-components (https://github.com/team-plain/sdk)
 
   '@tediousjs/connection-string@0.5.0':
     resolution: {integrity: sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==}
@@ -5554,6 +5601,12 @@ packages:
     peerDependencies:
       '@tiptap/core': ^3.15.3
 
+  '@tiptap/extension-table@3.15.3':
+    resolution: {integrity: sha512-dJk0u2JX1J/3x/ps641qdxQPOiie5txQhs2M1srgDeeFu//ORCePAxryJCw1bgf0TEVwFWwFTCtcOFR5SSgMZQ==}
+    peerDependencies:
+      '@tiptap/core': ^3.15.3
+      '@tiptap/pm': ^3.15.3
+
   '@tiptap/extension-text-style@3.0.9':
     resolution: {integrity: sha512-x7SZLS537c7w789n8re0IktmkBZqz98dux/hwpFAcC4oL06YPjFG7Dy9mAiKcsKqKWI0eAyTQvMybz+TJusBbw==}
     peerDependencies:
@@ -5641,6 +5694,9 @@ packages:
   '@tsconfig/node16@1.0.4':
     resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
 
+  '@turbopuffer/turbopuffer@2.8.0':
+    resolution: {integrity: sha512-lurmVByLynuWtPtVl7SBEJ0bNakb8bs4KsafKzeLWnXA6BsQiGS9obT/7ExQVb9/yecyRn/grj8VgwUzi2xMyg==}
+
   '@types/aria-query@5.0.4':
     resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
 
@@ -6000,6 +6056,7 @@ packages:
 
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
   '@upstash/core-analytics@0.0.10':
     resolution: {integrity: sha512-7qJHGxpQgQr9/vmeS1PktEwvNAF7TI4iJDi8Pu2CFZ9YUGHZH4fOP5TfYlZ4aVxfopnELiE4BS4FBjyK7V1/xQ==}
@@ -6013,8 +6070,8 @@ packages:
     peerDependencies:
       '@upstash/redis': ^1.34.3
 
-  '@upstash/redis@1.35.3':
-    resolution: {integrity: sha512-hSjv66NOuahW3MisRGlSgoszU2uONAY2l5Qo3Sae8OT3/Tng9K+2/cBRuyPBX8egwEGcNNCF9+r0V6grNnhL+w==}
+  '@upstash/redis@1.38.2':
+    resolution: {integrity: sha512-RZ+JaRCVIS+ZTGnjOnDMr+/0aqDxsBb5rV6aW+Pys4SGELwr5lwE3UbLHRCHqMQ5Ulxj0b/CFBHfbmE175Otog==}
 
   '@upstash/vector@1.2.2':
     resolution: {integrity: sha512-ptQ9xnxtKqmpNK52PCcHCszlPOLxIBfjsv7ty8RoF95pkjctS9rSjTQ3Pl9bx5VFbpDj+0dMXw88WLt6swDkgQ==}
@@ -6045,10 +6102,6 @@ packages:
     resolution: {integrity: sha512-GFXtgid3+TcVHTd668a10vGpzAh4Ty/yBZPRxKf1UicI8Vi8EthfvSxcaLW0KvQBBe1+d7TcjecLZHRT8JzQ4g==}
     engines: {node: '>=16'}
 
-  '@vercel/oidc@3.0.5':
-    resolution: {integrity: sha512-fnYhv671l+eTTp48gB4zEsTW/YtRgRPnkI2nT7x6qw5rkI1Lq2hTmQIpHPgyThI0znLK+vX2n9XxKdXZ7BUbbw==}
-    engines: {node: '>= 20'}
-
   '@vercel/oidc@3.2.0':
     resolution: {integrity: sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug==}
     engines: {node: '>= 20'}
@@ -6197,6 +6250,9 @@ packages:
   '@vitest/utils@4.0.8':
     resolution: {integrity: sha512-pdk2phO5NDvEFfUTxcTP8RFYjVj/kfLSPIN5ebP2Mu9kcIMeAQTbknqcFEyBcC4z2pJlJI9aS5UQjcYfhmKAow==}
 
+  '@workflow/serde@4.1.0':
+    resolution: {integrity: sha512-pav4F2BoirECWR7Nf1TKt+2eETcBj7jj4cBefQ8VXQCA6NPkaKeLfj/zMgi+3zYV5ZIBT4GuUiphsj0/b9hPQQ==}
+
   '@xmldom/is-dom-node@1.0.1':
     resolution: {integrity: sha512-CJDxIgE5I0FH+ttq/Fxy6nRpxP70+e2O048EPe85J2use3XKdatVM7dDVvFNjQudd9B49NPoZ+8PG49zj4Er8Q==}
     engines: {node: '>= 16'}
@@ -6291,9 +6347,9 @@ packages:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
 
-  ai@6.0.3:
-    resolution: {integrity: sha512-OOo+/C+sEyscoLnbY3w42vjQDICioVNyS+F+ogwq6O5RJL/vgWGuiLzFwuP7oHTeni/MkmX8tIge48GTdaV7QQ==}
-    engines: {node: '>=18'}
+  ai@7.0.107:
+    resolution: {integrity: sha512-PVYQ3W9kR8oYiGQxbg4aFIlhQzKskZm8UV+4E0zB2uKOzFr8ju3bXQncOOZtLsOgJY8vdpgyu3cXtomsfcdQYg==}
+    engines: {node: '>=22'}
     peerDependencies:
       zod: ^3.25.76 || ^4.1.8
 
@@ -7187,6 +7243,7 @@ packages:
 
   crypto-js@4.2.0:
     resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+    deprecated: Active development of CryptoJS has been discontinued. This library is no longer maintained.
 
   crypto-random-string@4.0.0:
     resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}
@@ -8119,6 +8176,10 @@ packages:
     resolution: {integrity: sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==}
     engines: {node: '>=18.0.0'}
 
+  eventsource-parser@3.1.1:
+    resolution: {integrity: sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ==}
+    engines: {node: '>=18.0.0'}
+
   eventsource@3.0.7:
     resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
     engines: {node: '>=18.0.0'}
@@ -8486,6 +8547,9 @@ packages:
     peerDependencies:
       next: '>=13.2.0'
 
+  gemoji@8.1.0:
+    resolution: {integrity: sha512-HA4Gx59dw2+tn+UAa7XEV4ufUKI4fH1KgcbenVA9YKSj1QJTT0xh5Mwv5HMFNN3l2OtUe3ZIfuRwSyZS5pLIWw==}
+
   generate-function@2.3.1:
     resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==}
 
@@ -9575,6 +9639,7 @@ packages:
   json-2-csv@5.5.0:
     resolution: {integrity: sha512-1Y4upYpzhoweEMkFDogMU8fKLCs+ciNKviTotrrMZ8duqlycERcB38GYXpu4xcwm6YBn86cTXd7za2yUl0GAkg==}
     engines: {node: '>= 16'}
+    deprecated: A security vulnerability has been reported with the preventCsvInjection option which has been fixed in version 5.5.11. Please upgrade as soon as possible.
 
   json-bigint@1.0.0:
     resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==}
@@ -9616,6 +9681,11 @@ packages:
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
+  jsondiffpatch@0.7.6:
+    resolution: {integrity: sha512-zE9+AXFq+MkTolDor2Cw1nJzLC0aleqPkYf52Kb4Kn4mJcka/gFHpGI2JBVEJCfWOvBl0OoxZS+wuLdislQcqg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+
   jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
@@ -10713,6 +10783,9 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
+  pako@2.2.0:
+    resolution: {integrity: sha512-zJq6RP/5q+TO2OpFV3FHzlPnFjmkb7Nc99a5SNjJE+uu/PkpChs+NIZSSzbBoD+6kjiISXjfYdwj1ZRQ81dz/w==}
+
   papaparse@5.4.1:
     resolution: {integrity: sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw==}
 
@@ -10883,6 +10956,10 @@ packages:
     resolution: {integrity: sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==}
     engines: {node: '>=16.20.0'}
 
+  pkce-challenge@5.0.1:
+    resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
+    engines: {node: '>=16.20.0'}
+
   pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -11004,6 +11081,7 @@ packages:
   prebuild-install@7.1.3:
     resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
     engines: {node: '>=10'}
+    deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.
     hasBin: true
 
   prelude-ls@1.2.1:
@@ -12286,10 +12364,10 @@ packages:
     peerDependencies:
       react: ^16.11.0 || ^17.0.0 || ^18.0.0
 
-  swr@2.2.5:
-    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
+  swr@2.5.1:
+    resolution: {integrity: sha512-BRw55e8r0B7SpDN20CAzoQAHl7y1yP7/Zt7oqUjMv0vSt2u2Xnkm88Ws+VypbV9BXHQVuSuyVq7zMjO16wSExw==}
     peerDependencies:
-      react: ^16.11.0 || ^17.0.0 || ^18.0.0
+      react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
   symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
@@ -12566,6 +12644,7 @@ packages:
   tsconfck@3.0.3:
     resolution: {integrity: sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==}
     engines: {node: ^18 || >=20}
+    deprecated: unmaintained
     hasBin: true
     peerDependencies:
       typescript: ^5.0.0
@@ -12891,6 +12970,10 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici@7.29.0:
+    resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==}
+    engines: {node: '>=20.18.1'}
+
   unicode-properties@1.4.1:
     resolution: {integrity: sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==}
 
@@ -13053,6 +13136,11 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  use-sync-external-store@1.7.0:
+    resolution: {integrity: sha512-6L+EeigHMQhdaIPNIFUKwfWJSwWFQ8gJbJ2DLOs5sDIegTwR9fRxvnM3uciHKjIZhFz+KAv2emhWMRvDmMcY8A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
@@ -13065,6 +13153,7 @@ packages:
 
   uuid@10.0.0:
     resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@11.0.3:
@@ -13082,10 +13171,12 @@ packages:
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@9.0.1:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   v8-compile-cache-lib@3.0.1:
@@ -13642,11 +13733,19 @@ snapshots:
       '@ai-sdk/provider-utils': 4.0.1(zod@4.3.5)
       zod: 4.3.5
 
-  '@ai-sdk/gateway@3.0.2(zod@4.3.5)':
+  '@ai-sdk/gateway@4.0.87(zod@4.3.5)':
     dependencies:
-      '@ai-sdk/provider': 3.0.0
-      '@ai-sdk/provider-utils': 4.0.1(zod@4.3.5)
-      '@vercel/oidc': 3.0.5
+      '@ai-sdk/provider': 4.0.17
+      '@ai-sdk/provider-utils': 5.0.45(zod@4.3.5)
+      '@vercel/oidc': 3.2.0
+      zod: 4.3.5
+
+  '@ai-sdk/mcp@2.0.54(zod@4.3.5)':
+    dependencies:
+      '@ai-sdk/provider': 4.0.17
+      '@ai-sdk/provider-utils': 5.0.45(zod@4.3.5)
+      cross-spawn: 7.0.6
+      pkce-challenge: 5.0.1
       zod: 4.3.5
 
   '@ai-sdk/provider-utils@4.0.1(zod@4.3.5)':
@@ -13656,26 +13755,41 @@ snapshots:
       eventsource-parser: 3.0.6
       zod: 4.3.5
 
+  '@ai-sdk/provider-utils@5.0.45(zod@4.3.5)':
+    dependencies:
+      '@ai-sdk/provider': 4.0.17
+      '@standard-schema/spec': 1.1.0
+      '@workflow/serde': 4.1.0
+      eventsource-parser: 3.1.1
+      undici: 7.29.0
+      zod: 4.3.5
+
   '@ai-sdk/provider@3.0.0':
     dependencies:
       json-schema: 0.4.0
 
-  '@ai-sdk/react@3.0.3(react@19.1.3)(zod@4.3.5)':
+  '@ai-sdk/provider@4.0.17':
     dependencies:
-      '@ai-sdk/provider-utils': 4.0.1(zod@4.3.5)
-      ai: 6.0.3(zod@4.3.5)
+      json-schema: 0.4.0
+
+  '@ai-sdk/react@4.0.110(react@19.1.3)(zod@4.3.5)':
+    dependencies:
+      '@ai-sdk/mcp': 2.0.54(zod@4.3.5)
+      '@ai-sdk/provider': 4.0.17
+      '@ai-sdk/provider-utils': 5.0.45(zod@4.3.5)
+      ai: 7.0.107(zod@4.3.5)
       react: 19.1.3
-      swr: 2.2.5(react@19.1.3)
+      swr: 2.5.1(react@19.1.3)
       throttleit: 2.1.0
     transitivePeerDependencies:
       - zod
 
-  '@ai-sdk/rsc@2.0.3(react@19.1.3)(zod@4.3.5)':
+  '@ai-sdk/rsc@3.0.107(react@19.1.3)(zod@4.3.5)':
     dependencies:
-      '@ai-sdk/provider': 3.0.0
-      '@ai-sdk/provider-utils': 4.0.1(zod@4.3.5)
-      ai: 6.0.3(zod@4.3.5)
-      jsondiffpatch: 0.7.3
+      '@ai-sdk/provider': 4.0.17
+      '@ai-sdk/provider-utils': 5.0.45(zod@4.3.5)
+      ai: 7.0.107(zod@4.3.5)
+      jsondiffpatch: 0.7.6
       react: 19.1.3
     optionalDependencies:
       zod: 4.3.5
@@ -14508,9 +14622,9 @@ snapshots:
       '@babel/core': 7.24.5
       '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.24.5)':
+  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.4)':
     dependencies:
-      '@babel/core': 7.24.5
+      '@babel/core': 7.28.4
       '@babel/helper-plugin-utils': 7.27.1
     optional: true
 
@@ -15340,7 +15454,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@hubspot/cli@7.6.2(@babel/core@7.24.5)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.11.9)(terser@5.27.0))':
+  '@hubspot/cli@7.6.2(@babel/core@7.28.4)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.11.9)(terser@5.27.0))':
     dependencies:
       '@hubspot/local-dev-lib': 3.19.1
       '@hubspot/project-parsing-lib': 0.8.6(@hubspot/local-dev-lib@3.19.1)
@@ -15371,7 +15485,7 @@ snapshots:
       yargs: 17.7.2
       yargs-parser: 21.1.1
     optionalDependencies:
-      '@hubspot/cms-dev-server': 1.0.38(@babel/core@7.24.5)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)
+      '@hubspot/cms-dev-server': 1.0.38(@babel/core@7.28.4)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)
       '@modelcontextprotocol/sdk': 1.13.3
     transitivePeerDependencies:
       - '@babel/core'
@@ -15409,7 +15523,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
     optional: true
 
-  '@hubspot/cms-dev-server@1.0.38(@babel/core@7.24.5)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)':
+  '@hubspot/cms-dev-server@1.0.38(@babel/core@7.28.4)(@types/node@18.11.9)(@types/react-dom@19.1.9(@types/react@19.1.15))(@types/react@19.1.15)(encoding@0.1.13)(prettier@3.6.2)(rollup@4.52.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(terser@5.27.0)':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/parser': 7.26.2
@@ -15436,7 +15550,7 @@ snapshots:
       '@vitejs/plugin-react': 4.7.0(vite@5.4.8(@types/node@18.11.9)(terser@5.27.0))
       ansi-to-html: 0.7.2
       babel-plugin-macros: 3.1.0
-      babel-plugin-styled-components: 2.1.4(@babel/core@7.24.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      babel-plugin-styled-components: 2.1.4(@babel/core@7.28.4)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       chalk: 5.4.1
       class-variance-authority: 0.7.0
       cli-progress: 3.12.0
@@ -15455,7 +15569,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       request: 2.88.2
       storybook: 8.6.14(prettier@3.6.2)
-      styled-jsx: 5.1.2(@babel/core@7.24.5)(babel-plugin-macros@3.1.0)(react@18.3.1)
+      styled-jsx: 5.1.2(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react@18.3.1)
       tailwind-merge: 2.6.0
       tailwindcss-animate: 1.0.7
       typescript: 4.7.4
@@ -19196,6 +19310,11 @@ snapshots:
     dependencies:
       '@tiptap/core': 3.15.3(@tiptap/pm@3.15.3)
 
+  '@tiptap/extension-table@3.15.3(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))(@tiptap/pm@3.15.3)':
+    dependencies:
+      '@tiptap/core': 3.15.3(@tiptap/pm@3.15.3)
+      '@tiptap/pm': 3.15.3
+
   '@tiptap/extension-text-style@3.0.9(@tiptap/core@3.15.3(@tiptap/pm@3.15.3))':
     dependencies:
       '@tiptap/core': 3.15.3(@tiptap/pm@3.15.3)
@@ -19322,6 +19441,11 @@ snapshots:
 
   '@tsconfig/node16@1.0.4': {}
 
+  '@turbopuffer/turbopuffer@2.8.0':
+    dependencies:
+      pako: 2.2.0
+      undici: 7.29.0
+
   '@types/aria-query@5.0.4':
     optional: true
 
@@ -19730,7 +19854,7 @@ snapshots:
 
   '@upstash/core-analytics@0.0.10':
     dependencies:
-      '@upstash/redis': 1.35.3
+      '@upstash/redis': 1.38.2
 
   '@upstash/qstash@2.11.0':
     dependencies:
@@ -19738,12 +19862,12 @@ snapshots:
       jose: 5.10.0
       neverthrow: 7.2.0
 
-  '@upstash/ratelimit@2.0.6(@upstash/redis@1.35.3)':
+  '@upstash/ratelimit@2.0.6(@upstash/redis@1.38.2)':
     dependencies:
       '@upstash/core-analytics': 0.0.10
-      '@upstash/redis': 1.35.3
+      '@upstash/redis': 1.38.2
 
-  '@upstash/redis@1.35.3':
+  '@upstash/redis@1.38.2':
     dependencies:
       uncrypto: 0.1.3
 
@@ -19772,8 +19896,6 @@ snapshots:
       satori: 0.12.1
       yoga-wasm-web: 0.3.3
 
-  '@vercel/oidc@3.0.5': {}
-
   '@vercel/oidc@3.2.0': {}
 
   '@veriff/incontext-sdk@2.5.0':
@@ -20045,6 +20167,8 @@ snapshots:
       '@vitest/pretty-format': 4.0.8
       tinyrainbow: 3.0.3
 
+  '@workflow/serde@4.1.0': {}
+
   '@xmldom/is-dom-node@1.0.1': {}
 
   '@xmldom/xmldom@0.8.10': {}
@@ -20118,12 +20242,11 @@ snapshots:
       indent-string: 4.0.0
     optional: true
 
-  ai@6.0.3(zod@4.3.5):
+  ai@7.0.107(zod@4.3.5):
     dependencies:
-      '@ai-sdk/gateway': 3.0.2(zod@4.3.5)
-      '@ai-sdk/provider': 3.0.0
-      '@ai-sdk/provider-utils': 4.0.1(zod@4.3.5)
-      '@opentelemetry/api': 1.9.0
+      '@ai-sdk/gateway': 4.0.87(zod@4.3.5)
+      '@ai-sdk/provider': 4.0.17
+      '@ai-sdk/provider-utils': 5.0.45(zod@4.3.5)
       zod: 4.3.5
 
   ajv-formats@2.1.1(ajv@8.12.0):
@@ -20484,11 +20607,11 @@ snapshots:
       resolve: 1.22.6
     optional: true
 
-  babel-plugin-styled-components@2.1.4(@babel/core@7.24.5)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1)):
+  babel-plugin-styled-components@2.1.4(@babel/core@7.28.4)(styled-components@6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1)):
     dependencies:
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-module-imports': 7.25.9
-      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.24.5)
+      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4)
       lodash: 4.17.21
       picomatch: 2.3.1
       styled-components: 6.1.19(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -22276,6 +22399,8 @@ snapshots:
 
   eventsource-parser@3.0.6: {}
 
+  eventsource-parser@3.1.1: {}
+
   eventsource@3.0.7:
     dependencies:
       eventsource-parser: 3.0.6
@@ -22631,7 +22756,7 @@ snapshots:
 
   foreground-child@3.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   foreground-child@3.3.1:
@@ -22799,6 +22924,8 @@ snapshots:
     dependencies:
       next: 15.5.8(@opentelemetry/api@1.9.0)(@playwright/test@1.58.2)(react-dom@19.1.3(react@19.1.3))(react@19.1.3)
 
+  gemoji@8.1.0: {}
+
   generate-function@2.3.1:
     dependencies:
       is-property: 1.0.2
@@ -24352,6 +24479,10 @@ snapshots:
     dependencies:
       '@dmsnell/diff-match-patch': 1.1.0
 
+  jsondiffpatch@0.7.6:
+    dependencies:
+      '@dmsnell/diff-match-patch': 1.1.0
+
   jsonfile@4.0.0:
     optionalDependencies:
       graceful-fs: 4.2.11
@@ -25670,6 +25801,8 @@ snapshots:
 
   pako@1.0.11: {}
 
+  pako@2.2.0: {}
+
   papaparse@5.4.1: {}
 
   parent-module@1.0.1:
@@ -25820,6 +25953,8 @@ snapshots:
   pkce-challenge@5.0.0:
     optional: true
 
+  pkce-challenge@5.0.1: {}
+
   pkg-dir@4.2.0:
     dependencies:
       find-up: 4.1.0
@@ -27577,12 +27712,12 @@ snapshots:
       tslib: 2.6.2
     optional: true
 
-  styled-jsx@5.1.2(@babel/core@7.24.5)(babel-plugin-macros@3.1.0)(react@18.3.1):
+  styled-jsx@5.1.2(@babel/core@7.28.4)(babel-plugin-macros@3.1.0)(react@18.3.1):
     dependencies:
       client-only: 0.0.1
       react: 18.3.1
     optionalDependencies:
-      '@babel/core': 7.24.5
+      '@babel/core': 7.28.4
       babel-plugin-macros: 3.1.0
     optional: true
 
@@ -27645,11 +27780,11 @@ snapshots:
       react: 19.1.3
       use-sync-external-store: 1.2.0(react@19.1.3)
 
-  swr@2.2.5(react@19.1.3):
+  swr@2.5.1(react@19.1.3):
     dependencies:
-      client-only: 0.0.1
+      dequal: 2.0.3
       react: 19.1.3
-      use-sync-external-store: 1.5.0(react@19.1.3)
+      use-sync-external-store: 1.7.0(react@19.1.3)
 
   symbol-tree@3.2.4: {}
 
@@ -28494,6 +28629,8 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici@7.29.0: {}
+
   unicode-properties@1.4.1:
     dependencies:
       base64-js: 1.5.1
@@ -28685,6 +28822,10 @@ snapshots:
     dependencies:
       react: 19.1.3
 
+  use-sync-external-store@1.7.0(react@19.1.3):
+    dependencies:
+      react: 19.1.3
+
   util-deprecate@1.0.2: {}
 
   util@0.12.5: