diff --git a/.env.example b/.env.example
index 4ecfe056..7a5adbe8 100644
--- a/.env.example
+++ b/.env.example
@@ -18,8 +18,13 @@ BETTER_AUTH_SECRET=
 # OAUTH_SCOPES=openid email profile
 # OAUTH_PKCE=false
 
-# Email
-# Not required, but needed for functions like sending password reset emails.
+# Email (optional — needed for password reset and email verification)
+# FROM_EMAIL_ADDRESS is required for email sending to work.
+# If both provider keys are set, Resend takes priority.
+FROM_EMAIL_ADDRESS=
+VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS=
+
+RESEND_API_KEY=
 SENDGRID_API_KEY=
 
 # Integrations
@@ -29,3 +34,9 @@ INSTAPAPER_OAUTH_SECRET=
 # Analytics
 VITE_PUBLIC_UMAMI_WEBSITE_ID=
 VITE_PUBLIC_UMAMI_SRC=
+
+# Error Tracking (Sentry/GlitchTip)
+VITE_PUBLIC_SENTRY_DSN_WEB=
+VITE_PUBLIC_SENTRY_SECURITY_ENDPOINT_WEB=
+SENTRY_DSN_BACKEND=
+SENTRY_SECURITY_ENDPOINT_BACKEND=
diff --git a/README.md b/README.md
index cceba9b9..06115f2b 100644
--- a/README.md
+++ b/README.md
@@ -52,9 +52,10 @@ Serial takes a model of progressive enhancement for features. The app can run wi
 
 ### Email support (for password reset, etc)
 
-- Create an account on [Sendgrid](https://sendgrid.com/en-us)
-- Set up a mailing address
-- Add your `SENDGRID_API_KEY` to `.env` or your host's environment variables UI.
+Serial supports [Resend](https://resend.com) and [SendGrid](https://sendgrid.com/en-us) as email providers. Only one is used at a time — if both keys are set, Resend takes priority.
+
+- **Resend**: Create an account, add your `RESEND_API_KEY` to `.env` or your host's environment variables UI.
+- **SendGrid**: Create an account, set up a mailing address, add your `SENDGRID_API_KEY` to `.env` or your host's environment variables UI.
 
 ### Instapaper integration
 
diff --git a/docker-compose.arm.yaml b/docker-compose.arm.yaml
index 9745fc35..97043d4d 100644
--- a/docker-compose.arm.yaml
+++ b/docker-compose.arm.yaml
@@ -21,7 +21,10 @@ services:
       NODE_ENV: production
       DATABASE_URL: http://libsql:8080
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     depends_on:
diff --git a/docker-compose.build-arm.yaml b/docker-compose.build-arm.yaml
index 899ab462..5e2dff77 100644
--- a/docker-compose.build-arm.yaml
+++ b/docker-compose.build-arm.yaml
@@ -25,7 +25,10 @@ services:
       NODE_ENV: production
       DATABASE_URL: http://libsql:8080
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     depends_on:
diff --git a/docker-compose.build-cloud.yaml b/docker-compose.build-cloud.yaml
index 7b4c37d0..32b00127 100644
--- a/docker-compose.build-cloud.yaml
+++ b/docker-compose.build-cloud.yaml
@@ -11,7 +11,10 @@ services:
       DATABASE_URL: ${DATABASE_URL}
       DATABASE_AUTH_TOKEN: ${DATABASE_AUTH_TOKEN}
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     ports:
diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml
index e8186987..3a115db4 100644
--- a/docker-compose.build.yaml
+++ b/docker-compose.build.yaml
@@ -25,7 +25,10 @@ services:
       NODE_ENV: production
       DATABASE_URL: http://libsql:8080
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     depends_on:
diff --git a/docker-compose.cloud.yaml b/docker-compose.cloud.yaml
index 23fcdde6..4a58027f 100644
--- a/docker-compose.cloud.yaml
+++ b/docker-compose.cloud.yaml
@@ -6,7 +6,10 @@ services:
       DATABASE_URL: ${DATABASE_URL}
       DATABASE_AUTH_TOKEN: ${DATABASE_AUTH_TOKEN}
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     ports:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 413d78b0..850af3f7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -21,7 +21,10 @@ services:
       NODE_ENV: production
       DATABASE_URL: http://libsql:8080
       BETTER_AUTH_SECRET: ${BETTER_AUTH_SECRET}
+      FROM_EMAIL_ADDRESS: ${FROM_EMAIL_ADDRESS}
+      RESEND_API_KEY: ${RESEND_API_KEY}
       SENDGRID_API_KEY: ${SENDGRID_API_KEY}
+      VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: ${VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
       INSTAPAPER_OAUTH_ID: ${INSTAPAPER_OAUTH_ID}
       INSTAPAPER_OAUTH_SECRET: ${INSTAPAPER_OAUTH_SECRET}
     depends_on:
diff --git a/package.json b/package.json
index bfb725ee..2321111a 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,11 @@
     "dev:db:test:self-hosted": "turso dev --db-file serial-test-self-hosted.db --port 8082",
     "dev:migrate:test:main": "DATABASE_URL=http://127.0.0.1:8081 BETTER_AUTH_SECRET=test-secret-key-for-main-tests pnpm schema:migrate",
     "dev:migrate:test:self-hosted": "DATABASE_URL=http://127.0.0.1:8082 BETTER_AUTH_SECRET=test-secret-key-for-self-hosted-tests pnpm schema:migrate",
-    "dev:test:main": "concurrently --kill-others \"pnpm dev:db:test:main\" \"pnpm dev:migrate:test:main && DATABASE_URL=http://127.0.0.1:8081 BETTER_AUTH_SECRET=test-secret-key-for-main-tests BETTER_AUTH_BASE_URL=http://localhost:3002 VITE_PUBLIC_IS_MAIN_INSTANCE=true POLAR_ACCESS_TOKEN=test-token-for-e2e POLAR_WEBHOOK_SECRET=test-webhook-secret POLAR_STANDARD_MONTHLY_PRODUCT_ID=test-standard-monthly POLAR_STANDARD_ANNUAL_PRODUCT_ID=test-standard-annual POLAR_PRO_MONTHLY_PRODUCT_ID=test-pro-monthly POLAR_PRO_ANNUAL_PRODUCT_ID=test-pro-annual vite dev --port 3002\"",
+    "dev:test:main": "concurrently --kill-others \"pnpm dev:db:test:main\" \"pnpm dev:migrate:test:main && DATABASE_URL=http://127.0.0.1:8081 BETTER_AUTH_SECRET=test-secret-key-for-main-tests BETTER_AUTH_BASE_URL=http://localhost:3002 VITE_PUBLIC_IS_MAIN_INSTANCE=true POLAR_ACCESS_TOKEN=test-token-for-e2e POLAR_WEBHOOK_SECRET=test-webhook-secret POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID=test-standard-small-monthly POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID=test-standard-small-annual POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID=test-standard-medium-monthly POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID=test-standard-medium-annual POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID=test-standard-large-monthly POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID=test-standard-large-annual POLAR_PRO_MONTHLY_PRODUCT_ID=test-pro-monthly POLAR_PRO_ANNUAL_PRODUCT_ID=test-pro-annual vite dev --port 3002\"",
     "dev:test:self-hosted": "concurrently --kill-others \"pnpm dev:db:test:self-hosted\" \"pnpm dev:migrate:test:self-hosted && DATABASE_URL=http://127.0.0.1:8082 BETTER_AUTH_SECRET=test-secret-key-for-self-hosted-tests BETTER_AUTH_BASE_URL=http://localhost:3001 VITE_PUBLIC_IS_MAIN_INSTANCE=false vite dev --port 3001\"",
     "dev:migrate": "pnpm schema:migrate",
     "dev:atomic": "vite dev",
+    "dev:polar": "polar listen http://localhost:3000/api/auth/polar/webhooks",
     "dev": "concurrently --kill-others \"pnpm dev:db\" \"pnpm dev:migrate && pnpm dev:atomic\"",
     "dev:email": "email dev --dir ./src/emails --port 4000",
     "prebuild": "pnpm typecheck && pnpm format && pnpm lint",
@@ -86,6 +87,8 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^1.0.11",
     "@sendgrid/mail": "^8.1.6",
+    "@sentry/browser": "^10.49.0",
+    "@sentry/node": "^10.49.0",
     "@t3-oss/env-core": "^0.13.11",
     "@tanstack/query-async-storage-persister": "^5.96.2",
     "@tanstack/react-query": "^5.96.2",
@@ -94,6 +97,7 @@
     "@tanstack/react-start": "1.167.16",
     "@tanstack/react-table": "^8.21.3",
     "@tanstack/zod-adapter": "1.166.9",
+    "@upstash/redis": "^1.37.0",
     "better-auth": "^1.5.6",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -124,6 +128,7 @@
     "remark-gfm": "^4.0.1",
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.2",
+    "resend": "^6.11.0",
     "rss-parser": "^3.13.0",
     "sonner": "^2.0.7",
     "superjson": "^2.2.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d2a5a49b..99d99127 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,7 +56,7 @@ importers:
         version: 1.13.13(@opentelemetry/api@1.9.1)
       '@orpc/experimental-publisher':
         specifier: ^1.13.13
-        version: 1.13.13(@opentelemetry/api@1.9.1)
+        version: 1.13.13(@opentelemetry/api@1.9.1)(@upstash/redis@1.37.0)
       '@orpc/server':
         specifier: ^1.13.13
         version: 1.13.13(@opentelemetry/api@1.9.1)(crossws@0.4.4(srvx@0.11.15))(ws@8.19.0)
@@ -68,7 +68,7 @@ importers:
         version: 3.3.0
       '@polar-sh/better-auth':
         specifier: ^1.8.1
-        version: 1.8.3(d0c442ce4a9c66fb669f11db7be7f592)
+        version: 1.8.3(3039f015a40675ed8d512bd4940c91a8)
       '@polar-sh/sdk':
         specifier: ^0.47.0
         version: 0.47.0
@@ -135,6 +135,12 @@ importers:
       '@sendgrid/mail':
         specifier: ^8.1.6
         version: 8.1.6
+      '@sentry/browser':
+        specifier: ^10.49.0
+        version: 10.49.0
+      '@sentry/node':
+        specifier: ^10.49.0
+        version: 10.49.0
       '@t3-oss/env-core':
         specifier: ^0.13.11
         version: 0.13.11(typescript@6.0.2)(zod@4.3.6)
@@ -159,9 +165,12 @@ importers:
       '@tanstack/zod-adapter':
         specifier: 1.166.9
         version: 1.166.9(@tanstack/react-router@1.168.10(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(zod@4.3.6)
+      '@upstash/redis':
+        specifier: ^1.37.0
+        version: 1.37.0
       better-auth:
         specifier: ^1.5.6
-        version: 1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))
+        version: 1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -176,7 +185,7 @@ importers:
         version: 1.11.20
       drizzle-zod:
         specifier: ^0.8.3
-        version: 0.8.3(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(zod@4.3.6)
+        version: 0.8.3(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(zod@4.3.6)
       embla-carousel-react:
         specifier: ^8.6.0
         version: 8.6.0(react@19.2.4)
@@ -249,6 +258,9 @@ importers:
       remark-rehype:
         specifier: ^11.1.2
         version: 11.1.2
+      resend:
+        specifier: ^6.11.0
+        version: 6.11.0(@react-email/render@2.0.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4))
       rss-parser:
         specifier: ^3.13.0
         version: 3.13.0
@@ -336,10 +348,10 @@ importers:
         version: 0.31.10
       drizzle-orm:
         specifier: ^0.45.2
-        version: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+        version: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
       drizzle-seed:
         specifier: ^0.3.1
-        version: 0.3.1(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))
+        version: 0.3.1(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))
       esbuild:
         specifier: ^0.28.0
         version: 0.28.0
@@ -357,7 +369,7 @@ importers:
         version: 7.0.1(eslint@10.2.0(jiti@2.6.1))
       nitro:
         specifier: 3.0.260311-beta
-        version: 3.0.260311-beta(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(chokidar@4.0.3)(dotenv@17.4.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(jiti@2.6.1)(lru-cache@11.2.7)(rollup@2.79.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+        version: 3.0.260311-beta(@libsql/client@0.17.2)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(chokidar@4.0.3)(dotenv@17.4.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(jiti@2.6.1)(lru-cache@11.2.7)(rollup@2.79.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       postcss:
         specifier: ^8.5.8
         version: 8.5.8
@@ -1891,6 +1903,11 @@ packages:
     resolution: {integrity: sha512-ejvBr8MQCbVsWNZnCwDXjUKq40MDmHalq7cJ6e9s/qzTUFIIo/afzt1Vui9T97FM/V/pN4YsFVoed5NIa96RDg==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
+  '@fastify/otel@0.18.0':
+    resolution: {integrity: sha512-3TASCATfw+ctICSb4ymrv7iCm0qJ0N9CarB+CZ7zIJ7KqNbwI5JjyDL1/sxoC0ccTO1Zyd1iQ+oqncPg5FJXaA==}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+
   '@floating-ui/core@1.7.4':
     resolution: {integrity: sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==}
 
@@ -2344,14 +2361,204 @@ packages:
     resolution: {integrity: sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA==}
     engines: {node: '>=20.0'}
 
+  '@opentelemetry/api-logs@0.207.0':
+    resolution: {integrity: sha512-lAb0jQRVyleQQGiuuvCOTDVspc14nx6XJjP4FspJ1sNARo3Regq4ZZbrc3rN4b1TYSuUCvgH+UXUPug4SLOqEQ==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api-logs@0.212.0':
+    resolution: {integrity: sha512-TEEVrLbNROUkYY51sBJGk7lO/OLjuepch8+hmpM6ffMJQ2z/KVCjdHuCFX6fJj8OkJP2zckPjrJzQtXU3IAsFg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api-logs@0.214.0':
+    resolution: {integrity: sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==}
+    engines: {node: '>=8.0.0'}
+
   '@opentelemetry/api@1.9.1':
     resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==}
     engines: {node: '>=8.0.0'}
 
+  '@opentelemetry/core@2.6.1':
+    resolution: {integrity: sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.7.0':
+    resolution: {integrity: sha512-DT12SXVwV2eoJrGf4nnsvZojxxeQo+LlNAsoYGRRObPWTeN6APiqZ2+nqDCQDvQX40eLi1AePONS0onoASp3yQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/instrumentation-amqplib@0.61.0':
+    resolution: {integrity: sha512-mCKoyTGfRNisge4br0NpOFSy2Z1NnEW8hbCJdUDdJFHrPqVzc4IIBPA/vX0U+LUcQqrQvJX+HMIU0dbDRe0i0Q==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-connect@0.57.0':
+    resolution: {integrity: sha512-FMEBChnI4FLN5TE9DHwfH7QpNir1JzXno1uz/TAucVdLCyrG0jTrKIcNHt/i30A0M2AunNBCkcd8Ei26dIPKdg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-dataloader@0.31.0':
+    resolution: {integrity: sha512-f654tZFQXS5YeLDNb9KySrwtg7SnqZN119FauD7acBoTzuLduaiGTNz88ixcVSOOMGZ+EjJu/RFtx5klObC95g==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fs@0.33.0':
+    resolution: {integrity: sha512-sCZWXGalQ01wr3tAhSR9ucqFJ0phidpAle6/17HVjD6gN8FLmZMK/8sKxdXYHy3PbnlV1P4zeiSVFNKpbFMNLA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-generic-pool@0.57.0':
+    resolution: {integrity: sha512-orhmlaK+ZIW9hKU+nHTbXrCSXZcH83AescTqmpamHRobRmYSQwRbD0a1odc0yAzuzOtxYiHiXAnpnIpaSSY7Ow==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-graphql@0.62.0':
+    resolution: {integrity: sha512-3YNuLVPUxafXkH1jBAbGsKNsP3XVzcFDhCDCE3OqBwCwShlqQbLMRMFh1T/d5jaVZiGVmSsfof+ICKD2iOV8xg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-hapi@0.60.0':
+    resolution: {integrity: sha512-aNljZKYrEa7obLAxd1bCEDxF7kzCLGXTuTJZ8lMR9rIVEjmuKBXN1gfqpm/OB//Zc2zP4iIve1jBp7sr3mQV6w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.214.0':
+    resolution: {integrity: sha512-FlkDhZDRjDJDcO2LcSCtjRpkal1NJ8y0fBqBhTvfAR3JSYY2jAIj1kSS5IjmEBt4c3aWv+u/lqLuoCDrrKCSKg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-ioredis@0.62.0':
+    resolution: {integrity: sha512-ZYt//zcPve8qklaZX+5Z4MkU7UpEkFRrxsf2cnaKYBitqDnsCN69CPAuuMOX6NYdW2rG9sFy7V/QWtBlP5XiNQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-kafkajs@0.23.0':
+    resolution: {integrity: sha512-4K+nVo+zI+aDz0Z85SObwbdixIbzS9moIuKJaYsdlzcHYnKOPtB7ya8r8Ezivy/GVIBHiKJVq4tv+BEkgOMLaQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-knex@0.58.0':
+    resolution: {integrity: sha512-Hc/o8fSsaWxZ8r1Yw4rNDLwTpUopTf4X32y4W6UhlHmW8Wizz8wfhgOKIelSeqFVTKBBPIDUOsQWuIMxBmu8Bw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-koa@0.62.0':
+    resolution: {integrity: sha512-uVip0VuGUQXZ+vFxkKxAUNq8qNl+VFlyHDh/U6IQ8COOEDfbEchdaHnpFrMYF3psZRUuoSIgb7xOeXj00RdwDA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.58.0':
+    resolution: {integrity: sha512-6grM3TdMyHzlGY1cUA+mwoPueB1F3dYKgKtZIH6jOFXqfHAByyLTc+6PFjGM9tKh52CFBJaDwodNlL/Td39z7Q==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongodb@0.67.0':
+    resolution: {integrity: sha512-1WJp5N1lYfHq2IhECOTewFs5Tf2NfUOwQRqs/rZdXKTezArMlucxgzAaqcgp3A3YREXopXTpXHsxZTGHjNhMdQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongoose@0.60.0':
+    resolution: {integrity: sha512-8BahAZpKsOoc+lrZGb7Ofn4g3z8qtp5IxDfvAVpKXsEheQN7ONMH5djT5ihy6yf8yyeQJGS0gXFfpEAEeEHqQg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql2@0.60.0':
+    resolution: {integrity: sha512-m/5d3bxQALllCzezYDk/6vajh0tj5OijMMvOZGr+qN1NMXm1dzMNwyJ0gNZW7Fo3YFRyj/jJMxIw+W7d525dlw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql@0.60.0':
+    resolution: {integrity: sha512-08pO8GFPEIz2zquKDGteBZDNmwketdgH8hTe9rVYgW9kCJXq1Psj3wPQGx+VaX4ZJKCfPeoLMYup9+cxHvZyVQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-pg@0.66.0':
+    resolution: {integrity: sha512-KxfLGXBb7k2ueaPJfq2GXBDXBly8P+SpR/4Mj410hhNgmQF3sCqwXvUBQxZQkDAmsdBAoenM+yV1LhtsMRamcA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis@0.62.0':
+    resolution: {integrity: sha512-y3pPpot7WzR/8JtHcYlTYsyY8g+pbFhAqbwAuG5bLPnR6v6pt1rQc0DpH0OlGP/9CZbWBP+Zhwp9yFoygf/ZXQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-tedious@0.33.0':
+    resolution: {integrity: sha512-Q6WQwAD01MMTub31GlejoiFACYNw26J426wyjvU7by7fDIr2nZXNW4vhTGs7i7F0TnXBO3xN688g1tdUgYwJ5w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-undici@0.24.0':
+    resolution: {integrity: sha512-oKzZ3uvqP17sV0EsoQcJgjEfIp0kiZRbYu/eD8p13Cbahumf8lb/xpYeNr/hfAJ4owzEtIDcGIjprfLcYbIKBQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation@0.207.0':
+    resolution: {integrity: sha512-y6eeli9+TLKnznrR8AZlQMSJT7wILpXH+6EYq5Vf/4Ao+huI7EedxQHwRgVUOMLFbe7VFDvHJrX9/f4lcwnJsA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.212.0':
+    resolution: {integrity: sha512-IyXmpNnifNouMOe0I/gX7ENfv2ZCNdYTF0FpCsoBcpbIHzk81Ww9rQTYTnvghszCg7qGrIhNvWC8dhEifgX9Jg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.214.0':
+    resolution: {integrity: sha512-MHqEX5Dk59cqVah5LiARMACku7jXSVk9iVDWOea4x3cr7VfdByeDCURK6o1lntT1JS/Tsovw01UJrBhN3/uC5w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/redis-common@0.38.3':
+    resolution: {integrity: sha512-VCghU1JYs/4gP6Gqf/xro9MEsZ7LrMv2uONVsaESKL38ZOB9BqnI98FfS23wjMnHlpuE+TTaWSoAVNpTwYXzjw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+
+  '@opentelemetry/resources@2.7.0':
+    resolution: {integrity: sha512-K+oi0hNMv94EpZbnW3eyu2X6SGVpD3O5DhG2NIp65Hc7lhAj9brRXTAVzh3wB82+q3ThakEf7Zd7RsFUqcTc7A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@2.7.0':
+    resolution: {integrity: sha512-Yg9zEXJB50DLVLpsKPk7NmNqlPlS+OvqhJGh0A8oawIOTPOwlm4eXs9BMJV7L79lvEwI+dWtAj+YjTyddV336A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
   '@opentelemetry/semantic-conventions@1.40.0':
     resolution: {integrity: sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==}
     engines: {node: '>=14'}
 
+  '@opentelemetry/sql-common@0.41.2':
+    resolution: {integrity: sha512-4mhWm3Z8z+i508zQJ7r6Xi7y4mmoJpdvH0fZPFRkWrdp5fq7hhZ2HhYokEOLkfqSMgPR4Z9EyB3DBkbKGOqZiQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+
   '@orpc/client@1.13.13':
     resolution: {integrity: sha512-jagx/Sa+9K4HEC5lBrUlMSrmR/06hvZctWh93/sKZc8GBk4zM0+71oT1kXQVw1oRYFV2XAq3xy3m6NdM6gfKYA==}
 
@@ -2459,6 +2666,11 @@ packages:
       react: ^18 || ^19
       react-dom: ^18 || ^19
 
+  '@prisma/instrumentation@7.6.0':
+    resolution: {integrity: sha512-ZPW2gRiwpPzEfgeZgaekhqXrbW+Y2RJKHVqUmlhZhKzRNCcvR6DykzylDrynpArKKRQtLxoZy36fK7U0p3pdgQ==}
+    peerDependencies:
+      '@opentelemetry/api': ^1.8
+
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
 
@@ -3368,6 +3580,67 @@ packages:
     resolution: {integrity: sha512-/ZqxUvKeEztU9drOoPC/8opEPOk+jLlB2q4+xpx6HVLq6aFu3pMpalkTpAQz8XfRfpLp8O25bh6pGPcHDCYpqg==}
     engines: {node: '>=12.*'}
 
+  '@sentry-internal/browser-utils@10.49.0':
+    resolution: {integrity: sha512-n0QRx0Ysx6mPfIydTkz7VP0FmwM+/EqMZiRqdsU3aTYsngE9GmEDV0OL1bAy6a8N/C1xf9vntkuAtj6N/8Z51w==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/feedback@10.49.0':
+    resolution: {integrity: sha512-JNsUBGv0faCFE7MeZUH99Y9lU9qq3LBALbLxpE1x7ngNrQnVYRlcFgdqaD/btNBKr8awjYL8gmcSkHBWskGqLQ==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/replay-canvas@10.49.0':
+    resolution: {integrity: sha512-7D/NrgH1Qwx5trDYaaTSSJmCb1yVQQLqFG4G/S9x2ltzl9876lSGJL8UeW8ReNQgF3CDAcwbmm/9aXaVSBUNZA==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/replay@10.49.0':
+    resolution: {integrity: sha512-IEy4lwHVMiRE3JAcn+kFKjsTgalDOCSTf20SoFd+nkt6rN/k1RDyr4xpdfF//Kj3UdeTmbuibYjK5H/FLhhnGg==}
+    engines: {node: '>=18'}
+
+  '@sentry/browser@10.49.0':
+    resolution: {integrity: sha512-bGCHc+wK2Dx67YoSbmtlt04alqWfQ+dasD/GVipVOq50gvw/BBIDHTEWRJEjACl+LrvszeY54V+24p8z4IgysA==}
+    engines: {node: '>=18'}
+
+  '@sentry/core@10.49.0':
+    resolution: {integrity: sha512-UaFeum3LUM1mB0d67jvKnqId1yWQjyqmaDV6kWngG03x+jqXb08tJdGpSoxjXZe13jFBbiBL/wKDDYIK7rCK4g==}
+    engines: {node: '>=18'}
+
+  '@sentry/node-core@10.49.0':
+    resolution: {integrity: sha512-7WO0KuCDPSq3G54TVUSI1CKFJwB67LasG+n/gDMBqbrarzs/Yh/s34OOMU5gfVQpncxQAmQsy4nEboQms8iNqA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/core': ^1.30.1 || ^2.1.0
+      '@opentelemetry/exporter-trace-otlp-http': '>=0.57.0 <1'
+      '@opentelemetry/instrumentation': '>=0.57.1 <1'
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.1.0
+      '@opentelemetry/semantic-conventions': ^1.39.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@opentelemetry/core':
+        optional: true
+      '@opentelemetry/exporter-trace-otlp-http':
+        optional: true
+      '@opentelemetry/instrumentation':
+        optional: true
+      '@opentelemetry/sdk-trace-base':
+        optional: true
+      '@opentelemetry/semantic-conventions':
+        optional: true
+
+  '@sentry/node@10.49.0':
+    resolution: {integrity: sha512-xr+HXABCiO5mgAJRQxsXRdNOLO0+Ee6CvXAAIqovL2A1GlhxNWc5ooPWeIrrLDJ/KGyT8zI91O5scpVXdXs0uQ==}
+    engines: {node: '>=18'}
+
+  '@sentry/opentelemetry@10.49.0':
+    resolution: {integrity: sha512-XNLm4dXmtegXQf+EEE2Cs84Ymlo/f5wMx+lg2S2XS4qLbXaPN/HttjhwKftd8D+8iUNfmH+xNMCSshx4s1B/1w==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/core': ^1.30.1 || ^2.1.0
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.1.0
+      '@opentelemetry/semantic-conventions': ^1.39.0
+
   '@socket.io/component-emitter@3.1.2':
     resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
 
@@ -3702,6 +3975,9 @@ packages:
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
   '@types/cors@2.8.19':
     resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
 
@@ -3759,12 +4035,21 @@ packages:
   '@types/ms@2.1.0':
     resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
+  '@types/mysql@2.15.27':
+    resolution: {integrity: sha512-YfWiV16IY0OeBfBCk8+hXKmdTKrKlwKN1MNKAPBu5JYxLwBEZl7QzeEpGnlZb3VMGJrrGmB84gXiH+ofs/TezA==}
+
   '@types/node@16.9.1':
     resolution: {integrity: sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==}
 
   '@types/node@25.5.2':
     resolution: {integrity: sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==}
 
+  '@types/pg-pool@2.0.7':
+    resolution: {integrity: sha512-U4CwmGVQcbEuqpyju8/ptOKg6gEC+Tqsvj2xS9o1g71bUh8twxnC6ZL5rZKCsGN0iyH0CwgUyc9VR5owNQF9Ng==}
+
+  '@types/pg@8.15.6':
+    resolution: {integrity: sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==}
+
   '@types/react-dom@19.2.3':
     resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
@@ -3776,6 +4061,9 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
+  '@types/tedious@4.0.14':
+    resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
@@ -3945,6 +4233,9 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@upstash/redis@1.37.0':
+    resolution: {integrity: sha512-LqOJ3+XWPLSZ2rGSed5DYG3ixybxb8EhZu3yQqF7MdZX1wLBG/FRcI6xcUZXHy/SS7mmXWyadrud0HJHkOc+uw==}
+
   '@vitejs/plugin-react@6.0.1':
     resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -3995,6 +4286,11 @@ packages:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
     engines: {node: '>= 0.6'}
 
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -4370,6 +4666,9 @@ packages:
   citty@0.1.6:
     resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
 
+  cjs-module-lexer@2.2.0:
+    resolution: {integrity: sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==}
+
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
@@ -5268,6 +5567,9 @@ packages:
     resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
     engines: {node: '>=12.20.0'}
 
+  forwarded-parse@2.1.2:
+    resolution: {integrity: sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==}
+
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
@@ -5531,6 +5833,13 @@ packages:
   immer@11.1.4:
     resolution: {integrity: sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw==}
 
+  import-in-the-middle@2.0.6:
+    resolution: {integrity: sha512-3vZV3jX0XRFW3EJDTwzWoZa+RH1b8eTTx6YOCjglrLyPuepwoBti1k3L2dKwdCUrnVEfc5CuRuGstaC/uQJJaw==}
+
+  import-in-the-middle@3.0.1:
+    resolution: {integrity: sha512-pYkiyXVL2Mf3pozdlDGV6NAObxQx13Ae8knZk1UJRJ6uRW/ZRmTGHlQYtrsSl7ubuE5F8CD1z+s1n4RHNuTtuA==}
+    engines: {node: '>=18'}
+
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -6186,6 +6495,9 @@ packages:
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
+  module-details-from-path@1.0.4:
+    resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==}
+
   ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -6457,6 +6769,17 @@ packages:
     resolution: {integrity: sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==}
     engines: {node: '>=8'}
 
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-protocol@1.13.0:
+    resolution: {integrity: sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -6505,6 +6828,9 @@ packages:
     resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
+  postal-mime@2.7.4:
+    resolution: {integrity: sha512-0WdnFQYUrPGGTFu1uOqD2s7omwua8xaeYGdO6rb88oD5yJ/4pPHDA4sdWqfD8wQVfCny563n/HQS7zTFft+f/g==}
+
   postcss-selector-parser@6.0.10:
     resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
     engines: {node: '>=4'}
@@ -6517,6 +6843,22 @@ packages:
     resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-bytea@1.0.1:
+    resolution: {integrity: sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
   prebuild-install@7.1.3:
     resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
     engines: {node: '>=10'}
@@ -6829,9 +7171,22 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-in-the-middle@8.0.1:
+    resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==}
+    engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'}
+
   reselect@5.1.1:
     resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
 
+  resend@6.11.0:
+    resolution: {integrity: sha512-S9gxOccfwc+E6Cr3q28Gu8NkiIjYlYPlj9rqk4zkIuzlEoh8sWu/IvJSg7U7t+o3g0Ov2IOCzcneUaCi/M/WdQ==}
+    engines: {node: '>=20'}
+    peerDependencies:
+      '@react-email/render': '*'
+    peerDependenciesMeta:
+      '@react-email/render':
+        optional: true
+
   resolve-pkg-maps@1.0.0:
     resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
@@ -7191,6 +7546,9 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  svix@1.90.0:
+    resolution: {integrity: sha512-ljkZuyy2+IBEoESkIpn8sLM+sxJHQcPxlZFxU+nVDhltNfUMisMBzWX/UR8SjEnzoI28ZjCzMbmYAPwSTucoMw==}
+
   tagged-tag@1.0.0:
     resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
     engines: {node: '>=20'}
@@ -7370,6 +7728,9 @@ packages:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
 
+  uncrypto@0.1.3:
+    resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
+
   undici-types@7.18.2:
     resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
 
@@ -7547,6 +7908,10 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
+  uuid@10.0.0:
+    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    hasBin: true
+
   v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
@@ -7835,6 +8200,10 @@ packages:
     resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
     engines: {node: '>=4.0'}
 
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
   y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
@@ -8615,12 +8984,12 @@ snapshots:
       nanostores: 1.2.0
       zod: 4.3.6
 
-  '@better-auth/drizzle-adapter@1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))':
+  '@better-auth/drizzle-adapter@1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))':
     dependencies:
       '@better-auth/core': 1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0)
       '@better-auth/utils': 0.3.1
     optionalDependencies:
-      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
 
   '@better-auth/kysely-adapter@1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(kysely@0.28.15)':
     dependencies:
@@ -9163,6 +9532,16 @@ snapshots:
       '@eslint/core': 1.2.0
       levn: 0.4.1
 
+  '@fastify/otel@0.18.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.212.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      minimatch: 10.2.5
+    transitivePeerDependencies:
+      - supports-color
+
   '@floating-ui/core@1.7.4':
     dependencies:
       '@floating-ui/utils': 0.2.10
@@ -9636,10 +10015,261 @@ snapshots:
 
   '@oozcitak/util@10.0.0': {}
 
+  '@opentelemetry/api-logs@0.207.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+
+  '@opentelemetry/api-logs@0.212.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+
+  '@opentelemetry/api-logs@0.214.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+
   '@opentelemetry/api@1.9.1': {}
 
+  '@opentelemetry/core@2.6.1(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/instrumentation-amqplib@0.61.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-connect@0.57.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@types/connect': 3.4.38
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-dataloader@0.31.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fs@0.33.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-generic-pool@0.57.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-graphql@0.62.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-hapi@0.60.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.214.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.6.1(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      forwarded-parse: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-ioredis@0.62.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/redis-common': 0.38.3
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-kafkajs@0.23.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-knex@0.58.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-koa@0.62.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.58.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongodb@0.67.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongoose@0.60.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql2@0.60.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql@0.60.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@types/mysql': 2.15.27
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-pg@0.66.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@opentelemetry/sql-common': 0.41.2(@opentelemetry/api@1.9.1)
+      '@types/pg': 8.15.6
+      '@types/pg-pool': 2.0.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-redis@0.62.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/redis-common': 0.38.3
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-tedious@0.33.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@types/tedious': 4.0.14
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-undici@0.24.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.207.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/api-logs': 0.207.0
+      import-in-the-middle: 2.0.6
+      require-in-the-middle: 8.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.212.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/api-logs': 0.212.0
+      import-in-the-middle: 2.0.6
+      require-in-the-middle: 8.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.214.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/api-logs': 0.214.0
+      import-in-the-middle: 3.0.1
+      require-in-the-middle: 8.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/redis-common@0.38.3': {}
+
+  '@opentelemetry/resources@2.7.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/resources': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
   '@opentelemetry/semantic-conventions@1.40.0': {}
 
+  '@opentelemetry/sql-common@0.41.2(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+
   '@orpc/client@1.13.13(@opentelemetry/api@1.9.1)':
     dependencies:
       '@orpc/shared': 1.13.13(@opentelemetry/api@1.9.1)
@@ -9658,11 +10288,13 @@ snapshots:
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/experimental-publisher@1.13.13(@opentelemetry/api@1.9.1)':
+  '@orpc/experimental-publisher@1.13.13(@opentelemetry/api@1.9.1)(@upstash/redis@1.37.0)':
     dependencies:
       '@orpc/client': 1.13.13(@opentelemetry/api@1.9.1)
       '@orpc/shared': 1.13.13(@opentelemetry/api@1.9.1)
       '@orpc/standard-server': 1.13.13(@opentelemetry/api@1.9.1)
+    optionalDependencies:
+      '@upstash/redis': 1.37.0
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
@@ -9760,11 +10392,11 @@ snapshots:
     dependencies:
       playwright: 1.59.1
 
-  '@polar-sh/better-auth@1.8.3(d0c442ce4a9c66fb669f11db7be7f592)':
+  '@polar-sh/better-auth@1.8.3(3039f015a40675ed8d512bd4940c91a8)':
     dependencies:
       '@polar-sh/checkout': 0.2.0(@stripe/react-stripe-js@4.0.2(@stripe/stripe-js@7.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@stripe/stripe-js@7.9.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.4(react@19.2.4))(react-is@16.13.1)(react@19.2.4)(redux@5.0.1)
       '@polar-sh/sdk': 0.47.0
-      better-auth: 1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))
+      better-auth: 1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))
       zod: 4.3.6
     transitivePeerDependencies:
       - '@stripe/react-stripe-js'
@@ -9844,6 +10476,13 @@ snapshots:
       - react-is
       - redux
 
+  '@prisma/instrumentation@7.6.0(@opentelemetry/api@1.9.1)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/instrumentation': 0.207.0(@opentelemetry/api@1.9.1)
+    transitivePeerDependencies:
+      - supports-color
+
   '@radix-ui/number@1.1.1': {}
 
   '@radix-ui/primitive@1.1.3': {}
@@ -10719,6 +11358,92 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  '@sentry-internal/browser-utils@10.49.0':
+    dependencies:
+      '@sentry/core': 10.49.0
+
+  '@sentry-internal/feedback@10.49.0':
+    dependencies:
+      '@sentry/core': 10.49.0
+
+  '@sentry-internal/replay-canvas@10.49.0':
+    dependencies:
+      '@sentry-internal/replay': 10.49.0
+      '@sentry/core': 10.49.0
+
+  '@sentry-internal/replay@10.49.0':
+    dependencies:
+      '@sentry-internal/browser-utils': 10.49.0
+      '@sentry/core': 10.49.0
+
+  '@sentry/browser@10.49.0':
+    dependencies:
+      '@sentry-internal/browser-utils': 10.49.0
+      '@sentry-internal/feedback': 10.49.0
+      '@sentry-internal/replay': 10.49.0
+      '@sentry-internal/replay-canvas': 10.49.0
+      '@sentry/core': 10.49.0
+
+  '@sentry/core@10.49.0': {}
+
+  '@sentry/node-core@10.49.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/instrumentation@0.214.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/semantic-conventions@1.40.0)':
+    dependencies:
+      '@sentry/core': 10.49.0
+      '@sentry/opentelemetry': 10.49.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/semantic-conventions@1.40.0)
+      import-in-the-middle: 3.0.1
+    optionalDependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@sentry/node@10.49.0':
+    dependencies:
+      '@fastify/otel': 0.18.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-amqplib': 0.61.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-connect': 0.57.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-dataloader': 0.31.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-fs': 0.33.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-generic-pool': 0.57.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-graphql': 0.62.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-hapi': 0.60.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-http': 0.214.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-ioredis': 0.62.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-kafkajs': 0.23.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-knex': 0.58.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-koa': 0.62.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.58.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mongodb': 0.67.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mongoose': 0.60.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mysql': 0.60.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-mysql2': 0.60.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-pg': 0.66.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-redis': 0.62.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-tedious': 0.33.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/instrumentation-undici': 0.24.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@prisma/instrumentation': 7.6.0(@opentelemetry/api@1.9.1)
+      '@sentry/core': 10.49.0
+      '@sentry/node-core': 10.49.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/instrumentation@0.214.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/semantic-conventions@1.40.0)
+      '@sentry/opentelemetry': 10.49.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/semantic-conventions@1.40.0)
+      import-in-the-middle: 3.0.1
+    transitivePeerDependencies:
+      - '@opentelemetry/exporter-trace-otlp-http'
+      - supports-color
+
+  '@sentry/opentelemetry@10.49.0(@opentelemetry/api@1.9.1)(@opentelemetry/core@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/sdk-trace-base@2.7.0(@opentelemetry/api@1.9.1))(@opentelemetry/semantic-conventions@1.40.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.1
+      '@opentelemetry/core': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/sdk-trace-base': 2.7.0(@opentelemetry/api@1.9.1)
+      '@opentelemetry/semantic-conventions': 1.40.0
+      '@sentry/core': 10.49.0
+
   '@socket.io/component-emitter@3.1.2': {}
 
   '@stablelib/base64@1.0.1': {}
@@ -11106,6 +11831,10 @@ snapshots:
       '@types/deep-eql': 4.0.2
       assertion-error: 2.0.1
 
+  '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 25.5.2
+
   '@types/cors@2.8.19':
     dependencies:
       '@types/node': 25.5.2
@@ -11158,12 +11887,26 @@ snapshots:
 
   '@types/ms@2.1.0': {}
 
+  '@types/mysql@2.15.27':
+    dependencies:
+      '@types/node': 25.5.2
+
   '@types/node@16.9.1': {}
 
   '@types/node@25.5.2':
     dependencies:
       undici-types: 7.18.2
 
+  '@types/pg-pool@2.0.7':
+    dependencies:
+      '@types/pg': 8.15.6
+
+  '@types/pg@8.15.6':
+    dependencies:
+      '@types/node': 25.5.2
+      pg-protocol: 1.13.0
+      pg-types: 2.2.0
+
   '@types/react-dom@19.2.3(@types/react@19.2.14)':
     dependencies:
       '@types/react': 19.2.14
@@ -11174,6 +11917,10 @@ snapshots:
 
   '@types/resolve@1.20.2': {}
 
+  '@types/tedious@4.0.14':
+    dependencies:
+      '@types/node': 25.5.2
+
   '@types/trusted-types@2.0.7': {}
 
   '@types/unist@3.0.3': {}
@@ -11336,6 +12083,10 @@ snapshots:
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
     optional: true
 
+  '@upstash/redis@1.37.0':
+    dependencies:
+      uncrypto: 0.1.3
+
   '@vitejs/plugin-react@6.0.1(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.7
@@ -11391,6 +12142,10 @@ snapshots:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
+  acorn-import-attributes@1.9.5(acorn@8.16.0):
+    dependencies:
+      acorn: 8.16.0
+
   acorn-jsx@5.3.2(acorn@8.16.0):
     dependencies:
       acorn: 8.16.0
@@ -11600,10 +12355,10 @@ snapshots:
 
   baseline-browser-mapping@2.9.19: {}
 
-  better-auth@1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))):
+  better-auth@1.5.6(@opentelemetry/api@1.9.1)(@tanstack/react-start@1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(better-sqlite3@12.8.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(next@16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.2(@opentelemetry/api@1.9.1)(@types/node@25.5.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))):
     dependencies:
       '@better-auth/core': 1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0)
-      '@better-auth/drizzle-adapter': 1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))
+      '@better-auth/drizzle-adapter': 1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))
       '@better-auth/kysely-adapter': 1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)(kysely@0.28.15)
       '@better-auth/memory-adapter': 1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)
       '@better-auth/mongo-adapter': 1.5.6(@better-auth/core@1.5.6(@better-auth/utils@0.3.1)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.2(zod@4.3.6))(jose@6.1.3)(kysely@0.28.15)(nanostores@1.2.0))(@better-auth/utils@0.3.1)
@@ -11623,7 +12378,7 @@ snapshots:
       '@tanstack/react-start': 1.167.16(crossws@0.4.4(srvx@0.11.15))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       better-sqlite3: 12.8.0
       drizzle-kit: 0.31.10
-      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
       next: 16.1.7(@babel/core@7.29.0)(@opentelemetry/api@1.9.1)(@playwright/test@1.59.1)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
@@ -11784,6 +12539,8 @@ snapshots:
     dependencies:
       consola: 3.4.2
 
+  cjs-module-lexer@2.2.0: {}
+
   class-variance-authority@0.7.1:
     dependencies:
       clsx: 2.1.1
@@ -11986,11 +12743,11 @@ snapshots:
 
   dayjs@1.11.20: {}
 
-  db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)):
+  db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)):
     optionalDependencies:
       '@libsql/client': 0.17.2
       better-sqlite3: 12.8.0
-      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
 
   debounce-fn@6.0.0:
     dependencies:
@@ -12109,22 +12866,24 @@ snapshots:
       esbuild: 0.25.12
       tsx: 4.21.0
 
-  drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15):
+  drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15):
     optionalDependencies:
       '@libsql/client': 0.17.2
       '@opentelemetry/api': 1.9.1
+      '@types/pg': 8.15.6
+      '@upstash/redis': 1.37.0
       better-sqlite3: 12.8.0
       kysely: 0.28.15
 
-  drizzle-seed@0.3.1(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)):
+  drizzle-seed@0.3.1(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)):
     dependencies:
       pure-rand: 6.1.0
     optionalDependencies:
-      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
 
-  drizzle-zod@0.8.3(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(zod@4.3.6):
+  drizzle-zod@0.8.3(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(zod@4.3.6):
     dependencies:
-      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)
+      drizzle-orm: 0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)
       zod: 4.3.6
 
   dunder-proto@1.0.1:
@@ -12773,6 +13532,8 @@ snapshots:
     dependencies:
       fetch-blob: 3.2.0
 
+  forwarded-parse@2.1.2: {}
+
   fs-constants@1.0.0: {}
 
   fs-extra@9.1.0:
@@ -13096,6 +13857,20 @@ snapshots:
 
   immer@11.1.4: {}
 
+  import-in-the-middle@2.0.6:
+    dependencies:
+      acorn: 8.16.0
+      acorn-import-attributes: 1.9.5(acorn@8.16.0)
+      cjs-module-lexer: 2.2.0
+      module-details-from-path: 1.0.4
+
+  import-in-the-middle@3.0.1:
+    dependencies:
+      acorn: 8.16.0
+      acorn-import-attributes: 1.9.5(acorn@8.16.0)
+      cjs-module-lexer: 2.2.0
+      module-details-from-path: 1.0.4
+
   imurmurhash@0.1.4: {}
 
   inherits@2.0.4: {}
@@ -13866,6 +14641,8 @@ snapshots:
 
   mkdirp-classic@0.5.3: {}
 
+  module-details-from-path@1.0.4: {}
+
   ms@2.0.0: {}
 
   ms@2.1.3: {}
@@ -13915,11 +14692,11 @@ snapshots:
 
   nf3@0.3.16: {}
 
-  nitro@3.0.260311-beta(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(chokidar@4.0.3)(dotenv@17.4.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))(jiti@2.6.1)(lru-cache@11.2.7)(rollup@2.79.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
+  nitro@3.0.260311-beta(@libsql/client@0.17.2)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(chokidar@4.0.3)(dotenv@17.4.1)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))(jiti@2.6.1)(lru-cache@11.2.7)(rollup@2.79.2)(vite@8.0.3(@types/node@25.5.2)(esbuild@0.28.0)(jiti@2.6.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
       consola: 3.4.2
       crossws: 0.4.4(srvx@0.11.15)
-      db0: 0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))
+      db0: 0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))
       env-runner: 0.1.7
       h3: 2.0.1-rc.16(crossws@0.4.4(srvx@0.11.15))
       hookable: 6.1.0
@@ -13930,7 +14707,7 @@ snapshots:
       rolldown: 1.0.0-rc.12
       srvx: 0.11.15
       unenv: 2.0.0-rc.24
-      unstorage: 2.0.0-alpha.7(chokidar@4.0.3)(db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)))(lru-cache@11.2.7)(ofetch@2.0.0-alpha.3)
+      unstorage: 2.0.0-alpha.7(@upstash/redis@1.37.0)(chokidar@4.0.3)(db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)))(lru-cache@11.2.7)(ofetch@2.0.0-alpha.3)
     optionalDependencies:
       dotenv: 17.4.1
       jiti: 2.6.1
@@ -14161,6 +14938,18 @@ snapshots:
 
   peek-readable@4.1.0: {}
 
+  pg-int8@1.0.1: {}
+
+  pg-protocol@1.13.0: {}
+
+  pg-types@2.2.0:
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.1
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
+
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -14195,6 +14984,8 @@ snapshots:
 
   possible-typed-array-names@1.1.0: {}
 
+  postal-mime@2.7.4: {}
+
   postcss-selector-parser@6.0.10:
     dependencies:
       cssesc: 3.0.0
@@ -14212,6 +15003,16 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  postgres-array@2.0.0: {}
+
+  postgres-bytea@1.0.1: {}
+
+  postgres-date@1.0.7: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
   prebuild-install@7.1.3:
     dependencies:
       detect-libc: 2.1.2
@@ -14554,8 +15355,22 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-in-the-middle@8.0.1:
+    dependencies:
+      debug: 4.4.3
+      module-details-from-path: 1.0.4
+    transitivePeerDependencies:
+      - supports-color
+
   reselect@5.1.1: {}
 
+  resend@6.11.0(@react-email/render@2.0.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4)):
+    dependencies:
+      postal-mime: 2.7.4
+      svix: 1.90.0
+    optionalDependencies:
+      '@react-email/render': 2.0.5(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+
   resolve-pkg-maps@1.0.0: {}
 
   resolve@1.22.11:
@@ -14990,6 +15805,11 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  svix@1.90.0:
+    dependencies:
+      standardwebhooks: 1.0.0
+      uuid: 10.0.0
+
   tagged-tag@1.0.0: {}
 
   tailwind-merge@3.5.0: {}
@@ -15186,6 +16006,8 @@ snapshots:
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
 
+  uncrypto@0.1.3: {}
+
   undici-types@7.18.2: {}
 
   undici@7.21.0: {}
@@ -15275,10 +16097,11 @@ snapshots:
       '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1
       '@unrs/resolver-binding-win32-x64-msvc': 1.11.1
 
-  unstorage@2.0.0-alpha.7(chokidar@4.0.3)(db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15)))(lru-cache@11.2.7)(ofetch@2.0.0-alpha.3):
+  unstorage@2.0.0-alpha.7(@upstash/redis@1.37.0)(chokidar@4.0.3)(db0@0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15)))(lru-cache@11.2.7)(ofetch@2.0.0-alpha.3):
     optionalDependencies:
+      '@upstash/redis': 1.37.0
       chokidar: 4.0.3
-      db0: 0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(better-sqlite3@12.8.0)(kysely@0.28.15))
+      db0: 0.3.4(@libsql/client@0.17.2)(better-sqlite3@12.8.0)(drizzle-orm@0.45.2(@libsql/client@0.17.2)(@opentelemetry/api@1.9.1)(@types/pg@8.15.6)(@upstash/redis@1.37.0)(better-sqlite3@12.8.0)(kysely@0.28.15))
       lru-cache: 11.2.7
       ofetch: 2.0.0-alpha.3
 
@@ -15319,6 +16142,8 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
+  uuid@10.0.0: {}
+
   v8-compile-cache-lib@3.0.1: {}
 
   vary@1.1.2: {}
@@ -15657,6 +16482,8 @@ snapshots:
 
   xmlbuilder@11.0.1: {}
 
+  xtend@4.0.2: {}
+
   y18n@5.0.8: {}
 
   yallist@3.1.1: {}
diff --git a/server/plugins/sentry.ts b/server/plugins/sentry.ts
new file mode 100644
index 00000000..fe1f721e
--- /dev/null
+++ b/server/plugins/sentry.ts
@@ -0,0 +1,26 @@
+import * as Sentry from "@sentry/node";
+import { env } from "../../src/env";
+
+const SAMPLE_RATES = {
+  development: { traces: 1.0 },
+  production: { traces: 0.2 },
+} as const;
+
+let initialized = false;
+
+export default () => {
+  if (initialized || !env.SENTRY_DSN_BACKEND) {
+    return;
+  }
+
+  initialized = true;
+
+  const isDev = env.NODE_ENV === "development";
+  const rates = isDev ? SAMPLE_RATES.development : SAMPLE_RATES.production;
+
+  Sentry.init({
+    dsn: env.SENTRY_DSN_BACKEND,
+    environment: isDev ? "development" : "production",
+    tracesSampleRate: rates.traces,
+  });
+};
diff --git a/server/tasks/feeds/background-refresh.ts b/server/tasks/feeds/background-refresh.ts
index 248ab7e9..3a74526b 100644
--- a/server/tasks/feeds/background-refresh.ts
+++ b/server/tasks/feeds/background-refresh.ts
@@ -1,9 +1,10 @@
 import { defineTask } from "nitro/task";
-import { and, eq, lte } from "drizzle-orm";
+import { and, eq, isNull, lte, or } from "drizzle-orm";
 import { db } from "../../../src/server/db";
 import { feeds, user } from "../../../src/server/db/schema";
 import { fetchAndInsertFeedData } from "../../../src/server/rss/fetchFeeds";
 import { IS_MAIN_INSTANCE } from "../../../src/lib/constants";
+import { env } from "../../../src/env";
 
 export default defineTask({
   meta: {
@@ -11,8 +12,7 @@ export default defineTask({
     description: "Background refresh of active feeds for paid users",
   },
   async run() {
-    const backgroundRefreshEnabled =
-      process.env.BACKGROUND_REFRESH_ENABLED !== "false";
+    const backgroundRefreshEnabled = env.BACKGROUND_REFRESH_ENABLED !== "false";
 
     if (!backgroundRefreshEnabled) {
       console.log(
@@ -37,11 +37,17 @@ export default defineTask({
       adminUserIds = new Set(admins.map((a) => a.id));
     }
 
-    // Fetch all active feeds that need refreshing in a single query
+    // Fetch all active feeds that need refreshing in a single query.
+    // On non-main (self-hosted) instances, also include feeds where nextFetchAt
+    // is NULL — these have never been scheduled and should still be refreshed.
+    const fetchAtCondition = IS_MAIN_INSTANCE
+      ? lte(feeds.nextFetchAt, now)
+      : or(lte(feeds.nextFetchAt, now), isNull(feeds.nextFetchAt));
+
     const allFeedsDue = await db
       .select()
       .from(feeds)
-      .where(and(eq(feeds.isActive, true), lte(feeds.nextFetchAt, now)))
+      .where(and(eq(feeds.isActive, true), fetchAtCondition))
       .all();
 
     // Filter to admin users if on main instance
@@ -73,6 +79,14 @@ export default defineTask({
     let emptyCount = 0;
     let errorCount = 0;
 
+    // Map feed ID → name for error logging
+    const feedNameMap = new Map<number, string>();
+    for (const userFeeds of feedsByUser.values()) {
+      for (const feed of userFeeds) {
+        feedNameMap.set(feed.id, feed.name);
+      }
+    }
+
     for (const [userId, userFeeds] of feedsByUser) {
       try {
         // Fetch and insert feed data
@@ -86,6 +100,14 @@ export default defineTask({
             emptyCount++;
           } else if (result.status === "error") {
             errorCount++;
+            const feedName = feedNameMap.get(result.id) ?? "unknown";
+            const errMsg =
+              result.error instanceof Error
+                ? result.error.message
+                : String(result.error);
+            console.error(
+              `[background-refresh] Error refreshing feed "${feedName}" (id=${result.id}, user=${userId}): ${errMsg}`,
+            );
           }
         }
       } catch (e) {
diff --git a/src/app/__root.tsx b/src/app/__root.tsx
index 6e9ee0a3..cb86cbb1 100644
--- a/src/app/__root.tsx
+++ b/src/app/__root.tsx
@@ -9,6 +9,7 @@ import { SproutIcon } from "lucide-react";
 import { ThemeProvider } from "~/components/ThemeProvider";
 import { Toaster } from "~/components/ui/sonner";
 import { QueryProvider } from "~/lib/query-provider";
+import { initializeSentry } from "~/lib/sentry";
 
 import { ReloadPrompt } from "~/components/pwa/ReloadPrompt";
 import { Button } from "~/components/ui/button";
@@ -20,6 +21,11 @@ import appCss from "~/styles/globals.css?url";
 import "@fontsource-variable/outfit";
 import "@fontsource-variable/noto-serif";
 
+// Initialize Sentry as early as possible
+if (typeof window !== "undefined") {
+  initializeSentry();
+}
+
 const title = "Serial";
 const description =
   "A snappy, customizable video feed. Designed to show you exactly the content you want to see and nothing else.";
diff --git a/src/app/_app.admin.info.tsx b/src/app/_app.admin.info.tsx
index 2bf623e7..3d654654 100644
--- a/src/app/_app.admin.info.tsx
+++ b/src/app/_app.admin.info.tsx
@@ -5,6 +5,7 @@ import { ArrowLeftIcon } from "lucide-react";
 import { UserSignupsChart } from "~/components/admin/UserSignupsChart";
 import { UserSigninsChart } from "~/components/admin/UserSigninsChart";
 import { UserRetentionChart } from "~/components/admin/UserRetentionChart";
+import { UserFeedCountChart } from "~/components/admin/UserFeedCountChart";
 import { adminMiddleware } from "~/server/auth";
 import { Button } from "~/components/ui/button";
 
@@ -29,6 +30,7 @@ function AdminInfoPage() {
         <UserSignupsChart />
         <UserSigninsChart />
         <UserRetentionChart />
+        <UserFeedCountChart />
       </div>
     </div>
   );
diff --git a/src/app/_app.feeds.tsx b/src/app/_app.feeds.tsx
index 406fcc06..946c5cdd 100644
--- a/src/app/_app.feeds.tsx
+++ b/src/app/_app.feeds.tsx
@@ -13,6 +13,7 @@ import { FeedManagementTabs } from "~/components/feed/FeedManagementTabs";
 import { useFeedManagementShortcuts } from "~/components/feed/useManagementShortcuts";
 import { FeedEmptyState } from "~/components/feed/view-lists/EmptyStates";
 import { Alert, AlertDescription, AlertTitle } from "~/components/ui/alert";
+import { Progress } from "~/components/ui/progress";
 import { Badge } from "~/components/ui/badge";
 import { Button } from "~/components/ui/button";
 import { Checkbox } from "~/components/ui/checkbox";
@@ -20,6 +21,11 @@ import { ChipCombobox } from "~/components/ui/chip-combobox";
 import { Input } from "~/components/ui/input";
 import { ControlledResponsiveDialog } from "~/components/ui/responsive-dropdown";
 import { Switch } from "~/components/ui/switch";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "~/components/ui/tooltip";
 import { useContentCategories } from "~/lib/data/content-categories";
 import { useFeedCategories } from "~/lib/data/feed-categories";
 import {
@@ -29,6 +35,7 @@ import {
 import { useFeeds } from "~/lib/data/feeds";
 import {
   useBulkDeleteFeedsMutation,
+  useBulkSetActiveMutation,
   useSetFeedActiveMutation,
 } from "~/lib/data/feeds/mutations";
 import { useSubscription } from "~/lib/data/subscription";
@@ -40,6 +47,7 @@ import {
   useBulkAssignViewFeedMutation,
   useBulkRemoveViewFeedMutation,
 } from "~/lib/data/view-feeds/mutations";
+import { useShiftSelect } from "~/lib/hooks/useShiftSelect";
 
 export const Route = createFileRoute("/_app/feeds")({
   component: ManageFeedsPage,
@@ -94,6 +102,7 @@ function ManageFeedsPage() {
     useSubscription();
   const { mutate: setFeedActive, isPending: isTogglingActive } =
     useSetFeedActiveMutation();
+  const { mutateAsync: bulkSetActive } = useBulkSetActiveMutation();
 
   const [selectedFeedIds, setSelectedFeedIds] = useState<Set<number>>(
     new Set(),
@@ -135,6 +144,7 @@ function ManageFeedsPage() {
   const [showEditDialog, setShowEditDialog] = useState(false);
   const [selectedCategoryIds, setSelectedCategoryIds] = useState<number[]>([]);
   const [selectedViewIds, setSelectedViewIds] = useState<number[]>([]);
+  const [bulkActiveState, setBulkActiveState] = useState(false);
 
   const { mutateAsync: bulkDeleteFeeds, isPending: isDeletingFeeds } =
     useBulkDeleteFeedsMutation();
@@ -224,22 +234,16 @@ function ManageFeedsPage() {
     viewNamesMap,
   ]);
 
+  const filteredFeedIds = useMemo(
+    () => filteredFeeds.map((f) => f.id),
+    [filteredFeeds],
+  );
+  const handleFeedSelect = useShiftSelect(filteredFeedIds, setSelectedFeedIds);
+
   const selectedCount = selectedFeedIds.size;
   const allSelected =
     filteredFeeds.length > 0 && selectedCount === filteredFeeds.length;
 
-  const toggleFeedSelection = (feedId: number) => {
-    setSelectedFeedIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(feedId)) {
-        next.delete(feedId);
-      } else {
-        next.add(feedId);
-      }
-      return next;
-    });
-  };
-
   const selectAll = () => {
     setSelectedFeedIds(new Set(filteredFeeds.map((f) => f.id)));
   };
@@ -294,6 +298,11 @@ function ManageFeedsPage() {
   const openEditDialog = () => {
     setSelectedCategoryIds(getSharedCategories());
     setSelectedViewIds(getSharedViews());
+    // If all selected feeds are active, show active; otherwise show deactivated
+    const allActive = Array.from(selectedFeedIds).every(
+      (id) => feeds.find((f) => f.id === id)?.isActive,
+    );
+    setBulkActiveState(allActive);
     setShowEditDialog(true);
   };
 
@@ -349,8 +358,40 @@ function ManageFeedsPage() {
     const sharedCategories = getSharedCategories();
     const sharedViews = getSharedViews();
 
+    // Active state
+    const feedsToToggle = feedIds.filter((id) => {
+      const feed = feeds.find((f) => f.id === id);
+      return feed && feed.isActive !== bulkActiveState;
+    });
+
+    if (bulkActiveState && feedsToToggle.length > 0 && maxActiveFeeds >= 0) {
+      const wouldBeActive = activeFeeds + feedsToToggle.length;
+
+      if (wouldBeActive > maxActiveFeeds) {
+        const overLimit = wouldBeActive - maxActiveFeeds;
+        toast.warning(
+          `${overLimit} feed${overLimit > 1 ? "s would" : " would"} exceed your plan limit. To unlock more active feeds, you can switch to a higher plan.`,
+          {
+            action: {
+              label: "Upgrade",
+              onClick: () =>
+                launchDialog("subscription", { subscriptionView: "picker" }),
+            },
+          },
+        );
+        return;
+      }
+    }
+
     const promises: Array<Promise<void>> = [];
 
+    // Bulk active state toggle
+    if (feedsToToggle.length > 0) {
+      promises.push(
+        bulkSetActive({ feedIds: feedsToToggle, isActive: bulkActiveState }),
+      );
+    }
+
     // Categories
     const categoriesToAdd = selectedCategoryIds;
     const categoriesToRemove = sharedCategories.filter(
@@ -414,11 +455,6 @@ function ManageFeedsPage() {
         <div className="flex items-center justify-between">
           <div>
             <FeedManagementTabs value="feeds" />
-            {billingEnabled && maxActiveFeeds > 0 && (
-              <p className="text-muted-foreground mt-1 text-sm">
-                {activeFeeds} / {maxActiveFeeds} feeds active
-              </p>
-            )}
           </div>
           <ButtonWithShortcut
             variant="outline"
@@ -429,6 +465,20 @@ function ManageFeedsPage() {
             <PlusIcon size={16} />
           </ButtonWithShortcut>
         </div>
+        {billingEnabled &&
+          maxActiveFeeds > 0 &&
+          activeFeeds < maxActiveFeeds && (
+            <div className="mt-3 space-y-1.5">
+              <div className="flex items-center justify-between">
+                <p className="text-muted-foreground text-sm">
+                  {activeFeeds} / {maxActiveFeeds} feeds active
+                </p>
+              </div>
+              <Progress
+                value={Math.min(100, (activeFeeds / maxActiveFeeds) * 100)}
+              />
+            </div>
+          )}
         {billingEnabled &&
           maxActiveFeeds > 0 &&
           activeFeeds >= maxActiveFeeds && (
@@ -440,7 +490,9 @@ function ManageFeedsPage() {
                 will receive new content.
                 <Button
                   type="button"
-                  onClick={() => launchDialog("subscription")}
+                  onClick={() =>
+                    launchDialog("subscription", { subscriptionView: "picker" })
+                  }
                   className="mt-4"
                 >
                   Upgrade your plan
@@ -509,12 +561,12 @@ function ManageFeedsPage() {
                 className={`hover:bg-muted/50 flex w-full cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-3 text-left transition-colors ${
                   !feed.isActive ? "opacity-50" : ""
                 }`}
-                onClick={() => toggleFeedSelection(feed.id)}
+                onClick={(e) => handleFeedSelect(feed.id, e)}
               >
                 <Checkbox
                   id={`feed-${feed.id}`}
                   checked={isSelected}
-                  onCheckedChange={() => toggleFeedSelection(feed.id)}
+                  onCheckedChange={() => handleFeedSelect(feed.id)}
                   onClick={(e) => e.stopPropagation()}
                 />
                 <FeedImage
@@ -655,6 +707,49 @@ function ManageFeedsPage() {
         onOpenChange={setShowEditDialog}
         title="Edit Feeds"
         description={`Edit ${selectedCount} feed${selectedCount > 1 ? "s" : ""}.`}
+        headerRight={
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <div className="flex items-center">
+                <Switch
+                  checked={bulkActiveState}
+                  onCheckedChange={setBulkActiveState}
+                />
+              </div>
+            </TooltipTrigger>
+            <TooltipContent>
+              {bulkActiveState ? "Feeds active" : "Feeds inactive"}
+            </TooltipContent>
+          </Tooltip>
+        }
+        footer={
+          <div className="flex gap-2">
+            <Button
+              variant="outline"
+              className="flex-1"
+              onClick={() => setShowEditDialog(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              className="flex-1"
+              onClick={handleEditSave}
+              disabled={
+                isAssigningCategory ||
+                isRemovingCategory ||
+                isAssigningView ||
+                isRemovingView
+              }
+            >
+              {isAssigningCategory ||
+              isRemovingCategory ||
+              isAssigningView ||
+              isRemovingView
+                ? "Saving..."
+                : "Save"}
+            </Button>
+          </div>
+        }
       >
         <div className="grid gap-4">
           <ChipCombobox
@@ -682,32 +777,6 @@ function ManageFeedsPage() {
             selectedCategories={selectedCategoryIds}
             setSelectedCategories={setSelectedCategoryIds}
           />
-          <div className="flex gap-2">
-            <Button
-              variant="outline"
-              className="flex-1"
-              onClick={() => setShowEditDialog(false)}
-            >
-              Cancel
-            </Button>
-            <Button
-              className="flex-1"
-              onClick={handleEditSave}
-              disabled={
-                isAssigningCategory ||
-                isRemovingCategory ||
-                isAssigningView ||
-                isRemovingView
-              }
-            >
-              {isAssigningCategory ||
-              isRemovingCategory ||
-              isAssigningView ||
-              isRemovingView
-                ? "Saving..."
-                : "Save"}
-            </Button>
-          </div>
         </div>
       </ControlledResponsiveDialog>
     </div>
diff --git a/src/app/_app.import.tsx b/src/app/_app.import.tsx
index ed9abdda..b7c72066 100644
--- a/src/app/_app.import.tsx
+++ b/src/app/_app.import.tsx
@@ -109,6 +109,11 @@ function EditFeedsPage() {
   const [hasStartedImport, setHasStartedImport] = useState(false);
   const [isImportComplete, setIsImportComplete] = useState(false);
   const [importMode, setImportMode] = useState<ImportMode>("views");
+  // Signal to Playwright tests that React has hydrated and the onChange handler
+  // is attached to the file input, so file-chooser interactions are reliable.
+  useEffect(() => {
+    inputElementRef.current?.setAttribute("data-ready", "true");
+  }, []);
 
   const channelImportCount = feedsFoundFromFile?.filter(
     (feed) => feed.shouldImport,
@@ -132,7 +137,8 @@ function EditFeedsPage() {
         {
           action: {
             label: "Upgrade",
-            onClick: () => launchDialog("subscription"),
+            onClick: () =>
+              launchDialog("subscription", { subscriptionView: "picker" }),
           },
         },
       );
@@ -246,7 +252,7 @@ function EditFeedsPage() {
             </li>
           </ul>
           <ImportDropzone
-            inputElementRef={inputElementRef}
+            inputId="import-file-input"
             onSelectFile={onSelectFiles}
           />
         </>
@@ -267,10 +273,11 @@ function EditFeedsPage() {
         </>
       )}
       <input
+        id="import-file-input"
         ref={inputElementRef}
         type="file"
         accept="text/csv,.opml"
-        className="hidden"
+        className="sr-only"
         multiple
         onChange={onSelectFiles}
       />
diff --git a/src/app/_app.index.tsx b/src/app/_app.index.tsx
index cb9a5dbc..02c24fd0 100644
--- a/src/app/_app.index.tsx
+++ b/src/app/_app.index.tsx
@@ -14,6 +14,10 @@ import { ViewFilterChips } from "~/components/feed/ViewFilterChips";
 import { useUpdateViewFilter } from "~/lib/data/views";
 import { useShortcut } from "~/lib/hooks/useShortcut";
 import { SHORTCUT_KEYS } from "~/lib/constants/shortcuts";
+import { useFeeds } from "~/lib/data/feeds";
+import { useHasInitialData } from "~/lib/data/store";
+import FeedLoading from "~/components/loading";
+import { FeedEmptyState } from "~/components/feed/view-lists/EmptyStates";
 
 export const Route = createFileRoute("/_app/")({
   component: Home,
@@ -90,6 +94,21 @@ function Home() {
     updateViewFilter(views[nextIndex]!.id);
   });
 
+  const hasInitialData = useHasInitialData();
+  const { feeds, hasFetchedFeeds } = useFeeds();
+
+  if (!hasInitialData) {
+    return <FeedLoading />;
+  }
+
+  if (hasFetchedFeeds && !feeds.length) {
+    return (
+      <div className="mx-auto flex h-full w-full max-w-3xl flex-col items-center justify-center lg:pb-18">
+        <FeedEmptyState />
+      </div>
+    );
+  }
+
   return (
     <div className="mx-auto flex h-full w-full max-w-3xl flex-col items-center justify-center lg:pb-18">
       <div className="flex w-full flex-col px-6 pb-6 md:items-center md:text-center">
diff --git a/src/app/_app.tags.tsx b/src/app/_app.tags.tsx
index a3deee5f..404f675e 100644
--- a/src/app/_app.tags.tsx
+++ b/src/app/_app.tags.tsx
@@ -26,6 +26,7 @@ import { useFeedCategories } from "~/lib/data/feed-categories";
 import { useFeeds } from "~/lib/data/feeds";
 import { useViews } from "~/lib/data/views";
 import { INBOX_VIEW_ID } from "~/lib/data/views/constants";
+import { useShiftSelect } from "~/lib/hooks/useShiftSelect";
 import { useShortcut } from "~/lib/hooks/useShortcut";
 
 export const Route = createFileRoute("/_app/tags")({
@@ -146,19 +147,16 @@ function ManageTagsPage() {
     viewNamesMap,
   ]);
 
+  const filteredTagIds = useMemo(
+    () => filteredTags.map((t) => t.id),
+    [filteredTags],
+  );
+  const handleTagSelect = useShiftSelect(filteredTagIds, setSelectedTagIds);
+
   const selectedCount = selectedTagIds.size;
   const allSelected =
     filteredTags.length > 0 && selectedCount === filteredTags.length;
 
-  const toggleTagSelection = (tagId: number) => {
-    setSelectedTagIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(tagId)) next.delete(tagId);
-      else next.add(tagId);
-      return next;
-    });
-  };
-
   const selectAll = () =>
     setSelectedTagIds(new Set(filteredTags.map((t) => t.id)));
   const deselectAll = () => setSelectedTagIds(new Set());
@@ -299,12 +297,12 @@ function ManageTagsPage() {
                 type="button"
                 key={tag.id}
                 className="hover:bg-muted/50 flex w-full cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-3 text-left transition-colors"
-                onClick={() => toggleTagSelection(tag.id)}
+                onClick={(e) => handleTagSelect(tag.id, e)}
               >
                 <Checkbox
                   id={`tag-${tag.id}`}
                   checked={isSelected}
-                  onCheckedChange={() => toggleTagSelection(tag.id)}
+                  onCheckedChange={() => handleTagSelect(tag.id)}
                   onClick={(e) => e.stopPropagation()}
                 />
                 <span className="line-clamp-1 flex-1">{tag.name}</span>
diff --git a/src/app/_app.tsx b/src/app/_app.tsx
index 7133bb77..da8b5aef 100644
--- a/src/app/_app.tsx
+++ b/src/app/_app.tsx
@@ -1,19 +1,32 @@
 import "~/styles/globals.css";
 
 import { createFileRoute, Outlet } from "@tanstack/react-router";
-import { Suspense } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { CheckIcon } from "lucide-react";
+import { Suspense, useEffect, useRef, useState } from "react";
 import { AppDialogs } from "../components/feed/AppDialogs";
 import { Header } from "../components/feed/Header";
 import type React from "react";
 import FeedLoading from "~/components/loading";
 import { AppLeftSidebar, AppRightSidebar } from "~/components/app-sidebar";
+import { Button } from "~/components/ui/button";
+import { ControlledResponsiveDialog } from "~/components/ui/responsive-dropdown";
+import { useDialogStore } from "~/components/feed/dialogStore";
 import { ImpersonationBanner } from "~/components/ImpersonationBanner";
 import { ReleaseNotifier } from "~/components/releases/ReleaseNotifier";
 import { SidebarInset, SidebarProvider } from "~/components/ui/sidebar";
 import { InitialClientQueries } from "~/lib/data/InitialClientQueries";
+import { usePlanSuccessStore } from "~/lib/data/plan-success";
+import { useSubscription } from "~/lib/data/subscription";
 import { useAltKeyHeld } from "~/lib/hooks/useAltKeyHeld";
 import { authMiddleware } from "~/server/auth";
 import { getMostRecentRelease } from "~/lib/markdown/loaders";
+import { orpc, orpcRouterClient } from "~/lib/orpc";
+import { PLANS } from "~/server/subscriptions/plans";
+import {
+  getPlanFeatures,
+  PLAN_ICONS,
+} from "~/components/feed/subscription-dialog";
 
 export const Route = createFileRoute("/_app")({
   component: RootLayout,
@@ -26,9 +39,190 @@ export const Route = createFileRoute("/_app")({
   },
 });
 
+const MAX_SYNC_ATTEMPTS = 10;
+const SYNC_POLL_INTERVAL_MS = 3_000;
+
+function useCheckoutSuccess() {
+  const queryClient = useQueryClient();
+  const [awaitingUpgrade, setAwaitingUpgrade] = useState(false);
+  const { planId, billingEnabled } = useSubscription();
+  const openPlanSuccess = usePlanSuccessStore((s) => s.openDialog);
+  const previousPlanIdRef = useRef<string | null>(null);
+  const hasProcessedCheckout = useRef(false);
+
+  // Detect checkout_success query param (waits for billingEnabled to resolve)
+  useEffect(() => {
+    if (!billingEnabled) return;
+    if (hasProcessedCheckout.current) return;
+
+    const params = new URLSearchParams(window.location.search);
+    if (params.get("checkout_success") !== "true") return;
+
+    hasProcessedCheckout.current = true;
+
+    // Remove the query param from the URL
+    params.delete("checkout_success");
+    const newUrl =
+      window.location.pathname +
+      (params.size > 0 ? `?${params.toString()}` : "");
+    window.history.replaceState({}, "", newUrl);
+
+    // Snapshot the current plan so we can detect when it changes
+    previousPlanIdRef.current = planId;
+    setAwaitingUpgrade(true);
+  }, [billingEnabled, planId]);
+
+  // Eagerly sync after checkout, then poll if needed
+  useEffect(() => {
+    if (!awaitingUpgrade) return;
+
+    const previousPlanId = previousPlanIdRef.current;
+
+    // Check if plan has already changed (e.g. webhook arrived fast)
+    if (previousPlanId !== null && planId !== previousPlanId) {
+      setAwaitingUpgrade(false);
+      openPlanSuccess();
+      return;
+    }
+
+    const controller = new AbortController();
+    let attempts = 0;
+    let isSyncing = false;
+
+    const sync = async (): Promise<boolean> => {
+      if (isSyncing) return false;
+      isSyncing = true;
+      try {
+        const result = await orpcRouterClient.subscription.syncAfterCheckout();
+
+        if (controller.signal.aborted) return false;
+
+        // Update the getStatus query data with the fresh result
+        queryClient.setQueryData(
+          orpc.subscription.getStatus.queryOptions().queryKey,
+          result,
+        );
+
+        const planChanged =
+          previousPlanId !== null && result.planId !== previousPlanId;
+        if (planChanged) {
+          setAwaitingUpgrade(false);
+          openPlanSuccess();
+          return true;
+        }
+      } catch {
+        // Ignore errors, will retry
+      } finally {
+        isSyncing = false;
+      }
+      return false;
+    };
+
+    // First attempt immediately, then poll with interval
+    void sync().then((done) => {
+      if (done || controller.signal.aborted) return;
+
+      const interval = setInterval(() => {
+        if (controller.signal.aborted) {
+          clearInterval(interval);
+          return;
+        }
+
+        attempts++;
+        void sync().then((done) => {
+          if (done || attempts >= MAX_SYNC_ATTEMPTS) {
+            clearInterval(interval);
+            if (!done) {
+              // Give up gracefully — user will see the upgrade on next load
+              setAwaitingUpgrade(false);
+            }
+          }
+        });
+      }, SYNC_POLL_INTERVAL_MS);
+    });
+
+    return () => {
+      controller.abort();
+    };
+  }, [awaitingUpgrade, planId, queryClient, openPlanSuccess]);
+
+  return { awaitingUpgrade, billingEnabled };
+}
+
+/**
+ * Detect ?subscription=open query param (set by the Polar portal return URL)
+ * and re-open the subscription dialog.
+ */
+function usePortalReturn() {
+  const launchDialog = useDialogStore((s) => s.launchDialog);
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    if (params.get("subscription") !== "open") return;
+
+    // Clean the query param from the URL
+    params.delete("subscription");
+    const newUrl =
+      window.location.pathname +
+      (params.size > 0 ? `?${params.toString()}` : "");
+    window.history.replaceState({}, "", newUrl);
+
+    launchDialog("subscription");
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+}
+
+function CheckoutSuccessDialog({
+  open,
+  onOpenChange,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { planId } = useSubscription();
+  const plan = PLANS[planId];
+  const features = getPlanFeatures(plan);
+  const Icon = PLAN_ICONS[planId] ?? PLAN_ICONS.free;
+
+  return (
+    <ControlledResponsiveDialog
+      open={open}
+      onOpenChange={onOpenChange}
+      title="Welcome to Serial"
+      description="Your subscription is now active. Thank you for your support!"
+      headerClassName="text-center"
+    >
+      <div className="flex flex-col items-center gap-4 pt-4">
+        <div className="bg-primary/10 flex size-12 items-center justify-center rounded-full">
+          <Icon size={24} className="text-primary" />
+        </div>
+        <h3 className="text-lg font-semibold">{plan.name} Plan</h3>
+        <ul className="w-full space-y-2">
+          {features.map((feature) => (
+            <li key={feature} className="flex items-center gap-2 text-sm">
+              <CheckIcon size={16} className="text-primary shrink-0" />
+              {feature}
+            </li>
+          ))}
+        </ul>
+        <Button className="mt-2 w-full" onClick={() => onOpenChange(false)}>
+          Get Started
+        </Button>
+      </div>
+    </ControlledResponsiveDialog>
+  );
+}
+
 function RootLayout() {
   const { mostRecentRelease } = Route.useLoaderData();
   useAltKeyHeld();
+  usePortalReturn();
+  const { awaitingUpgrade, billingEnabled } = useCheckoutSuccess();
+  const showPlanSuccess = usePlanSuccessStore((s) => s.showDialog);
+  const closePlanSuccess = usePlanSuccessStore((s) => s.closeDialog);
+
+  if (awaitingUpgrade) {
+    return <FeedLoading />;
+  }
 
   return (
     // <ApplyColorTheme>
@@ -51,6 +245,12 @@ function RootLayout() {
                 <Outlet />
               </div>
               <AppDialogs />
+              {billingEnabled && (
+                <CheckoutSuccessDialog
+                  open={showPlanSuccess}
+                  onOpenChange={closePlanSuccess}
+                />
+              )}
             </main>
             <ReleaseNotifier mostRecentRelease={mostRecentRelease} />
           </SidebarInset>
diff --git a/src/app/_app.views.tsx b/src/app/_app.views.tsx
index e81150a7..0ef3da6f 100644
--- a/src/app/_app.views.tsx
+++ b/src/app/_app.views.tsx
@@ -25,6 +25,7 @@ import {
   useDeleteViewMutation,
   useEditViewMutation,
 } from "~/lib/data/views/mutations";
+import { useShiftSelect } from "~/lib/hooks/useShiftSelect";
 import { useShortcut } from "~/lib/hooks/useShortcut";
 import { VIEW_READ_STATUS } from "~/server/db/constants";
 
@@ -114,19 +115,16 @@ function ManageViewsPage() {
     });
   }, [customViews, searchQuery, feedNamesMap, categoryNamesMap]);
 
+  const filteredViewIds = useMemo(
+    () => filteredViews.map((v) => v.id),
+    [filteredViews],
+  );
+  const handleViewSelect = useShiftSelect(filteredViewIds, setSelectedViewIds);
+
   const selectedCount = selectedViewIds.size;
   const allSelected =
     filteredViews.length > 0 && selectedCount === filteredViews.length;
 
-  const toggleViewSelection = (viewId: number) => {
-    setSelectedViewIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(viewId)) next.delete(viewId);
-      else next.add(viewId);
-      return next;
-    });
-  };
-
   const selectAll = () =>
     setSelectedViewIds(new Set(filteredViews.map((v) => v.id)));
   const deselectAll = () => setSelectedViewIds(new Set());
@@ -266,12 +264,12 @@ function ManageViewsPage() {
                 type="button"
                 key={view.id}
                 className="hover:bg-muted/50 flex w-full cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-3 text-left transition-colors"
-                onClick={() => toggleViewSelection(view.id)}
+                onClick={(e) => handleViewSelect(view.id, e)}
               >
                 <Checkbox
                   id={`view-${view.id}`}
                   checked={isSelected}
-                  onCheckedChange={() => toggleViewSelection(view.id)}
+                  onCheckedChange={() => handleViewSelect(view.id)}
                   onClick={(e) => e.stopPropagation()}
                 />
                 <span className="line-clamp-1 flex-1">{view.name}</span>
diff --git a/src/app/_web.releases.$slug.tsx b/src/app/_web.releases.$slug.tsx
index 66691ce8..13f18395 100644
--- a/src/app/_web.releases.$slug.tsx
+++ b/src/app/_web.releases.$slug.tsx
@@ -14,6 +14,7 @@ export const Route = createFileRoute("/_web/releases/$slug")({
 
 function RouteComponent() {
   const { release, isAuthed } = Route.useLoaderData();
+  const supportEmail = import.meta.env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS;
 
   return (
     <article>
@@ -39,12 +40,14 @@ function RouteComponent() {
       {isAuthed && (
         <>
           <p className="pt-6 pb-2">
-            Thanks for checking out the release log! If you have any questions
-            or feedback, feel free to send me an email at{" "}
-            <a href="mailto:hey@serial.tube?subject=Question%20about%20serial.tube">
-              hey@serial.tube
-            </a>
-            .
+            Thanks for checking out the release log!
+            {supportEmail && (
+              <>
+                {" "}
+                If you have any questions or feedback, feel free to send me an
+                email at <a href={`mailto:${supportEmail}`}>{supportEmail}</a>.
+              </>
+            )}
           </p>
           <Link to="/">Return to the app →</Link>
         </>
diff --git a/src/app/welcome.tsx b/src/app/welcome.tsx
index 9749d25a..86f687d9 100644
--- a/src/app/welcome.tsx
+++ b/src/app/welcome.tsx
@@ -23,6 +23,7 @@ export const Route = createFileRoute("/welcome")({
 
 function RouteComponent() {
   const { mostRecentRelease } = Route.useLoaderData();
+  const supportEmail = import.meta.env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS;
 
   return (
     <main className="bg-background text-pretty">
@@ -187,17 +188,16 @@ function RouteComponent() {
           </div>
         </section>
       </div>
-      <section className="space-y-2 px-6 py-16 text-center">
-        <p className="text-lg">
-          Have a question? Reach us at{" "}
-          <a
-            href="mailto:hey@serial.tube?subject=Question%20about%20serial.tube"
-            className="underline"
-          >
-            hey@serial.tube
-          </a>
-        </p>
-      </section>
+      {supportEmail && (
+        <section className="space-y-2 px-6 py-16 text-center">
+          <p className="text-lg">
+            Have a question? Reach us at{" "}
+            <a href={`mailto:${supportEmail}`} className="underline">
+              {supportEmail}
+            </a>
+          </p>
+        </section>
+      )}
     </main>
   );
 }
diff --git a/src/components/AddContentCategoryDialog.tsx b/src/components/AddContentCategoryDialog.tsx
index 7f32fa54..271e7793 100644
--- a/src/components/AddContentCategoryDialog.tsx
+++ b/src/components/AddContentCategoryDialog.tsx
@@ -285,13 +285,7 @@ export function EditContentCategoryDialog({
       open={selectedContentCategoryId !== null}
       onOpenChange={onClose}
       title="Edit Tag"
-    >
-      <div className="grid gap-6">
-        <CategoryNameInput name={name} setName={setName} />
-        <CategoryFeedsInput
-          selectedFeedIds={selectedFeedIds}
-          setSelectedFeedIds={setSelectedFeedIds}
-        />
+      footer={
         <div className="flex gap-2">
           <Button
             disabled={isDeletingContentCategory}
@@ -364,6 +358,14 @@ export function EditContentCategoryDialog({
             {isUpdatingContentCategory ? "Saving..." : "Save"}
           </Button>
         </div>
+      }
+    >
+      <div className="grid gap-6">
+        <CategoryNameInput name={name} setName={setName} />
+        <CategoryFeedsInput
+          selectedFeedIds={selectedFeedIds}
+          setSelectedFeedIds={setSelectedFeedIds}
+        />
       </div>
     </ControlledResponsiveDialog>
   );
diff --git a/src/components/AddFeedDialog.tsx b/src/components/AddFeedDialog.tsx
index 87abb84d..33dba884 100644
--- a/src/components/AddFeedDialog.tsx
+++ b/src/components/AddFeedDialog.tsx
@@ -340,6 +340,64 @@ export function EditFeedDialog({
           </TooltipContent>
         </Tooltip>
       }
+      footer={
+        <div className="flex gap-2">
+          <Button
+            disabled={isDeletingFeed}
+            className="flex-1"
+            variant="destructive"
+            onClick={async () => {
+              if (selectedFeedId === null) return;
+
+              setIsDeletingFeed(true);
+              try {
+                const deleteFeedPromise = deleteFeed(selectedFeedId);
+                toast.promise(deleteFeedPromise, {
+                  loading: "Deleting feed...",
+                  success: () => {
+                    return "Feed deleted!";
+                  },
+                  error: () => {
+                    return "Something went wrong deleting your feed.";
+                  },
+                });
+                onClose();
+              } catch {
+                // Error handled by toast.promise
+              }
+
+              setIsDeletingFeed(false);
+            }}
+          >
+            {isDeletingFeed ? "Deleting..." : "Delete"}
+          </Button>
+          <Button
+            disabled={isFormDisabled || isUpdatingFeed}
+            onClick={async () => {
+              if (selectedFeedId === null) return;
+
+              setIsUpdatingFeed(true);
+              try {
+                await editFeed({
+                  feedId: selectedFeedId,
+                  categoryIds: selectedCategories,
+                  viewIds: selectedViewIds,
+                  openLocation: selectedOpenLocation,
+                });
+                toast.success("Feed updated!");
+                onClose();
+              } catch {
+                // Error handled by toast
+              }
+
+              setIsUpdatingFeed(false);
+            }}
+            className="flex-1"
+          >
+            {isUpdatingFeed ? "Saving..." : "Save"}
+          </Button>
+        </div>
+      }
     >
       <div className="grid gap-6">
         <div className="grid gap-2">
@@ -422,62 +480,6 @@ export function EditFeedDialog({
           openLocation={selectedOpenLocation}
           setOpenLocation={setSelectedOpenLocation}
         />
-        <div className="flex gap-2">
-          <Button
-            disabled={isDeletingFeed}
-            className="flex-1"
-            variant="destructive"
-            onClick={async () => {
-              if (selectedFeedId === null) return;
-
-              setIsDeletingFeed(true);
-              try {
-                const deleteFeedPromise = deleteFeed(selectedFeedId);
-                toast.promise(deleteFeedPromise, {
-                  loading: "Deleting feed...",
-                  success: () => {
-                    return "Feed deleted!";
-                  },
-                  error: () => {
-                    return "Something went wrong deleting your feed.";
-                  },
-                });
-                onClose();
-              } catch {
-                // Error handled by toast.promise
-              }
-
-              setIsDeletingFeed(false);
-            }}
-          >
-            {isDeletingFeed ? "Deleting..." : "Delete"}
-          </Button>
-          <Button
-            disabled={isFormDisabled || isUpdatingFeed}
-            onClick={async () => {
-              if (selectedFeedId === null) return;
-
-              setIsUpdatingFeed(true);
-              try {
-                await editFeed({
-                  feedId: selectedFeedId,
-                  categoryIds: selectedCategories,
-                  viewIds: selectedViewIds,
-                  openLocation: selectedOpenLocation,
-                });
-                toast.success("Feed updated!");
-                onClose();
-              } catch {
-                // Error handled by toast
-              }
-
-              setIsUpdatingFeed(false);
-            }}
-            className="flex-1"
-          >
-            {isUpdatingFeed ? "Saving..." : "Save"}
-          </Button>
-        </div>
       </div>
     </ControlledResponsiveDialog>
   );
diff --git a/src/components/AddViewDialog.tsx b/src/components/AddViewDialog.tsx
index e85b651e..050c55e9 100644
--- a/src/components/AddViewDialog.tsx
+++ b/src/components/AddViewDialog.tsx
@@ -517,26 +517,7 @@ export function EditViewDialog({
       open={selectedViewId !== null}
       onOpenChange={onClose}
       title="Edit View"
-    >
-      <div className="grid gap-6">
-        <ViewNameInput name={name} setName={setName} />
-        <ViewFeedsInput
-          selectedFeedIds={selectedFeedIds}
-          setSelectedFeedIds={setSelectedFeedIds}
-        />
-        <ViewCategoriesInput
-          selectedCategories={selectedCategories}
-          setSelectedCategories={setSelectedCategories}
-        />
-        <ViewTimeInput
-          daysWindow={daysTimeWindow}
-          setDaysWindow={setDaysTimeWindow}
-        />
-        <ViewContentTypeInput
-          contentType={contentType}
-          setContentType={setContentType}
-        />
-        <ViewLayoutInput layout={layout} setLayout={setLayout} />
+      footer={
         <div className="flex gap-2">
           <Button
             disabled={isDeletingView}
@@ -607,6 +588,27 @@ export function EditViewDialog({
             {isUpdatingView ? "Saving..." : "Save"}
           </Button>
         </div>
+      }
+    >
+      <div className="grid gap-6">
+        <ViewNameInput name={name} setName={setName} />
+        <ViewFeedsInput
+          selectedFeedIds={selectedFeedIds}
+          setSelectedFeedIds={setSelectedFeedIds}
+        />
+        <ViewCategoriesInput
+          selectedCategories={selectedCategories}
+          setSelectedCategories={setSelectedCategories}
+        />
+        <ViewTimeInput
+          daysWindow={daysTimeWindow}
+          setDaysWindow={setDaysTimeWindow}
+        />
+        <ViewContentTypeInput
+          contentType={contentType}
+          setContentType={setContentType}
+        />
+        <ViewLayoutInput layout={layout} setLayout={setLayout} />
       </div>
     </ControlledResponsiveDialog>
   );
diff --git a/src/components/admin/UserFeedCountChart.tsx b/src/components/admin/UserFeedCountChart.tsx
new file mode 100644
index 00000000..96ee9fc9
--- /dev/null
+++ b/src/components/admin/UserFeedCountChart.tsx
@@ -0,0 +1,112 @@
+"use client";
+
+import { useQuery } from "@tanstack/react-query";
+import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
+
+import type { ChartConfig } from "~/components/ui/chart";
+import { orpc } from "~/lib/orpc";
+import {
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+} from "~/components/ui/chart";
+import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";
+
+const chartConfig = {
+  allUsers: {
+    label: "All Feeds",
+    color: "hsl(var(--chart-1))",
+  },
+  activeUsers: {
+    label: "Active Feeds",
+    color: "hsl(var(--chart-2))",
+  },
+} satisfies ChartConfig;
+
+export function UserFeedCountChart() {
+  const { data, isLoading } = useQuery(
+    orpc.admin.getFeedCountDistribution.queryOptions({
+      staleTime: 0,
+      gcTime: 0,
+    }),
+  );
+
+  return (
+    <Card>
+      <CardHeader>
+        <CardTitle className="font-sans text-base font-medium">
+          User Feed Count Distribution
+        </CardTitle>
+      </CardHeader>
+      <CardContent>
+        {isLoading ? (
+          <div className="text-muted-foreground flex h-[250px] items-center justify-center">
+            Loading...
+          </div>
+        ) : !data?.distribution.length ? (
+          <div className="text-muted-foreground flex h-[250px] items-center justify-center">
+            No data available
+          </div>
+        ) : (
+          <ChartContainer config={chartConfig} className="h-[250px] w-full">
+            <LineChart data={data.distribution}>
+              <CartesianGrid vertical={false} />
+              <XAxis
+                dataKey="feedCount"
+                tickLine={false}
+                axisLine={false}
+                tickMargin={8}
+                label={{
+                  value: "# of Feeds",
+                  position: "insideBottom",
+                  offset: -2,
+                  className: "fill-muted-foreground text-xs",
+                }}
+              />
+              <YAxis
+                tickLine={false}
+                axisLine={false}
+                tickMargin={8}
+                allowDecimals={false}
+                label={{
+                  value: "# of Users",
+                  angle: -90,
+                  position: "insideLeft",
+                  offset: 10,
+                  className: "fill-muted-foreground text-xs",
+                }}
+              />
+              <ChartTooltip
+                cursor={false}
+                content={
+                  <ChartTooltipContent
+                    hideIndicator
+                    labelFormatter={(_, payload) => {
+                      const item = payload[0];
+                      if (!item) return "";
+                      return `${item.payload.feedCount} feeds`;
+                    }}
+                  />
+                }
+              />
+              <Line
+                dataKey="allUsers"
+                type="monotone"
+                stroke="var(--color-allUsers)"
+                strokeWidth={2}
+                dot={false}
+              />
+              <Line
+                dataKey="activeUsers"
+                type="monotone"
+                stroke="var(--color-activeUsers)"
+                strokeWidth={2}
+                dot={false}
+              />
+            </LineChart>
+          </ChartContainer>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/src/components/feed/AppDialogs.tsx b/src/components/feed/AppDialogs.tsx
index 0b618853..1cdefdaa 100644
--- a/src/components/feed/AppDialogs.tsx
+++ b/src/components/feed/AppDialogs.tsx
@@ -1,3 +1,5 @@
+import { useDialogStore } from "./dialogStore";
+import { SubscriptionDialog } from "./subscription-dialog";
 import { UserProfileEditDialog } from "./UserProfileEditDialog";
 import { AddContentCategoryDialog } from "~/components/AddContentCategoryDialog";
 import { AddFeedDialog } from "~/components/AddFeedDialog";
@@ -6,6 +8,8 @@ import { ConnectionsDialog } from "~/components/ConnectionsDialog";
 import { CustomVideoDialog } from "~/components/CustomVideoDialog";
 
 export function AppDialogs() {
+  const { dialog, closeDialog } = useDialogStore();
+
   return (
     <>
       <AddFeedDialog />
@@ -14,6 +18,12 @@ export function AppDialogs() {
       <CustomVideoDialog />
       <UserProfileEditDialog />
       <ConnectionsDialog />
+      <SubscriptionDialog
+        open={dialog === "subscription"}
+        onOpenChange={(open) => {
+          if (!open) closeDialog();
+        }}
+      />
     </>
   );
 }
diff --git a/src/components/feed/FeedManagementTabs.tsx b/src/components/feed/FeedManagementTabs.tsx
index c32a7c37..eb71512f 100644
--- a/src/components/feed/FeedManagementTabs.tsx
+++ b/src/components/feed/FeedManagementTabs.tsx
@@ -30,23 +30,35 @@ export function FeedManagementTabs({ value }: { value: FeedManagementTab }) {
 
   return (
     <Tabs value={value}>
-      <TabsList variant="line">
+      <TabsList variant="pill">
         <TabsTrigger value="feeds" asChild>
           <Link to="/feeds">
             Feeds
-            <KeyboardShortcutDisplay shortcut="1" position="right" />
+            <KeyboardShortcutDisplay
+              shortcut="1"
+              position="right"
+              isActive={value === "feeds"}
+            />
           </Link>
         </TabsTrigger>
         <TabsTrigger value="views" asChild>
           <Link to="/views">
             Views
-            <KeyboardShortcutDisplay shortcut="2" position="right" />
+            <KeyboardShortcutDisplay
+              shortcut="2"
+              position="right"
+              isActive={value === "views"}
+            />
           </Link>
         </TabsTrigger>
         <TabsTrigger value="tags" asChild>
           <Link to="/tags">
             Tags
-            <KeyboardShortcutDisplay shortcut="3" position="right" />
+            <KeyboardShortcutDisplay
+              shortcut="3"
+              position="right"
+              isActive={value === "tags"}
+            />
           </Link>
         </TabsTrigger>
       </TabsList>
diff --git a/src/components/feed/SubscriptionDialog.tsx b/src/components/feed/SubscriptionDialog.tsx
deleted file mode 100644
index 77750dfb..00000000
--- a/src/components/feed/SubscriptionDialog.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { useMutation, useQuery } from "@tanstack/react-query";
-import { CheckIcon } from "lucide-react";
-import { toast } from "sonner";
-import type { PlanConfig } from "~/server/subscriptions/plans";
-import { PLAN_IDS, PLANS } from "~/server/subscriptions/plans";
-import { Button } from "~/components/ui/button";
-import { Input } from "~/components/ui/input";
-import { ControlledResponsiveDialog } from "~/components/ui/responsive-dropdown";
-import { useSubscription } from "~/lib/data/subscription";
-import { orpc } from "~/lib/orpc";
-import { authClient, useSession } from "~/lib/auth-client";
-
-function formatPrice(cents: number): string {
-  const dollars = cents / 100;
-  return cents % 100 === 0 ? `$${dollars}` : `$${dollars.toFixed(2)}`;
-}
-
-function formatRefreshInterval(ms: number | null): string {
-  if (ms == null) return "Manual refresh only";
-  const minutes = ms / (60 * 1000);
-  if (minutes < 60) return `Background refresh every ${minutes} min`;
-  const hours = minutes / 60;
-  return `Background refresh every ${hours} hr`;
-}
-
-function getPlanFeatures(plan: PlanConfig): string[] {
-  const features: string[] = [];
-  features.push(`Up to ${plan.maxActiveFeeds.toLocaleString()} active feeds`);
-  features.push(formatRefreshInterval(plan.backgroundRefreshIntervalMs));
-
-  return features;
-}
-
-function EmailVerificationBanner({ onVerified }: { onVerified: () => void }) {
-  const { data: session } = useSession();
-  const [otpSent, setOtpSent] = useState(false);
-  const [otp, setOtp] = useState("");
-  const [sending, setSending] = useState(false);
-  const [verifying, setVerifying] = useState(false);
-
-  const email = session?.user?.email;
-
-  async function handleSendOtp() {
-    if (!email) return;
-    setSending(true);
-    try {
-      await authClient.emailOtp.sendVerificationOtp({
-        email,
-        type: "email-verification",
-      });
-      setOtpSent(true);
-      toast.success("Verification code sent to your email");
-    } catch {
-      toast.error("Failed to send verification code");
-    } finally {
-      setSending(false);
-    }
-  }
-
-  async function handleVerify() {
-    if (!email || !otp) return;
-    setVerifying(true);
-    try {
-      await authClient.emailOtp.verifyEmail({
-        email,
-        otp,
-      });
-      toast.success("Email verified!");
-      onVerified();
-    } catch {
-      toast.error("Invalid verification code");
-    } finally {
-      setVerifying(false);
-    }
-  }
-
-  return (
-    <div className="rounded-lg border border-yellow-500/50 bg-yellow-500/10 p-3">
-      <p className="text-sm font-medium">Verify your email to subscribe</p>
-      <p className="text-muted-foreground mt-1 text-xs">
-        You need to verify your email address before upgrading your plan.
-      </p>
-      {!otpSent ? (
-        <Button
-          size="sm"
-          variant="outline"
-          className="mt-2"
-          disabled={sending}
-          onClick={handleSendOtp}
-        >
-          {sending ? "Sending..." : "Send verification code"}
-        </Button>
-      ) : (
-        <div className="mt-2 flex gap-2">
-          <Input
-            type="text"
-            inputMode="numeric"
-            placeholder="Enter code"
-            value={otp}
-            onChange={(e) => setOtp(e.target.value)}
-            className="h-8 w-32"
-          />
-          <Button
-            size="sm"
-            disabled={verifying || otp.length === 0}
-            onClick={handleVerify}
-          >
-            {verifying ? "Verifying..." : "Verify"}
-          </Button>
-        </div>
-      )}
-    </div>
-  );
-}
-
-export function SubscriptionDialog({
-  open,
-  onOpenChange,
-}: {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-}) {
-  const { planId } = useSubscription();
-  const { data: session, refetch: refetchSession } = useSession();
-  const [showVerification, setShowVerification] = useState(false);
-  const [pendingPlanId, setPendingPlanId] = useState<"standard" | "pro" | null>(
-    null,
-  );
-
-  const emailVerified = session?.user?.emailVerified ?? false;
-
-  const { data: products } = useQuery({
-    ...orpc.subscription.getProducts.queryOptions(),
-    enabled: open,
-    staleTime: 5 * 60 * 1000,
-  });
-
-  const checkoutMutation = useMutation(
-    orpc.subscription.createCheckout.mutationOptions({
-      onSuccess: (result) => {
-        if (result.error === "email-not-verified") {
-          setShowVerification(true);
-          toast.error("Please verify your email before subscribing");
-          return;
-        }
-        if (result.url) {
-          window.location.assign(result.url);
-        }
-      },
-    }),
-  );
-
-  const portalMutation = useMutation(
-    orpc.subscription.createPortalSession.mutationOptions({
-      onSuccess: (result) => {
-        if (result.url) {
-          window.location.assign(result.url);
-        }
-      },
-    }),
-  );
-
-  const isSubscribed = planId !== "free";
-
-  function handleSubscribeClick(id: "standard" | "pro") {
-    setPendingPlanId(id);
-    checkoutMutation.mutate({ planId: id });
-  }
-
-  async function handleVerified() {
-    await refetchSession();
-    setShowVerification(false);
-    if (pendingPlanId) {
-      checkoutMutation.mutate({ planId: pendingPlanId });
-    }
-  }
-
-  return (
-    <ControlledResponsiveDialog
-      open={open}
-      onOpenChange={onOpenChange}
-      title="Subscription"
-      description="Choose a plan that fits your needs."
-    >
-      <div className="grid gap-3">
-        {showVerification && !emailVerified && (
-          <EmailVerificationBanner onVerified={handleVerified} />
-        )}
-        {PLAN_IDS.map((id) => {
-          const plan = PLANS[id];
-          const isCurrent = id === planId;
-          const isPaid = id !== "free";
-          const product = products?.find((p) => p.planId === id);
-          const monthlyPrice = product?.monthlyPrice ?? null;
-          const annualPrice = product?.annualPrice ?? null;
-          const hasPrice = monthlyPrice != null || annualPrice != null;
-          const features = getPlanFeatures(plan);
-
-          return (
-            <div
-              key={id}
-              className={`rounded-lg border p-4 ${
-                isCurrent ? "border-primary bg-primary/5" : "border-border"
-              }`}
-            >
-              <div>
-                <h3 className="font-medium">
-                  {plan.name}
-                  {isCurrent && (
-                    <span className="text-muted-foreground ml-2 text-xs">
-                      Current
-                    </span>
-                  )}
-                </h3>
-                {hasPrice ? (
-                  <p className="text-muted-foreground text-sm">
-                    {monthlyPrice != null && `${formatPrice(monthlyPrice)}/mo`}
-                    {monthlyPrice != null && annualPrice != null && " · "}
-                    {annualPrice != null && `${formatPrice(annualPrice)}/yr`}
-                  </p>
-                ) : (
-                  <p className="text-muted-foreground text-sm">
-                    {isPaid ? "" : "Free"}
-                  </p>
-                )}
-              </div>
-              <ul className="mt-2 space-y-1">
-                {features.map((feature) => (
-                  <li
-                    key={feature}
-                    className="text-muted-foreground flex items-center gap-2 text-xs"
-                  >
-                    <CheckIcon size={12} />
-                    {feature}
-                  </li>
-                ))}
-              </ul>
-              {isCurrent && isSubscribed && (
-                <div className="mt-3">
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    className="w-full"
-                    disabled={portalMutation.isPending}
-                    onClick={() => portalMutation.mutate({})}
-                  >
-                    Manage
-                  </Button>
-                </div>
-              )}
-              {!isCurrent && id !== "free" && (
-                <div className="mt-3">
-                  <Button
-                    size="sm"
-                    className="w-full"
-                    disabled={checkoutMutation.isPending}
-                    onClick={() => handleSubscribeClick(id)}
-                  >
-                    Subscribe
-                  </Button>
-                </div>
-              )}
-            </div>
-          );
-        })}
-      </div>
-    </ControlledResponsiveDialog>
-  );
-}
diff --git a/src/components/feed/UserManagementButton.tsx b/src/components/feed/UserManagementButton.tsx
index d694ca29..a0bead6d 100644
--- a/src/components/feed/UserManagementButton.tsx
+++ b/src/components/feed/UserManagementButton.tsx
@@ -10,7 +10,6 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import { useDialogStore } from "./dialogStore";
-import { SubscriptionDialog } from "./SubscriptionDialog";
 import { Button } from "~/components/ui/button";
 import { DropdownMenuSeparator } from "~/components/ui/dropdown-menu";
 import {
@@ -33,7 +32,7 @@ export function UserManagementNavItem() {
     isPending, // loading state
   } = authClient.useSession();
 
-  const { launchDialog, closeDialog, dialog } = useDialogStore();
+  const { launchDialog } = useDialogStore();
   const { billingEnabled, planName } = useSubscription();
 
   const router = useRouter();
@@ -43,12 +42,6 @@ export function UserManagementNavItem() {
 
   return (
     <SidebarMenu>
-      <SubscriptionDialog
-        open={dialog === "subscription"}
-        onOpenChange={(open) => {
-          if (!open) closeDialog();
-        }}
-      />
       <SidebarMenuItem>
         <ResponsiveDropdown
           side="right"
diff --git a/src/components/feed/dialogStore.ts b/src/components/feed/dialogStore.ts
index bf797613..b3795699 100644
--- a/src/components/feed/dialogStore.ts
+++ b/src/components/feed/dialogStore.ts
@@ -8,16 +8,28 @@ export type DialogType =
   | "edit-user-profile"
   | "connections"
   | "subscription";
+
+export type SubscriptionView = "overview" | "picker";
+
 type DialogStore = {
   dialog: null | DialogType;
-  launchDialog: (dialog: DialogType) => void;
+  subscriptionView: SubscriptionView;
+  launchDialog: (
+    dialog: DialogType,
+    options?: { subscriptionView?: SubscriptionView },
+  ) => void;
   closeDialog: () => void;
   onOpenChange: (open: boolean) => void;
 };
 
 export const useDialogStore = create<DialogStore>((set) => ({
   dialog: null,
-  launchDialog: (dialog: DialogType) => set({ dialog }),
-  closeDialog: () => set({ dialog: null }),
-  onOpenChange: () => set({ dialog: null }),
+  subscriptionView: "overview",
+  launchDialog: (dialog, options) =>
+    set({
+      dialog,
+      subscriptionView: options?.subscriptionView ?? "overview",
+    }),
+  closeDialog: () => set({ dialog: null, subscriptionView: "overview" }),
+  onOpenChange: () => set({ dialog: null, subscriptionView: "overview" }),
 }));
diff --git a/src/components/feed/import/ImportDropzone.tsx b/src/components/feed/import/ImportDropzone.tsx
index c9858e5d..09ee5c08 100644
--- a/src/components/feed/import/ImportDropzone.tsx
+++ b/src/components/feed/import/ImportDropzone.tsx
@@ -1,33 +1,23 @@
 import clsx from "clsx";
-import { useRef, useState } from "react";
-import type { DragEvent, RefObject } from "react";
+import { useState } from "react";
+import type { DragEvent } from "react";
 
 type ImportDropzoneProps = {
-  inputElementRef: RefObject<HTMLInputElement | null> | null;
+  inputId: string;
   onSelectFile: () => void;
 };
 
-export function ImportDropzone({
-  inputElementRef,
-  onSelectFile,
-}: ImportDropzoneProps) {
-  const dropzoneRef = useRef<HTMLButtonElement | null>(null);
-
+export function ImportDropzone({ inputId, onSelectFile }: ImportDropzoneProps) {
   const [isDraggingOverDropzone, setIsDraggingOverDropzone] = useState(false);
 
-  const onDragEvent = (e: DragEvent<HTMLButtonElement>) => {
+  const onDragEvent = (e: DragEvent<HTMLLabelElement>) => {
     e.preventDefault();
     e.stopPropagation();
   };
 
-  const handleActivate = () => {
-    inputElementRef?.current?.click();
-  };
-
   return (
-    <button
-      type="button"
-      ref={dropzoneRef}
+    <label
+      htmlFor={inputId}
       onDrag={onDragEvent}
       onDragStart={onDragEvent}
       onDragEnter={onDragEvent}
@@ -45,7 +35,10 @@ export function ImportDropzone({
         e.stopPropagation();
         setIsDraggingOverDropzone(false);
 
-        if (!inputElementRef?.current) return;
+        const input = document.getElementById(
+          inputId,
+        ) as HTMLInputElement | null;
+        if (!input) return;
 
         const files = e.dataTransfer.files;
         const dataTransfer = new DataTransfer();
@@ -54,10 +47,9 @@ export function ImportDropzone({
           dataTransfer.items.add(file);
         });
 
-        inputElementRef.current.files = dataTransfer.files;
+        input.files = dataTransfer.files;
         onSelectFile();
       }}
-      onClick={handleActivate}
       className={clsx(
         "hover:bg-muted/30 border-foreground/40 grid h-64 w-full cursor-pointer place-items-center rounded-xl border border-dashed transition-colors",
         {
@@ -68,6 +60,6 @@ export function ImportDropzone({
       <div className="max-w-sm text-center">
         Drag and drop your file here, or click/tap to upload
       </div>
-    </button>
+    </label>
   );
 }
diff --git a/src/components/feed/subscription-dialog/BillingCycleSwitchButton.tsx b/src/components/feed/subscription-dialog/BillingCycleSwitchButton.tsx
new file mode 100644
index 00000000..3e372389
--- /dev/null
+++ b/src/components/feed/subscription-dialog/BillingCycleSwitchButton.tsx
@@ -0,0 +1,27 @@
+"use client";
+
+import type { BillingInterval } from "./constants";
+import { Button } from "~/components/ui/button";
+
+export function BillingCycleSwitchButton({
+  currentInterval,
+  onSwitch,
+  isPending,
+}: {
+  currentInterval: BillingInterval;
+  onSwitch: (interval: BillingInterval) => void;
+  isPending: boolean;
+}) {
+  const alternateInterval: BillingInterval =
+    currentInterval === "month" ? "year" : "month";
+
+  return (
+    <Button
+      size="sm"
+      disabled={isPending}
+      onClick={() => onSwitch(alternateInterval)}
+    >
+      Switch
+    </Button>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/CurrentPlanContent.tsx b/src/components/feed/subscription-dialog/CurrentPlanContent.tsx
new file mode 100644
index 00000000..836f215c
--- /dev/null
+++ b/src/components/feed/subscription-dialog/CurrentPlanContent.tsx
@@ -0,0 +1,143 @@
+"use client";
+
+import { CheckIcon } from "lucide-react";
+import {
+  BILLING_INTERVAL_DISPLAY,
+  INTERVAL_LABELS,
+  PLAN_ICONS,
+} from "./constants";
+import { formatDate, formatPrice, getPlanFeatures } from "./utils";
+import { PLANS } from "~/server/subscriptions/plans";
+import { Button } from "~/components/ui/button";
+
+export function CurrentPlanContent({
+  summary,
+  pendingSwitch,
+  onSwitchClick,
+  onCancelPending,
+  isCancelPending,
+}: {
+  summary: {
+    planId: string;
+    planName: string;
+    amount: number | null;
+    currency: string | null;
+    billingInterval: "month" | "year" | null;
+    currentPeriodEnd: string | null;
+  };
+  pendingSwitch:
+    | {
+        planId: string;
+        billingInterval: "month" | "year" | null;
+        appliesAt: string;
+      }
+    | null
+    | undefined;
+  onSwitchClick: () => void;
+  onCancelPending: () => void;
+  isCancelPending: boolean;
+}) {
+  const plan = PLANS[summary.planId as keyof typeof PLANS];
+  const features = getPlanFeatures(plan);
+  const Icon = PLAN_ICONS[summary.planId as keyof typeof PLAN_ICONS];
+  const intervalLabel = summary.billingInterval
+    ? INTERVAL_LABELS[summary.billingInterval]
+    : null;
+
+  const hasPrice = summary.amount != null && intervalLabel != null;
+  const hasRenewalDate = summary.currentPeriodEnd != null;
+
+  const hasPendingPlanChange =
+    pendingSwitch != null && pendingSwitch.planId !== summary.planId;
+  const hasPendingIntervalChange =
+    pendingSwitch != null &&
+    pendingSwitch.planId === summary.planId &&
+    pendingSwitch.billingInterval != null &&
+    pendingSwitch.billingInterval !== summary.billingInterval;
+  const hasPendingSwitch = hasPendingPlanChange || hasPendingIntervalChange;
+  const pendingPlan = hasPendingSwitch
+    ? PLANS[pendingSwitch.planId as keyof typeof PLANS]
+    : null;
+  const PendingIcon = hasPendingSwitch
+    ? PLAN_ICONS[pendingSwitch.planId as keyof typeof PLAN_ICONS]
+    : null;
+  const pendingFeatures = pendingPlan ? getPlanFeatures(pendingPlan) : [];
+  const pendingIntervalLabel =
+    hasPendingIntervalChange && pendingSwitch.billingInterval
+      ? BILLING_INTERVAL_DISPLAY[pendingSwitch.billingInterval]
+      : null;
+
+  return (
+    <div className="space-y-4">
+      {hasPendingSwitch && pendingPlan && PendingIcon && (
+        <>
+          <div className="flex items-center gap-3 rounded-lg border border-dashed p-4">
+            <PendingIcon size={20} className="shrink-0" />
+            <div className="min-w-0 flex-1">
+              <h3 className="font-medium">
+                {pendingPlan.name} Plan
+                {pendingIntervalLabel && ` · ${pendingIntervalLabel}`}
+              </h3>
+              <p className="text-muted-foreground text-sm">
+                Starting {formatDate(pendingSwitch.appliesAt)}
+              </p>
+            </div>
+            <Button
+              variant="outline"
+              size="sm"
+              disabled={isCancelPending}
+              onClick={onCancelPending}
+            >
+              {isCancelPending ? "Canceling..." : "Cancel"}
+            </Button>
+          </div>
+          <ul className="space-y-2">
+            {pendingFeatures.map((feature) => (
+              <li
+                key={feature}
+                className="text-muted-foreground flex items-center gap-2 text-sm"
+              >
+                <CheckIcon size={14} className="shrink-0" />
+                {feature}
+              </li>
+            ))}
+          </ul>
+        </>
+      )}
+      <div className="flex items-center gap-3 rounded-lg border p-4">
+        <Icon size={20} className="shrink-0" />
+        <div className="min-w-0 flex-1">
+          <h3 className="font-medium">
+            {hasPendingSwitch
+              ? `${summary.planName} Plan (Current)`
+              : `${summary.planName} Plan`}
+          </h3>
+          <p className="text-muted-foreground text-sm">
+            {hasPrice && `${formatPrice(summary.amount!)}/${intervalLabel}`}
+            {hasPrice && hasRenewalDate && " · "}
+            {hasRenewalDate &&
+              (hasPendingSwitch
+                ? `Until ${formatDate(summary.currentPeriodEnd!)}`
+                : `Renews ${formatDate(summary.currentPeriodEnd!)}`)}
+          </p>
+        </div>
+        <Button variant="outline" size="sm" onClick={onSwitchClick}>
+          Switch
+        </Button>
+      </div>
+      {!hasPendingSwitch && (
+        <ul className="space-y-2">
+          {features.map((feature) => (
+            <li
+              key={feature}
+              className="text-muted-foreground flex items-center gap-2 text-sm"
+            >
+              <CheckIcon size={14} className="shrink-0" />
+              {feature}
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/EmailVerificationBanner.tsx b/src/components/feed/subscription-dialog/EmailVerificationBanner.tsx
new file mode 100644
index 00000000..8f4ad89d
--- /dev/null
+++ b/src/components/feed/subscription-dialog/EmailVerificationBanner.tsx
@@ -0,0 +1,93 @@
+"use client";
+
+import { useState } from "react";
+import { toast } from "sonner";
+import { Button } from "~/components/ui/button";
+import { Input } from "~/components/ui/input";
+import { authClient, useSession } from "~/lib/auth-client";
+
+export function EmailVerificationBanner({
+  onVerified,
+}: {
+  onVerified: () => void;
+}) {
+  const { data: session } = useSession();
+  const [otpSent, setOtpSent] = useState(false);
+  const [otp, setOtp] = useState("");
+  const [sending, setSending] = useState(false);
+  const [verifying, setVerifying] = useState(false);
+
+  const email = session?.user?.email;
+
+  async function handleSendOtp() {
+    if (!email) return;
+    setSending(true);
+    try {
+      await authClient.emailOtp.sendVerificationOtp({
+        email,
+        type: "email-verification",
+      });
+      setOtpSent(true);
+      toast.success("Verification code sent to your email");
+    } catch {
+      toast.error("Failed to send verification code");
+    } finally {
+      setSending(false);
+    }
+  }
+
+  async function handleVerify() {
+    if (!email || !otp) return;
+    setVerifying(true);
+    try {
+      await authClient.emailOtp.verifyEmail({
+        email,
+        otp,
+      });
+      toast.success("Email verified!");
+      onVerified();
+    } catch {
+      toast.error("Invalid verification code");
+    } finally {
+      setVerifying(false);
+    }
+  }
+
+  return (
+    <div className="rounded-lg border border-yellow-500/50 bg-yellow-500/10 p-3">
+      <p className="text-sm font-medium">Verify your email to subscribe</p>
+      <p className="text-muted-foreground mt-1 text-xs">
+        You need to verify your email address before upgrading your plan.
+      </p>
+      {!otpSent ? (
+        <Button
+          size="sm"
+          variant="outline"
+          className="mt-2"
+          disabled={sending}
+          onClick={handleSendOtp}
+        >
+          {sending ? "Sending..." : "Send verification code"}
+        </Button>
+      ) : (
+        <div className="mt-2 flex gap-2">
+          <Input
+            type="text"
+            inputMode="numeric"
+            placeholder="Enter code"
+            value={otp}
+            onChange={(e) => setOtp(e.target.value)}
+            className="h-8 w-32"
+          />
+          <Button
+            size="sm"
+            disabled={verifying || otp.length === 0}
+            onClick={handleVerify}
+          >
+            {verifying ? "Verifying..." : "Verify"}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/FreePlanCard.tsx b/src/components/feed/subscription-dialog/FreePlanCard.tsx
new file mode 100644
index 00000000..2c600af9
--- /dev/null
+++ b/src/components/feed/subscription-dialog/FreePlanCard.tsx
@@ -0,0 +1,97 @@
+"use client";
+
+import { CheckIcon, CircleHelpIcon } from "lucide-react";
+import { PLAN_ICONS, RECOMMENDATION_MESSAGES } from "./constants";
+import { useSubscriptionDialogContext } from "./context";
+import { formatDate, getPlanCardBorderClasses, getPlanFeatures } from "./utils";
+import { Button } from "~/components/ui/button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "~/components/ui/tooltip";
+import { PLANS } from "~/server/subscriptions/plans";
+
+export function FreePlanCard() {
+  const {
+    planId,
+    recommendedPlanId,
+    chosenPlanId,
+    pendingSwitch,
+    isSubscribed,
+    onSwitchToFreeClick,
+    isSwitchToFreeLoading,
+  } = useSubscriptionDialogContext();
+
+  const plan = PLANS.free;
+  const isCurrent = planId === "free";
+  const pendingDate =
+    pendingSwitch?.planId === "free" ? pendingSwitch.appliesAt : null;
+  const isPending = pendingDate != null;
+  const isRecommended = recommendedPlanId === "free";
+  const features = getPlanFeatures(plan);
+  const Icon = PLAN_ICONS.free;
+
+  return (
+    <div
+      className={`relative flex flex-col rounded-lg border p-4 ${getPlanCardBorderClasses(isCurrent, isRecommended)}`}
+    >
+      {(isCurrent || isRecommended || isPending) && (
+        <div className="absolute -top-3 left-1/2 flex -translate-x-1/2 gap-1.5">
+          {isCurrent && (
+            <span className="bg-foreground text-background rounded-full px-3 py-0.5 text-xs font-medium">
+              Current
+            </span>
+          )}
+          {isPending && (
+            <span className="bg-background border-foreground/70 text-foreground rounded-full border border-dashed px-3 py-0.5 text-xs font-medium whitespace-nowrap">
+              Starting {formatDate(pendingDate)}
+            </span>
+          )}
+          {isRecommended && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <span className="bg-background border-sidebar-accent text-sidebar-accent-foreground inline-flex cursor-default items-center gap-1 rounded-full border px-3 py-0.5 text-xs font-medium">
+                  Recommended
+                  <CircleHelpIcon size={12} />
+                </span>
+              </TooltipTrigger>
+              <TooltipContent className="max-w-64">
+                {chosenPlanId === "free"
+                  ? RECOMMENDATION_MESSAGES.currentFree
+                  : RECOMMENDATION_MESSAGES.upgrade}
+              </TooltipContent>
+            </Tooltip>
+          )}
+        </div>
+      )}
+      <div className="flex items-center gap-2">
+        <Icon size={20} className="shrink-0" />
+        <h3 className="font-medium">{plan.name}</h3>
+      </div>
+      <ul className="mt-2 space-y-1">
+        {features.map((feature) => (
+          <li
+            key={feature}
+            className="text-muted-foreground flex items-center gap-2 text-sm"
+          >
+            <CheckIcon size={12} />
+            {feature}
+          </li>
+        ))}
+      </ul>
+      {!isCurrent && isSubscribed && (
+        <div className="mt-auto pt-3">
+          <Button
+            size="sm"
+            className="w-full"
+            disabled={isSwitchToFreeLoading}
+            onClick={onSwitchToFreeClick}
+          >
+            Switch
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/PlanSwitchConfirmation.tsx b/src/components/feed/subscription-dialog/PlanSwitchConfirmation.tsx
new file mode 100644
index 00000000..42b42781
--- /dev/null
+++ b/src/components/feed/subscription-dialog/PlanSwitchConfirmation.tsx
@@ -0,0 +1,124 @@
+"use client";
+
+import { useState } from "react";
+import { CheckIcon } from "lucide-react";
+import { INTERVAL_LABELS, PLAN_ICONS } from "./constants";
+import { formatDate, formatPrice, getPlanFeatures } from "./utils";
+import type { CardRadioOption } from "~/components/ui/card-radio-group";
+import type { BillingInterval } from "./constants";
+import type { SwitchPreview } from "./types";
+import { CardRadioGroup } from "~/components/ui/card-radio-group";
+import { PLANS } from "~/server/subscriptions/plans";
+
+export function PlanSwitchConfirmationContent({
+  preview,
+  onIntervalChange,
+  monthlyPrice,
+  annualPrice,
+  currentBillingInterval,
+}: {
+  preview: SwitchPreview;
+  onIntervalChange: (interval: BillingInterval) => void;
+  monthlyPrice: number | null;
+  annualPrice: number | null;
+  currentBillingInterval: BillingInterval | null;
+}) {
+  const [selectedInterval, setSelectedInterval] = useState<BillingInterval>(
+    preview.billingInterval,
+  );
+
+  const newPlan = PLANS[preview.newPlanId as keyof typeof PLANS];
+  const features = getPlanFeatures(newPlan);
+  const Icon = PLAN_ICONS[preview.newPlanId as keyof typeof PLAN_ICONS];
+  const isFreePlan = preview.newPlanId === "free";
+  const intervalLabel = isFreePlan ? null : INTERVAL_LABELS[selectedInterval];
+
+  const isSamePlanSwitch = preview.currentPlanId === preview.newPlanId;
+  const hasBothIntervals =
+    !isFreePlan && monthlyPrice != null && annualPrice != null;
+
+  const intervalOptions: Array<CardRadioOption<BillingInterval>> = [];
+  if (monthlyPrice != null) {
+    intervalOptions.push({
+      value: "month",
+      title: `Monthly — ${formatPrice(monthlyPrice)}/mo`,
+      disabled: isSamePlanSwitch && currentBillingInterval === "month",
+    });
+  }
+  if (annualPrice != null) {
+    intervalOptions.push({
+      value: "year",
+      title: `Annual — ${formatPrice(annualPrice)}/yr`,
+      description: `${formatPrice(Math.round(annualPrice / 12))}/mo`,
+      disabled: isSamePlanSwitch && currentBillingInterval === "year",
+    });
+  }
+
+  function handleIntervalChange(interval: BillingInterval) {
+    setSelectedInterval(interval);
+    onIntervalChange(interval);
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center gap-3 rounded-lg border p-4">
+        <Icon size={20} className="shrink-0" />
+        <div className="flex-1">
+          <h3 className="font-medium">{preview.newPlanName} Plan</h3>
+          <p className="text-muted-foreground text-sm">
+            {isFreePlan
+              ? "Free"
+              : `${formatPrice(preview.newAmount)}/${intervalLabel}`}
+          </p>
+        </div>
+      </div>
+      {hasBothIntervals && (
+        <CardRadioGroup
+          value={selectedInterval}
+          onValueChange={handleIntervalChange}
+          options={intervalOptions}
+          orientation="vertical"
+        />
+      )}
+      <ul className="space-y-2">
+        {features.map((feature) => (
+          <li
+            key={feature}
+            className="text-muted-foreground flex items-center gap-2 text-sm"
+          >
+            <CheckIcon size={14} className="shrink-0" />
+            {feature}
+          </li>
+        ))}
+      </ul>
+      {preview.isDowngrade ? (
+        <div className="rounded-lg border p-4">
+          <p className="text-sm font-medium">
+            Your plan will change on {formatDate(preview.periodEnd)}
+          </p>
+          <p className="text-muted-foreground mt-1 text-xs">
+            You&apos;ll keep your current {preview.currentPlanName} plan
+            features until the end of your billing period. After that,
+            you&apos;ll be switched to the {preview.newPlanName} plan
+            automatically.
+          </p>
+        </div>
+      ) : preview.proratedAmount > 0 ? (
+        <div className="rounded-lg border p-4">
+          <p className="text-sm">
+            <span className="text-muted-foreground">
+              Estimated charge today:
+            </span>{" "}
+            <span className="font-medium">
+              {formatPrice(preview.proratedAmount)}
+            </span>
+          </p>
+          <p className="text-muted-foreground mt-1 text-xs">
+            You&apos;ll be credited for the unused time on your current plan.
+            The final amount may differ slightly based on your local tax rates.
+          </p>
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/ProPlanCard.tsx b/src/components/feed/subscription-dialog/ProPlanCard.tsx
new file mode 100644
index 00000000..acf40d2c
--- /dev/null
+++ b/src/components/feed/subscription-dialog/ProPlanCard.tsx
@@ -0,0 +1,135 @@
+"use client";
+
+import { CheckIcon, CircleHelpIcon } from "lucide-react";
+import { PLAN_ICONS, RECOMMENDATION_MESSAGES } from "./constants";
+import { useSubscriptionDialogContext } from "./context";
+import { BillingCycleSwitchButton } from "./BillingCycleSwitchButton";
+import {
+  formatPrice,
+  getPlanCardBorderClasses,
+  getPlanFeatures,
+} from "./utils";
+import { Button } from "~/components/ui/button";
+import { Skeleton } from "~/components/ui/skeleton";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "~/components/ui/tooltip";
+import { PLANS } from "~/server/subscriptions/plans";
+
+export function ProPlanCard() {
+  const {
+    planId,
+    recommendedPlanId,
+    chosenPlanId,
+    products,
+    isLoadingProducts,
+    isSubscribed,
+    currentBillingInterval,
+    onBillingCycleSwitch,
+    onSubscribeClick,
+    checkoutMutation,
+    previewMutation,
+  } = useSubscriptionDialogContext();
+  const plan = PLANS.pro;
+  const isCurrent = planId === "pro";
+  const isRecommended = recommendedPlanId === "pro";
+  const features = getPlanFeatures(plan);
+  const Icon = PLAN_ICONS.pro;
+  const product = products?.find((p) => p.planId === "pro");
+  const monthlyPrice = product?.monthlyPrice ?? null;
+  const annualPrice = product?.annualPrice ?? null;
+  const hasPrice = monthlyPrice != null || annualPrice != null;
+
+  const showBillingCycleSwitch = isCurrent && currentBillingInterval != null;
+
+  return (
+    <div
+      className={`relative flex flex-col rounded-lg border p-4 ${getPlanCardBorderClasses(isCurrent, isRecommended)}`}
+    >
+      {(isCurrent || isRecommended) && (
+        <div className="absolute -top-3 left-1/2 flex -translate-x-1/2 gap-1.5">
+          {isCurrent && (
+            <span className="bg-foreground text-background rounded-full px-3 py-0.5 text-xs font-medium">
+              Current
+            </span>
+          )}
+          {isRecommended && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <span className="bg-background border-sidebar-accent text-sidebar-accent-foreground inline-flex cursor-default items-center gap-1 rounded-full border px-3 py-0.5 text-xs font-medium">
+                  Recommended
+                  <CircleHelpIcon size={12} />
+                </span>
+              </TooltipTrigger>
+              <TooltipContent className="max-w-64">
+                {chosenPlanId === "pro"
+                  ? RECOMMENDATION_MESSAGES.currentPaid
+                  : RECOMMENDATION_MESSAGES.upgrade}
+              </TooltipContent>
+            </Tooltip>
+          )}
+        </div>
+      )}
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex items-center gap-2">
+          <Icon size={20} className="shrink-0" />
+          <h3 className="font-medium">{plan.name}</h3>
+        </div>
+        {isLoadingProducts ? (
+          <Skeleton className="h-4 w-28" />
+        ) : hasPrice ? (
+          <p className="text-muted-foreground text-base">
+            {monthlyPrice != null && `${formatPrice(monthlyPrice)}/mo`}
+            {monthlyPrice != null && annualPrice != null && " · "}
+            {annualPrice != null && (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <span className="cursor-default underline decoration-dotted underline-offset-4">
+                    {formatPrice(annualPrice)}/yr
+                  </span>
+                </TooltipTrigger>
+                <TooltipContent>
+                  {formatPrice(Math.round(annualPrice / 12))}/mo
+                </TooltipContent>
+              </Tooltip>
+            )}
+          </p>
+        ) : null}
+      </div>
+      <ul className="mt-2 space-y-1">
+        {features.map((feature) => (
+          <li
+            key={feature}
+            className="text-muted-foreground flex items-center gap-2 text-sm"
+          >
+            <CheckIcon size={12} />
+            {feature}
+          </li>
+        ))}
+      </ul>
+      {showBillingCycleSwitch && (
+        <div className="mt-auto pt-3">
+          <BillingCycleSwitchButton
+            currentInterval={currentBillingInterval}
+            onSwitch={onBillingCycleSwitch}
+            isPending={previewMutation.isPending}
+          />
+        </div>
+      )}
+      {!isCurrent && (
+        <div className="mt-auto pt-3">
+          <Button
+            size="sm"
+            className="w-full"
+            disabled={checkoutMutation.isPending || previewMutation.isPending}
+            onClick={() => onSubscribeClick("pro")}
+          >
+            {isSubscribed ? "Switch" : "Subscribe"}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/StandardPlanCards.tsx b/src/components/feed/subscription-dialog/StandardPlanCards.tsx
new file mode 100644
index 00000000..28daf486
--- /dev/null
+++ b/src/components/feed/subscription-dialog/StandardPlanCards.tsx
@@ -0,0 +1,164 @@
+"use client";
+
+import { CheckIcon, CircleHelpIcon, TreeDeciduousIcon } from "lucide-react";
+import {
+  QUOTA_DISPLAY_NAMES,
+  RECOMMENDATION_MESSAGES,
+  STANDARD_PLAN_IDS,
+} from "./constants";
+import { useSubscriptionDialogContext } from "./context";
+import { BillingCycleSwitchButton } from "./BillingCycleSwitchButton";
+import {
+  formatDate,
+  formatPrice,
+  getPlanCardBorderClasses,
+  getPlanFeatures,
+} from "./utils";
+import { Button } from "~/components/ui/button";
+import { Skeleton } from "~/components/ui/skeleton";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "~/components/ui/tooltip";
+import { PLANS } from "~/server/subscriptions/plans";
+
+export function StandardPlanCards() {
+  const {
+    planId,
+    recommendedPlanId,
+    chosenPlanId,
+    isSubscribed,
+    products,
+    isLoadingProducts,
+    pendingSwitch,
+    currentBillingInterval,
+    onBillingCycleSwitch,
+    onSubscribeClick,
+    checkoutMutation,
+    previewMutation,
+  } = useSubscriptionDialogContext();
+
+  // Derive shared features from the first standard plan config (all standard
+  // plans share the same refresh interval and background refresh capability).
+  const sharedFeatures = getPlanFeatures(PLANS["standard-small"]).filter(
+    (f) => !f.startsWith("Up to"),
+  );
+
+  return (
+    <div className="border-border rounded-lg border p-4">
+      <div className="flex items-center gap-2">
+        <TreeDeciduousIcon size={20} className="shrink-0" />
+        <h3 className="font-medium">Standard</h3>
+      </div>
+      <ul className="mt-2 space-y-1">
+        {sharedFeatures.map((feature) => (
+          <li
+            key={feature}
+            className="text-muted-foreground flex items-center gap-2 text-sm"
+          >
+            <CheckIcon size={12} />
+            {feature}
+          </li>
+        ))}
+      </ul>
+      <div className="mt-3 flex flex-col gap-4">
+        {STANDARD_PLAN_IDS.map((id) => {
+          const plan = PLANS[id];
+          const isCurrent = id === planId;
+          const isPending = pendingSwitch?.planId === id;
+          const pendingDate = isPending ? pendingSwitch.appliesAt : null;
+          const isRecommended = id === recommendedPlanId;
+          const product = products?.find((p) => p.planId === id);
+          const monthlyPrice = product?.monthlyPrice ?? null;
+          const annualPrice = product?.annualPrice ?? null;
+          const hasPrice = monthlyPrice != null || annualPrice != null;
+          const feedsLabel = `Up to ${plan.maxActiveFeeds.toLocaleString()} active feeds`;
+
+          return (
+            <div
+              key={id}
+              className={`relative rounded-lg border p-3 ${getPlanCardBorderClasses(isCurrent, isRecommended)}`}
+            >
+              {(isCurrent || isPending || isRecommended) && (
+                <div className="absolute -top-3 left-4 flex gap-1.5">
+                  {isCurrent && (
+                    <span className="bg-foreground text-background rounded-full px-3 py-0.5 text-xs font-medium">
+                      Current
+                    </span>
+                  )}
+                  {pendingDate && (
+                    <span className="bg-background border-foreground/70 text-foreground rounded-full border border-dashed px-3 py-0.5 text-xs font-medium whitespace-nowrap">
+                      Starting {formatDate(pendingDate)}
+                    </span>
+                  )}
+                  {isRecommended && (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <span className="bg-background border-sidebar-accent text-sidebar-accent-foreground inline-flex cursor-default items-center gap-1 rounded-full border px-3 py-0.5 text-xs font-medium">
+                          Recommended
+                          <CircleHelpIcon size={12} />
+                        </span>
+                      </TooltipTrigger>
+                      <TooltipContent className="max-w-64">
+                        {chosenPlanId === id
+                          ? RECOMMENDATION_MESSAGES.currentPaid
+                          : RECOMMENDATION_MESSAGES.upgrade}
+                      </TooltipContent>
+                    </Tooltip>
+                  )}
+                </div>
+              )}
+              <div className="flex items-center gap-2">
+                <span className="font-medium">{QUOTA_DISPLAY_NAMES[id]}</span>
+                <div className="ml-auto flex items-center gap-3">
+                  {isLoadingProducts ? (
+                    <Skeleton className="h-4 w-20" />
+                  ) : hasPrice ? (
+                    <span className="text-muted-foreground text-base">
+                      {monthlyPrice != null &&
+                        `${formatPrice(monthlyPrice)}/mo`}
+                      {monthlyPrice != null && annualPrice != null && " · "}
+                      {annualPrice != null && (
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <span className="cursor-default underline decoration-dotted underline-offset-4">
+                              {formatPrice(annualPrice)}/yr
+                            </span>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            {formatPrice(Math.round(annualPrice / 12))}
+                            /mo
+                          </TooltipContent>
+                        </Tooltip>
+                      )}
+                    </span>
+                  ) : null}
+                  {isCurrent && currentBillingInterval && (
+                    <BillingCycleSwitchButton
+                      currentInterval={currentBillingInterval}
+                      onSwitch={onBillingCycleSwitch}
+                      isPending={previewMutation.isPending}
+                    />
+                  )}
+                  {!isCurrent && (
+                    <Button
+                      size="sm"
+                      disabled={
+                        checkoutMutation.isPending || previewMutation.isPending
+                      }
+                      onClick={() => onSubscribeClick(id)}
+                    >
+                      {isSubscribed ? "Switch" : "Subscribe"}
+                    </Button>
+                  )}
+                </div>
+              </div>
+              <p className="text-muted-foreground mt-1 text-sm">{feedsLabel}</p>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/SubscriptionDialog.tsx b/src/components/feed/subscription-dialog/SubscriptionDialog.tsx
new file mode 100644
index 00000000..0f5cbe91
--- /dev/null
+++ b/src/components/feed/subscription-dialog/SubscriptionDialog.tsx
@@ -0,0 +1,459 @@
+"use client";
+
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useRef, useState } from "react";
+import { toast } from "sonner";
+import { BILLING_INTERVAL_DISPLAY } from "./constants";
+import { SubscriptionDialogContext } from "./context";
+import { CurrentPlanContent } from "./CurrentPlanContent";
+import { EmailVerificationBanner } from "./EmailVerificationBanner";
+import { FreePlanCard } from "./FreePlanCard";
+import { PlanSwitchConfirmationContent } from "./PlanSwitchConfirmation";
+import { ProPlanCard } from "./ProPlanCard";
+import { StandardPlanCards } from "./StandardPlanCards";
+import { getRecommendedPlanId } from "./utils";
+import type { BillingInterval } from "./constants";
+import type { SubscriptionDialogContextValue } from "./context";
+import type { SwitchPreview } from "./types";
+import type { PaidPlanId } from "~/server/subscriptions/plans";
+import { Button } from "~/components/ui/button";
+import { ControlledResponsiveDialog } from "~/components/ui/responsive-dropdown";
+import { Skeleton } from "~/components/ui/skeleton";
+import { useSession } from "~/lib/auth-client";
+import { useFeeds } from "~/lib/data/feeds/store";
+import { usePlanSuccessStore } from "~/lib/data/plan-success";
+import { useSubscription } from "~/lib/data/subscription";
+import { orpc } from "~/lib/orpc";
+import { PLAN_IDS, PLANS } from "~/server/subscriptions/plans";
+import { useDialogStore } from "~/components/feed/dialogStore";
+import { env } from "~/env";
+
+export function SubscriptionDialog({
+  open,
+  onOpenChange,
+}: {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { planId } = useSubscription();
+  const { data: session, refetch: refetchSession } = useSession();
+  const queryClient = useQueryClient();
+  const [showVerification, setShowVerification] = useState(false);
+  const [pendingPlanId, setPendingPlanId] = useState<PaidPlanId | null>(null);
+  const [switchPreview, setSwitchPreview] = useState<SwitchPreview | null>(
+    null,
+  );
+  const [showPlanPicker, setShowPlanPicker] = useState(false);
+  const subscriptionView = useDialogStore((s) => s.subscriptionView);
+  const prevOpenRef = useRef(false);
+
+  // Reset dialog state when it opens, respecting the requested view
+  useEffect(() => {
+    if (open && !prevOpenRef.current) {
+      setSwitchPreview(null);
+      setShowVerification(false);
+      setShowPlanPicker(subscriptionView === "picker");
+    }
+    prevOpenRef.current = open;
+  }, [open, subscriptionView]);
+
+  const emailVerified = session?.user?.emailVerified ?? false;
+  const isSubscribed = planId !== "free";
+
+  const { data: products, isLoading: isLoadingProducts } = useQuery({
+    ...orpc.subscription.getProducts.queryOptions(),
+    enabled: open,
+  });
+
+  const { data: pendingSwitch } = useQuery({
+    ...orpc.subscription.getPendingSwitch.queryOptions(),
+    enabled: open,
+  });
+
+  const { data: subscriptionSummary, isLoading: isLoadingSummary } = useQuery({
+    ...orpc.subscription.getSubscriptionSummary.queryOptions(),
+    enabled: open && isSubscribed,
+  });
+
+  const checkoutMutation = useMutation(
+    orpc.subscription.createCheckout.mutationOptions({
+      onSuccess: (result) => {
+        if (result.error === "email-not-verified") {
+          setShowVerification(true);
+          toast.error("Please verify your email before subscribing");
+          return;
+        }
+        if (result.url) {
+          window.location.assign(result.url);
+        }
+      },
+    }),
+  );
+
+  const previewMutation = useMutation(
+    orpc.subscription.previewPlanSwitch.mutationOptions({
+      onSuccess: (result) => {
+        if (result) {
+          setSwitchPreview(result);
+        } else {
+          toast.error("Unable to preview plan switch");
+        }
+      },
+    }),
+  );
+
+  const openPlanSuccess = usePlanSuccessStore((s) => s.openDialog);
+
+  const switchMutation = useMutation(
+    orpc.subscription.switchPlan.mutationOptions({
+      onSuccess: (result) => {
+        if (result.success) {
+          setSwitchPreview(null);
+          onOpenChange(false);
+          // Invalidate and then show success dialog
+          void queryClient
+            .invalidateQueries({
+              queryKey: orpc.subscription.getStatus.queryOptions().queryKey,
+            })
+            .then(() => {
+              openPlanSuccess();
+            });
+        }
+      },
+      onError: () => {
+        toast.error("Failed to switch plan. Please try again.");
+      },
+    }),
+  );
+
+  const portalMutation = useMutation(
+    orpc.subscription.createPortalSession.mutationOptions({
+      onSuccess: (result) => {
+        if (result.url) {
+          window.location.assign(result.url);
+        }
+      },
+    }),
+  );
+
+  const revertPendingMutation = useMutation(
+    orpc.subscription.revertPendingChange.mutationOptions({
+      onSuccess: (result) => {
+        if (result.success) {
+          toast.success("Pending change cancelled.");
+          void queryClient.invalidateQueries({
+            queryKey:
+              orpc.subscription.getPendingSwitch.queryOptions().queryKey,
+          });
+          void queryClient.invalidateQueries({
+            queryKey:
+              orpc.subscription.getSubscriptionSummary.queryOptions().queryKey,
+          });
+          void queryClient.invalidateQueries({
+            queryKey: orpc.subscription.getStatus.queryOptions().queryKey,
+          });
+        }
+      },
+      onError: () => {
+        toast.error("Failed to cancel pending change. Please try again.");
+      },
+    }),
+  );
+
+  const downgradePreviewMutation = useMutation(
+    orpc.subscription.previewDowngrade.mutationOptions({
+      onSuccess: (result) => {
+        if (result) {
+          setSwitchPreview({
+            currentPlanId: result.currentPlanId,
+            currentPlanName: result.currentPlanName,
+            currentAmount: 0,
+            newPlanId: "free",
+            newPlanName: PLANS.free.name,
+            newAmount: 0,
+            proratedAmount: 0,
+            isDowngrade: true,
+            periodEnd: result.periodEnd,
+            currency: "usd",
+            billingInterval: "month",
+            subscriptionId: result.subscriptionId,
+            newProductId: "",
+          });
+        } else {
+          toast.error("Unable to preview switch");
+        }
+      },
+    }),
+  );
+
+  const cancelMutation = useMutation(
+    orpc.subscription.cancelSubscription.mutationOptions({
+      onSuccess: (result) => {
+        if (result.success) {
+          setSwitchPreview(null);
+          onOpenChange(false);
+          toast.success(
+            "Your plan will switch at the end of your billing period.",
+          );
+          void queryClient.invalidateQueries({
+            queryKey: orpc.subscription.getStatus.queryOptions().queryKey,
+          });
+          void queryClient.invalidateQueries({
+            queryKey:
+              orpc.subscription.getPendingSwitch.queryOptions().queryKey,
+          });
+        }
+      },
+      onError: () => {
+        toast.error("Failed to cancel subscription. Please try again.");
+      },
+    }),
+  );
+
+  const feeds = useFeeds();
+
+  // Recommend the smallest plan that fits the user's feed count,
+  // but never recommend a lower-tier plan than the user's current plan
+  const currentPlanIndex = PLAN_IDS.indexOf(planId);
+  const recommendedPlanId = getRecommendedPlanId(
+    feeds.length,
+    currentPlanIndex,
+  );
+  const chosenPlanId = pendingSwitch?.planId ?? planId;
+
+  function handleSubscribeClick(id: PaidPlanId) {
+    setPendingPlanId(id);
+    if (isSubscribed) {
+      // Already subscribed — show switch confirmation
+      previewMutation.mutate({ planId: id });
+    } else {
+      checkoutMutation.mutate({
+        planId: id,
+        returnPath: window.location.pathname,
+      });
+    }
+  }
+
+  async function handleVerified() {
+    await refetchSession();
+    setShowVerification(false);
+    if (pendingPlanId) {
+      if (isSubscribed) {
+        previewMutation.mutate({ planId: pendingPlanId });
+      } else {
+        checkoutMutation.mutate({
+          planId: pendingPlanId,
+          returnPath: window.location.pathname,
+        });
+      }
+    }
+  }
+
+  const contextValue: SubscriptionDialogContextValue = {
+    planId,
+    recommendedPlanId,
+    chosenPlanId,
+    isSubscribed,
+    products,
+    isLoadingProducts,
+    pendingSwitch,
+    onSubscribeClick: handleSubscribeClick,
+    onSwitchToFreeClick: () => downgradePreviewMutation.mutate({}),
+    isSwitchToFreeLoading: downgradePreviewMutation.isPending,
+    currentBillingInterval:
+      (subscriptionSummary?.billingInterval as BillingInterval | null) ?? null,
+    onBillingCycleSwitch: (interval: BillingInterval) => {
+      if (!subscriptionSummary) return;
+      const paidPlanId = subscriptionSummary.planId;
+      previewMutation.mutate({ planId: paidPlanId, billingInterval: interval });
+    },
+    portalMutation,
+    checkoutMutation,
+    previewMutation,
+  };
+
+  // Determine current view
+  const showOverview =
+    isSubscribed &&
+    !showPlanPicker &&
+    !switchPreview &&
+    (isLoadingSummary || subscriptionSummary != null);
+  const isPlanPickerView = !switchPreview && !showOverview;
+  const isSwitchToFree = switchPreview?.newPlanId === "free";
+
+  let dialogTitle: string;
+  let dialogDescription: string;
+  let dialogFooter: React.ReactNode;
+  let dialogOnBack: (() => void) | undefined;
+
+  const isBillingCycleSwitch =
+    switchPreview != null &&
+    switchPreview.currentPlanId === switchPreview.newPlanId;
+
+  if (switchPreview) {
+    const billingCycleLabel =
+      BILLING_INTERVAL_DISPLAY[switchPreview.billingInterval];
+    dialogTitle = "Switch Plan";
+    dialogDescription = isBillingCycleSwitch
+      ? `Switch to ${billingCycleLabel} plan`
+      : `Switch from ${switchPreview.currentPlanName} to ${switchPreview.newPlanName}`;
+    dialogOnBack = () => setSwitchPreview(null);
+    dialogFooter = isSwitchToFree ? (
+      <Button
+        className="w-full"
+        onClick={() => cancelMutation.mutate({})}
+        disabled={cancelMutation.isPending}
+      >
+        {cancelMutation.isPending
+          ? "Switching..."
+          : `Confirm Switch to ${switchPreview.newPlanName}`}
+      </Button>
+    ) : (
+      <Button
+        className="w-full"
+        onClick={() =>
+          switchMutation.mutate({
+            subscriptionId: switchPreview.subscriptionId,
+            newProductId: switchPreview.newProductId,
+          })
+        }
+        disabled={switchMutation.isPending || previewMutation.isPending}
+      >
+        {switchMutation.isPending
+          ? "Switching..."
+          : `Confirm Switch to ${switchPreview.newPlanName}`}
+      </Button>
+    );
+  } else if (showOverview) {
+    dialogTitle = "Your Plan";
+    dialogDescription = "Manage your current subscription.";
+    dialogFooter = (
+      <Button
+        className="w-full"
+        disabled={portalMutation.isPending}
+        onClick={() => portalMutation.mutate({})}
+      >
+        {portalMutation.isPending ? "Loading..." : "Open Billing Portal"}
+      </Button>
+    );
+  } else {
+    dialogTitle = "Subscribe to Serial";
+    dialogDescription = "All prices are taxes-included.";
+    dialogOnBack = isSubscribed ? () => setShowPlanPicker(false) : undefined;
+    dialogFooter = (
+      <p className="text-muted-foreground flex flex-col text-center text-sm">
+        Price too high or need higher limits?{" "}
+        <span>
+          <a
+            href={`mailto:${env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="underline"
+          >
+            Let us know
+          </a>{" "}
+          or{" "}
+          <a
+            href="https://github.com/hfellerhoff/serial?tab=readme-ov-file#self-hosting"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="underline"
+          >
+            learn how to self-host
+          </a>{" "}
+          Serial
+        </span>
+      </p>
+    );
+  }
+
+  function handleOpenChange(nextOpen: boolean) {
+    if (!nextOpen) {
+      if (switchPreview) {
+        setSwitchPreview(null);
+        return;
+      }
+      if (showPlanPicker && isSubscribed) {
+        setShowPlanPicker(false);
+        return;
+      }
+      setShowPlanPicker(false);
+      onOpenChange(false);
+      return;
+    }
+    onOpenChange(nextOpen);
+  }
+
+  const newPlanProduct = switchPreview
+    ? products?.find((p) => p.planId === switchPreview.newPlanId)
+    : undefined;
+
+  return (
+    <SubscriptionDialogContext.Provider value={contextValue}>
+      <ControlledResponsiveDialog
+        open={open}
+        onOpenChange={handleOpenChange}
+        title={dialogTitle}
+        description={dialogDescription}
+        className={isPlanPickerView ? "lg:max-w-5xl xl:max-w-6xl" : undefined}
+        headerClassName={isPlanPickerView ? "lg:text-center" : undefined}
+        onBack={dialogOnBack}
+        footer={dialogFooter}
+      >
+        {switchPreview ? (
+          <PlanSwitchConfirmationContent
+            preview={switchPreview}
+            onIntervalChange={(interval) =>
+              previewMutation.mutate({
+                planId: switchPreview.newPlanId as PaidPlanId,
+                billingInterval: interval,
+              })
+            }
+            monthlyPrice={newPlanProduct?.monthlyPrice ?? null}
+            annualPrice={newPlanProduct?.annualPrice ?? null}
+            currentBillingInterval={
+              (subscriptionSummary?.billingInterval as BillingInterval | null) ??
+              null
+            }
+          />
+        ) : showOverview ? (
+          isLoadingSummary ? (
+            <div className="space-y-4">
+              <Skeleton className="h-[72px] w-full rounded-lg" />
+              <div className="space-y-2">
+                <Skeleton className="h-5 w-48" />
+                <Skeleton className="h-5 w-40" />
+                <Skeleton className="h-5 w-44" />
+              </div>
+            </div>
+          ) : subscriptionSummary ? (
+            <CurrentPlanContent
+              summary={subscriptionSummary}
+              pendingSwitch={pendingSwitch}
+              onSwitchClick={() => setShowPlanPicker(true)}
+              onCancelPending={() => revertPendingMutation.mutate({})}
+              isCancelPending={revertPendingMutation.isPending}
+            />
+          ) : null
+        ) : (
+          <div className="mt-2 grid gap-3 lg:grid-cols-[1fr_1.5fr_1fr] lg:gap-5 xl:grid-cols-[1fr_2fr_1fr]">
+            {showVerification && !emailVerified && (
+              <div className="col-span-full">
+                <EmailVerificationBanner onVerified={handleVerified} />
+              </div>
+            )}
+
+            {/* Free plan */}
+            <FreePlanCard />
+
+            {/* Paid plans */}
+            <StandardPlanCards />
+
+            {/* Pro plan */}
+            <ProPlanCard />
+          </div>
+        )}
+      </ControlledResponsiveDialog>
+    </SubscriptionDialogContext.Provider>
+  );
+}
diff --git a/src/components/feed/subscription-dialog/constants.ts b/src/components/feed/subscription-dialog/constants.ts
new file mode 100644
index 00000000..26b19ecf
--- /dev/null
+++ b/src/components/feed/subscription-dialog/constants.ts
@@ -0,0 +1,48 @@
+import {
+  ShrubIcon,
+  SproutIcon,
+  TreeDeciduousIcon,
+  TreePineIcon,
+  TreesIcon,
+} from "lucide-react";
+
+export const PLAN_ICONS = {
+  free: SproutIcon,
+  "standard-small": ShrubIcon,
+  "standard-medium": TreeDeciduousIcon,
+  "standard-large": TreePineIcon,
+  pro: TreesIcon,
+} as const;
+
+export const QUOTA_DISPLAY_NAMES = {
+  "standard-small": "Small",
+  "standard-medium": "Medium",
+  "standard-large": "Large",
+} as const;
+
+export const STANDARD_PLAN_IDS = [
+  "standard-small",
+  "standard-medium",
+  "standard-large",
+] as const;
+
+export const RECOMMENDATION_MESSAGES = {
+  currentFree:
+    "You're just getting started with Serial, so no need to give us money just yet! Consider upgrading later when you have more feeds, or if you want feeds to refresh while you're away.",
+  currentPaid:
+    "This plan is just right for the number of feeds you have. Good choice!",
+  upgrade:
+    "We think this plan is right for you, as it will allow you to keep all your feeds active.",
+} as const;
+
+export type BillingInterval = "month" | "year";
+
+export const INTERVAL_LABELS: Record<BillingInterval, string> = {
+  month: "mo",
+  year: "yr",
+};
+
+export const BILLING_INTERVAL_DISPLAY: Record<BillingInterval, string> = {
+  month: "Monthly",
+  year: "Annual",
+};
diff --git a/src/components/feed/subscription-dialog/context.tsx b/src/components/feed/subscription-dialog/context.tsx
new file mode 100644
index 00000000..7435a0f5
--- /dev/null
+++ b/src/components/feed/subscription-dialog/context.tsx
@@ -0,0 +1,48 @@
+import { createContext, useContext } from "react";
+import type { BillingInterval } from "./constants";
+import type { PaidPlanId } from "~/server/subscriptions/plans";
+
+export type SubscriptionDialogContextValue = {
+  planId: string;
+  recommendedPlanId: string | null;
+  chosenPlanId: string;
+
+  isSubscribed: boolean;
+  products:
+    | Array<{
+        planId: string;
+        monthlyPrice: number | null;
+        annualPrice: number | null;
+      }>
+    | undefined;
+  isLoadingProducts: boolean;
+  pendingSwitch:
+    | {
+        planId: string;
+        billingInterval: "month" | "year" | null;
+        appliesAt: string;
+      }
+    | null
+    | undefined;
+  onSubscribeClick: (id: PaidPlanId) => void;
+  onSwitchToFreeClick: () => void;
+  isSwitchToFreeLoading: boolean;
+  currentBillingInterval: BillingInterval | null;
+  onBillingCycleSwitch: (interval: BillingInterval) => void;
+  portalMutation: { isPending: boolean; mutate: (args: object) => void };
+  checkoutMutation: { isPending: boolean };
+  previewMutation: { isPending: boolean };
+};
+
+export const SubscriptionDialogContext =
+  createContext<SubscriptionDialogContextValue | null>(null);
+
+export function useSubscriptionDialogContext() {
+  const ctx = useContext(SubscriptionDialogContext);
+  if (!ctx) {
+    throw new Error(
+      "useSubscriptionDialogContext must be used within SubscriptionDialogProvider",
+    );
+  }
+  return ctx;
+}
diff --git a/src/components/feed/subscription-dialog/index.ts b/src/components/feed/subscription-dialog/index.ts
new file mode 100644
index 00000000..62fafb6c
--- /dev/null
+++ b/src/components/feed/subscription-dialog/index.ts
@@ -0,0 +1,4 @@
+export { SubscriptionDialog } from "./SubscriptionDialog";
+export { PLAN_ICONS } from "./constants";
+export { getPlanFeatures } from "./utils";
+export type { SwitchPreview } from "./types";
diff --git a/src/components/feed/subscription-dialog/types.ts b/src/components/feed/subscription-dialog/types.ts
new file mode 100644
index 00000000..48b9ec83
--- /dev/null
+++ b/src/components/feed/subscription-dialog/types.ts
@@ -0,0 +1,15 @@
+export type SwitchPreview = {
+  currentPlanId: string;
+  currentPlanName: string;
+  currentAmount: number;
+  newPlanId: string;
+  newPlanName: string;
+  newAmount: number;
+  proratedAmount: number;
+  isDowngrade: boolean;
+  periodEnd: string;
+  currency: string;
+  billingInterval: "month" | "year";
+  subscriptionId: string;
+  newProductId: string;
+};
diff --git a/src/components/feed/subscription-dialog/utils.ts b/src/components/feed/subscription-dialog/utils.ts
new file mode 100644
index 00000000..0538d2b6
--- /dev/null
+++ b/src/components/feed/subscription-dialog/utils.ts
@@ -0,0 +1,71 @@
+import type { PlanConfig } from "~/server/subscriptions/plans";
+import { PLAN_IDS, PLANS } from "~/server/subscriptions/plans";
+
+export function formatPrice(cents: number): string {
+  const dollars = cents / 100;
+  return cents % 100 === 0 ? `$${dollars}` : `$${dollars.toFixed(2)}`;
+}
+
+export function formatDate(iso: string): string {
+  return new Date(iso).toLocaleDateString(undefined, {
+    month: "long",
+    day: "numeric",
+    year: "numeric",
+  });
+}
+
+function formatRefreshInterval(ms: number): string {
+  const minutes = Math.round(ms / (60 * 1000));
+  if (minutes < 60) {
+    return minutes === 1
+      ? "Refreshes every minute"
+      : `Refreshes once every ${minutes} min`;
+  }
+  const hours = Math.round(minutes / 60);
+  return hours === 1
+    ? "Refresh up to once an hour"
+    : `Refresh up to once every ${hours} hours`;
+}
+
+export function getPlanFeatures(plan: PlanConfig): string[] {
+  const features: string[] = [];
+
+  if (plan.maxActiveFeeds === Infinity) {
+    features.push("Unlimited active feeds");
+  } else {
+    features.push(`Up to ${plan.maxActiveFeeds.toLocaleString()} active feeds`);
+  }
+
+  features.push(formatRefreshInterval(plan.refreshIntervalMs));
+
+  if (plan.backgroundRefreshIntervalMs != null) {
+    features.push("Refresh in background");
+  } else {
+    features.push("Manual refresh only");
+  }
+
+  return features;
+}
+
+export function getRecommendedPlanId(
+  totalFeeds: number,
+  currentPlanIndex: number,
+): string | null {
+  const bestFit = PLAN_IDS.find((id) => PLANS[id].maxActiveFeeds >= totalFeeds);
+  if (!bestFit) return null;
+  const bestFitIndex = PLAN_IDS.indexOf(bestFit);
+  if (bestFitIndex < currentPlanIndex) return null;
+  return bestFit;
+}
+
+export function getPlanCardBorderClasses(
+  isCurrent: boolean,
+  isRecommended: boolean,
+): string {
+  if (isCurrent || isRecommended) {
+    return isCurrent && !isRecommended
+      ? "border-foreground bg-foreground/5"
+      : "border-sidebar-accent bg-sidebar-accent/5";
+  }
+  return "border-border";
+}
diff --git a/src/components/ui/card-radio-group.tsx b/src/components/ui/card-radio-group.tsx
index c4e068ae..fdaca3d0 100644
--- a/src/components/ui/card-radio-group.tsx
+++ b/src/components/ui/card-radio-group.tsx
@@ -7,6 +7,7 @@ export type CardRadioOption<T extends string> = {
   value: T;
   title: string;
   description?: string;
+  disabled?: boolean;
 };
 
 type CardRadioGroupProps<T extends string> = {
@@ -36,17 +37,29 @@ export function CardRadioGroup<T extends string>({
     >
       {options.map((option) => {
         const isSelected = option.value === value;
+        const isDisabled = option.disabled === true;
         const id = `card-radio-${option.value}`;
         return (
           <label
             key={option.value}
             htmlFor={id}
             className={cn(
-              "bg-card text-card-foreground hover:bg-accent/30 flex cursor-pointer items-start gap-3 rounded-xl border p-4 shadow-sm transition-colors",
-              isSelected && "border-primary ring-primary/30 ring-1",
+              "bg-card text-card-foreground flex gap-3 rounded-xl border p-4 shadow-sm transition-colors",
+              option.description ? "items-start" : "items-center",
+              isDisabled
+                ? "cursor-not-allowed opacity-50"
+                : "hover:bg-accent/30 cursor-pointer",
+              isSelected &&
+                !isDisabled &&
+                "border-primary ring-primary/30 ring-1",
             )}
           >
-            <RadioGroupItem id={id} value={option.value} className="mt-1" />
+            <RadioGroupItem
+              id={id}
+              value={option.value}
+              disabled={isDisabled}
+              className={option.description ? "mt-1" : undefined}
+            />
             <div className="grid gap-1">
               <span className="text-sm leading-none font-semibold">
                 {option.title}
diff --git a/src/components/ui/chip-combobox.tsx b/src/components/ui/chip-combobox.tsx
index 3dd18a55..11b7574c 100644
--- a/src/components/ui/chip-combobox.tsx
+++ b/src/components/ui/chip-combobox.tsx
@@ -1,7 +1,19 @@
 "use client";
 
-import { Check, PlusIcon, XIcon } from "lucide-react";
-import { useRef, useState } from "react";
+import {
+  Check,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  PlusIcon,
+  XIcon,
+} from "lucide-react";
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from "react";
 import { cn } from "~/lib/utils";
 import { Badge } from "~/components/ui/badge";
 import { Button } from "~/components/ui/button";
@@ -38,6 +50,46 @@ type ChipComboboxProps = {
   emptyMessage?: string;
 };
 
+/** Max visible rows of badges before pagination kicks in. */
+const MAX_ROWS = 5;
+/**
+ * How many badges to render for measurement.
+ * Must exceed what could possibly fit in MAX_ROWS so we can detect overflow.
+ */
+const RENDER_CHUNK = 100;
+
+function measureVisibleCount(container: HTMLElement): {
+  count: number;
+  clipHeight: number;
+} {
+  const children = Array.from(container.children) as HTMLElement[];
+  if (children.length === 0) return { count: 0, clipHeight: 0 };
+
+  const containerTop = container.getBoundingClientRect().top;
+  let rowCount = 0;
+  let lastTop = -Infinity;
+  let count = 0;
+  let clipBottom = 0;
+
+  for (const child of children) {
+    const rect = child.getBoundingClientRect();
+    const top = Math.round(rect.top);
+    if (top > lastTop + 1) {
+      // New row (with 1px tolerance for sub-pixel rounding)
+      rowCount++;
+      if (rowCount > MAX_ROWS) break;
+      lastTop = top;
+    }
+    count++;
+    clipBottom = Math.round(rect.bottom);
+  }
+
+  return {
+    count,
+    clipHeight: rowCount > MAX_ROWS ? clipBottom - Math.round(containerTop) : 0,
+  };
+}
+
 export function ChipCombobox({
   label,
   placeholder,
@@ -54,11 +106,95 @@ export function ChipCombobox({
   const [search, setSearch] = useState("");
   const inputRef = useRef<HTMLInputElement>(null);
 
+  // Pagination state
+  const [offset, setOffset] = useState(0);
+  const [visibleCount, setVisibleCount] = useState(0);
+  const [currentPage, setCurrentPage] = useState(1);
+  const [firstPageCount, setFirstPageCount] = useState(0);
+  const maxClipHeightRef = useRef(0);
+  const prevOffsets = useRef<number[]>([]);
+  const badgeContainerRef = useRef<HTMLDivElement>(null);
+
   const selectedSet = new Set(selectedIds);
   const selectedOptions = options
     .filter((o) => selectedSet.has(o.id))
     .sort((a, b) => a.label.localeCompare(b.label));
 
+  // Badges to render — enough to fill 5 rows and detect overflow
+  const renderOptions = selectedOptions.slice(offset, offset + RENDER_CHUNK);
+  const totalCount = selectedOptions.length;
+  const hasMore = totalCount > 0 && offset + visibleCount < totalCount;
+  const hasPrev = offset > 0;
+  const showPagination = hasMore || hasPrev;
+  // Estimate total pages from first page's count (best available approximation)
+  const estimatedTotalPages =
+    firstPageCount > 0 ? Math.ceil(totalCount / firstPageCount) : 1;
+
+  // Reset pagination when selection count changes
+  useEffect(() => {
+    setOffset(0);
+    setVisibleCount(0);
+    setCurrentPage(1);
+    setFirstPageCount(0);
+    maxClipHeightRef.current = 0;
+    prevOffsets.current = [];
+  }, [totalCount]);
+
+  // Measure how many badges fit in MAX_ROWS rows and clip the container.
+  // useLayoutEffect runs synchronously before paint, so there's no flicker.
+  useLayoutEffect(() => {
+    const container = badgeContainerRef.current;
+    if (!container) return;
+
+    // Remove clip to measure natural layout
+    container.style.maxHeight = "none";
+    container.style.minHeight = "";
+
+    const { count, clipHeight } = measureVisibleCount(container);
+
+    // Track the tallest page so the container doesn't collapse on the last page
+    const effectiveHeight =
+      clipHeight > 0
+        ? clipHeight
+        : Math.round(container.getBoundingClientRect().height);
+    if (effectiveHeight > maxClipHeightRef.current) {
+      maxClipHeightRef.current = effectiveHeight;
+    }
+
+    // Store first page's count for total page estimation
+    if (offset === 0 && count > 0) {
+      setFirstPageCount(count);
+    }
+
+    if (clipHeight > 0) {
+      container.style.maxHeight = `${clipHeight}px`;
+    } else {
+      container.style.maxHeight = "";
+    }
+
+    // Prevent height collapse on pages with fewer items
+    if (maxClipHeightRef.current > 0) {
+      container.style.minHeight = `${maxClipHeightRef.current}px`;
+    }
+
+    setVisibleCount(count);
+  }, [offset, totalCount]);
+
+  const goForward = useCallback(() => {
+    prevOffsets.current.push(offset);
+    setOffset(offset + visibleCount);
+    setCurrentPage((p) => p + 1);
+  }, [offset, visibleCount]);
+
+  const goBack = useCallback(() => {
+    const prev = prevOffsets.current.pop();
+    if (prev !== undefined) {
+      setOffset(prev);
+      setCurrentPage((p) => p - 1);
+    }
+  }, []);
+
+  // Search / filter state
   const trimmedSearch = search.trim();
   const lowerSearch = trimmedSearch.toLowerCase();
   const filteredOptions = (
@@ -84,82 +220,114 @@ export function ChipCombobox({
 
   return (
     <div className="grid gap-2">
-      <div className="flex items-center gap-2">
-        <Label>{label}</Label>
-        <Popover open={open} onOpenChange={setOpen}>
-          <PopoverTrigger asChild>
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <Label>{label}</Label>
+          <Popover open={open} onOpenChange={setOpen}>
+            <PopoverTrigger asChild>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="size-6"
+                type="button"
+              >
+                <PlusIcon size={14} />
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent className="w-[250px] p-0" align="start">
+              <Command
+                shouldFilter={false}
+                // cmdk inside Radix Dialog incorrectly sets data-[disabled]
+                // on items, which kills pointer events. Override here.
+                className="[&_[cmdk-item]]:pointer-events-auto [&_[cmdk-item]]:opacity-100"
+              >
+                <CommandInput
+                  ref={inputRef}
+                  placeholder={placeholder}
+                  value={search}
+                  onValueChange={setSearch}
+                />
+                <CommandList>
+                  {filteredOptions.length === 0 && !canCreate && (
+                    <CommandEmpty>{emptyMessage}</CommandEmpty>
+                  )}
+                  <CommandGroup>
+                    {filteredOptions.map((option) => {
+                      const isSelected = selectedSet.has(option.id);
+                      return (
+                        <CommandItem
+                          key={option.id}
+                          value={String(option.id)}
+                          onSelect={() => {
+                            if (isSelected) {
+                              onRemove(option.id);
+                            } else {
+                              onAdd(option.id);
+                            }
+                            setSearch("");
+                            requestAnimationFrame(() => {
+                              inputRef.current?.focus();
+                            });
+                          }}
+                        >
+                          <Check
+                            className={cn(
+                              "mr-2 h-4 w-4",
+                              isSelected ? "opacity-100" : "opacity-0",
+                            )}
+                          />
+                          {option.label}
+                        </CommandItem>
+                      );
+                    })}
+                    {canCreate && (
+                      <CommandItem value="__create__" onSelect={handleCreate}>
+                        <PlusIcon className="mr-2 h-4 w-4" />
+                        <span className="truncate">
+                          {createLabel ?? "Create"} &quot;{trimmedSearch}&quot;
+                        </span>
+                      </CommandItem>
+                    )}
+                  </CommandGroup>
+                </CommandList>
+              </Command>
+            </PopoverContent>
+          </Popover>
+        </div>
+        {showPagination && (
+          <div className="flex items-center gap-1">
+            <span className="text-muted-foreground text-xs">
+              {currentPage}/{estimatedTotalPages}
+            </span>
             <Button
               variant="ghost"
               size="icon"
               className="size-6"
               type="button"
+              disabled={!hasPrev}
+              onClick={goBack}
             >
-              <PlusIcon size={14} />
+              <ChevronLeftIcon size={14} />
             </Button>
-          </PopoverTrigger>
-          <PopoverContent className="w-[250px] p-0" align="start">
-            <Command
-              shouldFilter={false}
-              // cmdk inside Radix Dialog incorrectly sets data-[disabled]
-              // on items, which kills pointer events. Override here.
-              className="[&_[cmdk-item]]:pointer-events-auto [&_[cmdk-item]]:opacity-100"
+            <Button
+              variant="ghost"
+              size="icon"
+              className="size-6"
+              type="button"
+              disabled={!hasMore}
+              onClick={goForward}
             >
-              <CommandInput
-                ref={inputRef}
-                placeholder={placeholder}
-                value={search}
-                onValueChange={setSearch}
-              />
-              <CommandList>
-                {filteredOptions.length === 0 && !canCreate && (
-                  <CommandEmpty>{emptyMessage}</CommandEmpty>
-                )}
-                <CommandGroup>
-                  {filteredOptions.map((option) => {
-                    const isSelected = selectedSet.has(option.id);
-                    return (
-                      <CommandItem
-                        key={option.id}
-                        value={String(option.id)}
-                        onSelect={() => {
-                          if (isSelected) {
-                            onRemove(option.id);
-                          } else {
-                            onAdd(option.id);
-                          }
-                          setSearch("");
-                          requestAnimationFrame(() => {
-                            inputRef.current?.focus();
-                          });
-                        }}
-                      >
-                        <Check
-                          className={cn(
-                            "mr-2 h-4 w-4",
-                            isSelected ? "opacity-100" : "opacity-0",
-                          )}
-                        />
-                        {option.label}
-                      </CommandItem>
-                    );
-                  })}
-                  {canCreate && (
-                    <CommandItem value="__create__" onSelect={handleCreate}>
-                      <PlusIcon className="mr-2 h-4 w-4" />
-                      <span className="truncate">
-                        {createLabel ?? "Create"} &quot;{trimmedSearch}&quot;
-                      </span>
-                    </CommandItem>
-                  )}
-                </CommandGroup>
-              </CommandList>
-            </Command>
-          </PopoverContent>
-        </Popover>
+              <ChevronRightIcon size={14} />
+            </Button>
+          </div>
+        )}
       </div>
       {selectedOptions.length > 0 ? (
-        <div className="flex flex-wrap gap-1">
-          {selectedOptions.map((option) => (
+        <div
+          ref={badgeContainerRef}
+          className="flex flex-wrap content-start gap-1 overflow-hidden"
+        >
+          {renderOptions.map((option) => (
             <Badge
               key={option.id}
               variant={badgeVariant}
diff --git a/src/components/ui/responsive-dropdown.tsx b/src/components/ui/responsive-dropdown.tsx
index f16a6645..2fefb083 100644
--- a/src/components/ui/responsive-dropdown.tsx
+++ b/src/components/ui/responsive-dropdown.tsx
@@ -12,6 +12,7 @@ import type {
   DropdownMenuContentProps,
   DropdownMenuItemProps,
 } from "@radix-ui/react-dropdown-menu";
+import { cn } from "~/lib/utils";
 import {
   Dialog,
   DialogClose,
@@ -113,9 +114,13 @@ interface ControlledResponsiveDialogProps {
   onOpenChange: (open: boolean) => void;
   children: React.ReactNode;
   title?: string;
-  description?: string;
+  description?: React.ReactNode;
+  className?: string;
+  headerClassName?: string;
   onBack?: () => void;
   headerRight?: React.ReactNode;
+  footer?: React.ReactNode;
+  footerBorder?: boolean;
   onOpenAutoFocus?: (event: Event) => void;
 }
 export function ControlledResponsiveDialog({
@@ -126,6 +131,10 @@ export function ControlledResponsiveDialog({
   description,
   onBack,
   headerRight,
+  className,
+  headerClassName,
+  footer,
+  footerBorder = false,
   onOpenAutoFocus,
 }: ControlledResponsiveDialogProps) {
   const isDesktop = useMediaQuery("(min-width: 640px)");
@@ -133,8 +142,12 @@ export function ControlledResponsiveDialog({
   if (isDesktop) {
     return (
       <Dialog open={open} onOpenChange={onOpenChange}>
-        <DialogContent hideClose onOpenAutoFocus={onOpenAutoFocus}>
-          <DialogHeader>
+        <DialogContent
+          hideClose
+          className={cn("flex max-h-[calc(100vh-6rem)] flex-col", className)}
+          onOpenAutoFocus={onOpenAutoFocus}
+        >
+          <DialogHeader className={cn("shrink-0", headerClassName)}>
             {onBack && (
               <button
                 onClick={onBack}
@@ -144,9 +157,9 @@ export function ControlledResponsiveDialog({
                 <span>Back</span>
               </button>
             )}
-            <div className="flex items-center justify-between">
-              <DialogTitle>{title}</DialogTitle>
-              <div className="flex items-center gap-3">
+            <div className="relative flex items-center justify-between">
+              <DialogTitle className="flex-1">{title}</DialogTitle>
+              <div className="absolute right-0 flex items-center gap-3">
                 {headerRight}
                 <DialogClose className="ring-offset-background focus:ring-ring rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden">
                   <XIcon className="h-4 w-4" />
@@ -156,7 +169,14 @@ export function ControlledResponsiveDialog({
             </div>
             <DialogDescription>{description}</DialogDescription>
           </DialogHeader>
-          {children}
+          <div className="-mx-6 min-h-0 flex-1 overflow-y-auto px-6 py-1">
+            {children}
+          </div>
+          {footer && (
+            <div className={cn("shrink-0 pt-4", footerBorder && "border-t")}>
+              {footer}
+            </div>
+          )}
         </DialogContent>
       </Dialog>
     );
@@ -164,8 +184,8 @@ export function ControlledResponsiveDialog({
 
   return (
     <Drawer open={open} onOpenChange={onOpenChange}>
-      <DrawerContent>
-        <DrawerHeader className="text-left">
+      <DrawerContent className="max-h-[calc(100vh-6rem)]">
+        <DrawerHeader className="shrink-0 text-left">
           {onBack && (
             <button
               onClick={onBack}
@@ -181,7 +201,20 @@ export function ControlledResponsiveDialog({
           </div>
           <DrawerDescription>{description}</DrawerDescription>
         </DrawerHeader>
-        <div className="px-4 pb-4">{children}</div>
+        <div className="min-h-0 flex-1 overflow-y-auto px-4 py-1">
+          {children}
+        </div>
+        {footer && (
+          <div
+            className={cn(
+              "shrink-0 px-4 pt-4 pb-4",
+              footerBorder && "border-t",
+            )}
+          >
+            {footer}
+          </div>
+        )}
+        {!footer && <div className="pb-4" />}
       </DrawerContent>
     </Drawer>
   );
diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx
index cbfb5684..32e7a724 100644
--- a/src/components/ui/tabs.tsx
+++ b/src/components/ui/tabs.tsx
@@ -26,12 +26,13 @@ function Tabs({
 }
 
 const tabsListVariants = cva(
-  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground data-[variant=line]:rounded-none",
+  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground data-[variant=line]:rounded-none data-[variant=pill]:rounded-none",
   {
     variants: {
       variant: {
         default: "h-9 bg-muted/30",
         line: "h-9 gap-1 bg-transparent",
+        pill: "h-9 gap-1 rounded-lg bg-transparent p-0",
       },
     },
     defaultVariants: {
@@ -71,6 +72,8 @@ function TabsTrigger({
         "group-data-[variant=line]/tabs-list:data-[state=active]:text-foreground group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-[state=active]:bg-transparent group-data-[variant=line]/tabs-list:data-[state=active]:shadow-none dark:group-data-[variant=line]/tabs-list:data-[state=active]:border-transparent dark:group-data-[variant=line]/tabs-list:data-[state=active]:bg-transparent",
         // underline pseudo-element for line variant
         "after:bg-foreground after:absolute after:inset-x-0 after:bottom-[-5px] after:h-0.5 after:opacity-0 after:transition-opacity group-data-[variant=line]/tabs-list:data-[state=active]:after:opacity-100",
+        // pill variant: muted bg on active, lighter muted on hover, smooth transition
+        "group-data-[variant=pill]/tabs-list:hover:bg-muted/50 group-data-[variant=pill]/tabs-list:data-[state=active]:bg-muted group-data-[variant=pill]/tabs-list:data-[state=active]:text-foreground group-data-[variant=pill]/tabs-list:transition-colors group-data-[variant=pill]/tabs-list:after:hidden group-data-[variant=pill]/tabs-list:data-[state=active]:shadow-none dark:group-data-[variant=pill]/tabs-list:data-[state=active]:border-transparent",
         className,
       )}
       {...props}
diff --git a/src/content/releases/2026-04-20.md b/src/content/releases/2026-04-20.md
new file mode 100644
index 00000000..3531fd20
--- /dev/null
+++ b/src/content/releases/2026-04-20.md
@@ -0,0 +1,33 @@
+---
+title: "Bulk operations & quality of life changes"
+description: "Bulk feed management, Resend email support, and a handful of UI improvements."
+publish_date: "2026-04-20"
+public: true
+---
+
+## Features
+
+### Bulk feed active/inactive toggle
+
+- Multiple feeds can now be toggled active or inactive at once from the manage page
+
+### Shift-click range selection
+
+- Hold <kbd>Shift</kbd> and click to bulk select items in the feeds, tags, and views management pages
+
+### Resend email support
+
+- Added [Resend](https://resend.com) as an alternative email provider alongside SendGrid
+
+## Improvements
+
+- Dialogs with long content now scroll properly
+- Feed chips in dialogs now paginate when there are many items
+- Management page tab style updates
+- Support email address is now configurable via `VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS` environment variable
+
+## Other changes
+
+### Progress on implementing subscriptions
+
+- Refined upcoming subscription support in Serial, expanding previous groundwork code changes
diff --git a/src/emails/reset-password.tsx b/src/emails/reset-password.tsx
index 289b6914..0b6d7ca7 100644
--- a/src/emails/reset-password.tsx
+++ b/src/emails/reset-password.tsx
@@ -12,11 +12,15 @@ import {
 
 interface ResetPasswordProps {
   resetUrl?: string;
+  supportEmail?: string;
 }
 
 const baseUrl = `https://serial.tube`;
 
-export default function ResetPasswordEmail({ resetUrl }: ResetPasswordProps) {
+export default function ResetPasswordEmail({
+  resetUrl,
+  supportEmail,
+}: ResetPasswordProps) {
   return (
     <Html>
       <Head />
@@ -56,24 +60,26 @@ export default function ResetPasswordEmail({ resetUrl }: ResetPasswordProps) {
             height="48"
             alt="Serial's Logo"
           />
-          <Text
-            style={{
-              ...text,
-              color: "#666",
-              marginTop: "14px",
-              marginBottom: "16px",
-            }}
-          >
-            Having trouble? Reach out to us at{" "}
-            <Link
+          {supportEmail && (
+            <Text
               style={{
-                textDecoration: "underline",
+                ...text,
+                color: "#666",
+                marginTop: "14px",
+                marginBottom: "16px",
               }}
-              href="mailto:hey@serial.tube?subject=Question%20about%20serial.tube"
             >
-              hey@serial.tube
-            </Link>
-          </Text>
+              Having trouble? Reach out to us at{" "}
+              <Link
+                style={{
+                  textDecoration: "underline",
+                }}
+                href={`mailto:${supportEmail}`}
+              >
+                {supportEmail}
+              </Link>
+            </Text>
+          )}
         </Container>
       </Body>
     </Html>
diff --git a/src/emails/verify-email.tsx b/src/emails/verify-email.tsx
index 764b24c9..6a62b282 100644
--- a/src/emails/verify-email.tsx
+++ b/src/emails/verify-email.tsx
@@ -12,11 +12,15 @@ import {
 
 interface VerifyEmailProps {
   otp?: string;
+  supportEmail?: string;
 }
 
 const baseUrl = `https://serial.tube`;
 
-export default function VerifyEmailEmail({ otp }: VerifyEmailProps) {
+export default function VerifyEmailEmail({
+  otp,
+  supportEmail,
+}: VerifyEmailProps) {
   return (
     <Html>
       <Head />
@@ -49,24 +53,26 @@ export default function VerifyEmailEmail({ otp }: VerifyEmailProps) {
             height="48"
             alt="Serial's Logo"
           />
-          <Text
-            style={{
-              ...text,
-              color: "#666",
-              marginTop: "14px",
-              marginBottom: "16px",
-            }}
-          >
-            Having trouble? Reach out to us at{" "}
-            <Link
+          {supportEmail && (
+            <Text
               style={{
-                textDecoration: "underline",
+                ...text,
+                color: "#666",
+                marginTop: "14px",
+                marginBottom: "16px",
               }}
-              href="mailto:hey@serial.tube?subject=Question%20about%20serial.tube"
             >
-              hey@serial.tube
-            </Link>
-          </Text>
+              Having trouble? Reach out to us at{" "}
+              <Link
+                style={{
+                  textDecoration: "underline",
+                }}
+                href={`mailto:${supportEmail}`}
+              >
+                {supportEmail}
+              </Link>
+            </Text>
+          )}
         </Container>
       </Body>
     </Html>
diff --git a/src/env.js b/src/env.js
index 24161f74..84c63c5e 100644
--- a/src/env.js
+++ b/src/env.js
@@ -2,6 +2,16 @@ import { createEnv } from "@t3-oss/env-core";
 import { z } from "zod";
 
 export const env = createEnv({
+  clientPrefix: "VITE_PUBLIC_",
+  /**
+   * Specify your client-side environment variables schema here.
+   * These are exposed to the browser via Vite's VITE_PUBLIC_ prefix.
+   */
+  client: {
+    VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS: z.string().email().optional(),
+    VITE_PUBLIC_SENTRY_DSN_WEB: z.string().optional(),
+    VITE_PUBLIC_SENTRY_SECURITY_ENDPOINT_WEB: z.string().optional(),
+  },
   /**
    * Specify your server-side environment variables schema here. This way you can ensure the app
    * isn't built with invalid env vars.
@@ -16,15 +26,23 @@ export const env = createEnv({
         "A DATABASE_AUTH_TOKEN is needed.",
       ),
     BETTER_AUTH_SECRET: z.string(),
+    RESEND_API_KEY: z.string().optional(),
     SENDGRID_API_KEY: z.string().optional(),
+    FROM_EMAIL_ADDRESS: z.string().email().optional(),
     INSTAPAPER_OAUTH_ID: z.string().optional(),
     INSTAPAPER_OAUTH_SECRET: z.string().optional(),
     POLAR_ACCESS_TOKEN: z.string().optional(),
     POLAR_WEBHOOK_SECRET: z.string().optional(),
-    POLAR_STANDARD_MONTHLY_PRODUCT_ID: z.string().optional(),
-    POLAR_STANDARD_ANNUAL_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID: z.string().optional(),
+    POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID: z.string().optional(),
     POLAR_PRO_MONTHLY_PRODUCT_ID: z.string().optional(),
     POLAR_PRO_ANNUAL_PRODUCT_ID: z.string().optional(),
+    UPSTASH_REDIS_REST_URL: z.string().optional(),
+    UPSTASH_REDIS_REST_TOKEN: z.string().optional(),
     BACKGROUND_REFRESH_ENABLED: z.string().optional().default("true"),
     OAUTH_PROVIDER_ID: z.string().optional(),
     OAUTH_PROVIDER_NAME: z.string().optional(),
@@ -36,6 +54,8 @@ export const env = createEnv({
     OAUTH_USER_INFO_URL: z.string().optional(),
     OAUTH_SCOPES: z.string().optional(),
     OAUTH_PKCE: z.string().optional(),
+    SENTRY_DSN_BACKEND: z.string().optional(),
+    SENTRY_SECURITY_ENDPOINT_BACKEND: z.string().optional(),
     NODE_ENV: z
       .enum(["development", "test", "production"])
       .default("development"),
@@ -46,21 +66,42 @@ export const env = createEnv({
    * middlewares) or client-side so we need to destruct manually.
    */
   runtimeEnv: {
+    VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS:
+      import.meta.env?.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS ??
+      process.env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS,
+    VITE_PUBLIC_SENTRY_DSN_WEB:
+      import.meta.env?.VITE_PUBLIC_SENTRY_DSN_WEB ??
+      process.env.VITE_PUBLIC_SENTRY_DSN_WEB,
+    VITE_PUBLIC_SENTRY_SECURITY_ENDPOINT_WEB:
+      import.meta.env?.VITE_PUBLIC_SENTRY_SECURITY_ENDPOINT_WEB ??
+      process.env.VITE_PUBLIC_SENTRY_SECURITY_ENDPOINT_WEB,
     DATABASE_URL: process.env.DATABASE_URL,
     DATABASE_AUTH_TOKEN: process.env.DATABASE_AUTH_TOKEN,
     NODE_ENV: process.env.NODE_ENV,
     BETTER_AUTH_SECRET: process.env.BETTER_AUTH_SECRET,
+    RESEND_API_KEY: process.env.RESEND_API_KEY,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
+    FROM_EMAIL_ADDRESS: process.env.FROM_EMAIL_ADDRESS,
     INSTAPAPER_OAUTH_ID: process.env.INSTAPAPER_OAUTH_ID,
     INSTAPAPER_OAUTH_SECRET: process.env.INSTAPAPER_OAUTH_SECRET,
     POLAR_ACCESS_TOKEN: process.env.POLAR_ACCESS_TOKEN,
     POLAR_WEBHOOK_SECRET: process.env.POLAR_WEBHOOK_SECRET,
-    POLAR_STANDARD_MONTHLY_PRODUCT_ID:
-      process.env.POLAR_STANDARD_MONTHLY_PRODUCT_ID,
-    POLAR_STANDARD_ANNUAL_PRODUCT_ID:
-      process.env.POLAR_STANDARD_ANNUAL_PRODUCT_ID,
+    POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID:
+      process.env.POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID,
+    POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID:
+      process.env.POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID,
+    POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID:
+      process.env.POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID,
+    POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID:
+      process.env.POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID,
+    POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID:
+      process.env.POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID,
+    POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID:
+      process.env.POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID,
     POLAR_PRO_MONTHLY_PRODUCT_ID: process.env.POLAR_PRO_MONTHLY_PRODUCT_ID,
     POLAR_PRO_ANNUAL_PRODUCT_ID: process.env.POLAR_PRO_ANNUAL_PRODUCT_ID,
+    UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,
+    UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN,
     BACKGROUND_REFRESH_ENABLED: process.env.BACKGROUND_REFRESH_ENABLED,
     OAUTH_PROVIDER_ID: process.env.OAUTH_PROVIDER_ID,
     OAUTH_PROVIDER_NAME: process.env.OAUTH_PROVIDER_NAME,
@@ -72,6 +113,9 @@ export const env = createEnv({
     OAUTH_USER_INFO_URL: process.env.OAUTH_USER_INFO_URL,
     OAUTH_SCOPES: process.env.OAUTH_SCOPES,
     OAUTH_PKCE: process.env.OAUTH_PKCE,
+    SENTRY_DSN_BACKEND: process.env.SENTRY_DSN_BACKEND,
+    SENTRY_SECURITY_ENDPOINT_BACKEND:
+      process.env.SENTRY_SECURITY_ENDPOINT_BACKEND,
   },
   /**
    * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially
diff --git a/src/lib/data/feeds/mutations.ts b/src/lib/data/feeds/mutations.ts
index c983ffec..072af785 100644
--- a/src/lib/data/feeds/mutations.ts
+++ b/src/lib/data/feeds/mutations.ts
@@ -46,7 +46,9 @@ export function useCreateFeedMutation() {
               action: {
                 label: "Upgrade",
                 onClick: () =>
-                  useDialogStore.getState().launchDialog("subscription"),
+                  useDialogStore.getState().launchDialog("subscription", {
+                    subscriptionView: "picker",
+                  }),
               },
             },
           );
@@ -207,3 +209,19 @@ export function useSetFeedActiveMutation() {
     }),
   );
 }
+
+export function useBulkSetActiveMutation() {
+  const fetchFeeds = useFetchFeeds();
+  const queryClient = useQueryClient();
+
+  return useMutation(
+    orpc.feed.bulkSetActive.mutationOptions({
+      onSuccess: () => {
+        void fetchFeeds();
+        void queryClient.invalidateQueries({
+          queryKey: orpc.subscription.getStatus.queryOptions().queryKey,
+        });
+      },
+    }),
+  );
+}
diff --git a/src/lib/data/plan-success.ts b/src/lib/data/plan-success.ts
new file mode 100644
index 00000000..98373d1a
--- /dev/null
+++ b/src/lib/data/plan-success.ts
@@ -0,0 +1,13 @@
+import { create } from "zustand";
+
+type PlanSuccessStore = {
+  showDialog: boolean;
+  openDialog: () => void;
+  closeDialog: () => void;
+};
+
+export const usePlanSuccessStore = create<PlanSuccessStore>((set) => ({
+  showDialog: false,
+  openDialog: () => set({ showDialog: true }),
+  closeDialog: () => set({ showDialog: false }),
+}));
diff --git a/src/lib/data/subscription.ts b/src/lib/data/subscription.ts
index 94b0e7f5..915dc4fe 100644
--- a/src/lib/data/subscription.ts
+++ b/src/lib/data/subscription.ts
@@ -4,7 +4,7 @@ import { orpc } from "~/lib/orpc";
 export function useSubscription() {
   const { data, isLoading } = useQuery({
     ...orpc.subscription.getStatus.queryOptions(),
-    staleTime: 60_000,
+    staleTime: 15_000,
   });
 
   return {
diff --git a/src/lib/hooks/useShiftSelect.ts b/src/lib/hooks/useShiftSelect.ts
new file mode 100644
index 00000000..6a3aa81c
--- /dev/null
+++ b/src/lib/hooks/useShiftSelect.ts
@@ -0,0 +1,54 @@
+import { useCallback, useRef } from "react";
+
+/**
+ * Hook that adds shift-click range selection to a list of items.
+ *
+ * @param filteredIds - The ordered array of visible item IDs.
+ * @param setSelectedIds - State setter for the selected IDs set.
+ * @returns A `handleSelect` function to use in place of a plain toggle.
+ *          Call it with `(id, event)` from onClick handlers.
+ */
+export function useShiftSelect(
+  filteredIds: number[],
+  setSelectedIds: React.Dispatch<React.SetStateAction<Set<number>>>,
+) {
+  const lastSelectedId = useRef<number | null>(null);
+
+  const handleSelect = useCallback(
+    (id: number, event?: { shiftKey?: boolean }) => {
+      if (event?.shiftKey && lastSelectedId.current !== null) {
+        const lastIndex = filteredIds.indexOf(lastSelectedId.current);
+        const currentIndex = filteredIds.indexOf(id);
+
+        if (lastIndex !== -1 && currentIndex !== -1) {
+          const start = Math.min(lastIndex, currentIndex);
+          const end = Math.max(lastIndex, currentIndex);
+          const rangeIds = filteredIds.slice(start, end + 1);
+
+          setSelectedIds((prev) => {
+            const next = new Set(prev);
+            rangeIds.forEach((rangeId) => next.add(rangeId));
+            return next;
+          });
+          lastSelectedId.current = id;
+          return;
+        }
+      }
+
+      // Normal toggle
+      setSelectedIds((prev) => {
+        const next = new Set(prev);
+        if (next.has(id)) {
+          next.delete(id);
+        } else {
+          next.add(id);
+        }
+        return next;
+      });
+      lastSelectedId.current = id;
+    },
+    [filteredIds, setSelectedIds],
+  );
+
+  return handleSelect;
+}
diff --git a/src/lib/sentry.ts b/src/lib/sentry.ts
new file mode 100644
index 00000000..14bcdda8
--- /dev/null
+++ b/src/lib/sentry.ts
@@ -0,0 +1,40 @@
+import * as Sentry from "@sentry/browser";
+import { env } from "~/env";
+
+const SAMPLE_RATES = {
+  development: {
+    traces: 1.0,
+    replaysSession: 0,
+    replaysOnError: 1.0,
+  },
+  production: {
+    traces: 0.2,
+    replaysSession: 0.1,
+    replaysOnError: 1.0,
+  },
+} as const;
+
+let initialized = false;
+
+export function initializeSentry() {
+  if (initialized || !env.VITE_PUBLIC_SENTRY_DSN_WEB) {
+    return;
+  }
+
+  initialized = true;
+
+  const isDev = import.meta.env.DEV;
+  const rates = isDev ? SAMPLE_RATES.development : SAMPLE_RATES.production;
+
+  Sentry.init({
+    dsn: env.VITE_PUBLIC_SENTRY_DSN_WEB,
+    environment: isDev ? "development" : "production",
+    integrations: [
+      Sentry.browserTracingIntegration(),
+      Sentry.replayIntegration(),
+    ],
+    tracesSampleRate: rates.traces,
+    replaysSessionSampleRate: rates.replaysSession,
+    replaysOnErrorSampleRate: rates.replaysOnError,
+  });
+}
diff --git a/src/server/api/routers/adminRouter.ts b/src/server/api/routers/adminRouter.ts
index 815ea06c..19c1cf0f 100644
--- a/src/server/api/routers/adminRouter.ts
+++ b/src/server/api/routers/adminRouter.ts
@@ -14,7 +14,7 @@ import { isOAuthConfigured } from "~/server/auth/constants";
 import { env } from "~/env";
 import { protectedProcedure, publicProcedure } from "~/server/orpc/base";
 import { auth } from "~/server/auth";
-import { account, appConfig, session, user } from "~/server/db/schema";
+import { account, appConfig, feeds, session, user } from "~/server/db/schema";
 import { db } from "~/server/db";
 
 // Admin procedure that requires admin role
@@ -698,3 +698,76 @@ export const getRetentionStats = adminProcedure.handler(async () => {
 
   return { stats };
 });
+
+// Get distribution of feed counts per user (how many users have N feeds)
+export const getFeedCountDistribution = adminProcedure.handler(async () => {
+  // Count all feeds per user (subquery)
+  const allFeedsSq = db
+    .select({
+      userId: feeds.userId,
+      feedCount: count().as("feed_count"),
+    })
+    .from(feeds)
+    .groupBy(feeds.userId)
+    .as("user_feeds");
+
+  // Aggregate: how many users have each feed count
+  const allFeedCounts = await db
+    .select({
+      feedCount: allFeedsSq.feedCount,
+      userCount: count(),
+    })
+    .from(allFeedsSq)
+    .groupBy(sql`${allFeedsSq.feedCount}`)
+    .orderBy(sql`${allFeedsSq.feedCount}`)
+    .all();
+
+  // Count active feeds per user (subquery)
+  const activeFeedsSq = db
+    .select({
+      userId: feeds.userId,
+      feedCount: count().as("feed_count"),
+    })
+    .from(feeds)
+    .where(eq(feeds.isActive, true))
+    .groupBy(feeds.userId)
+    .as("active_user_feeds");
+
+  // Aggregate: how many users have each active feed count
+  const activeFeedCounts = await db
+    .select({
+      feedCount: activeFeedsSq.feedCount,
+      userCount: count(),
+    })
+    .from(activeFeedsSq)
+    .groupBy(sql`${activeFeedsSq.feedCount}`)
+    .orderBy(sql`${activeFeedsSq.feedCount}`)
+    .all();
+
+  // Merge into a single array keyed by feedCount
+  const allMap = new Map(allFeedCounts.map((r) => [r.feedCount, r.userCount]));
+  const activeMap = new Map(
+    activeFeedCounts.map((r) => [r.feedCount, r.userCount]),
+  );
+
+  const maxFeedCount = Math.max(
+    ...allFeedCounts.map((r) => r.feedCount),
+    ...activeFeedCounts.map((r) => r.feedCount),
+    0,
+  );
+
+  const distribution = [];
+  for (let i = 1; i <= maxFeedCount; i++) {
+    const allUsers = allMap.get(i) ?? 0;
+    const activeUsers = activeMap.get(i) ?? 0;
+    if (allUsers > 0 || activeUsers > 0) {
+      distribution.push({
+        feedCount: i,
+        allUsers,
+        activeUsers,
+      });
+    }
+  }
+
+  return { distribution };
+});
diff --git a/src/server/api/routers/feed-router/index.ts b/src/server/api/routers/feed-router/index.ts
index 50b55346..70bfcaed 100644
--- a/src/server/api/routers/feed-router/index.ts
+++ b/src/server/api/routers/feed-router/index.ts
@@ -24,7 +24,9 @@ import { fetchNewFeedDetails } from "~/server/rss/fetchFeeds";
 import {
   canActivateFeed,
   getFeedsActivationBudget,
+  getUserPlanId,
 } from "~/server/subscriptions/helpers";
+import { getEffectivePlanConfig } from "~/server/subscriptions/plans";
 
 type BulkImportFromFileSuccess = {
   feedUrl: string;
@@ -522,6 +524,61 @@ export const setActive = protectedProcedure
     return feedsSchema.parse(updatedFeed);
   });
 
+export const bulkSetActive = protectedProcedure
+  .input(z.object({ feedIds: z.number().array(), isActive: z.boolean() }))
+  .handler(async ({ context, input }) => {
+    if (input.feedIds.length === 0) return;
+
+    // Resolve the plan limit outside the transaction (no db needed)
+    const planId = await getUserPlanId(context.user.id);
+    const planConfig = getEffectivePlanConfig(planId);
+
+    await context.db.transaction(async (tx) => {
+      if (input.isActive) {
+        // Count active feeds inside the transaction so the read is
+        // consistent with the subsequent update, preventing TOCTOU races.
+        const activeCountResult = await tx
+          .select({ count: sql<number>`count(*)` })
+          .from(feeds)
+          .where(
+            and(eq(feeds.userId, context.user.id), eq(feeds.isActive, true)),
+          )
+          .get();
+        const activeCount = activeCountResult?.count ?? 0;
+        const remainingSlots = Math.max(
+          0,
+          planConfig.maxActiveFeeds - activeCount,
+        );
+
+        // Count how many of the requested feeds are currently inactive
+        const currentFeeds = await tx.query.feeds.findMany({
+          where: and(
+            inArray(feeds.id, input.feedIds),
+            eq(feeds.userId, context.user.id),
+            eq(feeds.isActive, false),
+          ),
+          columns: { id: true },
+        });
+
+        if (currentFeeds.length > remainingSlots) {
+          throw new Error(
+            "Feed limit reached. Upgrade your plan to activate more feeds.",
+          );
+        }
+      }
+
+      await tx
+        .update(feeds)
+        .set({ isActive: input.isActive })
+        .where(
+          and(
+            inArray(feeds.id, input.feedIds),
+            eq(feeds.userId, context.user.id),
+          ),
+        );
+    });
+  });
+
 export const discoverFeeds = protectedProcedure
   .input(z.object({ url: z.string().url() }))
   .handler(async ({ input }) => {
diff --git a/src/server/api/routers/initialRouter.ts b/src/server/api/routers/initialRouter.ts
index a4dbc672..06d7481d 100644
--- a/src/server/api/routers/initialRouter.ts
+++ b/src/server/api/routers/initialRouter.ts
@@ -23,7 +23,10 @@ import type {
 } from "~/server/db/schema";
 import type { ORPCContext } from "~/server/orpc/base";
 import type { FetchFeedsStatus } from "~/server/rss/fetchFeeds";
-import { getFeedsActivationBudget } from "~/server/subscriptions/helpers";
+import {
+  checkUserRefreshEligibility,
+  getFeedsActivationBudget,
+} from "~/server/subscriptions/helpers";
 import { visibilityFilterSchema } from "~/lib/data/atoms";
 import {
   buildContentTypeFilter,
@@ -1410,6 +1413,24 @@ export const requestNewData = protectedProcedure
     const channel = getUserChannel(context.user.id);
     const newerThanTimestamp = input.newerThan;
 
+    // Check user-level refresh rate limit
+    const eligibility = await checkUserRefreshEligibility(
+      context.db,
+      context.user.id,
+    );
+    if (!eligibility.eligible) {
+      await publisher.publish(channel, {
+        source: "new-data",
+        chunk: {
+          type: "error",
+          message: `You can refresh again at ${eligibility.nextRefreshAt.toLocaleTimeString()}`,
+          phase: "initial-fetch",
+          viewId: -1,
+        },
+      });
+      return { status: "rate-limited" };
+    }
+
     // Fetch prerequisite data
     let prerequisiteData: PrerequisiteData;
     try {
diff --git a/src/server/api/routers/subscriptionRouter.ts b/src/server/api/routers/subscriptionRouter.ts
index 514f3e67..280b5871 100644
--- a/src/server/api/routers/subscriptionRouter.ts
+++ b/src/server/api/routers/subscriptionRouter.ts
@@ -1,11 +1,27 @@
 import { z } from "zod";
 import { eq } from "drizzle-orm";
-import type { PlanId } from "~/server/subscriptions/plans";
+import type { PaidPlanId } from "~/server/subscriptions/plans";
 import { protectedProcedure } from "~/server/orpc/base";
-import { getUserPlanLimits } from "~/server/subscriptions/helpers";
-import { IS_BILLING_ENABLED, polarClient } from "~/server/subscriptions/polar";
-import { PLANS } from "~/server/subscriptions/plans";
+import {
+  getUserPlanId,
+  getUserPlanLimits,
+} from "~/server/subscriptions/helpers";
+import {
+  determinePlanFromProductId,
+  getAllKnownProductIds,
+  getPolarProductIds,
+  IS_BILLING_ENABLED,
+  polarClient,
+} from "~/server/subscriptions/polar";
+import { PAID_PLAN_IDS, PLAN_IDS, PLANS } from "~/server/subscriptions/plans";
+import {
+  applySubscriptionSideEffects,
+  getSubscriptionFromKV,
+  redis,
+  syncPolarDataToKV,
+} from "~/server/subscriptions/kv";
 import { user } from "~/server/db/schema";
+import { IS_EMAIL_ENABLED } from "~/server/email";
 
 const BASE_URL = process.env.BETTER_AUTH_BASE_URL ?? "http://localhost:3000";
 
@@ -31,7 +47,7 @@ type CachedProducts = {
 };
 
 type PlanProduct = {
-  planId: PlanId;
+  planId: PaidPlanId;
   planName: string;
   monthlyPrice: number | null;
   annualPrice: number | null;
@@ -40,12 +56,30 @@ type PlanProduct = {
 };
 
 let productsCache: CachedProducts | null = null;
-const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
+const CACHE_TTL_MS = 3 * 60 * 1000; // 3 minutes
+
+/** Cooldown window for syncAfterCheckout per user (seconds). */
+const SYNC_COOLDOWN_SECONDS = 30;
 
 export const getStatus = protectedProcedure.handler(async ({ context }) => {
   return getUserPlanLimits(context.db, context.user.id);
 });
 
+/** Force-refresh the plan from Polar, bypassing the KV cache. */
+export const refreshStatus = protectedProcedure.handler(async ({ context }) => {
+  if (IS_BILLING_ENABLED) {
+    try {
+      await syncPolarDataToKV(context.user.id);
+    } catch (e) {
+      console.warn(
+        `[subscription] refreshStatus sync failed for user ${context.user.id}:`,
+        e,
+      );
+    }
+  }
+  return getUserPlanLimits(context.db, context.user.id);
+});
+
 export const getProducts = protectedProcedure.handler(async () => {
   if (!IS_BILLING_ENABLED || !polarClient) {
     return [];
@@ -56,12 +90,10 @@ export const getProducts = protectedProcedure.handler(async () => {
     return productsCache.data;
   }
 
-  const productIds = [
-    PLANS.standard.polarMonthlyProductId,
-    PLANS.standard.polarAnnualProductId,
-    PLANS.pro.polarMonthlyProductId,
-    PLANS.pro.polarAnnualProductId,
-  ].filter(Boolean);
+  const productIds = PAID_PLAN_IDS.flatMap((planId) => {
+    const ids = getPolarProductIds(planId);
+    return [ids.monthly, ids.annual];
+  }).filter(Boolean);
 
   if (productIds.length === 0) {
     return [];
@@ -70,15 +102,20 @@ export const getProducts = protectedProcedure.handler(async () => {
   try {
     const results: PlanProduct[] = [];
 
-    for (const planId of ["standard", "pro"] as const) {
+    for (const planId of PAID_PLAN_IDS) {
       const plan = PLANS[planId];
+      const planProductIds = getPolarProductIds(planId);
+
+      // Skip plans that have no Polar product IDs configured
+      if (!planProductIds.monthly && !planProductIds.annual) continue;
+
       let monthlyPrice: number | null = null;
       let annualPrice: number | null = null;
 
-      if (plan.polarMonthlyProductId) {
+      if (planProductIds.monthly) {
         try {
           const product = await polarClient.products.get({
-            id: plan.polarMonthlyProductId,
+            id: planProductIds.monthly,
           });
           const price = product.prices?.[0];
           if (price && "amountType" in price && price.amountType === "fixed") {
@@ -89,10 +126,10 @@ export const getProducts = protectedProcedure.handler(async () => {
         }
       }
 
-      if (plan.polarAnnualProductId) {
+      if (planProductIds.annual) {
         try {
           const product = await polarClient.products.get({
-            id: plan.polarAnnualProductId,
+            id: planProductIds.annual,
           });
           const price = product.prices?.[0];
           if (price && "amountType" in price && price.amountType === "fixed") {
@@ -111,8 +148,8 @@ export const getProducts = protectedProcedure.handler(async () => {
         planName: plan.name,
         monthlyPrice,
         annualPrice,
-        monthlyProductId: plan.polarMonthlyProductId,
-        annualProductId: plan.polarAnnualProductId,
+        monthlyProductId: planProductIds.monthly,
+        annualProductId: planProductIds.annual,
       });
     }
 
@@ -129,13 +166,24 @@ export const getProducts = protectedProcedure.handler(async () => {
 });
 
 export const createCheckout = protectedProcedure
-  .input(z.object({ planId: z.enum(["standard", "pro"]) }))
+  .input(
+    z.object({
+      planId: z.enum(PAID_PLAN_IDS),
+      returnPath: z.string().optional(),
+    }),
+  )
   .handler(async ({ context, input }) => {
     if (!IS_BILLING_ENABLED || !polarClient) {
-      return { url: null, error: null };
+      return { url: null, error: "billing-disabled" as const };
     }
 
-    if (process.env.SENDGRID_API_KEY) {
+    // Prevent double-checkout: block if user already has an active paid plan
+    const existingPlan = await getUserPlanId(context.user.id);
+    if (existingPlan !== "free") {
+      return { url: null, error: "already-subscribed" as const };
+    }
+
+    if (IS_EMAIL_ENABLED) {
       const currentUser = await context.db
         .select({ emailVerified: user.emailVerified })
         .from(user)
@@ -147,28 +195,409 @@ export const createCheckout = protectedProcedure
       }
     }
 
-    const plan = PLANS[input.planId];
-    const productIds = [
-      plan.polarMonthlyProductId,
-      plan.polarAnnualProductId,
-    ].filter((id): id is string => id != null);
+    const planProductIds = getPolarProductIds(input.planId);
+    const productIds = [planProductIds.monthly, planProductIds.annual].filter(
+      (id): id is string => id != null,
+    );
 
     if (productIds.length === 0) {
-      return { url: null, error: null };
+      return { url: null, error: "no-products" as const };
     }
 
     const origin = getValidatedOrigin(context.headers);
+    // Validate returnPath: resolve against origin and verify it stays on the same host.
+    // This prevents open-redirect via protocol-relative paths (//evil.com) or traversal (/../).
+    let safePath = "/";
+    if (input.returnPath) {
+      try {
+        const resolved = new URL(input.returnPath, origin);
+        if (resolved.origin === origin) {
+          safePath = resolved.pathname;
+        }
+      } catch {
+        // Malformed path, fall back to "/"
+      }
+    }
     const checkout = await polarClient.checkouts.create({
       externalCustomerId: context.user.id,
       customerEmail: context.user.email,
       products: productIds,
-      successUrl: `${origin}/?checkout_success=true`,
-      returnUrl: `${origin}/`,
+      successUrl: `${origin}${safePath}?checkout_success=true`,
+      returnUrl: `${origin}${safePath}`,
     });
 
     return { url: checkout.url, error: null };
   });
 
+export const previewPlanSwitch = protectedProcedure
+  .input(
+    z.object({
+      planId: z.enum(PAID_PLAN_IDS),
+      billingInterval: z.enum(["month", "year"]).optional(),
+    }),
+  )
+  .handler(async ({ context, input }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) {
+      return null;
+    }
+
+    // Find current active subscription
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const currentSub = subscriptions.result?.items?.[0];
+    if (!currentSub) return null;
+
+    const currentPlanId = determinePlanFromProductId(currentSub.productId);
+    if (!currentPlanId) return null;
+
+    // Block if same plan AND same (or unspecified) billing interval
+    const isSamePlan = currentPlanId === input.planId;
+    const isSameInterval =
+      !input.billingInterval ||
+      input.billingInterval === currentSub.recurringInterval;
+    if (isSamePlan && isSameInterval) return null;
+
+    const newPlan = PLANS[input.planId];
+    const newPlanProductIds = getPolarProductIds(input.planId);
+    const interval = input.billingInterval ?? currentSub.recurringInterval;
+    const isMonthly = interval === "month";
+    const newProductId = isMonthly
+      ? newPlanProductIds.monthly
+      : newPlanProductIds.annual;
+
+    if (!newProductId) return null;
+
+    // Get the new product price
+    let newAmount: number | null = null;
+    try {
+      const product = await polarClient.products.get({ id: newProductId });
+      const price = product.prices?.[0];
+      if (price && "amountType" in price && price.amountType === "fixed") {
+        newAmount = (price as { priceAmount: number }).priceAmount;
+      }
+    } catch {
+      return null;
+    }
+
+    // Determine upgrade vs downgrade by plan tier order.
+    // Same-plan annual→monthly is also treated as a downgrade (deferred switch).
+    const currentPlanIndex = PLAN_IDS.indexOf(currentPlanId);
+    const newPlanIndex = PLAN_IDS.indexOf(input.planId);
+    const isSamePlanAnnualToMonthly =
+      currentPlanId === input.planId &&
+      currentSub.recurringInterval === "year" &&
+      interval === "month";
+    const isDowngrade =
+      newPlanIndex < currentPlanIndex || isSamePlanAnnualToMonthly;
+
+    // Calculate proration (only meaningful for upgrades)
+    let proratedAmount = 0;
+    if (!isDowngrade) {
+      const now = Date.now();
+      const periodStart = new Date(currentSub.currentPeriodStart).getTime();
+      const periodEnd = new Date(currentSub.currentPeriodEnd).getTime();
+      const totalPeriod = periodEnd - periodStart;
+      const elapsed = now - periodStart;
+      const remaining = Math.max(0, 1 - elapsed / totalPeriod);
+
+      const currentCredit = Math.round(currentSub.amount * remaining);
+      const newCharge = Math.round((newAmount ?? 0) * remaining);
+      proratedAmount = Math.max(0, newCharge - currentCredit);
+    }
+
+    return {
+      currentPlanId,
+      currentPlanName: PLANS[currentPlanId].name,
+      currentAmount: currentSub.amount,
+      newPlanId: input.planId,
+      newPlanName: newPlan.name,
+      newAmount: newAmount ?? 0,
+      proratedAmount,
+      isDowngrade,
+      periodEnd: new Date(currentSub.currentPeriodEnd).toISOString(),
+      currency: currentSub.currency,
+      billingInterval: interval as "month" | "year",
+      subscriptionId: currentSub.id,
+      newProductId,
+    };
+  });
+
+export const switchPlan = protectedProcedure
+  .input(
+    z.object({
+      subscriptionId: z.string(),
+      newProductId: z.string(),
+    }),
+  )
+  .handler(async ({ context, input }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) {
+      return { success: false as const, error: "billing-disabled" as const };
+    }
+
+    // Verify the new product ID belongs to a known plan
+    const knownProductIds = getAllKnownProductIds();
+    if (!knownProductIds.has(input.newProductId)) {
+      return { success: false as const, error: "invalid-product" as const };
+    }
+
+    // Verify the subscription belongs to this user
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const sub = subscriptions.result?.items?.find(
+      (s) => s.id === input.subscriptionId,
+    );
+    if (!sub) {
+      return {
+        success: false as const,
+        error: "subscription-not-found" as const,
+      };
+    }
+
+    // Determine upgrade vs downgrade to choose proration strategy:
+    // - Upgrades: "invoice" — charge the prorated difference immediately
+    // - Downgrades: "next_period" — defer the switch to the next billing cycle
+    // Same-plan annual→monthly is also treated as a downgrade (deferred switch).
+    const currentPlanId = determinePlanFromProductId(sub.productId);
+    const newPlanId = determinePlanFromProductId(input.newProductId);
+    const currentIndex = currentPlanId ? PLAN_IDS.indexOf(currentPlanId) : -1;
+    const newIndex = newPlanId ? PLAN_IDS.indexOf(newPlanId) : -1;
+    const newPlanProductIds = newPlanId ? getPolarProductIds(newPlanId) : null;
+    const isNewMonthly = newPlanProductIds?.monthly === input.newProductId;
+    const isSamePlanAnnualToMonthly =
+      currentPlanId === newPlanId &&
+      sub.recurringInterval === "year" &&
+      isNewMonthly;
+    const isDowngrade = newIndex < currentIndex || isSamePlanAnnualToMonthly;
+
+    await polarClient.subscriptions.update({
+      id: input.subscriptionId,
+      subscriptionUpdate: {
+        productId: input.newProductId,
+        prorationBehavior: isDowngrade ? "next_period" : "invoice",
+      },
+    });
+
+    console.log(
+      `[polar] Plan switched for user=${context.user.id} subscription=${input.subscriptionId} newProduct=${input.newProductId}`,
+    );
+
+    // Immediately update KV cache with the new plan
+    try {
+      await syncPolarDataToKV(context.user.id);
+    } catch (e) {
+      console.warn(
+        `[polar] Post-switch sync failed for user=${context.user.id}:`,
+        e,
+      );
+    }
+
+    return { success: true as const, error: null };
+  });
+
+/**
+ * Eagerly sync subscription state after checkout completes.
+ * Called once from the client on checkout success — replaces the old polling approach.
+ * Rate-limited per user via KV to prevent abuse.
+ */
+export const syncAfterCheckout = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED) {
+      return getUserPlanLimits(context.db, context.user.id);
+    }
+
+    // Per-user rate limit: one sync per SYNC_COOLDOWN_SECONDS
+    const lockKey = `sync-checkout-lock:${context.user.id}`;
+    if (redis) {
+      const acquired = await redis.set(lockKey, "1", {
+        nx: true,
+        ex: SYNC_COOLDOWN_SECONDS,
+      });
+      if (!acquired) {
+        // Cooldown active — return current state without re-syncing
+        return getUserPlanLimits(context.db, context.user.id);
+      }
+    }
+
+    try {
+      const data = await syncPolarDataToKV(context.user.id);
+      await applySubscriptionSideEffects(context.db, context.user.id, data);
+    } catch (e) {
+      console.warn(
+        `[subscription] syncAfterCheckout failed for user ${context.user.id}:`,
+        e,
+      );
+    }
+
+    return getUserPlanLimits(context.db, context.user.id);
+  },
+);
+
+export const getPendingSwitch = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) return null;
+
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const sub = subscriptions.result?.items?.[0];
+    if (!sub) return null;
+
+    // Subscription set to cancel at period end → user reverts to free
+    if (sub.cancelAtPeriodEnd && sub.currentPeriodEnd) {
+      return {
+        planId: "free" as const,
+        billingInterval: null as "month" | "year" | null,
+        appliesAt: new Date(sub.currentPeriodEnd).toISOString(),
+      };
+    }
+
+    if (!sub.pendingUpdate?.productId) return null;
+
+    const pendingPlanId = determinePlanFromProductId(
+      sub.pendingUpdate.productId,
+    );
+    if (!pendingPlanId) return null;
+
+    // Determine billing interval of the pending product
+    const pendingPlanProductIds = getPolarProductIds(pendingPlanId);
+    const pendingBillingInterval: "month" | "year" =
+      pendingPlanProductIds.monthly === sub.pendingUpdate.productId
+        ? "month"
+        : "year";
+
+    return {
+      planId: pendingPlanId,
+      billingInterval: pendingBillingInterval as "month" | "year" | null,
+      appliesAt: new Date(sub.pendingUpdate.appliesAt).toISOString(),
+    };
+  },
+);
+
+export const revertPendingChange = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) {
+      return { success: false as const, error: "billing-disabled" as const };
+    }
+
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const sub = subscriptions.result?.items?.[0];
+    if (!sub) {
+      return { success: false as const, error: "no-subscription" as const };
+    }
+
+    if (sub.cancelAtPeriodEnd) {
+      // Undo scheduled cancellation — reactivate
+      await polarClient.subscriptions.update({
+        id: sub.id,
+        subscriptionUpdate: {
+          cancelAtPeriodEnd: false,
+        },
+      });
+    } else if (sub.pendingUpdate?.productId) {
+      // Undo pending product switch — revert to current product
+      await polarClient.subscriptions.update({
+        id: sub.id,
+        subscriptionUpdate: {
+          productId: sub.productId,
+        },
+      });
+    } else {
+      return { success: false as const, error: "no-pending-change" as const };
+    }
+
+    console.log(
+      `[polar] Pending change reverted for user=${context.user.id} subscription=${sub.id}`,
+    );
+
+    try {
+      await syncPolarDataToKV(context.user.id);
+    } catch (e) {
+      console.warn(
+        `[polar] Post-revert sync failed for user=${context.user.id}:`,
+        e,
+      );
+    }
+
+    return { success: true as const, error: null };
+  },
+);
+
+export const previewDowngrade = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) return null;
+
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const sub = subscriptions.result?.items?.[0];
+    if (!sub) return null;
+
+    const currentPlanId = determinePlanFromProductId(sub.productId);
+    if (!currentPlanId || currentPlanId === "free") return null;
+
+    return {
+      currentPlanId,
+      currentPlanName: PLANS[currentPlanId].name,
+      periodEnd: new Date(sub.currentPeriodEnd).toISOString(),
+      subscriptionId: sub.id,
+    };
+  },
+);
+
+export const cancelSubscription = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED || !polarClient) {
+      return { success: false as const, error: "billing-disabled" as const };
+    }
+
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [context.user.id],
+      active: true,
+    });
+
+    const sub = subscriptions.result?.items?.[0];
+    if (!sub) {
+      return { success: false as const, error: "no-subscription" as const };
+    }
+
+    await polarClient.subscriptions.update({
+      id: sub.id,
+      subscriptionUpdate: {
+        cancelAtPeriodEnd: true,
+      },
+    });
+
+    console.log(
+      `[polar] Subscription cancelled at period end for user=${context.user.id} subscription=${sub.id}`,
+    );
+
+    try {
+      await syncPolarDataToKV(context.user.id);
+    } catch (e) {
+      console.warn(
+        `[polar] Post-cancel sync failed for user=${context.user.id}:`,
+        e,
+      );
+    }
+
+    return { success: true as const, error: null };
+  },
+);
+
 export const createPortalSession = protectedProcedure.handler(
   async ({ context }) => {
     if (!IS_BILLING_ENABLED || !polarClient) {
@@ -178,9 +607,37 @@ export const createPortalSession = protectedProcedure.handler(
     const origin = getValidatedOrigin(context.headers);
     const session = await polarClient.customerSessions.create({
       externalCustomerId: context.user.id,
-      returnUrl: `${origin}/`,
+      returnUrl: `${origin}/?subscription=open`,
     });
 
     return { url: session.customerPortalUrl };
   },
 );
+
+export const getSubscriptionSummary = protectedProcedure.handler(
+  async ({ context }) => {
+    if (!IS_BILLING_ENABLED) return null;
+
+    let cached = await getSubscriptionFromKV(context.user.id);
+
+    if (!cached) {
+      try {
+        cached = await syncPolarDataToKV(context.user.id);
+      } catch {
+        return null;
+      }
+    }
+
+    if (cached.planId === "free" || cached.status === "none") return null;
+
+    const plan = PLANS[cached.planId];
+    return {
+      planId: cached.planId,
+      planName: plan.name,
+      amount: cached.amount,
+      currency: cached.currency,
+      billingInterval: cached.recurringInterval as "month" | "year" | null,
+      currentPeriodEnd: cached.currentPeriodEnd,
+    };
+  },
+);
diff --git a/src/server/auth/endpoints.ts b/src/server/auth/endpoints.ts
index c674fd75..669fa810 100644
--- a/src/server/auth/endpoints.ts
+++ b/src/server/auth/endpoints.ts
@@ -3,7 +3,7 @@ import { getRequest } from "@tanstack/react-start/server";
 import { eq } from "drizzle-orm";
 import { auth, isServerAuthed } from ".";
 import type { ArticleFontFamily } from "~/lib/constants/article-fonts";
-import { env } from "~/env";
+import { IS_EMAIL_ENABLED } from "~/server/email";
 import { FONT_FAMILY_CSS } from "~/lib/constants/article-fonts";
 import { parseHSL } from "~/server/api/routers/hsl";
 import { db } from "~/server/db";
@@ -11,7 +11,7 @@ import { userConfig } from "~/server/db/schema";
 
 export const fetchIsForgotPasswordEnabled = createServerFn({
   method: "GET",
-}).handler(async () => !!env.SENDGRID_API_KEY);
+}).handler(async () => IS_EMAIL_ENABLED);
 
 export const fetchIsAuthed = createServerFn({ method: "GET" }).handler(
   async () => {
diff --git a/src/server/auth/index.tsx b/src/server/auth/index.tsx
index 7a249769..6a12c272 100644
--- a/src/server/auth/index.tsx
+++ b/src/server/auth/index.tsx
@@ -1,5 +1,4 @@
 import { render } from "@react-email/components";
-import sendgrid from "@sendgrid/mail";
 import { betterAuth } from "better-auth";
 import { admin, emailOTP, genericOAuth } from "better-auth/plugins";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
@@ -8,16 +7,16 @@ import { APIError, createAuthMiddleware } from "better-auth/api";
 import { createMiddleware } from "@tanstack/react-start";
 import { getRequestHeaders } from "@tanstack/react-start/server";
 import { redirect } from "@tanstack/react-router";
-import { and, asc, count, eq, inArray, sql } from "drizzle-orm";
+import { asc, count, eq } from "drizzle-orm";
 import { checkout, polar, portal, webhooks } from "@polar-sh/better-auth";
 import { db } from "../db";
-import { account, appConfig, feeds, session, user } from "../db/schema";
-import { determinePlanFromProductId, PLANS } from "../subscriptions/plans";
+import { account, appConfig, session, user } from "../db/schema";
+import { getPolarProductIds, polarClient } from "../subscriptions/polar";
+import { PLANS } from "../subscriptions/plans";
 import {
-  deactivateExcessFeeds,
-  invalidatePlanCache,
-} from "../subscriptions/helpers";
-import { polarClient } from "../subscriptions/polar";
+  applySubscriptionSideEffects,
+  syncPolarDataToKV,
+} from "../subscriptions/kv";
 import ResetPasswordEmail from "~/emails/reset-password";
 import VerifyEmailEmail from "~/emails/verify-email";
 import {
@@ -27,6 +26,7 @@ import {
   isPublicSignupEnabled,
 } from "~/lib/constants";
 import { isOAuthConfigured } from "~/server/auth/constants";
+import { IS_EMAIL_ENABLED, sendEmail } from "~/server/email";
 import { env } from "~/env";
 
 export const authMiddleware = createMiddleware().server(
@@ -34,7 +34,7 @@ export const authMiddleware = createMiddleware().server(
     const headers = getRequestHeaders() as Headers;
     const session = await auth.api.getSession({ headers });
     if (!session) {
-      if (!pathname.includes("auth")) {
+      if (!pathname.startsWith("/auth/") && pathname !== "/auth") {
         throw redirect({ to: BASE_SIGNED_OUT_URL });
       }
     }
@@ -53,50 +53,53 @@ export const adminMiddleware = createMiddleware().server(async ({ next }) => {
   return await next();
 });
 
-async function handleSubscriptionEnd(payload: {
+async function syncAndApply(userId: string) {
+  try {
+    const data = await syncPolarDataToKV(userId);
+    await applySubscriptionSideEffects(db, userId, data);
+  } catch (e) {
+    console.error(
+      `[polar webhook] Failed to sync subscription for user ${userId}:`,
+      e,
+    );
+  }
+}
+
+async function handleSubscriptionWebhook(payload: {
   data: { customer?: { externalId?: string | null } | null };
 }) {
-  const externalId = payload.data.customer?.externalId;
-  if (!externalId) return;
-
-  invalidatePlanCache(externalId);
-  await deactivateExcessFeeds(db, externalId, PLANS.free.maxActiveFeeds);
-  await db
-    .update(feeds)
-    .set({ nextFetchAt: null })
-    .where(eq(feeds.userId, externalId));
+  const userId = payload.data.customer?.externalId;
+  if (!userId) return;
+  await syncAndApply(userId);
+}
+
+async function handleCustomerStateChanged(payload: {
+  data: { externalId?: string | null };
+}) {
+  const userId = payload.data.externalId;
+  if (!userId) return;
+  await syncAndApply(userId);
 }
 
 function buildPolarPlugin() {
   if (!polarClient) return [];
-  if (!process.env.POLAR_WEBHOOK_SECRET) return [];
-
-  const products = [
-    process.env.POLAR_STANDARD_MONTHLY_PRODUCT_ID
-      ? {
-          productId: process.env.POLAR_STANDARD_MONTHLY_PRODUCT_ID,
-          slug: "standard-monthly",
-        }
-      : null,
-    process.env.POLAR_STANDARD_ANNUAL_PRODUCT_ID
-      ? {
-          productId: process.env.POLAR_STANDARD_ANNUAL_PRODUCT_ID,
-          slug: "standard-annual",
-        }
-      : null,
-    process.env.POLAR_PRO_MONTHLY_PRODUCT_ID
-      ? {
-          productId: process.env.POLAR_PRO_MONTHLY_PRODUCT_ID,
-          slug: "pro-monthly",
-        }
-      : null,
-    process.env.POLAR_PRO_ANNUAL_PRODUCT_ID
-      ? {
-          productId: process.env.POLAR_PRO_ANNUAL_PRODUCT_ID,
-          slug: "pro-annual",
-        }
-      : null,
-  ].filter(Boolean);
+  if (!env.POLAR_WEBHOOK_SECRET) return [];
+
+  // Build products list from plan config — each plan can have a monthly and/or annual product.
+  const products = Object.values(PLANS).flatMap((plan) => {
+    const productIds = getPolarProductIds(plan.id);
+    const entries: Array<{ productId: string; slug: string }> = [];
+    if (productIds.monthly) {
+      entries.push({
+        productId: productIds.monthly,
+        slug: `${plan.id}-monthly`,
+      });
+    }
+    if (productIds.annual) {
+      entries.push({ productId: productIds.annual, slug: `${plan.id}-annual` });
+    }
+    return entries;
+  });
 
   return [
     polar({
@@ -110,62 +113,14 @@ function buildPolarPlugin() {
         }),
         portal(),
         webhooks({
-          secret: process.env.POLAR_WEBHOOK_SECRET ?? "",
-          onSubscriptionActive: async (payload) => {
-            const externalId = payload.data.customer?.externalId;
-            if (!externalId) return;
-
-            invalidatePlanCache(externalId);
-
-            const productId = payload.data.productId;
-            const planId = determinePlanFromProductId(productId);
-            if (!planId) {
-              console.warn(`[polar webhook] Unknown product ID: ${productId}`);
-              return;
-            }
-
-            const config = PLANS[planId];
-            if (config.backgroundRefreshIntervalMs) {
-              // Stagger nextFetchAt across the refresh interval so feeds
-              // don't all become due at the same instant (thundering herd).
-              const activeFeeds = await db
-                .select({ id: feeds.id })
-                .from(feeds)
-                .where(
-                  and(eq(feeds.userId, externalId), eq(feeds.isActive, true)),
-                )
-                .all();
-
-              const interval = config.backgroundRefreshIntervalMs;
-              const feedCount = activeFeeds.length;
-              if (feedCount > 0) {
-                const nowMs = Date.now();
-                const cases = activeFeeds.map((f, i) => {
-                  const offset =
-                    feedCount > 1 ? Math.round((interval / feedCount) * i) : 0;
-                  const ts = Math.floor((nowMs + offset) / 1000);
-                  return sql`WHEN ${f.id} THEN ${ts}`;
-                });
-                await db
-                  .update(feeds)
-                  .set({
-                    nextFetchAt: sql`(CASE ${feeds.id} ${sql.join(cases, sql` `)} END)`,
-                  })
-                  .where(
-                    inArray(
-                      feeds.id,
-                      activeFeeds.map((f) => f.id),
-                    ),
-                  );
-              }
-            }
-          },
-          onSubscriptionCanceled: async (payload) => {
-            await handleSubscriptionEnd(payload);
-          },
-          onSubscriptionRevoked: async (payload) => {
-            await handleSubscriptionEnd(payload);
-          },
+          secret: env.POLAR_WEBHOOK_SECRET ?? "",
+          onSubscriptionCreated: handleSubscriptionWebhook,
+          onSubscriptionUpdated: handleSubscriptionWebhook,
+          onSubscriptionActive: handleSubscriptionWebhook,
+          onSubscriptionCanceled: handleSubscriptionWebhook,
+          onSubscriptionRevoked: handleSubscriptionWebhook,
+          onSubscriptionUncanceled: handleSubscriptionWebhook,
+          onCustomerStateChanged: handleCustomerStateChanged,
         }),
       ],
     }),
@@ -202,20 +157,27 @@ export const auth = betterAuth({
     enabled: true,
     maxPasswordLength: 64,
     async sendResetPassword(data) {
-      sendgrid.setApiKey(import.meta.env.SENDGRID_API_KEY ?? "");
-
-      const forgotPasswordEmailHtml = await render(
-        <ResetPasswordEmail resetUrl={data.url} />,
-      );
-
-      const options = {
-        from: "hey@serial.tube",
-        to: data.user.email,
-        subject: "Reset your password for Serial",
-        html: forgotPasswordEmailHtml,
-      };
-
-      await sendgrid.send(options);
+      try {
+        const html = await render(
+          <ResetPasswordEmail
+            resetUrl={data.url}
+            supportEmail={env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
+          />,
+        );
+
+        await sendEmail({
+          to: data.user.email,
+          subject: "Reset your password for Serial",
+          html,
+        });
+        console.log(`[auth] Reset password email sent to ${data.user.email}`);
+      } catch (error) {
+        console.error(
+          `[auth] Failed to send reset password email to ${data.user.email}:`,
+          error,
+        );
+        throw error;
+      }
     },
   },
   plugins: [
@@ -223,19 +185,31 @@ export const auth = betterAuth({
     tanstackStartCookies(),
     ...buildPolarPlugin(),
     ...buildGenericOAuthPlugin(),
-    ...(import.meta.env.SENDGRID_API_KEY
+    ...(IS_EMAIL_ENABLED
       ? [
           emailOTP({
             async sendVerificationOTP({ email, otp, type }) {
               if (type === "email-verification") {
-                sendgrid.setApiKey(import.meta.env.SENDGRID_API_KEY ?? "");
-                const html = await render(<VerifyEmailEmail otp={otp} />);
-                await sendgrid.send({
-                  from: "hey@serial.tube",
-                  to: email,
-                  subject: "Verify your email for Serial",
-                  html,
-                });
+                try {
+                  const html = await render(
+                    <VerifyEmailEmail
+                      otp={otp}
+                      supportEmail={env.VITE_PUBLIC_SUPPORT_EMAIL_ADDRESS}
+                    />,
+                  );
+                  await sendEmail({
+                    to: email,
+                    subject: "Verify your email for Serial",
+                    html,
+                  });
+                  console.log(`[auth] Verification email sent to ${email}`);
+                } catch (error) {
+                  console.error(
+                    `[auth] Failed to send verification email to ${email}:`,
+                    error,
+                  );
+                  throw error;
+                }
               }
             },
             sendVerificationOnSignUp: true,
diff --git a/src/server/db/migrations/0041_needy_mongoose.sql b/src/server/db/migrations/0041_needy_mongoose.sql
new file mode 100644
index 00000000..b42c1c05
--- /dev/null
+++ b/src/server/db/migrations/0041_needy_mongoose.sql
@@ -0,0 +1 @@
+ALTER TABLE `serial_user` ADD `next_refresh_at` integer;
\ No newline at end of file
diff --git a/src/server/db/migrations/meta/0041_snapshot.json b/src/server/db/migrations/meta/0041_snapshot.json
new file mode 100644
index 00000000..203c4985
--- /dev/null
+++ b/src/server/db/migrations/meta/0041_snapshot.json
@@ -0,0 +1,1384 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "78a07af0-2bfd-4788-9011-290b9cbe4c4d",
+  "prevId": "5a595e3a-9acc-4f14-89d2-7cd327e05c38",
+  "tables": {
+    "serial_account": {
+      "name": "serial_account",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "account_user_id_idx": {
+          "name": "account_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_account_user_id_serial_user_id_fk": {
+          "name": "serial_account_user_id_serial_user_id_fk",
+          "tableFrom": "serial_account",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_app_config": {
+      "name": "serial_app_config",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_content_categories": {
+      "name": "serial_content_categories",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "content_categories_name_idx": {
+          "name": "content_categories_name_idx",
+          "columns": [
+            "name"
+          ],
+          "isUnique": false
+        },
+        "content_categories_user_id_idx": {
+          "name": "content_categories_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_content_categories_user_id_serial_user_id_fk": {
+          "name": "serial_content_categories_user_id_serial_user_id_fk",
+          "tableFrom": "serial_content_categories",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_feed_categories": {
+      "name": "serial_feed_categories",
+      "columns": {
+        "feed_id": {
+          "name": "feed_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "feed_categories_category_id_idx": {
+          "name": "feed_categories_category_id_idx",
+          "columns": [
+            "category_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_feed_categories_feed_id_serial_feed_id_fk": {
+          "name": "serial_feed_categories_feed_id_serial_feed_id_fk",
+          "tableFrom": "serial_feed_categories",
+          "tableTo": "serial_feed",
+          "columnsFrom": [
+            "feed_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "serial_feed_categories_category_id_serial_content_categories_id_fk": {
+          "name": "serial_feed_categories_category_id_serial_content_categories_id_fk",
+          "tableFrom": "serial_feed_categories",
+          "tableTo": "serial_content_categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "serial_feed_categories_feed_id_category_id_pk": {
+          "columns": [
+            "feed_id",
+            "category_id"
+          ],
+          "name": "serial_feed_categories_feed_id_category_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_feed_item": {
+      "name": "serial_feed_item",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_id": {
+          "name": "content_id",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author": {
+          "name": "author",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thumbnail": {
+          "name": "thumbnail",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "content_snippet": {
+          "name": "content_snippet",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "is_watched": {
+          "name": "is_watched",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "is_watch_later": {
+          "name": "is_watch_later",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "progress": {
+          "name": "progress",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "duration": {
+          "name": "duration",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "orientation": {
+          "name": "orientation",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "posted_at": {
+          "name": "posted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "feed_item_id_idx": {
+          "name": "feed_item_id_idx",
+          "columns": [
+            "id"
+          ],
+          "isUnique": false
+        },
+        "feed_item_feed_id_posted_at_idx": {
+          "name": "feed_item_feed_id_posted_at_idx",
+          "columns": [
+            "feed_id",
+            "posted_at"
+          ],
+          "isUnique": false
+        },
+        "feed_item_feed_id_is_watched_idx": {
+          "name": "feed_item_feed_id_is_watched_idx",
+          "columns": [
+            "feed_id",
+            "is_watched"
+          ],
+          "isUnique": false
+        },
+        "feed_item_feed_id_is_watch_later_idx": {
+          "name": "feed_item_feed_id_is_watch_later_idx",
+          "columns": [
+            "feed_id",
+            "is_watch_later"
+          ],
+          "isUnique": false
+        },
+        "serial_feed_item_url_feed_id_unique": {
+          "name": "serial_feed_item_url_feed_id_unique",
+          "columns": [
+            "url",
+            "feed_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "serial_feed_item_feed_id_serial_feed_id_fk": {
+          "name": "serial_feed_item_feed_id_serial_feed_id_fk",
+          "tableFrom": "serial_feed_item",
+          "tableTo": "serial_feed",
+          "columnsFrom": [
+            "feed_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_feed": {
+      "name": "serial_feed",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "url": {
+          "name": "url",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text(512)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "platform": {
+          "name": "platform",
+          "type": "text(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'youtube'"
+        },
+        "open_location": {
+          "name": "open_location",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'serial'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_fetched_at": {
+          "name": "last_fetched_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_fetch_at": {
+          "name": "next_fetch_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "etag": {
+          "name": "etag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "last_modified_header": {
+          "name": "last_modified_header",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "feed_name_idx": {
+          "name": "feed_name_idx",
+          "columns": [
+            "name"
+          ],
+          "isUnique": false
+        },
+        "feed_user_id_idx": {
+          "name": "feed_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        },
+        "feed_user_id_url_idx": {
+          "name": "feed_user_id_url_idx",
+          "columns": [
+            "user_id",
+            "url"
+          ],
+          "isUnique": false
+        },
+        "feed_user_id_is_active_idx": {
+          "name": "feed_user_id_is_active_idx",
+          "columns": [
+            "user_id",
+            "is_active"
+          ],
+          "isUnique": false
+        },
+        "feed_is_active_next_fetch_at_idx": {
+          "name": "feed_is_active_next_fetch_at_idx",
+          "columns": [
+            "is_active",
+            "next_fetch_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_feed_user_id_serial_user_id_fk": {
+          "name": "serial_feed_user_id_serial_user_id_fk",
+          "tableFrom": "serial_feed",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_instapaper_connections": {
+      "name": "serial_instapaper_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "oauth_token": {
+          "name": "oauth_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "oauth_token_secret": {
+          "name": "oauth_token_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "serial_instapaper_connections_user_id_unique": {
+          "name": "serial_instapaper_connections_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "serial_instapaper_connections_user_id_serial_user_id_fk": {
+          "name": "serial_instapaper_connections_user_id_serial_user_id_fk",
+          "tableFrom": "serial_instapaper_connections",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_session": {
+      "name": "serial_session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "impersonated_by": {
+          "name": "impersonated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "serial_session_token_unique": {
+          "name": "serial_session_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        },
+        "session_user_id_idx": {
+          "name": "session_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_session_user_id_serial_user_id_fk": {
+          "name": "serial_session_user_id_serial_user_id_fk",
+          "tableFrom": "serial_session",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_user": {
+      "name": "serial_user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "banned": {
+          "name": "banned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": false
+        },
+        "ban_reason": {
+          "name": "ban_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ban_expires": {
+          "name": "ban_expires",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "next_refresh_at": {
+          "name": "next_refresh_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "serial_user_email_unique": {
+          "name": "serial_user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_user_config": {
+      "name": "serial_user_config",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "light_hsl": {
+          "name": "light_hsl",
+          "type": "text(16)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "dark_hsl": {
+          "name": "dark_hsl",
+          "type": "text(16)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "article_font_size": {
+          "name": "article_font_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "article_font_family": {
+          "name": "article_font_family",
+          "type": "text(64)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "serial_user_config_user_id_unique": {
+          "name": "serial_user_config_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "serial_user_config_user_id_serial_user_id_fk": {
+          "name": "serial_user_config_user_id_serial_user_id_fk",
+          "tableFrom": "serial_user_config",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_verification": {
+      "name": "serial_verification",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_view_categories": {
+      "name": "serial_view_categories",
+      "columns": {
+        "view_id": {
+          "name": "view_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "view_categories_view_id_idx": {
+          "name": "view_categories_view_id_idx",
+          "columns": [
+            "view_id"
+          ],
+          "isUnique": false
+        },
+        "view_categories_category_id_idx": {
+          "name": "view_categories_category_id_idx",
+          "columns": [
+            "category_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_view_categories_view_id_serial_views_id_fk": {
+          "name": "serial_view_categories_view_id_serial_views_id_fk",
+          "tableFrom": "serial_view_categories",
+          "tableTo": "serial_views",
+          "columnsFrom": [
+            "view_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "serial_view_categories_category_id_serial_content_categories_id_fk": {
+          "name": "serial_view_categories_category_id_serial_content_categories_id_fk",
+          "tableFrom": "serial_view_categories",
+          "tableTo": "serial_content_categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "serial_view_categories_view_id_category_id_pk": {
+          "columns": [
+            "view_id",
+            "category_id"
+          ],
+          "name": "serial_view_categories_view_id_category_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_view_feeds": {
+      "name": "serial_view_feeds",
+      "columns": {
+        "view_id": {
+          "name": "view_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "view_feeds_view_id_idx": {
+          "name": "view_feeds_view_id_idx",
+          "columns": [
+            "view_id"
+          ],
+          "isUnique": false
+        },
+        "view_feeds_feed_id_idx": {
+          "name": "view_feeds_feed_id_idx",
+          "columns": [
+            "feed_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_view_feeds_view_id_serial_views_id_fk": {
+          "name": "serial_view_feeds_view_id_serial_views_id_fk",
+          "tableFrom": "serial_view_feeds",
+          "tableTo": "serial_views",
+          "columnsFrom": [
+            "view_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "serial_view_feeds_feed_id_serial_feed_id_fk": {
+          "name": "serial_view_feeds_feed_id_serial_feed_id_fk",
+          "tableFrom": "serial_view_feeds",
+          "tableTo": "serial_feed",
+          "columnsFrom": [
+            "feed_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "serial_view_feeds_view_id_feed_id_pk": {
+          "columns": [
+            "view_id",
+            "feed_id"
+          ],
+          "name": "serial_view_feeds_view_id_feed_id_pk"
+        }
+      },
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "serial_views": {
+      "name": "serial_views",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text(256)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "days_window": {
+          "name": "days_window",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "read_status": {
+          "name": "read_status",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "orientation": {
+          "name": "orientation",
+          "type": "text(16)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'horizontal'"
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text(32)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'longform'"
+        },
+        "layout": {
+          "name": "layout",
+          "type": "text(32)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'list'"
+        },
+        "placement": {
+          "name": "placement",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": -1
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "view_name_idx": {
+          "name": "view_name_idx",
+          "columns": [
+            "name"
+          ],
+          "isUnique": false
+        },
+        "view_user_id_idx": {
+          "name": "view_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        },
+        "view_user_id_placement_idx": {
+          "name": "view_user_id_placement_idx",
+          "columns": [
+            "user_id",
+            "placement"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "serial_views_user_id_serial_user_id_fk": {
+          "name": "serial_views_user_id_serial_user_id_fk",
+          "tableFrom": "serial_views",
+          "tableTo": "serial_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/src/server/db/migrations/meta/_journal.json b/src/server/db/migrations/meta/_journal.json
index c2a4f2af..642047e1 100644
--- a/src/server/db/migrations/meta/_journal.json
+++ b/src/server/db/migrations/meta/_journal.json
@@ -288,6 +288,13 @@
       "when": 1775509562655,
       "tag": "0040_skinny_warstar",
       "breakpoints": true
+    },
+    {
+      "idx": 41,
+      "version": "6",
+      "when": 1776662638770,
+      "tag": "0041_needy_mongoose",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/server/db/schema.ts b/src/server/db/schema.ts
index 19784369..1f570c80 100644
--- a/src/server/db/schema.ts
+++ b/src/server/db/schema.ts
@@ -49,6 +49,7 @@ export const user = sqliteTable("user", {
   banned: integer("banned", { mode: "boolean" }).default(false),
   banReason: text("ban_reason"),
   banExpires: integer("ban_expires", { mode: "timestamp_ms" }),
+  nextRefreshAt: integer("next_refresh_at", { mode: "timestamp" }),
 });
 
 export const session = sqliteTable(
diff --git a/src/server/email.ts b/src/server/email.ts
new file mode 100644
index 00000000..2fdb9589
--- /dev/null
+++ b/src/server/email.ts
@@ -0,0 +1,47 @@
+import { Resend } from "resend";
+import sendgrid from "@sendgrid/mail";
+import { env } from "~/env";
+
+type EmailProvider = "resend" | "sendgrid";
+
+export const EMAIL_PROVIDER: EmailProvider | null = env.RESEND_API_KEY
+  ? "resend"
+  : env.SENDGRID_API_KEY
+    ? "sendgrid"
+    : null;
+
+export const IS_EMAIL_ENABLED =
+  EMAIL_PROVIDER !== null && !!env.FROM_EMAIL_ADDRESS;
+
+export function isEmailProvider(
+  provider: EmailProvider,
+): provider is EmailProvider {
+  return EMAIL_PROVIDER === provider;
+}
+
+// Module-level singletons — avoids recreating SDK clients on every send
+const resendClient = env.RESEND_API_KEY ? new Resend(env.RESEND_API_KEY) : null;
+
+if (env.SENDGRID_API_KEY) {
+  sendgrid.setApiKey(env.SENDGRID_API_KEY);
+}
+
+interface SendEmailOptions {
+  to: string;
+  subject: string;
+  html: string;
+}
+
+export async function sendEmail(opts: SendEmailOptions) {
+  if (!IS_EMAIL_ENABLED) {
+    throw new Error("Email sending is not configured");
+  }
+
+  const fullOpts = { ...opts, from: env.FROM_EMAIL_ADDRESS! };
+
+  if (isEmailProvider("resend")) {
+    await resendClient!.emails.send(fullOpts);
+  } else if (isEmailProvider("sendgrid")) {
+    await sendgrid.send(fullOpts);
+  }
+}
diff --git a/src/server/rss/fetchFeeds.ts b/src/server/rss/fetchFeeds.ts
index 1bff8055..e6d5f6ee 100644
--- a/src/server/rss/fetchFeeds.ts
+++ b/src/server/rss/fetchFeeds.ts
@@ -23,6 +23,9 @@ import type {
 } from "./types";
 import { dbSemaphore } from "~/lib/semaphore";
 
+/** How long to back off a feed after a fetch error, to avoid cascading retries. */
+const ERROR_BACKOFF_MS = 60 * 60 * 1000; // 1 hour
+
 export type FetchFeedsStatus = "success" | "empty" | "error" | "skipped";
 
 export async function fetchNewFeedDetails(
@@ -69,8 +72,13 @@ type FeedResult =
       id: number;
     }
   | {
-      status: "empty" | "error" | "skipped";
+      status: "empty" | "skipped";
       id: number;
+    }
+  | {
+      status: "error";
+      id: number;
+      error: unknown;
     };
 
 export async function* fetchAndInsertFeedData(
@@ -99,21 +107,28 @@ export async function* fetchAndInsertFeedData(
 
       if (feed.platform === "youtube") {
         feedData = await fetchYouTubeFeedData(feed, cached);
-      }
-      if (feed.platform === "peertube") {
+      } else if (feed.platform === "peertube") {
         feedData = await fetchPeerTubeFeedData(feed, cached);
-      }
-      if (feed.platform === "nebula") {
+      } else if (feed.platform === "nebula") {
         feedData = await fetchNebulaFeedData(feed, cached);
-      }
-      if (feed.platform === "website") {
+      } else if (feed.platform === "website") {
         feedData = await fetchWebsiteFeedData(feed, cached);
       }
 
       if (!feedData) {
+        const errorBackoffAt = new Date(now.getTime() + ERROR_BACKOFF_MS);
+        await dbSemaphore.run(() =>
+          context.db
+            .update(feeds)
+            .set({ nextFetchAt: errorBackoffAt })
+            .where(eq(feeds.id, feed.id)),
+        );
         return {
           status: "error",
           id: feed.id,
+          error: new Error(
+            `No feed data returned for platform: ${feed.platform}`,
+          ),
         };
       }
 
@@ -260,10 +275,23 @@ export async function* fetchAndInsertFeedData(
         feedItems: applicationFeedItems,
         id: feed.id,
       };
-    } catch {
+    } catch (e) {
+      // Push back nextFetchAt so a broken feed isn't retried every minute
+      const errorBackoffAt = new Date(now.getTime() + ERROR_BACKOFF_MS);
+      try {
+        await dbSemaphore.run(() =>
+          context.db
+            .update(feeds)
+            .set({ nextFetchAt: errorBackoffAt })
+            .where(eq(feeds.id, feed.id)),
+        );
+      } catch {
+        // Best-effort — don't let the backoff update mask the original error
+      }
       return {
         status: "error",
         id: feed.id,
+        error: e,
       };
     }
   });
diff --git a/src/server/subscriptions/helpers.ts b/src/server/subscriptions/helpers.ts
index 656b7f73..332fdeb4 100644
--- a/src/server/subscriptions/helpers.ts
+++ b/src/server/subscriptions/helpers.ts
@@ -1,15 +1,13 @@
-import { and, asc, count, eq, inArray } from "drizzle-orm";
-import { determinePlanFromProductId, getEffectivePlanConfig } from "./plans";
-import { IS_BILLING_ENABLED, polarClient } from "./polar";
+import { and, asc, count, eq, inArray, sql } from "drizzle-orm";
+import { getEffectivePlanConfig } from "./plans";
+import { IS_BILLING_ENABLED } from "./polar";
+import { getSubscriptionFromKV, syncPolarDataToKV } from "./kv";
 import type { PlanId } from "./plans";
 import type { db as Database } from "~/server/db";
-import { feeds } from "~/server/db/schema";
+import { feeds, user } from "~/server/db/schema";
 
 type DB = typeof Database;
 
-const PLAN_CACHE_TTL_MS = 60_000 * 4; // 4 minutes
-const planCache = new Map<string, { planId: PlanId; expiresAt: number }>();
-
 export async function getActiveFeedCount(db: DB, userId: string) {
   const result = await db
     .select({ count: count() })
@@ -22,53 +20,29 @@ export async function getActiveFeedCount(db: DB, userId: string) {
 export async function getUserPlanId(userId: string): Promise<PlanId> {
   if (!IS_BILLING_ENABLED) return "pro";
 
-  const cached = planCache.get(userId);
-  if (cached && Date.now() < cached.expiresAt) {
-    return cached.planId;
-  }
-
+  // 1. Try KV cache first (fast, shared across instances)
   try {
-    // Look up active subscriptions by externalCustomerId (Better Auth sets this to user ID)
-    const subscriptions = await polarClient!.subscriptions.list({
-      externalCustomerId: [userId],
-      active: true,
-    });
-
-    const activeSub = subscriptions.result?.items?.[0];
-    const planId: PlanId = activeSub?.productId
-      ? (determinePlanFromProductId(activeSub.productId) ?? "free")
-      : "free";
-
-    planCache.set(userId, {
-      planId,
-      expiresAt: Date.now() + PLAN_CACHE_TTL_MS,
-    });
-
-    return planId;
-  } catch (e) {
-    // On failure, prefer the last-known plan over defaulting to free —
-    // a Polar outage shouldn't downgrade paid users mid-session.
+    const cached = await getSubscriptionFromKV(userId);
     if (cached) {
-      console.warn(
-        `[subscription] Polar API failed for user ${userId}, using cached plan "${cached.planId}":`,
-        e,
-      );
       return cached.planId;
     }
+  } catch {
+    // KV read failed, fall through to sync
+  }
 
+  // 2. KV miss — sync from Polar and write to KV
+  try {
+    const data = await syncPolarDataToKV(userId);
+    return data.planId;
+  } catch (e) {
     console.error(
-      `[subscription] Failed to fetch plan for user ${userId}, no cached value, defaulting to free:`,
+      `[subscription] Failed to fetch plan for user ${userId}, defaulting to free:`,
       e,
     );
     return "free";
   }
 }
 
-/** Evict the cached plan for a user (e.g. after a webhook updates their subscription). */
-export function invalidatePlanCache(userId: string) {
-  planCache.delete(userId);
-}
-
 export async function canActivateFeed(db: DB, userId: string) {
   const planId = await getUserPlanId(userId);
   const config = getEffectivePlanConfig(planId);
@@ -95,11 +69,57 @@ export async function getUserPlanLimits(db: DB, userId: string) {
     maxActiveFeeds:
       config.maxActiveFeeds === Infinity ? -1 : config.maxActiveFeeds,
     activeFeeds,
+    refreshIntervalMs: config.refreshIntervalMs,
     backgroundRefreshIntervalMs: config.backgroundRefreshIntervalMs,
     billingEnabled: IS_BILLING_ENABLED,
   };
 }
 
+/**
+ * Check if the user is eligible to refresh based on their plan's refresh interval.
+ * Uses an atomic compare-and-swap UPDATE to avoid TOCTOU races under concurrent requests.
+ */
+export async function checkUserRefreshEligibility(
+  db: DB,
+  userId: string,
+): Promise<{ eligible: true } | { eligible: false; nextRefreshAt: Date }> {
+  const planId = await getUserPlanId(userId);
+  const config = getEffectivePlanConfig(planId);
+
+  const now = new Date();
+  const nowEpoch = Math.floor(now.getTime() / 1000);
+  const nextRefreshAt = new Date(now.getTime() + config.refreshIntervalMs);
+
+  // Atomic: only update nextRefreshAt if the current value is null or in the past.
+  // If a concurrent request already claimed this window, rowsAffected will be 0.
+  const result = await db
+    .update(user)
+    .set({ nextRefreshAt })
+    .where(
+      and(
+        eq(user.id, userId),
+        sql`(${user.nextRefreshAt} IS NULL OR ${user.nextRefreshAt} <= ${nowEpoch})`,
+      ),
+    );
+
+  const rowsAffected = result.rowsAffected ?? 0;
+  if (rowsAffected > 0) {
+    return { eligible: true };
+  }
+
+  // Rate-limited — read back the current nextRefreshAt to report to the user
+  const userRow = await db
+    .select({ nextRefreshAt: user.nextRefreshAt })
+    .from(user)
+    .where(eq(user.id, userId))
+    .get();
+
+  return {
+    eligible: false,
+    nextRefreshAt: userRow?.nextRefreshAt ?? nextRefreshAt,
+  };
+}
+
 export async function deactivateExcessFeeds(
   db: DB,
   userId: string,
diff --git a/src/server/subscriptions/kv.ts b/src/server/subscriptions/kv.ts
new file mode 100644
index 00000000..2e06608a
--- /dev/null
+++ b/src/server/subscriptions/kv.ts
@@ -0,0 +1,244 @@
+import { Redis } from "@upstash/redis";
+import { and, eq, inArray, sql } from "drizzle-orm";
+import {
+  determinePlanFromProductId,
+  IS_BILLING_ENABLED,
+  polarClient,
+} from "./polar";
+import { getEffectivePlanConfig, PLANS } from "./plans";
+import { deactivateExcessFeeds } from "./helpers";
+import type { PlanId } from "./plans";
+import type { db as Database } from "~/server/db";
+import { feeds } from "~/server/db/schema";
+import { env } from "~/env";
+
+type DB = typeof Database;
+
+// ---------------------------------------------------------------------------
+// Upstash client — null when billing is disabled or creds are missing.
+// Consumers must handle null gracefully (fall through to Polar API).
+// ---------------------------------------------------------------------------
+
+const hasUpstashCredentials =
+  !!env.UPSTASH_REDIS_REST_URL && !!env.UPSTASH_REDIS_REST_TOKEN;
+
+export const redis =
+  IS_BILLING_ENABLED && hasUpstashCredentials
+    ? new Redis({
+        url: env.UPSTASH_REDIS_REST_URL!,
+        token: env.UPSTASH_REDIS_REST_TOKEN!,
+      })
+    : null;
+
+// ---------------------------------------------------------------------------
+// Cached subscription type — stored as JSON at `polar:sub:{userId}`
+// ---------------------------------------------------------------------------
+
+export type PolarSubscriptionCache = {
+  planId: PlanId;
+  status: string; // "active" | "trialing" | "past_due" | "canceled" | "none"
+  subscriptionId: string | null;
+  productId: string | null;
+  recurringInterval: string | null; // "month" | "year"
+  currentPeriodStart: string | null; // ISO string
+  currentPeriodEnd: string | null; // ISO string
+  cancelAtPeriodEnd: boolean;
+  amount: number | null; // cents
+  currency: string | null;
+  syncedAt: string; // ISO timestamp of last sync
+};
+
+function kvKey(userId: string) {
+  return `polar:sub:${userId}`;
+}
+
+const KV_TTL_SECONDS = 86_400; // 24 hours — safety net; active syncs keep data fresh
+
+// ---------------------------------------------------------------------------
+// syncPolarDataToKV — the single source-of-truth sync function.
+// Fetches the latest subscription state from Polar and writes it to KV.
+// ---------------------------------------------------------------------------
+
+export async function syncPolarDataToKV(
+  userId: string,
+): Promise<PolarSubscriptionCache> {
+  if (!polarClient) {
+    throw new Error(
+      "[kv] syncPolarDataToKV called but Polar client is not available",
+    );
+  }
+
+  try {
+    const subscriptions = await polarClient.subscriptions.list({
+      externalCustomerId: [userId],
+      active: true,
+    });
+
+    const activeSub = subscriptions.result?.items?.[0];
+
+    let data: PolarSubscriptionCache;
+
+    if (activeSub?.productId) {
+      const planId = determinePlanFromProductId(activeSub.productId) ?? "free";
+
+      data = {
+        planId,
+        status: activeSub.status ?? "active",
+        subscriptionId: activeSub.id ?? null,
+        productId: activeSub.productId,
+        recurringInterval: activeSub.recurringInterval ?? null,
+        currentPeriodStart: activeSub.currentPeriodStart
+          ? new Date(activeSub.currentPeriodStart).toISOString()
+          : null,
+        currentPeriodEnd: activeSub.currentPeriodEnd
+          ? new Date(activeSub.currentPeriodEnd).toISOString()
+          : null,
+        cancelAtPeriodEnd: activeSub.cancelAtPeriodEnd ?? false,
+        amount: activeSub.amount ?? null,
+        currency: activeSub.currency ?? null,
+        syncedAt: new Date().toISOString(),
+      };
+    } else {
+      data = {
+        planId: "free",
+        status: "none",
+        subscriptionId: null,
+        productId: null,
+        recurringInterval: null,
+        currentPeriodStart: null,
+        currentPeriodEnd: null,
+        cancelAtPeriodEnd: false,
+        amount: null,
+        currency: null,
+        syncedAt: new Date().toISOString(),
+      };
+    }
+
+    // Write to KV (best-effort — failure here is non-fatal)
+    if (redis) {
+      try {
+        await redis.set(kvKey(userId), JSON.stringify(data), {
+          ex: KV_TTL_SECONDS,
+        });
+      } catch (e) {
+        console.warn(
+          `[kv] Failed to write subscription cache for user ${userId}:`,
+          e,
+        );
+      }
+    }
+
+    return data;
+  } catch (e) {
+    // Polar API failed — try to return cached data from KV
+    if (redis) {
+      try {
+        const cached = await getSubscriptionFromKV(userId);
+        if (cached) {
+          console.warn(
+            `[kv] Polar API failed for user ${userId}, using cached data:`,
+            e,
+          );
+          return cached;
+        }
+      } catch {
+        // KV also failed, fall through
+      }
+    }
+
+    console.error(
+      `[kv] syncPolarDataToKV failed for user ${userId} (no cached fallback):`,
+      e,
+    );
+    throw e;
+  }
+}
+
+// ---------------------------------------------------------------------------
+// getSubscriptionFromKV — read-only KV lookup.
+// Returns null on miss, null redis, or any error.
+// ---------------------------------------------------------------------------
+
+export async function getSubscriptionFromKV(
+  userId: string,
+): Promise<PolarSubscriptionCache | null> {
+  if (!redis) return null;
+
+  try {
+    const raw = await redis.get<string>(kvKey(userId));
+    if (!raw) return null;
+
+    // @upstash/redis may auto-parse JSON, handle both string and object
+    const data =
+      typeof raw === "string"
+        ? (JSON.parse(raw) as PolarSubscriptionCache)
+        : (raw as unknown as PolarSubscriptionCache);
+
+    return data;
+  } catch (e) {
+    console.warn(
+      `[kv] Failed to read subscription cache for user ${userId}:`,
+      e,
+    );
+    return null;
+  }
+}
+
+// ---------------------------------------------------------------------------
+// applySubscriptionSideEffects — business logic that runs after a sync.
+// Extracted from the old webhook handlers.
+// ---------------------------------------------------------------------------
+
+const ACTIVE_STATUSES = new Set(["active", "trialing"]);
+
+export async function applySubscriptionSideEffects(
+  db: DB,
+  userId: string,
+  data: PolarSubscriptionCache,
+): Promise<void> {
+  const config = getEffectivePlanConfig(data.planId);
+
+  if (ACTIVE_STATUSES.has(data.status)) {
+    // Subscription is active — stagger feed nextFetchAt across the refresh
+    // interval so feeds don't all become due at the same instant.
+    if (config.backgroundRefreshIntervalMs) {
+      const activeFeeds = await db
+        .select({ id: feeds.id })
+        .from(feeds)
+        .where(and(eq(feeds.userId, userId), eq(feeds.isActive, true)))
+        .all();
+
+      const interval = config.backgroundRefreshIntervalMs;
+      const feedCount = activeFeeds.length;
+
+      if (feedCount > 0) {
+        const nowMs = Date.now();
+        const cases = activeFeeds.map((f, i) => {
+          const offset =
+            feedCount > 1 ? Math.round((interval / feedCount) * i) : 0;
+          const ts = Math.floor((nowMs + offset) / 1000);
+          return sql`WHEN ${f.id} THEN ${ts}`;
+        });
+
+        await db
+          .update(feeds)
+          .set({
+            nextFetchAt: sql`(CASE ${feeds.id} ${sql.join(cases, sql` `)} END)`,
+          })
+          .where(
+            inArray(
+              feeds.id,
+              activeFeeds.map((f) => f.id),
+            ),
+          );
+      }
+    }
+  } else {
+    // Subscription ended — deactivate excess feeds, clear nextFetchAt
+    await deactivateExcessFeeds(db, userId, PLANS.free.maxActiveFeeds);
+    await db
+      .update(feeds)
+      .set({ nextFetchAt: null })
+      .where(eq(feeds.userId, userId));
+  }
+}
diff --git a/src/server/subscriptions/plans.ts b/src/server/subscriptions/plans.ts
index 546c78d1..b05b022f 100644
--- a/src/server/subscriptions/plans.ts
+++ b/src/server/subscriptions/plans.ts
@@ -1,42 +1,77 @@
-import { IS_BILLING_ENABLED } from "./polar";
+import { IS_MAIN_INSTANCE } from "~/lib/constants";
 
-export const PLAN_IDS = ["free", "standard", "pro"] as const;
+export const PLAN_IDS = [
+  "free",
+  "standard-small",
+  "standard-medium",
+  "standard-large",
+  "pro",
+] as const;
 export type PlanId = (typeof PLAN_IDS)[number];
+export type PaidPlanId = Exclude<PlanId, "free">;
+
+export const PAID_PLAN_IDS = [
+  "standard-small",
+  "standard-medium",
+  "standard-large",
+  "pro",
+] as const satisfies readonly PaidPlanId[];
 
 export type PlanConfig = {
   id: PlanId;
   name: string;
   maxActiveFeeds: number;
+  /** Minimum interval between user-initiated refreshes (server-enforced). */
+  refreshIntervalMs: number;
   backgroundRefreshIntervalMs: number | null;
-  polarMonthlyProductId: string | null;
-  polarAnnualProductId: string | null;
 };
 
+/**
+ * Small buffer subtracted from refresh intervals so users don't hit the
+ * rate-limit boundary when refreshing right on the dot (e.g. every 15 min).
+ */
+const REFRESH_PERIOD_BUFFER = 15_000;
+
+const STANDARD_REFRESH_MS = 15 * 60 * 1000 - REFRESH_PERIOD_BUFFER; // ~15 minutes
+const STANDARD_BACKGROUND_REFRESH_MS = 4 * 60 * 60 * 1000; // 4 hours
+const PRO_REFRESH_MS = 1 * 60 * 1000 - REFRESH_PERIOD_BUFFER; // ~1 minute
+const PRO_BACKGROUND_REFRESH_MS = 1 * 60 * 1000; // 1 minute
+
 export const PLANS: Record<PlanId, PlanConfig> = {
   free: {
     id: "free",
     name: "Free",
-    maxActiveFeeds: 100,
+    maxActiveFeeds: 40,
+    refreshIntervalMs: 60 * 60 * 1000 - REFRESH_PERIOD_BUFFER, // ~1 hour
     backgroundRefreshIntervalMs: null,
-    polarMonthlyProductId: null,
-    polarAnnualProductId: null,
   },
-  standard: {
-    id: "standard",
-    name: "Standard",
+  "standard-small": {
+    id: "standard-small",
+    name: "Small",
+    maxActiveFeeds: 200,
+    refreshIntervalMs: STANDARD_REFRESH_MS,
+    backgroundRefreshIntervalMs: STANDARD_BACKGROUND_REFRESH_MS,
+  },
+  "standard-medium": {
+    id: "standard-medium",
+    name: "Medium",
     maxActiveFeeds: 500,
-    backgroundRefreshIntervalMs: 4 * 60 * 60 * 1000, // 4 hours
-    polarMonthlyProductId:
-      process.env.POLAR_STANDARD_MONTHLY_PRODUCT_ID ?? null,
-    polarAnnualProductId: process.env.POLAR_STANDARD_ANNUAL_PRODUCT_ID ?? null,
+    refreshIntervalMs: STANDARD_REFRESH_MS,
+    backgroundRefreshIntervalMs: STANDARD_BACKGROUND_REFRESH_MS,
+  },
+  "standard-large": {
+    id: "standard-large",
+    name: "Large",
+    maxActiveFeeds: 1000,
+    refreshIntervalMs: STANDARD_REFRESH_MS,
+    backgroundRefreshIntervalMs: STANDARD_BACKGROUND_REFRESH_MS,
   },
   pro: {
     id: "pro",
     name: "Pro",
-    maxActiveFeeds: 2000,
-    backgroundRefreshIntervalMs: 15 * 60 * 1000, // 15 minutes
-    polarMonthlyProductId: process.env.POLAR_PRO_MONTHLY_PRODUCT_ID ?? null,
-    polarAnnualProductId: process.env.POLAR_PRO_ANNUAL_PRODUCT_ID ?? null,
+    maxActiveFeeds: 2500,
+    refreshIntervalMs: PRO_REFRESH_MS,
+    backgroundRefreshIntervalMs: PRO_BACKGROUND_REFRESH_MS,
   },
 };
 
@@ -44,24 +79,11 @@ const UNLIMITED_CONFIG: PlanConfig = {
   id: "pro",
   name: "Pro",
   maxActiveFeeds: Infinity,
-  backgroundRefreshIntervalMs: 5 * 60 * 1000,
-  polarMonthlyProductId: null,
-  polarAnnualProductId: null,
+  refreshIntervalMs: PRO_REFRESH_MS,
+  backgroundRefreshIntervalMs: PRO_BACKGROUND_REFRESH_MS,
 };
 
 export function getEffectivePlanConfig(planId: PlanId): PlanConfig {
-  if (!IS_BILLING_ENABLED) return UNLIMITED_CONFIG;
+  if (!IS_MAIN_INSTANCE) return UNLIMITED_CONFIG;
   return PLANS[planId];
 }
-
-export function determinePlanFromProductId(productId: string): PlanId | null {
-  for (const plan of Object.values(PLANS)) {
-    if (
-      plan.polarMonthlyProductId === productId ||
-      plan.polarAnnualProductId === productId
-    ) {
-      return plan.id;
-    }
-  }
-  return null;
-}
diff --git a/src/server/subscriptions/polar.ts b/src/server/subscriptions/polar.ts
index 48b07b55..90f12265 100644
--- a/src/server/subscriptions/polar.ts
+++ b/src/server/subscriptions/polar.ts
@@ -1,27 +1,86 @@
 import { Polar } from "@polar-sh/sdk";
+import type { PlanId } from "./plans";
 import { IS_MAIN_INSTANCE } from "~/lib/constants";
-
-const REQUIRED_POLAR_ENV_VARS = [
-  "POLAR_ACCESS_TOKEN",
-  "POLAR_WEBHOOK_SECRET",
-  "POLAR_STANDARD_MONTHLY_PRODUCT_ID",
-  "POLAR_STANDARD_ANNUAL_PRODUCT_ID",
-  "POLAR_PRO_MONTHLY_PRODUCT_ID",
-  "POLAR_PRO_ANNUAL_PRODUCT_ID",
-] as const;
+import { env } from "~/env";
 
 function hasAllPolarCredentials(): boolean {
-  return REQUIRED_POLAR_ENV_VARS.every((key) => !!process.env[key]);
+  return !!(
+    env.POLAR_ACCESS_TOKEN &&
+    env.POLAR_WEBHOOK_SECRET &&
+    env.POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID &&
+    env.POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID &&
+    env.POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID &&
+    env.POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID &&
+    env.POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID &&
+    env.POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID &&
+    env.POLAR_PRO_MONTHLY_PRODUCT_ID &&
+    env.POLAR_PRO_ANNUAL_PRODUCT_ID
+  );
 }
 
 export const polarClient =
   IS_MAIN_INSTANCE && hasAllPolarCredentials()
     ? new Polar({
-        accessToken: process.env.POLAR_ACCESS_TOKEN!,
-        server:
-          process.env.NODE_ENV === "production" ? "production" : "sandbox",
+        accessToken: env.POLAR_ACCESS_TOKEN!,
+        server: env.NODE_ENV === "production" ? "production" : "sandbox",
       })
     : null;
 
 /** True only when running as the main instance with all Polar credentials configured. */
 export const IS_BILLING_ENABLED = polarClient !== null;
+
+// ---------------------------------------------------------------------------
+// Product ID map — keyed by plan ID, contains monthly/annual Polar product IDs.
+// Server-only: populated from typed env vars.
+// ---------------------------------------------------------------------------
+
+const PLAN_PRODUCT_IDS: Record<
+  Exclude<PlanId, "free">,
+  { monthly: string | null; annual: string | null }
+> = {
+  "standard-small": {
+    monthly: env.POLAR_STANDARD_SMALL_QUOTA_MONTHLY_PRODUCT_ID ?? null,
+    annual: env.POLAR_STANDARD_SMALL_QUOTA_ANNUAL_PRODUCT_ID ?? null,
+  },
+  "standard-medium": {
+    monthly: env.POLAR_STANDARD_MEDIUM_QUOTA_MONTHLY_PRODUCT_ID ?? null,
+    annual: env.POLAR_STANDARD_MEDIUM_QUOTA_ANNUAL_PRODUCT_ID ?? null,
+  },
+  "standard-large": {
+    monthly: env.POLAR_STANDARD_LARGE_QUOTA_MONTHLY_PRODUCT_ID ?? null,
+    annual: env.POLAR_STANDARD_LARGE_QUOTA_ANNUAL_PRODUCT_ID ?? null,
+  },
+  pro: {
+    monthly: env.POLAR_PRO_MONTHLY_PRODUCT_ID ?? null,
+    annual: env.POLAR_PRO_ANNUAL_PRODUCT_ID ?? null,
+  },
+};
+
+/** Returns the Polar product IDs for a given plan (monthly and annual). */
+export function getPolarProductIds(planId: PlanId): {
+  monthly: string | null;
+  annual: string | null;
+} {
+  if (planId === "free") return { monthly: null, annual: null };
+  return PLAN_PRODUCT_IDS[planId];
+}
+
+/** Returns the plan ID for a given Polar product ID, or null if not found. */
+export function determinePlanFromProductId(productId: string): PlanId | null {
+  for (const [planId, ids] of Object.entries(PLAN_PRODUCT_IDS)) {
+    if (ids.monthly === productId || ids.annual === productId) {
+      return planId as PlanId;
+    }
+  }
+  return null;
+}
+
+/** Returns the set of all configured Polar product IDs across every plan. */
+export function getAllKnownProductIds(): Set<string> {
+  const ids = new Set<string>();
+  for (const planIds of Object.values(PLAN_PRODUCT_IDS)) {
+    if (planIds.monthly) ids.add(planIds.monthly);
+    if (planIds.annual) ids.add(planIds.annual);
+  }
+  return ids;
+}
diff --git a/tests/e2e/main-instance/feed-limit.spec.ts b/tests/e2e/main-instance/feed-limit.spec.ts
index b0bb4573..5f4da68e 100644
--- a/tests/e2e/main-instance/feed-limit.spec.ts
+++ b/tests/e2e/main-instance/feed-limit.spec.ts
@@ -3,8 +3,8 @@ import { signUp } from "../fixtures/auth";
 import { MAIN_RSS_SERVER_PORT, MAIN_TURSO_PORT } from "../fixtures/ports";
 import { cleanupUser, generateTestEmail } from "../fixtures/seed-db";
 
-const TOTAL_FEEDS = 110;
-const MAX_ACTIVE = 100;
+const TOTAL_FEEDS = 50;
+const MAX_ACTIVE = 40;
 const EXPECTED_INACTIVE = TOTAL_FEEDS - MAX_ACTIVE;
 
 function generateOpml(count: number): Buffer {
@@ -30,7 +30,7 @@ test.describe("feed limit for free plan", () => {
     }
   });
 
-  test("importing 110 feeds limits active to 100 and shows upgrade CTA", async ({
+  test("importing 50 feeds limits active to 40 and shows upgrade CTA", async ({
     page,
   }) => {
     test.setTimeout(180_000);
@@ -51,9 +51,8 @@ test.describe("feed limit for free plan", () => {
 
     const dropzone = page.getByText(/drag and drop/i);
     await expect(dropzone).toBeVisible();
-    await page.waitForTimeout(1000);
+    await page.locator('input[data-ready="true"]').waitFor({ timeout: 10000 });
 
-    // Upload the 110-feed OPML
     const fileChooserPromise = page.waitForEvent("filechooser");
     await dropzone.click();
     const fileChooser = await fileChooserPromise;
@@ -85,25 +84,22 @@ test.describe("feed limit for free plan", () => {
 
     // Click "Upgrade" in the toast to open subscription dialog
     await page.getByRole("button", { name: "Upgrade" }).click();
-    await expect(
-      page.getByText("Choose a plan that fits your needs."),
-    ).toBeVisible({ timeout: 5000 });
+    await expect(page.getByText("All prices are taxes-included.")).toBeVisible({
+      timeout: 5000,
+    });
     await page.keyboard.press("Escape");
 
-    // Navigate to /feeds and verify the counter
+    // Navigate to /feeds and verify the "max reached" alert (quota bar is hidden at the limit)
     await page.goto("/feeds");
-    await expect(
-      page.getByText(`${MAX_ACTIVE} / ${MAX_ACTIVE} feeds active`),
-    ).toBeVisible({ timeout: 15000 });
-
-    // Verify "Max active feeds reached" alert
-    await expect(page.getByText("Max active feeds reached")).toBeVisible();
+    await expect(page.getByText("Max active feeds reached")).toBeVisible({
+      timeout: 15000,
+    });
 
     // Click "Upgrade your plan" button and verify subscription dialog opens
     await page.getByRole("button", { name: /upgrade your plan/i }).click();
-    await expect(
-      page.getByText("Choose a plan that fits your needs."),
-    ).toBeVisible({ timeout: 5000 });
+    await expect(page.getByText("All prices are taxes-included.")).toBeVisible({
+      timeout: 5000,
+    });
     await page.keyboard.press("Escape");
 
     // Verify exactly 10 inactive feed rows (opacity-50 class)
diff --git a/tests/e2e/self-hosted/import-flow.spec.ts b/tests/e2e/self-hosted/import-flow.spec.ts
index 7a1a90d5..c34ae5df 100644
--- a/tests/e2e/self-hosted/import-flow.spec.ts
+++ b/tests/e2e/self-hosted/import-flow.spec.ts
@@ -48,7 +48,7 @@ test.describe("full user lifecycle", () => {
 
     const dropzone = page.getByText(/drag and drop/i);
     await expect(dropzone).toBeVisible();
-    await page.waitForTimeout(1000);
+    await page.locator('input[data-ready="true"]').waitFor({ timeout: 10000 });
 
     const fileChooserPromise = page.waitForEvent("filechooser");
     await dropzone.click();
diff --git a/tests/e2e/self-hosted/import-modes.spec.ts b/tests/e2e/self-hosted/import-modes.spec.ts
index 46b49726..50961cef 100644
--- a/tests/e2e/self-hosted/import-modes.spec.ts
+++ b/tests/e2e/self-hosted/import-modes.spec.ts
@@ -28,7 +28,7 @@ async function importSectionedOpml(
 
   const dropzone = page.getByText(/drag and drop/i);
   await expect(dropzone).toBeVisible();
-  await page.waitForTimeout(500);
+  await page.locator('input[data-ready="true"]').waitFor({ timeout: 10000 });
 
   const fileChooserPromise = page.waitForEvent("filechooser");
   await dropzone.click();