diff --git a/.github/instructions/*.instructions.md b/.github/instructions/*.instructions.md
index 93e73ea1..0876c657 100644
--- a/.github/instructions/*.instructions.md
+++ b/.github/instructions/*.instructions.md
@@ -1,4 +1,4 @@
-# Copilot Instructions — Tracker Tracker
+# Copilot PR Review Instructions
 
 ## Project
 
@@ -8,12 +8,6 @@ Self-hosted single-user dashboard for monitoring private tracker stats. Next.js
 
 pnpm only. Never use npm or yarn. Node.js >= 22 required.
 
-## Linting and Formatting
-
-- Biome for linting (`pnpm lint` runs `pnpm tsc && biome check .`). No ESLint.
-- Prettier for formatting (`pnpm format`). Biome's formatter is disabled.
-- TypeScript strict mode. Check with `pnpm tsc`.
-
 ## File Conventions
 
 - First line of every JS/TS file: `// relative/path/to/file.tsx`
@@ -79,10 +73,11 @@ Single-user app with master password auth. No third-party providers.
 - **Public routes:** defined in `proxy.ts` as `PUBLIC_EXACT` and `PUBLIC_PREFIX` arrays. All other routes require the cookie.
 
 Route handler pattern:
+
 ```ts
 const auth = await authenticate()
-if (auth instanceof NextResponse) return auth  // 401
-const key = decodeKey(auth)                    // Buffer
+if (auth instanceof NextResponse) return auth // 401
+const key = decodeKey(auth) // Buffer
 // use key to decrypt DB fields
 ```
 
@@ -92,26 +87,8 @@ const key = decodeKey(auth)                    // Buffer
 - Suppress findings with `// security-audit-ignore: <reason>` on the line above. A bare suppression without a reason is itself a critical failure.
 - URL inputs are validated against SSRF via `isUnsafeNetworkHost()` in `src/lib/network.ts`.
 
-## Design System
-
-- Dark neumorphic aesthetic. No hex values in component files — use Tailwind semantic tokens.
-- Depth: `nm-raised`, `nm-raised-sm` for raised elements. `nm-inset`, `nm-inset-sm` for recessed elements.
-- Colors: `text-upload` (cyan), `text-download` (amber), `text-positive` (lime), `text-negative` (red).
-- Per-tracker colors are the only allowed inline `style={{ backgroundColor }}` values.
-- Chart colors come from `CHART_THEME` in `src/components/charts/lib/theme.ts`. Never hardcode hex in chart files.
-- Typography: `font-mono` (JetBrains Mono) for data values. `font-sans` (Archivo) for UI text. Use `tabular-nums` on numeric data for column alignment.
-- Chart axis labels use `textTertiary` (not `textMuted`). Chart tooltip HTML must escape user data with `escHtml()`.
-- Border radius tokens: `rounded-nm-sm` (8px), `rounded-nm-md` (12px), `rounded-nm-lg` (20px), `rounded-nm-pill` (9999px).
-- No shadcn/ui. This project uses a fully custom component library with `cva` (class-variance-authority) for variants and `clsx` for class merging.
-
 ## Component Patterns
 
-- `StatCard` has 3 variants (basic, stacked, ring) — they render different JSX structures, not just different classes.
-- `ProgressBar` in `src/components/ui/ProgressBar.tsx` — reusable neumorphic progress bar matching the Toggle track/knob depth pattern.
-- `MarqueeText` for long torrent/tracker names instead of CSS `truncate`.
-- `Tooltip` accepts `ReactNode` content, not just strings. Use JSX with `flex-col` for multi-line tooltips.
-- Never use native `<input type="checkbox">` — use the `<Checkbox>` component.
-- Never use native `<select>` — use the `<Select>` component.
 - Component anatomy: internal sub-components are unexported functions within the file. Single public export at the bottom. Types exported with `export type { ... }`.
 - Use React 19's ref-as-prop pattern (direct `ref` prop), not `forwardRef`.
 - SVG path calculations with floating-point geometry should round to 2 decimal places for SSR hydration safety.
@@ -125,13 +102,6 @@ All module-level singletons (cron tasks, DB client, qBT SID cache) must be store
 - Framework: Vitest.
 - Test mocks must match real API response shapes. Do not add fields (i.e., `isPrivate: true`) that the real API does not return — this masks bugs.
 - Do not add test-only methods to production classes. Put test utilities in test files.
-- qBittorrent's API returns snake_case fields (`is_private`, `added_on`). The `QbtTorrent` TypeScript type uses camelCase for some fields but there is no automatic mapping — raw API responses have snake_case.
-
-## Commit Messages
-
-- Never mention AI, Claude, or LLMs in commit messages.
-- Use conventional commits: `feat(scope):`, `fix(scope):`, `style(scope):`, `chore(scope):`.
-- One-line commit messages only.
 
 ## Code Organization
 
@@ -142,23 +112,11 @@ All module-level singletons (cron tasks, DB client, qBT SID cache) must be store
 ## SSR / Hydration
 
 - NEVER read `localStorage` in `useState` initializers — causes hydration mismatch. Initialize with a server-safe default, then hydrate in `useEffect`.
-- Page components (`page.tsx`) should be thin wrappers. Business logic, UI sections, and data fetching belong in extracted components and hooks.
-
-## Writing Style
-
-- Always use "i.e." never "e.g." in comments, documentation, and UI text.
-- Do not use em dashes, en dashes, curly quotes, or other non-ASCII punctuation in comments, strings, or error messages. Stick to plain ASCII: commas, periods, hyphens, straight quotes. IDEs and terminals choke on fancy Unicode punctuation.
 
 ## Adapter Pattern
 
 - Tracker platforms use an adapter pattern: `TrackerAdapter` interface with `getAdapter()` factory. UNIT3D, Gazelle, and GGn are implemented. Adding a new platform means adding a new adapter file in `src/lib/adapters/`, not modifying existing ones.
 
-## qBittorrent Integration
-
-- The qBT Web API returns snake_case field names (`is_private`, `added_on`). The `QbtTorrent` TypeScript interface uses camelCase for some fields but `getTorrents()` returns raw JSON with NO field mapping. Do not assume camelCase fields exist on raw API responses.
-- Tag matching must be case-insensitive. The aggregator lowercases map keys. `parseTorrentTags()` lowercases by default.
-- The heartbeat loop (5s) must NOT update `lastPolledAt` — only the deep poll (5min) writes it. Otherwise the deep poll's overdue check never triggers.
-
 ## Precision Concerns
 
 - Daily upload/download deltas are computed as BigInt subtraction. Converting daily deltas to Number for percentage calculations is safe — `Number.MAX_SAFE_INTEGER` (~9 PiB) vastly exceeds any realistic daily transfer. Do not over-engineer BigInt arithmetic for percentage computations on daily deltas.
@@ -191,7 +149,6 @@ All module-level singletons (cron tasks, DB client, qBT SID cache) must be store
 
 ## Things NOT to Do
 
-- Do not use the terms "Production-Ready" or "Enterprise" anywhere.
 - Do not use ESLint. It has been deprecated for this project.
 - Do not use `npm` or `yarn` — `pnpm` only.
 - Do not create raw SQL migration files. Use `drizzle-kit push`.
@@ -204,4 +161,3 @@ All module-level singletons (cron tasks, DB client, qBT SID cache) must be store
 - Do not use `JSON.parse()` without a try/catch wrapper.
 - Do not use `console.log` in API routes — use the `log` instance from `@/lib/logger`.
 - Do not use `db.execute()` in API routes (raw SQL is banned except for the health check `SELECT 1`).
-- Do not use function names like "enhanced", "wrapper", or "util" — be specific and descriptive.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index f7d71812..18098c8e 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -16,7 +16,6 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Review dependencies
-        continue-on-error: true
         uses: actions/dependency-review-action@v4
         with:
           fail-on-severity: high
diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml
index 71e322b0..e13eb7fe 100644
--- a/.github/workflows/dev-image.yml
+++ b/.github/workflows/dev-image.yml
@@ -45,6 +45,7 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
+          build-args: NEXT_PUBLIC_RELEASE_CHANNEL=development
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:development
             docker.io/jordyjordy/tracker-tracker:development
diff --git a/.gitignore b/.gitignore
index 4603b9f3..125986df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ docs/audit/
 docs/superpowers/*
 docs/superpowers/specs/
 .claude/
+CLAUDE.md
 .history/
 .vscode/
 .serena/
diff --git a/.prettierignore b/.prettierignore
index e4741063..2ccff735 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,5 @@
-# docs/**/*.md
+docs/**/*.md
+CHANGELOG.md
+LICENSE
+README.md
+pnpm-lock.yaml
\ No newline at end of file
diff --git a/.versionrc.json b/.versionrc.json
index c30eab22..6631fcce 100644
--- a/.versionrc.json
+++ b/.versionrc.json
@@ -1,10 +1,7 @@
 {
   "header": "# Changelog\n",
-  "skip": {
-    "tag": true
-  },
   "writerOpts": {
-    "commitPartial": "- {{#if scope}}**{{scope}}:** {{/if}}{{#if subject}}{{{subject}}}{{else}}{{{header}}}{{/if}}{{~#if hash}} ({{#if @root.linkReferences}}[{{shortHash}}]({{@root.host}}/{{@root.owner}}/{{@root.repository}}/commit/{{hash}}){{else}}{{shortHash}}{{/if}}){{/if}}{{~#each references}}, closes {{#if @root.linkReferences}}[{{prefix}}{{issue}}]({{@root.host}}/{{@root.owner}}/{{@root.repository}}/issues/{{issue}}){{else}}{{prefix}}{{issue}}{{/if}}{{/each}}\n"
+    "commitPartial": "- {{#if scope}}**{{scope}}:** {{/if}}{{#if subject}}{{{subject}}}{{else}}{{{header}}}{{/if}}\n"
   },
   "types": [
     { "type": "feat", "section": "Features" },
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e947f16b..0712cbd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,869 +1,565 @@
 # Changelog
 
-## [2.6.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.4.1...v2.6.0) (2026-03-27)
+## [2.8.7](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.8.6...v2.8.7) (2026-04-10)
 
 
 ### Features
 
-- **dashboard:** add Today At A Glance server logic, checkpoints, and deep poll fixes ([d3826a1](https://github.com/jordanlambrecht/tracker-tracker/commit/d3826a181c017c6b2ac8bbc6fa9d77f6dfd0edc2))
-- **dashboard:** add Today At A Glance UI ([84c5227](https://github.com/jordanlambrecht/tracker-tracker/commit/84c522750f517c95653b73e1298aa72bd204e27f))
-- **mam:** add bonus cap, VIP expiry, unsatisfied limit, and active HnR notifications ([2b210d7](https://github.com/jordanlambrecht/tracker-tracker/commit/2b210d76542db6a7377c13d7e9a9abf51cc48752))
-- **mam:** add Mousehole integration ([0e28443](https://github.com/jordanlambrecht/tracker-tracker/commit/0e28443875c1de70b1dea0f3662ae9625000da0f))
-- **mam:** add MyAnonaMouse adapter ([692d312](https://github.com/jordanlambrecht/tracker-tracker/commit/692d3124cd648a3f1278b38881df5083f7febdc1))
-- **mam:** add platform UI with health overview, badges, and FL Wedges chart ([3bb280e](https://github.com/jordanlambrecht/tracker-tracker/commit/3bb280e302ae4f4afeab667b912f5cea0e6f501c))
-- **schema:** add daily checkpoint tables and TodayAtAGlance types ([636d227](https://github.com/jordanlambrecht/tracker-tracker/commit/636d22701cd43d8827f9afe49a5105820578f892))
-- **security:** enhance security audit checks and improve vulnerability reporting ([23b4cae](https://github.com/jordanlambrecht/tracker-tracker/commit/23b4cae6420d17a1e1f86e9b925841726e28ccfe))
-- **settings:** display database size ([67ff496](https://github.com/jordanlambrecht/tracker-tracker/commit/67ff4961e5d6ba50655ed0a9229ba807a26e1bbe))
+- **trackers:** detects truncated cookies
 
 
 ### Bug Fixes
 
-- **api:** improve session expiration error message ([5a95cd0](https://github.com/jordanlambrecht/tracker-tracker/commit/5a95cd039daf5aebb128f547acf70ae749132221))
-- **auth:** decouple cookie secure flag from node_env for self-hosted http deployments. Closes [#101](https://github.com/jordanlambrecht/tracker-tracker/issues/101) ([b2a7902](https://github.com/jordanlambrecht/tracker-tracker/commit/b2a790245ca76f1ec3ef8220c273a4ab9ca508fd))
-- **auth:** return 401 on stale session instead of misleading credential errors ([cf54c7f](https://github.com/jordanlambrecht/tracker-tracker/commit/cf54c7fbd6c2d9171b5d11b621e9a1f68abc381a))
-- **backups:** enforce maximum length for backup password to 128 characters ([5e6d58e](https://github.com/jordanlambrecht/tracker-tracker/commit/5e6d58e361fbcfa6323e414b3702768d895d85d7))
-- **Dockerfile:** update package.json for drizzle-kit with esbuild overrides ([bce0854](https://github.com/jordanlambrecht/tracker-tracker/commit/bce0854d8ea18cf4a99488ed6d9243b25fc71658))
-- ensure backfill flag is set after successful checkpoint backfill ([60f5786](https://github.com/jordanlambrecht/tracker-tracker/commit/60f5786134f346e4ba07684d210f3806bd384468))
-- error logging for BigInt conversion failures ([e91b30a](https://github.com/jordanlambrecht/tracker-tracker/commit/e91b30a79605ac73c34c39e372ad2aaca4c09c44))
-- error logging for BigInt conversion failures in computeTodayAtAGlance ([15eb043](https://github.com/jordanlambrecht/tracker-tracker/commit/15eb043989fa2611acc846032aae1e049fef7000))
-- **errors:** improve error handling and logging for backup and tracker operations ([7f7b202](https://github.com/jordanlambrecht/tracker-tracker/commit/7f7b202e2557d25cd011c8bd96e14332f3565bb1))
-- **Icons:** update DownloadArrowIcon stroke width ([d2cd450](https://github.com/jordanlambrecht/tracker-tracker/commit/d2cd450af0b6cf55bc5fc1c94ea01452c55252fb))
-- improve error handling for decryption failures in fetchAndMergeTorrents ([0b07d40](https://github.com/jordanlambrecht/tracker-tracker/commit/0b07d40ddaca93f188eeb166e53431764cb1bb8e))
-- normalize tracker tags to lowercase ([762988f](https://github.com/jordanlambrecht/tracker-tracker/commit/762988f2228218cf27b2d12c138bb0e2dfa1c5b1))
-- optimize torrent checkpoint insertion by batching database writes ([90285d6](https://github.com/jordanlambrecht/tracker-tracker/commit/90285d69b1dd709d0f77682ecb797a20fe3fea1c))
-- resolve lint warnings, Copilot review issues, remove dead code, and harden error handling ([815b479](https://github.com/jordanlambrecht/tracker-tracker/commit/815b479047fc956b965556cdcc01d39bc1ce4a33))
-- **ui:** prevent StatCard DOM prop leak ([2d0b22a](https://github.com/jordanlambrecht/tracker-tracker/commit/2d0b22aa51b1badeb8916ace9505fdf32f526dc9))
-- update drizzle-kit, drizzle-orm, and postgres to specific versions in Dockerfile ([303c6f5](https://github.com/jordanlambrecht/tracker-tracker/commit/303c6f5b21195a9a15a66f227dab4c022eca36b9))
-- update VALID_PLATFORMS to use VALID_PLATFORM_TYPES constant ([8cff4ee](https://github.com/jordanlambrecht/tracker-tracker/commit/8cff4ee6fabc274ca644aac65433a03fedbc0d53))
-- use localDateStr for cutoff date in pruneOldCheckpoints function ([0b465b6](https://github.com/jordanlambrecht/tracker-tracker/commit/0b465b6c139333ebcb8650fcf8224d5a70076bee))
-
-
-### Refactoring
-
-- **Dockerfile:** cleaned up build stages ([3b96ff9](https://github.com/jordanlambrecht/tracker-tracker/commit/3b96ff964058f33d3fe8fd65bf7a6fcde9dbcd3b))
-- reuse ProgressBar component and extract slot-label utility ([c3d9031](https://github.com/jordanlambrecht/tracker-tracker/commit/c3d90315d4ca8717f983a3d270d922cc0355de18))
-
-## [2.5.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.3.0...v2.5.0) (2026-03-26)
+- **events:** update event categories and improve error logging
+- **trackers:** missing profile parsing items for AnimeZ
 
-### Features
+## [2.8.6](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.8.5...v2.8.6) (2026-04-09)
 
-- add development image to docker hub ([8785094](https://github.com/jordanlambrecht/tracker-tracker/commit/87850942f118ccfd23c0a04d537928cd3db82976))
-- add fetchTrackerStats for future live transit paper data ([ed6662f](https://github.com/jordanlambrecht/tracker-tracker/commit/ed6662f0ac0c9990b6c96e8ae5616452385b6c26))
-- add GitHub Actions workflow for building and pushing development Docker image ([dca0af0](https://github.com/jordanlambrecht/tracker-tracker/commit/dca0af0a75a4ce21fbe14414d86d4ecbe4d459d3))
-- add per-tracker pause polling ([14a6c43](https://github.com/jordanlambrecht/tracker-tracker/commit/14a6c43cd6764924aba6e2fa592ef13d208b528a))
-- add system events viewer and log management ([b01ed22](https://github.com/jordanlambrecht/tracker-tracker/commit/b01ed22ec2ecfefe7f12bb448998d2726cb6b7f9))
-- **dashboard:** add Today At A Glance server logic, checkpoints, and deep poll fixes ([d3826a1](https://github.com/jordanlambrecht/tracker-tracker/commit/d3826a181c017c6b2ac8bbc6fa9d77f6dfd0edc2))
-- **dashboard:** add Today At A Glance UI ([84c5227](https://github.com/jordanlambrecht/tracker-tracker/commit/84c522750f517c95653b73e1298aa72bd204e27f))
-- remote image upload ([a480c34](https://github.com/jordanlambrecht/tracker-tracker/commit/a480c3470b7e97e44764c1d9c6d1bee356d22728))
-- **schema:** add daily checkpoint tables and TodayAtAGlance types ([636d227](https://github.com/jordanlambrecht/tracker-tracker/commit/636d22701cd43d8827f9afe49a5105820578f892))
-- **ui:** add pause/resume button ([c89299e](https://github.com/jordanlambrecht/tracker-tracker/commit/c89299ee80b9ce5ab22743039b6abd40be5a27b6))
-- **ui:** lazy-load chart sections, prefetch sidebar links, and fix scroll-to-top on navigation ([ba8f59e](https://github.com/jordanlambrecht/tracker-tracker/commit/ba8f59ee33a21be72034f296f5da1ae795e03c70))
 
 ### Bug Fixes
 
-- **api:** improve session expiration error message ([5a95cd0](https://github.com/jordanlambrecht/tracker-tracker/commit/5a95cd039daf5aebb128f547acf70ae749132221))
-- **api:** orpheus was not matching seeding/leeching to response ([4569238](https://github.com/jordanlambrecht/tracker-tracker/commit/456923879b2970c46432bc9a0b604da2685bc31d))
-- **auth:** decouple cookie secure flag from node_env for self-hosted http deployments. Closes [#101](https://github.com/jordanlambrecht/tracker-tracker/issues/101) ([b2a7902](https://github.com/jordanlambrecht/tracker-tracker/commit/b2a790245ca76f1ec3ef8220c273a4ab9ca508fd))
-- **auth:** return 401 on stale session instead of misleading credential errors ([cf54c7f](https://github.com/jordanlambrecht/tracker-tracker/commit/cf54c7fbd6c2d9171b5d11b621e9a1f68abc381a))
-- better regex for splitting comparison values in timing safe check ([8c67a50](https://github.com/jordanlambrecht/tracker-tracker/commit/8c67a50cb64196831d7b021249eb76e84766e009))
-- convert bold numbered rules to markdown list items ([6e96454](https://github.com/jordanlambrecht/tracker-tracker/commit/6e964541330cca791818aca5d703e03ac2165694))
-- deploy issues ([cf45ea1](https://github.com/jordanlambrecht/tracker-tracker/commit/cf45ea19726b8f31db5080ebe93909dd0825e995))
-- **Dockerfile:** update package.json for drizzle-kit with esbuild overrides ([bce0854](https://github.com/jordanlambrecht/tracker-tracker/commit/bce0854d8ea18cf4a99488ed6d9243b25fc71658))
-- **Icons:** update DownloadArrowIcon stroke width ([d2cd450](https://github.com/jordanlambrecht/tracker-tracker/commit/d2cd450af0b6cf55bc5fc1c94ea01452c55252fb))
-- preload fleet dashboard tab ([5f08951](https://github.com/jordanlambrecht/tracker-tracker/commit/5f0895192f39a740927594ab6617f2c5c04b5708))
-- resolve biome lint warnings ([af8807d](https://github.com/jordanlambrecht/tracker-tracker/commit/af8807d72847e139be396778a096a7695fc49123))
-- **trackers:** markdown rendering ([a5fbdde](https://github.com/jordanlambrecht/tracker-tracker/commit/a5fbdde7056848bb58fdbe6f1e77a765a543842d))
-- **ui:** prevent StatCard DOM prop leak ([2d0b22a](https://github.com/jordanlambrecht/tracker-tracker/commit/2d0b22aa51b1badeb8916ace9505fdf32f526dc9))
-- update type imports for CollapsibleCard ([23979d1](https://github.com/jordanlambrecht/tracker-tracker/commit/23979d1f6323bd3fa209c9ed19172dbd7d05b6db))
-- update workflow triggers to include development branch for pull requests ([d159775](https://github.com/jordanlambrecht/tracker-tracker/commit/d15977566a9dbd341c0db6f3b67e0ace9bb70f16))
-- wrong postgres setup in docker-compose (closes [#78](https://github.com/jordanlambrecht/tracker-tracker/issues/78)) ([a0a3e0e](https://github.com/jordanlambrecht/tracker-tracker/commit/a0a3e0e16fe4e3b97dea9c7ebc5616cb54e22332))
-
-### Performance
-
-- add 5s per-client fetch deadline ([558c4be](https://github.com/jordanlambrecht/tracker-tracker/commit/558c4be0f9b05b198fd09ca5df4aad0dc6cde637))
-- **settings:** settings page optimizations ([63aabab](https://github.com/jordanlambrecht/tracker-tracker/commit/63aabab9afdfde3d492b81b86f581c4c035269d1))
-
-### Refactoring
-
-- **charts:** consolidate duplicate Fleet/Torrent chart pairs and normalize upstream data flow ([ca051a8](https://github.com/jordanlambrecht/tracker-tracker/commit/ca051a8f4284565f6b0c09e4c9f0522a70ff7e2c))
-- **charts:** migrate time-series charts to time axis with shared helpers and quality fixes ([596396e](https://github.com/jordanlambrecht/tracker-tracker/commit/596396e205fe387799986af7f1ff8386e8f77d13))
-- **charts:** reorganize chart support files into lib/ subfolder ([98a26d4](https://github.com/jordanlambrecht/tracker-tracker/commit/98a26d4fb4bf2fb7c3b02c4d38151a6b07fbb887))
-- **Dockerfile:** cleaned up build stages ([3b96ff9](https://github.com/jordanlambrecht/tracker-tracker/commit/3b96ff964058f33d3fe8fd65bf7a6fcde9dbcd3b))
-- **settings:** extract CollapsibleCard ([5487d19](https://github.com/jordanlambrecht/tracker-tracker/commit/5487d19d1ac2dd56c6bf2136f072edbcb7868fe5))
-- **settings:** extract SettingsSection wrapper ([ea0572c](https://github.com/jordanlambrecht/tracker-tracker/commit/ea0572c603ef191494a37cd9fe7ca64447bce1d4))
-
-## [2.4.2](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.3.0...v2.4.2) (2026-03-25)
+- **trackers:** profile parsing
 
-### Features
+## [2.8.5](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.8.4...v2.8.5) (2026-04-09)
 
-- add development image to docker hub ([8785094](https://github.com/jordanlambrecht/tracker-tracker/commit/87850942f118ccfd23c0a04d537928cd3db82976))
-- add fetchTrackerStats for future live transit paper data ([ed6662f](https://github.com/jordanlambrecht/tracker-tracker/commit/ed6662f0ac0c9990b6c96e8ae5616452385b6c26))
-- add GitHub Actions workflow for building and pushing development Docker image ([dca0af0](https://github.com/jordanlambrecht/tracker-tracker/commit/dca0af0a75a4ce21fbe14414d86d4ecbe4d459d3))
-- add per-tracker pause polling ([14a6c43](https://github.com/jordanlambrecht/tracker-tracker/commit/14a6c43cd6764924aba6e2fa592ef13d208b528a))
-- add system events viewer and log management ([b01ed22](https://github.com/jordanlambrecht/tracker-tracker/commit/b01ed22ec2ecfefe7f12bb448998d2726cb6b7f9))
-- remote image upload ([a480c34](https://github.com/jordanlambrecht/tracker-tracker/commit/a480c3470b7e97e44764c1d9c6d1bee356d22728))
-- **ui:** add pause/resume button ([c89299e](https://github.com/jordanlambrecht/tracker-tracker/commit/c89299ee80b9ce5ab22743039b6abd40be5a27b6))
-- **ui:** lazy-load chart sections, prefetch sidebar links, and fix scroll-to-top on navigation ([ba8f59e](https://github.com/jordanlambrecht/tracker-tracker/commit/ba8f59ee33a21be72034f296f5da1ae795e03c70))
 
 ### Bug Fixes
 
-- **api:** orpheus was not matching seeding/leeching to response ([4569238](https://github.com/jordanlambrecht/tracker-tracker/commit/456923879b2970c46432bc9a0b604da2685bc31d))
-- **auth:** decouple cookie secure flag from node_env for self-hosted http deployments. Closes [#101](https://github.com/jordanlambrecht/tracker-tracker/issues/101) ([b2a7902](https://github.com/jordanlambrecht/tracker-tracker/commit/b2a790245ca76f1ec3ef8220c273a4ab9ca508fd))
-- better regex for splitting comparison values in timing safe check ([8c67a50](https://github.com/jordanlambrecht/tracker-tracker/commit/8c67a50cb64196831d7b021249eb76e84766e009))
-- convert bold numbered rules to markdown list items ([6e96454](https://github.com/jordanlambrecht/tracker-tracker/commit/6e964541330cca791818aca5d703e03ac2165694))
-- deploy issues ([cf45ea1](https://github.com/jordanlambrecht/tracker-tracker/commit/cf45ea19726b8f31db5080ebe93909dd0825e995))
-- **Dockerfile:** update package.json for drizzle-kit with esbuild overrides ([bce0854](https://github.com/jordanlambrecht/tracker-tracker/commit/bce0854d8ea18cf4a99488ed6d9243b25fc71658))
-- preload fleet dashboard tab ([5f08951](https://github.com/jordanlambrecht/tracker-tracker/commit/5f0895192f39a740927594ab6617f2c5c04b5708))
-- resolve biome lint warnings ([af8807d](https://github.com/jordanlambrecht/tracker-tracker/commit/af8807d72847e139be396778a096a7695fc49123))
-- **trackers:** markdown rendering ([a5fbdde](https://github.com/jordanlambrecht/tracker-tracker/commit/a5fbdde7056848bb58fdbe6f1e77a765a543842d))
-- update type imports for CollapsibleCard ([23979d1](https://github.com/jordanlambrecht/tracker-tracker/commit/23979d1f6323bd3fa209c9ed19172dbd7d05b6db))
-- update workflow triggers to include development branch for pull requests ([d159775](https://github.com/jordanlambrecht/tracker-tracker/commit/d15977566a9dbd341c0db6f3b67e0ace9bb70f16))
-- wrong postgres setup in docker-compose (closes [#78](https://github.com/jordanlambrecht/tracker-tracker/issues/78)) ([a0a3e0e](https://github.com/jordanlambrecht/tracker-tracker/commit/a0a3e0e16fe4e3b97dea9c7ebc5616cb54e22332))
+- changelog now shows all missed releases not just latest
+- **trackers:** add batch tolerance for overdue checks to prevent drift
 
-### Performance
+## [2.8.4](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.8.3...v2.8.4) (2026-04-09)
 
-- add 5s per-client fetch deadline ([558c4be](https://github.com/jordanlambrecht/tracker-tracker/commit/558c4be0f9b05b198fd09ca5df4aad0dc6cde637))
-- **settings:** settings page optimizations ([63aabab](https://github.com/jordanlambrecht/tracker-tracker/commit/63aabab9afdfde3d492b81b86f581c4c035269d1))
 
-### Refactoring
+### Features
 
-- **charts:** consolidate duplicate Fleet/Torrent chart pairs and normalize upstream data flow ([ca051a8](https://github.com/jordanlambrecht/tracker-tracker/commit/ca051a8f4284565f6b0c09e4c9f0522a70ff7e2c))
-- **charts:** migrate time-series charts to time axis with shared helpers and quality fixes ([596396e](https://github.com/jordanlambrecht/tracker-tracker/commit/596396e205fe387799986af7f1ff8386e8f77d13))
-- **charts:** reorganize chart support files into lib/ subfolder ([98a26d4](https://github.com/jordanlambrecht/tracker-tracker/commit/98a26d4fb4bf2fb7c3b02c4d38151a6b07fbb887))
-- **Dockerfile:** cleaned up build stages ([3b96ff9](https://github.com/jordanlambrecht/tracker-tracker/commit/3b96ff964058f33d3fe8fd65bf7a6fcde9dbcd3b))
-- **settings:** extract CollapsibleCard ([5487d19](https://github.com/jordanlambrecht/tracker-tracker/commit/5487d19d1ac2dd56c6bf2136f072edbcb7868fe5))
-- **settings:** extract SettingsSection wrapper ([ea0572c](https://github.com/jordanlambrecht/tracker-tracker/commit/ea0572c603ef191494a37cd9fe7ca64447bce1d4))
+- new "What's New" dialog
+- **settings:** log files now batch in the events tab
 
-## [2.4.1](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.3.0...v2.4.1) (2026-03-23)
+## [2.8.3](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.8.3) (2026-04-09)
 
 ### Features
 
-- add development image to docker hub ([8785094](https://github.com/jordanlambrecht/tracker-tracker/commit/87850942f118ccfd23c0a04d537928cd3db82976))
-- add fetchTrackerStats for future live transit paper data ([ed6662f](https://github.com/jordanlambrecht/tracker-tracker/commit/ed6662f0ac0c9990b6c96e8ae5616452385b6c26))
-- add GitHub Actions workflow for building and pushing development Docker image ([dca0af0](https://github.com/jordanlambrecht/tracker-tracker/commit/dca0af0a75a4ce21fbe14414d86d4ecbe4d459d3))
-- add per-tracker pause polling ([14a6c43](https://github.com/jordanlambrecht/tracker-tracker/commit/14a6c43cd6764924aba6e2fa592ef13d208b528a))
-- add system events viewer and log management ([b01ed22](https://github.com/jordanlambrecht/tracker-tracker/commit/b01ed22ec2ecfefe7f12bb448998d2726cb6b7f9))
-- remote image upload ([a480c34](https://github.com/jordanlambrecht/tracker-tracker/commit/a480c3470b7e97e44764c1d9c6d1bee356d22728))
-- **ui:** add pause/resume button ([c89299e](https://github.com/jordanlambrecht/tracker-tracker/commit/c89299ee80b9ce5ab22743039b6abd40be5a27b6))
-- **ui:** lazy-load chart sections, prefetch sidebar links, and fix scroll-to-top on navigation ([ba8f59e](https://github.com/jordanlambrecht/tracker-tracker/commit/ba8f59ee33a21be72034f296f5da1ae795e03c70))
+* **logging:** added classifyFetchError for better error messages
 
 ### Bug Fixes
 
-- **api:** orpheus was not matching seeding/leeching to response ([4569238](https://github.com/jordanlambrecht/tracker-tracker/commit/456923879b2970c46432bc9a0b604da2685bc31d))
-- better regex for splitting comparison values in timing safe check ([8c67a50](https://github.com/jordanlambrecht/tracker-tracker/commit/8c67a50cb64196831d7b021249eb76e84766e009))
-- convert bold numbered rules to markdown list items ([6e96454](https://github.com/jordanlambrecht/tracker-tracker/commit/6e964541330cca791818aca5d703e03ac2165694))
-- deploy issues ([cf45ea1](https://github.com/jordanlambrecht/tracker-tracker/commit/cf45ea19726b8f31db5080ebe93909dd0825e995))
-- preload fleet dashboard tab ([5f08951](https://github.com/jordanlambrecht/tracker-tracker/commit/5f0895192f39a740927594ab6617f2c5c04b5708))
-- resolve biome lint warnings ([af8807d](https://github.com/jordanlambrecht/tracker-tracker/commit/af8807d72847e139be396778a096a7695fc49123))
-- **trackers:** markdown rendering ([a5fbdde](https://github.com/jordanlambrecht/tracker-tracker/commit/a5fbdde7056848bb58fdbe6f1e77a765a543842d))
-- update type imports for CollapsibleCard ([23979d1](https://github.com/jordanlambrecht/tracker-tracker/commit/23979d1f6323bd3fa209c9ed19172dbd7d05b6db))
-- update workflow triggers to include development branch for pull requests ([d159775](https://github.com/jordanlambrecht/tracker-tracker/commit/d15977566a9dbd341c0db6f3b67e0ace9bb70f16))
-- wrong postgres setup in docker-compose (closes [#78](https://github.com/jordanlambrecht/tracker-tracker/issues/78)) ([a0a3e0e](https://github.com/jordanlambrecht/tracker-tracker/commit/a0a3e0e16fe4e3b97dea9c7ebc5616cb54e22332))
+* **circuit-breaker:** reset consecutiveFailures on resume, add lastErrorAt + isManual tracking
+* **proxy:** proxy now works with test connection endpoint
+* **sidebar:** filter and sort dropdowns were clipping
+* **trackers:** tooltip extraction in parseAvistazProfile
 
-### Performance
+## [2.8.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.8.2) (2026-04-09)
 
-- add 5s per-client fetch deadline ([558c4be](https://github.com/jordanlambrecht/tracker-tracker/commit/558c4be0f9b05b198fd09ca5df4aad0dc6cde637))
-- **settings:** settings page optimizations ([63aabab](https://github.com/jordanlambrecht/tracker-tracker/commit/63aabab9afdfde3d492b81b86f581c4c035269d1))
+## [2.8.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.8.1) (2026-04-09)
 
-### Refactoring
+### Features
 
-- **charts:** consolidate duplicate Fleet/Torrent chart pairs and normalize upstream data flow ([ca051a8](https://github.com/jordanlambrecht/tracker-tracker/commit/ca051a8f4284565f6b0c09e4c9f0522a70ff7e2c))
-- **charts:** migrate time-series charts to time axis with shared helpers and quality fixes ([596396e](https://github.com/jordanlambrecht/tracker-tracker/commit/596396e205fe387799986af7f1ff8386e8f77d13))
-- **charts:** reorganize chart support files into lib/ subfolder ([98a26d4](https://github.com/jordanlambrecht/tracker-tracker/commit/98a26d4fb4bf2fb7c3b02c4d38151a6b07fbb887))
-- **settings:** extract CollapsibleCard ([5487d19](https://github.com/jordanlambrecht/tracker-tracker/commit/5487d19d1ac2dd56c6bf2136f072edbcb7868fe5))
-- **settings:** extract SettingsSection wrapper ([ea0572c](https://github.com/jordanlambrecht/tracker-tracker/commit/ea0572c603ef191494a37cd9fe7ca64447bce1d4))
+* **charts:** chart components now use useMemo
+* **fleet:** added bucketed queries
 
-## [2.4.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.3.0...v2.4.0) (2026-03-23)
+## [2.8.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.8.0) (2026-04-08)
 
 ### Features
 
-- add fetchTrackerStats for future live transit paper data ([ed6662f](https://github.com/jordanlambrecht/tracker-tracker/commit/ed6662f0ac0c9990b6c96e8ae5616452385b6c26))
-- add GitHub Actions workflow for building and pushing development Docker image ([dca0af0](https://github.com/jordanlambrecht/tracker-tracker/commit/dca0af0a75a4ce21fbe14414d86d4ecbe4d459d3))
-- add per-tracker pause polling ([14a6c43](https://github.com/jordanlambrecht/tracker-tracker/commit/14a6c43cd6764924aba6e2fa592ef13d208b528a))
-- add system events viewer and log management ([b01ed22](https://github.com/jordanlambrecht/tracker-tracker/commit/b01ed22ec2ecfefe7f12bb448998d2726cb6b7f9))
-- remote image upload ([a480c34](https://github.com/jordanlambrecht/tracker-tracker/commit/a480c3470b7e97e44764c1d9c6d1bee356d22728))
-- **ui:** add pause/resume button ([c89299e](https://github.com/jordanlambrecht/tracker-tracker/commit/c89299ee80b9ce5ab22743039b6abd40be5a27b6))
-- **ui:** lazy-load chart sections, prefetch sidebar links, and fix scroll-to-top on navigation ([ba8f59e](https://github.com/jordanlambrecht/tracker-tracker/commit/ba8f59ee33a21be72034f296f5da1ae795e03c70))
+* add `getFilteredTorrents` function
+* **backups:** security hardening
+* better API limits for snapshots
+* better logging, less silent failures, more try/catches
+* retention notice! dashboard alert when unconfigured, setup wizard toggle
+* **scheduler:** add SIGTERM handler
+* **security:** add checks for adapter cookie injection and credential logging
+* **tracker platforms:** add `metaFor` function and `PlatformMetaMap` interface
+* **trackers:** added support for DigitalCore
 
 ### Bug Fixes
 
-- **api:** orpheus was not matching seeding/leeching to response ([4569238](https://github.com/jordanlambrecht/tracker-tracker/commit/456923879b2970c46432bc9a0b604da2685bc31d))
-- better regex for splitting comparison values in timing safe check ([8c67a50](https://github.com/jordanlambrecht/tracker-tracker/commit/8c67a50cb64196831d7b021249eb76e84766e009))
-- convert bold numbered rules to markdown list items ([6e96454](https://github.com/jordanlambrecht/tracker-tracker/commit/6e964541330cca791818aca5d703e03ac2165694))
-- deploy issues ([cf45ea1](https://github.com/jordanlambrecht/tracker-tracker/commit/cf45ea19726b8f31db5080ebe93909dd0825e995))
-- resolve biome lint warnings ([af8807d](https://github.com/jordanlambrecht/tracker-tracker/commit/af8807d72847e139be396778a096a7695fc49123))
-- **trackers:** markdown rendering ([a5fbdde](https://github.com/jordanlambrecht/tracker-tracker/commit/a5fbdde7056848bb58fdbe6f1e77a765a543842d))
-- update type imports for CollapsibleCard ([23979d1](https://github.com/jordanlambrecht/tracker-tracker/commit/23979d1f6323bd3fa209c9ed19172dbd7d05b6db))
-- update workflow triggers to include development branch for pull requests ([d159775](https://github.com/jordanlambrecht/tracker-tracker/commit/d15977566a9dbd341c0db6f3b67e0ace9bb70f16))
-- wrong postgres setup in docker-compose (closes [#78](https://github.com/jordanlambrecht/tracker-tracker/issues/78)) ([a0a3e0e](https://github.com/jordanlambrecht/tracker-tracker/commit/a0a3e0e16fe4e3b97dea9c7ebc5616cb54e22332))
-
-### Performance
-
-- add 5s per-client fetch deadline ([558c4be](https://github.com/jordanlambrecht/tracker-tracker/commit/558c4be0f9b05b198fd09ca5df4aad0dc6cde637))
-- **settings:** settings page optimizations ([63aabab](https://github.com/jordanlambrecht/tracker-tracker/commit/63aabab9afdfde3d492b81b86f581c4c035269d1))
-
-### Refactoring
-
-- **charts:** consolidate duplicate Fleet/Torrent chart pairs and normalize upstream data flow ([ca051a8](https://github.com/jordanlambrecht/tracker-tracker/commit/ca051a8f4284565f6b0c09e4c9f0522a70ff7e2c))
-- **charts:** migrate time-series charts to time axis with shared helpers and quality fixes ([596396e](https://github.com/jordanlambrecht/tracker-tracker/commit/596396e205fe387799986af7f1ff8386e8f77d13))
-- **charts:** reorganize chart support files into lib/ subfolder ([98a26d4](https://github.com/jordanlambrecht/tracker-tracker/commit/98a26d4fb4bf2fb7c3b02c4d38151a6b07fbb887))
-- **settings:** extract CollapsibleCard ([5487d19](https://github.com/jordanlambrecht/tracker-tracker/commit/5487d19d1ac2dd56c6bf2136f072edbcb7868fe5))
-- **settings:** extract SettingsSection wrapper ([ea0572c](https://github.com/jordanlambrecht/tracker-tracker/commit/ea0572c603ef191494a37cd9fe7ca64447bce1d4))
+* **alerts:** reject unknown alert types
+* **auth:** reject pending/setup tokens in getSession function
+* **backup:** better validation for tracker baseUrl
+* emoji enum leak
+* **login:** bug where submit button would reset styling
+* **nuke:** reset backfill status after scrub and delete
+* **security-audit:** upper-bound pw length check
+* ssr issue
+* tag group batch validation
+* **trackers:** force unique ids and boost validation in PATCH handler
 
-## [2.3.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.1.1...v2.3.0) (2026-03-21)
+## [2.7.3](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.7.3) (2026-03-31)
 
 ### Features
 
-- add alertSlideIn keyframe animation ([f59ab88](https://github.com/jordanlambrecht/tracker-tracker/commit/f59ab8854669d8592422da27f8e74a9c7d643216))
-- add notification delivery pipeline with circuit breaker and cooldowns ([14d3982](https://github.com/jordanlambrecht/tracker-tracker/commit/14d3982c19e017b5d4b932953bcc8ae6fcfbd839))
-- add notification target CRUD API routes ([a367039](https://github.com/jordanlambrecht/tracker-tracker/commit/a367039735950988f612d7fe986cf491f90a3dd9))
-- add notificationTargets and notificationDeliveryState schema tables ([785a641](https://github.com/jordanlambrecht/tracker-tracker/commit/785a641fd8dc69cc9e9e51bad202110f70b12fde))
-- add scoped error boundary for tracker detail page ([e4ad230](https://github.com/jordanlambrecht/tracker-tracker/commit/e4ad2302d34bfea1954cd1485bdc56e985267e69))
-- add server-data module with secure column projections ([49fc00e](https://github.com/jordanlambrecht/tracker-tracker/commit/49fc00e4c21c37ae8d20b9630a12ddd917a68ebf))
-- add shared event detection functions and notification type definitions ([4c217bb](https://github.com/jordanlambrecht/tracker-tracker/commit/4c217bb1fe794bcba87a21c255028ee112c0732d))
-- added Dialog and CopyButton components ([a732148](https://github.com/jordanlambrecht/tracker-tracker/commit/a732148512ef3cc444d6828b0d17d4c7906f444e))
-- docs support for tooltips ([406528f](https://github.com/jordanlambrecht/tracker-tracker/commit/406528f40466e52ef153056c209ff40aa7a7456d))
-- **docs:** brand spankin' new documentation site and integration ([2c644d4](https://github.com/jordanlambrecht/tracker-tracker/commit/2c644d412bcf91d78564df596df01e1032843848))
-- expand TrackerLatestStats with bufferBytes, hitAndRuns, seedbonus, shareScore ([a818e1a](https://github.com/jordanlambrecht/tracker-tracker/commit/a818e1ad1995d157577e454a1de89d227826304b))
-- integrate notification targets with backup, restore, and nuke ([655393e](https://github.com/jordanlambrecht/tracker-tracker/commit/655393ebc32887548e7bcea5a08d2db3cb62410f))
-- replace manual polling with TanStack Query ([0129020](https://github.com/jordanlambrecht/tracker-tracker/commit/0129020d3caba64431485bd4d7fb7b3647853fab))
-- wire notification dispatch into tracker polling scheduler ([1d8f4fc](https://github.com/jordanlambrecht/tracker-tracker/commit/1d8f4fc622d79400f0bf52b7fc7678fd123dea42))
+* **trackers:** update user classes requirements for animez tracker
 
-### Bug Fixes
-
-- added size props to dialog comp ([46a8160](https://github.com/jordanlambrecht/tracker-tracker/commit/46a816081276ab068310b36a040ee6ada8fd4441))
-- round dashOffset to 2 decimal places ([5f23be2](https://github.com/jordanlambrecht/tracker-tracker/commit/5f23be24545c5544bd96813288b4bd065bc2d246))
-- update notificationDeliveryState schema to add foreign key constraint for targetId ([1319b8d](https://github.com/jordanlambrecht/tracker-tracker/commit/1319b8d168cd192627ab9c874120174317034738))
-- update timestamp format ([2d01aba](https://github.com/jordanlambrecht/tracker-tracker/commit/2d01abaf76a46e7f93353ce1e17461d3d112e22a))
-
-### Refactoring
-
-- add getProxyTrackers function to fetch proxy-enabled trackers ([17cf490](https://github.com/jordanlambrecht/tracker-tracker/commit/17cf4903c1047a00dc62ea3d2e8614cdc74f06ec))
-- adopt React 19 ref-as-prop pattern ([a936c8f](https://github.com/jordanlambrecht/tracker-tracker/commit/a936c8fa8fec9f00a0952680a419f3a2bc5e04ca))
-- better joinedAt logic ([24c2e1d](https://github.com/jordanlambrecht/tracker-tracker/commit/24c2e1d0c6da41f237963635466170d3066f5e97))
-- changed snapshot retrieval logic ([75613b1](https://github.com/jordanlambrecht/tracker-tracker/commit/75613b11a40e7114988037fb255e8e087038e49e))
-- consolidate API GET handlers to use server-data functions ([3d6b686](https://github.com/jordanlambrecht/tracker-tracker/commit/3d6b68656f43edfbd7b548e4fafc9fb0c57e149b))
-- migrate API route params to async props.params for Next.js 16 ([6a4efba](https://github.com/jordanlambrecht/tracker-tracker/commit/6a4efba993f1e990bddf388cb7a8921de1a33e32))
-- move login and setup redirect logic server-side ([168ae57](https://github.com/jordanlambrecht/tracker-tracker/commit/168ae579e694d253987cc5f2ffe4d4042bf7c268))
-- replace tracker list with proxy trackers in settings page ([c7d0c47](https://github.com/jordanlambrecht/tracker-tracker/commit/c7d0c4792067515bd004211fd7850d50150e78ac))
-- settingspage to use server-side data fetching ([ff27517](https://github.com/jordanlambrecht/tracker-tracker/commit/ff27517304598d9ebab0bb2ed7bc1053e75dd0c7))
-- simplify database query ([44de4aa](https://github.com/jordanlambrecht/tracker-tracker/commit/44de4aaed114048bfd82374e8fa800d4eeb6e311))
-- split authenticated pages into server and client components ([246287a](https://github.com/jordanlambrecht/tracker-tracker/commit/246287a16a0180c23efefebef7ea6d27a03b5f74))
-- update dismissAllAlerts logic to use persistDismiss ([411e98e](https://github.com/jordanlambrecht/tracker-tracker/commit/411e98e4fd4a791fd4355e64d1dcf86917597a0f))
-- update fetch calls in useDashboardData to support signal for aborting requests ([0ae0dbc](https://github.com/jordanlambrecht/tracker-tracker/commit/0ae0dbcbd765de08457449f0e3b2a324c426518f))
-- use shared detection functions in dashboard alerts and tracker status ([04aca35](https://github.com/jordanlambrecht/tracker-tracker/commit/04aca35e6d8c37e20f47f49d3604911c047b281e))
-
-## [2.2.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.1.1...v2.2.0) (2026-03-20)
+## [2.7.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.7.2) (2026-03-31)
 
 ### Features
 
-- add notification delivery pipeline with circuit breaker and cooldowns ([14d3982](https://github.com/jordanlambrecht/tracker-tracker/commit/14d3982c19e017b5d4b932953bcc8ae6fcfbd839))
-- add notification target CRUD API routes ([a367039](https://github.com/jordanlambrecht/tracker-tracker/commit/a367039735950988f612d7fe986cf491f90a3dd9))
-- add notificationTargets and notificationDeliveryState schema tables ([785a641](https://github.com/jordanlambrecht/tracker-tracker/commit/785a641fd8dc69cc9e9e51bad202110f70b12fde))
-- add scoped error boundary for tracker detail page ([e4ad230](https://github.com/jordanlambrecht/tracker-tracker/commit/e4ad2302d34bfea1954cd1485bdc56e985267e69))
-- add server-data module with secure column projections ([49fc00e](https://github.com/jordanlambrecht/tracker-tracker/commit/49fc00e4c21c37ae8d20b9630a12ddd917a68ebf))
-- add shared event detection functions and notification type definitions ([4c217bb](https://github.com/jordanlambrecht/tracker-tracker/commit/4c217bb1fe794bcba87a21c255028ee112c0732d))
-- docs support for tooltips ([406528f](https://github.com/jordanlambrecht/tracker-tracker/commit/406528f40466e52ef153056c209ff40aa7a7456d))
-- **docs:** brand spankin' new documentation site and integration ([2c644d4](https://github.com/jordanlambrecht/tracker-tracker/commit/2c644d412bcf91d78564df596df01e1032843848))
-- expand TrackerLatestStats with bufferBytes, hitAndRuns, seedbonus, shareScore ([a818e1a](https://github.com/jordanlambrecht/tracker-tracker/commit/a818e1ad1995d157577e454a1de89d227826304b))
-- integrate notification targets with backup, restore, and nuke ([655393e](https://github.com/jordanlambrecht/tracker-tracker/commit/655393ebc32887548e7bcea5a08d2db3cb62410f))
-- replace manual polling with TanStack Query ([0129020](https://github.com/jordanlambrecht/tracker-tracker/commit/0129020d3caba64431485bd4d7fb7b3647853fab))
-- wire notification dispatch into tracker polling scheduler ([1d8f4fc](https://github.com/jordanlambrecht/tracker-tracker/commit/1d8f4fc622d79400f0bf52b7fc7678fd123dea42))
-
-### Refactoring
-
-- add getProxyTrackers function to fetch proxy-enabled trackers ([17cf490](https://github.com/jordanlambrecht/tracker-tracker/commit/17cf4903c1047a00dc62ea3d2e8614cdc74f06ec))
-- adopt React 19 ref-as-prop pattern ([a936c8f](https://github.com/jordanlambrecht/tracker-tracker/commit/a936c8fa8fec9f00a0952680a419f3a2bc5e04ca))
-- better joinedAt logic ([24c2e1d](https://github.com/jordanlambrecht/tracker-tracker/commit/24c2e1d0c6da41f237963635466170d3066f5e97))
-- changed snapshot retrieval logic ([75613b1](https://github.com/jordanlambrecht/tracker-tracker/commit/75613b11a40e7114988037fb255e8e087038e49e))
-- consolidate API GET handlers to use server-data functions ([3d6b686](https://github.com/jordanlambrecht/tracker-tracker/commit/3d6b68656f43edfbd7b548e4fafc9fb0c57e149b))
-- migrate API route params to async props.params for Next.js 16 ([6a4efba](https://github.com/jordanlambrecht/tracker-tracker/commit/6a4efba993f1e990bddf388cb7a8921de1a33e32))
-- move login and setup redirect logic server-side ([168ae57](https://github.com/jordanlambrecht/tracker-tracker/commit/168ae579e694d253987cc5f2ffe4d4042bf7c268))
-- replace tracker list with proxy trackers in settings page ([c7d0c47](https://github.com/jordanlambrecht/tracker-tracker/commit/c7d0c4792067515bd004211fd7850d50150e78ac))
-- settingspage to use server-side data fetching ([ff27517](https://github.com/jordanlambrecht/tracker-tracker/commit/ff27517304598d9ebab0bb2ed7bc1053e75dd0c7))
-- simplify database query ([44de4aa](https://github.com/jordanlambrecht/tracker-tracker/commit/44de4aaed114048bfd82374e8fa800d4eeb6e311))
-- split authenticated pages into server and client components ([246287a](https://github.com/jordanlambrecht/tracker-tracker/commit/246287a16a0180c23efefebef7ea6d27a03b5f74))
-- update dismissAllAlerts logic to use persistDismiss ([411e98e](https://github.com/jordanlambrecht/tracker-tracker/commit/411e98e4fd4a791fd4355e64d1dcf86917597a0f))
-- use shared detection functions in dashboard alerts and tracker status ([04aca35](https://github.com/jordanlambrecht/tracker-tracker/commit/04aca35e6d8c37e20f47f49d3604911c047b281e))
-
-## [2.1.1](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.1.0...v2.1.1) (2026-03-18)
-
-## [2.1.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v2.0.2...v2.1.0) (2026-03-18)
-
-## [2.0.2](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.11.3...v2.0.2) (2026-03-18)
-
-### Features
+* **trackers:** details for digitalcore and luminarr (thanks @DGeyzer)
 
-- add boot-time scheduler recovery ([b1b1499](https://github.com/jordanlambrecht/tracker-tracker/commit/b1b1499d4cce5cfd3a621c9023ffd1f47c04322f))
-- add client IP logging for auth routes ([9442b62](https://github.com/jordanlambrecht/tracker-tracker/commit/9442b62d50a43f584f6d733ec7a0731d2bbf44ff))
-- add HKDF wrapping key and scheduler key store ([6e579c1](https://github.com/jordanlambrecht/tracker-tracker/commit/6e579c136efab3811e3a074f4a463b46588f9be7))
-- add optional BASE_URL env var with startup validation ([df1ff90](https://github.com/jordanlambrecht/tracker-tracker/commit/df1ff90e12e53d93ec13790ca5ae20f71524ba2a))
-- add per-tracker poll failure circuit breaker ([f57ab8b](https://github.com/jordanlambrecht/tracker-tracker/commit/f57ab8bed174aa73f6a054c44178febba61e0068))
-- add poll-paused alert type and paused health status ([a159abc](https://github.com/jordanlambrecht/tracker-tracker/commit/a159abc22cbee2df290861977ad373571d25a1f9))
-- add resume endpoint and serialize circuit breaker state ([205a805](https://github.com/jordanlambrecht/tracker-tracker/commit/205a805983107b06b1fe4757be609e098f5892a3))
-- add resume UI for paused trackers ([5ca9d8a](https://github.com/jordanlambrecht/tracker-tracker/commit/5ca9d8a625a7b70f07152e59c34cab07f09f27d0))
-- add webhooks coming-soon placeholder to settings ([5cddf82](https://github.com/jordanlambrecht/tracker-tracker/commit/5cddf826edc04cc88b199229283bcd5ad9c37751))
-- clear scheduler key on lockdown, nuke, password change, and restore ([493686e](https://github.com/jordanlambrecht/tracker-tracker/commit/493686ebf1054d146fb96e101e80204213c9d67b))
-- migrate alert dismissals to database, add system alerts ([8e85869](https://github.com/jordanlambrecht/tracker-tracker/commit/8e85869786909ebcf52c80ed3cd9f686f201e5cd))
-- persist scheduler key on login, keep running through logout ([eca1cad](https://github.com/jordanlambrecht/tracker-tracker/commit/eca1cad3ff7d7ef86cae43876e99b5cb1f75d9d9))
-- postgresql 18 infrastructure with migration script ([4178cad](https://github.com/jordanlambrecht/tracker-tracker/commit/4178cad4d78dc210323850e5623ebc7b16505cb0))
+## [2.7.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.7.1) (2026-03-31)
 
 ### Bug Fixes
 
-- add icons metadata for favicon ([d048355](https://github.com/jordanlambrecht/tracker-tracker/commit/d04835500a5d8071215a3613d678c1aaba51c7cd))
-- biome filter for noImportantStyles ([ae2fd08](https://github.com/jordanlambrecht/tracker-tracker/commit/ae2fd08b542a2c87cd080ce59dffe8e47ffcaace))
-- hopefully fixed un/pw field flashing on login screen ([2482473](https://github.com/jordanlambrecht/tracker-tracker/commit/2482473b950519f9bffe6cb459ec82f3bb2a9a73))
-
-### Performance
-
-- add database indexes, column type improvements, and connection pool tuning ([c949145](https://github.com/jordanlambrecht/tracker-tracker/commit/c949145f502fe6e549bc060e15af3f2f33eb59ca))
-- distinct on query, column projections, batch inserts, jsonb/array cleanup ([f5cc7ca](https://github.com/jordanlambrecht/tracker-tracker/commit/f5cc7ca22d4c72740f627f321c0258abbd4fa96c))
-
-### Refactoring
+* minor stuff
 
-- centralize localStorage keys into storage-keys.ts ([501288e](https://github.com/jordanlambrecht/tracker-tracker/commit/501288e6bd5a5c1e3d0d9f0d2bffc32fd16ffdcb))
-- consolidated the tag groups and download clients tabs in app settings ([41e1958](https://github.com/jordanlambrecht/tracker-tracker/commit/41e19583077fefe49a928c67824d64e646180a9f))
-- extract scrubObject to shared utility for tests ([dd821d3](https://github.com/jordanlambrecht/tracker-tracker/commit/dd821d3681810b79c2bd923c82e319ef220e10ae))
-- implement HKDF for session key derivation ([f38bccd](https://github.com/jordanlambrecht/tracker-tracker/commit/f38bccdb5043c643dc5d773a0b45396852369235))
-- standardize chart helpers, imports, and axis labels ([b55f0df](https://github.com/jordanlambrecht/tracker-tracker/commit/b55f0dfdcb27d5af1a203b11e8e5e162fcb8e079))
-- use HKDF for session key derivation ([d4a9001](https://github.com/jordanlambrecht/tracker-tracker/commit/d4a9001bd794e7c9a15f5e0fe085eddfd4ce84df))
-- use optional chaining ([c260fe6](https://github.com/jordanlambrecht/tracker-tracker/commit/c260fe64b5cab12e29154cf397789cfcfd2cec88))
-
-## [2.0.1](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.11.3...v2.0.1) (2026-03-18)
+## [2.7.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.7.0) (2026-03-31)
 
 ### Features
 
-- add boot-time scheduler recovery ([b1b1499](https://github.com/jordanlambrecht/tracker-tracker/commit/b1b1499d4cce5cfd3a621c9023ffd1f47c04322f))
-- add client IP logging for auth routes ([9442b62](https://github.com/jordanlambrecht/tracker-tracker/commit/9442b62d50a43f584f6d733ec7a0731d2bbf44ff))
-- add HKDF wrapping key and scheduler key store ([6e579c1](https://github.com/jordanlambrecht/tracker-tracker/commit/6e579c136efab3811e3a074f4a463b46588f9be7))
-- add optional BASE_URL env var with startup validation ([df1ff90](https://github.com/jordanlambrecht/tracker-tracker/commit/df1ff90e12e53d93ec13790ca5ae20f71524ba2a))
-- add per-tracker poll failure circuit breaker ([f57ab8b](https://github.com/jordanlambrecht/tracker-tracker/commit/f57ab8bed174aa73f6a054c44178febba61e0068))
-- add poll-paused alert type and paused health status ([a159abc](https://github.com/jordanlambrecht/tracker-tracker/commit/a159abc22cbee2df290861977ad373571d25a1f9))
-- add resume endpoint and serialize circuit breaker state ([205a805](https://github.com/jordanlambrecht/tracker-tracker/commit/205a805983107b06b1fe4757be609e098f5892a3))
-- add resume UI for paused trackers ([5ca9d8a](https://github.com/jordanlambrecht/tracker-tracker/commit/5ca9d8a625a7b70f07152e59c34cab07f09f27d0))
-- add webhooks coming-soon placeholder to settings ([5cddf82](https://github.com/jordanlambrecht/tracker-tracker/commit/5cddf826edc04cc88b199229283bcd5ad9c37751))
-- clear scheduler key on lockdown, nuke, password change, and restore ([493686e](https://github.com/jordanlambrecht/tracker-tracker/commit/493686ebf1054d146fb96e101e80204213c9d67b))
-- migrate alert dismissals to database, add system alerts ([8e85869](https://github.com/jordanlambrecht/tracker-tracker/commit/8e85869786909ebcf52c80ed3cd9f686f201e5cd))
-- persist scheduler key on login, keep running through logout ([eca1cad](https://github.com/jordanlambrecht/tracker-tracker/commit/eca1cad3ff7d7ef86cae43876e99b5cb1f75d9d9))
-- postgresql 18 infrastructure with migration script ([4178cad](https://github.com/jordanlambrecht/tracker-tracker/commit/4178cad4d78dc210323850e5623ebc7b16505cb0))
+* add AvistaZ slots for activity and badges
+* add ConfirmRemove and SaveDiscardBar components
+* add download_disabled + vip_expiring for AvistaZ plat, rename mamContext to platformContext
+* add hint support to Input component and update BackupsSection to use it
+* add lazy loading support to Card component
+* add searchParams handling and initialTab prop to TrackerDetailPage
+* add support for luminarr and darkPeers ( and)
+* added confirmAction ui comp
+* added support for the avistaz network
+* beefed up Dialog component
+* extend change-password API to handle notification target re-encryption
+* implement SectionToggle and ProgressWidget components
+* implement useActionStatus hook for managing action states
+* **mam:** add bonus cap, VIP expiry, unsatisfied limit, and active HnR notifications
+* **mam:** add Mousehole integration
+* **mam:** add MyAnonaMouse adapter
+* **mam:** add platform UI with health overview, badges, and FL Wedges chart
+* new formatSpeed formatter
+* new heatmap in torrent fleet on dashboard!
+* new info tip icon system thing
+* new notice component
+* new skeleton loaders
+* new useAnimatedPresence and useEscapeKey hooks
+* parseIntClamped
+* refactor dirty detection to buildPatch function
+* removed gravatar fluff
+* **security:** enhance security audit checks and improve vulnerability reporting
+* **settings:** display database size
+* **trackers:** added support for DarkPeers (, thanks @DGeyzer)
+* **trackers:** added support for DarkPeers (, thanks @DGeyzer)
+* useCrudCard hook
 
 ### Bug Fixes
 
-- add icons metadata for favicon ([d048355](https://github.com/jordanlambrecht/tracker-tracker/commit/d04835500a5d8071215a3613d678c1aaba51c7cd))
-- biome filter for noImportantStyles ([ae2fd08](https://github.com/jordanlambrecht/tracker-tracker/commit/ae2fd08b542a2c87cd080ce59dffe8e47ffcaace))
-- hopefully fixed un/pw field flashing on login screen ([2482473](https://github.com/jordanlambrecht/tracker-tracker/commit/2482473b950519f9bffe6cb459ec82f3bb2a9a73))
-
-### Performance
-
-- add database indexes, column type improvements, and connection pool tuning ([c949145](https://github.com/jordanlambrecht/tracker-tracker/commit/c949145f502fe6e549bc060e15af3f2f33eb59ca))
-- distinct on query, column projections, batch inserts, jsonb/array cleanup ([f5cc7ca](https://github.com/jordanlambrecht/tracker-tracker/commit/f5cc7ca22d4c72740f627f321c0258abbd4fa96c))
-
-### Refactoring
-
-- centralize localStorage keys into storage-keys.ts ([501288e](https://github.com/jordanlambrecht/tracker-tracker/commit/501288e6bd5a5c1e3d0d9f0d2bffc32fd16ffdcb))
-- consolidated the tag groups and download clients tabs in app settings ([41e1958](https://github.com/jordanlambrecht/tracker-tracker/commit/41e19583077fefe49a928c67824d64e646180a9f))
-- extract scrubObject to shared utility for tests ([dd821d3](https://github.com/jordanlambrecht/tracker-tracker/commit/dd821d3681810b79c2bd923c82e319ef220e10ae))
-- implement HKDF for session key derivation ([f38bccd](https://github.com/jordanlambrecht/tracker-tracker/commit/f38bccdb5043c643dc5d773a0b45396852369235))
-- standardize chart helpers, imports, and axis labels ([b55f0df](https://github.com/jordanlambrecht/tracker-tracker/commit/b55f0dfdcb27d5af1a203b11e8e5e162fcb8e079))
-- use HKDF for session key derivation ([d4a9001](https://github.com/jordanlambrecht/tracker-tracker/commit/d4a9001bd794e7c9a15f5e0fe085eddfd4ce84df))
-- use optional chaining ([c260fe6](https://github.com/jordanlambrecht/tracker-tracker/commit/c260fe64b5cab12e29154cf397789cfcfd2cec88))
-
-## [2.0.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.11.3...v2.0.0) (2026-03-18)
+*  avistaZ platform-based trackers not fetching user avatars
+* add notice for TOTP disabled during backup restore
+* add tabIndex to InfoTip
+* **backups:** enforce maximum length for backup password to 128 characters
+* bad styling
+* better error handling for setup response messages
+* boundaryGap bug on charts
+* chart content not hiding on card collapse
+* don't show editable user joined date for avistaz platform
+* duplicate TrackerSummary export
+* enforce character limits on proxy username, password, and mousehole URL
+* ensure backfill flag is set after successful checkpoint backfill
+* ensure default value reference is used in useLocalStorage hook
+* ensure loading state is reset after API calls in AddTrackerDialog
+* error logging for BigInt conversion failures
+* error logging for BigInt conversion failures in computeTodayAtAGlance
+* **errors:** improve error handling and logging for backup and tracker operations
+* improve error handling for decryption failures in fetchAndMergeTorrents
+* improve error handling in backup password operations
+* json parsing error
+* make footer logo load eagerly
+* make nextjs happy with image components
+* make validateHttpUrl function use dynamic error labels
+* minor placeholder bug
+* normalize tracker tags to lowercase
+* oops
+* oops 2
+* optimize database queries
+* optimize deletion of old checkpoints
+* optimize torrent checkpoint insertion by batching database writes
+* persist showTodayAtAGlance setting, serialize dates
+* remove unused import
+* removed unnecessary lazy loading from Elder Torrents section
+* replace useEffect with useLayoutEffect
+* resolve lint warnings, Copilot review issues, remove dead code, and harden error handling
+* simplify shouldMount logic in ChartCard component
+* unify error handling in SetupForm
+* update drizzle-kit, drizzle-orm, and postgres to specific versions in Dockerfile
+* update VALID_PLATFORMS to use VALID_PLATFORM_TYPES constant
+* use EMPTY_TRACKERS and EMPTY_TRACKER_TAGS constants
+* use localDateStr for cutoff date in pruneOldCheckpoints function
+* wrong Content-Type for cached avatar images
+* x-axis was showing wrong values, zoom bug
+
+## [2.5.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.5.0) (2026-03-26)
 
 ### Features
 
-- add boot-time scheduler recovery ([b1b1499](https://github.com/jordanlambrecht/tracker-tracker/commit/b1b1499d4cce5cfd3a621c9023ffd1f47c04322f))
-- add client IP logging for auth routes ([9442b62](https://github.com/jordanlambrecht/tracker-tracker/commit/9442b62d50a43f584f6d733ec7a0731d2bbf44ff))
-- add HKDF wrapping key and scheduler key store ([6e579c1](https://github.com/jordanlambrecht/tracker-tracker/commit/6e579c136efab3811e3a074f4a463b46588f9be7))
-- add optional BASE_URL env var with startup validation ([df1ff90](https://github.com/jordanlambrecht/tracker-tracker/commit/df1ff90e12e53d93ec13790ca5ae20f71524ba2a))
-- add per-tracker poll failure circuit breaker ([f57ab8b](https://github.com/jordanlambrecht/tracker-tracker/commit/f57ab8bed174aa73f6a054c44178febba61e0068))
-- add poll-paused alert type and paused health status ([a159abc](https://github.com/jordanlambrecht/tracker-tracker/commit/a159abc22cbee2df290861977ad373571d25a1f9))
-- add resume endpoint and serialize circuit breaker state ([205a805](https://github.com/jordanlambrecht/tracker-tracker/commit/205a805983107b06b1fe4757be609e098f5892a3))
-- add resume UI for paused trackers ([5ca9d8a](https://github.com/jordanlambrecht/tracker-tracker/commit/5ca9d8a625a7b70f07152e59c34cab07f09f27d0))
-- add webhooks coming-soon placeholder to settings ([5cddf82](https://github.com/jordanlambrecht/tracker-tracker/commit/5cddf826edc04cc88b199229283bcd5ad9c37751))
-- clear scheduler key on lockdown, nuke, password change, and restore ([493686e](https://github.com/jordanlambrecht/tracker-tracker/commit/493686ebf1054d146fb96e101e80204213c9d67b))
-- migrate alert dismissals to database, add system alerts ([8e85869](https://github.com/jordanlambrecht/tracker-tracker/commit/8e85869786909ebcf52c80ed3cd9f686f201e5cd))
-- persist scheduler key on login, keep running through logout ([eca1cad](https://github.com/jordanlambrecht/tracker-tracker/commit/eca1cad3ff7d7ef86cae43876e99b5cb1f75d9d9))
-- postgresql 18 infrastructure with migration script ([4178cad](https://github.com/jordanlambrecht/tracker-tracker/commit/4178cad4d78dc210323850e5623ebc7b16505cb0))
+* **dashboard:** add Today At A Glance server logic, checkpoints, and deep poll fixes
+* **dashboard:** add Today At A Glance UI
+* **schema:** add daily checkpoint tables and TodayAtAGlance types
 
 ### Bug Fixes
 
-- add icons metadata for favicon ([d048355](https://github.com/jordanlambrecht/tracker-tracker/commit/d04835500a5d8071215a3613d678c1aaba51c7cd))
-- biome filter for noImportantStyles ([ae2fd08](https://github.com/jordanlambrecht/tracker-tracker/commit/ae2fd08b542a2c87cd080ce59dffe8e47ffcaace))
-- hopefully fixed un/pw field flashing on login screen ([2482473](https://github.com/jordanlambrecht/tracker-tracker/commit/2482473b950519f9bffe6cb459ec82f3bb2a9a73))
-
-### Performance
-
-- add database indexes, column type improvements, and connection pool tuning ([c949145](https://github.com/jordanlambrecht/tracker-tracker/commit/c949145f502fe6e549bc060e15af3f2f33eb59ca))
-- distinct on query, column projections, batch inserts, jsonb/array cleanup ([f5cc7ca](https://github.com/jordanlambrecht/tracker-tracker/commit/f5cc7ca22d4c72740f627f321c0258abbd4fa96c))
+* **api:** improve session expiration error message
+* **auth:** return 401 on stale session instead of misleading credential errors
+* **Icons:** update DownloadArrowIcon stroke width
+* **ui:** prevent StatCard DOM prop leak
 
-### Refactoring
-
-- centralize localStorage keys into storage-keys.ts ([501288e](https://github.com/jordanlambrecht/tracker-tracker/commit/501288e6bd5a5c1e3d0d9f0d2bffc32fd16ffdcb))
-- consolidated the tag groups and download clients tabs in app settings ([41e1958](https://github.com/jordanlambrecht/tracker-tracker/commit/41e19583077fefe49a928c67824d64e646180a9f))
-- extract scrubObject to shared utility for tests ([dd821d3](https://github.com/jordanlambrecht/tracker-tracker/commit/dd821d3681810b79c2bd923c82e319ef220e10ae))
-- implement HKDF for session key derivation ([f38bccd](https://github.com/jordanlambrecht/tracker-tracker/commit/f38bccdb5043c643dc5d773a0b45396852369235))
-- standardize chart helpers, imports, and axis labels ([b55f0df](https://github.com/jordanlambrecht/tracker-tracker/commit/b55f0dfdcb27d5af1a203b11e8e5e162fcb8e079))
-- use HKDF for session key derivation ([d4a9001](https://github.com/jordanlambrecht/tracker-tracker/commit/d4a9001bd794e7c9a15f5e0fe085eddfd4ce84df))
-- use optional chaining ([c260fe6](https://github.com/jordanlambrecht/tracker-tracker/commit/c260fe64b5cab12e29154cf397789cfcfd2cec88))
-
-## [1.11.3](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.11.3) (2026-03-16)
+## [2.4.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.4.2) (2026-03-25)
 
 ### Features
 
-- add logging for login, logout, and TOTP verification events ([4bce6da](https://github.com/jordanlambrecht/tracker-tracker/commit/4bce6da45face537047df79d394686af49398360))
-- enhance api error handling for multiple adapters ([1891cef](https://github.com/jordanlambrecht/tracker-tracker/commit/1891cef6735e7ef0cf28bed1448a1ba0f35fb0da))
-- ip ban check for tracker api calls ([39e9554](https://github.com/jordanlambrecht/tracker-tracker/commit/39e95548f89689b17eb0308255c9d1c204ac3254))
-- log auth events for login, TOTP, and logout ([de3c0ce](https://github.com/jordanlambrecht/tracker-tracker/commit/de3c0cec82bc5d05444fb3e3a804c4cc1878e2ba))
-- show last seen and error state on download client cards ([#35](https://github.com/jordanlambrecht/tracker-tracker/issues/35)) ([36c07e6](https://github.com/jordanlambrecht/tracker-tracker/commit/36c07e689fc93fd7f1d9589d0f72bd506102e92c))
-- show per-endpoint debug info in tracker debug poll ([f088582](https://github.com/jordanlambrecht/tracker-tracker/commit/f088582119b1a9c0bb4e40c3088ecaf05aa12dbb))
-- update UploadPolarChart with html escaping ([9720759](https://github.com/jordanlambrecht/tracker-tracker/commit/972075966b8ab6e3d092c06c725d407857c4fccc))
+* add development image to docker hub
 
 ### Bug Fixes
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** add tsx as devDep and use pnpm exec instead of npx ([e9c25eb](https://github.com/jordanlambrecht/tracker-tracker/commit/e9c25eb7d0e4431f4a897c55e277eb6eaed5afed))
-- **ci:** exclude template files from tracker barrel validation ([7f6d4f4](https://github.com/jordanlambrecht/tracker-tracker/commit/7f6d4f4f17ed4e893461def6ded4f12b64482658))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- disable clients with cleared credentials on restore ([14ee232](https://github.com/jordanlambrecht/tracker-tracker/commit/14ee232e1800e6e46ed89f57dcfb4a0e3a4f50a2))
-- favicon wasnt showing in production ([d21622d](https://github.com/jordanlambrecht/tracker-tracker/commit/d21622d34063a0d0f88ff5fadcc335ac897e926f))
-- override browser autofill background styles for better UI consistency ([999ca5a](https://github.com/jordanlambrecht/tracker-tracker/commit/999ca5ab9326cdb40ba7a6a1c1ae74ae932ed626))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- sanitize error message in backup restore response ([b0fabc6](https://github.com/jordanlambrecht/tracker-tracker/commit/b0fabc62bfaa3ed90d82cdd0ac0c6e8f36a12f5d))
-- sec audit checks catch block for ignore comments ([#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45)) ([1504166](https://github.com/jordanlambrecht/tracker-tracker/commit/1504166aa22db59f4de7b400ce2e22d93088f33f))
-- security audit now checks catch block body for ignore comments. Closes [#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45) ([19f1cb7](https://github.com/jordanlambrecht/tracker-tracker/commit/19f1cb74258f923b1960b01de40c800ada840e8e))
-- suppress 1Password autofill on non-login password fields ([c987318](https://github.com/jordanlambrecht/tracker-tracker/commit/c987318b2b1ae3d87a9d7a9de339d574f8a08240))
-- update gazelleAuthStyle to use token ([96ca1f7](https://github.com/jordanlambrecht/tracker-tracker/commit/96ca1f78e31dcd6cb922fef39b8ce9824c806129))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-- update PUBLIC_PREFIX to include additional paths for image loading ([8d8709a](https://github.com/jordanlambrecht/tracker-tracker/commit/8d8709acfb5c5e8c50baf90b9ef7fb6b562b2b1e))
-- validate and trim inputs on tracker test and create routes ([0c9e27f](https://github.com/jordanlambrecht/tracker-tracker/commit/0c9e27f487d707da9ddcfd9c5f912bc7cbb47cf5))
-- wrap scrub-and-delete in a transaction ([5378274](https://github.com/jordanlambrecht/tracker-tracker/commit/5378274637850e65c00c9a53c78f8a4ff115e59d))
-
-### Refactoring
-
-- replace auto-wipe with configurable account lockout ([1bab0c5](https://github.com/jordanlambrecht/tracker-tracker/commit/1bab0c5086cdd74c4bb8a1eea93adaf6ce4e0845))
-
-## [1.11.2](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.11.2) (2026-03-16)
+* **auth:** decouple cookie secure flag from node_env for self-hosted http deployments. Closes
+* **Dockerfile:** update package.json for drizzle-kit with esbuild overrides
+* preload fleet dashboard tab
+
+## [2.4.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.4.0) (2026-03-23)
 
 ### Features
 
-- add logging for login, logout, and TOTP verification events ([4bce6da](https://github.com/jordanlambrecht/tracker-tracker/commit/4bce6da45face537047df79d394686af49398360))
-- enhance api error handling for multiple adapters ([1891cef](https://github.com/jordanlambrecht/tracker-tracker/commit/1891cef6735e7ef0cf28bed1448a1ba0f35fb0da))
-- ip ban check for tracker api calls ([39e9554](https://github.com/jordanlambrecht/tracker-tracker/commit/39e95548f89689b17eb0308255c9d1c204ac3254))
-- log auth events for login, TOTP, and logout ([de3c0ce](https://github.com/jordanlambrecht/tracker-tracker/commit/de3c0cec82bc5d05444fb3e3a804c4cc1878e2ba))
-- show last seen and error state on download client cards ([#35](https://github.com/jordanlambrecht/tracker-tracker/issues/35)) ([36c07e6](https://github.com/jordanlambrecht/tracker-tracker/commit/36c07e689fc93fd7f1d9589d0f72bd506102e92c))
-- show per-endpoint debug info in tracker debug poll ([f088582](https://github.com/jordanlambrecht/tracker-tracker/commit/f088582119b1a9c0bb4e40c3088ecaf05aa12dbb))
-- update UploadPolarChart with html escaping ([9720759](https://github.com/jordanlambrecht/tracker-tracker/commit/972075966b8ab6e3d092c06c725d407857c4fccc))
+* add alertSlideIn keyframe animation
+* add fetchTrackerStats for future live transit paper data
+* add GitHub Actions workflow for building and pushing development Docker image
+* add per-tracker pause polling
+* add system events viewer and log management
+* added Dialog and CopyButton components
+* remote image upload
+* **ui:** add pause/resume button
+* **ui:** lazy-load chart sections, prefetch sidebar links, and fix scroll-to-top on navigation
 
 ### Bug Fixes
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** add tsx as devDep and use pnpm exec instead of npx ([e9c25eb](https://github.com/jordanlambrecht/tracker-tracker/commit/e9c25eb7d0e4431f4a897c55e277eb6eaed5afed))
-- **ci:** exclude template files from tracker barrel validation ([7f6d4f4](https://github.com/jordanlambrecht/tracker-tracker/commit/7f6d4f4f17ed4e893461def6ded4f12b64482658))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- disable clients with cleared credentials on restore ([14ee232](https://github.com/jordanlambrecht/tracker-tracker/commit/14ee232e1800e6e46ed89f57dcfb4a0e3a4f50a2))
-- favicon wasnt showing in production ([d21622d](https://github.com/jordanlambrecht/tracker-tracker/commit/d21622d34063a0d0f88ff5fadcc335ac897e926f))
-- override browser autofill background styles for better UI consistency ([999ca5a](https://github.com/jordanlambrecht/tracker-tracker/commit/999ca5ab9326cdb40ba7a6a1c1ae74ae932ed626))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- sanitize error message in backup restore response ([b0fabc6](https://github.com/jordanlambrecht/tracker-tracker/commit/b0fabc62bfaa3ed90d82cdd0ac0c6e8f36a12f5d))
-- sec audit checks catch block for ignore comments ([#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45)) ([1504166](https://github.com/jordanlambrecht/tracker-tracker/commit/1504166aa22db59f4de7b400ce2e22d93088f33f))
-- security audit now checks catch block body for ignore comments. Closes [#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45) ([19f1cb7](https://github.com/jordanlambrecht/tracker-tracker/commit/19f1cb74258f923b1960b01de40c800ada840e8e))
-- suppress 1Password autofill on non-login password fields ([c987318](https://github.com/jordanlambrecht/tracker-tracker/commit/c987318b2b1ae3d87a9d7a9de339d574f8a08240))
-- update gazelleAuthStyle to use token ([96ca1f7](https://github.com/jordanlambrecht/tracker-tracker/commit/96ca1f78e31dcd6cb922fef39b8ce9824c806129))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-- update PUBLIC_PREFIX to include additional paths for image loading ([8d8709a](https://github.com/jordanlambrecht/tracker-tracker/commit/8d8709acfb5c5e8c50baf90b9ef7fb6b562b2b1e))
-- validate and trim inputs on tracker test and create routes ([0c9e27f](https://github.com/jordanlambrecht/tracker-tracker/commit/0c9e27f487d707da9ddcfd9c5f912bc7cbb47cf5))
-
-### Refactoring
-
-- replace auto-wipe with configurable account lockout ([1bab0c5](https://github.com/jordanlambrecht/tracker-tracker/commit/1bab0c5086cdd74c4bb8a1eea93adaf6ce4e0845))
-
-## [1.11.1](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.11.1) (2026-03-16)
+* added size props to dialog comp
+* **api:** orpheus was not matching seeding/leeching to response
+* better regex for splitting comparison values in timing safe check
+* convert bold numbered rules to markdown list items
+* deploy issues
+* resolve biome lint warnings
+* round dashOffset to 2 decimal places
+* **trackers:** markdown rendering
+* update notificationDeliveryState schema to add foreign key constraint for targetId
+* update timestamp format
+* update type imports for CollapsibleCard
+* update workflow triggers to include development branch for pull requests
+* wrong postgres setup in docker-compose
+
+## [2.2.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.2.0) (2026-03-20)
 
 ### Features
 
-- add logging for login, logout, and TOTP verification events ([4bce6da](https://github.com/jordanlambrecht/tracker-tracker/commit/4bce6da45face537047df79d394686af49398360))
-- enhance api error handling for multiple adapters ([1891cef](https://github.com/jordanlambrecht/tracker-tracker/commit/1891cef6735e7ef0cf28bed1448a1ba0f35fb0da))
-- ip ban check for tracker api calls ([39e9554](https://github.com/jordanlambrecht/tracker-tracker/commit/39e95548f89689b17eb0308255c9d1c204ac3254))
-- log auth events for login, TOTP, and logout ([de3c0ce](https://github.com/jordanlambrecht/tracker-tracker/commit/de3c0cec82bc5d05444fb3e3a804c4cc1878e2ba))
-- show last seen and error state on download client cards ([#35](https://github.com/jordanlambrecht/tracker-tracker/issues/35)) ([36c07e6](https://github.com/jordanlambrecht/tracker-tracker/commit/36c07e689fc93fd7f1d9589d0f72bd506102e92c))
-- show per-endpoint debug info in tracker debug poll ([f088582](https://github.com/jordanlambrecht/tracker-tracker/commit/f088582119b1a9c0bb4e40c3088ecaf05aa12dbb))
-- update UploadPolarChart with html escaping ([9720759](https://github.com/jordanlambrecht/tracker-tracker/commit/972075966b8ab6e3d092c06c725d407857c4fccc))
+* add notification delivery pipeline with circuit breaker and cooldowns
+* add notification target CRUD API routes
+* add notificationTargets and notificationDeliveryState schema tables
+* add scoped error boundary for tracker detail page
+* add server-data module with secure column projections
+* add shared event detection functions and notification type definitions
+* docs support for tooltips
+* **docs:** brand spankin' new documentation site and integration
+* expand TrackerLatestStats with bufferBytes, hitAndRuns, seedbonus, shareScore
+* integrate notification targets with backup, restore, and nuke
+* replace manual polling with TanStack Query
+* wire notification dispatch into tracker polling scheduler
 
-### Bug Fixes
+## [2.1.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.1.1) (2026-03-18)
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** add tsx as devDep and use pnpm exec instead of npx ([e9c25eb](https://github.com/jordanlambrecht/tracker-tracker/commit/e9c25eb7d0e4431f4a897c55e277eb6eaed5afed))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- disable clients with cleared credentials on restore ([14ee232](https://github.com/jordanlambrecht/tracker-tracker/commit/14ee232e1800e6e46ed89f57dcfb4a0e3a4f50a2))
-- favicon wasnt showing in production ([d21622d](https://github.com/jordanlambrecht/tracker-tracker/commit/d21622d34063a0d0f88ff5fadcc335ac897e926f))
-- override browser autofill background styles for better UI consistency ([999ca5a](https://github.com/jordanlambrecht/tracker-tracker/commit/999ca5ab9326cdb40ba7a6a1c1ae74ae932ed626))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- sanitize error message in backup restore response ([b0fabc6](https://github.com/jordanlambrecht/tracker-tracker/commit/b0fabc62bfaa3ed90d82cdd0ac0c6e8f36a12f5d))
-- sec audit checks catch block for ignore comments ([#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45)) ([1504166](https://github.com/jordanlambrecht/tracker-tracker/commit/1504166aa22db59f4de7b400ce2e22d93088f33f))
-- security audit now checks catch block body for ignore comments. Closes [#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45) ([19f1cb7](https://github.com/jordanlambrecht/tracker-tracker/commit/19f1cb74258f923b1960b01de40c800ada840e8e))
-- suppress 1Password autofill on non-login password fields ([c987318](https://github.com/jordanlambrecht/tracker-tracker/commit/c987318b2b1ae3d87a9d7a9de339d574f8a08240))
-- update gazelleAuthStyle to use token ([96ca1f7](https://github.com/jordanlambrecht/tracker-tracker/commit/96ca1f78e31dcd6cb922fef39b8ce9824c806129))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-- update PUBLIC_PREFIX to include additional paths for image loading ([8d8709a](https://github.com/jordanlambrecht/tracker-tracker/commit/8d8709acfb5c5e8c50baf90b9ef7fb6b562b2b1e))
-- validate and trim inputs on tracker test and create routes ([0c9e27f](https://github.com/jordanlambrecht/tracker-tracker/commit/0c9e27f487d707da9ddcfd9c5f912bc7cbb47cf5))
+## [2.1.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.1.0) (2026-03-18)
 
-### Refactoring
+## [2.0.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.0.2) (2026-03-18)
 
-- replace auto-wipe with configurable account lockout ([1bab0c5](https://github.com/jordanlambrecht/tracker-tracker/commit/1bab0c5086cdd74c4bb8a1eea93adaf6ce4e0845))
+## [2.0.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.0.1) (2026-03-18)
 
-## [1.11.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.11.0) (2026-03-16)
+## [2.0.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v2.0.0) (2026-03-18)
 
 ### Features
 
-- add logging for login, logout, and TOTP verification events ([4bce6da](https://github.com/jordanlambrecht/tracker-tracker/commit/4bce6da45face537047df79d394686af49398360))
-- enhance api error handling for multiple adapters ([1891cef](https://github.com/jordanlambrecht/tracker-tracker/commit/1891cef6735e7ef0cf28bed1448a1ba0f35fb0da))
-- ip ban check for tracker api calls ([39e9554](https://github.com/jordanlambrecht/tracker-tracker/commit/39e95548f89689b17eb0308255c9d1c204ac3254))
-- log auth events for login, TOTP, and logout ([de3c0ce](https://github.com/jordanlambrecht/tracker-tracker/commit/de3c0cec82bc5d05444fb3e3a804c4cc1878e2ba))
-- show last seen and error state on download client cards ([#35](https://github.com/jordanlambrecht/tracker-tracker/issues/35)) ([36c07e6](https://github.com/jordanlambrecht/tracker-tracker/commit/36c07e689fc93fd7f1d9589d0f72bd506102e92c))
-- show per-endpoint debug info in tracker debug poll ([f088582](https://github.com/jordanlambrecht/tracker-tracker/commit/f088582119b1a9c0bb4e40c3088ecaf05aa12dbb))
-- update UploadPolarChart with html escaping ([9720759](https://github.com/jordanlambrecht/tracker-tracker/commit/972075966b8ab6e3d092c06c725d407857c4fccc))
+* add boot-time scheduler recovery
+* add client IP logging for auth routes
+* add HKDF wrapping key and scheduler key store
+* add optional BASE_URL env var with startup validation
+* add per-tracker poll failure circuit breaker
+* add poll-paused alert type and paused health status
+* add resume endpoint and serialize circuit breaker state
+* add resume UI for paused trackers
+* add webhooks coming-soon placeholder to settings
+* clear scheduler key on lockdown, nuke, password change, and restore
+* migrate alert dismissals to database, add system alerts
+* persist scheduler key on login, keep running through logout
+* postgresql 18 infrastructure with migration script
 
 ### Bug Fixes
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- disable clients with cleared credentials on restore ([14ee232](https://github.com/jordanlambrecht/tracker-tracker/commit/14ee232e1800e6e46ed89f57dcfb4a0e3a4f50a2))
-- favicon wasnt showing in production ([d21622d](https://github.com/jordanlambrecht/tracker-tracker/commit/d21622d34063a0d0f88ff5fadcc335ac897e926f))
-- override browser autofill background styles for better UI consistency ([999ca5a](https://github.com/jordanlambrecht/tracker-tracker/commit/999ca5ab9326cdb40ba7a6a1c1ae74ae932ed626))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- sanitize error message in backup restore response ([b0fabc6](https://github.com/jordanlambrecht/tracker-tracker/commit/b0fabc62bfaa3ed90d82cdd0ac0c6e8f36a12f5d))
-- sec audit checks catch block for ignore comments ([#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45)) ([1504166](https://github.com/jordanlambrecht/tracker-tracker/commit/1504166aa22db59f4de7b400ce2e22d93088f33f))
-- security audit now checks catch block body for ignore comments. Closes [#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45) ([19f1cb7](https://github.com/jordanlambrecht/tracker-tracker/commit/19f1cb74258f923b1960b01de40c800ada840e8e))
-- suppress 1Password autofill on non-login password fields ([c987318](https://github.com/jordanlambrecht/tracker-tracker/commit/c987318b2b1ae3d87a9d7a9de339d574f8a08240))
-- update gazelleAuthStyle to use token ([96ca1f7](https://github.com/jordanlambrecht/tracker-tracker/commit/96ca1f78e31dcd6cb922fef39b8ce9824c806129))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-- update PUBLIC_PREFIX to include additional paths for image loading ([8d8709a](https://github.com/jordanlambrecht/tracker-tracker/commit/8d8709acfb5c5e8c50baf90b9ef7fb6b562b2b1e))
-- validate and trim inputs on tracker test and create routes ([0c9e27f](https://github.com/jordanlambrecht/tracker-tracker/commit/0c9e27f487d707da9ddcfd9c5f912bc7cbb47cf5))
+* add icons metadata for favicon
+* biome filter for noImportantStyles
+* **ci:** add tsx as devDep and use pnpm exec instead of npx
+* **ci:** exclude template files from tracker barrel validation
+* hopefully fixed un/pw field flashing on login screen
+* wrap scrub-and-delete in a transaction
 
-### Refactoring
-
-- replace auto-wipe with configurable account lockout ([1bab0c5](https://github.com/jordanlambrecht/tracker-tracker/commit/1bab0c5086cdd74c4bb8a1eea93adaf6ce4e0845))
-
-## [1.10.4](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.10.4) (2026-03-16)
+## [1.11.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.11.0) (2026-03-16)
 
 ### Features
 
-- add logging for login, logout, and TOTP verification events ([4bce6da](https://github.com/jordanlambrecht/tracker-tracker/commit/4bce6da45face537047df79d394686af49398360))
+* add logging for login, logout, and TOTP verification events
+* enhance api error handling for multiple adapters
+* ip ban check for tracker api calls
+* log auth events for login, TOTP, and logout
+* show last seen and error state on download client cards ([#35](https://github.com/jordanlambrecht/tracker-tracker/issues/35))
+* show per-endpoint debug info in tracker debug poll
+* update UploadPolarChart with html escaping
 
 ### Bug Fixes
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-- update PUBLIC_PREFIX to include additional paths for image loading ([8d8709a](https://github.com/jordanlambrecht/tracker-tracker/commit/8d8709acfb5c5e8c50baf90b9ef7fb6b562b2b1e))
+* add --ignore-scripts option to pnpm prune in Dockerfile
+* disable clients with cleared credentials on restore
+* favicon wasnt showing in production
+* override browser autofill background styles for better UI consistency
+* sanitize error message in backup restore response
+* sec audit checks catch block for ignore comments ([#45](https://github.com/jordanlambrecht/tracker-tracker/issues/45))
+* security audit now checks catch block body for ignore comments. Closes
+* suppress 1Password autofill on non-login password fields
+* update gazelleAuthStyle to use token
+* update PUBLIC_PREFIX to include additional paths for image loading
+* validate and trim inputs on tracker test and create routes
 
-## [1.10.3](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.10.3) (2026-03-16)
+## [1.10.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.10.2) (2026-03-16)
 
 ### Bug Fixes
 
-- add --ignore-scripts option to pnpm prune in Dockerfile ([259ed39](https://github.com/jordanlambrecht/tracker-tracker/commit/259ed39e418080652e410227a227399c2444275c))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
+* update jsdom to v29.0.0 and dom-selector to v7.0.3
 
-## [1.10.2](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.10.2) (2026-03-16)
-
-### Bug Fixes
-
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- update jsdom to v29.0.0 and dom-selector to v7.0.3 ([6565f35](https://github.com/jordanlambrecht/tracker-tracker/commit/6565f355c5cf6a1bb792a76ee8ab3b955701d0ae))
-
-## [1.10.1](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.10.0...v1.10.1) (2026-03-16)
+## [1.10.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.10.1) (2026-03-16)
 
 ### Features
 
-- add area and totals modes to daily volume chart ([8c6636c](https://github.com/jordanlambrecht/tracker-tracker/commit/8c6636c3f0b0f99c6e88e47bba1f56aa92bb9983))
-- add cross-seed network, size scatter, and category breakdown to fleet dashboard ([7e6bd67](https://github.com/jordanlambrecht/tracker-tracker/commit/7e6bd67998b14e4c221a9b1a50f120631b22c847))
-- add sankey flow and parallel views to distribution chart ([58e2d7c](https://github.com/jordanlambrecht/tracker-tracker/commit/58e2d7c218dbb29743a94e0ea68954e752bede23))
-- add stacked and total view modes to comparison charts ([cdf0f73](https://github.com/jordanlambrecht/tracker-tracker/commit/cdf0f732a82c675c07fcdd21c334603bce937298))
-- add volume heatmap and calendar charts ([7848e89](https://github.com/jordanlambrecht/tracker-tracker/commit/7848e89ca8462afcb1fcc5808c817b5c0533d91d))
-- added logo to footer ([1270099](https://github.com/jordanlambrecht/tracker-tracker/commit/1270099c6ad49de2d09b0f6c768789b457e7c521))
-- added timestamp to dl client disconnect error ([0cfabe2](https://github.com/jordanlambrecht/tracker-tracker/commit/0cfabe26f4740ca8dd9e9cbef3c3e3b15be5818d))
-- auto-fill proxy port based on selected type in ProxySection ([0e2f30e](https://github.com/jordanlambrecht/tracker-tracker/commit/0e2f30efdfbe544924cb2d2b9c16282acc6e70ac))
-- encrypt scheduled and manual backups with stored password ([e514f9c](https://github.com/jordanlambrecht/tracker-tracker/commit/e514f9c5f8771690eb3ed6f623bf6881ab653a9e))
+* added logo to footer
+* auto-fill proxy port based on selected type in ProxySection
+* encrypt scheduled and manual backups with stored password
 
 ### Bug Fixes
 
-- add .trivyignore file with CVE entries for vulnerability scanning ([e78d5e9](https://github.com/jordanlambrecht/tracker-tracker/commit/e78d5e9939f81349e2e82f5caa89510f850f0bc7))
-- add missing alias for typography in vitest configuration ([e7a7e34](https://github.com/jordanlambrecht/tracker-tracker/commit/e7a7e3498f199b1e3d99e6dd211183d486379a9e))
-- add missing permissions for actions in CodeQL workflow ([c1210df](https://github.com/jordanlambrecht/tracker-tracker/commit/c1210df290cccff1c7f333c6ee5df0cbb4d0e35e))
-- **ci:** update codeql-action to v4, pin sbom-action version ([16082b8](https://github.com/jordanlambrecht/tracker-tracker/commit/16082b8694a7004f7a67cf2c2e970bd351455c43))
-- commit-msg hook ([e8c81d1](https://github.com/jordanlambrecht/tracker-tracker/commit/e8c81d1cbbb077c2e3e385270d83f2443740b819))
-- construct DATABASE_URL from POSTGRES env vars when not set ([c8c473a](https://github.com/jordanlambrecht/tracker-tracker/commit/c8c473a718bd47c50498a744c5b9c49572d38579))
-- re-encrypt backup password on password change, clear on lockdown ([cf7a3dc](https://github.com/jordanlambrecht/tracker-tracker/commit/cf7a3dca1e242501cbafde491e9f8654e7e8e78f))
-- reduce CVE surface in Docker image ([d1196fc](https://github.com/jordanlambrecht/tracker-tracker/commit/d1196fc6487dce16bba46e05d2e39f5ab426596e))
-- remove redundant comment ([18688d5](https://github.com/jordanlambrecht/tracker-tracker/commit/18688d5f1dc4cc1f7c78bb4825b1e9892a344dbf))
-- update .trivyignore with additional CVE entries ([88142b5](https://github.com/jordanlambrecht/tracker-tracker/commit/88142b5ad8a6cfe819b1611aa8760454b20ef7aa))
-- update tracker file detection method and enhance session secret length ([5a23ccd](https://github.com/jordanlambrecht/tracker-tracker/commit/5a23ccdcade32f17fbd4a9d495ee65bce9e2df24))
-- update Trivy to version 0.35.0 in CI and release workflows ([88877f4](https://github.com/jordanlambrecht/tracker-tracker/commit/88877f4cace97937a50d07218333f7b19b0d9b1e))
-
-### Performance
+* add .trivyignore file with CVE entries for vulnerability scanning
+* add missing permissions for actions in CodeQL workflow
+* **ci:** update codeql-action to v4, pin sbom-action version
+* re-encrypt backup password on password change, clear on lockdown
+* reduce CVE surface in Docker image
+* update .trivyignore with additional CVE entries
+* update tracker file detection method and enhance session secret length
+* update Trivy to version 0.35.0 in CI and release workflows
 
-- batch snapshot queries and eliminate redundant DB round-trip ([ec4f77b](https://github.com/jordanlambrecht/tracker-tracker/commit/ec4f77b9eb7d813e88304ade53faad01b731a00d))
-
-### Refactoring
-
-- consolidate chart utilities and wire into 25+ chart files ([426b017](https://github.com/jordanlambrecht/tracker-tracker/commit/426b01747095147cc970708b57cff61a4871a95e))
-- extract shared server helpers and wire into consumers ([07c80d4](https://github.com/jordanlambrecht/tracker-tracker/commit/07c80d4e59863d0d15310841e57a3f558316b47d))
-- merge TopTorrentsTable and ElderTorrentsTable into TorrentRankingTable ([003b01c](https://github.com/jordanlambrecht/tracker-tracker/commit/003b01ce9a002c30e0e1e5b91b61804656503023))
-- streamline request creation in tracker routes tests ([13a42f7](https://github.com/jordanlambrecht/tracker-tracker/commit/13a42f793dd128f8d523ddebfa6953830dff09cb))
-
-## [1.10.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.8.4...v1.10.0) (2026-03-16)
+## [1.9.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.9.0) (2026-03-16)
 
 ### Features
 
-- add area and totals modes to daily volume chart ([8c6636c](https://github.com/jordanlambrecht/tracker-tracker/commit/8c6636c3f0b0f99c6e88e47bba1f56aa92bb9983))
-- add cross-seed network, size scatter, and category breakdown to fleet dashboard ([7e6bd67](https://github.com/jordanlambrecht/tracker-tracker/commit/7e6bd67998b14e4c221a9b1a50f120631b22c847))
-- add sankey flow and parallel views to distribution chart ([58e2d7c](https://github.com/jordanlambrecht/tracker-tracker/commit/58e2d7c218dbb29743a94e0ea68954e752bede23))
-- add stacked and total view modes to comparison charts ([cdf0f73](https://github.com/jordanlambrecht/tracker-tracker/commit/cdf0f732a82c675c07fcdd21c334603bce937298))
-- add volume heatmap and calendar charts ([7848e89](https://github.com/jordanlambrecht/tracker-tracker/commit/7848e89ca8462afcb1fcc5808c817b5c0533d91d))
-- added logo to footer ([1270099](https://github.com/jordanlambrecht/tracker-tracker/commit/1270099c6ad49de2d09b0f6c768789b457e7c521))
-- added timestamp to dl client disconnect error ([0cfabe2](https://github.com/jordanlambrecht/tracker-tracker/commit/0cfabe26f4740ca8dd9e9cbef3c3e3b15be5818d))
-- auto-fill proxy port based on selected type in ProxySection ([0e2f30e](https://github.com/jordanlambrecht/tracker-tracker/commit/0e2f30efdfbe544924cb2d2b9c16282acc6e70ac))
-- encrypt scheduled and manual backups with stored password ([e514f9c](https://github.com/jordanlambrecht/tracker-tracker/commit/e514f9c5f8771690eb3ed6f623bf6881ab653a9e))
+* add area and totals modes to daily volume chart
+* add cross-seed network, size scatter, and category breakdown to fleet dashboard
+* add sankey flow and parallel views to distribution chart
+* add stacked and total view modes to comparison charts
+* add volume heatmap and calendar charts
+* added timestamp to dl client disconnect error
 
 ### Bug Fixes
 
-- add .trivyignore file with CVE entries for vulnerability scanning ([e78d5e9](https://github.com/jordanlambrecht/tracker-tracker/commit/e78d5e9939f81349e2e82f5caa89510f850f0bc7))
-- add missing alias for typography in vitest configuration ([e7a7e34](https://github.com/jordanlambrecht/tracker-tracker/commit/e7a7e3498f199b1e3d99e6dd211183d486379a9e))
-- add missing permissions for actions in CodeQL workflow ([c1210df](https://github.com/jordanlambrecht/tracker-tracker/commit/c1210df290cccff1c7f333c6ee5df0cbb4d0e35e))
-- commit-msg hook ([e8c81d1](https://github.com/jordanlambrecht/tracker-tracker/commit/e8c81d1cbbb077c2e3e385270d83f2443740b819))
-- construct DATABASE_URL from POSTGRES env vars when not set ([c8c473a](https://github.com/jordanlambrecht/tracker-tracker/commit/c8c473a718bd47c50498a744c5b9c49572d38579))
-- re-encrypt backup password on password change, clear on lockdown ([cf7a3dc](https://github.com/jordanlambrecht/tracker-tracker/commit/cf7a3dca1e242501cbafde491e9f8654e7e8e78f))
-- remove redundant comment ([18688d5](https://github.com/jordanlambrecht/tracker-tracker/commit/18688d5f1dc4cc1f7c78bb4825b1e9892a344dbf))
-- update .trivyignore with additional CVE entries ([88142b5](https://github.com/jordanlambrecht/tracker-tracker/commit/88142b5ad8a6cfe819b1611aa8760454b20ef7aa))
-- update tracker file detection method and enhance session secret length ([5a23ccd](https://github.com/jordanlambrecht/tracker-tracker/commit/5a23ccdcade32f17fbd4a9d495ee65bce9e2df24))
-- update Trivy to version 0.35.0 in CI and release workflows ([88877f4](https://github.com/jordanlambrecht/tracker-tracker/commit/88877f4cace97937a50d07218333f7b19b0d9b1e))
-
-### Performance
+* add missing alias for typography in vitest configuration
+* commit-msg hook
+* construct DATABASE_URL from POSTGRES env vars when not set
 
-- batch snapshot queries and eliminate redundant DB round-trip ([ec4f77b](https://github.com/jordanlambrecht/tracker-tracker/commit/ec4f77b9eb7d813e88304ade53faad01b731a00d))
-
-### Refactoring
-
-- consolidate chart utilities and wire into 25+ chart files ([426b017](https://github.com/jordanlambrecht/tracker-tracker/commit/426b01747095147cc970708b57cff61a4871a95e))
-- extract shared server helpers and wire into consumers ([07c80d4](https://github.com/jordanlambrecht/tracker-tracker/commit/07c80d4e59863d0d15310841e57a3f558316b47d))
-- merge TopTorrentsTable and ElderTorrentsTable into TorrentRankingTable ([003b01c](https://github.com/jordanlambrecht/tracker-tracker/commit/003b01ce9a002c30e0e1e5b91b61804656503023))
-- streamline request creation in tracker routes tests ([13a42f7](https://github.com/jordanlambrecht/tracker-tracker/commit/13a42f793dd128f8d523ddebfa6953830dff09cb))
-
-## [1.9.0](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.8.4...v1.9.0) (2026-03-16)
-
-### Features
-
-- add area and totals modes to daily volume chart ([8c6636c](https://github.com/jordanlambrecht/tracker-tracker/commit/8c6636c3f0b0f99c6e88e47bba1f56aa92bb9983))
-- add cross-seed network, size scatter, and category breakdown to fleet dashboard ([7e6bd67](https://github.com/jordanlambrecht/tracker-tracker/commit/7e6bd67998b14e4c221a9b1a50f120631b22c847))
-- add sankey flow and parallel views to distribution chart ([58e2d7c](https://github.com/jordanlambrecht/tracker-tracker/commit/58e2d7c218dbb29743a94e0ea68954e752bede23))
-- add stacked and total view modes to comparison charts ([cdf0f73](https://github.com/jordanlambrecht/tracker-tracker/commit/cdf0f732a82c675c07fcdd21c334603bce937298))
-- add volume heatmap and calendar charts ([7848e89](https://github.com/jordanlambrecht/tracker-tracker/commit/7848e89ca8462afcb1fcc5808c817b5c0533d91d))
-- added timestamp to dl client disconnect error ([0cfabe2](https://github.com/jordanlambrecht/tracker-tracker/commit/0cfabe26f4740ca8dd9e9cbef3c3e3b15be5818d))
+## [1.8.5](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.5) (2026-03-15)
 
 ### Bug Fixes
 
-- add missing alias for typography in vitest configuration ([e7a7e34](https://github.com/jordanlambrecht/tracker-tracker/commit/e7a7e3498f199b1e3d99e6dd211183d486379a9e))
-- commit-msg hook ([e8c81d1](https://github.com/jordanlambrecht/tracker-tracker/commit/e8c81d1cbbb077c2e3e385270d83f2443740b819))
-- construct DATABASE_URL from POSTGRES env vars when not set ([c8c473a](https://github.com/jordanlambrecht/tracker-tracker/commit/c8c473a718bd47c50498a744c5b9c49572d38579))
-- remove redundant comment ([18688d5](https://github.com/jordanlambrecht/tracker-tracker/commit/18688d5f1dc4cc1f7c78bb4825b1e9892a344dbf))
-
-### Performance
+* remove redundant comment
 
-- batch snapshot queries and eliminate redundant DB round-trip ([ec4f77b](https://github.com/jordanlambrecht/tracker-tracker/commit/ec4f77b9eb7d813e88304ade53faad01b731a00d))
-
-### Refactoring
-
-- consolidate chart utilities and wire into 25+ chart files ([426b017](https://github.com/jordanlambrecht/tracker-tracker/commit/426b01747095147cc970708b57cff61a4871a95e))
-- extract shared server helpers and wire into consumers ([07c80d4](https://github.com/jordanlambrecht/tracker-tracker/commit/07c80d4e59863d0d15310841e57a3f558316b47d))
-- merge TopTorrentsTable and ElderTorrentsTable into TorrentRankingTable ([003b01c](https://github.com/jordanlambrecht/tracker-tracker/commit/003b01ce9a002c30e0e1e5b91b61804656503023))
-- streamline request creation in tracker routes tests ([13a42f7](https://github.com/jordanlambrecht/tracker-tracker/commit/13a42f793dd128f8d523ddebfa6953830dff09cb))
-
-## [1.8.5](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.8.4...v1.8.5) (2026-03-15)
+## [1.8.4](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.4) (2026-03-15)
 
 ### Bug Fixes
 
-- remove redundant comment ([18688d5](https://github.com/jordanlambrecht/tracker-tracker/commit/18688d5f1dc4cc1f7c78bb4825b1e9892a344dbf))
+* collapse tracker validation warnings
 
-## [1.8.4](https://github.com/jordanlambrecht/tracker-tracker/compare/v1.8.3...v1.8.4) (2026-03-15)
+## [1.8.3](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.3) (2026-03-15)
 
-### Features
-
-- Cached torrent fallback: stores last successful torrent list per tag, serves cached data when qBittorrent is unreachable, with stale data banner indicating cache age
-- Anniversary milestone detection with dashboard alerts for tracker join date anniversaries
-- Login timer dashboard setting (showLoginTimers) with shared state toggle
-- Last access date field and enhanced community data in tracker adapters
-- Bento grid slot system with explicit-positioning layout algorithms for tracker detail stat cards
-- Responsive bento grid: 2-col (mobile), 3-col (md), and 3-or-4-col (lg) breakpoints with per-breakpoint layout algorithms
-- Stat card alert system: danger glow, outline, and tooltip icon for ratio below required and negative buffer
-- Daily buffer candlestick chart on tracker detail pages
-- Dashboard alerts "Clear All" button for batch dismissal
-- Login timer cards link to tracker site with hover external-link indicator
-- Rank timeline: promotion/demotion chevrons (green/red), anniversary milestones, horizontal scroll
-- Swipe/drag gestures on sidebar client carousel (pointer events with capture)
-- 4 new draft trackers: AsianCinema, Bibliotik, UHDBits, SeedPool
-- TrackerHub slugs and status page URLs populated across 19 existing trackers
-- Download client uptime tracking: 24h heartbeat history displayed as a horizontal status bar in each client's settings card, with 5-minute bucket granularity and long-term retention for future chart overlays
-- Live active torrents: 5-second polling of actively transferring torrents on tracker detail page with live speed/state updates
-- Per-client stat card breakdowns: Seeding and Total Size cards show per-client rows when multiple download clients are configured (stacked variant with sumIsHero)
-- H&R risk separated from unsatisfied: stat card shows only stopped/paused unsatisfied torrents as actual risk, tooltip shows total unsatisfied count
-- Required ratio fallback: stat card falls back to tracker registry minimumRatio when the tracker API doesn't provide requiredRatio (UNIT3D)
-- Aggregate upload/download speeds shown inline in Active Uploads/Downloads section headers
-- Untagged torrents now shown in tag group breakdown charts (donut, bar, treemap) when "Count Not Tagged" is enabled
-
-### Security
-
-- Strip announce URL passkeys from torrent responses at both cache-write time and API response time
-- Sanitize raw error messages in client scheduler — generic messages to client, raw errors to server logs only
-
-### Changed
-
-- StatCard expanded with stacked and ring variants for bento grid layouts
-- Tracker detail cards migrated to slot-based grid system with slot registry
-- LoginTimers custom ring replaced with StatCard type=ring
-- formatTimeAgo extracted to shared formatters module
-- formatBytesNum improved with negative value handling and variable precision
-- CoreStatCards refactored: buildCoreStatDescriptors extracted as pure data function, component wrapper removed
-- Slot rendering consolidated: renderSlotElement single source in slot-registry, replaces duplicate SLOT_COMPONENT_MAP lookups
-- loginDeadlineSlot promoted to span:2 with priority 30 (stacked data cards get triple promotion over compact ring)
-- gazelleCommentsSlot guarded against NaN from missing API fields
-- Explicit draft: true/false required on all tracker registry entries (enforced by test)
-- Import order standardized across codebase
-- Shared portal-based Tooltip component replaces all native title attributes and inline tooltip implementations across 15 files
-- Backup settings restructured: Export, Restore, and Configuration split into separate sections
-- "Encrypt backups" renamed to "Password-protect backups" for clarity
-- Backup password field moved from Configuration to Export section (ephemeral per-export, not a saved setting)
-- Storage path input visible outside scheduled backup toggle (used by both manual exports and scheduled backups)
-- Backup Now saves to disk silently when storage path is available; browser download only as fallback
-- Changelog dialog renders markdown instead of raw text
-- Changelog version header auto-updates on release via pnpm version lifecycle hook
-- Deep poll optimized: parallel per-tag torrent fetching replaces single unfiltered dump (20MB → 10MB, 33% faster), public torrents filtered out before processing
-- Heartbeat interval reduced from 10s to 5s for more responsive speed data
-- Deep poll minimum raised from 10s to 60s, default from 30s to 300s (full torrent dump is ~20MB)
-- Download client settings: explicit Save/Discard buttons replace auto-save on every keystroke
-- Client snapshot retention now uses configurable snapshotRetentionDays instead of hardcoded 30 days
-- Fleet snapshots API max query window raised from 30 to 365 days
-- Icons: seeding changed from anchor to seedling, seedbonus changed from star to gem, required ratio uses balance scale (distinct from ratio arrows and favorite star)
-- StatCard shadow reduced from nm-raised to nm-raised-sm to prevent neighbor shadow bleed in grids
-- Card component no longer applies overflow-hidden by default (was clipping neumorphic shadows on nested cards)
-- ChartCard uses p-6/-m-6 breathing room for nested neumorphic shadows with documentation in globals.css
-- Ecosystem stats (Total Uploaded/Downloaded/Buffer) now use unit prop for smaller unit text
-- Unsatisfied torrents table: scrollable when >15 rows, percentage-based column widths, MarqueeText for long names
-- Top Seeded and Elder Torrents tables: percentage-based column widths with edge padding
-- Table component: overscroll-contain prevents elastic bounce on scrollable tables, empty state vertically centered
-- Leeching and Upload Speed stat cards removed from Torrents tab (redundant with Active Downloads table and inline speed display)
-
-### Fixed
-
-- Chart spacing on tracker detail pages: reduced top margin from 78px to 16-40px (was designed for multi-tracker dashboard legends)
-- Double/triple slot index mapping collision when algorithm promotes doubles to triples
-- Sidebar duplicate filepath comment removed
-- Color hex code validation bug
-- Backup storage path validated on filesystem (mkdir + access check) when saving settings
-- Backup Now disabled when configuration has unsaved changes
-- Default storage path (/data/backups) shown in input instead of empty placeholder
-- Export error messages now visible in Export section (were orphaned after section split)
-- Hydration mismatch on tracker detail page: added loading.tsx for framework-level Suspense boundary
-- Cross-seed donut chart vertically centered in card when adjacent Categories card is taller
-- Tag group breakdown charts (donut/bar/treemap) now include "Untagged" slice when countUnmatched is enabled (previously only worked in numbers view)
-- Uptime accumulator cleanup on client delete prevents FK violation on flush
-- Backup restore uses onConflictDoNothing for uptime buckets to handle edge-case duplicates
-- Active torrents poll correctly transitions state from "uploading"/"downloading" to stalled when torrent drops from active list
-- POST /api/clients default pollIntervalSeconds fixed from 30 to 300 (was below the validated minimum of 60)
-
-## v1.6.0 — Settings & Debug
-
-### Features
+### Bug Fixes
 
-- Debug button that shows raw API response output for tracker polling
-- Settings page decomposed into section components
+* update release scripts to push tags to specific origin
 
-## v1.5.0 — Security & Backup Hardening
+## [1.8.2](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.2) (2026-03-15)
 
 ### Features
 
-- Re-encryption for backup restore: tokens re-encrypted from backup salt to current salt via reencryptField()
-- Progressive login throttling: escalating lockout delays (5 req → 30s, 10 → 2m, 15 → 15m, 20 → 1h) with 429 responses
-- SSRF protection: isUnsafeNetworkHost blocks private/loopback/link-local addresses in tracker URLs
-
-### Changed
+* add security audit file tamper check in CI workflow
 
-- Extracted DB-aware privacy operations (createPrivacyMask, scrubSnapshotUsernames) into new privacy-db.ts module to eliminate duplication across 4 route handlers
-- Added shared reencrypt() function in crypto.ts, used by change-password and backup-restore routes
+### Bug Fixes
 
-### Fixed
+* encode PostgreSQL password in DATABASE_URL and update healthcheck command
+* refine tracker validation logic to exclude drafts and improve error messages
 
-- Critical SQL column mapping bug in scrubSnapshotUsernames: "group" → group_name (Drizzle schema field mapping)
-- UTF-8 consistency in scrubSnapshotUsernames: LENGTH → CHAR_LENGTH
-- Missing transaction error handling in change-password route (would crash with opaque 500)
-- Master password now validated before parsing backup payload
+## [1.8.1](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.1) (2026-03-15)
 
-## v1.4.0 — Docker & Deployment
+### Bug Fixes
 
-### Changed
+* move DEFAULT_API_PATHS to constants module
 
-- Simplified backup process by removing encryption for automated backups
-- Dockerfile optimized for drizzle-kit schema sync (dedicated build stage, bash in runner)
-- Docker entrypoint improved for schema sync process
-- PostgreSQL image updated to 17-alpine
+## [1.8.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.8.0) (2026-03-15)
 
-### Fixed
+## [1.7.0](https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v1.7.0) (2026-03-15)
 
-- Proxy configuration updated to include tracker logo path
-- Drizzle config dotenv handling improved
+### Features
 
-## v1.3.0 — Chart & Detail Overhaul
+* add 'warned' alert type to AlertsBanner for improved alert handling
+* add adapterFetch function and integrate it into Unit3dAdapter for improved API handling
+* add alert indicators to stat cards for ratio and buffer warnings
+* add anniversary milestone detection with dashboard alerts
+* add avatarRemoteUrl update in pollTracker for enhanced avatar handling
+* add avatarUrl to Gazelle user stats and update phoenixproject with new user classes and rules
+* add BackToTop component
+* add cached torrent fallback to useTrackerTorrents hook
+* add cached torrents fallback endpoint
+* add cachedTorrents columns to downloadClients schema
+* add changelog and health check API routes
+* add chart preferences hook with DnD reorder and category support
+* add clear-all button to alerts, external links on login timers
+* add core security and utility libraries
+* add custom UI component library
+* add dashboard components with token and robustness fixes
+* add dashboard settings API route and DB-backed hook
+* add devIndicators configuration for improved development experience
+* add DND reordering, explicit save, and numbers display to tag groups
+* add feature components for settings management
+* add fleet dashboard with torrent analytics across all clients
+* add formatStatValue function and related tests
+* add GET /api/clients/[id]/uptime endpoint
+* add lastAccessDate field and enhanced community data in adapters
+* add nebulance to valid platforms in tracker validation script
+* add nebulanceMeta handling in TrackerDetailPage for improved tracker support
+* add nebulanceMeta to AnalyticsTab for enhanced tracker details
+* add Prettier
+* add promotion/demotion indicators and anniversary milestones to rank timeline
+* add qBittorrent client integration
+* add quicklinks API route for DB persistence
+* add re-encryption functionality for backup restore process and update validation rules for empty API tokens
+* add React hooks for click-outside and localStorage
+* add required ratio fallback to tracker minimum ratio
+* add settings and admin API routes
+* add settings page, dashboard layout, and page-level components
+* add shared ECharts config builder functions
+* add shared Icons, ChevronToggle, and ChartEmptyState components
+* add showLoginTimers dashboard setting with shared state
+* add support for Nebulance tracker, including adapter and tests
+* add swipe/drag gestures to client carousel in sidebar
+* add tag group and download client API routes
+* add template for new tracker registry entries with guidance and validation steps
+* add tracker API extensions with security hardening
+* add unit display for ecosystem aggregate stats
+* add untagged torrents to tag group breakdown charts
+* add update check badge to sidebar
+* add upload polar heatmap chart with day-of-week by hour breakdown
+* add UptimeBar component to download client settings
+* add useClickOutside hook with stable ref pattern
+* added debug button that shows raw api response output
+* added new tracker logos
+* adjust download client poll interval defaults and snapshot retention
+* backup system
+* cache filtered torrent list on successful deep poll
+* conditionally render Join Date input based on selected tracker properties
+* **database:** add app_settings, tracker roles, and tracker snapshots tables with initial columns
+* docker hardening — standalone output, node 24, multi-arch builds
+* enhance security audit with raw SQL check and update test count
+* enhance security documentation with comprehensive sections and updates
+* enhance StatCard with stacked hero totals and unit support
+* enhance tracker support with nebulance integration and improve alert handling
+* expand security audit with inline suppression and 8 new checks
+* harden auth routes with defense-in-depth security
+* heartbeat chart for download clients
+* implement bento grid slot system and layout algorithms
+* implement explicit save/discard pattern for download client settings
+* implement GGnAdapter with user stats fetching and response handling
+* implement live active torrents polling and inline speed display
+* improve table scrollability and chart card spacing
+* include uptime buckets in backup and restore
+* increase fleet snapshots query window to 365 days
+* initial tracker registries/entries
+* integrate uptime recording into heartbeat and deep poll
+* login, auth, and totp
+* new chart types
+* new logo!
+* optimize torrent polling with parallel per-tag fetching and state filtering
+* portal tooltips, backup settings overhaul, changelog improvements
+* refactor chart legend system with log scale support
+* refactor EmojiPickerPopover to use createPortal for rendering and improve positioning logic
+* refactor torrent stat cards with per-client breakdown and consolidated tables
+* separate H&R risk from unsatisfied torrents with distinct display
+* show stale data banner when using cached torrents
+* Stores 5-minute heartbeat success/failure buckets per download client. Unique constraint on (clientId, bucketTs) prevents duplicates. Cascade delete on client removal. Added to wipe.ts for security scrub coverage.
+* torrents tab polish, stat card tooltips, ratio baseline, log scale toggle
+* tracker detail UX improvements and new torrent charts
+* **trackers:** add new trackers HAWKE-UNO, Nebulance, and REDacted
+* update avatarUrl function to include avatarRemoteUrl parameter for improved avatar handling
+* update StarIcon and SeedingIcon, add RequiredRatioIcon
+* wire responsive bento grid with 3-col and 2-col layout algorithms
 
-### Features
+### Bug Fixes
 
-- Chart legend system overhaul: scroll pagination replaced with natural wrapping, adjustable spacing, and an All/None toggle button on multi-series charts
-- Log scale toggle added to 6 dashboard charts (Buffer, Seedbonus, Active Torrents, Total Uploaded, Ratio Stability, Buffer Velocity) with auto-detect when data spans >100x range
-- Tracker detail page redesign: TrackerHub status card with animated collapse, user ranks table with perk pills, release/notable/banned group badges, elder torrents table with rank column and marquee ticker
-- Torrents tab: compact table mode, category acquisition chart, 3D torrent age scatter plot, dead torrents card, average seed time stat card and cohort chart, full-width unsatisfied progress bars
-- Ratio chart: red dashed baseline at minimum required ratio
-- StatCard tooltip support with hover popup
-- Sidebar: archived tracker styling (dimmed, static dot, "Archived" label) and GitHub repo link
-- New logo
-
-### Refactoring
-
-- Tracker detail page slimmed from 1,229 to 265 lines — extracted TrackerDetailHeader, UserProfileCard, AnalyticsTab, TrackerInfoTab, CoreStatCards, PollLog, platform-specific guard components, and independent data-fetching hooks with AbortControllers
-- Dashboard page split into AnalyticsSection and EcosystemStatsSection components
-- Chart preference hooks consolidated into shared `useChartPreferencesBase`
-- StatCard value/unit prop split for consistent formatting
-
-### Fixes
-
-- Log(0) crash in ComparisonChart when switching to log scale with zero-value data points
-- VolumeSurface3D (Upload Landscape) background now matches card surface instead of broken WebGL transparent
-- Tracker GET endpoint hardened with column projection (excludes avatarData, encrypted tokens from response)
-- computeDelta BigInt null guard prevents crash on missing snapshot data
-- StrictMode abort race condition: loading state only clears when the active request completes
-- Emoji picker overflow in tag group settings
-- Proxy toggle disabled when no proxy is configured
-- Join date input capped to today in both UI and API validation
-- Redirect to dashboard after archiving a tracker
-- Design system alignment: raw `<p>` elements replaced with `<H2>` component across dashboard sections
-- Archived trackers no longer appear on the dashboard
-- Normalized content categories: "Software" → "Apps", "Sport" → "Sports", "Animation" → "TV"
-- Tracker registry test allows `loginIntervalDays: 0` to mean "no login interval policy"
-
-## v0.1.0 — Initial Release
-
-- Dashboard with aggregate stats, comparison charts, and tracker leaderboard
-- Tracker detail pages with upload/download history, ratio, buffer, seedbonus, and seeding charts
-- UNIT3D platform adapter with encrypted API token storage
-- Master password auth with Argon2 hash + AES-256-GCM encryption
-- Global polling interval (15 min - 24 hours) with unified batch timestamps
-- Dark neumorphic UI with per-tracker accent colors
-- Sidebar with drag-and-drop reorder, stat modes, and sort options
-- Tracker registry with detailed data for Aither, Blutopia, FearNoPeer, OnlyEncodes, and Upload.cx
-- TrackerHub integration for site status monitoring
-- Rank progression timeline and rank change alerts
-- Privacy mode with username/group redaction
-- App-wide settings (privacy toggle, data scrub)
-- Poll log with collapsible history per tracker
+* add aria-label comment for anchor element
+* add comment to ignore security audit for async JSON parsing in proxyFetch
+* add container names for db and app services in docker-compose.yml
+* add dynamic export to AuthLayout for forced dynamic rendering
+* add linting step to CI and update dependency review workflow
+* add loading boundary to prevent hydration mismatch on tracker detail page
+* add permissions for CI workflow to comment on PRs
+* add progressive login throttling, SSRF protection, and error sanitization
+* add type annotations for TrackerRegistryEntry in TrackerOverviewGrid
+* address PR security review findings
+* address security audit findings
+* allow lint step to continue on error and add dummy DATABASE_URL for build
+* bump setup-qemu-action to v4 for node 24 compat
+* color hex code bug
+* correct barrel inclusion filter to match import format
+* correct spelling of 'Sports' in VALID_CONTENT_CATEGORIES
+* enhance compareVersions to strip pre-release and build metadata
+* enhance tooltip accessibility and cleanup in StatCard component
+* ensure master password is validated before parsing backup payload
+* harden chart components against XSS and stale data
+* harden tracker GET endpoint and align design system usage
+* improve security test count verification by refining output parsing
+* improve tracker validation comment handling in CI workflow
+* improve UI component robustness and React patterns
+* isolate drizzle-kit deps in dedicated build stage
+* markdown not rendering in changelog dialog
+* normalize content categories and update changelog
+* now noClients is set based on the latest response every fetch.
+* optimize line caching in getCachedLines function
+* refactor tracker exports and initialize ALL_TRACKERS array
+* remove onRefresh prop from FleetDashboard component
+* remove unused onRefresh prop from FleetDashboardProps interface
+* remove unused timeAgo function and update category map initialization
+* reorder import
+* reorder import
+* reorder imports
+* reorder imports
+* replace corepack enable with npm install for pnpm in Dockerfile
+* replace div with button for SortableTrackerItem accessibility improvements
+* replace img with Image component for logo in Login and Setup pages
+* resolve AuthShell hydration mismatch
+* resolve biome a11y lint errors and barrel test quote mismatch
+* tighten chart spacing on tracker pages, add daily buffer candlestick
+* UI polish and input validation improvements
+* update allowed content categories in tracker validation
+* update base image to node:22-alpine and install corepack globally
+* update color definitions to use OKLCH values instead of hex
+* update Docker cache settings for multi-platform builds
+* update drizzle-kit command path in docker-entrypoint.sh
+* update import for CSSProperties type in ChartECharts component
+* update import paths for ALL_TRACKERS and DEFAULT_API_PATHS in validate-trackers script
+* update json parsing in proxyFetch to use async/await
+* update key prop in perks mapping to include index for uniqueness
+* update key prop in perks mapping to use perk label for uniqueness
+* update matcher in proxy configuration to include trackerTracker_logo
+* update packageManager version and upgrade @types/node in package.json and pnpm-lock.yaml
+* update packageManager version in package.json and refactor routePathFromFile function
+* update PostgreSQL image version to 17-alpine
+* update security audit to include additional checks and improve documentation
+* update security test count minimum from 41 to 78
+* update security test for setup route username validation
+* update SortableTrackerItem to use a div for accessibility and keyboard navigation
+* update SortableTrackerItem to use a span for favorite toggle with accessibility improvements
+* update version number in changelog to v1.3.0
+* use built-in corepack in node:25-alpine base image
+* use URL-based registry lookup in dashboard alerts
diff --git a/Dockerfile b/Dockerfile
index 1d45ac35..68fc91f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,10 +21,12 @@ RUN pnpm install --frozen-lockfile
 # Stage 2 — Build the Next.js app
 # ---------------------------------------------------------------------------
 FROM base AS builder
+ARG NEXT_PUBLIC_RELEASE_CHANNEL=stable
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_RELEASE_CHANNEL=$NEXT_PUBLIC_RELEASE_CHANNEL
 # Dummy DATABASE_URL so Next.js can evaluate route modules during build
 # (In case DB is never actually queried at build time)
 ENV DATABASE_URL=postgresql://build:build@localhost:5432/build
diff --git a/README.md b/README.md
index 4dddab7c..d8f5e387 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Self-hosted dashboard for monitoring private tracker stats over time. Track uplo
 ## Features
 
 - Per-tracker and fleet-wide stats with 30+ charts
-- UNIT3D, Gazelle, GGn, and Nebulance support out of the box
+- UNIT3D, Gazelle, GGn, Nebulance, MAM, and AvistaZ network support out of the box
 - qBittorrent integration - cross-seed tracking, activity heatmaps, speed history, etc
 - Everything stays on your machine. No telemetry, no phoning home.
 
@@ -60,21 +60,25 @@ You can check out a few other, longer, screenshots in the docs folder.
 | PassThePopcorn (PTP)  | Gazelle   | 🟡 Unverified          |                                                   |
 | 720pier               | Custom    | 📋 Needs adapter       |                                                   |
 | ABTorrents            | Custom    | 📋 Needs adapter       |                                                   |
-| AvistaZ               | Custom    | 📋 Needs adapter       |                                                   |
+| AvistaZ               | AvistaZ   | ✅ Verified            | Cookie auth + HTML scraping                       |
+| AnimeZ                | AvistaZ   | 🟡 Unverified          | Same adapter as AvistaZ                           |
+| CinemaZ               | AvistaZ   | ✅ Verified            | Same adapter as AvistaZ                           |
+| ExoticaZ              | AvistaZ   | 🟡 Unverified          | Same adapter as AvistaZ                           |
+| PrivateHD             | AvistaZ   | 🟡 Unverified          | Same adapter as AvistaZ                           |
+| MyAnonamouse (MAM)    | MAM       | ✅ Verified            | Cookie auth via mam_id                            |
+| DarkPeers             | UNIT3D    | ✅ Verified            |                                                   |
+| Luminarr              | UNIT3D    | 🟡 Unverified          |                                                   |
 | CathodeRayTube (CRT)  | UNIT3D    | 📋 Draft               |                                                   |
-| CinemaZ               | Custom    | 📋 Needs adapter       |                                                   |
+| DigitalCore           | Custom    | 📋 Needs adapter       |                                                   |
 | HDBits                | Custom    | 📋 Needs adapter       |                                                   |
-| MyAnonamouse (MAM)    | Custom    | 📋 Needs adapter       |                                                   |
 | SecretCinema          | Custom    | 📋 Needs adapter       |                                                   |
 | SportsCult            | Custom    | 📋 Needs adapter       |                                                   |
 | TorrentLeech          | Custom    | 📋 Needs adapter       |                                                   |
 | BeyondHD              | Custom    | ⛔ Stuck               |                                                   |
 | Cinemageddon          | Custom    | ⛔ Stuck               |                                                   |
-| ExotikaZ              | Custom    | ⛔ Stuck               |                                                   |
 | FileList              | Custom    | ⛔ Stuck               |                                                   |
 | HD-Torrents           | Custom    | ⛔ Stuck               |                                                   |
 | IPTorrents            | Custom    | ⛔ Stuck               |                                                   |
-| PrivateHD             | Custom    | ⛔ Stuck               |                                                   |
 | TVVault               | Custom    | ⛔ Stuck               |                                                   |
 | HawkeUno              | UNIT3D    | ❌ Broken              | API does not permit /user requests                |
 
@@ -187,7 +191,7 @@ All other settings — polling interval, privacy mode, proxy, backups — are co
 
 Full documentation is available at **[jordanlambrecht.github.io/tracker-tracker](https://jordanlambrecht.github.io/tracker-tracker/)**.
 
-Covers installation, tracker setup (UNIT3D, Gazelle, GGn), features (proxies, TOTP, backups, download clients, notifications), and troubleshooting.
+Covers installation, tracker setup (UNIT3D, Gazelle, GGn, MAM, AvistaZ), features (proxies, TOTP, backups, download clients, notifications), and troubleshooting.
 
 ## Contributing
 
@@ -199,7 +203,7 @@ PRs welcome. Areas where help matters most:
 - **Security auditing** — Check out SECURITY.md for threat surfice info.
 - **Responsiveness** - I only have my 16" MBP to work off of, so feedback of different screen experiences is much appreciated
 - **Data Visualization** - I ain't no math wizard, so any contributions for data viz, charts/graphs, etc.
-- **Custom platform adapters** — trackers marked "Custom" need bespoke adapters since they don't run UNIT3D or Gazelle.
+- **Custom platform adapters** — trackers marked "Custom" need bespoke adapters since they don't run a supported platform.
 - **HawkeUno lobbying** — convince the Hawke mods to add a `/users` endpoint so the adapter can work
 
 ## Architecture
diff --git a/SECURITY.md b/SECURITY.md
index 2cc996a6..5692a7cd 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -153,7 +153,7 @@ All API routes validate inputs — `src/app/api/trackers/route.ts`, `src/app/api
 | qBittorrent tag | string, max 100 chars, trimmed                                                                 |
 | Poll interval   | integer, clamped to 15-1440 minutes                                                            |
 | Tracker ID      | parsed as integer, NaN rejected                                                                |
-| Platform type   | allowlist: `["unit3d", "gazelle", "ggn", "nebulance"]`                                         |
+| Platform type   | allowlist: `["unit3d", "gazelle", "ggn", "nebulance", "avistaz", "mam", "custom"]`             |
 | Password        | string, 8-128 chars                                                                            |
 | Role name       | string, max 255 chars                                                                          |
 | joinedAt        | regex-validated YYYY-MM-DD or null                                                             |
@@ -330,7 +330,7 @@ If you discover a security vulnerability:
 
 ### Security Testing
 
-Security invariants are verified by 86 automated tests in `src/lib/__tests__/security.test.ts`:
+Security invariants are verified by 106 automated tests in `src/lib/__tests__/security.test.ts`:
 
 | Category         | Tests | What's Verified                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | ---------------- | ----- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -357,7 +357,7 @@ pnpm test:run
 The GitHub Actions workflow (`.github/workflows/ci.yml`) runs on every push and PR to `main`:
 
 1. **Type check** (`pnpm tsc`) — catches type errors before runtime
-2. **Full test suite** (`pnpm test:run`) — all 1250+ tests including security invariants
+2. **Full test suite** (`pnpm test:run`) — all 2050+ tests including security invariants
 3. **Security test count guard** — fails the build if the security test count drops below 78, preventing accidental removal of security tests
 4. **Static security audit** (`scripts/security-audit.ts`) — runs on every PR, comments results on the PR, and fails on critical findings
 
diff --git a/biome.json b/biome.json
index 2c54afc6..77861493 100644
--- a/biome.json
+++ b/biome.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.9/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.11/schema.json",
   "files": {
-    "includes": ["**", "!.next", "!node_modules", "!public", "!.history", "!.claude"]
+    "includes": ["**", "!.next", "!node_modules", "!public", "!.history", "!docs/kb/site"]
   },
   "assist": {
     "enabled": true,
@@ -19,6 +19,9 @@
         "noUnusedImports": "warn",
         "noUnusedVariables": "warn"
       },
+      "suspicious": {
+        "noArrayIndexKey": "off"
+      },
       "complexity": {
         "noImportantStyles": "off"
       }
diff --git a/commitlint.config.mjs b/commitlint.config.mjs
index fdd00f37..15b3fed2 100644
--- a/commitlint.config.mjs
+++ b/commitlint.config.mjs
@@ -1,4 +1,37 @@
 // commitlint.config.mjs
 export default {
   extends: ["@commitlint/config-conventional"],
+  rules: {
+    "scope-enum": [
+      2,
+      "always",
+      [
+        "tracker-adapters",
+        "alerts",
+        "api",
+        "auth",
+        "backups",
+        "charts",
+        "dashboard",
+        "db",
+        "events",
+        "db-fleet",
+        "login",
+        "release",
+        "user-proxy",
+        "scheduler",
+        "ci",
+        "circuit-breaker",
+        "deps",
+        "deps-dev",
+        "schema",
+        "security",
+        "settings",
+        "sidebar",
+        "trackers",
+        "ui",
+        "webhooks",
+      ],
+    ],
+  },
 }
diff --git a/docs/kb/docs/assets/images/avistaz-cookie-copy-value.png b/docs/kb/docs/assets/images/avistaz-cookie-copy-value.png
new file mode 100644
index 00000000..0a339fa8
Binary files /dev/null and b/docs/kb/docs/assets/images/avistaz-cookie-copy-value.png differ
diff --git a/docs/kb/docs/assets/images/digitalcore-cookie.png b/docs/kb/docs/assets/images/digitalcore-cookie.png
new file mode 100644
index 00000000..fd50d291
Binary files /dev/null and b/docs/kb/docs/assets/images/digitalcore-cookie.png differ
diff --git a/docs/kb/docs/contributing/adding-a-tracker.md b/docs/kb/docs/contributing/adding-a-tracker.md
index 47ffc4bc..e7fbd26d 100644
--- a/docs/kb/docs/contributing/adding-a-tracker.md
+++ b/docs/kb/docs/contributing/adding-a-tracker.md
@@ -1,16 +1,16 @@
 # Adding a Tracker to the Registry
 
-This guide covers adding a new tracker entry for an **existing platform** (UNIT3D, Gazelle, GGn, or Nebulance). If the tracker runs on a platform that does not have an adapter yet, stop here and read [Tracker API Responses](tracker-responses.md) first — you will need to write an adapter before the registry entry.
+Adding a new tracker to an **existing platform** (UNIT3D, Gazelle, GGn, Nebulance, MAM, or AvistaZ) requires one file and two lines in the barrel export. No adapter code needed.
 
-If the tracker you want to add runs on UNIT3D, Gazelle, GGn, or Nebulance, you only need to create one file and add two lines to the barrel export. No adapter code required.
+If your tracker runs on a new platform, read [Tracker API Responses](tracker-responses.md) first — you'll need to write an adapter before adding the registry entry.
 
 ---
 
 ## Standardization Philosophy
 
-Every tracker file in `src/data/trackers/` follows the same field order and completeness rules. This makes files easy to compare, review, and diff.
+Every tracker file follows the same field order and completeness rules. This makes diffs clean and reviews fast.
 
-**Every field must be present in every tracker file, even if empty.** Use `""` for empty strings, `[]` for empty arrays, and `false` for booleans. Do not omit fields and do not use `undefined` as a value. Presence in the file shows the field was considered.
+**Every field must be present, even if empty.** Use `""` for empty strings, `[]` for empty arrays, and `false` for booleans. Never omit fields or use `undefined` — if it's there, you've decided on it.
 
 ```typescript
 abbreviation: "" // not: abbreviation: undefined
@@ -20,23 +20,23 @@ bannedGroups: [] // not: bannedGroups: undefined
 warning: false // not: warning: undefined
 ```
 
-**There are three exceptions to this rule:**
+**Three exceptions:**
 
-1. The `stats` block is omitted entirely when no real data exists. Do not include the block with `undefined` values.
-2. `rules.fulfillmentPeriodHours`, `rules.hnrBanLimit`, and `rules.fullRulesMarkdown` are truly optional — omit them when unknown rather than setting them to `undefined`.
-3. Platform-specific fields (`gazelleAuthStyle`, `gazelleEnrich`, `unit3dAuthStyle`) only appear in tracker files for their respective platform. Do not add them to tracker files on other platforms.
+1. Omit the `stats` block entirely when you don't have real data. Don't include it with `undefined` values.
+2. `rules.fulfillmentPeriodHours`, `rules.hnrBanLimit`, and `rules.fullRulesMarkdown` are truly optional — omit them when unknown.
+3. Platform-specific fields (`gazelleAuthStyle`, `gazelleEnrich`, `unit3dAuthStyle`) only belong in tracker files for their own platform. Don't add them to other trackers.
 
 ---
 
 ## 1. Copy the Template
 
-The template lives at `src/data/trackers/_template.ts`. Copy it to a new file named after your tracker's slug. The slug must be lowercase with hyphens only — no underscores, no uppercase, no special characters.
+Copy `src/data/trackers/_template.ts` to a new file matching your tracker's slug (lowercase, hyphens only):
 
 ```bash
 cp src/data/trackers/_template.ts src/data/trackers/mytracker.ts
 ```
 
-Here is the full template for reference:
+Full template:
 
 ```typescript
 // src/data/trackers/_template.ts
@@ -142,7 +142,7 @@ export const mytracker: TrackerRegistryEntry = {
 
 ## 2. Field Reference
 
-Fields are documented in the same order they appear in the template, grouped by section.
+Fields are documented in template order, grouped by section.
 
 ### Identity
 
@@ -150,7 +150,7 @@ Fields are documented in the same order they appear in the template, grouped by
 
 Type: `string`
 
-The unique identifier for this tracker. Used in file names, URL paths, and database lookups. Must be lowercase with hyphens only.
+The unique identifier for this tracker. Used in filenames, URLs, and database lookups. Lowercase with hyphens only.
 
 ```typescript
 slug: "blutopia"
@@ -184,19 +184,19 @@ abbreviation: "" // no abbreviation
 
 Type: `string`
 
-The base URL of the tracker site, including protocol. HTTPS only. No trailing slash.
+The base URL including protocol. HTTPS only, no trailing slash.
 
 ```typescript
 url: "https://blutopia.cc"
 ```
 
-The adapter constructs the API request by appending `apiPath` to this value.
+The adapter appends `apiPath` to this URL to make API requests.
 
 #### `description`
 
 Type: `string`
 
-One or two sentences describing what the tracker is about — content focus, community reputation, anything a prospective member would want to know.
+One or two sentences about what the tracker is — content focus, community reputation, anything someone might want to know before joining.
 
 ```typescript
 description: "The largest general music tracker (also has some software). Has an interview to join, although the wait can be notoriously long."
@@ -210,16 +210,17 @@ description: "The largest general music tracker (also has some software). Has an
 
 Type: `"unit3d" | "gazelle" | "ggn" | "nebulance" | "mam" | "custom"`
 
-Which adapter handles API requests for this tracker. This controls how the scheduler fetches stats. Must match the software the tracker runs.
+Which adapter handles API requests. This tells the scheduler how to fetch stats. Pick the one that matches the tracker's software.
 
 | Platform      | What it means                                                  |
 | ------------- | -------------------------------------------------------------- |
-| `"unit3d"`    | Runs the UNIT3D codebase                                       |
-| `"gazelle"`   | Runs Gazelle or a derivative (Orpheus, Gazelle-Music, etc.)    |
-| `"ggn"`       | GazelleGames only — custom API different from standard Gazelle |
-| `"nebulance"` | Nebulance-specific API                                         |
-| `"mam"`       | MyAnonaMouse — cookie-based auth via `mam_id` session cookie   |
-| `"custom"`    | Placeholder, not implemented — do not use                      |
+| `"unit3d"`    | Runs UNIT3D                                                    |
+| `"gazelle"`   | Runs Gazelle or a fork (Orpheus, Gazelle-Music, etc.)         |
+| `"ggn"`       | GazelleGames only — has its own custom API                    |
+| `"nebulance"` | Uses Nebulance's API                                           |
+| `"mam"`       | MyAnonaMouse — cookie-based auth via `mam_id`                 |
+| `"avistaz"`   | AvistaZ network — cookie auth + profile scraping              |
+| `"custom"`    | Placeholder, not implemented yet                              |
 
 #### `gazelleAuthStyle`
 
@@ -236,7 +237,7 @@ Only include this field for Gazelle trackers. If you are unsure which style a Ga
 
 Type: `boolean` — Gazelle trackers only
 
-When `true`, the adapter makes a second API call (`action=user&id=X`) after the initial `action=index` call to fetch seeding/leeching counts, warned status, joined date, avatar, ranks, and community stats. **All Gazelle trackers must set this to `true`** — without it, seeding and leeching counts will always be 0.
+When `true`, the adapter makes a second API call (`action=user&id=X`) after the initial `action=index` call to get seeding/leeching counts, warned status, joined date, avatar, ranks, and community stats. **Set this to `true` for all Gazelle trackers** — without it, seeding and leeching will show as 0.
 
 ```typescript
 gazelleEnrich: true
@@ -265,24 +266,19 @@ Only include this field for UNIT3D trackers.
 
 Type: `string`
 
-The path appended to `url` when making API requests. Must match the platform's actual API endpoint.
+The path appended to `url` for API requests. Must match the platform's actual endpoint.
 
-| Platform    | Default apiPath |
-| ----------- | --------------- |
-| `unit3d`    | `"/api/user"`   |
-| `gazelle`   | `"/ajax.php"`   |
-| `ggn`       | `"/api.php"`    |
-| `nebulance` | `"/api.php"`    |
+| Platform    | Default |
+| ----------- | ------- |
+| `unit3d`    | `/api/user` |
+| `gazelle`   | `/ajax.php` |
+| `ggn`       | `/api.php` |
+| `nebulance` | `/api.php` |
+| `avistaz`   | `/profile` |
 
-```typescript
-// UNIT3D tracker
-apiPath: "/api/user"
-
-// Gazelle tracker
-apiPath: "/ajax.php"
-```
+Almost all trackers use the platform default. Only change it if you've verified the tracker deviates.
 
-Do not change this from the platform default unless you have verified that the tracker uses a non-standard path. Almost no trackers deviate from the defaults above.
+AvistaZ trackers scrape HTML using browser cookies. All five AvistaZ sites (AvistaZ, AnimeZ, PrivateHD, CinemaZ, ExoticaZ) use the same adapter.
 
 ---
 
@@ -306,7 +302,7 @@ Type: `string[]`
 
 The categories of content hosted on the tracker. Must use values from the allowed list exactly as written (case-sensitive):
 
-```
+```md
 Movies, TV, Music, Games, Apps, Sports, Books, Audiobooks, Comics,
 Manga, Anime, XXX, Documentaries, Education, Tutorials, Fanres,
 iOS Apps, Graphics, Audio
@@ -345,7 +341,7 @@ color: "#1a4fc2" // Nebulance blue
 
 Type: `string`
 
-Path to the tracker's logo file under the `public/` directory. The file must actually exist — do not set this field to a path unless you have added the logo. Use `""` if none.
+Path to the tracker's logo file in `public/`. Only set this if the file exists. Use `""` if none. SVG preferred, PNG acceptable.
 
 ```typescript
 logo: "/tracker-logos/aither_logo.svg"
@@ -353,8 +349,6 @@ logo: "/tracker-logos/nebulance_logo.png"
 logo: ""
 ```
 
-SVG is preferred. PNG is acceptable.
-
 ---
 
 ### External Links
@@ -428,9 +422,9 @@ profileUrlPattern: ""
 
 ### Stats
 
-The `stats` block is **omitted entirely** when no real data is available. Do not include the block with `undefined` values — the absence of the block signals that no stats have been sourced yet.
+**Omit the `stats` block entirely** when you don't have real data. Don't include it with `undefined` values — the absence of the block signals that stats haven't been sourced yet.
 
-When you do have data, include only the fields you know:
+When you have data, include only the fields you know:
 
 ```typescript
 stats: {
@@ -468,7 +462,7 @@ interface TrackerUserClass {
 }
 ```
 
-For most trackers, `name` and `requirements` are all you need. Write `requirements` as a human-readable summary — no need to be exhaustive, but include the key numeric thresholds (upload amount, ratio, account age, seed count).
+For most trackers, `name` and `requirements` are enough. Write `requirements` as a human-readable summary — hit the key numeric thresholds (upload, ratio, account age, seed count) without being exhaustive.
 
 ```typescript
 // From aither.ts — upload-based progression
@@ -609,7 +603,7 @@ rules: {
 }
 ```
 
-For `fullRulesMarkdown`, use the array-join format. This keeps diffs clean and avoids multiline template literal indentation issues:
+For `fullRulesMarkdown`, use array-join format. It keeps diffs clean and avoids multiline template literal indentation issues:
 
 ```typescript
 fullRulesMarkdown: [
@@ -629,37 +623,28 @@ fullRulesMarkdown: [
 
 ## 6. Register in the Barrel File
 
-Open `src/data/trackers/index.ts`. You need to add the tracker in two places.
-
-**Step 1 — Add a named export** in the `export *` block at the top. Keep the list alphabetically sorted:
+Open `src/data/trackers/index.ts` and add in three places (alphabetized):
 
+**Export block:**
 ```typescript
-export * from "./morethantv"
-export * from "./mytracker" // add this
-export * from "./myanonamouse"
+export * from "./mytracker"
 ```
 
-**Step 2 — Add a named import** in the import block in the middle of the file:
-
+**Import block:**
 ```typescript
-import { morethantv } from "./morethantv"
-import { mytracker } from "./mytracker" // add this
-import { myanonamouse } from "./myanonamouse"
+import { mytracker } from "./mytracker"
 ```
 
-**Step 3 — Add the tracker to the `ALL_TRACKERS` array** at the bottom. Keep this list alphabetically sorted as well:
-
+**`ALL_TRACKERS` array:**
 ```typescript
 export const ALL_TRACKERS: TrackerRegistryEntry[] = [
   // ...
-  morethantv,
-  mytracker, // add this
-  myanonamouse,
+  mytracker,
   // ...
 ]
 ```
 
-The exported const name must match the variable exported from your tracker file. For a file that exports `export const mytracker: TrackerRegistryEntry = { ... }`, the import and array entry are both `mytracker`.
+The const name must match what you exported from your tracker file.
 
 ---
 
@@ -671,7 +656,7 @@ The exported const name must match the variable exported from your tracker file.
 pnpm tsc
 ```
 
-This will catch any missing required fields or type mismatches. Fix all errors before proceeding.
+This catches missing required fields or type mismatches. Fix all errors before proceeding.
 
 ### Run the test suite
 
@@ -679,7 +664,7 @@ This will catch any missing required fields or type mismatches. Fix all errors b
 pnpm test:run
 ```
 
-The test suite validates tracker registry entries — required fields, valid platform types, correct `apiPath` values for each platform, valid content category names, and that all `bannedGroups` entries are plain strings.
+The test suite validates tracker registry entries: required fields, valid platform types, correct `apiPath` values per platform, valid content category names, and plain-string `bannedGroups` entries.
 
 ### Check it in the UI
 
@@ -698,28 +683,28 @@ If the tracker appears in search results and polls successfully, the registry en
 
 ### Forgetting to add to the barrel file
 
-The most common mistake. If you create `src/data/trackers/mytracker.ts` but do not edit `index.ts`, the tracker will never appear in the UI. The file must be exported and imported in `index.ts`, and the variable must be added to `ALL_TRACKERS`.
+The most common mistake. If you create `src/data/trackers/mytracker.ts` but skip editing `index.ts`, the tracker won't appear in the UI. Export and import it in `index.ts`, and add the variable to `ALL_TRACKERS`.
 
 ### Wrong `platform` type
 
-Using `"unit3d"` for a Gazelle tracker or vice versa will cause the adapter to send the wrong API request. The scheduler will log a `fetch` error or return garbled data. Check the tracker's tech stack — most UNIT3D sites have `/api/user` in their documentation, and most Gazelle sites have `/ajax.php`.
+Using `"unit3d"` for a Gazelle tracker (or vice versa) causes the adapter to send the wrong API request. The scheduler will log a `fetch` error or return garbled data. Check the tracker's tech stack — most UNIT3D sites document `/api/user`, and most Gazelle sites use `/ajax.php`.
 
 ### Wrong `apiPath`
 
-Each platform has a default API path (see the table in the field reference above). Setting `apiPath: "/api/user"` on a Gazelle tracker, for example, will cause every poll to fail with a 404. The path must match what the platform actually serves.
+Each platform has a default API path (see the field reference table above). Setting `apiPath: "/api/user"` on a Gazelle tracker will cause every poll to fail with 404. Match what the platform actually serves.
 
 ### `draft: true` left in a finished entry
 
-If `draft` is `true`, the entry is filtered out of `TRACKER_REGISTRY` at runtime and never shown to users. Remove the field or set `draft: false` when the entry is complete.
+If `draft: true`, the entry is filtered out at runtime and never shown to users. Remove the field or set `draft: false` when you're done.
 
 ### Invalid content category names
 
-The `contentCategories` array only accepts values from the fixed allowed list. A typo like `"Movie"` instead of `"Movies"`, or `"Audiobook"` instead of `"Audiobooks"`, will fail the registry validation tests. The list is case-sensitive.
+The `contentCategories` array only accepts the fixed allowed list. A typo like `"Movie"` instead of `"Movies"` will fail validation. The list is case-sensitive.
 
 ### `color` not a valid hex code
 
-The `color` field must be a full six-digit hex string starting with `#`. Shorthand hex (`#fff`) and named colors (`red`) are not accepted. Use a real hex value.
+The `color` field must be a full six-digit hex string starting with `#`. Shorthand hex (`#fff`) and named colors don't work. Use real hex.
 
 ### Logo path points to a missing file
 
-If you set `logo: "/tracker-logos/mytracker.svg"` but the file does not exist under `public/`, the logo image will silently 404 and show a broken image in the UI. Either add the file or set `logo: ""`.
+If you set `logo: "/tracker-logos/mytracker.svg"` but the file doesn't exist in `public/`, the image will 404 and show broken in the UI. Add the file or set `logo: ""`.
diff --git a/docs/kb/docs/contributing/index.md b/docs/kb/docs/contributing/index.md
deleted file mode 100644
index b5246eaf..00000000
--- a/docs/kb/docs/contributing/index.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# Contributing
-
-This section covers the development workflow for working on Tracker Tracker itself — setting up a local environment, running tests, and keeping the codebase clean before submitting changes.
-
----
-
-## Dev Environment Setup
-
-**Prerequisites:** Node.js >= 22, pnpm, PostgreSQL
-
-```bash
-# 1. Install dependencies
-pnpm install
-
-# 2. Copy the environment template and fill in your values
-cp .env.example .env
-
-# 3. Start a local PostgreSQL instance (Docker is easiest)
-docker run -d \
-  --name tracker-tracker-db \
-  -e POSTGRES_USER=postgres \
-  -e POSTGRES_PASSWORD=postgres \
-  -e POSTGRES_DB=trackertracker \
-  -p 5432:5432 \
-  postgres:16-alpine
-
-# 4. Push the Drizzle schema to the database
-pnpm db:push
-
-# 5. Start the dev server
-pnpm dev
-```
-
-The app will be available at `http://localhost:3000`. On first run it redirects to `/setup` to create a master password.
-
-### Key environment variables
-
-| Variable                  | Description                                      |
-| ------------------------- | ------------------------------------------------ |
-| `DATABASE_URL`            | Postgres connection string                       |
-| `NEXTAUTH_SECRET`         | Random secret for JWE session signing            |
-| `NEXT_PUBLIC_APP_VERSION` | Auto-populated from `package.json` at build time |
-
----
-
-## Running Tests
-
-The test suite uses [Vitest](https://vitest.dev/).
-
-```bash
-# Run all tests once (CI mode)
-pnpm test:run
-
-# Run in watch mode during development
-pnpm test
-```
-
-Test files live in `src/lib/__tests__/` and alongside source files as `*.test.ts`. When adding new adapter logic or utility functions, add a corresponding test file.
-
----
-
-## Type Checking
-
-```bash
-pnpm tsc
-```
-
-This runs `tsc --noEmit` against the full project. The codebase must be clean before merging — no `any` escape hatches without a comment explaining why.
-
----
-
-## Linting
-
-```bash
-pnpm lint
-```
-
-This runs both steps in sequence:
-
-1. `pnpm tsc` — TypeScript type checking
-2. `biome check .` — Biome lint rules (import ordering, unused variables, etc.)
-
-The project uses **Biome** for linting, not ESLint. Do not add ESLint config or ESLint plugins. Biome is also **not** used for formatting — Prettier handles that separately via `pnpm format`.
-
-To check formatting without writing:
-
-```bash
-pnpm format:check
-```
-
----
-
-## Database Schema Changes
-
-The project uses **Drizzle's schema-first approach**. All schema changes go in `src/lib/db/schema.ts`. Never write raw SQL migrations.
-
-After editing the schema:
-
-```bash
-pnpm db:push
-```
-
-This pushes schema changes directly to your local database. For production, the same command applies — there is no separate migration file to commit.
-
----
-
-## Project Conventions
-
-- **Package manager:** pnpm only. Never use npm or yarn.
-- **File header comment:** Every JS/TS file starts with `// path/to/file.ts` (relative to project root).
-- **Function index comment:** If a file contains five or more functions, add a comment block at the top listing them all.
-- **Imports:** Import only what you need — `import { useEffect } from "react"`, not `React.useEffect`.
-- **Error handling:** Never swallow errors silently. Wrap thrown errors with context.
-
----
-
-## Further Reading
-
-- [Tracker API Responses](tracker-responses.md) — Raw JSON shapes from each tracker platform, used as a reference when adding new trackers or debugging adapter issues.
diff --git a/docs/kb/docs/contributing/slot-system.md b/docs/kb/docs/contributing/slot-system.md
index dfb27566..0d0a912a 100644
--- a/docs/kb/docs/contributing/slot-system.md
+++ b/docs/kb/docs/contributing/slot-system.md
@@ -1,16 +1,16 @@
 # Bento Grid Slot System
 
-The tracker detail page's Data & Analytics tab uses a slot-based bento grid to render per-platform stat cards alongside the universal core stats. This document covers how the system works and how to add a new stat card.
+The tracker detail page's Data & Analytics tab uses a slot-based bento grid to render platform-specific stat cards alongside universal core stats. Learn how it works and how to add a new card.
 
 ---
 
 ## What is the bento grid?
 
-The analytics tab combines eight fixed core stats (Uploaded, Downloaded, Ratio, Buffer, Seeding, Leeching, Hit & Runs, Required Ratio) with a variable number of platform-specific slot cards. Slots are registered centrally and each slot decides at render time whether it has anything to show for the current tracker — if not, it returns `null` and is excluded entirely from the layout.
+The analytics tab combines eight fixed core stats with platform-specific slot cards. Slots decide at render time whether to show — return `null` to hide.
 
-The grid needs to pack single-height and double-height cards into a clean rectangular layout without orphaned cells or large gaps. Rather than using CSS auto-placement (which can leave unpredictable holes), the layout algorithm runs ahead of time and produces explicit `row-start`, `col-start`, and `row-span` classes for every card. Each responsive breakpoint has its own algorithm and produces an independent placement.
+The grid packs 1-tall and 2-tall cards cleanly without orphans or gaps. Instead of CSS auto-placement, the layout algorithm pre-computes `row-start`, `col-start`, and `row-span` classes per breakpoint.
 
-**Why explicit positioning?** Tailwind's CSS grid auto-placement works fine for uniform grids, but breaks down when mixing 1-tall and 2-tall cards across multiple breakpoints. Explicit positioning gives full control over where each card lands and eliminates gaps.
+**Why explicit positioning?** Tailwind auto-placement leaves holes when mixing 1-tall and 2-tall cards. Explicit positioning gives full control.
 
 ---
 
@@ -34,14 +34,12 @@ This document focuses on **`stat-card`** slots, as they are the most common thin
 
 ## Slot sizes
 
-Each stat-card slot has a `span` field that determines how many grid rows it occupies.
+| `span` | CardType | Description |
+| --- | --- | --- |
+| `1` (default) | `single` | 1x1 card |
+| `2` | `double` or `triple` | 2-row tall card; algorithm may promote to `triple` (3 rows) for better layout |
 
-| `span`        | CardType in layout                 | Description                                                                                                                             |
-| ------------- | ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `1` (default) | `single`                           | Standard 1×1 card — one row tall, one column wide                                                                                       |
-| `2`           | `double` (or `triple` if promoted) | Tall card — two rows tall, one column wide. Can be promoted to `triple` (three rows) by the algorithm when it produces a better layout. |
-
-The algorithm may promote a `double` to a `triple` (three rows) when doing so reduces gaps or eliminates an orphan. This is purely a layout decision — the slot itself only declares `span: 1` or `span: 2`. The `triple` type exists in `CardType` but is never assigned directly by slot authors.
+Promotion happens automatically when it reduces gaps. You only declare `span: 1` or `span: 2` — the algorithm handles `triple`.
 
 ---
 
@@ -49,25 +47,24 @@ The algorithm may promote a `double` to a `triple` (three rows) when doing so re
 
 ### SlotContext
 
-The object passed to every slot's `resolve` function:
+Data your slot's `resolve` function receives:
 
 ```ts
-// src/lib/slot-types.ts
 export interface SlotContext {
-  tracker: TrackerSummary // DB row + computed fields
+  tracker: TrackerSummary
   latestSnapshot: Snapshot | null
   snapshots: Snapshot[]
   meta: GGnPlatformMeta | GazellePlatformMeta | NebulancePlatformMeta | null
   registry: TrackerRegistryEntry | undefined
-  accentColor: string // tracker's hex color, e.g. "#00d4ff"
+  accentColor: string // hex, e.g. "#00d4ff"
 }
 ```
 
-`meta` is the platform-specific extra data returned by the adapter. It is `null` for UNIT3D trackers (they have no extra meta yet). Always guard with `if (!meta)` before accessing platform fields.
+`meta` is null for UNIT3D trackers and platforms without extra data. Always guard `if (!meta)` before accessing platform fields.
 
 ### ResolvedSlot
 
-What the registry produces after calling `resolve`:
+What the registry produces after it calls `resolve`:
 
 ```ts
 // src/lib/slot-types.ts
@@ -101,26 +98,26 @@ interface SlotDefinition<P = Record<string, unknown>> {
 
 ## StatCard variants
 
-All stat-card slots render via the unified `StatCard` component in `src/components/ui/StatCard.tsx`. It has three variants selected by the `type` prop.
+All stat-card slots use `StatCard` from `src/components/ui/StatCard.tsx`. Pick one of three variants via `type`.
 
 ### `basic` (default)
 
-Single hero value. Use for any scalar metric.
+Single hero value for any scalar metric.
 
 ```ts
 interface StatCardBasicProps {
-  type?: "basic" // optional — "basic" is the default
-  label: string // card title, displayed uppercase
-  value: string | number // large hero number
-  unit?: string // displayed small next to value, e.g. "BON", "GiB"
-  subtitle?: string // small text below the value
-  subValue?: string // secondary line, mono font, tertiary color
+  type?: "basic"
+  label: string
+  value: string | number
+  unit?: string // "BON", "GiB", etc.
+  subtitle?: string
+  subValue?: string
   trend?: "up" | "down" | "flat"
-  tooltip?: string // adds a "?" button with a popover
-  icon?: ReactNode // 16×16 icon in the top-right corner
-  accentColor?: string // hex color for the glow effect
+  tooltip?: string // shows "?" button with popover
+  icon?: ReactNode // 16x16
+  accentColor?: string
   alert?: "warn" | "danger"
-  alertReason?: string // shown in a "!" tooltip when alert is set
+  alertReason?: string // shown in "!" tooltip
 }
 ```
 
@@ -153,18 +150,18 @@ interface StatCardStackedProps {
 }
 ```
 
-A `stacked` card with `span: 2` occupies two grid rows, giving the rows more vertical breathing room.
+A `stacked` card with `span: 2` takes two grid rows, giving rows more vertical space.
 
 ### `ring`
 
-Countdown progress ring. Used exclusively for the Login Deadline card. Renders an SVG ring that fills as the deadline approaches and turns amber → red as it gets close.
+Countdown progress ring for login deadlines. Renders an SVG ring that fills and turns amber → red as the deadline nears.
 
 ```ts
 interface StatCardRingProps {
-  type: "ring" // required
+  type: "ring"
   title?: string // defaults to "Login Deadline"
-  lastAccessAt: string // ISO date string of last tracker visit
-  loginIntervalDays: number // from registry entry's rules.loginIntervalDays
+  lastAccessAt: string // ISO date
+  loginIntervalDays: number
   tooltip?: string
   accentColor?: string
   alert?: "warn" | "danger"
@@ -172,7 +169,7 @@ interface StatCardRingProps {
 }
 ```
 
-The ring variant is driven by data from `ctx.tracker.lastAccessAt` and `ctx.registry?.rules?.loginIntervalDays`. It is unlikely you will need a second ring card.
+You'll rarely need more than one ring card.
 
 ---
 
@@ -180,7 +177,7 @@ The ring variant is driven by data from `ctx.tracker.lastAccessAt` and `ctx.regi
 
 ### 1. Decide what data you need
 
-Look at `SlotContext` above. If your data is in `latestSnapshot`, you can read it directly. If it requires platform-specific `meta`, check what fields are available on the relevant `*PlatformMeta` type in `src/lib/adapters/types.ts`.
+If your data is in `latestSnapshot`, read it directly. For platform-specific `meta`, check `*PlatformMeta` in `src/lib/adapters/types.ts`.
 
 ### 2. Write the slot definition
 
@@ -238,22 +235,19 @@ const myTrackerTokensSlot: SlotDefinition<StatCardStackedProps> = {
 
 ### 3. Register it
 
-Add the slot to the `SLOT_DEFINITIONS` array at the bottom of `slot-registry.ts`. The array order does not determine layout position — `priority` does. Lower priority numbers appear first (leftmost in the first available row).
+Add the slot to `SLOT_DEFINITIONS` in `slot-registry.ts`. Array order doesn't matter — `priority` does. Lower priority = renders first.
 
 ```ts
 export const SLOT_DEFINITIONS: AnySlotDefinition[] = [
-  // stat-card slots
   loginDeadlineSlot,
   goldSlot,
-  // ... existing slots ...
   myTrackerInvitesSlot, // add here
   myTrackerTokensSlot,
-  // badge slots
   // ...
 ]
 ```
 
-That is all. The resolver, layout algorithm, and renderer pick it up automatically.
+Done. The system picks it up automatically.
 
 ### 4. Verify the resolve guard
 
@@ -292,29 +286,29 @@ The first N cards in the `single` pool are marked `fixed` (N = number of columns
 
 ### 4-column breakpoint (`findOptimalLayout4Col`)
 
-This is the primary desktop layout. It brute-forces all valid combinations of column count (3 or 4) and double-to-triple promotions, then ranks them by:
+This is the main desktop layout. It tries all valid combinations of column count (3 or 4) and promotions, ranking by:
 
 1. No orphaned card in the last row (preferred)
 2. Fewest gap cells
 3. Prefer 4 columns over 3
-4. Fewest triples (promotions)
+4. Fewest promotions
 
-The winning configuration's cards each receive a `{ row, col, span }` placement. `getCardClasses` turns these into static Tailwind classes (`row-start-N col-start-N row-span-N`). The row/col start classes are pre-enumerated as lookup tables (up to 30 rows) rather than generated dynamically, because Tailwind v4 requires static class names for its JIT scanner.
+The winner's cards get a `{ row, col, span }` placement. `getCardClasses` converts these to static Tailwind classes (`row-start-N col-start-N row-span-N`). Row/col classes are pre-enumerated lookup tables (up to 30 rows) instead of generated, because Tailwind v4 requires static class names.
 
-**Placement order within the winner:**
+**Placement order:**
 
 - Row 1: core stat singles (up to 4)
-- Triple-height blocks: promoted doubles fill columns left to right; remaining columns in the same row block are filled with singles stacked 3-tall
-- Double-height blocks: doubles fill columns left to right; remaining columns filled with pairs of singles
-- Remaining singles: flow left to right, top to bottom in remaining rows
+- Triple-height blocks: promoted doubles fill columns left to right; other columns get stacked singles
+- Double-height blocks: doubles fill columns left to right; other columns get pairs of singles
+- Remaining singles: flow left to right, top to bottom
 
 ### 3-column breakpoint (`findOptimalLayout3Col`)
 
-Fixed 3 columns. Same brute-force promotion strategy but ranks by: no-orphan → fewest gaps → fewest triples (no column-count preference since columns are fixed). Implemented and tested. **Currently wired into the `md` breakpoint** (`hidden md:grid md:grid-cols-3 lg:hidden`).
+Fixed 3 columns. Same brute-force strategy, ranks by: no-orphan → fewest gaps → fewest triples. **Currently wired to the `md` breakpoint** (`hidden md:grid md:grid-cols-3 lg:hidden`).
 
 ### 2-column breakpoint (`findOptimalLayout2Col`)
 
-Fixed 2 columns. Deterministic: promotes at most one double to a triple when the total cell count is odd (to keep columns balanced). **Currently wired into the mobile grid** (`grid grid-cols-2 md:hidden`).
+Fixed 2 columns. Deterministic: promotes at most one double to triple when the total cell count is odd. **Currently wired to mobile** (`grid grid-cols-2 md:hidden`).
 
 ### Breakpoint wiring (current status)
 
@@ -324,39 +318,39 @@ Fixed 2 columns. Deterministic: promotes at most one double to a triple when the
 | Medium (`md` to `lg`) | `md:grid-cols-3`                     | `findOptimalLayout3Col` | Wired and active |
 | Large (`>= lg`)       | `lg:grid-cols-3` or `lg:grid-cols-4` | `findOptimalLayout4Col` | Wired and active |
 
-The large grid uses `lg:grid-cols-4` when the algorithm selects 4 columns, or `lg:grid-cols-3` when it finds 3 columns produces fewer gaps.
+The large grid uses `lg:grid-cols-4` when the algorithm picks 4 columns, or `lg:grid-cols-3` when 3 produces fewer gaps.
 
 ---
 
 ## How the renderer maps cards to content
 
-In `AnalyticsTab.tsx`, `renderLayoutCards` iterates the placed cards and maps each card ID to a React element:
+In `AnalyticsTab.tsx`, `renderLayoutCards` iterates placed cards and maps each ID to a React element:
 
-- `s1` through `s{coreCount}` → core stat descriptors from `buildCoreStatDescriptors`
-- `s{coreCount + 1}` onward → `span: 1` slot cards in priority order
-- `t1`, `t2`, ... → the first T promoted slot doubles (triples)
-- `d1`, `d2`, ... → the remaining slot doubles (at offset T)
+- `s1` through `s{coreCount}` → core stat descriptors
+- `s{coreCount + 1}` onward → `span: 1` slot cards, by priority
+- `t1`, `t2`, ... → the first T promoted doubles (triples)
+- `d1`, `d2`, ... → remaining doubles (offset by T)
 
-The full pipeline for stat-card slots:
+The full pipeline:
 
-```
-SlotContext built in tracker detail page
-  → SLOT_DEFINITIONS[n].resolve(ctx) called for each definition
-  → null returns filtered out
-  → surviving slots sorted by priority
-  → split into singleSlots (span=1) and doubleSlots (span=2)
-  → counts passed to layout algorithms
-  → layout algorithms return PlacedCard[]
+```md
+Build SlotContext in tracker detail page
+  → Call SLOT_DEFINITIONS[n].resolve(ctx) for each
+  → Filter out null returns
+  → Sort survivors by priority
+  → Split into singleSlots (span=1) and doubleSlots (span=2)
+  → Pass counts to layout algorithms
+  → Layout algorithms return PlacedCard[]
   → renderLayoutCards maps card IDs to elements
   → getCardClasses(card) produces positioning classes
-  → rendered as <div className={positionClasses}>{element}</div>
+  → Render as <div className={positionClasses}>{element}</div>
 ```
 
 ---
 
 ## Adding a new badge slot
 
-Badge slots follow the same `SlotDefinition` shape but use `SlotBadge` as the component:
+Badge slots use the same `SlotDefinition` shape but render via `SlotBadge`:
 
 ```ts
 const myBadgeSlot: SlotDefinition<SlotBadgeProps> = {
@@ -371,7 +365,7 @@ const myBadgeSlot: SlotDefinition<SlotBadgeProps> = {
 }
 ```
 
-`SlotBadgeProps` variants: `"default"`, `"accent"`, `"warn"`, `"danger"`. Badges are collected separately from stat-card slots and rendered as a horizontal pill row, not inside the bento grid.
+`SlotBadgeProps` variants: `"default"`, `"accent"`, `"warn"`, `"danger"`. Badges are collected separately and rendered as a horizontal pill row above the bento grid.
 
 ---
 
diff --git a/docs/kb/docs/contributing/tracker-responses-gazelle.md b/docs/kb/docs/contributing/tracker-responses-gazelle.md
index 0ffe9382..726d5b05 100644
--- a/docs/kb/docs/contributing/tracker-responses-gazelle.md
+++ b/docs/kb/docs/contributing/tracker-responses-gazelle.md
@@ -2,21 +2,21 @@
 
 ## Endpoint (action=index)
 
-```
+```bash
 GET {baseUrl}/ajax.php?action=index
 ```
 
-The path `ajax.php` comes from the tracker's `apiPath` field. This is standard across all Gazelle forks.
+All Gazelle forks use `ajax.php` by default, but you can override it per tracker via `apiPath`.
 
 ## Authentication
 
-API token passed as an HTTP header:
+Most forks expect the token as a header:
 
-```
+```bash
 Authorization: token TOKEN
 ```
 
-Some forks (configured with `authStyle: "raw"`) use the token value directly without the `token ` prefix. The adapter checks `options.authStyle` to handle this.
+Some sites (`authStyle: "raw"`) omit the `token` prefix. The adapter checks `options.authStyle` to handle both.
 
 ## Example Response
 
@@ -50,7 +50,7 @@ Some forks (configured with `authStyle: "raw"`) use the token value directly wit
 }
 ```
 
-Byte values are **raw integers** (bytes), not formatted strings. The `id` field in the top-level response is the user's remote ID — the adapter caches this as `remoteUserId` for use in the enrichment call.
+Byte values are raw integers (bytes), not formatted strings. The `id` field is the remote user ID — cached as `remoteUserId` for the optional enrichment call.
 
 ## Field Mapping (action=index)
 
@@ -75,14 +75,12 @@ Byte values are **raw integers** (bytes), not formatted strings. The `id` field
 
 ## Enrichment Response (action=user)
 
-Trackers configured with `enrich: true` make a second call after the index request:
+If the tracker has `gazelleEnrich: true`, a second call fetches the full profile (warned status, join date, reliable seeding/leeching counts, ranks, avatar):
 
-```
+```bash
 GET {baseUrl}/ajax.php?action=user&id={USER_ID}
 ```
 
-This call fetches the full user profile including warned status, join date, seeding/leeching counts from the community object, ranks, and avatar.
-
 ### Example Response
 
 ```json
@@ -144,32 +142,32 @@ This call fetches the full user profile including warned status, join date, seed
 
 ### What the enrichment step overrides
 
-| TrackerStats field | Source in action=user response   | Notes                                    |
-| ------------------ | -------------------------------- | ---------------------------------------- |
-| `warned`           | `personal.warned`                | Overrides the `false` default from index |
-| `joinedDate`       | `stats.joinedDate`               | Not available from index                 |
-| `lastAccessDate`   | `stats.lastAccess`               | Not available from index                 |
-| `bufferBytes`      | `stats.buffer`                   | Richer than the calculated value         |
-| `seedingCount`     | `community.seeding`              | More reliable than index for many forks  |
-| `leechingCount`    | `community.leeching`             | More reliable than index for many forks  |
-| `avatarUrl`        | `avatar`                         | Not available from index                 |
-| `platformMeta`     | `personal`, `ranks`, `community` | Full `GazellePlatformMeta` object        |
+| Field | Source | Notes |
+| --- | --- | --- |
+| `warned` | `personal.warned` | Overrides `false` default |
+| `joinedDate` | `stats.joinedDate` | Index has none |
+| `lastAccessDate` | `stats.lastAccess` | Index has none |
+| `bufferBytes` | `stats.buffer` | Better than calculated value |
+| `seedingCount` | `community.seeding` | More reliable than index |
+| `leechingCount` | `community.leeching` | More reliable than index |
+| `avatarUrl` | `avatar` | Index has none |
+| `platformMeta` | `personal`, `ranks`, `community` | Full object |
 
-If the enrichment call fails for any reason, the adapter continues with core stats from the index response — the failure is non-fatal.
+If enrichment fails, we keep the index stats. No problem.
 
 ---
 
 ## Gazelle Fork Variations
 
-| Site                 | bonusPoints field | freeleechTokens | seedingcount in index |
-| -------------------- | ----------------- | --------------- | --------------------- |
-| Redacted (RED)       | `bonusPoints`     | Sometimes       | No                    |
-| Orpheus (OPS)        | `bonusPoints`     | Sometimes       | No                    |
-| BroadcasTheNet (BTN) | Varies            | No              | No                    |
-| PassThePopcorn (PTP) | Varies            | No              | No                    |
-| AnimeBytes (AB)      | Varies            | Varies          | No                    |
+| Site | bonusPoints field | freeleechTokens | seedingcount in index |
+| --- | --- | --- | --- |
+| Redacted (RED) | `bonusPoints` | Sometimes | No |
+| Orpheus (OPS) | `bonusPoints` | Sometimes | No |
+| BroadcasTheNet (BTN) | Varies | No | No |
+| PassThePopcorn (PTP) | Varies | No | No |
+| AnimeBytes (AB) | Varies | Varies | No |
 
-GazelleGames (GGn) is handled by its own separate adapter — see the [GGn page](tracker-responses-ggn.md).
+GGn uses a separate adapter — see the [GGn page](tracker-responses-ggn.md).
 
 ## Supported Trackers
 
diff --git a/docs/kb/docs/contributing/tracker-responses-ggn.md b/docs/kb/docs/contributing/tracker-responses-ggn.md
index 62c3f193..5af0563f 100644
--- a/docs/kb/docs/contributing/tracker-responses-ggn.md
+++ b/docs/kb/docs/contributing/tracker-responses-ggn.md
@@ -1,19 +1,19 @@
 # GGn (GazelleGames) API Response
 
-GGn shares Gazelle's overall architecture but differs enough to warrant its own adapter. It uses query-parameter auth instead of headers, a two-step fetch on first poll, and its own field naming conventions.
+GGn is Gazelle-based but uses query-param auth (not headers), two calls on first poll, and different field names. Hence its own adapter.
 
 ## Endpoint
 
-Two requests per poll (first poll only — subsequent polls skip step 1 using the cached `remoteUserId`):
+First poll: two requests. Subsequent polls: one request (using cached `remoteUserId`).
 
-```
+```bash
 GET {baseUrl}/api.php?request=quick_user&key={TOKEN}
 GET {baseUrl}/api.php?request=user&id={USER_ID}&key={TOKEN}
 ```
 
 ## Authentication
 
-API token passed as a query parameter: `?key=TOKEN`. No authorization header.
+API token as query parameter: `?key=TOKEN`. No authorization header.
 
 ## Example quick_user Response
 
@@ -27,7 +27,7 @@ API token passed as a query parameter: `?key=TOKEN`. No authorization header.
 }
 ```
 
-The only purpose of this call is to resolve the user's numeric ID. Once the adapter has stored this as `remoteUserId` in the database, it skips this call on all future polls and goes straight to `request=user`.
+Gets your numeric ID. After caching as `remoteUserId`, we skip this and go straight to `request=user` on subsequent polls.
 
 ## Example user Response
 
@@ -151,22 +151,21 @@ The only purpose of this call is to resolve the user's numeric ID. Once the adap
 
 ## Quirks
 
-**`ratio` is a string.** Unlike every other platform, GGn returns `stats.ratio` as a string (`"0.99699"`), not a number. The adapter handles this with:
+**`ratio` is a string.** Returns as `"0.99699"` instead of a number:
 
 ```typescript
-const ratio =
-  typeof resp.stats.ratio === "number" ? resp.stats.ratio : parseFloat(resp.stats.ratio) || 0
+const ratio = typeof resp.stats.ratio === "number" ? resp.stats.ratio : parseFloat(resp.stats.ratio) || 0
 ```
 
-**Seedbonus is called `gold`.** GGn has a currency called gold, not bonus points. The adapter maps `stats.gold` → `seedbonus` in the `TrackerStats` output so the dashboard can display it consistently.
+**Seedbonus is called `gold`.** We map `stats.gold` → `seedbonus` so dashboards are consistent.
 
-**Seeding and leeching are paranoia-dependent.** `community.seeding` and `community.leeching` return `null` when the user's paranoia level hides community stats. The adapter defaults to `0` in that case, but `null` in the raw response is expected and normal for many GGn users.
+**Seeding/leeching are paranoia-dependent.** Users with paranoia enabled return `null`. We default to `0`.
 
-**`hnrs` (hit and runs) can be `null`.** GGn tracks hit-and-runs as `personal.hnrs`, but it can be `null` if the user has none or the field is hidden. The adapter passes `null` through directly to `hitAndRuns`.
+**`hnrs` can be `null`.** Stored in `personal.hnrs`, null if hidden. Passed through as-is.
 
-**Two-step fetch, first poll only.** The `quick_user` call exists solely to resolve the numeric user ID. After the first successful poll, the adapter stores `remoteUserId` in the database and skips `quick_user` on all subsequent polls, going directly to `request=user&id=X`. This saves one round-trip per poll cycle.
+**Two-step fetch, first poll only.** Afterward, we cache `remoteUserId` and hit `request=user&id=X` directly.
 
-**Buffs are upload/download multipliers.** The `buffs` object contains per-category multipliers active on the user's account (e.g. `Upload: 2` means 2x upload credit). These are stored in `GGnPlatformMeta.buffs` but not currently used in the dashboard display — tracked for future buffer projection features.
+**Buffs are multipliers.** Stored in `GGnPlatformMeta.buffs` (e.g., `Upload: 2` = 2x credit). Not displayed yet, but reserved for buffer projections.
 
 ## Supported Trackers
 
diff --git a/docs/kb/docs/contributing/tracker-responses-mam.md b/docs/kb/docs/contributing/tracker-responses-mam.md
index 60b86d1f..253fa794 100644
--- a/docs/kb/docs/contributing/tracker-responses-mam.md
+++ b/docs/kb/docs/contributing/tracker-responses-mam.md
@@ -1,42 +1,34 @@
 # MAM (MyAnonaMouse) API Response
 
-MAM uses a custom JSON API with cookie-based authentication. A single endpoint returns all user stats including a detailed snatch summary breakdown.
+MAM uses a custom JSON API with cookie auth. One endpoint returns stats plus a detailed snatch breakdown.
 
 ## Endpoint
 
-One request per poll:
-
-```
+```bash
 GET {baseUrl}/jsonLoad.php?snatch_summary&notif
 ```
 
-The `snatch_summary` query parameter enables the detailed torrent category breakdown. The `notif` parameter includes notification counts (PMs, tickets, requests). Without these, only basic stats (username, ratio, uploaded, downloaded) are returned.
+Add `snatch_summary` for torrent breakdown by category, and `notif` for notification counts (PMs, tickets, requests). Without them, you get only basic stats.
 
 Optional parameters (not used by the adapter):
 
-- `clientStats` — includes per-client connectivity info from MAM's perspective (30min cache). Returns empty array without `?id=`, full breakdown with `?id={uid}`.
-- `pretty` — pretty-prints the JSON output
-- `id={userid}` — load a specific user's data. When set to your own UID, `clientStats` returns the full per-IP/port breakdown. When set to another user's UID, returns limited public data.
+- `clientStats` — per-client connectivity info (30-min cache)
+- `pretty` — pretty-prints JSON
+- `id={userid}` — load specific user data (limited public data for others)
 
-**Note:** The `?id=` parameter does NOT return additional profile fields (like join date). The response shape is identical to the self-lookup — `created` and `update` fields are cache timestamps that change between requests, not account dates.
+**Note:** The `?id=` parameter doesn't add fields like join date. The `created` and `update` fields are cache timestamps, not account dates (see Quirks).
 
 ## Authentication
 
-MAM uses a `mam_id` session cookie instead of an API key or authorization header:
+Use a session cookie (`mam_id`) instead of an API key:
 
-```
+```bash
 Cookie: mam_id={SESSION_COOKIE}
 ```
 
-The session cookie is obtained from MAM's Security Settings page (User Preferences → Security). Users should create an IP-locked or ASN-locked session for API use. **Session cookies rotate monthly** — users must update the stored token periodically.
+Get it from User Preferences → Security. Create an IP-locked or ASN-locked session for API use. MAM rotates these monthly, so refresh periodically.
 
-Auth failures return an HTML error string, not JSON:
-
-```
-Error, you are not signed in <br />Other error
-```
-
-The adapter detects this by checking for the absence of `username` in the response.
+Auth fails silently — you get HTML instead of JSON. We detect it by checking if `username` is missing.
 
 ## Example Response
 
@@ -116,48 +108,46 @@ The adapter detects this by checking for the absence of `username` in the respon
 
 ## Snatch Summary Categories
 
-MAM's snatch summary groups all torrents into categories based on seeding status and satisfaction:
-
-| Category | Field | Meaning | Red flag? |
+| Category | Field | Meaning | Alert? |
 | --- | --- | --- | --- |
-| Seeding - Satisfied | `sSat` | Fully seeded past 72hrs, still active | No |
-| Seeding - H&R - Not Yet Satisfied | `seedHnr` | Active HnR being resolved by seeding | Yes |
-| Seeding - pre-H&R - Not Yet Satisfied | `seedUnsat` | Not yet HnR, still seeding toward 72hrs | No |
-| Seeding - Uploads | `upAct` | User's own uploads, still seeding | No |
-| Not Seeding - H&R - Not Yet Satisfied | `inactHnr` | **Danger:** inactive HnR, needs immediate attention | Yes |
-| Not Seeding - pre-H&R - Not Yet Satisfied | `inactUnsat` | Ticking clock toward HnR status | Yes |
-| Not Seeding - Satisfied | `inactSat` | Completed, no longer seeding | No |
-| Not Seeding - Uploads | `upInact` | User's uploads, not currently seeding | No |
-| Leeching | `leeching` | Currently downloading | No |
-| Unsatisfied | `unsat` | Total unsatisfied (includes `limit` field) | No (has limit) |
-
-Each category object has: `name` (human-readable), `count` (number), `red` (boolean — MAM flags it as concerning), `size` (bytes or null).
+| Seeding - Satisfied | `sSat` | Past 72h, active | No |
+| Seeding - H&R - Not Yet Satisfied | `seedHnr` | Active HnR being resolved | Yes |
+| Seeding - pre-H&R - Not Yet Satisfied | `seedUnsat` | Seeding toward 72h | No |
+| Seeding - Uploads | `upAct` | Own uploads, seeding | No |
+| Not Seeding - H&R - Not Yet Satisfied | `inactHnr` | Inactive HnR — urgent | Yes |
+| Not Seeding - pre-H&R - Not Yet Satisfied | `inactUnsat` | Ticking clock to HnR | Yes |
+| Not Seeding - Satisfied | `inactSat` | Completed | No |
+| Not Seeding - Uploads | `upInact` | Own uploads, inactive | No |
+| Leeching | `leeching` | Downloading | No |
+| Unsatisfied | `unsat` | Total unsatisfied | No |
+
+Each object: `name`, `count`, `red` (boolean alert flag), `size` (bytes or null).
 
 ## Quirks
 
-**Dual byte representation.** MAM returns both formatted strings (`uploaded`: `"5.125 TiB"`) and raw integers (`uploaded_bytes`: `5635036489461`). The adapter uses the raw integers directly via `BigInt()`, avoiding the `parseBytes()` parsing that UNIT3D requires.
+**Dual byte representation.** Both formatted strings (`"5.125 TiB"`) and raw bytes. We use raw bytes with `BigInt()` — no parsing needed.
 
-**Bonus points cap at 99,999.** MAM has a hard cap on seedbonus. Points earned above this are lost. The notification system should alert when the cap is reached.
+**Bonus points cap at 99,999.** Hard ceiling. Anything above is lost.
 
-**FL Wedges are not bonus points.** Wedges (`wedges`) are a separate currency from seedbonus. They are earned from the Millionaire's Vault and can be exchanged for Personal or Staff Freeleech on individual torrents.
+**FL Wedges are separate currency.** Earned from Millionaire's Vault, traded for personal or staff freeleech.
 
-**Cookie auth, not API key.** MAM is the only platform using cookie-based auth. The `mam_id` session cookie must be set up in MAM's Security Settings as an IP-locked or ASN-locked session. Regular browser session cookies also work but are less stable. Cookies rotate monthly.
+**Cookie auth only.** Set `mam_id` as IP-locked or ASN-locked in Security Settings. Monthly rotations are normal.
 
-**`created` and `update` are cache timestamps, NOT account dates.** Verified: these values change between consecutive API calls (observed `1774552832` → `1774553470` seconds apart). They reflect when MAM's internal cache was last refreshed. **MAM does not expose account join date via any API endpoint** — users must enter it manually.
+**`created` and `update` are cache timestamps.** They change on each API call — they're not account dates. MAM doesn't expose join date via API.
 
-**`unsat.limit` is class-dependent.** The unsatisfied torrent limit varies by user class: User=50, Power User=100, VIP=150, above VIP=200. The API returns the current limit for the authenticated user.
+**`unsat.limit` is class-dependent.** User=50, Power User=100, VIP=150, above VIP=200.
 
-**72-hour seed requirement.** MAM requires 72 hours of seeding within 30 days per torrent. Failure to meet this results in a Hit & Run. The `inactHnr` count represents torrents that have passed the deadline without sufficient seeding.
+**72-hour seed requirement.** 72h seeding per torrent within 30 days, or it's an H&R. `inactHnr` = torrents past deadline that you stopped seeding.
 
 ## Other MAM Endpoints (Not Used by Adapter)
 
-The following endpoints exist in the MAM API but are not used by the Tracker Tracker adapter. They are documented here for reference and potential future use.
+Alternative endpoints for reference and future use.
 
 ### `/jsonLoad.php?clientStats`
 
-Returns torrent client connectivity information from MAM's perspective (30-minute cache). Not used by the adapter because Tracker Tracker has its own qBittorrent integration. However, the data is useful for diagnosing connectivity issues since it shows what MAM sees.
+Torrent client connectivity info from MAM's perspective (30-min cache). Not used because Tracker Tracker has its own qBT integration, but useful for diagnosing MAM-side connectivity.
 
-When called without `?id=`, `clientStats` is an empty array. When called with `?id={uid}` (your own user ID), it returns the full client breakdown:
+Without `?id=`: empty array. With `?id={uid}` (your ID): full breakdown:
 
 ```json
 {
@@ -221,7 +211,7 @@ Note: A single user can have multiple client entries across different IPs/ports
 
 ### `/jsonLoad.php?notif`
 
-Returns notification counts (PMs, tickets, requests). The adapter includes `?notif` in every poll alongside `?snatch_summary`. The counts are stored in `MamPlatformMeta` (`unreadPMs`, `openTickets`, `pendingRequests`, `unreadTopics`) and surfaced as an unread badge on the tracker detail page.
+Notification counts (PMs, tickets, requests). Included in every poll alongside `?snatch_summary`. Stored in `MamPlatformMeta` and surfaced as an unread badge on the tracker detail page.
 
 The `notifs` object appears when `?notif` is included:
 
@@ -242,18 +232,18 @@ These fields are merged into the standard `/jsonLoad.php` response alongside the
 
 ### `/json/userBonusHistory.php`
 
-Shows a history of bonus points and wedge transactions. Requires `mam_id` cookie auth on `www.myanonamouse.net`.
+Bonus points and wedge transaction history. Requires `mam_id` cookie auth on `www.myanonamouse.net`.
 
 **Parameters:**
 
 | Parameter | Type | Description |
 | --- | --- | --- |
-| `other_userid` | int | Filter to transactions with a specific user |
-| `type[]` | list | Which transaction types to show: `giftPoints`, `giftWedge`, `wedgePF`, `wedgeGFL`, `torrentThanks`, `millionaires` |
+| `other_userid` | int | Filter by user |
+| `type[]` | list | Transaction types: `giftPoints`, `giftWedge`, `wedgePF`, `wedgeGFL`, `torrentThanks`, `millionaires` |
 
-**Example request:**
+**Example:**
 
-```
+```bash
 GET /json/userBonusHistory.php?type[]=giftWedge&type[]=wedgePF&type[]=wedgeGFL
 ```
 
@@ -304,11 +294,11 @@ GET /json/userBonusHistory.php?type[]=giftWedge&type[]=wedgePF&type[]=wedgeGFL
 
 ### `/json/dynamicSeedbox.php`
 
-Sets the dynamic seedbox IP. Operational tool for VPN/seedbox users — not relevant to stats tracking. Requires a specially configured API session (ASN-locked + Dynamic Seedbox permission) on `t.myanonamouse.net`.
+Sets the dynamic seedbox IP. For VPN/seedbox users, not relevant to stats tracking. Requires specially configured API session (ASN-locked + Dynamic Seedbox permission) on `t.myanonamouse.net`.
 
-**Rate limit:** Once per hour (rolling window).
+**Rate limit:** Once per hour.
 
-**Example response (success):**
+**Success:**
 
 ```json
 {
@@ -320,7 +310,7 @@ Sets the dynamic seedbox IP. Operational tool for VPN/seedbox users — not rele
 }
 ```
 
-**Example response (rate limited):**
+**Rate limited:**
 
 ```json
 {
@@ -346,7 +336,7 @@ Sets the dynamic seedbox IP. Operational tool for VPN/seedbox users — not rele
 
 ### `/json/jsonIp.php`
 
-Returns the caller's current IP, ASN, and AS organization name. Available on both `www.myanonamouse.net` and `t.myanonamouse.net`. No authentication required.
+Current IP, ASN, and organization name. Available on both `www` and `t` subdomains. No auth required.
 
 ```json
 {
diff --git a/docs/kb/docs/contributing/tracker-responses-unit3d.md b/docs/kb/docs/contributing/tracker-responses-unit3d.md
index f261cfc0..23b3a225 100644
--- a/docs/kb/docs/contributing/tracker-responses-unit3d.md
+++ b/docs/kb/docs/contributing/tracker-responses-unit3d.md
@@ -2,15 +2,15 @@
 
 ## Endpoint
 
-```
+```bash
 GET {baseUrl}/api/user?api_token={TOKEN}
 ```
 
-The path `/api/user` comes from the tracker's `apiPath` field in the database. Most UNIT3D sites use this default.
+Most UNIT3D sites use `/api/user` by default. Override via the tracker's `apiPath` field if needed.
 
 ## Authentication
 
-API token passed as a query parameter: `?api_token=TOKEN`. No request headers required beyond the default `User-Agent`.
+Pass API token as a query parameter: `?api_token=TOKEN`. No special headers required.
 
 ## Example Response
 
@@ -29,7 +29,7 @@ API token passed as a query parameter: `?api_token=TOKEN`. No request headers re
 }
 ```
 
-All byte values are **formatted strings** (`"500.25 GiB"`), not integers. The `ratio`, `buffer`, and `seedbonus` fields are also strings even though they represent numbers. The adapter runs everything through `parseBytes()` or `parseFloat()` accordingly.
+Byte values return as formatted strings (`"500.25 GiB"`), not integers. Same for `ratio`, `buffer`, and `seedbonus` — all strings. The adapter parses via `parseBytes()` or `parseFloat()`.
 
 ## Field Mapping
 
@@ -49,7 +49,7 @@ All byte values are **formatted strings** (`"500.25 GiB"`), not integers. The `r
 | `warned`           | —              | —        | Always `null` — not in UNIT3D API    |
 | `freeleechTokens`  | —              | —        | Always `null` — not in UNIT3D API    |
 
-UNIT3D makes a single API call per poll. No enrichment step.
+One API call per poll, no enrichment step.
 
 ## Supported Trackers
 
diff --git a/docs/kb/docs/contributing/tracker-responses.md b/docs/kb/docs/contributing/tracker-responses.md
index ee223c15..7de207fa 100644
--- a/docs/kb/docs/contributing/tracker-responses.md
+++ b/docs/kb/docs/contributing/tracker-responses.md
@@ -1,6 +1,6 @@
 # Tracker API Responses
 
-This section documents the raw JSON responses from each tracker platform's API and how the adapter maps those fields to the shared `TrackerStats` interface. Use it when adding support for a new tracker or debugging why a field is coming back wrong.
+This section shows the raw JSON responses from each tracker platform's API and how the adapter maps those fields to the shared `TrackerStats` interface. Use it when adding a new tracker or debugging why a field isn't mapping correctly.
 
 Source of truth: `src/lib/adapters/`
 
@@ -8,7 +8,7 @@ Source of truth: `src/lib/adapters/`
 
 ## TrackerStats Interface
 
-All adapters return a `TrackerStats` object defined in `src/lib/adapters/types.ts`.
+All adapters return `TrackerStats` defined in `src/lib/adapters/types.ts`.
 
 ```typescript
 interface TrackerStats {
@@ -25,8 +25,6 @@ interface TrackerStats {
   requiredRatio: number | null
   warned: boolean | null
   freeleechTokens: number | null
-
-  // Optional — populated when available
   remoteUserId?: number
   joinedDate?: string
   lastAccessDate?: string
@@ -36,7 +34,7 @@ interface TrackerStats {
 }
 ```
 
-Fields marked `null` in the platform pages mean the platform does not expose that data — the adapter explicitly returns `null`, not `undefined` or `0`.
+Fields marked `null` indicate the tracker doesn't expose that data. We return `null` explicitly, not `undefined` or `0`.
 
 ## Platform Reference
 
@@ -49,14 +47,14 @@ Fields marked `null` in the platform pages mean the platform does not expose tha
 
 ## Adding a New Tracker Platform
 
-If you are adding support for an entirely new platform type (not a new tracker on an existing platform):
+For a brand new platform (not just a new tracker on an existing one):
 
 1. Create `src/lib/adapters/{platform}.ts` implementing `TrackerAdapter`
-2. Add the response interface(s) to the top of the file
-3. Add the new platform type to `src/lib/adapters/types.ts` if it needs new `platformMeta` fields
-4. Register the adapter in `src/lib/adapters/index.ts` (`getAdapter()` factory)
-5. Add the platform to the `platform` enum in `src/lib/db/schema.ts`
-6. Add tracker registry entries in `src/data/trackers/` using the new platform type
-7. Document the raw response shape in this section
-
-For a new tracker on an existing platform (e.g. a new UNIT3D site), you only need to add an entry in `src/data/trackers/` — no adapter code required.
+2. Add response interface(s) at the top
+3. Update `src/lib/adapters/types.ts` with new `platformMeta` fields if needed
+4. Register in `src/lib/adapters/index.ts` (`getAdapter()` factory)
+5. Add platform to the `platform` enum in `src/lib/db/schema.ts`
+6. Add tracker entries in `src/data/trackers/`
+7. Document the raw response shape here
+
+For a new tracker on an existing platform (i.e., a new UNIT3D site), just add an entry in `src/data/trackers/`.
diff --git a/docs/kb/docs/contributing/trackers/aither.md b/docs/kb/docs/contributing/trackers/aither.md
index 5400de6d..dcd2c2ca 100644
--- a/docs/kb/docs/contributing/trackers/aither.md
+++ b/docs/kb/docs/contributing/trackers/aither.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+This is a standard UNIT3D setup.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/alpharatio.md b/docs/kb/docs/contributing/trackers/alpharatio.md
index 7caa54df..a82f3ef9 100644
--- a/docs/kb/docs/contributing/trackers/alpharatio.md
+++ b/docs/kb/docs/contributing/trackers/alpharatio.md
@@ -1,5 +1,8 @@
 # AlphaRatio (AR)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet. The field names and response structure should match the standard Gazelle layout, but there's no proof yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,7 +14,7 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. Field names and response structure are assumed to match the standard Gazelle layout.
+This is a standard Gazelle setup.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/animebytes.md b/docs/kb/docs/contributing/trackers/animebytes.md
index 487a86c7..9053653d 100644
--- a/docs/kb/docs/contributing/trackers/animebytes.md
+++ b/docs/kb/docs/contributing/trackers/animebytes.md
@@ -1,5 +1,8 @@
 # AnimeBytes (AB)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet. The field names and response structure should match the standard Gazelle layout, but there's no proof yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,7 +14,7 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. Field names and response structure are assumed to match the standard Gazelle layout.
+This is a standard Gazelle setup.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/anthelion.md b/docs/kb/docs/contributing/trackers/anthelion.md
index c2753705..c9a071d8 100644
--- a/docs/kb/docs/contributing/trackers/anthelion.md
+++ b/docs/kb/docs/contributing/trackers/anthelion.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Anthelion uses the Nebulance platform, which is a Gazelle-derived fork. It uses `api.php` as the endpoint path (not `ajax.php`) and authenticates via query parameter rather than HTTP header. Sister site of Nebulance (NBL).
+Anthelion runs on Nebulance, a Gazelle fork. It has two quirks: the endpoint is `api.php` (not `ajax.php`), and it authenticates via query parameter instead of HTTP header. It's the sister site to Nebulance (NBL).
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/blutopia.md b/docs/kb/docs/contributing/trackers/blutopia.md
index 2224239f..d454faca 100644
--- a/docs/kb/docs/contributing/trackers/blutopia.md
+++ b/docs/kb/docs/contributing/trackers/blutopia.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+This is a standard UNIT3D setup. Nothing unusual here.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/broadcasthenet.md b/docs/kb/docs/contributing/trackers/broadcasthenet.md
index 328cade8..638eeada 100644
--- a/docs/kb/docs/contributing/trackers/broadcasthenet.md
+++ b/docs/kb/docs/contributing/trackers/broadcasthenet.md
@@ -1,5 +1,8 @@
 # BroadcasTheNet (BTN)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,7 +14,7 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. The `bonusPoints` field naming may vary from standard.
+This is a standard Gazelle setup. It's marked **Unvalidated** because no one's tested it against a real account yet. Fair warning: the `bonusPoints` field might not match the standard Gazelle naming.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/concertos.md b/docs/kb/docs/contributing/trackers/concertos.md
index e6d18f57..1a193c10 100644
--- a/docs/kb/docs/contributing/trackers/concertos.md
+++ b/docs/kb/docs/contributing/trackers/concertos.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+This is a standard UNIT3D setup. Nothing unusual here.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/empornium.md b/docs/kb/docs/contributing/trackers/empornium.md
index 7420ba7b..e99e5dd7 100644
--- a/docs/kb/docs/contributing/trackers/empornium.md
+++ b/docs/kb/docs/contributing/trackers/empornium.md
@@ -1,5 +1,8 @@
 # Empornium (EMP)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet. The field names and response structure should match the standard Gazelle layout, but there's no proof yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,13 +14,13 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. Field names and response structure are assumed to match the standard Gazelle layout.
+Uses standard Gazelle.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — no enrichment)
 
-**Badges:** `warned` (conditional — always `false` without enrichment)
+**Badges:** `warned` (conditional — always `false` since there's no enrichment)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/fearnopeer.md b/docs/kb/docs/contributing/trackers/fearnopeer.md
index c88948c2..658e402b 100644
--- a/docs/kb/docs/contributing/trackers/fearnopeer.md
+++ b/docs/kb/docs/contributing/trackers/fearnopeer.md
@@ -11,13 +11,13 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+Standard UNIT3D. Nothing special here.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — UNIT3D platform)
 
-**Badges:** `warned` (conditional — only resolves when `warned === true` in snapshot)
+**Badges:** `warned` (shows up only if `warned === true` in the API response)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 150)
 
diff --git a/docs/kb/docs/contributing/trackers/gazellegames.md b/docs/kb/docs/contributing/trackers/gazellegames.md
index ed18c852..dae8e944 100644
--- a/docs/kb/docs/contributing/trackers/gazellegames.md
+++ b/docs/kb/docs/contributing/trackers/gazellegames.md
@@ -11,22 +11,22 @@
 
 ## Notes
 
-GGn uses its own dedicated adapter rather than the standard Gazelle one. Key differences:
+GGn needs its own adapter — not the standard Gazelle one. Here's what makes it different:
 
-- Auth is via query parameter `?key=TOKEN`, not a header.
-- First poll makes two requests: `?request=quick_user&key=TOKEN` to resolve the numeric user ID, then `?request=user&id=X&key=TOKEN` for full stats. Subsequent polls skip the first request and go directly to `request=user`.
-- The currency field is called `gold` (not `bonusPoints` or `seedbonus`) — mapped to `seedbonus` in the dashboard.
-- `stats.ratio` is a string (`"0.99699"`), not a number. The adapter handles the conversion.
-- Seeding and leeching counts are paranoia-dependent and may return `null`.
-- `freeleechTokens` is always `null` — GGn does not expose FL token counts via the API.
+- Auth uses a query parameter (`?key=TOKEN`), not a header.
+- The first poll does two requests: first hits `?request=quick_user&key=TOKEN` to get your numeric user ID, then `?request=user&id=X&key=TOKEN` to grab the full stats. After that, we skip the ID lookup and go straight to `request=user`.
+- Currency is called `gold` here (not `bonusPoints` or `seedbonus`), but we map it to `seedbonus` in the dashboard.
+- `stats.ratio` comes back as a string like `"0.99699"`, not a number. The adapter converts it.
+- Seeding and leeching counts depend on your paranoia level and might be `null`.
+- `freeleechTokens` is always `null` — GGn doesn't expose those via the API.
 
-See the [GGn platform page](../tracker-responses-ggn.md) for full field mapping details.
+See the [GGn platform page](../tracker-responses-ggn.md) for the full field mapping.
 
 ## Slots
 
-**Profile Card:** username · group · join date (GGn adapter provides joinedDate)
+**Profile Card:** username · group · join date (GGn's adapter gives us joinedDate)
 
-**Badges:** `warned`, `donor`, `disabled`, `ggn-parked`, `ggn-invites`, `ggn-irc`
+**Badges:** `warned`, `donor`, `disabled`, `ggn-parked`, `ggn-invites`, `ggn-irc` (GGn-specific statuses)
 
 **Stat Cards:** `gold`, `ggn-share-score-card`, `login-deadline` (loginIntervalDays: 60)
 
diff --git a/docs/kb/docs/contributing/trackers/greatposterwall.md b/docs/kb/docs/contributing/trackers/greatposterwall.md
index ed5f676a..2a4c7e35 100644
--- a/docs/kb/docs/contributing/trackers/greatposterwall.md
+++ b/docs/kb/docs/contributing/trackers/greatposterwall.md
@@ -1,5 +1,8 @@
 # Great Poster Wall (GPW)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,13 +14,13 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. The site is primarily Chinese-language.
+- Standard Gazelle config.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — no enrichment)
 
-**Badges:** `warned` (conditional — always `false` without enrichment)
+**Badges:** `warned` (conditional — always `false` since there's no enrichment)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/lst.md b/docs/kb/docs/contributing/trackers/lst.md
index 9f7c9331..6268c737 100644
--- a/docs/kb/docs/contributing/trackers/lst.md
+++ b/docs/kb/docs/contributing/trackers/lst.md
@@ -11,13 +11,13 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+Standard UNIT3D. Nothing special here.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — UNIT3D platform)
 
-**Badges:** `warned` (conditional — only resolves when `warned === true` in snapshot)
+**Badges:** `warned` (shows up only if `warned === true` in the API response)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/morethantv.md b/docs/kb/docs/contributing/trackers/morethantv.md
index deb6a5a4..3d320521 100644
--- a/docs/kb/docs/contributing/trackers/morethantv.md
+++ b/docs/kb/docs/contributing/trackers/morethantv.md
@@ -1,5 +1,8 @@
 # MoreThanTV (MTV)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,13 +14,13 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. Field names and response structure are assumed to match the standard Gazelle layout.
+Standard Gazelle.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — no enrichment)
 
-**Badges:** `warned` (conditional — always `false` without enrichment)
+**Badges:** `warned` (conditional — always `false` since there's no enrichment)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/nebulance.md b/docs/kb/docs/contributing/trackers/nebulance.md
index a4b69b86..5e32b376 100644
--- a/docs/kb/docs/contributing/trackers/nebulance.md
+++ b/docs/kb/docs/contributing/trackers/nebulance.md
@@ -11,13 +11,13 @@
 
 ## Notes
 
-Nebulance is a Gazelle-derived fork that uses `api.php` as the endpoint path (not `ajax.php`) and authenticates via query parameter rather than HTTP header. Sister site of Anthelion (ANT).
+Nebulance is a Gazelle fork that uses `api.php` instead of `ajax.php` and authenticates via query parameter rather than HTTP header. Sister site to Anthelion (ANT).
 
 ## Slots
 
-**Profile Card:** username · group · join date (Nebulance provides joinedDate for NBL)
+**Profile Card:** username · group · join date (Nebulance gives us joinedDate)
 
-**Badges:** `warned` (conditional — always `false`, no enrichment on Nebulance platform)
+**Badges:** `warned` (always `false` — Nebulance doesn't provide enrichment)
 
 **Stat Cards:** `snatched-nebulance`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/oldtoons.md b/docs/kb/docs/contributing/trackers/oldtoons.md
index 0cd3dc58..d9208d33 100644
--- a/docs/kb/docs/contributing/trackers/oldtoons.md
+++ b/docs/kb/docs/contributing/trackers/oldtoons.md
@@ -11,13 +11,13 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+Standard UNIT3D. Nothing special here.
 
 ## Slots
 
 **Profile Card:** username · group (no avatar or join date — UNIT3D platform)
 
-**Badges:** `warned` (conditional — only resolves when `warned === true` in snapshot)
+**Badges:** `warned` (shows up only if `warned === true` in the API response)
 
 **Stat Cards:** `seedbonus`, `login-deadline` (loginIntervalDays: 90)
 
diff --git a/docs/kb/docs/contributing/trackers/onlyencodes.md b/docs/kb/docs/contributing/trackers/onlyencodes.md
index 83b5a945..554e89cf 100644
--- a/docs/kb/docs/contributing/trackers/onlyencodes.md
+++ b/docs/kb/docs/contributing/trackers/onlyencodes.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+It's a standard UNIT3D setup with nothing unusual to worry about.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/orpheus.md b/docs/kb/docs/contributing/trackers/orpheus.md
index 8f7265f5..704eb63d 100644
--- a/docs/kb/docs/contributing/trackers/orpheus.md
+++ b/docs/kb/docs/contributing/trackers/orpheus.md
@@ -1,5 +1,8 @@
 # Orpheus (OPS)
 
+!!! Outdated
+    This doc page needs to be updated with correct response shapes.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,7 +14,7 @@
 
 ## Notes
 
-Standard Gazelle configuration. No tracker-specific quirks. Similar to REDacted — both are based on What.CD's Gazelle fork.
+Standard Gazelle setup with no quirks. Like REDacted, it's built on the What.CD Gazelle fork.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/passthepopcorn.md b/docs/kb/docs/contributing/trackers/passthepopcorn.md
index 00ec2010..5fd6df7f 100644
--- a/docs/kb/docs/contributing/trackers/passthepopcorn.md
+++ b/docs/kb/docs/contributing/trackers/passthepopcorn.md
@@ -1,5 +1,8 @@
 # PassThePopcorn (PTP)
 
+!!! Warning
+    This tracker is marked **Unvalidated** and has not been tested it against a real account yet. The `bonusPoints` field might be named differently than we expect.
+
 | Field        | Value                                     |
 | ------------ | ----------------------------------------- |
 | Platform     | Gazelle                                   |
@@ -11,7 +14,7 @@
 
 ## Notes
 
-Standard Gazelle configuration. This tracker is marked **Unvalidated** — the API integration has not been confirmed against a live account. The `bonusPoints` field naming may vary from standard.
+Standard Gazelle setup.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/phoenixproject.md b/docs/kb/docs/contributing/trackers/phoenixproject.md
index a3a9ec6a..5eaf065c 100644
--- a/docs/kb/docs/contributing/trackers/phoenixproject.md
+++ b/docs/kb/docs/contributing/trackers/phoenixproject.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Enrichment is enabled, which means a second `?action=user&id=X` call is made after the index request to retrieve `warned` status, join date, last access date, and more accurate seeding/leeching counts.
+Enrichment is on, so we make a second `?action=user&id=X` call after the first one to grab `warned` status, join date, last access, and better seeding/leeching numbers.
 
 ## Slots
 
@@ -23,4 +23,4 @@ Enrichment is enabled, which means a second `?action=user&id=X` call is made aft
 
 **Progress:** none
 
-> `login-deadline` does not resolve for Phoenix Project because `loginIntervalDays` is set to `0` in the registry.
+> `login-deadline` won't show for Phoenix Project because we set `loginIntervalDays` to `0` in the registry.
diff --git a/docs/kb/docs/contributing/trackers/racing4everyone.md b/docs/kb/docs/contributing/trackers/racing4everyone.md
index 49e702a2..42d29c26 100644
--- a/docs/kb/docs/contributing/trackers/racing4everyone.md
+++ b/docs/kb/docs/contributing/trackers/racing4everyone.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+It's a standard UNIT3D setup with nothing unusual to worry about.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/redacted.md b/docs/kb/docs/contributing/trackers/redacted.md
index f5d74cdc..e17f6f01 100644
--- a/docs/kb/docs/contributing/trackers/redacted.md
+++ b/docs/kb/docs/contributing/trackers/redacted.md
@@ -11,9 +11,9 @@
 
 ## Notes
 
-REDacted uses `gazelleAuthStyle: "token"` — the `Authorization` header value is the raw token string rather than the `token TOKEN` prefixed form used by most other Gazelle sites.
+REDacted uses `gazelleAuthStyle: "token"` — it takes the raw token string in the `Authorization` header, not the `token TOKEN` format most Gazelle sites expect.
 
-Enrichment is enabled, which means a second `?action=user&id=X` call is made after the index request to retrieve `warned` status, join date, last access date, and more accurate seeding/leeching counts.
+Enrichment is on, so we make a second `?action=user&id=X` call after the first one to grab `warned` status, join date, last access, and better seeding/leeching numbers.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/reelflix.md b/docs/kb/docs/contributing/trackers/reelflix.md
index c1af8a8e..a5b3c55d 100644
--- a/docs/kb/docs/contributing/trackers/reelflix.md
+++ b/docs/kb/docs/contributing/trackers/reelflix.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+It's a standard UNIT3D setup with nothing unusual to worry about.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/seedpool.md b/docs/kb/docs/contributing/trackers/seedpool.md
index 42029d5d..284b01be 100644
--- a/docs/kb/docs/contributing/trackers/seedpool.md
+++ b/docs/kb/docs/contributing/trackers/seedpool.md
@@ -11,13 +11,11 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+Standard UNIT3D setup, but Seed Pool has its own promotion system based on seedsize instead of upload amount. The class names are all pool-themed: User → Pool → PowerPool → SuperPool → UberPool → MegaPool → GodPool. There's also a ProPool class you can buy on IRC.
 
-Seed Pool uses a seedsize-based promotion system rather than upload amount. All class names are pool-themed (User → Pool → PowerPool → SuperPool → UberPool → MegaPool → GodPool). There is also a purchasable ProPool class available via IRC.
+Fall below a 1.0 ratio and you'll hit `Cesspool` — you lose download privileges. `KiddiePool` is a timeout zone.
 
-The `Cesspool` class is a demotion for users whose ratio drops below 1 — download privileges are revoked. `KiddiePool` is a timeout zone.
-
-Status page available at `https://status.seedpool.org/`.
+Check the status page at `https://status.seedpool.org/`.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/skipthecommercials.md b/docs/kb/docs/contributing/trackers/skipthecommercials.md
index 158b87f1..b0fa7ec5 100644
--- a/docs/kb/docs/contributing/trackers/skipthecommercials.md
+++ b/docs/kb/docs/contributing/trackers/skipthecommercials.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+It's a standard UNIT3D setup with nothing unusual to worry about.
 
 ## Slots
 
diff --git a/docs/kb/docs/contributing/trackers/uploadcx.md b/docs/kb/docs/contributing/trackers/uploadcx.md
index 4f4fa0a3..7f4cbfbc 100644
--- a/docs/kb/docs/contributing/trackers/uploadcx.md
+++ b/docs/kb/docs/contributing/trackers/uploadcx.md
@@ -11,7 +11,7 @@
 
 ## Notes
 
-Standard UNIT3D configuration. No tracker-specific quirks.
+It's a standard UNIT3D setup with nothing unusual to worry about.
 
 ## Slots
 
diff --git a/docs/kb/docs/features/backups.md b/docs/kb/docs/features/backups.md
index 3ec49882..6ff59463 100644
--- a/docs/kb/docs/features/backups.md
+++ b/docs/kb/docs/features/backups.md
@@ -5,47 +5,38 @@ description: Export, schedule, encrypt, and restore Tracker Tracker backups.
 
 # Backups
 
-Tracker Tracker can back up your configuration and history. You can download a backup manually at any time, or set up automatic scheduled backups saved to disk on the server.
+Tracker Tracker backs up your configuration and history. Download backups manually whenever you want, or set up automatic scheduled backups that save to disk on the server.
 
 ## What Gets Backed Up
 
-A backup captures a snapshot of everything you'd need to fully restore the app:
-
-- App settings (poll intervals, proxy settings, notification settings, TOTP state)
-- All trackers and their configurations
-- Full upload/download history (snapshots)
-- Tracker membership roles
-- Download client configurations
-- Tag groups
-- Download client speed history
-- Notification targets
-
-Sensitive values — API tokens, download client credentials, proxy passwords, webhook URLs, TOTP secrets — are included in the backup in encrypted form. They stay encrypted the whole time they're in the file.
-
-### What is NOT in backups
-
-- **Your password.** It's never exported. A backup file cannot be used to recover your login password.
-- Failed login attempt counters (these reset to zero on restore).
-- Transient runtime state: last poll time, last error, cached torrent lists.
-- Notification delivery history.
+| Item                                                            | Backed up? | Notes                                           |
+|-----------------------------------------------------------------|------------|-------------------------------------------------|
+| App settings (poll intervals, proxy, notifications, TOTP state) | ✓          | Encrypted                                       |
+| Trackers and configurations                                     | ✓          | All metadata                                    |
+| Upload/download history (snapshots)                             | ✓          | Full time-series                                |
+| Download client configurations                                  | ✓          | Encrypted (credentials)                         |
+| Tag groups & notification targets                               | ✓          | All destinations                                |
+| **Your login password**                                         | ✗          | Never exported; use current password to restore |
+| **Encryption salt**                                             | ✗          | Never backed up; stays on instance              |
+| **Failed login counters**                                       | ✗          | Reset to zero on restore                        |
+| Transient state (last poll time, errors, cached torrents)       | ✗          | Not persisted                                   |
+| Notification delivery history                                   | ✗          | Not included                                    |
+
+Sensitive values — API tokens, client credentials, proxy passwords, webhook URLs, TOTP secrets — remain encrypted in the backup file.
 
 ## Backup File Format
 
-Backups are plain JSON files. Encrypted backups use the `.ttbak` extension.
-
-The file includes a header with the version, creation time, your instance URL, and counts of each data type — useful for confirming you're restoring the right file before proceeding.
+Backups are plain JSON (encrypted backups use `.ttbak`). The header includes version, creation time, instance URL, and data counts to confirm you're restoring the right file.
 
 ## Encrypted Backups (.ttbak)
 
-You can wrap a backup in an extra layer of encryption. This produces a `.ttbak` file that requires a password to restore.
-
-The encryption password for backups is separate from your login password. Set it in **Settings → Backups**. Each backup generates its own random key — two backups with the same password produce different ciphertext.
+Add an extra encryption layer to any backup. Set the password in **Settings → Backups** — it's separate from your login password. Each backup generates a random key, so two backups with the same password produce different ciphertext.
 
-Encrypted backups are useful if you store them in cloud storage, send them offsite, or anywhere you'd rather not have the raw config readable.
+This is useful if you store backups in cloud storage, send them offsite, or anywhere you don't want the raw config readable.
 
 ## Exporting a Backup Manually
 
-Go to **Settings → Backups** and click **Export Now**. The file downloads directly to your browser. Manual exports are not saved on the server and won't appear in backup history.
+Go to **Settings → Backups** and click **Export Now**. Manual exports download to your browser and don't save to the server.
 
 ![Backup export and restore UI](../assets/images/backups-exportAndRestore.png)
 
@@ -54,50 +45,48 @@ Go to **Settings → Backups** and click **Export Now**. The file downloads dire
 Scheduled backups run automatically at **03:00 server time**.
 
 | Frequency | When it runs                     |
-| --------- | -------------------------------- |
+|-----------|----------------------------------|
 | Daily     | Every day at 03:00               |
 | Weekly    | Every Monday at 03:00            |
 | Monthly   | First day of each month at 03:00 |
 
-Scheduled backups are saved to the storage path you set in **Settings → Backups** and are listed in the backup history.
+They save to the storage path you set in **Settings → Backups** and show up in your backup history.
 
 ### Retention
 
-Set a retention count (1-365, default 14). When a new scheduled backup is created and the total exceeds that number, the oldest backup files are deleted automatically.
+Set a retention count (1-365, default 14). Once exceeded, the oldest backups delete automatically.
 
 ## Restoring a Backup
 
 ### Before you start
 
-- You'll need your **current login password** to confirm the restore.
-- If the backup is a `.ttbak` encrypted file, you'll also need the backup's encryption password.
+- Your **current login password** (for confirmation)
+- For `.ttbak` encrypted backups, the backup password
 
-### What happens during a restore
+### What happens during restore
 
-1. The backup file is validated.
-2. All existing data is deleted.
-3. Backup data is written to the database.
-4. If the backup came from a different instance (different encryption setup), all encrypted fields are automatically re-encrypted to work with your current password.
-5. Failed login attempts are reset to zero.
-6. **Your current login password is not changed.** You don't need to log out or log back in.
+1. Backup file is validated
+2. All existing data is deleted
+3. Backup data is written to the database
+4. If the backup is from a different instance, encrypted fields are automatically re-encrypted for your current password
+5. Failed login attempts reset to zero
+6. **Your login password stays the same.** You stay logged in.
 
 ### Cross-instance restores
 
-If you're restoring a backup from a different Tracker Tracker installation — one that was set up with a different password — Tracker Tracker will re-encrypt the sensitive fields automatically so they work with your current password.
-
-If a field can't be re-encrypted (for example, because the backup was encrypted with a password you no longer know), that field is cleared rather than saved in a broken state. For TOTP, the restore screen will tell you if 2FA was turned off as a result. You can re-enable it after the restore completes.
+Restoring from a different Tracker Tracker instance with a different password? The app re-encrypts sensitive fields automatically. If a field can't be re-encrypted (i.e., the backup was encrypted with an unknown password), it's cleared. For TOTP, the restore screen tells you if 2FA is disabled — re-enable it after restoring.
 
 !!! warning "TOTP after a cross-instance restore"
-    If 2FA was active on the source instance but can't be carried over, it will be disabled. Re-enroll in **Settings → Security** after the restore.
+    If 2FA was active but can't be carried over, it'll be disabled. Re-enroll in **Settings → Security** after the restore.
 
 ![Backup configuration — encryption, scheduling, and storage path](../assets/images/backups-configuration.png)
 
 ## Settings Reference
 
-| Setting           | Default | Description                                                       |
-| ----------------- | ------- | ----------------------------------------------------------------- |
-| Scheduled backups | Off     | Enable automatic backups on a schedule                            |
-| Frequency         | Daily   | How often scheduled backups run: daily, weekly, or monthly        |
-| Retention count   | 14      | How many scheduled backups to keep (1-365)                        |
-| Encrypt backups   | Off     | Wrap scheduled backups in an additional encryption layer (.ttbak) |
-| Storage path      | —       | Directory on the server where scheduled backup files are saved    |
+| Setting           | Default | Description                                                 |
+|-------------------|---------|-------------------------------------------------------------|
+| Scheduled backups | Off     | Enable automatic backups on a schedule                      |
+| Frequency         | Daily   | How often to run: daily, weekly, or monthly                 |
+| Retention count   | 14      | How many backups to keep (1-365)                            |
+| Encrypt backups   | Off     | Add an extra encryption layer to scheduled backups (.ttbak) |
+| Storage path      | —       | Server directory where scheduled backups are saved          |
diff --git a/docs/kb/docs/features/download-clients.md b/docs/kb/docs/features/download-clients.md
index a3dca79a..a6e10477 100644
--- a/docs/kb/docs/features/download-clients.md
+++ b/docs/kb/docs/features/download-clients.md
@@ -5,7 +5,7 @@ description: Connect qBittorrent to track per-tracker torrent stats, seeding cou
 
 # Download Clients
 
-Tracker Tracker connects to qBittorrent's web interface to pull live torrent data. This powers the Torrents tab on the dashboard — showing active downloads and uploads, speeds, seeding counts, ratio histograms, and cross-seed stats.
+Tracker Tracker connects to qBittorrent's web interface to pull live torrent data. This powers the Torrents tab with active downloads and uploads, speeds, seeding counts, ratio histograms, and cross-seed stats.
 
 ## Supported Clients
 
@@ -18,7 +18,7 @@ Tracker Tracker connects to qBittorrent's web interface to pull live torrent dat
 
 ## Adding a Client
 
-Go to **Settings → Download Clients** and fill in the connection details:
+Go to **Settings → Download Clients** and fill in your connection details:
 
 | Field    | Notes                                                       |
 | -------- | ----------------------------------------------------------- |
@@ -36,33 +36,27 @@ After saving, use the **Test Connection** button to confirm Tracker Tracker can
 
 ## Linking Trackers to a Client
 
-Each tracker can have a **qBittorrent tag** assigned to it. Set this tag to match the label you use in qBittorrent for that tracker's torrents.
-
-When Tracker Tracker polls for torrent data, it fetches only torrents with the matching tag — so you get per-tracker stats rather than a combined total.
-
-To assign a tag, open the tracker's settings page and fill in the qBittorrent tag field.
+Assign each tracker a **qBittorrent tag** that matches the label you use for that tracker's torrents. When polling, Tracker Tracker fetches only torrents with the matching tag for per-tracker stats. Open the tracker's settings and fill in the qBittorrent tag field.
 
 ## How Polling Works
 
-Tracker Tracker uses two separate polling loops:
+Tracker Tracker runs two polling loops:
 
 === "Live speed (every 30 seconds)"
 
-    Fetches current upload/download speeds from qBittorrent. This is a single lightweight request. The result shows in the sidebar speed display and in the uptime tracker.
+    Lightweight request for current upload/download speeds. Displayed in the sidebar and uptime tracker.
 
 === "Full torrent data (every 5 minutes)"
 
-    Fetches the full torrent list for each configured tag, then aggregates per-tag stats: seeding count, leeching count, speeds. The result is saved as a snapshot.
-
-    This loop also caches the torrent list so the Torrents tab has data to show even if qBittorrent is briefly unreachable.
+    Fetches the full torrent list per tag and aggregates stats: seeding count, leeching count, speeds. Cached as snapshots so the Torrents tab works even if qBittorrent is briefly offline.
 
-Both loops reuse the existing session. qBittorrent only re-authenticates if the session expires (which shows up as a 403 response).
+Both loops reuse the same session. qBittorrent only re-authenticates on 403 responses.
 
 ## Cross-Seed Detection
 
-If you use [cross-seed](https://cross-seed.org/) to find matching torrents across trackers, you can configure cross-seed tags on the download client. Any torrent tagged with one of those tags is counted separately in the cross-seed stats on the Torrents tab — so you can see how many of your torrents are cross-seeded vs. original grabs.
+Use [cross-seed](https://cross-seed.org/) to find matching torrents across trackers? Configure cross-seed tags on the download client. Any torrent with one of those tags is counted separately in the cross-seed stats — so you can see how many torrents are cross-seeded vs. original grabs.
 
-Set the cross-seed tags in the client's settings after adding it. Common tags are `cross-seed` (the default from cross-seed) or category-based variants like `cs-link-movies`, `cs-link-tv`.
+Set cross-seed tags in the client settings after adding it. Common tags are `cross-seed` (the default) or category-based like `cs-link-movies`, `cs-link-tv`.
 
 ![Cross-seed ratio chart showing 741 cross-seeded vs 1307 unique](../assets/images/tracker-page-cross-seed-chart.png)
 
@@ -70,16 +64,16 @@ For more on setting up cross-seed itself, see the [cross-seed documentation](htt
 
 ## Privacy: What Gets Stripped
 
-Tracker Tracker deliberately removes certain fields from torrent data before caching or displaying it:
+Tracker Tracker removes these fields from torrent data before caching or displaying:
 
-- Announce URLs (these contain your tracker passkey)
+- Announce URLs (which contain your tracker passkey)
 - File paths on disk
 
-This applies everywhere — the dashboard, the cached torrent list, and any API response.
+This applies everywhere: dashboard, cached lists, API responses.
 
 ## Credential Security
 
-Your qBittorrent username and password are encrypted at rest. They're decrypted in memory only when a poll is about to run, used for authentication, and never written to logs.
+Your qBittorrent username and password are encrypted at rest. They're decrypted in memory only when polling starts, used for authentication, and never logged.
 
 ## Troubleshooting
 
@@ -91,4 +85,4 @@ Your qBittorrent username and password are encrypted at rest. They're decrypted
 | `Authentication failed — check username and password`      | Wrong credentials                                                                                 |
 | `Authentication failed — SID cookie not found in response` | Unexpected response from qBittorrent — check that the Web UI is enabled in qBittorrent's settings |
 
-If the Test Connection button reports an error, it always forces a fresh login attempt — it won't reuse a cached session. So the error you see reflects the actual current state.
+The Test Connection button forces a fresh login, so errors reflect the current state.
diff --git a/docs/kb/docs/features/image-hosting.md b/docs/kb/docs/features/image-hosting.md
deleted file mode 100644
index bb2ed715..00000000
--- a/docs/kb/docs/features/image-hosting.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-title: Image Hosting
-description: Upload screenshots to PTPImg, OnlyImage, or ImgBB directly from Tracker Tracker.
----
-
-# Image Hosting
-
-!!! danger "Functionality has not been implemented and this currently does nothing"
-    This is in preparation for the Tracker Transit Papers that will be launched in an upcoming release. No harm is done from adding your api keys now, but they won't do anything.
-
-Tracker Tracker can upload images to external hosting services and return a direct link. This is useful for uploading screenshots when creating or editing torrent listings on trackers that require images hosted on approved services.
-
-## Supported Hosts
-
-| Host          | URL           | Expiration                  | Notes                                      |
-| ------------- | ------------- | --------------------------- | ------------------------------------------ |
-| **PTPImg**    | ptpimg.me     | Not supported               | Required by PTP, accepted by most trackers |
-| **OnlyImage** | onlyimage.org | Time-based (ISO 8601)       | Used by OnlyEncodes and other trackers     |
-| **ImgBB**     | imgbb.com     | Time-based (60s - 180 days) | Widely accepted free host                  |
-
-None of the three services support "burn after reading" (view-count-based self-destruct). PTPImg hosts images permanently. OnlyImage and ImgBB support time-based auto-deletion.
-
-## Setting Up API Keys
-
-Go to **Settings → General → Image Hosting** to add your API keys.
-
-Each key is encrypted at rest using the same AES-256-GCM encryption used for tracker API tokens. The app only stores whether a key is configured (shown as a "configured" badge) — the plaintext key is never returned to the browser after saving.
-
-### Where to Get Your API Key
-
-**PTPImg:** Log into ptpimg.me, view page source, and find the `api_key` value. It looks like a UUID: `44171be4-eb87-444f-9c49-11268f470e12`.
-
-**OnlyImage:** Go to your user settings at onlyimage.org and find the API section. The key is a long hex string starting with `chv_`.
-
-**ImgBB:** Create a free account at api.imgbb.com and generate an API key from the dashboard. It's a 32-character hex string.
-
-### Managing Keys
-
-- **Save Key** — Paste the key and click Save. It's encrypted before storage.
-- **Replace Key** — Click "Replace Key" to enter a new one. The old key is overwritten.
-- **Remove** — Click "Remove" to delete the stored key. This does not delete any images already uploaded.
-
-## Expiration
-
-When uploading to ImgBB or OnlyImage, you can optionally set images to auto-delete after a set time. PTPImg does not support expiration — all PTPImg uploads are permanent.
-
-| Duration | ImgBB         | OnlyImage |
-| -------- | ------------- | --------- |
-| 1 minute | Yes (minimum) | Yes       |
-| 1 hour   | Yes           | Yes       |
-| 1 day    | Yes           | Yes       |
-| 1 week   | Yes           | Yes       |
-| 30 days  | Yes           | Yes       |
-| 180 days | Yes (maximum) | Yes       |
-
-## Supported File Types
-
-JPEG, PNG, GIF, WebP, BMP, and AVIF. Maximum file size is 32 MB.
-
-## Backups
-
-Image hosting API keys are included in backups as encrypted ciphertext. When restoring from a backup created on a different instance (different encryption salt), the keys are automatically re-encrypted using the current instance's key. If re-encryption fails, the keys are silently cleared — you'll need to re-enter them after restore.
-
-Backups created before the image hosting feature was added will not contain these keys. Restoring from such a backup will not affect any keys you've already configured.
-
-## Security
-
-- API keys are encrypted at rest using the same encryption as your tracker tokens
-- Keys are never shown after saving — the app only displays whether a key is configured
-- Uploads require you to be logged in
-- Keys are sent securely to the hosting services (never in URLs where they could leak into logs)
diff --git a/docs/kb/docs/features/proxies.md b/docs/kb/docs/features/proxies.md
index 482d8775..8e7d6bc3 100644
--- a/docs/kb/docs/features/proxies.md
+++ b/docs/kb/docs/features/proxies.md
@@ -8,62 +8,60 @@ description: Route tracker polling through SOCKS5, HTTP, or HTTPS proxies on a p
 !!! warning "Experimental"
     Proxy support is experimental and may not work with all trackers or proxy configurations. Use at your own risk.
 
-You can route outbound tracker API requests through a proxy. Proxy support is opt-in — you configure one global proxy, and then individually enable it per tracker.
+Route tracker API requests through a proxy. Set up one global proxy, then enable it per tracker.
 
 ## Supported Proxy Types
 
 | Type     | Common use                                      |
-| -------- | ----------------------------------------------- |
+|----------|-------------------------------------------------|
 | `socks5` | Tor, SSH tunnels, most privacy-oriented proxies |
 | `http`   | Standard HTTP CONNECT proxies                   |
 | `https`  | TLS-wrapped HTTP CONNECT proxies                |
 
-The proxy type controls how your traffic reaches the proxy server — SOCKS5 for tunnel-level proxying, HTTP/HTTPS for CONNECT-based proxying. Either way, the actual request to the tracker is always HTTPS, so your API token is encrypted end-to-end regardless of proxy type.
-
-When a proxy is enabled for a tracker, the tracker sees the proxy's IP address — not yours.
+The proxy type controls how traffic reaches the proxy server. SOCKS5 uses tunnel-level proxying, HTTP/HTTPS uses CONNECT-based proxying. Either way, tracker requests stay HTTPS, keeping your API token encrypted. When enabled, the tracker sees the proxy's IP instead of yours.
 
 !!! warning "Some trackers ban proxy and VPN traffic"
-    Many private trackers explicitly prohibit accessing the site from VPNs, proxies, or shared IPs. Using a proxy for API polling may trigger automated security flags or get your account disabled. Check your tracker's rules before enabling this. If a tracker allows API access from a different IP than your browsing IP, you're probably fine — but not all trackers make that distinction.
+    Many private trackers prohibit access from VPNs, proxies, or shared IPs. Using a proxy for API polling may trigger security flags or get you disabled. Check your tracker's rules first. If a tracker allows API access from a different IP than your browsing IP, you're probably fine — but not all make that distinction.
 
 !!! info "DNS resolution"
-    HTTP and HTTPS proxies resolve the tracker's hostname on the proxy side — your local DNS provider never sees the domain. SOCKS5 behavior depends on configuration: most SOCKS5 proxies also resolve remotely, but some setups resolve locally first. If DNS privacy matters to you, verify your SOCKS5 proxy does remote resolution.
+    HTTP and HTTPS proxies resolve on the proxy side — your DNS provider never sees it. SOCKS5 varies: most resolve remotely, some resolve locally first. If DNS privacy matters, verify your SOCKS5 proxy does remote resolution.
 
 ## Setup
 
-Proxy settings live in **Settings → General → Proxy**.
+Proxy settings are in **Settings → General → Proxy**.
 
 ### Step 1: Configure the global proxy
 
-Fill in the proxy details:
+Fill in your proxy details:
 
 | Field      | Description                                               |
-| ---------- | --------------------------------------------------------- |
+|------------|-----------------------------------------------------------|
 | Proxy type | `socks5`, `http`, or `https`                              |
-| Host       | Hostname or IP address of your proxy server               |
+| Host       | Hostname or IP of your proxy                              |
 | Port       | Port number (commonly `1080` for SOCKS5, `8080` for HTTP) |
-| Username   | Optional — only needed for authenticated proxies          |
-| Password   | Optional — stored securely, never in plaintext            |
+| Username   | Optional — for authenticated proxies only                 |
+| Password   | Optional — stored securely, never plaintext               |
 
-The master switch at the top of the proxy section enables or disables the proxy globally. Even if individual trackers have the proxy toggled on, nothing is routed through the proxy while the master switch is off.
+The master switch controls the proxy globally. Even if trackers have the toggle on, nothing routes through while the master switch is off.
 
-### Step 2: Enable the proxy per tracker
+### Step 2: Enable per tracker
 
-On any tracker's settings page, toggle **Use Proxy**. That tracker's polls will then go through the global proxy.
+On a tracker's settings page, toggle **Use Proxy**. That tracker's polls go through the global proxy.
 
-Trackers with the toggle off always poll directly, even if a global proxy is configured.
+Trackers with the toggle off always poll directly.
 
 ## Credential Security
 
-Your proxy password is encrypted at rest. It's decrypted in memory only when a poll is about to run, used for the request, and never written to logs.
+Your proxy password is encrypted at rest. It's decrypted in memory only when polling starts, used for the request, and never logged.
 
 ## Troubleshooting
 
-| Error message                                                        | What it means                                                                                                                                           |
-| -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `Failed to create proxy agent (check proxy host/port configuration)` | The host or port format is invalid. Double-check there are no typos and no `http://` prefix in the host field.                                          |
-| `Failed to decrypt proxy password, proceeding without auth`          | The proxy password couldn't be read — this can happen after a restore from a backup with a different password. Re-enter the proxy password in settings. |
-| `Request timed out after 15000ms`                                    | The proxy or tracker didn't respond within 15 seconds. Check that the proxy is running and reachable.                                                   |
-| `proxyFetch only supports HTTPS URLs`                                | The tracker URL is using `http://` — change it to `https://`.                                                                                           |
+| Error message                                                        | What it means                                                                                                                                    |
+|----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
+| `Failed to create proxy agent (check proxy host/port configuration)` | Invalid host or port format. Check for typos and no `http://` prefix in the host field.                                                          |
+| `Failed to decrypt proxy password, proceeding without auth`          | The proxy password couldn't be read — can happen after restore from a backup with a different password. Re-enter the proxy password in settings. |
+| `Request timed out after 15000ms`                                    | The proxy or tracker didn't respond in 15 seconds. Check that the proxy is running and reachable.                                                |
+| `proxyFetch only supports HTTPS URLs`                                | The tracker URL uses `http://` — change it to `https://`.                                                                                        |
 
 ## Proxy Host Format
 
diff --git a/docs/kb/docs/features/qbitmanage.md b/docs/kb/docs/features/qbitmanage.md
index ceeaf467..fa3e3d80 100644
--- a/docs/kb/docs/features/qbitmanage.md
+++ b/docs/kb/docs/features/qbitmanage.md
@@ -5,19 +5,17 @@ description: Automatically categorize and visualize torrents using qbitmanage st
 
 # qbitmanage Integration
 
-[qbitmanage](https://github.com/StuffAnThings/qbit_manage) is a tool that automatically manages your qBittorrent torrents — tagging, categorizing, cleaning up orphaned data, enforcing share limits, and more. If you already run it, Tracker Tracker can read its tags and turn them into useful charts.
+[qbitmanage](https://github.com/StuffAnThings/qbit_manage) automatically manages qBittorrent torrents — tags, categories, cleanup, share limits, and more. If you're already running it, Tracker Tracker can read those tags and build charts from them.
 
-This page covers how the two tools work together. For general tag group setup, see [Tag Groups](tag-groups.md).
+For general tag group setup, see [Tag Groups](tag-groups.md).
 
 ## How It Works
 
-qbitmanage writes tags to your torrents in qBittorrent. Tracker Tracker reads those tags during its deep poll cycle. You set up tag groups that match qbitmanage's tag names, and the charts appear automatically on each tracker's Torrents tab.
-
-Nothing is pushed between the two — they both talk to qBittorrent independently.
+qbitmanage writes tags to qBittorrent. Tracker Tracker reads them during its deep poll cycle. Create tag groups matching qbitmanage's tag names and charts appear automatically on each tracker's Torrents tab. Both tools talk to qBittorrent independently.
 
 ## Built-In Status Tag Tracking
 
-Tracker Tracker has built-in support for qbitmanage's status tags. Enable it in **Settings → Download Clients → qbitmanage Tag Tracking**.
+Tracker Tracker has built-in support for qbitmanage's status tags. Turn it on in **Settings → Download Clients → qbitmanage Tag Tracking**.
 
 ![qbitmanage tag tracking settings](../assets/images/qbitmanage-settings.png)
 
@@ -32,14 +30,14 @@ Map each status to the tag name from your qbitmanage config. Here are qbitmanage
 | Last Active Limit Not Reached | `LastActiveLimitNotReached` | `share_limits_last_active_tag`      | Hasn't been inactive long enough for removal                  |
 | Last Active Not Reached       | `LastActiveNotReached`      | `share_limits_last_active_tag`      | Last activity hasn't crossed the threshold                    |
 
-Many people customize these with emoji prefixes (e.g., `⚠️ Issue` instead of `issue`). If you've changed them in your qbitmanage `config.yml`, enter **your** tag names — not the defaults above.
+Many people customize them with emoji (i.e., `⚠️ Issue`). If you've changed them in your qbitmanage `config.yml`, use your actual tag names here.
 
 Here's what the qbitmanage status breakdown looks like on a tracker's Torrents tab:
 
 ![qbitmanage status bar chart showing No Hardlinks, Min Seeds Not Met, Last Active Limit, and Last Active Not Reached](../assets/images/tracker-page-qbitmanage.png)
 
 !!! tip "Match your config exactly"
-  Tag names must match character-for-character, including any emoji or special characters. Copy them directly from your qbitmanage `config.yml`.
+    Tag names must match character-for-character, including emoji and special characters. Copy them straight from your qbitmanage `config.yml`.
 
 ## Tag Group Examples
 
@@ -137,10 +135,10 @@ Create a tag group with just the `⛓️‍💥 noHL` tag and enable **Count unm
 
 ## Tips
 
-- **qbitmanage runs on its own schedule.** Tags may take a few minutes to appear in qBittorrent after a new torrent is added. Tracker Tracker polls qBittorrent every 5 minutes by default, so there's a lag between qbitmanage tagging a torrent and the chart updating.
-- **Emoji in tags are fine.** qbitmanage commonly uses emoji prefixes for visual organization. Tracker Tracker handles them without issues — just make sure the exact emoji sequence matches.
-- **Priority tags come from the `tracker:` section,** not from share limits. Share limits _use_ the priority tags for filtering, but the tags themselves are assigned by the tracker keyword matching.
-- **You don't need qbitmanage to use tag groups.** Any tags in qBittorrent work — qbitmanage just happens to be the most popular way to automate tagging in the homelab community.
+- **qbitmanage runs independently.** Tags take a few minutes to appear, and Tracker Tracker polls every 5 minutes by default, so there's some lag.
+- **Emoji in tags work fine** — just match the exact sequence.
+- **Priority tags come from the `tracker:` section**, not share limits. Share limits use them for filtering, but the tags come from tracker keyword matching.
+- **You don't need qbitmanage for tag groups.** Any qBittorrent tags work — qbitmanage is just popular in the homelab community.
 
 ## Resources
 
diff --git a/docs/kb/docs/features/tag-groups.md b/docs/kb/docs/features/tag-groups.md
index e721908d..09e5493c 100644
--- a/docs/kb/docs/features/tag-groups.md
+++ b/docs/kb/docs/features/tag-groups.md
@@ -5,7 +5,7 @@ description: Bundle qBittorrent tags into named groups to see breakdown charts o
 
 # Tag Groups
 
-If you tag your torrents in qBittorrent, tag groups let you visualize those tags as charts on each tracker's Torrents tab. You define the groups once, and they show up on every tracker.
+Tag groups turn qBittorrent tags into charts on each tracker's Torrents tab. Define them once and they appear everywhere.
 
 ## What They're For
 
@@ -33,13 +33,13 @@ This is what the Priority group looks like on a tracker's Torrents tab:
 
 ## Creating a Tag Group
 
-1. Go to **Settings → Download Clients** (scroll past your client cards).
-2. Click **Add Tag Group**.
-3. Name it and pick an emoji.
-4. Add rows — each row maps a **qBittorrent tag** (the exact tag string as it appears in qBit) to a **display label** (what shows up in the chart).
-5. Save.
+1. Go to **Settings → Download Clients** and scroll past your client cards
+2. Click **Add Tag Group**
+3. Name it and pick an emoji
+4. Add rows mapping **qBittorrent tags** (exact strings) to **display labels** (what appears in the chart)
+5. Save
 
-The group immediately appears on the Torrents tab of every tracker that has matching torrents. Trackers with no matching torrents skip the chart silently.
+The group appears instantly on the Torrents tab for trackers with matching torrents. If there are no matches, the chart won't appear.
 
 ## Display Types
 
@@ -54,11 +54,11 @@ Each group can use a different chart style:
 
 ## Count Unmatched Tags
 
-When enabled, the chart includes an extra segment for torrents that don't match _any_ tag in the group. Useful for seeing how many torrents aren't categorized yet.
+Enable this to add a segment showing torrents with no tag in the group. Great for seeing what's still uncategorized.
 
 ## Tag Matching
 
-Tags must match **exactly** — same capitalization, same spacing, same characters. If your qBittorrent tag is `High Priority` and you type `high priority` in the group, it won't match.
+Tags are case-sensitive and must match exactly. If qBittorrent says `High Priority`, typing `high priority` won't work.
 
 !!! tip "Check your qBittorrent tags"
     Open qBittorrent and look at the tag list in the sidebar to see the exact tag names. Copy them character-for-character into Tracker Tracker.
@@ -69,13 +69,13 @@ If you use [qbitmanage](https://github.com/StuffAnThings/qbit_manage) to automat
 
 ## Editing and Reordering
 
-- **Rename a group** — double-click the group name.
-- **Reorder tags** — drag the handle on the left side of each row.
-- **Remove a tag** — click the X on the right.
-- **Delete a group** — click Delete Group at the bottom (requires confirmation).
+- **Rename** — double-click the group name
+- **Reorder tags** — drag the handle on the left
+- **Remove a tag** — click the X on the right
+- **Delete a group** — click Delete Group at the bottom (requires confirmation)
 
 ## Good to Know
 
-- Tag groups are global — they apply to all trackers, not just one. If a group's tags don't match any torrents on a particular tracker, the chart simply doesn't appear there.
-- Changes in settings take effect on the next page load of a tracker detail page.
-- Tag groups are included in backups and restored automatically.
+- Tag groups are global — one group works across all trackers.
+- Changes take effect when you reload a tracker page.
+- Backups include tag groups and restore them automatically.
diff --git a/docs/kb/docs/features/totp.md b/docs/kb/docs/features/totp.md
deleted file mode 100644
index ad657533..00000000
--- a/docs/kb/docs/features/totp.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: Two-Factor Authentication (TOTP)
-description: Add a time-based one-time password requirement to your login flow.
----
-
-# Two-Factor Authentication (TOTP)
-
-You can add a second login step using any standard authenticator app. After entering your password, you'll be prompted for a 6-digit code from the app.
-
-Works with: Google Authenticator, Aegis, 1Password, Bitwarden, Authy, and any other app that supports standard TOTP.
-
-## Enabling 2FA
-
-1. Go to **Settings → Security**.
-2. Click **Enable Two-Factor Authentication**.
-3. Scan the QR code with your authenticator app.
-4. Enter the 6-digit code shown in your app to confirm it worked.
-5. Copy your backup codes and store them somewhere safe (see below).
-6. Click **Confirm**.
-
-The app won't save anything until you enter a valid code in step 4. If the code is wrong or expired, just try again — nothing gets committed.
-
-## Backup Codes
-
-When you enable 2FA, you get 8 backup codes. Each one looks like this:
-
-```ascii
-3A7F-B2C1
-```
-
-**Each code works exactly once.** After you use one, it's gone. The remaining codes stay valid.
-
-Use a backup code at the TOTP prompt the same way you'd use a 6-digit code — there's a "Use a backup code" option on the login screen.
-
-!!! warning "Save your backup codes now"
-    If you lose your authenticator app and don't have backup codes, you cannot log in. There is no account recovery. Store the codes in a password manager or print them and keep them somewhere secure.
-
-## Logging In With 2FA
-
-After entering your password, you'll see a second screen asking for your code. Enter:
-
-- The current 6-digit code from your authenticator app, **or**
-- One of your saved backup codes
-
-The app accepts codes from the previous and next 30-second window to account for slight clock drift.
-
-## Disabling 2FA
-
-Turning off 2FA requires both your password and a valid TOTP code (or a backup code). This prevents someone with brief access to your open browser session from removing your 2FA protection.
-
-1. Go to **Settings → Security**.
-2. Click **Disable Two-Factor Authentication**.
-3. Enter your password.
-4. Enter a current TOTP code, or check "Use a backup code" and enter one.
-5. Click **Confirm**.
-
-## Failed Login Attempts
-
-Failed TOTP attempts count toward the same lockout limit as failed password attempts. If you've configured a lockout threshold in settings, too many wrong codes will temporarily lock the account.
-
-## After a Backup Restore
-
-!!! warning "2FA may be disabled after restoring a backup"
-    If you restore a backup from a different Tracker Tracker instance — one that was set up with a different password — the 2FA secret can't be carried over. In that case, 2FA will be turned off automatically as part of the restore.
-
-The restore confirmation screen will tell you if this happened. You'll need to go back to **Settings → Security** and set up 2FA again.
-
-This only applies to cross-instance restores. Restoring a backup on the same instance you created it on is fine.
diff --git a/docs/kb/docs/features/transit-papers.md b/docs/kb/docs/features/transit-papers.md
index d6af957b..80838e50 100644
--- a/docs/kb/docs/features/transit-papers.md
+++ b/docs/kb/docs/features/transit-papers.md
@@ -10,32 +10,25 @@ description: Generate tamper-resistant proof-of-membership images for private tr
 !!! warning "Beta — Highly Experimental"
     Transit Papers are under active development. The report format, encoding scheme, and verification behavior may change between versions. Reports generated with one version are not guaranteed to verify correctly with a future version. Use at your own risk.
 
-Transit Papers generate a tamper-resistant PNG image showing your stats on a single tracker. The image is designed to be shared with tracker moderators as proof of your membership and standing when applying to other trackers.
-
-Instead of a browser screenshot — which can be faked in seconds with inspect element or Photoshop — Transit Papers produce a server-rendered image with cryptographically linked visual elements. Editing any part of the image (the stats, the fractal seal, or the data strip) breaks the link between them, and the verification tool detects it. Each report is called a **Proof of Citizenship**.
+Transit Papers generate tamper-resistant PNG images of your tracker stats to share with moderators when applying to new trackers. Unlike a screenshot (faked in 30 seconds), they use server-side rendering with cryptographically linked elements — edit any part and the links break. The verification tool catches tampering. These reports are **Proofs of Citizenship**.
 
 !!! warning "What Transit Papers are NOT"
-    Transit Papers are **not zero-trust cryptographic proof** that the stats are real. Tracker Tracker is self-hosted. You control the machine, the database, and the network. A technically motivated user could theoretically fabricate data before generation.
-
-    What this system does is raise the cost of forgery from **trivial** (inspect element, 30 seconds) to **impractical** (clone the project, set up a database, fabricate internally consistent stats across 10+ mathematically related fields, understand the target tracker's API schema).
 
-    Transit Papers are a tool to assist a mod's judgment, not replace it. If a mod has direct access to your profile on the source tracker, that is always more trustworthy than any report.
+    They're **not cryptographic proof** your stats are real. Self-hosted means you control the machine, database, and network. A determined attacker could fake data before generation. But this system makes forgery impractical — faking a screenshot takes 30 seconds; faking a Transit Paper means cloning the project, setting up a database, fabricating internally consistent stats across 10+ math-linked fields, and matching the exact API schema of your target tracker. Much harder. Transit Papers help mods decide — they don't replace human judgment. Direct tracker profile access is always more trustworthy.
 
 ---
 
 ## Generating a Proof of Citizenship
 
-Navigate to a tracker's detail page and generate a report. Tracker Tracker uses your most recent polled snapshot to render the report server-side and returns a PNG for download.
+Go to a tracker's detail page and generate a report. Tracker Tracker renders your most recent snapshot server-side and returns a 1200x630 PNG with:
 
-The report is a 1200x630 image containing:
-
-- **Tracker name and platform type** — which tracker and what software it runs
-- **Your identity** — username, class/rank, and member-since date appear in a header section above the stats grid (when available).
-- **Your stats** — uploaded bytes, downloaded bytes, ratio, buffer, seeding count, seedbonus, and hit & runs. Which fields appear depends on what the platform reports.
-- **Fractal Seal** — a unique fractal image derived from your stats. Different stats produce a completely different fractal. This is both decorative and functional — it serves as the encryption key for the data strip.
-- **Spirograph** — a decorative hypotrochoid pattern derived from the generation timestamp. Three layered curves, each 120 degrees apart on the color wheel.
-- **Data Strip** — a horizontal colored barcode near the bottom of the image. Your stats are serialized, encrypted using a key derived from the fractal, and encoded as colored bands.
-- **Footer** — generation timestamp, report version, and the full SHA-256 seed hash.
+- **Tracker name and platform** — which tracker and its software
+- **Your identity** — username, class/rank, join date (when available)
+- **Your stats** — upload, download, ratio, buffer, seeding count, seedbonus, hit & runs (what's available varies by platform)
+- **Fractal Seal** — a unique fractal derived from your stats. Different stats = different fractal. Serves as the encryption key for the data strip.
+- **Spirograph** — a decorative hypotrochoid pattern from the generation timestamp
+- **Data Strip** — a colored barcode near the bottom. Stats are serialized, encrypted with the fractal key, and encoded as colored bands.
+- **Footer** — generation timestamp, report version, and full SHA-256 seed hash
 
 ---
 
@@ -43,7 +36,7 @@ The report is a 1200x630 image containing:
 
 ### Built-in upload integrations (recommended)
 
-Tracker Tracker can upload your Proof of Citizenship directly to an image host and give you a shareable URL. This is the most reliable method because the image is transferred losslessly.
+Upload your Proof directly to an image host for a shareable URL. This is most reliable because the image transfers losslessly.
 
 | Host          | Notes                                                                              |
 | ------------- | ---------------------------------------------------------------------------------- |
@@ -51,24 +44,25 @@ Tracker Tracker can upload your Proof of Citizenship directly to an image host a
 | **OnlyImage** | onlyimage.org. Accepted by OnlyEncodes and other trackers.                         |
 | **ImgBB**     | Supports auto-delete timers if you want expiring links. May recompress large PNGs. |
 
-Configure API keys in **Settings → General → Image Hosting**. See the [Image Hosting](image-hosting.md) docs for setup instructions.
+Configure API keys in **Settings → General → Image Hosting**.
 
 ### Manual sharing
 
-If you are not using an integration, share the original PNG file directly:
+No integration? Share the original PNG directly:
 
 - Attach it to a forum PM or recruitment thread
 - Send via IRC DCC
 - Upload to any lossless image host manually (ptpimg.me, imgbox.com, catbox.moe)
 
 !!! danger "Do not screenshot the report"
+
     The verification system reads pixel data from the image. A screenshot of the report is not the report. It will degrade verification or cause it to fail entirely.
 
 ---
 
 ## Compression and Image Quality
 
-The data strip and fractal seal are verified at the pixel level. If the image passes through a lossy compression step (JPEG conversion, resize, re-encoding), pixel colors shift. This can cause verification to fail or require fuzzy recovery that reduces confidence.
+The data strip and fractal seal are verified at the pixel level. Lossy compression (JPEG, resize, re-encoding) shifts pixel colors, breaking verification or triggering fuzzy recovery with lower confidence.
 
 ### Lossless (verification works perfectly)
 
@@ -103,52 +97,51 @@ The verifier uses fuzzy recovery: it tries nearby perceptual hash keys until it
 | 4+        | Heavy compression or re-encoding. Result is valid but confidence is reduced.        |
 | Failed    | Image too degraded to recover. Request the original file or a lossless-hosted link. |
 
-**For users:** Use a built-in upload integration or share the original file directly.
+**For users:** Use a built-in integration or share the original file directly.
 
-**For mods:** If verification shows more than 0 bit flips, consider asking the user to reshare via ptpimg or OnlyImage.
+**For mods:** If verification shows bit flips, ask the user to reshare via ptpimg or OnlyImage.
 
 ---
 
 ## For Tracker Mods: Verifying a Report
 
-The verification tool is a standalone static page — completely separate from any Tracker Tracker installation. It runs entirely in your browser. No account, no server connection, no data leaves your machine. You do not need to be a Tracker Tracker user to verify a report.
-
-Upload or drag-and-drop the PNG onto the verification page.
+The verification tool is a standalone static page, completely separate from Tracker Tracker. It runs entirely in your browser with no account, server, or data leaving your machine. Just upload or drag-and-drop the PNG onto the verification page.
 
 ### What the verification page shows
 
-- Whether the data strip was successfully decoded
-- The decoded stats: tracker name, platform, username, class, upload, download, ratio, buffer, seeding count, seedbonus, hit & runs, join date
-- A side-by-side comparison of the fractal extracted from the image and the fractal regenerated from the decoded stats
-- A regenerated spirograph from the decoded timestamp
-- How many bit corrections were needed (0 = lossless)
+- Whether the data strip decoded successfully
+- Decoded stats: tracker name, platform, username, class, upload, download, ratio, buffer, seeding count, seedbonus, hit & runs, join date
+- Side-by-side fractal comparison: extracted from image vs. regenerated from decoded stats
+- Regenerated spirograph from the timestamp
+- Bit corrections needed (0 = lossless)
 - Overall verification status
 
 ### Verification results
 
 **Verified — Seal + Data Match**
-: The stats in the strip match the fractal. The image has not been tampered with after generation. This is the best result.
+: Stats in the strip match the fractal. No tampering after generation. Best result.
 
 **Data Decoded — Seal Mismatch**
-: The strip decoded but the fractal does not match. The image may have been edited after generation, or it experienced heavy compression. Ask for the original file.
+: Strip decoded but fractal doesn't match. The image was edited after generation or compressed heavily. Ask for the original.
 
 **Decode Failed**
-: The image is too degraded or has been fundamentally altered. Cannot verify.
+: Image too degraded or fundamentally altered. Cannot verify.
 
 !!! info "What verification does NOT tell you"
-    Verification confirms the image is internally consistent and has not been tampered with **after generation**. It does not confirm the stats are truthful — the user controls their instance and could have fabricated data before generating the report. Use it as one input alongside your own judgment.
+
+    It confirms internal consistency and no tampering after generation. It doesn't confirm the stats are real — the user controls their instance. Use it as one input with your own judgment.
 
 ---
 
 ## How It Works
 
-1. When you generate a report, Tracker Tracker reads your most recent polled snapshot from its database.
-2. It serializes the stats into a compact binary format and hashes them to produce a unique fingerprint.
-3. That fingerprint determines the appearance of the fractal seal. Different stats produce a completely different fractal.
-4. The fractal image is used to derive an encryption key.
-5. The binary stats are encrypted with that key, scrambled, and encoded into the colored bands of the data strip.
-6. The fractal and strip are bound together: you cannot change one without breaking the other.
-7. When a verifier uploads the image, the system extracts the fractal, derives the decryption key from it, decrypts the strip, recovers the stats, regenerates what the fractal _should_ look like from those stats, and checks that it matches what's actually in the image.
+1. Generate a report. Tracker Tracker reads your most recent snapshot.
+2. Stats serialize to compact binary, hashed for a fingerprint.
+3. The fingerprint determines the fractal. Different stats = different fractal.
+4. The fractal derives an encryption key.
+5. Stats encrypt with that key, scramble, and encode into the data strip's colored bands.
+6. Fractal and strip are linked — change one and the other breaks.
+7. A verifier uploads the image. The system extracts the fractal, derives the decryption key, decrypts the strip, recovers the stats, regenerates the fractal from those stats, and compares it to the image.
 
 ---
 
@@ -174,22 +167,23 @@ Upload or drag-and-drop the PNG onto the verification page.
 | User modifies the source code                                        | Open source — code is public            | Faker must reproduce pixel-perfect output from the full rendering pipeline                |
 
 !!! note "Honest positioning"
-    This system raises forgery effort from trivial to impractical. It does not make forgery impossible. A determined attacker with technical skills who controls their instance can theoretically fabricate a valid report. The practical threat — someone trying to bluff their way into a tracker invite — is effectively blocked.
+
+    This makes forgery impractical, not impossible. A skilled attacker with instance control could theoretically fake a report. The real threat — someone bluffing their way into a tracker invite — is effectively blocked.
 
 ---
 
 ## Privacy Considerations
 
-- The report contains your username, tracker name, platform type, and stats. Once shared, you cannot control its distribution.
-- Image host URLs (ptpimg, imgbox, etc.) are typically unguessable but publicly accessible if someone has the link.
-- ImgBB supports auto-delete timers if you want the image to expire after sharing.
-- The verification tool runs entirely in the browser. No images are uploaded to any server — processing happens locally in memory and nothing is stored or transmitted.
+- Reports contain your username, tracker name, platform, and stats — once shared, you can't control distribution.
+- Image host URLs are unguessable but publicly accessible with the link.
+- ImgBB supports auto-deletion if you want.
+- Verification runs in-browser only with no uploads or data transmission.
 
 ---
 
 ## Image Host Setup
 
-Configure image hosting API keys in **Settings → General → Image Hosting**. See the [Image Hosting](image-hosting.md) page for full setup instructions.
+Configure API keys in **Settings → General → Image Hosting**.
 
 | Host      | Where to find your key                                     | Notes                                                                             |
 | --------- | ---------------------------------------------------------- | --------------------------------------------------------------------------------- |
@@ -201,4 +195,4 @@ Configure image hosting API keys in **Settings → General → Image Hosting**.
 
 ## How Verification Recovers From Compression
 
-When an image has been mildly compressed (passed through Discord, re-saved, etc.), the fractal's visual fingerprint may shift by a few bits. The verifier compensates by testing nearby fingerprint variants until it finds one that successfully decrypts the data strip. A checksum embedded in the payload acts as a stop condition. This process is automatic and typically completes in under a second.
+If an image gets mildly compressed, the fractal's fingerprint shifts by a few bits. The verifier tests nearby variants until one decrypts the data strip successfully. A checksum stops the search. It's automatic and usually takes under a second.
diff --git a/docs/kb/docs/features/webhooks.md b/docs/kb/docs/features/webhooks.md
index 8fbd1d99..43e12834 100644
--- a/docs/kb/docs/features/webhooks.md
+++ b/docs/kb/docs/features/webhooks.md
@@ -5,7 +5,7 @@ description: Get alerts in Discord when your ratio drops, a tracker goes down, o
 
 # Webhooks
 
-Tracker Tracker can send you alerts when things happen on your trackers — ratio drops, hit-and-runs, outages, rank changes, and more.
+Tracker Tracker sends you alerts when things change on your trackers — ratio drops, hit-and-runs, outages, rank changes, and more.
 
 ## Supported Platforms
 
@@ -21,10 +21,10 @@ Tracker Tracker can send you alerts when things happen on your trackers — rati
 
 ### In Discord
 
-1. Open the channel where you want alerts.
-2. **Edit Channel → Integrations → Webhooks → New Webhook.**
-3. Name it whatever you want (e.g., "Tracker Alerts").
-4. Copy the webhook URL.
+1. Open the channel where you want alerts
+2. **Edit Channel → Integrations → Webhooks → New Webhook**
+3. Name it (i.e., "Tracker Alerts")
+4. Copy the webhook URL
 
 Keep this URL private — anyone with it can post to your channel.
 
@@ -32,11 +32,11 @@ Keep this URL private — anyone with it can post to your channel.
 
 ### In Tracker Tracker
 
-1. Go to **Settings → Notifications**.
-2. Click **Add Notification Target**.
-3. Select **Discord**, paste the URL, and give the target a name.
-4. Choose which events you want.
-5. Save, then click **Test Webhook** to confirm it works.
+1. Go to **Settings → Notifications**
+2. Click **Add Notification Target**
+3. Select **Discord**, paste the URL, and name the target
+4. Choose which events to send
+5. Save and click **Test Webhook** to confirm
 
 ![Test notification in Discord](../assets/images/webhooks-discord-test-notif.png)
 
@@ -56,10 +56,10 @@ Each target subscribes to any combination of these events:
 | Rank change      | Your user class changes                          | 7 days   |
 | Anniversary      | Membership hits 1 month, 6 months, then yearly   | 7 days   |
 
-Cooldowns prevent spam — if a condition persists across multiple polls, you get one alert per cooldown period, not one per poll.
+Cooldowns prevent spam. If a problem persists across multiple polls, you get one alert per cooldown period, not one for every single poll.
 
 !!! info "First-poll behavior"
-    Events that compare snapshots (ratio drop, hit-and-run) need at least two polls and won't fire on the first one. Events like "account warned" fire immediately if the condition is already true.
+    Comparison events (ratio drop, hit-and-run) need two polls before firing. State events like "account warned" fire immediately if true on the first poll.
 
 ## Thresholds
 
@@ -72,25 +72,23 @@ Two thresholds can be adjusted per target:
 
 ## Scoping to Specific Trackers
 
-By default, a target gets events from all your trackers. You can restrict it to specific ones — events from other trackers are ignored.
-
-Useful for separate channels per tracker, or if you only care about alerts for certain sites.
+By default, a target receives events from all trackers. You can limit it to specific trackers instead — events from others are ignored. Great for one Discord channel per tracker, or if you only want alerts for certain sites.
 
 ## Multiple Targets
 
-You can set up more than one target. Some ideas:
+Set up as many targets as you need:
 
-- **One channel per tracker** — scope each target to a single tracker.
-- **Urgent vs. routine** — ratio danger and tracker down in one channel, rank changes and anniversaries in another.
-- **Private vs. shared** — turn off "Include tracker name" on targets that post to channels other people can see.
+- **One channel per tracker** — scope each target to a single tracker
+- **Urgent vs. routine** — ratio danger and outages in one channel, rank changes and anniversaries in another
+- **Private vs. shared** — disable "Include tracker name" on public channels
 
 ## Privacy
 
-The **Include tracker name** toggle controls whether the tracker's name appears in messages. Turn it off if you share the channel.
+Use the **Include tracker name** toggle to hide the tracker name in messages if you share the Discord channel.
 
-If **Store usernames** is disabled in app settings, usernames are masked in notifications too.
+If you disable **Store usernames** in app settings, usernames are masked in alerts too.
 
-Webhook URLs are encrypted in the database and never appear in API responses or logs.
+Webhook URLs stay encrypted in the database — they never show up in API responses or logs.
 
 ## What the Messages Look Like
 
@@ -105,7 +103,7 @@ Notifications arrive as Discord embeds with a colored sidebar:
 
 ### Webhook shows "Failed"
 
-Open the target card — the error under the status badge describes the problem. Common causes:
+Open the target card to see the error under the status badge. Common causes:
 
 - **Webhook deleted in Discord.** Re-create it and update the URL in Tracker Tracker.
 - **Channel deleted.** Discord removes all webhooks when a channel is deleted.
@@ -113,7 +111,7 @@ Open the target card — the error under the status badge describes the problem.
 
 ### Notifications stopped arriving
 
-After 3 consecutive failures, delivery pauses briefly and resumes automatically. If Discord was temporarily unreachable, notifications catch up on the next poll.
+After 3 failures, delivery pauses and then resumes on its own. If Discord was just temporarily down, you'll catch up on the next poll.
 
 ### Getting rate-limited
 
@@ -125,8 +123,8 @@ Discord allows roughly 30 webhook messages per minute per channel. To reduce vol
 
 ### Test works but real notifications don't
 
-The test button sends a sample message. Real notifications need:
+Real alerts require:
 
-1. An event to actually occur (your ratio has to drop, not just be low).
-2. The cooldown window to have elapsed since the last alert of that type.
-3. At least two polls for comparison-based events (ratio drop, hit-and-run).
+1. An actual event (ratio must drop, not just be low)
+2. The cooldown to have passed since the last alert
+3. Two polls for comparison events (ratio drop, hit-and-run)
diff --git a/docs/kb/docs/getting-started/docker-config.md b/docs/kb/docs/getting-started/docker-config.md
index 4a79db4d..84352c39 100644
--- a/docs/kb/docs/getting-started/docker-config.md
+++ b/docs/kb/docs/getting-started/docker-config.md
@@ -5,7 +5,7 @@ description: Environment variables, volumes, ports, reverse proxy examples, and
 
 # Docker Configuration
 
-Everything you need to customize how Tracker Tracker runs: environment variables, volume mounts, port mapping, reverse proxy setup, and how to update.
+Customize Tracker Tracker via environment variables, volumes, ports, reverse proxies, and update strategies.
 
 ---
 
@@ -13,64 +13,64 @@ Everything you need to customize how Tracker Tracker runs: environment variables
 
 ### Required
 
-| Variable            | Description                                                                                                                            |
-| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
-| `SESSION_SECRET`    | Protects your session cookies. Minimum 32 characters. Generate with `openssl rand -base64 48`.                                         |
-| `POSTGRES_PASSWORD` | Password for the bundled PostgreSQL container. Generate with `openssl rand -base64 24`. Not needed if you set `DATABASE_URL` directly. |
+| Variable            | Description                                                                                                               |
+|---------------------|---------------------------------------------------------------------------------------------------------------------------|
+| `SESSION_SECRET`    | Protects your session cookies. Minimum 32 characters. Generate with `openssl rand -base64 48`.                            |
+| `POSTGRES_PASSWORD` | Password for the PostgreSQL container. Generate with `openssl rand -base64 24`. Skip this if you're using `DATABASE_URL`. |
 
 ### Optional
 
-| Variable         | Default              | Description                                                                                                                                                             |
-| ---------------- | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `POSTGRES_USER`  | `postgres`           | PostgreSQL username. Must match in both the app and db services.                                                                                                        |
-| `POSTGRES_DB`    | `tracker_tracker`    | Database name.                                                                                                                                                          |
-| `POSTGRES_HOST`  | `tracker-tracker-db` | Hostname of the PostgreSQL server. Only change this if you're using an external database without `DATABASE_URL`.                                                        |
-| `POSTGRES_PORT`  | `5432`               | PostgreSQL port. If you change this, uncomment the matching lines in `docker-compose.yml`.                                                                              |
-| `DATABASE_URL`   | _(auto-built)_       | Full connection string. Set this to use an external Postgres instance instead of the `POSTGRES_*` variables. Format: `postgresql://user:password@host:5432/dbname`      |
-| `PORT`           | `3000`               | Port the app listens on inside the container. The host-side port mapping in `docker-compose.yml` follows this value.                                                    |
-| `BASE_URL`       | _(empty)_            | The public URL where your app is reachable, e.g. `https://trackertracker.example.com`. Used in backup file metadata and notification links.                             |
-| `SECURE_COOKIES` | _(auto)_             | Set to `true` to mark session cookies as `Secure`. Auto-enabled when `BASE_URL` starts with `https://`. Only needed if you serve over HTTPS without setting `BASE_URL`. |
-| `TZ`             | `UTC`                | Timezone for scheduled tasks and log timestamps. Uses standard tz database names, e.g. `America/Chicago`, `Europe/London`.                                              |
-| `LOG_LEVEL`      | `info`               | Log verbosity. Options: `error`, `warn`, `info`, `debug`.                                                                                                               |
-| `LOG_FILE`       | _(none)_             | Absolute path inside the container to write logs to disk, e.g. `/data/logs/tracker-tracker.log`.                                                                        |
+| Variable         | Default              | Description                                                                                                                                                     |
+|------------------|----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `POSTGRES_USER`  | `postgres`           | PostgreSQL username. Match this in both the app and db services.                                                                                                |
+| `POSTGRES_DB`    | `tracker_tracker`    | Database name.                                                                                                                                                  |
+| `POSTGRES_HOST`  | `tracker-tracker-db` | PostgreSQL hostname. Change only if using an external Postgres instance without `DATABASE_URL`.                                                                 |
+| `POSTGRES_PORT`  | `5432`               | PostgreSQL port. If you change it, uncomment the matching lines in `docker-compose.yml`.                                                                        |
+| `DATABASE_URL`   | _(auto-built)_       | Full connection string. Use this instead of `POSTGRES_*` variables when pointing to an external Postgres. Format: `postgresql://user:password@host:5432/dbname` |
+| `PORT`           | `3000`               | Container port. The host mapping in `docker-compose.yml` follows this.                                                                                          |
+| `BASE_URL`       | _(empty)_            | Your public app URL (e.g. `https://trackertracker.example.com`). Used for backup metadata and notification links.                                               |
+| `SECURE_COOKIES` | _(auto)_             | Set to `true` to mark session cookies as `Secure`. Auto-enabled when `BASE_URL` is HTTPS. Only set this if you serve HTTPS without `BASE_URL`.                  |
+| `TZ`             | `UTC`                | Timezone for scheduled tasks and log timestamps (e.g. `America/Chicago`, `Europe/London`).                                                                      |
+| `LOG_LEVEL`      | `info`               | Log verbosity. Options: `error`, `warn`, `info`, `debug`.                                                                                                       |
+| `LOG_FILE`       | _(none)_             | Write logs to disk at this container path (e.g. `/data/logs/tracker-tracker.log`).                                                                              |
 
 !!! info "Settings vs environment variables"
-    Most day-to-day settings — polling interval, privacy mode, proxy config, backup schedule, lockout policy — live inside the app under **Settings**, not in environment variables. Environment variables are just for infrastructure stuff like database connections and ports.
+    Day-to-day options (polling interval, privacy mode, proxy config, backup schedule, lockout policy) live in the app under **Settings**. Environment variables control infrastructure: database, ports, logging.
 
 ---
 
 ## Volume mounts
 
-| Host path                    | Container path                    | Purpose                                                                                        |
-| ---------------------------- | --------------------------------- | ---------------------------------------------------------------------------------------------- |
-| `./data`                     | `/data`                           | Application data directory. Contains `backups/` and `logs/` subdirectories.                    |
-| `./data/backups`             | `/data/backups`                   | Where scheduled backup files are written.                                                      |
-| `./data/logs`                | `/data/logs`                      | Log files when `LOG_FILE` is set.                                                              |
-| `pgdata` (named volume)      | `/var/lib/postgresql/data`        | PostgreSQL data directory. Managed by Docker — don't put this on a network drive.              |
-| `./postgres/postgresql.conf` | `/etc/postgresql/postgresql.conf` | Custom PostgreSQL config. Included in the repo and required for the bundled database to start. |
+| Host path                    | Container path                    | Purpose                                                       |
+|------------------------------|-----------------------------------|---------------------------------------------------------------|
+| `./data`                     | `/data`                           | App data (`backups/` and `logs/`).                            |
+| `./data/backups`             | `/data/backups`                   | Scheduled backups.                                            |
+| `./data/logs`                | `/data/logs`                      | Logs when you set `LOG_FILE`.                                 |
+| `pgdata` (named volume)      | `/var/lib/postgresql/data`        | PostgreSQL data. Docker manages it—don't use a network drive. |
+| `./postgres/postgresql.conf` | `/etc/postgresql/postgresql.conf` | Custom PostgreSQL config. Required for the bundled database.  |
 
-!!! warning "Back up the pgdata volume"
-    The `pgdata` named volume holds your entire database. Use the built-in backup feature (Settings → Backups) for app-level backups, and separately snapshot the Docker volume or use `pg_dump` if you want a database-level backup.
+!!! warning "Back up pgdata"
+    This volume holds your entire database. Use the built-in backup (Settings → Backups) for app snapshots. For database-level backups, snapshot the Docker volume or run `pg_dump` separately.
 
 ---
 
 ## Port configuration
 
-By default the app binds to port `3000` on your host:
+By default the app binds to port `3000`:
 
 ```yaml
 ports:
   - "${PORT:-3000}:3000"
 ```
 
-To use a different port, set `PORT` in `.env`:
+Use a different port? Set it in `.env`:
 
 ```ini title=".env"
 PORT=8080
 ```
 
-!!! tip "Behind a reverse proxy?"
-    If Tracker Tracker sits behind Nginx, Caddy, or Traefik, you don't need to expose port 3000 to the outside world at all. Remove the `ports:` block from `docker-compose.yml` and let the reverse proxy talk to the container over the Docker network directly.
+!!! tip "Running behind a reverse proxy"
+    With Nginx, Caddy, or Traefik? Skip the `ports:` block and let your proxy reach the container via Docker's network.
 
 ---
 
@@ -78,107 +78,99 @@ PORT=8080
 
 === "Nginx"
 
-    ```nginx title="/etc/nginx/sites-available/tracker-tracker"
-    server {
-        listen 80;
-        server_name trackertracker.example.com;
-        return 301 https://$host$request_uri;
+```nginx title="/etc/nginx/sites-available/tracker-tracker"
+server {
+    listen 80;
+    server_name trackertracker.example.com;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name trackertracker.example.com;
+
+    ssl_certificate     /etc/letsencrypt/live/trackertracker.example.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/trackertracker.example.com/privkey.pem;
+
+    # Required for live polling status updates
+    proxy_buffering off;
+    proxy_cache off;
+
+    location / {
+        proxy_pass         http://127.0.0.1:3000;
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection "upgrade";
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   X-Forwarded-Proto $scheme;
     }
-
-    server {
-        listen 443 ssl http2;
-        server_name trackertracker.example.com;
-
-        ssl_certificate     /etc/letsencrypt/live/trackertracker.example.com/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/trackertracker.example.com/privkey.pem;
-
-        # Required for live polling status updates
-        proxy_buffering off;
-        proxy_cache off;
-
-        location / {
-            proxy_pass         http://127.0.0.1:3000;
-            proxy_http_version 1.1;
-            proxy_set_header   Upgrade $http_upgrade;
-            proxy_set_header   Connection "upgrade";
-            proxy_set_header   Host $host;
-            proxy_set_header   X-Real-IP $remote_addr;
-            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header   X-Forwarded-Proto $scheme;
-        }
-    }
-    ```
+}
+```
 
 === "Caddy"
 
-    ```caddy title="Caddyfile"
-    trackertracker.example.com {
-        reverse_proxy localhost:3000
-    }
-    ```
+=== "Traefik"
 
-    Caddy handles TLS automatically via Let's Encrypt. That's the whole config.
+Add labels to the app service in `docker-compose.yml`:
+
+```yaml title="docker-compose.yml (app service labels)"
+services:
+    tracker-tracker-app:
+    image: ghcr.io/jordanlambrecht/tracker-tracker:latest
+    restart: unless-stopped
+    container_name: tracker-tracker-app
+    labels:
+        - "traefik.enable=true"
+        - "traefik.http.routers.tracker-tracker.rule=Host(`trackertracker.example.com`)"
+        - "traefik.http.routers.tracker-tracker.entrypoints=websecure"
+        - "traefik.http.routers.tracker-tracker.tls.certresolver=letsencrypt"
+        - "traefik.http.services.tracker-tracker.loadbalancer.server.port=3000"
+    # Remove the ports: block when using Traefik
+    networks:
+        - traefik_proxy
+        - default
+```
 
-=== "Traefik"
+Assumes Traefik is already running with a `websecure` entrypoint and `letsencrypt` resolver.
 
-    Add labels to the app service in `docker-compose.yml`:
-
-    ```yaml title="docker-compose.yml (app service labels)"
-    services:
-      tracker-tracker-app:
-        image: ghcr.io/jordanlambrecht/tracker-tracker:latest
-        restart: unless-stopped
-        container_name: tracker-tracker-app
-        labels:
-          - "traefik.enable=true"
-          - "traefik.http.routers.tracker-tracker.rule=Host(`trackertracker.example.com`)"
-          - "traefik.http.routers.tracker-tracker.entrypoints=websecure"
-          - "traefik.http.routers.tracker-tracker.tls.certresolver=letsencrypt"
-          - "traefik.http.services.tracker-tracker.loadbalancer.server.port=3000"
-        # Remove the ports: block when using Traefik
-        networks:
-          - traefik_proxy
-          - default
-    ```
-
-    This assumes Traefik is already running with a `websecure` entrypoint and a `letsencrypt` certificate resolver.
-
-!!! info "Set BASE_URL when using a reverse proxy"
-    Set `BASE_URL=https://trackertracker.example.com` in `.env`. This enables secure session cookies automatically and ensures backup files and notification links use your public address.
+!!! info "Set BASE_URL with a reverse proxy"
+    Add `BASE_URL=https://trackertracker.example.com` in `.env`. This auto-enables secure cookies and ensures backups and notifications use your public URL.
 
 ---
 
 ## Health check
 
-The container has a built-in Docker health check:
+A built-in health check comes with the container:
 
 ```dockerfile
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
   CMD wget --no-verbose --tries=1 --spider http://localhost:3000/api/health || exit 1
 ```
 
-The `/api/health` endpoint returns `200 OK` when the app is up and the database connection is healthy. The `depends_on` condition in `docker-compose.yml` waits for PostgreSQL to be ready before starting the app container.
+The `/api/health` endpoint returns `200 OK` when both the app and database are healthy. Docker Compose waits for Postgres before starting the app.
 
 ---
 
-## Updating to a new version
+## Updates
 
 ```bash
 docker compose pull && docker compose up -d
 ```
 
-The database schema updates automatically on startup. No manual steps required.
+The database schema updates automatically. No manual steps needed.
 
-!!! tip "Check the changelog first"
-    Read the [CHANGELOG](https://github.com/jordanlambrecht/tracker-tracker/blob/main/CHANGELOG.md) before pulling a new image — especially for major version bumps, which may include breaking changes to backup formats or environment variables.
+!!! tip "Read the changelog first"
+    Check the [CHANGELOG](https://github.com/jordanlambrecht/tracker-tracker/blob/main/CHANGELOG.md) before upgrading, especially major versions—they may break backups or environment variables.
 
-To pin to a specific version and update deliberately:
+Pin a version by editing `docker-compose.yml`:
 
 ```bash
-# In docker-compose.yml, change:
+# Change:
 image: ghcr.io/jordanlambrecht/tracker-tracker:latest
-# to:
+# To:
 image: ghcr.io/jordanlambrecht/tracker-tracker:2.1.1
 ```
 
-Then run `docker compose pull && docker compose up -d` to apply it.
+Then run `docker compose pull && docker compose up -d`.
diff --git a/docs/kb/docs/getting-started/first-setup.md b/docs/kb/docs/getting-started/first-setup.md
index c52958fb..48ce28c2 100644
--- a/docs/kb/docs/getting-started/first-setup.md
+++ b/docs/kb/docs/getting-started/first-setup.md
@@ -5,43 +5,24 @@ description: Creating your account and getting oriented after your first login.
 
 # First Setup
 
-Once the stack is running, there are a few one-time steps before you can start adding trackers.
+Once your stack is up, there are a few one-time things to do before you add trackers.
 
 ## Creating your account
 
-Open [http://localhost:3000](http://localhost:3000) in your browser. Tracker Tracker is a single-user app, so on first visit you're redirected to `/setup`.
+Go to [http://localhost:3000](http://localhost:3000). Since this is single-user, you'll land on `/setup` on first visit.
 
-Enter a username and password on the **Create an account** form.
+Fill in a username and password on the **Create an account** form. Your password does two things:
 
-Your password does two things:
+1. **Logs you in**—you'll need it every time you access the app.
+2. **Encrypts your API tokens**—all tracker tokens are encrypted at rest using your password. Lose the password? You can't recover the tokens, but you can re-enter them manually.
 
-1. **Logs you in.** You'll type it every time you access the app.
-2. **Protects your stored API tokens.** All tracker API tokens are encrypted at rest using a key derived from your password. If you lose your password, those tokens can't be recovered — but you can re-enter them manually.
+!!! warning "Use a strong password"
+    There's no recovery if you forget it—you'll have to reset the database. Use a password manager.
 
-!!! warning "Choose strong credentials"
-    There is no recovery mechanism. If you forget your password, you'll need to reset the database and start fresh. Keep it in a password manager.
+!!! info "Your password never leaves your machine"
+    It's hashed on the server before storage. The raw password is never written to disk.
 
-!!! info "Your password stays on your machine"
-    It's hashed on the server before being stored. The raw password is never saved anywhere.
-
-Click **Create Account**. You'll be logged in and land on the dashboard.
-
----
-
-## First look at the dashboard
-
-The dashboard is mostly empty until you add your first tracker — that's expected.
-
-The left sidebar has three sections:
-
-- **Tracker list** — each tracker you add shows up here with a pulse indicator showing its current health.
-- **Fleet stats** — combined upload, download, and ratio across all your active trackers.
-- **Navigation** — links to Settings and the download client panel (if you've configured one).
-
-The main area shows the tracker overview grid, charts, and leaderboard. Charts fill in automatically as polling history builds up over time.
-
-!!! tip "Polling starts right away"
-    The moment you add a tracker, the app polls it and records a snapshot. Stats start charting from that first poll. The default polling interval is 60 minutes — you can change it in **Settings → General**.
+Click **Create Account** and you're in. The dashboard starts empty—that's normal.
 
 ---
 
diff --git a/docs/kb/docs/getting-started/installation.md b/docs/kb/docs/getting-started/installation.md
index 072783e7..a3073705 100644
--- a/docs/kb/docs/getting-started/installation.md
+++ b/docs/kb/docs/getting-started/installation.md
@@ -5,17 +5,17 @@ description: How to install Tracker Tracker using Docker Compose or Docker Run.
 
 # Installation
 
-Tracker Tracker runs as a Docker image. The easiest way to get it running is with Docker Compose.
+Tracker Tracker runs in Docker. Use Docker Compose to get it up and running.
 
 ## Prerequisites
 
 - [Docker](https://docs.docker.com/get-docker/) 24+
 - [Docker Compose v2](https://docs.docker.com/compose/install/) (the `docker compose` plugin, not the legacy `docker-compose` binary)
 
-Nothing else needs to be installed on your host.
+That's it — nothing else to install.
 
 !!! info "Architecture support"
-    The image supports **linux/amd64** and **linux/arm64**. It runs on x86-64 servers and ARM machines like Raspberry Pi 4/5 or Apple Silicon in Linux VMs — Docker picks the right version automatically.
+    We build for **linux/amd64** and **linux/arm64**, so you're covered on x86-64 servers, Raspberry Pi 4/5, and Apple Silicon in Linux VMs. Docker grabs the right one automatically.
 
 ---
 
@@ -32,18 +32,18 @@ curl -LO https://raw.githubusercontent.com/jordanlambrecht/tracker-tracker/main/
 curl -L https://raw.githubusercontent.com/jordanlambrecht/tracker-tracker/main/.env.example -o .env
 ```
 
-Or create the files manually using the contents shown in the next steps.
+Or create them manually by copying the examples below.
 
 ## Step 3 — Generate secrets
 
-You need two secrets before starting the stack. Run each command and paste the output into `.env`:
+Generate two secrets and paste them into `.env`:
 
 ```bash
 openssl rand -base64 24   # → POSTGRES_PASSWORD
 openssl rand -base64 48   # → SESSION_SECRET
 ```
 
-Open `.env` and fill in the values:
+Then open `.env` and add them:
 
 ```ini title=".env"
 SESSION_SECRET=<output of openssl rand -base64 48>
@@ -52,64 +52,62 @@ POSTGRES_USER=postgres
 TZ=America/Chicago
 ```
 
-!!! warning "Don't reuse these values"
-    `SESSION_SECRET` protects your session cookies. `POSTGRES_PASSWORD` protects your database. Generate fresh values — never copy the placeholder text from `.env.example`.
+!!! warning "Fresh secrets every time"
+    Generate new ones each time. `SESSION_SECRET` protects your cookies, `POSTGRES_PASSWORD` protects your database. Don't copy the `.env.example` placeholder.
 
 ## Step 4 — Start the stack
 
 === "Docker Compose (recommended)"
 
-    ```bash
-    docker compose up -d
-    ```
-
-    The app waits for the database to be ready before starting, then sets up the database schema automatically. First boot takes about 15-20 seconds.
+```bash
+docker compose up -d
+```
 
-    Watch the startup logs:
+The app waits for the database to be ready, then sets up the schema automatically. First boot takes about 15-20 seconds. Peek at the logs if you want to watch:
 
-    ```bash
-    docker compose logs -f tracker-tracker-app
-    ```
+```bash
+docker compose logs -f tracker-tracker-app
+```
 
 === "Docker Run (standalone)"
 
-    If you already have PostgreSQL running somewhere else, you can start just the app container:
+Running Postgres elsewhere? Start the app container:
 
-    ```bash
-    docker run -d \
-      --name tracker-tracker-app \
-      --restart unless-stopped \
-      -p 3000:3000 \
-      -v ./data:/data \
-      -e DATABASE_URL="postgresql://postgres:yourpassword@your-postgres-host:5432/tracker_tracker" \
-      -e SESSION_SECRET="your-session-secret-minimum-32-chars" \
-      -e TZ="America/Chicago" \
-      ghcr.io/jordanlambrecht/tracker-tracker:latest
-    ```
+```bash
+docker run -d \
+    --name tracker-tracker-app \
+    --restart unless-stopped \
+    -p 3000:3000 \
+    -v ./data:/data \
+    -e DATABASE_URL="postgresql://postgres:yourpassword@your-postgres-host:5432/tracker_tracker" \
+    -e SESSION_SECRET="your-session-secret-minimum-32-chars" \
+    -e TZ="America/Chicago" \
+    ghcr.io/jordanlambrecht/tracker-tracker:latest
+```
 
-    Point `DATABASE_URL` at your existing Postgres instance. The app creates its own schema on startup if it doesn't exist yet.
+Point `DATABASE_URL` to your Postgres instance. The app will create its schema on startup if needed.
 
-## Step 5 — Verify it is running
+## Step 5 — Verify it's running
 
 ```bash
 docker compose ps
 ```
 
-Both containers should show as running:
+Both containers should be running:
 
-```
+```md
 NAME                    STATUS
 tracker-tracker-app     running
 tracker-tracker-db      running (healthy)
 ```
 
-You can also hit the health endpoint:
+Or test the health endpoint:
 
 ```bash
 curl -s http://localhost:3000/api/health
 ```
 
-A `200 OK` response means the app is up and connected to the database.
+A `200 OK` means the app is up and talking to the database.
 
 ## Step 6 — Open the app
 
@@ -121,14 +119,14 @@ On first visit you'll be redirected to `/setup` to create your account. See [Fir
 
 ## Image registries
 
-The same image is on two registries — either works:
+Both registries have the same image — use whichever you prefer:
 
 | Registry                  | Image                                            |
 | ------------------------- | ------------------------------------------------ |
 | GitHub Container Registry | `ghcr.io/jordanlambrecht/tracker-tracker:latest` |
 | Docker Hub                | `jordyjordy/tracker-tracker:latest`              |
 
-Pin to a specific version if you want predictable updates:
+Pin a specific version if you want predictable updates:
 
 ```bash
 ghcr.io/jordanlambrecht/tracker-tracker:2.1.1
@@ -140,7 +138,7 @@ Check the [CHANGELOG](https://github.com/jordanlambrecht/tracker-tracker/blob/ma
 
 ## Using an external database
 
-If you already run PostgreSQL, remove the `tracker-tracker-db` service and the `depends_on` block from `docker-compose.yml`, then set `DATABASE_URL` directly instead of the `POSTGRES_*` variables:
+Using an external Postgres instance? Remove the `tracker-tracker-db` service and `depends_on` from `docker-compose.yml`, then set `DATABASE_URL`:
 
 ```ini title=".env"
 DATABASE_URL=postgresql://myuser:mypassword@192.168.1.10:5432/tracker_tracker
@@ -149,4 +147,4 @@ TZ=America/Chicago
 ```
 
 !!! tip
-    You only need to create the database itself beforehand. The app handles the rest on first startup — no manual SQL required.
+    Create the database name ahead of time. The app handles the rest on startup—no SQL scripts needed.
diff --git a/docs/kb/docs/index.md b/docs/kb/docs/index.md
index 6734c0b2..e173fc9e 100644
--- a/docs/kb/docs/index.md
+++ b/docs/kb/docs/index.md
@@ -4,17 +4,20 @@ Self-hosted dashboard for monitoring your private tracker stats over time.
 
 ## What is Tracker Tracker?
 
-Tracker Tracker connects to your private tracker accounts via their APIs and records your stats (upload, download, ratio, buffer, seed count, etc.) over time. It supports UNIT3D, Gazelle, and GazelleGames platforms.
+Tracker Tracker connects to your private tracker accounts and records your stats (upload, download, ratio, buffer, seed count, bonus points, etc.) over time. It polls tracker APIs on a schedule, stores the results, and charts everything so you see trends across days, weeks, and months.
+
+Supports UNIT3D, Gazelle, GGn, Nebulance, MAM, and AvistaZ networks. Over 40 trackers come pre-configured.
 
 ## Quick Links
 
-- **Getting Started** Start with the [Installation Guide](getting-started/installation.md)
-- **Adding your first tracker** See [Adding a Tracker](trackers/adding-a-tracker.md)
-- **Something not working?** Check [Troubleshooting](troubleshooting/common-errors.md)
+- [Installation guide](getting-started/installation.md) — get running in a few minutes with Docker
+- [Adding a tracker](trackers/adding-a-tracker.md) — connect your first tracker
+- [Troubleshooting](troubleshooting.md) — something not working?
 
 ## Features
 
-- **All your trackers in one place** — Upload, download, ratio, buffer, rank, and more across every site you're on
-- **Historical charts** — See how your stats change over days, weeks, and months
-- **qBittorrent dashboard** — Your torrents, seeds, and transfer speeds right next to your tracker stats
-- **Discord alerts** — Get notified when your ratio drops, a tracker goes down, or you hit a rank milestone
+- **All your trackers in one place** — upload, download, ratio, buffer, rank, bonus points across all your sites
+- **Historical charts**—watch your stats evolve over days, weeks, and months
+- **qBittorrent integration** — per-tracker torrent details, seeding counts, cross-seed stats, and live speeds
+- **Tag group visualizations** — turn qBittorrent tags into donut charts, bar charts, and treemaps
+- **Discord notifications** — alerts when your ratio drops, a tracker goes down, you hit a buffer milestone, or your rank shifts
diff --git a/docs/kb/docs/reference/platform-differences.md b/docs/kb/docs/reference/platform-differences.md
index 3a7b25f2..833abba9 100644
--- a/docs/kb/docs/reference/platform-differences.md
+++ b/docs/kb/docs/reference/platform-differences.md
@@ -5,74 +5,75 @@ description: Stat availability and behavior differences across UNIT3D, Gazelle,
 
 # Platform Differences
 
-Tracker Tracker supports multiple tracker platforms: **UNIT3D**, **Gazelle**, **GGn**, **Nebulance**, and **MAM** (MyAnonaMouse). Each platform exposes different stats and uses a different authentication method. This page tells you what to expect when adding a tracker of each type.
+Tracker Tracker works with **UNIT3D**, **Gazelle**, **GGn**, **Nebulance**, **MAM** (MyAnonaMouse), and **AvistaZ**. Each has different stats and authentication methods.
 
 ---
 
 ## Authentication
 
-How you authenticate with each platform's API depends on the platform type. In all cases, Tracker Tracker handles this for you — you just paste your API token when adding the tracker.
+Tracker Tracker handles auth behind the scenes — just paste your token when adding a tracker.
 
-| Platform    | How the token is sent                                                                                                                                                  |
-| ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **UNIT3D**  | Appended as a query parameter on every request (`?api_token=TOKEN`). HTTPS is required to prevent the token from being exposed in server logs.                         |
-| **Gazelle** | Sent as an HTTP `Authorization` header (`Authorization: token TOKEN`). Some Gazelle forks accept the token without the `token ` prefix — Tracker Tracker handles both. |
-| **GGn**     | Appended as a query parameter (`?key=TOKEN`), similar to UNIT3D but using a different parameter name.                                                                  |
-| **MAM**     | Sent as a `Cookie: mam_id=VALUE` header. Uses a session cookie from MAM's Security Settings page, not a traditional API key. Session cookies rotate monthly.           |
+| Platform    | How the token is sent                                                                                                                                                                                    |
+|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **UNIT3D**  | Appended as a query parameter on every request (`?api_token=TOKEN`). HTTPS is required to prevent the token from being exposed in server logs.                                                           |
+| **Gazelle** | Sent as an HTTP `Authorization` header (`Authorization: token TOKEN`). Some Gazelle forks accept the token without the `token` prefix — Tracker Tracker handles both.                                    |
+| **GGn**     | Appended as a query parameter (`?key=TOKEN`), similar to UNIT3D but using a different parameter name.                                                                                                    |
+| **MAM**     | Sent as a `Cookie: mam_id=VALUE` header. Uses a session cookie from MAM's Security Settings page, not a traditional API key. Session cookies rotate monthly.                                             |
+| **AvistaZ** | Browser cookies (`cf_clearance` + session cookies) sent as a `Cookie` header, with the matching `User-Agent`. Uses HTML scraping instead of a JSON API. Cookies expire when Cloudflare clearance lapses. |
 
 ---
 
 ## Stat Availability
 
-The table below shows which stats Tracker Tracker can collect from each platform. A note in the cell means the stat is available but with caveats.
-
-| Stat                      | UNIT3D                   | Gazelle                          | GGn                              | MAM                                 |
-| ------------------------- | ------------------------ | -------------------------------- | -------------------------------- | ----------------------------------- |
-| Upload / Download / Ratio | Yes                      | Yes                              | Yes                              | Yes (raw bytes + formatted strings) |
-| Buffer                    | Yes (tracker-calculated) | Approximate (calculated locally) | Approximate (calculated locally) | Approximate (calculated locally)    |
-| Seeding count             | Yes                      | Some forks only                  | Paranoia-dependent               | Yes (sum of snatch_summary seeding) |
-| Leeching count            | Yes                      | Some forks only                  | Paranoia-dependent               | Yes                                 |
-| Seedbonus / Bonus Points  | Yes                      | Yes (most forks)                 | Yes (called "gold")              | Yes                                 |
-| Required Ratio            | No                       | Yes                              | Yes                              | No                                  |
-| Hit & Runs                | Yes                      | No                               | Partial (may be null)            | Yes (inactive unsatisfied HnRs)     |
-| Freeleech Tokens          | No                       | Some forks only                  | No                               | Yes (called "wedges")               |
-| Warned status             | No                       | Some sites only                  | Yes                              | No                                  |
-| Class / Rank              | Yes                      | Yes                              | Yes                              | Yes                                 |
-| Join date                 | No                       | Some sites only                  | Yes                              | No                                  |
-| Last access date          | No                       | Some sites only                  | Yes                              | No                                  |
-| Share Score               | No                       | No                               | Yes                              | No                                  |
-| Donor status              | No                       | Some sites only                  | Yes                              | No (VIP status + expiry available)  |
-| Snatched count            | No                       | Some sites only                  | Yes                              | Yes (via snatch_summary categories) |
-| Community / rank data     | No                       | Some sites only                  | Yes                              | No                                  |
-| Upload / download buffs   | No                       | No                               | Yes                              | No                                  |
-| Avatar                    | No                       | Some sites only                  | No                               | No                                  |
+Notes in cells mean the stat exists but with limitations.
+
+| Stat                      | UNIT3D                   | Gazelle                          | GGn                              | MAM                                 | AvistaZ                           |
+|---------------------------|--------------------------|----------------------------------|----------------------------------|-------------------------------------|-----------------------------------|
+| Upload / Download / Ratio | Yes                      | Yes                              | Yes                              | Yes (raw bytes + formatted strings) | Yes (HTML scraped, decimal units) |
+| Buffer                    | Yes (tracker-calculated) | Approximate (calculated locally) | Approximate (calculated locally) | Approximate (calculated locally)    | Yes (tracker-calculated)          |
+| Seeding count             | Yes                      | Some forks only                  | Paranoia-dependent               | Yes (sum of snatch_summary seeding) | Yes                               |
+| Leeching count            | Yes                      | Some forks only                  | Paranoia-dependent               | Yes                                 | Yes                               |
+| Seedbonus / Bonus Points  | Yes                      | Yes (most forks)                 | Yes (called "gold")              | Yes                                 | Yes                               |
+| Required Ratio            | No                       | Yes                              | Yes                              | No                                  | No                                |
+| Hit & Runs                | Yes                      | No                               | Partial (may be null)            | Yes (inactive unsatisfied HnRs)     | Yes                               |
+| Freeleech Tokens          | No                       | Some forks only                  | No                               | Yes (called "wedges")               | No                                |
+| Warned status             | No                       | Some sites only                  | Yes                              | No                                  | No                                |
+| Class / Rank              | Yes                      | Yes                              | Yes                              | Yes                                 | Yes                               |
+| Join date                 | No                       | Some sites only                  | Yes                              | No                                  | Yes                               |
+| Last access date          | No                       | Some sites only                  | Yes                              | No                                  | Yes                               |
+| Share Score               | No                       | No                               | Yes                              | No                                  | No                                |
+| Donor status              | No                       | Some sites only                  | Yes                              | No (VIP status + expiry available)  | Yes                               |
+| Snatched count            | No                       | Some sites only                  | Yes                              | Yes (via snatch_summary categories) | No                                |
+| Community / rank data     | No                       | Some sites only                  | Yes                              | No                                  | No                                |
+| Upload / download buffs   | No                       | No                               | Yes                              | No                                  | No                                |
+| Avatar                    | No                       | Some sites only                  | No                               | No                                  | No                                |
 
 ### Notes on specific cells
 
-**Buffer (Gazelle and GGn):** The approximate buffer shown is your uploaded total minus your downloaded total. This tells you whether you are in surplus or deficit, but it does not account for your required ratio the way UNIT3D's server-calculated value does.
+**Buffer (Gazelle and GGn):** Approximate buffer = upload minus download. It shows surplus or deficit, but doesn't account for required ratio like UNIT3D's server-side calculation.
 
-**Seeding / Leeching on GGn:** GGn's paranoia setting controls what information is visible on public profiles. The API responses for your own account are not affected — Tracker Tracker always polls as you, so seeding and leeching counts are available unless GGn changes how it reports them.
+**Seeding / Leeching on GGn:** GGn's paranoia setting controls public profiles, but not your own account. Since we poll as you, seeding and leeching counts work unless GGn changes them.
 
-**Gazelle "some forks only":** The Gazelle codebase has been forked many times. Fields like seeding count, freeleech tokens, and extended profile data are not present on every site. See [Gazelle Fork Variations](#gazelle-fork-variations) below.
+**Gazelle "some forks only":** The Gazelle codebase has many forks with varying field support. See [Gazelle Fork Variations](#gazelle-fork-variations).
 
-**Warned / Join date / Last access on Gazelle:** These require an extended profile call that not all Gazelle sites support. Tracker Tracker fetches it where available.
+**Warned / Join date / Last access on Gazelle:** These need an extended profile call that not all sites support. We fetch them when available.
 
 ---
 
 ## GGn Polling
 
-GGn requires two API calls per poll cycle instead of one. The first call fetches your username and user ID. The second call fetches all of your stats using that ID.
+GGn requires two API calls per poll: one to get your username and user ID, then one for stats.
 
-After the first successful poll, Tracker Tracker caches your GGn user ID. Subsequent polls go directly to the stats call, skipping the first step.
+We cache your user ID after the first poll, so later polls skip straight to stats.
 
 ---
 
 ## Gazelle Fork Variations
 
-The Gazelle codebase has been forked many times, and field names are not consistent across sites. Here is what Tracker Tracker knows about the sites it supports:
+Field names vary across Gazelle forks. Here's what we track:
 
 | Site                 | Seedbonus field | Freeleech Tokens | Seeding count in basic response |
-| -------------------- | --------------- | ---------------- | ------------------------------- |
+|----------------------|-----------------|------------------|---------------------------------|
 | Redacted (RED)       | `bonusPoints`   | Sometimes        | No                              |
 | Orpheus (OPS)        | `bonusPoints`   | Sometimes        | No                              |
 | BroadcasTheNet (BTN) | Varies          | No               | No                              |
@@ -85,17 +86,17 @@ GGn is a Gazelle fork but uses its own dedicated adapter due to significant API
 
 ## Platform-Specific Extras
 
-Beyond the core stats, each platform surfaces additional information that Tracker Tracker stores and displays where relevant.
+Each platform offers extras beyond core stats that we store and display.
 
 ### Gazelle (extended profile)
 
-When the extended profile call is available, Tracker Tracker also collects:
+When available, we also fetch:
 
 - Donor status
 - Account enabled / paranoia level
 - Community rank positions (upload, download, requests, posts, overall)
 - Community activity totals (posts, comments, snatched, bounty, invites)
-- Unread messages and notification counts
+- Unread message and notification counts
 - Gift tokens and merit tokens (some forks)
 
 ### GGn
@@ -112,7 +113,7 @@ GGn's full user profile includes:
 
 ### MAM (MyAnonaMouse)
 
-MAM uses a single `/jsonLoad.php` endpoint with `?snatch_summary` to return everything in one call. MAM-specific extras include:
+We use a single `/jsonLoad.php` endpoint with `?snatch_summary` that returns everything at once. Extras include:
 
 - VIP status and expiry date
 - Connectivity status (connectable/offline)
@@ -122,4 +123,22 @@ MAM uses a single `/jsonLoad.php` endpoint with `?snatch_summary` to return ever
 - Recently deleted torrent count
 - FL Wedge count (freeleech tokens)
 
-**Authentication note:** MAM uses a `mam_id` session cookie rather than a traditional API key. The cookie is obtained from MAM's Security Settings page (User Preferences → Security). Session cookies rotate monthly, so users will need to update their token periodically.
+**Authentication note:** MAM uses a `mam_id` session cookie, not an API key. Get it from **User Preferences → Security**. Cookies rotate monthly, so refresh periodically.
+
+### AvistaZ Network
+
+AvistaZ uses HTML scraping instead of a JSON API. The profile page provides:
+
+- Donor status and VIP expiry date
+- Invite count
+- Account permission flags (can download, can upload)
+- Total upload and download torrent counts
+- Reseed request count
+- Two-factor authentication status
+- Bonus point earning rate per hour (from the bonus page, enrichment call)
+
+**Authentication note:** AvistaZ uses browser cookies, not an API key. Paste your cookies (include Cloudflare `cf_clearance`), and we capture the User-Agent automatically. Refresh when Cloudflare clearance expires.
+
+**Sites in the network:** AvistaZ, AnimeZ, PrivateHD, CinemaZ, ExoticaZ — all share the same platform and HTML structure.
+
+**Minimum rank:** Newbie accounts have restricted profiles. You need **Member** rank or above (5 GB upload, ratio ≥ 1.0, 7+ days old) to use the adapter.
diff --git a/docs/kb/docs/reference/settings.md b/docs/kb/docs/reference/settings.md
index ad296585..e28612b4 100644
--- a/docs/kb/docs/reference/settings.md
+++ b/docs/kb/docs/reference/settings.md
@@ -5,89 +5,83 @@ description: Complete reference for every configurable setting in Tracker Tracke
 
 # Settings Reference
 
-Every setting available in the Tracker Tracker settings interface is listed here, grouped by tab.
+Every setting, grouped by tab.
 
 ---
 
 ## General
 
-| Setting                     | Default    | What it does                                                                                                                                                                                                                                                                                      |
-| --------------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Tracker Poll Interval**   | 60 minutes | How often Tracker Tracker checks all of your active trackers. The minimum is 15 minutes; the maximum is 1440 minutes (24 hours). All trackers are polled together in each cycle — you cannot set a different interval per tracker.                                                                |
-| **Snapshot Retention**      | Unlimited  | How many days of polling history to keep. Leave blank to keep data forever. Set a number (between 7 and 3650) to automatically delete old snapshots. Pruning runs at the end of each poll cycle.                                                                                                  |
-| **Display Username**        | Enabled    | The name shown in the Tracker Tracker interface. This is your local label — it has nothing to do with your usernames on individual trackers.                                                                                                                                                      |
-| **Store Tracker Usernames** | Enabled    | When enabled, your username on each tracker is saved with each snapshot and shown in the UI. When disabled, usernames are masked before being saved and redacted before being shown — even if you had them stored previously. Turning this off does not delete usernames that were already saved. |
+Controls polling frequency and data retention. All trackers poll together at the configured interval (no per-tracker settings). **Display Username** is your local app label. When **Store Tracker Usernames** is off, they're masked in the UI but existing data isn't deleted.
+
+| Setting                | Default   | Notes                                                                 |
+|------------------------|-----------|-----------------------------------------------------------------------|
+| **Snapshot Retention** | Unlimited | Set 7–3650 days to auto-delete old snapshots; leave blank for forever |
 
 ---
 
 ## Security
 
-| Setting                              | Default    | What it does                                                                                                                                                                                                                  |
-| ------------------------------------ | ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Session Timeout**                  | None       | How long you can be idle before being automatically logged out. Leave blank to stay logged in until you log out manually.                                                                                                     |
-| **Two-Factor Authentication (TOTP)** | Disabled   | Adds a second login step using a time-based one-time code from any authenticator app (Google Authenticator, Aegis, etc.). When you enable TOTP, a set of one-time backup codes is also generated — save these somewhere safe. |
-| **Lockout**                          | Enabled    | When enabled, too many failed login attempts will temporarily lock the account.                                                                                                                                               |
-| **Lockout Threshold**                | 5 attempts | How many consecutive failed login attempts (password or TOTP) trigger a lockout.                                                                                                                                              |
-| **Lockout Duration**                 | 15 minutes | How long the account stays locked after the threshold is hit. The lock clears automatically when the time is up.                                                                                                              |
+Manages login security, lockouts, and two-factor authentication. **Session Timeout** defaults to infinite (never logged out by idle). **Lockout** protects against brute force — it auto-clears after the duration expires.
+
+| Setting             | Default | Notes                                                                          |
+|---------------------|---------|--------------------------------------------------------------------------------|
+| **Session Timeout** | None    | Leave blank to stay logged in forever; otherwise set minutes until auto-logout |
+
+### Two-Factor Authentication
+
+Enable TOTP (time-based one-time password) with any standard authenticator app (Google Authenticator, Aegis, 1Password, Bitwarden, Authy, etc).
+
+**Setup:**
+
+1. Go to **Settings → Security**
+2. Click **Enable Two-Factor Authentication**
+3. Scan the QR code with your authenticator app
+4. Enter the 6-digit code from your app to confirm
+5. **Save your 8 backup codes** in a password manager or secure location
+6. Click **Confirm**
+
+On login, enter either the current 6-digit code from your app or one of your backup codes. Each backup code works once, then expires.
+
+**Disabling:** Go to **Settings → Security** and click **Disable Two-Factor Authentication**. You'll need to enter your password and a valid TOTP or backup code.
+
+!!! warning "No authenticator app and no backup codes means no login — there is no account recovery."
+
+    Store backup codes immediately and keep them safe.
 
 ---
 
 ## Proxy
 
-These settings configure a single outbound proxy for tracker requests. Individual trackers can opt in to use this proxy via their own settings.
+Configures a single outbound proxy for tracker requests. Individual trackers can opt in per their own settings.
 
-| Setting            | Default  | What it does                                                                                                   |
-| ------------------ | -------- | -------------------------------------------------------------------------------------------------------------- |
-| **Proxy Enabled**  | Disabled | Master switch. When off, all tracker requests go out directly, even if individual trackers have proxy enabled. |
-| **Proxy Type**     | `socks5` | The proxy protocol. Options: `socks5`, `http`, `https`.                                                        |
-| **Proxy Host**     | —        | Hostname or IP address of the proxy server.                                                                    |
-| **Proxy Port**     | 1080     | Port the proxy listens on.                                                                                     |
-| **Proxy Username** | —        | Username for proxy authentication. Leave blank if your proxy does not require a login.                         |
-| **Proxy Password** | —        | Password for proxy authentication. Stored encrypted at rest.                                                   |
+All settings are self-explanatory; **Proxy Password** is stored encrypted.
 
 ---
 
 ## Notifications
 
-Notification targets are configured individually. Each target is an independent delivery destination (a Discord webhook, a Gotify server, etc.). The settings below apply per target.
-
-| Setting                        | Default             | What it does                                                                                                                      |
-| ------------------------------ | ------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| **Target Name**                | —                   | A label for this target, e.g. "Discord #alerts".                                                                                  |
-| **Target Type**                | —                   | The delivery platform: `discord`, `gotify`, `telegram`, `slack`, or `email`. Each type has its own credential fields.             |
-| **Enabled**                    | Enabled             | Turn a target off temporarily without deleting it.                                                                                |
-| **Include Tracker Name**       | Enabled             | When on, notification messages include the name of the tracker that triggered them. Turn off for extra privacy.                   |
-| **Scope**                      | All trackers        | Restrict this target to specific trackers. Leave blank to receive notifications from any tracker.                                 |
-| **Notify on Ratio Drop**       | Disabled            | Fires when a tracker's ratio drops by more than the configured delta.                                                             |
-| **Notify on Hit & Run**        | Disabled            | Fires when a new hit-and-run is detected.                                                                                         |
-| **Notify on Tracker Down**     | Disabled            | Fires when a tracker fails to respond during a poll cycle.                                                                        |
-| **Notify on Buffer Milestone** | Disabled            | Fires when your uploaded buffer crosses a configured size threshold.                                                              |
-| **Notify on Warning**          | Disabled            | Fires when your account enters warned status on a tracker.                                                                        |
-| **Notify on Ratio Danger**     | Disabled            | Fires when your ratio falls into a critical zone (typically below the tracker's required ratio).                                  |
-| **Notify on Zero Seeding**     | Disabled            | Fires when your seeding count drops to zero.                                                                                      |
-| **Notify on Rank Change**      | Disabled            | Fires when your class or rank changes on a tracker.                                                                               |
-| **Notify on Anniversary**      | Disabled            | Fires at membership milestones: 1 month, 6 months, then each year after.                                                          |
-| **Ratio Drop Delta**           | Application default | How large a ratio drop must be to trigger a notification. Overrides the application default for this target only.                 |
-| **Buffer Milestone Threshold** | Application default | The buffer size (in bytes) that triggers a buffer milestone notification. Overrides the application default for this target only. |
+Each target is an independent delivery destination (Discord, Gotify, Telegram, Slack, email). Configure what events trigger notifications per target and whether to include tracker names.
+
+| Setting                        | Default             | Notes                                                                       |
+|--------------------------------|---------------------|-----------------------------------------------------------------------------|
+| **Ratio Drop Delta**           | Application default | Override the app-wide ratio drop threshold for this target only             |
+| **Buffer Milestone Threshold** | Application default | Override the app-wide buffer milestone size (in bytes) for this target only |
 
 ---
 
 ## Backups
 
-| Setting                    | Default  | What it does                                                                                                                                                                                                               |
-| -------------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Scheduled Backups**      | Disabled | Turns on automatic backups. When disabled, you can still export backups manually at any time.                                                                                                                              |
-| **Backup Frequency**       | Daily    | How often scheduled backups run: `daily`, `weekly`, or `monthly`. Scheduled backups always run at 03:00 server time.                                                                                                       |
-| **Backup Retention Count** | 14       | Maximum number of scheduled backup files to keep on disk. When this limit is exceeded, the oldest file is deleted. This does not affect manual exports, which are downloaded to your browser and not stored on the server. |
-| **Backup Encryption**      | Disabled | When enabled, backup files are encrypted with an additional password layer and saved with the `.ttbak` extension.                                                                                                          |
-| **Backup Password**        | —        | The password used to encrypt and decrypt backup files. Only relevant when backup encryption is on.                                                                                                                         |
-| **Backup Storage Path**    | —        | The folder on the server where scheduled backup files are written. The path must be writable by the application process.                                                                                                   |
+Controls automatic backup scheduling, encryption, and retention. Backups always run at 03:00 server time.
+
+| Setting                    | Default | Notes                                                           |
+|----------------------------|---------|-----------------------------------------------------------------|
+| **Backup Retention Count** | 14      | Number of backups to keep (1–365); oldest deletes when exceeded |
 
 ---
 
 ## Notes
 
-- **Encrypted storage** — Your proxy password, backup password, API tokens, and download client credentials are all encrypted at rest. Changing your master password re-encrypts everything automatically.
-- **Restoring a backup** — Your master password and its associated encryption salt are never included in a backup and are never overwritten when you restore one. Your session stays valid after a restore.
-- **Lockout and restores** — Restoring a backup always clears any active lockout, regardless of what was in the backup file.
-- **Secure cookies** — Session cookies are marked `Secure` (HTTPS-only) when `BASE_URL` starts with `https://` or `SECURE_COOKIES=true` is set. If you access the app over plain HTTP, cookies are not marked `Secure` and this is expected.
+- **Encrypted storage** — Proxy password, backup password, API tokens, and credentials are encrypted at rest. Changing your master password re-encrypts everything.
+- **Restoring a backup** — Your master password and encryption salt are never backed up and never overwritten on restore. Sessions stay valid.
+- **Lockout and restores** — Backup restore always clears active lockout.
+- **Secure cookies** — Session cookies are marked `Secure` when `BASE_URL` starts with `https://` or `SECURE_COOKIES=true`. Plain HTTP doesn't mark them secure.
diff --git a/docs/kb/docs/reference/stats-explained.md b/docs/kb/docs/reference/stats-explained.md
index fbac0423..b8604097 100644
--- a/docs/kb/docs/reference/stats-explained.md
+++ b/docs/kb/docs/reference/stats-explained.md
@@ -5,7 +5,7 @@ description: Plain-language explanations of every stat Tracker Tracker collects
 
 # Stats Explained
 
-At each poll interval, Tracker Tracker fetches a snapshot of your stats from each tracker. This page explains what each stat means and which platforms support it.
+We save a snapshot on every poll. Here's what each stat means.
 
 ---
 
@@ -13,13 +13,13 @@ At each poll interval, Tracker Tracker fetches a snapshot of your stats from eac
 
 ### Uploaded
 
-The total amount of data you have contributed to the swarm across your entire account history. This number only ever goes up. Upload credit is the primary currency on private trackers — it is the basis for your ratio and your buffer.
+Total data you've contributed since signup. It only goes up. Upload is the main currency on private trackers — it drives ratio and buffer.
 
 ### Downloaded
 
-The total amount of data your client has received from the swarm. Like uploaded, this is a lifetime counter. A few trackers run occasional "download forgiveness" events that can reduce this number, but that is rare.
+Total data you've received since signup. Like upload, it's a lifetime counter. Some trackers run rare "download forgiveness" events that reduce it.
 
-A large download total is not a problem on its own. What matters is your ratio relative to it.
+A large download isn't a problem — your ratio relative to it is what matters.
 
 ---
 
@@ -27,32 +27,32 @@ A large download total is not a problem on its own. What matters is your ratio r
 
 ### Ratio
 
-Your ratio is your uploaded total divided by your downloaded total. If you have uploaded 400 GiB and downloaded 200 GiB, your ratio is 2.00.
+Upload divided by download. Upload 400 GiB and download 200 GiB, you get 2.00.
 
-Most trackers require a minimum ratio. Falling below it can restrict your ability to download or result in a warning.
+Most trackers enforce a minimum. Fall below it and you lose download access or get warned.
 
-A ratio of `∞` means you have uploaded data but downloaded nothing. This typically happens when you seed your own uploads.
+A ratio of `∞` means you uploaded but never downloaded — i.e., you seeded your own uploads.
 
 ### Required Ratio
 
-The minimum ratio your account must maintain, set by the tracker. A required ratio of `0.60` means you must have uploaded at least 60% of what you have downloaded.
+The minimum ratio you must maintain. A requirement of `0.60` means you must upload at least 60% of your download.
 
-Some trackers have a grace period for new members — no requirement for the first few gigabytes, then the requirement kicks in.
+Some trackers give new members grace — no requirement for the first few GiB.
 
-**Availability:** Not available on UNIT3D. Available on Gazelle and GGn.
+**Availability:** Not on UNIT3D. Available on Gazelle and GGn.
 
 ---
 
 ## Buffer
 
-Your buffer is the gap between where your ratio is now and where it would need to drop before you hit the tracker's required minimum. A larger buffer means you can grab more content before ratio becomes a concern.
+How far below the required minimum you could fall. A bigger buffer means you can grab more without hitting your ratio floor.
 
-How buffer is calculated depends on the platform:
+Calculation varies:
 
-- **UNIT3D** — The tracker calculates buffer server-side and returns it directly. This is the most accurate value.
-- **Gazelle and GGn** — Tracker Tracker calculates buffer as uploaded minus downloaded (your net upload surplus). This is a simplified figure; it does not factor in your required ratio.
+- **UNIT3D** — Server-side calculation. Most accurate.
+- **Gazelle and GGn** — Upload minus download (net surplus). Doesn't account for your required ratio.
 
-A negative buffer means you are already in deficit — your downloaded total exceeds your uploaded total.
+A negative buffer means you're already in deficit.
 
 ---
 
@@ -60,41 +60,41 @@ A negative buffer means you are already in deficit — your downloaded total exc
 
 ### Seeding Count
 
-The number of torrents your client is currently seeding (uploading to others). Seeding is how you build upload credit over time. Some trackers enforce minimum seeding requirements — for example, requiring you to seed each download for a set amount of time.
+How many torrents you're currently uploading. Seeding builds upload credit. Some trackers require minimum seeding — i.e., seed each download for a set period.
 
-**Availability:** Available on UNIT3D. Available on some Gazelle forks. On GGn, this is tied to your account's paranoia setting — if you have high paranoia, this field may not be visible even to the API.
+**Availability:** On UNIT3D. On some Gazelle forks. On GGn, it depends on your paranoia setting — high paranoia hides it from the API.
 
 ### Leeching Count
 
-The number of torrents your client is currently downloading. This should normally be low or zero when you are not actively grabbing anything.
+How many torrents you're currently downloading. Usually zero when you're not grabbing.
 
-**Availability:** Same as seeding count.
+**Availability:** Same as seeding.
 
 ---
 
 ## Seedbonus / Gold
 
-A site currency earned by continuously seeding torrents. The earn rate usually depends on how long you have been seeding, how large the torrent is, and how many other seeders are active. You can typically spend this currency on freeleech tokens, upload credit, or store items.
+A site currency earned by seeding. Earn rate depends on seed time, torrent size, and how many other seeders are active. Spend it on freeleech tokens, upload credit, or store items.
 
 **Platform notes:**
 
-- **UNIT3D** — Called "seedbonus" or "Bonus Points" depending on the site.
-- **Gazelle** — Called "Bonus Points" or "BP" on most forks.
-- **GGn** — Uses a distinct `gold` currency. Gold is earned through seeding and spent within GGn's own economy (achievements, buffs, store items).
+- **UNIT3D** — Called "seedbonus" or "Bonus Points".
+- **Gazelle** — Called "Bonus Points" or "BP".
+- **GGn** — Uses a separate `gold` currency, spent in GGn's economy (achievements, buffs, store).
 
 ---
 
 ## Hit & Runs
 
-A hit-and-run happens when you download a torrent and disconnect from the swarm before seeding it back to a 1:1 ratio, or before meeting a minimum seed time requirement. Trackers track H&Rs to identify members who consume content without contributing.
+A hit-and-run is downloading and bailing before seeding to 1:1 or meeting minimum seed time. Trackers penalize members who consume without contributing.
 
-Accumulating H&Rs typically leads to warnings or download restrictions.
+Too many H&Rs lead to warnings or download loss.
 
 **Availability:**
 
-- **UNIT3D** — Available. Shows 0 when you have no H&Rs.
-- **Gazelle** — Not available. Tracker Tracker shows nothing for Gazelle sites.
-- **GGn** — Available, but may be `null` if the tracker does not surface this data for your account.
+- **UNIT3D** — Available. Shows 0 when you have none.
+- **Gazelle** — Not available.
+- **GGn** — Available, but may be `null` if the tracker doesn't expose it.
 
 ---
 
@@ -102,38 +102,38 @@ Accumulating H&Rs typically leads to warnings or download restrictions.
 
 ### Warned
 
-Whether your account is currently under a warning from tracker staff. Warnings are issued for rule violations such as hit-and-runs, ratio problems, or conduct issues. A warned account may have restricted download access.
+Whether you're under a staff warning. Warnings come from H&Rs, ratio drops, or conduct. Warned accounts may lose download.
 
 **Availability:**
 
-- **UNIT3D** — Not available via the API.
-- **Gazelle** — Available on sites that support the extended user profile call. Without it, Tracker Tracker defaults to showing no warning.
-- **GGn** — Available directly from your user profile.
+- **UNIT3D** — Not exposed via API.
+- **Gazelle** — Available on sites that support the extended user profile call. Otherwise defaults to no warning.
+- **GGn** — Available from your profile.
 
 ### Username
 
-Your account username on the tracker. Whether this is saved and displayed depends on the "Store Tracker Usernames" setting. See [Settings Reference](./settings.md) for details.
+Your tracker username. Visibility depends on the "Store Tracker Usernames" setting. See [Settings Reference](./settings.md).
 
 ### Class / Rank
 
-Your membership class on the tracker — things like "Member", "Power User", "Elite", "VIP", or "Donor". Trackers promote users based on combinations of ratio, total upload, seedbonus, account age, and community contributions.
+Your member class — "Member", "Power User", "Elite", "VIP", "Donor", etc. Promotion is based on ratio, upload, seedbonus, age, and contributions.
 
-Tracker Tracker records whatever class string the tracker returns. It does not compare or rank classes across different trackers.
+We record what the tracker returns. No cross-tracker comparison.
 
 ---
 
 ## Freeleech Tokens
 
-Tokens you can apply to individual torrents so that downloading them does not count against your downloaded total. Using a freeleech token lets you grab content without hurting your ratio.
+Apply these to torrents so downloads don't count against ratio. Grab content without penalty.
 
 **Availability:**
 
 - **UNIT3D** — Not available.
-- **Gazelle** — Available on some forks. Not all Gazelle-based sites expose this field.
-- **GGn** — Not available. GGn uses its gold economy instead of separate freeleech tokens.
+- **Gazelle** — Available on some forks. Not all expose it.
+- **GGn** — Not available. Uses gold economy instead.
 
 ---
 
 ## Share Score
 
-A composite score specific to GGn that combines upload activity, seeding time, and other factors into a single number. Not available on UNIT3D or Gazelle sites.
+A GGn-specific score combining upload activity, seeding time, and other factors.
diff --git a/docs/kb/docs/trackers/adding-a-tracker.md b/docs/kb/docs/trackers/adding-a-tracker.md
index d4481e91..3686cfc7 100644
--- a/docs/kb/docs/trackers/adding-a-tracker.md
+++ b/docs/kb/docs/trackers/adding-a-tracker.md
@@ -5,15 +5,15 @@ description: How to add a private tracker, find your API token, and understand w
 
 # Adding a Tracker
 
-Tracker Tracker supports 40+ trackers across four platforms: UNIT3D, Gazelle, GGn, and Nebulance. Most are in the built-in registry — pick one from the list and the URL and platform fill in automatically.
+Tracker Tracker works with 40+ trackers. Pick one from the list below.
 
-## Opening the Add Tracker dialog
+## Open the Add Tracker dialog
 
 Click the **+** button next to "Trackers" in the sidebar, or go to `/trackers/new`.
 
 ![Add Tracker dialog](../assets/images/adding-a-tracker-dialog.png)
 
-## The tracker registry
+## Tracker registry
 
 === "UNIT3D"
 
@@ -31,6 +31,8 @@ Click the **+** button next to "Trackers" in the sidebar, or go to `/trackers/ne
     | SkipTheCommercials | STC |
     | Seedpool | SP |
     | Upload.cx | |
+    | DarkPeers | DP |
+    | Luminarr | LUME |
 
 === "Gazelle"
 
@@ -60,125 +62,183 @@ Click the **+** button next to "Trackers" in the sidebar, or go to `/trackers/ne
     | Anthelion | ANT |
     | Nebulance | NBL |
 
+=== "AvistaZ"
+
+    | Name | Abbreviation |
+    |---|---|
+    | AvistaZ | AvZ |
+    | AnimeZ | AnZ |
+    | CinemaZ | CZ |
+    | ExoticaZ | ExZ |
+    | PrivateHD | PHD |
+
+=== "DigitalCore"
+
+    | Name | Abbreviation |
+    |---|---|
+    | DigitalCore | DC |
+
 !!! note "Draft entries"
-    Some trackers in the registry are marked as drafts — dashed border, "Stats tracking not yet supported." You can pin them as quicklinks but no stats will be polled.
+    Some trackers show a dashed border saying "Stats tracking not yet supported." You can pin them as quicklinks, but they won't poll yet.
 
-Trackers you've already added are hidden from the list automatically.
+Added trackers hide from the list automatically.
 
 ## Required fields
 
 ### Base URL
 
-The full HTTPS address for the tracker.
+The tracker's full HTTPS address.
 
 ### API token
 
-Where to find it depends on the platform:
+Location varies by platform:
 
 === "UNIT3D"
 
-    Go to your account settings. Look for `Settings → Security → API Token` or `Settings → API`.
+    Go to **Settings → Security → API Token** or **Settings → API** in your account.
 
-    The token is a long alphanumeric string — copy the whole thing.
+    Copy the entire alphanumeric string.
 
     !!! tip "Token rotation"
         Some UNIT3D trackers regenerate your token when you change your password. If polls stop working after a password change, grab a fresh token.
 
 === "Gazelle"
 
-    - **RED / OPS** — `Settings → Access Settings → API Keys`. Create a new key. Read-only is sufficient.
-    - **BTN / PTP / AB / others** — check `Settings → Security`, `Settings → API`, or your profile page.
+    - **RED / OPS** — **Settings → Access Settings → API Keys**. Create a new key (read-only is fine).
+    - **BTN / PTP / AB / others** — Check **Settings → Security**, **Settings → API**, or your profile.
 
-    Gazelle keys are usually shown only once when created. Copy it immediately.
+    Gazelle shows keys only once when created, so copy it right away.
 
     !!! tip "Scoped keys"
-        Some Gazelle forks let you create keys with limited permissions. Tracker Tracker only reads your stats — read-only works fine.
+        Some Gazelle forks support limited-permission keys. Since Tracker Tracker only reads your stats, read-only access works great.
 
 === "GGn"
 
-    Go to `Settings → Access Settings → API Key`. Copy the full key.
+    Go to **Settings → Access Settings → API Key** and copy it.
 
-    GGn keys don't expire on their own, but they can be regenerated from your settings.
+    GGn keys don't expire automatically, but you can regenerate them anytime from your settings.
 
-!!! warning "Keep your token private"
-    Your API token acts like a password for your account. Tracker Tracker encrypts it before storing it.
+=== "AvistaZ"
 
-## Optional fields
+    AvistaZ uses browser cookies instead of API keys.
 
-### Proxy
+    1. Open the tracker in your browser and log in
+    2. Open DevTools (F12 or Cmd+Option+I)
+    3. Go to the **Network** tab
+    4. Refresh the page
+    5. Click any request to the tracker's domain
+    6. Find the `Cookie` header in **Request Headers**
+    7. **Right-click** the Cookie header and select **Copy Value**
+
+    ![Right-click Copy Value in Firefox DevTools](../assets/images/avistaz-cookie-copy-value.png)
+
+    You'll also need your **username** on that tracker.
+
+    Paste both into the Add Tracker dialog. The User-Agent gets captured automatically.
+
+    !!! danger "Do not select and copy the Cookie value directly"
+        Firefox (and some Chromium browsers) truncate long header values in the display, replacing the end with `…`. If you select the text and copy it, you'll get the truncated version with the ellipsis character embedded. This causes a "Tracker test failed" error.
 
-If the tracker needs a proxy (e.g., for geo-restrictions), toggle **Use Proxy** on the tracker's settings page. See [Proxy Support](../features/proxies.md) for setup.
+        Always use **right-click → Copy Value** to get the full, untruncated cookie string.
 
-## What happens after you save
+    !!! warning "Cookie expiration"
+        The Cloudflare `cf_clearance` cookie expires periodically. When polling fails, refresh it by repeating the steps above.
 
-1. The tracker is saved and an immediate poll runs.
-2. The **PulseDot** on the tracker card shows the result:
-   - Breathing cyan — poll succeeded
-   - Amber — warning or partial data
-   - Red — poll failed (bad token, network error, etc.)
-3. The tracker appears in the dashboard and sidebar.
+    !!! warning "Newbie rank not supported"
+        AvistaZ restricts Newbie accounts to limited site access. You need **Member** rank (5 GB upload, ratio ≥ 1.0, 7+ days old) before the profile page shows the data Tracker Tracker needs. Wait until promotion before adding the tracker.
+
+=== "DigitalCore"
+
+    DigitalCore uses session cookies instead of API keys.
+
+    1. Open [digitalcore.club](https://digitalcore.club) in your browser and log in
+    2. Open DevTools (F12 or Cmd+Option+I)
+    3. Go to the **Network** tab
+    4. Refresh the page
+    5. Click any request to `digitalcore.club`
+    6. Find the `Cookie` header in **Request Headers** and copy its full value
+
+    The string will contain `uid=...` and `pass=...` among other values. Paste the entire thing into the Add Tracker dialog. Tracker Tracker extracts what it needs automatically.
+
+    ![Cookie header in DevTools](../assets/images/digitalcore-cookie.png)
+
+    !!! tip "Alternative: Application tab method"
+        Go to **Application** → **Cookies** → `digitalcore.club` and copy the `uid` and `pass` values. Paste them as `uid=12345; pass=abc123...`.
+
+    !!! warning "Cookie expiration"
+        Session cookies expire when you log out or after extended inactivity. If polling fails with "Session expired," log back into DigitalCore and re-copy the cookie values.
+
+    !!! info "DigitalCore's API key won't work"
+        DigitalCore has an API key feature, but it only allows access to torrent search endpoints. User stats require session cookies, which is why Tracker Tracker uses the cookie approach.
+
+!!! warning "Keep your token private"
+    Your API token works like a password. Tracker Tracker encrypts it before storing it.
+
+## Optional fields
+
+### Proxy
 
-![PulseDot states showing healthy, warning, and error](../assets/images/pulsedots-states.png)
+If the tracker needs a proxy (i.e., for geo-restrictions), toggle **Use Proxy** on the tracker's settings page. See [Proxy Support](../features/proxies.md) for setup.
 
-!!! tip "Red dot right after adding?"
-    Check your API token. The most common cause is a copy-paste error or a token that was rotated after you copied it.
+!!! tip "Getting a red dot?"
+    Check your API token — most often it's a copy-paste error or a token that rotated after you saved it.
 
-## Polling manually
+## Poll manually
 
-The **Poll Now** button on any tracker's detail page runs an immediate fetch outside the normal schedule. Use it after updating a token or testing connectivity.
+The **Poll Now** button on any tracker's detail page fetches stats immediately. Use it after updating a token or testing connectivity.
 
-The global schedule (default: every 60 minutes) runs all trackers on a shared timer. Manual polls don't change it.
+Manual polls don't interfere with the global schedule (default: every 60 minutes).
 
 ---
 
-## What's tracked per platform
+## What stats each platform provides
 
-Not every platform exposes the same stats. Here's what you'll see:
+Different platforms expose different stats. Here's what you'll get:
 
-| Stat             | UNIT3D | Gazelle | GGn     | Notes                                                                        |
-| ---------------- | ------ | ------- | ------- | ---------------------------------------------------------------------------- |
-| Upload           | Yes    | Yes     | Yes     |                                                                              |
-| Download         | Yes    | Yes     | Yes     |                                                                              |
-| Ratio            | Yes    | Yes     | Yes     | GGn shows extra decimal precision                                            |
-| Buffer           | Yes    | Yes     | Yes     | UNIT3D returns this directly; others calculate it from upload minus download |
-| Seeding count    | Yes    | Partial | Partial | Some Gazelle forks and GGn may return 0 even when you're seeding             |
-| Leeching count   | Yes    | Partial | Partial | Same as above                                                                |
-| Bonus points     | Yes    | Yes     | Yes     | GGn calls this "gold" — it maps automatically                                |
-| Hit & Runs       | Yes    | No      | Partial | GGn shows unknown for Elite Gamer+ (HNR immunity)                            |
-| Required ratio   | No     | Yes     | Yes     | Not in the UNIT3D API                                                        |
-| Warned status    | No     | Partial | Yes     | Most Gazelle trackers default to false; RED has extended data                |
-| Freeleech tokens | No     | Partial | No      | Not all Gazelle forks expose this                                            |
+| Stat             | UNIT3D | Gazelle | GGn     | AvistaZ | DigitalCore | Notes                                                                        |
+| ---------------- | ------ | ------- | ------- | ------- | ----------- | ---------------------------------------------------------------------------- |
+| Upload           | Yes    | Yes     | Yes     | Yes     | Yes         |                                                                              |
+| Download         | Yes    | Yes     | Yes     | Yes     | Yes         |                                                                              |
+| Ratio            | Yes    | Yes     | Yes     | Yes     | Yes         | GGn shows extra decimal precision                                            |
+| Buffer           | Yes    | Yes     | Yes     | Yes     | Yes         | UNIT3D returns this directly; others calculate it from upload minus download |
+| Seeding count    | Yes    | Partial | Partial | Yes     | Yes         | Some Gazelle forks and GGn may return 0 even when you're seeding             |
+| Leeching count   | Yes    | Partial | Partial | Yes     | Yes         | Same as above                                                                |
+| Bonus points     | Yes    | Yes     | Yes     | Yes     | Yes         | GGn calls this "gold," DigitalCore calls it "bonuspoang"                     |
+| Hit & Runs       | Yes    | No      | Partial | Yes     | Yes         | GGn shows unknown for Elite Gamer+ (HNR immunity)                            |
+| Required ratio   | No     | Yes     | Yes     | No      | No          | Not in the UNIT3D or DigitalCore API                                         |
+| Warned status    | No     | Partial | Yes     | No      | Yes         | Most Gazelle trackers default to false; RED has extended data                |
+| Freeleech tokens | No     | Partial | No      | No      | No          | Not all Gazelle forks expose this                                            |
 
-### Gazelle: enriched data on RED
+### Gazelle: extra data on RED
 
-REDacted (and Phoenix Project) fetch additional data beyond the standard stats — including warned status, join date, avatar, and more detailed seeding/leeching counts. If you're on RED, you'll see richer data than on other Gazelle trackers.
+REDacted and Phoenix Project return additional fields — warned status, join date, avatar, and detailed seeding/leeching counts — giving you richer info than other Gazelle trackers.
 
 ### GGn quirks
 
-- **Seeding/leeching can show 0** — GGn's API doesn't always return these counts. Not a polling error.
-- **Hit & Runs shows unknown** for Elite Gamer and above — those classes are HNR-immune, so GGn returns null.
-- **Gold, not seedbonus** — GGn's bonus currency is called "gold." Tracker Tracker maps it to the same field as bonus points on other trackers.
+- **Seeding/leeching can show 0** — GGn's API doesn't always expose these counts. That's normal.
+- **Hit & Runs shows unknown** for Elite Gamer and above — those classes are HNR-immune.
+- **Gold, not seedbonus** — GGn calls bonus currency "gold," which we map to the bonus points field.
 
 ---
 
-## Common issues
+## Troubleshooting
 
 ### Token not working
 
-Make sure you copied the full token. UNIT3D tokens are typically 60-80 characters. Gazelle keys are shown only once when created.
+Make sure you copied the full token. UNIT3D tokens are usually 60-80 characters. Gazelle shows keys only once when you create them.
 
 ### Poll fails with 401
 
-Your token has expired or been regenerated. Copy the current token from the tracker's settings and update it in Tracker Tracker.
+Your token expired or was regenerated. Get a fresh token from the tracker's settings and update it.
 
-### Bonus points show as unavailable
+### Bonus points show unavailable
 
-A small number of heavily customized Gazelle forks don't include bonus points in their API. Nothing to configure — the tracker doesn't expose it.
+Some heavily customized Gazelle forks don't include bonus points in their API. The tracker just doesn't expose it.
 
-### Seeding count is always 0
+### Seeding count always shows 0
 
-Some Gazelle forks and GGn don't include seeding counts in their standard API response. If you're actively seeding and see 0, it's a platform limitation.
+Some Gazelle forks and GGn don't expose seeding counts via their API. If you're seeding but see 0, it's a platform limitation.
 
-### Warned status is always false
+### Warned status always shows false
 
-Expected for most Gazelle trackers. Only RED and Phoenix Project provide this data.
+That's expected for most Gazelle trackers. Only RED and Phoenix Project provide this.
diff --git a/docs/kb/docs/troubleshooting.md b/docs/kb/docs/troubleshooting.md
new file mode 100644
index 00000000..3e1afb6a
--- /dev/null
+++ b/docs/kb/docs/troubleshooting.md
@@ -0,0 +1,390 @@
+---
+title: Troubleshooting
+description: A reference for error messages shown in the Poll Error Banner and download client status, with causes and solutions.
+---
+
+# Common Error Messages
+
+Error strings in the Tracker Tracker interface, with causes and fixes.
+
+---
+
+## Understanding Tracker Health
+
+The **PulseDot** next to each tracker name indicates polling status:
+
+| State      | Color | Meaning                                                                            |
+| ---------- | ----- | ---------------------------------------------------------------------------------- |
+| `healthy`  | Cyan  | Ratio ≥ 2.0 — polling normally                                                     |
+| `warning`  | Amber | Ratio between 1.0 and 2.0, or ratio is fine but zero active seeds                  |
+| `critical` | Red   | Ratio < 1.0, or the tracker has warned your account                                |
+| `error`    | Red   | The last poll failed, but polling has not paused yet                               |
+| `paused`   | Red   | Polling has been automatically suspended after repeated failures                   |
+| `offline`  | Gray  | No snapshot data exists yet (tracker was just added, or all snapshots were pruned) |
+
+---
+
+## Ratio or Stats Not Updating
+
+Stats only change when Tracker Tracker captures a new snapshot. If your ratio, upload, or seeding count looks stale, work through this checklist.
+
+### Step 1 — Check the poll interval
+
+Go to **Settings → General** and check **Tracker Poll Interval** (15–1440 minutes).
+
+If it's 240, stats update every 4 hours. That's normal.
+
+!!! info "Fastest update rate"
+    15 minutes is the fastest. Stats won't update more often, even with page reloads.
+
+### Step 2 — Check if polling is running
+
+Look at the PulseDot next to the tracker name. If it's `paused` or `error`, fix that first before worrying about stale stats. See [Automatic Poll Pausing](#automatic-poll-pausing) below for guidance.
+
+### Step 3 — Trigger an immediate poll
+
+Don't wait for the next scheduled poll.
+
+1. Open the tracker's detail page.
+2. Click **Poll Now**.
+3. The page refreshes with new stats if it works.
+
+If Poll Now returns an error, the Poll Error Banner will show the reason.
+
+### Step 4 — Check the chart time range
+
+Charts show data over your selected range. A narrow range hides changes.
+
+- Find the **day range selector** in the right sidebar on Data & Analytics.
+- Try a broader range (30 or 90 days) to see historical data.
+- If only today is selected, you'll only see today's snapshots.
+
+### Step 5 — Confirm snapshots are recording
+
+If Poll Now works but charts don't move, hard-refresh first (`Cmd+Shift+R` on Mac, `Ctrl+Shift+R` on Windows/Linux).
+
+Then check the **Last Polled** timestamp on the tracker detail page — it should match your most recent poll.
+
+If Last Polled updated but the chart didn't, the API returned the same values. That's normal.
+
+---
+
+## Automatic Poll Pausing
+
+After **4 consecutive failed polls**, the tracker automatically pauses to prevent hammering a broken tracker. When this happens:
+
+- The PulseDot switches to `paused`
+- The **Poll Error Banner** appears at the top of the tracker detail page with:
+  - Red "Polling Paused" heading
+  - Pause timestamp
+  - Last error (e.g., `Authentication failed`, `Host not found`)
+  - **Resume Polling** button
+
+!!! warning "Verify the cause before resuming"
+    Fix the underlying problem first. If you resume without fixing it, the tracker will fail again and re-pause immediately.
+
+---
+
+## Resuming a Paused Tracker
+
+1. Open the tracker detail page.
+2. Find the **Poll Error Banner** at the top with the last error below "Polling Paused".
+3. Fix the problem (see specific error sections below).
+4. Click **Resume Polling**, then **Poll Now** to verify immediately.
+
+---
+
+## Tracker poll errors
+
+These appear in the **Poll Error Banner** on the tracker detail page.
+
+---
+
+### `Authentication failed`
+
+**Cause:** The tracker rejected the token (HTTP 401/403 or explicit "Unauthorized"/"Forbidden").
+
+**Common reasons:**
+
+- Token was regenerated on the tracker site.
+- Token was entered wrong (whitespace, partial copy).
+- Account API access was revoked or restricted.
+- Tracker requires an IP allowlist.
+
+!!! success "Solution"
+
+    1. Log into the tracker and find your API token (usually under "Security", "API", or "Edit Profile").
+    2. Copy it carefully.
+    3. In Tracker Tracker, edit the tracker settings and paste the new token.
+    4. Save, then click **Resume Polling**, then **Poll Now**.
+
+---
+
+### `Host not found`
+
+**Cause:** DNS resolution failed for the hostname.
+
+!!! success "Solution"
+
+    1. Check the base URL for typos.
+    2. Test: `nslookup <tracker-hostname>` from your Docker host.
+    3. If using VPN or custom DNS, add `dns:` to `docker-compose.yml` if needed.
+    4. Update the base URL if the domain changed.
+
+---
+
+### `Host unreachable`
+
+**Cause:** Hostname resolved but unreachable at the network layer. Route missing or firewall blocking.
+
+!!! success "Solution"
+
+    1. Check if the tracker loads in your browser.
+    2. Verify VPN or firewall routing is up.
+    3. Confirm no egress firewall on Docker host is blocking outbound.
+
+---
+
+### `Connection refused`
+
+**Cause:** Host reached but connection refused. Usually wrong port or the tracker's down.
+
+!!! success "Solution"
+
+    1. Check the base URL port if the tracker uses a non-standard one.
+    2. Verify the scheme (`https://` vs `http://`).
+    3. Confirm the tracker loads in a browser.
+
+---
+
+### `Connection reset`
+
+**Cause:** Connection established then terminated by the host. Often SSL/TLS mismatch or invalid certificate.
+
+!!! success "Solution"
+
+    1. Use `https://` if required.
+    2. Self-signed certificates aren't supported.
+
+---
+
+### `Request timed out`
+
+**Cause:** API doesn't respond within 15 seconds. May happen during maintenance or heavy load.
+
+!!! success "Solution"
+
+    1. Wait a few minutes and try **Poll Now** again.
+    2. If persistent, check if a proxy is adding latency.
+    3. The 15-second timeout can't be changed.
+
+---
+
+### `IP temporarily banned by tracker`
+
+**Cause:** Tracker's rate-limiting blocked your IP. Poll interval too short or automated requests treated as abuse.
+
+!!! success "Solution"
+
+    1. Wait for the ban to expire — typically minutes to hours.
+    2. Increase **Poll Interval** in **Settings → General** to 60 minutes (or higher for sensitive trackers).
+    3. Resume polling after the ban clears.
+
+---
+
+### `Proxy connection failed`
+
+**Cause:** **Use Proxy** is enabled and the proxy is unreachable or erroring. We don't bypass required proxies.
+
+!!! success "Solution"
+
+    1. Check **Settings → Proxy** — verify host, port, type, username, password.
+    2. Confirm the proxy is running and reachable.
+    3. Or disable **Use Proxy** in tracker settings.
+
+---
+
+### Stale error banner (no pause)
+
+If you see a **Last Error** banner without "Polling Paused", a recent poll failed but not enough to trigger a pause. It clears on the next success.
+
+!!! info "No action if the last poll succeeded"
+    The banner shows the most recent error even if later polls recovered. If the PulseDot is `healthy`, `warning`, or `critical`, polling already recovered.
+
+---
+
+### `API returned <status code>`
+
+**Cause:** API returned an unexpected status. E.g., 429 = rate limit, 500/503 = server error.
+
+!!! success "Solution"
+
+    - **429:** Increase poll interval and wait.
+    - **500 / 503:** Tracker having issues — wait and retry.
+    - **Other:** Check tracker's status page or forums.
+
+---
+
+### `Poll failed` (generic)
+
+**Cause:** Unexpected error not matching known patterns.
+
+!!! success "Solution"
+
+    Check logs: `docker compose logs app` for a line with `Poll failed for tracker` + raw error.
+
+---
+
+## Download client errors
+
+These appear on individual client cards in **Settings → Download Clients**.
+
+---
+
+### `Authentication failed` (qBittorrent)
+
+**Cause:** Wrong username or password.
+
+!!! success "Solution"
+
+    1. Confirm qBittorrent credentials in its Web UI settings.
+    2. Update in **Settings → Download Clients**.
+    3. Use **Test Connection** to verify.
+
+---
+
+### `Session expired` (qBittorrent — auto-handled)
+
+**Cause:** Session expired (HTTP 403). We re-authenticate automatically on next request.
+
+!!! info "No action needed"
+    Handled transparently. Persistent errors are more likely wrong credentials.
+
+---
+
+### `Connection refused` (qBittorrent)
+
+**Cause:** Web UI not accessible at the configured host/port.
+
+!!! success "Solution"
+
+    1. Check host and port match qBittorrent's Web UI config.
+    2. Confirm qBittorrent is running with Web UI enabled.
+    3. If on a different container, confirm the port is reachable.
+    4. Verify SSL toggle matches qBittorrent's scheme.
+
+---
+
+### `Host not found` (qBittorrent)
+
+**Cause:** DNS resolution failed.
+
+!!! success "Solution"
+
+    Use the container name (if in same Docker stack) or an IP instead of a hostname.
+
+---
+
+### `Request timed out` (qBittorrent)
+
+**Cause:** qBittorrent doesn't respond within 15 seconds. May happen during heavy indexing.
+
+!!! success "Solution"
+
+    Wait and retry. If persistent, check qBittorrent's CPU and memory.
+
+---
+
+## Authentication and session errors (Tracker Tracker login)
+
+---
+
+### HTTP 429 — Too many failed login attempts
+
+**Cause:** Auto-lockout triggered after too many failed attempts.
+
+!!! success "Solution"
+
+    Wait for the lockout to expire (time shown on login page). If you can't wait, connect to the database and clear `lockedUntil` in the `appSettings` table.
+
+---
+
+### Login succeeds but redirects back to login
+
+**Cause:** Session cookies marked `Secure` but app accessed over plain HTTP. Browsers discard `Secure` cookies on HTTP.
+
+!!! success "Solution"
+
+    If using `http://`, no action needed on recent versions. If serving over HTTPS via proxy, set `BASE_URL=https://your-domain.com` in `.env`.
+
+---
+
+### TOTP — Invalid code
+
+**Cause:** Code incorrect or expired (valid 30s). Clock drift invalidates codes.
+
+!!! success "Solution"
+
+    1. Sync your device clock (NTP). Even 30-60s drift breaks codes.
+    2. Wait for the next code and retry.
+    3. Or use a backup code (`XXXX-XXXX` format, one-time use).
+
+---
+
+### TOTP — Lost authenticator / no backup codes
+
+**Cause:** No access to authenticator app and no backup codes.
+
+!!! warning "Database access required"
+
+    No in-app recovery. Connect to PostgreSQL and run:
+
+    ```sql
+    UPDATE app_settings SET totp_secret = NULL, totp_backup_codes = NULL;
+    ```
+
+    Then log in and reconfigure TOTP.
+
+---
+
+## Errors when adding or editing a tracker
+
+---
+
+### `Tracker test failed` (AvistaZ / cookie-based trackers)
+
+**Cause:** Cookie string contains a non-ASCII character (usually `…` from browser truncation).
+
+Firefox and some Chromium browsers truncate long header values in their DevTools display, replacing the end with a `…` (ellipsis) character. If you select and copy the displayed text instead of using "Copy Value", the truncated string gets pasted into the dialog. HTTP headers can't contain non-ASCII characters, so the connection fails.
+
+!!! success "Solution"
+
+    1. Open DevTools → **Network** tab → click any request.
+    2. Find the **Cookie** header in Request Headers.
+    3. **Right-click** the Cookie header → **Copy Value** (do not select the text manually).
+    4. Paste the full value into the Add Tracker dialog.
+
+    ![Right-click Copy Value in Firefox DevTools](assets/images/avistaz-cookie-copy-value.png)
+
+!!! tip "How to tell if your cookies are truncated"
+    The Add Tracker dialog shows a yellow warning if it detects a `…` character in the cookie string. If you see this warning, re-copy using right-click → Copy Value.
+
+---
+
+### `baseUrl must use https:// or http://`
+
+**Cause:** URL uses unsupported scheme (e.g. `ftp://`) or missing scheme.
+
+!!! success "Solution"
+
+    Prefix with `https://` or `http://`.
+
+---
+
+### `baseUrl must not target localhost or a private network address`
+
+**Cause:** URL resolves to a private IP or localhost. We block these for security.
+
+!!! info "By design"
+
+    Tracker URLs must be public. Internal or self-hosted trackers can't be added.
diff --git a/docs/kb/docs/troubleshooting/common-errors.md b/docs/kb/docs/troubleshooting/common-errors.md
deleted file mode 100644
index bdb14e44..00000000
--- a/docs/kb/docs/troubleshooting/common-errors.md
+++ /dev/null
@@ -1,218 +0,0 @@
----
-title: Common Error Messages
-description: A reference for error messages shown in the Poll Error Banner and download client status, with causes and solutions.
----
-
-# Common Error Messages
-
-This page maps the error strings shown in the Tracker Tracker interface to their likely causes and fixes.
-
----
-
-## Tracker poll errors
-
-These appear in the **Poll Error Banner** on the tracker detail page, under the "Last Error" or "Polling Paused" heading.
-
----
-
-### `Authentication failed`
-
-**Cause:** The tracker rejected the API token. This covers HTTP 401 and 403 responses, as well as explicit "Unauthorized" or "Forbidden" messages from the tracker API.
-
-**Common reasons:**
-
-- The API token was regenerated on the tracker site and the one stored in Tracker Tracker is no longer valid.
-- The token was entered incorrectly (extra whitespace, partial copy).
-- Your account's API access was revoked or restricted.
-- The tracker requires a specific IP allowlist for API access.
-
-!!! success "Solution" 1. Log into the tracker website and go to your profile or security settings. 2. Regenerate or copy your current API token. 3. Open the tracker settings in Tracker Tracker and replace the token. 4. Click **Resume Polling** on the tracker detail page, then **Poll Now** to verify.
-
----
-
-### `Host not found`
-
-**Cause:** DNS resolution failed for the tracker's hostname. The system could not translate the domain name to an IP address.
-
-!!! success "Solution" 1. Check the tracker's base URL for typos (e.g. `tracker.exmaple.com` instead of `tracker.example.com`). 2. Test DNS from your Docker host: `nslookup <tracker-hostname>`. 3. If you use a VPN or custom DNS, confirm DNS is accessible inside the container. Add a `dns:` directive to `docker-compose.yml` if needed. 4. If the tracker's domain has changed, update the base URL in tracker settings.
-
----
-
-### `Host unreachable`
-
-**Cause:** The hostname resolved but the host could not be reached at the network layer. The route to the IP does not exist, or a firewall is silently dropping packets.
-
-!!! success "Solution" 1. Check whether the tracker is accessible from your browser. 2. If you use a VPN or firewall to route tracker traffic, verify those are up. 3. Confirm there is no egress firewall on your Docker host blocking outbound connections.
-
----
-
-### `Connection refused`
-
-**Cause:** The host was reached but actively refused the connection. The most common cause is a wrong port — nothing is listening there — or the tracker's web server is down.
-
-!!! success "Solution" 1. Verify the base URL includes the correct port if the tracker uses a non-standard one. 2. Check the scheme (`https://` vs `http://`) — a mismatch will produce a refused or reset connection. 3. Confirm the tracker site is responding normally in a browser.
-
----
-
-### `Connection reset`
-
-**Cause:** The connection was established and then immediately terminated by the remote host. Often caused by SSL/TLS mismatches, invalid certificates, or the remote server closing the connection unexpectedly.
-
-!!! success "Solution" 1. Confirm the scheme in the base URL matches what the tracker requires (`https://`). 2. Self-signed certificates are not currently supported — the TLS handshake will fail.
-
----
-
-### `Request timed out`
-
-**Cause:** The tracker API accepted the connection but did not return a response within 15 seconds. This can happen during maintenance windows or when the API is under heavy load.
-
-!!! success "Solution" 1. Wait a few minutes and use **Poll Now** to retry manually. 2. If timeouts are persistent, check whether a proxy is adding latency. 3. The 15-second timeout is fixed and cannot be changed.
-
----
-
-### `IP temporarily banned by tracker`
-
-**Cause:** The tracker's rate-limiting or abuse detection blocked your IP. This can happen if the poll interval is too short, or if the tracker treats automated requests as abusive.
-
-!!! success "Solution" 1. Wait for the ban to expire — this is enforced on the tracker side and typically lasts minutes to hours depending on the site's policy. 2. Once the ban clears, go to **Settings → General** and increase the poll interval. 60 minutes is the recommended default; some trackers enforce stricter limits. 3. Resume polling only after the ban has likely expired. 4. Do **not** set the poll interval below 30 minutes on trackers known to be sensitive to API traffic.
-
----
-
-### `Proxy connection failed`
-
-**Cause:** The tracker has **Use Proxy** enabled, and the proxy server was unreachable or returned an error. Tracker Tracker will not silently bypass a required proxy and make a direct connection.
-
-!!! success "Solution" 1. Go to **Settings → Proxy** and verify the proxy host, port, type, username, and password. 2. Confirm the proxy server is running and reachable from the Docker container. 3. To disable the proxy for a specific tracker, edit the tracker settings and turn off **Use Proxy**.
-
----
-
-### `API returned <status code>`
-
-**Cause:** The tracker's API responded with an unexpected HTTP status code. For example, `API returned 429` indicates HTTP-level rate limiting; `API returned 500` indicates a tracker-side server error.
-
-!!! success "Solution" - **429:** Reduce the poll interval and wait for the tracker to clear the rate limit. - **500 / 503:** The tracker API is having issues — wait and retry later. - **Other codes:** Check the tracker's status page or community forums.
-
----
-
-### `Poll failed` (generic)
-
-**Cause:** An unexpected error occurred that did not match any of the known patterns above.
-
-!!! success "Solution"
-    Check the Tracker Tracker server logs (`docker compose logs app`) for the full error. Look for a line containing `Poll failed for tracker` followed by the raw error string.
-
----
-
-## Download client errors
-
-These appear on the **Download Clients** panel in Settings, on individual client cards.
-
----
-
-### `Authentication failed` (qBittorrent)
-
-**Cause:** qBittorrent rejected the username/password combination.
-
-!!! success "Solution" 1. In qBittorrent's Web UI settings, confirm the username and password. 2. Update the credentials in **Settings → Download Clients** (edit the client card). 3. Use the **Test Connection** button after saving to verify.
-
----
-
-### `Session expired` (qBittorrent — auto-handled)
-
-**Cause:** qBittorrent returned a 403 on an authenticated request, indicating the session has expired. Tracker Tracker handles this automatically by re-authenticating on the next request.
-
-!!! info "No action needed"
-    Session expiry is handled transparently. If you see persistent errors in the **Download Clients** panel, the issue is more likely wrong credentials rather than session expiry.
-
----
-
-### `Connection refused` (qBittorrent)
-
-**Cause:** The qBittorrent Web UI is not accessible at the configured host and port.
-
-!!! success "Solution" 1. Verify the host and port match the qBittorrent Web UI configuration. 2. Confirm qBittorrent is running with the Web UI enabled. 3. If qBittorrent is on a different machine or container, confirm the port is reachable from the Tracker Tracker container. 4. Check the SSL toggle — a mismatch between qBittorrent's actual scheme and what Tracker Tracker expects will cause failures.
-
----
-
-### `Host not found` (qBittorrent)
-
-**Cause:** DNS resolution failed for the qBittorrent host.
-
-!!! success "Solution"
-    Use the container name (if qBittorrent is in the same Docker Compose stack) or an IP address instead of a hostname that depends on external DNS.
-
----
-
-### `Request timed out` (qBittorrent)
-
-**Cause:** qBittorrent accepted the connection but did not respond within 15 seconds. This can happen during heavy indexing operations.
-
-!!! success "Solution"
-    Wait for qBittorrent to finish processing and retry. If timeouts are persistent, check qBittorrent's CPU and memory usage.
-
----
-
-## Authentication and session errors (Tracker Tracker login)
-
----
-
-### HTTP 429 — Too many failed login attempts
-
-**Cause:** The auto-lockout feature triggered. After a configurable number of consecutive failed login attempts, the app blocks further attempts until the lockout duration expires.
-
-!!! success "Solution"
-    Wait for the lockout duration to expire. The remaining time is shown on the login page. If you are locked out and cannot wait, you will need to connect to the database directly and clear the `lockedUntil` field in the `appSettings` table.
-
----
-
-### Login succeeds but redirects back to login
-
-**Cause:** The server logs show "Login successful" but the browser keeps returning to the login screen. This happens when session cookies are marked `Secure` but the app is accessed over plain HTTP — browsers silently discard `Secure` cookies on non-HTTPS connections.
-
-!!! success "Solution"
-    If you access Tracker Tracker over plain HTTP (e.g. `http://192.168.1.x:3000`), no action is needed on recent versions — cookies default to non-secure. If you are on an older version, update to the latest image. If you serve over HTTPS via a reverse proxy, set `BASE_URL=https://your-domain.com` in `.env` to enable secure cookies.
-
----
-
-### TOTP — Invalid code
-
-**Cause:** The 6-digit code was incorrect or expired. TOTP codes are valid for 30 seconds. Clock drift between your authenticator app and the server can cause valid-looking codes to fail.
-
-!!! success "Solution" 1. Ensure your device's clock is synchronized (NTP). Even a 30-60 second drift can invalidate codes. 2. Wait for your authenticator to cycle to the next code and try again. 3. If your clock is correct and codes still fail, use a **backup code** from when you set up TOTP. Backup codes are one-time use and follow the format `XXXX-XXXX`.
-
----
-
-### TOTP — Lost authenticator / no backup codes
-
-**Cause:** You no longer have access to the authenticator app and have no backup codes.
-
-!!! warning "Database access required"
-    There is no in-app recovery path for this situation. You will need to connect to the PostgreSQL database directly and run:
-
-    ```sql
-    UPDATE app_settings SET totp_secret = NULL, totp_backup_codes = NULL;
-    ```
-
-    TOTP is considered disabled when `totp_secret` is `NULL` — there is no separate enabled/disabled flag. After clearing those columns, log in with your password and reconfigure TOTP.
-
----
-
-## Errors when adding or editing a tracker
-
----
-
-### `baseUrl must use https:// or http://`
-
-**Cause:** The URL you entered uses an unsupported scheme (e.g. `ftp://`) or is a bare hostname without a scheme.
-
-!!! success "Solution"
-    Prefix the URL with `https://` or `http://`.
-
----
-
-### `baseUrl must not target localhost or a private network address`
-
-**Cause:** The URL resolves to a private IP range (192.168.x.x, 10.x.x.x, 172.16-31.x.x) or localhost. Tracker Tracker blocks these to prevent your internal network from being probed through the app.
-
-!!! info "By design"
-    Tracker URLs must be publicly routable hostnames. Internal or self-hosted trackers only accessible via private IPs cannot be added.
diff --git a/docs/kb/docs/troubleshooting/ratio-not-updating.md b/docs/kb/docs/troubleshooting/ratio-not-updating.md
deleted file mode 100644
index a63bbccd..00000000
--- a/docs/kb/docs/troubleshooting/ratio-not-updating.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: Ratio or Stats Not Updating
-description: Why your ratio or other stats appear stale, and how to verify that polling is working correctly.
----
-
-# Ratio or Stats Not Updating
-
-Stats only change when Tracker Tracker records a new snapshot. If your ratio, upload totals, or seeding count look stale, work through the checklist below.
-
----
-
-## Step 1 — Check the poll interval setting
-
-Go to **Settings → General** and find the **Tracker Poll Interval** field. The value is in minutes. The valid range is 15 to 1440 (one day).
-
-If this is set to 240, stats will only update every 4 hours. That is expected behavior, not a bug.
-
-!!! info "Minimum update rate"
-    Setting the interval to 15 minutes is the fastest update rate available. Stats will not update more frequently than this regardless of how often you reload the page.
-
----
-
-## Step 2 — Verify polling is actually running
-
-Look at the PulseDot next to the tracker name.
-
-| PulseDot state                     | What it means for polling                                                                                                                 |
-| ---------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `healthy` / `warning` / `critical` | Polling is running. Stats are current as of the last snapshot.                                                                            |
-| `error`                            | The last poll failed. The next poll cycle will retry automatically.                                                                       |
-| `paused`                           | Polling is suspended. No new snapshots will be recorded until you resume. See [Tracker Showing as Offline or Paused](tracker-offline.md). |
-| `offline`                          | No snapshot data exists yet. The tracker may not have been polled.                                                                        |
-
-If the PulseDot is `paused` or `error`, fix the underlying issue before investigating stale stats.
-
----
-
-## Step 3 — Use Poll Now to trigger an immediate update
-
-You do not need to wait for the next scheduled poll.
-
-1. Open the tracker's detail page.
-2. Click the **Poll Now** button near the tracker name.
-3. The page will refresh with updated stats if the poll succeeded.
-
-If Poll Now returns an error, the Poll Error Banner will show the reason. See [Tracker Showing as Offline or Paused](tracker-offline.md) for error-specific guidance.
-
----
-
-## Step 4 — Check the chart time range
-
-The charts on the tracker detail page show data over a selected time range. A narrow range can make it look like nothing has changed even when new snapshots exist.
-
-- Find the **day range selector** in the right sidebar on the Data & Analytics tab.
-- Try a broader range (30 days or 90 days) to confirm historical data is present.
-- The default view shows the most recent data. If only today is selected, you will only see today's snapshots.
-
----
-
-## Step 5 — Confirm snapshots are being recorded
-
-If Poll Now succeeds but the charts still do not move, try a hard-refresh first.
-
-1. Hard-refresh the page (`Cmd+Shift+R` on macOS, `Ctrl+Shift+R` on Windows/Linux).
-2. Check the **Last Polled** timestamp on the tracker detail page — it should match the time of the most recent poll.
-3. If the Last Polled time updated but the chart did not change, the tracker API returned the same values as the previous snapshot. This is normal — the snapshot is still recorded, the values just did not change.
-
----
-
-## Edge case — Tracker API returns cached data
-
-Some trackers cache their API responses server-side for several minutes. If you poll twice within that cache window, both snapshots will contain identical values. This shows up as a flat line on the chart.
-
-There is no workaround for this. The data reflects exactly what the tracker API reported. A longer poll interval (30-60 minutes) is less likely to land inside the tracker's cache window.
-
----
-
-## Edge case — Snapshot retention pruning
-
-If you have configured a **Snapshot Retention** period in Settings → General, snapshots older than that window are automatically deleted after each poll cycle.
-
-If retention is set to 7 days and you are looking at a 30-day chart, the older portion of the chart will be empty. That data was pruned.
-
-!!! tip "Retention defaults"
-    If retention is not configured, snapshots are kept forever. If you see gaps in older data, check the retention setting in Settings → General.
diff --git a/docs/kb/docs/troubleshooting/tracker-offline.md b/docs/kb/docs/troubleshooting/tracker-offline.md
deleted file mode 100644
index e1dd772d..00000000
--- a/docs/kb/docs/troubleshooting/tracker-offline.md
+++ /dev/null
@@ -1,126 +0,0 @@
----
-title: Tracker Showing as Offline or Paused
-description: What the PulseDot states mean, how automatic poll pausing works, and how to get a paused tracker polling again.
----
-
-# Tracker Showing as Offline or Paused
-
-## Understanding PulseDot states
-
-The PulseDot next to each tracker name is the first place to look. It reflects the tracker's current health based on its last known data and any recent poll errors.
-
-| State      | Color | Meaning                                                                            |
-| ---------- | ----- | ---------------------------------------------------------------------------------- |
-| `healthy`  | Cyan  | Ratio ≥ 2.0 — polling normally                                                     |
-| `warning`  | Amber | Ratio between 1.0 and 2.0, or ratio is fine but zero active seeds                  |
-| `critical` | Red   | Ratio < 1.0, or the tracker has warned your account                                |
-| `error`    | Red   | The last poll failed, but polling has not paused yet                               |
-| `paused`   | Red   | Polling has been automatically suspended after repeated failures                   |
-| `offline`  | Gray  | No snapshot data exists yet (tracker was just added, or all snapshots were pruned) |
-
-The `paused` and `error` states are what you will see when a tracker goes offline or becomes unreachable.
-
----
-
-## Automatic poll pausing
-
-After **4 consecutive failed polls**, the tracker is automatically paused. This prevents repeated failed requests to a broken or unreachable tracker.
-
-When this happens:
-
-- The PulseDot switches to the `paused` state.
-- The **Poll Error Banner** appears at the top of the tracker's detail page showing:
-  - The heading **"Polling Paused"** in red
-  - The timestamp when polling was paused
-  - The last recorded error (e.g. `Authentication failed`, `Host not found`)
-  - A **Resume Polling** button
-
-Paused trackers are skipped entirely until you manually resume them.
-
-!!! warning "Verify the cause before resuming"
-  The banner reads: _"Polling was paused after repeated failures. Verify your API key is correct before resuming."_ If you resume without fixing the underlying problem, the tracker will fail again immediately and re-pause within the same poll cycle.
-
----
-
-## Resuming a paused tracker
-
-1. Open the tracker's detail page.
-2. Find the **Poll Error Banner** near the top. The last error is listed below the "Polling Paused" heading.
-3. Fix the underlying problem (see sections below).
-4. Click **Resume Polling**.
-
-After resuming, click **Poll Now** to verify the fix works immediately rather than waiting for the next scheduled poll.
-
----
-
-## Common causes and solutions
-
-### Invalid or expired API key
-
-This is the most common cause. Your tracker API key may have been regenerated, revoked, or entered incorrectly.
-
-**Symptom:** The Poll Error Banner shows `Authentication failed`.
-
-!!! success "Solution" 1. Log into your tracker's website and go to your profile or security settings. 2. Find your API token (often under "Security", "API", or "Edit Profile"). 3. Copy the current token. 4. In Tracker Tracker, open the tracker's settings (edit icon on the tracker detail page or tracker list). 5. Paste the new token into the API Token field and save. 6. Click **Resume Polling**, then **Poll Now** to verify.
-
----
-
-### Proxy misconfiguration
-
-If a tracker has **Use Proxy** enabled, Tracker Tracker will not fall back to a direct connection. If the proxy is unreachable or misconfigured, every poll fails.
-
-**Symptom:** The Poll Error Banner shows `Proxy connection failed`. The tracker has "Use Proxy" toggled on in its settings.
-
-!!! success "Solution" 1. Go to **Settings → Proxy** and verify the proxy host, port, type (SOCKS5/HTTP/HTTPS), and credentials. 2. Confirm the proxy server is running and reachable from your Docker host. 3. If you want to bypass the proxy for this tracker, edit the tracker settings and disable **Use Proxy**. 4. Resume polling after fixing.
-
----
-
-### DNS resolution failure
-
-The tracker's hostname cannot be resolved. This may be a temporary DNS outage, a typo in the base URL, or a DNS issue inside Docker.
-
-**Symptom:** The Poll Error Banner shows `Host not found`.
-
-!!! success "Solution" 1. Check the tracker's base URL for typos in the hostname. 2. From your Docker host, test resolution: `nslookup tracker.example.com`. 3. If you use custom DNS or a VPN, confirm DNS is available inside the container network. You may need to add a `dns:` entry to your `docker-compose.yml`. 4. If the tracker's domain has changed, update the base URL in the tracker settings.
-
----
-
-### Tracker is genuinely unreachable
-
-The hostname resolved but the connection was refused or the host was unreachable.
-
-**Symptom:** The Poll Error Banner shows `Connection refused` or `Host unreachable`.
-
-!!! success "Solution" 1.
-  Check whether the tracker site loads in your browser. 2. If the tracker is down, wait for it to recover, then resume polling. 3. If you route tracker traffic through a VPN, confirm the VPN is up. 4. Verify the base URL uses the correct scheme (`https://` vs `http://`) and the right port if the tracker uses a non-standard one.
-
----
-
-### Request timeout
-
-The connection was established but the tracker API did not respond within 15 seconds.
-
-**Symptom:** The Poll Error Banner shows `Request timed out`.
-
-!!! success "Solution" 1.
-  This is often transient. Try **Poll Now** again after a few minutes. 2. If timeouts are persistent, check whether a proxy is adding significant latency. 3. If the tracker's API is consistently slow, there is no configurable timeout override.
-
----
-
-### Rate limiting
-
-Some trackers block repeated requests from a single IP if polls come in too frequently.
-
-**Symptom:** The Poll Error Banner shows `IP temporarily banned by tracker`.
-
-!!! success "Solution" 1.
-  Go to **Settings → General** and increase the **Poll Interval**. The minimum is 15 minutes, but 60 minutes (the default) is recommended for most trackers. 2. Wait for the IP ban to expire on the tracker side — this varies by site, typically minutes to hours. 3. Resume polling only after the ban has likely cleared.
-
----
-
-### Stale error banner (no pause)
-
-If polling has not paused but you still see a **Last Error** banner — without the "Polling Paused" heading — it means a recent poll failed but not enough times to trigger a pause. The banner clears automatically on the next successful poll.
-
-!!! info "No action needed if the last poll succeeded"
-  The Last Error banner always shows the most recent error, even if subsequent polls recovered. If the PulseDot is `healthy`, `warning`, or `critical` (not `error` or `paused`), polling has already recovered on its own.
diff --git a/docs/kb/mkdocs.yml b/docs/kb/mkdocs.yml
index 8efeb1fc..de871829 100644
--- a/docs/kb/mkdocs.yml
+++ b/docs/kb/mkdocs.yml
@@ -46,22 +46,18 @@ nav:
       - Adding a Tracker: trackers/adding-a-tracker.md
   - Features:
       - Proxy Support: features/proxies.md
-      - Two-Factor Auth (TOTP): features/totp.md
       - Backups & Restore: features/backups.md
       - Download Clients: features/download-clients.md
       - Tag Groups: features/tag-groups.md
       - qbitmanage Integration: features/qbitmanage.md
       - Webhooks: features/webhooks.md
+      - Transit Papers: features/transit-papers.md
   - Reference:
       - Settings Guide: reference/settings.md
       - Stats Explained: reference/stats-explained.md
       - Platform Differences: reference/platform-differences.md
-  - Troubleshooting:
-      - Tracker Shows Offline: troubleshooting/tracker-offline.md
-      - Ratio Not Updating: troubleshooting/ratio-not-updating.md
-      - Common Errors: troubleshooting/common-errors.md
+  - Troubleshooting: troubleshooting.md
   - Contributing:
-      - Overview: contributing/index.md
       - Adding a Tracker: contributing/adding-a-tracker.md
       - Bento Grid Slot System: contributing/slot-system.md
       - Tracker API Responses:
diff --git a/next.config.ts b/next.config.ts
index 1c32ce31..4d74bd3f 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -29,6 +29,7 @@ const nextConfig: NextConfig = {
   env: {
     NEXT_PUBLIC_APP_VERSION: process.env.npm_package_version ?? "0.0.0",
   },
+  allowedDevOrigins: ["*.local", "*.lan", "192.168.*.*", "10.*.*.*"],
   devIndicators: {
     position: "bottom-right",
   },
diff --git a/package.json b/package.json
index 37acf9ce..0de0cd24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "private-tracker-tracker",
-  "version": "2.6.0",
+  "version": "2.8.7",
   "description": "Self-hosted dashboard for monitoring private tracker stats over time",
   "license": "GPL-3.0",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "https://github.com/jordanlambrecht/tracker-tracker.git"
   },
   "private": true,
-  "packageManager": "pnpm@10.32.1",
+  "packageManager": "pnpm@10.33.0",
   "engines": {
     "node": ">=22"
   },
@@ -36,6 +36,7 @@
     "release:patch": "commit-and-tag-version --release-as patch",
     "release:minor": "commit-and-tag-version --release-as minor",
     "release:major": "commit-and-tag-version --release-as major",
+    "changelog:regen": "node scripts/regen-changelog.cjs",
     "knip": "knip",
     "knip:filter": "knip --reporter json --no-exit-code | bash scripts/knip-filter.sh",
     "db:push": "drizzle-kit push",
@@ -48,54 +49,58 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@formkit/auto-animate": "^0.9.0",
     "@tailwindcss/typography": "^0.5.19",
-    "@tanstack/react-query": "^5.95.2",
+    "@tanstack/react-query": "^5.97.0",
     "argon2": "^0.44.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "drizzle-kit": "^0.31.10",
-    "drizzle-orm": "^0.45.1",
+    "drizzle-orm": "^0.45.2",
     "echarts": "^6.0.0",
     "echarts-for-react": "^3.0.6",
     "echarts-gl": "^2.0.9",
     "emoji-picker-react": "^4.18.0",
-    "https-proxy-agent": "^8.0.0",
+    "https-proxy-agent": "^9.0.0",
     "jose": "^6.2.2",
-    "next": "16.2.1",
+    "next": "16.2.2",
     "node-cron": "^4.2.1",
+    "node-html-parser": "^7.1.0",
     "otpauth": "^9.5.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "postgres": "^3.4.8",
+    "postgres": "^3.4.9",
     "qrcode.react": "^4.2.0",
     "react": "19.2.4",
     "react-colorful": "^5.6.1",
     "react-dom": "19.2.4",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
-    "socks-proxy-agent": "^9.0.0"
+    "socks-proxy-agent": "^10.0.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.9",
+    "@biomejs/biome": "^2.4.11",
     "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^20.5.0",
     "@tailwindcss/postcss": "^4.2.2",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
-    "@types/node": "^25.5.0",
+    "@types/jsdom": "^28.0.1",
+    "@types/node": "^25.5.2",
     "@types/node-cron": "^3.0.11",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "commit-and-tag-version": "^12.7.1",
-    "dotenv": "^17.3.1",
+    "conventional-changelog-cli": "^5.0.0",
+    "conventional-changelog-conventionalcommits": "^9.3.1",
+    "dotenv": "^17.4.1",
     "husky": "^9.1.7",
-    "jsdom": "^29.0.1",
-    "knip": "^6.0.6",
-    "postcss": "^8.5.8",
+    "jsdom": "^29.0.2",
+    "knip": "^6.3.1",
+    "postcss": "^8.5.9",
     "prettier": "^3.8.1",
     "tailwindcss": "^4.2.2",
     "tsx": "^4.21.0",
     "typescript": "^6.0.2",
-    "vitest": "^4.1.2"
+    "vitest": "^4.1.4"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e1afbeee..aabfe6a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ importers:
         specifier: ^0.5.19
         version: 0.5.19(tailwindcss@4.2.2)
       '@tanstack/react-query':
-        specifier: ^5.95.2
-        version: 5.95.2(react@19.2.4)
+        specifier: ^5.97.0
+        version: 5.97.0(react@19.2.4)
       argon2:
         specifier: ^0.44.0
         version: 0.44.0
@@ -42,8 +42,8 @@ importers:
         specifier: ^0.31.10
         version: 0.31.10
       drizzle-orm:
-        specifier: ^0.45.1
-        version: 0.45.1(postgres@3.4.8)
+        specifier: ^0.45.2
+        version: 0.45.2(postgres@3.4.9)
       echarts:
         specifier: ^6.0.0
         version: 6.0.0
@@ -57,17 +57,20 @@ importers:
         specifier: ^4.18.0
         version: 4.18.0(react@19.2.4)
       https-proxy-agent:
-        specifier: ^8.0.0
-        version: 8.0.0
+        specifier: ^9.0.0
+        version: 9.0.0
       jose:
         specifier: ^6.2.2
         version: 6.2.2
       next:
-        specifier: 16.2.1
-        version: 16.2.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: 16.2.2
+        version: 16.2.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       node-cron:
         specifier: ^4.2.1
         version: 4.2.1
+      node-html-parser:
+        specifier: ^7.1.0
+        version: 7.1.0
       otpauth:
         specifier: ^9.5.0
         version: 9.5.0
@@ -78,8 +81,8 @@ importers:
         specifier: ^13.1.3
         version: 13.1.3
       postgres:
-        specifier: ^3.4.8
-        version: 3.4.8
+        specifier: ^3.4.9
+        version: 3.4.9
       qrcode.react:
         specifier: ^4.2.0
         version: 4.2.0(react@19.2.4)
@@ -99,15 +102,15 @@ importers:
         specifier: ^4.0.1
         version: 4.0.1
       socks-proxy-agent:
-        specifier: ^9.0.0
-        version: 9.0.0
+        specifier: ^10.0.0
+        version: 10.0.0
     devDependencies:
       '@biomejs/biome':
-        specifier: ^2.4.9
-        version: 2.4.9
+        specifier: ^2.4.11
+        version: 2.4.11
       '@commitlint/cli':
         specifier: ^20.5.0
-        version: 20.5.0(@types/node@25.5.0)(conventional-commits-parser@6.3.0)(typescript@6.0.2)
+        version: 20.5.0(@types/node@25.5.2)(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)(typescript@6.0.2)
       '@commitlint/config-conventional':
         specifier: ^20.5.0
         version: 20.5.0
@@ -123,9 +126,12 @@ importers:
       '@testing-library/user-event':
         specifier: ^14.6.1
         version: 14.6.1(@testing-library/dom@10.4.1)
+      '@types/jsdom':
+        specifier: ^28.0.1
+        version: 28.0.1
       '@types/node':
-        specifier: ^25.5.0
-        version: 25.5.0
+        specifier: ^25.5.2
+        version: 25.5.2
       '@types/node-cron':
         specifier: ^3.0.11
         version: 3.0.11
@@ -138,21 +144,27 @@ importers:
       commit-and-tag-version:
         specifier: ^12.7.1
         version: 12.7.1
+      conventional-changelog-cli:
+        specifier: ^5.0.0
+        version: 5.0.0(conventional-commits-filter@5.0.0)
+      conventional-changelog-conventionalcommits:
+        specifier: ^9.3.1
+        version: 9.3.1
       dotenv:
-        specifier: ^17.3.1
-        version: 17.3.1
+        specifier: ^17.4.1
+        version: 17.4.1
       husky:
         specifier: ^9.1.7
         version: 9.1.7
       jsdom:
-        specifier: ^29.0.1
-        version: 29.0.1(@noble/hashes@2.0.1)
+        specifier: ^29.0.2
+        version: 29.0.2(@noble/hashes@2.0.1)
       knip:
-        specifier: ^6.0.6
-        version: 6.0.6
+        specifier: ^6.3.1
+        version: 6.3.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
       postcss:
-        specifier: ^8.5.8
-        version: 8.5.8
+        specifier: ^8.5.9
+        version: 8.5.9
       prettier:
         specifier: ^3.8.1
         version: 3.8.1
@@ -166,8 +178,8 @@ importers:
         specifier: ^6.0.2
         version: 6.0.2
       vitest:
-        specifier: ^4.1.2
-        version: 4.1.2(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.0.1))(vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))
+        specifier: ^4.1.4
+        version: 4.1.4(@types/node@25.5.2)(jsdom@29.0.2(@noble/hashes@2.0.1))(vite@7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))
 
 packages:
 
@@ -178,12 +190,12 @@ packages:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
-  '@asamuzakjp/css-color@5.0.1':
-    resolution: {integrity: sha512-2SZFvqMyvboVV1d15lMf7XiI3m7SDqXUuKaTymJYLN6dSGadqp+fVojqJlVoMlbZnlTmu3S0TLwLTJpvBMO1Aw==}
+  '@asamuzakjp/css-color@5.1.9':
+    resolution: {integrity: sha512-zd9c/Wdso6v1U7v6w3i/hbAr4K7NaSHImdpvmLt+Y9ea5BhilnIGNkfhOJ7FEIuPipAnE9tZeDOll05WDT0kgg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
-  '@asamuzakjp/dom-selector@7.0.4':
-    resolution: {integrity: sha512-jXR6x4AcT3eIrS2fSNAwJpwirOkGcd+E7F7CP3zjdTqz9B/2huHOL8YJZBgekKwLML+u7qB/6P1LXQuMScsx0w==}
+  '@asamuzakjp/dom-selector@7.0.9':
+    resolution: {integrity: sha512-r3ElRr7y8ucyN2KdICwGsmj19RoN13CLCa/pvGydghWK6ZzeKQ+TcDjVdtEZz2ElpndM5jXw//B9CEee0mWnVg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
   '@asamuzakjp/nwsapi@2.3.9':
@@ -201,59 +213,59 @@ packages:
     resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
     engines: {node: '>=6.9.0'}
 
-  '@biomejs/biome@2.4.9':
-    resolution: {integrity: sha512-wvZW92FrwitTcacvCBT8xdAbfbxWfDLwjYMmU3djjqQTh7Ni4ZdiWIT/x5VcZ+RQuxiKzIOzi5D+dcyJDFZMsA==}
+  '@biomejs/biome@2.4.11':
+    resolution: {integrity: sha512-nWxHX8tf3Opb/qRgZpBbsTOqOodkbrkJ7S+JxJAruxOReaDPPmPuLBAGQ8vigyUgo0QBB+oQltNEAvalLcjggA==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.4.9':
-    resolution: {integrity: sha512-d5G8Gf2RpH5pYwiHLPA+UpG3G9TLQu4WM+VK6sfL7K68AmhcEQ9r+nkj/DvR/GYhYox6twsHUtmWWWIKfcfQQA==}
+  '@biomejs/cli-darwin-arm64@2.4.11':
+    resolution: {integrity: sha512-wOt+ed+L2dgZanWyL6i29qlXMc088N11optzpo10peayObBaAshbTcxKUchzEMp9QSY8rh5h6VfAFE3WTS1rqg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.4.9':
-    resolution: {integrity: sha512-LNCLNgqDMG7BLdc3a8aY/dwKPK7+R8/JXJoXjCvZh2gx8KseqBdFDKbhrr7HCWF8SzNhbTaALhTBoh/I6rf9lA==}
+  '@biomejs/cli-darwin-x64@2.4.11':
+    resolution: {integrity: sha512-gZ6zR8XmZlExfi/Pz/PffmdpWOQ8Qhy7oBztgkR8/ylSRyLwfRPSadmiVCV8WQ8PoJ2MWUy2fgID9zmtgUUJmw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.4.9':
-    resolution: {integrity: sha512-8RCww5xnPn2wpK4L/QDGDOW0dq80uVWfppPxHIUg6mOs9B6gRmqPp32h1Ls3T8GnW8Wo5A8u7vpTwz4fExN+sw==}
+  '@biomejs/cli-linux-arm64-musl@2.4.11':
+    resolution: {integrity: sha512-+Sbo1OAmlegtdwqFE8iOxFIWLh1B3OEgsuZfBpyyN/kWuqZ8dx9ZEes6zVnDMo+zRHF2wLynRVhoQmV7ohxl2Q==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-arm64@2.4.9':
-    resolution: {integrity: sha512-4adnkAUi6K4C/emPRgYznMOcLlUqZdXWM6aIui4VP4LraE764g6Q4YguygnAUoxKjKIXIWPteKMgRbN0wsgwcg==}
+  '@biomejs/cli-linux-arm64@2.4.11':
+    resolution: {integrity: sha512-avdJaEElXrKceK0va9FkJ4P5ci3N01TGkc6ni3P8l3BElqbOz42Wg2IyX3gbh0ZLEd4HVKEIrmuVu/AMuSeFFA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-linux-x64-musl@2.4.9':
-    resolution: {integrity: sha512-5TD+WS9v5vzXKzjetF0hgoaNFHMcpQeBUwKKVi3JbG1e9UCrFuUK3Gt185fyTzvRdwYkJJEMqglRPjmesmVv4A==}
+  '@biomejs/cli-linux-x64-musl@2.4.11':
+    resolution: {integrity: sha512-bexd2IklK7ZgPhrz6jXzpIL6dEAH9MlJU1xGTrypx+FICxrXUp4CqtwfiuoDKse+UlgAlWtzML3jrMqeEAHEhA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-x64@2.4.9':
-    resolution: {integrity: sha512-L10na7POF0Ks/cgLFNF1ZvIe+X4onLkTi5oP9hY+Rh60Q+7fWzKDDCeGyiHUFf1nGIa9dQOOUPGe2MyYg8nMSQ==}
+  '@biomejs/cli-linux-x64@2.4.11':
+    resolution: {integrity: sha512-TagWV0iomp5LnEnxWFg4nQO+e52Fow349vaX0Q/PIcX6Zhk4GGBgp3qqZ8PVkpC+cuehRctMf3+6+FgQ8jCEFQ==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-win32-arm64@2.4.9':
-    resolution: {integrity: sha512-aDZr0RBC3sMGJOU10BvG7eZIlWLK/i51HRIfScE2lVhfts2dQTreowLiJJd+UYg/tHKxS470IbzpuKmd0MiD6g==}
+  '@biomejs/cli-win32-arm64@2.4.11':
+    resolution: {integrity: sha512-RJhaTnY8byzxDt4bDVb7AFPHkPcjOPK3xBip4ZRTrN3TEfyhjLRm3r3mqknqydgVTB74XG8l4jMLwEACEeihVg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.4.9':
-    resolution: {integrity: sha512-NS4g/2G9SoQ4ktKtz31pvyc/rmgzlcIDCGU/zWbmHJAqx6gcRj2gj5Q/guXhoWTzCUaQZDIqiCQXHS7BcGYc0w==}
+  '@biomejs/cli-win32-x64@2.4.11':
+    resolution: {integrity: sha512-A8D3JM/00C2KQgUV3oj8Ba15EHEYwebAGCy5Sf9GAjr5Y3+kJIYOiESoqRDeuRZueuMdCsbLZIUqmPhpYXJE9A==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -331,12 +343,12 @@ packages:
     resolution: {integrity: sha512-ZJoS8oSq2CAZEpc/YI9SulLrdiIyXeHb/OGqGrkUP6Q7YV+0ouNAa7GjqRdXeQPncHQIDz/jbCTlHScvYvO/gA==}
     engines: {node: '>=v18'}
 
-  '@conventional-changelog/git-client@2.6.0':
-    resolution: {integrity: sha512-T+uPDciKf0/ioNNDpMGc8FDsehJClZP0yR3Q5MN6wE/Y/1QZ7F+80OgznnTCOlMEG4AV0LvH2UJi3C/nBnaBUg==}
+  '@conventional-changelog/git-client@2.7.0':
+    resolution: {integrity: sha512-j7A8/LBEQ+3rugMzPXoKYzyUPpw/0CBQCyvtTR7Lmu4olG4yRC/Tfkq79Mr3yuPs0SUitlO2HwGP3gitMJnRFw==}
     engines: {node: '>=18'}
     peerDependencies:
       conventional-commits-filter: ^5.0.0
-      conventional-commits-parser: ^6.3.0
+      conventional-commits-parser: ^6.4.0
     peerDependenciesMeta:
       conventional-commits-filter:
         optional: true
@@ -407,8 +419,8 @@ packages:
   '@emnapi/core@1.9.1':
     resolution: {integrity: sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==}
 
-  '@emnapi/runtime@1.9.1':
-    resolution: {integrity: sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==}
+  '@emnapi/runtime@1.9.2':
+    resolution: {integrity: sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==}
 
   '@emnapi/wasi-threads@1.2.0':
     resolution: {integrity: sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==}
@@ -424,158 +436,158 @@ packages:
     resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
     deprecated: 'Merged into tsx: https://tsx.is'
 
-  '@esbuild/aix-ppc64@0.27.4':
-    resolution: {integrity: sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==}
+  '@esbuild/aix-ppc64@0.28.0':
+    resolution: {integrity: sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.27.4':
-    resolution: {integrity: sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==}
+  '@esbuild/android-arm64@0.28.0':
+    resolution: {integrity: sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.27.4':
-    resolution: {integrity: sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==}
+  '@esbuild/android-arm@0.28.0':
+    resolution: {integrity: sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.27.4':
-    resolution: {integrity: sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==}
+  '@esbuild/android-x64@0.28.0':
+    resolution: {integrity: sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.27.4':
-    resolution: {integrity: sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==}
+  '@esbuild/darwin-arm64@0.28.0':
+    resolution: {integrity: sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.27.4':
-    resolution: {integrity: sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==}
+  '@esbuild/darwin-x64@0.28.0':
+    resolution: {integrity: sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.27.4':
-    resolution: {integrity: sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==}
+  '@esbuild/freebsd-arm64@0.28.0':
+    resolution: {integrity: sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.27.4':
-    resolution: {integrity: sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==}
+  '@esbuild/freebsd-x64@0.28.0':
+    resolution: {integrity: sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.27.4':
-    resolution: {integrity: sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==}
+  '@esbuild/linux-arm64@0.28.0':
+    resolution: {integrity: sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.27.4':
-    resolution: {integrity: sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==}
+  '@esbuild/linux-arm@0.28.0':
+    resolution: {integrity: sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.27.4':
-    resolution: {integrity: sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==}
+  '@esbuild/linux-ia32@0.28.0':
+    resolution: {integrity: sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.27.4':
-    resolution: {integrity: sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==}
+  '@esbuild/linux-loong64@0.28.0':
+    resolution: {integrity: sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.27.4':
-    resolution: {integrity: sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==}
+  '@esbuild/linux-mips64el@0.28.0':
+    resolution: {integrity: sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.27.4':
-    resolution: {integrity: sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==}
+  '@esbuild/linux-ppc64@0.28.0':
+    resolution: {integrity: sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.27.4':
-    resolution: {integrity: sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==}
+  '@esbuild/linux-riscv64@0.28.0':
+    resolution: {integrity: sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.27.4':
-    resolution: {integrity: sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==}
+  '@esbuild/linux-s390x@0.28.0':
+    resolution: {integrity: sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.27.4':
-    resolution: {integrity: sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==}
+  '@esbuild/linux-x64@0.28.0':
+    resolution: {integrity: sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.27.4':
-    resolution: {integrity: sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==}
+  '@esbuild/netbsd-arm64@0.28.0':
+    resolution: {integrity: sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.27.4':
-    resolution: {integrity: sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==}
+  '@esbuild/netbsd-x64@0.28.0':
+    resolution: {integrity: sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.27.4':
-    resolution: {integrity: sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==}
+  '@esbuild/openbsd-arm64@0.28.0':
+    resolution: {integrity: sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.27.4':
-    resolution: {integrity: sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==}
+  '@esbuild/openbsd-x64@0.28.0':
+    resolution: {integrity: sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openharmony-arm64@0.27.4':
-    resolution: {integrity: sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==}
+  '@esbuild/openharmony-arm64@0.28.0':
+    resolution: {integrity: sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
-  '@esbuild/sunos-x64@0.27.4':
-    resolution: {integrity: sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==}
+  '@esbuild/sunos-x64@0.28.0':
+    resolution: {integrity: sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.27.4':
-    resolution: {integrity: sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==}
+  '@esbuild/win32-arm64@0.28.0':
+    resolution: {integrity: sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.27.4':
-    resolution: {integrity: sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==}
+  '@esbuild/win32-ia32@0.28.0':
+    resolution: {integrity: sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.27.4':
-    resolution: {integrity: sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==}
+  '@esbuild/win32-x64@0.28.0':
+    resolution: {integrity: sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -596,6 +608,10 @@ packages:
     resolution: {integrity: sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==}
     engines: {node: '>=6.9.0'}
 
+  '@hutson/parse-repository-url@5.0.0':
+    resolution: {integrity: sha512-e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg==}
+    engines: {node: '>=10.13.0'}
+
   '@img/colour@1.1.0':
     resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
     engines: {node: '>=18'}
@@ -765,60 +781,63 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@napi-rs/wasm-runtime@1.1.1':
-    resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
+  '@napi-rs/wasm-runtime@1.1.3':
+    resolution: {integrity: sha512-xK9sGVbJWYb08+mTJt3/YV24WxvxpXcXtP6B172paPZ+Ts69Re9dAr7lKwJoeIx8OoeuimEiRZ7umkiUVClmmQ==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
 
-  '@next/env@16.2.1':
-    resolution: {integrity: sha512-n8P/HCkIWW+gVal2Z8XqXJ6aB3J0tuM29OcHpCsobWlChH/SITBs1DFBk/HajgrwDkqqBXPbuUuzgDvUekREPg==}
+  '@next/env@16.2.2':
+    resolution: {integrity: sha512-LqSGz5+xGk9EL/iBDr2yo/CgNQV6cFsNhRR2xhSXYh7B/hb4nePCxlmDvGEKG30NMHDFf0raqSyOZiQrO7BkHQ==}
 
-  '@next/swc-darwin-arm64@16.2.1':
-    resolution: {integrity: sha512-BwZ8w8YTaSEr2HIuXLMLxIdElNMPvY9fLqb20LX9A9OMGtJilhHLbCL3ggyd0TwjmMcTxi0XXt+ur1vWUoxj2Q==}
+  '@next/swc-darwin-arm64@16.2.2':
+    resolution: {integrity: sha512-B92G3ulrwmkDSEJEp9+XzGLex5wC1knrmCSIylyVeiAtCIfvEJYiN3v5kXPlYt5R4RFlsfO/v++aKV63Acrugg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@16.2.1':
-    resolution: {integrity: sha512-/vrcE6iQSJq3uL3VGVHiXeaKbn8Es10DGTGRJnRZlkNQQk3kaNtAJg8Y6xuAlrx/6INKVjkfi5rY0iEXorZ6uA==}
+  '@next/swc-darwin-x64@16.2.2':
+    resolution: {integrity: sha512-7ZwSgNKJNQiwW0CKhNm9B1WS2L1Olc4B2XY0hPYCAL3epFnugMhuw5TMWzMilQ3QCZcCHoYm9NGWTHbr5REFxw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@16.2.1':
-    resolution: {integrity: sha512-uLn+0BK+C31LTVbQ/QU+UaVrV0rRSJQ8RfniQAHPghDdgE+SlroYqcmFnO5iNjNfVWCyKZHYrs3Nl0mUzWxbBw==}
+  '@next/swc-linux-arm64-gnu@16.2.2':
+    resolution: {integrity: sha512-c3m8kBHMziMgo2fICOP/cd/5YlrxDU5YYjAJeQLyFsCqVF8xjOTH/QYG4a2u48CvvZZSj1eHQfBCbyh7kBr30Q==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-arm64-musl@16.2.1':
-    resolution: {integrity: sha512-ssKq6iMRnHdnycGp9hCuGnXJZ0YPr4/wNwrfE5DbmvEcgl9+yv97/Kq3TPVDfYome1SW5geciLB9aiEqKXQjlQ==}
+  '@next/swc-linux-arm64-musl@16.2.2':
+    resolution: {integrity: sha512-VKLuscm0P/mIfzt+SDdn2+8TNNJ7f0qfEkA+az7OqQbjzKdBxAHs0UvuiVoCtbwX+dqMEL9U54b5wQ/aN3dHeg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-linux-x64-gnu@16.2.1':
-    resolution: {integrity: sha512-HQm7SrHRELJ30T1TSmT706IWovFFSRGxfgUkyWJZF/RKBMdbdRWJuFrcpDdE5vy9UXjFOx6L3mRdqH04Mmx0hg==}
+  '@next/swc-linux-x64-gnu@16.2.2':
+    resolution: {integrity: sha512-kU3OPHJq6sBUjOk7wc5zJ7/lipn8yGldMoAv4z67j6ov6Xo/JvzA7L7LCsyzzsXmgLEhk3Qkpwqaq/1+XpNR3g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-x64-musl@16.2.1':
-    resolution: {integrity: sha512-aV2iUaC/5HGEpbBkE+4B8aHIudoOy5DYekAKOMSHoIYQ66y/wIVeaRx8MS2ZMdxe/HIXlMho4ubdZs/J8441Tg==}
+  '@next/swc-linux-x64-musl@16.2.2':
+    resolution: {integrity: sha512-CKXRILyErMtUftp+coGcZ38ZwE/Aqq45VMCcRLr2I4OXKrgxIBDXHnBgeX/UMil0S09i2JXaDL3Q+TN8D/cKmg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-win32-arm64-msvc@16.2.1':
-    resolution: {integrity: sha512-IXdNgiDHaSk0ZUJ+xp0OQTdTgnpx1RCfRTalhn3cjOP+IddTMINwA7DXZrwTmGDO8SUr5q2hdP/du4DcrB1GxA==}
+  '@next/swc-win32-arm64-msvc@16.2.2':
+    resolution: {integrity: sha512-sS/jSk5VUoShUqINJFvNjVT7JfR5ORYj/+/ZpOYbbIohv/lQfduWnGAycq2wlknbOql2xOR0DoV0s6Xfcy49+g==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@16.2.1':
-    resolution: {integrity: sha512-qvU+3a39Hay+ieIztkGSbF7+mccbbg1Tk25hc4JDylf8IHjYmY/Zm64Qq1602yPyQqvie+vf5T/uPwNxDNIoeg==}
+  '@next/swc-win32-x64-msvc@16.2.2':
+    resolution: {integrity: sha512-aHaKceJgdySReT7qeck5oShucxWRiiEuwCGK8HHALe6yZga8uyFpLkPgaRw3kkF04U7ROogL/suYCNt/+CuXGA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -839,135 +858,135 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
-  '@oxc-parser/binding-android-arm-eabi@0.120.0':
-    resolution: {integrity: sha512-WU3qtINx802wOl8RxAF1v0VvmC2O4D9M8Sv486nLeQ7iPHVmncYZrtBhB4SYyX+XZxj2PNnCcN+PW21jHgiOxg==}
+  '@oxc-parser/binding-android-arm-eabi@0.121.0':
+    resolution: {integrity: sha512-n07FQcySwOlzap424/PLMtOkbS7xOu8nsJduKL8P3COGHKgKoDYXwoAHCbChfgFpHnviehrLWIPX0lKGtbEk/A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxc-parser/binding-android-arm64@0.120.0':
-    resolution: {integrity: sha512-SEf80EHdhlbjZEgzeWm0ZA/br4GKMenDW3QB/gtyeTV1gStvvZeFi40ioHDZvds2m4Z9J1bUAUL8yn1/+A6iGg==}
+  '@oxc-parser/binding-android-arm64@0.121.0':
+    resolution: {integrity: sha512-/Dd1xIXboYAicw+twT2utxPD7bL8qh7d3ej0qvaYIMj3/EgIrGR+tSnjCUkiCT6g6uTC0neSS4JY8LxhdSU/sA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxc-parser/binding-darwin-arm64@0.120.0':
-    resolution: {integrity: sha512-xVrrbCai8R8CUIBu3CjryutQnEYhZqs1maIqDvtUCFZb8vY33H7uh9mHpL3a0JBIKoBUKjPH8+rzyAeXnS2d6A==}
+  '@oxc-parser/binding-darwin-arm64@0.121.0':
+    resolution: {integrity: sha512-A0jNEvv7QMtCO1yk205t3DWU9sWUjQ2KNF0hSVO5W9R9r/R1BIvzG01UQAfmtC0dQm7sCrs5puixurKSfr2bRQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxc-parser/binding-darwin-x64@0.120.0':
-    resolution: {integrity: sha512-xyHBbnJ6mydnQUH7MAcafOkkrNzQC6T+LXgDH/3InEq2BWl/g424IMRiJVSpVqGjB+p2bd0h0WRR8iIwzjU7rw==}
+  '@oxc-parser/binding-darwin-x64@0.121.0':
+    resolution: {integrity: sha512-SsHzipdxTKUs3I9EOAPmnIimEeJOemqRlRDOp9LIj+96wtxZejF51gNibmoGq8KoqbT1ssAI5po/E3J+vEtXGA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxc-parser/binding-freebsd-x64@0.120.0':
-    resolution: {integrity: sha512-UMnVRllquXUYTeNfFKmxTTEdZ/ix1nLl0ducDzMSREoWYGVIHnOOxoKMWlCOvRr9Wk/HZqo2rh1jeumbPGPV9A==}
+  '@oxc-parser/binding-freebsd-x64@0.121.0':
+    resolution: {integrity: sha512-v1APOTkCp+RWOIDAHRoaeW/UoaHF15a60E8eUL6kUQXh+i4K7PBwq2Wi7jm8p0ymID5/m/oC1w3W31Z/+r7HQw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.120.0':
-    resolution: {integrity: sha512-tkvn2CQ7QdcsMnpfiX3fd3wA3EFsWKYlcQzq9cFw/xc89Al7W6Y4O0FgLVkVQpo0Tnq/qtE1XfkJOnRRA9S/NA==}
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.121.0':
+    resolution: {integrity: sha512-PmqPQuqHZyFVWA4ycr0eu4VnTMmq9laOHZd+8R359w6kzuNZPvmmunmNJ8ybkm769A0nCoVp3TJ6dUz7B3FYIQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.120.0':
-    resolution: {integrity: sha512-WN5y135Ic42gQDk9grbwY9++fDhqf8knN6fnP+0WALlAUh4odY/BDK1nfTJRSfpJD9P3r1BwU0m3pW2DU89whQ==}
+  '@oxc-parser/binding-linux-arm-musleabihf@0.121.0':
+    resolution: {integrity: sha512-vF24htj+MOH+Q7y9A8NuC6pUZu8t/C2Fr/kDOi2OcNf28oogr2xadBPXAbml802E8wRAVfbta6YLDQTearz+jw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.120.0':
-    resolution: {integrity: sha512-1GgQBCcXvFMw99EPdMy+4NZ3aYyXsxjf9kbUUg8HuAy3ZBXzOry5KfFEzT9nqmgZI1cuetvApkiJBZLAPo8uaw==}
+  '@oxc-parser/binding-linux-arm64-gnu@0.121.0':
+    resolution: {integrity: sha512-wjH8cIG2Lu/3d64iZpbYr73hREMgKAfu7fqpXjgM2S16y2zhTfDIp8EQjxO8vlDtKP5Rc7waZW72lh8nZtWrpA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-arm64-musl@0.120.0':
-    resolution: {integrity: sha512-gmMQ70gsPdDBgpcErvJEoWNBr7bJooSLlvOBVBSGfOzlP5NvJ3bFvnUeZZ9d+dPrqSngtonf7nyzWUTUj/U+lw==}
+  '@oxc-parser/binding-linux-arm64-musl@0.121.0':
+    resolution: {integrity: sha512-qT663J/W8yQFw3dtscbEi9LKJevr20V7uWs2MPGTnvNZ3rm8anhhE16gXGpxDOHeg9raySaSHKhd4IGa3YZvuw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.120.0':
-    resolution: {integrity: sha512-T/kZuU0ajop0xhzVMwH5r3srC9Nqup5HaIo+3uFjIN5uPxa0LvSxC1ZqP4aQGJVW5G0z8/nCkjIfSMS91P/wzw==}
+  '@oxc-parser/binding-linux-ppc64-gnu@0.121.0':
+    resolution: {integrity: sha512-mYNe4NhVvDBbPkAP8JaVS8lC1dsoJZWH5WCjpw5E+sjhk1R08wt3NnXYUzum7tIiWPfgQxbCMcoxgeemFASbRw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.120.0':
-    resolution: {integrity: sha512-vn21KXLAXzaI3N5CZWlBr1iWeXLl9QFIMor7S1hUjUGTeUuWCoE6JZB040/ZNDwf+JXPX8Ao9KbmJq9FMC2iGw==}
+  '@oxc-parser/binding-linux-riscv64-gnu@0.121.0':
+    resolution: {integrity: sha512-+QiFoGxhAbaI/amqX567784cDyyuZIpinBrJNxUzb+/L2aBRX67mN6Jv40pqduHf15yYByI+K5gUEygCuv0z9w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.120.0':
-    resolution: {integrity: sha512-SUbUxlar007LTGmSLGIC5x/WJvwhdX+PwNzFJ9f/nOzZOrCFbOT4ikt7pJIRg1tXVsEfzk5mWpGO1NFiSs4PIw==}
+  '@oxc-parser/binding-linux-riscv64-musl@0.121.0':
+    resolution: {integrity: sha512-9ykEgyTa5JD/Uhv2sttbKnCfl2PieUfOjyxJC/oDL2UO0qtXOtjPLl7H8Kaj5G7p3hIvFgu3YWvAxvE0sqY+hQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.120.0':
-    resolution: {integrity: sha512-hYiPJTxyfJY2+lMBFk3p2bo0R9GN+TtpPFlRqVchL1qvLG+pznstramHNvJlw9AjaoRUHwp9IKR7UZQnRPGjgQ==}
+  '@oxc-parser/binding-linux-s390x-gnu@0.121.0':
+    resolution: {integrity: sha512-DB1EW5VHZdc1lIRjOI3bW/wV6R6y0xlfvdVrqj6kKi7Ayu2U3UqUBdq9KviVkcUGd5Oq+dROqvUEEFRXGAM7EQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-gnu@0.120.0':
-    resolution: {integrity: sha512-q+5jSVZkprJCIy3dzJpApat0InJaoxQLsJuD6DkX8hrUS61z2lHQ1Fe9L2+TYbKHXCLWbL0zXe7ovkIdopBGMQ==}
+  '@oxc-parser/binding-linux-x64-gnu@0.121.0':
+    resolution: {integrity: sha512-s4lfobX9p4kPTclvMiH3gcQUd88VlnkMTF6n2MTMDAyX5FPNRhhRSFZK05Ykhf8Zy5NibV4PbGR6DnK7FGNN6A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-musl@0.120.0':
-    resolution: {integrity: sha512-D9QDDZNnH24e7X4ftSa6ar/2hCavETfW3uk0zgcMIrZNy459O5deTbWrjGzZiVrSWigGtlQwzs2McBP0QsfV1w==}
+  '@oxc-parser/binding-linux-x64-musl@0.121.0':
+    resolution: {integrity: sha512-P9KlyTpuBuMi3NRGpJO8MicuGZfOoqZVRP1WjOecwx8yk4L/+mrCRNc5egSi0byhuReblBF2oVoDSMgV9Bj4Hw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-openharmony-arm64@0.120.0':
-    resolution: {integrity: sha512-TBU8ZwOUWAOUWVfmI16CYWbvh4uQb9zHnGBHsw5Cp2JUVG044OIY1CSHODLifqzQIMTXvDvLzcL89GGdUIqNrA==}
+  '@oxc-parser/binding-openharmony-arm64@0.121.0':
+    resolution: {integrity: sha512-R+4jrWOfF2OAPPhj3Eb3U5CaKNAH9/btMveMULIrcNW/hjfysFQlF8wE0GaVBr81dWz8JLgQlsxwctoL78JwXw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxc-parser/binding-wasm32-wasi@0.120.0':
-    resolution: {integrity: sha512-WG/FOZgDJCpJnuF3ToG/K28rcOmSY7FmFmfBKYb2fmLyhDzPpUldFGV7/Fz4ru0Iz/v4KPmf8xVgO8N3lO4KHA==}
+  '@oxc-parser/binding-wasm32-wasi@0.121.0':
+    resolution: {integrity: sha512-5TFISkPTymKvsmIlKasPVTPuWxzCcrT8pM+p77+mtQbIZDd1UC8zww4CJcRI46kolmgrEX6QpKO8AvWMVZ+ifw==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.120.0':
-    resolution: {integrity: sha512-1T0HKGcsz/BKo77t7+89L8Qvu4f9DoleKWHp3C5sJEcbCjDOLx3m9m722bWZTY+hANlUEs+yjlK+lBFsA+vrVQ==}
+  '@oxc-parser/binding-win32-arm64-msvc@0.121.0':
+    resolution: {integrity: sha512-V0pxh4mql4XTt3aiEtRNUeBAUFOw5jzZNxPABLaOKAWrVzSr9+XUaB095lY7jqMf5t8vkfh8NManGB28zanYKw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.120.0':
-    resolution: {integrity: sha512-L7vfLzbOXsjBXV0rv/6Y3Jd9BRjPeCivINZAqrSyAOZN3moCopDN+Psq9ZrGNZtJzP8946MtlRFZ0Als0wBCOw==}
+  '@oxc-parser/binding-win32-ia32-msvc@0.121.0':
+    resolution: {integrity: sha512-4Ob1qvYMPnlF2N9rdmKdkQFdrq16QVcQwBsO8yiPZXof0fHKFF+LmQV501XFbi7lHyrKm8rlJRfQ/M8bZZPVLw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxc-parser/binding-win32-x64-msvc@0.120.0':
-    resolution: {integrity: sha512-ys+upfqNtSu58huAhJMBKl3XCkGzyVFBlMlGPzHeFKgpFF/OdgNs1MMf8oaJIbgMH8ZxgGF7qfue39eJohmKIg==}
+  '@oxc-parser/binding-win32-x64-msvc@0.121.0':
+    resolution: {integrity: sha512-BOp1KCzdboB1tPqoCPXgntgFs0jjeSyOXHzgxVFR7B/qfr3F8r4YDacHkTOUNXtDgM8YwKnkf3rE5gwALYX7NA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxc-project/types@0.120.0':
-    resolution: {integrity: sha512-k1YNu55DuvAip/MGE1FTsIuU3FUCn6v/ujG9V7Nq5Df/kX2CWb13hhwD0lmJGMGqE+bE1MXvv9SZVnMzEXlWcg==}
+  '@oxc-project/types@0.121.0':
+    resolution: {integrity: sha512-CGtOARQb9tyv7ECgdAlFxi0Fv7lmzvmlm2rpD/RdijOO9rfk/JvB1CjT8EnoD+tjna/IYgKKw3IV7objRb+aYw==}
 
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==}
@@ -1084,141 +1103,141 @@ packages:
   '@pinojs/redact@0.4.0':
     resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
 
-  '@rollup/rollup-android-arm-eabi@4.60.0':
-    resolution: {integrity: sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==}
+  '@rollup/rollup-android-arm-eabi@4.60.1':
+    resolution: {integrity: sha512-d6FinEBLdIiK+1uACUttJKfgZREXrF0Qc2SmLII7W2AD8FfiZ9Wjd+rD/iRuf5s5dWrr1GgwXCvPqOuDquOowA==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.60.0':
-    resolution: {integrity: sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==}
+  '@rollup/rollup-android-arm64@4.60.1':
+    resolution: {integrity: sha512-YjG/EwIDvvYI1YvYbHvDz/BYHtkY4ygUIXHnTdLhG+hKIQFBiosfWiACWortsKPKU/+dUwQQCKQM3qrDe8c9BA==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.60.0':
-    resolution: {integrity: sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==}
+  '@rollup/rollup-darwin-arm64@4.60.1':
+    resolution: {integrity: sha512-mjCpF7GmkRtSJwon+Rq1N8+pI+8l7w5g9Z3vWj4T7abguC4Czwi3Yu/pFaLvA3TTeMVjnu3ctigusqWUfjZzvw==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.60.0':
-    resolution: {integrity: sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==}
+  '@rollup/rollup-darwin-x64@4.60.1':
+    resolution: {integrity: sha512-haZ7hJ1JT4e9hqkoT9R/19XW2QKqjfJVv+i5AGg57S+nLk9lQnJ1F/eZloRO3o9Scy9CM3wQ9l+dkXtcBgN5Ew==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.60.0':
-    resolution: {integrity: sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==}
+  '@rollup/rollup-freebsd-arm64@4.60.1':
+    resolution: {integrity: sha512-czw90wpQq3ZsAVBlinZjAYTKduOjTywlG7fEeWKUA7oCmpA8xdTkxZZlwNJKWqILlq0wehoZcJYfBvOyhPTQ6w==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.60.0':
-    resolution: {integrity: sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==}
+  '@rollup/rollup-freebsd-x64@4.60.1':
+    resolution: {integrity: sha512-KVB2rqsxTHuBtfOeySEyzEOB7ltlB/ux38iu2rBQzkjbwRVlkhAGIEDiiYnO2kFOkJp+Z7pUXKyrRRFuFUKt+g==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.0':
-    resolution: {integrity: sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
+    resolution: {integrity: sha512-L+34Qqil+v5uC0zEubW7uByo78WOCIrBvci69E7sFASRl0X7b/MB6Cqd1lky/CtcSVTydWa2WZwFuWexjS5o6g==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.0':
-    resolution: {integrity: sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==}
+  '@rollup/rollup-linux-arm-musleabihf@4.60.1':
+    resolution: {integrity: sha512-n83O8rt4v34hgFzlkb1ycniJh7IR5RCIqt6mz1VRJD6pmhRi0CXdmfnLu9dIUS6buzh60IvACM842Ffb3xd6Gg==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.0':
-    resolution: {integrity: sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==}
+  '@rollup/rollup-linux-arm64-gnu@4.60.1':
+    resolution: {integrity: sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-musl@4.60.0':
-    resolution: {integrity: sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==}
+  '@rollup/rollup-linux-arm64-musl@4.60.1':
+    resolution: {integrity: sha512-+pUymDhd0ys9GcKZPPWlFiZ67sTWV5UU6zOJat02M1+PiuSGDziyRuI/pPue3hoUwm2uGfxdL+trT6Z9rxnlMA==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.0':
-    resolution: {integrity: sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==}
+  '@rollup/rollup-linux-loong64-gnu@4.60.1':
+    resolution: {integrity: sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-loong64-musl@4.60.0':
-    resolution: {integrity: sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==}
+  '@rollup/rollup-linux-loong64-musl@4.60.1':
+    resolution: {integrity: sha512-4LqhUomJqwe641gsPp6xLfhqWMbQV04KtPp7/dIp0nzPxAkNY1AbwL5W0MQpcalLYk07vaW9Kp1PBhdpZYYcEw==}
     cpu: [loong64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.0':
-    resolution: {integrity: sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==}
+  '@rollup/rollup-linux-ppc64-gnu@4.60.1':
+    resolution: {integrity: sha512-tLQQ9aPvkBxOc/EUT6j3pyeMD6Hb8QF2BTBnCQWP/uu1lhc9AIrIjKnLYMEroIz/JvtGYgI9dF3AxHZNaEH0rw==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.0':
-    resolution: {integrity: sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==}
+  '@rollup/rollup-linux-ppc64-musl@4.60.1':
+    resolution: {integrity: sha512-RMxFhJwc9fSXP6PqmAz4cbv3kAyvD1etJFjTx4ONqFP9DkTkXsAMU4v3Vyc5BgzC+anz7nS/9tp4obsKfqkDHg==}
     cpu: [ppc64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.0':
-    resolution: {integrity: sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==}
+  '@rollup/rollup-linux-riscv64-gnu@4.60.1':
+    resolution: {integrity: sha512-QKgFl+Yc1eEk6MmOBfRHYF6lTxiiiV3/z/BRrbSiW2I7AFTXoBFvdMEyglohPj//2mZS4hDOqeB0H1ACh3sBbg==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.0':
-    resolution: {integrity: sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==}
+  '@rollup/rollup-linux-riscv64-musl@4.60.1':
+    resolution: {integrity: sha512-RAjXjP/8c6ZtzatZcA1RaQr6O1TRhzC+adn8YZDnChliZHviqIjmvFwHcxi4JKPSDAt6Uhf/7vqcBzQJy0PDJg==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.0':
-    resolution: {integrity: sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==}
+  '@rollup/rollup-linux-s390x-gnu@4.60.1':
+    resolution: {integrity: sha512-wcuocpaOlaL1COBYiA89O6yfjlp3RwKDeTIA0hM7OpmhR1Bjo9j31G1uQVpDlTvwxGn2nQs65fBFL5UFd76FcQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.60.0':
-    resolution: {integrity: sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==}
+  '@rollup/rollup-linux-x64-gnu@4.60.1':
+    resolution: {integrity: sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-musl@4.60.0':
-    resolution: {integrity: sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==}
+  '@rollup/rollup-linux-x64-musl@4.60.1':
+    resolution: {integrity: sha512-5cIATbk5vynAjqqmyBjlciMJl1+R/CwX9oLk/EyiFXDWd95KpHdrOJT//rnUl4cUcskrd0jCCw3wpZnhIHdD9w==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-openbsd-x64@4.60.0':
-    resolution: {integrity: sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==}
+  '@rollup/rollup-openbsd-x64@4.60.1':
+    resolution: {integrity: sha512-cl0w09WsCi17mcmWqqglez9Gk8isgeWvoUZ3WiJFYSR3zjBQc2J5/ihSjpl+VLjPqjQ/1hJRcqBfLjssREQILw==}
     cpu: [x64]
     os: [openbsd]
 
-  '@rollup/rollup-openharmony-arm64@4.60.0':
-    resolution: {integrity: sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==}
+  '@rollup/rollup-openharmony-arm64@4.60.1':
+    resolution: {integrity: sha512-4Cv23ZrONRbNtbZa37mLSueXUCtN7MXccChtKpUnQNgF010rjrjfHx3QxkS2PI7LqGT5xXyYs1a7LbzAwT0iCA==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.0':
-    resolution: {integrity: sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.60.1':
+    resolution: {integrity: sha512-i1okWYkA4FJICtr7KpYzFpRTHgy5jdDbZiWfvny21iIKky5YExiDXP+zbXzm3dUcFpkEeYNHgQ5fuG236JPq0g==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.0':
-    resolution: {integrity: sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==}
+  '@rollup/rollup-win32-ia32-msvc@4.60.1':
+    resolution: {integrity: sha512-u09m3CuwLzShA0EYKMNiFgcjjzwqtUMLmuCJLeZWjjOYA3IT2Di09KaxGBTP9xVztWyIWjVdsB2E9goMjZvTQg==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-gnu@4.60.0':
-    resolution: {integrity: sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==}
+  '@rollup/rollup-win32-x64-gnu@4.60.1':
+    resolution: {integrity: sha512-k+600V9Zl1CM7eZxJgMyTUzmrmhB/0XZnF4pRypKAlAgxmedUA+1v9R+XOFv56W4SlHEzfeMtzujLJD22Uz5zg==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.60.0':
-    resolution: {integrity: sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==}
+  '@rollup/rollup-win32-x64-msvc@4.60.1':
+    resolution: {integrity: sha512-lWMnixq/QzxyhTV6NjQJ4SFo1J6PvOX8vUx5Wb4bBPsEb+8xZ89Bz6kOXpfXj9ak9AHTQVQzlgzBEc1SyM27xQ==}
     cpu: [x64]
     os: [win32]
 
@@ -1333,11 +1352,11 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
 
-  '@tanstack/query-core@5.95.2':
-    resolution: {integrity: sha512-o4T8vZHZET4Bib3jZ/tCW9/7080urD4c+0/AUaYVpIqOsr7y0reBc1oX3ttNaSW5mYyvZHctiQ/UOP2PfdmFEQ==}
+  '@tanstack/query-core@5.97.0':
+    resolution: {integrity: sha512-QdpLP5VzVMgo4VtaPppRA2W04UFjIqX+bxke/ZJhE5cfd5UPkRzqIAJQt9uXkQJjqE8LBOMbKv7f8HCsZltXlg==}
 
-  '@tanstack/react-query@5.95.2':
-    resolution: {integrity: sha512-/wGkvLj/st5Ud1Q76KF1uFxScV7WeqN1slQx5280ycwAyYkIPGaRZAEgHxe3bjirSd5Zpwkj6zNcR4cqYni/ZA==}
+  '@tanstack/react-query@5.97.0':
+    resolution: {integrity: sha512-y4So4eGcQoK2WVMAcDNZE9ofB/p5v1OlKvtc1F3uqHwrtifobT7q+ZnXk2mRkc8E84HKYSlAE9z6HXl2V0+ySQ==}
     peerDependencies:
       react: ^18 || ^19
 
@@ -1394,6 +1413,9 @@ packages:
   '@types/hast@3.0.4':
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
 
+  '@types/jsdom@28.0.1':
+    resolution: {integrity: sha512-GJq2QE4TAZ5ajSoCasn5DOFm8u1mI3tIFvM5tIq3W5U/RTB6gsHwc6Yhpl91X9VSDOUVblgXmG+2+sSvFQrdlw==}
+
   '@types/mdast@4.0.4':
     resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
 
@@ -1406,8 +1428,8 @@ packages:
   '@types/node-cron@3.0.11':
     resolution: {integrity: sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==}
 
-  '@types/node@25.5.0':
-    resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==}
+  '@types/node@25.5.2':
+    resolution: {integrity: sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==}
 
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
@@ -1420,6 +1442,9 @@ packages:
   '@types/react@19.2.14':
     resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
 
+  '@types/tough-cookie@4.0.5':
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
@@ -1429,11 +1454,11 @@ packages:
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
 
-  '@vitest/expect@4.1.2':
-    resolution: {integrity: sha512-gbu+7B0YgUJ2nkdsRJrFFW6X7NTP44WlhiclHniUhxADQJH5Szt9mZ9hWnJPJ8YwOK5zUOSSlSvyzRf0u1DSBQ==}
+  '@vitest/expect@4.1.4':
+    resolution: {integrity: sha512-iPBpra+VDuXmBFI3FMKHSFXp3Gx5HfmSCE8X67Dn+bwephCnQCaB7qWK2ldHa+8ncN8hJU8VTMcxjPpyMkUjww==}
 
-  '@vitest/mocker@4.1.2':
-    resolution: {integrity: sha512-Ize4iQtEALHDttPRCmN+FKqOl2vxTiNUhzobQFFt/BM1lRUTG7zRCLOykG/6Vo4E4hnUdfVLo5/eqKPukcWW7Q==}
+  '@vitest/mocker@4.1.4':
+    resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1443,20 +1468,20 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.2':
-    resolution: {integrity: sha512-dwQga8aejqeuB+TvXCMzSQemvV9hNEtDDpgUKDzOmNQayl2OG241PSWeJwKRH3CiC+sESrmoFd49rfnq7T4RnA==}
+  '@vitest/pretty-format@4.1.4':
+    resolution: {integrity: sha512-ddmDHU0gjEUyEVLxtZa7xamrpIefdEETu3nZjWtHeZX4QxqJ7tRxSteHVXJOcr8jhiLoGAhkK4WJ3WqBpjx42A==}
 
-  '@vitest/runner@4.1.2':
-    resolution: {integrity: sha512-Gr+FQan34CdiYAwpGJmQG8PgkyFVmARK8/xSijia3eTFgVfpcpztWLuP6FttGNfPLJhaZVP/euvujeNYar36OQ==}
+  '@vitest/runner@4.1.4':
+    resolution: {integrity: sha512-xTp7VZ5aXP5ZJrn15UtJUWlx6qXLnGtF6jNxHepdPHpMfz/aVPx+htHtgcAL2mDXJgKhpoo2e9/hVJsIeFbytQ==}
 
-  '@vitest/snapshot@4.1.2':
-    resolution: {integrity: sha512-g7yfUmxYS4mNxk31qbOYsSt2F4m1E02LFqO53Xpzg3zKMhLAPZAjjfyl9e6z7HrW6LvUdTwAQR3HHfLjpko16A==}
+  '@vitest/snapshot@4.1.4':
+    resolution: {integrity: sha512-MCjCFgaS8aZz+m5nTcEcgk/xhWv0rEH4Yl53PPlMXOZ1/Ka2VcZU6CJ+MgYCZbcJvzGhQRjVrGQNZqkGPttIKw==}
 
-  '@vitest/spy@4.1.2':
-    resolution: {integrity: sha512-DU4fBnbVCJGNBwVA6xSToNXrkZNSiw59H8tcuUspVMsBDBST4nfvsPsEHDHGtWRRnqBERBQu7TrTKskmjqTXKA==}
+  '@vitest/spy@4.1.4':
+    resolution: {integrity: sha512-XxNdAsKW7C+FLydqFJLb5KhJtl3PGCMmYwFRfhvIgxJvLSXhhVI1zM8f1qD3Zg7RCjTSzDVyct6sghs9UEgBEQ==}
 
-  '@vitest/utils@4.1.2':
-    resolution: {integrity: sha512-xw2/TiX82lQHA06cgbqRKFb5lCAy3axQ4H4SoUFhUsg+wztiet+co86IAMDtF6Vm1hc7J6j09oh/rgDn+JdKIQ==}
+  '@vitest/utils@4.1.4':
+    resolution: {integrity: sha512-13QMT+eysM5uVGa1rG4kegGYNp6cnQcsTc67ELFbhNLQO+vgsygtYJx2khvdt4gVQqSSpC/KT5FZZxUpP3Oatw==}
 
   JSONStream@1.3.5:
     resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
@@ -1465,9 +1490,9 @@ packages:
   add-stream@1.0.0:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
 
-  agent-base@8.0.0:
-    resolution: {integrity: sha512-QT8i0hCz6C/KQ+KTAbSNwCHDGdmUJl2tp2ZpNlGSWCfhUNVbYG2WLE3MdZGBAgXPV4GAvjGMxo+C1hroyxmZEg==}
-    engines: {node: '>= 14'}
+  agent-base@9.0.0:
+    resolution: {integrity: sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==}
+    engines: {node: '>= 20'}
 
   ajv@8.18.0:
     resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
@@ -1523,16 +1548,19 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  baseline-browser-mapping@2.10.11:
-    resolution: {integrity: sha512-DAKrHphkJyiGuau/cFieRYhcTFeK/lBuD++C7cZ6KZHbMhBrisoi+EvhQ5RZrIfV5qwsW8kgQ07JIC+MDJRAhg==}
+  baseline-browser-mapping@2.10.17:
+    resolution: {integrity: sha512-HdrkN8eVG2CXxeifv/VdJ4A4RSra1DTW8dc/hdxzhGHN8QePs6gKaWM9pHPcpCoxYZJuOZ8drHmbdpLHjCYjLA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
   bidi-js@1.0.3:
     resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
 
-  brace-expansion@1.1.12:
-    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  brace-expansion@1.1.13:
+    resolution: {integrity: sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -1553,8 +1581,8 @@ packages:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
 
-  caniuse-lite@1.0.30001781:
-    resolution: {integrity: sha512-RdwNCyMsNBftLjW6w01z8bKEvT6e/5tpPVEgtn22TiLGlstHOVecsX2KHFkD5e/vRnIE4EGzpuIODb3mtswtkw==}
+  caniuse-lite@1.0.30001787:
+    resolution: {integrity: sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -1637,18 +1665,32 @@ packages:
     resolution: {integrity: sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==}
     engines: {node: '>=14'}
 
-  conventional-changelog-angular@8.3.0:
-    resolution: {integrity: sha512-DOuBwYSqWzfwuRByY9O4oOIvDlkUCTDzfbOgcSbkY+imXXj+4tmrEFao3K+FxemClYfYnZzsvudbwrhje9VHDA==}
+  conventional-changelog-angular@8.3.1:
+    resolution: {integrity: sha512-6gfI3otXK5Ph5DfCOI1dblr+kN3FAm5a97hYoQkqNZxOaYa5WKfXH+AnpsmS+iUH2mgVC2Cg2Qw9m5OKcmNrIg==}
     engines: {node: '>=18'}
 
   conventional-changelog-atom@3.0.0:
     resolution: {integrity: sha512-pnN5bWpH+iTUWU3FaYdw5lJmfWeqSyrUkG+wyHBI9tC1dLNnHkbAOg1SzTQ7zBqiFrfo55h40VsGXWMdopwc5g==}
     engines: {node: '>=14'}
 
+  conventional-changelog-atom@5.1.0:
+    resolution: {integrity: sha512-fw7GpI9jHNCWGBnTsPRI452ypQbNupGwsjrXfozvRNE0c92pJRpoj9rXfzDKUYJcsmk0H4XKaQjhjelwI9z27w==}
+    engines: {node: '>=18'}
+
+  conventional-changelog-cli@5.0.0:
+    resolution: {integrity: sha512-9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ==}
+    engines: {node: '>=18'}
+    deprecated: This package is no longer maintained. Please use the conventional-changelog package instead.
+    hasBin: true
+
   conventional-changelog-codemirror@3.0.0:
     resolution: {integrity: sha512-wzchZt9HEaAZrenZAUUHMCFcuYzGoZ1wG/kTRMICxsnW5AXohYMRxnyecP9ob42Gvn5TilhC0q66AtTPRSNMfw==}
     engines: {node: '>=14'}
 
+  conventional-changelog-codemirror@5.1.0:
+    resolution: {integrity: sha512-iXhy63YczB+yWA9DrsYbquSYLvWKsK9M3WC+xQPEm8cOn4oXzKpmTp2uH3qi7+i10oTcGJTvq9lsBpZmMADaNg==}
+    engines: {node: '>=18'}
+
   conventional-changelog-config-spec@2.1.0:
     resolution: {integrity: sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==}
 
@@ -1656,58 +1698,103 @@ packages:
     resolution: {integrity: sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw==}
     engines: {node: '>=14'}
 
-  conventional-changelog-conventionalcommits@9.3.0:
-    resolution: {integrity: sha512-kYFx6gAyjSIMwNtASkI3ZE99U1fuVDJr0yTYgVy+I2QG46zNZfl2her+0+eoviG82c5WQvW1jMt1eOQTeJLodA==}
+  conventional-changelog-conventionalcommits@8.0.0:
+    resolution: {integrity: sha512-eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA==}
+    engines: {node: '>=18'}
+
+  conventional-changelog-conventionalcommits@9.3.1:
+    resolution: {integrity: sha512-dTYtpIacRpcZgrvBYvBfArMmK2xvIpv2TaxM0/ZI5CBtNUzvF2x0t15HsbRABWprS6UPmvj+PzHVjSx4qAVKyw==}
     engines: {node: '>=18'}
 
   conventional-changelog-core@5.0.2:
     resolution: {integrity: sha512-RhQOcDweXNWvlRwUDCpaqXzbZemKPKncCWZG50Alth72WITVd6nhVk9MJ6w1k9PFNBcZ3YwkdkChE+8+ZwtUug==}
     engines: {node: '>=14'}
 
+  conventional-changelog-core@8.0.0:
+    resolution: {integrity: sha512-EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw==}
+    engines: {node: '>=18'}
+
   conventional-changelog-ember@3.0.0:
     resolution: {integrity: sha512-7PYthCoSxIS98vWhVcSphMYM322OxptpKAuHYdVspryI0ooLDehRXWeRWgN+zWSBXKl/pwdgAg8IpLNSM1/61A==}
     engines: {node: '>=14'}
 
+  conventional-changelog-ember@5.1.0:
+    resolution: {integrity: sha512-XNcgGcdJt7wh341BBML0CI8DKpqE5lKD1WahzFHGZFvKTzJr1rZW976cw7beqKLOBbzdrH9ZIkE/s2TfbOuM3g==}
+    engines: {node: '>=18'}
+
   conventional-changelog-eslint@4.0.0:
     resolution: {integrity: sha512-nEZ9byP89hIU0dMx37JXQkE1IpMmqKtsaR24X7aM3L6Yy/uAtbb+ogqthuNYJkeO1HyvK7JsX84z8649hvp43Q==}
     engines: {node: '>=14'}
 
+  conventional-changelog-eslint@6.1.0:
+    resolution: {integrity: sha512-beWr3qzuEMN9gznMWa8PhTVfGkGXoq+XnUzViNXg5KygrgV728ZRqZngz3uPhz5+ayUhPrpNFYqIE0qHWz9NAw==}
+    engines: {node: '>=18'}
+
   conventional-changelog-express@3.0.0:
     resolution: {integrity: sha512-HqxihpUMfIuxvlPvC6HltA4ZktQEUan/v3XQ77+/zbu8No/fqK3rxSZaYeHYant7zRxQNIIli7S+qLS9tX9zQA==}
     engines: {node: '>=14'}
 
+  conventional-changelog-express@5.1.0:
+    resolution: {integrity: sha512-g/s9eLohrefYTSNQaB6+k0ONbiVx41YOKBbIOIM3ST/NtedAgppCJnrpKXVN9sOmpPkN4vjFwURlfvpEDUjoeg==}
+    engines: {node: '>=18'}
+
   conventional-changelog-jquery@4.0.0:
     resolution: {integrity: sha512-TTIN5CyzRMf8PUwyy4IOLmLV2DFmPtasKN+x7EQKzwSX8086XYwo+NeaeA3VUT8bvKaIy5z/JoWUvi7huUOgaw==}
     engines: {node: '>=14'}
 
+  conventional-changelog-jquery@6.1.0:
+    resolution: {integrity: sha512-/sFhULybhFrMg+qc8MHHHSj7kTVMfx5C7rSM6Z9EjduVoAQJdGRq/wpv/SWPMQ+KPNSYHqDLwm/x2Z5hOcYvqQ==}
+    engines: {node: '>=18'}
+
   conventional-changelog-jshint@3.0.0:
     resolution: {integrity: sha512-bQof4byF4q+n+dwFRkJ/jGf9dCNUv4/kCDcjeCizBvfF81TeimPZBB6fT4HYbXgxxfxWXNl/i+J6T0nI4by6DA==}
     engines: {node: '>=14'}
 
+  conventional-changelog-jshint@5.2.0:
+    resolution: {integrity: sha512-OaatyvHXP1fjI7Mx0b1IkmhbhTsVHsytnsQSkOj4rhGbFMoTcfvbwm/vAtCzRMXOxojK1EDMBBmBj1pM9KNy/Q==}
+    engines: {node: '>=18'}
+
   conventional-changelog-preset-loader@3.0.0:
     resolution: {integrity: sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==}
     engines: {node: '>=14'}
 
+  conventional-changelog-preset-loader@5.0.0:
+    resolution: {integrity: sha512-SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA==}
+    engines: {node: '>=18'}
+
   conventional-changelog-writer@6.0.1:
     resolution: {integrity: sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==}
     engines: {node: '>=14'}
     hasBin: true
 
+  conventional-changelog-writer@8.4.0:
+    resolution: {integrity: sha512-HHBFkk1EECxxmCi4CTu091iuDpQv5/OavuCUAuZmrkWpmYfyD816nom1CvtfXJ/uYfAAjavgHvXHX291tSLK8g==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   conventional-changelog@4.0.0:
     resolution: {integrity: sha512-JbZjwE1PzxQCvm+HUTIr+pbSekS8qdOZzMakdFyPtdkEWwFvwEJYONzjgMm0txCb2yBcIcfKDmg8xtCKTdecNQ==}
     engines: {node: '>=14'}
 
+  conventional-changelog@6.0.0:
+    resolution: {integrity: sha512-tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w==}
+    engines: {node: '>=18'}
+
   conventional-commits-filter@3.0.0:
     resolution: {integrity: sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==}
     engines: {node: '>=14'}
 
+  conventional-commits-filter@5.0.0:
+    resolution: {integrity: sha512-tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q==}
+    engines: {node: '>=18'}
+
   conventional-commits-parser@4.0.0:
     resolution: {integrity: sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==}
     engines: {node: '>=14'}
     hasBin: true
 
-  conventional-commits-parser@6.3.0:
-    resolution: {integrity: sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==}
+  conventional-commits-parser@6.4.0:
+    resolution: {integrity: sha512-tvRg7FIBNlyPzjdG8wWRlPHQJJHI7DylhtRGeU9Lq+JuoPh5BKpPRX83ZdLrvXuOSu5Eo/e7SzOQhU4Hd2Miuw==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -1722,8 +1809,8 @@ packages:
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
-  cosmiconfig-typescript-loader@6.2.0:
-    resolution: {integrity: sha512-GEN39v7TgdxgIoNcdkRE3uiAzQt3UXLyHbRHD6YoL048XAeOomyxaP+Hh/+2C6C2wYjxJ2onhJcsQp+L4YEkVQ==}
+  cosmiconfig-typescript-loader@6.3.0:
+    resolution: {integrity: sha512-Akr82WH1Wfqatyiqpj8HDkO2o2KmJRu1FhKfSNJP3K4IdXwHfEyL7MOb62i1AGQVLtIQM+iCE9CGOtrfhR+mmA==}
     engines: {node: '>=v18'}
     peerDependencies:
       '@types/node': '*'
@@ -1748,10 +1835,17 @@ packages:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
+  css-select@5.2.2:
+    resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==}
+
   css-tree@3.2.1:
     resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
 
+  css-what@6.2.2:
+    resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
+    engines: {node: '>= 6'}
+
   css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
 
@@ -1825,12 +1919,25 @@ packages:
   dom-accessibility-api@0.6.3:
     resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
 
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  domutils@3.2.2:
+    resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
+
   dot-prop@5.3.0:
     resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
     engines: {node: '>=8'}
 
-  dotenv@17.3.1:
-    resolution: {integrity: sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==}
+  dotenv@17.4.1:
+    resolution: {integrity: sha512-k8DaKGP6r1G30Lx8V4+pCsLzKr8vLmV2paqEj1Y55GdAgJuIqpRp5FfajGF8KtwMxCz9qJc6wUIJnm053d/WCw==}
     engines: {node: '>=12'}
 
   dotgitignore@2.1.0:
@@ -1841,8 +1948,8 @@ packages:
     resolution: {integrity: sha512-7OZcmQUrdGI+DUNNsKBn1aW8qSoKuTH7d0mYgSP8bAzdFzKoovxEFnoGQp2dVs82EOJeYycqRtciopszwUf8bw==}
     hasBin: true
 
-  drizzle-orm@0.45.1:
-    resolution: {integrity: sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA==}
+  drizzle-orm@0.45.2:
+    resolution: {integrity: sha512-kY0BSaTNYWnoDMVoyY8uxmyHjpJW1geOmBMdSSicKo9CIIWkSxMIj2rkeSR51b8KAPB7m+qysjuHme5nKP+E5Q==}
     peerDependencies:
       '@aws-sdk/client-rds-data': '>=3'
       '@cloudflare/workers-types': '>=4'
@@ -1963,6 +2070,10 @@ packages:
     resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
     engines: {node: '>=10.13.0'}
 
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
   entities@6.0.1:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
@@ -1977,8 +2088,8 @@ packages:
   es-module-lexer@2.0.0:
     resolution: {integrity: sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==}
 
-  esbuild@0.27.4:
-    resolution: {integrity: sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==}
+  esbuild@0.28.0:
+    resolution: {integrity: sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -2026,8 +2137,8 @@ packages:
   fast-xml-builder@1.1.4:
     resolution: {integrity: sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==}
 
-  fast-xml-parser@5.5.9:
-    resolution: {integrity: sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==}
+  fast-xml-parser@5.5.11:
+    resolution: {integrity: sha512-QL0eb0YbSTVWF6tTf1+LEMSgtCEjBYPpnAjoLC8SscESlAjXEIRJ7cHtLG0pLeDFaZLa4VKZLArtA/60ZS7vyA==}
     hasBin: true
 
   fastq@1.20.1:
@@ -2053,6 +2164,10 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
+  find-up-simple@1.0.1:
+    resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==}
+    engines: {node: '>=18'}
+
   find-up@2.1.0:
     resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
     engines: {node: '>=4'}
@@ -2118,6 +2233,11 @@ packages:
     deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead.
     hasBin: true
 
+  git-semver-tags@8.0.1:
+    resolution: {integrity: sha512-zMbamckSNdlT4U48IMFa2Cn6FTzM+2yF6/gEmStPJI8PiLxd/bT6dw10+mc6u5Qe4fhrc/y9nU290FWjQhAV7g==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   gitconfiglocal@1.0.0:
     resolution: {integrity: sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==}
 
@@ -2155,6 +2275,10 @@ packages:
   hast-util-whitespace@3.0.0:
     resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
 
+  he@1.2.0:
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
+    hasBin: true
+
   help-me@5.0.0:
     resolution: {integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==}
 
@@ -2165,6 +2289,10 @@ packages:
     resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}
     engines: {node: '>=10'}
 
+  hosted-git-info@7.0.2:
+    resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==}
+    engines: {node: ^16.14.0 || >=18.0.0}
+
   html-encoding-sniffer@6.0.0:
     resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -2172,9 +2300,9 @@ packages:
   html-url-attributes@3.0.1:
     resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
 
-  https-proxy-agent@8.0.0:
-    resolution: {integrity: sha512-YYeW+iCnAS3xhvj2dvVoWgsbca3RfQy/IlaNHHOtDmU0jMqPI9euIq3Y9BJETdxk16h9NHHCKqp/KB9nIMStCQ==}
-    engines: {node: '>= 14'}
+  https-proxy-agent@9.0.0:
+    resolution: {integrity: sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==}
+    engines: {node: '>= 20'}
 
   husky@9.1.7:
     resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
@@ -2192,6 +2320,10 @@ packages:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
+  index-to-position@1.2.0:
+    resolution: {integrity: sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==}
+    engines: {node: '>=18'}
+
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
@@ -2287,8 +2419,8 @@ packages:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
-  jsdom@29.0.1:
-    resolution: {integrity: sha512-z6JOK5gRO7aMybVq/y/MlIpKh8JIi68FBKMUtKkK2KH/wMSRlCxQ682d08LB9fYXplyY/UXG8P4XXTScmdjApg==}
+  jsdom@29.0.2:
+    resolution: {integrity: sha512-9VnGEBosc/ZpwyOsJBCQ/3I5p7Q5ngOY14a9bf5btenAORmZfDse1ZEheMiWcJ3h81+Fv7HmJFdS0szo/waF2w==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
     peerDependencies:
       canvas: ^3.0.0
@@ -2316,8 +2448,8 @@ packages:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
 
-  knip@6.0.6:
-    resolution: {integrity: sha512-PA+r1mTDLHH3eShlffn2ZDyH1hHvmgDj7JsTP3JKuhV/jZTyHbRkGcOd+uaSxfJZmcZyOE5zw3naP33WllTIlA==}
+  knip@6.3.1:
+    resolution: {integrity: sha512-22kLJloVcOVOAudCxlFOC0ICAMme7dKsS7pVTEnrmyKGpswb8ieznvAiSKUeFVDJhb01ect6dkDc1Ha1g1sPpg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -2442,8 +2574,11 @@ packages:
   longest-streak@3.1.0:
     resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
 
-  lru-cache@11.2.7:
-    resolution: {integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==}
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
+  lru-cache@11.3.3:
+    resolution: {integrity: sha512-JvNw9Y81y33E+BEYPr0U7omo+U9AySnsMsEiXgwT6yqd31VQWTLNQqmT4ou5eqPFUrTfIDFta2wKhB1hyohtAQ==}
     engines: {node: 20 || >=22}
 
   lru-cache@6.0.0:
@@ -2645,8 +2780,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  next@16.2.1:
-    resolution: {integrity: sha512-VaChzNL7o9rbfdt60HUj8tev4m6d7iC1igAy157526+cJlXOQu5LzsBXNT+xaJnTP/k+utSX5vMv7m0G+zKH+Q==}
+  next@16.2.2:
+    resolution: {integrity: sha512-i6AJdyVa4oQjyvX/6GeER8dpY/xlIV+4NMv/svykcLtURJSy/WzDnnUk/TM4d0uewFHK7xSQz4TbIwPgjky+3A==}
     engines: {node: '>=20.9.0'}
     hasBin: true
     peerDependencies:
@@ -2678,6 +2813,9 @@ packages:
     resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
     hasBin: true
 
+  node-html-parser@7.1.0:
+    resolution: {integrity: sha512-iJo8b2uYGT40Y8BTyy5ufL6IVbN8rbm/1QK2xffXU/1a/v3AAa0d1YAoqBNYqaS4R/HajkWIpIfdE6KcyFh1AQ==}
+
   normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
 
@@ -2685,6 +2823,13 @@ packages:
     resolution: {integrity: sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==}
     engines: {node: '>=10'}
 
+  normalize-package-data@6.0.2:
+    resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==}
+    engines: {node: ^16.14.0 || >=18.0.0}
+
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
   obug@2.1.1:
     resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
 
@@ -2698,8 +2843,8 @@ packages:
   otpauth@9.5.0:
     resolution: {integrity: sha512-Ldhc6UYl4baR5toGr8nfKC+L/b8/RgHKoIixAebgoNGzUUCET02g04rMEZ2ZsPfeVQhMHcuaOgb28nwMr81zCA==}
 
-  oxc-parser@0.120.0:
-    resolution: {integrity: sha512-WyPWZlcIm+Fkte63FGfgFB8mAAk33aH9h5N9lphXVOHSXEBFFsmYdOBedVKly363aWABjZdaj/m9lBfEY4wt+w==}
+  oxc-parser@0.121.0:
+    resolution: {integrity: sha512-ek9o58+SCv6AV7nchiAcUJy1DNE2CC5WRdBcO0mF+W4oRjNQfPO7b3pLjTHSFECpHkKGOZSQxx3hk8viIL5YCg==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   oxc-resolver@11.19.1:
@@ -2756,6 +2901,13 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
 
+  parse-json@8.3.0:
+    resolution: {integrity: sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==}
+    engines: {node: '>=18'}
+
+  parse5@7.3.0:
+    resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
+
   parse5@8.0.0:
     resolution: {integrity: sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==}
 
@@ -2767,8 +2919,8 @@ packages:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
 
-  path-expression-matcher@1.2.0:
-    resolution: {integrity: sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==}
+  path-expression-matcher@1.4.0:
+    resolution: {integrity: sha512-s4DQMxIdhj3jLFWd9LxHOplj4p9yQ4ffMGowFf3cpEgrrJjEhN0V5nxw4Ye1EViAGDoL4/1AeO6qHpqYPOzE4Q==}
     engines: {node: '>=14.0.0'}
 
   path-key@3.1.1:
@@ -2826,12 +2978,12 @@ packages:
     resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.5.8:
-    resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
+  postcss@8.5.9:
+    resolution: {integrity: sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postgres@3.4.8:
-    resolution: {integrity: sha512-d+JFcLM17njZaOLkv6SCev7uoLaBtfK86vMUXhW1Z4glPWh4jozno9APvW/XKFJ3CCxVoC7OL38BqRydtu5nGg==}
+  postgres@3.4.9:
+    resolution: {integrity: sha512-GD3qdB0x1z9xgFI6cdRD6xu2Sp2WCOEoe3mtnyB5Ee0XrrL5Pe+e4CCnJrRMnL1zYtRDZmQQVbvOttLnKDLnaw==}
     engines: {node: '>=12'}
 
   prettier@3.8.1:
@@ -2898,6 +3050,10 @@ packages:
     resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==}
     engines: {node: '>=0.10.0'}
 
+  read-package-up@11.0.0:
+    resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==}
+    engines: {node: '>=18'}
+
   read-pkg-up@3.0.0:
     resolution: {integrity: sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==}
     engines: {node: '>=4'}
@@ -2914,6 +3070,10 @@ packages:
     resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
     engines: {node: '>=8'}
 
+  read-pkg@9.0.1:
+    resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==}
+    engines: {node: '>=18'}
+
   readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
 
@@ -2969,8 +3129,8 @@ packages:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rollup@4.60.0:
-    resolution: {integrity: sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==}
+  rollup@4.60.1:
+    resolution: {integrity: sha512-VmtB2rFU/GroZ4oL8+ZqXgSA38O6GR8KSIvWmEFv63pQ0G6KaBH9s07PO8XTXP4vI+3UJUEypOfjkGfmSBBR0w==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -3032,9 +3192,9 @@ packages:
     resolution: {integrity: sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==}
     engines: {node: '>= 18'}
 
-  socks-proxy-agent@9.0.0:
-    resolution: {integrity: sha512-fFlbMlfsXhK02ZB8aZY7Hwxh/IHBV9b1Oq9bvBk6tkFWXvdAxUgA0wbw/NYR5liU3Y5+KI6U4FH3kYJt9QYv0w==}
-    engines: {node: '>= 14'}
+  socks-proxy-agent@10.0.0:
+    resolution: {integrity: sha512-pyp2YR3mNxAMu0mGLtzs4g7O3uT4/9sQOLAKcViAkaS9fJWkud7nmaf6ZREFqQEi24IPkBcjfHjXhPTUWjo3uA==}
+    engines: {node: '>= 20'}
 
   socks@2.8.7:
     resolution: {integrity: sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==}
@@ -3114,8 +3274,8 @@ packages:
     resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
     engines: {node: '>=14.16'}
 
-  strnum@2.2.2:
-    resolution: {integrity: sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==}
+  strnum@2.2.3:
+    resolution: {integrity: sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==}
 
   style-to-js@1.1.21:
     resolution: {integrity: sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==}
@@ -3154,6 +3314,14 @@ packages:
     resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==}
     engines: {node: '>=6'}
 
+  temp-dir@3.0.0:
+    resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
+    engines: {node: '>=14.16'}
+
+  tempfile@5.0.0:
+    resolution: {integrity: sha512-bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q==}
+    engines: {node: '>=14.18'}
+
   text-extensions@1.9.0:
     resolution: {integrity: sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==}
     engines: {node: '>=0.10'}
@@ -3171,23 +3339,23 @@ packages:
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
-  tinyexec@1.0.4:
-    resolution: {integrity: sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==}
+  tinyexec@1.1.1:
+    resolution: {integrity: sha512-VKS/ZaQhhkKFMANmAOhhXVoIfBXblQxGX1myCQ2faQrfmobMftXeJPcZGp0gS07ocvGJWDLZGyOZDadDBqYIJg==}
     engines: {node: '>=18'}
 
-  tinyglobby@0.2.15:
-    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
     engines: {node: '>=12.0.0'}
 
   tinyrainbow@3.1.0:
     resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
     engines: {node: '>=14.0.0'}
 
-  tldts-core@7.0.27:
-    resolution: {integrity: sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==}
+  tldts-core@7.0.28:
+    resolution: {integrity: sha512-7W5Efjhsc3chVdFhqtaU0KtK32J37Zcr9RKtID54nG+tIpcY79CQK/veYPODxtD/LJ4Lue66jvrQzIX2Z2/pUQ==}
 
-  tldts@7.0.27:
-    resolution: {integrity: sha512-I4FZcVFcqCRuT0ph6dCDpPuO4Xgzvh+spkcTr1gK7peIvxWauoloVO0vuy1FQnijT63ss6AsHB6+OIM4aXHbPg==}
+  tldts@7.0.28:
+    resolution: {integrity: sha512-+Zg3vWhRUv8B1maGSTFdev9mjoo8Etn2Ayfs4cnjlD3CsGkxXX4QyW3j2WJ0wdjYcYmy7Lx2RDsZMhgCWafKIw==}
     hasBin: true
 
   to-regex-range@5.0.1:
@@ -3235,6 +3403,10 @@ packages:
     resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
     engines: {node: '>=8'}
 
+  type-fest@4.41.0:
+    resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
+    engines: {node: '>=16'}
+
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
@@ -3255,10 +3427,17 @@ packages:
   undici-types@7.18.2:
     resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==}
 
-  undici@7.24.6:
-    resolution: {integrity: sha512-Xi4agocCbRzt0yYMZGMA6ApD7gvtUFaxm4ZmeacWI4cZxaF6C+8I8QfofC20NAePiB/IcvZmzkJ7XPa471AEtA==}
+  undici-types@7.24.7:
+    resolution: {integrity: sha512-XA+gOBkzYD3C74sZowtCLTpgtaCdqZhqCvR6y9LXvrKTt/IVU6bz49T4D+BPi475scshCCkb0IklJRw6T1ZlgQ==}
+
+  undici@7.24.7:
+    resolution: {integrity: sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==}
     engines: {node: '>=20.18.1'}
 
+  unicorn-magic@0.1.0:
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
+
   unified@11.0.5:
     resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
@@ -3289,8 +3468,8 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vite@7.3.1:
-    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
+  vite@7.3.2:
+    resolution: {integrity: sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -3329,18 +3508,20 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.1.2:
-    resolution: {integrity: sha512-xjR1dMTVHlFLh98JE3i/f/WePqJsah4A0FK9cc8Ehp9Udk0AZk6ccpIZhh1qJ/yxVWRZ+Q54ocnD8TXmkhspGg==}
+  vitest@4.1.4:
+    resolution: {integrity: sha512-tFuJqTxKb8AvfyqMfnavXdzfy3h3sWZRWwfluGbkeR7n0HUev+FmNgZ8SDrRBTVrVCjgH5cA21qGbCffMNtWvg==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.1.2
-      '@vitest/browser-preview': 4.1.2
-      '@vitest/browser-webdriverio': 4.1.2
-      '@vitest/ui': 4.1.2
+      '@vitest/browser-playwright': 4.1.4
+      '@vitest/browser-preview': 4.1.4
+      '@vitest/browser-webdriverio': 4.1.4
+      '@vitest/coverage-istanbul': 4.1.4
+      '@vitest/coverage-v8': 4.1.4
+      '@vitest/ui': 4.1.4
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -3357,6 +3538,10 @@ packages:
         optional: true
       '@vitest/browser-webdriverio':
         optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
+        optional: true
       '@vitest/ui':
         optional: true
       happy-dom:
@@ -3465,21 +3650,19 @@ snapshots:
 
   '@alloc/quick-lru@5.2.0': {}
 
-  '@asamuzakjp/css-color@5.0.1':
+  '@asamuzakjp/css-color@5.1.9':
     dependencies:
       '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-color-parser': 4.0.2(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
       '@csstools/css-tokenizer': 4.0.0
-      lru-cache: 11.2.7
 
-  '@asamuzakjp/dom-selector@7.0.4':
+  '@asamuzakjp/dom-selector@7.0.9':
     dependencies:
       '@asamuzakjp/nwsapi': 2.3.9
       bidi-js: 1.0.3
       css-tree: 3.2.1
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.2.7
 
   '@asamuzakjp/nwsapi@2.3.9': {}
 
@@ -3493,53 +3676,53 @@ snapshots:
 
   '@babel/runtime@7.29.2': {}
 
-  '@biomejs/biome@2.4.9':
+  '@biomejs/biome@2.4.11':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.4.9
-      '@biomejs/cli-darwin-x64': 2.4.9
-      '@biomejs/cli-linux-arm64': 2.4.9
-      '@biomejs/cli-linux-arm64-musl': 2.4.9
-      '@biomejs/cli-linux-x64': 2.4.9
-      '@biomejs/cli-linux-x64-musl': 2.4.9
-      '@biomejs/cli-win32-arm64': 2.4.9
-      '@biomejs/cli-win32-x64': 2.4.9
+      '@biomejs/cli-darwin-arm64': 2.4.11
+      '@biomejs/cli-darwin-x64': 2.4.11
+      '@biomejs/cli-linux-arm64': 2.4.11
+      '@biomejs/cli-linux-arm64-musl': 2.4.11
+      '@biomejs/cli-linux-x64': 2.4.11
+      '@biomejs/cli-linux-x64-musl': 2.4.11
+      '@biomejs/cli-win32-arm64': 2.4.11
+      '@biomejs/cli-win32-x64': 2.4.11
 
-  '@biomejs/cli-darwin-arm64@2.4.9':
+  '@biomejs/cli-darwin-arm64@2.4.11':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.4.9':
+  '@biomejs/cli-darwin-x64@2.4.11':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.4.9':
+  '@biomejs/cli-linux-arm64-musl@2.4.11':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.4.9':
+  '@biomejs/cli-linux-arm64@2.4.11':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.4.9':
+  '@biomejs/cli-linux-x64-musl@2.4.11':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.4.9':
+  '@biomejs/cli-linux-x64@2.4.11':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.4.9':
+  '@biomejs/cli-win32-arm64@2.4.11':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.4.9':
+  '@biomejs/cli-win32-x64@2.4.11':
     optional: true
 
   '@bramus/specificity@2.4.2':
     dependencies:
       css-tree: 3.2.1
 
-  '@commitlint/cli@20.5.0(@types/node@25.5.0)(conventional-commits-parser@6.3.0)(typescript@6.0.2)':
+  '@commitlint/cli@20.5.0(@types/node@25.5.2)(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)(typescript@6.0.2)':
     dependencies:
       '@commitlint/format': 20.5.0
       '@commitlint/lint': 20.5.0
-      '@commitlint/load': 20.5.0(@types/node@25.5.0)(typescript@6.0.2)
-      '@commitlint/read': 20.5.0(conventional-commits-parser@6.3.0)
+      '@commitlint/load': 20.5.0(@types/node@25.5.2)(typescript@6.0.2)
+      '@commitlint/read': 20.5.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
       '@commitlint/types': 20.5.0
-      tinyexec: 1.0.4
+      tinyexec: 1.1.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
@@ -3550,7 +3733,7 @@ snapshots:
   '@commitlint/config-conventional@20.5.0':
     dependencies:
       '@commitlint/types': 20.5.0
-      conventional-changelog-conventionalcommits: 9.3.0
+      conventional-changelog-conventionalcommits: 9.3.1
 
   '@commitlint/config-validator@20.5.0':
     dependencies:
@@ -3585,14 +3768,14 @@ snapshots:
       '@commitlint/rules': 20.5.0
       '@commitlint/types': 20.5.0
 
-  '@commitlint/load@20.5.0(@types/node@25.5.0)(typescript@6.0.2)':
+  '@commitlint/load@20.5.0(@types/node@25.5.2)(typescript@6.0.2)':
     dependencies:
       '@commitlint/config-validator': 20.5.0
       '@commitlint/execute-rule': 20.0.0
       '@commitlint/resolve-extends': 20.5.0
       '@commitlint/types': 20.5.0
       cosmiconfig: 9.0.1(typescript@6.0.2)
-      cosmiconfig-typescript-loader: 6.2.0(@types/node@25.5.0)(cosmiconfig@9.0.1(typescript@6.0.2))(typescript@6.0.2)
+      cosmiconfig-typescript-loader: 6.3.0(@types/node@25.5.2)(cosmiconfig@9.0.1(typescript@6.0.2))(typescript@6.0.2)
       is-plain-obj: 4.1.0
       lodash.mergewith: 4.6.2
       picocolors: 1.1.1
@@ -3605,16 +3788,16 @@ snapshots:
   '@commitlint/parse@20.5.0':
     dependencies:
       '@commitlint/types': 20.5.0
-      conventional-changelog-angular: 8.3.0
-      conventional-commits-parser: 6.3.0
+      conventional-changelog-angular: 8.3.1
+      conventional-commits-parser: 6.4.0
 
-  '@commitlint/read@20.5.0(conventional-commits-parser@6.3.0)':
+  '@commitlint/read@20.5.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)':
     dependencies:
       '@commitlint/top-level': 20.4.3
       '@commitlint/types': 20.5.0
-      git-raw-commits: 5.0.1(conventional-commits-parser@6.3.0)
+      git-raw-commits: 5.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
       minimist: 1.2.8
-      tinyexec: 1.0.4
+      tinyexec: 1.1.1
     transitivePeerDependencies:
       - conventional-commits-filter
       - conventional-commits-parser
@@ -3643,16 +3826,17 @@ snapshots:
 
   '@commitlint/types@20.5.0':
     dependencies:
-      conventional-commits-parser: 6.3.0
+      conventional-commits-parser: 6.4.0
       picocolors: 1.1.1
 
-  '@conventional-changelog/git-client@2.6.0(conventional-commits-parser@6.3.0)':
+  '@conventional-changelog/git-client@2.7.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)':
     dependencies:
       '@simple-libs/child-process-utils': 1.0.2
       '@simple-libs/stream-utils': 1.2.0
       semver: 7.7.4
     optionalDependencies:
-      conventional-commits-parser: 6.3.0
+      conventional-commits-filter: 5.0.0
+      conventional-commits-parser: 6.4.0
 
   '@csstools/color-helpers@6.0.2': {}
 
@@ -3711,7 +3895,7 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
-  '@emnapi/runtime@1.9.1':
+  '@emnapi/runtime@1.9.2':
     dependencies:
       tslib: 2.8.1
     optional: true
@@ -3725,7 +3909,7 @@ snapshots:
 
   '@esbuild-kit/core-utils@3.3.2':
     dependencies:
-      esbuild: 0.27.4
+      esbuild: 0.28.0
       source-map-support: 0.5.21
 
   '@esbuild-kit/esm-loader@2.6.5':
@@ -3733,82 +3917,82 @@ snapshots:
       '@esbuild-kit/core-utils': 3.3.2
       get-tsconfig: 4.13.7
 
-  '@esbuild/aix-ppc64@0.27.4':
+  '@esbuild/aix-ppc64@0.28.0':
     optional: true
 
-  '@esbuild/android-arm64@0.27.4':
+  '@esbuild/android-arm64@0.28.0':
     optional: true
 
-  '@esbuild/android-arm@0.27.4':
+  '@esbuild/android-arm@0.28.0':
     optional: true
 
-  '@esbuild/android-x64@0.27.4':
+  '@esbuild/android-x64@0.28.0':
     optional: true
 
-  '@esbuild/darwin-arm64@0.27.4':
+  '@esbuild/darwin-arm64@0.28.0':
     optional: true
 
-  '@esbuild/darwin-x64@0.27.4':
+  '@esbuild/darwin-x64@0.28.0':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.27.4':
+  '@esbuild/freebsd-arm64@0.28.0':
     optional: true
 
-  '@esbuild/freebsd-x64@0.27.4':
+  '@esbuild/freebsd-x64@0.28.0':
     optional: true
 
-  '@esbuild/linux-arm64@0.27.4':
+  '@esbuild/linux-arm64@0.28.0':
     optional: true
 
-  '@esbuild/linux-arm@0.27.4':
+  '@esbuild/linux-arm@0.28.0':
     optional: true
 
-  '@esbuild/linux-ia32@0.27.4':
+  '@esbuild/linux-ia32@0.28.0':
     optional: true
 
-  '@esbuild/linux-loong64@0.27.4':
+  '@esbuild/linux-loong64@0.28.0':
     optional: true
 
-  '@esbuild/linux-mips64el@0.27.4':
+  '@esbuild/linux-mips64el@0.28.0':
     optional: true
 
-  '@esbuild/linux-ppc64@0.27.4':
+  '@esbuild/linux-ppc64@0.28.0':
     optional: true
 
-  '@esbuild/linux-riscv64@0.27.4':
+  '@esbuild/linux-riscv64@0.28.0':
     optional: true
 
-  '@esbuild/linux-s390x@0.27.4':
+  '@esbuild/linux-s390x@0.28.0':
     optional: true
 
-  '@esbuild/linux-x64@0.27.4':
+  '@esbuild/linux-x64@0.28.0':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.27.4':
+  '@esbuild/netbsd-arm64@0.28.0':
     optional: true
 
-  '@esbuild/netbsd-x64@0.27.4':
+  '@esbuild/netbsd-x64@0.28.0':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.27.4':
+  '@esbuild/openbsd-arm64@0.28.0':
     optional: true
 
-  '@esbuild/openbsd-x64@0.27.4':
+  '@esbuild/openbsd-x64@0.28.0':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.27.4':
+  '@esbuild/openharmony-arm64@0.28.0':
     optional: true
 
-  '@esbuild/sunos-x64@0.27.4':
+  '@esbuild/sunos-x64@0.28.0':
     optional: true
 
-  '@esbuild/win32-arm64@0.27.4':
+  '@esbuild/win32-arm64@0.28.0':
     optional: true
 
-  '@esbuild/win32-ia32@0.27.4':
+  '@esbuild/win32-ia32@0.28.0':
     optional: true
 
-  '@esbuild/win32-x64@0.27.4':
+  '@esbuild/win32-x64@0.28.0':
     optional: true
 
   '@exodus/bytes@1.15.0(@noble/hashes@2.0.1)':
@@ -3819,6 +4003,8 @@ snapshots:
 
   '@hutson/parse-repository-url@3.0.2': {}
 
+  '@hutson/parse-repository-url@5.0.0': {}
+
   '@img/colour@1.1.0':
     optional: true
 
@@ -3904,7 +4090,7 @@ snapshots:
 
   '@img/sharp-wasm32@0.34.5':
     dependencies:
-      '@emnapi/runtime': 1.9.1
+      '@emnapi/runtime': 1.9.2
     optional: true
 
   '@img/sharp-win32-arm64@0.34.5':
@@ -3935,37 +4121,37 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@napi-rs/wasm-runtime@1.1.1':
+  '@napi-rs/wasm-runtime@1.1.3(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)':
     dependencies:
       '@emnapi/core': 1.9.1
-      '@emnapi/runtime': 1.9.1
+      '@emnapi/runtime': 1.9.2
       '@tybys/wasm-util': 0.10.1
     optional: true
 
-  '@next/env@16.2.1': {}
+  '@next/env@16.2.2': {}
 
-  '@next/swc-darwin-arm64@16.2.1':
+  '@next/swc-darwin-arm64@16.2.2':
     optional: true
 
-  '@next/swc-darwin-x64@16.2.1':
+  '@next/swc-darwin-x64@16.2.2':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@16.2.1':
+  '@next/swc-linux-arm64-gnu@16.2.2':
     optional: true
 
-  '@next/swc-linux-arm64-musl@16.2.1':
+  '@next/swc-linux-arm64-musl@16.2.2':
     optional: true
 
-  '@next/swc-linux-x64-gnu@16.2.1':
+  '@next/swc-linux-x64-gnu@16.2.2':
     optional: true
 
-  '@next/swc-linux-x64-musl@16.2.1':
+  '@next/swc-linux-x64-musl@16.2.2':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@16.2.1':
+  '@next/swc-win32-arm64-msvc@16.2.2':
     optional: true
 
-  '@next/swc-win32-x64-msvc@16.2.1':
+  '@next/swc-win32-x64-msvc@16.2.2':
     optional: true
 
   '@noble/hashes@2.0.1': {}
@@ -3982,69 +4168,72 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.20.1
 
-  '@oxc-parser/binding-android-arm-eabi@0.120.0':
+  '@oxc-parser/binding-android-arm-eabi@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-android-arm64@0.120.0':
+  '@oxc-parser/binding-android-arm64@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-arm64@0.120.0':
+  '@oxc-parser/binding-darwin-arm64@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-x64@0.120.0':
+  '@oxc-parser/binding-darwin-x64@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-freebsd-x64@0.120.0':
+  '@oxc-parser/binding-freebsd-x64@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.120.0':
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.120.0':
+  '@oxc-parser/binding-linux-arm-musleabihf@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.120.0':
+  '@oxc-parser/binding-linux-arm64-gnu@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-musl@0.120.0':
+  '@oxc-parser/binding-linux-arm64-musl@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.120.0':
+  '@oxc-parser/binding-linux-ppc64-gnu@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.120.0':
+  '@oxc-parser/binding-linux-riscv64-gnu@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.120.0':
+  '@oxc-parser/binding-linux-riscv64-musl@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.120.0':
+  '@oxc-parser/binding-linux-s390x-gnu@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-gnu@0.120.0':
+  '@oxc-parser/binding-linux-x64-gnu@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-musl@0.120.0':
+  '@oxc-parser/binding-linux-x64-musl@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-openharmony-arm64@0.120.0':
+  '@oxc-parser/binding-openharmony-arm64@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-wasm32-wasi@0.120.0':
+  '@oxc-parser/binding-wasm32-wasi@0.121.0(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.1
+      '@napi-rs/wasm-runtime': 1.1.3(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
     optional: true
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.120.0':
+  '@oxc-parser/binding-win32-arm64-msvc@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.120.0':
+  '@oxc-parser/binding-win32-ia32-msvc@0.121.0':
     optional: true
 
-  '@oxc-parser/binding-win32-x64-msvc@0.120.0':
+  '@oxc-parser/binding-win32-x64-msvc@0.121.0':
     optional: true
 
-  '@oxc-project/types@0.120.0': {}
+  '@oxc-project/types@0.121.0': {}
 
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     optional: true
@@ -4094,9 +4283,12 @@ snapshots:
   '@oxc-resolver/binding-openharmony-arm64@11.19.1':
     optional: true
 
-  '@oxc-resolver/binding-wasm32-wasi@11.19.1':
+  '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.1
+      '@napi-rs/wasm-runtime': 1.1.3(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
     optional: true
 
   '@oxc-resolver/binding-win32-arm64-msvc@11.19.1':
@@ -4112,79 +4304,79 @@ snapshots:
 
   '@pinojs/redact@0.4.0': {}
 
-  '@rollup/rollup-android-arm-eabi@4.60.0':
+  '@rollup/rollup-android-arm-eabi@4.60.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.60.0':
+  '@rollup/rollup-android-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.60.0':
+  '@rollup/rollup-darwin-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.60.0':
+  '@rollup/rollup-darwin-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.60.0':
+  '@rollup/rollup-freebsd-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.60.0':
+  '@rollup/rollup-freebsd-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.60.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.60.0':
+  '@rollup/rollup-linux-arm-musleabihf@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.60.0':
+  '@rollup/rollup-linux-arm64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.60.0':
+  '@rollup/rollup-linux-arm64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.60.0':
+  '@rollup/rollup-linux-loong64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-loong64-musl@4.60.0':
+  '@rollup/rollup-linux-loong64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.60.0':
+  '@rollup/rollup-linux-ppc64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-musl@4.60.0':
+  '@rollup/rollup-linux-ppc64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.60.0':
+  '@rollup/rollup-linux-riscv64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.60.0':
+  '@rollup/rollup-linux-riscv64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.60.0':
+  '@rollup/rollup-linux-s390x-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.60.0':
+  '@rollup/rollup-linux-x64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.60.0':
+  '@rollup/rollup-linux-x64-musl@4.60.1':
     optional: true
 
-  '@rollup/rollup-openbsd-x64@4.60.0':
+  '@rollup/rollup-openbsd-x64@4.60.1':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.60.0':
+  '@rollup/rollup-openharmony-arm64@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.60.0':
+  '@rollup/rollup-win32-arm64-msvc@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.60.0':
+  '@rollup/rollup-win32-ia32-msvc@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-gnu@4.60.0':
+  '@rollup/rollup-win32-x64-gnu@4.60.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.60.0':
+  '@rollup/rollup-win32-x64-msvc@4.60.1':
     optional: true
 
   '@simple-libs/child-process-utils@1.0.2':
@@ -4265,7 +4457,7 @@ snapshots:
       '@alloc/quick-lru': 5.2.0
       '@tailwindcss/node': 4.2.2
       '@tailwindcss/oxide': 4.2.2
-      postcss: 8.5.8
+      postcss: 8.5.9
       tailwindcss: 4.2.2
 
   '@tailwindcss/typography@0.5.19(tailwindcss@4.2.2)':
@@ -4273,11 +4465,11 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 4.2.2
 
-  '@tanstack/query-core@5.95.2': {}
+  '@tanstack/query-core@5.97.0': {}
 
-  '@tanstack/react-query@5.95.2(react@19.2.4)':
+  '@tanstack/react-query@5.97.0(react@19.2.4)':
     dependencies:
-      '@tanstack/query-core': 5.95.2
+      '@tanstack/query-core': 5.97.0
       react: 19.2.4
 
   '@testing-library/dom@10.4.1':
@@ -4342,6 +4534,13 @@ snapshots:
     dependencies:
       '@types/unist': 3.0.3
 
+  '@types/jsdom@28.0.1':
+    dependencies:
+      '@types/node': 25.5.2
+      '@types/tough-cookie': 4.0.5
+      parse5: 7.3.0
+      undici-types: 7.24.7
+
   '@types/mdast@4.0.4':
     dependencies:
       '@types/unist': 3.0.3
@@ -4352,7 +4551,7 @@ snapshots:
 
   '@types/node-cron@3.0.11': {}
 
-  '@types/node@25.5.0':
+  '@types/node@25.5.2':
     dependencies:
       undici-types: 7.18.2
 
@@ -4366,50 +4565,52 @@ snapshots:
     dependencies:
       csstype: 3.2.3
 
+  '@types/tough-cookie@4.0.5': {}
+
   '@types/unist@2.0.11': {}
 
   '@types/unist@3.0.3': {}
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitest/expect@4.1.2':
+  '@vitest/expect@4.1.4':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.2
-      '@vitest/utils': 4.1.2
+      '@vitest/spy': 4.1.4
+      '@vitest/utils': 4.1.4
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.2(vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))':
+  '@vitest/mocker@4.1.4(vite@7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))':
     dependencies:
-      '@vitest/spy': 4.1.2
+      '@vitest/spy': 4.1.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)
+      vite: 7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)
 
-  '@vitest/pretty-format@4.1.2':
+  '@vitest/pretty-format@4.1.4':
     dependencies:
       tinyrainbow: 3.1.0
 
-  '@vitest/runner@4.1.2':
+  '@vitest/runner@4.1.4':
     dependencies:
-      '@vitest/utils': 4.1.2
+      '@vitest/utils': 4.1.4
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.2':
+  '@vitest/snapshot@4.1.4':
     dependencies:
-      '@vitest/pretty-format': 4.1.2
-      '@vitest/utils': 4.1.2
+      '@vitest/pretty-format': 4.1.4
+      '@vitest/utils': 4.1.4
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.1.2': {}
+  '@vitest/spy@4.1.4': {}
 
-  '@vitest/utils@4.1.2':
+  '@vitest/utils@4.1.4':
     dependencies:
-      '@vitest/pretty-format': 4.1.2
+      '@vitest/pretty-format': 4.1.4
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
@@ -4420,7 +4621,7 @@ snapshots:
 
   add-stream@1.0.0: {}
 
-  agent-base@8.0.0: {}
+  agent-base@9.0.0: {}
 
   ajv@8.18.0:
     dependencies:
@@ -4468,13 +4669,15 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  baseline-browser-mapping@2.10.11: {}
+  baseline-browser-mapping@2.10.17: {}
 
   bidi-js@1.0.3:
     dependencies:
       require-from-string: 2.0.2
 
-  brace-expansion@1.1.12:
+  boolbase@1.0.0: {}
+
+  brace-expansion@1.1.13:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
@@ -4495,7 +4698,7 @@ snapshots:
 
   camelcase@5.3.1: {}
 
-  caniuse-lite@1.0.30001781: {}
+  caniuse-lite@1.0.30001787: {}
 
   ccount@2.0.1: {}
 
@@ -4563,7 +4766,7 @@ snapshots:
       detect-indent: 6.1.0
       detect-newline: 3.1.0
       dotgitignore: 2.1.0
-      fast-xml-parser: 5.5.9
+      fast-xml-parser: 5.5.11
       figures: 3.2.0
       find-up: 5.0.0
       git-semver-tags: 5.0.1
@@ -4589,21 +4792,38 @@ snapshots:
     dependencies:
       compare-func: 2.0.0
 
-  conventional-changelog-angular@8.3.0:
+  conventional-changelog-angular@8.3.1:
     dependencies:
       compare-func: 2.0.0
 
   conventional-changelog-atom@3.0.0: {}
 
+  conventional-changelog-atom@5.1.0: {}
+
+  conventional-changelog-cli@5.0.0(conventional-commits-filter@5.0.0):
+    dependencies:
+      add-stream: 1.0.0
+      conventional-changelog: 6.0.0(conventional-commits-filter@5.0.0)
+      meow: 13.2.0
+      tempfile: 5.0.0
+    transitivePeerDependencies:
+      - conventional-commits-filter
+
   conventional-changelog-codemirror@3.0.0: {}
 
+  conventional-changelog-codemirror@5.1.0: {}
+
   conventional-changelog-config-spec@2.1.0: {}
 
   conventional-changelog-conventionalcommits@6.1.0:
     dependencies:
       compare-func: 2.0.0
 
-  conventional-changelog-conventionalcommits@9.3.0:
+  conventional-changelog-conventionalcommits@8.0.0:
+    dependencies:
+      compare-func: 2.0.0
+
+  conventional-changelog-conventionalcommits@9.3.1:
     dependencies:
       compare-func: 2.0.0
 
@@ -4621,20 +4841,49 @@ snapshots:
       read-pkg: 3.0.0
       read-pkg-up: 3.0.0
 
+  conventional-changelog-core@8.0.0(conventional-commits-filter@5.0.0):
+    dependencies:
+      '@hutson/parse-repository-url': 5.0.0
+      add-stream: 1.0.0
+      conventional-changelog-writer: 8.4.0
+      conventional-commits-parser: 6.4.0
+      git-raw-commits: 5.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
+      git-semver-tags: 8.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
+      hosted-git-info: 7.0.2
+      normalize-package-data: 6.0.2
+      read-package-up: 11.0.0
+      read-pkg: 9.0.1
+    transitivePeerDependencies:
+      - conventional-commits-filter
+
   conventional-changelog-ember@3.0.0: {}
 
+  conventional-changelog-ember@5.1.0: {}
+
   conventional-changelog-eslint@4.0.0: {}
 
+  conventional-changelog-eslint@6.1.0: {}
+
   conventional-changelog-express@3.0.0: {}
 
+  conventional-changelog-express@5.1.0: {}
+
   conventional-changelog-jquery@4.0.0: {}
 
+  conventional-changelog-jquery@6.1.0: {}
+
   conventional-changelog-jshint@3.0.0:
     dependencies:
       compare-func: 2.0.0
 
+  conventional-changelog-jshint@5.2.0:
+    dependencies:
+      compare-func: 2.0.0
+
   conventional-changelog-preset-loader@3.0.0: {}
 
+  conventional-changelog-preset-loader@5.0.0: {}
+
   conventional-changelog-writer@6.0.1:
     dependencies:
       conventional-commits-filter: 3.0.0
@@ -4645,6 +4894,14 @@ snapshots:
       semver: 7.7.4
       split: 1.0.1
 
+  conventional-changelog-writer@8.4.0:
+    dependencies:
+      '@simple-libs/stream-utils': 1.2.0
+      conventional-commits-filter: 5.0.0
+      handlebars: 4.7.9
+      meow: 13.2.0
+      semver: 7.7.4
+
   conventional-changelog@4.0.0:
     dependencies:
       conventional-changelog-angular: 6.0.0
@@ -4659,11 +4916,29 @@ snapshots:
       conventional-changelog-jshint: 3.0.0
       conventional-changelog-preset-loader: 3.0.0
 
+  conventional-changelog@6.0.0(conventional-commits-filter@5.0.0):
+    dependencies:
+      conventional-changelog-angular: 8.3.1
+      conventional-changelog-atom: 5.1.0
+      conventional-changelog-codemirror: 5.1.0
+      conventional-changelog-conventionalcommits: 8.0.0
+      conventional-changelog-core: 8.0.0(conventional-commits-filter@5.0.0)
+      conventional-changelog-ember: 5.1.0
+      conventional-changelog-eslint: 6.1.0
+      conventional-changelog-express: 5.1.0
+      conventional-changelog-jquery: 6.1.0
+      conventional-changelog-jshint: 5.2.0
+      conventional-changelog-preset-loader: 5.0.0
+    transitivePeerDependencies:
+      - conventional-commits-filter
+
   conventional-commits-filter@3.0.0:
     dependencies:
       lodash.ismatch: 4.4.0
       modify-values: 1.0.1
 
+  conventional-commits-filter@5.0.0: {}
+
   conventional-commits-parser@4.0.0:
     dependencies:
       JSONStream: 1.3.5
@@ -4671,7 +4946,7 @@ snapshots:
       meow: 8.1.2
       split2: 3.2.2
 
-  conventional-commits-parser@6.3.0:
+  conventional-commits-parser@6.4.0:
     dependencies:
       '@simple-libs/stream-utils': 1.2.0
       meow: 13.2.0
@@ -4690,9 +4965,9 @@ snapshots:
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig-typescript-loader@6.2.0(@types/node@25.5.0)(cosmiconfig@9.0.1(typescript@6.0.2))(typescript@6.0.2):
+  cosmiconfig-typescript-loader@6.3.0(@types/node@25.5.2)(cosmiconfig@9.0.1(typescript@6.0.2))(typescript@6.0.2):
     dependencies:
-      '@types/node': 25.5.0
+      '@types/node': 25.5.2
       cosmiconfig: 9.0.1(typescript@6.0.2)
       jiti: 2.6.1
       typescript: 6.0.2
@@ -4717,11 +4992,21 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  css-select@5.2.2:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.2.2
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      nth-check: 2.1.1
+
   css-tree@3.2.1:
     dependencies:
       mdn-data: 2.27.1
       source-map-js: 1.2.1
 
+  css-what@6.2.2: {}
+
   css.escape@1.5.1: {}
 
   cssesc@3.0.0: {}
@@ -4774,11 +5059,29 @@ snapshots:
 
   dom-accessibility-api@0.6.3: {}
 
+  dom-serializer@2.0.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      entities: 4.5.0
+
+  domelementtype@2.3.0: {}
+
+  domhandler@5.0.3:
+    dependencies:
+      domelementtype: 2.3.0
+
+  domutils@3.2.2:
+    dependencies:
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+
   dot-prop@5.3.0:
     dependencies:
       is-obj: 2.0.0
 
-  dotenv@17.3.1: {}
+  dotenv@17.4.1: {}
 
   dotgitignore@2.1.0:
     dependencies:
@@ -4789,12 +5092,12 @@ snapshots:
     dependencies:
       '@drizzle-team/brocli': 0.10.2
       '@esbuild-kit/esm-loader': 2.6.5
-      esbuild: 0.27.4
+      esbuild: 0.28.0
       tsx: 4.21.0
 
-  drizzle-orm@0.45.1(postgres@3.4.8):
+  drizzle-orm@0.45.2(postgres@3.4.9):
     optionalDependencies:
-      postgres: 3.4.8
+      postgres: 3.4.9
 
   echarts-for-react@3.0.6(echarts@6.0.0)(react@19.2.4):
     dependencies:
@@ -4830,6 +5133,8 @@ snapshots:
       graceful-fs: 4.2.11
       tapable: 2.3.2
 
+  entities@4.5.0: {}
+
   entities@6.0.1: {}
 
   env-paths@2.2.1: {}
@@ -4840,34 +5145,34 @@ snapshots:
 
   es-module-lexer@2.0.0: {}
 
-  esbuild@0.27.4:
+  esbuild@0.28.0:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.4
-      '@esbuild/android-arm': 0.27.4
-      '@esbuild/android-arm64': 0.27.4
-      '@esbuild/android-x64': 0.27.4
-      '@esbuild/darwin-arm64': 0.27.4
-      '@esbuild/darwin-x64': 0.27.4
-      '@esbuild/freebsd-arm64': 0.27.4
-      '@esbuild/freebsd-x64': 0.27.4
-      '@esbuild/linux-arm': 0.27.4
-      '@esbuild/linux-arm64': 0.27.4
-      '@esbuild/linux-ia32': 0.27.4
-      '@esbuild/linux-loong64': 0.27.4
-      '@esbuild/linux-mips64el': 0.27.4
-      '@esbuild/linux-ppc64': 0.27.4
-      '@esbuild/linux-riscv64': 0.27.4
-      '@esbuild/linux-s390x': 0.27.4
-      '@esbuild/linux-x64': 0.27.4
-      '@esbuild/netbsd-arm64': 0.27.4
-      '@esbuild/netbsd-x64': 0.27.4
-      '@esbuild/openbsd-arm64': 0.27.4
-      '@esbuild/openbsd-x64': 0.27.4
-      '@esbuild/openharmony-arm64': 0.27.4
-      '@esbuild/sunos-x64': 0.27.4
-      '@esbuild/win32-arm64': 0.27.4
-      '@esbuild/win32-ia32': 0.27.4
-      '@esbuild/win32-x64': 0.27.4
+      '@esbuild/aix-ppc64': 0.28.0
+      '@esbuild/android-arm': 0.28.0
+      '@esbuild/android-arm64': 0.28.0
+      '@esbuild/android-x64': 0.28.0
+      '@esbuild/darwin-arm64': 0.28.0
+      '@esbuild/darwin-x64': 0.28.0
+      '@esbuild/freebsd-arm64': 0.28.0
+      '@esbuild/freebsd-x64': 0.28.0
+      '@esbuild/linux-arm': 0.28.0
+      '@esbuild/linux-arm64': 0.28.0
+      '@esbuild/linux-ia32': 0.28.0
+      '@esbuild/linux-loong64': 0.28.0
+      '@esbuild/linux-mips64el': 0.28.0
+      '@esbuild/linux-ppc64': 0.28.0
+      '@esbuild/linux-riscv64': 0.28.0
+      '@esbuild/linux-s390x': 0.28.0
+      '@esbuild/linux-x64': 0.28.0
+      '@esbuild/netbsd-arm64': 0.28.0
+      '@esbuild/netbsd-x64': 0.28.0
+      '@esbuild/openbsd-arm64': 0.28.0
+      '@esbuild/openbsd-x64': 0.28.0
+      '@esbuild/openharmony-arm64': 0.28.0
+      '@esbuild/sunos-x64': 0.28.0
+      '@esbuild/win32-arm64': 0.28.0
+      '@esbuild/win32-ia32': 0.28.0
+      '@esbuild/win32-x64': 0.28.0
 
   escalade@3.2.0: {}
 
@@ -4903,13 +5208,13 @@ snapshots:
 
   fast-xml-builder@1.1.4:
     dependencies:
-      path-expression-matcher: 1.2.0
+      path-expression-matcher: 1.4.0
 
-  fast-xml-parser@5.5.9:
+  fast-xml-parser@5.5.11:
     dependencies:
       fast-xml-builder: 1.1.4
-      path-expression-matcher: 1.2.0
-      strnum: 2.2.2
+      path-expression-matcher: 1.4.0
+      strnum: 2.2.3
 
   fastq@1.20.1:
     dependencies:
@@ -4931,6 +5236,8 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
+  find-up-simple@1.0.1: {}
+
   find-up@2.1.0:
     dependencies:
       locate-path: 2.0.0
@@ -4979,9 +5286,9 @@ snapshots:
       meow: 8.1.2
       split2: 3.2.2
 
-  git-raw-commits@5.0.1(conventional-commits-parser@6.3.0):
+  git-raw-commits@5.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0):
     dependencies:
-      '@conventional-changelog/git-client': 2.6.0(conventional-commits-parser@6.3.0)
+      '@conventional-changelog/git-client': 2.7.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
       meow: 13.2.0
     transitivePeerDependencies:
       - conventional-commits-filter
@@ -4997,6 +5304,14 @@ snapshots:
       meow: 8.1.2
       semver: 7.7.4
 
+  git-semver-tags@8.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0):
+    dependencies:
+      '@conventional-changelog/git-client': 2.7.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.4.0)
+      meow: 13.2.0
+    transitivePeerDependencies:
+      - conventional-commits-filter
+      - conventional-commits-parser
+
   gitconfiglocal@1.0.0:
     dependencies:
       ini: 1.3.8
@@ -5052,6 +5367,8 @@ snapshots:
     dependencies:
       '@types/hast': 3.0.4
 
+  he@1.2.0: {}
+
   help-me@5.0.0: {}
 
   hosted-git-info@2.8.9: {}
@@ -5060,6 +5377,10 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
+  hosted-git-info@7.0.2:
+    dependencies:
+      lru-cache: 10.4.3
+
   html-encoding-sniffer@6.0.0(@noble/hashes@2.0.1):
     dependencies:
       '@exodus/bytes': 1.15.0(@noble/hashes@2.0.1)
@@ -5068,9 +5389,9 @@ snapshots:
 
   html-url-attributes@3.0.1: {}
 
-  https-proxy-agent@8.0.0:
+  https-proxy-agent@9.0.0:
     dependencies:
-      agent-base: 8.0.0
+      agent-base: 9.0.0
       debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
@@ -5086,6 +5407,8 @@ snapshots:
 
   indent-string@4.0.0: {}
 
+  index-to-position@1.2.0: {}
+
   inherits@2.0.4: {}
 
   ini@1.3.8: {}
@@ -5151,10 +5474,10 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
-  jsdom@29.0.1(@noble/hashes@2.0.1):
+  jsdom@29.0.2(@noble/hashes@2.0.1):
     dependencies:
-      '@asamuzakjp/css-color': 5.0.1
-      '@asamuzakjp/dom-selector': 7.0.4
+      '@asamuzakjp/css-color': 5.1.9
+      '@asamuzakjp/dom-selector': 7.0.9
       '@bramus/specificity': 2.4.2
       '@csstools/css-syntax-patches-for-csstree': 1.1.2(css-tree@3.2.1)
       '@exodus/bytes': 1.15.0(@noble/hashes@2.0.1)
@@ -5163,12 +5486,12 @@ snapshots:
       decimal.js: 10.6.0
       html-encoding-sniffer: 6.0.0(@noble/hashes@2.0.1)
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.2.7
+      lru-cache: 11.3.3
       parse5: 8.0.0
       saxes: 6.0.0
       symbol-tree: 3.2.4
       tough-cookie: 6.0.1
-      undici: 7.24.6
+      undici: 7.24.7
       w3c-xmlserializer: 5.0.0
       webidl-conversions: 8.0.1
       whatwg-mimetype: 5.0.0
@@ -5189,7 +5512,7 @@ snapshots:
 
   kind-of@6.0.3: {}
 
-  knip@6.0.6:
+  knip@6.3.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2):
     dependencies:
       '@nodelib/fs.walk': 1.2.8
       fast-glob: 3.3.3
@@ -5197,8 +5520,8 @@ snapshots:
       get-tsconfig: 4.13.7
       jiti: 2.6.1
       minimist: 1.2.8
-      oxc-parser: 0.120.0
-      oxc-resolver: 11.19.1
+      oxc-parser: 0.121.0(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
+      oxc-resolver: 11.19.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
       picocolors: 1.1.1
       picomatch: 4.0.4
       smol-toml: 1.6.1
@@ -5206,6 +5529,9 @@ snapshots:
       unbash: 2.2.0
       yaml: 2.8.3
       zod: 4.3.6
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
 
   lightningcss-android-arm64@1.32.0:
     optional: true
@@ -5299,7 +5625,9 @@ snapshots:
 
   longest-streak@3.1.0: {}
 
-  lru-cache@11.2.7: {}
+  lru-cache@10.4.3: {}
+
+  lru-cache@11.3.3: {}
 
   lru-cache@6.0.0:
     dependencies:
@@ -5690,7 +6018,7 @@ snapshots:
 
   minimatch@3.1.5:
     dependencies:
-      brace-expansion: 1.1.12
+      brace-expansion: 1.1.13
 
   minimist-options@4.1.0:
     dependencies:
@@ -5708,25 +6036,25 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  next@16.2.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+  next@16.2.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      '@next/env': 16.2.1
+      '@next/env': 16.2.2
       '@swc/helpers': 0.5.15
-      baseline-browser-mapping: 2.10.11
-      caniuse-lite: 1.0.30001781
+      baseline-browser-mapping: 2.10.17
+      caniuse-lite: 1.0.30001787
       postcss: 8.4.31
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
       styled-jsx: 5.1.6(react@19.2.4)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 16.2.1
-      '@next/swc-darwin-x64': 16.2.1
-      '@next/swc-linux-arm64-gnu': 16.2.1
-      '@next/swc-linux-arm64-musl': 16.2.1
-      '@next/swc-linux-x64-gnu': 16.2.1
-      '@next/swc-linux-x64-musl': 16.2.1
-      '@next/swc-win32-arm64-msvc': 16.2.1
-      '@next/swc-win32-x64-msvc': 16.2.1
+      '@next/swc-darwin-arm64': 16.2.2
+      '@next/swc-darwin-x64': 16.2.2
+      '@next/swc-linux-arm64-gnu': 16.2.2
+      '@next/swc-linux-arm64-musl': 16.2.2
+      '@next/swc-linux-x64-gnu': 16.2.2
+      '@next/swc-linux-x64-musl': 16.2.2
+      '@next/swc-win32-arm64-msvc': 16.2.2
+      '@next/swc-win32-x64-msvc': 16.2.2
       sharp: 0.34.5
     transitivePeerDependencies:
       - '@babel/core'
@@ -5738,6 +6066,11 @@ snapshots:
 
   node-gyp-build@4.8.4: {}
 
+  node-html-parser@7.1.0:
+    dependencies:
+      css-select: 5.2.2
+      he: 1.2.0
+
   normalize-package-data@2.5.0:
     dependencies:
       hosted-git-info: 2.8.9
@@ -5752,6 +6085,16 @@ snapshots:
       semver: 7.7.4
       validate-npm-package-license: 3.0.4
 
+  normalize-package-data@6.0.2:
+    dependencies:
+      hosted-git-info: 7.0.2
+      semver: 7.7.4
+      validate-npm-package-license: 3.0.4
+
+  nth-check@2.1.1:
+    dependencies:
+      boolbase: 1.0.0
+
   obug@2.1.1: {}
 
   on-exit-leak-free@2.1.2: {}
@@ -5764,32 +6107,35 @@ snapshots:
     dependencies:
       '@noble/hashes': 2.0.1
 
-  oxc-parser@0.120.0:
+  oxc-parser@0.121.0(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2):
     dependencies:
-      '@oxc-project/types': 0.120.0
+      '@oxc-project/types': 0.121.0
     optionalDependencies:
-      '@oxc-parser/binding-android-arm-eabi': 0.120.0
-      '@oxc-parser/binding-android-arm64': 0.120.0
-      '@oxc-parser/binding-darwin-arm64': 0.120.0
-      '@oxc-parser/binding-darwin-x64': 0.120.0
-      '@oxc-parser/binding-freebsd-x64': 0.120.0
-      '@oxc-parser/binding-linux-arm-gnueabihf': 0.120.0
-      '@oxc-parser/binding-linux-arm-musleabihf': 0.120.0
-      '@oxc-parser/binding-linux-arm64-gnu': 0.120.0
-      '@oxc-parser/binding-linux-arm64-musl': 0.120.0
-      '@oxc-parser/binding-linux-ppc64-gnu': 0.120.0
-      '@oxc-parser/binding-linux-riscv64-gnu': 0.120.0
-      '@oxc-parser/binding-linux-riscv64-musl': 0.120.0
-      '@oxc-parser/binding-linux-s390x-gnu': 0.120.0
-      '@oxc-parser/binding-linux-x64-gnu': 0.120.0
-      '@oxc-parser/binding-linux-x64-musl': 0.120.0
-      '@oxc-parser/binding-openharmony-arm64': 0.120.0
-      '@oxc-parser/binding-wasm32-wasi': 0.120.0
-      '@oxc-parser/binding-win32-arm64-msvc': 0.120.0
-      '@oxc-parser/binding-win32-ia32-msvc': 0.120.0
-      '@oxc-parser/binding-win32-x64-msvc': 0.120.0
+      '@oxc-parser/binding-android-arm-eabi': 0.121.0
+      '@oxc-parser/binding-android-arm64': 0.121.0
+      '@oxc-parser/binding-darwin-arm64': 0.121.0
+      '@oxc-parser/binding-darwin-x64': 0.121.0
+      '@oxc-parser/binding-freebsd-x64': 0.121.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.121.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.121.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.121.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.121.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.121.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.121.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.121.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.121.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.121.0
+      '@oxc-parser/binding-linux-x64-musl': 0.121.0
+      '@oxc-parser/binding-openharmony-arm64': 0.121.0
+      '@oxc-parser/binding-wasm32-wasi': 0.121.0(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
+      '@oxc-parser/binding-win32-arm64-msvc': 0.121.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.121.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.121.0
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
 
-  oxc-resolver@11.19.1:
+  oxc-resolver@11.19.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2):
     optionalDependencies:
       '@oxc-resolver/binding-android-arm-eabi': 11.19.1
       '@oxc-resolver/binding-android-arm64': 11.19.1
@@ -5807,10 +6153,13 @@ snapshots:
       '@oxc-resolver/binding-linux-x64-gnu': 11.19.1
       '@oxc-resolver/binding-linux-x64-musl': 11.19.1
       '@oxc-resolver/binding-openharmony-arm64': 11.19.1
-      '@oxc-resolver/binding-wasm32-wasi': 11.19.1
+      '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.9.1)(@emnapi/runtime@1.9.2)
       '@oxc-resolver/binding-win32-arm64-msvc': 11.19.1
       '@oxc-resolver/binding-win32-ia32-msvc': 11.19.1
       '@oxc-resolver/binding-win32-x64-msvc': 11.19.1
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
 
   p-limit@1.3.0:
     dependencies:
@@ -5870,6 +6219,16 @@ snapshots:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
+  parse-json@8.3.0:
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      index-to-position: 1.2.0
+      type-fest: 4.41.0
+
+  parse5@7.3.0:
+    dependencies:
+      entities: 6.0.1
+
   parse5@8.0.0:
     dependencies:
       entities: 6.0.1
@@ -5878,7 +6237,7 @@ snapshots:
 
   path-exists@4.0.0: {}
 
-  path-expression-matcher@1.2.0: {}
+  path-expression-matcher@1.4.0: {}
 
   path-key@3.1.1: {}
 
@@ -5947,13 +6306,13 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.5.8:
+  postcss@8.5.9:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postgres@3.4.8: {}
+  postgres@3.4.9: {}
 
   prettier@3.8.1: {}
 
@@ -6018,6 +6377,12 @@ snapshots:
 
   react@19.2.4: {}
 
+  read-package-up@11.0.0:
+    dependencies:
+      find-up-simple: 1.0.1
+      read-pkg: 9.0.1
+      type-fest: 4.41.0
+
   read-pkg-up@3.0.0:
     dependencies:
       find-up: 2.1.0
@@ -6042,6 +6407,14 @@ snapshots:
       parse-json: 5.2.0
       type-fest: 0.6.0
 
+  read-pkg@9.0.1:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 6.0.2
+      parse-json: 8.3.0
+      type-fest: 4.41.0
+      unicorn-magic: 0.1.0
+
   readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
@@ -6117,35 +6490,35 @@ snapshots:
 
   reusify@1.1.0: {}
 
-  rollup@4.60.0:
+  rollup@4.60.1:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.60.0
-      '@rollup/rollup-android-arm64': 4.60.0
-      '@rollup/rollup-darwin-arm64': 4.60.0
-      '@rollup/rollup-darwin-x64': 4.60.0
-      '@rollup/rollup-freebsd-arm64': 4.60.0
-      '@rollup/rollup-freebsd-x64': 4.60.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.60.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.60.0
-      '@rollup/rollup-linux-arm64-gnu': 4.60.0
-      '@rollup/rollup-linux-arm64-musl': 4.60.0
-      '@rollup/rollup-linux-loong64-gnu': 4.60.0
-      '@rollup/rollup-linux-loong64-musl': 4.60.0
-      '@rollup/rollup-linux-ppc64-gnu': 4.60.0
-      '@rollup/rollup-linux-ppc64-musl': 4.60.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.60.0
-      '@rollup/rollup-linux-riscv64-musl': 4.60.0
-      '@rollup/rollup-linux-s390x-gnu': 4.60.0
-      '@rollup/rollup-linux-x64-gnu': 4.60.0
-      '@rollup/rollup-linux-x64-musl': 4.60.0
-      '@rollup/rollup-openbsd-x64': 4.60.0
-      '@rollup/rollup-openharmony-arm64': 4.60.0
-      '@rollup/rollup-win32-arm64-msvc': 4.60.0
-      '@rollup/rollup-win32-ia32-msvc': 4.60.0
-      '@rollup/rollup-win32-x64-gnu': 4.60.0
-      '@rollup/rollup-win32-x64-msvc': 4.60.0
+      '@rollup/rollup-android-arm-eabi': 4.60.1
+      '@rollup/rollup-android-arm64': 4.60.1
+      '@rollup/rollup-darwin-arm64': 4.60.1
+      '@rollup/rollup-darwin-x64': 4.60.1
+      '@rollup/rollup-freebsd-arm64': 4.60.1
+      '@rollup/rollup-freebsd-x64': 4.60.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.60.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.60.1
+      '@rollup/rollup-linux-arm64-gnu': 4.60.1
+      '@rollup/rollup-linux-arm64-musl': 4.60.1
+      '@rollup/rollup-linux-loong64-gnu': 4.60.1
+      '@rollup/rollup-linux-loong64-musl': 4.60.1
+      '@rollup/rollup-linux-ppc64-gnu': 4.60.1
+      '@rollup/rollup-linux-ppc64-musl': 4.60.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.60.1
+      '@rollup/rollup-linux-riscv64-musl': 4.60.1
+      '@rollup/rollup-linux-s390x-gnu': 4.60.1
+      '@rollup/rollup-linux-x64-gnu': 4.60.1
+      '@rollup/rollup-linux-x64-musl': 4.60.1
+      '@rollup/rollup-openbsd-x64': 4.60.1
+      '@rollup/rollup-openharmony-arm64': 4.60.1
+      '@rollup/rollup-win32-arm64-msvc': 4.60.1
+      '@rollup/rollup-win32-ia32-msvc': 4.60.1
+      '@rollup/rollup-win32-x64-gnu': 4.60.1
+      '@rollup/rollup-win32-x64-msvc': 4.60.1
       fsevents: 2.3.3
 
   run-parallel@1.2.0:
@@ -6216,9 +6589,9 @@ snapshots:
 
   smol-toml@1.6.1: {}
 
-  socks-proxy-agent@9.0.0:
+  socks-proxy-agent@10.0.0:
     dependencies:
-      agent-base: 8.0.0
+      agent-base: 9.0.0
       debug: 4.4.3
       socks: 2.8.7
     transitivePeerDependencies:
@@ -6303,7 +6676,7 @@ snapshots:
 
   strip-json-comments@5.0.3: {}
 
-  strnum@2.2.2: {}
+  strnum@2.2.3: {}
 
   style-to-js@1.1.21:
     dependencies:
@@ -6330,6 +6703,12 @@ snapshots:
 
   tapable@2.3.2: {}
 
+  temp-dir@3.0.0: {}
+
+  tempfile@5.0.0:
+    dependencies:
+      temp-dir: 3.0.0
+
   text-extensions@1.9.0: {}
 
   thread-stream@4.0.0:
@@ -6345,20 +6724,20 @@ snapshots:
 
   tinybench@2.9.0: {}
 
-  tinyexec@1.0.4: {}
+  tinyexec@1.1.1: {}
 
-  tinyglobby@0.2.15:
+  tinyglobby@0.2.16:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
 
   tinyrainbow@3.1.0: {}
 
-  tldts-core@7.0.27: {}
+  tldts-core@7.0.28: {}
 
-  tldts@7.0.27:
+  tldts@7.0.28:
     dependencies:
-      tldts-core: 7.0.27
+      tldts-core: 7.0.28
 
   to-regex-range@5.0.1:
     dependencies:
@@ -6366,7 +6745,7 @@ snapshots:
 
   tough-cookie@6.0.1:
     dependencies:
-      tldts: 7.0.27
+      tldts: 7.0.28
 
   tr46@6.0.0:
     dependencies:
@@ -6384,7 +6763,7 @@ snapshots:
 
   tsx@4.21.0:
     dependencies:
-      esbuild: 0.27.4
+      esbuild: 0.28.0
       get-tsconfig: 4.13.7
     optionalDependencies:
       fsevents: 2.3.3
@@ -6395,6 +6774,8 @@ snapshots:
 
   type-fest@0.8.1: {}
 
+  type-fest@4.41.0: {}
+
   typedarray@0.0.6: {}
 
   typescript@6.0.2: {}
@@ -6406,7 +6787,11 @@ snapshots:
 
   undici-types@7.18.2: {}
 
-  undici@7.24.6: {}
+  undici-types@7.24.7: {}
+
+  undici@7.24.7: {}
+
+  unicorn-magic@0.1.0: {}
 
   unified@11.0.5:
     dependencies:
@@ -6458,31 +6843,31 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3):
+  vite@7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3):
     dependencies:
-      esbuild: 0.27.4
+      esbuild: 0.28.0
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
-      postcss: 8.5.8
-      rollup: 4.60.0
-      tinyglobby: 0.2.15
+      postcss: 8.5.9
+      rollup: 4.60.1
+      tinyglobby: 0.2.16
     optionalDependencies:
-      '@types/node': 25.5.0
+      '@types/node': 25.5.2
       fsevents: 2.3.3
       jiti: 2.6.1
       lightningcss: 1.32.0
       tsx: 4.21.0
       yaml: 2.8.3
 
-  vitest@4.1.2(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.0.1))(vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)):
+  vitest@4.1.4(@types/node@25.5.2)(jsdom@29.0.2(@noble/hashes@2.0.1))(vite@7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)):
     dependencies:
-      '@vitest/expect': 4.1.2
-      '@vitest/mocker': 4.1.2(vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))
-      '@vitest/pretty-format': 4.1.2
-      '@vitest/runner': 4.1.2
-      '@vitest/snapshot': 4.1.2
-      '@vitest/spy': 4.1.2
-      '@vitest/utils': 4.1.2
+      '@vitest/expect': 4.1.4
+      '@vitest/mocker': 4.1.4(vite@7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3))
+      '@vitest/pretty-format': 4.1.4
+      '@vitest/runner': 4.1.4
+      '@vitest/snapshot': 4.1.4
+      '@vitest/spy': 4.1.4
+      '@vitest/utils': 4.1.4
       es-module-lexer: 2.0.0
       expect-type: 1.3.0
       magic-string: 0.30.21
@@ -6491,14 +6876,14 @@ snapshots:
       picomatch: 4.0.4
       std-env: 4.0.0
       tinybench: 2.9.0
-      tinyexec: 1.0.4
-      tinyglobby: 0.2.15
+      tinyexec: 1.1.1
+      tinyglobby: 0.2.16
       tinyrainbow: 3.1.0
-      vite: 7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)
+      vite: 7.3.2(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.32.0)(tsx@4.21.0)(yaml@2.8.3)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 25.5.0
-      jsdom: 29.0.1(@noble/hashes@2.0.1)
+      '@types/node': 25.5.2
+      jsdom: 29.0.2(@noble/hashes@2.0.1)
     transitivePeerDependencies:
       - msw
 
diff --git a/public/tracker-logos/animez_logo.svg b/public/tracker-logos/animez_logo.svg
new file mode 100644
index 00000000..2b55701f
--- /dev/null
+++ b/public/tracker-logos/animez_logo.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 394 394" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="Artboard1" x="0" y="0" width="393.75" height="393.75" style="fill:none;"/><circle cx="196.875" cy="198.438" r="184.375" style="fill:url(#_Linear1);"/><path d="M196.875,4.368c-107.11,0 -194.07,86.96 -194.07,194.07c0,107.109 86.96,194.069 194.07,194.069c107.11,0 194.07,-86.96 194.07,-194.069c0,-107.11 -86.96,-194.07 -194.07,-194.07Zm0,9.695c101.759,0 184.375,82.615 184.375,184.375c0,101.759 -82.616,184.375 -184.375,184.375c-101.759,0 -184.375,-82.616 -184.375,-184.375c0,-101.76 82.616,-184.375 184.375,-184.375Z"/><clipPath id="_clip2"><circle cx="196.875" cy="198.437" r="184.375"/></clipPath><g clip-path="url(#_clip2)"><path d="M164.921,2.545c-0.235,-1.54 -0.354,-3.095 -0.354,-4.652c0,-16.986 13.79,-30.776 30.776,-30.776c16.986,0 30.776,13.79 30.776,30.776c0,1.557 -0.118,3.112 -0.354,4.652l-30.422,198.947l65.518,-190.297c0.507,-1.472 1.125,-2.904 1.849,-4.283c7.893,-15.04 26.513,-20.842 41.553,-12.949c15.04,7.894 20.842,26.513 12.948,41.553c-0.724,1.379 -1.551,2.701 -2.475,3.955l-119.393,162.021l146.449,-138.052c1.133,-1.068 2.346,-2.049 3.627,-2.933c13.979,-9.649 33.162,-6.134 42.811,7.845c9.649,13.979 6.134,33.162 -7.845,42.81c-1.282,0.885 -2.629,1.671 -4.03,2.352l-181.012,87.978l193.83,-54.181c1.5,-0.419 3.029,-0.724 4.575,-0.912c16.862,-2.047 32.214,9.98 34.261,26.842c2.048,16.862 -9.98,32.214 -26.842,34.261c-1.546,0.188 -3.104,0.258 -4.66,0.21l-201.164,-6.22l196.807,42.102c1.523,0.326 3.019,0.767 4.475,1.319c15.882,6.024 23.886,23.808 17.863,39.69c-6.024,15.881 -23.808,23.885 -39.69,17.862c-1.456,-0.552 -2.868,-1.214 -4.224,-1.98l-175.231,-98.993l154.698,128.74c1.197,0.997 2.317,2.082 3.349,3.248c11.264,12.714 10.086,32.181 -2.628,43.444c-12.713,11.264 -32.18,10.086 -43.444,-2.628c-1.032,-1.165 -1.975,-2.408 -2.82,-3.716l-109.155,-169.088l77.149,185.886c0.597,1.438 1.084,2.92 1.457,4.432c4.065,16.492 -6.024,33.182 -22.516,37.247c-16.492,4.064 -33.182,-6.025 -37.247,-22.517c-0.373,-1.512 -0.63,-3.05 -0.77,-4.601l-18.073,-200.447l-18.073,200.447c-0.14,1.551 -0.397,3.089 -0.77,4.601c-4.065,16.492 -20.754,26.581 -37.246,22.517c-16.493,-4.065 -26.582,-20.755 -22.517,-37.247c0.373,-1.512 0.86,-2.994 1.457,-4.432l77.149,-185.886l-109.155,169.088c-0.845,1.308 -1.787,2.551 -2.82,3.716c-11.264,12.714 -30.73,13.892 -43.444,2.628c-12.714,-11.263 -13.892,-30.73 -2.628,-43.444c1.033,-1.166 2.152,-2.251 3.349,-3.248l154.698,-128.74l-175.231,98.993c-1.356,0.766 -2.768,1.428 -4.224,1.98c-15.882,6.023 -33.666,-1.981 -39.689,-17.862c-6.024,-15.882 1.98,-33.666 17.862,-39.69c1.456,-0.552 2.952,-0.993 4.475,-1.319l196.807,-42.102l-201.163,6.22c-1.557,0.048 -3.115,-0.022 -4.661,-0.21c-16.862,-2.047 -28.889,-17.399 -26.842,-34.261c2.047,-16.862 17.399,-28.889 34.261,-26.842c1.546,0.188 3.076,0.493 4.575,0.912l193.83,54.181l-181.012,-87.978c-1.401,-0.681 -2.748,-1.467 -4.029,-2.352c-13.979,-9.648 -17.495,-28.831 -7.846,-42.81c9.649,-13.979 28.832,-17.494 42.811,-7.845c1.282,0.884 2.494,1.865 3.628,2.933l146.448,138.052l-119.393,-162.021c-0.924,-1.254 -1.751,-2.576 -2.475,-3.955c-7.893,-15.04 -2.091,-33.659 12.949,-41.553c15.04,-7.893 33.659,-2.091 41.552,12.949c0.724,1.379 1.342,2.811 1.849,4.283l65.518,190.297l-30.422,-198.947Z" style="fill:#ebebeb;fill-opacity:0.11;"/></g><g id="ninja2"><path d="M169.393,284.907c-0.174,-0.579 -0.463,-2.258 -0.695,-3.764c-0.405,-3.068 0.174,-4.458 3.879,-9.784l2.316,-3.242l-1.795,-3.59c-1.621,-3.126 -2.2,-3.705 -4.863,-4.921c-1.621,-0.695 -3.821,-2.027 -4.805,-2.837c-3.648,-3.069 -7.18,-3.474 -11.927,-1.39c-1.679,0.753 -3.416,1.853 -3.879,2.374c-1.216,1.505 -3.822,2.663 -5.848,2.663c-1.505,0 -2.026,-0.463 -3.532,-2.895c-1.447,-2.373 -2.142,-2.952 -4.168,-3.473c-5.443,-1.332 -6.658,-1.795 -8.164,-2.953c-1.563,-1.216 -3.647,-4.806 -4.4,-7.411c-0.289,-1.216 -0.926,-1.505 -4.111,-2.142c-3.531,-0.753 -10.421,-3.821 -13.084,-5.906c-2.027,-1.505 -3.3,-8.163 -3.3,-17.195c0,-7.006 0.115,-7.932 1.91,-13.027c1.042,-3.011 2.663,-6.832 3.59,-8.511c2.374,-4.168 3.763,-4.458 16.443,-4.053c12.505,0.464 19.221,1.274 24.258,3.011l3.995,1.39l-0.347,-2.548c-0.347,-2.374 -0.232,-2.663 1.505,-3.995c1.042,-0.81 2.837,-1.853 3.995,-2.374c2.721,-1.1 2.837,-1.331 1.911,-3.937c-1.39,-3.995 -3.242,-6.137 -6.137,-7.005c-6.369,-1.911 -12.159,-6.369 -13.085,-10.132c-0.232,-0.869 0.81,-4.921 3.068,-11.58l3.358,-10.189l0.406,-9.553c0.289,-7.238 0.695,-10.364 1.563,-13.027c2.374,-7.122 3.3,-8.569 7.295,-11.753c2.084,-1.737 3.821,-3.358 3.821,-3.648c0,-0.289 -0.752,-1.795 -1.621,-3.3c-0.868,-1.505 -2.142,-3.59 -2.721,-4.632c-1.1,-1.795 -1.332,-1.91 -3.474,-1.621c-1.274,0.174 -6.542,0.868 -11.637,1.505c-5.153,0.637 -11.116,1.679 -13.317,2.374c-6.773,2.027 -18.99,9.032 -28.427,16.327c-2.084,1.563 -3.821,2.721 -3.995,2.605c-0.347,-0.405 8.916,-9.321 13.374,-12.853c2.258,-1.794 5.79,-4.168 7.99,-5.326c4.111,-2.142 11.464,-4.864 13.259,-4.864c0.579,0 1.042,-0.289 1.042,-0.636c0,-0.637 -4.053,-0.464 -8.106,0.405c-1.042,0.231 -1.216,0.174 -0.579,-0.232c1.679,-1.1 7.237,-1.737 12.159,-1.447c4.921,0.347 13.779,-0.521 16.558,-1.621l1.505,-0.521l-2.605,-3.648c-1.389,-1.968 -4.574,-6.6 -7.063,-10.248c-2.49,-3.647 -6.485,-9.437 -8.801,-12.853c-3.474,-5.037 -4.168,-6.484 -3.879,-7.7c0.521,-2.084 3.416,-4.342 5.616,-4.342c1.795,0 2.2,0.579 10.537,13.432c4.806,7.353 8.859,13.663 9.09,13.953c0.406,0.637 9.148,-3.474 9.148,-4.284c0,-0.29 1.505,-1.274 3.358,-2.201c4.632,-2.373 14.59,-10.132 14.59,-11.347c0,-0.464 -2.663,-0.116 -4.284,0.579c-0.753,0.347 -0.985,0.289 -0.753,-0.116c0.521,-0.811 7.179,-3.995 12.274,-5.848c5.616,-2.084 14.243,-2.142 20.554,-0.231c3.879,1.215 4.747,1.794 7.874,4.979c5.616,5.847 10.074,15.979 10.074,22.869c0,1.853 1.91,3.879 6.079,6.253c1.621,0.926 3.474,2.605 4.169,3.705c2.547,3.937 3.184,4.632 5.558,6.137c2.895,1.737 5.789,4.69 6.947,6.948c0.464,0.869 1.564,3.821 2.432,6.542c1.911,5.906 2.605,17.022 1.505,24.954c-0.347,2.663 -0.81,9.032 -1.042,14.185l-0.347,9.263l1.563,2.722c0.869,1.447 1.505,3.126 1.39,3.647c-0.116,0.521 -3.011,2.432 -6.427,4.227c-3.416,1.852 -6.484,3.589 -6.832,3.937c-0.752,0.752 -2.374,7.005 -2.026,7.642c0.173,0.232 1.852,0.926 3.763,1.447l3.474,0.985l9.148,-4.69c11.405,-5.79 16.269,-7.121 24.664,-6.832c5.442,0.174 6.253,0.348 10.248,2.316c2.663,1.274 5.789,3.474 7.932,5.5c3.358,3.185 3.821,3.995 8.221,13.896c2.605,5.847 4.69,11.058 4.69,11.695c0,1.91 -1.158,4.342 -3.011,6.253c-0.984,0.984 -2.953,4.284 -4.458,7.237c-2.432,4.863 -2.953,5.558 -5.732,7.237c-2.837,1.679 -7.7,3.763 -14.706,6.195c-2.084,0.753 -3.01,1.563 -4.111,3.416c-0.81,1.332 -2.547,3.647 -3.879,5.211l-2.431,2.721l-4.69,0c-2.605,0 -6.89,-0.521 -9.437,-1.042l-4.748,-1.042l-10.074,7.237c-5.558,3.995 -10.885,7.874 -11.811,8.568l-1.679,1.274l2.837,8.395c2.49,7.353 2.779,8.743 2.316,10.595l-0.521,2.201l-32.828,0.173c-30.859,0.116 -32.827,0.058 -33.059,-0.868Zm34.738,-11.753c0.348,0 0.811,-0.811 1.042,-1.737c0.232,-0.985 0.869,-2.258 1.448,-2.779c0.81,-0.753 1.216,-2.49 1.679,-7.006c0.347,-3.3 0.637,-6.137 0.637,-6.369c0,-0.694 -14.938,-0.694 -15.401,0c-0.232,0.406 0.116,2.606 0.695,5.037c0.81,3.301 1.447,4.516 2.547,5.269c2.085,1.332 2.721,2.374 3.127,4.921c0.521,3.011 0.81,3.416 2.316,3.011c0.637,-0.174 1.505,-0.347 1.91,-0.347Zm-36.301,-171.086c0.637,-0.753 0.521,-1.332 -0.521,-3.243c-1.332,-2.315 -1.332,-3.068 -0.29,-6.831l0.405,-1.448l-2.258,1.39c-4.052,2.431 -4.052,2.316 -1.679,6.889c2.201,4.169 3.011,4.806 4.343,3.243Z" style="fill-rule:nonzero;"/><path d="M143.982,91.287c-1.6,-2.29 -4.24,-6.134 -6.373,-9.258c-2.491,-3.651 -6.489,-9.445 -8.789,-12.838c-2.346,-3.401 -3.523,-5.374 -4.053,-6.683c-0.738,-1.821 -0.696,-3.067 -0.413,-4.253c0.446,-1.783 1.785,-3.728 3.605,-5.14c1.806,-1.4 4.018,-2.227 5.885,-2.227c1.703,0 2.943,0.084 5.006,2.298c1.365,1.465 3.648,4.886 8.874,12.943c3.095,4.735 5.863,9.032 7.456,11.492c0.475,-0.193 0.965,-0.401 1.382,-0.598c1.023,-0.481 2.391,-1.26 2.953,-1.585c0.597,-0.674 2.388,-2.083 4.641,-3.209c1.818,-0.932 4.907,-3.224 7.612,-5.344c-0.501,-0.968 -0.662,-2.295 0.295,-3.969c0.034,-0.06 0.07,-0.119 0.108,-0.178c0.256,-0.398 0.971,-1.208 2.282,-2c2.268,-1.37 7.655,-3.866 11.962,-5.432c6.312,-2.342 16.007,-2.457 23.137,-0.298c4.687,1.469 5.752,2.144 9.56,6.024c6.207,6.462 11.063,17.638 11.184,25.341c0.135,0.168 0.482,0.589 0.784,0.854c0.803,0.705 1.896,1.434 3.286,2.226c2.182,1.247 4.629,3.559 5.54,5.003c2.023,3.126 2.46,3.739 4.26,4.882c3.541,2.125 7.03,5.788 8.417,8.493c0.511,0.958 1.754,4.205 2.708,7.192c2.047,6.327 2.839,18.234 1.665,26.7c-0.339,2.6 -0.786,8.817 -1.011,13.818l-0.305,8.118l0.954,1.662c0.984,1.639 1.695,3.514 1.881,4.565c0.15,0.844 0.088,1.53 -0.017,2.003c-0.117,0.525 -0.478,1.556 -1.622,2.578c-1.034,0.926 -3.737,2.685 -6.799,4.293c-2.098,1.138 -4.449,2.495 -5.575,3.151l-0.655,2.431l2.281,0.648l7.764,-3.98c12.293,-6.24 17.562,-7.574 26.599,-7.262c6.317,0.201 7.249,0.44 11.844,2.705c3.005,1.437 6.536,3.915 8.956,6.205c3.682,3.491 4.298,4.315 9.122,15.167c2.153,4.833 3.954,9.248 4.592,11.156c0.366,1.097 0.443,1.862 0.443,2.165c0,2.735 -1.485,6.297 -4.137,9.033c-0.014,0.014 -0.029,0.029 -0.043,0.043c-0.84,0.841 -2.439,3.707 -3.71,6.2c-3.016,6.031 -3.793,6.787 -7.27,8.888c-2.979,1.763 -8.074,3.977 -15.384,6.514c-1.033,0.373 -1.487,0.78 -2.055,1.736c-0.89,1.462 -2.789,4.009 -4.251,5.724l-2.494,2.793c-0.757,0.848 -1.84,1.332 -2.977,1.332l-4.69,0c-2.826,0 -7.474,-0.558 -10.237,-1.123l-3.064,-0.672l-8.627,6.197c-4.765,3.425 -9.359,6.764 -11.114,8.056l1.913,5.659c2.999,8.859 2.965,10.612 2.419,12.796l-0.521,2.2c-0.425,1.793 -2.022,3.063 -3.865,3.073c0,0 -32.828,0.174 -32.834,0.174c-25.576,0.096 -31.994,-0.079 -33.662,-0.582c-1.266,-0.381 -1.903,-0.967 -2.333,-1.465c-0.459,-0.533 -0.745,-1.095 -0.915,-1.71c-0.202,-0.699 -0.546,-2.575 -0.818,-4.346c-0.515,-3.903 -0.153,-5.812 4.56,-12.588l0.947,-1.326l-0.693,-1.387c-1.011,-1.951 -1.315,-2.368 -2.891,-3.089c-1.95,-0.835 -4.587,-2.45 -5.803,-3.451c-2.367,-1.991 -4.671,-2.142 -7.723,-0.802c-0.983,0.441 -2.387,1.348 -2.64,1.513c-1.95,2.182 -5.732,3.874 -8.72,3.874c-1.014,0 -1.821,-0.146 -2.556,-0.425c-1.301,-0.492 -2.577,-1.464 -4.385,-4.385c-0.649,-1.064 -0.846,-1.451 -1.708,-1.673c-6.472,-1.584 -7.86,-2.29 -9.666,-3.68c-1.821,-1.416 -4.294,-5.272 -5.464,-8.476c-0.407,-0.101 -0.93,-0.224 -1.428,-0.323c-3.947,-0.842 -11.612,-4.274 -14.652,-6.62c-1.057,-0.792 -2.178,-2.272 -2.974,-4.538c-1.168,-3.323 -1.92,-8.947 -1.92,-15.849c0,-7.722 0.159,-8.738 2.13,-14.333c1.119,-3.233 2.872,-7.331 3.894,-9.181c1.043,-1.833 2.033,-3.094 3.303,-4.029c1.259,-0.928 2.815,-1.588 5.153,-1.911c2.39,-0.33 5.93,-0.309 11.604,-0.127c11.809,0.437 18.685,1.228 23.792,2.712c0.055,-0.239 0.123,-0.46 0.203,-0.67c0.401,-1.061 1.119,-2.044 2.818,-3.346c1.11,-0.864 2.929,-1.95 4.3,-2.623c-0.773,-1.993 -1.651,-3.243 -3.228,-3.716c-4.425,-1.328 -8.598,-3.736 -11.469,-6.376c-2.329,-2.143 -3.823,-4.505 -4.327,-6.552c-0.126,-0.473 -0.238,-1.29 -0.088,-2.443c0.236,-1.815 1.299,-5.744 3.223,-11.415l3.184,-9.664l0.382,-8.989c0.313,-7.841 0.815,-11.22 1.765,-14.13c2.762,-8.288 3.945,-9.907 8.527,-13.558c0.522,-0.435 1.08,-0.93 1.577,-1.381c-0.094,-0.175 -0.189,-0.345 -0.28,-0.504c-0.77,-1.334 -1.854,-3.119 -2.505,-4.25c-1.676,0.226 -6.601,0.873 -11.378,1.471c-4.876,0.602 -10.522,1.561 -12.662,2.236c-6.473,1.936 -18.112,8.69 -27.176,15.696c-2.468,1.851 -4.674,3.104 -5.235,3.259c-1.654,0.454 -2.765,-0.122 -3.371,-0.526c-0.304,-0.203 -0.579,-0.446 -0.817,-0.724c-0.46,-0.537 -1.924,-2.701 -0.029,-5.309c1.365,-1.877 9.704,-9.905 13.95,-13.269c2.434,-1.934 6.244,-4.486 8.63,-5.742c0.914,-0.476 1.972,-0.97 3.097,-1.455c-0.004,-0.899 0.288,-2.469 2.176,-3.67c0.787,-0.516 2.09,-1.049 3.779,-1.415c2.8,-0.607 6.974,-0.904 10.849,-0.676c3.032,0.214 7.742,-0.042 11.188,-0.544Zm21.575,194.725l0.011,0.042l-0.049,-0.179l0.038,0.137Zm3.836,-1.105c-0.174,-0.579 -0.463,-2.258 -0.695,-3.764c-0.405,-3.068 0.174,-4.458 3.879,-9.784l2.316,-3.242l-1.795,-3.59c-1.621,-3.126 -2.2,-3.705 -4.863,-4.921c-1.621,-0.695 -3.821,-2.027 -4.805,-2.837c-3.648,-3.069 -7.18,-3.474 -11.927,-1.39c-1.679,0.753 -3.416,1.853 -3.879,2.374c-1.216,1.505 -3.822,2.663 -5.848,2.663c-1.505,0 -2.026,-0.463 -3.532,-2.895c-1.447,-2.373 -2.142,-2.952 -4.168,-3.473c-5.443,-1.332 -6.658,-1.795 -8.164,-2.953c-1.563,-1.216 -3.647,-4.806 -4.4,-7.411c-0.289,-1.216 -0.926,-1.505 -4.111,-2.142c-3.531,-0.753 -10.421,-3.821 -13.084,-5.906c-2.027,-1.505 -3.3,-8.163 -3.3,-17.195c0,-7.006 0.115,-7.932 1.91,-13.027c1.042,-3.011 2.663,-6.832 3.59,-8.511c2.374,-4.168 3.763,-4.458 16.443,-4.053c12.505,0.464 19.221,1.274 24.258,3.011l3.995,1.39l-0.347,-2.548c-0.347,-2.374 -0.232,-2.663 1.505,-3.995c1.042,-0.81 2.837,-1.853 3.995,-2.374c2.721,-1.1 2.837,-1.331 1.911,-3.937c-1.39,-3.995 -3.242,-6.137 -6.137,-7.005c-6.369,-1.911 -12.159,-6.369 -13.085,-10.132c-0.232,-0.869 0.81,-4.921 3.068,-11.58l3.358,-10.189l0.406,-9.553c0.289,-7.238 0.695,-10.364 1.563,-13.027c2.374,-7.122 3.3,-8.569 7.295,-11.753c2.084,-1.737 3.821,-3.358 3.821,-3.648c0,-0.289 -0.752,-1.795 -1.621,-3.3c-0.868,-1.505 -2.142,-3.59 -2.721,-4.632c-1.1,-1.795 -1.332,-1.91 -3.474,-1.621c-1.274,0.174 -6.542,0.868 -11.637,1.505c-5.153,0.637 -11.116,1.679 -13.317,2.374c-6.773,2.027 -18.99,9.032 -28.427,16.327c-2.084,1.563 -3.821,2.721 -3.995,2.605c-0.347,-0.405 8.916,-9.321 13.374,-12.853c2.258,-1.794 5.79,-4.168 7.99,-5.326c4.111,-2.142 11.464,-4.864 13.259,-4.864c0.579,0 1.042,-0.289 1.042,-0.636c0,-0.637 -4.053,-0.464 -8.106,0.405c-1.042,0.231 -1.216,0.174 -0.579,-0.232c1.679,-1.1 7.237,-1.737 12.159,-1.447c4.921,0.347 13.779,-0.521 16.558,-1.621l1.505,-0.521l-2.605,-3.648c-1.389,-1.968 -4.574,-6.6 -7.063,-10.248c-2.49,-3.647 -6.485,-9.437 -8.801,-12.853c-3.474,-5.037 -4.168,-6.484 -3.879,-7.7c0.521,-2.084 3.416,-4.342 5.616,-4.342c1.795,0 2.2,0.579 10.537,13.432c4.806,7.353 8.859,13.663 9.09,13.953c0.406,0.637 9.148,-3.474 9.148,-4.284c0,-0.29 1.505,-1.274 3.358,-2.201c4.632,-2.373 14.59,-10.132 14.59,-11.347c0,-0.464 -2.663,-0.116 -4.284,0.579c-0.753,0.347 -0.985,0.289 -0.753,-0.116c0.521,-0.811 7.179,-3.995 12.274,-5.848c5.616,-2.084 14.243,-2.142 20.554,-0.231c3.879,1.215 4.747,1.794 7.874,4.979c5.616,5.847 10.074,15.979 10.074,22.869c0,1.853 1.91,3.879 6.079,6.253c1.621,0.926 3.474,2.605 4.169,3.705c2.547,3.937 3.184,4.632 5.558,6.137c2.895,1.737 5.789,4.69 6.947,6.948c0.464,0.869 1.564,3.821 2.432,6.542c1.911,5.906 2.605,17.022 1.505,24.954c-0.347,2.663 -0.81,9.032 -1.042,14.185l-0.347,9.263l1.563,2.722c0.869,1.447 1.505,3.126 1.39,3.647c-0.116,0.521 -3.011,2.432 -6.427,4.227c-3.416,1.852 -6.484,3.589 -6.832,3.937c-0.752,0.752 -2.374,7.005 -2.026,7.642c0.173,0.232 1.852,0.926 3.763,1.447l3.474,0.985l9.148,-4.69c11.405,-5.79 16.269,-7.121 24.664,-6.832c5.442,0.174 6.253,0.348 10.248,2.316c2.663,1.274 5.789,3.474 7.932,5.5c3.358,3.185 3.821,3.995 8.221,13.896c2.605,5.847 4.69,11.058 4.69,11.695c0,1.91 -1.158,4.342 -3.011,6.253c-0.984,0.984 -2.953,4.284 -4.458,7.237c-2.432,4.863 -2.953,5.558 -5.732,7.237c-2.837,1.679 -7.7,3.763 -14.706,6.195c-2.084,0.753 -3.01,1.563 -4.111,3.416c-0.81,1.332 -2.547,3.647 -3.879,5.211l-2.431,2.721l-4.69,0c-2.605,0 -6.89,-0.521 -9.437,-1.042l-4.748,-1.042l-10.074,7.237c-5.558,3.995 -10.885,7.874 -11.811,8.568l-1.679,1.274l2.837,8.395c2.49,7.353 2.779,8.743 2.316,10.595l-0.521,2.201l-32.828,0.173c-30.859,0.116 -32.827,0.058 -33.059,-0.868Zm34.738,-11.753c0.348,0 0.811,-0.811 1.042,-1.737c0.232,-0.985 0.869,-2.258 1.448,-2.779c0.81,-0.753 1.216,-2.49 1.679,-7.006c0.347,-3.3 0.637,-6.137 0.637,-6.369c0,-0.694 -14.938,-0.694 -15.401,0c-0.232,0.406 0.116,2.606 0.695,5.037c0.81,3.301 1.447,4.516 2.547,5.269c2.085,1.332 2.721,2.374 3.127,4.921c0.521,3.011 0.81,3.416 2.316,3.011c0.637,-0.174 1.505,-0.347 1.91,-0.347Zm-0.399,-3.972c0.076,-0.007 0.148,-0.013 0.214,-0.016c0.067,-0.004 0.129,-0.006 0.185,-0.006l-0.399,0.022Zm0.826,-10.19l-6.526,0.01l0.077,0.346c0.265,1.078 0.496,1.887 0.748,2.505c0.077,0.188 0.066,0.344 0.175,0.419c2.158,1.391 3.319,2.581 4.034,4.42c0.169,-0.239 0.339,-0.456 0.506,-0.642c0.099,-0.469 0.523,-2.556 0.756,-4.836c0.078,-0.742 0.157,-1.502 0.23,-2.222Zm-102.641,-20.164l0.018,0.014l-0.08,-0.061l0.062,0.047Zm65.913,-136.76c0.637,-0.753 0.521,-1.332 -0.521,-3.243c-1.332,-2.315 -1.332,-3.068 -0.29,-6.831l0.405,-1.448l-2.258,1.39c-4.052,2.431 -4.052,2.316 -1.679,6.889c2.201,4.169 3.011,4.806 4.343,3.243Zm-10.99,-21.945c-0.087,-0.138 -0.197,-0.301 -0.332,-0.471l0.332,0.471Zm2.191,-3.922c-0.194,0.349 -0.295,0.69 -0.348,0.996c-0.053,0.307 -0.057,0.578 -0.057,0.786c0,-0.485 0.076,-1.105 0.405,-1.782Z" style="fill:#fff;"/><path d="M186.241,111.563c-1.389,-0.753 -1.332,-2.258 0.058,-2.258c0.695,0 1.158,0.521 1.332,1.447c0.347,1.563 0.115,1.737 -1.39,0.811Z" style="fill:#bcb4b4;fill-rule:nonzero;"/><path d="M189.657,111.042c0.347,-1.332 0.926,-1.448 1.853,-0.406c0.752,0.927 0.289,1.564 -1.158,1.564c-0.695,0 -0.927,-0.348 -0.695,-1.158Z" style="fill:#bcb4b4;fill-rule:nonzero;"/><path d="M204.71,111.794c-0.405,-0.405 0.637,-1.91 1.332,-1.91c0.231,0 0.579,0.521 0.753,1.158c0.231,0.81 0,1.158 -0.695,1.158c-0.579,0 -1.216,-0.174 -1.39,-0.406Z" style="fill:#bcb4b4;fill-rule:nonzero;"/><path d="M208.821,110.752c0.174,-0.926 0.637,-1.447 1.332,-1.447c1.331,0 1.389,0.753 0.173,1.968c-1.274,1.332 -1.852,1.158 -1.505,-0.521Z" style="fill:#bcb4b4;fill-rule:nonzero;"/></g><g><path d="M130.275,307.592c0.3,1.25 0.85,2.9 1.45,3.75c0.55,0.8 3.55,4.5 5.55,4.5c1,0 5.25,-1.75 6.1,-2.05c4,-1.2 12.75,-2.8 16.8,-2.8c0.65,0 1.25,0 1.25,0.5c0,0.8 -2.45,3.95 -6.55,7.2c-2.5,-2.5 -3.4,-3 -4.85,-3c-1.1,0 -2.65,0.45 -4.55,1.05l0.1,0.5c1.8,0.3 2.25,1.7 2.25,3.15c0,3.15 -3.55,17.15 -14.05,24.9l0.3,0.4c6.7,-2.3 13.85,-6.8 20.2,-20.3c0.5,-1.05 0.85,-1.7 1.75,-2.85c0.35,-0.5 0.55,-0.85 0.55,-1.25c0,-0.45 -0.25,-0.85 -0.7,-1.4c3.35,-1.1 7.35,-2.55 9.8,-3.6c1.55,-0.6 2.15,-0.7 3.55,-1c2.4,-0.5 2.55,-1.8 2.55,-2.2c0,-1.75 -4.25,-5.7 -6.9,-6.95c-0.45,-0.2 -0.8,-0.25 -1.2,-0.25c-0.45,0 -0.9,0.1 -1.5,0.3l-2.4,0.85c-1,0.35 -1.75,0.6 -3.95,0.85c-3.55,0.4 -15,1.25 -19.45,1.25c-2.55,0 -4.75,-0.7 -5.65,-1.75l-0.45,0.2Z" style="fill-rule:nonzero;"/><path d="M133.764,304.423c0.247,0.073 1.632,0.469 2.611,0.469c4.341,0 15.511,-0.833 18.97,-1.222c1.684,-0.192 2.261,-0.371 3.011,-0.634l2.475,-0.875c1.134,-0.378 1.994,-0.519 2.844,-0.519c0.976,0 1.828,0.129 3.013,0.657c2.336,1.102 5.681,3.846 7.465,6.164c1.338,1.739 1.871,3.471 1.871,4.629c0,0.686 -0.101,2.155 -1.26,3.658c-0.742,0.962 -2.033,2.152 -4.649,2.697c-1.136,0.243 -1.631,0.315 -2.876,0.796c-1.729,0.736 -4.161,1.654 -6.615,2.518c-0.192,0.678 -0.541,1.393 -1.118,2.217c-0.043,0.062 -0.088,0.123 -0.135,0.182c-0.649,0.83 -0.899,1.301 -1.251,2.04c-7.083,15.059 -15.192,19.945 -22.665,22.511c-1.743,0.598 -3.674,0.005 -4.779,-1.47l-0.3,-0.4c-0.68,-0.906 -0.97,-2.046 -0.805,-3.166c0.164,-1.121 0.769,-2.13 1.681,-2.802c8.558,-6.317 11.922,-17.351 12.289,-20.904c-0.815,-0.442 -1.467,-1.144 -1.846,-1.998c-0.519,0.19 -1.041,0.374 -1.512,0.527c-1.274,0.412 -2.366,0.593 -2.908,0.593c-1.323,0 -2.923,-0.53 -4.437,-1.606c-2.067,-1.467 -4.118,-4.014 -4.584,-4.693c-0.839,-1.188 -1.691,-3.461 -2.111,-5.209c-0.478,-1.992 0.534,-4.042 2.406,-4.874l0.45,-0.2c1.632,-0.725 3.531,-0.351 4.765,0.914Zm-3.489,3.169c0.3,1.25 0.85,2.9 1.45,3.75c0.55,0.8 3.55,4.5 5.55,4.5c1,0 5.25,-1.75 6.1,-2.05c4,-1.2 12.75,-2.8 16.8,-2.8c0.65,0 1.25,0 1.25,0.5c0,0.8 -2.45,3.95 -6.55,7.2c-2.5,-2.5 -3.4,-3 -4.85,-3c-1.1,0 -2.65,0.45 -4.55,1.05l0.1,0.5c1.8,0.3 2.25,1.7 2.25,3.15c0,3.15 -3.55,17.15 -14.05,24.9l0.3,0.4c6.7,-2.3 13.85,-6.8 20.2,-20.3c0.5,-1.05 0.85,-1.7 1.75,-2.85c0.35,-0.5 0.55,-0.85 0.55,-1.25c0,-0.45 -0.25,-0.85 -0.7,-1.4c3.35,-1.1 7.35,-2.55 9.8,-3.6c1.55,-0.6 2.15,-0.7 3.55,-1c2.4,-0.5 2.55,-1.8 2.55,-2.2c0,-1.75 -4.25,-5.7 -6.9,-6.95c-0.45,-0.2 -0.8,-0.25 -1.2,-0.25c-0.45,0 -0.9,0.1 -1.5,0.3l-2.4,0.85c-1,0.35 -1.75,0.6 -3.95,0.85c-3.55,0.4 -15,1.25 -19.45,1.25c-2.55,0 -4.75,-0.7 -5.65,-1.75l-0.45,0.2Z" style="fill:#fff;"/><path d="M183.825,312.042c0.3,1 0.7,2.25 1.25,3.1c0.2,0.3 2.55,4 4.95,4c1.05,0 5.55,-0.85 6.45,-0.95c2.4,-0.3 5.65,-0.65 7.8,-0.8c2.55,-0.2 5.15,-0.1 6.65,-0.3c1.25,-0.2 2,-1.45 2,-2.8c0,-2.45 -5.9,-3.35 -6.7,-3.35c-0.6,0 -1.05,0.1 -1.55,0.3c-0.55,0.2 -1.15,0.5 -1.65,0.7c-2.75,1.05 -10.75,1.5 -11.45,1.5c-5.25,0 -6.7,-1.2 -7.3,-1.65l-0.45,0.25Zm-6.5,16.7c0,1.35 0.05,2.85 0.5,3.85c0.6,1.4 3.65,4.95 6,4.95c0.45,0 0.9,-0.05 1.4,-0.15c2.6,-0.45 6.8,-1.35 11.4,-1.85c3.45,-0.35 7.95,-0.7 12.45,-0.7l0.9,0c4.05,0.05 6.85,0.45 8.85,0.45c0.95,0 2.25,0 2.8,-2c0.1,-0.3 0.15,-0.65 0.15,-1c0,-0.65 -0.2,-1.35 -0.9,-1.85c-2.05,-1.4 -5.85,-2.35 -7.2,-2.35c-0.6,0 -1.15,0.1 -1.75,0.25c-3.3,0.95 -3.35,0.95 -6.65,1.35c-2.6,0.3 -15.8,1.4 -19.8,1.4c-2.7,0 -6,-0.35 -7.7,-2.55l-0.45,0.2Z" style="fill-rule:nonzero;"/><path d="M185.977,341.574c-0.765,0.149 -1.459,0.217 -2.152,0.217c-1.754,0 -3.815,-0.833 -5.612,-2.273c-2.073,-1.661 -3.777,-4.046 -4.263,-5.183c-0.656,-1.458 -0.874,-3.625 -0.874,-5.593c0,-1.68 0.989,-3.201 2.523,-3.883l0.45,-0.2c1.79,-0.796 3.891,-0.265 5.088,1.285c0.279,0.361 0.745,0.47 1.196,0.589c1.022,0.269 2.139,0.309 3.142,0.309c3.902,0 16.777,-1.079 19.289,-1.369c2.97,-0.36 3.015,-0.36 5.985,-1.215c0.049,-0.014 0.097,-0.027 0.145,-0.039c0.953,-0.238 1.829,-0.377 2.781,-0.377c1.797,0 6.868,1.227 9.596,3.091c0.025,0.017 0.049,0.034 0.074,0.051c2.023,1.445 2.679,3.429 2.679,5.308c0,0.771 -0.118,1.54 -0.328,2.214c-0.556,1.957 -1.53,3.057 -2.495,3.771c-1.401,1.035 -3.01,1.264 -4.376,1.264c-2.012,0 -4.829,-0.4 -8.85,-0.45l-0.9,0c-4.345,0 -8.69,0.34 -11.991,0.675c-4.477,0.487 -8.565,1.367 -11.107,1.808Zm-8.652,-12.832c0,1.35 0.05,2.85 0.5,3.85c0.6,1.4 3.65,4.95 6,4.95c0.45,0 0.9,-0.05 1.4,-0.15c2.6,-0.45 6.8,-1.35 11.4,-1.85c3.45,-0.35 7.95,-0.7 12.45,-0.7l0.9,0c4.05,0.05 6.85,0.45 8.85,0.45c0.95,0 2.25,0 2.8,-2c0.1,-0.3 0.15,-0.65 0.15,-1c0,-0.65 -0.2,-1.35 -0.9,-1.85c-2.05,-1.4 -5.85,-2.35 -7.2,-2.35c-0.6,0 -1.15,0.1 -1.75,0.25c-3.3,0.95 -3.35,0.95 -6.65,1.35c-2.6,0.3 -15.8,1.4 -19.8,1.4c-2.7,0 -6,-0.35 -7.7,-2.55l-0.45,0.2Zm25.872,-21.483c0.969,-0.379 1.857,-0.567 3.028,-0.567c0.792,0 5.117,0.621 7.64,2.183c2.187,1.353 3.309,3.316 3.309,5.417c0,3.51 -2.327,6.475 -5.578,6.995c-0.036,0.006 -0.073,0.012 -0.109,0.017c-1.552,0.206 -4.242,0.117 -6.916,0.327c-2.087,0.145 -5.24,0.486 -7.569,0.777c-0.019,0.002 -0.038,0.005 -0.058,0.007c-0.964,0.107 -5.794,0.976 -6.919,0.976c-1.562,0 -3.164,-0.587 -4.584,-1.616c-2.061,-1.495 -3.712,-3.993 -3.902,-4.276c-0.01,-0.016 -0.021,-0.033 -0.031,-0.049c-0.747,-1.154 -1.346,-2.829 -1.753,-4.187c-0.574,-1.913 0.261,-3.966 2.006,-4.936l0.45,-0.25c1.466,-0.814 3.273,-0.69 4.614,0.315c0.386,0.29 1.371,0.8 4.75,0.8c0.607,0 7.551,-0.31 9.872,-1.196c0.53,-0.211 1.165,-0.523 1.75,-0.737Zm-19.372,4.783c0.3,1 0.7,2.25 1.25,3.1c0.2,0.3 2.55,4 4.95,4c1.05,0 5.55,-0.85 6.45,-0.95c2.4,-0.3 5.65,-0.65 7.8,-0.8c2.55,-0.2 5.15,-0.1 6.65,-0.3c1.25,-0.2 2,-1.45 2,-2.8c0,-2.45 -5.9,-3.35 -6.7,-3.35c-0.6,0 -1.05,0.1 -1.55,0.3c-0.55,0.2 -1.15,0.5 -1.65,0.7c-2.75,1.05 -10.75,1.5 -11.45,1.5c-5.25,0 -6.7,-1.2 -7.3,-1.65l-0.45,0.25Zm19.398,-4.794l-0.126,0.048l0.126,-0.048Z" style="fill:#fff;"/><path d="M234.825,314.892c4.35,2.75 8,6 11.3,9.2c-7.05,9.85 -14.3,16.25 -19.85,20.05l0.2,0.45c9.2,-2.55 17.2,-7.8 24,-16.05c1.85,2.1 4,4.55 5.3,6.15c0.8,0.9 1.45,1.4 2.6,1.4c2.8,0 3.9,-1.85 3.9,-4.4c0,-2.4 -0.65,-4.35 -7.3,-9.05c1.55,-2.05 3,-4 4.35,-5.9c1.35,-1.8 2.2,-2.3 3.4,-3.7c0.5,-0.6 0.75,-1.1 0.75,-1.7c0,-1.55 -3.1,-6.75 -7.2,-6.75c-0.9,0 -3.15,0.25 -4.15,0.55l0,0.45c1.25,0.4 2.6,0.85 2.6,3.05c0,0.65 -0.15,1.35 -0.5,2.15c-0.75,1.9 -2.3,4.75 -4.8,8.55c-4.8,-2.35 -9.75,-4.1 -14.35,-4.85l-0.25,0.4Z" style="fill-rule:nonzero;"/><path d="M250.21,309.385c-1.415,-0.713 -2.334,-2.172 -2.334,-3.793l0,-0.45c0,-1.877 1.231,-3.531 3.028,-4.07c1.295,-0.389 4.206,-0.73 5.371,-0.73c3.85,0 7.311,2.645 9.324,5.513c1.514,2.156 2.125,4.392 2.125,5.487c0,1.533 -0.457,2.887 -1.773,4.465c-1.129,1.318 -1.944,1.779 -3.211,3.463l-1,1.393l-0.845,1.152c5.453,4.548 5.629,7.168 5.629,9.877c0,2.961 -1.042,5.328 -2.826,6.833c-1.276,1.077 -2.997,1.816 -5.323,1.816c-2.504,0 -4.034,-0.867 -5.776,-2.826c-0.042,-0.047 -0.082,-0.095 -0.122,-0.144c-0.553,-0.681 -1.264,-1.519 -2.04,-2.416c-6.652,6.863 -14.27,11.36 -22.827,13.731c-2.029,0.563 -4.163,-0.445 -5.018,-2.369l-0.2,-0.45c-0.832,-1.873 -0.209,-4.073 1.482,-5.231c4.679,-3.204 10.621,-8.37 16.578,-16.045c-2.374,-2.151 -4.964,-4.253 -7.898,-6.108c-1.976,-1.249 -2.572,-3.861 -1.332,-5.843l0.25,-0.4c0.907,-1.452 2.597,-2.218 4.287,-1.942c3.872,0.631 7.977,1.905 12.054,3.638c1.135,-1.88 1.926,-3.395 2.397,-4.551Zm-15.385,5.507c4.35,2.75 8,6 11.3,9.2c-7.05,9.85 -14.3,16.25 -19.85,20.05l0.2,0.45c9.2,-2.55 17.2,-7.8 24,-16.05c1.85,2.1 4,4.55 5.3,6.15c0.8,0.9 1.45,1.4 2.6,1.4c2.8,0 3.9,-1.85 3.9,-4.4c0,-2.4 -0.65,-4.35 -7.3,-9.05c1.55,-2.05 3,-4 4.35,-5.9c1.35,-1.8 2.2,-2.3 3.4,-3.7c0.5,-0.6 0.75,-1.1 0.75,-1.7c0,-1.55 -3.1,-6.75 -7.2,-6.75c-0.9,0 -3.15,0.25 -4.15,0.55l0,0.45c1.25,0.4 2.6,0.85 2.6,3.05c0,0.65 -0.15,1.35 -0.5,2.15c-0.75,1.9 -2.3,4.75 -4.8,8.55c-4.8,-2.35 -9.75,-4.1 -14.35,-4.85l-0.25,0.4Z" style="fill:#fff;"/></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(300.353,208.165,-208.165,300.353,45.2117,98.8155)"><stop offset="0" style="stop-color:#0d9dd4;stop-opacity:1"/><stop offset="1" style="stop-color:#02558b;stop-opacity:1"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/public/tracker-logos/avistaz_logo.png b/public/tracker-logos/avistaz_logo.png
new file mode 100644
index 00000000..6e792f06
Binary files /dev/null and b/public/tracker-logos/avistaz_logo.png differ
diff --git a/public/tracker-logos/beyondhd_logo.png b/public/tracker-logos/beyondhd_logo.png
new file mode 100644
index 00000000..1c55cc3d
Binary files /dev/null and b/public/tracker-logos/beyondhd_logo.png differ
diff --git a/public/tracker-logos/cinemaz_logo.png b/public/tracker-logos/cinemaz_logo.png
new file mode 100644
index 00000000..051ba779
Binary files /dev/null and b/public/tracker-logos/cinemaz_logo.png differ
diff --git a/public/tracker-logos/darkpeers_logo.png b/public/tracker-logos/darkpeers_logo.png
new file mode 100644
index 00000000..4ac010e2
Binary files /dev/null and b/public/tracker-logos/darkpeers_logo.png differ
diff --git a/public/tracker-logos/digitalcore_logo.png b/public/tracker-logos/digitalcore_logo.png
new file mode 100644
index 00000000..7cd158b4
Binary files /dev/null and b/public/tracker-logos/digitalcore_logo.png differ
diff --git a/public/tracker-logos/exoticaz_logo.png b/public/tracker-logos/exoticaz_logo.png
new file mode 100644
index 00000000..c2ff0c12
Binary files /dev/null and b/public/tracker-logos/exoticaz_logo.png differ
diff --git a/public/tracker-logos/luminarr_logo.png b/public/tracker-logos/luminarr_logo.png
new file mode 100644
index 00000000..13d5db10
Binary files /dev/null and b/public/tracker-logos/luminarr_logo.png differ
diff --git a/public/tracker-logos/privatehd_logo.png b/public/tracker-logos/privatehd_logo.png
new file mode 100644
index 00000000..5772db2b
Binary files /dev/null and b/public/tracker-logos/privatehd_logo.png differ
diff --git a/scripts/regen-changelog.cjs b/scripts/regen-changelog.cjs
new file mode 100644
index 00000000..bb9e99fd
--- /dev/null
+++ b/scripts/regen-changelog.cjs
@@ -0,0 +1,58 @@
+// scripts/regen-changelog.cjs
+// Regenerates CHANGELOG.md using the conventionalcommits preset,
+// then post-processes to match .versionrc.json preferences.
+
+const { execFileSync } = require("node:child_process")
+const { readFileSync, writeFileSync } = require("node:fs")
+const { join } = require("node:path")
+
+const root = join(__dirname, "..")
+const changelog = join(root, "CHANGELOG.md")
+
+// 1. Generate with the conventionalcommits preset
+execFileSync(
+  "pnpm",
+  ["conventional-changelog", "-p", "conventionalcommits", "-i", "CHANGELOG.md", "-s", "-r", "0"],
+  {
+    cwd: root,
+    stdio: "inherit",
+  }
+)
+
+// 2. Post-process to match .versionrc.json preferences
+let content = readFileSync(changelog, "utf-8")
+
+// Add header
+if (!content.startsWith("# Changelog")) {
+  content = `# Changelog\n${content}`
+}
+
+// Strip commit hash links: ([abc1234](https://github.com/.../commit/...))
+content = content.replace(/ \(\[[a-f0-9]{7,}\]\(https?:\/\/[^)]+\/commit\/[^)]+\)\)/g, "")
+
+// Strip all issue links: closes [#123](...), (#123), [#123](...)
+content = content.replace(/,?\s*closes\s+\[#\d+\]\([^)]+\)/g, "")
+content = content.replace(/ \[#\d+\]\([^)]+\)/g, "")
+content = content.replace(/ \(#\d+\)/g, "")
+
+// Clean up empty/orphaned parens left after stripping
+content = content.replace(/ \( and \)/g, "")
+content = content.replace(/ \(\)/g, "")
+content = content.replace(/ \( \)/g, "")
+
+// Remove sections not shown in-app (heading + all bullets until next heading or blank line)
+content = content.replace(/### Performance(?:\s+Improvements)?\n\n(?:\*[^\n]*\n)*/g, "")
+content = content.replace(/### Refactoring\n\n(?:\*[^\n]*\n)*/g, "")
+content = content.replace(/### Reverts\n\n(?:\*[^\n]*\n)*/g, "")
+
+// Rewrite version header links: compare URL → release URL
+content = content.replace(
+  /## \[([^\]]+)\]\(https:\/\/github\.com\/([^/]+)\/([^/]+)\/compare\/[^)]+\)/g,
+  "## [$1](https://github.com/$2/$3/releases/tag/v$1)"
+)
+
+// Collapse triple+ blank lines to double
+content = content.replace(/\n{3,}/g, "\n\n")
+
+writeFileSync(changelog, `${content.trimEnd()}\n`)
+console.log(`Regenerated ${changelog} (${content.split("\n").length} lines)`)
diff --git a/scripts/security-audit.ts b/scripts/security-audit.ts
index 34c13549..3143827f 100644
--- a/scripts/security-audit.ts
+++ b/scripts/security-audit.ts
@@ -18,7 +18,8 @@
 //   checkBackupPasswordBounds, checkWebhookRedirectPolicy,
 //   checkSessionSecretLengthGuard, checkNotificationSsrfValidation,
 //   checkErrorMessageDisclosure, checkDockerCopySensitiveFiles,
-//   checkClientEnvLeak, runAudit
+//   checkClientEnvLeak, checkAdapterCookieInjection, checkAdapterCredentialLogging,
+//   runAudit
 //
 // Usage: npx tsx scripts/security-audit.ts [--changed-only file1 file2 ...]
 // If --changed-only is provided, only those files are scanned for
@@ -1283,13 +1284,7 @@ function checkProxyAllowlistSync(): CheckResult {
 // ── Check 20: BigInt fields use string serialization (warning) ───────────
 
 // Column names that hold BigInt values in the DB schema
-const BIGINT_COLUMNS = [
-  "uploadedBytes",
-  "downloadedBytes",
-  "bufferBytes",
-  "rawUploadedBytes",
-  "rawDownloadedBytes",
-]
+const BIGINT_COLUMNS = ["uploadedBytes", "downloadedBytes", "bufferBytes"]
 
 function checkBigIntSafety(files?: string[]): CheckResult {
   const findings: Finding[] = []
@@ -2032,10 +2027,10 @@ function checkBackupPasswordBounds(): CheckResult {
 
     if (!readsBackupPw || !callsDeriveOrEncrypt) continue
 
-    // Must have an upper-bound length check (e.g., .length > 128)
+    // Must have an upper-bound length check (e.g., .length > 128 or .length > BACKUP_PASSWORD_MAX)
     const hasUpperBound =
-      /backupPassword\.length\s*>\s*\d+/.test(content) ||
-      /formPassword\.length\s*>\s*\d+/.test(content)
+      /backupPassword\.length\s*>\s*(\d+|[A-Z][A-Z0-9_]*)/.test(content) ||
+      /formPassword\.length\s*>\s*(\d+|[A-Z][A-Z0-9_]*)/.test(content)
 
     if (!hasUpperBound) {
       findings.push({
@@ -2390,6 +2385,137 @@ function checkClientEnvLeak(): CheckResult {
   }
 }
 
+// ── Check 37: Adapter Cookie header injection guard ────────────────────
+//
+// Adapters that construct Cookie: headers with template-literal interpolation
+// (i.e. Cookie: `name=${value}`) must validate the interpolated values against
+// injection characters (semicolons, carriage returns, newlines) BEFORE use.
+// Without this, a malicious or malformed credential value could inject extra
+// cookies or HTTP headers.
+//
+// AvistaZ is not flagged because it passes a pre-assembled cookie string
+// (Cookie: cookies) rather than interpolating individual values.
+
+function checkAdapterCookieInjection(): CheckResult {
+  const findings: Finding[] = []
+  const adaptersDir = path.resolve(SRC_DIR, "lib/adapters")
+  const adapterFiles = walkFiles(adaptersDir, ".ts")
+
+  // Matches: Cookie: `...${...}...`  (template literal with interpolation)
+  const COOKIE_INTERPOLATION_RE = /Cookie:\s*`[^`]*\$\{/
+
+  // Matches evidence that the file validates cookie values before interpolation.
+  // Two approaches are valid:
+  //   1. Blocklist: reject specific injection chars like [;\r\n]
+  //   2. Allowlist: only permit safe characters like [a-fA-F0-9]
+  const INJECTION_GUARD_PATTERNS = [
+    /\[;\\r\\n\]/, // blocklist regex literal [;\r\n]
+    /\[;\\r\\n]/, // alternate escaping
+    /unsafeChars/, // variable name convention from DC adapter
+    /\[\^a-fA-F0-9\]/, // hex-only allowlist (stricter than blocklist)
+    /\[\^a-f0-9\]/i, // hex-only allowlist variant
+    /\[\^\\w\]/, // word-char-only allowlist
+    /injection.*guard/i, // explicit labeling
+    /header.*injection/i, // explicit labeling
+    /validateMam/, // MAM-specific validation function
+  ]
+
+  for (const file of adapterFiles) {
+    if (isTestFile(file)) continue
+    const content = fs.readFileSync(file, "utf8")
+    const lines = content.split("\n")
+    const rel = relativePath(file)
+
+    // Find lines with Cookie template interpolation
+    const cookieLines: number[] = []
+    for (let i = 0; i < lines.length; i++) {
+      if (COOKIE_INTERPOLATION_RE.test(lines[i])) {
+        cookieLines.push(i)
+      }
+    }
+
+    if (cookieLines.length === 0) continue
+
+    // Check if the file contains ANY injection guard pattern
+    const hasGuard = INJECTION_GUARD_PATTERNS.some((re) => re.test(content))
+
+    if (!hasGuard) {
+      for (const lineIdx of cookieLines) {
+        findings.push({
+          file: rel,
+          line: lineIdx + 1,
+          detail:
+            "Cookie header uses template interpolation but no injection guard (validation against [;\\r\\n]) found in this file. User-provided values could inject extra cookies or headers.",
+        })
+      }
+    }
+  }
+
+  return {
+    id: "adapter-cookie-injection",
+    name: "Adapter Cookie headers guard against injection",
+    severity: "critical",
+    status: findings.length === 0 ? "pass" : "fail",
+    findings,
+  }
+}
+
+// ── Check 38: Adapter credential logging ───────────────────────────────
+//
+// Adapter files must never log credential material (api tokens, cookies,
+// passwords, passkeys). console.log/warn/error calls in adapters are checked
+// to ensure they don't reference credential variables.
+
+function checkAdapterCredentialLogging(): CheckResult {
+  const findings: Finding[] = []
+  const adaptersDir = path.resolve(SRC_DIR, "lib/adapters")
+  const adapterFiles = walkFiles(adaptersDir, ".ts")
+
+  // Variable names that hold credentials in adapter code
+  const CREDENTIAL_VARS = [
+    "apiToken",
+    "creds\\.uid",
+    "creds\\.pass",
+    "creds\\.cookies",
+    "cookies",
+    "trimmedToken",
+    "trimmedPass",
+    "trimmedUid",
+  ]
+  const CRED_IN_LOG_RE = new RegExp(
+    `console\\.(log|warn|error)\\s*\\([^)]*\\b(${CREDENTIAL_VARS.join("|")})\\b`
+  )
+
+  for (const file of adapterFiles) {
+    if (isTestFile(file)) continue
+    const content = fs.readFileSync(file, "utf8")
+    const lines = content.split("\n")
+    const rel = relativePath(file)
+
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i]
+      const trimmed = line.trim()
+      if (trimmed.startsWith("//") || trimmed.startsWith("*")) continue
+
+      if (CRED_IN_LOG_RE.test(line)) {
+        findings.push({
+          file: rel,
+          line: i + 1,
+          detail: "Adapter logs a credential variable. This could expose secrets in server logs.",
+        })
+      }
+    }
+  }
+
+  return {
+    id: "adapter-credential-logging",
+    name: "Adapter files do not log credential values",
+    severity: "critical",
+    status: findings.length === 0 ? "pass" : "fail",
+    findings,
+  }
+}
+
 // ── Run all checks ──────────────────────────────────────────────────────
 
 function runAudit(changedFiles?: string[]): AuditOutput {
@@ -2426,6 +2552,8 @@ function runAudit(changedFiles?: string[]): AuditOutput {
     checkNotificationSsrfValidation(),
     checkDockerCopySensitiveFiles(),
     checkClientEnvLeak(),
+    checkAdapterCookieInjection(),
+    checkAdapterCredentialLogging(),
     // Warning — flag but don't fail
     checkConsoleLogInRoutes(absChangedFiles),
     checkTodoInSecurityFiles(),
diff --git a/scripts/validate-trackers.ts b/scripts/validate-trackers.ts
index ac4e7c28..3ec2f532 100644
--- a/scripts/validate-trackers.ts
+++ b/scripts/validate-trackers.ts
@@ -11,43 +11,22 @@
 import fs from "node:fs"
 import path from "node:path"
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+import {
+  isEmpty,
+  LOGO_NAME_RE,
+  normalizeTrackerUrl,
+  PLACEHOLDER_RE,
+  SLUG_RE,
+  VALID_CONTENT_CATEGORIES,
+} from "@/data/tracker-validation-rules"
 import { ALL_TRACKERS } from "@/data/trackers"
 import { DEFAULT_API_PATHS, VALID_PLATFORM_TYPES } from "@/lib/adapters/constants"
+import { isValidHex } from "@/lib/validators"
 
-const VALID_PLATFORMS = [...VALID_PLATFORM_TYPES, "custom"] as const
-const HEX_COLOR_RE = /^#[0-9a-fA-F]{6}$/
-const SLUG_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/
-const LOGO_NAME_RE = /^\/tracker-logos\/[a-z0-9_]+_logo\.(svg|png)$/
-const PLACEHOLDER_RE = /^TODO$/i
+const VALID_PLATFORMS = [...VALID_PLATFORM_TYPES, "custom"]
 const LOGO_DIR = path.resolve(__dirname, "../public/tracker-logos")
 const TRACKER_DIR = path.resolve(__dirname, "../src/data/trackers")
 
-const VALID_CONTENT_CATEGORIES = new Set([
-  "Movies",
-  "TV",
-  "Music",
-  "Games",
-  "Apps",
-  "Sports",
-  "Books",
-  "Audiobooks",
-  "Comics",
-  "Manga",
-  "Anime",
-  "XXX",
-  "Documentaries",
-  "Education",
-  "Tutorials",
-  "Fanres",
-])
-
-function isEmpty(val: unknown): boolean {
-  if (val === undefined || val === null) return true
-  if (typeof val === "string") return val.trim().length === 0
-  if (Array.isArray(val)) return val.length === 0
-  return false
-}
-
 interface TrackerResult {
   slug: string
   name: string
@@ -60,8 +39,7 @@ function validate(slugFilter?: string[]): TrackerResult[] {
   // Check for global issues first
   const allSlugs = ALL_TRACKERS.map((t: TrackerRegistryEntry) => t.slug)
   const dupeSlugs = allSlugs.filter((s: string, i: number) => allSlugs.indexOf(s) !== i)
-  const normalize = (u: string) => u.replace(/\/+$/, "").toLowerCase()
-  const allUrls = ALL_TRACKERS.map((t: TrackerRegistryEntry) => normalize(t.url))
+  const allUrls = ALL_TRACKERS.map((t: TrackerRegistryEntry) => normalizeTrackerUrl(t.url))
   const dupeUrls = allUrls.filter((u: string, i: number) => allUrls.indexOf(u) !== i)
 
   const nonDraft = ALL_TRACKERS.filter((t: TrackerRegistryEntry) => !t.draft)
@@ -75,7 +53,7 @@ function validate(slugFilter?: string[]): TrackerResult[] {
 
     // ── Global duplication checks ─────────────────────────────────────
     if (dupeSlugs.includes(tracker.slug)) errors.push("Duplicate slug")
-    if (dupeUrls.includes(normalize(tracker.url))) errors.push("Duplicate URL")
+    if (dupeUrls.includes(normalizeTrackerUrl(tracker.url))) errors.push("Duplicate URL")
 
     // ── Required fields (errors) ──────────────────────────────────────
     if (!SLUG_RE.test(tracker.slug)) errors.push("Invalid slug format")
@@ -168,7 +146,7 @@ function validate(slugFilter?: string[]): TrackerResult[] {
     if (dupeCats.length > 0)
       errors.push(`Duplicate categories: ${[...new Set(dupeCats)].join(", ")}`)
 
-    if (tracker.color && !HEX_COLOR_RE.test(tracker.color)) {
+    if (tracker.color && !isValidHex(tracker.color)) {
       errors.push(`Invalid hex color "${tracker.color}"`)
     }
     if (tracker.logo) {
diff --git a/src/app/(auth)/DashboardClient.tsx b/src/app/(auth)/DashboardClient.tsx
index 06dafdd6..3d18a353 100644
--- a/src/app/(auth)/DashboardClient.tsx
+++ b/src/app/(auth)/DashboardClient.tsx
@@ -1,15 +1,13 @@
 // src/app/(auth)/DashboardClient.tsx
-//
-// Functions: buildTrackerSeries, DashboardClient
-
 "use client"
 
 import { H1, H2 } from "@typography"
-import { useMemo, useState } from "react"
+import dynamic from "next/dynamic"
+import { useMemo, useState, useTransition } from "react"
+import { DashboardSkeleton } from "@/app/(auth)/DashboardSkeleton"
 import { CHART_THEME } from "@/components/charts/lib/theme"
 import { AlertsBanner } from "@/components/dashboard/AlertsBanner"
 import { AnalyticsSection } from "@/components/dashboard/AnalyticsSection"
-import { DashboardSettingsSheet } from "@/components/dashboard/DashboardSettingsSheet"
 import { DayRangeSidebar } from "@/components/dashboard/DayRangeSidebar"
 import { EcosystemStatsSection } from "@/components/dashboard/EcosystemStatsSection"
 import { FleetDashboard } from "@/components/dashboard/FleetDashboard"
@@ -20,14 +18,23 @@ import { TodayAtAGlanceSkeleton } from "@/components/dashboard/TodayAtAGlanceSke
 import { TrackerLeaderboard } from "@/components/dashboard/TrackerLeaderboard"
 import { TrackerOverviewGrid } from "@/components/dashboard/TrackerOverviewGrid"
 import { useDashboardSettings } from "@/components/dashboard/useDashboardSettings"
-import { Button } from "@/components/ui/Button"
-import { GearIcon } from "@/components/ui/Icons"
-import { TabBar } from "@/components/ui/TabBar"
+import { Button, Divider, GearIcon, TabBar } from "@/components/ui"
 import { useDashboardData } from "@/hooks/useDashboardData"
 import { computeAggregateStats } from "@/lib/dashboard"
 import type { Snapshot, TrackerSummary } from "@/types/api"
 import type { TrackerSnapshotSeries } from "@/types/charts"
 
+const DashboardSettingsSheet = dynamic(
+  () =>
+    import("@/components/dashboard/DashboardSettingsSheet").then((m) => m.DashboardSettingsSheet),
+  { ssr: false }
+)
+
+const DASHBOARD_TABS = [
+  { key: "tracker-stats" as const, label: "Tracker Stats" },
+  { key: "torrent-fleet" as const, label: "Torrent Fleet" },
+]
+
 function buildTrackerSeries(
   trackers: TrackerSummary[],
   snapshotMap: Map<number, Snapshot[]>
@@ -41,15 +48,21 @@ function buildTrackerSeries(
 
 interface DashboardClientProps {
   initialTrackers: TrackerSummary[]
+  snapshotRetentionDays: number | null
 }
 
-export function DashboardClient({ initialTrackers }: DashboardClientProps) {
-  const data = useDashboardData({ initialTrackers })
+export function DashboardClient({ initialTrackers, snapshotRetentionDays }: DashboardClientProps) {
+  const data = useDashboardData({ initialTrackers, snapshotRetentionDays })
   const dashSettings = useDashboardSettings()
   const [settingsOpen, setSettingsOpen] = useState(false)
+  // Two-state tab pattern: dashboardTab updates immediately (drives TabBar pill animation),
+  // deferredTab updates via startTransition (drives content switch + query gating).
+  // This prevents the 350ms React reconciliation from blocking the pill's CSS transition.
   const [dashboardTab, setDashboardTab] = useState<"tracker-stats" | "torrent-fleet">(
     "tracker-stats"
   )
+  const [deferredTab, setDeferredTab] = useState<"tracker-stats" | "torrent-fleet">("tracker-stats")
+  const [, startTransition] = useTransition()
 
   const aggregateStats = useMemo(() => computeAggregateStats(data.trackers), [data.trackers])
   const trackerSeries = useMemo(
@@ -58,18 +71,12 @@ export function DashboardClient({ initialTrackers }: DashboardClientProps) {
   )
 
   if (data.loading) {
-    return (
-      <div className="flex h-full min-h-[calc(100vh-6rem)] items-center justify-center">
-        <p className="text-secondary text-sm font-mono animate-loading-breathe">
-          Loading dashboard...
-        </p>
-      </div>
-    )
+    return <DashboardSkeleton />
   }
 
   if (data.trackers.length === 0) {
     return (
-      <div className="flex h-full min-h-[calc(100vh-6rem)] items-center justify-center">
+      <div className="full-page-loader">
         <p className="text-secondary text-sm font-mono">No trackers added yet</p>
       </div>
     )
@@ -138,41 +145,31 @@ export function DashboardClient({ initialTrackers }: DashboardClientProps) {
       </div>
 
       {/* Divider */}
-      <div
-        className="h-px"
-        style={{
-          background: `linear-gradient(90deg, transparent, ${CHART_THEME.borderEmphasis}, transparent)`,
-        }}
-      />
+      <Divider />
 
       {/* Aggregate Stats */}
       <EcosystemStatsSection trackers={data.trackers} aggregateStats={aggregateStats} />
 
       {/* Divider */}
-      <div
-        className="h-px"
-        style={{
-          background: `linear-gradient(90deg, transparent, ${CHART_THEME.borderEmphasis}, transparent)`,
-        }}
-      />
+      <Divider />
 
       {/* Tab Switcher */}
       <TabBar
-        tabs={[
-          { key: "tracker-stats" as const, label: "Tracker Stats" },
-          { key: "torrent-fleet" as const, label: "Torrent Fleet" },
-        ]}
+        tabs={DASHBOARD_TABS}
         activeTab={dashboardTab}
-        onChange={setDashboardTab}
+        onChange={(tab) => {
+          setDashboardTab(tab)
+          startTransition(() => setDeferredTab(tab))
+        }}
       />
 
       {/*  Analytics / Fleet  */}
       <div className="flex flex-col md:flex-row gap-4 md:gap-8">
         <div className="flex-1 min-w-0">
-          <div className={dashboardTab !== "torrent-fleet" ? "hidden" : undefined}>
-            <FleetDashboard dayRange={data.dayRange} trackers={data.trackers} />
+          <div className={deferredTab !== "torrent-fleet" ? "hidden" : undefined}>
+            <FleetDashboard dayRange={data.dayRange} isActive={deferredTab === "torrent-fleet"} />
           </div>
-          <div className={dashboardTab !== "tracker-stats" ? "hidden" : undefined}>
+          <div className={deferredTab !== "tracker-stats" ? "hidden" : undefined}>
             <AnalyticsSection trackerSeries={trackerSeries} trackers={data.trackers} />
           </div>
         </div>
diff --git a/src/app/(auth)/DashboardSkeleton.tsx b/src/app/(auth)/DashboardSkeleton.tsx
new file mode 100644
index 00000000..f2526438
--- /dev/null
+++ b/src/app/(auth)/DashboardSkeleton.tsx
@@ -0,0 +1,62 @@
+// src/app/(auth)/DashboardSkeleton.tsx
+
+import { Card, Shimmer } from "@/components/ui"
+
+function DashboardSkeleton() {
+  return (
+    <div className="flex flex-col gap-10 max-w-6xl mx-auto pb-12">
+      {/* Page header */}
+      <div className="flex items-center justify-between">
+        <Shimmer size="value" className="w-48" />
+        <div className="flex items-center gap-2">
+          <Shimmer className="h-9 w-24" rounded="md" />
+          <Shimmer className="h-9 w-9" rounded="md" />
+        </div>
+      </div>
+
+      {/* Today At A Glance */}
+      <div className="flex flex-col gap-4">
+        <Shimmer size="heading" className="w-44" />
+        <Card>
+          <div className="flex flex-col gap-5">
+            <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3">
+              {Array.from({ length: 5 }, (_, i) => (
+                <div
+                  key={`stat-${i}`}
+                  className="bg-raised p-5 flex flex-col gap-3 nm-raised-sm rounded-nm-lg"
+                >
+                  <Shimmer size="text" className="w-24" />
+                  <Shimmer size="value" className="w-20" />
+                </div>
+              ))}
+            </div>
+          </div>
+        </Card>
+      </div>
+
+      {/* Tracker Overview */}
+      <div className="flex flex-col gap-4">
+        <Shimmer size="heading" className="w-28" />
+        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
+          {Array.from({ length: 3 }, (_, i) => (
+            <Card key={`tracker-${i}`}>
+              <div className="flex flex-col gap-3 p-1">
+                <div className="flex items-center gap-3">
+                  <Shimmer rounded="full" className="h-8 w-8" />
+                  <Shimmer size="heading" className="w-32" />
+                </div>
+                <div className="flex gap-4">
+                  <Shimmer size="bar" className="w-20" />
+                  <Shimmer size="bar" className="w-20" />
+                  <Shimmer size="bar" className="w-16" />
+                </div>
+              </div>
+            </Card>
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export { DashboardSkeleton }
diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
index 3169d237..2443c9be 100644
--- a/src/app/(auth)/layout.tsx
+++ b/src/app/(auth)/layout.tsx
@@ -12,18 +12,20 @@ import { QueryProvider } from "./QueryProvider"
 export const dynamic = "force-dynamic"
 
 export default async function AuthLayout({ children }: { children: ReactNode }) {
-  const [settings] = await db.select({ id: appSettings.id }).from(appSettings).limit(1)
-  if (!settings) {
-    redirect("/setup")
-  }
+  const [[settings], session] = await Promise.all([
+    db.select({ id: appSettings.id }).from(appSettings).limit(1),
+    getSession(),
+  ])
 
-  const session = await getSession()
-  if (!session) {
-    redirect("/login")
-  }
+  if (!settings) redirect("/setup")
+  if (!session) redirect("/login")
 
-  // Auto-restart scheduler if it died (i.e, server restart).
-  ensureSchedulerRunning(session.encryptionKey)
+  // Auto-restart scheduler if it died (i.e. server restart).
+  try {
+    ensureSchedulerRunning(session.encryptionKey)
+  } catch (err) {
+    console.error("[auth-layout] Scheduler startup failed:", err)
+  }
 
   return (
     <QueryProvider>
diff --git a/src/app/(auth)/loading.tsx b/src/app/(auth)/loading.tsx
new file mode 100644
index 00000000..a35cfc84
--- /dev/null
+++ b/src/app/(auth)/loading.tsx
@@ -0,0 +1,7 @@
+// src/app/(auth)/loading.tsx
+
+import { DashboardSkeleton } from "@/app/(auth)/DashboardSkeleton"
+
+export default function DashboardLoading() {
+  return <DashboardSkeleton />
+}
diff --git a/src/app/(auth)/page.tsx b/src/app/(auth)/page.tsx
index e5ed6a6a..6d64e851 100644
--- a/src/app/(auth)/page.tsx
+++ b/src/app/(auth)/page.tsx
@@ -1,10 +1,18 @@
 // src/app/(auth)/page.tsx
 
-import { getTrackerListForDashboard } from "@/lib/server-data"
-import type { TrackerSummary } from "@/types/api"
+import { fetchSettings, getTrackerListForDashboard } from "@/lib/server-data"
 import { DashboardClient } from "./DashboardClient"
 
 export default async function DashboardPage() {
-  const trackers = (await getTrackerListForDashboard()) as TrackerSummary[]
-  return <DashboardClient initialTrackers={trackers} />
+  const [trackers, settingsResult] = await Promise.all([
+    getTrackerListForDashboard(),
+    fetchSettings().catch(() => []),
+  ])
+  const [settings] = settingsResult
+  return (
+    <DashboardClient
+      initialTrackers={trackers}
+      snapshotRetentionDays={settings?.snapshotRetentionDays ?? null}
+    />
+  )
 }
diff --git a/src/app/(auth)/settings/page.tsx b/src/app/(auth)/settings/page.tsx
index 5a16e35a..e54c4810 100644
--- a/src/app/(auth)/settings/page.tsx
+++ b/src/app/(auth)/settings/page.tsx
@@ -1,15 +1,14 @@
 // src/app/(auth)/settings/page.tsx
-//
-// Functions: SettingsPage
 
+import { Notice } from "@/components/ui/Notice"
 import { getDatabaseSize, getProxyTrackers, getSettingsForClient } from "@/lib/server-data"
 import { SettingsClient } from "./SettingsClient"
 
 export default async function SettingsPage() {
   const [settings, proxyTrackers, databaseSize] = await Promise.all([
     getSettingsForClient(),
-    getProxyTrackers(),
-    getDatabaseSize(),
+    getProxyTrackers().catch(() => []),
+    getDatabaseSize().catch(() => "Unknown"),
   ])
 
   // If settings don't exist, this page shouldn't be reachable
@@ -17,7 +16,7 @@ export default async function SettingsPage() {
   if (!settings) {
     return (
       <div className="max-w-2xl mx-auto">
-        <p className="text-sm font-mono text-danger">Settings not configured</p>
+        <Notice message="Settings not configured" />
       </div>
     )
   }
diff --git a/src/app/(auth)/trackers/[id]/TrackerDetailClient.tsx b/src/app/(auth)/trackers/[id]/TrackerDetailClient.tsx
index a111b512..90599235 100644
--- a/src/app/(auth)/trackers/[id]/TrackerDetailClient.tsx
+++ b/src/app/(auth)/trackers/[id]/TrackerDetailClient.tsx
@@ -1,17 +1,13 @@
 // src/app/(auth)/trackers/[id]/TrackerDetailClient.tsx
-//
-// Functions: TrackerDetailClient
-
 "use client"
 
 import clsx from "clsx"
-import { useRouter, useSearchParams } from "next/navigation"
+import { useRouter } from "next/navigation"
 import { type CSSProperties, useCallback, useEffect, useMemo, useState } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
-import type { DayRange } from "@/components/dashboard/DayRangeSidebar"
 import { RankProgress } from "@/components/dashboard/RankProgress"
 import { TorrentsTab } from "@/components/dashboard/TorrentsTab"
-import { TrackerSettingsDialog } from "@/components/TrackerSettingsDialog"
+import { TrackerSettingsSheet } from "@/components/TrackerSettingsSheet"
 import { AnalyticsTab } from "@/components/tracker-detail/AnalyticsTab"
 import type { DebugData } from "@/components/tracker-detail/DebugResponseDialog"
 import { DebugResponseDialog } from "@/components/tracker-detail/DebugResponseDialog"
@@ -21,26 +17,35 @@ import { TrackerInfoTab } from "@/components/tracker-detail/TrackerInfoTab"
 import { TrackerStatusBanner } from "@/components/tracker-detail/TrackerStatusBanner"
 import { findRegistryEntry } from "@/data/tracker-registry"
 import { useTrackerTorrents } from "@/hooks/useTrackerTorrents"
-import { computeDelta, hexToRgba } from "@/lib/formatters"
-import type { SlotContext } from "@/lib/slot-types"
+import { hexToRgba } from "@/lib/color-utils"
+import { computeDelta } from "@/lib/data-transforms"
 import type {
+  DayRange,
   GazellePlatformMeta,
   QbitmanageTagConfig,
   Snapshot,
   TagGroup,
   TrackerSummary,
 } from "@/types/api"
+import type { SlotContext } from "@/types/slots"
 
 type Tab = "analytics" | "info" | "torrents"
 
 const VALID_TABS: Tab[] = ["analytics", "info", "torrents"]
 
+const TRACKER_DETAIL_TABS: { key: Tab; label: string }[] = [
+  { key: "analytics", label: "Data & Analytics" },
+  { key: "info", label: "Tracker Info" },
+  { key: "torrents", label: "Torrents" },
+]
+
 interface TrackerDetailClientProps {
   trackerId: number
   initialTracker: TrackerSummary
   initialAllTimeSnapshots: Snapshot[]
   initialTagGroups: TagGroup[]
   initialQbitmanageConfig: { enabled: boolean; tags: QbitmanageTagConfig } | null
+  initialTab?: string | null
 }
 
 export function TrackerDetailClient({
@@ -49,13 +54,13 @@ export function TrackerDetailClient({
   initialAllTimeSnapshots,
   initialTagGroups,
   initialQbitmanageConfig,
+  initialTab: initialTabProp,
 }: TrackerDetailClientProps) {
   const router = useRouter()
-  const searchParams = useSearchParams()
   const id = String(trackerId)
 
-  const initialTab = VALID_TABS.includes(searchParams.get("tab") as Tab)
-    ? (searchParams.get("tab") as Tab)
+  const initialTab = VALID_TABS.includes(initialTabProp as Tab)
+    ? (initialTabProp as Tab)
     : "analytics"
 
   const [tracker, setTracker] = useState<TrackerSummary>(initialTracker)
@@ -80,6 +85,7 @@ export function TrackerDetailClient({
     tagGroups,
     trackerSeedingCount: tracker.latestStats?.seedingCount,
     qbitmanageConfig,
+    isActive: activeTab === "torrents",
   })
 
   const snapshots = useMemo(() => {
@@ -127,7 +133,9 @@ export function TrackerDetailClient({
     setTracker((prev) => ({
       ...prev,
       userPausedAt: wasPaused ? null : new Date().toISOString(),
-      ...(wasPaused ? { pausedAt: null, consecutiveFailures: 0, lastError: null } : {}),
+      ...(wasPaused
+        ? { pausedAt: null, consecutiveFailures: 0, lastError: null, lastErrorAt: null }
+        : {}),
     }))
 
     try {
@@ -137,8 +145,7 @@ export function TrackerDetailClient({
         body: JSON.stringify({ pollingPaused: !wasPaused }),
       })
       if (!res.ok) throw new Error("Failed to toggle pause")
-      const trackerRes = await fetch(`/api/trackers/${id}`)
-      if (trackerRes.ok) setTracker(await trackerRes.json())
+      setTracker(await res.json())
     } catch {
       setTracker((prev) => ({ ...prev, userPausedAt: originalUserPausedAt }))
       setPollError("Failed to toggle pause — please try again")
@@ -206,6 +213,15 @@ export function TrackerDetailClient({
   const delta = useMemo(() => computeDelta(snapshots), [snapshots])
 
   const tc = tracker?.color || CHART_THEME.accent
+  const trackerStyle = useMemo(
+    () =>
+      ({
+        "--tracker-color": tc,
+        "--tracker-color-dim": hexToRgba(tc, 0.15),
+        "--tracker-color-glow": hexToRgba(tc, 0.25),
+      }) as CSSProperties,
+    [tc]
+  )
   const baseUrl = tracker?.baseUrl
   const registryEntry = useMemo(() => (baseUrl ? findRegistryEntry(baseUrl) : undefined), [baseUrl])
 
@@ -214,7 +230,6 @@ export function TrackerDetailClient({
     const ctx: SlotContext = {
       tracker,
       latestSnapshot,
-      snapshots,
       meta: tracker.platformMeta as SlotContext["meta"],
       registry: registryEntry,
       accentColor: tc,
@@ -225,28 +240,15 @@ export function TrackerDetailClient({
       badgeSlots: resolved.get("badge") ?? [],
       progressSlots: resolved.get("progress") ?? [],
     }
-  }, [tracker, latestSnapshot, snapshots, registryEntry, tc])
+  }, [tracker, latestSnapshot, registryEntry, tc])
 
   const gazelleMeta: GazellePlatformMeta | null =
     tracker.platformType === "gazelle" ? (tracker.platformMeta as GazellePlatformMeta | null) : null
 
-  const tabs: { key: Tab; label: string }[] = [
-    { key: "analytics", label: "Data & Analytics" },
-    { key: "info", label: "Tracker Info" },
-    { key: "torrents", label: "Torrents" },
-  ]
+  const tabs = TRACKER_DETAIL_TABS
 
   return (
-    <div
-      className="flex flex-col gap-10 max-w-6xl mx-auto pb-24"
-      style={
-        {
-          "--tracker-color": tc,
-          "--tracker-color-dim": hexToRgba(tc, 0.15),
-          "--tracker-color-glow": hexToRgba(tc, 0.25),
-        } as CSSProperties
-      }
-    >
+    <div className="flex flex-col gap-10 max-w-6xl mx-auto pb-24" style={trackerStyle}>
       {/* Header */}
       <TrackerDetailHeader
         tracker={tracker}
@@ -332,7 +334,7 @@ export function TrackerDetailClient({
         />
       )}
 
-      <TrackerSettingsDialog
+      <TrackerSettingsSheet
         key={tracker.id}
         open={showSettings}
         tracker={tracker}
@@ -349,13 +351,15 @@ export function TrackerDetailClient({
         }}
       />
 
-      <DebugResponseDialog
-        open={showDebugDialog}
-        loading={debugLoading}
-        data={debugData}
-        error={debugError}
-        onClose={() => setShowDebugDialog(false)}
-      />
+      {showDebugDialog && (
+        <DebugResponseDialog
+          open
+          loading={debugLoading}
+          data={debugData}
+          error={debugError}
+          onClose={() => setShowDebugDialog(false)}
+        />
+      )}
     </div>
   )
 }
diff --git a/src/app/(auth)/trackers/[id]/loading.tsx b/src/app/(auth)/trackers/[id]/loading.tsx
index 9a719064..5cbd2fa5 100644
--- a/src/app/(auth)/trackers/[id]/loading.tsx
+++ b/src/app/(auth)/trackers/[id]/loading.tsx
@@ -1,9 +1,47 @@
 // src/app/(auth)/trackers/[id]/loading.tsx
 
+import { Card, Shimmer } from "@/components/ui"
+
 export default function TrackerDetailLoading() {
   return (
-    <div className="flex h-full min-h-[calc(100vh-6rem)] items-center justify-center">
-      <p className="text-secondary text-sm font-mono animate-loading-breathe">Loading...</p>
+    <div className="flex flex-col gap-8 max-w-6xl mx-auto pb-12">
+      {/* Header: name + stats */}
+      <div className="flex flex-col gap-4">
+        <div className="flex items-center gap-4">
+          <Shimmer rounded="full" className="h-10 w-10" />
+          <Shimmer size="value" className="w-56" />
+        </div>
+        <div className="grid grid-cols-2 md:grid-cols-4 gap-3">
+          {Array.from({ length: 4 }, (_, i) => (
+            <div
+              key={`stat-${i}`}
+              className="bg-raised p-4 flex flex-col gap-2 nm-raised-sm rounded-nm-lg"
+            >
+              <Shimmer size="label" className="w-20" />
+              <Shimmer size="heading" className="w-28" />
+            </div>
+          ))}
+        </div>
+      </div>
+
+      {/* Tab bar placeholder */}
+      <div className="flex gap-2">
+        {Array.from({ length: 3 }, (_, i) => (
+          <Shimmer key={`tab-${i}`} className="h-9 w-24" rounded="md" />
+        ))}
+      </div>
+
+      {/* Chart placeholders */}
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+        {Array.from({ length: 4 }, (_, i) => (
+          <Card key={`chart-${i}`}>
+            <div className="flex flex-col gap-4">
+              <Shimmer size="heading" className="w-40" />
+              <Shimmer className="h-48 w-full" rounded="md" />
+            </div>
+          </Card>
+        ))}
+      </div>
     </div>
   )
 }
diff --git a/src/app/(auth)/trackers/[id]/page.tsx b/src/app/(auth)/trackers/[id]/page.tsx
index 7871c7d1..c038239f 100644
--- a/src/app/(auth)/trackers/[id]/page.tsx
+++ b/src/app/(auth)/trackers/[id]/page.tsx
@@ -3,31 +3,38 @@
 import { notFound } from "next/navigation"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
-import { parseQbitmanageTags } from "@/lib/qbitmanage-defaults"
+import { parseQbitmanageTags } from "@/lib/download-clients/qbt/qbitmanage-defaults"
 import {
   getSnapshotsForTracker,
   getTagGroupsWithMembers,
   getTrackerForClient,
 } from "@/lib/server-data"
-import type { QbitmanageTagConfig, TrackerSummary } from "@/types/api"
+import type { QbitmanageTagConfig } from "@/types/api"
 import { TrackerDetailClient } from "./TrackerDetailClient"
 
-export default async function TrackerDetailPage(props: { params: Promise<{ id: string }> }) {
+export default async function TrackerDetailPage(props: {
+  params: Promise<{ id: string }>
+  searchParams: Promise<{ [key: string]: string | string[] | undefined }>
+}) {
   const { id } = await props.params
+  const searchParams = await props.searchParams
+  const rawTab = searchParams?.tab
+  const initialTab = typeof rawTab === "string" ? rawTab : null
   const trackerId = parseInt(id, 10)
   if (Number.isNaN(trackerId) || trackerId < 1) notFound()
 
   const [tracker, allTimeSnapshots, tagGroupsData, settingsRow] = await Promise.all([
     getTrackerForClient(trackerId),
     getSnapshotsForTracker(trackerId, 0),
-    getTagGroupsWithMembers(),
+    getTagGroupsWithMembers().catch(() => []),
     db
       .select({
         qbitmanageEnabled: appSettings.qbitmanageEnabled,
         qbitmanageTags: appSettings.qbitmanageTags,
       })
       .from(appSettings)
-      .limit(1),
+      .limit(1)
+      .catch(() => []),
   ])
 
   if (!tracker) notFound()
@@ -44,10 +51,11 @@ export default async function TrackerDetailPage(props: { params: Promise<{ id: s
   return (
     <TrackerDetailClient
       trackerId={trackerId}
-      initialTracker={tracker as TrackerSummary}
+      initialTracker={tracker}
       initialAllTimeSnapshots={allTimeSnapshots}
       initialTagGroups={tagGroupsData}
       initialQbitmanageConfig={qbitmanageConfig}
+      initialTab={initialTab}
     />
   )
 }
diff --git a/src/app/api/alerts/dismissed/dismissed-route.test.ts b/src/app/api/alerts/dismissed/dismissed-route.test.ts
index c14b66c2..8fde7002 100644
--- a/src/app/api/alerts/dismissed/dismissed-route.test.ts
+++ b/src/app/api/alerts/dismissed/dismissed-route.test.ts
@@ -2,15 +2,20 @@
 
 import { NextResponse } from "next/server"
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import { NON_DISMISSIBLE_ALERT_TYPES } from "@/lib/alert-pruning"
+// biome-ignore lint/correctness/noUnusedImports: used in vi.mock factory below
+import { NON_DISMISSIBLE_ALERT_TYPES, pruneDismissedAlerts } from "@/lib/alert-pruning"
 import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { DELETE, GET, POST } from "./route"
 
-vi.mock("@/lib/api-helpers", () => ({
-  authenticate: vi.fn(),
-  parseJsonBody: vi.fn(),
-}))
+vi.mock("@/lib/api-helpers", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/api-helpers")>()
+  return {
+    ...actual,
+    authenticate: vi.fn(),
+    parseJsonBody: vi.fn(),
+  }
+})
 
 vi.mock("@/lib/db", () => ({
   db: {
@@ -30,6 +35,7 @@ vi.mock("@/lib/alert-pruning", async (importOriginal) => {
     EXPIRING_ALERT_TYPES: actual.EXPIRING_ALERT_TYPES,
     NON_DISMISSIBLE_ALERT_TYPES: actual.NON_DISMISSIBLE_ALERT_TYPES,
     ALERT_EXPIRY_MS: actual.ALERT_EXPIRY_MS,
+    pruneDismissedAlerts: vi.fn().mockResolvedValue(undefined),
   }
 })
 
@@ -61,49 +67,30 @@ describe("GET /api/alerts/dismissed", () => {
     expect(res.status).toBe(401)
   })
 
-  it("returns dismissed alert keys after pruning expired rows", async () => {
-    const mockDeleteWhere = vi.fn().mockResolvedValue(undefined)
-    ;(db.delete as ReturnType<typeof vi.fn>).mockReturnValue({ where: mockDeleteWhere })
-
-    // First select: find expired rows (returns some expired keys)
-    const mockSelectWhere1 = vi.fn().mockResolvedValue([{ alertKey: "expired-1" }])
-    const mockSelectFrom1 = vi.fn().mockReturnValue({ where: mockSelectWhere1 })
-
-    // Second select: get remaining rows
-    const mockSelectFrom2 = vi
+  it("prunes expired rows and returns remaining keys", async () => {
+    const mockSelectFrom = vi
       .fn()
       .mockResolvedValue([{ alertKey: "active-1" }, { alertKey: "active-2" }])
-
-    ;(db.select as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce({ from: mockSelectFrom1 })
-      .mockReturnValueOnce({ from: mockSelectFrom2 })
+    ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue({ from: mockSelectFrom })
 
     const res = await GET()
     const data = await res.json()
 
     expect(res.status).toBe(200)
     expect(data.keys).toEqual(["active-1", "active-2"])
-    expect(db.delete).toHaveBeenCalledTimes(1)
+    expect(pruneDismissedAlerts).toHaveBeenCalledOnce()
   })
 
-  it("skips pruning when no expired rows exist", async () => {
-    // First select: no expired rows
-    const mockSelectWhere1 = vi.fn().mockResolvedValue([])
-    const mockSelectFrom1 = vi.fn().mockReturnValue({ where: mockSelectWhere1 })
-
-    // Second select: remaining rows
-    const mockSelectFrom2 = vi.fn().mockResolvedValue([{ alertKey: "key-1" }])
-
-    ;(db.select as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce({ from: mockSelectFrom1 })
-      .mockReturnValueOnce({ from: mockSelectFrom2 })
+  it("returns empty keys array when none exist", async () => {
+    const mockSelectFrom = vi.fn().mockResolvedValue([])
+    ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue({ from: mockSelectFrom })
 
     const res = await GET()
     const data = await res.json()
 
     expect(res.status).toBe(200)
-    expect(data.keys).toEqual(["key-1"])
-    expect(db.delete).not.toHaveBeenCalled()
+    expect(data.keys).toEqual([])
+    expect(pruneDismissedAlerts).toHaveBeenCalledOnce()
   })
 })
 
@@ -266,14 +253,6 @@ describe("POST /api/alerts/dismissed — non-dismissible rejection", () => {
     expect(data.error).toBe("This alert type cannot be dismissed")
   })
 
-  it("confirms client-error is in the NON_DISMISSIBLE set", () => {
-    expect(NON_DISMISSIBLE_ALERT_TYPES.has("client-error")).toBe(true)
-  })
-
-  it("confirms poll-paused is in the NON_DISMISSIBLE set", () => {
-    expect(NON_DISMISSIBLE_ALERT_TYPES.has("poll-paused")).toBe(true)
-  })
-
   it("rejects dismissing a poll-paused alert type", async () => {
     ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
       key: "poll-paused-1",
@@ -321,20 +300,18 @@ describe("POST /api/alerts/dismissed — non-dismissible rejection", () => {
     expect(res.status).toBe(200)
   })
 
-  it("allows dismissing an arbitrary non-blocked type", async () => {
+  it("rejects unknown alert types with 400", async () => {
     ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
       key: "some-key",
       type: "custom-type",
     })
 
-    const mockOnConflictDoNothing = vi.fn().mockResolvedValue(undefined)
-    const mockValues = vi.fn().mockReturnValue({ onConflictDoNothing: mockOnConflictDoNothing })
-    ;(db.insert as ReturnType<typeof vi.fn>).mockReturnValue({ values: mockValues })
-
     const req = makeRequest("http://localhost/api/alerts/dismissed", undefined, "POST")
     const res = await POST(req)
 
-    expect(res.status).toBe(200)
+    expect(res.status).toBe(400)
+    const data = await res.json()
+    expect(data.error).toBe("Unknown alert type")
   })
 })
 
diff --git a/src/app/api/alerts/dismissed/route.ts b/src/app/api/alerts/dismissed/route.ts
index a83f4306..0826fde4 100644
--- a/src/app/api/alerts/dismissed/route.ts
+++ b/src/app/api/alerts/dismissed/route.ts
@@ -2,38 +2,20 @@
 //
 // Functions: GET, POST, DELETE
 
-import { and, eq, inArray, lt } from "drizzle-orm"
+import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import {
-  ALERT_EXPIRY_MS,
-  EXPIRING_ALERT_TYPES,
-  NON_DISMISSIBLE_ALERT_TYPES,
-} from "@/lib/alert-pruning"
-import { authenticate, parseJsonBody } from "@/lib/api-helpers"
+import { NON_DISMISSIBLE_ALERT_TYPES, pruneDismissedAlerts } from "@/lib/alert-pruning"
+import { authenticate, parseJsonBody, validateMaxLength } from "@/lib/api-helpers"
+import { VALID_ALERT_TYPES } from "@/lib/dashboard"
 import { db } from "@/lib/db"
 import { dismissedAlerts } from "@/lib/db/schema"
+import { ALERT_KEY_MAX, ALERT_TYPE_MAX } from "@/lib/limits"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const cutoff = new Date(Date.now() - ALERT_EXPIRY_MS)
-
-  // Lazily prune expired rows for expiring types
-  const expiredRows = await db
-    .select({ alertKey: dismissedAlerts.alertKey })
-    .from(dismissedAlerts)
-    .where(
-      and(
-        inArray(dismissedAlerts.alertType, EXPIRING_ALERT_TYPES),
-        lt(dismissedAlerts.dismissedAt, cutoff)
-      )
-    )
-
-  if (expiredRows.length > 0) {
-    const expiredKeys = expiredRows.map((r) => r.alertKey)
-    await db.delete(dismissedAlerts).where(inArray(dismissedAlerts.alertKey, expiredKeys))
-  }
+  await pruneDismissedAlerts()
 
   const remaining = await db.select({ alertKey: dismissedAlerts.alertKey }).from(dismissedAlerts)
 
@@ -56,9 +38,8 @@ export async function POST(request: Request) {
   if (normalizedKey.length === 0) {
     return NextResponse.json({ error: "key must be a non-empty string" }, { status: 400 })
   }
-  if (normalizedKey.length > 255) {
-    return NextResponse.json({ error: "key must be 255 characters or fewer" }, { status: 400 })
-  }
+  const keyErr = validateMaxLength(normalizedKey, ALERT_KEY_MAX, "key")
+  if (keyErr) return keyErr
 
   if (typeof type !== "string") {
     return NextResponse.json({ error: "type must be a non-empty string" }, { status: 400 })
@@ -67,11 +48,13 @@ export async function POST(request: Request) {
   if (normalizedType.length === 0) {
     return NextResponse.json({ error: "type must be a non-empty string" }, { status: 400 })
   }
-  if (normalizedType.length > 30) {
-    return NextResponse.json({ error: "type must be 30 characters or fewer" }, { status: 400 })
-  }
+  const typeErr = validateMaxLength(normalizedType, ALERT_TYPE_MAX, "type")
+  if (typeErr) return typeErr
 
-  if (NON_DISMISSIBLE_ALERT_TYPES.has(normalizedType)) {
+  if (!(VALID_ALERT_TYPES as Set<string>).has(normalizedType)) {
+    return NextResponse.json({ error: "Unknown alert type" }, { status: 400 })
+  }
+  if ((NON_DISMISSIBLE_ALERT_TYPES as Set<string>).has(normalizedType)) {
     return NextResponse.json({ error: "This alert type cannot be dismissed" }, { status: 400 })
   }
 
diff --git a/src/app/api/auth/change-password/route.ts b/src/app/api/auth/change-password/route.ts
index d255e372..ff43380d 100644
--- a/src/app/api/auth/change-password/route.ts
+++ b/src/app/api/auth/change-password/route.ts
@@ -4,7 +4,8 @@
 //
 // Changes the master password and re-encrypts all encrypted fields
 // (tracker API tokens, download client credentials, proxy password,
-// backup password, TOTP secrets) inside a single transaction.
+// backup password, TOTP secrets, image host API keys, notification
+// target configs) inside a single transaction.
 // Requires an active session and the current password for verification.
 
 import { eq } from "drizzle-orm"
@@ -13,7 +14,8 @@ import { authenticate, decodeKey, parseJsonBody } from "@/lib/api-helpers"
 import { clearSession, hashPassword, verifyPassword } from "@/lib/auth"
 import { decrypt, deriveKey, encrypt, reencrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
-import { appSettings, downloadClients, trackers } from "@/lib/db/schema"
+import { appSettings, downloadClients, notificationTargets, trackers } from "@/lib/db/schema"
+import { PASSWORD_MAX, PASSWORD_MIN } from "@/lib/limits"
 import { recordFailedAttempt, resetFailedAttempts } from "@/lib/lockout"
 import { log } from "@/lib/logger"
 import { stopScheduler } from "@/lib/scheduler"
@@ -31,17 +33,21 @@ export async function POST(request: Request) {
     newPassword?: string
   }
 
-  if (!currentPassword || typeof currentPassword !== "string" || currentPassword.length > 128) {
+  if (
+    !currentPassword ||
+    typeof currentPassword !== "string" ||
+    currentPassword.length > PASSWORD_MAX
+  ) {
     return NextResponse.json({ error: "Current password is required" }, { status: 400 })
   }
   if (
     !newPassword ||
     typeof newPassword !== "string" ||
-    newPassword.length < 8 ||
-    newPassword.length > 128
+    newPassword.length < PASSWORD_MIN ||
+    newPassword.length > PASSWORD_MAX
   ) {
     return NextResponse.json(
-      { error: "New password must be between 8 and 128 characters" },
+      { error: `New password must be between ${PASSWORD_MIN} and ${PASSWORD_MAX} characters` },
       { status: 400 }
     )
   }
@@ -70,43 +76,75 @@ export async function POST(request: Request) {
   // already-corrupted items before committing any writes.
   const trackerPlaintexts = new Map<number, string>()
   const clientPlaintexts = new Map<number, { username: string; password: string }>()
+  const notificationPlaintexts = new Map<number, string>()
   const failedTrackers: string[] = []
   const failedClients: string[] = []
+  const failedNotifications: string[] = []
+
+  const [allTrackers, allClients, allNotifications] = await Promise.all([
+    db
+      .select({
+        id: trackers.id,
+        name: trackers.name,
+        encryptedApiToken: trackers.encryptedApiToken,
+      })
+      .from(trackers),
+    db
+      .select({
+        id: downloadClients.id,
+        name: downloadClients.name,
+        encryptedUsername: downloadClients.encryptedUsername,
+        encryptedPassword: downloadClients.encryptedPassword,
+      })
+      .from(downloadClients),
+    db
+      .select({
+        id: notificationTargets.id,
+        name: notificationTargets.name,
+        encryptedConfig: notificationTargets.encryptedConfig,
+      })
+      .from(notificationTargets),
+  ])
 
-  const allTrackers = await db
-    .select({
-      id: trackers.id,
-      name: trackers.name,
-      encryptedApiToken: trackers.encryptedApiToken,
-    })
-    .from(trackers)
   for (const tracker of allTrackers) {
     try {
       trackerPlaintexts.set(tracker.id, decrypt(tracker.encryptedApiToken, oldKey))
-    } catch {
+    } catch (err) {
+      log.warn(
+        { trackerId: tracker.id, error: String(err) },
+        "Failed to decrypt tracker API token during password change"
+      )
       failedTrackers.push(tracker.name)
     }
   }
 
-  const allClients = await db
-    .select({
-      id: downloadClients.id,
-      name: downloadClients.name,
-      encryptedUsername: downloadClients.encryptedUsername,
-      encryptedPassword: downloadClients.encryptedPassword,
-    })
-    .from(downloadClients)
   for (const client of allClients) {
     try {
       clientPlaintexts.set(client.id, {
         username: decrypt(client.encryptedUsername, oldKey),
         password: decrypt(client.encryptedPassword, oldKey),
       })
-    } catch {
+    } catch (err) {
+      log.warn(
+        { clientId: client.id, error: String(err) },
+        "Failed to decrypt client credentials during password change"
+      )
       failedClients.push(client.name)
     }
   }
 
+  for (const nt of allNotifications) {
+    try {
+      notificationPlaintexts.set(nt.id, decrypt(nt.encryptedConfig, oldKey))
+    } catch (err) {
+      log.warn(
+        { targetId: nt.id, error: String(err) },
+        "Failed to decrypt notification config during password change"
+      )
+      failedNotifications.push(nt.name)
+    }
+  }
+
   const settingsUpdates: Record<string, unknown> = {}
   const warnings: string[] = []
   let totpDisabled = false
@@ -114,8 +152,11 @@ export async function POST(request: Request) {
   if (settings.totpSecret) {
     try {
       settingsUpdates.totpSecret = reencrypt(settings.totpSecret, oldKey, newKey)
-    } catch {
-      // security-audit-ignore: re-encryption failed — clearing TOTP is the safe fallback
+    } catch (err) {
+      log.warn(
+        { error: String(err) },
+        "TOTP secret re-encryption failed during password change, disabling 2FA"
+      )
       settingsUpdates.totpSecret = null
       settingsUpdates.totpBackupCodes = null
       totpDisabled = true
@@ -124,8 +165,11 @@ export async function POST(request: Request) {
   if (settings.totpBackupCodes && !settingsUpdates.totpBackupCodes && !totpDisabled) {
     try {
       settingsUpdates.totpBackupCodes = reencrypt(settings.totpBackupCodes, oldKey, newKey)
-    } catch {
-      // security-audit-ignore: clearing backup codes is safe when re-encryption fails
+    } catch (err) {
+      log.warn(
+        { error: String(err) },
+        "TOTP backup codes re-encryption failed during password change"
+      )
       settingsUpdates.totpBackupCodes = null
     }
   }
@@ -160,6 +204,51 @@ export async function POST(request: Request) {
     }
   }
 
+  if (settings.encryptedPtpimgApiKey) {
+    try {
+      settingsUpdates.encryptedPtpimgApiKey = reencrypt(
+        settings.encryptedPtpimgApiKey,
+        oldKey,
+        newKey
+      )
+    } catch {
+      settingsUpdates.encryptedPtpimgApiKey = null
+      warnings.push(
+        "PTPImg API key could not be re-encrypted and was cleared. Re-enter it in settings."
+      )
+    }
+  }
+
+  if (settings.encryptedOeimgApiKey) {
+    try {
+      settingsUpdates.encryptedOeimgApiKey = reencrypt(
+        settings.encryptedOeimgApiKey,
+        oldKey,
+        newKey
+      )
+    } catch {
+      settingsUpdates.encryptedOeimgApiKey = null
+      warnings.push(
+        "OEImg API key could not be re-encrypted and was cleared. Re-enter it in settings."
+      )
+    }
+  }
+
+  if (settings.encryptedImgbbApiKey) {
+    try {
+      settingsUpdates.encryptedImgbbApiKey = reencrypt(
+        settings.encryptedImgbbApiKey,
+        oldKey,
+        newKey
+      )
+    } catch {
+      settingsUpdates.encryptedImgbbApiKey = null
+      warnings.push(
+        "ImgBB API key could not be re-encrypted and was cleared. Re-enter it in settings."
+      )
+    }
+  }
+
   // All decrypts done. Write phase is all-or-nothing inside a transaction.
   // Only items that successfully decrypted are re-encrypted and committed.
   try {
@@ -181,6 +270,13 @@ export async function POST(request: Request) {
           .where(eq(downloadClients.id, id))
       }
 
+      for (const [id, plainConfig] of notificationPlaintexts) {
+        await tx
+          .update(notificationTargets)
+          .set({ encryptedConfig: encrypt(plainConfig, newKey) })
+          .where(eq(notificationTargets.id, id))
+      }
+
       await tx
         .update(appSettings)
         .set({ passwordHash: newHash, ...settingsUpdates })
@@ -219,6 +315,11 @@ export async function POST(request: Request) {
       `Could not re-encrypt ${failedClients.length} client credential(s). Re-enter them manually.`
     )
   }
+  if (failedNotifications.length > 0) {
+    warnings.push(
+      `${failedNotifications.length} notification target(s) could not be re-encrypted and were skipped: ${failedNotifications.join(", ")}`
+    )
+  }
   if (totpDisabled) {
     log.warn(
       { route: "POST /api/auth/change-password" },
diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts
index b1b7dde3..905fca4d 100644
--- a/src/app/api/auth/login/route.ts
+++ b/src/app/api/auth/login/route.ts
@@ -9,6 +9,8 @@ import { extractClientIp } from "@/lib/client-ip"
 import { deriveKey } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { PASSWORD_MAX } from "@/lib/limits"
 import { checkLockout, recordFailedAttempt, resetFailedAttempts } from "@/lib/lockout"
 import { log } from "@/lib/logger"
 import { startScheduler } from "@/lib/scheduler"
@@ -29,7 +31,7 @@ export async function POST(request: Request) {
   const clientIp = extractClientIp(request.headers)
 
   const password = body.password as string | undefined
-  if (!password || typeof password !== "string" || password.length > 128) {
+  if (!password || typeof password !== "string" || password.length > PASSWORD_MAX) {
     return NextResponse.json({ error: "Invalid password" }, { status: 400 })
   }
 
@@ -41,32 +43,70 @@ export async function POST(request: Request) {
       typeof username === "string" && username.toLowerCase() === settings.username.toLowerCase()
   }
 
-  // Always run Argon2 to normalize timing — prevents username oracle
-  const passwordOk = await verifyPassword(settings.passwordHash, password)
+  // Run Argon2 + scrypt in parallel — both depend only on password + settings, not each other.
+  // Argon2 always runs to normalize timing (prevents username oracle).
+  // scrypt runs even on failure — improves timing normalization and is acceptable
+  // for a single-user app with rate limiting.
+  let passwordOk: boolean
+  let key: Buffer
+  try {
+    ;[passwordOk, key] = await Promise.all([
+      verifyPassword(settings.passwordHash, password),
+      deriveKey(password, settings.encryptionSalt),
+    ])
+  } catch (err) {
+    log.error(
+      { route: "POST /api/auth/login", error: errMsg(err) },
+      "Crypto operation failed during login"
+    )
+    return NextResponse.json(
+      { error: "Login system error. Contact administrator." },
+      { status: 500 }
+    )
+  }
 
   if (!usernameOk || !passwordOk) {
     await recordFailedAttempt(settings.id, settings)
     log.warn({ event: "login_failed", ip: clientIp }, "Failed login attempt")
     return NextResponse.json({ error: "Invalid credentials" }, { status: 401 })
   }
-
-  // Derive encryption key
-  const key = await deriveKey(password, settings.encryptionSalt)
   const keyHex = key.toString("hex")
 
   // If TOTP is enrolled, return a pending token instead of a full session.
   // Don't reset the counter yet — TOTP verification is still pending.
   if (settings.totpSecret) {
     log.info({ event: "login_totp_pending", ip: clientIp }, "Password verified, awaiting TOTP")
-    const pendingToken = await createPendingToken(keyHex)
-    return NextResponse.json({ requiresTotp: true, pendingToken })
+    try {
+      const pendingToken = await createPendingToken(keyHex)
+      return NextResponse.json({ requiresTotp: true, pendingToken })
+    } catch (err) {
+      log.error(
+        { route: "POST /api/auth/login", error: errMsg(err) },
+        "Failed to create pending token after successful auth"
+      )
+      return NextResponse.json(
+        { error: "Login succeeded but session creation failed. Check server configuration." },
+        { status: 500 }
+      )
+    }
   }
 
   // No TOTP — login fully successful, reset failed attempts
   await resetFailedAttempts(settings.id)
-  await createSession(keyHex, settings.sessionTimeoutMinutes)
-  await persistSchedulerKey(key, settings.id)
-  startScheduler(key)
+  try {
+    await createSession(keyHex, settings.sessionTimeoutMinutes)
+    await persistSchedulerKey(key, settings.id)
+    startScheduler(key)
+  } catch (err) {
+    log.error(
+      { route: "POST /api/auth/login", error: errMsg(err) },
+      "Session creation failed after successful auth"
+    )
+    return NextResponse.json(
+      { error: "Login succeeded but session creation failed. Check server configuration." },
+      { status: 500 }
+    )
+  }
   log.info({ event: "login_success", ip: clientIp }, "Login successful")
 
   return NextResponse.json({ success: true })
diff --git a/src/app/api/auth/setup/route.ts b/src/app/api/auth/setup/route.ts
index d594411d..2ce8558f 100644
--- a/src/app/api/auth/setup/route.ts
+++ b/src/app/api/auth/setup/route.ts
@@ -1,20 +1,38 @@
 // src/app/api/auth/setup/route.ts
 import { NextResponse } from "next/server"
-import { parseJsonBody } from "@/lib/api-helpers"
+import { parseJsonBody, validateIntRange } from "@/lib/api-helpers"
 import { hashPassword } from "@/lib/auth"
 import { generateSalt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import {
+  PASSWORD_MAX,
+  PASSWORD_MIN,
+  SNAPSHOT_RETENTION_MAX,
+  SNAPSHOT_RETENTION_MIN,
+  USERNAME_MAX,
+  USERNAME_MIN,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 
 export async function POST(request: Request) {
   const body = await parseJsonBody(request)
   if (body instanceof NextResponse) return body
 
-  const { password, username } = body as { password?: string; username?: string }
-  if (!password || typeof password !== "string" || password.length < 8 || password.length > 128) {
+  const { password, username, snapshotRetentionDays } = body as {
+    password?: string
+    username?: string
+    snapshotRetentionDays?: number
+  }
+  if (
+    !password ||
+    typeof password !== "string" ||
+    password.length < PASSWORD_MIN ||
+    password.length > PASSWORD_MAX
+  ) {
     return NextResponse.json(
-      { error: "Password must be between 8 and 128 characters" },
+      { error: `Password must be between ${PASSWORD_MIN} and ${PASSWORD_MAX} characters` },
       { status: 400 }
     )
   }
@@ -23,9 +41,9 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "Username is required" }, { status: 400 })
   }
   const validatedUsername = username.trim()
-  if (validatedUsername.length < 3 || validatedUsername.length > 100) {
+  if (validatedUsername.length < USERNAME_MIN || validatedUsername.length > USERNAME_MAX) {
     return NextResponse.json(
-      { error: "Username must be between 3 and 100 characters" },
+      { error: `Username must be between ${USERNAME_MIN} and ${USERNAME_MAX} characters` },
       { status: 400 }
     )
   }
@@ -38,6 +56,28 @@ export async function POST(request: Request) {
     )
   }
 
+  // Validate optional retention setting
+  let validatedRetention: number | undefined
+  if (snapshotRetentionDays !== undefined) {
+    if (typeof snapshotRetentionDays !== "number") {
+      return NextResponse.json(
+        {
+          error: `snapshotRetentionDays must be an integer between ${SNAPSHOT_RETENTION_MIN} and ${SNAPSHOT_RETENTION_MAX}`,
+        },
+        { status: 400 }
+      )
+    }
+    const retentionErr = validateIntRange(
+      snapshotRetentionDays,
+      SNAPSHOT_RETENTION_MIN,
+      SNAPSHOT_RETENTION_MAX,
+      "snapshotRetentionDays",
+      `snapshotRetentionDays must be an integer between ${SNAPSHOT_RETENTION_MIN} and ${SNAPSHOT_RETENTION_MAX}`
+    )
+    if (retentionErr) return retentionErr
+    validatedRetention = snapshotRetentionDays
+  }
+
   // Fast pre-flight: skip expensive hashing if already configured
   const preCheck = await db.select({ id: appSettings.id }).from(appSettings).limit(1)
   if (preCheck.length > 0) {
@@ -49,22 +89,32 @@ export async function POST(request: Request) {
   const encryptionSalt = generateSalt()
 
   // Atomic check-and-insert with serializable isolation: prevents TOCTOU race
-  const inserted = await db.transaction(
-    async (tx) => {
-      const existing = await tx.select({ id: appSettings.id }).from(appSettings).limit(1)
-      if (existing.length > 0) return false
-      await tx.insert(appSettings).values({
-        passwordHash,
-        encryptionSalt,
-        username: validatedUsername,
-      })
-      return true
-    },
-    { isolationLevel: "serializable" }
-  )
+  let inserted: boolean
+  try {
+    inserted = await db.transaction(
+      async (tx) => {
+        const existing = await tx.select({ id: appSettings.id }).from(appSettings).limit(1)
+        if (existing.length > 0) return false
+        await tx.insert(appSettings).values({
+          passwordHash,
+          encryptionSalt,
+          username: validatedUsername,
+          ...(validatedRetention !== undefined && { snapshotRetentionDays: validatedRetention }),
+        })
+        return true
+      },
+      { isolationLevel: "serializable" }
+    )
+  } catch (err) {
+    log.error({ route: "POST /api/auth/setup", error: errMsg(err) }, "Setup transaction failed")
+    return NextResponse.json(
+      { error: "Setup failed due to a database error. Please try again." },
+      { status: 500 }
+    )
+  }
 
   if (!inserted) {
-    log.warn({ route: "POST /api/auth/setup" }, "setup rejected — race condition")
+    log.warn({ route: "POST /api/auth/setup" }, "setup rejected: race condition")
     return NextResponse.json({ error: "Already configured" }, { status: 400 })
   }
 
diff --git a/src/app/api/auth/status/route.ts b/src/app/api/auth/status/route.ts
index 6c871b9e..8fb0fa41 100644
--- a/src/app/api/auth/status/route.ts
+++ b/src/app/api/auth/status/route.ts
@@ -5,8 +5,13 @@ import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
 
 export async function GET() {
-  const [settings] = await db.select().from(appSettings).limit(1)
-  const session = await getSession()
+  const [[settings], session] = await Promise.all([
+    db
+      .select({ totpSecret: appSettings.totpSecret, username: appSettings.username })
+      .from(appSettings)
+      .limit(1),
+    getSession(),
+  ])
 
   return NextResponse.json({
     configured: !!settings,
diff --git a/src/app/api/auth/totp/confirm/route.ts b/src/app/api/auth/totp/confirm/route.ts
index 0cfdf53a..c8e397c0 100644
--- a/src/app/api/auth/totp/confirm/route.ts
+++ b/src/app/api/auth/totp/confirm/route.ts
@@ -11,8 +11,9 @@ import { verifySetupToken } from "@/lib/auth"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { TOTP_TOKEN_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { verifyTotpCode } from "@/lib/totp"
+import { TOTP_CODE_RE, verifyTotpCode } from "@/lib/totp"
 
 export async function POST(request: Request) {
   const auth = await authenticate()
@@ -27,10 +28,10 @@ export async function POST(request: Request) {
     enableBackupCodes?: boolean
   }
 
-  if (!setupToken || typeof setupToken !== "string" || setupToken.length > 2048) {
+  if (!setupToken || typeof setupToken !== "string" || setupToken.length > TOTP_TOKEN_MAX) {
     return NextResponse.json({ error: "Missing setup token" }, { status: 400 })
   }
-  if (!code || typeof code !== "string" || code.length !== 6 || !/^\d{6}$/.test(code)) {
+  if (!code || typeof code !== "string" || !TOTP_CODE_RE.test(code)) {
     return NextResponse.json({ error: "Invalid TOTP code — must be 6 digits" }, { status: 400 })
   }
 
diff --git a/src/app/api/auth/totp/disable/route.ts b/src/app/api/auth/totp/disable/route.ts
index 888a4ddf..b4121412 100644
--- a/src/app/api/auth/totp/disable/route.ts
+++ b/src/app/api/auth/totp/disable/route.ts
@@ -11,10 +11,16 @@ import { verifyPassword } from "@/lib/auth"
 import { decrypt, encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { PASSWORD_MAX } from "@/lib/limits"
 import { recordFailedAttempt, resetFailedAttempts } from "@/lib/lockout"
 import { log } from "@/lib/logger"
 import type { BackupCodeEntry } from "@/lib/totp"
-import { BACKUP_CODE_PATTERN, verifyAndConsumeBackupCode, verifyTotpCode } from "@/lib/totp"
+import {
+  BACKUP_CODE_PATTERN,
+  TOTP_CODE_RE,
+  verifyAndConsumeBackupCode,
+  verifyTotpCode,
+} from "@/lib/totp"
 
 export async function POST(request: Request) {
   const auth = await authenticate()
@@ -30,7 +36,7 @@ export async function POST(request: Request) {
   }
 
   // Password re-verification required to disable 2FA
-  if (!password || typeof password !== "string" || password.length > 128) {
+  if (!password || typeof password !== "string" || password.length > PASSWORD_MAX) {
     return NextResponse.json(
       { error: "Master password is required to disable 2FA" },
       { status: 400 }
@@ -86,7 +92,7 @@ export async function POST(request: Request) {
         .where(eq(appSettings.id, settings.id))
     }
   } else {
-    if (code.length !== 6 || !/^\d{6}$/.test(code)) {
+    if (!TOTP_CODE_RE.test(code)) {
       await recordFailedAttempt(settings.id, settings)
       return NextResponse.json({ error: "Invalid TOTP code — must be 6 digits" }, { status: 400 })
     }
diff --git a/src/app/api/auth/totp/verify/route.ts b/src/app/api/auth/totp/verify/route.ts
index 2a482af7..b75936fd 100644
--- a/src/app/api/auth/totp/verify/route.ts
+++ b/src/app/api/auth/totp/verify/route.ts
@@ -4,7 +4,7 @@
 //
 // Verifies a TOTP code (or backup code) during login. Exchanges a pending
 // token + valid code for a full session. This route is public (no session
-// cookie required — the user is mid-login).
+// cookie required since the user is mid-login).
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
@@ -14,12 +14,19 @@ import { extractClientIp } from "@/lib/client-ip"
 import { decrypt, encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { TOTP_TOKEN_MAX } from "@/lib/limits"
 import { checkLockout, recordFailedAttempt, resetFailedAttempts } from "@/lib/lockout"
 import { log } from "@/lib/logger"
 import { startScheduler } from "@/lib/scheduler"
 import { persistSchedulerKey } from "@/lib/scheduler-key-store"
 import type { BackupCodeEntry } from "@/lib/totp"
-import { BACKUP_CODE_PATTERN, verifyAndConsumeBackupCode, verifyTotpCode } from "@/lib/totp"
+import {
+  BACKUP_CODE_PATTERN,
+  TOTP_CODE_RE,
+  verifyAndConsumeBackupCode,
+  verifyTotpCode,
+} from "@/lib/totp"
 
 export async function POST(request: Request) {
   const body = await parseJsonBody(request)
@@ -33,7 +40,7 @@ export async function POST(request: Request) {
     isBackupCode?: boolean
   }
 
-  if (!pendingToken || typeof pendingToken !== "string" || pendingToken.length > 2048) {
+  if (!pendingToken || typeof pendingToken !== "string" || pendingToken.length > TOTP_TOKEN_MAX) {
     return NextResponse.json({ error: "Missing pending token" }, { status: 400 })
   }
   if (!code || typeof code !== "string") {
@@ -45,7 +52,7 @@ export async function POST(request: Request) {
     if (!BACKUP_CODE_PATTERN.test(code)) {
       return NextResponse.json({ error: "Invalid backup code format" }, { status: 400 })
     }
-  } else if (code.length !== 6 || !/^\d{6}$/.test(code)) {
+  } else if (!TOTP_CODE_RE.test(code)) {
     return NextResponse.json({ error: "Invalid TOTP code — must be 6 digits" }, { status: 400 })
   }
 
@@ -99,7 +106,13 @@ export async function POST(request: Request) {
       .where(eq(appSettings.id, settings.id))
   } else {
     // Verify TOTP code
-    const totpSecret = decrypt(settings.totpSecret, key)
+    let totpSecret: string
+    try {
+      totpSecret = decrypt(settings.totpSecret, key)
+    } catch {
+      log.error({ route: "POST /api/auth/totp/verify" }, "TOTP verify failed: decrypt error")
+      return NextResponse.json({ error: "Failed to decrypt TOTP secret" }, { status: 500 })
+    }
     if (!verifyTotpCode(totpSecret, code)) {
       await recordFailedAttempt(settings.id, settings)
       log.warn({ event: "totp_failed", method: "totp", ip: clientIp }, "Failed TOTP code attempt")
@@ -107,12 +120,26 @@ export async function POST(request: Request) {
     }
   }
 
-  // Code verified — login fully successful, reset failed attempts
+  // Code verified
   await resetFailedAttempts(settings.id)
 
-  await createSession(pending.encryptionKey, settings.sessionTimeoutMinutes)
-  await persistSchedulerKey(key, settings.id)
-  startScheduler(key)
+  try {
+    await createSession(pending.encryptionKey, settings.sessionTimeoutMinutes)
+    await persistSchedulerKey(key, settings.id)
+    startScheduler(key)
+  } catch (err) {
+    log.error(
+      {
+        route: "POST /api/auth/totp/verify",
+        error: errMsg(err),
+      },
+      "Session creation failed after successful 2FA"
+    )
+    return NextResponse.json(
+      { error: "Login succeeded but session creation failed. Check server configuration." },
+      { status: 500 }
+    )
+  }
   log.info(
     { event: "login_success", method: isBackupCode ? "backup_code" : "totp", ip: clientIp },
     "Login successful (2FA verified)"
diff --git a/src/app/api/changelog/route.ts b/src/app/api/changelog/route.ts
index 36d35727..18c1c4fc 100644
--- a/src/app/api/changelog/route.ts
+++ b/src/app/api/changelog/route.ts
@@ -3,15 +3,20 @@ import { readFile } from "node:fs/promises"
 import { join } from "node:path"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
+import { errMsg } from "@/lib/error-utils"
+import { log } from "@/lib/logger"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   try {
-    const content = await readFile(join(process.cwd(), "CHANGELOG.md"), "utf-8")
+    let content = await readFile(join(process.cwd(), "CHANGELOG.md"), "utf-8")
+    // Strip version header links for dialog display, keep plain text
+    content = content.replace(/## \[([^\]]+)\]\([^)]+\)/g, "## $1")
     return NextResponse.json({ content })
-  } catch {
+  } catch (err) {
+    log.warn({ err: errMsg(err) }, "[changelog] Failed to read CHANGELOG.md")
     return NextResponse.json({ content: "No changelog available." })
   }
 }
diff --git a/src/app/api/clients/[id]/route.ts b/src/app/api/clients/[id]/route.ts
index ea3d8c81..4b3c8ee5 100644
--- a/src/app/api/clients/[id]/route.ts
+++ b/src/app/api/clients/[id]/route.ts
@@ -1,6 +1,4 @@
 // src/app/api/clients/[id]/route.ts
-//
-// Functions: PATCH, DELETE
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
@@ -9,17 +7,30 @@ import {
   decodeKey,
   parseJsonBody,
   parseRouteId,
+  type RouteContext,
+  validateIntRange,
+  validateMaxLength,
   validatePort,
 } from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
+import { sanitizeHost } from "@/lib/data-transforms"
 import { db } from "@/lib/db"
 import { downloadClients } from "@/lib/db/schema"
+import { VALID_CLIENT_TYPES } from "@/lib/download-clients"
+import { errMsg } from "@/lib/error-utils"
+import {
+  CLIENT_POLL_INTERVAL_MAX,
+  CLIENT_POLL_INTERVAL_MIN,
+  CREDENTIAL_MAX,
+  CROSS_SEED_TAG_MAX,
+  CROSS_SEED_TAGS_MAX,
+  HOST_MAX,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { PROXY_HOST_PATTERN } from "@/lib/proxy"
-import { VALID_CLIENT_TYPES } from "@/lib/qbt/types"
-import { removeClientFromAccumulator } from "@/lib/uptime"
+import { PROXY_HOST_PATTERN } from "@/lib/tunnel"
+import { removeDownloadClientFromAccumulator } from "@/lib/uptime"
 
-export async function PATCH(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function PATCH(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -49,17 +60,15 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   }
 
   if (typeof body.name === "string") {
-    if (body.name.length > 255) {
-      return NextResponse.json({ error: "Name must be 255 characters or fewer" }, { status: 400 })
-    }
+    const nameErr = validateMaxLength(body.name, CREDENTIAL_MAX, "Name")
+    if (nameErr) return nameErr
     updates.name = body.name.trim()
   }
 
   if (typeof body.host === "string") {
-    if (body.host.length > 255) {
-      return NextResponse.json({ error: "Host must be 255 characters or fewer" }, { status: 400 })
-    }
-    const sanitizedHost = body.host.trim().replace(/^https?:\/\//, "")
+    const hostErr = validateMaxLength(body.host, HOST_MAX, "Host")
+    if (hostErr) return hostErr
+    const sanitizedHost = sanitizeHost(body.host)
     if (!PROXY_HOST_PATTERN.test(sanitizedHost)) {
       return NextResponse.json({ error: "Invalid host format" }, { status: 400 })
     }
@@ -83,12 +92,14 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   if (typeof body.enabled === "boolean") updates.enabled = body.enabled
 
   if (typeof body.pollIntervalSeconds === "number") {
-    if (body.pollIntervalSeconds < 60 || body.pollIntervalSeconds > 86400) {
-      return NextResponse.json(
-        { error: "Poll interval must be between 60 and 86400 seconds" },
-        { status: 400 }
-      )
-    }
+    const pollErr = validateIntRange(
+      body.pollIntervalSeconds,
+      CLIENT_POLL_INTERVAL_MIN,
+      CLIENT_POLL_INTERVAL_MAX,
+      "pollIntervalSeconds",
+      `Poll interval must be between ${CLIENT_POLL_INTERVAL_MIN} and ${CLIENT_POLL_INTERVAL_MAX} seconds`
+    )
+    if (pollErr) return pollErr
     updates.pollIntervalSeconds = body.pollIntervalSeconds
   }
 
@@ -96,7 +107,7 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
     if (!Array.isArray(body.crossSeedTags)) {
       return NextResponse.json({ error: "crossSeedTags must be an array" }, { status: 400 })
     }
-    if (body.crossSeedTags.length > 50) {
+    if (body.crossSeedTags.length > CROSS_SEED_TAGS_MAX) {
       return NextResponse.json(
         { error: "Cannot specify more than 50 cross-seed tags" },
         { status: 400 }
@@ -104,7 +115,7 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
     }
     if (
       !body.crossSeedTags.every(
-        (t: unknown) => typeof t === "string" && t.length > 0 && t.length <= 100
+        (t: unknown) => typeof t === "string" && t.length > 0 && t.length <= CROSS_SEED_TAG_MAX
       )
     ) {
       return NextResponse.json(
@@ -116,38 +127,41 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   }
 
   if (typeof body.username === "string") {
-    if (body.username.length > 255) {
-      return NextResponse.json(
-        { error: "Username must be 255 characters or fewer" },
-        { status: 400 }
-      )
-    }
+    const usernameErr = validateMaxLength(body.username, CREDENTIAL_MAX, "Username")
+    if (usernameErr) return usernameErr
     updates.encryptedUsername = encrypt(body.username, getKey())
   }
 
   if (typeof body.password === "string") {
-    if (body.password.length > 255) {
-      return NextResponse.json(
-        { error: "Password must be 255 characters or fewer" },
-        { status: 400 }
-      )
-    }
+    const passwordErr = validateMaxLength(body.password, CREDENTIAL_MAX, "Password")
+    if (passwordErr) return passwordErr
     updates.encryptedPassword = encrypt(body.password, getKey())
   }
 
   if (body.isDefault === true) {
-    await db.update(downloadClients).set({ isDefault: false })
     updates.isDefault = true
   } else if (body.isDefault === false) {
     updates.isDefault = false
   }
 
-  await db.update(downloadClients).set(updates).where(eq(downloadClients.id, clientId))
-
-  return NextResponse.json({ success: true })
+  try {
+    await db.transaction(async (tx) => {
+      if (body.isDefault === true) {
+        await tx.update(downloadClients).set({ isDefault: false })
+      }
+      await tx.update(downloadClients).set(updates).where(eq(downloadClients.id, clientId))
+    })
+    return NextResponse.json({ success: true })
+  } catch (err) {
+    log.error(
+      { route: "PATCH /api/clients/[id]", clientId, error: errMsg(err) },
+      "Failed to update download client"
+    )
+    return NextResponse.json({ error: "Failed to update download client" }, { status: 500 })
+  }
 }
 
-export async function DELETE(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function DELETE(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -165,7 +179,7 @@ export async function DELETE(_request: Request, props: { params: Promise<{ id: s
     return NextResponse.json({ error: "Client not found" }, { status: 404 })
   }
 
-  removeClientFromAccumulator(clientId)
+  removeDownloadClientFromAccumulator(clientId)
 
   await db.transaction(async (tx) => {
     await tx.delete(downloadClients).where(eq(downloadClients.id, clientId))
diff --git a/src/app/api/clients/[id]/snapshots/route.ts b/src/app/api/clients/[id]/snapshots/route.ts
index 9e4c8062..098ea9be 100644
--- a/src/app/api/clients/[id]/snapshots/route.ts
+++ b/src/app/api/clients/[id]/snapshots/route.ts
@@ -4,11 +4,11 @@
 
 import { desc, eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseRouteId } from "@/lib/api-helpers"
+import { authenticate, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { clientSnapshots } from "@/lib/db/schema"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -25,6 +25,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
   // Serialize bigints to strings for JSON transport
   const serialized = snapshots.map((s) => ({
     ...s,
+    polledAt: s.polledAt.toISOString(),
     uploadSpeedBytes: s.uploadSpeedBytes?.toString() ?? null,
     downloadSpeedBytes: s.downloadSpeedBytes?.toString() ?? null,
     tagStats: (() => {
diff --git a/src/app/api/clients/[id]/speeds/route.ts b/src/app/api/clients/[id]/speeds/route.ts
index 9681ca51..8d9cd5b6 100644
--- a/src/app/api/clients/[id]/speeds/route.ts
+++ b/src/app/api/clients/[id]/speeds/route.ts
@@ -1,10 +1,10 @@
 // src/app/api/clients/[id]/speeds/route.ts
 
 import { NextResponse } from "next/server"
-import { authenticate, parseRouteId } from "@/lib/api-helpers"
-import { getSpeedSnapshots } from "@/lib/qbt"
+import { authenticate, parseRouteId, type RouteContext } from "@/lib/api-helpers"
+import { getSpeedSnapshots } from "@/lib/download-clients"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
diff --git a/src/app/api/clients/[id]/test/route.ts b/src/app/api/clients/[id]/test/route.ts
index 46de3ee4..5b3ddb8e 100644
--- a/src/app/api/clients/[id]/test/route.ts
+++ b/src/app/api/clients/[id]/test/route.ts
@@ -2,71 +2,28 @@
 //
 // Functions: POST
 
-import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseRouteId } from "@/lib/api-helpers"
-import { decryptClientCredentials } from "@/lib/client-decrypt"
-import { db } from "@/lib/db"
-import { downloadClients } from "@/lib/db/schema"
-import { isDecryptionError } from "@/lib/error-utils"
+import { authenticate, decodeKey, parseRouteId, type RouteContext } from "@/lib/api-helpers"
+import { testClientConnection } from "@/lib/download-clients"
 import { log } from "@/lib/logger"
-import { buildBaseUrl, getTransferInfo, invalidateSession, login } from "@/lib/qbt"
 
-export async function POST(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const clientId = await parseRouteId(props.params, "client ID")
   if (clientId instanceof NextResponse) return clientId
 
-  const [client] = await db
-    .select()
-    .from(downloadClients)
-    .where(eq(downloadClients.id, clientId))
-    .limit(1)
-
-  if (!client) {
-    return NextResponse.json({ error: "Client not found" }, { status: 404 })
-  }
-
   const key = decodeKey(auth)
+  const out = await testClientConnection(clientId, key)
 
-  let username: string
-  let password: string
-  try {
-    ;({ username, password } = decryptClientCredentials(client, key))
-  } catch (err) {
-    if (isDecryptionError(err)) {
-      log.warn(
-        { route: "POST /api/clients/[id]/test", clientId },
-        "client test failed — stale session key"
-      )
-      return NextResponse.json({ error: "Session expired — please log in again" }, { status: 401 })
-    }
-    log.error(
-      { route: "POST /api/clients/[id]/test", clientId },
-      "client test failed — credential decrypt error"
-    )
-    return NextResponse.json({ error: "Failed to decrypt credentials" }, { status: 422 })
-  }
-
-  try {
-    // Force a fresh login for explicit connection tests — don't use cached SID
-    const baseUrl = buildBaseUrl(client.host, client.port, client.useSsl)
-    invalidateSession(baseUrl)
-    const sid = await login(client.host, client.port, client.useSsl, username, password)
-    await getTransferInfo(baseUrl, sid)
-    return NextResponse.json({ success: true })
-  } catch (error) {
-    const raw = error instanceof Error ? error.message : ""
-    let detail = ""
-    if (/timed?\s*out/i.test(raw)) detail = " (timed out)"
-    else if (/ECONNREFUSED/i.test(raw)) detail = " (ECONNREFUSED)"
-    else if (/403/.test(raw)) detail = " (403)"
+  if ("error" in out) {
     log.warn(
-      { route: "POST /api/clients/[id]/test", clientId, error: `Connection test failed${detail}` },
+      { route: "POST /api/clients/[id]/test", clientId, error: out.error },
       "client connection test failed"
     )
-    return NextResponse.json({ error: `Connection test failed${detail}` }, { status: 422 })
+    return NextResponse.json({ error: out.error }, { status: out.status })
   }
+
+  return NextResponse.json(out)
 }
diff --git a/src/app/api/clients/[id]/torrents/route.ts b/src/app/api/clients/[id]/torrents/route.ts
index fcb1f7bd..1d1ed7bc 100644
--- a/src/app/api/clients/[id]/torrents/route.ts
+++ b/src/app/api/clients/[id]/torrents/route.ts
@@ -4,15 +4,14 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseRouteId } from "@/lib/api-helpers"
-import { decryptClientCredentials } from "@/lib/client-decrypt"
+import { authenticate, decodeKey, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { downloadClients } from "@/lib/db/schema"
-import { isDecryptionError } from "@/lib/error-utils"
+import { createAdapterForClient, stripSensitiveTorrentFields } from "@/lib/download-clients"
+import { isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
 import { log } from "@/lib/logger"
-import { getTorrents, withSessionRetry } from "@/lib/qbt"
 
-export async function GET(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -26,7 +25,16 @@ export async function GET(request: Request, props: { params: Promise<{ id: strin
   }
 
   const [client] = await db
-    .select()
+    .select({
+      name: downloadClients.name,
+      host: downloadClients.host,
+      port: downloadClients.port,
+      useSsl: downloadClients.useSsl,
+      encryptedUsername: downloadClients.encryptedUsername,
+      encryptedPassword: downloadClients.encryptedPassword,
+      crossSeedTags: downloadClients.crossSeedTags,
+      type: downloadClients.type,
+    })
     .from(downloadClients)
     .where(eq(downloadClients.id, clientId))
     .limit(1)
@@ -37,52 +45,25 @@ export async function GET(request: Request, props: { params: Promise<{ id: strin
 
   const key = decodeKey(auth)
 
-  let username: string
-  let password: string
   try {
-    ;({ username, password } = decryptClientCredentials(client, key))
-  } catch (err) {
-    if (isDecryptionError(err)) {
-      log.warn(
-        { route: "GET /api/clients/[id]/torrents", clientId },
-        "torrent fetch failed — stale session key"
-      )
+    const adapter = createAdapterForClient(client, key)
+    const torrents = await adapter.getTorrents({ tag: tag.trim() })
+    return NextResponse.json(torrents.map(stripSensitiveTorrentFields))
+  } catch (error) {
+    if (isDecryptionError(error)) {
+      log.warn({ route: "GET /api/clients/[id]/torrents", clientId }, "failed — stale session key")
       return NextResponse.json({ error: "Session expired. Please log in again" }, { status: 401 })
     }
-    log.error(
-      { route: "GET /api/clients/[id]/torrents", clientId },
-      "torrent fetch failed — credential decrypt error"
-    )
-    return NextResponse.json({ error: "Failed to decrypt credentials" }, { status: 422 })
-  }
-
-  try {
-    const torrents = await withSessionRetry(
-      client.host,
-      client.port,
-      client.useSsl,
-      username,
-      password,
-      (baseUrl, sid) => getTorrents(baseUrl, sid, tag.trim())
-    )
-    return NextResponse.json(torrents)
-  } catch (error) {
     const raw = error instanceof Error ? error.message : ""
-    let detail = ""
-    if (/timed?\s*out/i.test(raw)) detail = " (timed out)"
-    else if (/ECONNREFUSED/i.test(raw)) detail = " (ECONNREFUSED)"
-    else if (/403/.test(raw)) detail = " (403)"
+    const message = sanitizeNetworkError(raw, "Failed to fetch torrents")
     log.error(
       {
         route: "GET /api/clients/[id]/torrents",
         clientId,
-        error: `Failed to fetch torrents${detail}`,
+        error: message,
       },
       "torrent fetch failed"
     )
-    return NextResponse.json(
-      { error: `Failed to fetch torrents from client${detail}` },
-      { status: 502 }
-    )
+    return NextResponse.json({ error: message }, { status: 502 })
   }
 }
diff --git a/src/app/api/clients/[id]/uptime/route.ts b/src/app/api/clients/[id]/uptime/route.ts
index f4025699..199c8469 100644
--- a/src/app/api/clients/[id]/uptime/route.ts
+++ b/src/app/api/clients/[id]/uptime/route.ts
@@ -1,14 +1,12 @@
 // src/app/api/clients/[id]/uptime/route.ts
-//
-// Functions: GET
 
 import { and, eq, gte } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseRouteId } from "@/lib/api-helpers"
+import { authenticate, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { clientUptimeBuckets, downloadClients } from "@/lib/db/schema"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -44,5 +42,9 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
   const total = totalOk + totalFail
   const uptimePercent = total > 0 ? Math.round((totalOk / total) * 1000) / 10 : null
 
-  return NextResponse.json({ buckets, uptimePercent })
+  const serializedBuckets = buckets.map((b) => ({
+    ...b,
+    bucketTs: b.bucketTs.toISOString(),
+  }))
+  return NextResponse.json({ buckets: serializedBuckets, uptimePercent })
 }
diff --git a/src/app/api/clients/client-routes.test.ts b/src/app/api/clients/client-routes.test.ts
index a6af0ad7..4043607c 100644
--- a/src/app/api/clients/client-routes.test.ts
+++ b/src/app/api/clients/client-routes.test.ts
@@ -1,15 +1,10 @@
 // src/app/api/clients/client-routes.test.ts
-//
-// Functions:
-//   mockDbSelectClient  - Sets up db.select chain returning one client or empty
-//   makeRequest         - Constructs a Request for GET handler calls
 
 import { NextResponse } from "next/server"
 import { beforeEach, describe, expect, it, vi } from "vitest"
 import { authenticate } from "@/lib/api-helpers"
-import { decrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
-import { getTorrents, withSessionRetry } from "@/lib/qbt"
+import { createAdapterForClient } from "@/lib/download-clients"
 import { GET } from "./[id]/torrents/route"
 
 // ---------------------------------------------------------------------------
@@ -33,25 +28,22 @@ vi.mock("@/lib/db", () => ({
   },
 }))
 
-vi.mock("@/lib/crypto", () => ({
-  decrypt: vi.fn(),
-}))
+const mockAdapter = {
+  type: "qbittorrent" as const,
+  baseUrl: "http://192.168.1.100:8080",
+  testConnection: vi.fn(),
+  getTorrents: vi.fn().mockResolvedValue([]),
+  getTransferInfo: vi.fn().mockResolvedValue({ uploadSpeed: 0, downloadSpeed: 0 }),
+  getDeltaSync: vi.fn(),
+  dispose: vi.fn(),
+}
 
-vi.mock("@/lib/qbt", () => ({
-  getTorrents: vi.fn(),
-  // withSessionRetry: by default, call op with a fixed baseUrl+sid so the
-  // getTorrents mock still fires normally. Individual tests that need to
-  // simulate upstream errors replace this with vi.fn().mockRejectedValue(...).
-  withSessionRetry: vi.fn(
-    async (
-      _host: string,
-      _port: number,
-      _ssl: boolean,
-      _username: string,
-      _password: string,
-      op: (baseUrl: string, sid: string) => Promise<unknown>
-    ) => op("http://192.168.1.100:8080", "sid-token")
-  ),
+vi.mock("@/lib/download-clients", () => ({
+  createAdapterForClient: vi.fn(() => mockAdapter),
+  stripSensitiveTorrentFields: vi.fn((t: Record<string, unknown>) => {
+    const { tracker: _t, content_path: _cp, save_path: _sp, ...rest } = t
+    return rest
+  }),
 }))
 
 // ---------------------------------------------------------------------------
@@ -139,6 +131,8 @@ describe("GET /api/clients/[id]/torrents", () => {
     ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
       encryptionKey: VALID_KEY,
     })
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
   })
 
   // -------------------------------------------------------------------------
@@ -240,8 +234,10 @@ describe("GET /api/clients/[id]/torrents", () => {
 
   it("returns 401 when credential decryption fails", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>).mockImplementation(() => {
-      throw new Error("decryption error")
+    // Decryption now happens inside createAdapterForClient. Simulate it throwing
+    // an AES-GCM authentication failure, which isDecryptionError detects as 401.
+    vi.mocked(createAdapterForClient).mockImplementation(() => {
+      throw new Error("EVP_DecryptFinal_ex: bad decrypt")
     })
 
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=aither")
@@ -251,7 +247,6 @@ describe("GET /api/clients/[id]/torrents", () => {
 
     expect(response.status).toBe(401)
     expect(data.error).toMatch(/session expired/i)
-    // Response body must not contain the encryption key or the encrypted credential strings
     const body = JSON.stringify(data)
     expect(body).not.toContain(VALID_KEY)
     expect(body).not.toContain(MOCK_CLIENT.encryptedUsername)
@@ -264,10 +259,7 @@ describe("GET /api/clients/[id]/torrents", () => {
 
   it("returns 502 when qBT login fails with authentication error", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(withSessionRetry as ReturnType<typeof vi.fn>).mockRejectedValue(
+    mockAdapter.getTorrents.mockRejectedValue(
       new Error("Authentication failed — check username and password")
     )
 
@@ -277,17 +269,12 @@ describe("GET /api/clients/[id]/torrents", () => {
     const data = await response.json()
 
     expect(response.status).toBe(502)
-    expect(data.error).toBe("Failed to fetch torrents from client")
+    expect(data.error).toBe("Failed to fetch torrents")
   })
 
   it("returns 502 when qBT connection times out", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(withSessionRetry as ReturnType<typeof vi.fn>).mockRejectedValue(
-      new Error("Request to 192.168.1.100 timed out")
-    )
+    mockAdapter.getTorrents.mockRejectedValue(new Error("Request to 192.168.1.100 timed out"))
 
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=aither")
     const params = Promise.resolve({ id: "1" })
@@ -300,12 +287,7 @@ describe("GET /api/clients/[id]/torrents", () => {
 
   it("returns 502 when getTorrents fails", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockRejectedValue(
-      new Error("qBittorrent API error: 403 Forbidden")
-    )
+    mockAdapter.getTorrents.mockRejectedValue(new Error("qBittorrent API error: 403 Forbidden"))
 
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=aither")
     const params = Promise.resolve({ id: "1" })
@@ -324,10 +306,7 @@ describe("GET /api/clients/[id]/torrents", () => {
     // Note: if the upstream error already contains them, that is a known risk
     // outside this handler's control — this test validates the handler itself.
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("plaintext-user")
-      .mockReturnValueOnce("plaintext-pass")
-    ;(withSessionRetry as ReturnType<typeof vi.fn>).mockRejectedValue(
+    mockAdapter.getTorrents.mockRejectedValue(
       new Error("upstream error with no credential content")
     )
 
@@ -336,7 +315,7 @@ describe("GET /api/clients/[id]/torrents", () => {
     const response = await GET(request, { params })
     const data = await response.json()
 
-    // The handler must not inject the plaintext credentials into its own error output
+    // The handler must not inject plaintext credentials into its own error output
     expect(data.error).not.toContain("plaintext-user")
     expect(data.error).not.toContain("plaintext-pass")
   })
@@ -347,10 +326,7 @@ describe("GET /api/clients/[id]/torrents", () => {
 
   it("returns torrent array on success", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TORRENTS)
+    mockAdapter.getTorrents.mockResolvedValue(MOCK_TORRENTS)
 
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=aither")
     const params = Promise.resolve({ id: "1" })
@@ -370,36 +346,26 @@ describe("GET /api/clients/[id]/torrents", () => {
 
   it("passes the tag to getTorrents for server-side filtering", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
 
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=aither")
     const params = Promise.resolve({ id: "1" })
     await GET(request, { params })
 
-    // If this assertion fails, the route is not passing the tag to getTorrents,
+    // If this assertion fails, the route is not passing the tag to adapter.getTorrents,
     // meaning it would fall back to fetching all torrents — the optimization is broken.
-    const getTorrentsCalls = (getTorrents as ReturnType<typeof vi.fn>).mock.calls
-    expect(getTorrentsCalls).toHaveLength(1)
-    expect(getTorrentsCalls[0][2]).toBe("aither")
+    expect(mockAdapter.getTorrents).toHaveBeenCalledOnce()
+    expect(mockAdapter.getTorrents).toHaveBeenCalledWith({ tag: "aither" })
   })
 
   it("trims whitespace from tag before querying getTorrents", async () => {
     mockDbSelectClient(MOCK_CLIENT)
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
 
     // %20aither%20 decodes to " aither " — should be trimmed to "aither"
     const request = makeRequest("http://localhost/api/clients/1/torrents?tag=%20aither%20")
     const params = Promise.resolve({ id: "1" })
     await GET(request, { params })
 
-    const getTorrentsCalls = (getTorrents as ReturnType<typeof vi.fn>).mock.calls
-    expect(getTorrentsCalls).toHaveLength(1)
-    expect(getTorrentsCalls[0][2]).toBe("aither")
+    expect(mockAdapter.getTorrents).toHaveBeenCalledOnce()
+    expect(mockAdapter.getTorrents).toHaveBeenCalledWith({ tag: "aither" })
   })
 })
diff --git a/src/app/api/clients/route.ts b/src/app/api/clients/route.ts
index cb3bab77..64906e28 100644
--- a/src/app/api/clients/route.ts
+++ b/src/app/api/clients/route.ts
@@ -3,42 +3,39 @@
 // Functions: GET, POST
 
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseJsonBody, validatePort } from "@/lib/api-helpers"
+import {
+  authenticate,
+  decodeKey,
+  parseJsonBody,
+  validateIntRange,
+  validateMaxLength,
+  validatePort,
+} from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
+import { sanitizeHost } from "@/lib/data-transforms"
 import { db } from "@/lib/db"
 import { downloadClients } from "@/lib/db/schema"
+import { VALID_CLIENT_TYPES } from "@/lib/download-clients"
+import { errMsg } from "@/lib/error-utils"
+import {
+  CLIENT_POLL_INTERVAL_DEFAULT,
+  CLIENT_POLL_INTERVAL_MAX,
+  CLIENT_POLL_INTERVAL_MIN,
+  CREDENTIAL_MAX,
+  CROSS_SEED_TAG_MAX,
+  CROSS_SEED_TAGS_MAX,
+  HOST_MAX,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { PROXY_HOST_PATTERN } from "@/lib/proxy"
-import { parseCrossSeedTags } from "@/lib/qbt"
-import { VALID_CLIENT_TYPES } from "@/lib/qbt/types"
+import { fetchDownloadClients, serializeDownloadClientResponse } from "@/lib/server-data"
+import { PROXY_HOST_PATTERN } from "@/lib/tunnel"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const clients = await db.select().from(downloadClients).orderBy(downloadClients.createdAt)
-
-  // SECURITY: Never return encryptedUsername or encryptedPassword
-  const safe = clients.map((client) => ({
-    id: client.id,
-    name: client.name,
-    type: client.type,
-    enabled: client.enabled,
-    host: client.host,
-    port: client.port,
-    useSsl: client.useSsl,
-    hasCredentials: !!(client.encryptedUsername && client.encryptedPassword),
-    pollIntervalSeconds: client.pollIntervalSeconds,
-    isDefault: client.isDefault,
-    crossSeedTags: parseCrossSeedTags(client.crossSeedTags),
-    lastPolledAt: client.lastPolledAt,
-    lastError: client.lastError,
-    errorSince: client.errorSince,
-    createdAt: client.createdAt,
-    updatedAt: client.updatedAt,
-  }))
-
-  return NextResponse.json(safe)
+  const clients = await fetchDownloadClients()
+  return NextResponse.json(clients.map(serializeDownloadClientResponse))
 }
 
 export async function POST(request: Request) {
@@ -88,23 +85,19 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "Invalid field types" }, { status: 400 })
   }
 
-  if (name.length > 255) {
-    return NextResponse.json({ error: "Name must be 255 characters or fewer" }, { status: 400 })
-  }
+  const nameErr = validateMaxLength(name, CREDENTIAL_MAX, "Name")
+  if (nameErr) return nameErr
 
-  if (host.length > 255) {
-    return NextResponse.json({ error: "Host must be 255 characters or fewer" }, { status: 400 })
-  }
+  const hostErr = validateMaxLength(host, HOST_MAX, "Host")
+  if (hostErr) return hostErr
 
-  if (username.length > 255) {
-    return NextResponse.json({ error: "Username must be 255 characters or fewer" }, { status: 400 })
-  }
+  const usernameErr = validateMaxLength(username, CREDENTIAL_MAX, "Username")
+  if (usernameErr) return usernameErr
 
-  if (password.length > 255) {
-    return NextResponse.json({ error: "Password must be 255 characters or fewer" }, { status: 400 })
-  }
+  const passwordErr = validateMaxLength(password, CREDENTIAL_MAX, "Password")
+  if (passwordErr) return passwordErr
 
-  const sanitizedHost = host.trim().replace(/^https?:\/\//, "")
+  const sanitizedHost = sanitizeHost(host)
   if (!PROXY_HOST_PATTERN.test(sanitizedHost)) {
     return NextResponse.json({ error: "Invalid host format" }, { status: 400 })
   }
@@ -118,14 +111,15 @@ export async function POST(request: Request) {
   const portErr = validatePort(resolvedPort)
   if (portErr) return portErr
 
-  if (
-    typeof pollIntervalSeconds === "number" &&
-    (pollIntervalSeconds < 60 || pollIntervalSeconds > 86400)
-  ) {
-    return NextResponse.json(
-      { error: "Poll interval must be between 60 and 86400 seconds" },
-      { status: 400 }
+  if (typeof pollIntervalSeconds === "number") {
+    const pollErr = validateIntRange(
+      pollIntervalSeconds,
+      CLIENT_POLL_INTERVAL_MIN,
+      CLIENT_POLL_INTERVAL_MAX,
+      "pollIntervalSeconds",
+      `Poll interval must be between ${CLIENT_POLL_INTERVAL_MIN} and ${CLIENT_POLL_INTERVAL_MAX} seconds`
     )
+    if (pollErr) return pollErr
   }
 
   const key = decodeKey(auth)
@@ -135,7 +129,7 @@ export async function POST(request: Request) {
   const resolvedIsDefault = typeof isDefault === "boolean" ? isDefault : false
   const resolvedTags = Array.isArray(crossSeedTags) ? crossSeedTags : []
 
-  if (resolvedTags.length > 50) {
+  if (resolvedTags.length > CROSS_SEED_TAGS_MAX) {
     return NextResponse.json(
       { error: "Cannot specify more than 50 cross-seed tags" },
       { status: 400 }
@@ -144,7 +138,9 @@ export async function POST(request: Request) {
 
   if (
     resolvedTags.length > 0 &&
-    !resolvedTags.every((t: unknown) => typeof t === "string" && t.length > 0 && t.length <= 100)
+    !resolvedTags.every(
+      (t: unknown) => typeof t === "string" && t.length > 0 && t.length <= CROSS_SEED_TAG_MAX
+    )
   ) {
     return NextResponse.json(
       { error: "Each cross-seed tag must be a non-empty string of 100 characters or fewer" },
@@ -152,27 +148,38 @@ export async function POST(request: Request) {
     )
   }
 
-  if (resolvedIsDefault) {
-    await db.update(downloadClients).set({ isDefault: false })
-  }
-
-  const [client] = await db
-    .insert(downloadClients)
-    .values({
-      name: name.trim(),
-      host: sanitizedHost,
-      type: resolvedType,
-      port: resolvedPort,
-      useSsl: typeof useSsl === "boolean" ? useSsl : false,
-      encryptedUsername,
-      encryptedPassword,
-      pollIntervalSeconds: typeof pollIntervalSeconds === "number" ? pollIntervalSeconds : 300,
-      isDefault: resolvedIsDefault,
-      crossSeedTags: resolvedTags,
+  try {
+    const [client] = await db.transaction(async (tx) => {
+      if (resolvedIsDefault) {
+        await tx.update(downloadClients).set({ isDefault: false })
+      }
+      return tx
+        .insert(downloadClients)
+        .values({
+          name: name.trim(),
+          host: sanitizedHost,
+          type: resolvedType,
+          port: resolvedPort,
+          useSsl: typeof useSsl === "boolean" ? useSsl : false,
+          encryptedUsername,
+          encryptedPassword,
+          pollIntervalSeconds:
+            typeof pollIntervalSeconds === "number"
+              ? pollIntervalSeconds
+              : CLIENT_POLL_INTERVAL_DEFAULT,
+          isDefault: resolvedIsDefault,
+          crossSeedTags: resolvedTags,
+        })
+        .returning()
     })
-    .returning()
 
-  // SECURITY: Only return safe fields
-  log.info({ route: "POST /api/clients", clientId: client.id }, "download client created")
-  return NextResponse.json({ id: client.id, name: client.name }, { status: 201 })
+    log.info({ route: "POST /api/clients", clientId: client.id }, "download client created")
+    return NextResponse.json({ id: client.id, name: client.name }, { status: 201 })
+  } catch (err) {
+    log.error(
+      { route: "POST /api/clients", error: errMsg(err) },
+      "Failed to create download client"
+    )
+    return NextResponse.json({ error: "Failed to create download client" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/fleet/snapshots/route.ts b/src/app/api/fleet/snapshots/route.ts
index 12f58223..0058e1c4 100644
--- a/src/app/api/fleet/snapshots/route.ts
+++ b/src/app/api/fleet/snapshots/route.ts
@@ -5,11 +5,15 @@
 // Returns historical client snapshots with parsed tagStats for all clients.
 // Query param: ?days=N (default 7, max 365)
 
-import { gte } from "drizzle-orm"
+import { desc, gte, sql } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { clientSnapshots, downloadClients } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { FLEET_SNAPSHOT_QUERY_MAX } from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { getSnapshotBucket } from "@/lib/server-data"
 
 export async function GET(request: Request) {
   const auth = await authenticate()
@@ -17,39 +21,76 @@ export async function GET(request: Request) {
 
   const url = new URL(request.url)
   const daysParam = parseInt(url.searchParams.get("days") ?? "7", 10)
-  const days = Math.min(Math.max(1, Number.isNaN(daysParam) ? 7 : daysParam), 365)
+  const days = Math.min(
+    Math.max(1, Number.isNaN(daysParam) ? 7 : daysParam),
+    FLEET_SNAPSHOT_QUERY_MAX
+  )
 
   const cutoff = new Date(Date.now() - days * 24 * 60 * 60 * 1000)
 
-  const clients = await db
-    .select({ id: downloadClients.id, name: downloadClients.name })
-    .from(downloadClients)
-
-  const clientNameMap = new Map(clients.map((c) => [c.id, c.name]))
-
-  const snapshots = await db
-    .select()
-    .from(clientSnapshots)
-    .where(gte(clientSnapshots.polledAt, cutoff))
-
-  const serialized = snapshots.map((s) => ({
-    clientId: s.clientId,
-    clientName: clientNameMap.get(s.clientId) ?? `Client ${s.clientId}`,
-    polledAt: s.polledAt.toISOString(),
-    totalSeedingCount: s.totalSeedingCount,
-    totalLeechingCount: s.totalLeechingCount,
-    uploadSpeedBytes: s.uploadSpeedBytes?.toString() ?? null,
-    downloadSpeedBytes: s.downloadSpeedBytes?.toString() ?? null,
-    tagStats: s.tagStats
+  try {
+    const bucket = getSnapshotBucket(days)
+
+    const clientSnapshotColumns = {
+      clientId: clientSnapshots.clientId,
+      polledAt: clientSnapshots.polledAt,
+      totalSeedingCount: clientSnapshots.totalSeedingCount,
+      totalLeechingCount: clientSnapshots.totalLeechingCount,
+      uploadSpeedBytes: clientSnapshots.uploadSpeedBytes,
+      downloadSpeedBytes: clientSnapshots.downloadSpeedBytes,
+      tagStats: clientSnapshots.tagStats,
+    }
+
+    const snapshotQuery = bucket
       ? (() => {
-          try {
-            return JSON.parse(s.tagStats) as unknown
-          } catch {
-            return null
-          }
+          const bucketExpr = sql`date_trunc(${sql.raw(`'${bucket}'`)}, ${clientSnapshots.polledAt})`
+          return db
+            .selectDistinctOn([clientSnapshots.clientId, bucketExpr], clientSnapshotColumns)
+            .from(clientSnapshots)
+            .where(gte(clientSnapshots.polledAt, cutoff))
+            .orderBy(clientSnapshots.clientId, bucketExpr, desc(clientSnapshots.polledAt))
         })()
-      : null,
-  }))
+      : db
+          .select(clientSnapshotColumns)
+          .from(clientSnapshots)
+          .where(gte(clientSnapshots.polledAt, cutoff))
+
+    const [clients, snapshots] = await Promise.all([
+      db.select({ id: downloadClients.id, name: downloadClients.name }).from(downloadClients),
+      snapshotQuery,
+    ])
+
+    const clientNameMap = new Map(clients.map((c) => [c.id, c.name]))
+
+    const serialized = snapshots.map((s) => ({
+      clientId: s.clientId,
+      clientName: clientNameMap.get(s.clientId) ?? `Client ${s.clientId}`,
+      polledAt: s.polledAt.toISOString(),
+      totalSeedingCount: s.totalSeedingCount,
+      totalLeechingCount: s.totalLeechingCount,
+      uploadSpeedBytes: s.uploadSpeedBytes?.toString() ?? null,
+      downloadSpeedBytes: s.downloadSpeedBytes?.toString() ?? null,
+      tagStats: s.tagStats
+        ? (() => {
+            try {
+              return JSON.parse(s.tagStats) as unknown
+            } catch {
+              log.warn(
+                { clientId: s.clientId, polledAt: s.polledAt.toISOString() },
+                "Corrupt tagStats JSON in client snapshot"
+              )
+              return null
+            }
+          })()
+        : null,
+    }))
 
-  return NextResponse.json(serialized)
+    return NextResponse.json(serialized)
+  } catch (err) {
+    log.error(
+      { route: "GET /api/fleet/snapshots", error: errMsg(err) },
+      "Failed to fetch fleet snapshots"
+    )
+    return NextResponse.json({ error: "Failed to load fleet snapshots" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/fleet/torrents/cached/route.ts b/src/app/api/fleet/torrents/cached/route.ts
index 74e1e1ca..a759fd7e 100644
--- a/src/app/api/fleet/torrents/cached/route.ts
+++ b/src/app/api/fleet/torrents/cached/route.ts
@@ -1,83 +1,24 @@
 // src/app/api/fleet/torrents/cached/route.ts
 //
 // Functions: GET
-//
-// Returns cached torrent data from the last deep poll across all clients.
-// Reads from downloadClients.cachedTorrents (populated by client-scheduler).
-// No live qBT HTTP requests — DB read only.
 
-import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
-import { db } from "@/lib/db"
-import { downloadClients } from "@/lib/db/schema"
-import { parseCrossSeedTags, type QbtTorrent } from "@/lib/qbt"
-import { aggregateCrossSeedTags, mergeTorrentLists } from "@/lib/qbt/merge"
+import { fetchFleetAggregation } from "@/lib/download-clients"
+import { log } from "@/lib/logger"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const clients = await db
-    .select({
-      id: downloadClients.id,
-      name: downloadClients.name,
-      cachedTorrents: downloadClients.cachedTorrents,
-      cachedTorrentsAt: downloadClients.cachedTorrentsAt,
-      crossSeedTags: downloadClients.crossSeedTags,
-    })
-    .from(downloadClients)
-    .where(eq(downloadClients.enabled, true))
-
-  if (clients.length === 0) {
-    return NextResponse.json({
-      torrents: [],
-      crossSeedTags: [],
-      clientErrors: [],
-      clientCount: 0,
-      cachedAt: null,
-    })
-  }
-
-  const torrentLists: QbtTorrent[][] = []
-  const crossSeedClients: { crossSeedTags: string[] }[] = []
-  const hashClients = new Map<string, string[]>()
-  let oldestCacheAt: Date | null = null
-
-  for (const client of clients) {
-    if (!client.cachedTorrents || !Array.isArray(client.cachedTorrents)) continue
-
-    const torrents = client.cachedTorrents as QbtTorrent[]
-    torrentLists.push(torrents)
-
-    for (const t of torrents) {
-      const names = hashClients.get(t.hash) ?? []
-      names.push(client.name)
-      hashClients.set(t.hash, names)
-    }
-
-    crossSeedClients.push({ crossSeedTags: parseCrossSeedTags(client.crossSeedTags) })
-
-    if (client.cachedTorrentsAt) {
-      if (!oldestCacheAt || client.cachedTorrentsAt < oldestCacheAt) {
-        oldestCacheAt = client.cachedTorrentsAt
-      }
-    }
+  try {
+    const result = await fetchFleetAggregation()
+    return NextResponse.json(result)
+  } catch (error) {
+    log.error(
+      error instanceof Error ? error : { err: String(error) },
+      "GET /api/fleet/torrents/cached failed"
+    )
+    return NextResponse.json({ error: "Failed to load fleet data" }, { status: 500 })
   }
-
-  const merged = mergeTorrentLists(torrentLists)
-  const crossSeedTags = aggregateCrossSeedTags(crossSeedClients)
-
-  const stamped = merged.map((t) => ({
-    ...t,
-    client_name: (hashClients.get(t.hash) ?? []).join(", "),
-  }))
-
-  return NextResponse.json({
-    torrents: stamped,
-    crossSeedTags,
-    clientErrors: [],
-    clientCount: clients.length,
-    cachedAt: oldestCacheAt?.toISOString() ?? null,
-  })
 }
diff --git a/src/app/api/fleet/torrents/route.ts b/src/app/api/fleet/torrents/route.ts
index 68d0eb8b..ba71d3d3 100644
--- a/src/app/api/fleet/torrents/route.ts
+++ b/src/app/api/fleet/torrents/route.ts
@@ -1,54 +1,31 @@
 // src/app/api/fleet/torrents/route.ts
 //
 // Functions: GET
-//
-// Returns merged torrent list across all download clients and all tracker tags.
-// Uses Promise.allSettled for resilience — one failed client doesn't block others.
 
-import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { authenticate, decodeKey } from "@/lib/api-helpers"
-import { db } from "@/lib/db"
-import { downloadClients, trackers } from "@/lib/db/schema"
+import { fetchFleetTorrents } from "@/lib/download-clients"
 import { log } from "@/lib/logger"
-import { fetchAndMergeTorrents } from "@/lib/qbt/fetch-merged"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
   const key = decodeKey(auth)
 
-  const [allTrackers, clients] = await Promise.all([
-    db.select({ qbtTag: trackers.qbtTag }).from(trackers).where(eq(trackers.isActive, true)),
-    db
-      .select({
-        name: downloadClients.name,
-        host: downloadClients.host,
-        port: downloadClients.port,
-        useSsl: downloadClients.useSsl,
-        encryptedUsername: downloadClients.encryptedUsername,
-        encryptedPassword: downloadClients.encryptedPassword,
-        crossSeedTags: downloadClients.crossSeedTags,
-      })
-      .from(downloadClients)
-      .where(eq(downloadClients.enabled, true)),
-  ])
-
-  const tags = [
-    ...new Set(
-      allTrackers
-        .map((t) => t.qbtTag)
-        .filter((t): t is string => t !== null && t.trim() !== "")
-        .map((t) => t.trim())
-    ),
-  ]
+  try {
+    const result = await fetchFleetTorrents(key)
 
-  const result = await fetchAndMergeTorrents(clients, tags, key)
+    if (result.sessionExpired) {
+      log.warn({ route: "GET /api/fleet/torrents" }, "fleet fetch failed — stale session key")
+      return NextResponse.json({ error: "Session expired. Please log in again." }, { status: 401 })
+    }
 
-  if (result.sessionExpired) {
-    log.warn({ route: "GET /api/fleet/torrents" }, "fleet fetch failed — stale session key")
-    return NextResponse.json({ error: "Session expired — please log in again" }, { status: 401 })
+    return NextResponse.json(result)
+  } catch (error) {
+    log.error(
+      { route: "GET /api/fleet/torrents", error: String(error) },
+      "fleet torrent fetch failed"
+    )
+    return NextResponse.json({ error: "Failed to fetch fleet torrents" }, { status: 500 })
   }
-
-  return NextResponse.json(result)
 }
diff --git a/src/app/api/notifications/[id]/route.ts b/src/app/api/notifications/[id]/route.ts
index 4e53f153..24056ef9 100644
--- a/src/app/api/notifications/[id]/route.ts
+++ b/src/app/api/notifications/[id]/route.ts
@@ -4,14 +4,23 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseJsonBody, parseRouteId } from "@/lib/api-helpers"
+import {
+  authenticate,
+  decodeKey,
+  parseJsonBody,
+  parseRouteId,
+  type RouteContext,
+  validateMaxLength,
+} from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { notificationTargets } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { SHORT_NAME_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { validateNotificationConfig } from "@/lib/notifications/validate"
 
-export async function PATCH(req: Request, { params }: { params: Promise<{ id: string }> }) {
+export async function PATCH(req: Request, { params }: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -45,9 +54,8 @@ export async function PATCH(req: Request, { params }: { params: Promise<{ id: st
     if (typeof fields.name !== "string" || !fields.name.trim()) {
       return NextResponse.json({ error: "name must be a non-empty string" }, { status: 400 })
     }
-    if (fields.name.length > 100) {
-      return NextResponse.json({ error: "name must be ≤100 characters" }, { status: 400 })
-    }
+    const nameErr = validateMaxLength(fields.name, SHORT_NAME_MAX, "name")
+    if (nameErr) return nameErr
     updates.name = fields.name.trim()
   }
 
@@ -190,22 +198,37 @@ export async function PATCH(req: Request, { params }: { params: Promise<{ id: st
     updates.scope = fields.scope
   }
 
-  await db.update(notificationTargets).set(updates).where(eq(notificationTargets.id, id))
-
-  return NextResponse.json({ success: true })
+  try {
+    await db.update(notificationTargets).set(updates).where(eq(notificationTargets.id, id))
+    return NextResponse.json({ success: true })
+  } catch (err) {
+    log.error(
+      { route: "PATCH /api/notifications/[id]", targetId: id, error: errMsg(err) },
+      "Failed to update notification target"
+    )
+    return NextResponse.json({ error: "Failed to update notification target" }, { status: 500 })
+  }
 }
 
-export async function DELETE(_req: Request, { params }: { params: Promise<{ id: string }> }) {
+export async function DELETE(_req: Request, { params }: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const id = await parseRouteId(params, "notification target ID")
   if (id instanceof NextResponse) return id
 
-  // notificationDeliveryState rows are cleaned up automatically via FK cascade
-  // (onDelete: "cascade" on targetId)
-  await db.delete(notificationTargets).where(eq(notificationTargets.id, id))
-
-  log.info({ route: "DELETE /api/notifications/[id]", targetId: id }, "notification target deleted")
-  return NextResponse.json({ success: true })
+  try {
+    await db.delete(notificationTargets).where(eq(notificationTargets.id, id))
+    log.info(
+      { route: "DELETE /api/notifications/[id]", targetId: id },
+      "notification target deleted"
+    )
+    return NextResponse.json({ success: true })
+  } catch (err) {
+    log.error(
+      { route: "DELETE /api/notifications/[id]", targetId: id, error: errMsg(err) },
+      "Failed to delete notification target"
+    )
+    return NextResponse.json({ error: "Failed to delete notification target" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/notifications/[id]/test/route.ts b/src/app/api/notifications/[id]/test/route.ts
index 75437358..c65c8e0a 100644
--- a/src/app/api/notifications/[id]/test/route.ts
+++ b/src/app/api/notifications/[id]/test/route.ts
@@ -4,15 +4,15 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseRouteId } from "@/lib/api-helpers"
+import { authenticate, decodeKey, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { notificationTargets } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
 import { decryptNotificationConfig } from "@/lib/notifications/decrypt"
 import { deliverDiscordWebhook } from "@/lib/notifications/deliver"
-import type { DiscordConfig } from "@/lib/notifications/types"
+import { type DiscordConfig, isDiscordConfig } from "@/lib/notifications/types"
 
-export async function POST(_req: Request, { params }: { params: Promise<{ id: string }> }) {
+export async function POST(_req: Request, { params }: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -33,7 +33,11 @@ export async function POST(_req: Request, { params }: { params: Promise<{ id: st
 
   let config: DiscordConfig
   try {
-    config = decryptNotificationConfig(target, key) as DiscordConfig
+    const raw = decryptNotificationConfig(target, key)
+    if (!isDiscordConfig(raw)) {
+      return NextResponse.json({ error: "Invalid notification config shape" }, { status: 422 })
+    }
+    config = raw
   } catch {
     log.error(
       { route: "POST /api/notifications/[id]/test", targetId: id },
diff --git a/src/app/api/notifications/route.ts b/src/app/api/notifications/route.ts
index 2f46fc9a..ce51d0be 100644
--- a/src/app/api/notifications/route.ts
+++ b/src/app/api/notifications/route.ts
@@ -3,51 +3,23 @@
 // Functions: GET, POST
 
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseJsonBody } from "@/lib/api-helpers"
+import { authenticate, decodeKey, parseJsonBody, validateMaxLength } from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { notificationTargets } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { SHORT_NAME_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { VALID_NOTIFICATION_TYPES } from "@/lib/notifications/types"
+import { SUPPORTED_NOTIFICATION_TYPES } from "@/lib/notifications/types"
 import { validateNotificationConfig } from "@/lib/notifications/validate"
+import { fetchNotificationTargets, serializeNotificationTarget } from "@/lib/server-data"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const targets = await db.select().from(notificationTargets)
-
-  const safe = targets.map((t) => ({
-    id: t.id,
-    name: t.name,
-    type: t.type,
-    enabled: t.enabled,
-    hasConfig: !!t.encryptedConfig,
-    notifyRatioDrop: t.notifyRatioDrop,
-    notifyHitAndRun: t.notifyHitAndRun,
-    notifyTrackerDown: t.notifyTrackerDown,
-    notifyBufferMilestone: t.notifyBufferMilestone,
-    notifyWarned: t.notifyWarned,
-    notifyRatioDanger: t.notifyRatioDanger,
-    notifyZeroSeeding: t.notifyZeroSeeding,
-    notifyRankChange: t.notifyRankChange,
-    notifyAnniversary: t.notifyAnniversary,
-    notifyBonusCap: t.notifyBonusCap,
-    notifyVipExpiring: t.notifyVipExpiring,
-    notifyUnsatisfiedLimit: t.notifyUnsatisfiedLimit,
-    notifyActiveHnrs: t.notifyActiveHnrs,
-    thresholds: t.thresholds,
-    includeTrackerName: t.includeTrackerName,
-    scope: t.scope,
-    lastDeliveryStatus: t.lastDeliveryStatus,
-    lastDeliveryAt: t.lastDeliveryAt?.toISOString() ?? null,
-    lastDeliveryError: t.lastDeliveryError,
-    createdAt: t.createdAt.toISOString(),
-    updatedAt: t.updatedAt.toISOString(),
-    // SECURITY: encryptedConfig is NEVER included
-  }))
-
-  return NextResponse.json(safe)
+  const targets = await fetchNotificationTargets()
+  return NextResponse.json(targets.map(serializeNotificationTarget))
 }
 
 export async function POST(req: Request) {
@@ -61,15 +33,15 @@ export async function POST(req: Request) {
 
   if (typeof name !== "string" || !name.trim())
     return NextResponse.json({ error: "name is required" }, { status: 400 })
-  if (name.length > 100)
-    return NextResponse.json({ error: "name must be ≤100 characters" }, { status: 400 })
+  const nameErr = validateMaxLength(name, SHORT_NAME_MAX, "name")
+  if (nameErr) return nameErr
 
   if (
     typeof type !== "string" ||
-    !VALID_NOTIFICATION_TYPES.includes(type as (typeof VALID_NOTIFICATION_TYPES)[number])
+    !SUPPORTED_NOTIFICATION_TYPES.includes(type as (typeof SUPPORTED_NOTIFICATION_TYPES)[number])
   )
     return NextResponse.json(
-      { error: `type must be one of: ${VALID_NOTIFICATION_TYPES.join(", ")}` },
+      { error: `type must be one of: ${SUPPORTED_NOTIFICATION_TYPES.join(", ")}` },
       { status: 400 }
     )
 
@@ -77,26 +49,34 @@ export async function POST(req: Request) {
     return NextResponse.json({ error: "config object is required" }, { status: 400 })
 
   const validationError = validateNotificationConfig(
-    type as (typeof VALID_NOTIFICATION_TYPES)[number],
+    type as (typeof SUPPORTED_NOTIFICATION_TYPES)[number],
     config as Record<string, unknown>
   )
   if (validationError) return NextResponse.json({ error: validationError }, { status: 400 })
 
-  const key = decodeKey(auth)
-  const encryptedConfig = encrypt(JSON.stringify(config), key)
+  try {
+    const key = decodeKey(auth)
+    const encryptedConfig = encrypt(JSON.stringify(config), key)
 
-  const [inserted] = await db
-    .insert(notificationTargets)
-    .values({
-      name: name.trim(),
-      type,
-      encryptedConfig,
-    })
-    .returning({ id: notificationTargets.id, name: notificationTargets.name })
+    const [inserted] = await db
+      .insert(notificationTargets)
+      .values({
+        name: name.trim(),
+        type,
+        encryptedConfig,
+      })
+      .returning({ id: notificationTargets.id, name: notificationTargets.name })
 
-  log.info(
-    { route: "POST /api/notifications", targetId: inserted.id },
-    "notification target created"
-  )
-  return NextResponse.json(inserted, { status: 201 })
+    log.info(
+      { route: "POST /api/notifications", targetId: inserted.id },
+      "notification target created"
+    )
+    return NextResponse.json(inserted, { status: 201 })
+  } catch (err) {
+    log.error(
+      { route: "POST /api/notifications", error: errMsg(err) },
+      "Failed to create notification target"
+    )
+    return NextResponse.json({ error: "Failed to create notification target" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/settings/backup/[id]/route.ts b/src/app/api/settings/backup/[id]/route.ts
index 12db6c61..ed4ff97a 100644
--- a/src/app/api/settings/backup/[id]/route.ts
+++ b/src/app/api/settings/backup/[id]/route.ts
@@ -6,14 +6,14 @@ import { readFile, stat, unlink } from "node:fs/promises"
 import path from "node:path"
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseRouteId } from "@/lib/api-helpers"
+import { authenticate, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings, backupHistory } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
 
 export async function GET(
   _request: Request,
-  props: { params: Promise<{ id: string }> }
+  props: RouteContext
 ): Promise<NextResponse | Response> {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
@@ -75,10 +75,7 @@ export async function GET(
   })
 }
 
-export async function DELETE(
-  _request: Request,
-  props: { params: Promise<{ id: string }> }
-): Promise<NextResponse> {
+export async function DELETE(_request: Request, props: RouteContext): Promise<NextResponse> {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
diff --git a/src/app/api/settings/backup/export/route.ts b/src/app/api/settings/backup/export/route.ts
index 4b49505c..af4199ba 100644
--- a/src/app/api/settings/backup/export/route.ts
+++ b/src/app/api/settings/backup/export/route.ts
@@ -4,10 +4,10 @@ import { mkdir, writeFile } from "node:fs/promises"
 import nodePath from "node:path"
 import { NextResponse } from "next/server"
 import { authenticate, decodeKey } from "@/lib/api-helpers"
-import { encryptBackupPayload, generateBackupPayload } from "@/lib/backup"
-import { decrypt } from "@/lib/crypto"
+import { encryptBackupPayload, generateBackupPayload, resolveBackupPassword } from "@/lib/backup"
 import { db } from "@/lib/db"
 import { appSettings, backupHistory } from "@/lib/db/schema"
+import { BACKUP_PASSWORD_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
 export async function POST(request: Request) {
@@ -26,7 +26,7 @@ export async function POST(request: Request) {
     // Resolve backup password: explicit form value > stored encrypted password
     let backupPassword: string | null = null
     if (formPassword && typeof formPassword === "string" && formPassword.length > 0) {
-      if (formPassword.length > 128) {
+      if (formPassword.length > BACKUP_PASSWORD_MAX) {
         return NextResponse.json(
           { error: "Backup password must be 128 characters or fewer" },
           { status: 400 }
@@ -35,10 +35,19 @@ export async function POST(request: Request) {
       backupPassword = formPassword
     } else if (settings?.backupEncryptionEnabled && settings.encryptedBackupPassword) {
       try {
-        const key = decodeKey(auth)
-        backupPassword = decrypt(settings.encryptedBackupPassword, key)
+        backupPassword = resolveBackupPassword(
+          true,
+          settings.encryptedBackupPassword,
+          decodeKey(auth)
+        )
       } catch {
         log.error("Failed to decrypt stored backup password for manual export")
+        return NextResponse.json(
+          {
+            error: "Failed to decrypt backup password. Re-enter your backup password in settings.",
+          },
+          { status: 500 }
+        )
       }
     }
 
@@ -79,7 +88,7 @@ export async function POST(request: Request) {
       sizeBytes,
       encrypted,
       frequency: null,
-      status: "completed",
+      status: filePath ? "completed" : "disk_write_failed",
       storagePath: filePath,
     })
 
diff --git a/src/app/api/settings/backup/history/route.ts b/src/app/api/settings/backup/history/route.ts
index 3e42b1bf..dc8ee5d7 100644
--- a/src/app/api/settings/backup/history/route.ts
+++ b/src/app/api/settings/backup/history/route.ts
@@ -1,6 +1,6 @@
 // src/app/api/settings/backup/history/route.ts
 
-import { desc } from "drizzle-orm"
+import { desc, isNotNull } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
@@ -10,7 +10,24 @@ export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const records = await db.select().from(backupHistory).orderBy(desc(backupHistory.createdAt))
+  const records = await db
+    .select({
+      id: backupHistory.id,
+      createdAt: backupHistory.createdAt,
+      sizeBytes: backupHistory.sizeBytes,
+      encrypted: backupHistory.encrypted,
+      frequency: backupHistory.frequency,
+      status: backupHistory.status,
+      notes: backupHistory.notes,
+      hasStoredFile: isNotNull(backupHistory.storagePath),
+    })
+    .from(backupHistory)
+    .orderBy(desc(backupHistory.createdAt))
+    .limit(200)
 
-  return NextResponse.json(records)
+  const serialized = records.map((r) => ({
+    ...r,
+    createdAt: r.createdAt.toISOString(),
+  }))
+  return NextResponse.json(serialized)
 }
diff --git a/src/app/api/settings/backup/restore/route.ts b/src/app/api/settings/backup/restore/route.ts
index 262cbc1e..a0675187 100644
--- a/src/app/api/settings/backup/restore/route.ts
+++ b/src/app/api/settings/backup/restore/route.ts
@@ -29,9 +29,19 @@ import {
   trackerSnapshots,
   trackers,
 } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import {
+  BACKUP_PASSWORD_MAX,
+  BACKUP_RESTORE_MAX_BYTES,
+  LOCKOUT_DURATION_DEFAULT,
+  LOCKOUT_THRESHOLD_DEFAULT,
+  PASSWORD_MAX,
+  PASSWORD_MIN,
+  POLL_INTERVAL_DEFAULT,
+} from "@/lib/limits"
 import { checkLockout, recordFailedAttempt, resetFailedAttempts } from "@/lib/lockout"
 import { log } from "@/lib/logger"
-import { stopScheduler } from "@/lib/scheduler"
+import { ensureSchedulerRunning, stopScheduler } from "@/lib/scheduler"
 
 const BATCH_SIZE = 500
 
@@ -56,11 +66,20 @@ async function batchInsert<T extends Record<string, unknown>>(
 
 // Attempt to decrypt a field with the backup key and re-encrypt with the current key.
 // Returns the re-encrypted ciphertext, or "" if the field is empty or re-encryption fails.
-function reencryptField(ciphertext: string, backupKey: Buffer, currentKey: Buffer): string {
+function reencryptField(
+  ciphertext: string,
+  backupKey: Buffer,
+  currentKey: Buffer,
+  context: string
+): string {
   if (!ciphertext) return ""
   try {
     return reencrypt(ciphertext, backupKey, currentKey)
-  } catch {
+  } catch (err) {
+    log.warn(
+      { error: errMsg(err), field: context },
+      "Failed to re-encrypt field during restore, value will be cleared"
+    )
     return ""
   }
 }
@@ -86,8 +105,7 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "Backup file is required" }, { status: 400 })
   }
 
-  const MAX_BACKUP_SIZE = 50 * 1024 * 1024 // 50 MB
-  if (file.size > MAX_BACKUP_SIZE) {
+  if (file.size > BACKUP_RESTORE_MAX_BYTES) {
     return NextResponse.json(
       { error: "Backup file exceeds maximum size of 50 MB" },
       { status: 400 }
@@ -98,8 +116,8 @@ export async function POST(request: Request) {
   if (
     !masterPassword ||
     typeof masterPassword !== "string" ||
-    masterPassword.length === 0 ||
-    masterPassword.length > 128
+    masterPassword.length < PASSWORD_MIN ||
+    masterPassword.length > PASSWORD_MAX
   ) {
     return NextResponse.json(
       { error: "Master password is required to restore backups" },
@@ -134,7 +152,7 @@ export async function POST(request: Request) {
           { status: 400 }
         )
       }
-      if (backupPassword.length > 128) {
+      if (backupPassword.length > BACKUP_PASSWORD_MAX) {
         return NextResponse.json(
           { error: "Backup password must be 128 characters or fewer" },
           { status: 400 }
@@ -215,9 +233,11 @@ export async function POST(request: Request) {
     backupKey = await deriveKey(masterPassword, backupSalt)
     currentKey = sameSalt ? backupKey : await deriveKey(masterPassword, currentSalt)
   } catch (err) {
-    log.warn({ err }, "Backup restore: key derivation failed, encrypted fields will be cleared")
-    backupKey = Buffer.alloc(0)
-    currentKey = Buffer.alloc(0)
+    log.error({ error: errMsg(err) }, "Backup restore aborted: encryption key derivation failed")
+    return NextResponse.json(
+      { error: "Failed to derive encryption keys. Restore cannot proceed safely." },
+      { status: 500 }
+    )
   }
 
   const canReencrypt = backupKey.length === 32
@@ -231,6 +251,7 @@ export async function POST(request: Request) {
   let tokensCleared = 0
   let clientCredentialsCleared = 0
   let totpDisabledOnRestore = false
+  let orphanedRecordsSkipped = 0
 
   try {
     await db.transaction(async (tx) => {
@@ -257,7 +278,12 @@ export async function POST(request: Request) {
           // Same instance — keep ciphertext as-is
           apiToken = (fields.encryptedApiToken as string) || ""
         } else if (canReencrypt) {
-          apiToken = reencryptField(fields.encryptedApiToken as string, backupKey, currentKey)
+          apiToken = reencryptField(
+            fields.encryptedApiToken as string,
+            backupKey,
+            currentKey,
+            `tracker '${fields.name}' apiToken`
+          )
         } else {
           apiToken = ""
         }
@@ -306,8 +332,18 @@ export async function POST(request: Request) {
           encUsername = (fields.encryptedUsername as string) || ""
           encPassword = (fields.encryptedPassword as string) || ""
         } else if (canReencrypt) {
-          encUsername = reencryptField(fields.encryptedUsername as string, backupKey, currentKey)
-          encPassword = reencryptField(fields.encryptedPassword as string, backupKey, currentKey)
+          encUsername = reencryptField(
+            fields.encryptedUsername as string,
+            backupKey,
+            currentKey,
+            `downloadClient '${fields.name}' username`
+          )
+          encPassword = reencryptField(
+            fields.encryptedPassword as string,
+            backupKey,
+            currentKey,
+            `downloadClient '${fields.name}' password`
+          )
         } else {
           encUsername = ""
           encPassword = ""
@@ -333,6 +369,10 @@ export async function POST(request: Request) {
                   try {
                     return JSON.parse(fields.crossSeedTags as string) as string[]
                   } catch {
+                    log.warn(
+                      { client: fields.name },
+                      "Malformed crossSeedTags in backup, defaulting to empty"
+                    )
                     return []
                   }
                 })(),
@@ -372,7 +412,10 @@ export async function POST(request: Request) {
       for (const s of payload.trackerSnapshots) {
         const fields = s as Record<string, unknown>
         const newTrackerId = trackerIdMap.get(fields.trackerId as number)
-        if (!newTrackerId) continue
+        if (!newTrackerId) {
+          orphanedRecordsSkipped++
+          continue
+        }
         snapshotRows.push({
           trackerId: newTrackerId,
           polledAt: new Date(fields.polledAt as string),
@@ -398,7 +441,10 @@ export async function POST(request: Request) {
       for (const r of payload.trackerRoles) {
         const fields = r as Record<string, unknown>
         const newTrackerId = trackerIdMap.get(fields.trackerId as number)
-        if (!newTrackerId) continue
+        if (!newTrackerId) {
+          orphanedRecordsSkipped++
+          continue
+        }
         await tx.insert(trackerRoles).values({
           trackerId: newTrackerId,
           roleName: fields.roleName as string,
@@ -411,7 +457,10 @@ export async function POST(request: Request) {
       for (const m of payload.tagGroupMembers) {
         const fields = m as Record<string, unknown>
         const newGroupId = tagGroupIdMap.get(fields.groupId as number)
-        if (!newGroupId) continue
+        if (!newGroupId) {
+          orphanedRecordsSkipped++
+          continue
+        }
         await tx.insert(tagGroupMembers).values({
           groupId: newGroupId,
           tag: fields.tag as string,
@@ -426,7 +475,10 @@ export async function POST(request: Request) {
       for (const cs of payload.clientSnapshots) {
         const fields = cs as Record<string, unknown>
         const newClientId = clientIdMap.get(fields.clientId as number)
-        if (!newClientId) continue
+        if (!newClientId) {
+          orphanedRecordsSkipped++
+          continue
+        }
         clientSnapshotRows.push({
           clientId: newClientId,
           polledAt: new Date(fields.polledAt as string),
@@ -449,7 +501,10 @@ export async function POST(request: Request) {
         for (const ub of payload.clientUptimeBuckets) {
           const fields = ub as Record<string, unknown>
           const newClientId = clientIdMap.get(fields.clientId as number)
-          if (!newClientId) continue
+          if (!newClientId) {
+            orphanedRecordsSkipped++
+            continue
+          }
           uptimeRows.push({
             clientId: newClientId,
             bucketTs: new Date(fields.bucketTs as string),
@@ -497,7 +552,8 @@ export async function POST(request: Request) {
             encryptedConfig = reencryptField(
               fields.encryptedConfig as string,
               backupKey,
-              currentKey
+              currentKey,
+              `notificationTarget '${fields.name}' config`
             )
           } else {
             encryptedConfig = ""
@@ -539,7 +595,8 @@ export async function POST(request: Request) {
           const result = reencryptField(
             payload.settings.encryptedProxyPassword as string,
             backupKey,
-            currentKey
+            currentKey,
+            "settings proxyPassword"
           )
           proxyPassword = result || null
         }
@@ -554,7 +611,8 @@ export async function POST(request: Request) {
           const result = reencryptField(
             payload.settings.encryptedBackupPassword as string,
             backupKey,
-            currentKey
+            currentKey,
+            "settings backupPassword"
           )
           backupPasswordEncrypted = result || null
         }
@@ -570,7 +628,8 @@ export async function POST(request: Request) {
             reencryptField(
               payload.settings.encryptedPtpimgApiKey as string,
               backupKey,
-              currentKey
+              currentKey,
+              "settings ptpimgApiKey"
             ) || null
         }
       }
@@ -584,7 +643,8 @@ export async function POST(request: Request) {
             reencryptField(
               payload.settings.encryptedOeimgApiKey as string,
               backupKey,
-              currentKey
+              currentKey,
+              "settings oeimgApiKey"
             ) || null
         }
       }
@@ -598,7 +658,8 @@ export async function POST(request: Request) {
             reencryptField(
               payload.settings.encryptedImgbbApiKey as string,
               backupKey,
-              currentKey
+              currentKey,
+              "settings imgbbApiKey"
             ) || null
         }
       }
@@ -614,13 +675,18 @@ export async function POST(request: Request) {
           const reencryptedSecret = reencryptField(
             payload.settings.totpSecret as string,
             backupKey,
-            currentKey
+            currentKey,
+            "settings totpSecret"
           )
           if (reencryptedSecret) {
             totpSecret = reencryptedSecret
             totpBackupCodes = payload.settings.totpBackupCodes
-              ? reencryptField(payload.settings.totpBackupCodes as string, backupKey, currentKey) ||
-                null
+              ? reencryptField(
+                  payload.settings.totpBackupCodes as string,
+                  backupKey,
+                  currentKey,
+                  "settings totpBackupCodes"
+                ) || null
               : null
           } else {
             totpDisabledOnRestore = true
@@ -630,6 +696,11 @@ export async function POST(request: Request) {
         }
       }
 
+      // Detect TOTP being silently wiped: live instance has TOTP but backup predates it
+      if (currentSettings.totpSecret && !totpSecret) {
+        totpDisabledOnRestore = true
+      }
+
       // Update appSettings in place — NEVER delete + re-insert
       await tx
         .update(appSettings)
@@ -640,12 +711,15 @@ export async function POST(request: Request) {
           totpBackupCodes,
           sessionTimeoutMinutes: (payload.settings.sessionTimeoutMinutes as number | null) ?? null,
           lockoutEnabled: (payload.settings.lockoutEnabled as boolean) ?? true,
-          lockoutThreshold: (payload.settings.lockoutThreshold as number) ?? 5,
-          lockoutDurationMinutes: (payload.settings.lockoutDurationMinutes as number) ?? 15,
+          lockoutThreshold:
+            (payload.settings.lockoutThreshold as number) ?? LOCKOUT_THRESHOLD_DEFAULT,
+          lockoutDurationMinutes:
+            (payload.settings.lockoutDurationMinutes as number) ?? LOCKOUT_DURATION_DEFAULT,
           failedLoginAttempts: 0,
           lockedUntil: null,
           snapshotRetentionDays: (payload.settings.snapshotRetentionDays as number | null) ?? null,
-          trackerPollIntervalMinutes: (payload.settings.trackerPollIntervalMinutes as number) ?? 60,
+          trackerPollIntervalMinutes:
+            (payload.settings.trackerPollIntervalMinutes as number) ?? POLL_INTERVAL_DEFAULT,
           proxyEnabled: payload.settings.proxyEnabled as boolean,
           proxyType: payload.settings.proxyType as string,
           proxyHost: (payload.settings.proxyHost as string | null) ?? null,
@@ -675,13 +749,16 @@ export async function POST(request: Request) {
     log.error(
       {
         event: "restore_failed",
-        error: err instanceof Error ? err.message : String(err),
+        error: errMsg(err),
         fileNameHash: hashFileName(fileName),
       },
       "Restore operation failed"
     )
 
-    return NextResponse.json({ error: "Backup restore failed" }, { status: 409 })
+    // Transaction rolled back, DB unchanged. Restart the scheduler we stopped.
+    ensureSchedulerRunning(auth.encryptionKey)
+
+    return NextResponse.json({ error: "Backup restore failed" }, { status: 500 })
   } finally {
     if (backupKey.length > 0) backupKey.fill(0)
     if (currentKey !== backupKey && currentKey.length > 0) currentKey.fill(0)
@@ -702,6 +779,7 @@ export async function POST(request: Request) {
       tokensCleared,
       clientCredentialsCleared,
       totpDisabledOnRestore,
+      orphanedRecordsSkipped,
       restored: {
         trackers: payload.trackers.length,
         trackerSnapshots: payload.trackerSnapshots.length,
@@ -741,6 +819,7 @@ export async function POST(request: Request) {
     tokensCleared,
     clientCredentialsCleared,
     totpDisabledOnRestore,
+    orphanedRecordsSkipped,
     requiresRelogin: false,
   })
 }
diff --git a/src/app/api/settings/dashboard/route.ts b/src/app/api/settings/dashboard/route.ts
index 5a08f2ab..11320e66 100644
--- a/src/app/api/settings/dashboard/route.ts
+++ b/src/app/api/settings/dashboard/route.ts
@@ -1,12 +1,11 @@
 // src/app/api/settings/dashboard/route.ts
-//
-// Functions: GET, PUT
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { log } from "@/lib/logger"
 import { DASHBOARD_SETTINGS_DEFAULTS, type DashboardSettings } from "@/types/api"
 
 const DEFAULTS = DASHBOARD_SETTINGS_DEFAULTS
@@ -15,7 +14,8 @@ function parseSettings(raw: string | null): DashboardSettings {
   if (!raw) return { ...DEFAULTS }
   try {
     return { ...DEFAULTS, ...(JSON.parse(raw) as Partial<DashboardSettings>) }
-  } catch {
+  } catch (err) {
+    log.warn({ error: String(err) }, "Corrupt dashboardSettings JSON in DB, returning defaults")
     return { ...DEFAULTS }
   }
 }
@@ -39,17 +39,23 @@ export async function PUT(request: Request) {
   const body = await parseJsonBody(request)
   if (body instanceof NextResponse) return body
 
-  const merged: DashboardSettings = { ...DEFAULTS }
+  const [row] = await db
+    .select({ id: appSettings.id, dashboardSettings: appSettings.dashboardSettings })
+    .from(appSettings)
+    .limit(1)
+  if (!row) {
+    return NextResponse.json({ error: "Not configured" }, { status: 400 })
+  }
+
+  const merged: DashboardSettings = parseSettings(row.dashboardSettings)
   if (typeof body.showHealthIndicators === "boolean") {
     merged.showHealthIndicators = body.showHealthIndicators
   }
   if (typeof body.showLoginTimers === "boolean") {
     merged.showLoginTimers = body.showLoginTimers
   }
-
-  const [row] = await db.select({ id: appSettings.id }).from(appSettings).limit(1)
-  if (!row) {
-    return NextResponse.json({ error: "Not configured" }, { status: 400 })
+  if (typeof body.showTodayAtAGlance === "boolean") {
+    merged.showTodayAtAGlance = body.showTodayAtAGlance
   }
 
   await db
diff --git a/src/app/api/settings/db-size/route.ts b/src/app/api/settings/db-size/route.ts
new file mode 100644
index 00000000..80c4a265
--- /dev/null
+++ b/src/app/api/settings/db-size/route.ts
@@ -0,0 +1,23 @@
+// src/app/api/settings/db-size/route.ts
+
+import { NextResponse } from "next/server"
+import { authenticate } from "@/lib/api-helpers"
+import { errMsg } from "@/lib/error-utils"
+import { log } from "@/lib/logger"
+import { getDbSizeHistory } from "@/lib/server-data"
+
+export async function GET() {
+  const auth = await authenticate()
+  if (auth instanceof NextResponse) return auth
+
+  try {
+    const data = await getDbSizeHistory()
+    return NextResponse.json(data)
+  } catch (err) {
+    log.error(
+      { route: "GET /api/settings/db-size", error: errMsg(err) },
+      "Failed to fetch DB size history"
+    )
+    return NextResponse.json({ error: "Failed to load database size history" }, { status: 500 })
+  }
+}
diff --git a/src/app/api/settings/events/route.ts b/src/app/api/settings/events/route.ts
index 07192656..8f88cae9 100644
--- a/src/app/api/settings/events/route.ts
+++ b/src/app/api/settings/events/route.ts
@@ -11,15 +11,17 @@ import {
   backupToEvent,
   EVENT_CATEGORIES,
   type EventCategory,
+  groupPollBatches,
   mergeAndSort,
   parseLogLine,
   type SystemEvent,
   snapshotToEvent,
 } from "@/lib/events"
+import { EVENTS_LIMIT_CAP, EVENTS_LIMIT_DEFAULT } from "@/lib/limits"
 import { readLogTail } from "@/lib/log-reader"
 import { log } from "@/lib/logger"
 
-const MAX_LOG_BYTES = 256 * 1024 // 256 KB tail read
+const MAX_LOG_BYTES = 256 * 1024 // 256 KB
 
 export async function GET(request: Request): Promise<NextResponse> {
   const auth = await authenticate()
@@ -29,7 +31,9 @@ export async function GET(request: Request): Promise<NextResponse> {
 
   // Parse and validate limit
   const rawLimit = parseInt(searchParams.get("limit") ?? "", 10)
-  const limit = Number.isNaN(rawLimit) ? 50 : Math.min(Math.max(rawLimit, 1), 200)
+  const limit = Number.isNaN(rawLimit)
+    ? EVENTS_LIMIT_DEFAULT
+    : Math.min(Math.max(rawLimit, 1), EVENTS_LIMIT_CAP)
 
   // Parse and validate offset
   const rawOffset = parseInt(searchParams.get("offset") ?? "", 10)
@@ -73,7 +77,7 @@ export async function GET(request: Request): Promise<NextResponse> {
         .limit(100),
     ])
 
-    // Convert DB rows to SystemEvent — dates → ISO strings, bigints → strings
+    // Convert DB rows to SystemEvent (dates to ISO strings, bigints to strings)
     const dbEvents = [
       ...snapshotRows.map((row) =>
         snapshotToEvent({
@@ -98,7 +102,7 @@ export async function GET(request: Request): Promise<NextResponse> {
       ),
     ]
 
-    // Positional tail-read of log file — never loads the full file
+    // tail-read of log file
     let logEvents: SystemEvent[] = []
     let logSizeBytes = 0
 
@@ -115,13 +119,17 @@ export async function GET(request: Request): Promise<NextResponse> {
       ) {
         log.error({ route: "GET /api/settings/events" }, "failed to read log file for events")
       }
-      // ENOENT is non-fatal — proceed with DB events only
     }
 
-    // Single pass — sort+filter once, then slice for pagination
-    const allMerged = mergeAndSort(dbEvents, logEvents, category, Number.MAX_SAFE_INTEGER, 0)
-    const total = allMerged.length
-    const events = allMerged.slice(offset, offset + limit)
+    // Count total
+    const total =
+      category === "all"
+        ? dbEvents.length + logEvents.length
+        : dbEvents.reduce((count, e) => (e.category === category ? count + 1 : count), 0) +
+          logEvents.reduce((count, e) => (e.category === category ? count + 1 : count), 0)
+
+    // Sort, paginate, then collapse same-timestamp polls into batches
+    const events = groupPollBatches(mergeAndSort(dbEvents, logEvents, category, limit, offset))
 
     return NextResponse.json({
       events,
diff --git a/src/app/api/settings/image-hosts/route.ts b/src/app/api/settings/image-hosts/route.ts
index 279e2b1b..72a78e35 100644
--- a/src/app/api/settings/image-hosts/route.ts
+++ b/src/app/api/settings/image-hosts/route.ts
@@ -4,29 +4,21 @@
 
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
-import { db } from "@/lib/db"
-import { appSettings } from "@/lib/db/schema"
+import { fetchSettings } from "@/lib/server-data"
 
 export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const [settings] = await db
-    .select({
-      encryptedPtpimgApiKey: appSettings.encryptedPtpimgApiKey,
-      encryptedOeimgApiKey: appSettings.encryptedOeimgApiKey,
-      encryptedImgbbApiKey: appSettings.encryptedImgbbApiKey,
-    })
-    .from(appSettings)
-    .limit(1)
+  const [settings] = await fetchSettings()
 
   if (!settings) {
     return NextResponse.json({ error: "Not configured" }, { status: 400 })
   }
 
   return NextResponse.json({
-    ptpimg: !!settings.encryptedPtpimgApiKey,
-    onlyimage: !!settings.encryptedOeimgApiKey,
-    imgbb: !!settings.encryptedImgbbApiKey,
+    ptpimg: !!settings.hasPtpimgKey,
+    onlyimage: !!settings.hasOeimgKey,
+    imgbb: !!settings.hasImgbbKey,
   })
 }
diff --git a/src/app/api/settings/lockdown/route.ts b/src/app/api/settings/lockdown/route.ts
index e10e7dbf..210fbd06 100644
--- a/src/app/api/settings/lockdown/route.ts
+++ b/src/app/api/settings/lockdown/route.ts
@@ -11,7 +11,9 @@ import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { clearSession, verifyPassword } from "@/lib/auth"
 import { generateSalt } from "@/lib/crypto"
 import { db } from "@/lib/db"
-import { appSettings, trackers } from "@/lib/db/schema"
+import { appSettings, downloadClients, trackers } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { PASSWORD_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { stopScheduler } from "@/lib/scheduler"
 import { clearSchedulerKey } from "@/lib/scheduler-key-store"
@@ -24,7 +26,7 @@ export async function POST(request: Request) {
   if (body instanceof NextResponse) return body
 
   const { password } = body as { password?: string }
-  if (!password || typeof password !== "string" || password.length > 128) {
+  if (!password || typeof password !== "string" || password.length > PASSWORD_MAX) {
     return NextResponse.json({ error: "Master password is required" }, { status: 400 })
   }
 
@@ -44,29 +46,54 @@ export async function POST(request: Request) {
   stopScheduler()
   await clearSchedulerKey(settings.id)
 
-  // 2. Nullify all tracker API tokens — they're now useless
-  await db.update(trackers).set({
-    encryptedApiToken: "LOCKDOWN_REVOKED",
-    isActive: false,
-    lastError: "Emergency lockdown — API token revoked",
-    updatedAt: new Date(),
-  })
-
-  // 3. Rotate encryption salt — orphans any remaining ciphertext
   const newSalt = generateSalt()
+  const now = new Date()
+
+  try {
+    await db.transaction(async (tx) => {
+      // 2. Revoke all tracker API tokens
+      await tx.update(trackers).set({
+        encryptedApiToken: "LOCKDOWN_REVOKED",
+        isActive: false,
+        lastError: "Emergency lockdown: API token revoked",
+        updatedAt: now,
+      })
 
-  // 4. Wipe all encrypted fields (encrypted with old key, now unrecoverable anyway)
-  await db
-    .update(appSettings)
-    .set({
-      encryptionSalt: newSalt,
-      totpSecret: null,
-      totpBackupCodes: null,
-      encryptedProxyPassword: null,
-      encryptedBackupPassword: null,
-      username: null,
+      // 3. Revoke all download client credentials
+      await tx.update(downloadClients).set({
+        encryptedUsername: "",
+        encryptedPassword: "",
+        enabled: false,
+        lastError: "Emergency lockdown: credentials revoked",
+        updatedAt: now,
+      })
+
+      // 4. Rotate salt + wipe all encrypted settings fields
+      await tx
+        .update(appSettings)
+        .set({
+          encryptionSalt: newSalt,
+          totpSecret: null,
+          totpBackupCodes: null,
+          encryptedProxyPassword: null,
+          encryptedBackupPassword: null,
+          encryptedPtpimgApiKey: null,
+          encryptedOeimgApiKey: null,
+          encryptedImgbbApiKey: null,
+          username: null,
+        })
+        .where(eq(appSettings.id, settings.id))
     })
-    .where(eq(appSettings.id, settings.id))
+  } catch (err) {
+    log.error(
+      { route: "POST /api/settings/lockdown", error: errMsg(err) },
+      "Lockdown DB operations failed"
+    )
+    return NextResponse.json(
+      { error: "Emergency lockdown failed. Retry immediately or shut down the server." },
+      { status: 500 }
+    )
+  }
 
   // 5. Kill the session
   await clearSession()
diff --git a/src/app/api/settings/logs/download/route.ts b/src/app/api/settings/logs/download/route.ts
index 8e592357..705151c1 100644
--- a/src/app/api/settings/logs/download/route.ts
+++ b/src/app/api/settings/logs/download/route.ts
@@ -1,20 +1,21 @@
 // src/app/api/settings/logs/download/route.ts
-//
-// Functions: GET
 
 import { createReadStream, existsSync } from "node:fs"
+import { dirname } from "node:path"
 import { Readable } from "node:stream"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
-import { DEFAULT_LOG_FILE } from "@/lib/constants"
+import { DEFAULT_LOG_FILE, DEV_LOG_FILE } from "@/lib/constants"
+import { localDateStr } from "@/lib/formatters"
 import { log } from "@/lib/logger"
 
 export async function GET(): Promise<Response> {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  // Path comes from server env only — no user input, no traversal risk
-  const logFile = process.env.LOG_FILE || DEFAULT_LOG_FILE
+  const logFile =
+    process.env.LOG_FILE ??
+    (existsSync(dirname(DEFAULT_LOG_FILE)) ? DEFAULT_LOG_FILE : DEV_LOG_FILE)
 
   if (!existsSync(logFile)) {
     return NextResponse.json({ error: "Log file not found" }, { status: 404 })
@@ -23,7 +24,7 @@ export async function GET(): Promise<Response> {
   try {
     const stream = createReadStream(logFile)
     const webStream = Readable.toWeb(stream) as ReadableStream
-    const today = new Date().toISOString().split("T")[0]
+    const today = localDateStr()
 
     return new Response(webStream, {
       headers: {
diff --git a/src/app/api/settings/logs/route.ts b/src/app/api/settings/logs/route.ts
index b22e5fa4..dfd011a4 100644
--- a/src/app/api/settings/logs/route.ts
+++ b/src/app/api/settings/logs/route.ts
@@ -2,10 +2,12 @@
 //
 // Functions: GET, DELETE
 
+import { existsSync } from "node:fs"
 import { writeFile } from "node:fs/promises"
+import { dirname } from "node:path"
 import { NextResponse } from "next/server"
 import { authenticate } from "@/lib/api-helpers"
-import { DEFAULT_LOG_FILE } from "@/lib/constants"
+import { DEFAULT_LOG_FILE, DEV_LOG_FILE } from "@/lib/constants"
 import { readLogTail } from "@/lib/log-reader"
 import { log } from "@/lib/logger"
 
@@ -31,7 +33,9 @@ export async function DELETE(_request: Request): Promise<NextResponse> {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const logFile = process.env.LOG_FILE || DEFAULT_LOG_FILE
+  const logFile =
+    process.env.LOG_FILE ??
+    (existsSync(dirname(DEFAULT_LOG_FILE)) ? DEFAULT_LOG_FILE : DEV_LOG_FILE)
   try {
     await writeFile(logFile, "", "utf8")
     log.info({ route: "DELETE /api/settings/logs" }, "log file cleared by user")
diff --git a/src/app/api/settings/nuke/route.ts b/src/app/api/settings/nuke/route.ts
index 4446a08a..377b6f83 100644
--- a/src/app/api/settings/nuke/route.ts
+++ b/src/app/api/settings/nuke/route.ts
@@ -7,8 +7,11 @@ import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { clearSession, verifyPassword } from "@/lib/auth"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { PASSWORD_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { scrubAndDeleteAll } from "@/lib/nuke"
+import { ensureSchedulerRunning } from "@/lib/scheduler"
 
 export async function POST(request: Request) {
   const auth = await authenticate()
@@ -18,7 +21,7 @@ export async function POST(request: Request) {
   if (body instanceof NextResponse) return body
 
   const { password } = body as { password?: string }
-  if (!password || typeof password !== "string" || password.length > 128) {
+  if (!password || typeof password !== "string" || password.length > PASSWORD_MAX) {
     return NextResponse.json({ error: "Master password is required" }, { status: 400 })
   }
 
@@ -34,8 +37,18 @@ export async function POST(request: Request) {
   }
 
   log.info({ route: "POST /api/settings/nuke" }, "data scrub initiated")
-  await scrubAndDeleteAll()
-  await clearSession()
 
+  try {
+    await scrubAndDeleteAll()
+  } catch (err) {
+    log.error({ route: "POST /api/settings/nuke", error: errMsg(err) }, "Data scrub failed")
+    ensureSchedulerRunning(auth.encryptionKey)
+    return NextResponse.json(
+      { error: "Data scrub failed. Your data is unchanged." },
+      { status: 500 }
+    )
+  }
+
+  await clearSession()
   return NextResponse.json({ success: true })
 }
diff --git a/src/app/api/settings/proxy-test/route.ts b/src/app/api/settings/proxy-test/route.ts
index 78f2a02f..8e7b68df 100644
--- a/src/app/api/settings/proxy-test/route.ts
+++ b/src/app/api/settings/proxy-test/route.ts
@@ -3,10 +3,17 @@
 // Functions: POST
 
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseJsonBody, validatePort } from "@/lib/api-helpers"
+import {
+  authenticate,
+  decodeKey,
+  parseJsonBody,
+  validateMaxLength,
+  validatePort,
+} from "@/lib/api-helpers"
 import { decrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { CREDENTIAL_MAX, HOST_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 import {
   createProxyAgent,
@@ -14,7 +21,7 @@ import {
   type ProxyType,
   proxyFetch,
   VALID_PROXY_TYPES,
-} from "@/lib/proxy"
+} from "@/lib/tunnel"
 
 const TEST_URL = "https://httpbin.org/ip"
 // Loose IP pattern — IPv4, IPv6, or comma-separated (httpbin returns this)
@@ -41,12 +48,8 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "proxyHost is required" }, { status: 400 })
   }
 
-  if (proxyHost.length > 255) {
-    return NextResponse.json(
-      { error: "Proxy host must be 255 characters or fewer" },
-      { status: 400 }
-    )
-  }
+  const proxyHostErr = validateMaxLength(proxyHost, HOST_MAX, "Proxy host")
+  if (proxyHostErr) return proxyHostErr
 
   if (!PROXY_HOST_PATTERN.test(proxyHost)) {
     return NextResponse.json({ error: "Invalid proxy host format" }, { status: 400 })
@@ -59,6 +62,15 @@ export async function POST(request: Request) {
     )
   }
 
+  if (typeof proxyUsername === "string") {
+    const proxyUsernameErr = validateMaxLength(proxyUsername, CREDENTIAL_MAX, "Proxy username")
+    if (proxyUsernameErr) return proxyUsernameErr
+  }
+  if (typeof proxyPassword === "string") {
+    const proxyPasswordErr = validateMaxLength(proxyPassword, CREDENTIAL_MAX, "Proxy password")
+    if (proxyPasswordErr) return proxyPasswordErr
+  }
+
   const port = typeof proxyPort === "number" ? proxyPort : 1080
   const portErr = validatePort(port)
   if (portErr) return portErr
diff --git a/src/app/api/settings/quicklinks/route.ts b/src/app/api/settings/quicklinks/route.ts
index cd7a6e9c..7ae81d38 100644
--- a/src/app/api/settings/quicklinks/route.ts
+++ b/src/app/api/settings/quicklinks/route.ts
@@ -4,9 +4,11 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody } from "@/lib/api-helpers"
+import { authenticate, parseJsonBody, validateMaxLength } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { QUICKLINK_SLUG_MAX, QUICKLINK_SLUGS_MAX } from "@/lib/limits"
+import { log } from "@/lib/logger"
 
 export async function GET() {
   const auth = await authenticate()
@@ -28,7 +30,8 @@ export async function GET() {
       if (Array.isArray(parsed) && parsed.every((s) => typeof s === "string")) {
         slugs = parsed
       }
-    } catch {
+    } catch (err) {
+      log.warn({ error: String(err) }, "Corrupt draftQuicklinks JSON in DB, returning empty")
       slugs = []
     }
   }
@@ -49,12 +52,13 @@ export async function PUT(request: Request) {
     return NextResponse.json({ error: "slugs must be an array of strings" }, { status: 400 })
   }
 
-  if (slugs.length > 100) {
+  if (slugs.length > QUICKLINK_SLUGS_MAX) {
     return NextResponse.json({ error: "Too many quicklinks (max 100)" }, { status: 400 })
   }
 
-  if (slugs.some((s) => s.length > 200)) {
-    return NextResponse.json({ error: "Slug too long (max 200 characters)" }, { status: 400 })
+  for (const s of slugs) {
+    const slugErr = validateMaxLength(s, QUICKLINK_SLUG_MAX, "Slug")
+    if (slugErr) return slugErr
   }
 
   const [settings] = await db.select({ id: appSettings.id }).from(appSettings).limit(1)
diff --git a/src/app/api/settings/reset-stats/reset-stats.test.ts b/src/app/api/settings/reset-stats/reset-stats.test.ts
index 828aa2b8..0d2b3450 100644
--- a/src/app/api/settings/reset-stats/reset-stats.test.ts
+++ b/src/app/api/settings/reset-stats/reset-stats.test.ts
@@ -21,6 +21,7 @@ vi.mock("@/lib/db", () => ({
     select: vi.fn(),
     delete: vi.fn(),
     update: vi.fn(),
+    transaction: vi.fn(),
   },
 }))
 
@@ -83,18 +84,32 @@ describe("POST /api/settings/reset-stats", () => {
     mockSelectSettings({ id: 1, passwordHash: "hash" })
     ;(verifyPassword as ReturnType<typeof vi.fn>).mockResolvedValue(true)
 
-    const mockWhere = vi.fn().mockResolvedValue(undefined)
-    const mockSet = vi.fn().mockReturnValue({ where: mockWhere })
-    ;(db.delete as ReturnType<typeof vi.fn>).mockResolvedValue(undefined)
-    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
+    // Mock the transaction to invoke the callback with a tx mock
+    const txDeleteCalls: unknown[] = []
+    const txSetCalls: unknown[] = []
+    const txMock = {
+      delete: vi.fn().mockImplementation((table) => {
+        txDeleteCalls.push(table)
+        return Promise.resolve(undefined)
+      }),
+      update: vi.fn().mockReturnValue({
+        set: vi.fn().mockImplementation((data) => {
+          txSetCalls.push(data)
+          return Promise.resolve(undefined)
+        }),
+      }),
+    }
+    ;(db.transaction as ReturnType<typeof vi.fn>).mockImplementation(
+      async (fn: (tx: unknown) => Promise<unknown>) => fn(txMock)
+    )
 
     const res = await POST(makeRequest())
     const data = await res.json()
 
     expect(res.status).toBe(200)
     expect(data.success).toBe(true)
-    expect(db.delete).toHaveBeenCalledTimes(2)
-    expect(db.update).toHaveBeenCalledTimes(1)
-    expect(mockSet).toHaveBeenCalledWith({ lastPolledAt: null, lastError: null })
+    expect(txMock.delete).toHaveBeenCalledTimes(2)
+    expect(txMock.update).toHaveBeenCalledTimes(1)
+    expect(txSetCalls[0]).toEqual({ lastPolledAt: null, lastError: null })
   })
 })
diff --git a/src/app/api/settings/reset-stats/route.ts b/src/app/api/settings/reset-stats/route.ts
index 69157cec..b3402723 100644
--- a/src/app/api/settings/reset-stats/route.ts
+++ b/src/app/api/settings/reset-stats/route.ts
@@ -7,6 +7,8 @@ import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { verifyPassword } from "@/lib/auth"
 import { db } from "@/lib/db"
 import { appSettings, clientSnapshots, trackerSnapshots, trackers } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { PASSWORD_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
 export async function POST(request: Request) {
@@ -17,7 +19,7 @@ export async function POST(request: Request) {
   if (body instanceof NextResponse) return body
 
   const { password } = body as { password?: string }
-  if (!password || typeof password !== "string" || password.length > 128) {
+  if (!password || typeof password !== "string" || password.length > PASSWORD_MAX) {
     return NextResponse.json({ error: "Master password is required" }, { status: 400 })
   }
 
@@ -36,14 +38,17 @@ export async function POST(request: Request) {
   }
 
   log.info({ route: "POST /api/settings/reset-stats" }, "stats reset initiated")
-  // Delete all tracker snapshots
-  await db.delete(trackerSnapshots)
 
-  // Delete all client snapshots
-  await db.delete(clientSnapshots)
-
-  // Clear lastPolledAt and lastError on all trackers so they re-poll fresh
-  await db.update(trackers).set({ lastPolledAt: null, lastError: null })
+  try {
+    await db.transaction(async (tx) => {
+      await tx.delete(trackerSnapshots)
+      await tx.delete(clientSnapshots)
+      await tx.update(trackers).set({ lastPolledAt: null, lastError: null })
+    })
+  } catch (err) {
+    log.error({ route: "POST /api/settings/reset-stats", error: errMsg(err) }, "stats reset failed")
+    return NextResponse.json({ error: "Stats reset failed" }, { status: 500 })
+  }
 
   return NextResponse.json({ success: true })
 }
diff --git a/src/app/api/settings/route.ts b/src/app/api/settings/route.ts
index 8add5be8..09eb89bc 100644
--- a/src/app/api/settings/route.ts
+++ b/src/app/api/settings/route.ts
@@ -6,16 +6,47 @@ import { access, mkdir } from "node:fs/promises"
 import path from "node:path"
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseJsonBody } from "@/lib/api-helpers"
+import {
+  authenticate,
+  decodeKey,
+  parseJsonBody,
+  validateIntRange,
+  validateMaxLength,
+} from "@/lib/api-helpers"
 import { VALID_BACKUP_FREQUENCIES } from "@/lib/backup"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
+import { QBITMANAGE_KEYS } from "@/lib/download-clients/qbt/qbitmanage-defaults"
+import { errMsg } from "@/lib/error-utils"
+import {
+  BACKUP_PASSWORD_MAX,
+  BACKUP_RETENTION_MAX,
+  BACKUP_RETENTION_MIN,
+  CREDENTIAL_MAX,
+  HOST_MAX,
+  LOCKOUT_DURATION_MAX,
+  LOCKOUT_DURATION_MIN,
+  LOCKOUT_THRESHOLD_MAX,
+  LOCKOUT_THRESHOLD_MIN,
+  LONG_STRING_MAX,
+  POLL_INTERVAL_MAX,
+  POLL_INTERVAL_MIN,
+  PORT_MAX,
+  PORT_MIN,
+  SESSION_TIMEOUT_MAX,
+  SESSION_TIMEOUT_MIN,
+  SHORT_NAME_MAX,
+  SNAPSHOT_RETENTION_MAX,
+  SNAPSHOT_RETENTION_MIN,
+  USERNAME_MAX,
+  USERNAME_MIN,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { scrubSnapshotUsernames } from "@/lib/privacy-db"
-import { PROXY_HOST_PATTERN, VALID_PROXY_TYPES } from "@/lib/proxy"
-import { QBITMANAGE_KEYS } from "@/lib/qbitmanage-defaults"
 import { fetchSettings, serializeSettingsResponse } from "@/lib/server-data"
+import { PROXY_HOST_PATTERN, VALID_PROXY_TYPES } from "@/lib/tunnel"
+import { isValidPort } from "@/lib/validators"
 
 export async function GET() {
   const auth = await authenticate()
@@ -49,9 +80,9 @@ export async function PATCH(request: Request) {
     if (body.username === null || body.username === "") {
       updates.username = null
     } else if (typeof body.username === "string") {
-      if (body.username.length < 6 || body.username.length > 100) {
+      if (body.username.length < USERNAME_MIN || body.username.length > USERNAME_MAX) {
         return NextResponse.json(
-          { error: "Username must be between 6 and 100 characters" },
+          { error: `Username must be between ${USERNAME_MIN} and ${USERNAME_MAX} characters` },
           { status: 400 }
         )
       }
@@ -69,9 +100,14 @@ export async function PATCH(request: Request) {
       typeof body.sessionTimeoutMinutes === "number" &&
       Number.isInteger(body.sessionTimeoutMinutes)
     ) {
-      if (body.sessionTimeoutMinutes < 1 || body.sessionTimeoutMinutes > 525960) {
+      if (
+        body.sessionTimeoutMinutes < SESSION_TIMEOUT_MIN ||
+        body.sessionTimeoutMinutes > SESSION_TIMEOUT_MAX
+      ) {
         return NextResponse.json(
-          { error: "Session timeout must be between 1 minute and 1 year" },
+          {
+            error: `Session timeout must be between ${SESSION_TIMEOUT_MIN} and ${SESSION_TIMEOUT_MAX} minutes`,
+          },
           { status: 400 }
         )
       }
@@ -94,31 +130,32 @@ export async function PATCH(request: Request) {
   }
 
   if (body.lockoutThreshold !== undefined) {
-    if (typeof body.lockoutThreshold !== "number" || !Number.isInteger(body.lockoutThreshold)) {
+    if (typeof body.lockoutThreshold !== "number") {
       return NextResponse.json({ error: "Invalid lockout threshold" }, { status: 400 })
     }
-    if (body.lockoutThreshold < 1 || body.lockoutThreshold > 99) {
-      return NextResponse.json(
-        { error: "Lockout threshold must be between 1 and 99" },
-        { status: 400 }
-      )
-    }
+    const thresholdErr = validateIntRange(
+      body.lockoutThreshold,
+      LOCKOUT_THRESHOLD_MIN,
+      LOCKOUT_THRESHOLD_MAX,
+      "lockoutThreshold",
+      `Lockout threshold must be between ${LOCKOUT_THRESHOLD_MIN} and ${LOCKOUT_THRESHOLD_MAX}`
+    )
+    if (thresholdErr) return thresholdErr
     updates.lockoutThreshold = body.lockoutThreshold
   }
 
   if (body.lockoutDurationMinutes !== undefined) {
-    if (
-      typeof body.lockoutDurationMinutes !== "number" ||
-      !Number.isInteger(body.lockoutDurationMinutes)
-    ) {
+    if (typeof body.lockoutDurationMinutes !== "number") {
       return NextResponse.json({ error: "Invalid lockout duration" }, { status: 400 })
     }
-    if (body.lockoutDurationMinutes < 1 || body.lockoutDurationMinutes > 1440) {
-      return NextResponse.json(
-        { error: "Lockout duration must be between 1 minute and 24 hours" },
-        { status: 400 }
-      )
-    }
+    const durationErr = validateIntRange(
+      body.lockoutDurationMinutes,
+      LOCKOUT_DURATION_MIN,
+      LOCKOUT_DURATION_MAX,
+      "lockoutDurationMinutes",
+      `Lockout duration must be between ${LOCKOUT_DURATION_MIN} and ${LOCKOUT_DURATION_MAX} minutes`
+    )
+    if (durationErr) return durationErr
     updates.lockoutDurationMinutes = body.lockoutDurationMinutes
   }
 
@@ -130,9 +167,14 @@ export async function PATCH(request: Request) {
       typeof body.snapshotRetentionDays === "number" &&
       Number.isInteger(body.snapshotRetentionDays)
     ) {
-      if (body.snapshotRetentionDays < 7 || body.snapshotRetentionDays > 3650) {
+      if (
+        body.snapshotRetentionDays < SNAPSHOT_RETENTION_MIN ||
+        body.snapshotRetentionDays > SNAPSHOT_RETENTION_MAX
+      ) {
         return NextResponse.json(
-          { error: "Snapshot retention must be between 7 days and 10 years" },
+          {
+            error: `Snapshot retention must be between ${SNAPSHOT_RETENTION_MIN} and ${SNAPSHOT_RETENTION_MAX} days`,
+          },
           { status: 400 }
         )
       }
@@ -144,18 +186,17 @@ export async function PATCH(request: Request) {
 
   // --- Tracker poll interval ---
   if (body.trackerPollIntervalMinutes !== undefined) {
-    if (
-      typeof body.trackerPollIntervalMinutes !== "number" ||
-      !Number.isInteger(body.trackerPollIntervalMinutes)
-    ) {
+    if (typeof body.trackerPollIntervalMinutes !== "number") {
       return NextResponse.json({ error: "Invalid poll interval" }, { status: 400 })
     }
-    if (body.trackerPollIntervalMinutes < 15 || body.trackerPollIntervalMinutes > 1440) {
-      return NextResponse.json(
-        { error: "Poll interval must be between 15 minutes and 24 hours" },
-        { status: 400 }
-      )
-    }
+    const pollErr = validateIntRange(
+      body.trackerPollIntervalMinutes,
+      POLL_INTERVAL_MIN,
+      POLL_INTERVAL_MAX,
+      "trackerPollIntervalMinutes",
+      `Poll interval must be between ${POLL_INTERVAL_MIN} and ${POLL_INTERVAL_MAX} minutes`
+    )
+    if (pollErr) return pollErr
     updates.trackerPollIntervalMinutes = body.trackerPollIntervalMinutes
   }
 
@@ -181,12 +222,8 @@ export async function PATCH(request: Request) {
     if (body.proxyHost === null || body.proxyHost === "") {
       updates.proxyHost = null
     } else if (typeof body.proxyHost === "string") {
-      if (body.proxyHost.length > 255) {
-        return NextResponse.json(
-          { error: "Proxy host must be 255 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const proxyHostErr = validateMaxLength(body.proxyHost, HOST_MAX, "Proxy host")
+      if (proxyHostErr) return proxyHostErr
       if (!PROXY_HOST_PATTERN.test(body.proxyHost)) {
         return NextResponse.json({ error: "Invalid proxy host format" }, { status: 400 })
       }
@@ -200,9 +237,9 @@ export async function PATCH(request: Request) {
     if (body.proxyPort === null) {
       updates.proxyPort = null
     } else if (typeof body.proxyPort === "number" && Number.isInteger(body.proxyPort)) {
-      if (body.proxyPort < 1 || body.proxyPort > 65535) {
+      if (!isValidPort(body.proxyPort)) {
         return NextResponse.json(
-          { error: "Proxy port must be between 1 and 65535" },
+          { error: `Proxy port must be between ${PORT_MIN} and ${PORT_MAX}` },
           { status: 400 }
         )
       }
@@ -216,12 +253,12 @@ export async function PATCH(request: Request) {
     if (body.proxyUsername === null || body.proxyUsername === "") {
       updates.proxyUsername = null
     } else if (typeof body.proxyUsername === "string") {
-      if (body.proxyUsername.length > 255) {
-        return NextResponse.json(
-          { error: "Proxy username must be 255 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const proxyUsernameErr = validateMaxLength(
+        body.proxyUsername,
+        CREDENTIAL_MAX,
+        "Proxy username"
+      )
+      if (proxyUsernameErr) return proxyUsernameErr
       updates.proxyUsername = body.proxyUsername
     } else {
       return NextResponse.json({ error: "Invalid proxy username" }, { status: 400 })
@@ -232,12 +269,12 @@ export async function PATCH(request: Request) {
     if (body.proxyPassword === null || body.proxyPassword === "") {
       updates.encryptedProxyPassword = null
     } else if (typeof body.proxyPassword === "string") {
-      if (body.proxyPassword.length > 255) {
-        return NextResponse.json(
-          { error: "Proxy password must be 255 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const proxyPasswordErr = validateMaxLength(
+        body.proxyPassword,
+        CREDENTIAL_MAX,
+        "Proxy password"
+      )
+      if (proxyPasswordErr) return proxyPasswordErr
       const key = decodeKey(auth)
       updates.encryptedProxyPassword = encrypt(body.proxyPassword, key)
     } else {
@@ -307,7 +344,7 @@ export async function PATCH(request: Request) {
           { status: 400 }
         )
       }
-      if (tag.length === 0 || tag.length > 100) {
+      if (tag.length === 0 || tag.length > SHORT_NAME_MAX) {
         return NextResponse.json(
           { error: `qbitmanageTags.${key}.tag must be between 1 and 100 characters` },
           { status: 400 }
@@ -343,18 +380,17 @@ export async function PATCH(request: Request) {
   }
 
   if (body.backupRetentionCount !== undefined) {
-    if (
-      typeof body.backupRetentionCount !== "number" ||
-      !Number.isInteger(body.backupRetentionCount)
-    ) {
+    if (typeof body.backupRetentionCount !== "number") {
       return NextResponse.json({ error: "Invalid backup retention count" }, { status: 400 })
     }
-    if (body.backupRetentionCount < 1 || body.backupRetentionCount > 365) {
-      return NextResponse.json(
-        { error: "Backup retention count must be between 1 and 365" },
-        { status: 400 }
-      )
-    }
+    const retentionErr = validateIntRange(
+      body.backupRetentionCount,
+      BACKUP_RETENTION_MIN,
+      BACKUP_RETENTION_MAX,
+      "backupRetentionCount",
+      `Backup retention count must be between ${BACKUP_RETENTION_MIN} and ${BACKUP_RETENTION_MAX}`
+    )
+    if (retentionErr) return retentionErr
     updates.backupRetentionCount = body.backupRetentionCount
   }
 
@@ -376,12 +412,12 @@ export async function PATCH(request: Request) {
     if (body.backupPassword === null || body.backupPassword === "") {
       updates.encryptedBackupPassword = null
     } else if (typeof body.backupPassword === "string") {
-      if (body.backupPassword.length > 255) {
-        return NextResponse.json(
-          { error: "Backup password must be 255 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const backupPasswordErr = validateMaxLength(
+        body.backupPassword,
+        BACKUP_PASSWORD_MAX,
+        "Backup password"
+      )
+      if (backupPasswordErr) return backupPasswordErr
       const key = decodeKey(auth)
       updates.encryptedBackupPassword = encrypt(body.backupPassword, key)
     } else {
@@ -394,12 +430,12 @@ export async function PATCH(request: Request) {
     if (body.ptpimgApiKey === null || body.ptpimgApiKey === "") {
       updates.encryptedPtpimgApiKey = null
     } else if (typeof body.ptpimgApiKey === "string") {
-      if (body.ptpimgApiKey.length > 500) {
-        return NextResponse.json(
-          { error: "PTPimg API key must be 500 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const ptpimgApiKeyErr = validateMaxLength(
+        body.ptpimgApiKey,
+        LONG_STRING_MAX,
+        "PTPimg API key"
+      )
+      if (ptpimgApiKeyErr) return ptpimgApiKeyErr
       const key = decodeKey(auth)
       updates.encryptedPtpimgApiKey = encrypt(body.ptpimgApiKey, key)
     } else {
@@ -411,12 +447,12 @@ export async function PATCH(request: Request) {
     if (body.oeimgApiKey === null || body.oeimgApiKey === "") {
       updates.encryptedOeimgApiKey = null
     } else if (typeof body.oeimgApiKey === "string") {
-      if (body.oeimgApiKey.length > 500) {
-        return NextResponse.json(
-          { error: "OnlyImage API key must be 500 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const oeimgApiKeyErr = validateMaxLength(
+        body.oeimgApiKey,
+        LONG_STRING_MAX,
+        "OnlyImage API key"
+      )
+      if (oeimgApiKeyErr) return oeimgApiKeyErr
       const key = decodeKey(auth)
       updates.encryptedOeimgApiKey = encrypt(body.oeimgApiKey, key)
     } else {
@@ -428,12 +464,8 @@ export async function PATCH(request: Request) {
     if (body.imgbbApiKey === null || body.imgbbApiKey === "") {
       updates.encryptedImgbbApiKey = null
     } else if (typeof body.imgbbApiKey === "string") {
-      if (body.imgbbApiKey.length > 500) {
-        return NextResponse.json(
-          { error: "ImgBB API key must be 500 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const imgbbApiKeyErr = validateMaxLength(body.imgbbApiKey, LONG_STRING_MAX, "ImgBB API key")
+      if (imgbbApiKeyErr) return imgbbApiKeyErr
       const key = decodeKey(auth)
       updates.encryptedImgbbApiKey = encrypt(body.imgbbApiKey, key)
     } else {
@@ -446,12 +478,12 @@ export async function PATCH(request: Request) {
       updates.backupStoragePath = null
     } else if (typeof body.backupStoragePath === "string") {
       const trimmedPath = body.backupStoragePath.trim()
-      if (trimmedPath.length > 500) {
-        return NextResponse.json(
-          { error: "Backup storage path must be 500 characters or fewer" },
-          { status: 400 }
-        )
-      }
+      const backupStoragePathErr = validateMaxLength(
+        trimmedPath,
+        LONG_STRING_MAX,
+        "Backup storage path"
+      )
+      if (backupStoragePathErr) return backupStoragePathErr
       if (!path.isAbsolute(trimmedPath) || trimmedPath.includes("..")) {
         return NextResponse.json(
           { error: "Backup storage path must be an absolute path with no '..' segments" },
@@ -478,28 +510,33 @@ export async function PATCH(request: Request) {
     return NextResponse.json({ error: "No valid fields to update" }, { status: 400 })
   }
 
-  await db.update(appSettings).set(updates).where(eq(appSettings.id, settings.id))
-  log.info({ route: "PATCH /api/settings", fields: Object.keys(updates) }, "settings updated")
+  try {
+    await db.update(appSettings).set(updates).where(eq(appSettings.id, settings.id))
+    log.info({ route: "PATCH /api/settings", fields: Object.keys(updates) }, "settings updated")
 
-  // Re-fetch to return current state
-  const [updated] = await fetchSettings()
-  if (!updated) {
-    log.error({ route: "PATCH /api/settings" }, "settings re-fetch returned empty after update")
-    throw new Error("Settings update failed")
-  }
+    // Re-fetch to return current state
+    const [updated] = await fetchSettings()
+    if (!updated) {
+      log.error({ route: "PATCH /api/settings" }, "settings re-fetch returned empty after update")
+      return NextResponse.json({ error: "Settings update failed" }, { status: 500 })
+    }
 
-  // Restart backup scheduler if schedule settings changed
-  if (
-    updates.backupScheduleEnabled !== undefined ||
-    updates.backupScheduleFrequency !== undefined
-  ) {
-    const { stopBackupScheduler, startBackupScheduler } = await import("@/lib/backup-scheduler")
-    stopBackupScheduler()
-    if (updated.backupScheduleEnabled) {
-      const key = decodeKey(auth)
-      startBackupScheduler(key)
+    // Restart backup scheduler if schedule settings changed
+    if (
+      updates.backupScheduleEnabled !== undefined ||
+      updates.backupScheduleFrequency !== undefined
+    ) {
+      const { stopBackupScheduler, startBackupScheduler } = await import("@/lib/backup-scheduler")
+      stopBackupScheduler()
+      if (updated.backupScheduleEnabled) {
+        const key = decodeKey(auth)
+        startBackupScheduler(key)
+      }
     }
-  }
 
-  return NextResponse.json(serializeSettingsResponse(updated))
+    return NextResponse.json(serializeSettingsResponse(updated))
+  } catch (err) {
+    log.error({ route: "PATCH /api/settings", error: errMsg(err) }, "Failed to save settings")
+    return NextResponse.json({ error: "Failed to save settings" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/settings/settings-routes.test.ts b/src/app/api/settings/settings-routes.test.ts
index 4deedfc5..a985997e 100644
--- a/src/app/api/settings/settings-routes.test.ts
+++ b/src/app/api/settings/settings-routes.test.ts
@@ -54,6 +54,54 @@ vi.mock("@/lib/db/schema", () => ({
     updatedAt: "updatedAt",
   },
   trackerSnapshots: {},
+  downloadClients: {
+    id: "id",
+    name: "name",
+    type: "type",
+    enabled: "enabled",
+    host: "host",
+    port: "port",
+    useSsl: "useSsl",
+    encryptedUsername: "encryptedUsername",
+    encryptedPassword: "encryptedPassword",
+    pollIntervalSeconds: "pollIntervalSeconds",
+    isDefault: "isDefault",
+    crossSeedTags: "crossSeedTags",
+    lastPolledAt: "lastPolledAt",
+    lastError: "lastError",
+    errorSince: "errorSince",
+    createdAt: "createdAt",
+    updatedAt: "updatedAt",
+  },
+  notificationTargets: {
+    id: "id",
+    name: "name",
+    type: "type",
+    enabled: "enabled",
+    encryptedConfig: "encryptedConfig",
+    notifyRatioDrop: "notifyRatioDrop",
+    notifyHitAndRun: "notifyHitAndRun",
+    notifyTrackerDown: "notifyTrackerDown",
+    notifyBufferMilestone: "notifyBufferMilestone",
+    notifyWarned: "notifyWarned",
+    notifyRatioDanger: "notifyRatioDanger",
+    notifyZeroSeeding: "notifyZeroSeeding",
+    notifyRankChange: "notifyRankChange",
+    notifyAnniversary: "notifyAnniversary",
+    notifyBonusCap: "notifyBonusCap",
+    notifyVipExpiring: "notifyVipExpiring",
+    notifyUnsatisfiedLimit: "notifyUnsatisfiedLimit",
+    notifyActiveHnrs: "notifyActiveHnrs",
+    notifyDownloadDisabled: "notifyDownloadDisabled",
+    thresholds: "thresholds",
+    includeTrackerName: "includeTrackerName",
+    scope: "scope",
+    lastDeliveryStatus: "lastDeliveryStatus",
+    lastDeliveryAt: "lastDeliveryAt",
+    lastDeliveryError: "lastDeliveryError",
+    createdAt: "createdAt",
+    updatedAt: "updatedAt",
+  },
 }))
 
 vi.mock("@/lib/backup", () => ({
@@ -73,12 +121,12 @@ vi.mock("@/lib/privacy-db", () => ({
   scrubSnapshotUsernames: vi.fn().mockResolvedValue(0),
 }))
 
-vi.mock("@/lib/proxy", () => ({
+vi.mock("@/lib/tunnel", () => ({
   PROXY_HOST_PATTERN: /^[\w.\-:[\]]+$/,
   VALID_PROXY_TYPES: new Set(["socks5", "http", "https"]),
 }))
 
-vi.mock("@/lib/qbitmanage-defaults", () => ({
+vi.mock("@/lib/download-clients/qbt/qbitmanage-defaults", () => ({
   parseQbitmanageTags: vi.fn(() => ({})),
   QBITMANAGE_KEYS: [],
 }))
@@ -127,7 +175,9 @@ describe("PATCH /api/settings route validation", () => {
     const response = await PATCH(new Request("http://localhost/api/settings", { method: "PATCH" }))
 
     expect(response.status).toBe(400)
-    await expect(response.json()).resolves.toEqual({ error: "Invalid poll interval" })
+    await expect(response.json()).resolves.toEqual({
+      error: "Poll interval must be between 15 and 1440 minutes",
+    })
   })
 
   it("rejects trackerPollIntervalMinutes below 15 minutes", async () => {
@@ -139,7 +189,7 @@ describe("PATCH /api/settings route validation", () => {
 
     expect(response.status).toBe(400)
     await expect(response.json()).resolves.toEqual({
-      error: "Poll interval must be between 15 minutes and 24 hours",
+      error: "Poll interval must be between 15 and 1440 minutes",
     })
   })
 
@@ -152,10 +202,56 @@ describe("PATCH /api/settings route validation", () => {
 
     expect(response.status).toBe(400)
     await expect(response.json()).resolves.toEqual({
-      error: "Poll interval must be between 15 minutes and 24 hours",
+      error: "Poll interval must be between 15 and 1440 minutes",
     })
   })
 
+  // ─── Username validation ──────────────────────────────────────
+
+  it("rejects username shorter than 3 characters", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({ username: "ab" })
+
+    const response = await PATCH(new Request("http://localhost/api/settings", { method: "PATCH" }))
+
+    expect(response.status).toBe(400)
+    await expect(response.json()).resolves.toEqual({
+      error: "Username must be between 3 and 100 characters",
+    })
+  })
+
+  it("accepts username of exactly 3 characters", async () => {
+    const set = vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue([]) })
+    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({ username: "joe" })
+
+    const response = await PATCH(new Request("http://localhost/api/settings", { method: "PATCH" }))
+
+    expect(response.status).toBe(200)
+  })
+
+  it("rejects username longer than 100 characters", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      username: "a".repeat(101),
+    })
+
+    const response = await PATCH(new Request("http://localhost/api/settings", { method: "PATCH" }))
+
+    expect(response.status).toBe(400)
+    await expect(response.json()).resolves.toEqual({
+      error: "Username must be between 3 and 100 characters",
+    })
+  })
+
+  it("accepts null username to clear it", async () => {
+    const set = vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue([]) })
+    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({ username: null })
+
+    const response = await PATCH(new Request("http://localhost/api/settings", { method: "PATCH" }))
+
+    expect(response.status).toBe(200)
+  })
+
   it("returns 401 when unauthenticated", async () => {
     ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue(
       NextResponse.json({ error: "Unauthorized" }, { status: 401 })
diff --git a/src/app/api/tag-groups/[id]/members/[memberId]/route.ts b/src/app/api/tag-groups/[id]/members/[memberId]/route.ts
index 3c942bf0..d07a19c3 100644
--- a/src/app/api/tag-groups/[id]/members/[memberId]/route.ts
+++ b/src/app/api/tag-groups/[id]/members/[memberId]/route.ts
@@ -4,13 +4,14 @@
 
 import { and, eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody, validateHexColor } from "@/lib/api-helpers"
+import { authenticate, parseJsonBody, type RouteContext, validateHexColor } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { tagGroupMembers } from "@/lib/db/schema"
+import { SHORT_NAME_MAX, SORT_ORDER_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
 async function parseGroupAndMemberId(
-  params: Promise<{ id: string; memberId: string }>
+  params: RouteContext<{ id: string; memberId: string }>["params"]
 ): Promise<NextResponse | { groupId: number; memberId: number }> {
   const { id, memberId } = await params
   const groupId = parseInt(id, 10)
@@ -24,7 +25,7 @@ async function parseGroupAndMemberId(
 
 export async function PATCH(
   request: Request,
-  props: { params: Promise<{ id: string; memberId: string }> }
+  props: RouteContext<{ id: string; memberId: string }>
 ) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
@@ -52,7 +53,7 @@ export async function PATCH(
     if (body.tag.trim().length === 0) {
       return NextResponse.json({ error: "Tag cannot be empty" }, { status: 400 })
     }
-    if (body.tag.length > 100) {
+    if (body.tag.length > SHORT_NAME_MAX) {
       return NextResponse.json({ error: "Tag must be 100 characters or fewer" }, { status: 400 })
     }
     if (body.tag.trim() !== existing.tag) {
@@ -76,7 +77,7 @@ export async function PATCH(
     if (body.label.trim().length === 0) {
       return NextResponse.json({ error: "Label cannot be empty" }, { status: 400 })
     }
-    if (body.label.length > 100) {
+    if (body.label.length > SHORT_NAME_MAX) {
       return NextResponse.json({ error: "Label must be 100 characters or fewer" }, { status: 400 })
     }
     updates.label = body.label.trim()
@@ -91,9 +92,9 @@ export async function PATCH(
   }
 
   if (typeof body.sortOrder === "number") {
-    if (!Number.isFinite(body.sortOrder) || body.sortOrder < 0 || body.sortOrder > 9999) {
+    if (!Number.isFinite(body.sortOrder) || body.sortOrder < 0 || body.sortOrder > SORT_ORDER_MAX) {
       return NextResponse.json(
-        { error: "sortOrder must be a finite integer between 0 and 9999" },
+        { error: `sortOrder must be a finite integer between 0 and ${SORT_ORDER_MAX}` },
         { status: 400 }
       )
     }
@@ -114,7 +115,7 @@ export async function PATCH(
 
 export async function DELETE(
   _request: Request,
-  props: { params: Promise<{ id: string; memberId: string }> }
+  props: RouteContext<{ id: string; memberId: string }>
 ) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
diff --git a/src/app/api/tag-groups/[id]/members/route.ts b/src/app/api/tag-groups/[id]/members/route.ts
index 0f8a63d3..30b05c21 100644
--- a/src/app/api/tag-groups/[id]/members/route.ts
+++ b/src/app/api/tag-groups/[id]/members/route.ts
@@ -4,12 +4,19 @@
 
 import { and, asc, eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody, parseRouteId, validateHexColor } from "@/lib/api-helpers"
+import {
+  authenticate,
+  parseJsonBody,
+  parseRouteId,
+  type RouteContext,
+  validateHexColor,
+} from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { tagGroupMembers, tagGroups } from "@/lib/db/schema"
+import { SHORT_NAME_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -35,7 +42,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
   return NextResponse.json(members)
 }
 
-export async function POST(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -60,11 +67,11 @@ export async function POST(request: Request, props: { params: Promise<{ id: stri
     return NextResponse.json({ error: "label is required" }, { status: 400 })
   }
 
-  if (tag.length > 100) {
+  if (tag.length > SHORT_NAME_MAX) {
     return NextResponse.json({ error: "Tag must be 100 characters or fewer" }, { status: 400 })
   }
 
-  if (label.length > 100) {
+  if (label.length > SHORT_NAME_MAX) {
     return NextResponse.json({ error: "Label must be 100 characters or fewer" }, { status: 400 })
   }
 
diff --git a/src/app/api/tag-groups/[id]/route.ts b/src/app/api/tag-groups/[id]/route.ts
index e50d3b0e..85ac7b2a 100644
--- a/src/app/api/tag-groups/[id]/route.ts
+++ b/src/app/api/tag-groups/[id]/route.ts
@@ -2,15 +2,75 @@
 //
 // Functions: PATCH, DELETE
 
-import { eq } from "drizzle-orm"
+import { and, eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody, parseRouteId } from "@/lib/api-helpers"
+import { authenticate, parseJsonBody, parseRouteId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
-import { tagGroups } from "@/lib/db/schema"
+import { tagGroupMembers, tagGroups } from "@/lib/db/schema"
+import {
+  BATCH_MEMBERS_MAX,
+  COLOR_STRING_MAX,
+  EMOJI_MAX,
+  LONG_STRING_MAX,
+  SHORT_NAME_MAX,
+  SORT_ORDER_MAX,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { VALID_CHART_TYPES } from "@/types/api"
 
-export async function PATCH(request: Request, props: { params: Promise<{ id: string }> }) {
+// ─── Batch member mutation types ──────────────────────────────────────────────
+
+interface MemberUpdate {
+  id: number
+  tag?: string
+  label?: string
+  color?: string | null
+  sortOrder?: number
+}
+
+interface MemberCreate {
+  tag: string
+  label: string
+  color?: string | null
+  sortOrder?: number
+}
+
+interface BatchMembers {
+  removes?: number[]
+  updates?: MemberUpdate[]
+  creates?: MemberCreate[]
+}
+
+// ─── Validation helpers ───────────────────────────────────────────────────────
+
+function validateMemberTag(tag: unknown): string | null {
+  if (typeof tag !== "string" || tag.trim().length === 0) return "tag is required"
+  if (tag.length > SHORT_NAME_MAX) return "Tag must be 100 characters or fewer"
+  return null
+}
+
+function validateMemberLabel(label: unknown): string | null {
+  if (typeof label !== "string" || label.trim().length === 0) return "label is required"
+  if (label.length > SHORT_NAME_MAX) return "Label must be 100 characters or fewer"
+  return null
+}
+
+function validateSortOrder(sortOrder: unknown): string | null {
+  if (sortOrder === undefined || sortOrder === null) return null
+  if (
+    typeof sortOrder !== "number" ||
+    !Number.isInteger(sortOrder) ||
+    sortOrder < 0 ||
+    sortOrder > SORT_ORDER_MAX
+  ) {
+    return `sortOrder must be an integer between 0 and ${SORT_ORDER_MAX}`
+  }
+  return null
+}
+
+// ─── PATCH ────────────────────────────────────────────────────────────────────
+
+export async function PATCH(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -20,20 +80,22 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   const body = await parseJsonBody(request)
   if (body instanceof NextResponse) return body
 
+  // --- Build group metadata updates ---
+
   const updates: Record<string, unknown> = { updatedAt: new Date() }
 
   if (typeof body.name === "string") {
     if (body.name.trim().length === 0) {
       return NextResponse.json({ error: "Name cannot be empty" }, { status: 400 })
     }
-    if (body.name.length > 100) {
+    if (body.name.length > SHORT_NAME_MAX) {
       return NextResponse.json({ error: "Name must be 100 characters or fewer" }, { status: 400 })
     }
     updates.name = body.name.trim()
   }
 
   if (typeof body.description === "string") {
-    if (body.description.length > 500) {
+    if (body.description.length > LONG_STRING_MAX) {
       return NextResponse.json(
         { error: "Description must be 500 characters or fewer" },
         { status: 400 }
@@ -45,7 +107,7 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   }
 
   if (typeof body.emoji === "string") {
-    if (body.emoji.length > 10) {
+    if (body.emoji.length > EMOJI_MAX) {
       return NextResponse.json({ error: "Emoji must be 10 characters or fewer" }, { status: 400 })
     }
     updates.emoji = body.emoji.trim() || null
@@ -64,7 +126,7 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   }
 
   if (typeof body.sortOrder === "number") {
-    if (!Number.isFinite(body.sortOrder) || body.sortOrder < 0 || body.sortOrder > 9999) {
+    if (!Number.isFinite(body.sortOrder) || body.sortOrder < 0 || body.sortOrder > SORT_ORDER_MAX) {
       return NextResponse.json(
         { error: "sortOrder must be a finite integer between 0 and 9999" },
         { status: 400 }
@@ -75,6 +137,8 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
 
   if (typeof body.countUnmatched === "boolean") updates.countUnmatched = body.countUnmatched
 
+  // --- Validate group exists ---
+
   const [existing] = await db
     .select({ id: tagGroups.id })
     .from(tagGroups)
@@ -85,12 +149,156 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
     return NextResponse.json({ error: "Tag group not found" }, { status: 404 })
   }
 
+  // --- Batch member mutations (optional) ---
+
+  const members = body.members as BatchMembers | undefined
+
+  if (
+    members !== undefined &&
+    (typeof members !== "object" || members === null || Array.isArray(members))
+  ) {
+    return NextResponse.json(
+      { error: "members must be an object with removes, updates, and creates" },
+      { status: 400 }
+    )
+  }
+
+  if (members) {
+    // Pre-validate all member mutations before touching the DB
+    const removes = members.removes ?? []
+    const memberUpdates = members.updates ?? []
+    const creates = members.creates ?? []
+
+    if (
+      !Array.isArray(removes) ||
+      !removes.every((id) => typeof id === "number" && Number.isInteger(id))
+    ) {
+      return NextResponse.json(
+        { error: "members.removes must be an array of integer IDs" },
+        { status: 400 }
+      )
+    }
+    if (removes.length > BATCH_MEMBERS_MAX) {
+      return NextResponse.json({ error: "Too many removes" }, { status: 400 })
+    }
+
+    if (!Array.isArray(memberUpdates)) {
+      return NextResponse.json({ error: "members.updates must be an array" }, { status: 400 })
+    }
+    if (memberUpdates.length > BATCH_MEMBERS_MAX) {
+      return NextResponse.json({ error: "Too many updates" }, { status: 400 })
+    }
+    for (const u of memberUpdates) {
+      if (typeof u.id !== "number" || !Number.isInteger(u.id)) {
+        return NextResponse.json({ error: "Each update must have an integer id" }, { status: 400 })
+      }
+      if (u.tag !== undefined) {
+        const err = validateMemberTag(u.tag)
+        if (err) return NextResponse.json({ error: err }, { status: 400 })
+      }
+      if (u.label !== undefined) {
+        const err = validateMemberLabel(u.label)
+        if (err) return NextResponse.json({ error: err }, { status: 400 })
+      }
+      if (
+        u.color !== undefined &&
+        u.color !== null &&
+        (typeof u.color !== "string" || u.color.length > COLOR_STRING_MAX)
+      ) {
+        return NextResponse.json(
+          { error: "color must be a string of 20 characters or fewer" },
+          { status: 400 }
+        )
+      }
+      const sortErr = validateSortOrder(u.sortOrder)
+      if (sortErr) return NextResponse.json({ error: sortErr }, { status: 400 })
+    }
+
+    if (!Array.isArray(creates)) {
+      return NextResponse.json({ error: "members.creates must be an array" }, { status: 400 })
+    }
+    if (creates.length > BATCH_MEMBERS_MAX) {
+      return NextResponse.json({ error: "Too many creates" }, { status: 400 })
+    }
+    for (const c of creates) {
+      const tagErr = validateMemberTag(c.tag)
+      if (tagErr) return NextResponse.json({ error: tagErr }, { status: 400 })
+      const labelErr = validateMemberLabel(c.label)
+      if (labelErr) return NextResponse.json({ error: labelErr }, { status: 400 })
+      if (
+        c.color !== undefined &&
+        c.color !== null &&
+        (typeof c.color !== "string" || c.color.length > COLOR_STRING_MAX)
+      ) {
+        return NextResponse.json(
+          { error: "color must be a string of 20 characters or fewer" },
+          { status: 400 }
+        )
+      }
+      const sortErr = validateSortOrder(c.sortOrder)
+      if (sortErr) return NextResponse.json({ error: sortErr }, { status: 400 })
+    }
+
+    // All valid — execute atomically
+    await db.transaction(async (tx) => {
+      // 1. Update group metadata
+      await tx.update(tagGroups).set(updates).where(eq(tagGroups.id, groupId))
+
+      // 2. Deletes first (must precede creates — tag duplicate check depends on this)
+      for (const memberId of removes) {
+        await tx
+          .delete(tagGroupMembers)
+          .where(and(eq(tagGroupMembers.id, memberId), eq(tagGroupMembers.groupId, groupId)))
+      }
+
+      // 3. Updates second
+      for (const u of memberUpdates) {
+        const fields: Record<string, unknown> = {}
+        if (u.tag !== undefined) fields.tag = u.tag.trim()
+        if (u.label !== undefined) fields.label = u.label.trim()
+        if (u.color !== undefined) fields.color = typeof u.color === "string" ? u.color : null
+        if (u.sortOrder !== undefined) fields.sortOrder = Math.floor(u.sortOrder)
+        if (Object.keys(fields).length > 0) {
+          await tx
+            .update(tagGroupMembers)
+            .set(fields)
+            .where(and(eq(tagGroupMembers.id, u.id), eq(tagGroupMembers.groupId, groupId)))
+        }
+      }
+
+      // 4. Creates last (after deletes to avoid false duplicate-tag conflicts)
+      for (const c of creates) {
+        await tx.insert(tagGroupMembers).values({
+          groupId,
+          tag: c.tag.trim(),
+          label: c.label.trim(),
+          color: typeof c.color === "string" ? c.color : null,
+          sortOrder: typeof c.sortOrder === "number" ? Math.floor(c.sortOrder) : 0,
+        })
+      }
+    })
+
+    log.info(
+      {
+        route: "PATCH /api/tag-groups/[id]",
+        groupId,
+        removes: removes.length,
+        updates: memberUpdates.length,
+        creates: creates.length,
+      },
+      "tag group batch saved"
+    )
+    return NextResponse.json({ success: true })
+  }
+
+  // --- Non-batch path (group metadata only, backward-compatible) ---
+
   await db.update(tagGroups).set(updates).where(eq(tagGroups.id, groupId))
 
   return NextResponse.json({ success: true })
 }
 
-export async function DELETE(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function DELETE(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
diff --git a/src/app/api/tag-groups/route.ts b/src/app/api/tag-groups/route.ts
index 89729f46..567e4953 100644
--- a/src/app/api/tag-groups/route.ts
+++ b/src/app/api/tag-groups/route.ts
@@ -3,9 +3,10 @@
 // Functions: GET, POST
 
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody } from "@/lib/api-helpers"
+import { authenticate, parseJsonBody, validateMaxLength } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { tagGroups } from "@/lib/db/schema"
+import { EMOJI_MAX, LONG_STRING_MAX, SHORT_NAME_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { getTagGroupsWithMembers } from "@/lib/server-data"
 import { VALID_CHART_TYPES } from "@/types/api"
@@ -37,11 +38,10 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: "name is required" }, { status: 400 })
   }
 
-  if (name.length > 100) {
-    return NextResponse.json({ error: "Name must be 100 characters or fewer" }, { status: 400 })
-  }
+  const nameErr = validateMaxLength(name, SHORT_NAME_MAX, "Name")
+  if (nameErr) return nameErr
 
-  if (typeof description === "string" && description.length > 500) {
+  if (typeof description === "string" && description.length > LONG_STRING_MAX) {
     return NextResponse.json(
       { error: "Description must be 500 characters or fewer" },
       { status: 400 }
@@ -58,7 +58,7 @@ export async function POST(request: Request) {
     )
   }
 
-  if (typeof emoji === "string" && emoji.length > 10) {
+  if (typeof emoji === "string" && emoji.length > EMOJI_MAX) {
     return NextResponse.json({ error: "Emoji must be 10 characters or fewer" }, { status: 400 })
   }
 
diff --git a/src/app/api/trackers/[id]/avatar/route.ts b/src/app/api/trackers/[id]/avatar/route.ts
index 3577789a..8a75c413 100644
--- a/src/app/api/trackers/[id]/avatar/route.ts
+++ b/src/app/api/trackers/[id]/avatar/route.ts
@@ -6,14 +6,49 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseTrackerId, validateHttpUrl } from "@/lib/api-helpers"
+import {
+  authenticate,
+  decodeKey,
+  parseTrackerId,
+  type RouteContext,
+  validateHttpUrl,
+} from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings, trackers } from "@/lib/db/schema"
+import { AVATAR_FETCH_MAX_BYTES } from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { buildProxyAgentFromSettings, proxyFetch } from "@/lib/proxy"
+import { buildProxyAgentFromSettings, proxyFetch } from "@/lib/tunnel"
 
 const STALE_MS = 7 * 24 * 60 * 60 * 1000
-const MAX_AVATAR_BYTES = 5 * 1024 * 1024
+
+/** Detect image format from magic bytes. Falls back to image/png. */
+function sniffImageMime(buf: Buffer): string {
+  if (buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff) return "image/jpeg"
+  if (buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47) return "image/png"
+  if (buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46) return "image/gif"
+  if (
+    buf[0] === 0x52 &&
+    buf[1] === 0x49 &&
+    buf[2] === 0x46 &&
+    buf[3] === 0x46 &&
+    buf[8] === 0x57 &&
+    buf[9] === 0x45 &&
+    buf[10] === 0x42 &&
+    buf[11] === 0x50
+  )
+    return "image/webp"
+  if (
+    buf[0] === 0x00 &&
+    buf[1] === 0x00 &&
+    buf[2] === 0x00 &&
+    buf[4] === 0x66 &&
+    buf[5] === 0x74 &&
+    buf[6] === 0x79 &&
+    buf[7] === 0x70
+  )
+    return "image/avif"
+  return "image/png"
+}
 
 function avatarUrl(
   platformType: string,
@@ -27,7 +62,7 @@ function avatarUrl(
   return null
 }
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -40,6 +75,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
       remoteUserId: trackers.remoteUserId,
       useProxy: trackers.useProxy,
       avatarData: trackers.avatarData,
+      avatarMimeType: trackers.avatarMimeType,
       avatarCachedAt: trackers.avatarCachedAt,
       avatarRemoteUrl: trackers.avatarRemoteUrl,
     })
@@ -68,7 +104,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
       const data = Buffer.from(tracker.avatarData, "base64")
       return new NextResponse(new Uint8Array(data), {
         headers: {
-          "Content-Type": "image/png",
+          "Content-Type": tracker.avatarMimeType ?? "image/png",
           "Cache-Control": "private, max-age=86400",
         },
       })
@@ -78,6 +114,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
   // Fetch from tracker
   try {
     let imageBuffer: Buffer
+    let mimeType = "image/png"
 
     if (tracker.useProxy) {
       const [settings] = await db
@@ -101,8 +138,8 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
 
       const result = await proxyFetch(url, agent, {
         timeoutMs: 10000,
-        maxBytes: MAX_AVATAR_BYTES,
-        headers: { Accept: "image/png,image/*" },
+        maxBytes: AVATAR_FETCH_MAX_BYTES,
+        headers: { Accept: "image/*" },
       })
 
       if (!result.ok) {
@@ -110,19 +147,23 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
       }
 
       imageBuffer = await result.buffer()
+      // proxyFetch doesn't expose content-type; sniff from magic bytes
+      mimeType = sniffImageMime(imageBuffer)
     } else {
       const response = await fetch(url, { signal: AbortSignal.timeout(10000) })
       if (!response.ok) {
         return NextResponse.json({ error: "Avatar not found" }, { status: 404 })
       }
       const contentLength = response.headers.get("content-length")
-      if (contentLength && parseInt(contentLength, 10) > MAX_AVATAR_BYTES) {
+      if (contentLength && parseInt(contentLength, 10) > AVATAR_FETCH_MAX_BYTES) {
         return NextResponse.json({ error: "Avatar too large" }, { status: 413 })
       }
       imageBuffer = Buffer.from(await response.arrayBuffer())
+      mimeType =
+        response.headers.get("content-type")?.split(";")[0].trim() || sniffImageMime(imageBuffer)
     }
 
-    if (imageBuffer.length > MAX_AVATAR_BYTES) {
+    if (imageBuffer.length > AVATAR_FETCH_MAX_BYTES) {
       return NextResponse.json({ error: "Avatar too large" }, { status: 413 })
     }
 
@@ -131,13 +172,14 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
       .update(trackers)
       .set({
         avatarData: imageBuffer.toString("base64"),
+        avatarMimeType: mimeType,
         avatarCachedAt: new Date(),
       })
       .where(eq(trackers.id, trackerId))
 
     return new NextResponse(new Uint8Array(imageBuffer), {
       headers: {
-        "Content-Type": "image/png",
+        "Content-Type": mimeType,
         "Cache-Control": "private, max-age=86400",
       },
     })
@@ -151,7 +193,7 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
       const data = Buffer.from(tracker.avatarData, "base64")
       return new NextResponse(new Uint8Array(data), {
         headers: {
-          "Content-Type": "image/png",
+          "Content-Type": tracker.avatarMimeType ?? "image/png",
           "Cache-Control": "private, max-age=3600",
         },
       })
diff --git a/src/app/api/trackers/[id]/debug/route.ts b/src/app/api/trackers/[id]/debug/route.ts
index b415497b..f1a0286b 100644
--- a/src/app/api/trackers/[id]/debug/route.ts
+++ b/src/app/api/trackers/[id]/debug/route.ts
@@ -8,13 +8,13 @@ import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { buildFetchOptions, getAdapter } from "@/lib/adapters"
 import type { DebugApiCall, TrackerStats } from "@/lib/adapters/types"
-import { authenticate, decodeKey, parseTrackerId } from "@/lib/api-helpers"
+import { authenticate, decodeKey, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
 import { decrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { appSettings, trackers } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
-import { buildProxyAgentFromSettings } from "@/lib/proxy"
 import { scrubObject } from "@/lib/scrub-object"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
 
 function serializeStats(stats: TrackerStats): Record<string, unknown> {
   return {
@@ -33,13 +33,14 @@ function serializeStats(stats: TrackerStats): Record<string, unknown> {
     freeleechTokens: stats.freeleechTokens,
     remoteUserId: stats.remoteUserId ?? null,
     joinedDate: stats.joinedDate ?? null,
+    lastAccessDate: stats.lastAccessDate ?? null,
     shareScore: stats.shareScore ?? null,
     avatarUrl: stats.avatarUrl ?? null,
     platformMeta: stats.platformMeta ?? null,
   }
 }
 
-export async function POST(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
diff --git a/src/app/api/trackers/[id]/mousehole/route.ts b/src/app/api/trackers/[id]/mousehole/route.ts
index 41fdd3f5..bfaa6783 100644
--- a/src/app/api/trackers/[id]/mousehole/route.ts
+++ b/src/app/api/trackers/[id]/mousehole/route.ts
@@ -4,22 +4,21 @@
 
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseTrackerId } from "@/lib/api-helpers"
+import { authenticate, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { trackers } from "@/lib/db/schema"
+import { MOUSEHOLE_BODY_MAX_BYTES } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
 const GET_TIMEOUT_MS = 10_000
 const POST_TIMEOUT_MS = 15_000
 
-type RouteContext = { params: Promise<{ id: string }> }
-
 // ---------------------------------------------------------------------------
 // Shared guards
 // ---------------------------------------------------------------------------
 
 async function resolveMouseholeBase(
-  params: Promise<{ id: string }>
+  params: RouteContext["params"]
 ): Promise<NextResponse | { mouseholeBase: string }> {
   const trackerId = await parseTrackerId(params)
   if (trackerId instanceof NextResponse) return trackerId
@@ -134,9 +133,8 @@ export async function POST(request: Request, { params }: RouteContext) {
 
   const { mouseholeBase } = resolved
 
-  const MAX_BODY_SIZE = 256
   const contentLength = Number(request.headers.get("content-length") ?? 0)
-  if (contentLength > MAX_BODY_SIZE) {
+  if (contentLength > MOUSEHOLE_BODY_MAX_BYTES) {
     return NextResponse.json({ error: "Request body too large" }, { status: 413 })
   }
 
diff --git a/src/app/api/trackers/[id]/poll/route.ts b/src/app/api/trackers/[id]/poll/route.ts
index dcaed335..a130bb78 100644
--- a/src/app/api/trackers/[id]/poll/route.ts
+++ b/src/app/api/trackers/[id]/poll/route.ts
@@ -1,39 +1,40 @@
 // src/app/api/trackers/[id]/poll/route.ts
-import { eq } from "drizzle-orm"
+import { and, eq, isNull, lte, or } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseTrackerId } from "@/lib/api-helpers"
+import { authenticate, decodeKey, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings, trackers } from "@/lib/db/schema"
 import { isDecryptionError } from "@/lib/error-utils"
+import { POLL_MANUAL_COOLDOWN_MS } from "@/lib/limits"
 import { log } from "@/lib/logger"
-import { buildProxyAgentFromSettings } from "@/lib/proxy"
-import { pollTracker } from "@/lib/scheduler"
+import { pollTracker } from "@/lib/tracker-scheduler"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
 
-const POLL_COOLDOWN_MS = 10_000
-
-export async function POST(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const trackerId = await parseTrackerId(props.params)
   if (trackerId instanceof NextResponse) return trackerId
 
-  // Rate limit: reject if this tracker was polled within the last 60 seconds
-  const [tracker] = await db
-    .select({ lastPolledAt: trackers.lastPolledAt })
-    .from(trackers)
-    .where(eq(trackers.id, trackerId))
-    .limit(1)
-
-  if (tracker?.lastPolledAt) {
-    const elapsed = Date.now() - tracker.lastPolledAt.getTime()
-    if (elapsed < POLL_COOLDOWN_MS) {
-      const waitSec = Math.ceil((POLL_COOLDOWN_MS - elapsed) / 1000)
-      return NextResponse.json(
-        { error: `Poll cooldown: try again in ${waitSec}s` },
-        { status: 429 }
+  // Atomically claim poll slot — prevents TOCTOU race with multiple tabs
+  const threshold = new Date(Date.now() - POLL_MANUAL_COOLDOWN_MS)
+  const [claimed] = await db
+    .update(trackers)
+    .set({ lastPolledAt: new Date() })
+    .where(
+      and(
+        eq(trackers.id, trackerId),
+        or(isNull(trackers.lastPolledAt), lte(trackers.lastPolledAt, threshold))
       )
-    }
+    )
+    .returning({ id: trackers.id })
+
+  if (!claimed) {
+    return NextResponse.json(
+      { error: "Poll cooldown: try again in a few seconds" },
+      { status: 429 }
+    )
   }
 
   const key = decodeKey(auth)
@@ -55,7 +56,7 @@ export async function POST(_request: Request, props: { params: Promise<{ id: str
   const proxyAgent = settings ? buildProxyAgentFromSettings(settings, key) : undefined
 
   try {
-    await pollTracker(trackerId, key, privacyMode, proxyAgent)
+    await pollTracker(trackerId, key, privacyMode, proxyAgent, undefined, undefined, true)
     return NextResponse.json({ success: true })
   } catch (error) {
     if (isDecryptionError(error)) {
@@ -63,7 +64,7 @@ export async function POST(_request: Request, props: { params: Promise<{ id: str
         { route: "POST /api/trackers/[id]/poll", trackerId },
         "manual poll failed — stale session key"
       )
-      return NextResponse.json({ error: "Session expired — please log in again" }, { status: 401 })
+      return NextResponse.json({ error: "Session expired. Please log in again." }, { status: 401 })
     }
     log.error(
       { route: "POST /api/trackers/[id]/poll", trackerId, error: String(error) },
diff --git a/src/app/api/trackers/[id]/resume/route.ts b/src/app/api/trackers/[id]/resume/route.ts
index 9ee113e8..f347d775 100644
--- a/src/app/api/trackers/[id]/resume/route.ts
+++ b/src/app/api/trackers/[id]/resume/route.ts
@@ -1,12 +1,12 @@
 // src/app/api/trackers/[id]/resume/route.ts
 import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseTrackerId } from "@/lib/api-helpers"
+import { authenticate, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { trackers } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
 
-export async function POST(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -14,7 +14,11 @@ export async function POST(_request: Request, props: { params: Promise<{ id: str
   if (trackerId instanceof NextResponse) return trackerId
 
   const [tracker] = await db
-    .select({ pausedAt: trackers.pausedAt })
+    .select({
+      pausedAt: trackers.pausedAt,
+      consecutiveFailures: trackers.consecutiveFailures,
+      lastError: trackers.lastError,
+    })
     .from(trackers)
     .where(eq(trackers.id, trackerId))
     .limit(1)
@@ -24,18 +28,49 @@ export async function POST(_request: Request, props: { params: Promise<{ id: str
   }
 
   if (!tracker.pausedAt) {
-    return NextResponse.json({ error: "Tracker is not paused" }, { status: 400 })
+    log.info(
+      {
+        route: "POST /api/trackers/[id]/resume",
+        trackerId,
+        consecutiveFailures: tracker.consecutiveFailures,
+        lastError: tracker.lastError,
+      },
+      "resume called but tracker is not paused (idempotent OK)"
+    )
+    return NextResponse.json({ success: true, alreadyResumed: true })
   }
 
+  log.info(
+    {
+      route: "POST /api/trackers/[id]/resume",
+      trackerId,
+      pausedAt: tracker.pausedAt.toISOString(),
+      consecutiveFailures: tracker.consecutiveFailures,
+      lastError: tracker.lastError,
+    },
+    "resuming auto-paused tracker"
+  )
+
   try {
     await db
       .update(trackers)
-      .set({ pausedAt: null, lastError: null, updatedAt: new Date() })
+      .set({
+        pausedAt: null,
+        lastError: null,
+        lastErrorAt: null,
+        consecutiveFailures: 0,
+        updatedAt: new Date(),
+      })
       .where(eq(trackers.id, trackerId))
   } catch (error) {
     log.error(error, `Failed to resume tracker ${trackerId}`)
     return NextResponse.json({ error: "Failed to resume tracker" }, { status: 500 })
   }
 
+  log.info(
+    { route: "POST /api/trackers/[id]/resume", trackerId },
+    "tracker resumed, consecutiveFailures reset to 0"
+  )
+
   return NextResponse.json({ success: true })
 }
diff --git a/src/app/api/trackers/[id]/roles/route.ts b/src/app/api/trackers/[id]/roles/route.ts
index 9f7f4912..d043db04 100644
--- a/src/app/api/trackers/[id]/roles/route.ts
+++ b/src/app/api/trackers/[id]/roles/route.ts
@@ -1,12 +1,19 @@
 // src/app/api/trackers/[id]/roles/route.ts
 import { desc, eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseJsonBody, parseTrackerId } from "@/lib/api-helpers"
+import {
+  authenticate,
+  parseJsonBody,
+  parseTrackerId,
+  type RouteContext,
+  validateMaxLength,
+} from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { trackerRoles } from "@/lib/db/schema"
+import { TRACKER_NOTES_MAX, TRACKER_ROLE_NAME_MAX } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -19,10 +26,15 @@ export async function GET(_request: Request, props: { params: Promise<{ id: stri
     .where(eq(trackerRoles.trackerId, trackerId))
     .orderBy(desc(trackerRoles.achievedAt))
 
-  return NextResponse.json(roles)
+  return NextResponse.json(
+    roles.map((role) => ({
+      ...role,
+      achievedAt: role.achievedAt?.toISOString() ?? null,
+    }))
+  )
 }
 
-export async function POST(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function POST(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -42,12 +54,8 @@ export async function POST(request: Request, props: { params: Promise<{ id: stri
     return NextResponse.json({ error: "roleName is required" }, { status: 400 })
   }
 
-  if (roleName.length > 255) {
-    return NextResponse.json(
-      { error: "Role name must be 255 characters or fewer" },
-      { status: 400 }
-    )
-  }
+  const roleNameErr = validateMaxLength(roleName, TRACKER_ROLE_NAME_MAX, "Role name")
+  if (roleNameErr) return roleNameErr
 
   if (achievedAt !== undefined) {
     if (typeof achievedAt !== "string" || Number.isNaN(new Date(achievedAt).getTime())) {
@@ -55,8 +63,9 @@ export async function POST(request: Request, props: { params: Promise<{ id: stri
     }
   }
 
-  if (typeof notes === "string" && notes.length > 2000) {
-    return NextResponse.json({ error: "Notes must be 2000 characters or fewer" }, { status: 400 })
+  if (typeof notes === "string") {
+    const notesErr = validateMaxLength(notes, TRACKER_NOTES_MAX, "Notes")
+    if (notesErr) return notesErr
   }
 
   const [role] = await db
@@ -70,5 +79,8 @@ export async function POST(request: Request, props: { params: Promise<{ id: stri
     .returning()
 
   log.info({ route: "POST /api/trackers/[id]/roles", trackerId }, "role created")
-  return NextResponse.json(role, { status: 201 })
+  return NextResponse.json(
+    { ...role, achievedAt: role.achievedAt?.toISOString() ?? null },
+    { status: 201 }
+  )
 }
diff --git a/src/app/api/trackers/[id]/route.ts b/src/app/api/trackers/[id]/route.ts
index bfd57ace..032f8db3 100644
--- a/src/app/api/trackers/[id]/route.ts
+++ b/src/app/api/trackers/[id]/route.ts
@@ -9,30 +9,48 @@ import {
   decodeKey,
   parseJsonBody,
   parseTrackerId,
+  type RouteContext,
   validateHexColor,
   validateHttpUrl,
   validateJoinedAt,
+  validateMaxLength,
 } from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { trackers } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import {
+  AVISTAZ_TOKEN_MAX,
+  LONG_STRING_MAX,
+  TRACKER_NAME_MAX,
+  TRACKER_TAG_MAX,
+  TRACKER_TOKEN_MAX,
+  TRACKER_URL_MAX,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { getTrackerForClient } from "@/lib/server-data"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const trackerId = await parseTrackerId(props.params)
   if (trackerId instanceof NextResponse) return trackerId
 
-  const tracker = await getTrackerForClient(trackerId)
-  if (!tracker) return NextResponse.json({ error: "Tracker not found" }, { status: 404 })
-
-  return NextResponse.json(tracker)
+  try {
+    const tracker = await getTrackerForClient(trackerId)
+    if (!tracker) return NextResponse.json({ error: "Tracker not found" }, { status: 404 })
+    return NextResponse.json(tracker)
+  } catch (err) {
+    log.error(
+      { route: "GET /api/trackers/[id]", trackerId, error: errMsg(err) },
+      "Failed to fetch tracker"
+    )
+    return NextResponse.json({ error: "Failed to load tracker" }, { status: 500 })
+  }
 }
 
-export async function PATCH(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function PATCH(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -45,15 +63,13 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   const updates: Record<string, unknown> = { updatedAt: new Date() }
 
   if (typeof body.name === "string") {
-    if (body.name.length > 100) {
-      return NextResponse.json({ error: "Name must be 100 characters or fewer" }, { status: 400 })
-    }
+    const nameErr = validateMaxLength(body.name, TRACKER_NAME_MAX, "Name")
+    if (nameErr) return nameErr
     updates.name = body.name.trim()
   }
   if (typeof body.baseUrl === "string") {
-    if (body.baseUrl.length > 500) {
-      return NextResponse.json({ error: "URL must be 500 characters or fewer" }, { status: 400 })
-    }
+    const urlLenErr = validateMaxLength(body.baseUrl, TRACKER_URL_MAX, "URL")
+    if (urlLenErr) return urlLenErr
     const urlErr = validateHttpUrl(body.baseUrl as string)
     if (urlErr) return urlErr
     updates.baseUrl = (body.baseUrl as string).trim()
@@ -66,26 +82,18 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
   }
 
   if (typeof body.qbtTag === "string") {
-    if (body.qbtTag.length > 100) {
-      return NextResponse.json(
-        { error: "qBittorrent tag must be 100 characters or fewer" },
-        { status: 400 }
-      )
-    }
+    const qbtTagErr = validateMaxLength(body.qbtTag, TRACKER_TAG_MAX, "qBittorrent tag")
+    if (qbtTagErr) return qbtTagErr
     updates.qbtTag = body.qbtTag.trim() || null
   }
 
   if (typeof body.mouseholeUrl === "string") {
     const trimmed = body.mouseholeUrl.trim()
     if (trimmed) {
-      try {
-        const parsed = new URL(trimmed)
-        if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-          return NextResponse.json({ error: "Mousehole URL must use http or https" }, { status: 400 })
-        }
-      } catch {
-        return NextResponse.json({ error: "Invalid Mousehole URL format" }, { status: 400 })
-      }
+      const mouseholeUrlErr = validateMaxLength(trimmed, LONG_STRING_MAX, "Mousehole URL")
+      if (mouseholeUrlErr) return mouseholeUrlErr
+      const mouseUrlErr = validateHttpUrl(trimmed, "Mousehole URL")
+      if (mouseUrlErr) return mouseUrlErr
     }
     updates.mouseholeUrl = trimmed || null
   }
@@ -101,6 +109,7 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
       updates.pausedAt = null
       updates.consecutiveFailures = 0
       updates.lastError = null
+      updates.lastErrorAt = null
     }
     log.info(
       {
@@ -126,30 +135,48 @@ export async function PATCH(request: Request, props: { params: Promise<{ id: str
 
   if (typeof body.apiToken === "string") {
     const trimmedToken = (body.apiToken as string).trim()
-    if (trimmedToken.length > 500) {
-      return NextResponse.json(
-        { error: "API token must be 500 characters or fewer" },
-        { status: 400 }
-      )
-    }
+    const [tracker] = await db
+      .select({ platformType: trackers.platformType })
+      .from(trackers)
+      .where(eq(trackers.id, trackerId))
+      .limit(1)
+    const maxTokenLength =
+      tracker?.platformType === "avistaz" ? AVISTAZ_TOKEN_MAX : TRACKER_TOKEN_MAX
+    const tokenErr = validateMaxLength(trimmedToken, maxTokenLength, "API token")
+    if (tokenErr) return tokenErr
     const key = decodeKey(auth)
     updates.encryptedApiToken = encrypt(trimmedToken, key)
   }
 
-  await db.update(trackers).set(updates).where(eq(trackers.id, trackerId))
-
-  return NextResponse.json({ success: true })
+  try {
+    await db.update(trackers).set(updates).where(eq(trackers.id, trackerId))
+    const updated = await getTrackerForClient(trackerId)
+    return NextResponse.json(updated ?? { success: true })
+  } catch (err) {
+    log.error(
+      { route: "PATCH /api/trackers/[id]", trackerId, error: errMsg(err) },
+      "Failed to update tracker"
+    )
+    return NextResponse.json({ error: "Failed to update tracker" }, { status: 500 })
+  }
 }
 
-export async function DELETE(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function DELETE(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const trackerId = await parseTrackerId(props.params)
   if (trackerId instanceof NextResponse) return trackerId
 
-  await db.delete(trackers).where(eq(trackers.id, trackerId))
-
-  log.info({ route: "DELETE /api/trackers/[id]", trackerId }, "tracker deleted")
-  return NextResponse.json({ success: true })
+  try {
+    await db.delete(trackers).where(eq(trackers.id, trackerId))
+    log.info({ route: "DELETE /api/trackers/[id]", trackerId }, "tracker deleted")
+    return NextResponse.json({ success: true })
+  } catch (err) {
+    log.error(
+      { route: "DELETE /api/trackers/[id]", trackerId, error: errMsg(err) },
+      "Failed to delete tracker"
+    )
+    return NextResponse.json({ error: "Failed to delete tracker" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/trackers/[id]/snapshots/route.ts b/src/app/api/trackers/[id]/snapshots/route.ts
index 21834923..106b7f5a 100644
--- a/src/app/api/trackers/[id]/snapshots/route.ts
+++ b/src/app/api/trackers/[id]/snapshots/route.ts
@@ -1,10 +1,14 @@
 // src/app/api/trackers/[id]/snapshots/route.ts
 
 import { NextResponse } from "next/server"
-import { authenticate, parseTrackerId } from "@/lib/api-helpers"
+import { authenticate, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
+import { errMsg } from "@/lib/error-utils"
+import { SNAPSHOT_QUERY_MAX } from "@/lib/limits"
+import { log } from "@/lib/logger"
 import { getSnapshotsForTracker } from "@/lib/server-data"
+import { parseIntClamped } from "@/lib/validators"
 
-export async function GET(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
@@ -12,10 +16,16 @@ export async function GET(request: Request, props: { params: Promise<{ id: strin
   if (trackerId instanceof NextResponse) return trackerId
 
   const url = new URL(request.url)
-  const daysParam = url.searchParams.get("days")
-  const daysRaw = parseInt(daysParam ?? "30", 10)
-  const days = Number.isNaN(daysRaw) ? 30 : daysRaw
+  const days = parseIntClamped(url.searchParams.get("days"), 0, SNAPSHOT_QUERY_MAX, 30)
 
-  const snapshots = await getSnapshotsForTracker(trackerId, days)
-  return NextResponse.json(snapshots)
+  try {
+    const snapshots = await getSnapshotsForTracker(trackerId, days)
+    return NextResponse.json(snapshots)
+  } catch (err) {
+    log.error(
+      { route: "GET /api/trackers/[id]/snapshots", trackerId, error: errMsg(err) },
+      "Failed to fetch snapshots"
+    )
+    return NextResponse.json({ error: "Failed to load snapshots" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/trackers/[id]/torrents/cached/route.ts b/src/app/api/trackers/[id]/torrents/cached/route.ts
index 61bd8dfe..782aa168 100644
--- a/src/app/api/trackers/[id]/torrents/cached/route.ts
+++ b/src/app/api/trackers/[id]/torrents/cached/route.ts
@@ -1,122 +1,21 @@
 // src/app/api/trackers/[id]/torrents/cached/route.ts
 //
 // Functions: GET
-//
-// Returns cached torrent data from the last successful deep poll.
-// Used as fallback when live qBittorrent connection fails.
 
-import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, parseTrackerId } from "@/lib/api-helpers"
-import { db } from "@/lib/db"
-import { downloadClients, trackers } from "@/lib/db/schema"
-import { parseCrossSeedTags, type QbtTorrent } from "@/lib/qbt"
-import { aggregateCrossSeedTags, mergeTorrentLists } from "@/lib/qbt/merge"
+import { authenticate, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
+import { fetchTrackerTorrentsCached } from "@/lib/download-clients"
 
-export async function GET(_request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(_request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const trackerId = await parseTrackerId(props.params)
   if (trackerId instanceof NextResponse) return trackerId
 
-  // Look up tracker to get qbtTag
-  const [tracker] = await db
-    .select({ qbtTag: trackers.qbtTag })
-    .from(trackers)
-    .where(eq(trackers.id, trackerId))
-    .limit(1)
-
-  if (!tracker) {
-    return NextResponse.json({ error: "Tracker not found" }, { status: 404 })
-  }
-
-  if (!tracker.qbtTag) {
-    return NextResponse.json({ error: "No qBittorrent tag configured" }, { status: 400 })
-  }
-
-  // Fetch all enabled clients that have cached data
-  const clients = await db
-    .select({
-      id: downloadClients.id,
-      name: downloadClients.name,
-      cachedTorrents: downloadClients.cachedTorrents,
-      cachedTorrentsAt: downloadClients.cachedTorrentsAt,
-      crossSeedTags: downloadClients.crossSeedTags,
-    })
-    .from(downloadClients)
-    .where(eq(downloadClients.enabled, true))
-
-  if (clients.length === 0) {
-    return NextResponse.json({
-      torrents: [],
-      crossSeedTags: [],
-      clientErrors: [],
-      clientCount: 0,
-      cachedAt: null,
-    })
-  }
-
-  const tag = tracker.qbtTag.trim().toLowerCase()
-  const torrentLists: QbtTorrent[][] = []
-  const crossSeedClients: { crossSeedTags: string[] }[] = []
-  const hashClients = new Map<string, string[]>()
-  let oldestCacheAt: Date | null = null
-
-  // Drizzle returns jsonb columns already deserialized — no JSON.parse needed.
-  // Cached blobs can be 500 KB-5 MB; we map once and reuse for filtering + stamping.
-  const parsedCache = new Map<number, QbtTorrent[]>()
-  for (const client of clients) {
-    if (!client.cachedTorrents || !Array.isArray(client.cachedTorrents)) continue
-    parsedCache.set(client.id, client.cachedTorrents as QbtTorrent[])
+  const out = await fetchTrackerTorrentsCached(trackerId)
+  if ("error" in out) {
+    return NextResponse.json({ error: out.error }, { status: out.status })
   }
-
-  for (const client of clients) {
-    const torrents = parsedCache.get(client.id)
-    if (!torrents) continue
-
-    // Re-filter by this tracker's tag (cache is per-client, not per-tracker)
-    const filtered = torrents.filter((t) =>
-      t.tags
-        .split(",")
-        .map((s) => s.trim().toLowerCase())
-        .includes(tag)
-    )
-
-    torrentLists.push(filtered)
-
-    // Build hash->client name(s) map for client_name stamping (matches live endpoint)
-    for (const t of filtered) {
-      const names = hashClients.get(t.hash) ?? []
-      names.push(client.name)
-      hashClients.set(t.hash, names)
-    }
-
-    crossSeedClients.push({ crossSeedTags: parseCrossSeedTags(client.crossSeedTags) })
-
-    // Track the oldest cache timestamp for the stale indicator.
-    // We use the oldest (most pessimistic) timestamp across clients so the
-    // UI banner reflects the worst-case staleness.
-    if (client.cachedTorrentsAt) {
-      if (!oldestCacheAt || client.cachedTorrentsAt < oldestCacheAt) {
-        oldestCacheAt = client.cachedTorrentsAt
-      }
-    }
-  }
-
-  const merged = mergeTorrentLists(torrentLists)
-  const crossSeedTags = aggregateCrossSeedTags(crossSeedClients)
-
-  const stamped = merged.map((t) => ({
-    ...t,
-    client_name: (hashClients.get(t.hash) ?? []).join(", "),
-  }))
-
-  return NextResponse.json({
-    torrents: stamped,
-    crossSeedTags,
-    clientErrors: [],
-    clientCount: clients.length,
-    cachedAt: oldestCacheAt?.toISOString() ?? null,
-  })
+  return NextResponse.json(out.result)
 }
diff --git a/src/app/api/trackers/[id]/torrents/route.ts b/src/app/api/trackers/[id]/torrents/route.ts
index b3e19935..c03c4ee1 100644
--- a/src/app/api/trackers/[id]/torrents/route.ts
+++ b/src/app/api/trackers/[id]/torrents/route.ts
@@ -1,67 +1,30 @@
 // src/app/api/trackers/[id]/torrents/route.ts
 //
 // Functions: GET
-//
-// Aggregated torrents endpoint — queries ALL enabled download clients
-// for the tracker's qbtTag, merges results with deduplication by hash.
 
-import { eq } from "drizzle-orm"
 import { NextResponse } from "next/server"
-import { authenticate, decodeKey, parseTrackerId } from "@/lib/api-helpers"
-import { db } from "@/lib/db"
-import { downloadClients, trackers } from "@/lib/db/schema"
+import { authenticate, decodeKey, parseTrackerId, type RouteContext } from "@/lib/api-helpers"
+import { fetchTrackerTorrents } from "@/lib/download-clients"
 import { log } from "@/lib/logger"
-import { fetchAndMergeTorrents } from "@/lib/qbt/fetch-merged"
 
-export async function GET(request: Request, props: { params: Promise<{ id: string }> }) {
+export async function GET(request: Request, props: RouteContext) {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
   const trackerId = await parseTrackerId(props.params)
   if (trackerId instanceof NextResponse) return trackerId
 
-  // Look up tracker to get qbtTag
-  const [tracker] = await db
-    .select({ qbtTag: trackers.qbtTag })
-    .from(trackers)
-    .where(eq(trackers.id, trackerId))
-    .limit(1)
-
-  if (!tracker) {
-    return NextResponse.json({ error: "Tracker not found" }, { status: 404 })
-  }
-
-  if (!tracker.qbtTag) {
-    return NextResponse.json(
-      { error: "No qBittorrent tag configured for this tracker" },
-      { status: 400 }
-    )
-  }
-
-  // Fetch only the columns needed — avoids loading cachedTorrents blob
-  // and keeps encrypted credentials scoped to this handler's memory.
-  const clients = await db
-    .select({
-      name: downloadClients.name,
-      host: downloadClients.host,
-      port: downloadClients.port,
-      useSsl: downloadClients.useSsl,
-      encryptedUsername: downloadClients.encryptedUsername,
-      encryptedPassword: downloadClients.encryptedPassword,
-      crossSeedTags: downloadClients.crossSeedTags,
-    })
-    .from(downloadClients)
-    .where(eq(downloadClients.enabled, true))
-
   const key = decodeKey(auth)
-  const tag = tracker.qbtTag.trim()
   const url = new URL(request.url)
   const activeOnly = url.searchParams.get("active") === "true"
   const qbtFilter = activeOnly ? "active" : undefined
 
   try {
-    const result = await fetchAndMergeTorrents(clients, [tag], key, qbtFilter)
-    return NextResponse.json(result)
+    const out = await fetchTrackerTorrents(trackerId, key, qbtFilter)
+    if ("error" in out) {
+      return NextResponse.json({ error: out.error }, { status: out.status })
+    }
+    return NextResponse.json(out.result)
   } catch (error) {
     log.error(
       { route: "GET /api/trackers/[id]/torrents", trackerId, error: String(error) },
diff --git a/src/app/api/trackers/poll-all/route.ts b/src/app/api/trackers/poll-all/route.ts
index 09b069ea..fd1af0aa 100644
--- a/src/app/api/trackers/poll-all/route.ts
+++ b/src/app/api/trackers/poll-all/route.ts
@@ -13,8 +13,8 @@ import { authenticate, decodeKey } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { appSettings, trackers } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
-import { buildProxyAgentFromSettings } from "@/lib/proxy"
-import { pollTracker } from "@/lib/scheduler"
+import { pollTracker } from "@/lib/tracker-scheduler"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
 
 export async function POST() {
   const auth = await authenticate()
@@ -22,27 +22,25 @@ export async function POST() {
 
   const key = decodeKey(auth)
 
-  const [settings] = await db
-    .select({
-      storeUsernames: appSettings.storeUsernames,
-      proxyEnabled: appSettings.proxyEnabled,
-      proxyType: appSettings.proxyType,
-      proxyHost: appSettings.proxyHost,
-      proxyPort: appSettings.proxyPort,
-      proxyUsername: appSettings.proxyUsername,
-      encryptedProxyPassword: appSettings.encryptedProxyPassword,
-    })
-    .from(appSettings)
-    .limit(1)
+  const [[settings], activeTrackers] = await Promise.all([
+    db
+      .select({
+        storeUsernames: appSettings.storeUsernames,
+        proxyEnabled: appSettings.proxyEnabled,
+        proxyType: appSettings.proxyType,
+        proxyHost: appSettings.proxyHost,
+        proxyPort: appSettings.proxyPort,
+        proxyUsername: appSettings.proxyUsername,
+        encryptedProxyPassword: appSettings.encryptedProxyPassword,
+      })
+      .from(appSettings)
+      .limit(1),
+    db.select({ id: trackers.id }).from(trackers).where(eq(trackers.isActive, true)),
+  ])
 
   const privacyMode = settings ? !settings.storeUsernames : false
   const proxyAgent = settings ? buildProxyAgentFromSettings(settings, key) : undefined
 
-  const activeTrackers = await db
-    .select({ id: trackers.id })
-    .from(trackers)
-    .where(eq(trackers.isActive, true))
-
   if (activeTrackers.length === 0) {
     return NextResponse.json({ total: 0, done: true, polled: 0, failed: 0 })
   }
diff --git a/src/app/api/trackers/reorder/route.ts b/src/app/api/trackers/reorder/route.ts
index 74668d93..0fd39b37 100644
--- a/src/app/api/trackers/reorder/route.ts
+++ b/src/app/api/trackers/reorder/route.ts
@@ -4,6 +4,9 @@ import { NextResponse } from "next/server"
 import { authenticate, parseJsonBody } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
 import { trackers } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import { REORDER_IDS_MAX } from "@/lib/limits"
+import { log } from "@/lib/logger"
 
 export async function PATCH(request: Request) {
   const auth = await authenticate()
@@ -18,7 +21,7 @@ export async function PATCH(request: Request) {
     return NextResponse.json({ error: "ids must be a non-empty array of numbers" }, { status: 400 })
   }
 
-  if (ids.length > 500) {
+  if (ids.length > REORDER_IDS_MAX) {
     return NextResponse.json({ error: "Too many ids" }, { status: 400 })
   }
 
@@ -26,9 +29,22 @@ export async function PATCH(request: Request) {
     return NextResponse.json({ error: "All ids must be integers" }, { status: 400 })
   }
 
-  await Promise.all(
-    ids.map((id, index) => db.update(trackers).set({ sortOrder: index }).where(eq(trackers.id, id)))
-  )
+  if (new Set(ids).size !== ids.length) {
+    return NextResponse.json({ error: "Duplicate ids are not allowed" }, { status: 400 })
+  }
 
-  return NextResponse.json({ ok: true })
+  try {
+    await db.transaction(async (tx) => {
+      for (let i = 0; i < ids.length; i++) {
+        await tx.update(trackers).set({ sortOrder: i }).where(eq(trackers.id, ids[i]))
+      }
+    })
+    return NextResponse.json({ success: true })
+  } catch (err) {
+    log.error(
+      { route: "PATCH /api/trackers/reorder", error: errMsg(err) },
+      "Failed to reorder trackers"
+    )
+    return NextResponse.json({ error: "Failed to reorder trackers" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/trackers/route.ts b/src/app/api/trackers/route.ts
index fc2eacef..cb805191 100644
--- a/src/app/api/trackers/route.ts
+++ b/src/app/api/trackers/route.ts
@@ -12,10 +12,20 @@ import {
   validateHexColor,
   validateHttpUrl,
   validateJoinedAt,
+  validateMaxLength,
 } from "@/lib/api-helpers"
 import { encrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
 import { trackers } from "@/lib/db/schema"
+import { errMsg } from "@/lib/error-utils"
+import {
+  AVISTAZ_TOKEN_MAX,
+  LONG_STRING_MAX,
+  TRACKER_NAME_MAX,
+  TRACKER_TAG_MAX,
+  TRACKER_TOKEN_MAX,
+  TRACKER_URL_MAX,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { getTrackerListForDashboard } from "@/lib/server-data"
 
@@ -23,8 +33,13 @@ export async function GET() {
   const auth = await authenticate()
   if (auth instanceof NextResponse) return auth
 
-  const trackerList = await getTrackerListForDashboard()
-  return NextResponse.json(trackerList)
+  try {
+    const trackerList = await getTrackerListForDashboard()
+    return NextResponse.json(trackerList)
+  } catch (err) {
+    log.error({ route: "GET /api/trackers", error: errMsg(err) }, "Failed to fetch trackers")
+    return NextResponse.json({ error: "Failed to load trackers" }, { status: 500 })
+  }
 }
 
 export async function POST(request: Request) {
@@ -62,21 +77,17 @@ export async function POST(request: Request) {
   const trimmedName = name.trim()
   const trimmedBaseUrl = baseUrl.trim()
   const trimmedApiToken = apiToken.trim()
+  const platform = typeof platformType === "string" ? platformType : "unit3d"
 
-  if (trimmedName.length > 100) {
-    return NextResponse.json({ error: "Name must be 100 characters or fewer" }, { status: 400 })
-  }
+  const nameErr = validateMaxLength(trimmedName, TRACKER_NAME_MAX, "Name")
+  if (nameErr) return nameErr
 
-  if (trimmedBaseUrl.length > 500) {
-    return NextResponse.json({ error: "URL must be 500 characters or fewer" }, { status: 400 })
-  }
+  const urlLenErr = validateMaxLength(trimmedBaseUrl, TRACKER_URL_MAX, "URL")
+  if (urlLenErr) return urlLenErr
 
-  if (trimmedApiToken.length > 500) {
-    return NextResponse.json(
-      { error: "API token must be 500 characters or fewer" },
-      { status: 400 }
-    )
-  }
+  const maxTokenLength = platform === "avistaz" ? AVISTAZ_TOKEN_MAX : TRACKER_TOKEN_MAX
+  const tokenErr = validateMaxLength(trimmedApiToken, maxTokenLength, "API token")
+  if (tokenErr) return tokenErr
 
   const urlErr = validateHttpUrl(trimmedBaseUrl)
   if (urlErr) return urlErr
@@ -86,22 +97,16 @@ export async function POST(request: Request) {
     if (colorErr) return colorErr
   }
 
-  if (typeof qbtTag === "string" && qbtTag.length > 100) {
-    return NextResponse.json(
-      { error: "qBittorrent tag must be 100 characters or fewer" },
-      { status: 400 }
-    )
+  if (typeof qbtTag === "string") {
+    const qbtTagErr = validateMaxLength(qbtTag, TRACKER_TAG_MAX, "qBittorrent tag")
+    if (qbtTagErr) return qbtTagErr
   }
 
   if (typeof mouseholeUrl === "string" && mouseholeUrl.trim()) {
-    try {
-      const parsed = new URL(mouseholeUrl.trim())
-      if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-        return NextResponse.json({ error: "Mousehole URL must use http or https" }, { status: 400 })
-      }
-    } catch {
-      return NextResponse.json({ error: "Invalid Mousehole URL format" }, { status: 400 })
-    }
+    const mouseholeUrlErr = validateMaxLength(mouseholeUrl.trim(), LONG_STRING_MAX, "Mousehole URL")
+    if (mouseholeUrlErr) return mouseholeUrlErr
+    const mouseUrlErr = validateHttpUrl(mouseholeUrl.trim(), "Mousehole URL")
+    if (mouseUrlErr) return mouseUrlErr
   }
 
   if (typeof joinedAt === "string" && joinedAt) {
@@ -109,31 +114,38 @@ export async function POST(request: Request) {
     if (joinedAtErr) return joinedAtErr
   }
 
-  const platform = typeof platformType === "string" ? platformType : "unit3d"
   if (!VALID_PLATFORM_TYPES.includes(platform as (typeof VALID_PLATFORM_TYPES)[number])) {
     return NextResponse.json({ error: "Invalid platform type" }, { status: 400 })
   }
 
-  const key = decodeKey(auth)
-  const encryptedApiToken = encrypt(trimmedApiToken, key)
-
-  const [tracker] = await db
-    .insert(trackers)
-    .values({
-      name: trimmedName,
-      baseUrl: trimmedBaseUrl,
-      apiPath: DEFAULT_API_PATHS[platform] ?? "/api/user",
-      encryptedApiToken,
-      platformType: platform,
-      color: (color as string) || CHART_THEME.accent,
-      qbtTag: typeof qbtTag === "string" ? qbtTag.trim() : null,
-      mouseholeUrl:
-        typeof mouseholeUrl === "string" && mouseholeUrl.trim() ? mouseholeUrl.trim() : null,
-      joinedAt: typeof joinedAt === "string" && joinedAt ? joinedAt : null,
-    })
-    .returning()
-
-  // SECURITY: Only return safe fields
-  log.info({ route: "POST /api/trackers", trackerId: tracker.id }, "tracker created")
-  return NextResponse.json({ id: tracker.id, name: tracker.name }, { status: 201 })
+  try {
+    const key = decodeKey(auth)
+    const encryptedApiToken = encrypt(trimmedApiToken, key)
+
+    const [tracker] = await db
+      .insert(trackers)
+      .values({
+        name: trimmedName,
+        baseUrl: trimmedBaseUrl,
+        apiPath: DEFAULT_API_PATHS[platform] ?? "/api/user",
+        encryptedApiToken,
+        platformType: platform,
+        color: (color as string) || CHART_THEME.accent,
+        qbtTag: typeof qbtTag === "string" ? qbtTag.trim() : null,
+        mouseholeUrl:
+          typeof mouseholeUrl === "string" && mouseholeUrl.trim() ? mouseholeUrl.trim() : null,
+        joinedAt: typeof joinedAt === "string" && joinedAt ? joinedAt : null,
+      })
+      .returning()
+
+    // SECURITY: Only return safe fields
+    log.info(
+      { route: "POST /api/trackers", trackerId: tracker.id, trackerName: tracker.name },
+      `tracker created: ${tracker.name}`
+    )
+    return NextResponse.json({ id: tracker.id, name: tracker.name }, { status: 201 })
+  } catch (err) {
+    log.error({ route: "POST /api/trackers", error: errMsg(err) }, "Failed to create tracker")
+    return NextResponse.json({ error: "Failed to create tracker" }, { status: 500 })
+  }
 }
diff --git a/src/app/api/trackers/snapshots/fleet/route.ts b/src/app/api/trackers/snapshots/fleet/route.ts
new file mode 100644
index 00000000..797ea0f3
--- /dev/null
+++ b/src/app/api/trackers/snapshots/fleet/route.ts
@@ -0,0 +1,30 @@
+// src/app/api/trackers/snapshots/fleet/route.ts
+//
+// Functions: GET
+
+import { NextResponse } from "next/server"
+import { authenticate } from "@/lib/api-helpers"
+import { errMsg } from "@/lib/error-utils"
+import { SNAPSHOT_QUERY_MAX } from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { getFleetSnapshots } from "@/lib/server-data"
+import { parseIntClamped } from "@/lib/validators"
+
+export async function GET(request: Request) {
+  const auth = await authenticate()
+  if (auth instanceof NextResponse) return auth
+
+  const url = new URL(request.url)
+  const days = parseIntClamped(url.searchParams.get("days"), 0, SNAPSHOT_QUERY_MAX, 30)
+
+  try {
+    const data = await getFleetSnapshots(days)
+    return NextResponse.json(data)
+  } catch (err) {
+    log.error(
+      { route: "GET /api/trackers/snapshots/fleet", error: errMsg(err) },
+      "Failed to fetch fleet snapshots"
+    )
+    return NextResponse.json({ error: "Failed to load fleet snapshots" }, { status: 500 })
+  }
+}
diff --git a/src/app/api/trackers/test-connection/route.ts b/src/app/api/trackers/test-connection/route.ts
new file mode 100644
index 00000000..09c2f682
--- /dev/null
+++ b/src/app/api/trackers/test-connection/route.ts
@@ -0,0 +1,122 @@
+// src/app/api/trackers/test-connection/route.ts
+import { NextResponse } from "next/server"
+import {
+  buildFetchOptions,
+  DEFAULT_API_PATHS,
+  getAdapter,
+  VALID_PLATFORM_TYPES,
+} from "@/lib/adapters"
+import {
+  authenticate,
+  decodeKey,
+  parseJsonBody,
+  validateHttpUrl,
+  validateMaxLength,
+} from "@/lib/api-helpers"
+import { db } from "@/lib/db"
+import { appSettings } from "@/lib/db/schema"
+import { sanitizeNetworkError } from "@/lib/error-utils"
+import {
+  AVISTAZ_TOKEN_MAX,
+  LONG_STRING_MAX,
+  TRACKER_TOKEN_MAX,
+  TRACKER_URL_MAX,
+} from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
+
+export async function POST(request: Request) {
+  const auth = await authenticate()
+  if (auth instanceof NextResponse) return auth
+
+  const body = await parseJsonBody(request)
+  if (body instanceof NextResponse) return body
+
+  const { baseUrl, apiToken, platformType, apiPath } = body as {
+    baseUrl?: string
+    apiToken?: string
+    platformType?: string
+    apiPath?: string
+  }
+
+  if (!baseUrl || typeof baseUrl !== "string" || !apiToken || typeof apiToken !== "string") {
+    return NextResponse.json({ error: "baseUrl and apiToken are required" }, { status: 400 })
+  }
+
+  const trimmedBaseUrl = baseUrl.trim()
+  const trimmedApiToken = apiToken.trim()
+  const platform = typeof platformType === "string" ? platformType : "unit3d"
+
+  const maxTokenLength = platform === "avistaz" ? AVISTAZ_TOKEN_MAX : TRACKER_TOKEN_MAX
+  const tokenErr = validateMaxLength(trimmedApiToken, maxTokenLength, "API token")
+  if (tokenErr) return tokenErr
+
+  const urlLenErr = validateMaxLength(trimmedBaseUrl, TRACKER_URL_MAX, "URL")
+  if (urlLenErr) return urlLenErr
+
+  const urlErr = validateHttpUrl(trimmedBaseUrl)
+  if (urlErr) return urlErr
+
+  if (!VALID_PLATFORM_TYPES.includes(platform as (typeof VALID_PLATFORM_TYPES)[number])) {
+    return NextResponse.json({ error: "Invalid platform type" }, { status: 400 })
+  }
+
+  try {
+    const key = decodeKey(auth)
+    const [settings] = await db
+      .select({
+        proxyEnabled: appSettings.proxyEnabled,
+        proxyType: appSettings.proxyType,
+        proxyHost: appSettings.proxyHost,
+        proxyPort: appSettings.proxyPort,
+        proxyUsername: appSettings.proxyUsername,
+        encryptedProxyPassword: appSettings.encryptedProxyPassword,
+      })
+      .from(appSettings)
+      .limit(1)
+
+    const proxyAgent = settings ? buildProxyAgentFromSettings(settings, key) : undefined
+
+    const adapter = getAdapter(platform)
+    const defaultPath = DEFAULT_API_PATHS[platform] ?? "/api/user"
+    const rawPath = typeof apiPath === "string" && apiPath.startsWith("/") ? apiPath : defaultPath
+    const pathLenErr = validateMaxLength(rawPath, LONG_STRING_MAX, "API path")
+    if (pathLenErr) return pathLenErr
+    const path = rawPath
+    const fetchOptions = buildFetchOptions(trimmedBaseUrl, {
+      proxyAgent: proxyAgent ?? undefined,
+    })
+    const stats = await adapter.fetchStats(trimmedBaseUrl, trimmedApiToken, path, fetchOptions)
+
+    const result: Record<string, unknown> = {
+      success: true,
+      username: stats.username,
+      group: stats.group,
+    }
+
+    if (platform === "avistaz") {
+      log.debug(
+        {
+          route: "POST /api/trackers/test-connection",
+          userAgent: request.headers.get("user-agent") ?? "",
+        },
+        "tracker test user agent captured"
+      )
+    }
+
+    return NextResponse.json(result)
+  } catch (error) {
+    const raw = error instanceof Error ? error.message : String(error)
+    const safeError = sanitizeNetworkError(raw, "Tracker test failed")
+    log.warn(
+      {
+        route: "POST /api/trackers/test-connection",
+        platform,
+        baseUrl: trimmedBaseUrl,
+        error: raw,
+      },
+      `tracker test failed: ${safeError}`
+    )
+    return NextResponse.json({ error: safeError }, { status: 422 })
+  }
+}
diff --git a/src/app/api/trackers/test-connection/test-connection-route.test.ts b/src/app/api/trackers/test-connection/test-connection-route.test.ts
new file mode 100644
index 00000000..16934a09
--- /dev/null
+++ b/src/app/api/trackers/test-connection/test-connection-route.test.ts
@@ -0,0 +1,506 @@
+// src/app/api/trackers/test-connection/test-connection-route.test.ts
+//
+// Tests for POST /api/trackers/test-connection
+// Focuses on the three new behaviors added in the AvistaZ connection fix:
+//   1. Returns sanitized actual error instead of generic "Tracker test failed"
+//   2. Logs platform, baseUrl, and raw error in the msg field
+//   3. Wires proxy settings from appSettings (DB load -> buildProxyAgentFromSettings)
+
+import { NextResponse } from "next/server"
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { authenticate, decodeKey, parseJsonBody } from "@/lib/api-helpers"
+import { db } from "@/lib/db"
+import { log } from "@/lib/logger"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
+import { POST } from "./route"
+
+// ---------------------------------------------------------------------------
+// Module mocks
+// ---------------------------------------------------------------------------
+
+vi.mock("@/lib/api-helpers", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/api-helpers")>()
+  return {
+    ...actual,
+    authenticate: vi.fn(),
+    parseJsonBody: vi.fn(),
+    decodeKey: vi
+      .fn()
+      .mockReturnValue(
+        Buffer.from("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "hex")
+      ),
+    validateHttpUrl: vi.fn().mockReturnValue(null),
+    validateMaxLength: vi.fn().mockReturnValue(null),
+  }
+})
+
+vi.mock("@/lib/db", () => ({
+  db: {
+    select: vi.fn(),
+  },
+}))
+
+vi.mock("@/lib/db/schema", () => ({
+  appSettings: {
+    proxyEnabled: "proxyEnabled",
+    proxyType: "proxyType",
+    proxyHost: "proxyHost",
+    proxyPort: "proxyPort",
+    proxyUsername: "proxyUsername",
+    encryptedProxyPassword: "encryptedProxyPassword",
+  },
+}))
+
+vi.mock("@/lib/tunnel", () => ({
+  buildProxyAgentFromSettings: vi.fn().mockReturnValue(undefined),
+}))
+
+vi.mock("@/lib/logger", () => ({
+  log: {
+    warn: vi.fn(),
+    debug: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock all adapters via the adapters barrel. The test-connection route calls
+// getAdapter(platform).fetchStats(...). We intercept at the adapter level so
+// we can control success vs failure per test.
+vi.mock("@/lib/adapters", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/adapters")>()
+  return {
+    ...actual,
+    getAdapter: vi.fn().mockReturnValue({
+      fetchStats: vi.fn().mockResolvedValue({ username: "testuser", group: "Member" }),
+    }),
+    buildFetchOptions: vi.fn().mockReturnValue({}),
+  }
+})
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+const VALID_KEY = "a".repeat(64)
+
+function makeRequest(body: Record<string, unknown>): Request {
+  return new Request("http://localhost/api/trackers/test-connection", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+  })
+}
+
+const VALID_BODY = {
+  baseUrl: "https://avistaz.to",
+  apiToken: "some-token",
+  platformType: "unit3d",
+}
+
+function mockDbSettings(settings?: Record<string, unknown> | null) {
+  const row =
+    settings === null
+      ? []
+      : [
+          {
+            proxyEnabled: false,
+            proxyType: "socks5",
+            proxyHost: null,
+            proxyPort: null,
+            proxyUsername: null,
+            encryptedProxyPassword: null,
+            ...settings,
+          },
+        ]
+
+  const mockLimit = vi.fn().mockResolvedValue(row)
+  const mockFrom = vi.fn().mockReturnValue({ limit: mockLimit })
+  ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: mockFrom })
+}
+
+// ---------------------------------------------------------------------------
+// Auth guards
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — auth", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+  })
+
+  it("returns 401 when not authenticated", async () => {
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue(
+      NextResponse.json({ error: "Unauthorized" }, { status: 401 })
+    )
+
+    const res = await POST(makeRequest(VALID_BODY))
+    expect(res.status).toBe(401)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Input validation
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — input validation", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+  })
+
+  it("returns 400 when baseUrl is missing", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      apiToken: "some-token",
+      platformType: "unit3d",
+    })
+    const res = await POST(makeRequest({ apiToken: "some-token" }))
+    const body = await res.json()
+    expect(res.status).toBe(400)
+    expect(body.error).toMatch(/baseUrl.*required|required.*baseUrl/i)
+  })
+
+  it("returns 400 when apiToken is missing", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      baseUrl: "https://avistaz.to",
+      platformType: "unit3d",
+    })
+    const res = await POST(makeRequest({ baseUrl: "https://avistaz.to" }))
+    const body = await res.json()
+    expect(res.status).toBe(400)
+    expect(body.error).toMatch(/required/)
+  })
+
+  it("returns 400 when platformType is not in VALID_PLATFORM_TYPES", async () => {
+    // validateHttpUrl and validateMaxLength are vi.fn() returning null (pass-through),
+    // so only the platform check fires here.
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      baseUrl: "https://avistaz.to",
+      apiToken: "tok",
+      platformType: "notaplatform",
+    })
+    const res = await POST(
+      makeRequest({ baseUrl: "https://avistaz.to", apiToken: "tok", platformType: "notaplatform" })
+    )
+    const body = await res.json()
+    expect(res.status).toBe(400)
+    expect(body.error).toMatch(/platform/i)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Happy path
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — success", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+  })
+
+  it("returns 200 with success flag, username, and group on happy path", async () => {
+    mockDbSettings()
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(200)
+    expect(body.success).toBe(true)
+    expect(body.username).toBe("testuser")
+    expect(body.group).toBe("Member")
+  })
+
+  it("does not include encryptedApiToken or raw credentials in success response", async () => {
+    mockDbSettings()
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(body).not.toHaveProperty("encryptedApiToken")
+    expect(body).not.toHaveProperty("apiToken")
+    expect(body).not.toHaveProperty("encryptedProxyPassword")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Error response — sanitized actual error (change 1 of 3)
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — sanitized error response", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+  })
+
+  it("returns sanitized ECONNREFUSED message instead of generic fallback", async () => {
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi
+        .fn()
+        .mockRejectedValueOnce(new Error("Failed to connect to avistaz.to: ECONNREFUSED")),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    // sanitizeNetworkError maps ECONNREFUSED -> "Connection refused"
+    expect(body.error).toBe("Connection refused")
+    expect(body.error).not.toBe("Tracker test failed")
+  })
+
+  it("returns sanitized timeout message instead of generic fallback", async () => {
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error("Request to avistaz.to timed out")),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(body.error).toBe("Request timed out")
+    expect(body.error).not.toBe("Tracker test failed")
+  })
+
+  it("returns sanitized auth failure message for 401 errors", async () => {
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error("HTTP 401 Unauthorized")),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(body.error).toBe("Authentication failed")
+  })
+
+  it("returns sanitized proxy error message when error contains 'proxy'", async () => {
+    // Use a message that only triggers the proxy branch, not an earlier branch.
+    // sanitizeNetworkError checks ECONNREFUSED before proxy, so use a proxy-only phrase.
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error("Failed to connect via proxy server")),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(body.error).toBe("Proxy connection failed")
+  })
+
+  it("returns 'Tracker test failed' fallback for truly unrecognized errors", async () => {
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi
+        .fn()
+        .mockRejectedValueOnce(
+          new Error("Something completely unknown happened that matches no pattern")
+        ),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(body.error).toBe("Tracker test failed")
+  })
+
+  it("does not leak raw error messages or internal details to the client", async () => {
+    const rawMessage = "ECONNREFUSED 104.21.0.1:443 — secret-internal-ip"
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error(rawMessage)),
+    })
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(422)
+    expect(body.error).not.toContain("104.21.0.1")
+    expect(body.error).not.toContain("secret-internal-ip")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Error logging — platform, baseUrl, raw error in log (change 2 of 3)
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — error log enrichment", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+  })
+
+  it("logs platform in the warn payload when adapter throws", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      ...VALID_BODY,
+      platformType: "nebulance",
+    })
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error("ECONNREFUSED")),
+    })
+
+    await POST(makeRequest({ ...VALID_BODY, platformType: "nebulance" }))
+
+    expect(log.warn).toHaveBeenCalledOnce()
+    const [payload] = (log.warn as ReturnType<typeof vi.fn>).mock.calls[0]
+    expect(payload).toMatchObject({ platform: "nebulance" })
+  })
+
+  it("logs baseUrl in the warn payload when adapter throws", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
+      ...VALID_BODY,
+      baseUrl: "https://nebulance.io",
+    })
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error("ECONNREFUSED")),
+    })
+
+    await POST(makeRequest({ ...VALID_BODY, baseUrl: "https://nebulance.io" }))
+
+    const [payload] = (log.warn as ReturnType<typeof vi.fn>).mock.calls[0]
+    expect(payload).toMatchObject({ baseUrl: "https://nebulance.io" })
+  })
+
+  it("logs the raw (unsanitized) error in the warn payload", async () => {
+    const rawMsg = "Failed to connect to avistaz.to: ECONNREFUSED 104.21.0.1:443"
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+    mockDbSettings()
+    const { getAdapter } = await import("@/lib/adapters")
+    ;(getAdapter as ReturnType<typeof vi.fn>).mockReturnValueOnce({
+      fetchStats: vi.fn().mockRejectedValueOnce(new Error(rawMsg)),
+    })
+
+    await POST(makeRequest(VALID_BODY))
+
+    const [payload] = (log.warn as ReturnType<typeof vi.fn>).mock.calls[0]
+    // The raw message (with IP, ECONNREFUSED) must appear in the log, NOT in the response
+    expect(payload.error).toContain("ECONNREFUSED")
+    expect(payload.error).toBe(rawMsg)
+  })
+
+  it("does not log warn on success", async () => {
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+    mockDbSettings()
+
+    await POST(makeRequest(VALID_BODY))
+
+    expect(log.warn).not.toHaveBeenCalled()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Proxy wiring (change 3 of 3)
+// ---------------------------------------------------------------------------
+
+describe("POST /api/trackers/test-connection — proxy wiring", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    ;(authenticate as ReturnType<typeof vi.fn>).mockResolvedValue({
+      encryptionKey: VALID_KEY,
+    })
+    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue(VALID_BODY)
+  })
+
+  it("calls db.select to load proxy settings before running the adapter", async () => {
+    mockDbSettings()
+
+    await POST(makeRequest(VALID_BODY))
+
+    expect(db.select).toHaveBeenCalled()
+  })
+
+  it("calls buildProxyAgentFromSettings with the fetched settings row", async () => {
+    const settingsRow = {
+      proxyEnabled: true,
+      proxyType: "socks5",
+      proxyHost: "proxy.internal",
+      proxyPort: 1080,
+      proxyUsername: null,
+      encryptedProxyPassword: null,
+    }
+    mockDbSettings(settingsRow)
+
+    await POST(makeRequest(VALID_BODY))
+
+    expect(buildProxyAgentFromSettings).toHaveBeenCalledOnce()
+    const [calledSettings] = (buildProxyAgentFromSettings as ReturnType<typeof vi.fn>).mock.calls[0]
+    expect(calledSettings).toMatchObject(settingsRow)
+  })
+
+  it("calls buildProxyAgentFromSettings with the decrypted encryption key", async () => {
+    mockDbSettings()
+
+    await POST(makeRequest(VALID_BODY))
+
+    expect(decodeKey).toHaveBeenCalled()
+    expect(buildProxyAgentFromSettings).toHaveBeenCalledOnce()
+    const [, calledKey] = (buildProxyAgentFromSettings as ReturnType<typeof vi.fn>).mock.calls[0]
+    // decodeKey mock returns a Buffer — verify that Buffer was passed
+    expect(Buffer.isBuffer(calledKey)).toBe(true)
+  })
+
+  it("passes the proxy agent from buildProxyAgentFromSettings into buildFetchOptions", async () => {
+    const fakeAgent = { isFakeAgent: true }
+    ;(buildProxyAgentFromSettings as ReturnType<typeof vi.fn>).mockReturnValueOnce(fakeAgent)
+    mockDbSettings({ proxyEnabled: true, proxyHost: "proxy.internal" })
+
+    const { buildFetchOptions } = await import("@/lib/adapters")
+
+    await POST(makeRequest(VALID_BODY))
+
+    expect(buildFetchOptions).toHaveBeenCalledOnce()
+    const [, optsArg] = (buildFetchOptions as ReturnType<typeof vi.fn>).mock.calls[0]
+    expect(optsArg).toMatchObject({ proxyAgent: fakeAgent })
+  })
+
+  it("proceeds without proxy agent when settings row is absent (empty DB)", async () => {
+    // Simulate no appSettings row at all (fresh install or missing row)
+    mockDbSettings(null)
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    // Should succeed — proxy is optional
+    expect(res.status).toBe(200)
+    expect(body.success).toBe(true)
+    // buildProxyAgentFromSettings should NOT have been called when settings row is absent
+    expect(buildProxyAgentFromSettings).not.toHaveBeenCalled()
+  })
+
+  it("proceeds without proxy when buildProxyAgentFromSettings returns undefined", async () => {
+    ;(buildProxyAgentFromSettings as ReturnType<typeof vi.fn>).mockReturnValueOnce(undefined)
+    mockDbSettings()
+
+    const res = await POST(makeRequest(VALID_BODY))
+    const body = await res.json()
+
+    expect(res.status).toBe(200)
+    expect(body.success).toBe(true)
+  })
+})
diff --git a/src/app/api/trackers/test/route.ts b/src/app/api/trackers/test/route.ts
deleted file mode 100644
index fec70b8f..00000000
--- a/src/app/api/trackers/test/route.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// src/app/api/trackers/test/route.ts
-import { NextResponse } from "next/server"
-import {
-  buildFetchOptions,
-  DEFAULT_API_PATHS,
-  getAdapter,
-  VALID_PLATFORM_TYPES,
-} from "@/lib/adapters"
-import { authenticate, parseJsonBody, validateHttpUrl } from "@/lib/api-helpers"
-import { log } from "@/lib/logger"
-
-export async function POST(request: Request) {
-  const auth = await authenticate()
-  if (auth instanceof NextResponse) return auth
-
-  const body = await parseJsonBody(request)
-  if (body instanceof NextResponse) return body
-
-  const { baseUrl, apiToken, platformType, apiPath } = body as {
-    baseUrl?: string
-    apiToken?: string
-    platformType?: string
-    apiPath?: string
-  }
-
-  if (!baseUrl || typeof baseUrl !== "string" || !apiToken || typeof apiToken !== "string") {
-    return NextResponse.json({ error: "baseUrl and apiToken are required" }, { status: 400 })
-  }
-
-  const trimmedBaseUrl = baseUrl.trim()
-  const trimmedApiToken = apiToken.trim()
-
-  if (trimmedApiToken.length > 500) {
-    return NextResponse.json(
-      { error: "API token must be 500 characters or fewer" },
-      { status: 400 }
-    )
-  }
-
-  if (trimmedBaseUrl.length > 500) {
-    return NextResponse.json({ error: "URL must be 500 characters or fewer" }, { status: 400 })
-  }
-
-  const urlErr = validateHttpUrl(trimmedBaseUrl)
-  if (urlErr) return urlErr
-
-  const platform = typeof platformType === "string" ? platformType : "unit3d"
-  if (!VALID_PLATFORM_TYPES.includes(platform as (typeof VALID_PLATFORM_TYPES)[number])) {
-    return NextResponse.json({ error: "Invalid platform type" }, { status: 400 })
-  }
-
-  try {
-    const adapter = getAdapter(platform)
-    const defaultPath = DEFAULT_API_PATHS[platform] ?? "/api/user"
-    const path = typeof apiPath === "string" && apiPath.startsWith("/") ? apiPath : defaultPath
-    const fetchOptions = buildFetchOptions(trimmedBaseUrl)
-    const stats = await adapter.fetchStats(trimmedBaseUrl, trimmedApiToken, path, fetchOptions)
-    return NextResponse.json({
-      success: true,
-      username: stats.username,
-      group: stats.group,
-    })
-  } catch (error) {
-    log.warn(
-      {
-        route: "POST /api/trackers/test",
-        error: String(error),
-      },
-      "tracker connection test failed"
-    )
-    return NextResponse.json({ error: "Tracker test failed" }, { status: 422 })
-  }
-}
diff --git a/src/app/api/trackers/tracker-routes.test.ts b/src/app/api/trackers/tracker-routes.test.ts
index b933798d..6f6c62f7 100644
--- a/src/app/api/trackers/tracker-routes.test.ts
+++ b/src/app/api/trackers/tracker-routes.test.ts
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest"
 import { CHART_THEME } from "@/components/charts/lib/theme"
 import { authenticate, parseJsonBody, parseTrackerId } from "@/lib/api-helpers"
 import { db } from "@/lib/db"
-import { pollTracker } from "@/lib/scheduler"
+import { pollTracker } from "@/lib/tracker-scheduler"
 import { POST as PollPOST } from "./[id]/poll/route"
 import { GET as RolesGET, POST as RolesPOST } from "./[id]/roles/route"
 import { DELETE, PATCH } from "./[id]/route"
@@ -37,13 +37,13 @@ vi.mock("@/lib/crypto", () => ({
   decrypt: vi.fn().mockReturnValue("decrypted-value"),
 }))
 
-vi.mock("@/lib/proxy", () => ({
+vi.mock("@/lib/tunnel", () => ({
   createProxyAgent: vi.fn(),
   buildProxyAgentFromSettings: vi.fn().mockReturnValue(undefined),
   VALID_PROXY_TYPES: new Set(["socks5", "http", "https"]),
 }))
 
-vi.mock("@/lib/scheduler", () => ({
+vi.mock("@/lib/tracker-scheduler", () => ({
   pollTracker: vi.fn(),
 }))
 
@@ -59,6 +59,39 @@ vi.mock("@/lib/privacy-db", () => ({
   createPrivacyMaskSync: vi.fn().mockReturnValue((v: string | null | undefined) => v ?? null),
 }))
 
+vi.mock("@/lib/server-data", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/server-data")>()
+  return {
+    ...actual,
+    getTrackerForClient: vi.fn().mockResolvedValue({
+      id: 1,
+      name: "Test Tracker",
+      baseUrl: "https://example.com",
+      platformType: "unit3d",
+      isActive: true,
+      lastPolledAt: null,
+      lastError: null,
+      consecutiveFailures: 0,
+      pausedAt: null,
+      userPausedAt: null,
+      color: "#00d4ff",
+      qbtTag: null,
+      mouseholeUrl: null,
+      useProxy: false,
+      countCrossSeedUnsatisfied: false,
+      hideUnreadBadges: false,
+      isFavorite: false,
+      sortOrder: null,
+      joinedAt: null,
+      lastAccessAt: null,
+      remoteUserId: null,
+      platformMeta: null,
+      createdAt: "2024-01-01T00:00:00.000Z",
+      latestStats: null,
+    }),
+  }
+})
+
 const VALID_KEY = "abcd1234".repeat(8)
 
 function makeRequest(url: string, body?: Record<string, unknown>, method = "GET"): Request {
@@ -465,7 +498,7 @@ describe("PATCH /api/trackers/[id]", () => {
     const data = await response.json()
 
     expect(response.status).toBe(200)
-    expect(data.success).toBe(true)
+    expect(data.id).toBe(1)
   })
 
   it("returns 400 when name exceeds 100 characters", async () => {
@@ -555,11 +588,17 @@ describe("PATCH /api/trackers/[id]", () => {
     expect(data.error).toMatch(/color/i)
   })
 
-  it("returns 400 when API token exceeds 500 characters", async () => {
+  it("returns 400 when API token exceeds limit for non-avistaz tracker", async () => {
     ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
       apiToken: "t".repeat(501),
     })
 
+    // Mock the platformType lookup: select → from → where → limit
+    const mockLimit = vi.fn().mockResolvedValue([{ platformType: "unit3d" }])
+    const mockWhere = vi.fn().mockReturnValue({ limit: mockLimit })
+    const mockFrom = vi.fn().mockReturnValue({ where: mockWhere })
+    ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: mockFrom })
+
     const request = makeRequest(
       "http://localhost/api/trackers/1",
       { apiToken: "t".repeat(501) },
@@ -588,7 +627,7 @@ describe("PATCH /api/trackers/[id]", () => {
     const data = await response.json()
 
     expect(response.status).toBe(200)
-    expect(data.success).toBe(true)
+    expect(data.id).toBe(1)
   })
 
   it("returns 401 when unauthenticated", async () => {
@@ -734,20 +773,14 @@ describe("POST /api/trackers/[id]/poll", () => {
     })
     ;(parseTrackerId as ReturnType<typeof vi.fn>).mockResolvedValue(1)
 
-    // Poll route makes two db.select() calls:
-    //   1. Cooldown check: select({ lastPolledAt }).from(trackers).where(...).limit(1)
-    //   2. Settings: select({...}).from(appSettings).limit(1)
-    let selectCallCount = 0
+    // Poll route:
+    //   1. db.update(trackers).set(...).where(...).returning(...) — atomic cooldown claim
+    //   2. db.select({...}).from(appSettings).limit(1) — settings query
+    const mockReturning = vi.fn().mockResolvedValue([{ id: 1 }])
+    const mockUpdateWhere = vi.fn().mockReturnValue({ returning: mockReturning })
+    const mockSet = vi.fn().mockReturnValue({ where: mockUpdateWhere })
+    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
     ;(db.select as ReturnType<typeof vi.fn>).mockImplementation(() => {
-      selectCallCount++
-      if (selectCallCount === 1) {
-        // Cooldown check — return lastPolledAt far enough in the past
-        const mockLimit = vi.fn().mockResolvedValue([{ lastPolledAt: new Date(0) }])
-        const mockWhere = vi.fn().mockReturnValue({ limit: mockLimit })
-        const mockFrom = vi.fn().mockReturnValue({ where: mockWhere })
-        return { from: mockFrom }
-      }
-      // Settings query
       const mockLimit = vi.fn().mockResolvedValue([
         {
           storeUsernames: true,
@@ -801,12 +834,11 @@ describe("POST /api/trackers/[id]/poll", () => {
   })
 
   it("returns 429 when tracker was polled within cooldown period", async () => {
-    ;(db.select as ReturnType<typeof vi.fn>).mockImplementation(() => {
-      const mockLimit = vi.fn().mockResolvedValue([{ lastPolledAt: new Date() }])
-      const mockWhere = vi.fn().mockReturnValue({ limit: mockLimit })
-      const mockFrom = vi.fn().mockReturnValue({ where: mockWhere })
-      return { from: mockFrom }
-    })
+    // Atomic claim returns 0 rows = cooldown still active
+    const mockReturning = vi.fn().mockResolvedValue([])
+    const mockUpdateWhere = vi.fn().mockReturnValue({ returning: mockReturning })
+    const mockSet = vi.fn().mockReturnValue({ where: mockUpdateWhere })
+    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
 
     const request = makeRequest("http://localhost/api/trackers/1/poll", undefined, "POST")
     const params = Promise.resolve({ id: "1" })
@@ -850,17 +882,17 @@ describe("GET /api/trackers/[id]/snapshots", () => {
   })
 
   function buildSnapshotDbMock(result: unknown[]) {
-    // Call 1: db.select().from(trackerSnapshots).where(...).orderBy(...)
+    // Call 1: db.selectDistinctOn([bucket], cols).from(...).where(...).orderBy(...)
+    // (getSnapshotsForTracker uses selectDistinctOn for the default 30-day range)
     const mockOrderBy = vi.fn().mockResolvedValue(result)
     const mockWhere = vi.fn().mockReturnValue({ orderBy: mockOrderBy })
     const mockFrom = vi.fn().mockReturnValue({ where: mockWhere })
+    ;(db.selectDistinctOn as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: mockFrom })
+
     // Call 2: db.select({storeUsernames}).from(appSettings).limit(1)
     const mockSettingsLimit = vi.fn().mockResolvedValue([{ storeUsernames: true }])
     const mockSettingsFrom = vi.fn().mockReturnValue({ limit: mockSettingsLimit })
-
-    ;(db.select as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce({ from: mockFrom })
-      .mockReturnValueOnce({ from: mockSettingsFrom })
+    ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: mockSettingsFrom })
   }
 
   it("returns snapshots with default 30 days and serialized bigints", async () => {
@@ -905,30 +937,6 @@ describe("GET /api/trackers/[id]/snapshots", () => {
     expect(response.status).toBe(200)
   })
 
-  it("clamps days to minimum 1", async () => {
-    // Smoke test: clamping logic is verified via Math.max(parseInt(...), 1) in source.
-    // The route returns 200 for any non-negative days value including 0.
-    buildSnapshotDbMock([])
-
-    const request = new Request("http://localhost/api/trackers/1/snapshots?days=0")
-    const params = Promise.resolve({ id: "1" })
-    const response = await SnapshotsGET(request, { params })
-
-    expect(response.status).toBe(200)
-  })
-
-  it("clamps days to maximum 3650", async () => {
-    // Smoke test: clamping logic is verified via Math.min(..., 3650) in source.
-    // The route returns 200 for any days value, clamped internally.
-    buildSnapshotDbMock([])
-
-    const request = new Request("http://localhost/api/trackers/1/snapshots?days=9999")
-    const params = Promise.resolve({ id: "1" })
-    const response = await SnapshotsGET(request, { params })
-
-    expect(response.status).toBe(200)
-  })
-
   it("defaults to 30 days for non-numeric days param", async () => {
     buildSnapshotDbMock([])
 
diff --git a/src/app/api/upload-image/route.ts b/src/app/api/upload-image/route.ts
index 86d84d02..e0364764 100644
--- a/src/app/api/upload-image/route.ts
+++ b/src/app/api/upload-image/route.ts
@@ -9,9 +9,9 @@ import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
 import type { ImageHostId } from "@/lib/image-hosting"
 import { getImageHostAdapter } from "@/lib/image-hosting"
+import { IMAGE_EXPIRATION_MAX, UPLOAD_IMAGE_MAX_BYTES } from "@/lib/limits"
 import { log } from "@/lib/logger"
 
-const MAX_FILE_SIZE = 32 * 1024 * 1024 // 32 MB (ImgBB limit, lowest common denominator)
 const VALID_HOSTS = new Set<ImageHostId>(["ptpimg", "onlyimage", "imgbb"])
 const VALID_MIME_TYPES = [
   "image/jpeg",
@@ -70,9 +70,9 @@ export async function POST(request: Request) {
   if (file.size === 0) {
     return NextResponse.json({ error: "image file is empty" }, { status: 400 })
   }
-  if (file.size > MAX_FILE_SIZE) {
+  if (file.size > UPLOAD_IMAGE_MAX_BYTES) {
     return NextResponse.json(
-      { error: `File too large (max ${MAX_FILE_SIZE / 1024 / 1024} MB)` },
+      { error: `File too large (max ${UPLOAD_IMAGE_MAX_BYTES / 1024 / 1024} MB)` },
       { status: 400 }
     )
   }
@@ -88,7 +88,7 @@ export async function POST(request: Request) {
   const expirationRaw = formData.get("expiration")
   if (expirationRaw) {
     const parsed = Number(expirationRaw)
-    if (!Number.isFinite(parsed) || parsed < 0 || parsed > 31_536_000) {
+    if (!Number.isFinite(parsed) || parsed < 0 || parsed > IMAGE_EXPIRATION_MAX) {
       return NextResponse.json(
         { error: "expiration must be a positive number of seconds (max 31536000)" },
         { status: 400 }
diff --git a/src/app/globals.css b/src/app/globals.css
index 3cff1f8b..bf9cddc8 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -107,6 +107,14 @@
   --radius-lg: 20px;
   --radius-xl: 24px;
   --radius-pill: 9999px;
+
+  /* Sub-xs font sizes for dense data UI.
+   * text-3xs and text-2xs are intentionally the same value today (10px).
+   * text-2xs covers former 11px contexts (table cells, pills).
+   * If dense tables feel too tight, bump --text-2xs to 11px — one-line change. */
+  --text-4xs: 9px;
+  --text-3xs: 10px;
+  --text-2xs: 10px;
 }
 
 /* Custom radius utilities matching design system tokens */
@@ -174,13 +182,165 @@
     /* #14151b */ inset -2px -2px 5px oklch(32.94% 0.0266 278.88); /* #323443 */
 }
 
+/* Tracker color accent glow — corner-pooling inset glow via pseudo-element
+ * so it doesn't conflict with the card's nm-raised box-shadow. Four offset
+ * shadows concentrate light in the corners and fade along the edges.
+ * Color passed as --card-accent via inline style. */
+@utility card-accent {
+  position: relative;
+  &::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    border-radius: inherit;
+    box-shadow:
+      inset 5px 5px 14px -5px var(--card-accent, transparent),
+      inset -3px -3px 14px -8px var(--card-accent, transparent),
+      inset 1px 1px 2px 0 rgba(255, 255, 255, 0.05),
+      inset -1px -1px 2px 0 rgba(255, 255, 255, 0.015);
+    pointer-events: none;
+  }
+}
+
 @utility slot-label {
   font-family: var(--font-sans);
-  font-size: 10px;
+  font-size: var(--text-3xs);
   font-weight: 500;
   text-transform: uppercase;
   letter-spacing: 0.05em;
-  color: var(--color-text-tertiary);
+  color: var(--color-tertiary);
+}
+
+/* ─── Typography utilities ─── */
+
+@utility card-heading {
+  font-size: var(--text-sm);
+  font-family: var(--font-sans);
+  font-weight: 600;
+  color: var(--color-primary);
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+}
+
+@utility timestamp {
+  font-size: var(--text-3xs);
+  font-family: var(--font-mono);
+  color: var(--color-muted);
+}
+
+@utility tabular-cell {
+  font-family: var(--font-mono);
+  font-variant-numeric: tabular-nums;
+  color: var(--color-secondary);
+  font-size: var(--text-xs);
+}
+
+@utility torrent-cell {
+  font-size: var(--text-2xs);
+  font-family: var(--font-mono);
+  color: var(--color-muted);
+}
+
+@utility ghost-link {
+  font-size: var(--text-xs);
+  font-family: var(--font-mono);
+  color: var(--color-tertiary);
+  cursor: pointer;
+  transition: color 150ms;
+  &:hover {
+    color: var(--color-secondary);
+  }
+}
+
+@utility description-text {
+  font-size: var(--text-xs);
+  font-family: var(--font-sans);
+  color: var(--color-tertiary);
+  line-height: 1.625;
+}
+
+@utility danger-confirm-text {
+  font-size: var(--text-sm);
+  font-family: var(--font-sans);
+  color: var(--color-primary);
+  line-height: 1.625;
+}
+
+@utility progress-footnote {
+  font-size: var(--text-3xs);
+  font-family: var(--font-mono);
+  color: var(--color-muted);
+  text-align: right;
+}
+
+/* ─── Native dialog backdrop ─── */
+
+dialog[data-overlay]::backdrop {
+  background: rgb(0 0 0 / 0.6);
+  opacity: 0;
+  transition: opacity 150ms ease-in;
+}
+
+dialog[data-overlay][data-visible]::backdrop {
+  opacity: 1;
+  transition: opacity 200ms ease-out;
+}
+
+/* ─── Interactive utilities ─── */
+
+@utility help-icon {
+  cursor: help;
+  font-size: var(--text-4xs);
+  font-weight: 700;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 0.875rem;
+  height: 0.875rem;
+  border-radius: 9999px;
+  border: 1px solid currentColor;
+}
+
+@utility tooltip-icon {
+  color: var(--color-muted);
+  cursor: help;
+  font-size: var(--text-sm);
+  transition: color 150ms;
+  &:hover {
+    color: var(--color-secondary);
+  }
+}
+
+/* ─── Structural utilities ─── */
+
+@utility color-dot {
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 9999px;
+  flex-shrink: 0;
+}
+
+@utility form-responsive-row {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  @media (min-width: 640px) {
+    flex-direction: row;
+    align-items: flex-end;
+  }
+}
+
+@utility full-page-loader {
+  display: flex;
+  height: 100%;
+  min-height: calc(100vh - 6rem);
+  align-items: center;
+  justify-content: center;
+}
+
+@utility lazy-card {
+  content-visibility: auto;
+  contain-intrinsic-size: 0 320px;
 }
 
 /*
@@ -297,7 +457,7 @@
   animation-play-state: paused;
 }
 
-/* Carousel slide animations — used by ClientStatusWidget */
+/* Carousel slide animations — used by DownloadClientStatusWidget */
 @keyframes slideInLeft {
   from {
     opacity: 0;
@@ -430,7 +590,7 @@ select {
   background: oklch(40.24% 0.0439 279.12); /* #434660 */
 }
 
-/* react-colorful overrides — scoped under wrapper for specificity without !important */
+/* react-colorful overrides */
 .color-picker-wrapper .react-colorful {
   width: 100%;
   height: 160px;
@@ -453,7 +613,7 @@ select {
   box-shadow: 0 0 4px oklch(0% 0 0 / 0.4); /* #000000 40% */
 }
 
-/* Emoji picker theme overrides — scoped under wrapper for specificity without !important */
+/* Emoji picker theme overrides */
 .emoji-picker-wrapper .EmojiPickerReact.epr-dark-theme {
   --epr-bg-color: oklch(31.52% 0.0323 279.44); /* #2e3042 */
   --epr-category-label-bg-color: oklch(31.52% 0.0323 279.44); /* #2e3042 */
diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx
index f806dd6a..d4e45ff5 100644
--- a/src/app/login/LoginForm.tsx
+++ b/src/app/login/LoginForm.tsx
@@ -39,19 +39,20 @@ export function LoginForm({ hasUsername }: { hasUsername: boolean }) {
 
       if (!res.ok) {
         setError(data.error ?? "Login failed. Please try again.")
+        setIsSubmitting(false)
         return
       }
 
       if (data.requiresTotp) {
         setPendingToken(data.pendingToken)
         setStep("totp")
+        setIsSubmitting(false)
         return
       }
 
       router.push("/")
     } catch {
       setError("An unexpected error occurred. Please try again.")
-    } finally {
       setIsSubmitting(false)
     }
   }
@@ -79,13 +80,13 @@ export function LoginForm({ hasUsername }: { hasUsername: boolean }) {
 
       if (!res.ok) {
         setError(data.error ?? "Verification failed.")
+        setIsSubmitting(false)
         return
       }
 
       router.push("/")
     } catch {
       setError("An unexpected error occurred. Please try again.")
-    } finally {
       setIsSubmitting(false)
     }
   }
@@ -108,10 +109,11 @@ export function LoginForm({ hasUsername }: { hasUsername: boolean }) {
             alt="Tracker Tracker"
             width={160}
             height={40}
-            className="h-10 w-auto mx-auto"
+            className="mx-auto"
+            style={{ height: 40, width: "auto" }}
             priority
           />
-          <p className="mt-2 text-sm text-secondary">
+          <p className="mt-6 text-sm text-secondary">
             {step === "password"
               ? "Enter your credentials to unlock."
               : "Enter the code from your authenticator app."}
@@ -152,9 +154,8 @@ export function LoginForm({ hasUsername }: { hasUsername: boolean }) {
                 size="md"
                 className="w-full mt-1"
                 disabled={isSubmitting}
-              >
-                {isSubmitting ? "Unlocking…" : "Unlock"}
-              </Button>
+                text={isSubmitting ? "Unlocking…" : "Unlock"}
+              />
             </form>
           )}
 
@@ -198,28 +199,25 @@ export function LoginForm({ hasUsername }: { hasUsername: boolean }) {
                 size="md"
                 className="w-full"
                 disabled={isSubmitting}
-              >
-                {isSubmitting ? "Verifying…" : "Verify"}
-              </Button>
+                text={isSubmitting ? "Verifying…" : "Verify"}
+              />
 
               <div className="flex items-center justify-between">
-                <button
-                  type="button"
+                <Button
+                  variant="minimal"
+                  size="sm"
+                  text="Back to password"
                   onClick={handleBackToPassword}
-                  className="text-xs font-sans text-tertiary hover:text-secondary transition-colors cursor-pointer"
-                >
-                  Back to password
-                </button>
-                <button
-                  type="button"
+                />
+                <Button
+                  variant="minimal"
+                  size="sm"
                   onClick={() => {
                     setShowBackupInput(!showBackupInput)
                     setError(null)
                   }}
-                  className="text-xs font-sans text-tertiary hover:text-secondary transition-colors cursor-pointer"
-                >
-                  {showBackupInput ? "Use authenticator" : "Use backup code"}
-                </button>
+                  text={showBackupInput ? "Use authenticator" : "Use backup code"}
+                />
               </div>
             </form>
           )}
diff --git a/src/app/setup/SetupForm.tsx b/src/app/setup/SetupForm.tsx
index 7791eda1..7787872f 100644
--- a/src/app/setup/SetupForm.tsx
+++ b/src/app/setup/SetupForm.tsx
@@ -5,39 +5,46 @@ import { H2 } from "@typography"
 import Image from "next/image"
 import { useRouter } from "next/navigation"
 import { type SubmitEvent, useState } from "react"
-import { Button, Card, Input } from "@/components/ui"
+import { Button, Card, Input, Toggle } from "@/components/ui"
+import { Notice } from "@/components/ui/Notice"
+import { SNAPSHOT_RETENTION_MAX, SNAPSHOT_RETENTION_MIN } from "@/lib/limits"
 
 export function SetupForm() {
   const router = useRouter()
   const [username, setUsername] = useState("")
   const [password, setPassword] = useState("")
   const [confirmPassword, setConfirmPassword] = useState("")
-  const [error, setError] = useState<string | null>(null)
+  const [retentionEnabled, setRetentionEnabled] = useState(false)
+  const [retentionDays, setRetentionDays] = useState(365)
+  const [errors, setErrors] = useState<Record<string, string>>({})
   const [isSubmitting, setIsSubmitting] = useState(false)
 
   async function handleSubmit(e: SubmitEvent<HTMLFormElement>) {
     e.preventDefault()
-    setError(null)
+    setErrors({})
 
     if (!username.trim() || username.trim().length < 3) {
-      setError("Username must be at least 3 characters.")
+      setErrors({ username: "Username must be at least 3 characters." })
       return
     }
 
     if (password.length < 8) {
-      setError("Password must be at least 8 characters.")
+      setErrors({ password: "Password must be at least 8 characters." })
       return
     }
 
     if (password !== confirmPassword) {
-      setError("Passwords do not match.")
+      setErrors({ confirmPassword: "Passwords do not match." })
       return
     }
 
     setIsSubmitting(true)
 
     try {
-      const payload: Record<string, string> = { password, username: username.trim() }
+      const payload: Record<string, unknown> = { password, username: username.trim() }
+      if (retentionEnabled && retentionDays > 0) {
+        payload.snapshotRetentionDays = retentionDays
+      }
 
       const setupRes = await fetch("/api/auth/setup", {
         method: "POST",
@@ -47,7 +54,17 @@ export function SetupForm() {
 
       if (!setupRes.ok) {
         const data = (await setupRes.json()) as { error?: string }
-        setError(data.error ?? "Setup failed. Please try again.")
+        const msg = data.error ?? "Setup failed. Please try again."
+        const lowerMsg = msg.toLowerCase()
+        if (lowerMsg.includes("username")) {
+          setErrors({ username: msg })
+        } else if (lowerMsg.includes("match")) {
+          setErrors({ confirmPassword: msg })
+        } else if (lowerMsg.includes("8 char") || lowerMsg.includes("password")) {
+          setErrors({ password: msg })
+        } else {
+          setErrors({ form: msg })
+        }
         return
       }
 
@@ -59,13 +76,13 @@ export function SetupForm() {
 
       if (!loginRes.ok) {
         const data = (await loginRes.json()) as { error?: string }
-        setError(data.error ?? "Login after setup failed. Please go to the login page.")
+        setErrors({ form: data.error ?? "Login after setup failed. Please go to the login page." })
         return
       }
 
       router.push("/")
     } catch {
-      setError("An unexpected error occurred. Please try again.")
+      setErrors({ form: "An unexpected error occurred. Please try again." })
     } finally {
       setIsSubmitting(false)
     }
@@ -80,7 +97,8 @@ export function SetupForm() {
             alt="Tracker Tracker"
             width={160}
             height={40}
-            className="h-10 w-auto mx-auto"
+            className="mx-auto"
+            style={{ height: 40, width: "auto" }}
             priority
           />
           <H2 className="mt-6 text-secondary text-center">Create an account</H2>
@@ -96,7 +114,7 @@ export function SetupForm() {
               required
               value={username}
               onChange={(e) => setUsername(e.target.value)}
-              error={error?.toLowerCase().includes("username") ? error : undefined}
+              error={errors.username}
               disabled={isSubmitting}
             />
 
@@ -107,7 +125,7 @@ export function SetupForm() {
               placeholder="Min. 8 characters"
               value={password}
               onChange={(e) => setPassword(e.target.value)}
-              error={error?.toLowerCase().includes("8 char") ? error : undefined}
+              error={errors.password}
               disabled={isSubmitting}
               required
             />
@@ -119,19 +137,45 @@ export function SetupForm() {
               placeholder="Re-enter password"
               value={confirmPassword}
               onChange={(e) => setConfirmPassword(e.target.value)}
-              error={error?.toLowerCase().includes("match") ? error : undefined}
+              error={errors.confirmPassword}
               disabled={isSubmitting}
               required
             />
 
-            {error &&
-              !error?.toLowerCase().includes("8 char") &&
-              !error?.toLowerCase().includes("match") &&
-              !error?.toLowerCase().includes("username") && (
-                <p className="text-xs font-sans text-danger" role="alert">
-                  {error}
-                </p>
+            <div className="border-t border-border pt-4 mt-1">
+              <Toggle
+                label="Enable snapshot retention"
+                description={
+                  retentionEnabled
+                    ? `Snapshots older than ${retentionDays} days will be pruned automatically.`
+                    : "Disabled — snapshots will be kept indefinitely. You can change this later in Settings."
+                }
+                checked={retentionEnabled}
+                onChange={setRetentionEnabled}
+                disabled={isSubmitting}
+              />
+              {retentionEnabled && (
+                <Input
+                  label="Retention (days)"
+                  type="number"
+                  min={SNAPSHOT_RETENTION_MIN}
+                  max={SNAPSHOT_RETENTION_MAX}
+                  value={String(retentionDays)}
+                  onChange={(e) =>
+                    setRetentionDays(
+                      Math.max(
+                        SNAPSHOT_RETENTION_MIN,
+                        Math.min(SNAPSHOT_RETENTION_MAX, Number(e.target.value) || 365)
+                      )
+                    )
+                  }
+                  disabled={isSubmitting}
+                  className="mt-3"
+                />
               )}
+            </div>
+
+            <Notice message={errors.form} />
 
             <Button
               type="submit"
@@ -139,9 +183,8 @@ export function SetupForm() {
               size="md"
               className="w-full mt-1"
               disabled={isSubmitting}
-            >
-              {isSubmitting ? "Setting up…" : "Create Account"}
-            </Button>
+              text={isSubmitting ? "Setting up…" : "Create Account"}
+            />
           </form>
         </Card>
       </div>
diff --git a/src/components/AddTrackerDialog.tsx b/src/components/AddTrackerDialog.tsx
index 57bd114f..414d3d00 100644
--- a/src/components/AddTrackerDialog.tsx
+++ b/src/components/AddTrackerDialog.tsx
@@ -1,36 +1,30 @@
 // src/components/AddTrackerDialog.tsx
 "use client"
 
-//
-// Functions: AddTrackerDialog
-
 import { H2 } from "@typography"
 import clsx from "clsx"
 import Image from "next/image"
-import {
-  type KeyboardEvent,
-  type MouseEvent,
-  type SyntheticEvent,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react"
+import { type KeyboardEvent, useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
+import { AreaInput } from "@/components/ui/AreaInput"
 import { Button } from "@/components/ui/Button"
 import { ColorPicker } from "@/components/ui/ColorPicker"
+import { Dialog } from "@/components/ui/Dialog"
 import { TriangleWarningIcon } from "@/components/ui/Icons"
+import { InfoTip } from "@/components/ui/InfoTip"
 import { Input } from "@/components/ui/Input"
+import { Notice } from "@/components/ui/Notice"
 import { QbtTagWarning } from "@/components/ui/QbtTagWarning"
 import { Tooltip } from "@/components/ui/Tooltip"
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
 import { TRACKER_REGISTRY } from "@/data/tracker-registry"
 import { useClickOutside } from "@/hooks/useClickOutside"
-import { normalizeUrl } from "@/lib/url"
+import { DOCS } from "@/lib/constants"
+import { normalizeUrl } from "@/lib/data-transforms"
+import { localDateStr } from "@/lib/formatters"
 
 // ---------------------------------------------------------------------------
-// Fuzzy match — matches if all query chars appear in order in the target
+// Fuzzy match
 // ---------------------------------------------------------------------------
 
 function fuzzyMatch(query: string, target: string): boolean {
@@ -44,7 +38,7 @@ function fuzzyMatch(query: string, target: string): boolean {
 }
 
 // ---------------------------------------------------------------------------
-// TrackerCombobox — searchable dropdown for tracker selection
+// TrackerCombobox
 // ---------------------------------------------------------------------------
 
 interface TrackerComboboxProps {
@@ -71,10 +65,8 @@ function TrackerCombobox({ presets, value, onChange }: TrackerComboboxProps) {
       )
     : presets
 
-  // Close on outside click
   useClickOutside(ref, () => setOpen(false), open)
 
-  // Scroll highlighted item into view
   useEffect(() => {
     if (!open || !listRef.current) return
     const item = listRef.current.children[highlightIndex] as HTMLElement | undefined
@@ -160,7 +152,7 @@ function TrackerCombobox({ presets, value, onChange }: TrackerComboboxProps) {
             ✕
           </button>
         )}
-        <span className="text-tertiary text-[10px] shrink-0" aria-hidden="true">
+        <span className="text-tertiary text-3xs shrink-0" aria-hidden="true">
           ▾
         </span>
       </div>
@@ -168,7 +160,7 @@ function TrackerCombobox({ presets, value, onChange }: TrackerComboboxProps) {
       {open && (
         <div
           ref={listRef}
-          className="absolute top-full left-0 right-0 mt-1 z-50 bg-elevated nm-raised-sm py-1 max-h-60 overflow-y-auto styled-scrollbar rounded-nm-md"
+          className="absolute top-full left-0 right-0 mt-1 z-40 bg-elevated nm-raised-sm py-1 max-h-60 overflow-y-auto styled-scrollbar rounded-nm-md"
           role="listbox"
         >
           {filtered.length === 0 ? (
@@ -203,11 +195,8 @@ function TrackerCombobox({ presets, value, onChange }: TrackerComboboxProps) {
                 <span className="flex-1 truncate">{entry.name}</span>
                 {entry.warning && (
                   <Tooltip content={entry.warningNote ?? "Warning"}>
-                    <span className="flex items-center gap-1 shrink-0">
+                    <span className="shrink-0">
                       <TriangleWarningIcon width="13" height="13" className="text-warn" />
-                      {entry.warningNote && (
-                        <span className="text-[10px] text-warn">{entry.warningNote}</span>
-                      )}
                     </span>
                   </Tooltip>
                 )}
@@ -240,12 +229,13 @@ function AddTrackerDialog({
   onAdded,
   existingBaseUrls = [],
 }: AddTrackerDialogProps) {
-  const dialogRef = useRef<HTMLDialogElement>(null)
-
   const [selectedPreset, setSelectedPreset] = useState("")
   const [nickname, setNickname] = useState("")
   const [baseUrl, setBaseUrl] = useState("")
   const [apiToken, setApiToken] = useState("")
+  const [avistazUsername, setAvistazUsername] = useState("")
+  const [avistazCookies, setAvistazCookies] = useState("")
+  const [dcCookies, setDcCookies] = useState("")
   const [qbtTag, setQbtTag] = useState("")
   const [mouseholeUrl, setMouseholeUrl] = useState("")
   const [color, setColor] = useState<string>(CHART_THEME.accent)
@@ -259,6 +249,9 @@ function AddTrackerDialog({
     setNickname("")
     setBaseUrl("")
     setApiToken("")
+    setAvistazUsername("")
+    setAvistazCookies("")
+    setDcCookies("")
     setQbtTag("")
     setMouseholeUrl("")
     setColor(CHART_THEME.accent)
@@ -268,43 +261,10 @@ function AddTrackerDialog({
     setTestResult(null)
   }, [])
 
-  useEffect(() => {
-    const dialog = dialogRef.current
-    if (!dialog) return
-
-    if (open) {
-      dialog.showModal()
-    } else {
-      dialog.close()
-    }
-  }, [open])
-
-  useEffect(() => {
-    const dialog = dialogRef.current
-    if (!dialog) return
-
-    function handleNativeClose() {
-      resetForm()
-      onClose()
-    }
-
-    dialog.addEventListener("close", handleNativeClose)
-    return () => {
-      dialog.removeEventListener("close", handleNativeClose)
-    }
-  }, [onClose, resetForm])
-
-  function handleBackdropClick(e: MouseEvent<HTMLDialogElement>) {
-    if (e.target === dialogRef.current) {
-      dialogRef.current?.close()
-    }
-  }
-
-  function handleDialogKeyDown(e: KeyboardEvent<HTMLDialogElement>) {
-    if (e.key === "Escape") {
-      dialogRef.current?.close()
-    }
-  }
+  const handleDialogClose = useCallback(() => {
+    resetForm()
+    onClose()
+  }, [resetForm, onClose])
 
   function handlePresetChange(slug: string) {
     setSelectedPreset(slug)
@@ -318,6 +278,9 @@ function AddTrackerDialog({
       setBaseUrl("")
       setColor(CHART_THEME.accent)
     }
+    setAvistazUsername("")
+    setAvistazCookies("")
+    setDcCookies("")
   }
 
   const availablePresets = useMemo(() => {
@@ -331,28 +294,49 @@ function AddTrackerDialog({
   function validate(): Record<string, string> {
     const next: Record<string, string> = {}
 
-    if (!selectedPreset && !baseUrl.trim()) {
-      next.preset = "Select a tracker or enter a Base URL"
+    if (!selectedPreset) {
+      next.preset = "Select a tracker"
     }
-    if (!baseUrl.trim()) {
-      next.baseUrl = "Base URL is required"
-    } else {
-      try {
-        new URL(baseUrl)
-      } catch {
-        next.baseUrl = "Invalid URL format"
+
+    if (selectedEntry?.platform === "avistaz") {
+      if (!avistazUsername.trim()) {
+        next.apiToken = "Username is required"
+      } else if (!avistazCookies.trim()) {
+        next.apiToken = "Browser cookies are required"
+      } else if (!avistazCookies.includes("=")) {
+        next.apiToken =
+          "This doesn't look like a cookie string — it should contain key=value pairs (i.e. cf_clearance=abc123; session=xyz)"
+      } else if (
+        /^(cf_clearance|[a-z]+x_session|remember_web_\w+|XSRF-TOKEN|love)$/i.test(
+          avistazCookies.trim()
+        )
+      ) {
+        next.apiToken =
+          'You pasted a cookie name, not the value. Copy the entire string after "Cookie:" in the request headers.'
       }
-    }
-    if (!apiToken.trim()) {
+    } else if (selectedEntry?.platform === "digitalcore") {
+      const trimmed = dcCookies.trim()
+      if (!trimmed) {
+        next.apiToken = "Session cookies are required"
+      } else {
+        const uidMatch = trimmed.match(/(?:^|;\s*)uid=([^;]+)/)
+        const passMatch = trimmed.match(/(?:^|;\s*)pass=([^;]+)/)
+        if (!uidMatch) {
+          next.apiToken =
+            "Cookie string is missing uid value. Paste the full Cookie header from DevTools."
+        } else if (!passMatch) {
+          next.apiToken =
+            "Cookie string is missing pass value. Paste the full Cookie header from DevTools."
+        }
+      }
+    } else if (!apiToken.trim()) {
       next.apiToken = "API token is required"
     }
 
     return next
   }
 
-  async function handleSubmit(e: SyntheticEvent) {
-    e.preventDefault()
-
+  async function handleSubmit() {
     const validationErrors = validate()
     if (Object.keys(validationErrors).length > 0) {
       setErrors(validationErrors)
@@ -363,13 +347,33 @@ function AddTrackerDialog({
     setLoading(true)
     setTestResult(null)
 
+    const isAvistaz = selectedEntry?.platform === "avistaz"
+    const isDigitalCore = selectedEntry?.platform === "digitalcore"
+    let effectiveApiToken = apiToken
+
+    if (isAvistaz) {
+      effectiveApiToken = JSON.stringify({
+        cookies: avistazCookies.trim(),
+        userAgent: navigator.userAgent,
+        username: avistazUsername.trim(),
+      })
+    } else if (isDigitalCore) {
+      const trimmed = dcCookies.trim()
+      const uidMatch = trimmed.match(/(?:^|;\s*)uid=([^;]+)/)
+      const passMatch = trimmed.match(/(?:^|;\s*)pass=([^;]+)/)
+      effectiveApiToken = JSON.stringify({
+        uid: uidMatch?.[1]?.trim() ?? "",
+        pass: passMatch?.[1]?.trim() ?? "",
+      })
+    }
+
     try {
-      const testRes = await fetch("/api/trackers/test", {
+      const testRes = await fetch("/api/trackers/test-connection", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           baseUrl,
-          apiToken,
+          apiToken: effectiveApiToken,
           platformType: selectedEntry?.platform ?? "unit3d",
           apiPath: selectedEntry?.apiPath,
         }),
@@ -379,19 +383,26 @@ function AddTrackerDialog({
 
       if (!testRes.ok) {
         setErrors({ apiToken: testData.error ?? "Connection failed" })
-        setLoading(false)
         return
       }
 
       setTestResult({ username: testData.username, group: testData.group })
 
+      if (isAvistaz && testData.capturedUserAgent) {
+        effectiveApiToken = JSON.stringify({
+          cookies: avistazCookies.trim(),
+          userAgent: testData.capturedUserAgent,
+          username: avistazUsername.trim(),
+        })
+      }
+
       const saveRes = await fetch("/api/trackers", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           name: trackerName,
           baseUrl,
-          apiToken,
+          apiToken: effectiveApiToken,
           platformType: selectedEntry?.platform ?? "unit3d",
           color,
           qbtTag: qbtTag.trim() || undefined,
@@ -404,7 +415,6 @@ function AddTrackerDialog({
 
       if (!saveRes.ok) {
         setErrors({ form: saveData.error ?? "Failed to add tracker" })
-        setLoading(false)
         return
       }
 
@@ -415,75 +425,151 @@ function AddTrackerDialog({
       onAdded(saveData.id)
     } catch {
       setErrors({ form: "Network error — please try again" })
+    } finally {
       setLoading(false)
     }
   }
 
   return (
-    <dialog
-      ref={dialogRef}
-      onClick={handleBackdropClick}
-      onKeyDown={handleDialogKeyDown}
-      className="fixed inset-0 m-auto w-full max-w-lg bg-elevated p-0 overflow-visible backdrop:bg-black/60 backdrop:backdrop-blur-sm open:flex open:flex-col nm-raised-lg rounded-nm-xl border-0"
+    <Dialog
+      open={open}
+      onClose={handleDialogClose}
+      onSubmit={handleSubmit}
+      formProps={
+        { autoComplete: "off", "data-1p-ignore": true } as React.HTMLAttributes<HTMLFormElement>
+      }
+      title="Add Tracker"
+      maxWidth="max-w-lg"
+      busy={loading}
+      footer={
+        <div className="flex gap-3">
+          <Button
+            type="submit"
+            disabled={loading}
+            text={loading ? "Connecting..." : "Add Tracker"}
+          />
+          <Button variant="ghost" onClick={handleDialogClose} text="Cancel" />
+        </div>
+      }
     >
-      <div className="flex flex-col w-full p-6 gap-5">
-        {/* Header */}
-        <div className="flex items-center justify-between">
-          <H2 className="text-base font-semibold text-primary">Add Tracker</H2>
-          <button
-            type="button"
-            onClick={() => dialogRef.current?.close()}
-            className="text-tertiary hover:text-primary transition-colors cursor-pointer p-1 -m-1 rounded-nm-sm"
-            aria-label="Close dialog"
-          >
-            ✕
-          </button>
+      <div className="flex flex-col gap-4">
+        <div className="flex flex-col gap-1">
+          <H2 className="uppercase tracking-wider">Tracker</H2>
+          <TrackerCombobox
+            presets={availablePresets}
+            value={selectedPreset}
+            onChange={handlePresetChange}
+          />
+          <Notice message={errors.preset} />
         </div>
 
-        {/* Form */}
-        <form
-          onSubmit={handleSubmit}
-          className="flex flex-col gap-4"
+        {selectedEntry?.warning && selectedEntry.warningNote && (
+          <Notice variant="warn" box message={selectedEntry.warningNote} />
+        )}
+
+        {selectedEntry?.platform === "avistaz" && (
+          <Notice
+            variant="warn"
+            box
+            message="AvistaZ network trackers require Member class or above. New accounts start as Validating and cannot access the profile page needed for stat tracking. This tracker won't work until your account is promoted."
+          />
+        )}
+
+        <Input
+          label="Nickname (optional)"
+          name="tracker-nickname"
           autoComplete="off"
           data-1p-ignore
-        >
+          value={nickname}
+          onChange={(e) => setNickname(e.target.value)}
+          placeholder={selectedEntry?.name ?? "Custom name for this tracker"}
+        />
+
+        {selectedEntry?.platform === "avistaz" ? (
+          <div className="flex flex-col gap-3">
+            <Input
+              label={`${selectedEntry?.name ?? "AvistaZ"} Username`}
+              name="tracker-avistaz-username"
+              autoComplete="off"
+              data-1p-ignore
+              value={avistazUsername}
+              onChange={(e) => setAvistazUsername(e.target.value)}
+              placeholder="Your username on this tracker"
+            />
+            <div className="flex flex-col gap-1">
+              <div className="flex items-center gap-1">
+                <label
+                  htmlFor="tracker-avistaz-cookies"
+                  className="text-xs uppercase tracking-wider text-secondary font-sans font-medium"
+                >
+                  Browser Cookies
+                </label>
+                <InfoTip
+                  content="Open DevTools (F12) → Network tab → click any request → find the Cookie header → right-click it → Copy Value. Do not select the text directly, as Firefox truncates long values in the display."
+                  size="sm"
+                  docs={DOCS.ADDING_A_TRACKER}
+                />
+              </div>
+              <AreaInput
+                id="tracker-avistaz-cookies"
+                name="tracker-avistaz-cookies"
+                autoComplete="off"
+                data-1p-ignore
+                value={avistazCookies}
+                onChange={(e) => setAvistazCookies(e.target.value)}
+                placeholder="F12 → Network → any request → Cookie header → right-click → Copy Value"
+                rows={3}
+              />
+              {avistazCookies.includes("\u2026") && (
+                <Notice variant="warn">
+                  Cookie string appears truncated (contains &quot;&hellip;&quot;). Firefox truncates
+                  long values in the display. Right-click the Cookie header and select{" "}
+                  <strong>Copy Value</strong> instead.
+                </Notice>
+              )}
+              <Notice message={errors.apiToken} />
+            </div>
+            {testResult && (
+              <Notice variant="success">
+                Connected as <span className="font-semibold">{testResult.username}</span>
+                {testResult.group ? ` (${testResult.group})` : ""}
+              </Notice>
+            )}
+          </div>
+        ) : selectedEntry?.platform === "digitalcore" ? (
           <div className="flex flex-col gap-1">
-            <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-              Tracker
-            </span>
-            <TrackerCombobox
-              presets={availablePresets}
-              value={selectedPreset}
-              onChange={handlePresetChange}
+            <div className="flex items-center gap-1">
+              <label
+                htmlFor="tracker-dc-cookies"
+                className="text-xs uppercase tracking-wider text-secondary font-sans font-medium"
+              >
+                Session Cookies
+              </label>
+              <InfoTip
+                content="DigitalCore uses session cookies instead of API keys. Open DevTools (F12) → Network → any request → copy the Cookie header value."
+                size="sm"
+                docs={DOCS.ADDING_A_TRACKER}
+              />
+            </div>
+            <AreaInput
+              id="tracker-dc-cookies"
+              name="tracker-dc-cookies"
+              autoComplete="off"
+              data-1p-ignore
+              value={dcCookies}
+              onChange={(e) => setDcCookies(e.target.value)}
+              placeholder="uid=56954; pass=abc123def456..."
+              rows={2}
             />
-            {errors.preset && (
-              <p className="text-xs font-sans text-danger" role="alert">
-                {errors.preset}
-              </p>
+            <Notice message={errors.apiToken} />
+            {testResult && (
+              <Notice variant="success">
+                Connected as <span className="font-semibold">{testResult.username}</span>
+                {testResult.group ? ` (${testResult.group})` : ""}
+              </Notice>
             )}
           </div>
-
-          <Input
-            label="Nickname (optional)"
-            name="tracker-nickname"
-            autoComplete="off"
-            data-1p-ignore
-            value={nickname}
-            onChange={(e) => setNickname(e.target.value)}
-            placeholder={selectedEntry?.name ?? "Custom name for this tracker"}
-          />
-
-          <Input
-            label="Base URL"
-            name="tracker-url"
-            autoComplete="off"
-            data-1p-ignore
-            value={baseUrl}
-            onChange={(e) => setBaseUrl(e.target.value)}
-            placeholder="https://aither.cc"
-            error={errors.baseUrl}
-          />
-
+        ) : (
           <div className="flex flex-col gap-1">
             <Input
               label="API Token"
@@ -505,84 +591,71 @@ function AddTrackerDialog({
               error={errors.apiToken}
             />
             {testResult && (
-              <p className="text-xs font-sans text-success">
+              <Notice variant="success">
                 Connected as <span className="font-semibold">{testResult.username}</span>
                 {testResult.group ? ` (${testResult.group})` : ""}
-              </p>
+              </Notice>
             )}
           </div>
+        )}
 
-          <div className="flex flex-col gap-1">
-            <Input
-              label="qBittorrent Tag"
-              name="tracker-qbt-tag"
-              autoComplete="off"
-              data-1p-ignore
-              value={qbtTag}
-              onChange={(e) => setQbtTag(e.target.value)}
-              placeholder={selectedEntry ? `i.e, ${selectedEntry.slug}` : "i.e, tracker-name"}
-            />
-            <QbtTagWarning tag={qbtTag} />
-          </div>
+        <div className="flex flex-col gap-1">
+          <Input
+            label="qBittorrent Tag"
+            name="tracker-qbt-tag"
+            autoComplete="off"
+            data-1p-ignore
+            value={qbtTag}
+            onChange={(e) => setQbtTag(e.target.value)}
+            placeholder={selectedEntry ? `i.e, ${selectedEntry.slug}` : "i.e, tracker-name"}
+          />
+          <QbtTagWarning tag={qbtTag} />
+        </div>
 
-          {selectedEntry?.platform === "mam" && (
-            <div className="flex flex-col gap-1">
-              <div className="flex items-center gap-1">
-                <Input
-                  label="Mousehole URL (optional)"
-                  name="tracker-mousehole-url"
-                  autoComplete="off"
-                  data-1p-ignore
-                  value={mouseholeUrl}
-                  onChange={(e) => setMouseholeUrl(e.target.value)}
-                  placeholder="http://localhost:7001"
-                />
-                <Tooltip
-                  content="If you run Mousehole to manage your MAM seedbox IP, enter its URL here to see status and trigger updates from Tracker Tracker."
-                  docs={{
-                    href: "https://github.com/t-mart/mousehole",
-                    description: "Mousehole on GitHub",
-                  }}
-                >
-                  <span className="text-muted hover:text-secondary cursor-help text-xs">
-                    &#9432;
-                  </span>
-                </Tooltip>
-              </div>
+        {selectedEntry?.platform === "mam" && (
+          <div className="flex flex-col gap-1">
+            <div className="flex items-center gap-1">
+              <Input
+                label="Mousehole URL (optional)"
+                name="tracker-mousehole-url"
+                autoComplete="off"
+                data-1p-ignore
+                value={mouseholeUrl}
+                onChange={(e) => setMouseholeUrl(e.target.value)}
+                placeholder="http://localhost:7001"
+              />
+              <InfoTip
+                content="If you run Mousehole to manage your MAM seedbox IP, enter its URL here to see status and trigger updates from Tracker Tracker."
+                size="sm"
+                docs={{
+                  href: "https://github.com/t-mart/mousehole",
+                  description: "Mousehole on GitHub",
+                }}
+              />
             </div>
-          )}
+          </div>
+        )}
 
-          <ColorPicker label="Color" value={color} onChange={setColor} />
+        <ColorPicker label="Color" value={color} onChange={setColor} />
 
-          {!(selectedEntry?.gazelleEnrich || selectedEntry?.platform === "ggn") && (
+        {selectedEntry &&
+          !selectedEntry.gazelleEnrich &&
+          selectedEntry.platform !== "ggn" &&
+          selectedEntry.platform !== "avistaz" &&
+          selectedEntry.platform !== "digitalcore" && (
             <Input
               label="Join Date (optional)"
               type="date"
               value={joinedAt}
-              max={new Date().toISOString().split("T")[0]}
+              max={localDateStr()}
               onChange={(e) => setJoinedAt(e.target.value)}
               placeholder="YYYY-MM-DD"
             />
           )}
 
-          {errors.form && (
-            <p className="text-xs font-sans text-danger" role="alert">
-              {errors.form}
-            </p>
-          )}
-
-          {/* Footer */}
-          <div className="flex gap-3 pt-1">
-            <Button type="submit" disabled={loading}>
-              {loading ? "Connecting..." : "Add Tracker"}
-            </Button>
-            <Button type="button" variant="ghost" onClick={() => dialogRef.current?.close()}>
-              Cancel
-            </Button>
-          </div>
-        </form>
+        <Notice message={errors.form} />
       </div>
-    </dialog>
+    </Dialog>
   )
 }
 
diff --git a/src/components/DownloadClients.tsx b/src/components/DownloadClients.tsx
index 6be77475..f221ab36 100644
--- a/src/components/DownloadClients.tsx
+++ b/src/components/DownloadClients.tsx
@@ -1,47 +1,41 @@
 // src/components/DownloadClients.tsx
-//
-// Functions: DownloadClients, ClientCard
-
 "use client"
 
-import { H3, Paragraph, Subheader, Subtext } from "@typography"
-import { useCallback, useEffect, useState } from "react"
-import { Badge } from "@/components/ui/Badge"
-import { Button } from "@/components/ui/Button"
-import { Card } from "@/components/ui/Card"
-import { CollapsibleCard } from "@/components/ui/CollapsibleCard"
-import { Input } from "@/components/ui/Input"
-import { MaskedSecret } from "@/components/ui/MaskedSecret"
-import { NumberInput } from "@/components/ui/NumberInput"
-import { Select } from "@/components/ui/Select"
-import { Toggle } from "@/components/ui/Toggle"
-import { UptimeBar } from "@/components/ui/UptimeBar"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { H2, H3, Paragraph, Subheader, Subtext } from "@typography"
+import { useCallback, useState } from "react"
+import {
+  Badge,
+  Button,
+  Card,
+  CardListSkeleton,
+  CollapsibleCard,
+  ConfirmRemove,
+  Input,
+  MaskedSecret,
+  Notice,
+  NumberInput,
+  SaveDiscardBar,
+  Select,
+  Toggle,
+  UptimeBar,
+} from "@/components/ui"
+
+import { useActionStatus } from "@/hooks/useActionStatus"
+import { useCrudCard } from "@/hooks/useCrudCard"
 import { formatTimeAgo } from "@/lib/formatters"
+import { PORT_MAX, PORT_MIN } from "@/lib/limits"
+import { clientQueryOptions } from "@/lib/query-options"
+import type { SafeDownloadClient } from "@/types/api"
 
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
 
 type ClientType = "qbittorrent" | "deluge" | "transmission" | "rtorrent"
+type DownloadClient = SafeDownloadClient
 
-interface DownloadClient {
-  id: number
-  name: string
-  type: ClientType
-  enabled: boolean
-  host: string
-  port: number
-  useSsl: boolean
-  hasCredentials: boolean
-  pollIntervalSeconds: number
-  isDefault: boolean
-  crossSeedTags: string[]
-  lastPolledAt: string | null
-  lastError: string | null
-  errorSince: string | null
-}
-
-type ConnectionStatus = "idle" | "testing" | "success" | "failed"
+const EMPTY_TRACKERS: string[] = []
 
 const CLIENT_TYPE_OPTIONS: { value: ClientType; label: string; disabled?: boolean }[] = [
   { value: "qbittorrent", label: "qBittorrent" },
@@ -74,122 +68,69 @@ const DRAFT_KEYS: (keyof DownloadClient)[] = [
   "crossSeedTags",
 ]
 
-function isDirty(draft: DownloadClient, saved: DownloadClient): boolean {
+function buildPatch(draft: DownloadClient, saved: DownloadClient): Record<string, unknown> | null {
+  const patch: Record<string, unknown> = {}
   for (const key of DRAFT_KEYS) {
     const a = draft[key]
     const b = saved[key]
     if (Array.isArray(a) && Array.isArray(b)) {
-      if (a.length !== b.length || a.some((v, i) => v !== b[i])) return true
-    } else if (a !== b) return true
+      if (a.length !== b.length || a.some((v, i) => v !== b[i])) patch[key] = a
+    } else if (a !== b) patch[key] = a
   }
-  return false
+  return Object.keys(patch).length > 0 ? patch : null
 }
 
 function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }: ClientCardProps) {
-  const [draft, setDraft] = useState<DownloadClient>(client)
-  const [saving, setSaving] = useState(false)
-  const [saveError, setSaveError] = useState<string | null>(null)
-  const [expanded, setExpanded] = useState(false)
-  const [connectionStatus, setConnectionStatus] = useState<ConnectionStatus>("idle")
-  const [connectionError, setConnectionError] = useState<string | null>(null)
-  const [confirmRemove, setConfirmRemove] = useState(false)
+  const {
+    draft,
+    updateDraft,
+    dirty,
+    saving,
+    saveError,
+    expanded,
+    toggleExpand,
+    handleSave,
+    handleDiscard,
+  } = useCrudCard({
+    item: client,
+    apiEndpoint: "/api/clients",
+    buildPatch,
+    onSaved,
+  })
+  const {
+    status: connectionStatus,
+    error: connectionError,
+    execute: executeTest,
+  } = useActionStatus()
   const [tagInput, setTagInput] = useState("")
 
-  const dirty = isDirty(draft, client)
-
-  // Sync draft when parent pushes new server state (i.e after another card's setDefault)
-  useEffect(() => {
-    if (!dirty) setDraft(client)
-  }, [client, dirty])
-
-  function updateDraft(patch: Partial<DownloadClient>) {
-    setDraft((prev) => ({ ...prev, ...patch }))
-  }
-
-  async function handleSave() {
-    setSaving(true)
-    setSaveError(null)
-    const patch: Record<string, unknown> = {}
-    for (const key of DRAFT_KEYS) {
-      const a = draft[key]
-      const b = client[key]
-      if (Array.isArray(a) && Array.isArray(b)) {
-        if (a.length !== b.length || a.some((v, i) => v !== b[i])) patch[key] = a
-      } else if (a !== b) patch[key] = a
-    }
-    try {
-      const res = await fetch(`/api/clients/${client.id}`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(patch),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        setSaveError(data.error || "Failed to save")
-        return
-      }
-      onSaved(client.id, draft)
-    } catch {
-      setSaveError("Network error")
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  function handleDiscard() {
-    setDraft(client)
-    setSaveError(null)
-  }
-
   // Credential change state — show inputs for new clients (no creds yet) or after "Change"
   const [changingCredentials, setChangingCredentials] = useState(!client.hasCredentials)
   const [newUsername, setNewUsername] = useState("")
   const [newPassword, setNewPassword] = useState("")
   const [credError, setCredError] = useState<string | null>(null)
 
-  const [uptimeData, setUptimeData] = useState<{
-    buckets: { bucketTs: string; ok: number; fail: number }[]
-    uptimePercent: number | null
-  } | null>(null)
-
-  useEffect(() => {
-    let cancelled = false
-    async function fetchUptime() {
-      try {
-        const res = await fetch(`/api/clients/${client.id}/uptime`)
-        if (!res.ok || cancelled) return
-        const data = await res.json()
-        if (!cancelled) setUptimeData(data)
-      } catch {
-        // uptime bar is non-critical
-      }
-    }
-    fetchUptime()
-    const interval = setInterval(fetchUptime, 5 * 60 * 1000)
-    return () => {
-      cancelled = true
-      clearInterval(interval)
-    }
-  }, [client.id])
-
-  const handleTestConnection = useCallback(async () => {
-    setConnectionStatus("testing")
-    setConnectionError(null)
-    try {
+  const { data: uptimeData = null } = useQuery({
+    queryKey: ["client-uptime", client.id],
+    queryFn: async ({ signal }) => {
+      const res = await fetch(`/api/clients/${client.id}/uptime`, { signal })
+      if (!res.ok) return null
+      return res.json() as Promise<{
+        buckets: { bucketTs: string; ok: number; fail: number }[]
+        uptimePercent: number | null
+      }>
+    },
+    refetchInterval: 5 * 60 * 1000,
+  })
+
+  const handleTestConnection = () =>
+    executeTest(async () => {
       const res = await fetch(`/api/clients/${client.id}/test`, { method: "POST" })
-      if (res.ok) {
-        setConnectionStatus("success")
-        setTimeout(() => setConnectionStatus("idle"), 3000)
-      } else {
+      if (!res.ok) {
         const data = await res.json().catch(() => ({}))
-        setConnectionError(data.error || "Connection failed")
-        setConnectionStatus("failed")
+        throw new Error(data.error || "Connection failed")
       }
-    } catch {
-      setConnectionError("Network error — could not reach server")
-      setConnectionStatus("failed")
-    }
-  }, [client.id])
+    })
 
   async function handleSaveCredentials() {
     if (!newUsername.trim() || !newPassword.trim()) return
@@ -223,7 +164,7 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
   return (
     <CollapsibleCard
       expanded={expanded}
-      onToggle={() => setExpanded((e) => !e)}
+      onToggle={toggleExpand}
       header={
         <div className="flex flex-col gap-0.5">
           <div className="flex items-center gap-3">
@@ -232,18 +173,18 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
             {client.isDefault && <Badge variant="accent">Default</Badge>}
           </div>
           <div className="flex items-center gap-3 flex-wrap">
-            <span className="text-[10px] font-mono text-tertiary">
+            <span className="text-3xs font-mono text-tertiary">
               {client.lastPolledAt
                 ? `Last seen: ${formatTimeAgo(client.lastPolledAt)}`
                 : "Last seen: Never"}
             </span>
             {client.errorSince && (
-              <span className="text-[10px] font-mono text-danger">
+              <span className="text-3xs font-mono text-danger">
                 Down since {formatTimeAgo(client.errorSince)}
               </span>
             )}
             {client.lastError && !client.errorSince && (
-              <span className="text-[10px] font-mono text-danger">{client.lastError}</span>
+              <span className="text-3xs font-mono text-danger">{client.lastError}</span>
             )}
           </div>
         </div>
@@ -258,7 +199,7 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
       }
     >
       {/* Row 1: Name + Type + Enabled */}
-      <div className="flex flex-col sm:flex-row gap-4 sm:items-end pt-5">
+      <div className="form-responsive-row pt-5">
         <div className="flex-1">
           <Input
             label="Name"
@@ -289,7 +230,7 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
       <div className="border-t border-border" />
 
       {/* Row 2: Host + Port + SSL */}
-      <div className="flex flex-col sm:flex-row gap-4 sm:items-end">
+      <div className="form-responsive-row">
         <div className="flex-1">
           <Input
             label="Host"
@@ -302,8 +243,8 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
           label="Port"
           value={draft.port}
           onChange={(v) => updateDraft({ port: v })}
-          min={1}
-          max={65535}
+          min={PORT_MIN}
+          max={PORT_MAX}
         />
       </div>
 
@@ -315,23 +256,23 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
       />
 
       {draft.useSsl && draft.port === 80 && (
-        <p className="text-xs font-mono text-warning">
-          SSL is enabled but port is 80 (standard HTTP). Did you mean port 443?
-        </p>
+        <Notice
+          variant="warn"
+          message="SSL is enabled but port is 80 (standard HTTP). Did you mean port 443?"
+        />
       )}
       {!draft.useSsl && draft.port === 443 && (
-        <p className="text-xs font-mono text-warning">
-          Port 443 is typically used with SSL. Did you mean to enable SSL?
-        </p>
+        <Notice
+          variant="warn"
+          message="Port 443 is typically used with SSL. Did you mean to enable SSL?"
+        />
       )}
 
       <div className="border-t border-border" />
 
       {/* Row 3: Auth */}
       <div className="flex flex-col gap-2">
-        <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          Credentials
-        </span>
+        <H2 className="uppercase tracking-wider">Credentials</H2>
         {changingCredentials ? (
           <div className="flex flex-col gap-3">
             <div className="flex flex-col sm:flex-row gap-4">
@@ -365,9 +306,8 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
                 variant="primary"
                 onClick={handleSaveCredentials}
                 disabled={!newUsername.trim() || !newPassword.trim()}
-              >
-                Save Credentials
-              </Button>
+                text="Save Credentials"
+              />
               {client.hasCredentials && (
                 <button
                   type="button"
@@ -377,13 +317,13 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
                     setNewPassword("")
                     setCredError(null)
                   }}
-                  className="text-xs font-mono text-tertiary hover:text-secondary transition-colors cursor-pointer"
+                  className="ghost-link"
                 >
                   Cancel
                 </button>
               )}
             </div>
-            {credError && <p className="text-xs font-mono text-danger">{credError}</p>}
+            <Notice message={credError} />
           </div>
         ) : (
           <MaskedSecret onChangeClick={() => setChangingCredentials(true)} />
@@ -446,16 +386,15 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
                 }
                 setTagInput("")
               }}
-            >
-              Add
-            </Button>
+              text="Add"
+            />
           </div>
           {draft.crossSeedTags.length > 0 && (
-            <div className="flex gap-1.5 flex-wrap">
+            <div className="flex gap-2 flex-wrap">
               {draft.crossSeedTags.map((tag) => (
                 <span
                   key={tag}
-                  className="inline-flex items-center gap-1.5 font-mono text-xs text-primary bg-control-bg nm-inset-sm px-2.5 py-1 rounded-nm-sm"
+                  className="inline-flex items-center gap-2 font-mono text-xs text-primary bg-control-bg nm-inset-sm px-2.5 py-1 rounded-nm-sm"
                 >
                   {tag}
                   <button
@@ -485,7 +424,7 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
       {linkedTrackers.length > 0 && (
         <div className="flex items-center gap-2">
           <Subheader className="uppercase tracking-wider shrink-0">Linked Trackers</Subheader>
-          <div className="flex gap-1.5 flex-wrap">
+          <div className="flex gap-2 flex-wrap">
             {linkedTrackers.map((name) => (
               <Badge key={name} variant="default">
                 {name}
@@ -500,21 +439,13 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
         settings.
       </Subtext>
 
-      {/* Save / Discard bar — only visible when draft has changes */}
-      {dirty && (
-        <>
-          <div className="border-t border-border" />
-          <div className="flex items-center gap-3">
-            <Button size="sm" onClick={handleSave} disabled={saving}>
-              {saving ? "Saving..." : "Save Changes"}
-            </Button>
-            <Button size="sm" variant="ghost" onClick={handleDiscard} disabled={saving}>
-              Discard
-            </Button>
-            {saveError && <span className="text-xs font-mono text-danger">{saveError}</span>}
-          </div>
-        </>
-      )}
+      <SaveDiscardBar
+        dirty={dirty}
+        saving={saving}
+        onSave={handleSave}
+        onDiscard={handleDiscard}
+        error={saveError}
+      />
 
       <div className="border-t border-border" />
 
@@ -524,9 +455,9 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
           size="sm"
           variant="secondary"
           onClick={handleTestConnection}
-          disabled={connectionStatus === "testing"}
+          disabled={connectionStatus === "pending"}
         >
-          {connectionStatus === "testing"
+          {connectionStatus === "pending"
             ? "Testing..."
             : connectionStatus === "success"
               ? "Connected"
@@ -541,29 +472,17 @@ function ClientCard({ client, linkedTrackers, onSaved, onRemove, onSetDefault }:
         <div className="flex-1" />
 
         {!client.isDefault && (
-          <Button size="sm" variant="ghost" onClick={() => onSetDefault(client.id)}>
-            Set as Default
-          </Button>
+          <Button
+            size="sm"
+            variant="ghost"
+            onClick={() => onSetDefault(client.id)}
+            text="Set as Default"
+          />
         )}
 
-        {confirmRemove ? (
-          <div className="flex items-center gap-2">
-            <Button size="sm" variant="danger" onClick={() => onRemove(client.id)}>
-              Confirm Remove
-            </Button>
-            <Button size="sm" variant="ghost" onClick={() => setConfirmRemove(false)}>
-              Cancel
-            </Button>
-          </div>
-        ) : (
-          <Button size="sm" variant="danger" onClick={() => setConfirmRemove(true)}>
-            Remove
-          </Button>
-        )}
+        <ConfirmRemove onConfirm={() => onRemove(client.id)} />
       </div>
-      {connectionStatus === "failed" && connectionError && (
-        <p className="text-xs font-mono text-danger">{connectionError}</p>
-      )}
+      {connectionStatus === "failed" && connectionError && <Notice message={connectionError} />}
     </CollapsibleCard>
   )
 }
@@ -622,9 +541,9 @@ function AddClientForm({
   }
 
   return (
-    <Card elevation="raised" className="flex flex-col gap-4 !p-5">
+    <Card elevation="raised" className="flex flex-col gap-4">
       <H3>Add Download Client</H3>
-      <div className="flex flex-col sm:flex-row gap-4 sm:items-end">
+      <div className="form-responsive-row">
         <div className="flex-1">
           <Input
             label="Name"
@@ -642,7 +561,7 @@ function AddClientForm({
               placeholder="localhost"
             />
           </div>
-          <NumberInput label="Port" value={port} onChange={setPort} min={1} max={65535} />
+          <NumberInput label="Port" value={port} onChange={setPort} min={PORT_MIN} max={PORT_MAX} />
         </div>
       </div>
       <div className="flex flex-col sm:flex-row gap-4">
@@ -670,68 +589,68 @@ function AddClientForm({
           />
         </div>
       </div>
-      {error && <p className="text-sm font-mono text-danger">{error}</p>}
+      <Notice message={error} />
       <div className="flex items-center gap-3">
-        <Button size="sm" onClick={handleSubmit} disabled={!canSubmit || saving}>
-          {saving ? "Creating..." : "Create Client"}
-        </Button>
-        <Button size="sm" variant="ghost" onClick={onCancel}>
-          Cancel
-        </Button>
+        <Button
+          size="sm"
+          onClick={handleSubmit}
+          disabled={!canSubmit || saving}
+          text={saving ? "Creating..." : "Create Client"}
+        />
+        <Button size="sm" variant="ghost" onClick={onCancel} text="Cancel" />
       </div>
     </Card>
   )
 }
 
 function DownloadClients() {
-  const [clients, setClients] = useState<DownloadClient[]>([])
-  const [loading, setLoading] = useState(true)
+  const queryClient = useQueryClient()
   const [showAddForm, setShowAddForm] = useState(false)
 
-  const fetchClients = useCallback(async () => {
-    try {
-      const res = await fetch("/api/clients")
-      if (!res.ok) return
-      const data: DownloadClient[] = await res.json()
-      setClients(data)
-    } catch {
-      // silently fail
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchClients()
-  }, [fetchClients])
-
-  const handleSaved = useCallback((id: number, updated: DownloadClient) => {
-    setClients((prev) => prev.map((c) => (c.id === id ? updated : c)))
-  }, [])
-
-  const handleRemove = useCallback(async (id: number) => {
-    await fetch(`/api/clients/${id}`, { method: "DELETE" })
-    setClients((prev) => {
-      const next = prev.filter((c) => c.id !== id)
-      // If we removed the default, promote the first remaining client optimistically
-      if (next.length > 0 && !next.some((c) => c.isDefault)) {
-        next[0] = { ...next[0], isDefault: true }
-      }
-      return next
-    })
-  }, [])
+  const { data: clients = [], isLoading: loading } = useQuery({
+    ...clientQueryOptions,
+  })
+
+  const handleSaved = useCallback(
+    (id: number, updated: DownloadClient) => {
+      queryClient.setQueryData<DownloadClient[]>(clientQueryOptions.queryKey, (prev) =>
+        prev?.map((c) => (c.id === id ? updated : c))
+      )
+    },
+    [queryClient]
+  )
+
+  const handleRemove = useCallback(
+    async (id: number) => {
+      await fetch(`/api/clients/${id}`, { method: "DELETE" })
+      queryClient.setQueryData<DownloadClient[]>(clientQueryOptions.queryKey, (prev) => {
+        if (!prev) return prev
+        const next = prev.filter((c) => c.id !== id)
+        if (next.length > 0 && !next.some((c) => c.isDefault)) {
+          next[0] = { ...next[0], isDefault: true }
+        }
+        return next
+      })
+    },
+    [queryClient]
+  )
 
-  const handleSetDefault = useCallback((id: number) => {
-    setClients((prev) => prev.map((c) => ({ ...c, isDefault: c.id === id })))
-    fetch(`/api/clients/${id}`, {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ isDefault: true }),
-    }).catch(() => {})
-  }, [])
+  const handleSetDefault = useCallback(
+    (id: number) => {
+      queryClient.setQueryData<DownloadClient[]>(clientQueryOptions.queryKey, (prev) =>
+        prev?.map((c) => ({ ...c, isDefault: c.id === id }))
+      )
+      fetch(`/api/clients/${id}`, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ isDefault: true }),
+      }).catch(() => {})
+    },
+    [queryClient]
+  )
 
   if (loading) {
-    return <p className="text-sm font-mono text-tertiary">Loading clients...</p>
+    return <CardListSkeleton count={2} />
   }
 
   return (
@@ -748,9 +667,7 @@ function DownloadClients() {
               download activity.
             </Paragraph>
           </div>
-          <Button size="sm" onClick={() => setShowAddForm(true)}>
-            Add Download Client
-          </Button>
+          <Button size="sm" onClick={() => setShowAddForm(true)} text="Add Download Client" />
         </Card>
       ) : (
         <>
@@ -758,7 +675,7 @@ function DownloadClients() {
             <ClientCard
               key={client.id}
               client={client}
-              linkedTrackers={[]}
+              linkedTrackers={EMPTY_TRACKERS}
               onSaved={handleSaved}
               onRemove={handleRemove}
               onSetDefault={handleSetDefault}
@@ -769,7 +686,7 @@ function DownloadClients() {
               isFirst={clients.length === 0}
               onCreated={() => {
                 setShowAddForm(false)
-                fetchClients()
+                queryClient.invalidateQueries({ queryKey: clientQueryOptions.queryKey })
               }}
               onCancel={() => setShowAddForm(false)}
             />
@@ -779,9 +696,8 @@ function DownloadClients() {
               variant="secondary"
               className="self-start"
               onClick={() => setShowAddForm(true)}
-            >
-              + Add Client
-            </Button>
+              text="+ Add Client"
+            />
           )}
         </>
       )}
diff --git a/src/components/NotificationTargets.tsx b/src/components/NotificationTargets.tsx
index a4a5ae19..c37c383f 100644
--- a/src/components/NotificationTargets.tsx
+++ b/src/components/NotificationTargets.tsx
@@ -1,55 +1,33 @@
 // src/components/NotificationTargets.tsx
 //
 // Functions: NotificationTargets, NotificationCard, AddNotificationForm
-
 "use client"
 
-import { H2, H3, Paragraph, Subtext } from "@typography"
-import { useCallback, useEffect, useState } from "react"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { H2, H3, Paragraph } from "@typography"
+import { useCallback, useState } from "react"
 import { Badge } from "@/components/ui/Badge"
 import { Button } from "@/components/ui/Button"
 import { Card } from "@/components/ui/Card"
 import { CollapsibleCard } from "@/components/ui/CollapsibleCard"
+import { ConfirmRemove } from "@/components/ui/ConfirmRemove"
+import { InfoTip } from "@/components/ui/InfoTip"
 import { Input } from "@/components/ui/Input"
 import { MaskedSecret } from "@/components/ui/MaskedSecret"
+import { Notice } from "@/components/ui/Notice"
 import { NumberInput } from "@/components/ui/NumberInput"
+import { SaveDiscardBar } from "@/components/ui/SaveDiscardBar"
 import { Select } from "@/components/ui/Select"
+import { CardListSkeleton } from "@/components/ui/skeletons"
 import { Toggle } from "@/components/ui/Toggle"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { useActionStatus } from "@/hooks/useActionStatus"
+import { useCrudCard } from "@/hooks/useCrudCard"
 import { DOCS } from "@/lib/constants"
 import { formatTimeAgo } from "@/lib/formatters"
 import type { NotificationTargetType } from "@/lib/notifications/types"
+import type { SafeNotificationTarget } from "@/types/api"
 
-interface NotificationTarget {
-  id: number
-  name: string
-  type: NotificationTargetType
-  enabled: boolean
-  hasConfig: boolean
-  notifyRatioDrop: boolean
-  notifyHitAndRun: boolean
-  notifyTrackerDown: boolean
-  notifyBufferMilestone: boolean
-  notifyWarned: boolean
-  notifyRatioDanger: boolean
-  notifyZeroSeeding: boolean
-  notifyRankChange: boolean
-  notifyAnniversary: boolean
-  notifyBonusCap: boolean
-  notifyVipExpiring: boolean
-  notifyUnsatisfiedLimit: boolean
-  notifyActiveHnrs: boolean
-  thresholds: { ratioDropDelta?: number; bufferMilestoneBytes?: number } | null
-  includeTrackerName: boolean
-  scope: number[] | null
-  lastDeliveryStatus: string | null
-  lastDeliveryAt: string | null
-  lastDeliveryError: string | null
-  createdAt: string
-  updatedAt: string
-}
-
-type WebhookStatus = "idle" | "testing" | "success" | "failed"
+type NotificationTarget = SafeNotificationTarget
 
 const NOTIFICATION_TYPE_OPTIONS: {
   value: NotificationTargetType
@@ -91,42 +69,47 @@ const DRAFT_KEYS: (keyof NotificationTarget)[] = [
   "notifyVipExpiring",
   "notifyUnsatisfiedLimit",
   "notifyActiveHnrs",
+  "notifyDownloadDisabled",
   "thresholds",
   "includeTrackerName",
   "scope",
 ]
 
-function isDirty(draft: NotificationTarget, saved: NotificationTarget): boolean {
+function buildPatch(
+  draft: NotificationTarget,
+  saved: NotificationTarget
+): Record<string, unknown> | null {
+  const patch: Record<string, unknown> = {}
   for (const key of DRAFT_KEYS) {
     const a = draft[key]
     const b = saved[key]
     if (a === null && b === null) continue
     if (typeof a === "object" && typeof b === "object" && a !== null && b !== null) {
-      if (JSON.stringify(a) !== JSON.stringify(b)) return true
-    } else if (a !== b) return true
+      if (JSON.stringify(a) !== JSON.stringify(b)) patch[key] = a
+    } else if (a !== b) patch[key] = a
   }
-  return false
+  return Object.keys(patch).length > 0 ? patch : null
 }
 
 function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps) {
-  const [draft, setDraft] = useState<NotificationTarget>(target)
-  const [saving, setSaving] = useState(false)
-  const [saveError, setSaveError] = useState<string | null>(null)
-  const [expanded, setExpanded] = useState(false)
-  const [webhookStatus, setWebhookStatus] = useState<WebhookStatus>("idle")
-  const [webhookError, setWebhookError] = useState<string | null>(null)
-  const [confirmRemove, setConfirmRemove] = useState(false)
-
-  const dirty = isDirty(draft, target)
-
-  // Sync draft when parent pushes new server state
-  useEffect(() => {
-    if (!dirty) setDraft(target)
-  }, [target, dirty])
-
-  function updateDraft(patch: Partial<NotificationTarget>) {
-    setDraft((prev) => ({ ...prev, ...patch }))
-  }
+  const {
+    draft,
+    setDraft,
+    updateDraft,
+    dirty,
+    saving,
+    saveError,
+    expanded,
+    toggleExpand,
+    handleSave,
+    handleDiscard,
+  } = useCrudCard({
+    item: target,
+    apiEndpoint: "/api/notifications",
+    buildPatch,
+    onSaved,
+  })
+  const { status: webhookStatus, error: webhookError, execute: executeTest } = useActionStatus()
 
   function updateThreshold(patch: Partial<NonNullable<NotificationTarget["thresholds"]>>) {
     setDraft((prev) => ({
@@ -135,43 +118,6 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
     }))
   }
 
-  async function handleSave() {
-    setSaving(true)
-    setSaveError(null)
-    const patch: Record<string, unknown> = {}
-    for (const key of DRAFT_KEYS) {
-      const a = draft[key]
-      const b = target[key]
-      if (typeof a === "object" && typeof b === "object") {
-        if (JSON.stringify(a) !== JSON.stringify(b)) patch[key] = a
-      } else if (a !== b) {
-        patch[key] = a
-      }
-    }
-    try {
-      const res = await fetch(`/api/notifications/${target.id}`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(patch),
-      })
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}))
-        setSaveError(data.error || "Failed to save")
-        return
-      }
-      onSaved(target.id, draft)
-    } catch {
-      setSaveError("Network error")
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  function handleDiscard() {
-    setDraft(target)
-    setSaveError(null)
-  }
-
   // Webhook config change state
   const [changingConfig, setChangingConfig] = useState(!target.hasConfig)
   const [newWebhookUrl, setNewWebhookUrl] = useState("")
@@ -199,24 +145,14 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
     }
   }
 
-  const handleTestWebhook = useCallback(async () => {
-    setWebhookStatus("testing")
-    setWebhookError(null)
-    try {
+  const handleTestWebhook = () =>
+    executeTest(async () => {
       const res = await fetch(`/api/notifications/${target.id}/test`, { method: "POST" })
-      if (res.ok) {
-        setWebhookStatus("success")
-        setTimeout(() => setWebhookStatus("idle"), 3000)
-      } else {
+      if (!res.ok) {
         const data = await res.json().catch(() => ({}))
-        setWebhookError(data.error || "Test failed")
-        setWebhookStatus("failed")
+        throw new Error(data.error || "Test failed")
       }
-    } catch {
-      setWebhookError("Network error — could not reach server")
-      setWebhookStatus("failed")
-    }
-  }, [target.id])
+    })
 
   const ratioDropDelta = draft.thresholds?.ratioDropDelta ?? 0.1
 
@@ -235,7 +171,7 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
   return (
     <CollapsibleCard
       expanded={expanded}
-      onToggle={() => setExpanded((e) => !e)}
+      onToggle={toggleExpand}
       header={
         <div className="flex flex-col gap-0.5">
           <div className="flex items-center gap-3">
@@ -243,7 +179,7 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
             {typeBadge}
             {statusBadge}
           </div>
-          <span className="text-[10px] font-mono text-tertiary">
+          <span className="text-3xs font-mono text-tertiary">
             {target.lastDeliveryAt
               ? `Last sent: ${formatTimeAgo(target.lastDeliveryAt)}`
               : "Last sent: Never"}
@@ -252,7 +188,7 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
       }
     >
       {/* Row 1: Name + Type + Enabled */}
-      <div className="flex flex-col sm:flex-row gap-4 sm:items-end pt-5">
+      <div className="form-responsive-row pt-5">
         <div className="flex-1">
           <Input
             label="Name"
@@ -284,15 +220,15 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
 
       {/* Webhook URL */}
       <div className="flex flex-col gap-2">
-        <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider flex items-center gap-1.5">
+        <H2 className="uppercase tracking-wider flex items-center gap-2">
           Webhook URL
-          <Tooltip
+          <InfoTip
+            icon="question"
+            size="sm"
             content="Encrypted at rest with AES-256-GCM. Never returned in API responses."
             docs={DOCS.WEBHOOKS}
-          >
-            <span className="text-tertiary cursor-help text-[10px]">?</span>
-          </Tooltip>
-        </span>
+          />
+        </H2>
         {changingConfig ? (
           <div className="flex flex-col gap-3">
             <Input
@@ -310,9 +246,8 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
                 variant="primary"
                 onClick={handleSaveConfig}
                 disabled={!newWebhookUrl.trim()}
-              >
-                Save URL
-              </Button>
+                text="Save URL"
+              />
               {target.hasConfig && (
                 <button
                   type="button"
@@ -321,13 +256,13 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
                     setNewWebhookUrl("")
                     setConfigError(null)
                   }}
-                  className="text-xs font-mono text-tertiary hover:text-secondary transition-colors cursor-pointer"
+                  className="ghost-link"
                 >
                   Cancel
                 </button>
               )}
             </div>
-            {configError && <p className="text-xs font-mono text-danger">{configError}</p>}
+            <Notice message={configError} />
           </div>
         ) : (
           <MaskedSecret onChangeClick={() => setChangingConfig(true)} />
@@ -338,15 +273,15 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
 
       {/* Notify when section */}
       <div className="flex flex-col gap-4">
-        <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider flex items-center gap-1.5">
+        <H2 className="uppercase tracking-wider flex items-center gap-2">
           Notify when
-          <Tooltip
+          <InfoTip
+            icon="question"
+            size="sm"
             content="Each event has a snooze window to prevent repeated alerts."
             docs={DOCS.WEBHOOKS}
-          >
-            <span className="text-tertiary cursor-help text-[10px]">?</span>
-          </Tooltip>
-        </span>
+          />
+        </H2>
 
         <div className="flex flex-col gap-1">
           <Toggle
@@ -355,7 +290,7 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
             onChange={(v) => updateDraft({ notifyRatioDrop: v })}
           />
           {draft.notifyRatioDrop && (
-            <div className="ml-[3.75rem] flex items-center gap-3">
+            <div className="ml-15 flex items-center gap-3">
               <span className="text-xs font-mono text-tertiary">Threshold (delta)</span>
               <NumberInput
                 value={Math.round(ratioDropDelta * 100)}
@@ -421,14 +356,14 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
           label="Bonus Points Capped"
           checked={draft.notifyBonusCap}
           onChange={(v) => updateDraft({ notifyBonusCap: v })}
-          description="Alert when seedbonus hits the cap (99,999 on MAM)"
+          description="Alert when seedbonus hits the cap (i.e. 99,999 on MAM)"
         />
 
         <Toggle
           label="VIP Expiring Soon"
           checked={draft.notifyVipExpiring}
           onChange={(v) => updateDraft({ notifyVipExpiring: v })}
-          description="Alert when VIP status is about to expire"
+          description="Alert when VIP status is about to expire (MAM, AvistaZ network)"
         />
 
         <Toggle
@@ -444,6 +379,13 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
           onChange={(v) => updateDraft({ notifyActiveHnrs: v })}
           description="Alert when inactive Hit & Runs are detected"
         />
+
+        <Toggle
+          label="Download Privileges Revoked"
+          checked={draft.notifyDownloadDisabled}
+          onChange={(v) => updateDraft({ notifyDownloadDisabled: v })}
+          description="Alert when an AvistaZ network tracker revokes download access"
+        />
       </div>
 
       <div className="border-t border-border" />
@@ -455,26 +397,19 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
           checked={draft.includeTrackerName}
           onChange={(v) => updateDraft({ includeTrackerName: v })}
         />
-        <Subtext>
-          Tracker names reveal which private trackers you use. Disable for maximum privacy.
-        </Subtext>
+        <Notice
+          variant="info"
+          message="Tracker names reveal which private trackers you use. Disable for maximum privacy."
+        />
       </div>
 
-      {/* Save / Discard bar — only visible when draft has changes */}
-      {dirty && (
-        <>
-          <div className="border-t border-border" />
-          <div className="flex items-center gap-3">
-            <Button size="sm" onClick={handleSave} disabled={saving}>
-              {saving ? "Saving..." : "Save Changes"}
-            </Button>
-            <Button size="sm" variant="ghost" onClick={handleDiscard} disabled={saving}>
-              Discard
-            </Button>
-            {saveError && <span className="text-xs font-mono text-danger">{saveError}</span>}
-          </div>
-        </>
-      )}
+      <SaveDiscardBar
+        dirty={dirty}
+        saving={saving}
+        onSave={handleSave}
+        onDiscard={handleDiscard}
+        error={saveError}
+      />
 
       <div className="border-t border-border" />
 
@@ -484,9 +419,9 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
           size="sm"
           variant="secondary"
           onClick={handleTestWebhook}
-          disabled={webhookStatus === "testing" || !target.hasConfig}
+          disabled={webhookStatus === "pending" || !target.hasConfig}
         >
-          {webhookStatus === "testing"
+          {webhookStatus === "pending"
             ? "Sending..."
             : webhookStatus === "success"
               ? "Sent"
@@ -500,24 +435,9 @@ function NotificationCard({ target, onSaved, onRemove }: NotificationCardProps)
 
         <div className="flex-1" />
 
-        {confirmRemove ? (
-          <div className="flex items-center gap-2">
-            <Button size="sm" variant="danger" onClick={() => onRemove(target.id)}>
-              Confirm Remove
-            </Button>
-            <Button size="sm" variant="ghost" onClick={() => setConfirmRemove(false)}>
-              Cancel
-            </Button>
-          </div>
-        ) : (
-          <Button size="sm" variant="danger" onClick={() => setConfirmRemove(true)}>
-            Remove
-          </Button>
-        )}
+        <ConfirmRemove onConfirm={() => onRemove(target.id)} />
       </div>
-      {webhookStatus === "failed" && webhookError && (
-        <p className="text-xs font-mono text-danger">{webhookError}</p>
-      )}
+      {webhookStatus === "failed" && webhookError && <Notice message={webhookError} />}
     </CollapsibleCard>
   )
 }
@@ -569,9 +489,9 @@ function AddNotificationForm({
   }
 
   return (
-    <Card elevation="raised" className="flex flex-col gap-4 !p-5">
+    <Card elevation="raised" className="flex flex-col gap-4">
       <H3>Add Notification Target</H3>
-      <div className="flex flex-col sm:flex-row gap-4 sm:items-end">
+      <div className="form-responsive-row">
         <div className="flex-1">
           <Input
             label="Name"
@@ -600,14 +520,15 @@ function AddNotificationForm({
         autoComplete="off"
         data-1p-ignore
       />
-      {error && <p className="text-sm font-mono text-danger">{error}</p>}
+      <Notice message={error} />
       <div className="flex items-center gap-3">
-        <Button size="sm" onClick={handleSubmit} disabled={!canSubmit || saving}>
-          {saving ? "Creating..." : "Create Target"}
-        </Button>
-        <Button size="sm" variant="ghost" onClick={onCancel}>
-          Cancel
-        </Button>
+        <Button
+          size="sm"
+          onClick={handleSubmit}
+          disabled={!canSubmit || saving}
+          text={saving ? "Creating..." : "Create Target"}
+        />
+        <Button size="sm" variant="ghost" onClick={onCancel} text="Cancel" />
       </div>
     </Card>
   )
@@ -618,52 +539,64 @@ function AddNotificationForm({
 // ---------------------------------------------------------------------------
 
 function NotificationTargets() {
-  const [targets, setTargets] = useState<NotificationTarget[]>([])
-  const [loading, setLoading] = useState(true)
+  const queryClient = useQueryClient()
   const [showAddForm, setShowAddForm] = useState(false)
 
-  const fetchTargets = useCallback(async () => {
-    try {
-      const res = await fetch("/api/notifications")
-      if (!res.ok) return
-      const data: NotificationTarget[] = await res.json()
-      setTargets(data)
-    } catch {
-      // silently fail
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchTargets()
-  }, [fetchTargets])
-
-  const handleSaved = useCallback((id: number, updated: NotificationTarget) => {
-    setTargets((prev) => prev.map((t) => (t.id === id ? updated : t)))
-  }, [])
+  const {
+    data: targets = [],
+    isLoading: loading,
+    error: loadError,
+  } = useQuery({
+    queryKey: ["notification-targets"],
+    queryFn: async ({ signal }) => {
+      const res = await fetch("/api/notifications", { signal })
+      if (!res.ok) throw new Error("Failed to load notification targets")
+      return res.json() as Promise<NotificationTarget[]>
+    },
+  })
+
+  const handleSaved = useCallback(
+    (id: number, updated: NotificationTarget) => {
+      queryClient.setQueryData<NotificationTarget[]>(["notification-targets"], (prev) =>
+        prev?.map((t) => (t.id === id ? updated : t))
+      )
+    },
+    [queryClient]
+  )
 
-  const handleRemove = useCallback(async (id: number) => {
-    try {
+  const handleRemove = useCallback(
+    async (id: number) => {
       const res = await fetch(`/api/notifications/${id}`, { method: "DELETE" })
       if (!res.ok) return
-      setTargets((prev) => prev.filter((t) => t.id !== id))
-    } catch {
-      // Network error — leave state unchanged
-    }
-  }, [])
+      queryClient.setQueryData<NotificationTarget[]>(["notification-targets"], (prev) =>
+        prev?.filter((t) => t.id !== id)
+      )
+    },
+    [queryClient]
+  )
 
   if (loading) {
-    return <p className="text-sm font-mono text-tertiary">Loading notification targets...</p>
+    return <CardListSkeleton count={2} />
+  }
+
+  if (loadError) {
+    return (
+      <Notice
+        message={
+          loadError instanceof Error ? loadError.message : "Failed to load notification targets"
+        }
+      />
+    )
   }
 
   return (
     <div className="flex flex-col gap-6">
       <H2 className="flex items-center gap-2">
         Webhooks
-        <Tooltip content="Get alerts when something happens on your trackers." docs={DOCS.WEBHOOKS}>
-          <span className="text-muted hover:text-secondary cursor-help text-sm">&#9432;</span>
-        </Tooltip>
+        <InfoTip
+          content="Get alerts when something happens on your trackers."
+          docs={DOCS.WEBHOOKS}
+        />
       </H2>
       {targets.length === 0 && !showAddForm ? (
         <Card elevation="raised" className="flex flex-col items-center gap-4 py-10">
@@ -676,9 +609,7 @@ function NotificationTargets() {
               Add a notification target to receive alerts when your tracker stats change.
             </Paragraph>
           </div>
-          <Button size="sm" onClick={() => setShowAddForm(true)}>
-            Add Notification Target
-          </Button>
+          <Button size="sm" onClick={() => setShowAddForm(true)} text="Add Notification Target" />
         </Card>
       ) : (
         <>
@@ -694,7 +625,7 @@ function NotificationTargets() {
             <AddNotificationForm
               onCreated={() => {
                 setShowAddForm(false)
-                fetchTargets()
+                queryClient.invalidateQueries({ queryKey: ["notification-targets"] })
               }}
               onCancel={() => setShowAddForm(false)}
             />
@@ -704,9 +635,8 @@ function NotificationTargets() {
               variant="secondary"
               className="self-start"
               onClick={() => setShowAddForm(true)}
-            >
-              + Add Notification Target
-            </Button>
+              text="+ Add Notification Target"
+            />
           )}
         </>
       )}
diff --git a/src/components/QbitmanageSettings.tsx b/src/components/QbitmanageSettings.tsx
index 34739120..43e77c83 100644
--- a/src/components/QbitmanageSettings.tsx
+++ b/src/components/QbitmanageSettings.tsx
@@ -1,18 +1,15 @@
 // src/components/QbitmanageSettings.tsx
-//
-// Functions: QbitmanageSettings
-
 "use client"
 
 import { Subtext } from "@typography"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
 import { Checkbox } from "@/components/ui/Checkbox"
 import { Input } from "@/components/ui/Input"
+import { SaveDiscardBar } from "@/components/ui/SaveDiscardBar"
 import { Toggle } from "@/components/ui/Toggle"
 import { DOCS } from "@/lib/constants"
-import { QBITMANAGE_TAG_DEFAULTS } from "@/lib/qbitmanage-defaults"
+import { QBITMANAGE_TAG_DEFAULTS } from "@/lib/download-clients/qbt/qbitmanage-defaults"
 import type { QbitmanageTagConfig } from "@/types/api"
 
 const QBITMANAGE_STATUSES = [
@@ -138,15 +135,14 @@ function QbitmanageSettings({ initialEnabled, initialTags }: QbitmanageSettingsP
             </div>
           ))}
 
-          <div className="flex flex-col gap-1.5 pt-2">
-            <div className="flex items-center gap-3">
-              <Button size="sm" onClick={handleSave} disabled={saving || !dirty}>
-                {saving ? "Saving..." : "Save"}
-              </Button>
-              {saved && <span className="text-xs font-mono text-success">Saved</span>}
-            </div>
-            {saveError && <span className="text-xs font-mono text-danger">{saveError}</span>}
-          </div>
+          <SaveDiscardBar
+            dirty={dirty}
+            saving={saving}
+            onSave={handleSave}
+            error={saveError}
+            success={saved ? "Saved" : null}
+            showDivider={false}
+          />
         </>
       )}
     </SettingsSection>
diff --git a/src/components/TagGroups.tsx b/src/components/TagGroups.tsx
index 9bdaff97..b6e5b51a 100644
--- a/src/components/TagGroups.tsx
+++ b/src/components/TagGroups.tsx
@@ -1,6 +1,6 @@
 // src/components/TagGroups.tsx
 //
-// Functions: TagGroups, AddTagGroupForm, TagGroupCard, SortableMemberRow, MemberRow, NewMemberRow
+// Functions: TagGroups, AddTagGroupForm, TagGroupCard, SortableMemberRow, MemberRow
 
 "use client"
 
@@ -12,17 +12,26 @@ import {
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable"
 import { CSS } from "@dnd-kit/utilities"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { H2, H3, Paragraph } from "@typography"
 import clsx from "clsx"
-import { type KeyboardEvent, useCallback, useEffect, useRef, useState } from "react"
-import { Button } from "@/components/ui/Button"
-import { Card } from "@/components/ui/Card"
-import { CollapsibleCard } from "@/components/ui/CollapsibleCard"
+import { type KeyboardEvent, useEffect, useRef, useState } from "react"
+import {
+  Button,
+  Card,
+  CardListSkeleton,
+  CollapsibleCard,
+  ConfirmRemove,
+  FilterPill,
+  InfoTip,
+  Input,
+  Notice,
+  Toggle,
+  Tooltip,
+} from "@/components/ui"
 import { EmojiPickerPopover } from "@/components/ui/EmojiPickerPopover"
-import { Input } from "@/components/ui/Input"
 import { QBT_TAG_WARN_PATTERN } from "@/components/ui/QbtTagWarning"
-import { Toggle } from "@/components/ui/Toggle"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { useEscapeKey } from "@/hooks/useEscapeKey"
 import { DOCS } from "@/lib/constants"
 import type { TagGroup, TagGroupChartType } from "@/types/api"
 
@@ -80,9 +89,10 @@ function AddTagGroupForm({ onCreated, onCancel }: AddTagGroupFormProps) {
     }
   }
 
+  useEscapeKey(onCancel, true)
+
   function handleKeyDown(e: KeyboardEvent) {
     if (e.key === "Enter") handleCreate()
-    if (e.key === "Escape") onCancel()
   }
 
   return (
@@ -90,9 +100,7 @@ function AddTagGroupForm({ onCreated, onCancel }: AddTagGroupFormProps) {
       <H3>New Tag Group</H3>
       <div className="flex items-end gap-3">
         <div className="flex flex-col gap-1">
-          <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-            Emoji
-          </span>
+          <H2 className="uppercase tracking-wider">Emoji</H2>
           <EmojiPickerPopover value={emoji} onChange={setEmoji} disabled={saving} />
         </div>
         <div className="flex-1">
@@ -113,37 +121,30 @@ function AddTagGroupForm({ onCreated, onCancel }: AddTagGroupFormProps) {
       </div>
 
       {/* Chart type selector */}
-      <div className="flex flex-col gap-1.5">
-        <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          Display Type
-        </span>
+      <div className="flex flex-col gap-2">
+        <H2 className="uppercase tracking-wider">Display Type</H2>
         <div className="nm-inset-sm p-1.5 flex gap-1 rounded-nm-md">
           {CHART_TYPE_OPTIONS.map((opt) => (
-            <button
+            <FilterPill
               key={opt.value}
-              type="button"
+              active={chartType === opt.value}
               onClick={() => setChartType(opt.value)}
               disabled={saving}
-              className={clsx(
-                "flex-1 px-3 py-1.5 text-xs font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-                chartType === opt.value
-                  ? "nm-raised-sm text-primary font-semibold"
-                  : "bg-transparent text-tertiary hover:text-secondary"
-              )}
-            >
-              {opt.label}
-            </button>
+              text={opt.label}
+              className="flex-1"
+            />
           ))}
         </div>
       </div>
 
       <div className="flex gap-2 justify-end">
-        <Button size="sm" variant="ghost" onClick={onCancel} disabled={saving}>
-          Cancel
-        </Button>
-        <Button size="sm" onClick={handleCreate} disabled={saving || !name.trim()}>
-          {saving ? "Creating…" : "Create"}
-        </Button>
+        <Button size="sm" variant="ghost" onClick={onCancel} disabled={saving} text="Cancel" />
+        <Button
+          size="sm"
+          onClick={handleCreate}
+          disabled={saving || !name.trim()}
+          text={saving ? "Creating…" : "Create"}
+        />
       </div>
     </Card>
   )
@@ -159,6 +160,7 @@ interface MemberRowProps {
   onRemove: () => void
   disabled?: boolean
   dragHandle?: boolean
+  isNew?: boolean
 }
 
 function MemberRow({
@@ -169,14 +171,23 @@ function MemberRow({
   onRemove,
   disabled,
   dragHandle,
+  isNew,
 }: MemberRowProps) {
-  const warn = tagWarning(tag)
+  const warn = tag ? tagWarning(tag) : null
   return (
     <div className="flex flex-col gap-1">
-      <div className="nm-inset-sm flex items-center gap-3 px-3 py-2 bg-control-bg rounded-nm-md">
-        {dragHandle && (
+      <div
+        className={clsx(
+          "nm-inset-sm flex items-center gap-3 px-3 py-2 bg-control-bg rounded-nm-md",
+          isNew && "border border-dashed border-border"
+        )}
+      >
+        {(dragHandle || isNew) && (
           <span
-            className="text-tertiary shrink-0 text-sm leading-none select-none cursor-grab active:cursor-grabbing"
+            className={clsx(
+              "shrink-0 text-sm leading-none select-none",
+              isNew ? "text-transparent" : "text-tertiary cursor-grab active:cursor-grabbing"
+            )}
             aria-hidden="true"
           >
             ⠿
@@ -189,7 +200,7 @@ function MemberRow({
             onChange={(e) => onTagChange(e.target.value)}
             placeholder="qbt-tag"
             disabled={disabled}
-            aria-label="qBT Tag"
+            aria-label={isNew ? "New qBT Tag" : "qBT Tag"}
           />
         </div>
         <div className="w-px h-4 bg-border shrink-0" />
@@ -200,7 +211,7 @@ function MemberRow({
             onChange={(e) => onLabelChange(e.target.value)}
             placeholder="Display Label"
             disabled={disabled}
-            aria-label="Display Label"
+            aria-label={isNew ? "New Display Label" : "Display Label"}
           />
         </div>
         <button
@@ -213,7 +224,7 @@ function MemberRow({
           ✕
         </button>
       </div>
-      {warn && <p className="text-xs font-sans text-warn px-1">{warn}</p>}
+      <Notice variant="warn" message={warn} className="px-1" />
     </div>
   )
 }
@@ -235,78 +246,13 @@ function SortableMemberRow({ sortId, ...props }: SortableMemberRowProps) {
   )
 }
 
-// ─── NewMemberRow (always visible) ────────────────────────────────────────────
-
-interface NewMemberRowProps {
-  tag: string
-  label: string
-  onTagChange: (v: string) => void
-  onLabelChange: (v: string) => void
-  onRemove: () => void
-  disabled?: boolean
-}
-
-function NewMemberRow({
-  tag,
-  label,
-  onTagChange,
-  onLabelChange,
-  onRemove,
-  disabled,
-}: NewMemberRowProps) {
-  const warn = tag ? tagWarning(tag) : null
-
-  return (
-    <div className="flex flex-col gap-1">
-      <div className="nm-inset-sm flex items-center gap-3 px-3 py-2 bg-control-bg border border-dashed border-border rounded-nm-md">
-        <span
-          className="text-transparent shrink-0 text-sm leading-none select-none"
-          aria-hidden="true"
-        >
-          ⠿
-        </span>
-        <div className="flex-1 min-w-0">
-          <input
-            className="w-full font-mono text-sm text-primary bg-transparent focus:outline-none placeholder:text-muted disabled:opacity-40"
-            value={tag}
-            onChange={(e) => onTagChange(e.target.value)}
-            placeholder="qbt-tag"
-            disabled={disabled}
-            aria-label="New qBT Tag"
-          />
-        </div>
-        <div className="w-px h-4 bg-border shrink-0" />
-        <div className="flex-1 min-w-0">
-          <input
-            className="w-full font-mono text-sm text-primary bg-transparent focus:outline-none placeholder:text-muted disabled:opacity-40"
-            value={label}
-            onChange={(e) => onLabelChange(e.target.value)}
-            placeholder="Display Label"
-            disabled={disabled}
-            aria-label="New Display Label"
-          />
-        </div>
-        <button
-          type="button"
-          onClick={onRemove}
-          disabled={disabled}
-          className="shrink-0 text-tertiary hover:text-danger transition-colors duration-150 disabled:opacity-40 disabled:cursor-not-allowed text-base leading-none"
-          aria-label="Remove row"
-        >
-          ✕
-        </button>
-      </div>
-      {warn && <p className="text-xs font-sans text-warn px-1">{warn}</p>}
-    </div>
-  )
-}
-
 // ─── TagGroupCard ─────────────────────────────────────────────────────────────
 
 interface EditableMember {
   id: number | null
   tag: string
   label: string
+  _clientId?: number
 }
 
 interface TagGroupCardProps {
@@ -324,16 +270,14 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
   const [members, setMembers] = useState<EditableMember[]>(
     group.members.map((m) => ({ id: m.id, tag: m.tag, label: m.label }))
   )
+  const nextClientId = useRef(0)
   const [saving, setSaving] = useState(false)
   const [saveError, setSaveError] = useState<string | null>(null)
   const [deleting, setDeleting] = useState(false)
   const [deleteError, setDeleteError] = useState<string | null>(null)
-  const [confirmDelete, setConfirmDelete] = useState(false)
 
   // Sync from parent when group prop changes (e.g. after save + refetch)
-  const groupIdRef = useRef(group.id)
   useEffect(() => {
-    if (groupIdRef.current !== group.id) groupIdRef.current = group.id
     setName(group.name)
     setEmoji(group.emoji ?? "")
     setChartType(group.chartType)
@@ -357,7 +301,8 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
   })()
 
   function handleAddRow() {
-    setMembers((prev) => [...prev, { id: null, tag: "", label: "" }])
+    const clientId = ++nextClientId.current
+    setMembers((prev) => [...prev, { id: null, tag: "", label: "", _clientId: clientId }])
   }
 
   function handleRemoveMember(index: number) {
@@ -381,7 +326,26 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
     setSaving(true)
     setSaveError(null)
     try {
-      await fetch(`/api/tag-groups/${group.id}`, {
+      const currentIds = new Set(members.filter((m) => m.id !== null).map((m) => m.id))
+      const removes = group.members.filter((m) => !currentIds.has(m.id)).map((m) => m.id)
+
+      const updates: { id: number; tag: string; label: string; sortOrder: number }[] = []
+      const creates: { tag: string; label: string; sortOrder: number }[] = []
+
+      for (let i = 0; i < members.length; i++) {
+        const m = members[i]
+        if (m.id !== null) {
+          const orig = group.members.find((om) => om.id === m.id)
+          const origIndex = group.members.findIndex((om) => om.id === m.id)
+          if (orig && (m.tag !== orig.tag || m.label !== orig.label || i !== origIndex)) {
+            updates.push({ id: m.id, tag: m.tag.trim(), label: m.label.trim(), sortOrder: i })
+          }
+        } else if (m.tag.trim() && m.label.trim()) {
+          creates.push({ tag: m.tag.trim(), label: m.label.trim(), sortOrder: i })
+        }
+      }
+
+      const res = await fetch(`/api/tag-groups/${group.id}`, {
         method: "PATCH",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
@@ -389,40 +353,12 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
           emoji: emoji.trim() || null,
           chartType,
           countUnmatched,
+          members: { removes, updates, creates },
         }),
-      }).then((r) => {
-        if (!r.ok) throw new Error("Failed to save group")
       })
-
-      const currentIds = new Set(members.filter((m) => m.id !== null).map((m) => m.id))
-      const removedMembers = group.members.filter((m) => !currentIds.has(m.id))
-      for (const rm of removedMembers) {
-        await fetch(`/api/tag-groups/${group.id}/members/${rm.id}`, { method: "DELETE" })
-      }
-
-      for (let i = 0; i < members.length; i++) {
-        const m = members[i]
-        if (m.id === null) continue
-        const orig = group.members.find((om) => om.id === m.id)
-        const origIndex = group.members.findIndex((om) => om.id === m.id)
-        if (orig && (m.tag !== orig.tag || m.label !== orig.label || i !== origIndex)) {
-          await fetch(`/api/tag-groups/${group.id}/members/${m.id}`, {
-            method: "PATCH",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ tag: m.tag.trim(), label: m.label.trim(), sortOrder: i }),
-          })
-        }
-      }
-
-      for (let i = 0; i < members.length; i++) {
-        const m = members[i]
-        if (m.id !== null) continue
-        if (!m.tag.trim() || !m.label.trim()) continue
-        await fetch(`/api/tag-groups/${group.id}/members`, {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ tag: m.tag.trim(), label: m.label.trim(), sortOrder: i }),
-        })
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({ error: "Save failed" }))
+        throw new Error((data as { error?: string }).error ?? "Save failed")
       }
 
       onUpdated()
@@ -442,12 +378,13 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
     setSaveError(null)
   }
 
+  useEscapeKey(() => {
+    setName(group.name)
+    setEditingName(false)
+  }, editingName)
+
   function handleNameKeyDown(e: KeyboardEvent) {
     if (e.key === "Enter") setEditingName(false)
-    if (e.key === "Escape") {
-      setName(group.name)
-      setEditingName(false)
-    }
   }
 
   async function handleDelete() {
@@ -526,30 +463,20 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
       {/* Emoji + display type row */}
       <div className="flex items-end gap-4 mb-1">
         <div className="flex flex-col gap-1">
-          <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-            Emoji
-          </span>
+          <H2 className="uppercase tracking-wider">Emoji</H2>
           <EmojiPickerPopover value={emoji} onChange={setEmoji} />
         </div>
         <div className="flex flex-col gap-1 flex-1">
-          <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-            Display Type
-          </span>
+          <H2 className="uppercase tracking-wider">Display Type</H2>
           <div className="nm-inset-sm p-1.5 flex gap-1 rounded-nm-md">
             {CHART_TYPE_OPTIONS.map((opt) => (
-              <button
+              <FilterPill
                 key={opt.value}
-                type="button"
+                active={chartType === opt.value}
                 onClick={() => setChartType(opt.value)}
-                className={clsx(
-                  "flex-1 px-3 py-1.5 text-xs font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-                  chartType === opt.value
-                    ? "nm-raised-sm text-primary font-semibold"
-                    : "bg-transparent text-tertiary hover:text-secondary"
-                )}
-              >
-                {opt.label}
-              </button>
+                text={opt.label}
+                className="flex-1"
+              />
             ))}
           </div>
         </div>
@@ -566,13 +493,9 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
       {/* Column headers */}
       <div className="flex items-center gap-3 px-3">
         <span className="shrink-0 text-sm leading-none w-4" aria-hidden="true" />
-        <span className="flex-1 text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          qBT Tag
-        </span>
+        <H2 className="flex-1 uppercase tracking-wider">qBT Tag</H2>
         <div className="w-px h-3" />
-        <span className="flex-1 text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          Display Label
-        </span>
+        <H2 className="flex-1 uppercase tracking-wider">Display Label</H2>
         <span className="w-4" aria-hidden="true" />
       </div>
 
@@ -596,7 +519,7 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
                 disabled={saving}
               />
             ) : (
-              <NewMemberRow
+              <MemberRow
                 key={sortIds[i]}
                 tag={m.tag}
                 label={m.label}
@@ -608,6 +531,7 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
                 }
                 onRemove={() => handleRemoveMember(i)}
                 disabled={saving}
+                isNew
               />
             )
           )}
@@ -627,53 +551,33 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
       <div className="border-t border-border mt-1" />
 
       {/* Footer: Delete + Save */}
-      {saveError && (
-        <p className="text-xs font-sans text-danger px-1" role="alert">
-          {saveError}
-        </p>
-      )}
-      {deleteError && (
-        <p className="text-xs font-sans text-danger px-1" role="alert">
-          {deleteError}
-        </p>
-      )}
+      <Notice message={saveError} className="px-1" />
+      <Notice message={deleteError} className="px-1" />
       <div className="flex items-center justify-between gap-3">
-        <div>
-          {confirmDelete ? (
-            <div className="flex items-center gap-2">
-              <span className="text-xs font-sans text-warn">Delete this group?</span>
-              <Button size="sm" variant="danger" onClick={handleDelete} disabled={deleting}>
-                {deleting ? "Deleting…" : "Confirm"}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => setConfirmDelete(false)}
-                disabled={deleting}
-              >
-                Cancel
-              </Button>
-            </div>
-          ) : (
+        <ConfirmRemove
+          label="Delete Group"
+          confirmLabel={deleting ? "Deleting…" : "Confirm"}
+          variant="ghost"
+          className="text-danger hover:text-danger"
+          busy={deleting}
+          onConfirm={handleDelete}
+        />
+        <div className="flex items-center gap-2">
+          {isDirty && (
             <Button
               size="sm"
               variant="ghost"
-              onClick={() => setConfirmDelete(true)}
-              className="text-danger hover:text-danger"
-            >
-              Delete Group
-            </Button>
-          )}
-        </div>
-        <div className="flex items-center gap-2">
-          {isDirty && (
-            <Button size="sm" variant="ghost" onClick={handleDiscard} disabled={saving}>
-              Discard
-            </Button>
+              onClick={handleDiscard}
+              disabled={saving}
+              text="Discard"
+            />
           )}
-          <Button size="sm" onClick={handleSave} disabled={saving || !isDirty || !name.trim()}>
-            {saving ? "Saving…" : "Save"}
-          </Button>
+          <Button
+            size="sm"
+            onClick={handleSave}
+            disabled={saving || !isDirty || !name.trim()}
+            text={saving ? "Saving…" : "Save"}
+          />
         </div>
       </div>
     </CollapsibleCard>
@@ -681,40 +585,35 @@ function TagGroupCard({ group, onUpdated }: TagGroupCardProps) {
 }
 
 function sortKey(m: EditableMember, i: number): string {
-  return m.id !== null ? `member-${m.id}` : `new-${i}`
+  return m.id !== null ? `member-${m.id}` : `new-${m._clientId ?? i}`
 }
 
 // ─── TagGroups ────────────────────────────────────────────────────────────────
 
 function TagGroups() {
-  const [groups, setGroups] = useState<TagGroup[]>([])
-  const [loading, setLoading] = useState(true)
+  const queryClient = useQueryClient()
   const [showAddForm, setShowAddForm] = useState(false)
 
-  const fetchGroups = useCallback(async () => {
-    try {
-      const res = await fetch("/api/tag-groups")
+  const {
+    data: groups = [],
+    isLoading: loading,
+    error: loadError,
+  } = useQuery({
+    queryKey: ["tag-groups"],
+    queryFn: async ({ signal }) => {
+      const res = await fetch("/api/tag-groups", { signal })
       if (!res.ok) throw new Error("Failed to load tag groups")
-      const data: TagGroup[] = await res.json()
-      setGroups(data)
-    } catch {
-      // Non-critical — list just won't populate
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchGroups()
-  }, [fetchGroups])
+      return res.json() as Promise<TagGroup[]>
+    },
+  })
 
   function handleCreated() {
     setShowAddForm(false)
-    fetchGroups()
+    queryClient.invalidateQueries({ queryKey: ["tag-groups"] })
   }
 
   function handleUpdated() {
-    fetchGroups()
+    queryClient.invalidateQueries({ queryKey: ["tag-groups"] })
   }
 
   return (
@@ -722,17 +621,18 @@ function TagGroups() {
       <div className="flex items-center justify-between mb-2">
         <H2 id="tag-groups-heading" className="flex items-center gap-2">
           Tag Groups
-          <Tooltip
+          <InfoTip
             content="Create tag groups to visualize your qBittorrent tags as charts."
             docs={DOCS.TAG_GROUPS}
-          >
-            <span className="text-muted hover:text-secondary cursor-help text-sm">&#9432;</span>
-          </Tooltip>
+          />
         </H2>
         {!showAddForm && (
-          <Button size="sm" variant="secondary" onClick={() => setShowAddForm(true)}>
-            + New Group
-          </Button>
+          <Button
+            size="sm"
+            variant="secondary"
+            onClick={() => setShowAddForm(true)}
+            text="+ New Group"
+          />
         )}
       </div>
 
@@ -746,7 +646,11 @@ function TagGroups() {
       )}
 
       {loading ? (
-        <p className="text-sm font-mono text-tertiary py-4">Loading…</p>
+        <CardListSkeleton count={2} />
+      ) : loadError ? (
+        <Notice
+          message={loadError instanceof Error ? loadError.message : "Failed to load tag groups"}
+        />
       ) : groups.length === 0 && !showAddForm ? (
         <p className="text-sm font-mono text-muted py-8 text-center">No tag groups yet</p>
       ) : (
diff --git a/src/components/TrackerHubStatus.tsx b/src/components/TrackerHubStatus.tsx
index 2da7cec1..037977da 100644
--- a/src/components/TrackerHubStatus.tsx
+++ b/src/components/TrackerHubStatus.tsx
@@ -109,7 +109,7 @@ function TrackerHubStatus({
   const trackerHubUrl = `${TRACKERHUB_HISTORY}/${trackerHubSlug}`
 
   return (
-    <div className="nm-inset-sm bg-control-bg flex flex-col px-4 py-3.5 min-w-[320px] max-w-xl rounded-nm-md">
+    <div className="nm-inset-sm bg-control-bg flex flex-col px-4 py-3.5 min-w-80 max-w-xl rounded-nm-md">
       {/* Header row — always visible */}
       <div className="flex items-center justify-between gap-6 w-full">
         <button
@@ -165,7 +165,7 @@ function TrackerHubStatus({
       <div
         className={clsx(
           "overflow-hidden transition-[max-height,opacity] duration-300 ease-in-out",
-          expanded ? "max-h-[500px] opacity-100" : "max-h-0 opacity-0"
+          expanded ? "max-h-125 opacity-100" : "max-h-0 opacity-0"
         )}
       >
         <div className="flex flex-col gap-2.5 mt-2.5">
@@ -211,7 +211,7 @@ function TrackerHubStatus({
                 height={12}
                 aria-hidden="true"
               />
-              <span className="text-[10px] font-mono">Powered by TrackerHub</span>
+              <span className="text-3xs font-mono">Powered by TrackerHub</span>
             </a>
           </div>
         </div>
diff --git a/src/components/TrackerSettingsDialog.tsx b/src/components/TrackerSettingsSheet.tsx
similarity index 60%
rename from src/components/TrackerSettingsDialog.tsx
rename to src/components/TrackerSettingsSheet.tsx
index 21df8056..b6c04cbf 100644
--- a/src/components/TrackerSettingsDialog.tsx
+++ b/src/components/TrackerSettingsSheet.tsx
@@ -1,24 +1,29 @@
-// src/components/TrackerSettingsDialog.tsx
-//
-// Functions: TrackerSettingsDialog
-
+// src/components/TrackerSettingsSheet.tsx
 "use client"
 
+import { H2 } from "@typography"
 import clsx from "clsx"
 import { useRouter } from "next/navigation"
 import { type SyntheticEvent, useCallback, useEffect, useState } from "react"
-import { Button } from "@/components/ui/Button"
+import {
+  Button,
+  ConfirmRemove,
+  InfoTip,
+  Input,
+  MaskedSecret,
+  Notice,
+  QbtTagWarning,
+  Sheet,
+  Toggle,
+} from "@/components/ui"
 import { ColorPicker } from "@/components/ui/ColorPicker"
-import { Input } from "@/components/ui/Input"
-import { MaskedSecret } from "@/components/ui/MaskedSecret"
-import { QbtTagWarning } from "@/components/ui/QbtTagWarning"
-import { Sheet } from "@/components/ui/Sheet"
-import { Toggle } from "@/components/ui/Toggle"
-import { Tooltip } from "@/components/ui/Tooltip"
+
 import { findRegistryEntry } from "@/data/tracker-registry"
+import { DOCS } from "@/lib/constants"
+import { localDateStr } from "@/lib/formatters"
 import type { TrackerSummary } from "@/types/api"
 
-interface TrackerSettingsDialogProps {
+interface TrackerSettingsSheetProps {
   open: boolean
   tracker: TrackerSummary
   onClose: () => void
@@ -51,7 +56,7 @@ function formStateFromTracker(t: TrackerSummary): FormState {
   }
 }
 
-function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSettingsDialogProps) {
+function TrackerSettingsSheet({ open, tracker, onClose, onUpdated }: TrackerSettingsSheetProps) {
   const router = useRouter()
 
   const [form, setForm] = useState<FormState>(() => formStateFromTracker(tracker))
@@ -79,18 +84,22 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
 
   const [changingKey, setChangingKey] = useState(false)
   const [newApiToken, setNewApiToken] = useState("")
+  const [editAvistazUsername, setEditAvistazUsername] = useState("")
+  const [editAvistazCookies, setEditAvistazCookies] = useState("")
+  const [editDcCookies, setEditDcCookies] = useState("")
 
   const [errors, setErrors] = useState<Record<string, string>>({})
   const [saving, setSaving] = useState(false)
-  const [confirmDelete, setConfirmDelete] = useState(false)
   const [deleting, setDeleting] = useState(false)
 
   const resetTransientState = useCallback(() => {
     setChangingKey(false)
     setNewApiToken("")
+    setEditAvistazUsername("")
+    setEditAvistazCookies("")
+    setEditDcCookies("")
     setErrors({})
     setSaving(false)
-    setConfirmDelete(false)
     setDeleting(false)
   }, [])
 
@@ -113,7 +122,18 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
         validationErrors.baseUrl = "Invalid URL"
       }
     }
-    if (changingKey && !newApiToken.trim()) {
+    if (changingKey && tracker.platformType === "digitalcore") {
+      const trimmed = editDcCookies.trim()
+      if (!trimmed) {
+        validationErrors.apiToken = "Session cookies are required"
+      } else {
+        const hasUid = /(?:^|;\s*)uid=([^;]+)/.test(trimmed)
+        const hasPass = /(?:^|;\s*)pass=([^;]+)/.test(trimmed)
+        if (!hasUid || !hasPass) {
+          validationErrors.apiToken = "Cookie string must contain both uid and pass values"
+        }
+      }
+    } else if (changingKey && tracker.platformType !== "avistaz" && !newApiToken.trim()) {
       validationErrors.apiToken = "API token cannot be empty"
     }
 
@@ -125,12 +145,38 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
     setErrors({})
     setSaving(true)
 
-    const trimmedToken = newApiToken.trim()
+    let trimmedToken = newApiToken.trim()
+
+    if (changingKey && tracker.platformType === "avistaz") {
+      if (!editAvistazUsername.trim() || !editAvistazCookies.trim()) {
+        setErrors({ apiToken: "Username and cookies are required" })
+        setSaving(false)
+        return
+      }
+      trimmedToken = JSON.stringify({
+        cookies: editAvistazCookies.trim(),
+        userAgent: navigator.userAgent,
+        username: editAvistazUsername.trim(),
+      })
+    } else if (changingKey && tracker.platformType === "digitalcore") {
+      const trimmed = editDcCookies.trim()
+      const uidMatch = trimmed.match(/(?:^|;\s*)uid=([^;]+)/)
+      const passMatch = trimmed.match(/(?:^|;\s*)pass=([^;]+)/)
+      if (!uidMatch || !passMatch) {
+        setErrors({ apiToken: "Cookie string must contain both uid and pass values" })
+        setSaving(false)
+        return
+      }
+      trimmedToken = JSON.stringify({
+        uid: uidMatch[1].trim(),
+        pass: passMatch[1].trim(),
+      })
+    }
 
     // Test the new API key before saving
     if (changingKey && trimmedToken) {
       try {
-        const testRes = await fetch("/api/trackers/test", {
+        const testRes = await fetch("/api/trackers/test-connection", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
@@ -145,6 +191,16 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
           setSaving(false)
           return
         }
+        if (tracker.platformType === "avistaz") {
+          const testJson = await testRes.json().catch(() => ({}))
+          if ((testJson as Record<string, unknown>).capturedUserAgent) {
+            trimmedToken = JSON.stringify({
+              cookies: editAvistazCookies.trim(),
+              userAgent: (testJson as Record<string, string>).capturedUserAgent,
+              username: editAvistazUsername.trim(),
+            })
+          }
+        }
       } catch {
         setErrors({ apiToken: "Could not verify API key — check your connection" })
         setSaving(false)
@@ -232,7 +288,7 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
   }
 
   return (
-    <Sheet open={open} onClose={handleClose} title="Tracker Settings">
+    <Sheet open={open} onClose={handleClose} title="Tracker Settings" busy={saving || deleting}>
       <div className="flex flex-col p-6 pb-8 gap-5">
         {/* Form */}
         <form onSubmit={handleSave} className="flex flex-col gap-4">
@@ -254,10 +310,88 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
 
           {/* API Key — show status or change input */}
           <div className="flex flex-col gap-1">
-            <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-              API Key
-            </span>
-            {changingKey ? (
+            <H2 className="uppercase tracking-wider">API Key</H2>
+            {changingKey && tracker.platformType === "avistaz" ? (
+              <div className="flex flex-col gap-2">
+                <Input
+                  label="Username"
+                  autoComplete="off"
+                  data-1p-ignore
+                  value={editAvistazUsername}
+                  onChange={(e) => setEditAvistazUsername(e.target.value)}
+                  placeholder="Your username on this tracker"
+                />
+                <div className="flex flex-col gap-1">
+                  <label
+                    htmlFor="edit-avistaz-cookies"
+                    className="text-xs uppercase tracking-wider text-secondary font-mono"
+                  >
+                    Browser Cookies
+                  </label>
+                  <textarea
+                    id="edit-avistaz-cookies"
+                    autoComplete="off"
+                    data-1p-ignore
+                    value={editAvistazCookies}
+                    onChange={(e) => setEditAvistazCookies(e.target.value)}
+                    placeholder="Paste Cookie header from DevTools"
+                    rows={3}
+                    className="w-full rounded-nm-sm bg-control-bg px-3 py-2 text-sm text-primary border border-transparent focus:border-accent focus:outline-none font-mono resize-y"
+                  />
+                </div>
+                <Notice message={errors.apiToken} />
+                <Button
+                  variant="minimal"
+                  size="sm"
+                  text="Cancel"
+                  className="self-start"
+                  onClick={() => {
+                    setChangingKey(false)
+                    setEditAvistazUsername("")
+                    setEditAvistazCookies("")
+                    setErrors({})
+                  }}
+                />
+              </div>
+            ) : changingKey && tracker.platformType === "digitalcore" ? (
+              <div className="flex flex-col gap-2">
+                <div className="flex items-center gap-1">
+                  <label
+                    htmlFor="edit-dc-cookies"
+                    className="text-xs uppercase tracking-wider text-secondary font-sans font-medium"
+                  >
+                    Session Cookies
+                  </label>
+                  <InfoTip
+                    content="Open DevTools (F12) → Network → any request → copy the Cookie header value."
+                    size="sm"
+                    docs={DOCS.ADDING_A_TRACKER}
+                  />
+                </div>
+                <textarea
+                  id="edit-dc-cookies"
+                  autoComplete="off"
+                  data-1p-ignore
+                  value={editDcCookies}
+                  onChange={(e) => setEditDcCookies(e.target.value)}
+                  placeholder="uid=56954; pass=abc123def456..."
+                  rows={2}
+                  className="w-full font-mono text-sm text-primary bg-control-bg rounded-nm-md px-4 py-3 placeholder:text-muted nm-inset focus:outline-none focus:nm-inset border-0 resize-y"
+                />
+                <Notice message={errors.apiToken} />
+                <Button
+                  variant="minimal"
+                  size="sm"
+                  text="Cancel"
+                  className="self-start"
+                  onClick={() => {
+                    setChangingKey(false)
+                    setEditDcCookies("")
+                    setErrors({})
+                  }}
+                />
+              </div>
+            ) : changingKey ? (
               <div className="flex flex-col gap-2">
                 <Input
                   type="password"
@@ -268,17 +402,19 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
                   placeholder="Paste API token"
                   error={errors.apiToken}
                 />
-                <button
-                  type="button"
+                <Button
+                  variant="minimal"
+                  size="sm"
+                  text="Cancel"
+                  className="self-start"
                   onClick={() => {
                     setChangingKey(false)
                     setNewApiToken("")
+                    setEditAvistazUsername("")
+                    setEditAvistazCookies("")
                     setErrors({})
                   }}
-                  className="text-xs font-mono text-tertiary hover:text-secondary transition-colors cursor-pointer self-start"
-                >
-                  Cancel
-                </button>
+                />
               </div>
             ) : (
               <MaskedSecret onChangeClick={() => setChangingKey(true)} />
@@ -303,21 +439,25 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
                 onChange={(e) => updateField("mouseholeUrl", e.target.value)}
                 placeholder="http://localhost:7001"
               />
-              <Tooltip
+              <InfoTip
                 content="If you run Mousehole to manage your MAM seedbox IP, enter its URL here to see status and trigger updates from Tracker Tracker."
+                size="sm"
                 docs={{
                   href: "https://github.com/t-mart/mousehole",
                   description: "Mousehole on GitHub",
                 }}
-              >
-                <span className="text-muted hover:text-secondary cursor-help text-xs">&#9432;</span>
-              </Tooltip>
+              />
             </div>
           )}
 
           <ColorPicker label="Color" value={form.color} onChange={(v) => updateField("color", v)} />
 
-          {!(registryEntry?.gazelleEnrich || tracker.platformType === "ggn") && (
+          {!(
+            registryEntry?.gazelleEnrich ||
+            tracker.platformType === "ggn" ||
+            tracker.platformType === "avistaz" ||
+            tracker.platformType === "digitalcore"
+          ) && (
             <div>
               <label
                 htmlFor="settings-joined-at"
@@ -329,7 +469,7 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
                 id="settings-joined-at"
                 type="date"
                 value={form.joinedAt}
-                max={new Date().toISOString().split("T")[0]}
+                max={localDateStr()}
                 onChange={(e) => updateField("joinedAt", e.target.value)}
                 className={clsx(
                   "w-full font-mono text-sm text-primary cursor-pointer border-0",
@@ -369,20 +509,12 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
             />
           )}
 
-          {errors.form && (
-            <p className="text-xs font-sans text-danger" role="alert">
-              {errors.form}
-            </p>
-          )}
+          <Notice message={errors.form} />
 
           {/* Save / Cancel */}
           <div className="flex gap-3 pt-1 justify-end">
-            <Button type="button" variant="ghost" onClick={handleClose}>
-              Cancel
-            </Button>
-            <Button type="submit" disabled={saving}>
-              {saving ? "Saving..." : "Save Changes"}
-            </Button>
+            <Button variant="ghost" onClick={handleClose} text="Cancel" />
+            <Button type="submit" disabled={saving} text={saving ? "Saving..." : "Save Changes"} />
           </div>
         </form>
 
@@ -394,45 +526,20 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
 
           <div className="flex items-center gap-3">
             <Button
-              type="button"
               variant="secondary"
               size="sm"
               onClick={handleArchive}
               disabled={saving}
-            >
-              {tracker.isActive ? "Archive" : "Reactivate"}
-            </Button>
+              text={tracker.isActive ? "Archive" : "Reactivate"}
+            />
 
-            {confirmDelete ? (
-              <div className="flex items-center gap-2">
-                <Button
-                  type="button"
-                  variant="danger"
-                  size="sm"
-                  onClick={handleDelete}
-                  disabled={deleting}
-                >
-                  {deleting ? "Deleting..." : "Confirm Delete"}
-                </Button>
-                <Button
-                  type="button"
-                  variant="ghost"
-                  size="sm"
-                  onClick={() => setConfirmDelete(false)}
-                >
-                  Cancel
-                </Button>
-              </div>
-            ) : (
-              <Button
-                type="button"
-                variant="danger"
-                size="sm"
-                onClick={() => setConfirmDelete(true)}
-              >
-                Delete
-              </Button>
-            )}
+            <ConfirmRemove
+              label="Delete"
+              confirmLabel="Confirm Delete"
+              busyLabel="Deleting..."
+              busy={deleting}
+              onConfirm={handleDelete}
+            />
           </div>
         </div>
       </div>
@@ -440,4 +547,4 @@ function TrackerSettingsDialog({ open, tracker, onClose, onUpdated }: TrackerSet
   )
 }
 
-export { TrackerSettingsDialog }
+export { TrackerSettingsSheet }
diff --git a/src/components/TwoFactorSetup.tsx b/src/components/TwoFactorSetup.tsx
index a14f04f4..d7a652c9 100644
--- a/src/components/TwoFactorSetup.tsx
+++ b/src/components/TwoFactorSetup.tsx
@@ -1,16 +1,12 @@
 // src/components/TwoFactorSetup.tsx
-//
-// Functions: TwoFactorSetup
-
 "use client"
 
 import { H3, Paragraph, Subtext } from "@typography"
-import { QRCodeSVG } from "qrcode.react"
+import dynamic from "next/dynamic"
 import { useCallback, useEffect, useState } from "react"
-import { Badge } from "@/components/ui/Badge"
-import { Button } from "@/components/ui/Button"
-import { Checkbox } from "@/components/ui/Checkbox"
-import { Input } from "@/components/ui/Input"
+import { Badge, Button, Checkbox, Input, Notice } from "@/components/ui"
+
+const QRCodeSVG = dynamic(() => import("qrcode.react").then((m) => m.QRCodeSVG), { ssr: false })
 
 // ---------------------------------------------------------------------------
 // Types
@@ -251,15 +247,9 @@ function TwoFactorSetup() {
             Add a second layer of security to your login. You&apos;ll need an authenticator app like
             Google Authenticator, Authy, or 1Password.
           </Paragraph>
-          {error && (
-            <p className="text-xs font-sans text-danger" role="alert">
-              {error}
-            </p>
-          )}
+          <Notice message={error} />
           <div>
-            <Button size="sm" onClick={handleStartSetup}>
-              Enable 2FA
-            </Button>
+            <Button size="sm" onClick={handleStartSetup} text="Enable 2FA" />
           </div>
         </>
       )}
@@ -291,13 +281,14 @@ function TwoFactorSetup() {
                 <code className="font-mono text-xs text-primary bg-control-bg nm-inset-sm px-3 py-2 tracking-wider select-all rounded-nm-sm">
                   {setupData.secret}
                 </code>
-                <button
-                  type="button"
+                <Button
+                  variant="minimal"
+                  size="sm"
                   onClick={handleCopySecret}
-                  className="text-xs font-sans text-tertiary hover:text-primary transition-colors cursor-pointer"
+                  className="hover:text-primary"
                 >
-                  {copiedSecret ? "Copied" : "Copy"}
-                </button>
+                  {copiedSecret ? "Copied!" : "Copy secret"}
+                </Button>
               </div>
             </div>
           </div>
@@ -340,9 +331,7 @@ function TwoFactorSetup() {
             >
               {step === "confirming" ? "Verifying..." : "Confirm"}
             </Button>
-            <Button size="sm" variant="ghost" onClick={handleCancel}>
-              Cancel
-            </Button>
+            <Button size="sm" variant="ghost" onClick={handleCancel} text="Cancel" />
           </div>
         </div>
       )}
@@ -364,15 +353,18 @@ function TwoFactorSetup() {
           </div>
 
           <div className="flex items-center gap-3">
-            <Button size="sm" variant="secondary" onClick={handleCopyAll}>
-              {copied ? "Copied" : "Copy All"}
-            </Button>
+            <Button
+              size="sm"
+              variant="secondary"
+              onClick={handleCopyAll}
+              text={copied ? "Copied" : "Copy All"}
+            />
           </div>
 
-          <p className="text-xs font-sans leading-relaxed text-warn">
-            Save these codes somewhere safe. Each code can only be used once. You won&apos;t be able
-            to see them again.
-          </p>
+          <Notice
+            variant="warn"
+            message="Save these codes somewhere safe. Each code can only be used once. You won't be able to see them again."
+          />
 
           <div>
             <Button
@@ -407,9 +399,8 @@ function TwoFactorSetup() {
                 setError(null)
                 setUseBackupCode(false)
               }}
-            >
-              Disable 2FA
-            </Button>
+              text="Disable 2FA"
+            />
           </div>
         </>
       )}
@@ -476,22 +467,20 @@ function TwoFactorSetup() {
             >
               {step === "disabling" ? "Disabling..." : "Confirm Disable"}
             </Button>
-            <Button size="sm" variant="ghost" onClick={handleCancelDisable}>
-              Cancel
-            </Button>
+            <Button size="sm" variant="ghost" onClick={handleCancelDisable} text="Cancel" />
           </div>
 
-          <button
-            type="button"
+          <Button
+            variant="minimal"
+            size="sm"
+            className="self-start"
             onClick={() => {
               setUseBackupCode(!useBackupCode)
               setDisableCode("")
               setError(null)
             }}
-            className="text-xs font-sans text-tertiary hover:text-secondary transition-colors cursor-pointer self-start"
-          >
-            {useBackupCode ? "Use authenticator code instead" : "Use a backup code instead"}
-          </button>
+            text={useBackupCode ? "Use authenticator code instead" : "Use a backup code instead"}
+          />
         </div>
       )}
     </div>
diff --git a/src/components/charts/BufferCandlestickChart.tsx b/src/components/charts/BufferCandlestickChart.tsx
index 69212f4e..012dc555 100644
--- a/src/components/charts/BufferCandlestickChart.tsx
+++ b/src/components/charts/BufferCandlestickChart.tsx
@@ -1,13 +1,11 @@
 // src/components/charts/BufferCandlestickChart.tsx
-//
-// Functions: computeCandlestickData, buildCandlestickOption, BufferCandlestickChart
-
 "use client"
 
 import type { CandlestickSeriesOption, EChartsOption } from "echarts"
-import { bytesToGiB, hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { bytesToGiB } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -31,10 +29,7 @@ import {
 } from "./lib/theme"
 import { useLogScale } from "./lib/useLogScale"
 
-interface BufferCandlestickChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface BufferCandlestickChartProps extends FleetChartProps {}
 
 interface CandlestickResult {
   days: string[]
@@ -219,10 +214,10 @@ function buildCandlestickOption(
           })
           .join("")
 
-        return `<div style="font-family:${CHART_THEME.fontMono};font-size:11px;">${header}${rows}</div>`
+        return `<div style="font-family:${CHART_THEME.fontMono};font-size:${CHART_THEME.fontSizeDense}px;">${header}${rows}</div>`
       },
     }),
-    xAxis: buildTimeXAxis({ boundaryGap: true }),
+    xAxis: buildTimeXAxis({ boundaryGap: ["5%", "5%"] }),
     yAxis: {
       type: useLog ? "log" : "value",
       name: useLog ? `${unit} (log)` : unit,
@@ -230,7 +225,7 @@ function buildCandlestickOption(
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
diff --git a/src/components/charts/BufferVelocityChart.tsx b/src/components/charts/BufferVelocityChart.tsx
index 6d2d2a64..1805c843 100644
--- a/src/components/charts/BufferVelocityChart.tsx
+++ b/src/components/charts/BufferVelocityChart.tsx
@@ -7,8 +7,9 @@
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
+import { localDateStr } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import type { FleetChartProps } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -38,10 +39,7 @@ import { useLogScale } from "./lib/useLogScale"
 
 type MAWindow = "1" | "3" | "7"
 
-interface BufferVelocityChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface BufferVelocityChartProps extends FleetChartProps {}
 
 interface TrackerVelocityData {
   name: string
@@ -82,7 +80,7 @@ function computeBufferVelocity(snapshots: Snapshot[]): {
   // Group by calendar day, keep last snapshot per day
   const dayMap = new Map<string, Snapshot>()
   for (const snap of sorted) {
-    const day = new Date(snap.polledAt).toISOString().slice(0, 10)
+    const day = localDateStr(new Date(snap.polledAt))
     dayMap.set(day, snap) // last one wins
   }
 
@@ -95,7 +93,7 @@ function computeBufferVelocity(snapshots: Snapshot[]): {
     const curr = dayMap.get(days[i])
     // Both entries are guaranteed to exist since days comes from dayMap.keys()
     if (!prev || !curr) continue
-    // Allow negative values — this is the whole point
+    // Allow negative values
     const velocityGiB = Number(BigInt(curr.bufferBytes) - BigInt(prev.bufferBytes)) / 1024 ** 3
 
     resultDays.push(days[i])
@@ -139,11 +137,11 @@ function buildBufferVelocityOption(
   const unit = `${baseUnit}/day`
 
   // Detect whether the last day in the unified axis is today (partial day)
-  const today = new Date().toISOString().slice(0, 10)
+  const today = localDateStr()
   const lastDayIsToday = sortedDays[sortedDays.length - 1] === today
 
   // Build per-tracker series mapped to the unified day axis.
-  // Delta charts skip nulls — no carry-forward.
+  // Delta charts skip nulls with no carry-forward.
   const series: NonNullable<EChartsOption["series"]> = computed.map((tracker, idx) => {
     const dayVelocityMap = new Map<string, number | null>()
     for (let i = 0; i < tracker.days.length; i++) {
@@ -182,6 +180,7 @@ function buildBufferVelocityOption(
     return {
       name: tracker.name,
       type: "line",
+      sampling: "lttb",
       data,
       smooth: false,
       symbol: "circle",
@@ -215,7 +214,7 @@ function buildBufferVelocityOption(
                     position: "insideEndTop",
                     color: CHART_THEME.warn,
                     fontFamily: CHART_THEME.fontMono,
-                    fontSize: 10,
+                    fontSize: CHART_THEME.fontSizeCompact,
                   },
                   lineStyle: {
                     color: CHART_THEME.warn,
@@ -272,7 +271,7 @@ function buildBufferVelocityOption(
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
diff --git a/src/components/charts/ComparisonChart.tsx b/src/components/charts/ComparisonChart.tsx
index 7ecf076a..b9564775 100644
--- a/src/components/charts/ComparisonChart.tsx
+++ b/src/components/charts/ComparisonChart.tsx
@@ -8,9 +8,10 @@ import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
 import { Tooltip } from "@/components/ui/Tooltip"
-import { bytesToGiB, hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { bytesToGiB } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -42,10 +43,26 @@ import { useLogScale } from "./lib/useLogScale"
 
 type ChartMetric = "uploaded" | "downloaded" | "ratio" | "buffer" | "seedbonus" | "active"
 
-interface ComparisonChartProps {
+const METRIC_COLOR: Record<ChartMetric, string> = {
+  uploaded: CHART_THEME.upload,
+  downloaded: CHART_THEME.download,
+  ratio: CHART_THEME.positive,
+  buffer: CHART_THEME.upload,
+  seedbonus: CHART_THEME.accent,
+  active: CHART_THEME.accent,
+}
+
+const METRIC_DIM: Record<ChartMetric, string> = {
+  uploaded: CHART_THEME.accentDim,
+  downloaded: CHART_THEME.warnDim,
+  ratio: hexToRgba(CHART_THEME.positive, 0.15),
+  buffer: CHART_THEME.accentDim,
+  seedbonus: CHART_THEME.accentDim,
+  active: CHART_THEME.accentDim,
+}
+
+interface ComparisonChartProps extends FleetChartProps {
   metric: ChartMetric
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
   enableLogScale?: boolean
   enableAverage?: boolean
   enableStacked?: boolean
@@ -68,7 +85,7 @@ function getValue(snapshot: Snapshot, metric: ChartMetric): number | null {
   }
 }
 
-/** Compute a single "Avg" series — mean of all tracker values at each unified timestamp. */
+/** Compute a single "Avg" series, mean of all tracker values at each unified timestamp. */
 function buildAverageSeries(
   trackerData: TrackerSnapshotSeries[],
   allTimestamps: number[],
@@ -101,23 +118,27 @@ function buildAverageSeries(
     data.push([ts, Number(avg.toFixed(3))])
   }
 
+  const color = METRIC_COLOR[metric]
+  const dim = METRIC_DIM[metric]
+
   return [
     {
       name: "Average",
       type: "line",
+      sampling: "lttb",
       data,
       smooth: true,
       symbol: "circle",
       symbolSize: dotSize,
-      itemStyle: { color: CHART_THEME.accent },
+      itemStyle: { color },
       lineStyle: {
-        color: CHART_THEME.accent,
+        color,
         width: 3,
-        shadowColor: CHART_THEME.accent,
+        shadowColor: color,
         shadowBlur: 12,
       },
       emphasis: {
-        lineStyle: { shadowBlur: 20, shadowColor: CHART_THEME.accent },
+        lineStyle: { shadowBlur: 20, shadowColor: color },
       },
       areaStyle: {
         color: {
@@ -127,8 +148,8 @@ function buildAverageSeries(
           x2: 0,
           y2: 1,
           colorStops: [
-            { offset: 0, color: CHART_THEME.accentDim },
-            { offset: 1, color: hexToRgba(CHART_THEME.accent, 0) },
+            { offset: 0, color: dim },
+            { offset: 1, color: hexToRgba(color, 0) },
           ],
         } as unknown as string,
       },
@@ -150,7 +171,7 @@ function buildComparisonOption(
   const allTimestamps = collectUnifiedTimestamps(trackerData)
 
   // Determine unit and divisor per metric type
-  let unit = "×"
+  let unit = "x"
   let divisor = 1
   if (metric === "seedbonus") {
     unit = "pts"
@@ -170,7 +191,7 @@ function buildComparisonOption(
 
   const dotSize = adaptiveDotSize(allTimestamps.length)
 
-  // Build series — either per-tracker or single average line
+  // Build series either per-tracker or single average line
   let series: EChartsOption["series"]
 
   if (useTotalOnly) {
@@ -182,7 +203,7 @@ function buildComparisonOption(
       })
     )
 
-    // Build a map of ts → sum across all trackers
+    // Build a map of ts -> sum across all trackers
     const sumByTs = new Map<number, number>()
     for (const series of perTracker) {
       for (const [ts, val] of series) {
@@ -193,10 +214,14 @@ function buildComparisonOption(
       .sort(([a], [b]) => a - b)
       .map(([ts, sum]) => [ts, Number(sum.toFixed(3))])
 
+    const totalColor = METRIC_COLOR[metric]
+    const totalDim = METRIC_DIM[metric]
+
     series = [
       {
         name: "Fleet Total",
         type: "line",
+        sampling: "lttb",
         data,
         smooth: true,
         symbol: "circle",
@@ -209,20 +234,20 @@ function buildComparisonOption(
             x2: 0,
             y2: 1,
             colorStops: [
-              { offset: 0, color: CHART_THEME.accentDim },
-              { offset: 1, color: hexToRgba(CHART_THEME.accent, 0) },
+              { offset: 0, color: totalDim },
+              { offset: 1, color: hexToRgba(totalColor, 0) },
             ],
           } as unknown as string,
         },
-        itemStyle: { color: CHART_THEME.accent },
+        itemStyle: { color: totalColor },
         lineStyle: {
-          color: CHART_THEME.accent,
+          color: totalColor,
           width: 3,
-          shadowColor: CHART_THEME.accent,
+          shadowColor: totalColor,
           shadowBlur: 12,
         },
         emphasis: {
-          lineStyle: { shadowBlur: 20, shadowColor: CHART_THEME.accent },
+          lineStyle: { shadowBlur: 20, shadowColor: totalColor },
         },
       },
     ]
@@ -239,7 +264,7 @@ function buildComparisonOption(
       }
 
       // For stacked mode, carry forward the last known value to avoid spike artifacts.
-      // For line mode, use sparse [ts, value][] pairs — time axis handles gaps natively.
+      // For line mode, use sparse [ts, value][] pairs: time axis handles gaps natively.
       let data: [number, number][]
       if (useStacked) {
         data = carryForwardTimeSeries(allTimestamps, tracker.snapshots, fieldFn)
@@ -250,6 +275,7 @@ function buildComparisonOption(
       return {
         name: tracker.name,
         type: "line",
+        sampling: "lttb",
         data,
         smooth: true,
         symbol: useStacked ? "none" : "circle",
@@ -276,7 +302,7 @@ function buildComparisonOption(
     nameTextStyle: {
       color: CHART_THEME.textTertiary,
       fontFamily: CHART_THEME.fontMono,
-      fontSize: 10,
+      fontSize: CHART_THEME.fontSizeCompact,
     },
     axisLine: { show: false },
     axisTick: { show: false },
@@ -305,7 +331,7 @@ function buildComparisonOption(
           .filter((item) => item.value != null && item.value[1] != null)
           .map((item) => {
             const val = item.value[1]
-            const display = metric === "ratio" ? `${fmtNum(val)} ×` : `${fmtNum(val)} ${unit}`
+            const display = metric === "ratio" ? `${fmtNum(val)} x` : `${fmtNum(val)} ${unit}`
             return chartTooltipRow(item.color, item.seriesName, display)
           })
           .join("<br/>")
@@ -374,7 +400,7 @@ function ComparisonChart({
               <button
                 type="button"
                 onClick={() => setAverageMode((v) => !v)}
-                className="nm-raised-sm bg-raised px-2.5 py-1 text-[10px] font-mono text-muted hover:text-secondary active:nm-inset-sm active:scale-[0.97] transition-all duration-150 cursor-pointer flex items-center gap-1.5 rounded-nm-sm"
+                className="timestamp nm-interactive-sm bg-raised px-2.5 py-1 hover:text-secondary cursor-pointer flex items-center gap-2 rounded-nm-sm"
               >
                 {averageMode ? "Avg" : "Per-Tracker"}
               </button>
diff --git a/src/components/charts/CrossSeedNetwork.tsx b/src/components/charts/CrossSeedNetwork.tsx
index 06014cc3..a9be513d 100644
--- a/src/components/charts/CrossSeedNetwork.tsx
+++ b/src/components/charts/CrossSeedNetwork.tsx
@@ -1,22 +1,19 @@
 // src/components/charts/CrossSeedNetwork.tsx
-//
-// Functions: buildNetworkData, buildCrossSeedNetworkOption, CrossSeedNetwork
 
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TrackerTag } from "@/lib/fleet"
-import { hexToRgba } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import { useMemo } from "react"
+import { hexToRgba } from "@/lib/color-utils"
+import type { CrossSeedEdge, CrossSeedNode } from "@/lib/fleet-aggregation"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { fmtNum } from "./lib/chart-helpers"
 import { CHART_THEME, chartTooltip, escHtml } from "./lib/theme"
 
 interface CrossSeedNetworkProps {
-  torrents: TorrentInfo[]
-  trackerTags: TrackerTag[]
-  crossSeedTags: string[]
+  network: { nodes: CrossSeedNode[]; edges: CrossSeedEdge[] }
   height?: number
 }
 
@@ -37,92 +34,44 @@ interface NetworkEdge {
   lineStyle: { width: number; color: string; curveness: number; opacity: number }
 }
 
-function buildNetworkData(
-  torrents: TorrentInfo[],
-  trackerTags: TrackerTag[],
-  crossSeedTags: string[]
-): { nodes: NetworkNode[]; edges: NetworkEdge[] } {
-  const crossSeedSet = new Set(crossSeedTags.map((t) => t.toLowerCase()))
-  const trackerTagMap = new Map<string, TrackerTag>()
-  for (const tt of trackerTags) trackerTagMap.set(tt.tag.toLowerCase(), tt)
-
-  const nameToTrackers = new Map<string, Set<string>>()
-  const trackerTorrentCount = new Map<string, number>()
-
-  for (const torrent of torrents) {
-    const tags = torrent.tags
-      .split(",")
-      .map((t) => t.trim().toLowerCase())
-      .filter((t) => t && !crossSeedSet.has(t))
-    const matched = tags.filter((t) => trackerTagMap.has(t))
-    if (matched.length === 0) continue
-    for (const tag of matched) trackerTorrentCount.set(tag, (trackerTorrentCount.get(tag) ?? 0) + 1)
-    const existing = nameToTrackers.get(torrent.name) ?? new Set()
-    for (const tag of matched) existing.add(tag)
-    nameToTrackers.set(torrent.name, existing)
-  }
-
-  const crossSeededPerTracker = new Map<string, number>()
-  const pairCounts = new Map<string, number>()
-
-  for (const [, trackerSet] of nameToTrackers) {
-    if (trackerSet.size < 2) continue
-    const arr = Array.from(trackerSet).sort()
-    for (const t of arr) crossSeededPerTracker.set(t, (crossSeededPerTracker.get(t) ?? 0) + 1)
-    for (let i = 0; i < arr.length; i++) {
-      for (let j = i + 1; j < arr.length; j++) {
-        const key = `${arr[i]}|${arr[j]}`
-        pairCounts.set(key, (pairCounts.get(key) ?? 0) + 1)
-      }
-    }
-  }
-
-  const maxCount = Math.max(...Array.from(trackerTorrentCount.values()), 1)
-  const nodes: NetworkNode[] = []
-
-  for (const [tagKey, tt] of trackerTagMap) {
-    const count = trackerTorrentCount.get(tagKey) ?? 0
-    if (count === 0) continue
-    const crossCount = crossSeededPerTracker.get(tagKey) ?? 0
-    const sizeFactor = Math.sqrt(count / maxCount)
+function buildStyledNodes(aggregatedNodes: CrossSeedNode[]): NetworkNode[] {
+  const maxCount = Math.max(...aggregatedNodes.map((n) => n.torrentCount), 1)
+  return aggregatedNodes.map((n) => {
+    const sizeFactor = Math.sqrt(n.torrentCount / maxCount)
     const nodeSize = Math.max(20, sizeFactor * 60)
-
-    nodes.push({
-      id: tagKey,
-      name: tt.name,
+    return {
+      id: n.id,
+      name: n.name,
       symbolSize: nodeSize,
-      torrentCount: count,
-      crossSeeded: crossCount,
-      itemStyle: { color: tt.color, shadowBlur: 20, shadowColor: hexToRgba(tt.color, 0.5) },
+      torrentCount: n.torrentCount,
+      crossSeeded: n.crossSeeded,
+      itemStyle: { color: n.color, shadowBlur: 20, shadowColor: hexToRgba(n.color, 0.5) },
       label: {
         show: true,
         color: CHART_THEME.textSecondary,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
         fontFamily: CHART_THEME.fontMono,
       },
-    })
-  }
-
-  const maxShared = Math.max(...Array.from(pairCounts.values()), 1)
-  const edges: NetworkEdge[] = []
+    }
+  })
+}
 
-  for (const [key, count] of pairCounts) {
-    const [source, target] = key.split("|")
-    const widthFactor = Math.sqrt(count / maxShared)
-    edges.push({
-      source,
-      target,
-      sharedCount: count,
+function buildStyledEdges(aggregatedEdges: CrossSeedEdge[]): NetworkEdge[] {
+  const maxShared = Math.max(...aggregatedEdges.map((e) => e.weight), 1)
+  return aggregatedEdges.map((e) => {
+    const widthFactor = Math.sqrt(e.weight / maxShared)
+    return {
+      source: e.source,
+      target: e.target,
+      sharedCount: e.weight,
       lineStyle: {
         width: Math.max(1, widthFactor * 8),
         color: CHART_THEME.textTertiary,
         curveness: 0.2,
         opacity: 0.3 + widthFactor * 0.5,
       },
-    })
-  }
-
-  return { nodes, edges }
+    }
+  })
 }
 
 function buildCrossSeedNetworkOption(nodes: NetworkNode[], edges: NetworkEdge[]): EChartsOption {
@@ -142,7 +91,7 @@ function buildCrossSeedNetworkOption(nodes: NetworkNode[], edges: NetworkEdge[])
           const tgtName = nodes.find((n) => n.id === edge.target)?.name ?? edge.target
           return (
             `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(srcName)} ↔ ${escHtml(tgtName)}</span><br/>` +
-            `<span style="color:${CHART_THEME.accent};">${edge.sharedCount.toLocaleString()} shared torrent${edge.sharedCount !== 1 ? "s" : ""}</span>`
+            `<span style="color:${CHART_THEME.accent};">${formatCount(edge.sharedCount)} shared torrent${edge.sharedCount !== 1 ? "s" : ""}</span>`
           )
         }
 
@@ -151,8 +100,8 @@ function buildCrossSeedNetworkOption(nodes: NetworkNode[], edges: NetworkEdge[])
           node.torrentCount > 0 ? fmtNum((node.crossSeeded / node.torrentCount) * 100, 1) : "0.0"
         return (
           `<span style="color:${node.itemStyle.color};font-weight:600;">${escHtml(node.name)}</span><br/>` +
-          `<span style="color:${CHART_THEME.textSecondary};">${node.torrentCount.toLocaleString()} torrents</span><br/>` +
-          `<span style="color:${CHART_THEME.accent};">${node.crossSeeded.toLocaleString()} cross-seeded</span>` +
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(node.torrentCount)} torrents</span><br/>` +
+          `<span style="color:${CHART_THEME.accent};">${formatCount(node.crossSeeded)} cross-seeded</span>` +
           `<span style="color:${CHART_THEME.textTertiary};"> · ${pct}%</span>`
         )
       },
@@ -192,28 +141,21 @@ function buildCrossSeedNetworkOption(nodes: NetworkNode[], edges: NetworkEdge[])
   }
 }
 
-function CrossSeedNetwork({
-  torrents,
-  trackerTags,
-  crossSeedTags,
-  height = 450,
-}: CrossSeedNetworkProps) {
-  if (trackerTags.length === 0)
-    return <ChartEmptyState height={height} message="No tracker tags configured" />
+function CrossSeedNetwork({ network, height = 450 }: CrossSeedNetworkProps) {
+  const { nodes: aggregatedNodes, edges: aggregatedEdges } = network
 
-  const { nodes, edges } = buildNetworkData(torrents, trackerTags, crossSeedTags)
+  const option = useMemo(() => {
+    const nodes = buildStyledNodes(aggregatedNodes)
+    const edges = buildStyledEdges(aggregatedEdges)
+    return buildCrossSeedNetworkOption(nodes, edges)
+  }, [aggregatedNodes, aggregatedEdges])
 
-  if (nodes.length === 0)
+  if (aggregatedNodes.length === 0)
     return <ChartEmptyState height={height} message="No torrent data available" />
-  if (edges.length === 0)
+  if (aggregatedEdges.length === 0)
     return <ChartEmptyState height={height} message="No cross-seeded content detected" />
 
-  return (
-    <ChartECharts
-      option={buildCrossSeedNetworkOption(nodes, edges)}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { CrossSeedNetworkProps }
diff --git a/src/components/charts/DailyVolumeChart.tsx b/src/components/charts/DailyVolumeChart.tsx
index 4839270d..6b2faab0 100644
--- a/src/components/charts/DailyVolumeChart.tsx
+++ b/src/components/charts/DailyVolumeChart.tsx
@@ -7,8 +7,8 @@
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { hexToRgba } from "@/lib/formatters"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { hexToRgba } from "@/lib/color-utils"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -40,10 +40,7 @@ import {
 
 type VolumeMode = "bar" | "river" | "area" | "sums"
 
-interface DailyVolumeChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface DailyVolumeChartProps extends FleetChartProps {}
 
 // ---------------------------------------------------------------------------
 // Shared helpers
@@ -176,7 +173,7 @@ function buildDailyVolumeOption(trackerData: TrackerSnapshotSeries[]): EChartsOp
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -281,7 +278,7 @@ function buildRiverOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
           show: true,
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
         },
         emphasis: {
           itemStyle: {
@@ -311,6 +308,7 @@ function buildAreaOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
     return {
       name: tracker.name,
       type: "line",
+      sampling: "lttb",
       stack: "upload",
       areaStyle: { opacity: 0.6 },
       smooth: true,
@@ -361,7 +359,7 @@ function buildAreaOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -441,7 +439,7 @@ function buildSumsOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -457,6 +455,7 @@ function buildSumsOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
       {
         name: "Upload",
         type: "line",
+        sampling: "lttb",
         data: uploadSums,
         smooth: true,
         symbol: "circle",
@@ -486,6 +485,7 @@ function buildSumsOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
       {
         name: "Download",
         type: "line",
+        sampling: "lttb",
         data: downloadSums,
         smooth: true,
         symbol: "circle",
diff --git a/src/components/charts/DistributionChart.tsx b/src/components/charts/DistributionChart.tsx
index ec2cf2a1..79ac93c5 100644
--- a/src/components/charts/DistributionChart.tsx
+++ b/src/components/charts/DistributionChart.tsx
@@ -7,7 +7,7 @@
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { formatBytesFromString } from "@/lib/formatters"
+import { formatBytesFromString, formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { fmtNum } from "./lib/chart-helpers"
@@ -52,7 +52,7 @@ function buildPieOption(
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
         fontWeight: 500,
       },
     },
@@ -72,7 +72,7 @@ function buildPieOption(
           position: "outside",
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: "{b}",
         },
         labelLine: {
@@ -194,7 +194,7 @@ function buildSankeyOption(
         label: {
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: (params: { name: string }) => params.name.trim(),
         },
         lineStyle: {
@@ -212,7 +212,7 @@ function buildSankeyOption(
         style: {
           text: "Upload %",
           fill: CHART_THEME.textTertiary,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           fontFamily: CHART_THEME.fontMono,
         },
       },
@@ -223,7 +223,7 @@ function buildSankeyOption(
         style: {
           text: "Seeding %",
           fill: CHART_THEME.textTertiary,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           fontFamily: CHART_THEME.fontMono,
         },
       },
@@ -256,14 +256,14 @@ function buildParallelOption(
         nameTextStyle: {
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           padding: [0, 0, 12, 0],
         },
         axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
         axisLabel: {
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: (v: number) => `${fmtNum(v, 1)}%`,
         },
       },
@@ -274,14 +274,14 @@ function buildParallelOption(
         nameTextStyle: {
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           padding: [0, 0, 12, 0],
         },
         axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
         axisLabel: {
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: (v: number) => `${fmtNum(v, 1)}%`,
         },
       },
@@ -394,7 +394,7 @@ function DistributionChart({ trackers, height = 300 }: DistributionChartProps) {
             option={buildPieOption(
               "Seeding Share",
               seedingData,
-              (v) => `${v.toLocaleString()} torrents`
+              (v) => `${formatCount(v)} torrents`
             )}
             style={{ height, width: "100%" }}
           />
diff --git a/src/components/charts/FleetAgeBandHeatmap.tsx b/src/components/charts/FleetAgeBandHeatmap.tsx
new file mode 100644
index 00000000..d0a3e9d1
--- /dev/null
+++ b/src/components/charts/FleetAgeBandHeatmap.tsx
@@ -0,0 +1,135 @@
+// src/components/charts/FleetAgeBandHeatmap.tsx
+"use client"
+
+import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
+import { hexToRgba } from "@/lib/color-utils"
+import { AGE_BUCKETS } from "@/lib/fleet"
+import type { AgeBandEntry } from "@/lib/fleet-aggregation"
+import { ChartECharts } from "./lib/ChartECharts"
+import { ChartEmptyState } from "./lib/ChartEmptyState"
+import { CHART_THEME, chartTooltip, chartTooltipRow, escHtml } from "./lib/theme"
+
+interface FleetAgeBandHeatmapProps {
+  data: AgeBandEntry[]
+  height?: number
+}
+
+function buildAgeBandHeatmapOption(trackers: AgeBandEntry[]): EChartsOption {
+  const bucketLabels = AGE_BUCKETS.map((b) => b.label)
+  const trackerNames = trackers.map((t) => t.name)
+
+  let maxCount = 0
+  const heatmapData: [number, number, number][] = []
+  for (let y = 0; y < trackers.length; y++) {
+    for (let x = 0; x < AGE_BUCKETS.length; x++) {
+      const val = trackers[y].counts[x]
+      heatmapData.push([x, y, val])
+      if (val > maxCount) maxCount = val
+    }
+  }
+
+  const axisLabelStyle = {
+    color: CHART_THEME.textTertiary,
+    fontFamily: CHART_THEME.fontMono,
+    fontSize: CHART_THEME.fontSizeCompact,
+  }
+
+  return {
+    backgroundColor: "transparent",
+    tooltip: chartTooltip("item", {
+      formatter: (params: unknown) => {
+        const p = params as { data: [number, number, number] }
+        const [bucketIdx, trackerIdx, count] = p.data
+        const tracker = trackers[trackerIdx]
+        const bucket = bucketLabels[bucketIdx]
+        const pct = tracker.total > 0 ? ((count / tracker.total) * 100).toFixed(1) : "0"
+        return (
+          `<div style="font-family:var(--font-mono),monospace;font-size:${CHART_THEME.fontSizeDense}px;` +
+          `color:${CHART_THEME.textTertiary};margin-bottom:4px;">${escHtml(tracker.name)} · ${escHtml(bucket)}</div>` +
+          chartTooltipRow(tracker.color, "Torrents", String(count)) +
+          "<br/>" +
+          chartTooltipRow(tracker.color, "Share", `${pct}%`)
+        )
+      },
+    }),
+    grid: {
+      left: 12,
+      right: 12,
+      top: 12,
+      bottom: 12,
+      containLabel: true,
+    },
+    xAxis: {
+      type: "category",
+      data: bucketLabels,
+      position: "top",
+      axisLine: { show: false },
+      axisTick: { show: false },
+      axisLabel: axisLabelStyle,
+      splitArea: { show: false },
+    },
+    yAxis: {
+      type: "category",
+      data: trackerNames,
+      axisLine: { show: false },
+      axisTick: { show: false },
+      axisLabel: axisLabelStyle,
+    },
+    visualMap: {
+      show: false,
+      min: 0,
+      max: maxCount || 1,
+      inRange: {
+        color: [
+          hexToRgba(CHART_THEME.accent, 0.04),
+          hexToRgba(CHART_THEME.accent, 0.15),
+          hexToRgba(CHART_THEME.accent, 0.35),
+          hexToRgba(CHART_THEME.accent, 0.6),
+          hexToRgba(CHART_THEME.accent, 0.9),
+        ],
+      },
+    },
+    series: [
+      {
+        type: "heatmap",
+        data: heatmapData,
+        emphasis: {
+          itemStyle: {
+            borderColor: CHART_THEME.accent,
+            borderWidth: 1,
+          },
+        },
+        itemStyle: {
+          borderColor: CHART_THEME.surface,
+          borderWidth: 2,
+          borderRadius: 4,
+        },
+        label: {
+          show: true,
+          color: CHART_THEME.textSecondary,
+          fontFamily: CHART_THEME.fontMono,
+          fontSize: CHART_THEME.fontSizeDense,
+          formatter: (params: unknown) => {
+            const p = params as { data: [number, number, number] }
+            return p.data[2] > 0 ? String(p.data[2]) : ""
+          },
+        },
+      },
+    ],
+  }
+}
+
+function FleetAgeBandHeatmap({ data, height = 300 }: FleetAgeBandHeatmapProps) {
+  const option = useMemo(() => buildAgeBandHeatmapOption(data), [data])
+  const dynamicHeight = Math.max(height, 60 + data.length * 36)
+
+  if (data.length === 0) {
+    return <ChartEmptyState height={height} message="No torrent age data available" />
+  }
+
+  return <ChartECharts option={option} style={{ height: dynamicHeight, width: "100%" }} />
+}
+
+export type { FleetAgeBandHeatmapProps }
+export { FleetAgeBandHeatmap }
diff --git a/src/components/charts/FleetAgeTimeline.tsx b/src/components/charts/FleetAgeTimeline.tsx
index b87ac56f..55bf1ae4 100644
--- a/src/components/charts/FleetAgeTimeline.tsx
+++ b/src/components/charts/FleetAgeTimeline.tsx
@@ -1,104 +1,41 @@
 // src/components/charts/FleetAgeTimeline.tsx
-//
-// Functions: groupByMonth, FleetAgeTimeline
-
 "use client"
 
-import type { TrackerTag } from "@/lib/fleet"
+import { useMemo } from "react"
+import type { AgeTimelineEntry } from "@/lib/fleet-aggregation"
+import type { StackedAreaSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildStackedAreaOption } from "./lib/chart-helpers"
-import { CHART_THEME } from "./lib/theme"
 
 interface FleetAgeTimelineProps {
-  torrents: { addedOn: number; tags: string }[]
-  trackerTags?: TrackerTag[]
+  data: AgeTimelineEntry[]
   height?: number
 }
 
-interface SeriesData {
-  name: string
-  color: string
-  monthMap: Map<string, number>
-}
-
-function groupByMonth(
-  torrents: { addedOn: number; tags: string }[],
-  trackerTags: TrackerTag[]
-): { sortedMonths: string[]; series: SeriesData[] } {
-  const tagSetLower = trackerTags.map((t) => ({
-    tagLower: t.tag.toLowerCase(),
-    name: t.name,
-    color: t.color,
-  }))
-
-  const seriesMap = new Map<string, SeriesData>()
-
-  for (const entry of tagSetLower) {
-    seriesMap.set(entry.name, {
+function FleetAgeTimeline({ data, height = 320 }: FleetAgeTimelineProps) {
+  const option = useMemo(() => {
+    if (data.length === 0) return null
+    const allMonths = new Set<string>()
+    for (const entry of data) {
+      for (const { month } of entry.months) allMonths.add(month)
+    }
+    const sortedMonths = Array.from(allMonths).sort()
+    if (sortedMonths.length === 0) return null
+    const series: StackedAreaSeries[] = data.map((entry) => ({
       name: entry.name,
       color: entry.color,
-      monthMap: new Map(),
-    })
-  }
-
-  const otherSeries: SeriesData = {
-    name: "Other",
-    color: CHART_THEME.textTertiary,
-    monthMap: new Map(),
-  }
-
-  const allMonths = new Set<string>()
-
-  for (const torrent of torrents) {
-    if (!torrent.addedOn || torrent.addedOn <= 0) continue
-    const d = new Date(torrent.addedOn * 1000)
-    const month = `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`
-    allMonths.add(month)
-
-    const torrentTagList = torrent.tags
-      .split(",")
-      .map((s) => s.trim().toLowerCase())
-      .filter(Boolean)
-
-    const matchedEntry = tagSetLower.find((e) => torrentTagList.includes(e.tagLower))
-
-    if (matchedEntry) {
-      const series = seriesMap.get(matchedEntry.name)
-      if (series) {
-        series.monthMap.set(month, (series.monthMap.get(month) ?? 0) + 1)
-      }
-    } else {
-      otherSeries.monthMap.set(month, (otherSeries.monthMap.get(month) ?? 0) + 1)
-    }
-  }
-
-  const sortedMonths = Array.from(allMonths).sort()
-  const series = [...seriesMap.values(), otherSeries].filter((s) => s.monthMap.size > 0)
-
-  return { sortedMonths, series }
-}
-
-function FleetAgeTimeline({ torrents, trackerTags = [], height = 320 }: FleetAgeTimelineProps) {
-  const validTorrents = torrents.filter((t) => t.addedOn && t.addedOn > 0)
-
-  if (validTorrents.length === 0) {
-    return <ChartEmptyState height={height} message="No torrent addition data available" />
-  }
-
-  const { sortedMonths, series } = groupByMonth(validTorrents, trackerTags)
+      monthMap: new Map(entry.months.map(({ month, count }) => [month, count])),
+    }))
+    return buildStackedAreaOption(sortedMonths, series, "age")
+  }, [data])
 
-  if (sortedMonths.length === 0 || series.length === 0) {
+  if (!option) {
     return <ChartEmptyState height={height} message="No torrent addition data available" />
   }
 
-  return (
-    <ChartECharts
-      option={buildStackedAreaOption(sortedMonths, series, "age")}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { FleetAgeTimelineProps }
-export { FleetAgeTimeline, groupByMonth }
+export { FleetAgeTimeline }
diff --git a/src/components/charts/FleetCategoryBreakdown.tsx b/src/components/charts/FleetCategoryBreakdown.tsx
index bcdf0143..8c3fe2d2 100644
--- a/src/components/charts/FleetCategoryBreakdown.tsx
+++ b/src/components/charts/FleetCategoryBreakdown.tsx
@@ -1,19 +1,15 @@
 // src/components/charts/FleetCategoryBreakdown.tsx
-//
-// Functions: buildFleetCategoryBreakdownOption, FleetCategoryBreakdown
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TrackerTag } from "@/lib/fleet"
-import { parseTorrentTags } from "@/lib/fleet"
+import { useMemo } from "react"
+import type { TrackerCategoryCount } from "@/lib/fleet-aggregation"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { fmtNum } from "./lib/chart-helpers"
 import {
   CHART_THEME,
   chartAxisLabel,
-  chartDataZoom,
   chartLegend,
   chartTooltip,
   chartTooltipRow,
@@ -21,24 +17,23 @@ import {
 } from "./lib/theme"
 
 interface FleetCategoryBreakdownProps {
-  torrents: { addedOn: number; tags: string; category: string }[]
-  trackerTags: TrackerTag[]
+  data: TrackerCategoryCount[]
   height?: number
 }
 
 function buildFleetCategoryBreakdownOption(
-  sortedMonths: string[],
+  trackerNames: string[],
   categories: string[],
   categoryColors: string[],
-  // month key → category → count
+  // tracker name -> category -> count
   data: Map<string, Map<string, number>>
 ): EChartsOption {
   const series: NonNullable<EChartsOption["series"]> = categories.map((cat, catIndex) => {
-    const seriesData: number[] = sortedMonths.map((month) => {
-      const monthCats = data.get(month)
-      if (!monthCats) return 0
-      const total = Array.from(monthCats.values()).reduce((a, b) => a + b, 0)
-      const count = monthCats.get(cat) ?? 0
+    const seriesData: number[] = trackerNames.map((tracker) => {
+      const trackerCats = data.get(tracker)
+      if (!trackerCats) return 0
+      const total = Array.from(trackerCats.values()).reduce((a, b) => a + b, 0)
+      const count = trackerCats.get(cat) ?? 0
       return total > 0 ? Number(((count / total) * 100).toFixed(1)) : 0
     })
 
@@ -51,21 +46,22 @@ function buildFleetCategoryBreakdownOption(
         color: categoryColors[catIndex],
         borderRadius: catIndex === categories.length - 1 ? [2, 2, 0, 0] : 0,
       },
+      label: { show: false },
       emphasis: {
         itemStyle: {
           shadowBlur: 8,
           shadowColor: "rgba(0,0,0,0.3)",
         },
-      },
-      label: {
-        show: true,
-        position: "inside",
-        fontFamily: CHART_THEME.fontMono,
-        fontSize: 9,
-        color: CHART_THEME.textPrimary,
-        formatter: (params: unknown) => {
-          const p = params as { value: number }
-          return p.value >= 5 ? `${fmtNum(p.value, 1)}%` : ""
+        label: {
+          show: true,
+          position: "inside",
+          fontFamily: CHART_THEME.fontMono,
+          fontSize: CHART_THEME.fontSizeMicro,
+          color: CHART_THEME.textPrimary,
+          formatter: (params: unknown) => {
+            const p = params as { value: number }
+            return p.value >= 5 ? `${fmtNum(p.value, 1)}%` : ""
+          },
         },
       },
       data: seriesData,
@@ -83,13 +79,13 @@ function buildFleetCategoryBreakdownOption(
           color: string
         }>
         if (!items?.length) return ""
-        const dateLabel = items[0].axisValueLabel
+        const trackerLabel = items[0].axisValueLabel
         const rows = items
           .filter((item) => item.value > 0)
           .sort((a, b) => b.value - a.value)
           .map((item) => chartTooltipRow(item.color, item.seriesName, `${fmtNum(item.value, 1)}%`))
           .join("<br/>")
-        return `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(dateLabel)}</span><br/>${rows}`
+        return `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(trackerLabel)}</span><br/>${rows}`
       },
     }),
     legend: chartLegend({ data: categories }),
@@ -97,17 +93,15 @@ function buildFleetCategoryBreakdownOption(
       left: 48,
       right: 16,
       top: 48,
-      bottom: 48,
+      bottom: 16,
+      containLabel: true,
     },
     xAxis: {
       type: "category",
-      data: sortedMonths.map((m) => {
-        const d = new Date(`${m}-15T12:00:00`)
-        return d.toLocaleDateString("en-US", { month: "short", year: "2-digit" })
-      }),
+      data: trackerNames,
       axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
       axisTick: { show: false },
-      axisLabel: chartAxisLabel(),
+      axisLabel: chartAxisLabel({ rotate: trackerNames.length > 8 ? 30 : 0 }),
     },
     yAxis: {
       type: "value",
@@ -121,22 +115,10 @@ function buildFleetCategoryBreakdownOption(
         lineStyle: { color: CHART_THEME.gridLine, width: 1 },
       },
     },
-    dataZoom:
-      sortedMonths.length > 10
-        ? [
-            ...chartDataZoom(CHART_THEME.accent).map((z) => ({
-              ...z,
-              start: 0,
-              end: Math.min(100, (10 / sortedMonths.length) * 100),
-            })),
-            { type: "inside", xAxisIndex: 0 },
-          ]
-        : undefined,
     series,
   }
 }
 
-// Deterministic palette for categories — uses CHART_THEME scale colors + extras
 const CATEGORY_PALETTE = [
   CHART_THEME.accent,
   CHART_THEME.warn,
@@ -145,55 +127,32 @@ const CATEGORY_PALETTE = [
   ...CHART_THEME.scale,
 ]
 
-function FleetCategoryBreakdown({
-  torrents,
-  trackerTags,
-  height = 360,
-}: FleetCategoryBreakdownProps) {
-  if (torrents.length === 0 || trackerTags.length === 0) {
-    return <ChartEmptyState height={height} message="No torrent data available" />
-  }
-
-  const tagSet = new Set(trackerTags.map((tt) => tt.tag.toLowerCase()))
-
-  // Build: month → category → count (fleet-wide, filtered to tagged torrents only)
-  const data = new Map<string, Map<string, number>>()
-  const allCategories = new Set<string>()
-  const allMonths = new Set<string>()
-
-  for (const torrent of torrents) {
-    if (!torrent.addedOn || torrent.addedOn <= 0) continue
+function FleetCategoryBreakdown({ data, height = 360 }: FleetCategoryBreakdownProps) {
+  const option = useMemo(() => {
+    const trackerNames = data.map((d) => d.tracker)
 
-    const tags = parseTorrentTags(torrent.tags)
-    const hasTrackerTag = tags.some((tag) => tagSet.has(tag))
-    if (!hasTrackerTag) continue
-
-    const d = new Date(torrent.addedOn * 1000)
-    const month = `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`
-    allMonths.add(month)
+    const allCategories = new Set<string>()
+    for (const entry of data) {
+      for (const { name } of entry.categories) allCategories.add(name)
+    }
+    const categories = Array.from(allCategories).sort()
+    const categoryColors = categories.map((_, i) => CATEGORY_PALETTE[i % CATEGORY_PALETTE.length])
+
+    const dataMap = new Map<string, Map<string, number>>()
+    for (const entry of data) {
+      const catMap = new Map<string, number>()
+      for (const { name, count } of entry.categories) catMap.set(name, count)
+      dataMap.set(entry.tracker, catMap)
+    }
 
-    const cat = torrent.category?.trim() || "Uncategorized"
-    allCategories.add(cat)
+    return buildFleetCategoryBreakdownOption(trackerNames, categories, categoryColors, dataMap)
+  }, [data])
 
-    const monthCats = data.get(month) ?? new Map<string, number>()
-    monthCats.set(cat, (monthCats.get(cat) ?? 0) + 1)
-    data.set(month, monthCats)
-  }
-
-  if (data.size === 0) {
-    return <ChartEmptyState height={height} message="No tagged torrents found" />
+  if (data.length === 0) {
+    return <ChartEmptyState height={height} message="No torrent data available" />
   }
 
-  const sortedMonths = Array.from(allMonths).sort()
-  const categories = Array.from(allCategories).sort()
-  const categoryColors = categories.map((_, i) => CATEGORY_PALETTE[i % CATEGORY_PALETTE.length])
-
-  return (
-    <ChartECharts
-      option={buildFleetCategoryBreakdownOption(sortedMonths, categories, categoryColors, data)}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { FleetCategoryBreakdownProps }
diff --git a/src/components/charts/FleetCategoryTimeline.tsx b/src/components/charts/FleetCategoryTimeline.tsx
index a27a73fd..c8ed6c26 100644
--- a/src/components/charts/FleetCategoryTimeline.tsx
+++ b/src/components/charts/FleetCategoryTimeline.tsx
@@ -1,88 +1,43 @@
 // src/components/charts/FleetCategoryTimeline.tsx
-//
-// Functions: groupByCategory, FleetCategoryTimeline
 
 "use client"
 
+import { useMemo } from "react"
+import type { CategoryTimelineEntry } from "@/lib/fleet-aggregation"
+import type { StackedAreaSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildStackedAreaOption } from "./lib/chart-helpers"
 import { buildTagColors, CHART_THEME } from "./lib/theme"
 
 interface FleetCategoryTimelineProps {
-  torrents: { addedOn: number; category: string }[]
+  data: CategoryTimelineEntry[]
   height?: number
 }
 
-interface CategorySeries {
-  name: string
-  color: string
-  monthMap: Map<string, number>
-}
-
-function groupByCategory(torrents: { addedOn: number; category: string }[]): {
-  sortedMonths: string[]
-  series: CategorySeries[]
-} {
-  const categoryMaps = new Map<string, Map<string, number>>()
-  const allMonths = new Set<string>()
-
-  for (const torrent of torrents) {
-    if (!torrent.addedOn || torrent.addedOn <= 0) continue
-    const d = new Date(torrent.addedOn * 1000)
-    const month = `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`
-    allMonths.add(month)
-
-    const cat = torrent.category?.trim() || "Uncategorized"
-    let monthMap = categoryMaps.get(cat)
-    if (!monthMap) {
-      monthMap = new Map<string, number>()
-      categoryMaps.set(cat, monthMap)
+function FleetCategoryTimeline({ data, height = 320 }: FleetCategoryTimelineProps) {
+  const option = useMemo(() => {
+    if (data.length === 0) return null
+    const allMonths = new Set<string>()
+    for (const entry of data) {
+      for (const { month } of entry.months) allMonths.add(month)
     }
-    monthMap.set(month, (monthMap.get(month) ?? 0) + 1)
-  }
-
-  const sortedMonths = Array.from(allMonths).sort()
-
-  // Sort categories by total torrent count descending
-  const entries = Array.from(categoryMaps.entries())
-    .map(([name, monthMap]) => {
-      let total = 0
-      for (const count of monthMap.values()) total += count
-      return { name, monthMap, total }
-    })
-    .sort((a, b) => b.total - a.total)
-
-  const colorMap = buildTagColors(entries.map((e) => e.name))
-
-  const series: CategorySeries[] = entries.map((e) => ({
-    name: e.name,
-    color: colorMap.get(e.name) ?? CHART_THEME.chartFallback,
-    monthMap: e.monthMap,
-  }))
-
-  return { sortedMonths, series }
-}
-
-function FleetCategoryTimeline({ torrents, height = 320 }: FleetCategoryTimelineProps) {
-  const validTorrents = torrents.filter((t) => t.addedOn && t.addedOn > 0)
-
-  if (validTorrents.length === 0) {
-    return <ChartEmptyState height={height} message="No torrent data available" />
-  }
-
-  const { sortedMonths, series } = groupByCategory(validTorrents)
-
-  if (sortedMonths.length === 0 || series.length === 0) {
+    const sortedMonths = Array.from(allMonths).sort()
+    if (sortedMonths.length === 0) return null
+    const colorMap = buildTagColors(data.map((e) => e.category))
+    const series: StackedAreaSeries[] = data.map((entry) => ({
+      name: entry.category,
+      color: colorMap.get(entry.category) ?? CHART_THEME.chartFallback,
+      monthMap: new Map(entry.months.map(({ month, count }) => [month, count])),
+    }))
+    return buildStackedAreaOption(sortedMonths, series, "categories")
+  }, [data])
+
+  if (!option) {
     return <ChartEmptyState height={height} message="No torrent data available" />
   }
 
-  return (
-    <ChartECharts
-      option={buildStackedAreaOption(sortedMonths, series, "categories")}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { FleetCategoryTimelineProps }
diff --git a/src/components/charts/FleetCompositionChart.tsx b/src/components/charts/FleetCompositionChart.tsx
index f73c2684..42fc13fe 100644
--- a/src/components/charts/FleetCompositionChart.tsx
+++ b/src/components/charts/FleetCompositionChart.tsx
@@ -1,11 +1,10 @@
 // src/components/charts/FleetCompositionChart.tsx
-//
-// Functions: buildFleetOption, FleetCompositionChart
 
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { formatCount } from "@/lib/formatters"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -26,10 +25,7 @@ import {
   formatChartTimestamp,
 } from "./lib/theme"
 
-interface FleetCompositionChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface FleetCompositionChartProps extends FleetChartProps {}
 
 function buildFleetOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
   // Collect unified ms timestamps for the time axis
@@ -42,6 +38,7 @@ function buildFleetOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
     return {
       name: tracker.name,
       type: "line",
+      sampling: "lttb",
       stack: "fleet",
       data,
       smooth: true,
@@ -81,11 +78,11 @@ function buildFleetOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
         )
 
         const header = chartTooltipHeader(time)
-        const totalRow = `<div style="color:${CHART_THEME.textPrimary};font-weight:600;margin-bottom:4px;">Total: ${total.toLocaleString()} seeding</div>`
+        const totalRow = `<div style="color:${CHART_THEME.textPrimary};font-weight:600;margin-bottom:4px;">Total: ${formatCount(total)} seeding</div>`
         const rows = sorted
           .map((item) => {
             const val = (item.value as [number, number])[1]
-            return chartTooltipRow(item.color, item.seriesName, val.toLocaleString())
+            return chartTooltipRow(item.color, item.seriesName, formatCount(val))
           })
           .join("<br/>")
 
@@ -99,12 +96,12 @@ function buildFleetOption(trackerData: TrackerSnapshotSeries[]): EChartsOption {
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
       axisLabel: chartAxisLabel({
-        formatter: (val: number) => val.toLocaleString(),
+        formatter: (val: number) => formatCount(val),
       }),
       splitLine: {
         lineStyle: {
diff --git a/src/components/charts/FleetCrossSeedDonut.tsx b/src/components/charts/FleetCrossSeedDonut.tsx
index a3d7cf40..5c4bc8d3 100644
--- a/src/components/charts/FleetCrossSeedDonut.tsx
+++ b/src/components/charts/FleetCrossSeedDonut.tsx
@@ -1,19 +1,19 @@
 // src/components/charts/FleetCrossSeedDonut.tsx
-//
-// Functions: buildFleetCrossSeedOption, FleetCrossSeedDonut
 
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { parseTorrentTags } from "@/lib/fleet"
+import { useMemo } from "react"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildDonutShell } from "./lib/chart-helpers"
 import { CHART_THEME, chartDot, chartTooltip, escHtml } from "./lib/theme"
 
 interface FleetCrossSeedDonutProps {
-  torrents: { tags: string }[]
-  crossSeedTags: string[]
+  crossSeeded: number
+  unique: number
+  total: number
   height?: number
 }
 
@@ -33,7 +33,7 @@ function buildFleetCrossSeedOption(
         return (
           chartDot(p.color) +
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(p.name)}</span><br/>` +
-          `<span style="color:${CHART_THEME.textSecondary};">${p.value.toLocaleString()} torrents</span>` +
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(p.value)} torrents</span>` +
           `<span style="color:${CHART_THEME.textTertiary};"> · ${p.percent}%</span>`
         )
       },
@@ -44,7 +44,7 @@ function buildFleetCrossSeedOption(
         left: "center",
         top: "middle",
         style: {
-          text: total.toLocaleString(),
+          text: formatCount(total),
           fill: CHART_THEME.textPrimary,
           fontSize: 20,
           fontWeight: "bold",
@@ -58,7 +58,7 @@ function buildFleetCrossSeedOption(
         style: {
           text: "total",
           fill: CHART_THEME.textTertiary,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           fontFamily: CHART_THEME.fontMono,
         },
       },
@@ -71,7 +71,7 @@ function buildFleetCrossSeedOption(
           position: "outside",
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: (params: unknown) => {
             const p = params as { name: string; value: number }
             const pct = total > 0 ? ((p.value / total) * 100).toFixed(1) : "0.0"
@@ -107,30 +107,22 @@ function buildFleetCrossSeedOption(
   }
 }
 
-function FleetCrossSeedDonut({ torrents, crossSeedTags, height = 280 }: FleetCrossSeedDonutProps) {
-  if (crossSeedTags.length === 0) {
-    return <ChartEmptyState height={height} message="No cross-seed tags configured" />
-  }
+function FleetCrossSeedDonut({
+  crossSeeded,
+  unique,
+  total,
+  height = 280,
+}: FleetCrossSeedDonutProps) {
+  const option = useMemo(
+    () => buildFleetCrossSeedOption(crossSeeded, unique, total),
+    [crossSeeded, unique, total]
+  )
 
-  if (torrents.length === 0) {
+  if (total === 0) {
     return <ChartEmptyState height={height} message="No torrent data available" />
   }
 
-  const csTagSet = new Set(crossSeedTags.map((t) => t.toLowerCase()))
-  let crossSeeded = 0
-  for (const torrent of torrents) {
-    if (parseTorrentTags(torrent.tags).some((tag) => csTagSet.has(tag))) {
-      crossSeeded++
-    }
-  }
-  const unique = torrents.length - crossSeeded
-
-  return (
-    <ChartECharts
-      option={buildFleetCrossSeedOption(crossSeeded, unique, torrents.length)}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { FleetCrossSeedDonutProps }
diff --git a/src/components/charts/FleetSizeJitter.tsx b/src/components/charts/FleetSizeJitter.tsx
index 475f17c0..c714de09 100644
--- a/src/components/charts/FleetSizeJitter.tsx
+++ b/src/components/charts/FleetSizeJitter.tsx
@@ -1,80 +1,65 @@
 // src/components/charts/FleetSizeJitter.tsx
-//
-// Functions: buildFleetSizeJitterOption, FleetSizeJitter
-
 "use client"
 
 import type { EChartsOption } from "echarts"
 import { useMemo } from "react"
-import type { TrackerTag } from "@/lib/fleet"
-import { parseTorrentTags } from "@/lib/fleet"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TrackerSizes } from "@/lib/fleet-aggregation"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { autoByteScale, fmtNum } from "./lib/chart-helpers"
 import { CHART_THEME, chartAxisLabel, chartDataZoom, chartTooltip, escHtml } from "./lib/theme"
 
 interface FleetSizeJitterProps {
-  torrents: TorrentInfo[]
-  trackerTags: TrackerTag[]
+  data: TrackerSizes[]
   height?: number
 }
 
-function buildFleetSizeJitterOption(
-  trackerTags: TrackerTag[],
-  trackerData: Map<string, { sizes: number[]; color: string }>
-): EChartsOption {
-  const trackerNames = trackerTags
-    .filter((t) => trackerData.has(t.tag.toLowerCase()))
-    .map((t) => t.name)
+function buildFleetSizeJitterOption(data: TrackerSizes[]): EChartsOption {
+  const trackerNames = data.map((d) => d.name)
 
   // Find max size for scaling
   let maxBytes = 0
-  for (const [, data] of trackerData) {
-    for (const s of data.sizes) {
+  for (const entry of data) {
+    for (const s of entry.sizes) {
       if (s > maxBytes) maxBytes = s
     }
   }
   const { divisor, unit } = autoByteScale(maxBytes / 1024 ** 3)
   const scaleDivisor = 1024 ** 3 * divisor
 
-  // Build series — one scatter series per tracker for coloring
-  const series: NonNullable<EChartsOption["series"]> = trackerTags
-    .filter((t) => trackerData.has(t.tag.toLowerCase()))
-    .map((tt, trackerIndex) => {
-      const data = trackerData.get(tt.tag.toLowerCase())
-      if (!data) return null
-
-      // Gaussian jitter for beeswarm cloud — wide spread, clamped to avoid overlap with neighbors
-      const points = data.sizes.map((sizeBytes) => {
-        const u1 = Math.random()
-        const u2 = Math.random()
-        const gaussian = Math.sqrt(-2 * Math.log(u1 || 0.001)) * Math.cos(2 * Math.PI * u2)
-        const jitter = Math.max(-0.42, Math.min(0.42, gaussian * 0.25))
-        return [trackerIndex + jitter, sizeBytes / scaleDivisor]
-      })
+  // Build one scatter series per tracker for coloring
+  const series: NonNullable<EChartsOption["series"]> = data.map((entry, trackerIndex) => {
+    // Gaussian jitter for beeswarm cloud that's wide spread, clamped to avoid overlap with neighbors
+    const points = entry.sizes.map((sizeBytes) => {
+      const u1 = Math.random()
+      const u2 = Math.random()
+      const gaussian = Math.sqrt(-2 * Math.log(u1 || 0.001)) * Math.cos(2 * Math.PI * u2)
+      const jitter = Math.max(-0.42, Math.min(0.42, gaussian * 0.25))
+      return [trackerIndex + jitter, sizeBytes / scaleDivisor]
+    })
 
-      return {
-        type: "scatter" as const,
-        name: tt.name,
-        data: points,
-        symbolSize: 4,
+    return {
+      type: "scatter" as const,
+      name: entry.name,
+      data: points,
+      large: true,
+      symbolSize: 4,
+      itemStyle: {
+        color: entry.color,
+        opacity: 0.45,
+      },
+      emphasis: {
         itemStyle: {
-          color: tt.color,
-          opacity: 0.45,
+          opacity: 1,
+          shadowBlur: 8,
+          shadowColor: entry.color,
         },
-        emphasis: {
-          itemStyle: {
-            opacity: 1,
-            shadowBlur: 8,
-            shadowColor: tt.color,
-          },
-        },
-      }
-    })
-    .filter((s): s is NonNullable<typeof s> => s !== null)
+      },
+    }
+  })
 
   return {
+    animation: false,
     backgroundColor: "transparent",
     tooltip: chartTooltip("item", {
       formatter: (params: unknown) => {
@@ -108,7 +93,7 @@ function buildFleetSizeJitterOption(
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -127,7 +112,7 @@ function buildFleetSizeJitterOption(
     dataZoom:
       trackerNames.length > 10
         ? [
-            ...chartDataZoom(CHART_THEME.accent).map((z) => ({ ...z, startValue: 0, endValue: 9 })),
+            ...chartDataZoom(CHART_THEME.accent).map((z) => ({ ...z, start: 0, end: 100 })),
             { type: "inside", xAxisIndex: 0 },
           ]
         : undefined,
@@ -135,40 +120,15 @@ function buildFleetSizeJitterOption(
   }
 }
 
-function FleetSizeJitter({ torrents, trackerTags, height = 360 }: FleetSizeJitterProps) {
-  // Build trackerData map; memoized so Math.random() jitter only runs when data changes
-  const trackerData = useMemo(() => {
-    const map = new Map<string, { sizes: number[]; color: string }>()
-    for (const tt of trackerTags) {
-      map.set(tt.tag.toLowerCase(), { sizes: [], color: tt.color })
-    }
-    for (const torrent of torrents) {
-      const tags = parseTorrentTags(torrent.tags)
-      for (const tag of tags) {
-        const entry = map.get(tag)
-        if (entry) entry.sizes.push(torrent.size)
-      }
-    }
-    for (const [key, data] of map) {
-      if (data.sizes.length === 0) map.delete(key)
-    }
-    return map
-  }, [torrents, trackerTags])
+function FleetSizeJitter({ data, height = 360 }: FleetSizeJitterProps) {
+  // Memoize the full option so the jitter scatter points are stable across unrelated re-renders.
+  // Hook must be unconditional, so it runs before any early return.
+  const option = useMemo(() => buildFleetSizeJitterOption(data), [data])
 
-  // Memoize the full option so the jitter scatter points are stable across unrelated re-renders
-  const option = useMemo(
-    () => buildFleetSizeJitterOption(trackerTags, trackerData),
-    [trackerData, trackerTags]
-  )
-
-  if (torrents.length === 0 || trackerTags.length === 0) {
+  if (data.length === 0) {
     return <ChartEmptyState height={height} message="No torrent data available" />
   }
 
-  if (trackerData.size === 0) {
-    return <ChartEmptyState height={height} message="No tagged torrents found" />
-  }
-
   return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
diff --git a/src/components/charts/FleetSpeedSparklines.tsx b/src/components/charts/FleetSpeedSparklines.tsx
index b8807784..27d413d6 100644
--- a/src/components/charts/FleetSpeedSparklines.tsx
+++ b/src/components/charts/FleetSpeedSparklines.tsx
@@ -1,25 +1,21 @@
 // src/components/charts/FleetSpeedSparklines.tsx
-//
-// Pure SVG sparkline cards for per-client upload + download speed history.
-//
-// Functions: buildPolylinePoints, MiniSparkline, ClientSpeedCard, FleetSpeedSparklines
-
 "use client"
 
-import { useEffect, useRef, useState } from "react"
+import { useQueries } from "@tanstack/react-query"
+import { useRef } from "react"
 import { Card } from "@/components/ui/Card"
+import { Notice } from "@/components/ui/Notice"
 import { Tooltip } from "@/components/ui/Tooltip"
-import { formatBytesNum } from "@/lib/formatters"
+import { formatSpeed } from "@/lib/formatters"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { CHART_THEME } from "./lib/theme"
 
 // ── Constants ──
 
-const COLOR_UPLOAD = CHART_THEME.accent
-const COLOR_DOWNLOAD = CHART_THEME.warn
+const COLOR_UPLOAD = CHART_THEME.upload
+const COLOR_DOWNLOAD = CHART_THEME.download
 const SPARKLINE_WIDTH = 80
 const SPARKLINE_HEIGHT = 24
-const POLL_INTERVAL_MS = 10_000
 const MAX_HISTORY_POINTS = 60
 
 // ── Types ──
@@ -38,18 +34,14 @@ interface ClientSpeedState {
 
 interface FleetSpeedSparklinesProps {
   clients: { id: number; name: string }[]
+  isActive?: boolean
 }
 
 // ── Helpers ──
 
-/**
- * Converts an array of numeric values into SVG polyline `points` attribute string.
- * Maps values onto a viewBox of `width` × `height`, with y-axis inverted (SVG top=0).
- * Returns empty string when fewer than 2 points exist.
- */
 function buildPolylinePoints(values: number[], width: number, height: number): string {
   if (values.length < 2) return ""
-  const max = Math.max(...values, 1)
+  const max = values.reduce((m, v) => (v > m ? v : m), 1)
   const step = width / (values.length - 1)
   return values
     .map((v, i) => {
@@ -62,16 +54,7 @@ function buildPolylinePoints(values: number[], width: number, height: number): s
 
 // ── Sub-components ──
 
-interface MiniSparklineProps {
-  values: number[]
-  color: string
-}
-
-/**
- * Pure SVG sparkline — no ECharts.
- * Renders an 80×24 polyline with a translucent fill beneath the line.
- */
-function MiniSparkline({ values, color }: MiniSparklineProps) {
+function MiniSparkline({ values, color }: { values: number[]; color: string }) {
   const points = buildPolylinePoints(values, SPARKLINE_WIDTH, SPARKLINE_HEIGHT)
 
   if (!points) {
@@ -95,10 +78,7 @@ function MiniSparkline({ values, color }: MiniSparklineProps) {
     )
   }
 
-  // Build a closed fill path: polyline + descend to bottom-right + bottom-left
-  const firstX = 0
-  const lastX = SPARKLINE_WIDTH
-  const fillPoints = `${points} ${lastX},${SPARKLINE_HEIGHT} ${firstX},${SPARKLINE_HEIGHT}`
+  const fillPoints = `${points} ${SPARKLINE_WIDTH},${SPARKLINE_HEIGHT} 0,${SPARKLINE_HEIGHT}`
 
   return (
     <svg
@@ -120,15 +100,7 @@ function MiniSparkline({ values, color }: MiniSparklineProps) {
   )
 }
 
-interface ClientSpeedCardProps {
-  name: string
-  state: ClientSpeedState
-}
-
-/**
- * Single client card showing name, upload+download sparklines, and current speeds.
- */
-function ClientSpeedCard({ name, state }: ClientSpeedCardProps) {
+function ClientSpeedCard({ name, state }: { name: string; state: ClientSpeedState }) {
   const uploadValues = state.history.map((e) => e.uploadSpeed)
   const downloadValues = state.history.map((e) => e.downloadSpeed)
   const currentUpload = state.latest?.uploadSpeed ?? 0
@@ -141,32 +113,30 @@ function ClientSpeedCard({ name, state }: ClientSpeedCardProps) {
       </Tooltip>
 
       {state.error ? (
-        <p className="text-xs font-mono text-warn">fetch error</p>
+        <Notice variant="warn" message="fetch error" />
       ) : (
         <>
-          {/* Upload row */}
           <div className="flex items-center justify-between gap-2">
-            <div className="flex items-center gap-1.5">
-              <span className="text-[10px] font-mono" style={{ color: COLOR_UPLOAD }}>
+            <div className="flex items-center gap-2">
+              <span className="text-3xs font-mono" style={{ color: COLOR_UPLOAD }}>
                 ↑
               </span>
               <MiniSparkline values={uploadValues} color={COLOR_UPLOAD} />
             </div>
-            <span className="text-[10px] font-mono tabular-nums" style={{ color: COLOR_UPLOAD }}>
-              {formatBytesNum(currentUpload)}/s
+            <span className="text-3xs font-mono tabular-nums" style={{ color: COLOR_UPLOAD }}>
+              {formatSpeed(currentUpload)}
             </span>
           </div>
 
-          {/* Download row */}
           <div className="flex items-center justify-between gap-2">
-            <div className="flex items-center gap-1.5">
-              <span className="text-[10px] font-mono" style={{ color: COLOR_DOWNLOAD }}>
+            <div className="flex items-center gap-2">
+              <span className="text-3xs font-mono" style={{ color: COLOR_DOWNLOAD }}>
                 ↓
               </span>
               <MiniSparkline values={downloadValues} color={COLOR_DOWNLOAD} />
             </div>
-            <span className="text-[10px] font-mono tabular-nums" style={{ color: COLOR_DOWNLOAD }}>
-              {formatBytesNum(currentDownload)}/s
+            <span className="text-3xs font-mono tabular-nums" style={{ color: COLOR_DOWNLOAD }}>
+              {formatSpeed(currentDownload)}
             </span>
           </div>
         </>
@@ -175,87 +145,71 @@ function ClientSpeedCard({ name, state }: ClientSpeedCardProps) {
   )
 }
 
-// ── Main component ──
-
-/**
- * Grid of per-client speed sparkline cards.
- * Each card polls /api/clients/{id}/speeds every 10 seconds.
- */
-function FleetSpeedSparklines({ clients }: FleetSpeedSparklinesProps) {
-  const [speedMap, setSpeedMap] = useState<Record<number, ClientSpeedState>>({})
-  const intervalsRef = useRef<Map<number, ReturnType<typeof setInterval>>>(new Map())
-
-  useEffect(() => {
-    if (clients.length === 0) return
-
-    // Initialize state for all clients
-    setSpeedMap((prev) => {
-      const next: Record<number, ClientSpeedState> = { ...prev }
-      for (const client of clients) {
-        if (!next[client.id]) {
-          next[client.id] = { history: [], latest: null, error: false }
-        }
-      }
-      return next
-    })
-
-    async function fetchSpeeds(clientId: number): Promise<void> {
-      try {
-        const res = await fetch(`/api/clients/${clientId}/speeds`)
-        if (!res.ok) {
-          setSpeedMap((prev) => ({
-            ...prev,
-            [clientId]: { ...prev[clientId], error: true },
-          }))
-          return
-        }
-        const entries: SpeedEntry[] = await res.json()
-        if (!Array.isArray(entries) || entries.length === 0) return
-
-        setSpeedMap((prev) => {
-          const existing = prev[clientId] ?? { history: [], latest: null, error: false }
-          // Append new entries, deduplicate by timestamp, keep most recent MAX_HISTORY_POINTS
-          const allEntries = [...existing.history, ...entries]
-          const seen = new Set<number>()
-          const deduped = allEntries.filter((e) => {
-            if (seen.has(e.timestamp)) return false
-            seen.add(e.timestamp)
-            return true
-          })
-          deduped.sort((a, b) => a.timestamp - b.timestamp)
-          const trimmed = deduped.slice(-MAX_HISTORY_POINTS)
-          return {
-            ...prev,
-            [clientId]: {
-              history: trimmed,
-              latest: trimmed[trimmed.length - 1] ?? null,
-              error: false,
-            },
-          }
-        })
-      } catch {
-        setSpeedMap((prev) => ({
-          ...prev,
-          [clientId]: { ...(prev[clientId] ?? { history: [], latest: null }), error: true },
-        }))
+// ── Accumulate history across refetches ──
+
+function useAccumulatedSpeeds(
+  clients: { id: number; name: string }[],
+  isActive: boolean
+): Record<number, ClientSpeedState> {
+  const historyRef = useRef<Record<number, SpeedEntry[]>>({})
+
+  const speedQueries = useQueries({
+    queries: clients.map((client) => ({
+      queryKey: ["client-speeds", client.id] as const,
+      queryFn: async ({ signal }: { signal: AbortSignal }) => {
+        const res = await fetch(`/api/clients/${client.id}/speeds`, { signal })
+        if (!res.ok) throw new Error("fetch error")
+        return res.json() as Promise<SpeedEntry[]>
+      },
+      refetchInterval: isActive ? 10_000 : false,
+    })),
+  })
+
+  const result: Record<number, ClientSpeedState> = {}
+
+  for (let i = 0; i < clients.length; i++) {
+    const clientId = clients[i].id
+    const query = speedQueries[i]
+
+    if (query.error) {
+      result[clientId] = {
+        history: historyRef.current[clientId] ?? [],
+        latest: null,
+        error: true,
       }
+      continue
     }
 
-    // Initial fetch + polling per client
-    const intervals = intervalsRef.current
-    for (const client of clients) {
-      fetchSpeeds(client.id)
-      const handle = setInterval(() => fetchSpeeds(client.id), POLL_INTERVAL_MS)
-      intervals.set(client.id, handle)
+    const incoming = query.data
+    if (incoming && incoming.length > 0) {
+      const prev = historyRef.current[clientId] ?? []
+      const all = [...prev, ...incoming]
+      const seen = new Set<number>()
+      const deduped = all.filter((e) => {
+        if (seen.has(e.timestamp)) return false
+        seen.add(e.timestamp)
+        return true
+      })
+      deduped.sort((a, b) => a.timestamp - b.timestamp)
+      const trimmed = deduped.slice(-MAX_HISTORY_POINTS)
+      historyRef.current[clientId] = trimmed
     }
 
-    return () => {
-      for (const handle of intervals.values()) {
-        clearInterval(handle)
-      }
-      intervals.clear()
+    const history = historyRef.current[clientId] ?? []
+    result[clientId] = {
+      history,
+      latest: history.at(-1) ?? null,
+      error: false,
     }
-  }, [clients])
+  }
+
+  return result
+}
+
+// ── Main component ──
+
+function FleetSpeedSparklines({ clients, isActive = true }: FleetSpeedSparklinesProps) {
+  const speedMap = useAccumulatedSpeeds(clients, isActive)
 
   if (clients.length === 0) {
     return <ChartEmptyState height={120} message="No download clients configured." />
diff --git a/src/components/charts/FleetStorageTreemap.tsx b/src/components/charts/FleetStorageTreemap.tsx
index f6a064be..5e2385d2 100644
--- a/src/components/charts/FleetStorageTreemap.tsx
+++ b/src/components/charts/FleetStorageTreemap.tsx
@@ -1,19 +1,19 @@
 // src/components/charts/FleetStorageTreemap.tsx
 //
-// Functions: groupTorrentsForTreemap, buildFleetStorageTreemapOption, FleetStorageTreemap
+// Functions: buildFleetStorageTreemapOption, FleetStorageTreemap
 
 "use client"
 
 import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
+import type { TrackerCategoryStorage } from "@/lib/fleet-aggregation"
 import { formatBytesNum } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
-import { CHART_THEME, chartTooltip, escHtml } from "./lib/theme"
+import { buildTagColors, CHART_THEME, chartTooltip, escHtml } from "./lib/theme"
 
 interface FleetStorageTreemapProps {
-  torrents: TorrentInfo[]
-  trackerTags: string[]
+  data: TrackerCategoryStorage[]
   height?: number
 }
 
@@ -25,57 +25,30 @@ interface TreemapNode {
   upperLabel?: { show: boolean; color: string }
 }
 
-function groupTorrentsForTreemap(torrents: TorrentInfo[], trackerTags: string[]): TreemapNode[] {
-  const tagSetLower = trackerTags.map((t) => t.toLowerCase())
-
-  const trackerMap = new Map<string, Map<string, number>>()
-
-  for (const torrent of torrents) {
-    const torrentTagList = torrent.tags
-      .split(",")
-      .map((s) => s.trim().toLowerCase())
-      .filter(Boolean)
-
-    const matchedTag = tagSetLower.find((tag) => torrentTagList.includes(tag))
-    const trackerKey = matchedTag ?? "__other__"
-    const categoryKey = torrent.category || "(uncategorized)"
-
-    if (!trackerMap.has(trackerKey)) {
-      trackerMap.set(trackerKey, new Map())
-    }
-    const catMap = trackerMap.get(trackerKey)
-    if (catMap) {
-      catMap.set(categoryKey, (catMap.get(categoryKey) ?? 0) + torrent.size)
-    }
-  }
+function buildTreemapNodes(data: TrackerCategoryStorage[]): TreemapNode[] {
+  const trackerNames = data.map((d) => d.tracker)
+  const colorMap = buildTagColors(trackerNames)
 
   const nodes: TreemapNode[] = []
-  let colorIndex = 0
-
-  for (const [trackerKey, catMap] of trackerMap.entries()) {
-    const displayName =
-      trackerKey === "__other__"
-        ? "Other"
-        : (trackerTags.find((t) => t.toLowerCase() === trackerKey) ?? trackerKey)
-
-    const trackerColor = `hsl(${(colorIndex++ * 137.5) % 360}, 70%, 55%)`
-    const totalSize = Array.from(catMap.values()).reduce((a, b) => a + b, 0)
-
-    const children: TreemapNode[] = Array.from(catMap.entries()).map(([category, size]) => ({
-      name: category,
-      value: size,
+  for (const d of data) {
+    const trackerColor = colorMap.get(d.tracker) ?? CHART_THEME.chartFallback
+    const totalSize = d.categories.reduce((sum, c) => sum + c.totalSize, 0)
+    if (totalSize === 0) continue
+
+    const children: TreemapNode[] = d.categories.map((c) => ({
+      name: c.name,
+      value: c.totalSize,
       itemStyle: { color: trackerColor },
     }))
 
     nodes.push({
-      name: displayName,
+      name: d.tracker,
       value: totalSize,
       children,
       itemStyle: { color: trackerColor },
       upperLabel: { show: true, color: CHART_THEME.textPrimary },
     })
   }
-
   return nodes
 }
 
@@ -115,7 +88,7 @@ function buildFleetStorageTreemapOption(nodes: TreemapNode[]): EChartsOption {
             textStyle: {
               color: CHART_THEME.textSecondary,
               fontFamily: CHART_THEME.fontMono,
-              fontSize: 11,
+              fontSize: CHART_THEME.fontSizeDense,
             },
           },
           emphasis: {
@@ -129,7 +102,7 @@ function buildFleetStorageTreemapOption(nodes: TreemapNode[]): EChartsOption {
           height: 24,
           color: CHART_THEME.textPrimary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           fontWeight: "bold",
           formatter: (params: unknown) => {
             const p = params as { name: string; value: number }
@@ -140,7 +113,7 @@ function buildFleetStorageTreemapOption(nodes: TreemapNode[]): EChartsOption {
           show: true,
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: (params: unknown) => {
             const p = params as { name: string; value: number }
             return `${p.name}\n${formatBytesNum(p.value)}`
@@ -173,24 +146,22 @@ function buildFleetStorageTreemapOption(nodes: TreemapNode[]): EChartsOption {
   }
 }
 
-function FleetStorageTreemap({ torrents, trackerTags, height = 400 }: FleetStorageTreemapProps) {
-  if (torrents.length === 0) {
+function FleetStorageTreemap({ data, height = 400 }: FleetStorageTreemapProps) {
+  const { nodes, option } = useMemo(() => {
+    const n = buildTreemapNodes(data)
+    return { nodes: n, option: buildFleetStorageTreemapOption(n) }
+  }, [data])
+
+  if (data.length === 0) {
     return <ChartEmptyState height={height} message="No torrent data available" />
   }
 
-  const nodes = groupTorrentsForTreemap(torrents, trackerTags)
-
   if (nodes.length === 0) {
     return <ChartEmptyState height={height} message="No storage data to display" />
   }
 
-  return (
-    <ChartECharts
-      option={buildFleetStorageTreemapOption(nodes)}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { FleetStorageTreemapProps }
-export { FleetStorageTreemap, groupTorrentsForTreemap }
+export { FleetStorageTreemap }
diff --git a/src/components/charts/FleetVolumeCalendar.tsx b/src/components/charts/FleetVolumeCalendar.tsx
index cca5a7b9..7dc541e8 100644
--- a/src/components/charts/FleetVolumeCalendar.tsx
+++ b/src/components/charts/FleetVolumeCalendar.tsx
@@ -1,26 +1,19 @@
 // src/components/charts/FleetVolumeCalendar.tsx
-//
-// Functions: buildCalendarData, buildFleetVolumeCalendarOption, FleetVolumeCalendar
-
 "use client"
 
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { hexToRgba } from "@/lib/formatters"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { hexToRgba } from "@/lib/color-utils"
+import { localDateStr } from "@/lib/formatters"
+import type { FleetChartProps, TrackerSnapshotSeries, VolumeField } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
-import { fmtNum } from "./lib/chart-helpers"
+import { formatGiB } from "./lib/chart-helpers"
 import { computeDailyDeltas } from "./lib/chart-transforms"
 import { CHART_THEME, chartTooltip, chartTooltipRow, escHtml } from "./lib/theme"
 
-type VolumeField = "upload" | "download"
-
-interface FleetVolumeCalendarProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface FleetVolumeCalendarProps extends FleetChartProps {}
 
 /**
  * Aggregate daily upload/download deltas across all trackers.
@@ -48,10 +41,7 @@ function buildCalendarData(
   const yearAgo = new Date(today)
   yearAgo.setFullYear(yearAgo.getFullYear() - 1)
   yearAgo.setDate(yearAgo.getDate() + 1)
-  const dateRange: [string, string] = [
-    yearAgo.toISOString().slice(0, 10),
-    today.toISOString().slice(0, 10),
-  ]
+  const dateRange: [string, string] = [localDateStr(yearAgo), localDateStr(today)]
 
   const maxValue = entries.length > 0 ? Math.max(...entries.map(([, v]) => v)) : 0
 
@@ -84,7 +74,7 @@ function buildFleetVolumeCalendarOption(
             `<span style="color:${CHART_THEME.textTertiary};">No data</span>`
           )
         }
-        const display = gib >= 1024 ? `${fmtNum(gib / 1024)} TiB` : `${fmtNum(gib)} GiB`
+        const display = formatGiB(gib)
         return (
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(dateLabel)}</span><br/>` +
           chartTooltipRow(color, label, display)
@@ -114,13 +104,13 @@ function buildFleetVolumeCalendarOption(
       yearLabel: { show: false },
       monthLabel: {
         color: CHART_THEME.textTertiary,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
         fontFamily: CHART_THEME.fontMono,
       },
       dayLabel: {
         firstDay: 1,
         color: CHART_THEME.textTertiary,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
         fontFamily: CHART_THEME.fontMono,
         nameMap: ["S", "M", "T", "W", "T", "F", "S"],
       },
diff --git a/src/components/charts/FleetVolumeHeatmap.tsx b/src/components/charts/FleetVolumeHeatmap.tsx
index f0d427e4..86eb446f 100644
--- a/src/components/charts/FleetVolumeHeatmap.tsx
+++ b/src/components/charts/FleetVolumeHeatmap.tsx
@@ -1,30 +1,23 @@
 // src/components/charts/FleetVolumeHeatmap.tsx
-//
-// Functions: buildVolumeMatrix, buildFleetVolumeHeatmapOption, FleetVolumeHeatmap
 
 "use client"
 
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { hexToRgba } from "@/lib/formatters"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { hexToRgba } from "@/lib/color-utils"
+import type { FleetChartProps, TrackerSnapshotSeries, VolumeField } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
-import { DAY_LABELS, fmtNum, HOUR_LABELS } from "./lib/chart-helpers"
+import { DAY_LABELS, formatGiB, HOUR_LABELS } from "./lib/chart-helpers"
 import { CHART_THEME, chartAxisLabel, chartTooltip, chartTooltipRow, escHtml } from "./lib/theme"
 
-type VolumeField = "upload" | "download"
-
-interface FleetVolumeHeatmapProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface FleetVolumeHeatmapProps extends FleetChartProps {}
 
 /**
- * Build a 7×24 volume matrix from snapshot series.
+ * Build a 7x24 volume matrix from snapshot series.
  * For each consecutive snapshot pair, compute the byte delta and bucket
- * it by the dayOfWeek × hourOfDay of the later snapshot.
+ * it by the dayOfWeek x hourOfDay of the later snapshot.
  * Returns values in GiB.
  */
 function buildVolumeMatrix(
@@ -86,7 +79,7 @@ function buildFleetVolumeHeatmapOption(
             `<span style="color:${CHART_THEME.textTertiary};">No data</span>`
           )
         }
-        const display = gib >= 1024 ? `${fmtNum(gib / 1024)} TiB` : `${fmtNum(gib)} GiB`
+        const display = formatGiB(gib)
         return (
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(dayLabel)} at ${escHtml(hourLabel)}</span><br/>` +
           chartTooltipRow(color, label, display)
@@ -146,6 +139,11 @@ function buildFleetVolumeHeatmapOption(
   }
 }
 
+const VOLUME_FIELD_TABS = [
+  { key: "upload" as const, label: "Upload" },
+  { key: "download" as const, label: "Download" },
+]
+
 function FleetVolumeHeatmap({ trackerData, height = 260 }: FleetVolumeHeatmapProps) {
   const [field, setField] = useState<VolumeField>("upload")
 
@@ -159,15 +157,7 @@ function FleetVolumeHeatmap({ trackerData, height = 260 }: FleetVolumeHeatmapPro
   return (
     <div>
       <div className="flex justify-end pb-2">
-        <TabBar
-          compact
-          tabs={[
-            { key: "upload" as const, label: "Upload" },
-            { key: "download" as const, label: "Download" },
-          ]}
-          activeTab={field}
-          onChange={setField}
-        />
+        <TabBar compact tabs={VOLUME_FIELD_TABS} activeTab={field} onChange={setField} />
       </div>
       <ChartECharts
         option={buildFleetVolumeHeatmapOption(data, maxValue, field)}
diff --git a/src/components/charts/MetricChart.tsx b/src/components/charts/MetricChart.tsx
index 75b8057b..3ff0b181 100644
--- a/src/components/charts/MetricChart.tsx
+++ b/src/components/charts/MetricChart.tsx
@@ -1,13 +1,12 @@
 // src/components/charts/MetricChart.tsx
-//
-// Functions: buildLineOption, buildDailyDeltaOption, MetricChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { bytesToGiB, getComplementaryColor } from "@/lib/formatters"
+import { getComplementaryColor } from "@/lib/color-utils"
+import { bytesToGiB, formatCount } from "@/lib/formatters"
+import { isValidHex } from "@/lib/validators"
 import type { Snapshot } from "@/types/api"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -75,7 +74,7 @@ const METRIC_CONFIGS: Record<Exclude<Metric, "dailyDelta">, MetricConfig> = {
   },
   ratio: {
     label: "Ratio",
-    unit: "×",
+    unit: "x",
     getValue: (s) => s.ratio,
   },
   buffer: {
@@ -155,7 +154,7 @@ function buildLineOption(
         const pair = items[0].value
         if (!pair || pair[1] === null || pair[1] === undefined) return ""
         const val = pair[1]
-        const display = config.isInteger ? Math.round(val).toLocaleString() : fmtNum(val)
+        const display = config.isInteger ? formatCount(Math.round(val)) : fmtNum(val)
         const ts = formatChartTimestamp(pair[0])
         return (
           chartTooltipHeader(ts) +
@@ -173,13 +172,13 @@ function buildLineOption(
       nameTextStyle: {
         color: TERTIARY_COLOR,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
       axisLabel: chartAxisLabel({
         formatter: config.isInteger
-          ? (val: number) => Math.round(val).toLocaleString()
+          ? (val: number) => formatCount(Math.round(val))
           : (val: number) => fmtNum(val, 1),
       }),
       splitLine: { lineStyle: { color: BORDER_SOFT, width: 1 } },
@@ -189,6 +188,7 @@ function buildLineOption(
       {
         name: config.label,
         type: "line",
+        sampling: "lttb",
         data,
         smooth: true,
         symbol: "circle",
@@ -215,7 +215,7 @@ function buildLineOption(
                   formatter: `Min: ${baselineValue}`,
                   position: "insideEndTop",
                   color: CHART_THEME.danger,
-                  fontSize: 10,
+                  fontSize: CHART_THEME.fontSizeCompact,
                   fontFamily: CHART_THEME.fontMono,
                 },
                 data: [{ yAxis: baselineValue }],
@@ -287,7 +287,7 @@ function buildDailyDeltaOption(
       nameTextStyle: {
         color: TERTIARY_COLOR,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -303,6 +303,7 @@ function buildDailyDeltaOption(
             {
               name: "Upload Δ",
               type: "line",
+              sampling: "lttb",
               data: finalUpload,
               smooth: true,
               symbol: "circle",
@@ -315,6 +316,7 @@ function buildDailyDeltaOption(
             {
               name: "Download Δ",
               type: "line",
+              sampling: "lttb",
               data: finalDownload,
               smooth: true,
               symbol: "circle",
@@ -366,7 +368,7 @@ function MetricChart({
 }: MetricChartProps) {
   const [deltaMode, setDeltaMode] = useState<DeltaMode>("bar")
 
-  const safeAccent = /^#[0-9a-fA-F]{6}$/.test(accentColor) ? accentColor : CHART_THEME.accent
+  const safeAccent = isValidHex(accentColor) ? accentColor : CHART_THEME.accent
 
   const config = metric !== "dailyDelta" ? METRIC_CONFIGS[metric] : null
   const ratioValues = config
diff --git a/src/components/charts/ParallelTorrentsChart.tsx b/src/components/charts/ParallelTorrentsChart.tsx
index 94866f5f..5d0ad116 100644
--- a/src/components/charts/ParallelTorrentsChart.tsx
+++ b/src/components/charts/ParallelTorrentsChart.tsx
@@ -1,19 +1,17 @@
 // src/components/charts/ParallelTorrentsChart.tsx
-//
-// Functions: buildParallelOption, ParallelTorrentsChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { hexToRgba } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import { hexToRgba } from "@/lib/color-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { fmtNum } from "./lib/chart-helpers"
 import { CHART_THEME, chartAxisLabel, chartTooltip, chartTooltipRow } from "./lib/theme"
 
 interface ParallelTorrentsChartProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   trackerColor: string
   height?: number
 }
@@ -33,15 +31,15 @@ const DIM_AVAILABILITY = 5
 // Option builder
 // ---------------------------------------------------------------------------
 
-function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): EChartsOption {
+function buildParallelOption(torrents: TorrentRaw[], trackerColor: string): EChartsOption {
   const nowSec = Date.now() / 1000
 
   // Pre-compute derived values
   const rows = torrents.map((t) => {
     const sizeGiB = t.size / 1024 ** 3
     const seedDays = t.seedingTime / 86400
-    const ageDays = (nowSec - t.addedOn) / 86400
-    return [sizeGiB, t.ratio, seedDays, t.numSeeds, ageDays, Math.max(0, t.availability ?? 0)]
+    const ageDays = (nowSec - t.addedAt) / 86400
+    return [sizeGiB, t.ratio, seedDays, t.seedCount, ageDays, Math.max(0, t.availability ?? 0)]
   })
 
   // Compute per-dimension min/max from data for reasonable axis ranges
@@ -57,7 +55,7 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
     }
   }
 
-  // Floor mins to 0 for non-negative dimensions; ensure non-zero range
+  // Floor mins to 0 for non-negative dimensions and ensures non-zero range
   const safeMins = mins.map((m) => Math.max(0, Number.isFinite(m) ? m : 0))
   const safeMaxs = maxs.map((m, i) => {
     const base = Number.isFinite(m) ? m : 1
@@ -100,7 +98,7 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
       min: safeMins[DIM_SEEDS],
       max: safeMaxs[DIM_SEEDS],
       axisLabel: {
-        formatter: (v: number) => Math.round(v).toLocaleString(),
+        formatter: (v: number) => formatCount(Math.round(v)),
       },
     },
     {
@@ -129,7 +127,7 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
     nameTextStyle: {
       color: CHART_THEME.textSecondary,
       fontFamily: CHART_THEME.fontMono,
-      fontSize: 11,
+      fontSize: CHART_THEME.fontSizeDense,
       fontWeight: 500,
     },
     axisLabel: chartAxisLabel(axis.axisLabel),
@@ -156,6 +154,7 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
   const lineEmphasisColor = hexToRgba(trackerColor, 0.75)
 
   return {
+    animation: false,
     backgroundColor: "transparent",
     tooltip: chartTooltip("item", {
       borderColor: trackerColor,
@@ -164,11 +163,11 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
         const d = p.data
         if (!d) return ""
         return [
-          `<span style="color:${CHART_THEME.textTertiary};font-size:11px;font-family:${CHART_THEME.fontMono};">Torrent</span>`,
+          `<span style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeDense}px;font-family:${CHART_THEME.fontMono};">Torrent</span>`,
           chartTooltipRow(trackerColor, "Size", `${fmtNum(d[DIM_SIZE], 2)} GiB`),
           chartTooltipRow(trackerColor, "Ratio", fmtNum(d[DIM_RATIO], 2)),
           chartTooltipRow(trackerColor, "Seed Time", `${fmtNum(d[DIM_SEED_TIME], 1)} days`),
-          chartTooltipRow(trackerColor, "Seeds", Math.round(d[DIM_SEEDS]).toLocaleString()),
+          chartTooltipRow(trackerColor, "Seeds", formatCount(Math.round(d[DIM_SEEDS]))),
           chartTooltipRow(trackerColor, "Age", `${fmtNum(d[DIM_AGE], 0)} days`),
           chartTooltipRow(trackerColor, "Availability", fmtNum(d[DIM_AVAILABILITY], 2)),
         ].join("<br/>")
@@ -189,6 +188,7 @@ function buildParallelOption(torrents: TorrentInfo[], trackerColor: string): ECh
       {
         type: "parallel",
         smooth: true,
+        progressive: 500,
         lineStyle: {
           color: lineColor,
           width: 1,
@@ -218,7 +218,7 @@ function ParallelTorrentsChart({
   trackerColor,
   height = 420,
 }: ParallelTorrentsChartProps) {
-  const filtered = torrents.filter((t) => t.addedOn !== 0 && t.size !== 0)
+  const filtered = torrents.filter((t) => t.addedAt !== 0 && t.size !== 0)
 
   if (filtered.length === 0) {
     return <ChartEmptyState height={height} message="No torrent data available for parallel view" />
diff --git a/src/components/charts/PercentileRadarChart.tsx b/src/components/charts/PercentileRadarChart.tsx
index 67d8567c..93235b80 100644
--- a/src/components/charts/PercentileRadarChart.tsx
+++ b/src/components/charts/PercentileRadarChart.tsx
@@ -1,11 +1,8 @@
 // src/components/charts/PercentileRadarChart.tsx
-//
-// Functions: PercentileRadarChart
-
 "use client"
 
 import { useMemo } from "react"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 import type { GazelleRanks } from "@/types/api"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -46,7 +43,7 @@ function PercentileRadarChart({ ranks, accentColor }: PercentileRadarChartProps)
         axisName: {
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
         },
         splitArea: {
           areaStyle: {
diff --git a/src/components/charts/RankTenureChart.tsx b/src/components/charts/RankTenureChart.tsx
index 3c560814..5ad8f0ec 100644
--- a/src/components/charts/RankTenureChart.tsx
+++ b/src/components/charts/RankTenureChart.tsx
@@ -10,8 +10,8 @@ import type {
   CustomSeriesRenderItemReturn,
   EChartsOption,
 } from "echarts"
-import { generatePalette } from "@/lib/formatters"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { generatePalette } from "@/lib/color-utils"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -27,10 +27,7 @@ import {
 // Types
 // ---------------------------------------------------------------------------
 
-interface RankTenureChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface RankTenureChartProps extends FleetChartProps {}
 
 interface RankPeriod {
   tracker: string
@@ -148,10 +145,10 @@ function buildRankTenureOption(
 
         const durationLabel = `${durationDays} day${durationDays !== 1 ? "s" : ""}`
         return [
-          `<div style="font-family:${CHART_THEME.fontMono};font-size:11px;color:${CHART_THEME.textTertiary};margin-bottom:4px;">${escHtml(trackerName)}</div>`,
+          `<div style="font-family:${CHART_THEME.fontMono};font-size:${CHART_THEME.fontSizeDense}px;color:${CHART_THEME.textTertiary};margin-bottom:4px;">${escHtml(trackerName)}</div>`,
           `${chartTooltipRow(color, "Rank", rankName)}<br/>`,
           `${chartTooltipRow(CHART_THEME.neutral, "Duration", durationLabel)}<br/>`,
-          `<span style="color:${CHART_THEME.textTertiary};font-size:11px;">${escHtml(startDate)} → ${escHtml(endDate)}</span>`,
+          `<span style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeDense}px;">${escHtml(startDate)} → ${escHtml(endDate)}</span>`,
         ].join("")
       },
     }),
@@ -178,7 +175,7 @@ function buildRankTenureOption(
       axisLabel: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
         width: 112,
         overflow: "truncate",
       },
@@ -235,7 +232,7 @@ function buildRankTenureOption(
                     textAlign: "left" as const,
                     textVerticalAlign: "middle" as const,
                     fill: CHART_THEME.textPrimary,
-                    fontSize: 10,
+                    fontSize: CHART_THEME.fontSizeCompact,
                     fontFamily: CHART_THEME.fontMono,
                     truncate: { outerWidth: width - 12, ellipsis: "…" },
                   },
diff --git a/src/components/charts/RatioStabilityChart.tsx b/src/components/charts/RatioStabilityChart.tsx
index 7e001201..ce9f0816 100644
--- a/src/components/charts/RatioStabilityChart.tsx
+++ b/src/components/charts/RatioStabilityChart.tsx
@@ -5,9 +5,10 @@
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatRatioDisplay } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -31,9 +32,7 @@ import {
 } from "./lib/theme"
 import { useLogScale } from "./lib/useLogScale"
 
-interface RatioStabilityChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
+interface RatioStabilityChartProps extends FleetChartProps {
   emaPeriod?: number
   bandWindow?: number
 }
@@ -124,6 +123,7 @@ function buildRatioStabilityOption(
     series.push({
       name: `${tracker.name}-lower`,
       type: "line",
+      sampling: "lttb",
       stack: stackId,
       data: lower,
       symbol: "none",
@@ -138,6 +138,7 @@ function buildRatioStabilityOption(
     series.push({
       name: `${tracker.name}-band`,
       type: "line",
+      sampling: "lttb",
       stack: stackId,
       data: bandDiffData,
       symbol: "none",
@@ -154,6 +155,7 @@ function buildRatioStabilityOption(
     series.push({
       name: tracker.name,
       type: "line",
+      sampling: "lttb",
       data: ema,
       symbol: "none",
       smooth: true,
@@ -214,7 +216,7 @@ function buildRatioStabilityOption(
             return (
               chartDot(item.color) +
               `<span style="color:${CHART_THEME.textSecondary};">${escHtml(item.seriesName)}:</span> ` +
-              `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${emaVal.toFixed(2)}×</span>` +
+              `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${formatRatioDisplay(emaVal)}</span>` +
               ` <span style="color:${CHART_THEME.textTertiary};">(EMA)</span>` +
               sigmaStr
             )
@@ -233,7 +235,7 @@ function buildRatioStabilityOption(
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
diff --git a/src/components/charts/SeedbonusRiverChart.tsx b/src/components/charts/SeedbonusRiverChart.tsx
index 9a180cff..81d8538e 100644
--- a/src/components/charts/SeedbonusRiverChart.tsx
+++ b/src/components/charts/SeedbonusRiverChart.tsx
@@ -1,11 +1,9 @@
 // src/components/charts/SeedbonusRiverChart.tsx
-//
-// Functions: buildRiverData, buildRiverOption, SeedbonusRiverChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import { formatCount } from "@/lib/formatters"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildAxisPointer, buildThemeRiverSingleAxis } from "./lib/chart-helpers"
@@ -22,10 +20,7 @@ import {
 // Types
 // ---------------------------------------------------------------------------
 
-interface SeedbonusRiverChartProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface SeedbonusRiverChartProps extends FleetChartProps {}
 
 // ---------------------------------------------------------------------------
 // Data builder
@@ -97,7 +92,7 @@ function buildRiverOption(
           .map((item) => {
             const trackerName = item.value[2]
             const bon = item.value[1]
-            const display = `${bon.toLocaleString()} BON`
+            const display = `${formatCount(Math.floor(bon))} BON`
             return chartTooltipRow(item.color, trackerName, display)
           })
           .join("<br/>")
@@ -114,7 +109,7 @@ function buildRiverOption(
           show: true,
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
         },
         emphasis: {
           itemStyle: {
diff --git a/src/components/charts/SpeedHistoryChart.tsx b/src/components/charts/SpeedHistoryChart.tsx
index e835bbdb..0fbd9622 100644
--- a/src/components/charts/SpeedHistoryChart.tsx
+++ b/src/components/charts/SpeedHistoryChart.tsx
@@ -1,12 +1,12 @@
 // src/components/charts/SpeedHistoryChart.tsx
-//
-// Functions: parseSpeedBytes, buildOption, SpeedHistoryChart
 
 "use client"
 
 import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
+import { hexToRgba } from "@/lib/color-utils"
 import type { FleetSnapshot } from "@/lib/fleet"
-import { formatBytesNum, hexToRgba } from "@/lib/formatters"
+import { formatSpeed } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildAxisPointer, buildTimeXAxis } from "./lib/chart-helpers"
@@ -27,8 +27,8 @@ interface SpeedHistoryChartProps {
   height?: number
 }
 
-const CYAN = CHART_THEME.accent
-const AMBER = CHART_THEME.warn
+const CYAN = CHART_THEME.upload
+const AMBER = CHART_THEME.download
 
 function parseSpeedBytes(val: string | null): number {
   if (!val) return 0
@@ -74,7 +74,7 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         const rows = items
           .map((item) => {
             const dot = chartDot(item.color)
-            const speedLabel = `${formatBytesNum(item.value[1])}/s`
+            const speedLabel = formatSpeed(item.value[1])
             return `${dot}<span style="color:${CHART_THEME.textSecondary};">${escHtml(item.seriesName)}:</span> <span style="color:${CHART_THEME.textPrimary};font-weight:600;">${speedLabel}</span>`
           })
           .join("<br/>")
@@ -94,13 +94,13 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         nameTextStyle: {
           color: CYAN,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
         },
         axisLine: { show: false },
         axisTick: { show: false },
         axisLabel: chartAxisLabel({
           color: CYAN,
-          formatter: (val: number) => `${formatBytesNum(val)}/s`,
+          formatter: (val: number) => formatSpeed(val),
         }),
         splitLine: {
           lineStyle: { color: CHART_THEME.gridLine, width: 1 },
@@ -112,14 +112,14 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         nameTextStyle: {
           color: AMBER,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
         },
         position: "right",
         axisLine: { show: false },
         axisTick: { show: false },
         axisLabel: chartAxisLabel({
           color: AMBER,
-          formatter: (val: number) => `${formatBytesNum(val)}/s`,
+          formatter: (val: number) => formatSpeed(val),
         }),
         splitLine: { show: false },
       },
@@ -132,6 +132,7 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         data: uploadData,
         smooth: true,
         symbol: "none",
+        sampling: "lttb",
         itemStyle: { color: CYAN },
         lineStyle: { color: CYAN, width: 2, shadowColor: CYAN, shadowBlur: 8 },
         emphasis: {
@@ -159,6 +160,7 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         data: downloadData,
         smooth: true,
         symbol: "none",
+        sampling: "lttb",
         itemStyle: { color: AMBER },
         lineStyle: { color: AMBER, width: 2, shadowColor: AMBER, shadowBlur: 8 },
         emphasis: {
@@ -184,6 +186,8 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
 }
 
 function SpeedHistoryChart({ snapshots, height = 360 }: SpeedHistoryChartProps) {
+  const option = useMemo(() => buildOption(snapshots), [snapshots])
+
   const hasSpeedData = snapshots.some(
     (s) => s.uploadSpeedBytes !== null || s.downloadSpeedBytes !== null
   )
@@ -192,7 +196,7 @@ function SpeedHistoryChart({ snapshots, height = 360 }: SpeedHistoryChartProps)
     return <ChartEmptyState height={height} message="No speed history data available yet." />
   }
 
-  return <ChartECharts option={buildOption(snapshots)} style={{ height, width: "100%" }} />
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { SpeedHistoryChartProps }
diff --git a/src/components/charts/SpeedThemeRiver.tsx b/src/components/charts/SpeedThemeRiver.tsx
index 98c4e223..7b769535 100644
--- a/src/components/charts/SpeedThemeRiver.tsx
+++ b/src/components/charts/SpeedThemeRiver.tsx
@@ -1,16 +1,14 @@
 // src/components/charts/SpeedThemeRiver.tsx
-//
-// Functions: buildRiverData, buildOption, SpeedThemeRiver
-
 "use client"
 
 import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
 import type { FleetSnapshot } from "@/lib/fleet"
 import { extractTagsFromSnapshots } from "@/lib/fleet"
-import { formatBytesNum } from "@/lib/formatters"
+import { formatSpeed } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
-import { buildAxisPointer, buildThemeRiverSingleAxis } from "./lib/chart-helpers"
+import { buildAxisPointer, buildThemeRiverSingleAxis, floorTimestamp } from "./lib/chart-helpers"
 import {
   buildTagColors,
   CHART_THEME,
@@ -26,34 +24,36 @@ interface SpeedThemeRiverProps {
 }
 
 function buildRiverData(snapshots: FleetSnapshot[], tags: string[]): [number, number, string][] {
-  // Group snapshots by timestamp, sum speeds per tag across all clients
-  const timeTagMap = new Map<number, Map<string, number>>()
+  // Bucket snapshots by hour, averaging speeds per tag within each bucket.
+  // This gives the river bands visible width at 7d/30d zoom levels.
+  const bucketMap = new Map<number, Map<string, { sum: number; count: number }>>()
 
   for (const snap of snapshots) {
     if (!snap.tagStats) continue
-    const ts = new Date(snap.polledAt).getTime()
+    const bucket = floorTimestamp(new Date(snap.polledAt).getTime(), "hour")
 
-    let tagAccum = timeTagMap.get(ts)
+    let tagAccum = bucketMap.get(bucket)
     if (!tagAccum) {
-      tagAccum = new Map<string, number>()
-      timeTagMap.set(ts, tagAccum)
+      tagAccum = new Map<string, { sum: number; count: number }>()
+      bucketMap.set(bucket, tagAccum)
     }
 
     for (const stat of snap.tagStats) {
-      const prev = tagAccum.get(stat.tag) ?? 0
-      tagAccum.set(stat.tag, prev + stat.uploadSpeed)
+      const prev = tagAccum.get(stat.tag) ?? { sum: 0, count: 0 }
+      tagAccum.set(stat.tag, { sum: prev.sum + stat.uploadSpeed, count: prev.count + 1 })
     }
   }
 
   const riverData: [number, number, string][] = []
-  const sortedTimestamps = Array.from(timeTagMap.keys()).sort((a, b) => a - b)
+  const sortedBuckets = Array.from(bucketMap.keys()).sort((a, b) => a - b)
 
-  for (const ts of sortedTimestamps) {
-    const tagAccum = timeTagMap.get(ts)
+  for (const bucket of sortedBuckets) {
+    const tagAccum = bucketMap.get(bucket)
     if (!tagAccum) continue
     for (const tag of tags) {
-      const speed = tagAccum.get(tag) ?? 0
-      riverData.push([ts, speed, tag])
+      const entry = tagAccum.get(tag)
+      const avgSpeed = entry ? entry.sum / entry.count : 0
+      riverData.push([bucket, avgSpeed, tag])
     }
   }
 
@@ -84,9 +84,7 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
         const rows = items
           .filter((item) => item.value[1] > 0)
           .sort((a, b) => b.value[1] - a.value[1])
-          .map((item) =>
-            chartTooltipRow(item.color, item.value[2], `${formatBytesNum(item.value[1])}/s`)
-          )
+          .map((item) => chartTooltipRow(item.color, item.value[2], formatSpeed(item.value[1])))
           .join("<br/>")
 
         return `${chartTooltipHeader(dateLabel)}${rows}`
@@ -97,12 +95,7 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
       {
         type: "themeRiver",
         data: riverData,
-        label: {
-          show: true,
-          color: CHART_THEME.textSecondary,
-          fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
-        },
+        label: { show: false },
         emphasis: {
           itemStyle: {
             shadowBlur: 20,
@@ -115,13 +108,15 @@ function buildOption(snapshots: FleetSnapshot[]): EChartsOption {
 }
 
 function SpeedThemeRiver({ snapshots, height = 360 }: SpeedThemeRiverProps) {
+  const option = useMemo(() => buildOption(snapshots), [snapshots])
+
   const hasTagStats = snapshots.some((s) => s.tagStats && s.tagStats.length > 0)
 
   if (!hasTagStats) {
     return <ChartEmptyState height={height} message="No tag speed data available yet." />
   }
 
-  return <ChartECharts option={buildOption(snapshots)} style={{ height, width: "100%" }} />
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { SpeedThemeRiverProps }
diff --git a/src/components/charts/StorageSunburst.tsx b/src/components/charts/StorageSunburst.tsx
index ea5a414a..2bb06d30 100644
--- a/src/components/charts/StorageSunburst.tsx
+++ b/src/components/charts/StorageSunburst.tsx
@@ -1,11 +1,9 @@
 // src/components/charts/StorageSunburst.tsx
-//
-// Functions: StorageSunburst, buildOption
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { formatBytesNum, generatePalette, hexToHsl, hslToHex } from "@/lib/formatters"
+import { generatePalette, hexToHsl, hslToHex } from "@/lib/color-utils"
+import { formatBytesNum } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { CHART_THEME, chartDot, chartTooltip, escHtml } from "./lib/theme"
@@ -97,7 +95,7 @@ function buildOption(
           const catName = path[1].name
           return (
             `${swatch}` +
-            `<span style="color:${CHART_THEME.textTertiary};font-size:10px;">${escHtml(catName)}</span><br/>` +
+            `<span style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeCompact}px;">${escHtml(catName)}</span><br/>` +
             `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(p.name)}</span><br/>` +
             `<span style="color:${CHART_THEME.textSecondary};">${formatBytesNum(p.value)}</span>`
           )
@@ -110,7 +108,7 @@ function buildOption(
             `${swatch}` +
             `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(p.name)}</span><br/>` +
             `<span style="color:${CHART_THEME.textSecondary};">${formatBytesNum(p.value)}</span>` +
-            `<span style="color:${CHART_THEME.textTertiary};font-size:10px;"> · ${childCount} torrent${childCount !== 1 ? "s" : ""}</span>`
+            `<span style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeCompact}px;"> · ${childCount} torrent${childCount !== 1 ? "s" : ""}</span>`
           )
         }
 
@@ -136,7 +134,7 @@ function buildOption(
           textStyle: {
             color: CHART_THEME.textSecondary,
             fontFamily: CHART_THEME.fontMono,
-            fontSize: 11,
+            fontSize: CHART_THEME.fontSizeDense,
           },
         },
         upperLabel: {
@@ -144,7 +142,7 @@ function buildOption(
           height: 24,
           color: CHART_THEME.textPrimary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           fontWeight: "bold" as const,
           formatter: (params: unknown) => {
             const p = params as { name: string; value: number }
@@ -155,7 +153,7 @@ function buildOption(
           show: true,
           color: CHART_THEME.textTertiary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 9,
+          fontSize: CHART_THEME.fontSizeMicro,
           formatter: "{b}",
           position: "insideTopLeft" as const,
         },
diff --git a/src/components/charts/TagCountTrends.tsx b/src/components/charts/TagCountTrends.tsx
index e0495307..2d94cf68 100644
--- a/src/components/charts/TagCountTrends.tsx
+++ b/src/components/charts/TagCountTrends.tsx
@@ -1,12 +1,11 @@
 // src/components/charts/TagCountTrends.tsx
-//
-// Functions: buildSeriesData, buildOption, TagCountTrends
-
 "use client"
 
 import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
 import type { FleetSnapshot } from "@/lib/fleet"
 import { extractTagsFromSnapshots } from "@/lib/fleet"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildAxisPointer, buildTimeXAxis } from "./lib/chart-helpers"
@@ -83,6 +82,7 @@ function buildOption(snapshots: FleetSnapshot[], mode: TagCountMode): EChartsOpt
       type: "line",
       data: seriesMap.get(tag) ?? [],
       smooth: true,
+      sampling: "lttb",
       lineStyle: { width: isSeeding ? 2 : 1.5, color },
       itemStyle: { color },
       ...(isSeeding
@@ -111,9 +111,7 @@ function buildOption(snapshots: FleetSnapshot[], mode: TagCountMode): EChartsOpt
         const rows = items
           .filter((item) => item.value[1] > 0)
           .sort((a, b) => b.value[1] - a.value[1])
-          .map((item) =>
-            chartTooltipRow(item.color, item.seriesName, item.value[1].toLocaleString())
-          )
+          .map((item) => chartTooltipRow(item.color, item.seriesName, formatCount(item.value[1])))
           .join("<br/>")
 
         return `${chartTooltipHeader(dateLabel)}${rows}`
@@ -130,12 +128,12 @@ function buildOption(snapshots: FleetSnapshot[], mode: TagCountMode): EChartsOpt
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
       axisLabel: chartAxisLabel({
-        formatter: (val: number) => val.toLocaleString(),
+        formatter: (val: number) => formatCount(Math.round(val)),
       }),
       splitLine: {
         lineStyle: { color: CHART_THEME.gridLine, width: 1 },
@@ -146,6 +144,8 @@ function buildOption(snapshots: FleetSnapshot[], mode: TagCountMode): EChartsOpt
 }
 
 function TagCountTrends({ snapshots, mode, height = 360 }: TagCountTrendsProps) {
+  const option = useMemo(() => buildOption(snapshots, mode), [snapshots, mode])
+
   const hasTagStats = snapshots.some((s) => s.tagStats && s.tagStats.length > 0)
 
   if (!hasTagStats) {
@@ -161,7 +161,7 @@ function TagCountTrends({ snapshots, mode, height = 360 }: TagCountTrendsProps)
     )
   }
 
-  return <ChartECharts option={buildOption(snapshots, mode)} style={{ height, width: "100%" }} />
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { TagCountTrendsProps }
diff --git a/src/components/charts/TagGroupBreakdownChart.tsx b/src/components/charts/TagGroupBreakdownChart.tsx
index e0b3531f..a696365c 100644
--- a/src/components/charts/TagGroupBreakdownChart.tsx
+++ b/src/components/charts/TagGroupBreakdownChart.tsx
@@ -4,8 +4,9 @@
 
 "use client"
 
+import { SlotLabel } from "@typography"
 import type { EChartsOption } from "echarts"
-import { hexToRgba } from "@/lib/formatters"
+import { formatCount, formatPercent } from "@/lib/formatters"
 import type { TagGroupChartType } from "@/types/api"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -31,12 +32,11 @@ interface TagGroupBreakdownChartProps {
 function memberColor(
   accentColor: string,
   member: { color: string | null },
-  index: number,
-  total: number
+  _index: number,
+  _total: number
 ): string {
   if (member.color) return member.color
-  const opacity = Math.max(0.4, 1 - index * (0.6 / Math.max(total - 1, 1)))
-  return hexToRgba(accentColor, opacity)
+  return accentColor
 }
 
 // ---------------------------------------------------------------------------
@@ -75,7 +75,7 @@ function barOption(
       axisLabel: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -99,7 +99,7 @@ function barOption(
           position: "right",
           formatter: "{c}",
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           color: CHART_THEME.textSecondary,
         },
       },
@@ -135,14 +135,18 @@ function donutOption(
           show: true,
           color: CHART_THEME.textSecondary,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 10,
+          fontSize: CHART_THEME.fontSizeCompact,
           formatter: "{b}: {c}",
         },
         labelLine: {
           lineStyle: { color: CHART_THEME.textTertiary },
         },
         emphasis: {
-          label: { fontSize: 12, fontWeight: "bold", color: CHART_THEME.textPrimary },
+          label: {
+            fontSize: CHART_THEME.fontSizeSmall,
+            fontWeight: "bold",
+            color: CHART_THEME.textPrimary,
+          },
         },
         data: members.map((m, i) => ({
           name: m.label,
@@ -182,7 +186,7 @@ function treemapOption(
         label: {
           show: true,
           fontFamily: CHART_THEME.fontMono,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           color: CHART_THEME.textPrimary,
           formatter: "{b}\n{c}",
         },
@@ -229,14 +233,14 @@ function TagGroupBreakdownChart({
     const total = items.reduce((sum, m) => sum + m.count, 0)
     const maxCount = Math.max(...items.map((m) => m.count))
 
-    // Single item: hero layout
+    // Single item: hero layout — fill the card, vertically centered
     if (items.length === 1) {
       const m = items[0]
       const color = memberColor(accentColor, m, 0, 1)
       return (
-        <div className="flex flex-col items-center justify-center gap-2 py-6">
+        <div className="flex flex-col items-center justify-center gap-2 flex-1">
           <span className="font-mono text-5xl font-bold tabular-nums" style={{ color }}>
-            {m.count.toLocaleString()}
+            {formatCount(m.count)}
           </span>
           <span className="text-sm font-sans font-medium text-secondary">{m.label}</span>
         </div>
@@ -264,14 +268,12 @@ function TagGroupBreakdownChart({
                 key={m.label}
                 className="relative flex flex-col gap-1 p-3 nm-inset-sm rounded-nm-md overflow-hidden"
               >
-                <span className="text-[10px] font-sans font-medium text-tertiary uppercase tracking-wider leading-tight">
-                  {m.label}
-                </span>
-                <div className="flex items-baseline gap-1.5">
+                <SlotLabel label={m.label} className="leading-tight" />
+                <div className="flex items-baseline gap-2">
                   <span className="font-mono text-lg font-semibold tabular-nums" style={{ color }}>
-                    {m.count.toLocaleString()}
+                    {formatCount(m.count)}
                   </span>
-                  <span className="text-[10px] font-mono text-tertiary">{pct.toFixed(0)}%</span>
+                  <span className="text-3xs font-mono text-tertiary">{formatPercent(pct, 0)}</span>
                 </div>
                 {/* Proportional bar */}
                 <div className="h-0.5 mt-0.5 rounded-full bg-control-bg">
@@ -286,9 +288,7 @@ function TagGroupBreakdownChart({
         </div>
         {/* Total footer */}
         <div className="flex justify-end px-1">
-          <span className="text-[10px] font-mono text-tertiary">
-            Total: {total.toLocaleString()}
-          </span>
+          <span className="text-3xs font-mono text-tertiary">Total: {formatCount(total)}</span>
         </div>
       </div>
     )
diff --git a/src/components/charts/TorrentActivityHeatmap.tsx b/src/components/charts/TorrentActivityHeatmap.tsx
index e079a1a4..5ee37139 100644
--- a/src/components/charts/TorrentActivityHeatmap.tsx
+++ b/src/components/charts/TorrentActivityHeatmap.tsx
@@ -1,44 +1,38 @@
 // src/components/charts/TorrentActivityHeatmap.tsx
-//
-// Functions: TorrentActivityHeatmap
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { hexToRgba } from "@/lib/formatters"
+import { useMemo } from "react"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { DAY_LABELS, HOUR_LABELS } from "./lib/chart-helpers"
 import { buildActivityMatrix } from "./lib/chart-transforms"
 import { CHART_THEME, chartAxisLabel, chartTooltip, escHtml } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Props
-// ---------------------------------------------------------------------------
-
-interface TorrentActivityHeatmapProps {
-  torrents: { addedOn: number }[]
+// Pre-aggregated props (fleet dashboard path)
+interface PreAggregatedProps {
+  grid: { data: [number, number, number][]; maxCount: number }
   accentColor?: string
   height?: number
 }
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
-function TorrentActivityHeatmap({
-  torrents,
-  accentColor = CHART_THEME.accent,
-  height = 240,
-}: TorrentActivityHeatmapProps) {
-  const validTimestamps = torrents.map((t) => t.addedOn).filter((ts) => ts > 0)
-  const { data, maxCount } = buildActivityMatrix(validTimestamps)
+// Raw torrents props (per-tracker page path)
+interface RawTorrentsProps {
+  torrents: { addedAt: number }[]
+  accentColor?: string
+  height?: number
+}
 
-  if (maxCount === 0) {
-    return <ChartEmptyState height={height} message="No activity data" />
-  }
+type TorrentActivityHeatmapProps = PreAggregatedProps | RawTorrentsProps
 
-  const option: EChartsOption = {
+function buildHeatmapOption(
+  data: [number, number, number][],
+  maxCount: number,
+  accentColor: string
+): EChartsOption {
+  return {
     backgroundColor: "transparent",
     tooltip: chartTooltip("item", {
       borderColor: accentColor,
@@ -49,7 +43,7 @@ function TorrentActivityHeatmap({
         const hourLabel = HOUR_LABELS[hour] ?? ""
         return (
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(dayLabel)} at ${escHtml(hourLabel)}</span><br/>` +
-          `<span style="color:${CHART_THEME.textSecondary};">${count.toLocaleString()} torrent${count !== 1 ? "s" : ""} added</span>`
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(count)} torrent${count !== 1 ? "s" : ""} added</span>`
         )
       },
     }),
@@ -105,8 +99,40 @@ function TorrentActivityHeatmap({
       },
     ],
   }
+}
+
+function TorrentActivityHeatmap(props: TorrentActivityHeatmapProps) {
+  const { accentColor = CHART_THEME.accent, height = 240 } = props
+
+  const isFleet = "grid" in props
+  const fleetGrid = isFleet ? (props as PreAggregatedProps).grid : null
+  const rawTorrents = !isFleet ? (props as RawTorrentsProps).torrents : []
+
+  const fleetOption = useMemo<EChartsOption | null>(() => {
+    if (!fleetGrid || fleetGrid.maxCount === 0) return null
+    return buildHeatmapOption(fleetGrid.data, fleetGrid.maxCount, accentColor)
+  }, [fleetGrid, accentColor])
+
+  const perTrackerOption = useMemo<EChartsOption | null>(() => {
+    if (isFleet) return null
+    const validTimestamps = rawTorrents.map((t) => t.addedAt).filter((ts) => ts > 0)
+    const { data, maxCount } = buildActivityMatrix(validTimestamps)
+    if (maxCount === 0) return null
+    return buildHeatmapOption(data, maxCount, accentColor)
+  }, [isFleet, rawTorrents, accentColor])
+
+  if (isFleet) {
+    if (!fleetGrid || fleetGrid.maxCount === 0 || !fleetOption) {
+      return <ChartEmptyState height={height} message="No activity data" />
+    }
+    return <ChartECharts option={fleetOption} style={{ height, width: "100%" }} />
+  }
+
+  if (!perTrackerOption) {
+    return <ChartEmptyState height={height} message="No activity data" />
+  }
 
-  return <ChartECharts option={option} style={{ height, width: "100%" }} />
+  return <ChartECharts option={perTrackerOption} style={{ height, width: "100%" }} />
 }
 
 export type { TorrentActivityHeatmapProps }
diff --git a/src/components/charts/TorrentAgeScatter3D.tsx b/src/components/charts/TorrentAgeScatter3D.tsx
index e7710211..de40690f 100644
--- a/src/components/charts/TorrentAgeScatter3D.tsx
+++ b/src/components/charts/TorrentAgeScatter3D.tsx
@@ -1,21 +1,15 @@
 // src/components/charts/TorrentAgeScatter3D.tsx
-//
-// Functions: TorrentAgeScatter3D
-
 "use client"
 
-import clsx from "clsx"
 import ReactECharts from "echarts-for-react"
 import "echarts-gl"
 import { useState } from "react"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import { FilterPill } from "@/components/ui/FilterPill"
+import type { TorrentRaw } from "@/lib/fleet"
+import { formatRatio } from "@/lib/formatters"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { CHART_THEME } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Types & Constants
-// ---------------------------------------------------------------------------
-
 type Scatter3DView = "age-seed" | "seed-ratio"
 
 const SCATTER3D_VIEWS: Record<
@@ -48,28 +42,20 @@ const SCATTER3D_VIEWS: Record<
   },
 }
 
-// ---------------------------------------------------------------------------
-// Props
-// ---------------------------------------------------------------------------
-
 interface TorrentAgeScatter3DProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   accentColor: string
 }
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
 function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps) {
   const [view, setView] = useState<Scatter3DView>("age-seed")
   const cfg = SCATTER3D_VIEWS[view]
 
   const now = Date.now() / 1000
   const data = torrents
-    .filter((t) => t.addedOn > 0)
+    .filter((t) => t.addedAt > 0)
     .map((t) => [
-      Math.floor((now - t.addedOn) / 86400), // 0: age
+      Math.floor((now - t.addedAt) / 86400), // 0: age
       Math.floor(t.seedingTime / 86400), // 1: seed time
       +(t.size / 1024 ** 3).toFixed(2), // 2: size
       Math.min(t.ratio, 10), // 3: ratio
@@ -83,9 +69,13 @@ function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps
     nameTextStyle: {
       color: CHART_THEME.textTertiary,
       fontFamily: CHART_THEME.fontMono,
-      fontSize: 10,
+      fontSize: CHART_THEME.fontSizeCompact,
+    },
+    axisLabel: {
+      color: CHART_THEME.textTertiary,
+      fontFamily: CHART_THEME.fontMono,
+      fontSize: CHART_THEME.fontSizeMicro,
     },
-    axisLabel: { color: CHART_THEME.textTertiary, fontFamily: CHART_THEME.fontMono, fontSize: 9 },
     axisLine: { lineStyle: { color: CHART_THEME.borderEmphasis } },
   }
 
@@ -94,7 +84,7 @@ function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps
     tooltip: {
       formatter: (p: { data: number[] }) => {
         const d = p.data
-        return `Age: ${d[0]}d<br/>Seed: ${d[1]}d<br/>Size: ${d[2]} GiB<br/>Ratio: ${d[3].toFixed(2)}`
+        return `Age: ${d[0]}d<br/>Seed: ${d[1]}d<br/>Size: ${d[2]} GiB<br/>Ratio: ${formatRatio(d[3])}`
       },
     },
     visualMap: {
@@ -115,7 +105,7 @@ function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
     },
     xAxis3D: { type: "value", name: cfg.x.name, ...axisStyle },
@@ -125,7 +115,7 @@ function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps
       boxWidth: 100,
       boxDepth: 80,
       boxHeight: 60,
-      viewControl: { autoRotate: true, autoRotateSpeed: 4 },
+      viewControl: { autoRotate: true, autoRotateSpeed: 4, distance: 220, minDistance: 220 },
       light: {
         main: { intensity: 1.2 },
         ambient: { intensity: 0.3 },
@@ -146,19 +136,15 @@ function TorrentAgeScatter3D({ torrents, accentColor }: TorrentAgeScatter3DProps
     <div className="flex flex-col gap-3">
       <div className="flex items-center gap-2">
         {(Object.keys(SCATTER3D_VIEWS) as Scatter3DView[]).map((key) => (
-          <button
+          <FilterPill
             key={key}
-            type="button"
+            size="sm"
+            active={view === key}
             onClick={() => setView(key)}
-            className={clsx(
-              "px-3 py-1.5 text-[11px] font-mono rounded-nm-pill transition-colors cursor-pointer",
-              view === key
-                ? "nm-raised-sm text-primary"
-                : "nm-inset-sm text-tertiary hover:text-secondary"
-            )}
-          >
-            {SCATTER3D_VIEWS[key].label}
-          </button>
+            inactive="inset"
+            text={SCATTER3D_VIEWS[key].label}
+            className="px-3 py-1.5 rounded-nm-pill"
+          />
         ))}
       </div>
       <p className="text-xs font-mono text-tertiary">{cfg.description}</p>
diff --git a/src/components/charts/TorrentAgeTimeline.tsx b/src/components/charts/TorrentAgeTimeline.tsx
index 34af74f8..9fd08322 100644
--- a/src/components/charts/TorrentAgeTimeline.tsx
+++ b/src/components/charts/TorrentAgeTimeline.tsx
@@ -3,7 +3,7 @@
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildGlowAreaStyle, buildTimeXAxis } from "./lib/chart-helpers"
@@ -14,7 +14,7 @@ import { CHART_THEME, chartGrid, chartTooltip, chartTooltipRow } from "./lib/the
 // ---------------------------------------------------------------------------
 
 interface TorrentAgeTimelineProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   accentColor: string
 }
 
@@ -23,7 +23,7 @@ interface TorrentAgeTimelineProps {
 // ---------------------------------------------------------------------------
 
 function TorrentAgeTimeline({ torrents, accentColor }: TorrentAgeTimelineProps) {
-  const withDates = torrents.filter((t) => t.addedOn > 0).sort((a, b) => a.addedOn - b.addedOn)
+  const withDates = torrents.filter((t) => t.addedAt > 0).sort((a, b) => a.addedAt - b.addedAt)
   if (withDates.length < 2) {
     return <ChartEmptyState height={220} message="Need 2+ torrents with dates" />
   }
@@ -32,7 +32,7 @@ function TorrentAgeTimeline({ torrents, accentColor }: TorrentAgeTimelineProps)
   const monthMap = new Map<string, number>()
   let cumulative = 0
   for (const t of withDates) {
-    const d = new Date(t.addedOn * 1000)
+    const d = new Date(t.addedAt * 1000)
     const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`
     cumulative++
     monthMap.set(key, cumulative)
@@ -55,7 +55,7 @@ function TorrentAgeTimeline({ torrents, accentColor }: TorrentAgeTimelineProps)
           year: "numeric",
         })
         return (
-          `<div style="margin-bottom:4px;color:${CHART_THEME.textTertiary};font-size:11px;">${label}</div>` +
+          `<div style="margin-bottom:4px;color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeDense}px;">${label}</div>` +
           chartTooltipRow(accentColor, "Torrents", String(p.value[1]))
         )
       },
@@ -68,12 +68,13 @@ function TorrentAgeTimeline({ torrents, accentColor }: TorrentAgeTimelineProps)
       axisLabel: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
     },
     series: [
       {
         type: "line",
+        sampling: "lttb",
         data: seriesData,
         smooth: true,
         symbol: "none",
diff --git a/src/components/charts/TorrentAvgSeedTime.tsx b/src/components/charts/TorrentAvgSeedTime.tsx
index 00c051ca..c55d430e 100644
--- a/src/components/charts/TorrentAvgSeedTime.tsx
+++ b/src/components/charts/TorrentAvgSeedTime.tsx
@@ -3,7 +3,7 @@
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildGlowAreaStyle, buildTimeXAxis } from "./lib/chart-helpers"
@@ -14,7 +14,7 @@ import { CHART_THEME, chartGrid, chartTooltip, chartTooltipRow } from "./lib/the
 // ---------------------------------------------------------------------------
 
 interface TorrentAvgSeedTimeProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   accentColor: string
 }
 
@@ -23,12 +23,12 @@ interface TorrentAvgSeedTimeProps {
 // ---------------------------------------------------------------------------
 
 function TorrentAvgSeedTime({ torrents, accentColor }: TorrentAvgSeedTimeProps) {
-  const withDates = torrents.filter((t) => t.addedOn > 0 && t.seedingTime > 0)
+  const withDates = torrents.filter((t) => t.addedAt > 0 && t.seedingTime > 0)
   if (withDates.length === 0) return <ChartEmptyState height={280} message="No seed time data" />
 
   const byMonth = new Map<string, { total: number; count: number }>()
   for (const t of withDates) {
-    const d = new Date(t.addedOn * 1000)
+    const d = new Date(t.addedAt * 1000)
     const key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`
     const entry = byMonth.get(key) ?? { total: 0, count: 0 }
     entry.total += t.seedingTime
@@ -55,7 +55,7 @@ function TorrentAvgSeedTime({ torrents, accentColor }: TorrentAvgSeedTimeProps)
           year: "numeric",
         })
         return (
-          `<div style="margin-bottom:4px;color:${CHART_THEME.textTertiary};font-size:11px;">${label}</div>` +
+          `<div style="margin-bottom:4px;color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeDense}px;">${label}</div>` +
           chartTooltipRow(accentColor, "Avg Seed Time", `${p.value[1]}d`)
         )
       },
@@ -68,18 +68,19 @@ function TorrentAvgSeedTime({ torrents, accentColor }: TorrentAvgSeedTimeProps)
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLabel: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       splitLine: { lineStyle: { color: CHART_THEME.gridLine } },
     },
     series: [
       {
         type: "line",
+        sampling: "lttb",
         data: seriesData,
         smooth: true,
         symbol: "circle",
diff --git a/src/components/charts/TorrentCategoryAcquisition.tsx b/src/components/charts/TorrentCategoryAcquisition.tsx
index 0d036970..c288e8bf 100644
--- a/src/components/charts/TorrentCategoryAcquisition.tsx
+++ b/src/components/charts/TorrentCategoryAcquisition.tsx
@@ -1,30 +1,22 @@
 // src/components/charts/TorrentCategoryAcquisition.tsx
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { generatePalette } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import { generatePalette } from "@/lib/color-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import { localDateStr } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildTimeXAxis } from "./lib/chart-helpers"
 import { CHART_THEME, chartGrid, chartTooltip } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Props
-// ---------------------------------------------------------------------------
-
 interface TorrentCategoryAcquisitionProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   accentColor: string
 }
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
 function TorrentCategoryAcquisition({ torrents, accentColor }: TorrentCategoryAcquisitionProps) {
-  const withDates = torrents.filter((t) => t.addedOn > 0)
+  const withDates = torrents.filter((t) => t.addedAt > 0)
   if (withDates.length < 2) {
     return <ChartEmptyState height={280} message="Need 2+ torrents with dates" />
   }
@@ -34,7 +26,7 @@ function TorrentCategoryAcquisition({ torrents, accentColor }: TorrentCategoryAc
   const allCategories = new Set<string>()
 
   for (const t of withDates) {
-    const month = new Date(t.addedOn * 1000).toISOString().slice(0, 7) // YYYY-MM
+    const month = localDateStr(new Date(t.addedAt * 1000)).slice(0, 7) // YYYY-MM
     const cat = t.category || "Uncategorized"
     allCategories.add(cat)
     if (!monthCatMap.has(month)) monthCatMap.set(month, new Map())
@@ -73,7 +65,7 @@ function TorrentCategoryAcquisition({ torrents, accentColor }: TorrentCategoryAc
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       pageTextStyle: { color: CHART_THEME.textTertiary },
       pageIconColor: CHART_THEME.textSecondary,
@@ -87,7 +79,7 @@ function TorrentCategoryAcquisition({ torrents, accentColor }: TorrentCategoryAc
       axisLabel: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
     },
     series,
diff --git a/src/components/charts/TorrentCategoryDonut.tsx b/src/components/charts/TorrentCategoryDonut.tsx
index 2b424a00..8ea919b5 100644
--- a/src/components/charts/TorrentCategoryDonut.tsx
+++ b/src/components/charts/TorrentCategoryDonut.tsx
@@ -3,7 +3,8 @@
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { formatBytesNum, generatePalette } from "@/lib/formatters"
+import { generatePalette } from "@/lib/color-utils"
+import { formatBytesNum } from "@/lib/formatters"
 import type { CategoryStats } from "@/lib/torrent-utils"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -49,7 +50,7 @@ function TorrentCategoryDonut({ categories, accentColor }: TorrentCategoryDonutP
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
       },
       itemWidth: 10,
       itemHeight: 10,
@@ -64,14 +65,14 @@ function TorrentCategoryDonut({ categories, accentColor }: TorrentCategoryDonutP
           formatter: `{total|${total}}\n{label|torrents}`,
           rich: {
             total: {
-              fontSize: 22,
+              fontSize: 24,
               fontWeight: "bold",
               fontFamily: CHART_THEME.fontMono,
               color: CHART_THEME.textPrimary,
               lineHeight: 30,
             },
             label: {
-              fontSize: 11,
+              fontSize: CHART_THEME.fontSizeDense,
               fontFamily: CHART_THEME.fontMono,
               color: CHART_THEME.textTertiary,
               lineHeight: 16,
diff --git a/src/components/charts/TorrentCategoryRadar.tsx b/src/components/charts/TorrentCategoryRadar.tsx
index f77ea93d..72eb4c1a 100644
--- a/src/components/charts/TorrentCategoryRadar.tsx
+++ b/src/components/charts/TorrentCategoryRadar.tsx
@@ -1,28 +1,20 @@
 // src/components/charts/TorrentCategoryRadar.tsx
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { formatBytesNum, formatDuration, generatePalette, hexToRgba } from "@/lib/formatters"
+import { generatePalette, hexToRgba } from "@/lib/color-utils"
+import { formatBytesNum, formatCount, formatDuration, formatRatio } from "@/lib/formatters"
 import type { CategoryStats } from "@/lib/torrent-utils"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { CHART_THEME, chartTooltip, chartTooltipRow, escHtml } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
 /** Normalize a value to 0-100 scale for radar chart */
 function normalize(value: number, max: number): number {
   if (max === 0) return 0
   return Math.min((value / max) * 100, 100)
 }
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
 interface TorrentCategoryRadarProps {
   categories: CategoryStats[]
   accentColor: string
@@ -78,9 +70,9 @@ function TorrentCategoryRadar({ categories, accentColor }: TorrentCategoryRadarP
         if (!cat) return ""
         return [
           `<span style="color:${p.color};font-weight:600;">${escHtml(p.name)}</span>`,
-          chartTooltipRow(p.color, "Torrents", String(cat.count)),
+          chartTooltipRow(p.color, "Torrents", formatCount(cat.count)),
           chartTooltipRow(CHART_THEME.neutral, "Size", formatBytesNum(cat.totalSize)),
-          chartTooltipRow(CHART_THEME.neutral, "Avg Ratio", cat.avgRatio.toFixed(2)),
+          chartTooltipRow(CHART_THEME.neutral, "Avg Ratio", formatRatio(cat.avgRatio)),
           chartTooltipRow(CHART_THEME.neutral, "Avg Seed Time", formatDuration(cat.avgSeedTime)),
           chartTooltipRow(CHART_THEME.neutral, "Avg Swarm Seeds", cat.avgSwarmSeeds.toFixed(0)),
         ].join("<br/>")
@@ -91,7 +83,7 @@ function TorrentCategoryRadar({ categories, accentColor }: TorrentCategoryRadarP
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 12,
+        fontSize: CHART_THEME.fontSizeSmall,
       },
       itemWidth: 14,
       itemHeight: 10,
@@ -106,7 +98,7 @@ function TorrentCategoryRadar({ categories, accentColor }: TorrentCategoryRadarP
       axisName: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
       },
       splitLine: { lineStyle: { color: CHART_THEME.gridLine } },
       splitArea: { show: false },
diff --git a/src/components/charts/TorrentCrossSeedDonut.tsx b/src/components/charts/TorrentCrossSeedDonut.tsx
index 06850424..985cb51c 100644
--- a/src/components/charts/TorrentCrossSeedDonut.tsx
+++ b/src/components/charts/TorrentCrossSeedDonut.tsx
@@ -1,19 +1,13 @@
 // src/components/charts/TorrentCrossSeedDonut.tsx
-//
-// Functions: TorrentCrossSeedDonut
-
 "use client"
 
-import { getComplementaryColor, hexToRgba } from "@/lib/formatters"
+import { getComplementaryColor, hexToRgba } from "@/lib/color-utils"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildDonutShell } from "./lib/chart-helpers"
 import { CHART_THEME, chartTooltip, escHtml } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
-
 interface TorrentCrossSeedDonutProps {
   crossSeeded: number
   unique: number
@@ -38,7 +32,7 @@ function TorrentCrossSeedDonut({ crossSeeded, unique, accentColor }: TorrentCros
       formatter: (params: unknown) => {
         const p = params as { name: string; value: number; color: string }
         const pct = total > 0 ? ((p.value / total) * 100).toFixed(1) : "0"
-        return `<span style="color:${p.color};">●</span> <b>${escHtml(p.name)}</b><br/>${p.value.toLocaleString()} torrents · ${pct}%`
+        return `<span style="color:${p.color};">●</span> <b>${escHtml(p.name)}</b><br/>${formatCount(p.value)} torrents · ${pct}%`
       },
     }),
     graphic: [
@@ -62,7 +56,7 @@ function TorrentCrossSeedDonut({ crossSeeded, unique, accentColor }: TorrentCros
         style: {
           text: "cross-seeded",
           fill: CHART_THEME.textTertiary,
-          fontSize: 11,
+          fontSize: CHART_THEME.fontSizeDense,
           fontFamily: CHART_THEME.fontMono,
           textAlign: "center" as const,
         },
diff --git a/src/components/charts/TorrentRatioDistribution.tsx b/src/components/charts/TorrentRatioDistribution.tsx
index 40d7f9f8..2d0d52a8 100644
--- a/src/components/charts/TorrentRatioDistribution.tsx
+++ b/src/components/charts/TorrentRatioDistribution.tsx
@@ -1,47 +1,128 @@
 // src/components/charts/TorrentRatioDistribution.tsx
-//
-// Functions: TorrentRatioDistribution
-
 "use client"
 
+import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
 import { getRatioBuckets } from "@/lib/fleet"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildBucketedBarOption } from "./lib/chart-helpers"
-import { CHART_THEME } from "./lib/theme"
+import { CHART_THEME, chartAxisLabel, chartDot, chartGrid, chartTooltip } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
+// Pre-aggregated props (fleet dashboard path)
+interface PreAggregatedProps {
+  buckets: { label: string; count: number; min: number; max: number }[]
+  accentColor?: string
+  height?: number
+}
 
-interface TorrentRatioDistributionProps {
+// Raw torrents props (per-tracker page path)
+interface RawTorrentsProps {
   torrents: { ratio: number }[]
   accentColor?: string
   height?: number
 }
 
-function TorrentRatioDistribution({
-  torrents,
-  accentColor = CHART_THEME.accent,
-  height = 280,
-}: TorrentRatioDistributionProps) {
-  if (torrents.length === 0) {
-    return <ChartEmptyState height={height} message="No torrent data available" />
+type TorrentRatioDistributionProps = PreAggregatedProps | RawTorrentsProps
+
+function buildRatioBucketedOption(
+  buckets: { label: string; count: number }[],
+  colors: string[],
+  labelPrefix: string
+): EChartsOption {
+  const total = buckets.reduce((sum, b) => sum + b.count, 0)
+  const data = buckets.map((b, i) => ({
+    value: b.count,
+    itemStyle: { color: colors[i], borderRadius: [4, 4, 0, 0] },
+  }))
+
+  return {
+    backgroundColor: "transparent",
+    grid: chartGrid({ top: 24, right: 16, bottom: 40, left: 48 }),
+    tooltip: chartTooltip("item", {
+      formatter: (params: unknown) => {
+        const p = params as { value: number; color: string; dataIndex: number }
+        const bucket = buckets[p.dataIndex]
+        if (!bucket) return ""
+        const pct = total > 0 ? ((bucket.count / total) * 100).toFixed(1) : "0.0"
+        return (
+          chartDot(p.color) +
+          `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${labelPrefix} ${bucket.label}</span><br/>` +
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(bucket.count)} torrents</span>` +
+          `<span style="color:${CHART_THEME.textTertiary};"> · ${pct}%</span>`
+        )
+      },
+    }),
+    xAxis: {
+      type: "category",
+      data: buckets.map((b) => b.label),
+      axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
+      axisTick: { show: false },
+      axisLabel: chartAxisLabel(),
+    },
+    yAxis: {
+      type: "value",
+      axisLine: { show: false },
+      axisTick: { show: false },
+      axisLabel: chartAxisLabel(),
+      splitLine: { lineStyle: { color: CHART_THEME.gridLine } },
+    },
+    series: [
+      {
+        type: "bar",
+        data,
+        barMaxWidth: 48,
+        emphasis: { itemStyle: { shadowBlur: 10, shadowColor: "rgba(0,0,0,0.3)" } },
+      },
+    ],
   }
+}
 
-  const buckets = getRatioBuckets(accentColor)
+function TorrentRatioDistribution(props: TorrentRatioDistributionProps) {
+  const { accentColor = CHART_THEME.accent, height = 280 } = props
 
-  const option = buildBucketedBarOption({
-    buckets,
-    torrents,
-    getThreshold: (b) => b.max,
-    getValue: (t) => t.ratio,
-    getLabel: (b) => b.label,
-    getColor: (b) => b.color,
-    labelPrefix: "Ratio",
-  })
+  const isFleet = "buckets" in props
+  const fleetBuckets = isFleet ? (props as PreAggregatedProps).buckets : null
+  const rawTorrents = !isFleet ? (props as RawTorrentsProps).torrents : []
+
+  const fleetOption = useMemo<EChartsOption | null>(() => {
+    if (!fleetBuckets || fleetBuckets.length === 0 || fleetBuckets.every((b) => b.count === 0)) {
+      return null
+    }
+    const coloredBuckets = getRatioBuckets(accentColor)
+    const colors = fleetBuckets.map(
+      (_b, i) => coloredBuckets[i]?.color ?? CHART_THEME.chartFallback
+    )
+    return buildRatioBucketedOption(fleetBuckets, colors, "Ratio")
+  }, [fleetBuckets, accentColor])
+
+  const perTrackerOption = useMemo<EChartsOption | null>(() => {
+    if (isFleet || rawTorrents.length === 0) return null
+    const buckets = getRatioBuckets(accentColor)
+    return buildBucketedBarOption({
+      buckets,
+      torrents: rawTorrents,
+      getThreshold: (b) => b.max,
+      getValue: (t) => t.ratio,
+      getLabel: (b) => b.label,
+      getColor: (b) => b.color,
+      labelPrefix: "Ratio",
+    })
+  }, [isFleet, rawTorrents, accentColor])
+
+  if (isFleet) {
+    if (!fleetOption) {
+      return <ChartEmptyState height={height} message="No torrent data available" />
+    }
+    return <ChartECharts option={fleetOption} style={{ height, width: "100%" }} />
+  }
+
+  if (!perTrackerOption) {
+    return <ChartEmptyState height={height} message="No torrent data available" />
+  }
 
-  return <ChartECharts option={option} style={{ height, width: "100%" }} />
+  return <ChartECharts option={perTrackerOption} style={{ height, width: "100%" }} />
 }
 
 export type { TorrentRatioDistributionProps }
diff --git a/src/components/charts/TorrentSeedTimeDistribution.tsx b/src/components/charts/TorrentSeedTimeDistribution.tsx
index 5dc3f907..789d41da 100644
--- a/src/components/charts/TorrentSeedTimeDistribution.tsx
+++ b/src/components/charts/TorrentSeedTimeDistribution.tsx
@@ -1,66 +1,163 @@
 // src/components/charts/TorrentSeedTimeDistribution.tsx
-//
-// Functions: TorrentSeedTimeDistribution
-
 "use client"
 
+import type { EChartsOption } from "echarts"
+import { useMemo } from "react"
 import { getSeedTimeBuckets, SEEDING_STATES } from "@/lib/fleet"
+import { formatCount } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { buildBucketedBarOption } from "./lib/chart-helpers"
-import { CHART_THEME } from "./lib/theme"
+import { CHART_THEME, chartAxisLabel, chartDot, chartGrid, chartTooltip } from "./lib/theme"
 
-// ---------------------------------------------------------------------------
-// Component
-// ---------------------------------------------------------------------------
+// Pre-aggregated props (fleet dashboard path)
+interface PreAggregatedProps {
+  buckets: { label: string; count: number; color: string; max: number }[]
+  seedTimeHours?: number | null
+  height?: number
+}
 
-interface TorrentSeedTimeDistributionProps {
+// Raw torrents props (per-tracker page path)
+interface RawTorrentsProps {
   torrents: { state: string; seedingTime: number }[]
   seedTimeHours?: number | null
   accentColor?: string
   height?: number
 }
 
-function TorrentSeedTimeDistribution({
-  torrents,
-  seedTimeHours = null,
-  accentColor = CHART_THEME.accent,
-  height = 200,
-}: TorrentSeedTimeDistributionProps) {
-  const seeding = torrents.filter((t) => SEEDING_STATES.has(t.state))
+type TorrentSeedTimeDistributionProps = PreAggregatedProps | RawTorrentsProps
 
-  if (seeding.length === 0) {
-    return <ChartEmptyState height={height} message="No seeding torrents found" />
+function computeMarkLine(
+  buckets: { max: number }[],
+  seedTimeHours: number | null
+): { thresholdIdx: number; label: string; color: string } | undefined {
+  if (seedTimeHours == null || seedTimeHours <= 0) return undefined
+  const thresholdSeconds = seedTimeHours * 3600
+  const idx = buckets.findIndex((b, i) => {
+    const prevMax = i === 0 ? 0 : (buckets[i - 1]?.max ?? 0)
+    return thresholdSeconds >= prevMax && thresholdSeconds < b.max
+  })
+  if (idx === -1) return undefined
+  const label = seedTimeHours % 24 === 0 ? `Min: ${seedTimeHours / 24}d` : `Min: ${seedTimeHours}h`
+  return { thresholdIdx: idx, label, color: CHART_THEME.warn }
+}
+
+function buildSeedTimeBucketedOption(
+  buckets: { label: string; count: number; color: string; max: number }[],
+  markLine?: { thresholdIdx: number; label: string; color: string }
+): EChartsOption {
+  const total = buckets.reduce((sum, b) => sum + b.count, 0)
+  const data = buckets.map((b) => ({
+    value: b.count,
+    itemStyle: { color: b.color, borderRadius: [4, 4, 0, 0] },
+  }))
+
+  const seriesEntry: Record<string, unknown> = {
+    type: "bar",
+    data,
+    barMaxWidth: 48,
+    emphasis: { itemStyle: { shadowBlur: 10, shadowColor: "rgba(0,0,0,0.3)" } },
+  }
+
+  if (markLine) {
+    seriesEntry.markLine = {
+      silent: true,
+      symbol: "none",
+      data: [{ xAxis: markLine.thresholdIdx }],
+      lineStyle: { color: markLine.color, type: "dashed", width: 1 },
+      label: {
+        show: true,
+        formatter: markLine.label,
+        position: "end",
+        color: markLine.color,
+        fontSize: CHART_THEME.fontSizeCompact,
+      },
+    }
+  }
+
+  return {
+    backgroundColor: "transparent",
+    grid: chartGrid({ top: 24, right: 16, bottom: 40, left: 48 }),
+    tooltip: chartTooltip("item", {
+      formatter: (params: unknown) => {
+        const p = params as { value: number; color: string; dataIndex: number }
+        const bucket = buckets[p.dataIndex]
+        if (!bucket) return ""
+        const pct = total > 0 ? ((bucket.count / total) * 100).toFixed(1) : "0.0"
+        return (
+          chartDot(p.color) +
+          `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">Seed Time ${bucket.label}</span><br/>` +
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(bucket.count)} torrents</span>` +
+          `<span style="color:${CHART_THEME.textTertiary};"> · ${pct}%</span>`
+        )
+      },
+    }),
+    xAxis: {
+      type: "category",
+      data: buckets.map((b) => b.label),
+      axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
+      axisTick: { show: false },
+      axisLabel: chartAxisLabel(),
+    },
+    yAxis: {
+      type: "value",
+      axisLine: { show: false },
+      axisTick: { show: false },
+      axisLabel: chartAxisLabel(),
+      splitLine: { lineStyle: { color: CHART_THEME.gridLine } },
+    },
+    series: [seriesEntry],
   }
+}
+
+function TorrentSeedTimeDistribution(props: TorrentSeedTimeDistributionProps) {
+  const { seedTimeHours = null, height = 200 } = props
 
-  const buckets = getSeedTimeBuckets(accentColor)
+  const isFleet = "buckets" in props
+  const fleetBuckets = isFleet ? (props as PreAggregatedProps).buckets : null
+  const rawTorrents = !isFleet ? (props as RawTorrentsProps).torrents : []
+  const accentColor = !isFleet
+    ? ((props as RawTorrentsProps).accentColor ?? CHART_THEME.accent)
+    : CHART_THEME.accent
 
-  let markLine: { thresholdIdx: number; label: string; color: string } | undefined
-  if (seedTimeHours != null && seedTimeHours > 0) {
-    const thresholdSeconds = seedTimeHours * 3600
-    const idx = buckets.findIndex((b, i) => {
-      const prevMax = i === 0 ? 0 : buckets[i - 1].max
-      return thresholdSeconds >= prevMax && thresholdSeconds < b.max
+  const fleetOption = useMemo<EChartsOption | null>(() => {
+    if (!fleetBuckets || fleetBuckets.length === 0 || fleetBuckets.every((b) => b.count === 0)) {
+      return null
+    }
+    const markLine = computeMarkLine(fleetBuckets, seedTimeHours)
+    return buildSeedTimeBucketedOption(fleetBuckets, markLine)
+  }, [fleetBuckets, seedTimeHours])
+
+  const perTrackerOption = useMemo<EChartsOption | null>(() => {
+    if (isFleet) return null
+    const seeding = rawTorrents.filter((t) => SEEDING_STATES.has(t.state))
+    if (seeding.length === 0) return null
+    const buckets = getSeedTimeBuckets(accentColor)
+    const markLine = computeMarkLine(buckets, seedTimeHours)
+    return buildBucketedBarOption({
+      buckets,
+      torrents: seeding,
+      getThreshold: (b) => b.max,
+      getValue: (t) => t.seedingTime,
+      getLabel: (b) => b.label,
+      getColor: (b) => b.color,
+      labelPrefix: "Seed Time",
+      markLine,
     })
-    if (idx !== -1) {
-      const label =
-        seedTimeHours % 24 === 0 ? `Min: ${seedTimeHours / 24}d` : `Min: ${seedTimeHours}h`
-      markLine = { thresholdIdx: idx, label, color: CHART_THEME.warn }
+  }, [isFleet, rawTorrents, accentColor, seedTimeHours])
+
+  if (isFleet) {
+    if (!fleetOption) {
+      return <ChartEmptyState height={height} message="No seeding torrents found" />
     }
+    return <ChartECharts option={fleetOption} style={{ height, width: "100%" }} />
   }
 
-  const option = buildBucketedBarOption({
-    buckets,
-    torrents: seeding,
-    getThreshold: (b) => b.max,
-    getValue: (t) => t.seedingTime,
-    getLabel: (b) => b.label,
-    getColor: (b) => b.color,
-    labelPrefix: "Seed Time",
-    markLine,
-  })
+  if (!perTrackerOption) {
+    return <ChartEmptyState height={height} message="No seeding torrents found" />
+  }
 
-  return <ChartECharts option={option} style={{ height, width: "100%" }} />
+  return <ChartECharts option={perTrackerOption} style={{ height, width: "100%" }} />
 }
 
 export type { TorrentSeedTimeDistributionProps }
diff --git a/src/components/charts/TorrentSizeBreakdown.tsx b/src/components/charts/TorrentSizeBreakdown.tsx
index 536aefc2..3bf5809b 100644
--- a/src/components/charts/TorrentSizeBreakdown.tsx
+++ b/src/components/charts/TorrentSizeBreakdown.tsx
@@ -3,7 +3,8 @@
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { formatBytesNum, generatePalette } from "@/lib/formatters"
+import { generatePalette } from "@/lib/color-utils"
+import { formatBytesNum } from "@/lib/formatters"
 import type { CategoryStats } from "@/lib/torrent-utils"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -50,7 +51,7 @@ function TorrentSizeBreakdown({ categories, accentColor }: TorrentSizeBreakdownP
       axisLabel: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
         formatter: (val: number) => formatBytesNum(val),
       },
       splitLine: { lineStyle: { color: CHART_THEME.gridLine } },
@@ -61,7 +62,7 @@ function TorrentSizeBreakdown({ categories, accentColor }: TorrentSizeBreakdownP
       axisLabel: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
         width: 80,
         overflow: "truncate",
       },
@@ -86,7 +87,7 @@ function TorrentSizeBreakdown({ categories, accentColor }: TorrentSizeBreakdownP
   return (
     <ChartECharts
       option={option}
-      style={{ height: Math.max(160, top.length * 36), width: "100%" }}
+      style={{ height: Math.max(280, top.length * 36), width: "100%" }}
     />
   )
 }
diff --git a/src/components/charts/TrackerBubbleChart.tsx b/src/components/charts/TrackerBubbleChart.tsx
index d1991072..ca4662c3 100644
--- a/src/components/charts/TrackerBubbleChart.tsx
+++ b/src/components/charts/TrackerBubbleChart.tsx
@@ -1,11 +1,8 @@
 // src/components/charts/TrackerBubbleChart.tsx
-//
-// Functions: computeBubbleSize, buildBubbleOption, TrackerBubbleChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { bytesToGiB } from "@/lib/formatters"
+import { bytesToGiB, formatCount, formatRatioDisplay } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { autoByteScale, fmtNum } from "./lib/chart-helpers"
@@ -120,7 +117,7 @@ function buildBubbleOption(trackers: ValidTrackerData[], forceLog: boolean | nul
               formatter: "1:1 ratio",
               color: CHART_THEME.textTertiary,
               fontFamily: CHART_THEME.fontMono,
-              fontSize: 10,
+              fontSize: CHART_THEME.fontSizeCompact,
             },
             data: [
               [
@@ -154,7 +151,7 @@ function buildBubbleOption(trackers: ValidTrackerData[], forceLog: boolean | nul
 
   return {
     backgroundColor: "transparent",
-    grid: chartGrid({ right: 24, bottom: 48, left: 72 }),
+    grid: chartGrid({ right: 48, bottom: 56, left: 72 }),
     tooltip: chartTooltip("item", {
       formatter: (params: unknown) => {
         const p = params as {
@@ -170,15 +167,15 @@ function buildBubbleOption(trackers: ValidTrackerData[], forceLog: boolean | nul
         const match = scaled.find((d) => d.tracker.name === p.seriesName)
         const seedingCount = match?.tracker.seedingCount ?? 0
 
-        const ratio = downloadVal > 0 ? (uploadVal / downloadVal).toFixed(2) : "∞"
+        const ratio = formatRatioDisplay(downloadVal > 0 ? uploadVal / downloadVal : Infinity)
 
         return [
-          `<div style="font-family:${CHART_THEME.fontMono};font-size:12px;">`,
+          `<div style="font-family:${CHART_THEME.fontMono};font-size:${CHART_THEME.fontSizeSmall}px;">`,
           `${chartDot(color.startsWith("#") ? color : CHART_THEME.neutral)}<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(p.seriesName)}</span>`,
           `<br/><span style="color:${CHART_THEME.textSecondary};">Uploaded:</span> <span style="color:${CHART_THEME.textPrimary};">${fmtNum(uploadVal)} ${unit}</span>`,
           `<br/><span style="color:${CHART_THEME.textSecondary};">Downloaded:</span> <span style="color:${CHART_THEME.textPrimary};">${fmtNum(downloadVal)} ${unit}</span>`,
-          `<br/><span style="color:${CHART_THEME.textSecondary};">Seeding:</span> <span style="color:${CHART_THEME.textPrimary};">${seedingCount.toLocaleString()} torrents</span>`,
-          `<br/><span style="color:${CHART_THEME.textSecondary};">Ratio:</span> <span style="color:${CHART_THEME.textPrimary};">${ratio}×</span>`,
+          `<br/><span style="color:${CHART_THEME.textSecondary};">Seeding:</span> <span style="color:${CHART_THEME.textPrimary};">${formatCount(seedingCount)} torrents</span>`,
+          `<br/><span style="color:${CHART_THEME.textSecondary};">Ratio:</span> <span style="color:${CHART_THEME.textPrimary};">${ratio}</span>`,
           "</div>",
         ].join("")
       },
@@ -187,11 +184,13 @@ function buildBubbleOption(trackers: ValidTrackerData[], forceLog: boolean | nul
     xAxis: {
       type: useLogX ? "log" : "value",
       name: useLogX ? `Downloaded (${unit}, log)` : `Downloaded (${unit})`,
+      nameLocation: "center",
+      nameGap: 32,
       ...(useLogX ? xLogBounds : { min: 0 }),
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
       axisTick: { show: false },
@@ -209,7 +208,7 @@ function buildBubbleOption(trackers: ValidTrackerData[], forceLog: boolean | nul
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -240,7 +239,7 @@ function TrackerBubbleChart({ trackers, height = 360 }: TrackerBubbleChartProps)
       : []
   )
 
-  // Hook must be called before any early return (React rules of hooks)
+  // Hook must be called before any early return
   const xValues = validTrackers.map((t) => bytesToGiB(t.downloadedBytes))
   const yValues = validTrackers.map((t) => bytesToGiB(t.uploadedBytes))
   const allValues = [...xValues, ...yValues]
diff --git a/src/components/charts/TrackerHealthRadar.tsx b/src/components/charts/TrackerHealthRadar.tsx
index 98a56276..7d02c379 100644
--- a/src/components/charts/TrackerHealthRadar.tsx
+++ b/src/components/charts/TrackerHealthRadar.tsx
@@ -1,12 +1,10 @@
 // src/components/charts/TrackerHealthRadar.tsx
-//
-// Functions: computeTrackerMetrics, normalizeMetrics, buildTrackerHealthRadarOption, TrackerHealthRadar
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import type { TrackerTag } from "@/lib/fleet"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import { useMemo } from "react"
+import type { TrackerHealthMetric } from "@/lib/fleet-aggregation"
+import { formatCount, formatPercent, formatRatio } from "@/lib/formatters"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import {
@@ -19,68 +17,11 @@ import {
 } from "./lib/theme"
 
 interface TrackerHealthRadarProps {
-  torrents: TorrentInfo[]
-  trackerTags: TrackerTag[]
+  metrics: TrackerHealthMetric[]
   height?: number
 }
 
-interface TrackerMetrics {
-  name: string
-  color: string
-  torrentCount: number
-  avgRatio: number
-  uploadSpeedSum: number
-  freshnessPct: number
-  avgSeedTimeDays: number
-}
-
-const FRESHNESS_WINDOW_MS = 7 * 24 * 60 * 60 * 1000
-
-function computeTrackerMetrics(
-  torrents: TorrentInfo[],
-  trackerTags: TrackerTag[]
-): TrackerMetrics[] {
-  const now = Date.now()
-
-  return trackerTags
-    .map((tracker) => {
-      const tagLower = tracker.tag.toLowerCase()
-      const group = torrents.filter((t) => {
-        const tags = t.tags
-          .split(",")
-          .map((s) => s.trim().toLowerCase())
-          .filter(Boolean)
-        return tags.includes(tagLower)
-      })
-
-      if (group.length === 0) return null
-
-      const avgRatio = group.reduce((sum, t) => sum + t.ratio, 0) / group.length
-
-      const uploadSpeedSum = group.reduce((sum, t) => sum + t.upspeed, 0)
-
-      const recentCount = group.filter(
-        (t) => t.lastActivity > 0 && now - t.lastActivity * 1000 < FRESHNESS_WINDOW_MS
-      ).length
-      const freshnessPct = (recentCount / group.length) * 100
-
-      const avgSeedTimeDays =
-        group.reduce((sum, t) => sum + t.seedingTime, 0) / group.length / 86400
-
-      return {
-        name: tracker.name,
-        color: tracker.color,
-        torrentCount: group.length,
-        avgRatio,
-        uploadSpeedSum,
-        freshnessPct,
-        avgSeedTimeDays,
-      } satisfies TrackerMetrics
-    })
-    .filter((m): m is TrackerMetrics => m !== null)
-}
-
-function normalizeMetrics(metrics: TrackerMetrics[]): number[][] {
+function normalizeMetrics(metrics: TrackerHealthMetric[]): number[][] {
   const maxTorrentCount = Math.max(...metrics.map((m) => m.torrentCount), 1)
   const maxAvgRatio = Math.max(...metrics.map((m) => m.avgRatio), 1)
   const maxUploadSpeed = Math.max(...metrics.map((m) => m.uploadSpeedSum), 1)
@@ -97,7 +38,7 @@ function normalizeMetrics(metrics: TrackerMetrics[]): number[][] {
 }
 
 function buildTrackerHealthRadarOption(
-  metrics: TrackerMetrics[],
+  metrics: TrackerHealthMetric[],
   normalized: number[][]
 ): EChartsOption {
   return {
@@ -115,9 +56,9 @@ function buildTrackerHealthRadarOption(
         const dot = chartDot(p.color)
         return [
           `${dot}<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(m.name)}</span>`,
-          chartTooltipRow(p.color, "Torrents", m.torrentCount.toLocaleString()),
-          chartTooltipRow(p.color, "Avg Ratio", m.avgRatio.toFixed(2)),
-          chartTooltipRow(p.color, "Freshness", `${m.freshnessPct.toFixed(1)}%`),
+          chartTooltipRow(p.color, "Torrents", formatCount(m.torrentCount)),
+          chartTooltipRow(p.color, "Avg Ratio", formatRatio(m.avgRatio)),
+          chartTooltipRow(p.color, "Freshness", formatPercent(m.freshnessPct)),
           chartTooltipRow(p.color, "Avg Seed Time", `${m.avgSeedTimeDays.toFixed(1)}d`),
         ].join("<br/>")
       },
@@ -136,7 +77,7 @@ function buildTrackerHealthRadarOption(
       axisName: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       splitLine: {
         lineStyle: { color: CHART_THEME.gridLine },
@@ -165,8 +106,11 @@ function buildTrackerHealthRadarOption(
   }
 }
 
-function TrackerHealthRadar({ torrents, trackerTags, height = 360 }: TrackerHealthRadarProps) {
-  const metrics = computeTrackerMetrics(torrents, trackerTags)
+function TrackerHealthRadar({ metrics, height = 360 }: TrackerHealthRadarProps) {
+  const option = useMemo(() => {
+    const normalized = normalizeMetrics(metrics)
+    return buildTrackerHealthRadarOption(metrics, normalized)
+  }, [metrics])
 
   if (metrics.length < 2) {
     return (
@@ -177,15 +121,8 @@ function TrackerHealthRadar({ torrents, trackerTags, height = 360 }: TrackerHeal
     )
   }
 
-  const normalized = normalizeMetrics(metrics)
-
-  return (
-    <ChartECharts
-      option={buildTrackerHealthRadarOption(metrics, normalized)}
-      style={{ height, width: "100%" }}
-    />
-  )
+  return <ChartECharts option={option} style={{ height, width: "100%" }} />
 }
 
 export type { TrackerHealthRadarProps }
-export { computeTrackerMetrics, normalizeMetrics, TrackerHealthRadar }
+export { normalizeMetrics, TrackerHealthRadar }
diff --git a/src/components/charts/UploadDownloadChart.tsx b/src/components/charts/UploadDownloadChart.tsx
index 3c580d0f..74e9a4fa 100644
--- a/src/components/charts/UploadDownloadChart.tsx
+++ b/src/components/charts/UploadDownloadChart.tsx
@@ -1,11 +1,9 @@
 // src/components/charts/UploadDownloadChart.tsx
-//
-// Functions: buildOption, UploadDownloadChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
-import { bytesToGiB, getComplementaryColor } from "@/lib/formatters"
+import { getComplementaryColor } from "@/lib/color-utils"
+import { bytesToGiB } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
@@ -64,14 +62,15 @@ function buildOption(
   const dotSize = adaptiveDotSize(snapshots.length)
   const complementColor = getComplementaryColor(accentColor)
 
-  // Dynamic Y-axis padding — recalculates when series are toggled via legend
-  const dataZoom: EChartsOption["dataZoom"] = showDataZoom
+  // Scrubber is useless (and renders oversized) with ≤ 2 data points
+  const hasEnoughData = showDataZoom && snapshots.length > 2
+  const dataZoom: EChartsOption["dataZoom"] = hasEnoughData
     ? (chartDataZoom(accentColor) as EChartsOption["dataZoom"])
     : []
 
   return {
     backgroundColor: "transparent",
-    grid: chartGrid({ top: 40, right: 16, bottom: showDataZoom ? 80 : 40, left: 64 }),
+    grid: chartGrid({ top: 40, right: 16, bottom: hasEnoughData ? 80 : 40, left: 64 }),
     tooltip: chartTooltip("axis", {
       borderColor: accentColor,
       axisPointer: buildAxisPointer(accentColor, 0.3, 1),
@@ -94,7 +93,7 @@ function buildOption(
               chartDot(item.color) +
               `<span style="color:${CHART_THEME.textSecondary};">${escHtml(item.seriesName)}:</span> ` +
               `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${primary}</span>` +
-              `<span style="color:${CHART_THEME.textTertiary};font-size:10px;"> (${alt})</span>`
+              `<span style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeCompact}px;"> (${alt})</span>`
             )
           })
           .join("<br/>")
@@ -111,7 +110,7 @@ function buildOption(
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
@@ -130,6 +129,7 @@ function buildOption(
       {
         name: "Uploaded",
         type: "line",
+        sampling: "lttb",
         data: uploadData,
         smooth: true,
         symbol: "circle",
@@ -152,6 +152,7 @@ function buildOption(
       {
         name: "Downloaded",
         type: "line",
+        sampling: "lttb",
         data: downloadData,
         smooth: true,
         symbol: "circle",
diff --git a/src/components/charts/UploadPolarChart.tsx b/src/components/charts/UploadPolarChart.tsx
index d5debada..48e0fc69 100644
--- a/src/components/charts/UploadPolarChart.tsx
+++ b/src/components/charts/UploadPolarChart.tsx
@@ -1,21 +1,17 @@
 // src/components/charts/UploadPolarChart.tsx
-//
-// Functions: computeHourlyAverages, buildPolarOption, UploadPolarChart
-
 "use client"
 
 import type { EChartsOption } from "echarts"
 import { useState } from "react"
 import { TabBar } from "@/components/ui/TabBar"
-import { formatBytesNum, hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatBytesNum } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 import { ChartECharts } from "./lib/ChartECharts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { DAY_LABELS, HOUR_LABELS } from "./lib/chart-helpers"
 import { CHART_THEME, chartTooltip, escHtml } from "./lib/theme"
 
-// ── Types ──
-
 type PolarMode = "upload" | "download"
 
 interface HourDayBucket {
@@ -90,7 +86,7 @@ function buildPolarOption(
     if (b.avgBytes > maxVal) maxVal = b.avgBytes
   }
 
-  // Flatten the 7×24 grid into [hourIdx, dayIdx, value] triples for the heatmap
+  // Flatten the 7x24 grid into [hourIdx, dayIdx, value] triples for the heatmap
   const heatmapData: [number, number, number][] = []
   for (let day = 0; day < 7; day++) {
     for (let hour = 0; hour < 24; hour++) {
@@ -101,7 +97,7 @@ function buildPolarOption(
   const axisLabelStyle = {
     color: CHART_THEME.textTertiary,
     fontFamily: CHART_THEME.fontMono,
-    fontSize: 10,
+    fontSize: CHART_THEME.fontSizeCompact,
   }
 
   const ANGLE_STEP = 360 / 24
@@ -124,7 +120,7 @@ function buildPolarOption(
         const hourLabel = escHtml(HOUR_LABELS[hourIdx] ?? "")
         const formatted = formatBytesNum(val)
         return (
-          `<div style="font-family:var(--font-mono),monospace;font-size:11px;` +
+          `<div style="font-family:var(--font-mono),monospace;font-size:${CHART_THEME.fontSizeDense}px;` +
           `color:${CHART_THEME.textTertiary};margin-bottom:4px;">${dayName} at ${hourLabel}</div>` +
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${escHtml(formatted)}/hr ${dirLabel}</span>`
         )
@@ -151,7 +147,7 @@ function buildPolarOption(
       axisTick: { show: false },
       axisLabel: {
         ...axisLabelStyle,
-        fontSize: 9,
+        fontSize: CHART_THEME.fontSizeMicro,
       },
       splitLine: { show: false },
     },
@@ -228,6 +224,11 @@ function buildPolarOption(
 
 // ── Component ──
 
+const POLAR_TABS = [
+  { key: "upload" as const, label: "Upload" },
+  { key: "download" as const, label: "Download" },
+]
+
 function UploadPolarChart({
   snapshots,
   accentColor = CHART_THEME.accent,
@@ -238,11 +239,6 @@ function UploadPolarChart({
   const hasEnoughSnapshots = snapshots.length >= 2
   const buckets = hasEnoughSnapshots ? computeHourlyAverages(snapshots, mode) : []
 
-  const POLAR_TABS = [
-    { key: "upload" as const, label: "Upload" },
-    { key: "download" as const, label: "Download" },
-  ]
-
   if (!hasEnoughSnapshots) {
     return (
       <ChartEmptyState
diff --git a/src/components/charts/VolumeSurface3D.tsx b/src/components/charts/VolumeSurface3D.tsx
index 61ea9271..63bf4d72 100644
--- a/src/components/charts/VolumeSurface3D.tsx
+++ b/src/components/charts/VolumeSurface3D.tsx
@@ -1,13 +1,11 @@
 // src/components/charts/VolumeSurface3D.tsx
-//
-// Functions: computeDailyGrid, bucketGrid, buildSurfaceOption, VolumeSurface3D
-
 "use client"
 
 import ReactECharts from "echarts-for-react"
 import "echarts-gl"
+import { localDateStr } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
-import type { TrackerSnapshotSeries } from "@/types/charts"
+import type { FleetChartProps, TrackerSnapshotSeries } from "@/types/charts"
 import { ChartEmptyState } from "./lib/ChartEmptyState"
 import { autoByteScale, fmtNum } from "./lib/chart-helpers"
 import { CHART_THEME, chartAxisLabel, chartTooltip, escHtml } from "./lib/theme"
@@ -16,10 +14,7 @@ import { CHART_THEME, chartAxisLabel, chartTooltip, escHtml } from "./lib/theme"
 // Types
 // ---------------------------------------------------------------------------
 
-interface VolumeSurface3DProps {
-  trackerData: TrackerSnapshotSeries[]
-  height?: number
-}
+interface VolumeSurface3DProps extends FleetChartProps {}
 
 interface GridResult {
   bucketLabels: string[]
@@ -51,7 +46,7 @@ function computeDailyGrid(trackerData: TrackerSnapshotSeries[]): {
     )
     const dayMap = new Map<string, Snapshot>()
     for (const snap of sorted) {
-      const day = new Date(snap.polledAt).toISOString().slice(0, 10)
+      const day = localDateStr(new Date(snap.polledAt))
       dayMap.set(day, snap)
     }
     return dayMap
@@ -108,7 +103,7 @@ function getBucketKey(day: string, granularity: "day" | "week" | "month"): strin
   const dow = d.getDay()
   const monday = new Date(d)
   monday.setDate(d.getDate() - ((dow + 6) % 7))
-  return monday.toISOString().slice(0, 10)
+  return localDateStr(monday)
 }
 
 /** Format a bucket key into a human-readable label. */
@@ -217,10 +212,10 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
     }
   }
 
-  // Adaptive bar size — fewer buckets = fatter bars
+  // Adaptive bar size. fewer buckets = fatter bars
   const barSize = bucketCount > 40 ? 4 : bucketCount > 20 ? 6 : bucketCount > 10 ? 8 : 10
 
-  // Adaptive box width — wider for more buckets
+  // Adaptive box width
   const boxWidth = Math.min(300, Math.max(150, bucketCount * 6))
 
   const periodLabel =
@@ -237,7 +232,7 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
         const formatted = fmtNum(Math.abs(val))
         return (
           `<div style="font-family:var(--font-mono),monospace">` +
-          `<div style="color:${CHART_THEME.textTertiary};font-size:11px;margin-bottom:2px">${escHtml(bucketLabel)}</div>` +
+          `<div style="color:${CHART_THEME.textTertiary};font-size:${CHART_THEME.fontSizeDense}px;margin-bottom:2px">${escHtml(bucketLabel)}</div>` +
           `<div><span style="color:${CHART_THEME.textSecondary}">${escHtml(tracker)}:</span> <b>${formatted} ${unit}</b></div>` +
           `</div>`
         )
@@ -258,10 +253,10 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
       nameTextStyle: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
       },
       axisLabel: chartAxisLabel({
-        fontSize: 9,
+        fontSize: CHART_THEME.fontSizeMicro,
         interval: Math.max(0, Math.floor(displayLabels.length / 8) - 1),
       }),
       axisLine: { lineStyle: { color: CHART_THEME.borderEmphasis } },
@@ -273,7 +268,7 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
       nameTextStyle: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
       },
       axisLabel: chartAxisLabel(),
       axisLine: { lineStyle: { color: CHART_THEME.borderEmphasis } },
@@ -284,9 +279,9 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
       nameTextStyle: {
         color: CHART_THEME.textSecondary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 11,
+        fontSize: CHART_THEME.fontSizeDense,
       },
-      axisLabel: chartAxisLabel({ fontSize: 9 }),
+      axisLabel: chartAxisLabel({ fontSize: CHART_THEME.fontSizeMicro }),
       axisLine: { lineStyle: { color: CHART_THEME.borderEmphasis } },
     },
     grid3D: {
@@ -300,6 +295,7 @@ function buildSurfaceOption(grid: GridResult): Record<string, unknown> {
         rotateSensitivity: 2,
         zoomSensitivity: 1.5,
         distance: 250,
+        minDistance: 250,
         alpha: 25,
         beta: 40,
       },
diff --git a/src/components/charts/lib/ChartECharts.tsx b/src/components/charts/lib/ChartECharts.tsx
index 8f041b4f..29f8b8bf 100644
--- a/src/components/charts/lib/ChartECharts.tsx
+++ b/src/components/charts/lib/ChartECharts.tsx
@@ -1,16 +1,23 @@
 // src/components/charts/lib/ChartECharts.tsx
-//
-// Functions: ChartECharts
-//
-// Drop-in replacement for ReactECharts that adds an All/None legend toggle.
-// Listens to legendselectchanged to track state, dispatches legendAllSelect
-// or legendInverseSelect via the ECharts instance ref.
+
+// Drop-in replacement for ReactECharts that renders the legend as HTML
+// outside the canvas so the chart never shrinks and makes the card grow instead.
+// Listens to legendselectchanged to track state, dispatches legend actions
+// via the ECharts instance ref.
 
 "use client"
 
+import clsx from "clsx"
 import type { EChartsOption } from "echarts"
 import ReactECharts from "echarts-for-react"
-import { type CSSProperties, useCallback, useMemo, useRef, useState } from "react"
+import { type CSSProperties, useCallback, useEffect, useMemo, useRef, useState } from "react"
+import { Button } from "@/components/ui/Button"
+import { CHART_THEME } from "./theme"
+
+interface LegendItem {
+  name: string
+  color: string
+}
 
 interface ChartEChartsProps {
   option: EChartsOption
@@ -18,70 +25,178 @@ interface ChartEChartsProps {
   opts?: { renderer?: "canvas" | "svg" }
   notMerge?: boolean
   lazyUpdate?: boolean
+  shouldSetOption?: (
+    prevProps: { option?: unknown; style?: unknown },
+    nextProps: { option?: unknown; style?: unknown }
+  ) => boolean
 }
 
 const DEFAULT_OPTS = { renderer: "canvas" as const }
 
+// Skips setOption when the option data hasn't changed. JSON.stringify drops
+// function values (i.e. tooltip formatters), so two options with identical data
+// but different formatter closures produce the same string. Returns true when
+// style changes so echarts-for-react's resize() check still fires.
+export function defaultShouldSetOption(
+  prev: { option?: unknown; style?: unknown },
+  next: { option?: unknown; style?: unknown }
+): boolean {
+  if (prev.style !== next.style) return true
+  if (prev.option === next.option) return false
+  return JSON.stringify(prev.option) !== JSON.stringify(next.option)
+}
+
+/** Extract legend items from ECharts option — series names + colors */
+function extractLegendItems(option: EChartsOption): LegendItem[] {
+  const series = option.series as
+    | Array<{ name?: string; itemStyle?: { color?: string } }>
+    | undefined
+  if (!Array.isArray(series)) return []
+
+  const globalColors = (option.color as string[] | undefined) ?? []
+  const legend = option.legend as { data?: string[] } | undefined
+  const allowedNames = legend?.data ? new Set(legend.data) : null
+
+  const seen = new Set<string>()
+  const items: LegendItem[] = []
+
+  for (let i = 0; i < series.length; i++) {
+    const s = series[i]
+    const name = s.name ?? ""
+    if (!name) continue
+    if (allowedNames && !allowedNames.has(name)) continue
+    if (seen.has(name)) continue
+    seen.add(name)
+    items.push({
+      name,
+      color: s.itemStyle?.color ?? globalColors[i % globalColors.length] ?? CHART_THEME.accent,
+    })
+  }
+
+  return items
+}
+
 function ChartECharts({
   option,
   style,
   opts = DEFAULT_OPTS,
   notMerge = false,
   lazyUpdate = true,
+  shouldSetOption = defaultShouldSetOption,
 }: ChartEChartsProps) {
   const chartRef = useRef<ReactECharts | null>(null)
-  const [allSelected, setAllSelected] = useState(true)
 
-  // Determine if this chart has a multi-item legend worth toggling
+  // Determine if this chart has a multi-item legend
   const legend = option.legend as Record<string, unknown> | undefined
   const hasLegend = legend && legend.show !== false
   const series = option.series as Array<{ name?: string }> | undefined
   const seriesCount = Array.isArray(series) ? series.length : 0
-  const showToggle = hasLegend && seriesCount > 1
+  const showExternalLegend = hasLegend && seriesCount > 1
 
+  // Extract legend items — stabilized by content key to avoid unnecessary re-renders
+  const legendItemsRaw = showExternalLegend ? extractLegendItems(option) : []
+  const legendKey = legendItemsRaw.map((i) => `${i.name}:${i.color}`).join(",")
+  // biome-ignore lint/correctness/useExhaustiveDependencies: intentionally keyed on legendKey string, not legendItemsRaw reference — stabilizes the array across renders when content hasn't changed
+  const legendItems = useMemo(() => legendItemsRaw, [legendKey])
+
+  // Track which series are selected — keyed by series name
+  const [selected, setSelected] = useState<Record<string, boolean>>({})
+
+  // Sync selection state when legend items actually change (not on every render)
+  const prevLegendKeyRef = useRef("")
+  useEffect(() => {
+    if (legendKey !== prevLegendKeyRef.current && legendItems.length > 0) {
+      prevLegendKeyRef.current = legendKey
+      setSelected(Object.fromEntries(legendItems.map((item) => [item.name, true])))
+    }
+  }, [legendKey, legendItems])
+
+  const allSelected = Object.values(selected).length > 0 && Object.values(selected).every(Boolean)
+
+  // Sync selection state from ECharts events (individual toggle clicks)
   const onEvents = useMemo(
     () => ({
       legendselectchanged: (params: { selected: Record<string, boolean> }) => {
-        const values = Object.values(params.selected)
-        setAllSelected(values.length > 0 && values.every(Boolean))
+        setSelected(params.selected)
       },
     }),
     []
   )
 
-  const handleToggle = useCallback(() => {
+  const handleToggleAll = useCallback(() => {
     const instance = chartRef.current?.getEchartsInstance()
     if (!instance) return
 
     if (allSelected) {
       instance.dispatchAction({ type: "legendInverseSelect" })
-      setAllSelected(false)
+      setSelected((prev) => Object.fromEntries(Object.keys(prev).map((k) => [k, false])))
     } else {
       instance.dispatchAction({ type: "legendAllSelect" })
-      setAllSelected(true)
+      setSelected((prev) => Object.fromEntries(Object.keys(prev).map((k) => [k, true])))
     }
   }, [allSelected])
 
+  const handleToggleSeries = useCallback((name: string) => {
+    const instance = chartRef.current?.getEchartsInstance()
+    if (!instance) return
+    instance.dispatchAction({ type: "legendToggleSelect", name })
+  }, [])
+
+  // Hide internal legend when rendering externally — immutable shallow copy
+  // instead of mutating the parent's option object during render.
+  const effectiveOption = useMemo(() => {
+    if (!showExternalLegend || !option.legend) return option
+    return { ...option, legend: { ...(option.legend as object), show: false } }
+  }, [option, showExternalLegend])
+
   return (
-    <div className="relative">
-      {showToggle && (
-        <button
-          type="button"
-          onClick={handleToggle}
-          className="absolute top-0 right-0 z-10 px-2.5 py-1 text-[11px] font-mono text-muted hover:text-secondary hover:bg-overlay transition-colors cursor-pointer rounded-nm-sm"
-        >
-          {allSelected ? "None" : "All"}
-        </button>
+    <div className="flex flex-col gap-0">
+      {/* External HTML legend */}
+      {showExternalLegend && legendItems.length > 0 && (
+        <div className="flex flex-wrap items-center gap-x-3 gap-y-1 pt-2 px-4">
+          {legendItems.map((item) => {
+            const isActive = selected[item.name] !== false
+            return (
+              <button
+                key={item.name}
+                type="button"
+                onClick={() => handleToggleSeries(item.name)}
+                className={clsx(
+                  "flex items-center gap-1.5 text-3xs font-mono cursor-pointer transition-all duration-150 bg-transparent border-none px-1.5 py-0.5 rounded-nm-sm hover:bg-overlay/50",
+                  isActive ? "opacity-100" : "opacity-30"
+                )}
+              >
+                <span
+                  className="w-2 h-2 rounded-full shrink-0"
+                  style={{ backgroundColor: item.color }}
+                />
+                <span style={{ color: CHART_THEME.textTertiary }}>{item.name}</span>
+              </button>
+            )
+          })}
+          <Button
+            variant="minimal"
+            size="sm"
+            onClick={handleToggleAll}
+            className="torrent-cell hover:bg-overlay"
+            text={allSelected ? "None" : "All"}
+          />
+        </div>
       )}
-      <ReactECharts
-        ref={chartRef}
-        option={option}
-        style={style}
-        opts={opts}
-        notMerge={notMerge}
-        lazyUpdate={lazyUpdate}
-        onEvents={onEvents}
-      />
+
+      {/* Chart canvas */}
+      <div className="relative">
+        <ReactECharts
+          ref={chartRef}
+          option={effectiveOption}
+          style={style}
+          opts={opts}
+          notMerge={notMerge}
+          lazyUpdate={lazyUpdate}
+          onEvents={onEvents}
+          shouldSetOption={shouldSetOption}
+        />
+      </div>
     </div>
   )
 }
diff --git a/src/components/charts/lib/LogScaleToggle.tsx b/src/components/charts/lib/LogScaleToggle.tsx
index 69da7744..60623d25 100644
--- a/src/components/charts/lib/LogScaleToggle.tsx
+++ b/src/components/charts/lib/LogScaleToggle.tsx
@@ -1,7 +1,4 @@
 // src/components/charts/lib/LogScaleToggle.tsx
-//
-// Functions: LogScaleToggle
-
 "use client"
 
 import { ActivityIcon } from "@/components/ui/Icons"
@@ -25,7 +22,7 @@ function LogScaleToggle({ effectiveLog, isAuto, onToggle }: LogScaleToggleProps)
       <button
         type="button"
         onClick={onToggle}
-        className="nm-raised-sm bg-raised px-2.5 py-1 text-[10px] font-mono text-muted hover:text-secondary active:nm-inset-sm active:scale-[0.97] transition-all duration-150 cursor-pointer flex items-center gap-1.5 rounded-nm-sm"
+        className="timestamp nm-interactive-sm bg-raised px-2.5 py-1 hover:text-secondary cursor-pointer flex items-center gap-2 rounded-nm-sm"
       >
         <ActivityIcon width="10" height="10" />
         {effectiveLog ? "Log" : "Linear"}
diff --git a/src/components/charts/lib/__tests__/chart-transforms.test.ts b/src/components/charts/lib/__tests__/chart-transforms.test.ts
index f6b22e96..3efab5a0 100644
--- a/src/components/charts/lib/__tests__/chart-transforms.test.ts
+++ b/src/components/charts/lib/__tests__/chart-transforms.test.ts
@@ -2,6 +2,7 @@
 
 import { describe, expect, it } from "vitest"
 import { carryForwardValues, computeDailyDeltas } from "@/components/charts/lib/chart-transforms"
+import { localDateStr } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 
 // ---------------------------------------------------------------------------
@@ -25,6 +26,7 @@ function makeSnap(polledAt: string, overrides?: Partial<Snapshot>): Snapshot {
     username: null,
     shareScore: null,
     group: null,
+    isManual: false,
     ...overrides,
   }
 }
@@ -57,7 +59,7 @@ describe("computeDailyDeltas", () => {
     const result = computeDailyDeltas(snaps)
 
     expect(result).toHaveLength(1)
-    expect(result[0].label).toBe("2024-01-01")
+    expect(result[0].label).toBe(localDateStr(new Date("2024-01-01T12:00:00.000Z")))
     expect(result[0].uploadDelta).toBeCloseTo(2, 6)
     expect(result[0].downloadDelta).toBeCloseTo(1, 6)
   })
@@ -82,7 +84,7 @@ describe("computeDailyDeltas", () => {
     const result = computeDailyDeltas(snaps)
 
     expect(result).toHaveLength(1)
-    expect(result[0].label).toBe("2024-02-05")
+    expect(result[0].label).toBe(localDateStr(new Date("2024-02-05T06:00:00.000Z")))
     // Upload: (1 GiB - 0) + (3 GiB - 1 GiB) = 3 GiB total
     expect(result[0].uploadDelta).toBeCloseTo(3, 6)
     // Download: (0 - 0) + (1 GiB - 0) = 1 GiB total
@@ -110,10 +112,12 @@ describe("computeDailyDeltas", () => {
     expect(result).toHaveLength(2)
     const byLabel = Object.fromEntries(result.map((b) => [b.label, b]))
 
-    expect(byLabel["2024-03-02"].uploadDelta).toBeCloseTo(1, 6)
-    expect(byLabel["2024-03-02"].downloadDelta).toBeCloseTo(0, 6)
-    expect(byLabel["2024-03-03"].uploadDelta).toBeCloseTo(3, 6)
-    expect(byLabel["2024-03-03"].downloadDelta).toBeCloseTo(2, 6)
+    const day2 = localDateStr(new Date("2024-03-02T00:00:00.000Z"))
+    const day3 = localDateStr(new Date("2024-03-03T00:00:00.000Z"))
+    expect(byLabel[day2].uploadDelta).toBeCloseTo(1, 6)
+    expect(byLabel[day2].downloadDelta).toBeCloseTo(0, 6)
+    expect(byLabel[day3].uploadDelta).toBeCloseTo(3, 6)
+    expect(byLabel[day3].downloadDelta).toBeCloseTo(2, 6)
   })
 
   it("handles negative deltas when bytes decrease between snapshots", () => {
@@ -135,6 +139,28 @@ describe("computeDailyDeltas", () => {
     expect(result[0].uploadDelta).toBeCloseTo(-1, 6)
     expect(result[0].downloadDelta).toBeCloseTo(-1, 6)
   })
+
+  it("handles large byte values correctly via BigInt arithmetic", () => {
+    // Values that would overflow a 32-bit integer (~4 GiB boundary)
+    const fourGiB = BigInt(4) * BigInt(GiB)
+    const eightGiB = BigInt(8) * BigInt(GiB)
+
+    const snaps = [
+      makeSnap("2024-05-01T00:00:00.000Z", {
+        uploadedBytes: fourGiB.toString(),
+        downloadedBytes: "0",
+      }),
+      makeSnap("2024-05-02T00:00:00.000Z", {
+        uploadedBytes: eightGiB.toString(),
+        downloadedBytes: "0",
+      }),
+    ]
+
+    const result = computeDailyDeltas(snaps)
+
+    expect(result).toHaveLength(1)
+    expect(result[0].uploadDelta).toBeCloseTo(4, 5)
+  })
 })
 
 // ---------------------------------------------------------------------------
diff --git a/src/components/charts/lib/__tests__/defaultShouldSetOption.test.ts b/src/components/charts/lib/__tests__/defaultShouldSetOption.test.ts
new file mode 100644
index 00000000..c803697e
--- /dev/null
+++ b/src/components/charts/lib/__tests__/defaultShouldSetOption.test.ts
@@ -0,0 +1,141 @@
+// src/components/charts/lib/__tests__/defaultShouldSetOption.test.ts
+//
+// Tests for defaultShouldSetOption — the chart update guard that decides
+// whether echarts-for-react should call setOption on re-render.
+
+import { describe, expect, it } from "vitest"
+import { defaultShouldSetOption } from "@/components/charts/lib/ChartECharts"
+
+describe("defaultShouldSetOption", () => {
+  // -------------------------------------------------------------------------
+  // Reference-equality fast paths
+  // -------------------------------------------------------------------------
+
+  it("returns false when option is the same reference (no style change)", () => {
+    const option = { series: [{ name: "Upload", data: [1, 2, 3] }] }
+    const prev = { option, style: undefined }
+    const next = { option, style: undefined }
+    expect(defaultShouldSetOption(prev, next)).toBe(false)
+  })
+
+  it("returns false when both option and style are the same references", () => {
+    const option = { series: [] }
+    const style = { height: "300px" }
+    expect(defaultShouldSetOption({ option, style }, { option, style })).toBe(false)
+  })
+
+  // -------------------------------------------------------------------------
+  // Style change forces an update regardless of option
+  // -------------------------------------------------------------------------
+
+  it("returns true when style reference changes even if option is identical reference", () => {
+    const option = { series: [] }
+    const prev = { option, style: { height: "200px" } }
+    const next = { option, style: { height: "300px" } }
+    expect(defaultShouldSetOption(prev, next)).toBe(true)
+  })
+
+  it("returns true when style goes from defined to undefined", () => {
+    const option = { series: [] }
+    expect(
+      defaultShouldSetOption({ option, style: { height: "300px" } }, { option, style: undefined })
+    ).toBe(true)
+  })
+
+  it("returns true when style goes from undefined to defined", () => {
+    const option = { series: [] }
+    expect(
+      defaultShouldSetOption({ option, style: undefined }, { option, style: { height: "300px" } })
+    ).toBe(true)
+  })
+
+  // -------------------------------------------------------------------------
+  // JSON.stringify equality: different references, same serialized content
+  // -------------------------------------------------------------------------
+
+  it("returns false when option references differ but JSON content is identical", () => {
+    const prev = { option: { series: [{ name: "Upload", data: [1, 2, 3] }] }, style: undefined }
+    const next = { option: { series: [{ name: "Upload", data: [1, 2, 3] }] }, style: undefined }
+    expect(defaultShouldSetOption(prev, next)).toBe(false)
+  })
+
+  it("returns false when deeply nested options are equal by value", () => {
+    const makeOption = () => ({
+      xAxis: { type: "category", data: ["Mon", "Tue", "Wed"] },
+      yAxis: { type: "value" },
+      series: [{ name: "Upload", type: "line", data: [100, 200, 300] }],
+      color: ["#00d4ff", "#f59e0b"],
+    })
+    expect(defaultShouldSetOption({ option: makeOption() }, { option: makeOption() })).toBe(false)
+  })
+
+  // -------------------------------------------------------------------------
+  // Actual data changes trigger an update
+  // -------------------------------------------------------------------------
+
+  it("returns true when option data changes", () => {
+    const prev = { option: { series: [{ data: [1, 2, 3] }] } }
+    const next = { option: { series: [{ data: [1, 2, 4] }] } }
+    expect(defaultShouldSetOption(prev, next)).toBe(true)
+  })
+
+  it("returns true when series count changes", () => {
+    const prev = { option: { series: [{ name: "A" }] } }
+    const next = { option: { series: [{ name: "A" }, { name: "B" }] } }
+    expect(defaultShouldSetOption(prev, next)).toBe(true)
+  })
+
+  it("returns true when a key is added to option", () => {
+    const prev = { option: { series: [] } }
+    const next = { option: { series: [], title: { text: "New Title" } } }
+    expect(defaultShouldSetOption(prev, next)).toBe(true)
+  })
+
+  // -------------------------------------------------------------------------
+  // Function values in options: JSON.stringify drops them so they are ignored
+  // -------------------------------------------------------------------------
+
+  it("returns false when options differ only by formatter function closures (same data)", () => {
+    // JSON.stringify drops function values entirely, so two options with identical
+    // data but different formatter closures serialize to the same string.
+    const dataA = [100, 200, 300]
+    const prev = {
+      option: {
+        series: [{ data: dataA }],
+        tooltip: { formatter: (p: unknown) => `${p}A` },
+      },
+    }
+    const next = {
+      option: {
+        series: [{ data: dataA }],
+        tooltip: { formatter: (p: unknown) => `${p}B` },
+      },
+    }
+    // Different function references, same data — must NOT trigger setOption.
+    expect(defaultShouldSetOption(prev, next)).toBe(false)
+  })
+
+  // -------------------------------------------------------------------------
+  // Null/undefined option handling
+  // -------------------------------------------------------------------------
+
+  it("returns false when both options are undefined", () => {
+    expect(defaultShouldSetOption({ option: undefined }, { option: undefined })).toBe(false)
+  })
+
+  it("returns false when both options are null", () => {
+    expect(defaultShouldSetOption({ option: null }, { option: null })).toBe(false)
+  })
+
+  it("returns true when option goes from undefined to a real object", () => {
+    expect(defaultShouldSetOption({ option: undefined }, { option: { series: [] } })).toBe(true)
+  })
+
+  it("returns true when option goes from a real object to undefined", () => {
+    expect(defaultShouldSetOption({ option: { series: [] } }, { option: undefined })).toBe(true)
+  })
+
+  it("returns false when both options are empty objects (different references)", () => {
+    expect(defaultShouldSetOption({ option: {} }, { option: {} })).toBe(false)
+  })
+})
diff --git a/src/components/charts/lib/__tests__/time-axis-helpers.test.ts b/src/components/charts/lib/__tests__/time-axis-helpers.test.ts
index 8450978b..d9a18299 100644
--- a/src/components/charts/lib/__tests__/time-axis-helpers.test.ts
+++ b/src/components/charts/lib/__tests__/time-axis-helpers.test.ts
@@ -26,6 +26,7 @@ function makeSnap(polledAt: string, ratio: number | null = 1.5): Snapshot {
     username: null,
     group: null,
     shareScore: null,
+    isManual: false,
   }
 }
 
diff --git a/src/components/charts/lib/chart-helpers.ts b/src/components/charts/lib/chart-helpers.ts
index 8ca8a081..87242086 100644
--- a/src/components/charts/lib/chart-helpers.ts
+++ b/src/components/charts/lib/chart-helpers.ts
@@ -1,9 +1,14 @@
 // src/components/charts/lib/chart-helpers.ts
 //
-// Functions: fmtNum, yAxisPad, formatDateLabel, yAxisAutoRange, autoByteScale, DAY_LABELS, HOUR_LABELS, buildBucketedBarOption, buildGlowAreaStyle, buildAxisPointer, buildThemeRiverSingleAxis, adaptiveDotSize, buildTimeXAxis, insideZoom, buildDonutShell, buildStackedAreaOption
+// Functions: fmtNum, formatGiB, yAxisPad, formatDateLabel, yAxisAutoRange,
+// autoByteScale, DAY_LABELS, HOUR_LABELS, buildBucketedBarOption, buildGlowAreaStyle,
+// buildAxisPointer, buildThemeRiverSingleAxis, floorTimestamp, adaptiveDotSize,
+// buildTimeXAxis, insideZoom, buildDonutShell, buildStackedAreaOption
 
 import type { EChartsOption } from "echarts"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatCount } from "@/lib/formatters"
+import type { StackedAreaSeries } from "@/types/charts"
 import {
   CHART_THEME,
   chartAxisLabel,
@@ -24,6 +29,11 @@ export function fmtNum(v: number, decimals = 2): string {
   })
 }
 
+/** Formats a GiB value with automatic TiB scaling for display in chart tooltips. */
+export function formatGiB(gib: number): string {
+  return gib >= 1024 ? `${fmtNum(gib / 1024)} TiB` : `${fmtNum(gib)} GiB`
+}
+
 /** Format ISO date string to short locale label (i.e "Mar 15") */
 export function formatDateLabel(isoDate: string): string {
   const date = new Date(`${isoDate}T12:00:00`)
@@ -134,7 +144,7 @@ export function buildBucketedBarOption<TBucket, TTorrent>(
         formatter: markLine.label,
         position: "end",
         color: markLine.color,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
     }
   }
@@ -151,7 +161,7 @@ export function buildBucketedBarOption<TBucket, TTorrent>(
         return (
           chartDot(p.color) +
           `<span style="color:${CHART_THEME.textPrimary};font-weight:600;">${labelPrefix} ${getLabel(entry.bucket)}</span><br/>` +
-          `<span style="color:${CHART_THEME.textSecondary};">${entry.count.toLocaleString()} torrents</span>` +
+          `<span style="color:${CHART_THEME.textSecondary};">${formatCount(entry.count)} torrents</span>` +
           `<span style="color:${CHART_THEME.textTertiary};"> · ${pct}%${pctSuffix}</span>`
         )
       },
@@ -232,9 +242,32 @@ export function buildThemeRiverSingleAxis(overrides?: {
     axisLabel: chartAxisLabel(),
     axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
     axisTick: { show: false },
+    splitLine: { lineStyle: { color: CHART_THEME.gridLine, width: 1 } },
   }
 }
 
+type TimeBucket = "minute" | "5min" | "15min" | "hour" | "day"
+
+const BUCKET_MS: Record<TimeBucket, number> = {
+  minute: 60_000,
+  "5min": 300_000,
+  "15min": 900_000,
+  hour: 3_600_000,
+  day: 86_400_000,
+}
+
+/**
+ * Floor a millisecond timestamp to the nearest bucket boundary.
+ * Use to bucket time-series data before charting — eliminates sub-bucket
+ * precision that wastes render cycles with no visual benefit.
+ * @param ms - Unix timestamp in milliseconds
+ * @param granularity - Bucket size (default: "hour")
+ */
+export function floorTimestamp(ms: number, granularity: TimeBucket = "hour"): number {
+  const interval = BUCKET_MS[granularity]
+  return ms - (ms % interval)
+}
+
 /**
  * Computes an adaptive symbol dot size based on data point count.
  * Returns smaller dots for dense data and larger dots for sparse data.
@@ -255,7 +288,7 @@ export function adaptiveDotSize(count: number, thresholds: [number, number] = [1
 export function buildTimeXAxis(overrides?: Record<string, unknown>): Record<string, unknown> {
   return {
     type: "time",
-    boundaryGap: false,
+    boundaryGap: ["0%", "0%"],
     axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
     axisTick: { show: false },
     axisLabel: chartAxisLabel({
@@ -327,7 +360,7 @@ export function buildDonutShell(overrides?: {
  */
 export function buildStackedAreaOption(
   sortedMonths: string[],
-  series: { name: string; color: string; monthMap: Map<string, number> }[],
+  series: StackedAreaSeries[],
   stackId = "default"
 ): EChartsOption {
   const eChartsSeries: NonNullable<EChartsOption["series"]> = series.map((s) => {
@@ -368,22 +401,20 @@ export function buildStackedAreaOption(
         const rows = items
           .filter((item) => item.value[1] > 0)
           .sort((a, b) => b.value[1] - a.value[1])
-          .map((item) =>
-            chartTooltipRow(item.color, item.seriesName, item.value[1].toLocaleString())
-          )
+          .map((item) => chartTooltipRow(item.color, item.seriesName, formatCount(item.value[1])))
           .join("<br/>")
         return `${chartTooltipHeader(dateLabel)}${rows}`
       },
     }),
     legend: chartLegend(),
-    xAxis: buildTimeXAxis({ boundaryGap: false }),
+    xAxis: buildTimeXAxis(),
     yAxis: {
       type: "value",
       name: "Torrents",
       nameTextStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       axisLine: { show: false },
       axisTick: { show: false },
diff --git a/src/components/charts/lib/chart-transforms.ts b/src/components/charts/lib/chart-transforms.ts
index 29678725..fcfbb7db 100644
--- a/src/components/charts/lib/chart-transforms.ts
+++ b/src/components/charts/lib/chart-transforms.ts
@@ -2,6 +2,7 @@
 //
 // Functions: buildActivityMatrix, computeDailyDeltas, carryForwardValues, buildTimeSeriesData, carryForwardTimeSeries, collectUnifiedTimestamps
 
+import { localDateStr } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 import type { TrackerSnapshotSeries } from "@/types/charts"
 
@@ -12,23 +13,20 @@ export interface DailyBucket {
 }
 
 /** Compute per-day upload/download deltas (in GiB) from a sorted snapshot list. */
+// INVARIANT: snapshots arrive sorted ascending by polledAt from the API
 export function computeDailyDeltas(snapshots: Snapshot[]): DailyBucket[] {
   if (snapshots.length < 2) return []
 
-  const sorted = [...snapshots].sort(
-    (a, b) => new Date(a.polledAt).getTime() - new Date(b.polledAt).getTime()
-  )
-
   const bucketMap = new Map<string, { upload: number; download: number }>()
 
-  for (let i = 1; i < sorted.length; i++) {
-    const prev = sorted[i - 1]
-    const curr = sorted[i]
+  for (let i = 1; i < snapshots.length; i++) {
+    const prev = snapshots[i - 1]
+    const curr = snapshots[i]
 
     const uploadDiff = Number(BigInt(curr.uploadedBytes) - BigInt(prev.uploadedBytes))
     const downloadDiff = Number(BigInt(curr.downloadedBytes) - BigInt(prev.downloadedBytes))
 
-    const dayKey = new Date(curr.polledAt).toISOString().slice(0, 10)
+    const dayKey = localDateStr(new Date(curr.polledAt))
 
     const existing = bucketMap.get(dayKey) ?? { upload: 0, download: 0 }
     existing.upload += uploadDiff
@@ -44,7 +42,7 @@ export function computeDailyDeltas(snapshots: Snapshot[]): DailyBucket[] {
 }
 
 /**
- * Build a 7×24 activity matrix from a list of Unix epoch timestamps (seconds).
+ * Build a 7x24 activity matrix from a list of Unix epoch timestamps (seconds).
  * Returns the flattened [hour, day, count] data array and the maximum count.
  */
 export function buildActivityMatrix(addedOnSeconds: number[]): {
diff --git a/src/components/charts/lib/theme.ts b/src/components/charts/lib/theme.ts
index e7480ebb..9d20f468 100644
--- a/src/components/charts/lib/theme.ts
+++ b/src/components/charts/lib/theme.ts
@@ -18,16 +18,17 @@
 //   chartAxisLabel      - standard axis label styling
 //   chartDataZoom       - standard slider dataZoom configuration
 
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 
 export const CHART_THEME = {
   // ── Surfaces ──
   surface: "#282a36", // --color-base
   elevated: "#2e3042", // --color-elevated
+  surfaceElevated: "#343648", // --color-overlay — raised handle surfaces
   overlay: "#343648", // --color-overlay
   controlBg: "#1e2029", // --color-control-bg
   tooltipBg: "#2e3042", // same as elevated
-  surfaceSemi: "rgba(40, 42, 54, 0.6)", // semi-transparent base for slider backgrounds
+  surfaceSemi: hexToRgba("#282a36", 0.6), // semi-transparent base for slider backgrounds
 
   // ── Text ──
   textPrimary: "#e2e8f0", // --color-primary
@@ -36,10 +37,10 @@ export const CHART_THEME = {
   fontMono: "var(--font-mono), monospace",
 
   // ── Borders ──
-  tooltipBorder: "rgba(148, 163, 184, 0.2)",
-  gridLine: "rgba(148, 163, 184, 0.08)", // --color-border
-  borderEmphasis: "rgba(148, 163, 184, 0.15)", // --color-border-emphasis
-  borderMid: "rgba(148, 163, 184, 0.3)", // axis pointers, label lines
+  tooltipBorder: hexToRgba("#94a3b8", 0.2),
+  gridLine: hexToRgba("#94a3b8", 0.08), // --color-border
+  borderEmphasis: hexToRgba("#94a3b8", 0.15), // --color-border-emphasis
+  borderMid: hexToRgba("#94a3b8", 0.3), // axis pointers, label lines
 
   // ── Layer 1: Raw colors ──
   cyan: "#00d4ff",
@@ -62,18 +63,25 @@ export const CHART_THEME = {
   positive: "#22c55e",
   negative: "#ef4444",
   neutral: "#94a3b8",
-  chartFallback: "#6b7280", // gray-500, replaces "#888" in multi-series charts
+  chartFallback: "#6b7280",
 
   // Ordinal scale for ratio/seed-time distribution buckets
   scale: ["#ef4444", "#f59e0b", "#10b981", "#00d4ff", "#8b5cf6", "#06b6d4"] as const,
 
   // ── Glow variants (for areaStyle fills, shadows) ──
-  accentDim: "rgba(0, 212, 255, 0.15)",
-  accentGlow: "rgba(0, 212, 255, 0.3)",
-  accentGlow40: "rgba(0, 212, 255, 0.4)",
-  accentGlow60: "rgba(0, 212, 255, 0.6)",
-  warnDim: "rgba(245, 158, 11, 0.15)",
-  warnGlow: "rgba(245, 158, 11, 0.3)",
+  accentDim: hexToRgba("#00d4ff", 0.15),
+  accentGlow: hexToRgba("#00d4ff", 0.3),
+  accentGlow40: hexToRgba("#00d4ff", 0.4),
+  accentGlow60: hexToRgba("#00d4ff", 0.6),
+  warnDim: hexToRgba("#f59e0b", 0.15),
+  warnGlow: hexToRgba("#f59e0b", 0.3),
+
+  // ── Font sizes (raw numbers — ECharts cannot read CSS vars) ──
+  // Keep in sync with @theme inline tokens in globals.css.
+  fontSizeMicro: 9, // text-4xs — unit suffixes in chart tooltips
+  fontSizeCompact: 10, // text-3xs — axis labels, legend items
+  fontSizeDense: 10, // text-2xs — same as compact today; bump to 11 if needed
+  fontSizeSmall: 12, // text-xs  — tooltip body, larger labels
 } as const
 
 /** Escape HTML entities in untrusted strings before injecting into ECharts tooltip HTML */
@@ -115,7 +123,7 @@ export function formatChartTimestamp(ts: number): string {
 
 /** Timestamp header div for tooltip content */
 export function chartTooltipHeader(label: string): string {
-  return `<div style="font-family:var(--font-mono),monospace;font-size:11px;color:${CHART_THEME.textTertiary};margin-bottom:4px;">${escHtml(label)}</div>`
+  return `<div style="font-family:var(--font-mono),monospace;font-size:${CHART_THEME.fontSizeDense}px;color:${CHART_THEME.textTertiary};margin-bottom:4px;">${escHtml(label)}</div>`
 }
 
 /** Standard legend configuration — plain wrapping, toggle handled by ChartECharts wrapper */
@@ -132,7 +140,7 @@ export function chartLegend(overrides?: Record<string, unknown>): Record<string,
     textStyle: {
       color: CHART_THEME.textTertiary,
       fontFamily: CHART_THEME.fontMono,
-      fontSize: 11,
+      fontSize: CHART_THEME.fontSizeDense,
     },
     ...overrides,
   }
@@ -189,7 +197,7 @@ export function chartTooltip(
     textStyle: {
       color: CHART_THEME.textPrimary,
       fontFamily: CHART_THEME.fontMono,
-      fontSize: 12,
+      fontSize: CHART_THEME.fontSizeSmall,
     },
     ...(trigger === "axis"
       ? {
@@ -216,7 +224,7 @@ export function chartGrid(overrides?: {
   return {
     left: 56,
     right: 24,
-    top: 78,
+    top: 16,
     bottom: 40,
     containLabel: false,
     ...overrides,
@@ -230,7 +238,7 @@ export function chartAxisLabel(overrides?: Record<string, unknown>): Record<stri
   return {
     color: CHART_THEME.textTertiary,
     fontFamily: CHART_THEME.fontMono,
-    fontSize: 10,
+    fontSize: CHART_THEME.fontSizeCompact,
     ...overrides,
   }
 }
@@ -244,18 +252,43 @@ export function chartDataZoom(accentColor: string): Record<string, unknown>[] {
     {
       type: "slider",
       borderColor: CHART_THEME.gridLine,
-      backgroundColor: CHART_THEME.surface,
-      fillerColor: hexToRgba(accentColor, 0.094),
-      handleStyle: { color: accentColor, borderColor: accentColor },
-      moveHandleStyle: { color: accentColor },
+      borderRadius: 8,
+      backgroundColor: hexToRgba("#1e2029", 0.8), // control-bg, recessed track
+      fillerColor: hexToRgba(accentColor, 0.08),
+      handleStyle: {
+        color: CHART_THEME.surfaceElevated,
+        borderColor: hexToRgba(accentColor, 0.4),
+        borderWidth: 1,
+        borderRadius: 4,
+        shadowBlur: 4,
+        shadowColor: hexToRgba("#000", 0.3),
+      },
+      moveHandleStyle: {
+        color: hexToRgba(accentColor, 0.3),
+      },
+      emphasis: {
+        handleStyle: {
+          color: CHART_THEME.surfaceElevated,
+          borderColor: accentColor,
+          shadowBlur: 8,
+          shadowColor: hexToRgba(accentColor, 0.3),
+        },
+        moveHandleStyle: {
+          color: hexToRgba(accentColor, 0.5),
+        },
+      },
       selectedDataBackground: {
-        lineStyle: { color: accentColor },
-        areaStyle: { color: hexToRgba(accentColor, 0.188) },
+        lineStyle: { color: hexToRgba(accentColor, 0.6) },
+        areaStyle: { color: hexToRgba(accentColor, 0.12) },
+      },
+      dataBackground: {
+        lineStyle: { color: CHART_THEME.gridLine },
+        areaStyle: { color: hexToRgba("#94a3b8", 0.04) },
       },
       textStyle: {
         color: CHART_THEME.textTertiary,
         fontFamily: CHART_THEME.fontMono,
-        fontSize: 10,
+        fontSize: CHART_THEME.fontSizeCompact,
       },
       height: 24,
       bottom: 8,
diff --git a/src/components/dashboard/AlertsBanner.tsx b/src/components/dashboard/AlertsBanner.tsx
index 1a88c7eb..17d3b876 100644
--- a/src/components/dashboard/AlertsBanner.tsx
+++ b/src/components/dashboard/AlertsBanner.tsx
@@ -1,12 +1,32 @@
 // src/components/dashboard/AlertsBanner.tsx
-//
-// Functions: AlertsBanner
-
 "use client"
 
+import { cva } from "class-variance-authority"
+import clsx from "clsx"
 import Link from "next/link"
 import { useCallback, useState } from "react"
 import type { DashboardAlert } from "@/lib/dashboard"
+import { formatDateTime } from "@/lib/formatters"
+
+// ── CVA variants ──
+
+type AlertSeverity = "danger" | "warn" | "accent"
+
+const alertRowVariants = cva(
+  "flex items-start sm:items-center gap-2 sm:gap-3 px-3 sm:px-4 py-3 nm-inset-sm bg-control-bg rounded-nm-md border-l-3 transition-transform duration-200 ease-out",
+  {
+    variants: {
+      severity: {
+        danger: "border-l-danger",
+        warn: "border-l-warn",
+        accent: "border-l-accent",
+      },
+    },
+    defaultVariants: { severity: "danger" },
+  }
+)
+
+// ── Type config ──
 
 interface AlertsBannerProps {
   alerts: DashboardAlert[]
@@ -14,18 +34,18 @@ interface AlertsBannerProps {
   onDismissAll?: () => void
 }
 
-const typeConfig: Record<string, { borderColor: string; icon: string; label: string }> = {
-  error: { borderColor: "var(--color-danger)", icon: "✕", label: "Error" },
-  "ratio-danger": { borderColor: "var(--color-danger)", icon: "▼", label: "Ratio" },
-  "stale-data": { borderColor: "var(--color-warn)", icon: "⏱", label: "Stale" },
-  "rank-change": { borderColor: "var(--color-accent)", icon: "🎉", label: "Rank" },
-  "zero-seeding": { borderColor: "var(--color-warn)", icon: "⏸", label: "Seeds" },
-  warned: { borderColor: "var(--color-danger)", icon: "⚠", label: "Warning" },
-  anniversary: { borderColor: "var(--color-accent)", icon: "🎂", label: "Anniversary" },
-  "update-available": { borderColor: "var(--color-accent)", icon: "⬆", label: "Update" },
-  "backup-failed": { borderColor: "var(--color-warn)", icon: "⚠", label: "Backup" },
-  "client-error": { borderColor: "var(--color-danger)", icon: "⏹", label: "Client" },
-  "poll-paused": { borderColor: "var(--color-danger)", icon: "⏸", label: "Paused" },
+const typeConfig: Record<string, { severity: AlertSeverity; icon: string; label: string }> = {
+  error: { severity: "danger", icon: "✕", label: "Error" },
+  "ratio-danger": { severity: "danger", icon: "▼", label: "Ratio" },
+  "stale-data": { severity: "warn", icon: "⏱", label: "Stale" },
+  "rank-change": { severity: "accent", icon: "🎉", label: "Rank" },
+  "zero-seeding": { severity: "warn", icon: "⏸", label: "Seeds" },
+  warned: { severity: "danger", icon: "⚠", label: "Warning" },
+  anniversary: { severity: "accent", icon: "🎂", label: "Anniversary" },
+  "update-available": { severity: "accent", icon: "⬆", label: "Update" },
+  "backup-failed": { severity: "warn", icon: "⚠", label: "Backup" },
+  "client-error": { severity: "danger", icon: "⏹", label: "Client" },
+  "poll-paused": { severity: "danger", icon: "⏸", label: "Paused" },
 }
 
 function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
@@ -66,7 +86,7 @@ function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
           <button
             type="button"
             onClick={handleDismissAll}
-            className="text-[10px] font-mono text-muted hover:text-secondary transition-colors duration-150 cursor-pointer uppercase tracking-wider"
+            className="timestamp hover:text-secondary transition-colors duration-150 cursor-pointer uppercase tracking-wider"
           >
             Clear All
           </button>
@@ -78,7 +98,7 @@ function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
         return (
           <div
             key={alert.key}
-            className="overflow-hidden transition-all duration-250 ease-out"
+            className="overflow-hidden transition-all duration-200 ease-out"
             style={{
               maxHeight: isDismissing ? 0 : 80,
               marginBottom: isDismissing ? -8 : 0,
@@ -91,11 +111,10 @@ function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
             }}
           >
             <div
-              className="flex items-start sm:items-center gap-2 sm:gap-3 px-3 sm:px-4 py-3 nm-inset-sm bg-control-bg rounded-nm-md transition-transform duration-250 ease-out"
-              style={{
-                borderLeft: `3px solid ${config.borderColor}`,
-                transform: isDismissing ? "translateX(-12px)" : "translateX(0)",
-              }}
+              className={clsx(
+                alertRowVariants({ severity: config.severity }),
+                isDismissing ? "-translate-x-3" : "translate-x-0"
+              )}
             >
               <span className="shrink-0 text-sm mt-0.5 sm:mt-0" aria-hidden="true">
                 {config.icon}
@@ -116,8 +135,8 @@ function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
                 <span className="font-mono text-xs text-tertiary truncate">{alert.message}</span>
               </div>
               {alert.timestamp && (
-                <span className="font-mono text-[10px] text-muted shrink-0 hidden sm:block">
-                  {new Date(alert.timestamp).toLocaleString()}
+                <span className="timestamp shrink-0 hidden sm:block">
+                  {formatDateTime(alert.timestamp)}
                 </span>
               )}
               {alert.dismissible !== false && (
@@ -127,7 +146,7 @@ function AlertsBanner({ alerts, onDismiss, onDismissAll }: AlertsBannerProps) {
                   className="text-muted hover:text-secondary transition-colors duration-150 cursor-pointer shrink-0 px-1 mt-0.5 sm:mt-0"
                   aria-label={`Dismiss ${config.label} alert for ${alert.trackerName}`}
                 >
-                  ×
+                  x
                 </button>
               )}
             </div>
diff --git a/src/components/dashboard/AnalyticsSection.tsx b/src/components/dashboard/AnalyticsSection.tsx
index 01b35f93..23087c27 100644
--- a/src/components/dashboard/AnalyticsSection.tsx
+++ b/src/components/dashboard/AnalyticsSection.tsx
@@ -1,7 +1,4 @@
 // src/components/dashboard/AnalyticsSection.tsx
-//
-// Functions: AnalyticsSection
-
 "use client"
 
 import { H2 } from "@typography"
@@ -159,14 +156,12 @@ function AnalyticsSection({ trackerSeries, trackers }: AnalyticsSectionProps) {
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-3">
           <H2>Analytics</H2>
-          {hiddenChartCount > 0 && (
-            <span className="text-[10px] font-mono text-muted">{hiddenChartCount} hidden</span>
-          )}
+          {hiddenChartCount > 0 && <span className="timestamp">{hiddenChartCount} hidden</span>}
         </div>
         <button
           type="button"
           onClick={() => chartPrefs.collapseAll(allChartIds)}
-          className="flex items-center gap-1.5 px-2.5 py-1 text-[10px] font-mono text-muted hover:text-secondary hover:bg-overlay transition-colors cursor-pointer rounded-nm-sm"
+          className="timestamp flex items-center gap-2 px-2.5 py-1 hover:text-secondary nm-interactive-inset cursor-pointer rounded-nm-sm"
         >
           <ChevronUpIcon
             width="12"
diff --git a/src/components/dashboard/ChartCard.tsx b/src/components/dashboard/ChartCard.tsx
index c50c20ec..60c9139e 100644
--- a/src/components/dashboard/ChartCard.tsx
+++ b/src/components/dashboard/ChartCard.tsx
@@ -1,15 +1,11 @@
 // src/components/dashboard/ChartCard.tsx
-//
-// Functions: ChartCard
 
 "use client"
 
-import { H3 } from "@typography"
-import type { ReactNode } from "react"
-import { useEffect, useRef, useState } from "react"
-import { Card } from "@/components/ui/Card"
-import { ChevronUpIcon, EyeOffIcon } from "@/components/ui/Icons"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { ChevronUpIcon, EyeOffIcon } from "@icons"
+import clsx from "clsx"
+import { type ReactNode, useEffect, useRef, useState } from "react"
+import { Card, ChartShimmer, Tooltip } from "@/components/ui"
 
 interface ChartCardProps {
   title: string
@@ -30,13 +26,12 @@ function ChartCard({
 }: ChartCardProps) {
   const cardRef = useRef<HTMLDivElement>(null)
   const [visible, setVisible] = useState(false)
-  const [shouldMount, setShouldMount] = useState(false)
+  const [mounted, setMounted] = useState(false)
 
-  // Lazy-load: only mount chart content when card scrolls into view
+  // Defer initial mount until scrolled into view
   useEffect(() => {
     const el = cardRef.current
     if (!el || visible) return
-
     const observer = new IntersectionObserver(
       ([entry]) => {
         if (entry.isIntersecting) {
@@ -50,59 +45,65 @@ function ChartCard({
     return () => observer.disconnect()
   }, [visible])
 
+  // Mount once visible, stay mounted. The collapse animation uses CSS
+  // (grid-rows-[0fr] + opacity-0) to hide content — no need to destroy
+  // and recreate ECharts instances on every expand/collapse cycle.
   useEffect(() => {
-    if (!collapsed && visible) setShouldMount(true)
-  }, [collapsed, visible])
+    if (visible && !collapsed && !mounted) {
+      setMounted(true)
+    }
+  }, [visible, collapsed, mounted])
 
   return (
     <div ref={cardRef}>
-      <Card className="flex flex-col gap-4">
-        <div className="flex items-start justify-between gap-4">
-          <div className="flex flex-col gap-1 min-w-0">
-            <H3 className="uppercase tracking-wider text-secondary">{title}</H3>
-            {description && !collapsed && (
-              <p className="text-xs font-mono text-tertiary">{description}</p>
-            )}
-          </div>
-          <div className="flex items-center gap-1 shrink-0">
-            {/* Collapse toggle */}
-            <Tooltip content={collapsed ? "Expand" : "Collapse"}>
-              <button
-                type="button"
-                onClick={onToggleCollapse}
-                className="w-7 h-7 flex items-center justify-center text-muted hover:text-secondary hover:bg-overlay transition-colors cursor-pointer rounded-nm-sm"
-                aria-label={collapsed ? "Expand chart" : "Collapse chart"}
-              >
-                <ChevronUpIcon
-                  width="14"
-                  height="14"
-                  className="transition-transform duration-200"
-                  style={{ transform: collapsed ? "rotate(180deg)" : "rotate(0deg)" }}
-                />
-              </button>
-            </Tooltip>
-            {/* Hide */}
-            <Tooltip content="Hide chart">
-              <button
-                type="button"
-                onClick={onHide}
-                className="w-7 h-7 flex items-center justify-center text-muted hover:text-secondary hover:bg-overlay transition-colors cursor-pointer rounded-nm-sm"
-                aria-label="Hide chart"
-              >
-                <EyeOffIcon width="14" height="14" />
-              </button>
-            </Tooltip>
-          </div>
+      <Card
+        className="relative flex flex-col gap-4"
+        title={title}
+        subtitle={description && !collapsed ? description : undefined}
+      >
+        {/* Collapse / Hide controls — absolute top-right over Card header */}
+        <div className="absolute top-4 right-4 flex items-center gap-1 z-10">
+          <Tooltip content={collapsed ? "Expand" : "Collapse"}>
+            <button
+              type="button"
+              onClick={onToggleCollapse}
+              className="w-7 h-7 flex items-center justify-center text-muted hover:text-secondary nm-interactive-inset cursor-pointer rounded-nm-sm"
+              aria-label={collapsed ? "Expand chart" : "Collapse chart"}
+            >
+              <ChevronUpIcon
+                width="14"
+                height="14"
+                className="transition-transform duration-200"
+                style={{ transform: collapsed ? "rotate(180deg)" : "rotate(0deg)" }}
+              />
+            </button>
+          </Tooltip>
+          <Tooltip content="Hide chart">
+            <button
+              type="button"
+              onClick={onHide}
+              className="w-7 h-7 flex items-center justify-center text-muted hover:text-secondary nm-interactive-inset cursor-pointer rounded-nm-sm"
+              aria-label="Hide chart"
+            >
+              <EyeOffIcon width="14" height="14" />
+            </button>
+          </Tooltip>
         </div>
 
-        {/* Animated content area using CSS grid trick */}
         <div
-          className={`grid transition-[grid-template-rows] duration-200 ease-out ${collapsed ? "grid-rows-[0fr]" : "grid-rows-[1fr]"}`}
+          className={clsx(
+            "grid transition-[grid-template-rows] duration-200 ease-out",
+            collapsed ? "grid-rows-[0fr]" : "grid-rows-[1fr]"
+          )}
         >
-          {/* p-6 -m-6: overflow-hidden is required for grid collapse animation,
-            but clips neumorphic shadows (nm-raised reaches ~24px). The padding
-            pushes the clip boundary out; the negative margin cancels layout shift. */}
-          <div className="overflow-hidden p-6 -m-6">{shouldMount && children}</div>
+          <div
+            className={clsx(
+              "overflow-hidden p-6 -m-6 transition-opacity duration-150",
+              collapsed ? "opacity-0" : "opacity-100"
+            )}
+          >
+            {mounted ? children : visible && !collapsed && <ChartShimmer />}
+          </div>
         </div>
       </Card>
     </div>
diff --git a/src/components/dashboard/DashboardSettingsSheet.tsx b/src/components/dashboard/DashboardSettingsSheet.tsx
index f98da912..e7a47d4a 100644
--- a/src/components/dashboard/DashboardSettingsSheet.tsx
+++ b/src/components/dashboard/DashboardSettingsSheet.tsx
@@ -1,6 +1,4 @@
 // src/components/dashboard/DashboardSettingsSheet.tsx
-//
-// Functions: SortableChartItem, DashboardSettingsSheet
 
 "use client"
 
@@ -14,13 +12,11 @@ import {
 import { CSS } from "@dnd-kit/utilities"
 import { H2 } from "@typography"
 import { useCallback, useState } from "react"
-import { CHART_THEME } from "@/components/charts/lib/theme"
 import type { ChartDef } from "@/components/dashboard/useChartPreferences"
 import { useChartPreferences } from "@/components/dashboard/useChartPreferences"
 import { useDashboardSettings } from "@/components/dashboard/useDashboardSettings"
-import { Sheet } from "@/components/ui/Sheet"
-import { TabBar } from "@/components/ui/TabBar"
-import { Toggle } from "@/components/ui/Toggle"
+import { Sheet, TabBar, Toggle } from "@/components/ui"
+import { Divider } from "@/components/ui/Divider"
 
 interface SortableChartItemProps {
   def: ChartDef
@@ -54,6 +50,11 @@ function SortableChartItem({ def, isHidden, onToggle }: SortableChartItemProps)
   )
 }
 
+const CHART_SETTINGS_TABS = [
+  { key: "analytics" as const, label: "Analytics" },
+  { key: "torrents" as const, label: "Torrents" },
+]
+
 interface DashboardSettingsSheetProps {
   open: boolean
   onClose: () => void
@@ -114,21 +115,13 @@ function DashboardSettingsSheet({
           />
         </div>
 
-        <div
-          className="h-px"
-          style={{
-            background: `linear-gradient(90deg, transparent, ${CHART_THEME.borderEmphasis}, transparent)`,
-          }}
-        />
+        <Divider compact />
 
         {/* Chart Visibility & Order */}
         <div className="flex flex-col gap-4">
           <H2>Charts</H2>
           <TabBar
-            tabs={[
-              { key: "analytics" as const, label: "Analytics" },
-              { key: "torrents" as const, label: "Torrents" },
-            ]}
+            tabs={CHART_SETTINGS_TABS}
             activeTab={chartSettingsTab}
             onChange={setChartSettingsTab}
           />
diff --git a/src/components/dashboard/DayRangeSidebar.tsx b/src/components/dashboard/DayRangeSidebar.tsx
index 94cc346a..36c481c0 100644
--- a/src/components/dashboard/DayRangeSidebar.tsx
+++ b/src/components/dashboard/DayRangeSidebar.tsx
@@ -1,14 +1,11 @@
 // src/components/dashboard/DayRangeSidebar.tsx
-//
-// Functions: DayRangeSidebar
 
 "use client"
 
 import clsx from "clsx"
 import { CHART_THEME } from "@/components/charts/lib/theme"
-import { hexToRgba } from "@/lib/formatters"
-
-type DayRange = 0 | 1 | 7 | 30 | 90 | 365
+import { hexToRgba } from "@/lib/color-utils"
+import type { DayRange } from "@/types/api"
 
 const DAY_RANGES: { value: DayRange; label: string }[] = [
   { value: 1, label: "24h" },
@@ -27,8 +24,8 @@ interface DayRangeSidebarProps {
 
 function DayRangeSidebar({ days, onChange, accentColor }: DayRangeSidebarProps) {
   return (
-    <div className="order-first md:order-none md:sticky md:top-6 flex flex-row flex-wrap md:flex-col gap-1 p-3 nm-raised-sm bg-elevated md:self-start md:ml-6 rounded-nm-lg">
-      <span className="w-full text-[9px] font-sans font-medium text-muted uppercase tracking-wider px-2 pb-1 md:pb-1">
+    <div className="order-first md:order-0 md:sticky md:top-6 flex flex-row flex-wrap md:flex-col gap-1 p-3 nm-raised-sm bg-elevated md:self-start md:ml-6 rounded-nm-lg">
+      <span className="w-full text-4xs font-sans font-medium text-muted uppercase tracking-wider px-2 pb-1 md:pb-1">
         Range
       </span>
       {DAY_RANGES.map((d) => {
@@ -39,8 +36,10 @@ function DayRangeSidebar({ days, onChange, accentColor }: DayRangeSidebarProps)
             type="button"
             onClick={() => onChange(d.value)}
             className={clsx(
-              "px-3 py-1.5 text-xs font-mono transition-all duration-150 cursor-pointer text-center rounded-nm-sm",
-              isActive ? "nm-inset-sm" : "hover:nm-raised-sm active:nm-inset-sm active:scale-[0.96]"
+              "px-3 py-1.5 text-xs font-mono cursor-pointer text-center rounded-nm-sm",
+              isActive
+                ? "nm-inset-sm"
+                : "transition-all duration-150 hover:nm-raised-sm active:nm-inset-sm active:scale-[0.96]"
             )}
             style={
               isActive
diff --git a/src/components/dashboard/EcosystemStatsSection.tsx b/src/components/dashboard/EcosystemStatsSection.tsx
index daa06b4d..460f7d91 100644
--- a/src/components/dashboard/EcosystemStatsSection.tsx
+++ b/src/components/dashboard/EcosystemStatsSection.tsx
@@ -1,7 +1,4 @@
 // src/components/dashboard/EcosystemStatsSection.tsx
-//
-// Functions: EcosystemStatsSection
-
 "use client"
 
 import { H2 } from "@typography"
@@ -17,7 +14,7 @@ import {
 } from "@/components/ui/Icons"
 import { StatCard } from "@/components/ui/StatCard"
 import type { AggregateStats } from "@/lib/dashboard"
-import { formatBytesFromString, formatRatio, splitValueUnit } from "@/lib/formatters"
+import { formatBytesFromString, formatCount, formatRatio, splitValueUnit } from "@/lib/formatters"
 import type { TrackerSummary } from "@/types/api"
 
 const AGGREGATE_ICONS: Record<string, ReactNode> = {
@@ -83,12 +80,12 @@ function EcosystemStatsSection({ trackers, aggregateStats }: EcosystemStatsSecti
         />
         <StatCard
           label="Seeding"
-          value={aggregateStats.totalSeeding.toLocaleString()}
+          value={formatCount(aggregateStats.totalSeeding)}
           icon={AGGREGATE_ICONS.seeding}
         />
         <StatCard
           label="Leeching"
-          value={aggregateStats.totalLeeching.toLocaleString()}
+          value={formatCount(aggregateStats.totalLeeching)}
           icon={AGGREGATE_ICONS.leeching}
         />
       </div>
diff --git a/src/components/dashboard/FleetDashboard.tsx b/src/components/dashboard/FleetDashboard.tsx
index 35e14175..db82d467 100644
--- a/src/components/dashboard/FleetDashboard.tsx
+++ b/src/components/dashboard/FleetDashboard.tsx
@@ -1,12 +1,11 @@
 // src/components/dashboard/FleetDashboard.tsx
-//
-// Functions: FleetDashboard
-
 "use client"
 
+import { useQuery, useQueryClient } from "@tanstack/react-query"
 import { H2 } from "@typography"
-import { useEffect, useRef, useState } from "react"
+import { useCallback } from "react"
 import { CrossSeedNetwork } from "@/components/charts/CrossSeedNetwork"
+import { FleetAgeBandHeatmap } from "@/components/charts/FleetAgeBandHeatmap"
 import { FleetAgeTimeline } from "@/components/charts/FleetAgeTimeline"
 import { FleetCategoryBreakdown } from "@/components/charts/FleetCategoryBreakdown"
 import { FleetCategoryTimeline } from "@/components/charts/FleetCategoryTimeline"
@@ -14,7 +13,6 @@ import { FleetCrossSeedDonut } from "@/components/charts/FleetCrossSeedDonut"
 import { FleetSizeJitter } from "@/components/charts/FleetSizeJitter"
 import { FleetSpeedSparklines } from "@/components/charts/FleetSpeedSparklines"
 import { FleetStorageTreemap } from "@/components/charts/FleetStorageTreemap"
-import { CHART_THEME } from "@/components/charts/lib/theme"
 import { SpeedHistoryChart } from "@/components/charts/SpeedHistoryChart"
 import { SpeedThemeRiver } from "@/components/charts/SpeedThemeRiver"
 import { TagCountTrends } from "@/components/charts/TagCountTrends"
@@ -27,157 +25,93 @@ import {
   FLEET_CHARTS,
   useFleetChartPreferences,
 } from "@/components/dashboard/useFleetChartPreferences"
+import { Button } from "@/components/ui"
 import {
   BoxIcon,
   ChevronUpIcon,
   DownloadArrowIcon,
   LeechingIcon,
+  RefreshIcon,
   SeedingIcon,
   TagIcon,
   UploadArrowIcon,
 } from "@/components/ui/Icons"
 import { StatCard } from "@/components/ui/StatCard"
-import type { FleetSnapshot, TorrentRaw, TrackerTag } from "@/lib/fleet"
-import { computeFleetStats } from "@/lib/fleet"
-import { formatBytesNum } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
-import { mapTorrent } from "@/lib/torrent-utils"
-import type { TrackerSummary } from "@/types/api"
-
-function splitBytes(bytes: number, suffix = ""): { value: string; unit: string } {
-  const formatted = formatBytesNum(bytes)
-  const idx = formatted.lastIndexOf(" ")
-  return { value: formatted.slice(0, idx), unit: `${formatted.slice(idx + 1)}${suffix}` }
-}
-
-function splitSpeed(bytes: number): { value: string; unit: string } {
-  return splitBytes(bytes, "/s")
-}
-
-interface FleetTorrentsResponse {
-  torrents: TorrentRaw[]
-  crossSeedTags: string[]
-  clientErrors: string[]
-  clientCount: number
-  cachedAt?: string | null
-}
+import { ChartGridSkeleton } from "@/components/ui/skeletons"
+import { usePollingIntervals } from "@/hooks/usePollingIntervals"
+import type { FleetSnapshot } from "@/lib/fleet"
+import type { FleetAggregation } from "@/lib/fleet-aggregation"
+import {
+  formatBytesNum,
+  formatCount,
+  formatPercent,
+  formatSpeed,
+  splitValueUnit,
+} from "@/lib/formatters"
+import { clientQueryOptions } from "@/lib/query-options"
 
 interface FleetDashboardProps {
   dayRange: number
-  trackers?: TrackerSummary[]
+  isActive?: boolean
 }
 
 const allChartIds = FLEET_CHARTS.map((c) => c.id)
 
-export function FleetDashboard({ dayRange, trackers: trackersProp }: FleetDashboardProps) {
-  const [torrents, setTorrents] = useState<TorrentInfo[]>([])
-  const [crossSeedTags, setCrossSeedTags] = useState<string[]>([])
-  const [snapshots, setSnapshots] = useState<FleetSnapshot[]>([])
-  const [trackerTags, setTrackerTags] = useState<TrackerTag[]>([])
-  const [clientList, setClientList] = useState<{ id: number; name: string }[]>([])
-  const [loading, setLoading] = useState(true)
+// Stable select: narrows ["clients"] cache to {id, name} so lastPolledAt
+// changes from the sidebar's 10s poll don't trigger re-renders here.
+export const selectClientIdName = (data: { id: number; name: string }[]) =>
+  data.map(({ id, name }) => ({ id, name }))
 
+export function FleetDashboard({ dayRange, isActive = true }: FleetDashboardProps) {
   const chartPrefs = useFleetChartPreferences()
   const { hydrated: chartPrefsHydrated } = chartPrefs
+  const intervals = usePollingIntervals()
 
-  const prevDayRange = useRef<number | null>(null)
-  const initialLoaded = useRef(false)
-
-  useEffect(() => {
-    const controller = new AbortController()
-    const { signal } = controller
-    const isFirstRun = !initialLoaded.current
+  const effectiveDays = dayRange === 0 ? 30 : dayRange
 
-    async function loadSnapshots() {
-      const res = await fetch(`/api/fleet/snapshots?days=${dayRange === 0 ? 30 : dayRange}`, {
-        signal,
-      })
-      if (res.ok) setSnapshots(await res.json())
-    }
-
-    async function loadInitial() {
-      const [cachedRes, clientsRes, trackersRes] = await Promise.all([
-        fetch("/api/fleet/torrents/cached", { signal }),
-        fetch("/api/clients", { signal }),
-        trackersProp ? Promise.resolve(null) : fetch("/api/trackers", { signal }),
-      ])
+  const { data: snapshots = [] } = useQuery({
+    queryKey: ["download-client-snapshots", effectiveDays],
+    queryFn: async ({ signal }) => {
+      const res = await fetch(`/api/fleet/snapshots?days=${effectiveDays}`, { signal })
+      if (!res.ok) throw new Error(`Fleet snapshots failed: ${res.status}`)
+      return res.json() as Promise<FleetSnapshot[]>
+    },
+    enabled: isActive,
+  })
 
-      if (cachedRes.ok) {
-        const data: FleetTorrentsResponse = await cachedRes.json()
-        if (data.torrents.length > 0) {
-          setTorrents(data.torrents.map(mapTorrent))
-          setCrossSeedTags(data.crossSeedTags)
-        }
-      }
+  // Fast: DB-cached torrent aggregation
+  const { data: aggregation, isFetching: fleetFetching } = useQuery({
+    queryKey: ["fleet-torrents-cached"],
+    queryFn: async ({ signal }) => {
+      const res = await fetch("/api/fleet/torrents/cached", { signal })
+      if (!res.ok) throw new Error(`Fleet data failed: ${res.status}`)
+      return res.json() as Promise<FleetAggregation>
+    },
+    staleTime: intervals.clientRefetchMs,
+    enabled: isActive,
+  })
 
-      if (clientsRes.ok) {
-        const data: { id: number; name: string }[] = await clientsRes.json()
-        setClientList(data)
-      }
+  const queryClient = useQueryClient()
 
-      if (trackersProp) {
-        setTrackerTags(
-          trackersProp
-            .filter((t): t is typeof t & { qbtTag: string } => !!t.qbtTag?.trim())
-            .map((t) => ({
-              tag: t.qbtTag.trim(),
-              name: t.name,
-              color: t.color ?? CHART_THEME.accent,
-            }))
-        )
-      } else if (trackersRes?.ok) {
-        const data: { id: number; name: string; color: string; qbtTag: string | null }[] =
-          await trackersRes.json()
-        setTrackerTags(
-          data
-            .filter((t): t is typeof t & { qbtTag: string } => !!t.qbtTag?.trim())
-            .map((t) => ({
-              tag: t.qbtTag.trim(),
-              name: t.name,
-              color: t.color ?? CHART_THEME.accent,
-            }))
-        )
-      }
+  const handleRefreshFleet = useCallback(() => {
+    queryClient.invalidateQueries({ queryKey: ["fleet-torrents-cached"] })
+  }, [queryClient])
 
-      // Background: refresh torrents live (slow — hits qBT clients)
-      try {
-        const liveRes = await fetch("/api/fleet/torrents", { signal })
-        if (liveRes.ok) {
-          const data: FleetTorrentsResponse = await liveRes.json()
-          setTorrents(data.torrents.map(mapTorrent))
-          setCrossSeedTags(data.crossSeedTags)
-        }
-      } catch {
-        // Live fetch failed — cached data stays visible
-      }
-    }
+  // Sidebar's 10s poll keeps this cache fresh. select narrows to {id, name}
+  // so lastPolledAt/updatedAt changes don't trigger re-renders.
+  const { data: clientList = [] } = useQuery({
+    ...clientQueryOptions,
+    staleTime: intervals.clientRefetchMs,
+    select: selectClientIdName,
+  })
 
-    const tasks = isFirstRun ? [loadInitial(), loadSnapshots()] : [loadSnapshots()]
-
-    Promise.all(tasks)
-      .catch(() => {})
-      .finally(() => {
-        if (isFirstRun) {
-          initialLoaded.current = true
-          setLoading(false)
-        }
-      })
-
-    prevDayRange.current = dayRange
-    return () => controller.abort()
-  }, [dayRange, trackersProp])
+  const loading = !aggregation && !snapshots.length
 
   if (loading) {
-    return (
-      <div className="flex min-h-[40vh] items-center justify-center">
-        <p className="text-secondary text-sm font-mono animate-loading-breathe">
-          Loading fleet data...
-        </p>
-      </div>
-    )
+    return <ChartGridSkeleton count={4} columns={1} chartHeight="h-[360px]" />
   }
 
-  if (torrents.length === 0 && snapshots.length === 0) {
+  if (aggregation && aggregation.stats.torrentCount === 0 && snapshots.length === 0) {
     return (
       <div className="flex min-h-[40vh] items-center justify-center flex-col gap-2">
         <p className="text-secondary text-sm font-mono">No torrent data available.</p>
@@ -188,14 +122,27 @@ export function FleetDashboard({ dayRange, trackers: trackersProp }: FleetDashbo
     )
   }
 
-  const stats = computeFleetStats(torrents, crossSeedTags)
+  // aggregation may still be null here if only snapshots are available.
+  // Stat cards and aggregation-based charts guard on aggregation below
+  const uploadSpeedParts = aggregation
+    ? splitValueUnit(formatSpeed(aggregation.stats.fleetUploadSpeed))
+    : null
+  const downloadSpeedParts = aggregation
+    ? splitValueUnit(formatSpeed(aggregation.stats.fleetDownloadSpeed))
+    : null
+  const librarySizeParts = aggregation
+    ? splitValueUnit(formatBytesNum(aggregation.stats.totalLibrarySize))
+    : null
+
   const hiddenCount =
     FLEET_CHARTS.length - FLEET_CHARTS.filter((c) => !chartPrefs.isHidden(c.id)).length
 
   function renderChart(id: string) {
     switch (id) {
       case "fleet-speed-sparklines":
-        return clientList.length > 0 ? <FleetSpeedSparklines clients={clientList} /> : null
+        return clientList.length > 0 ? (
+          <FleetSpeedSparklines clients={clientList} isActive={isActive} />
+        ) : null
       case "speed-theme-river":
         return <SpeedThemeRiver snapshots={snapshots} />
       case "seeding-count-trends":
@@ -205,36 +152,47 @@ export function FleetDashboard({ dayRange, trackers: trackersProp }: FleetDashbo
       case "speed-history":
         return <SpeedHistoryChart snapshots={snapshots} />
       case "fleet-ratio-distribution":
-        return <TorrentRatioDistribution torrents={torrents} />
+        return aggregation ? (
+          <TorrentRatioDistribution buckets={aggregation.ratioDistribution} />
+        ) : null
       case "fleet-cross-seed-donut":
-        return <FleetCrossSeedDonut torrents={torrents} crossSeedTags={crossSeedTags} />
-      case "cross-seed-network":
-        return (
-          <CrossSeedNetwork
-            torrents={torrents}
-            trackerTags={trackerTags}
-            crossSeedTags={crossSeedTags}
-            height={400}
+        return aggregation ? (
+          <FleetCrossSeedDonut
+            crossSeeded={aggregation.crossSeed.crossSeeded}
+            unique={aggregation.crossSeed.unique}
+            total={aggregation.crossSeed.total}
           />
-        )
+        ) : null
+      case "cross-seed-network":
+        return aggregation ? (
+          <CrossSeedNetwork network={aggregation.crossSeedNetwork} height={400} />
+        ) : null
       case "tracker-health-radar":
-        return <TrackerHealthRadar torrents={torrents} trackerTags={trackerTags} />
+        return aggregation ? <TrackerHealthRadar metrics={aggregation.trackerHealth} /> : null
       case "fleet-activity-heatmap":
-        return <TorrentActivityHeatmap torrents={torrents} />
+        return aggregation ? <TorrentActivityHeatmap grid={aggregation.activityGrid} /> : null
       case "fleet-storage-treemap":
-        return (
-          <FleetStorageTreemap torrents={torrents} trackerTags={trackerTags.map((t) => t.tag)} />
-        )
+        return aggregation ? (
+          <FleetStorageTreemap data={aggregation.storageByTrackerCategory} />
+        ) : null
       case "fleet-seed-time-distribution":
-        return <TorrentSeedTimeDistribution torrents={torrents} />
+        return aggregation ? (
+          <TorrentSeedTimeDistribution buckets={aggregation.seedTimeDistribution} />
+        ) : null
+      case "fleet-age-bands":
+        return aggregation ? <FleetAgeBandHeatmap data={aggregation.ageBands} /> : null
       case "fleet-age-timeline":
-        return <FleetAgeTimeline torrents={torrents} trackerTags={trackerTags} />
+        return aggregation ? <FleetAgeTimeline data={aggregation.ageTimeline} /> : null
       case "fleet-category-timeline":
-        return <FleetCategoryTimeline torrents={torrents} />
+        return aggregation ? <FleetCategoryTimeline data={aggregation.categoryTimeline} /> : null
       case "fleet-size-jitter":
-        return <FleetSizeJitter torrents={torrents} trackerTags={trackerTags} height={360} />
+        return aggregation ? (
+          <FleetSizeJitter data={aggregation.sizesByTracker} height={360} />
+        ) : null
       case "fleet-category-breakdown":
-        return <FleetCategoryBreakdown torrents={torrents} trackerTags={trackerTags} height={360} />
+        return aggregation ? (
+          <FleetCategoryBreakdown data={aggregation.categoryBreakdown} height={360} />
+        ) : null
       default:
         return null
     }
@@ -243,38 +201,41 @@ export function FleetDashboard({ dayRange, trackers: trackersProp }: FleetDashbo
   return (
     <div className="flex flex-col gap-6">
       {/* Fleet Stat Cards */}
-      {!chartPrefs.isHidden("fleet-stat-cards") && (
+      {!chartPrefs.isHidden("fleet-stat-cards") && aggregation && (
         <div className="flex flex-col gap-4">
           <H2>Fleet Overview</H2>
           <div className="grid grid-cols-[repeat(auto-fill,minmax(140px,1fr))] gap-4">
             <StatCard
               label="Seeding"
-              value={stats.totalSeeding.toLocaleString()}
+              value={formatCount(aggregation.stats.totalSeeding)}
               icon={<SeedingIcon width="16" height="16" />}
             />
             <StatCard
               label="Leeching"
-              value={stats.totalLeeching.toLocaleString()}
+              value={formatCount(aggregation.stats.totalLeeching)}
               icon={<LeechingIcon width="16" height="16" />}
             />
             <StatCard
               label="Upload"
-              {...splitSpeed(stats.fleetUploadSpeed)}
+              value={uploadSpeedParts?.num ?? "—"}
+              unit={uploadSpeedParts?.unit}
               icon={<UploadArrowIcon width="16" height="16" />}
             />
             <StatCard
               label="Download"
-              {...splitSpeed(stats.fleetDownloadSpeed)}
+              value={downloadSpeedParts?.num ?? "—"}
+              unit={downloadSpeedParts?.unit}
               icon={<DownloadArrowIcon width="16" height="16" />}
             />
             <StatCard
               label="Library"
-              {...splitBytes(stats.totalLibrarySize)}
+              value={librarySizeParts?.num ?? "—"}
+              unit={librarySizeParts?.unit}
               icon={<BoxIcon width="16" height="16" />}
             />
             <StatCard
               label="Cross-Seed"
-              value={`${stats.crossSeedPercent.toFixed(1)}%`}
+              value={formatPercent(aggregation.stats.crossSeedPercent)}
               icon={<TagIcon width="16" height="16" />}
             />
           </div>
@@ -286,27 +247,41 @@ export function FleetDashboard({ dayRange, trackers: trackersProp }: FleetDashbo
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-3">
             <H2>Fleet Analytics</H2>
-            {hiddenCount > 0 && (
-              <span className="text-[10px] font-mono text-muted">{hiddenCount} hidden</span>
-            )}
+            {hiddenCount > 0 && <span className="timestamp">{hiddenCount} hidden</span>}
+          </div>
+          <div className="flex items-center gap-2">
+            <Button
+              variant="secondary"
+              size="sm"
+              onClick={handleRefreshFleet}
+              disabled={fleetFetching}
+              aria-label="Refresh fleet data"
+            >
+              <RefreshIcon
+                width="14"
+                height="14"
+                className={fleetFetching ? "animate-spin" : undefined}
+              />
+              {fleetFetching ? "Refreshing…" : "Refresh"}
+            </Button>
+            <button
+              type="button"
+              onClick={() => chartPrefs.collapseAll(allChartIds)}
+              className="timestamp flex items-center gap-2 px-2.5 py-1 hover:text-secondary nm-interactive-inset cursor-pointer rounded-nm-sm"
+            >
+              <ChevronUpIcon
+                width="12"
+                height="12"
+                className="transition-transform duration-200"
+                style={{
+                  transform: chartPrefs.allVisibleCollapsed(allChartIds)
+                    ? "rotate(180deg)"
+                    : "rotate(0deg)",
+                }}
+              />
+              {chartPrefs.allVisibleCollapsed(allChartIds) ? "Expand All" : "Collapse All"}
+            </button>
           </div>
-          <button
-            type="button"
-            onClick={() => chartPrefs.collapseAll(allChartIds)}
-            className="flex items-center gap-1.5 px-2.5 py-1 text-[10px] font-mono text-muted hover:text-secondary hover:bg-overlay transition-colors cursor-pointer rounded-nm-sm"
-          >
-            <ChevronUpIcon
-              width="12"
-              height="12"
-              className="transition-transform duration-200"
-              style={{
-                transform: chartPrefs.allVisibleCollapsed(allChartIds)
-                  ? "rotate(180deg)"
-                  : "rotate(0deg)",
-              }}
-            />
-            {chartPrefs.allVisibleCollapsed(allChartIds) ? "Expand All" : "Collapse All"}
-          </button>
         </div>
 
         <div className="flex flex-col gap-6">
diff --git a/src/components/dashboard/FleetHeadline.tsx b/src/components/dashboard/FleetHeadline.tsx
index 3152741a..c1b85b78 100644
--- a/src/components/dashboard/FleetHeadline.tsx
+++ b/src/components/dashboard/FleetHeadline.tsx
@@ -1,5 +1,4 @@
 // src/components/dashboard/FleetHeadline.tsx
-
 "use client"
 
 import { CHART_THEME } from "@/components/charts/lib/theme"
@@ -11,7 +10,8 @@ import {
   UploadArrowIcon,
 } from "@/components/ui/Icons"
 import { StatCard } from "@/components/ui/StatCard"
-import { computePctChange, formatBytesFromString, splitValueUnit } from "@/lib/formatters"
+import { computePctChange } from "@/lib/data-transforms"
+import { formatBytesFromString, formatCount, splitValueUnit } from "@/lib/formatters"
 import type { TodayAtAGlance } from "@/types/api"
 
 interface FleetHeadlineProps {
@@ -40,7 +40,7 @@ export function FleetHeadline({ fleet }: FleetHeadlineProps) {
     if (fleet.seedbonusChange === null) return "+0"
     const floored = Math.floor(Math.abs(fleet.seedbonusChange))
     const sign = fleet.seedbonusChange >= 0 ? "+" : "-"
-    return sign + floored.toLocaleString()
+    return sign + formatCount(floored)
   })()
 
   const uploadPct = computePctChange(fleet.uploadDelta, fleet.uploadDeltaYesterday)
diff --git a/src/components/dashboard/LoginTimers.tsx b/src/components/dashboard/LoginTimers.tsx
index a7669122..216c7333 100644
--- a/src/components/dashboard/LoginTimers.tsx
+++ b/src/components/dashboard/LoginTimers.tsx
@@ -1,13 +1,11 @@
 // src/components/dashboard/LoginTimers.tsx
-//
-// Functions: LoginTimers
 
 "use client"
 
 import { useState } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
-import { ChevronToggle } from "@/components/ui/ChevronToggle"
 import { ExternalLinkIcon } from "@/components/ui/Icons"
+import { SectionToggle } from "@/components/ui/SectionToggle"
 import { StatCard } from "@/components/ui/StatCard"
 import { findRegistryEntry } from "@/data/tracker-registry"
 import type { TrackerSummary } from "@/types/api"
@@ -48,14 +46,11 @@ export function LoginTimers({ trackers }: { trackers: TrackerSummary[] }) {
 
   return (
     <div className="flex flex-col gap-3">
-      <button
-        type="button"
-        onClick={() => setExpanded((e) => !e)}
-        className="flex items-center gap-2 text-xs font-sans font-medium text-tertiary uppercase tracking-wider hover:text-secondary transition-colors duration-150 cursor-pointer w-fit"
-      >
-        <ChevronToggle expanded={expanded} />
-        Login Timers
-      </button>
+      <SectionToggle
+        label="Login Timers"
+        expanded={expanded}
+        onToggle={() => setExpanded((e) => !e)}
+      />
 
       {expanded && (
         <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-3">
@@ -73,7 +68,7 @@ export function LoginTimers({ trackers }: { trackers: TrackerSummary[] }) {
                 lastAccessAt={lastAccessAt}
                 loginIntervalDays={loginIntervalDays}
                 accentColor={CHART_THEME.success}
-                className="p-3 nm-raised-sm rounded-nm-md group-hover:nm-raised transition-shadow duration-150"
+                className="p-3 nm-interactive-sm rounded-nm-md"
               />
               <span className="absolute top-2 right-2 text-muted opacity-0 group-hover:opacity-60 transition-opacity duration-150">
                 <ExternalLinkIcon width={12} height={12} />
diff --git a/src/components/dashboard/MoversAndShakers.tsx b/src/components/dashboard/MoversAndShakers.tsx
index bba1a7f4..8faf132f 100644
--- a/src/components/dashboard/MoversAndShakers.tsx
+++ b/src/components/dashboard/MoversAndShakers.tsx
@@ -2,6 +2,8 @@
 
 "use client"
 
+import { DataCell, H2 } from "@typography"
+import clsx from "clsx"
 import type { ReactNode } from "react"
 import { MarqueeText } from "@/components/ui/MarqueeText"
 import { Tooltip } from "@/components/ui/Tooltip"
@@ -39,9 +41,7 @@ function buildTooltip(entry: TorrentRankListEntry): ReactNode {
 function TorrentRankList({ label, entries }: { label: string; entries: TorrentRankListEntry[] }) {
   return (
     <div className="nm-inset-sm rounded-nm-md p-4 overflow-hidden">
-      <p className="text-xs font-sans font-medium text-secondary uppercase tracking-wider mb-3">
-        {label}
-      </p>
+      <H2 className="uppercase tracking-wider mb-3">{label}</H2>
       {entries.length === 0 ? (
         <p className="text-xs text-muted">No activity</p>
       ) : (
@@ -49,18 +49,21 @@ function TorrentRankList({ label, entries }: { label: string; entries: TorrentRa
           {entries.map((entry, index) => (
             <Tooltip key={entry.hash} content={buildTooltip(entry)}>
               <li
-                className={`grid grid-cols-[1fr_auto] items-center gap-3 py-1.5 ${index < entries.length - 1 ? "border-b border-border" : ""}`}
+                className={clsx(
+                  "grid grid-cols-[1fr_auto] items-center gap-3 py-1.5",
+                  index < entries.length - 1 && "border-b border-border"
+                )}
               >
                 <div className="flex items-center gap-2 min-w-0">
                   <span
-                    className="w-2 h-2 rounded-full flex-shrink-0"
+                    className="color-dot"
                     style={{ backgroundColor: entry.trackerColor ?? "var(--color-accent)" }}
                   />
                   <MarqueeText className="text-xs font-mono text-primary">{entry.name}</MarqueeText>
                 </div>
-                <span className="text-xs font-mono text-secondary tabular-nums whitespace-nowrap">
+                <DataCell className="whitespace-nowrap">
                   {formatBytesFromString(entry.bytes)}
-                </span>
+                </DataCell>
               </li>
             </Tooltip>
           ))}
diff --git a/src/components/dashboard/PollAllButton.tsx b/src/components/dashboard/PollAllButton.tsx
index ef05bf3c..1fc7a388 100644
--- a/src/components/dashboard/PollAllButton.tsx
+++ b/src/components/dashboard/PollAllButton.tsx
@@ -113,7 +113,7 @@ export function PollAllButton({ onPollComplete }: PollAllButtonProps) {
   }, [polling, status, onPollComplete])
 
   return (
-    <Button variant="secondary" size="sm" onClick={handleClick} className="min-w-[136px]">
+    <Button variant="secondary" size="sm" onClick={handleClick} className="min-w-34">
       <span className="grid [&>*]:col-start-1 [&>*]:row-start-1 [&>*]:flex [&>*]:items-center [&>*]:justify-center [&>*]:transition-opacity [&>*]:duration-200">
         <span className={polling || status !== "idle" ? "opacity-0" : "opacity-100"}>
           Poll All Now
diff --git a/src/components/dashboard/RankProgress.tsx b/src/components/dashboard/RankProgress.tsx
index af2c35ef..0c06d84f 100644
--- a/src/components/dashboard/RankProgress.tsx
+++ b/src/components/dashboard/RankProgress.tsx
@@ -1,15 +1,12 @@
 // src/components/dashboard/RankProgress.tsx
-//
-// Functions: extractRankHistory, RankProgressBar, RankTimeline, RankProgress
-
 "use client"
 
 import { useState } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
-import { ChevronToggle } from "@/components/ui/ChevronToggle"
 import { RedactedText } from "@/components/ui/RedactedText"
+import { SectionToggle } from "@/components/ui/SectionToggle"
 import type { TrackerUserClass } from "@/data/tracker-registry"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 import { isRedacted } from "@/lib/privacy"
 import { checkAnniversaryMilestone } from "@/lib/tracker-events"
 import type { Snapshot } from "@/types/api"
@@ -32,6 +29,25 @@ type TimelineEvent =
     }
   | { kind: "anniversary"; label: string }
 
+interface RankProgressBarProps {
+  userClasses: TrackerUserClass[]
+  currentRank: string | null
+  accentColor: string
+}
+
+interface RankTimelineProps {
+  events: TimelineEvent[]
+  accentColor: string
+}
+
+interface RankProgressProps {
+  userClasses: TrackerUserClass[]
+  currentRank: string | null
+  snapshots: Snapshot[]
+  accentColor: string
+  joinedAt?: string | null
+}
+
 // ── Helpers ──
 
 function extractRankHistory(snapshots: Snapshot[]): RankChange[] {
@@ -63,14 +79,6 @@ function classifyDirection(
   return toIdx > fromIdx ? "promotion" : "demotion"
 }
 
-// ── Progress Bar ──
-
-interface RankProgressBarProps {
-  userClasses: TrackerUserClass[]
-  currentRank: string | null
-  accentColor: string
-}
-
 function RankProgressBar({ userClasses, currentRank, accentColor }: RankProgressBarProps) {
   if (userClasses.length === 0 || !currentRank || isRedacted(currentRank)) return null
 
@@ -79,7 +87,7 @@ function RankProgressBar({ userClasses, currentRank, accentColor }: RankProgress
   )
 
   return (
-    <div className="flex items-center gap-1 w-full overflow-x-auto pt-1 pb-3 styled-scrollbar">
+    <div className="flex items-center gap-1 w-full overflow-x-auto p-3 -m-3 styled-scrollbar">
       {userClasses.map((uc, i) => {
         const isPast = currentIndex >= 0 && i < currentIndex
         const isCurrent = i === currentIndex
@@ -129,13 +137,6 @@ function RankProgressBar({ userClasses, currentRank, accentColor }: RankProgress
   )
 }
 
-// ── Timeline ──
-
-interface RankTimelineProps {
-  events: TimelineEvent[]
-  accentColor: string
-}
-
 function RankTimeline({ events, accentColor }: RankTimelineProps) {
   if (events.length === 0) return null
 
@@ -144,18 +145,15 @@ function RankTimeline({ events, accentColor }: RankTimelineProps) {
       {events.map((event) => {
         if (event.kind === "anniversary") {
           return (
-            <div
-              key={`anniv-${event.label}`}
-              className="flex flex-col items-center gap-1.5 shrink-0"
-            >
+            <div key={`anniv-${event.label}`} className="flex flex-col items-center gap-2 shrink-0">
               <div
                 className="w-2.5 h-2.5 rounded-full shrink-0"
                 style={{
-                  backgroundColor: CHART_THEME.accent,
-                  boxShadow: `0 0 8px ${hexToRgba(CHART_THEME.accent, 0.4)}`,
+                  backgroundColor: accentColor,
+                  boxShadow: `0 0 8px ${hexToRgba(accentColor, 0.4)}`,
                 }}
               />
-              <span className="text-[10px] font-mono text-accent whitespace-nowrap">
+              <span className="text-3xs font-mono whitespace-nowrap" style={{ color: accentColor }}>
                 {event.label}
               </span>
             </div>
@@ -179,8 +177,8 @@ function RankTimeline({ events, accentColor }: RankTimelineProps) {
 
         return (
           <div key={`${event.date}-${event.to}`} className="flex flex-col gap-0.5 shrink-0">
-            <div className="flex items-center gap-1.5 whitespace-nowrap">
-              <span className="text-[9px] leading-none shrink-0" style={{ color: dirColor }}>
+            <div className="flex items-center gap-2 whitespace-nowrap">
+              <span className="text-4xs leading-none shrink-0" style={{ color: dirColor }}>
                 {dirIcon}
               </span>
               <span className="text-xs font-mono text-secondary">
@@ -193,9 +191,7 @@ function RankTimeline({ events, accentColor }: RankTimelineProps) {
                 <RedactedText value={event.to} color={dirColor} className="font-semibold" />
               </span>
             </div>
-            <span className="text-[10px] font-mono text-muted whitespace-nowrap pl-4">
-              {dateStr}
-            </span>
+            <span className="timestamp whitespace-nowrap pl-4">{dateStr}</span>
           </div>
         )
       })}
@@ -203,16 +199,6 @@ function RankTimeline({ events, accentColor }: RankTimelineProps) {
   )
 }
 
-// ── Combined component ──
-
-interface RankProgressProps {
-  userClasses: TrackerUserClass[]
-  currentRank: string | null
-  snapshots: Snapshot[]
-  accentColor: string
-  joinedAt?: string | null
-}
-
 function RankProgress({
   userClasses,
   currentRank,
@@ -223,7 +209,7 @@ function RankProgress({
   const [expanded, setExpanded] = useState(true)
   const rankHistory = extractRankHistory(snapshots)
 
-  // Build timeline events: rank changes + anniversary milestone
+  // Build timeline events for rank changes + anniversary milestone
   const events: TimelineEvent[] = [...rankHistory].reverse().map((change) => ({
     kind: "rank" as const,
     from: change.from,
@@ -243,14 +229,11 @@ function RankProgress({
 
   return (
     <div className="flex flex-col gap-4">
-      <button
-        type="button"
-        onClick={() => setExpanded((e) => !e)}
-        className="flex items-center gap-2 text-xs font-sans font-medium text-tertiary uppercase tracking-wider hover:text-secondary transition-colors duration-150 cursor-pointer w-fit"
-      >
-        <ChevronToggle expanded={expanded} />
-        Rank Progression
-      </button>
+      <SectionToggle
+        label="Rank Progression"
+        expanded={expanded}
+        onToggle={() => setExpanded((e) => !e)}
+      />
 
       {expanded && (
         <>
diff --git a/src/components/dashboard/TodayAtAGlance.tsx b/src/components/dashboard/TodayAtAGlance.tsx
index 92e83069..1507fab6 100644
--- a/src/components/dashboard/TodayAtAGlance.tsx
+++ b/src/components/dashboard/TodayAtAGlance.tsx
@@ -2,12 +2,13 @@
 
 "use client"
 
+import { H2 } from "@typography"
 import { FleetActivity } from "@/components/dashboard/FleetActivity"
 import { FleetHeadline } from "@/components/dashboard/FleetHeadline"
 import { MoversAndShakers } from "@/components/dashboard/MoversAndShakers"
 import { TrackerBreakdownBars } from "@/components/dashboard/TrackerBreakdownBars"
 import { TrackerBreakdownTicker } from "@/components/dashboard/TrackerBreakdownTicker"
-import { Card } from "@/components/ui/Card"
+import { Card, Divider } from "@/components/ui"
 import { formatTimeAgo } from "@/lib/formatters"
 import type { TodayAtAGlance as TodayAtAGlanceData } from "@/types/api"
 
@@ -20,7 +21,7 @@ function UpdatedAt({ iso }: { iso: string | null }) {
   if (!iso) return null
   const ago = formatTimeAgo(new Date(iso))
   return (
-    <span className="text-[10px] font-mono text-muted" title={iso}>
+    <span className="timestamp" title={iso}>
       Updated {ago}
     </span>
   )
@@ -38,20 +39,16 @@ export function TodayAtAGlance({ data, variant = "bars" }: TodayAtAGlanceProps)
       <div className="flex flex-col gap-5">
         <FleetHeadline fleet={data.fleet} />
 
-        <div className="border-t border-border" />
+        <Divider compact />
 
         {/* Tracker breakdowns — upload and download side by side on lg, stacked on mobile */}
         <div className="flex items-center justify-between">
-          <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-            By Tracker
-          </span>
+          <H2 className="uppercase tracking-wider">By Tracker</H2>
           <UpdatedAt iso={data.trackerLastUpdated} />
         </div>
         <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
           <div className="nm-inset-sm rounded-nm-md p-4 flex flex-col gap-3">
-            <p className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-              Upload
-            </p>
+            <H2 className="uppercase tracking-wider">Upload</H2>
             {variant === "bars" ? (
               <TrackerBreakdownBars trackers={data.trackers} metric="upload" />
             ) : (
@@ -60,9 +57,7 @@ export function TodayAtAGlance({ data, variant = "bars" }: TodayAtAGlanceProps)
           </div>
 
           <div className="nm-inset-sm rounded-nm-md p-4 flex flex-col gap-3">
-            <p className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-              Download
-            </p>
+            <H2 className="uppercase tracking-wider">Download</H2>
             {variant === "bars" ? (
               <TrackerBreakdownBars trackers={data.trackers} metric="download" />
             ) : (
@@ -73,7 +68,7 @@ export function TodayAtAGlance({ data, variant = "bars" }: TodayAtAGlanceProps)
 
         {hasActivity && (
           <>
-            <div className="border-t border-border" />
+            <Divider compact />
             <div className="flex items-center justify-between">
               <FleetActivity activity={data.activity} />
               <UpdatedAt iso={data.clientLastUpdated} />
diff --git a/src/components/dashboard/TodayAtAGlanceSkeleton.tsx b/src/components/dashboard/TodayAtAGlanceSkeleton.tsx
index be4b966a..6350b2c1 100644
--- a/src/components/dashboard/TodayAtAGlanceSkeleton.tsx
+++ b/src/components/dashboard/TodayAtAGlanceSkeleton.tsx
@@ -3,10 +3,7 @@
 "use client"
 
 import { Card } from "@/components/ui/Card"
-
-function Shimmer({ className }: { className?: string }) {
-  return <div className={`bg-control-bg rounded-nm-sm animate-pulse ${className ?? ""}`} />
-}
+import { Shimmer } from "@/components/ui/Shimmer"
 
 const STAT_KEYS = ["upload", "download", "buffer", "ratio", "bonus"] as const
 const PANEL_KEYS = ["upload-panel", "download-panel"] as const
@@ -19,8 +16,8 @@ export function TodayAtAGlanceSkeleton() {
         <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3">
           {STAT_KEYS.map((key) => (
             <div key={key} className="bg-raised p-5 flex flex-col gap-3 nm-raised-sm rounded-nm-lg">
-              <Shimmer className="h-3 w-24" />
-              <Shimmer className="h-8 w-20" />
+              <Shimmer size="text" className="w-24" />
+              <Shimmer size="value" className="w-20" />
             </div>
           ))}
         </div>
@@ -31,9 +28,9 @@ export function TodayAtAGlanceSkeleton() {
         <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
           {PANEL_KEYS.map((key) => (
             <div key={key} className="nm-inset-sm rounded-nm-md p-4 flex flex-col gap-3">
-              <Shimmer className="h-3 w-32" />
-              <Shimmer className="h-4 w-full" />
-              <Shimmer className="h-4 w-3/4" />
+              <Shimmer size="text" className="w-32" />
+              <Shimmer size="bar" className="w-full" />
+              <Shimmer size="bar" className="w-3/4" />
             </div>
           ))}
         </div>
diff --git a/src/components/dashboard/TorrentsTab.tsx b/src/components/dashboard/TorrentsTab.tsx
index 1751df91..38c9ac23 100644
--- a/src/components/dashboard/TorrentsTab.tsx
+++ b/src/components/dashboard/TorrentsTab.tsx
@@ -1,9 +1,10 @@
 // src/components/dashboard/TorrentsTab.tsx
-
 "use client"
 
 import { H2 } from "@typography"
-import { type ReactNode, useEffect, useRef, useState } from "react"
+import clsx from "clsx"
+import dynamic from "next/dynamic"
+import { useState } from "react"
 import { ParallelTorrentsChart } from "@/components/charts/ParallelTorrentsChart"
 import { StorageSunburst } from "@/components/charts/StorageSunburst"
 import {
@@ -11,7 +12,6 @@ import {
   TagGroupBreakdownChart,
 } from "@/components/charts/TagGroupBreakdownChart"
 import { TorrentActivityHeatmap } from "@/components/charts/TorrentActivityHeatmap"
-import { TorrentAgeScatter3D } from "@/components/charts/TorrentAgeScatter3D"
 import { TorrentAgeTimeline } from "@/components/charts/TorrentAgeTimeline"
 import { TorrentAvgSeedTime } from "@/components/charts/TorrentAvgSeedTime"
 import { TorrentCategoryAcquisition } from "@/components/charts/TorrentCategoryAcquisition"
@@ -22,15 +22,20 @@ import { TorrentSizeBreakdown } from "@/components/charts/TorrentSizeBreakdown"
 import {
   ActiveTransfersTable,
   CategoryCard,
-  NoClientState,
+  NoDownloadClientState,
   NoTagState,
   TorrentRankingTable,
   TorrentStatCards,
   UnsatisfiedTorrentsTable,
 } from "@/components/dashboard/torrents"
-import { Card } from "@/components/ui/Card"
+import { Card, LazySection, Notice, TorrentTabSkeleton } from "@/components/ui"
 import type { TrackerTorrentsData } from "@/hooks/useTrackerTorrents"
-import { formatBytesNum, formatTimeAgo } from "@/lib/formatters"
+import { formatSpeed, formatTimeAgo } from "@/lib/formatters"
+
+const TorrentAgeScatter3D = dynamic(
+  () => import("@/components/charts/TorrentAgeScatter3D").then((m) => m.TorrentAgeScatter3D),
+  { ssr: false }
+)
 
 // ---------------------------------------------------------------------------
 // Types
@@ -44,37 +49,6 @@ interface TorrentsTabProps {
   trackerSeedingCount?: number | null
 }
 
-// ---------------------------------------------------------------------------
-// Lazy section — mounts children only when scrolled into view
-// ---------------------------------------------------------------------------
-
-function LazySection({ children, minHeight = 200 }: { children: ReactNode; minHeight?: number }) {
-  const ref = useRef<HTMLDivElement>(null)
-  const [visible, setVisible] = useState(false)
-
-  useEffect(() => {
-    const el = ref.current
-    if (!el || visible) return
-    const observer = new IntersectionObserver(
-      ([entry]) => {
-        if (entry.isIntersecting) {
-          setVisible(true)
-          observer.disconnect()
-        }
-      },
-      { rootMargin: "200px" }
-    )
-    observer.observe(el)
-    return () => observer.disconnect()
-  }, [visible])
-
-  return (
-    <div ref={ref} style={{ minHeight: visible ? undefined : minHeight }}>
-      {visible ? children : null}
-    </div>
-  )
-}
-
 // ---------------------------------------------------------------------------
 // Component
 // ---------------------------------------------------------------------------
@@ -89,26 +63,18 @@ function TorrentsTab({
   const [staleDismissed, setStaleDismissed] = useState(false)
 
   if (data.loading) {
-    return (
-      <div className="flex items-center justify-center py-20">
-        <p className="text-sm text-muted font-mono">Loading...</p>
-      </div>
-    )
+    return <TorrentTabSkeleton />
   }
 
-  if (data.noClients) return <NoClientState />
   if (!qbtTag) return <NoTagState trackerName={trackerName ?? "this tracker"} />
+  if (data.noClients) return <NoDownloadClientState />
 
   return (
     <div className="flex flex-col gap-8">
       {/* Error banner */}
-      {data.torrentError && (
-        <div className="px-4 py-3 text-xs font-mono text-warn nm-inset-sm bg-warn-dim rounded-nm-md">
-          {data.torrentError}
-        </div>
-      )}
+      {data.torrentError && <Notice variant="warn" box message={data.torrentError} />}
 
-      {/* Stale data banner — dismissible, reappears on next mount */}
+      {/* Stale data banner that's dismissible, reappears on next mount */}
       {data.stale && data.cachedAt && !staleDismissed && (
         <div className="px-4 py-3 text-xs font-mono text-secondary nm-inset-sm rounded-nm-md flex items-center gap-2">
           <span className="text-warn">●</span>
@@ -129,14 +95,14 @@ function TorrentsTab({
       {/* Active Transfers */}
       <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
         <div className="flex flex-col gap-3 min-w-0 [&>*:last-child]:flex-1">
-          <H2 className="text-xs font-sans font-medium text-secondary uppercase tracking-wider flex items-center gap-2">
+          <H2 className="uppercase tracking-wider flex items-center gap-2">
             {data.activelyDownloading.length > 0 && (
               <span className="inline-block w-2 h-2 rounded-full bg-warn animate-pulse" />
             )}
             Active Downloads ({data.activelyDownloading.length})
             {data.activelyDownloading.length > 0 && (
-              <span className="font-mono text-warn ml-auto mr-2 text-[11px] normal-case tracking-normal">
-                {formatBytesNum(data.activelyDownloading.reduce((s, t) => s + t.dlspeed, 0))}/s
+              <span className="font-mono text-warn ml-auto mr-2 text-2xs normal-case tracking-normal">
+                {formatSpeed(data.activelyDownloading.reduce((s, t) => s + t.downloadSpeed, 0))}
               </span>
             )}
           </H2>
@@ -148,7 +114,7 @@ function TorrentsTab({
           />
         </div>
         <div className="flex flex-col gap-3 min-w-0 [&>*:last-child]:flex-1">
-          <H2 className="text-xs font-sans font-medium text-secondary uppercase tracking-wider flex items-center gap-2">
+          <H2 className="uppercase tracking-wider flex items-center gap-2">
             {data.activelySeedingTorrents.length > 0 && (
               <span
                 className="inline-block w-2 h-2 rounded-full animate-pulse"
@@ -157,8 +123,8 @@ function TorrentsTab({
             )}
             Active Uploads ({data.activelySeedingTorrents.length})
             {data.activelySeedingTorrents.length > 0 && (
-              <span className="font-mono text-accent ml-auto mr-2 text-[11px] normal-case tracking-normal">
-                {formatBytesNum(data.activelySeedingTorrents.reduce((s, t) => s + t.upspeed, 0))}/s
+              <span className="font-mono text-accent ml-auto mr-2 text-2xs normal-case tracking-normal">
+                {formatSpeed(data.activelySeedingTorrents.reduce((s, t) => s + t.uploadSpeed, 0))}
               </span>
             )}
           </H2>
@@ -186,36 +152,39 @@ function TorrentsTab({
       />
 
       {/* Category + Cross-Seed */}
-      <LazySection minHeight={350}>
-        <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
-          <CategoryCard categories={data.categoryStats} accentColor={accentColor} />
-          <Card trackerColor={accentColor} className="flex flex-col gap-4">
-            <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-              Cross-Seed Ratio
-            </H2>
-            {data.crossSeedTags.length === 0 ? (
-              <div className="flex items-center justify-center flex-1">
-                <p className="text-xs font-mono text-tertiary text-center">
-                  No cross-seed tags configured.
-                  <br />
-                  Set them in Settings → Download Clients.
-                </p>
-              </div>
-            ) : (
-              <TorrentCrossSeedDonut
-                crossSeeded={data.crossSeeded.length}
-                unique={data.torrents.length - data.crossSeeded.length}
-                accentColor={accentColor}
-              />
-            )}
-          </Card>
-        </div>
-      </LazySection>
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <CategoryCard categories={data.categoryStats} accentColor={accentColor} />
+        <Card
+          lazy
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+          title="Cross-Seed Ratio"
+        >
+          {data.crossSeedTags.length === 0 ? (
+            <div className="flex items-center justify-center flex-1">
+              <p className="text-xs font-mono text-tertiary text-center">
+                No cross-seed tags configured.
+                <br />
+                Set them in Settings → Download Clients.
+              </p>
+            </div>
+          ) : (
+            <TorrentCrossSeedDonut
+              crossSeeded={data.crossSeeded.length}
+              unique={data.torrents.length - data.crossSeeded.length}
+              accentColor={accentColor}
+            />
+          )}
+        </Card>
+      </div>
 
       {/* Tag Group Breakdowns */}
       {data.tagGroupBreakdowns.length > 0 && (
         <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
           {data.tagGroupBreakdowns.map(({ group, memberCounts, unmatchedCount }) => {
+            const effectiveCount =
+              memberCounts.length + (group.countUnmatched && unmatchedCount != null ? 1 : 0)
+            const isSingleNumber = group.chartType === "numbers" && effectiveCount === 1
             const wideCard =
               group.chartType === "numbers" &&
               numbersNeedsWideCard(memberCounts.length, group.countUnmatched, unmatchedCount)
@@ -223,9 +192,13 @@ function TorrentsTab({
               <Card
                 key={group.id}
                 trackerColor={accentColor}
-                className={`flex flex-col gap-4${wideCard ? " lg:col-span-2" : ""}`}
+                className={clsx(
+                  "flex flex-col gap-4",
+                  wideCard && "lg:col-span-2",
+                  isSingleNumber && "min-h-48"
+                )}
               >
-                <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
+                <H2 className="card-heading">
                   {group.emoji ? `${group.emoji} ` : ""}
                   {group.name}
                 </H2>
@@ -245,10 +218,7 @@ function TorrentsTab({
 
       {/* qbitmanage Breakdown */}
       {data.qbitmanageBreakdown.length > 0 && (
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-            qbitmanage Status
-          </H2>
+        <Card trackerColor={accentColor} className="flex flex-col gap-4" title="qbitmanage Status">
           <TagGroupBreakdownChart
             groupName="qbitmanage Status"
             members={data.qbitmanageBreakdown}
@@ -258,80 +228,85 @@ function TorrentsTab({
       )}
 
       {/* Ratio + Seed Time Distribution */}
-      <LazySection minHeight={300}>
-        <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
-          <Card trackerColor={accentColor} className="flex flex-col gap-4">
-            <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-              Ratio Distribution
-            </H2>
-            <TorrentRatioDistribution torrents={data.torrents} accentColor={accentColor} />
-          </Card>
-          <Card trackerColor={accentColor} className="flex flex-col gap-4">
-            <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-              Seed Time Distribution
-            </H2>
-            <TorrentSeedTimeDistribution
-              torrents={data.torrents}
-              seedTimeHours={
-                data.requiredSeedSeconds != null ? data.requiredSeedSeconds / 3600 : null
-              }
-              accentColor={accentColor}
-            />
-          </Card>
-        </div>
-      </LazySection>
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <Card
+          lazy
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+          title="Ratio Distribution"
+        >
+          <TorrentRatioDistribution torrents={data.torrents} accentColor={accentColor} />
+        </Card>
+        <Card
+          lazy
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+          title="Seed Time Distribution"
+        >
+          <TorrentSeedTimeDistribution
+            torrents={data.torrents}
+            seedTimeHours={
+              data.requiredSeedSeconds != null ? data.requiredSeedSeconds / 3600 : null
+            }
+            accentColor={accentColor}
+            height={280}
+          />
+        </Card>
+      </div>
 
       {/* Size Breakdown + Activity Heatmap */}
-      <LazySection minHeight={300}>
-        <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
-          <Card trackerColor={accentColor} className="flex flex-col gap-4">
-            <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-              Size by Category
-            </H2>
-            <TorrentSizeBreakdown categories={data.categoryStats} accentColor={accentColor} />
-          </Card>
-          <Card trackerColor={accentColor} className="flex flex-col gap-4">
-            <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-              Torrent Add Heatmap
-            </H2>
-            <TorrentActivityHeatmap torrents={data.torrents} accentColor={accentColor} />
-          </Card>
-        </div>
-      </LazySection>
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+        <Card
+          lazy
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+          title="Size by Category"
+        >
+          <TorrentSizeBreakdown categories={data.categoryStats} accentColor={accentColor} />
+        </Card>
+        <Card
+          lazy
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+          title="Torrent Add Heatmap"
+        >
+          <TorrentActivityHeatmap torrents={data.torrents} accentColor={accentColor} height={320} />
+        </Card>
+      </div>
 
       {/* Library Growth */}
-      <LazySection>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-            Library Growth
-          </H2>
-          <TorrentAgeTimeline torrents={data.torrents} accentColor={accentColor} />
-        </Card>
-      </LazySection>
+      <Card lazy trackerColor={accentColor} className="flex flex-col gap-4" title="Library Growth">
+        <TorrentAgeTimeline torrents={data.torrents} accentColor={accentColor} />
+      </Card>
 
       {/* Category Acquisition */}
-      <LazySection>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2>Torrents Added by Category</H2>
-          <p className="text-xs font-mono text-tertiary">
-            Monthly acquisition by category — shows what you've been grabbing
-          </p>
-          <TorrentCategoryAcquisition torrents={data.torrents} accentColor={accentColor} />
-        </Card>
-      </LazySection>
+      <Card
+        lazy
+        title="Torrents Added by Category"
+        subtitle="Monthly grabs by category"
+        trackerColor={accentColor}
+        className="flex flex-col gap-4"
+      >
+        <TorrentCategoryAcquisition torrents={data.torrents} accentColor={accentColor} />
+      </Card>
 
       {/* Avg Seed Time by Cohort */}
-      <LazySection>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2>Average Seed Time by Cohort</H2>
-          <TorrentAvgSeedTime torrents={data.torrents} accentColor={accentColor} />
-        </Card>
-      </LazySection>
+      <Card
+        lazy
+        title="Average Seed Time by Cohort"
+        trackerColor={accentColor}
+        className="flex flex-col gap-4"
+      >
+        <TorrentAvgSeedTime torrents={data.torrents} accentColor={accentColor} />
+      </Card>
 
       {/* 3D Scatter */}
       <LazySection minHeight={400}>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2>Torrent Library — 3D Scatter</H2>
+        <Card
+          title="Torrent Library — 3D Scatter"
+          trackerColor={accentColor}
+          className="flex flex-col gap-4"
+        >
           <TorrentAgeScatter3D torrents={data.torrents} accentColor={accentColor} />
         </Card>
       </LazySection>
@@ -339,7 +314,7 @@ function TorrentsTab({
       {/* Unsatisfied Torrents */}
       {data.requiredSeedSeconds && (
         <div className="flex flex-col gap-3">
-          <H2 className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
+          <H2 className="uppercase tracking-wider">
             Unsatisfied Torrents ({data.unsatisfiedSorted.length})
           </H2>
           <UnsatisfiedTorrentsTable
@@ -352,52 +327,46 @@ function TorrentsTab({
 
       {/* Top Seeded */}
       <div className="flex flex-col gap-3">
-        <H2 className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          Top Seeded Torrents
-        </H2>
-        <TorrentRankingTable variant="top-seeded" torrents={data.topBySeeding} />
+        <H2 className="uppercase tracking-wider">Top Seeded Torrents</H2>
+        <TorrentRankingTable
+          variant="top-seeded"
+          torrents={data.topBySeeding}
+          trackerColor={accentColor}
+        />
       </div>
 
       {/* Parallel Coordinates */}
-      <LazySection minHeight={380}>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-            Torrent Profile
-          </H2>
-          <p className="text-xs font-mono text-tertiary -mt-2">
-            Each line is a torrent — hover to inspect, brush axes to filter
-          </p>
-          <ParallelTorrentsChart torrents={data.torrents} trackerColor={accentColor} height={380} />
-        </Card>
-      </LazySection>
+      <Card lazy trackerColor={accentColor} className="flex flex-col gap-4" title="Torrent Profile">
+        <ParallelTorrentsChart torrents={data.torrents} trackerColor={accentColor} height={380} />
+      </Card>
 
       {/* Storage Sunburst */}
-      <LazySection minHeight={360}>
-        <Card trackerColor={accentColor} className="flex flex-col gap-4">
-          <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-            Storage Breakdown
-          </H2>
-          <StorageSunburst
-            torrents={data.torrents.map((t) => ({
-              name: t.name,
-              size: t.size,
-              category: t.category,
-            }))}
-            accentColor={accentColor}
-            height={480}
-          />
-        </Card>
-      </LazySection>
+      <Card
+        lazy
+        trackerColor={accentColor}
+        className="flex flex-col gap-4"
+        title="Storage Breakdown"
+      >
+        <StorageSunburst
+          torrents={data.torrents.map((t) => ({
+            name: t.name,
+            size: t.size,
+            category: t.category,
+          }))}
+          accentColor={accentColor}
+          height={480}
+        />
+      </Card>
 
       {/* Elder Torrents */}
-      <LazySection>
-        <div className="flex flex-col gap-3">
-          <H2 className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-            Elder Torrents
-          </H2>
-          <TorrentRankingTable variant="elder" torrents={data.elderTorrents} />
-        </div>
-      </LazySection>
+      <div className="flex flex-col gap-3">
+        <H2 className="uppercase tracking-wider">Elder Torrents</H2>
+        <TorrentRankingTable
+          variant="elder"
+          torrents={data.elderTorrents}
+          trackerColor={accentColor}
+        />
+      </div>
     </div>
   )
 }
diff --git a/src/components/dashboard/TrackerBreakdownBars.tsx b/src/components/dashboard/TrackerBreakdownBars.tsx
index db662e44..57f5facf 100644
--- a/src/components/dashboard/TrackerBreakdownBars.tsx
+++ b/src/components/dashboard/TrackerBreakdownBars.tsx
@@ -2,8 +2,10 @@
 
 "use client"
 
+import { DataCell } from "@typography"
 import { ProgressBar } from "@/components/ui/ProgressBar"
-import { compareBigIntDesc, formatBytesFromString } from "@/lib/formatters"
+import { compareBigIntDesc } from "@/lib/data-transforms"
+import { formatBytesFromString } from "@/lib/formatters"
 import type { TodayAtAGlance } from "@/types/api"
 
 interface TrackerBreakdownProps {
@@ -61,9 +63,9 @@ export function TrackerBreakdownBars({ trackers, metric = "upload" }: TrackerBre
 
             <ProgressBar percent={pct} color={color} size="md" className="flex-1" />
 
-            <span className="text-xs font-mono text-secondary tabular-nums w-20 text-right shrink-0">
+            <DataCell className="w-20 text-right shrink-0">
               {formatBytesFromString(getDelta(tracker))}
-            </span>
+            </DataCell>
           </div>
         )
       })}
diff --git a/src/components/dashboard/TrackerBreakdownTicker.tsx b/src/components/dashboard/TrackerBreakdownTicker.tsx
index 94afe3e2..38a6076f 100644
--- a/src/components/dashboard/TrackerBreakdownTicker.tsx
+++ b/src/components/dashboard/TrackerBreakdownTicker.tsx
@@ -1,8 +1,8 @@
 // src/components/dashboard/TrackerBreakdownTicker.tsx
-
 "use client"
 
-import { compareBigIntDesc, formatBytesFromString } from "@/lib/formatters"
+import { compareBigIntDesc } from "@/lib/data-transforms"
+import { formatBytesFromString } from "@/lib/formatters"
 import type { TodayAtAGlance } from "@/types/api"
 
 interface TrackerBreakdownProps {
@@ -26,7 +26,7 @@ export function TrackerBreakdownTicker({ trackers }: TrackerBreakdownProps) {
             key={tracker.id}
             className="nm-raised-sm rounded-full px-3 py-1 flex items-center gap-2"
           >
-            <span className="w-2 h-2 rounded-full shrink-0" style={{ backgroundColor: dotColor }} />
+            <span className="color-dot" style={{ backgroundColor: dotColor }} />
             <span className="text-xs font-sans text-primary">{tracker.name}</span>
             <span className="text-xs font-mono text-secondary">
               {formatBytesFromString(tracker.uploadDelta)}
diff --git a/src/components/dashboard/TrackerLeaderboard.tsx b/src/components/dashboard/TrackerLeaderboard.tsx
index d92c6cbd..3b23a98a 100644
--- a/src/components/dashboard/TrackerLeaderboard.tsx
+++ b/src/components/dashboard/TrackerLeaderboard.tsx
@@ -1,15 +1,19 @@
 // src/components/dashboard/TrackerLeaderboard.tsx
-//
-// Functions: getBufferBytes, TrackerLeaderboard
-
 "use client"
 
+import { DataCell } from "@typography"
 import { useRouter } from "next/navigation"
 import { Badge } from "@/components/ui/Badge"
 import { PulseDot } from "@/components/ui/PulseDot"
 import type { Column } from "@/components/ui/Table"
 import { Table } from "@/components/ui/Table"
-import { formatAccountAge, formatBytesFromString, formatRatio } from "@/lib/formatters"
+import { computeBufferBytes } from "@/lib/data-transforms"
+import {
+  formatAccountAge,
+  formatBytesFromString,
+  formatCount,
+  formatRatioDisplay,
+} from "@/lib/formatters"
 import {
   getHealthBadgeVariant,
   getHealthLabel,
@@ -21,7 +25,7 @@ import type { TrackerSummary } from "@/types/api"
 function getBufferBytes(t: TrackerSummary): bigint {
   const s = t.latestStats
   if (!s?.uploadedBytes || !s?.downloadedBytes) return 0n
-  return BigInt(s.uploadedBytes) - BigInt(s.downloadedBytes)
+  return computeBufferBytes(BigInt(s.uploadedBytes), BigInt(s.downloadedBytes))
 }
 
 const columns: Column<TrackerSummary>[] = [
@@ -50,11 +54,7 @@ const columns: Column<TrackerSummary>[] = [
     align: "right",
     sortable: true,
     sortValue: (t) => t.latestStats?.ratio ?? -1,
-    render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs">
-        {t.latestStats?.ratio != null ? `${formatRatio(t.latestStats.ratio)}×` : "—"}
-      </span>
-    ),
+    render: (t) => <DataCell>{formatRatioDisplay(t.latestStats?.ratio)}</DataCell>,
   },
   {
     key: "uploaded",
@@ -63,11 +63,7 @@ const columns: Column<TrackerSummary>[] = [
     sortable: true,
     sortValue: (t) =>
       t.latestStats?.uploadedBytes ? Number(BigInt(t.latestStats.uploadedBytes)) : -1,
-    render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs">
-        {t.latestStats?.uploadedBytes ? formatBytesFromString(t.latestStats.uploadedBytes) : "—"}
-      </span>
-    ),
+    render: (t) => <DataCell>{formatBytesFromString(t.latestStats?.uploadedBytes)}</DataCell>,
   },
   {
     key: "downloaded",
@@ -76,13 +72,7 @@ const columns: Column<TrackerSummary>[] = [
     sortable: true,
     sortValue: (t) =>
       t.latestStats?.downloadedBytes ? Number(BigInt(t.latestStats.downloadedBytes)) : -1,
-    render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs">
-        {t.latestStats?.downloadedBytes
-          ? formatBytesFromString(t.latestStats.downloadedBytes)
-          : "—"}
-      </span>
-    ),
+    render: (t) => <DataCell>{formatBytesFromString(t.latestStats?.downloadedBytes)}</DataCell>,
   },
   {
     key: "buffer",
@@ -91,11 +81,11 @@ const columns: Column<TrackerSummary>[] = [
     sortable: true,
     sortValue: (t) => Number(getBufferBytes(t)),
     render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs">
+      <DataCell>
         {t.latestStats?.uploadedBytes && t.latestStats?.downloadedBytes
           ? formatBytesFromString(getBufferBytes(t).toString())
           : "—"}
-      </span>
+      </DataCell>
     ),
   },
   {
@@ -104,11 +94,7 @@ const columns: Column<TrackerSummary>[] = [
     align: "right",
     sortable: true,
     sortValue: (t) => t.latestStats?.seedingCount ?? -1,
-    render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs">
-        {t.latestStats?.seedingCount != null ? t.latestStats.seedingCount.toLocaleString() : "—"}
-      </span>
-    ),
+    render: (t) => <DataCell>{formatCount(t.latestStats?.seedingCount)}</DataCell>,
   },
   {
     key: "age",
@@ -117,9 +103,7 @@ const columns: Column<TrackerSummary>[] = [
     sortable: true,
     sortValue: (t) => (t.joinedAt ? new Date(t.joinedAt).getTime() : Infinity),
     render: (t) => (
-      <span className="font-mono tabular-nums text-secondary text-xs whitespace-nowrap">
-        {formatAccountAge(t.joinedAt) ?? "—"}
-      </span>
+      <DataCell className="whitespace-nowrap">{formatAccountAge(t.joinedAt) ?? "—"}</DataCell>
     ),
   },
   {
diff --git a/src/components/dashboard/TrackerOverviewGrid.tsx b/src/components/dashboard/TrackerOverviewGrid.tsx
index 70491933..45cf03af 100644
--- a/src/components/dashboard/TrackerOverviewGrid.tsx
+++ b/src/components/dashboard/TrackerOverviewGrid.tsx
@@ -1,23 +1,23 @@
 // src/components/dashboard/TrackerOverviewGrid.tsx
-//
-// Functions: TrackerOverviewGrid
-
 "use client"
 
 import { useAutoAnimate } from "@formkit/auto-animate/react"
+import { ExternalLinkIcon, PlusIcon } from "@icons"
 import clsx from "clsx"
 import { useRouter } from "next/navigation"
 import { useEffect, useMemo, useRef, useState } from "react"
-import { Checkbox } from "@/components/ui/Checkbox"
-import { ChevronToggle } from "@/components/ui/ChevronToggle"
-import { ExternalLinkIcon, PlusIcon } from "@/components/ui/Icons"
-import { PulseDot } from "@/components/ui/PulseDot"
-import { RedactedText } from "@/components/ui/RedactedText"
+import {
+  Checkbox,
+  ChevronToggle,
+  FilterPill,
+  Notice,
+  PulseDot,
+  RedactedText,
+} from "@/components/ui"
 import { findRegistryEntry, type TrackerRegistryEntry } from "@/data/tracker-registry"
 import { ALL_TRACKERS } from "@/data/trackers"
 import { useClickOutside } from "@/hooks/useClickOutside"
-import { formatAccountAge, formatJoinedDate, formatRatio } from "@/lib/formatters"
-import { STORAGE_KEYS } from "@/lib/storage-keys"
+import { formatAccountAge, formatJoinedDate, formatRatioDisplay } from "@/lib/formatters"
 import { getHealthPulseDot, getTrackerHealth } from "@/lib/tracker-status"
 import type { TrackerSummary } from "@/types/api"
 
@@ -37,10 +37,9 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
   const [categoryFilter, setCategoryFilter] = useState<string | null>(null)
   const [favoritesOnly, setFavoritesOnly] = useState(false)
 
-  // Close picker on outside click
   useClickOutside(pickerRef, () => setPickerOpen(false), pickerOpen)
 
-  // Load draft quicklinks from DB on mount; migrate legacy localStorage data if needed
+  // Load draft quicklinks from DB on mount
   useEffect(() => {
     async function loadQuicklinks() {
       try {
@@ -48,32 +47,9 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
         if (!res.ok) return
         const data = (await res.json()) as { slugs: string[] }
         const dbSlugs = Array.isArray(data.slugs) ? data.slugs : []
-
-        if (dbSlugs.length === 0 && typeof window !== "undefined") {
-          const raw = localStorage.getItem(STORAGE_KEYS.DRAFT_QUICKLINKS)
-          if (raw) {
-            try {
-              const legacy = JSON.parse(raw) as unknown
-              if (Array.isArray(legacy) && legacy.every((s) => typeof s === "string")) {
-                const migrated = legacy as string[]
-                await fetch("/api/settings/quicklinks", {
-                  method: "PUT",
-                  headers: { "Content-Type": "application/json" },
-                  body: JSON.stringify({ slugs: migrated }),
-                })
-                localStorage.removeItem(STORAGE_KEYS.DRAFT_QUICKLINKS)
-                setSelectedDrafts(migrated)
-                return
-              }
-            } catch {
-              // Ignore malformed legacy data
-            }
-          }
-        }
-
         setSelectedDrafts(dbSlugs)
       } catch {
-        // Silently ignore fetch failures — drafts are non-critical
+        // Silently ignore fetch failures
       }
     }
 
@@ -149,7 +125,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
     <div className="flex flex-col gap-3">
       {/* Filters — only when > 6 trackers */}
       {showFilters && (
-        <div className="flex flex-col gap-1.5">
+        <div className="flex flex-col gap-2">
           {/* Mobile toggle */}
           <button
             type="button"
@@ -160,7 +136,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
             <ChevronToggle expanded={filtersOpen} />
             Filters
             {activeFilterCount > 0 && (
-              <span className="inline-flex items-center justify-center w-4 h-4 text-[10px] font-semibold text-accent nm-raised-sm rounded-nm-pill">
+              <span className="inline-flex items-center justify-center w-4 h-4 text-3xs font-semibold text-accent nm-raised-sm rounded-nm-pill">
                 {activeFilterCount}
               </span>
             )}
@@ -169,25 +145,19 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
           {/* Filter pills — always visible on md+, collapsible on mobile */}
           <div
             className={clsx(
-              "flex-wrap items-center gap-1.5",
+              "flex-wrap items-center gap-2",
               filtersOpen ? "flex" : "hidden md:flex"
             )}
           >
             {/* Favorites toggle */}
             {hasFavorites && (
-              <button
-                type="button"
+              <FilterPill
+                active={favoritesOnly}
                 onClick={() => setFavoritesOnly((v) => !v)}
-                className={clsx(
-                  "px-2.5 py-1 text-xs font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-                  favoritesOnly
-                    ? "nm-raised-sm text-accent font-semibold"
-                    : "bg-transparent text-muted hover:text-secondary"
-                )}
-                aria-pressed={favoritesOnly}
+                activeColor="text-accent"
               >
                 {favoritesOnly ? "★" : "☆"} Favorites
-              </button>
+              </FilterPill>
             )}
 
             {hasFavorites && allCategories.length > 0 && (
@@ -197,32 +167,18 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
             {/* Category pills */}
             {allCategories.length > 0 && (
               <>
-                <button
-                  type="button"
+                <FilterPill
+                  active={categoryFilter === null}
                   onClick={() => setCategoryFilter(null)}
-                  className={clsx(
-                    "px-2.5 py-1 text-xs font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-                    categoryFilter === null
-                      ? "nm-raised-sm text-primary font-semibold"
-                      : "bg-transparent text-muted hover:text-secondary"
-                  )}
-                >
-                  All
-                </button>
+                  text="All"
+                />
                 {allCategories.map((cat) => (
-                  <button
+                  <FilterPill
                     key={cat}
-                    type="button"
+                    active={categoryFilter === cat}
                     onClick={() => setCategoryFilter(categoryFilter === cat ? null : cat)}
-                    className={clsx(
-                      "px-2.5 py-1 text-xs font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-                      categoryFilter === cat
-                        ? "nm-raised-sm text-primary font-semibold"
-                        : "bg-transparent text-muted hover:text-secondary"
-                    )}
-                  >
-                    {cat}
-                  </button>
+                    text={cat}
+                  />
                 ))}
               </>
             )}
@@ -242,7 +198,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
               key={t.id}
               type="button"
               onClick={() => router.push(`/trackers/${t.id}`)}
-              className="flex flex-col gap-1.5 px-4 py-3 nm-interactive-sm cursor-pointer text-left h-full rounded-nm-md"
+              className="flex flex-col gap-2 px-4 py-3 nm-interactive-sm cursor-pointer text-left h-full rounded-nm-md"
               style={{ borderLeft: `3px solid ${t.color}` }}
             >
               {/* Row 1: Status + name + ratio + external link */}
@@ -258,13 +214,13 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
                   {t.name}
                 </span>
                 <span className="font-mono text-xs text-tertiary tabular-nums shrink-0">
-                  {t.latestStats?.ratio != null ? `${formatRatio(t.latestStats.ratio)}×` : "—"}
+                  {formatRatioDisplay(t.latestStats?.ratio)}
                 </span>
                 <a
                   href={t.baseUrl.startsWith("http") ? t.baseUrl : `https://${t.baseUrl}`}
                   target="_blank"
                   rel="noopener noreferrer"
-                  className="nm-inset-sm bg-control-bg w-7 h-7 flex items-center justify-center text-muted hover:text-accent transition-all duration-150 shrink-0 rounded-nm-sm"
+                  className="nm-inset-sm bg-control-bg w-7 h-7 flex items-center justify-center text-muted hover:text-accent transition-colors duration-150 shrink-0 rounded-nm-sm"
                   onClick={(e) => e.stopPropagation()}
                   aria-label={`Open ${t.name}`}
                 >
@@ -276,7 +232,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
               {health === "paused" || health === "paused-user" ? (
                 <span
                   className={clsx(
-                    "font-mono text-[10px] uppercase tracking-wider ml-4.5",
+                    "font-mono text-3xs uppercase tracking-wider ml-4.5",
                     health === "paused-user" ? "text-warn" : "text-danger"
                   )}
                 >
@@ -327,9 +283,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
                 strokeWidth={2}
               />
             </div>
-            <span className="font-mono text-[10px] text-muted ml-4.5">
-              Stats tracking not yet supported
-            </span>
+            <span className="timestamp ml-4.5">Stats tracking not yet supported</span>
           </a>
         ))}
 
@@ -347,10 +301,14 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
 
             {/* Draft tracker picker popover */}
             {pickerOpen && (
-              <div className="absolute top-full left-0 mt-2 z-50 w-80 max-h-72 overflow-y-auto nm-raised bg-elevated p-3 flex flex-col gap-1 styled-scrollbar rounded-nm-md">
-                <p className="text-[10px] font-mono text-warn px-2 py-1.5 nm-inset-sm bg-control-bg mb-2 rounded-nm-sm">
-                  These trackers don't have adapter support yet — links only, no stats tracking.
-                </p>
+              <div className="absolute top-full left-0 mt-2 z-40 w-80 max-h-72 overflow-y-auto nm-raised bg-elevated p-3 flex flex-col gap-1 styled-scrollbar rounded-nm-md">
+                <Notice
+                  variant="default"
+                  box
+                  message="These trackers don't have adapter support yet — links only, no stats tracking."
+                  showIcon={false}
+                  className="mb-2"
+                />
                 {draftTrackers.map((dt: TrackerRegistryEntry) => (
                   <div key={dt.slug} className="flex items-center gap-2 px-1">
                     <Checkbox
@@ -358,10 +316,7 @@ function TrackerOverviewGrid({ trackers, showHealthIndicators = true }: TrackerO
                       onChange={() => toggleDraft(dt.slug)}
                     >
                       <span className="flex items-center gap-2">
-                        <span
-                          className="w-2 h-2 rounded-full shrink-0"
-                          style={{ backgroundColor: dt.color }}
-                        />
+                        <span className="color-dot" style={{ backgroundColor: dt.color }} />
                         <span className="text-sm text-secondary">{dt.name}</span>
                       </span>
                     </Checkbox>
diff --git a/src/components/dashboard/torrents/ActiveTransfersTable.tsx b/src/components/dashboard/torrents/ActiveTransfersTable.tsx
index d9a7c32f..cea42e7a 100644
--- a/src/components/dashboard/torrents/ActiveTransfersTable.tsx
+++ b/src/components/dashboard/torrents/ActiveTransfersTable.tsx
@@ -1,15 +1,20 @@
 // src/components/dashboard/torrents/ActiveTransfersTable.tsx
-
 "use client"
 
 import { MarqueeText } from "@/components/ui/MarqueeText"
 import type { Column } from "@/components/ui/Table"
 import { Table } from "@/components/ui/Table"
-import { formatBytesNum } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import {
+  formatBytesNum,
+  formatPercent,
+  formatRatio,
+  formatSpeed,
+  splitValueUnit,
+} from "@/lib/formatters"
 
 interface ActiveTransfersTableProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   mode: "downloading" | "uploading"
   accentColor: string
   showClientName: boolean
@@ -23,19 +28,20 @@ export function ActiveTransfersTable({
 }: ActiveTransfersTableProps) {
   if (torrents.length === 0) {
     return (
-      <Table<TorrentInfo>
+      <Table<TorrentRaw>
         columns={[]}
         data={[]}
         keyExtractor={(t) => t.hash}
         emptyMessage={`No active ${mode === "downloading" ? "downloads" : "uploads"}`}
         surface="inset"
+        trackerColor={accentColor}
       />
     )
   }
 
   const isDownload = mode === "downloading"
 
-  const columns: Column<TorrentInfo>[] = [
+  const columns: Column<TorrentRaw>[] = [
     {
       key: "name",
       header: "Name",
@@ -44,7 +50,7 @@ export function ActiveTransfersTable({
         <div className="flex flex-col gap-1 min-w-0">
           <MarqueeText className="text-xs font-mono text-secondary">{t.name}</MarqueeText>
           {showClientName && t.clientName && (
-            <span className="text-[10px] font-sans text-muted truncate">{t.clientName}</span>
+            <span className="text-3xs font-sans text-muted truncate">{t.clientName}</span>
           )}
           {isDownload && (
             <div className="w-full h-1 rounded-full bg-base overflow-hidden">
@@ -66,14 +72,11 @@ export function ActiveTransfersTable({
       align: "right",
       width: 48,
       render: (t) => {
-        const formatted = formatBytesNum(t.size)
-        const spaceIdx = formatted.indexOf(" ")
-        const num = spaceIdx > -1 ? formatted.slice(0, spaceIdx) : formatted
-        const unit = spaceIdx > -1 ? formatted.slice(spaceIdx + 1) : ""
+        const { num, unit } = splitValueUnit(formatBytesNum(t.size))
         return (
-          <span className="text-[11px] font-mono text-muted text-right leading-none">
+          <span className="torrent-cell text-right leading-none">
             {num}
-            <span className="block text-[9px] mt-px">{unit}</span>
+            <span className="block text-4xs mt-px">{unit}</span>
           </span>
         )
       },
@@ -84,8 +87,8 @@ export function ActiveTransfersTable({
       align: "right",
       width: 36,
       render: (t) => (
-        <span className="text-[11px] font-mono text-muted">
-          {isDownload ? `${(t.progress * 100).toFixed(0)}%` : t.ratio.toFixed(2)}
+        <span className="torrent-cell">
+          {isDownload ? formatPercent(t.progress * 100, 0) : formatRatio(t.ratio)}
         </span>
       ),
     },
@@ -95,18 +98,16 @@ export function ActiveTransfersTable({
       align: "right",
       width: 48,
       render: (t) => {
-        const raw = isDownload ? t.dlspeed : t.upspeed
-        const formatted = formatBytesNum(raw)
-        const spaceIdx = formatted.indexOf(" ")
-        const num = spaceIdx > -1 ? formatted.slice(0, spaceIdx) : formatted
-        const unit = spaceIdx > -1 ? `${formatted.slice(spaceIdx + 1)}/s` : "/s"
+        const raw = isDownload ? t.downloadSpeed : t.uploadSpeed
+        const { num, unit: baseUnit } = splitValueUnit(formatSpeed(raw))
+        const unit = baseUnit || "B/s"
         return (
           <span
-            className="text-[11px] font-mono text-right leading-none"
+            className="text-2xs font-mono text-right leading-none"
             style={{ color: accentColor }}
           >
             {num}
-            <span className="block text-[9px] text-muted mt-px">{unit}</span>
+            <span className="block text-4xs text-muted mt-px">{unit}</span>
           </span>
         )
       },
@@ -117,8 +118,8 @@ export function ActiveTransfersTable({
       align: "right",
       width: 36,
       render: (t) => {
-        if (t.lastActivity <= 0) return <span className="text-[11px] font-mono text-muted">—</span>
-        const diff = Math.floor(Date.now() / 1000 - t.lastActivity)
+        if (t.lastActivityAt <= 0) return <span className="torrent-cell">—</span>
+        const diff = Math.floor(Date.now() / 1000 - t.lastActivityAt)
         const val =
           diff < 60
             ? `${diff}s`
@@ -127,17 +128,18 @@ export function ActiveTransfersTable({
               : diff < 86400
                 ? `${Math.floor(diff / 3600)}h`
                 : `${Math.floor(diff / 86400)}d`
-        return <span className="text-[11px] font-mono text-muted">{val}</span>
+        return <span className="torrent-cell">{val}</span>
       },
     },
   ]
 
   return (
-    <Table<TorrentInfo>
+    <Table<TorrentRaw>
       columns={columns}
       data={torrents}
       keyExtractor={(t) => t.hash}
       surface="inset"
+      trackerColor={accentColor}
       fixedLayout
       compact
       noHorizontalScroll
diff --git a/src/components/dashboard/torrents/CategoryCard.tsx b/src/components/dashboard/torrents/CategoryCard.tsx
index a2500a3b..cfe359f6 100644
--- a/src/components/dashboard/torrents/CategoryCard.tsx
+++ b/src/components/dashboard/torrents/CategoryCard.tsx
@@ -2,7 +2,6 @@
 
 "use client"
 
-import { H2 } from "@typography"
 import { useState } from "react"
 import { TorrentCategoryDonut } from "@/components/charts/TorrentCategoryDonut"
 import { TorrentCategoryRadar } from "@/components/charts/TorrentCategoryRadar"
@@ -21,10 +20,7 @@ export function CategoryCard({ categories, accentColor }: CategoryCardProps) {
   const [view, setView] = useState<CategoryView>("donut")
 
   return (
-    <Card trackerColor={accentColor} className="flex flex-col gap-4">
-      <H2 className="text-sm font-sans font-semibold text-primary uppercase tracking-wider">
-        Categories
-      </H2>
+    <Card trackerColor={accentColor} title="Categories" className="flex flex-col gap-4">
       <TabBar
         tabs={[
           { key: "donut" as CategoryView, label: "Distribution" },
diff --git a/src/components/dashboard/torrents/TorrentEmptyStates.tsx b/src/components/dashboard/torrents/TorrentEmptyStates.tsx
index b21d0e77..405a1605 100644
--- a/src/components/dashboard/torrents/TorrentEmptyStates.tsx
+++ b/src/components/dashboard/torrents/TorrentEmptyStates.tsx
@@ -1,15 +1,14 @@
 // src/components/dashboard/torrents/TorrentEmptyStates.tsx
-
 "use client"
 
 import Link from "next/link"
 import { ServerIcon, TagIcon } from "@/components/ui/Icons"
 
-export function NoClientState() {
+export function NoDownloadClientState() {
   return (
     <div className="flex flex-col items-center justify-center gap-4 py-16 nm-inset-sm bg-control-bg rounded-nm-lg">
       <ServerIcon width={40} height={40} className="text-muted" />
-      <div className="flex flex-col items-center gap-1.5 text-center">
+      <div className="flex flex-col items-center gap-2 text-center">
         <p className="text-sm font-sans text-secondary">No download client connected</p>
         <p className="text-xs font-sans text-muted max-w-sm">
           Connect a qBittorrent client to see torrent data.{" "}
@@ -26,7 +25,7 @@ export function NoTagState({ trackerName }: { trackerName: string }) {
   return (
     <div className="flex flex-col items-center justify-center gap-4 py-16 nm-inset-sm bg-control-bg rounded-nm-lg">
       <TagIcon width={40} height={40} className="text-muted" />
-      <div className="flex flex-col items-center gap-1.5 text-center">
+      <div className="flex flex-col items-center gap-2 text-center">
         <p className="text-sm font-sans text-secondary">No qBittorrent tag set for {trackerName}</p>
         <p className="text-xs font-sans text-muted max-w-sm">
           Set a tag in tracker settings to filter torrents from your client.
diff --git a/src/components/dashboard/torrents/TorrentRankingTable.tsx b/src/components/dashboard/torrents/TorrentRankingTable.tsx
index cd99eeb4..bcee3603 100644
--- a/src/components/dashboard/torrents/TorrentRankingTable.tsx
+++ b/src/components/dashboard/torrents/TorrentRankingTable.tsx
@@ -1,88 +1,82 @@
 // src/components/dashboard/torrents/TorrentRankingTable.tsx
-
 "use client"
 
 import { MarqueeText } from "@/components/ui/MarqueeText"
 import type { Column } from "@/components/ui/Table"
 import { Table } from "@/components/ui/Table"
 import { Tooltip } from "@/components/ui/Tooltip"
-import { formatBytesNum, formatDuration } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import { formatBytesNum, formatDuration, formatRatio, splitValueUnit } from "@/lib/formatters"
 
 type TorrentTableVariant = "top-seeded" | "elder"
 
 interface TorrentRankingTableProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   variant: TorrentTableVariant
+  trackerColor?: string
 }
 
-const seedTimeCol: Column<TorrentInfo> = {
+const seedTimeCol: Column<TorrentRaw> = {
   key: "seedTime",
   header: "Seed",
   align: "right",
   width: "8%",
-  render: (t) => (
-    <span className="text-[11px] font-mono text-muted">{formatDuration(t.seedingTime)}</span>
-  ),
+  render: (t) => <span className="torrent-cell">{formatDuration(t.seedingTime)}</span>,
 }
 
-const seedTimeColLast: Column<TorrentInfo> = {
+const seedTimeColLast: Column<TorrentRaw> = {
   key: "seedTime",
   header: "Seed",
   align: "right",
   width: "8%",
-  render: (t) => (
-    <span className="text-[11px] font-mono text-muted pr-2">{formatDuration(t.seedingTime)}</span>
-  ),
+  render: (t) => <span className="torrent-cell pr-2">{formatDuration(t.seedingTime)}</span>,
 }
 
-const swarmCol: Column<TorrentInfo> = {
+const swarmCol: Column<TorrentRaw> = {
   key: "swarm",
   header: "S/L",
   align: "right",
   width: "7%",
   render: (t) => (
-    <span className="text-[11px] font-mono text-muted pr-2">
-      {t.numComplete}/{t.numIncomplete}
+    <span className="torrent-cell pr-2">
+      {t.swarmSeeders}/{t.swarmLeechers}
     </span>
   ),
 }
 
-const addedCol: Column<TorrentInfo> = {
+const addedCol: Column<TorrentRaw> = {
   key: "added",
   header: "Added",
   align: "right",
   width: "9%",
   render: (t) => {
-    const d = new Date(t.addedOn * 1000)
+    const d = new Date(t.addedAt * 1000)
     return (
-      <span className="text-[11px] font-mono text-muted">
+      <span className="torrent-cell">
         {d.toLocaleDateString("en-US", { month: "short", year: "2-digit" })}
       </span>
     )
   },
 }
 
-const variantColumns: Record<TorrentTableVariant, Column<TorrentInfo>[]> = {
+const variantColumns: Record<TorrentTableVariant, Column<TorrentRaw>[]> = {
   "top-seeded": [seedTimeCol, swarmCol],
   elder: [addedCol, seedTimeColLast],
 }
 
-export function TorrentRankingTable({ torrents, variant }: TorrentRankingTableProps) {
-  const sharedColumns: Column<TorrentInfo>[] = [
+export function TorrentRankingTable({ torrents, variant, trackerColor }: TorrentRankingTableProps) {
+  const sharedColumns: Column<TorrentRaw>[] = [
     {
       key: "rank",
       header: "#",
       width: "3%",
-      render: (_t, i) => (
-        <span className="text-[11px] font-mono text-muted pl-2">{i != null ? i + 1 : ""}</span>
-      ),
+      render: (_t, i) => <span className="torrent-cell pl-2">{i != null ? i + 1 : ""}</span>,
     },
     {
       key: "name",
       header: "Name",
       render: (t) => (
-        <MarqueeText className="text-[11px] font-mono text-secondary" speed={30}>
+        <MarqueeText className="text-2xs font-mono text-secondary" speed={30}>
           {t.name}
         </MarqueeText>
       ),
@@ -93,9 +87,7 @@ export function TorrentRankingTable({ torrents, variant }: TorrentRankingTablePr
       width: "10%",
       render: (t) => (
         <Tooltip content={t.category}>
-          <span className="text-[11px] font-mono text-muted truncate block">
-            {t.category || "\u2014"}
-          </span>
+          <span className="torrent-cell truncate block">{t.category || "\u2014"}</span>
         </Tooltip>
       ),
     },
@@ -105,14 +97,11 @@ export function TorrentRankingTable({ torrents, variant }: TorrentRankingTablePr
       align: "right",
       width: "8%",
       render: (t) => {
-        const formatted = formatBytesNum(t.size)
-        const spaceIdx = formatted.indexOf(" ")
-        const num = spaceIdx > -1 ? formatted.slice(0, spaceIdx) : formatted
-        const unit = spaceIdx > -1 ? formatted.slice(spaceIdx + 1) : ""
+        const { num, unit } = splitValueUnit(formatBytesNum(t.size))
         return (
-          <span className="text-[11px] font-mono text-muted text-right leading-none">
+          <span className="torrent-cell text-right leading-none">
             {num}
-            <span className="block text-[9px] mt-px">{unit}</span>
+            <span className="block text-4xs mt-px">{unit}</span>
           </span>
         )
       },
@@ -122,19 +111,20 @@ export function TorrentRankingTable({ torrents, variant }: TorrentRankingTablePr
       header: "Ratio",
       align: "right",
       width: "8%",
-      render: (t) => <span className="text-[11px] font-mono text-muted">{t.ratio.toFixed(2)}</span>,
+      render: (t) => <span className="torrent-cell">{formatRatio(t.ratio)}</span>,
     },
   ]
 
   const columns = [...sharedColumns, ...variantColumns[variant]]
 
   return (
-    <Table<TorrentInfo>
+    <Table<TorrentRaw>
       columns={columns}
       data={torrents}
       keyExtractor={(t) => t.hash}
       emptyMessage="No torrents found"
       surface="inset"
+      trackerColor={trackerColor}
       fixedLayout
       compact
       noHorizontalScroll
diff --git a/src/components/dashboard/torrents/TorrentStatCards.tsx b/src/components/dashboard/torrents/TorrentStatCards.tsx
index 4de075ee..298689ba 100644
--- a/src/components/dashboard/torrents/TorrentStatCards.tsx
+++ b/src/components/dashboard/torrents/TorrentStatCards.tsx
@@ -1,5 +1,4 @@
 // src/components/dashboard/torrents/TorrentStatCards.tsx
-
 "use client"
 
 import { CHART_THEME } from "@/components/charts/lib/theme"
@@ -11,8 +10,8 @@ import {
   TriangleWarningIcon,
 } from "@/components/ui/Icons"
 import { StatCard } from "@/components/ui/StatCard"
-import { formatBytesNum, formatDuration, splitValueUnit } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import { formatBytesNum, formatCount, formatDuration, splitValueUnit } from "@/lib/formatters"
 
 const ICONS = {
   seeding: <SeedingIcon width={16} height={16} />,
@@ -23,8 +22,8 @@ const ICONS = {
 }
 
 interface TorrentStatCardsProps {
-  torrents: TorrentInfo[]
-  seedingTorrents: TorrentInfo[]
+  torrents: TorrentRaw[]
+  seedingTorrents: TorrentRaw[]
   totalSize: number
   crossSeededCount: number
   deadCount: number | null
@@ -76,7 +75,7 @@ export function TorrentStatCards({
           accentColor={accentColor}
           sumIsHero
           className="row-span-2"
-          total={{ label: "Total", value: seedingTorrents.length.toLocaleString() }}
+          total={{ label: "Total", value: formatCount(seedingTorrents.length) }}
           rows={(() => {
             const byClient = new Map<string, number>()
             for (const t of seedingTorrents) {
@@ -87,14 +86,14 @@ export function TorrentStatCards({
             }
             return [...byClient.entries()].map(([label, count]) => ({
               label,
-              value: count.toLocaleString(),
+              value: formatCount(count),
             }))
           })()}
         />
       ) : (
         <StatCard
           label="Seeding"
-          value={seedingTorrents.length.toLocaleString()}
+          value={formatCount(seedingTorrents.length)}
           accentColor={accentColor}
           icon={ICONS.seeding}
         />
@@ -133,18 +132,18 @@ export function TorrentStatCards({
       )}
       <StatCard
         label="Cross-Seeded"
-        value={crossSeededCount.toLocaleString()}
-        unit={`/ ${torrents.length.toLocaleString()}`}
+        value={formatCount(crossSeededCount)}
+        unit={`/ ${formatCount(torrents.length)}`}
         accentColor={accentColor}
         icon={ICONS.crossSeed}
       />
       {deadCount !== null && (
         <StatCard
           label="Dead"
-          value={deadCount.toLocaleString()}
+          value={formatCount(deadCount)}
           accentColor={deadCount > 0 ? CHART_THEME.warn : accentColor}
           icon={ICONS.warning}
-          tooltip={`Client has ${seedingTorrents.length} seeding torrents, tracker reports ${trackerSeedingCount?.toLocaleString() ?? "?"}. Difference may include torrents removed from the tracker but still in your client. This is an estimate and may not be accurate if the tracker's seeding count is affected by paranoia settings or API delays.`}
+          tooltip={`Client has ${seedingTorrents.length} seeding torrents, tracker reports ${trackerSeedingCount != null ? formatCount(trackerSeedingCount) : "?"}. Difference may include torrents removed from the tracker but still in your client. This is an estimate and may not be accurate if the tracker's seeding count is affected by paranoia settings or API delays.`}
         />
       )}
       <StatCard
@@ -170,7 +169,7 @@ export function TorrentStatCards({
       {hnrRiskCount !== null && (
         <StatCard
           label="H&R Risk"
-          value={hnrRiskCount.toLocaleString()}
+          value={formatCount(hnrRiskCount)}
           accentColor={hnrRiskCount > 0 ? CHART_THEME.danger : accentColor}
           icon={ICONS.warning}
           tooltip={
diff --git a/src/components/dashboard/torrents/UnsatisfiedTorrentsTable.tsx b/src/components/dashboard/torrents/UnsatisfiedTorrentsTable.tsx
index 26fec135..99a0105f 100644
--- a/src/components/dashboard/torrents/UnsatisfiedTorrentsTable.tsx
+++ b/src/components/dashboard/torrents/UnsatisfiedTorrentsTable.tsx
@@ -1,16 +1,15 @@
 // src/components/dashboard/torrents/UnsatisfiedTorrentsTable.tsx
-
 "use client"
 
 import { CHART_THEME } from "@/components/charts/lib/theme"
 import { MarqueeText } from "@/components/ui/MarqueeText"
 import type { Column } from "@/components/ui/Table"
 import { Table } from "@/components/ui/Table"
-import { formatBytesNum, formatDuration } from "@/lib/formatters"
-import type { TorrentInfo } from "@/lib/torrent-utils"
+import type { TorrentRaw } from "@/lib/fleet"
+import { formatBytesNum, formatDuration, formatPercent } from "@/lib/formatters"
 
 interface UnsatisfiedTorrentsTableProps {
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   requiredSeconds: number
   accentColor: string
 }
@@ -18,19 +17,19 @@ interface UnsatisfiedTorrentsTableProps {
 export function UnsatisfiedTorrentsTable({
   torrents,
   requiredSeconds,
-  accentColor: _accentColor,
+  accentColor,
 }: UnsatisfiedTorrentsTableProps) {
   const pctColor = (p: number) =>
     p < 50 ? CHART_THEME.danger : p < 80 ? CHART_THEME.warn : CHART_THEME.positive
 
-  const columns: Column<TorrentInfo>[] = [
+  const columns: Column<TorrentRaw>[] = [
     {
       key: "name",
       header: "Name",
       render: (t) => {
         const pct = Math.min((t.seedingTime / requiredSeconds) * 100, 100)
         return (
-          <div className="flex flex-col gap-1.5 min-w-0">
+          <div className="flex flex-col gap-2 min-w-0">
             <MarqueeText className="text-xs font-mono text-secondary">{t.name}</MarqueeText>
             <div className="flex items-center gap-2">
               <div className="flex-1 h-1 rounded-full bg-base overflow-hidden">
@@ -42,8 +41,8 @@ export function UnsatisfiedTorrentsTable({
                   }}
                 />
               </div>
-              <span className="text-[10px] font-mono shrink-0" style={{ color: pctColor(pct) }}>
-                {pct.toFixed(0)}%
+              <span className="text-3xs font-mono shrink-0" style={{ color: pctColor(pct) }}>
+                {formatPercent(pct, 0)}
               </span>
             </div>
           </div>
@@ -92,12 +91,13 @@ export function UnsatisfiedTorrentsTable({
   ]
 
   return (
-    <Table<TorrentInfo>
+    <Table<TorrentRaw>
       columns={columns}
       data={torrents}
       keyExtractor={(t) => t.hash}
       emptyMessage="All torrents meet seed time requirements"
       surface="inset"
+      trackerColor={accentColor}
       fixedLayout
       noHorizontalScroll
       maxHeight={torrents.length > 15 ? 720 : undefined}
diff --git a/src/components/dashboard/torrents/index.ts b/src/components/dashboard/torrents/index.ts
index c7dc0b1b..2c9d600c 100644
--- a/src/components/dashboard/torrents/index.ts
+++ b/src/components/dashboard/torrents/index.ts
@@ -2,7 +2,7 @@
 
 export { ActiveTransfersTable } from "./ActiveTransfersTable"
 export { CategoryCard } from "./CategoryCard"
-export { NoClientState, NoTagState } from "./TorrentEmptyStates"
+export { NoDownloadClientState, NoTagState } from "./TorrentEmptyStates"
 export type { TorrentTableVariant } from "./TorrentRankingTable"
 export { TorrentRankingTable } from "./TorrentRankingTable"
 export { TorrentStatCards } from "./TorrentStatCards"
diff --git a/src/components/dashboard/useChartPreferences.ts b/src/components/dashboard/useChartPreferences.ts
index 3279e93a..380a8ca2 100644
--- a/src/components/dashboard/useChartPreferences.ts
+++ b/src/components/dashboard/useChartPreferences.ts
@@ -1,7 +1,5 @@
 // src/components/dashboard/useChartPreferences.ts
-//
-// Functions: useChartPreferences, orderedCharts
-//
+
 // Manages dashboard chart visibility, collapse state, and display order in localStorage.
 // Single source of truth for both inline chart controls and settings sheet.
 // Order/reorder logic is dashboard-specific; shared base lives in src/hooks/useChartPreferencesBase.ts.
@@ -67,7 +65,7 @@ const DASHBOARD_CHARTS: ChartDef[] = [
   {
     id: "rank-tenure",
     label: "Rank Tenure",
-    description: "Time spent at each rank per tracker — hover segments for duration details",
+    description: "Time spent at each rank per tracker",
     category: "analytics",
   },
   {
@@ -79,13 +77,13 @@ const DASHBOARD_CHARTS: ChartDef[] = [
   {
     id: "buffer-candlestick",
     label: "Buffer Candlestick",
-    description: "Daily buffer open/high/low/close per tracker — like stock price charts",
+    description: "Daily buffer open/high/low/close per tracker",
     category: "analytics",
   },
   {
     id: "tracker-landscape",
     label: "Tracker Landscape",
-    description: "Each tracker as a bubble — position shows upload vs download, size shows fleet",
+    description: "Position shows upload vs download, size shows fleet",
     category: "analytics",
   },
   {
diff --git a/src/components/dashboard/useDashboardSettings.ts b/src/components/dashboard/useDashboardSettings.ts
index 7477dc5d..720dd565 100644
--- a/src/components/dashboard/useDashboardSettings.ts
+++ b/src/components/dashboard/useDashboardSettings.ts
@@ -1,7 +1,4 @@
 // src/components/dashboard/useDashboardSettings.ts
-//
-// Functions: useDashboardSettings
-
 "use client"
 
 import { useCallback, useEffect, useState } from "react"
@@ -58,12 +55,26 @@ function useDashboardSettings() {
     <K extends keyof DashboardSettings>(key: K, value: DashboardSettings[K]) => {
       setSettings((prev) => {
         const next = { ...prev, [key]: value }
-        // Fire-and-forget save
+        // Fire-and-forget save inside updater so `next` is guaranteed correct
+        // even under rapid sequential calls (prev is always the latest queued state).
+        // PUT is idempotent — duplicate calls in StrictMode are harmless.
         fetch("/api/settings/dashboard", {
           method: "PUT",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(next),
         })
+          .then((res) => {
+            if (!res.ok) throw new Error(`PUT failed: ${res.status}`)
+          })
+          .catch(() => {
+            // Resync from server to revert the optimistic toggle
+            fetch("/api/settings/dashboard")
+              .then((res) => (res.ok ? res.json() : null))
+              .then((data) => {
+                if (data) setSettings({ ...DEFAULTS, ...(data as Partial<DashboardSettings>) })
+              })
+              .catch(() => {})
+          })
         return next
       })
     },
diff --git a/src/components/dashboard/useFleetChartPreferences.ts b/src/components/dashboard/useFleetChartPreferences.ts
index 6e30376f..2815cb5c 100644
--- a/src/components/dashboard/useFleetChartPreferences.ts
+++ b/src/components/dashboard/useFleetChartPreferences.ts
@@ -1,10 +1,4 @@
 // src/components/dashboard/useFleetChartPreferences.ts
-//
-// Functions: useFleetChartPreferences
-//
-// Manages fleet dashboard chart visibility and collapse state in localStorage.
-// Shared base logic lives in src/hooks/useChartPreferencesBase.ts.
-
 "use client"
 
 import { useChartPreferencesBase } from "@/hooks/useChartPreferencesBase"
@@ -79,6 +73,11 @@ export const FLEET_CHARTS: FleetChartDef[] = [
     label: "Seed Time Distribution",
     description: "Seed time histogram",
   },
+  {
+    id: "fleet-age-bands",
+    label: "Age Distribution",
+    description: "Torrent count per age band per tracker",
+  },
   {
     id: "fleet-age-timeline",
     label: "Library Growth",
@@ -92,12 +91,12 @@ export const FLEET_CHARTS: FleetChartDef[] = [
   {
     id: "fleet-size-jitter",
     label: "Size Scatter",
-    description: "Torrent size distribution per tracker — jittered scatter plot",
+    description: "Torrent size distribution per tracker",
   },
   {
     id: "fleet-category-breakdown",
     label: "Category Mix",
-    description: "Normalized category breakdown per tracker — stacked percentage bars",
+    description: "Normalized category breakdown per tracker",
   },
 ]
 
diff --git a/src/components/layout/AuthShell.tsx b/src/components/layout/AuthShell.tsx
index 6c0c2792..dba63a1f 100644
--- a/src/components/layout/AuthShell.tsx
+++ b/src/components/layout/AuthShell.tsx
@@ -6,6 +6,7 @@ import Image from "next/image"
 import { usePathname } from "next/navigation"
 import { type ReactNode, useCallback, useEffect, useRef, useState } from "react"
 import { Sidebar } from "@/components/layout/Sidebar"
+import { WhatsNew } from "@/components/layout/WhatsNew"
 import { BackToTop } from "@/components/ui/BackToTop"
 import { HamburgerIcon } from "@/components/ui/Icons"
 import { useLocalStorage } from "@/hooks/useLocalStorage"
@@ -55,7 +56,7 @@ export function AuthShell({ children }: { children: ReactNode }) {
       {isMobile && (
         <div
           className={clsx(
-            "fixed inset-0 z-30 bg-black/50 transition-opacity duration-300 ease-in-out",
+            "fixed inset-0 z-20 bg-black/50 transition-opacity duration-300 ease-in-out",
             effectiveCollapsed ? "opacity-0 pointer-events-none" : "opacity-100"
           )}
           onClick={toggle}
@@ -71,7 +72,7 @@ export function AuthShell({ children }: { children: ReactNode }) {
           <button
             type="button"
             onClick={toggle}
-            className="fixed top-4 left-4 z-50 p-2 bg-base text-secondary hover:text-primary transition-colors duration-150 cursor-pointer nm-raised-sm rounded-nm-sm"
+            className="fixed top-4 left-4 z-40 p-2 bg-base text-secondary hover:text-primary transition-colors duration-150 cursor-pointer nm-raised-sm rounded-nm-sm"
             aria-label="Open sidebar"
           >
             <HamburgerIcon width="20" height="20" />
@@ -93,11 +94,13 @@ export function AuthShell({ children }: { children: ReactNode }) {
               height={73}
               className="select-none pointer-events-none"
               draggable={false}
+              priority
             />
           </footer>
         </div>
         <BackToTop scrollRef={mainRef} />
       </main>
+      <WhatsNew />
     </div>
   )
 }
diff --git a/src/components/layout/ChangelogContent.tsx b/src/components/layout/ChangelogContent.tsx
new file mode 100644
index 00000000..0b7e01b1
--- /dev/null
+++ b/src/components/layout/ChangelogContent.tsx
@@ -0,0 +1,14 @@
+// src/components/layout/ChangelogContent.tsx
+
+"use client"
+
+import Markdown from "react-markdown"
+import remarkGfm from "remark-gfm"
+
+interface ChangelogContentProps {
+  content: string
+}
+
+export default function ChangelogContent({ content }: ChangelogContentProps) {
+  return <Markdown remarkPlugins={[remarkGfm]}>{content}</Markdown>
+}
diff --git a/src/components/layout/ChangelogDialog.tsx b/src/components/layout/ChangelogDialog.tsx
new file mode 100644
index 00000000..e1bc0666
--- /dev/null
+++ b/src/components/layout/ChangelogDialog.tsx
@@ -0,0 +1,64 @@
+// src/components/layout/ChangelogDialog.tsx
+
+"use client"
+
+import dynamic from "next/dynamic"
+import { useEffect, useState } from "react"
+import { Dialog, Shimmer } from "@/components/ui"
+
+const ChangelogContent = dynamic(() => import("./ChangelogContent"), { ssr: false })
+
+interface ChangelogDialogProps {
+  open: boolean
+  onClose: () => void
+}
+
+export function ChangelogDialog({ open, onClose }: ChangelogDialogProps) {
+  const [content, setContent] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!open || content !== null) return
+
+    fetch("/api/changelog")
+      .then((r) => r.json())
+      .then((data: { content: string }) => setContent(data.content))
+      .catch(() => setContent("Failed to load changelog."))
+  }, [open, content])
+
+  const header = (
+    <div className="flex items-center gap-3">
+      <span className="font-mono text-sm text-primary">v{process.env.NEXT_PUBLIC_APP_VERSION}</span>
+      <a
+        href="https://github.com/jordanlambrecht/tracker-tracker/releases"
+        target="_blank"
+        rel="noopener noreferrer"
+        className="text-xs text-tertiary hover:text-accent transition-colors duration-150"
+      >
+        View on GitHub
+      </a>
+    </div>
+  )
+
+  return (
+    <Dialog open={open} onClose={onClose} title={header} size="sm" maxHeight="70vh">
+      <div className="prose prose-invert prose-sm max-w-none prose-headings:font-mono prose-h1:hidden prose-h2:text-sm prose-h2:font-medium prose-h2:text-primary prose-h2:border-t prose-h2:border-border prose-h2:pt-4 prose-h2:mt-4 prose-h2:mb-2 prose-h2:first:border-0 prose-h2:first:pt-0 prose-h2:first:mt-0 prose-h3:text-xs prose-h3:font-medium prose-h3:text-tertiary prose-h3:mb-1 prose-h3:mt-2.5 prose-li:text-secondary prose-li:text-[13px] prose-li:leading-relaxed prose-p:text-secondary prose-strong:text-primary prose-a:text-accent prose-a:no-underline hover:prose-a:underline prose-ul:my-1.5 prose-ul:pl-4">
+        {content ? (
+          <ChangelogContent content={content} />
+        ) : (
+          <div className="flex flex-col gap-2.5">
+            <Shimmer size="bar" className="w-28 h-3" />
+            <Shimmer size="bar" className="w-16 h-2" />
+            <Shimmer size="bar" className="w-full" />
+            <Shimmer size="bar" className="w-5/6" />
+            <Shimmer size="bar" className="w-full" />
+            <Shimmer size="bar" className="w-3/4" />
+            <Shimmer size="bar" className="w-20 h-3 mt-3" />
+            <Shimmer size="bar" className="w-16 h-2" />
+            <Shimmer size="bar" className="w-full" />
+            <Shimmer size="bar" className="w-4/5" />
+          </div>
+        )}
+      </div>
+    </Dialog>
+  )
+}
diff --git a/src/components/layout/DownloadClientStatusWidget.tsx b/src/components/layout/DownloadClientStatusWidget.tsx
new file mode 100644
index 00000000..9e30c8f3
--- /dev/null
+++ b/src/components/layout/DownloadClientStatusWidget.tsx
@@ -0,0 +1,242 @@
+// src/components/layout/DownloadClientStatusWidget.tsx
+"use client"
+
+import { useQueries, useQuery } from "@tanstack/react-query"
+import clsx from "clsx"
+import { useEffect, useMemo } from "react"
+import { ChevronToggle } from "@/components/ui/ChevronToggle"
+import { DownloadArrowIcon, UploadArrowIcon } from "@/components/ui/Icons"
+import { MarqueeText } from "@/components/ui/MarqueeText"
+import { Sparkline } from "@/components/ui/Sparkline"
+import { useCarousel } from "@/hooks/useCarousel"
+import { useLocalStorage } from "@/hooks/useLocalStorage"
+import { formatSpeed, formatTimeAgo } from "@/lib/formatters"
+import { clientQueryOptions } from "@/lib/query-options"
+import { STORAGE_KEYS } from "@/lib/storage-keys"
+
+interface ClientInfo {
+  id: number
+  name: string
+  enabled: boolean
+  lastError: string | null
+  errorSince: string | null
+  lastPolledAt: string | null
+}
+
+interface SpeedPoint {
+  up: number
+  down: number
+}
+
+interface ClientWithSpeeds {
+  client: ClientInfo
+  speeds: SpeedPoint[]
+}
+
+// ---------------------------------------------------------------------------
+//  ClientSlide
+// ---------------------------------------------------------------------------
+
+function ClientSlide({
+  entry,
+  expanded,
+  onToggle,
+}: {
+  entry: ClientWithSpeeds
+  expanded: boolean
+  onToggle: () => void
+}) {
+  const { client } = entry
+  const hasError = !!client.lastError
+  const latestSpeed = entry.speeds.at(-1)
+
+  function renderSubline(): React.ReactNode {
+    if (hasError) {
+      return (
+        <span className="text-danger">
+          Down{client.errorSince ? ` ${formatTimeAgo(client.errorSince)}` : ""}
+        </span>
+      )
+    }
+    if (!expanded && latestSpeed) {
+      return (
+        <span className="flex items-center gap-2">
+          <span className="text-accent">{formatSpeed(latestSpeed.up)}↑</span>
+          <span className="text-warn">{formatSpeed(latestSpeed.down)}↓</span>
+        </span>
+      )
+    }
+    return "Connected"
+  }
+
+  return (
+    <button
+      type="button"
+      onClick={onToggle}
+      onPointerDown={(e) => e.stopPropagation()}
+      className="flex items-center gap-2 cursor-pointer w-full text-left"
+    >
+      <span
+        className={clsx("color-dot", hasError ? "bg-danger" : "bg-success")}
+        style={hasError ? undefined : { boxShadow: "0 0 6px var(--color-success)" }}
+      />
+      <div className="flex flex-col flex-1 min-w-0">
+        <MarqueeText className="text-xs font-mono text-secondary">{client.name}</MarqueeText>
+        <span className="text-3xs font-mono text-tertiary">{renderSubline()}</span>
+      </div>
+      <ChevronToggle expanded={expanded} variant="flip" />
+    </button>
+  )
+}
+
+// ---------------------------------------------------------------------------
+//  DownloadClientStatusWidget
+// ---------------------------------------------------------------------------
+
+const selectEnabled = (all: ClientInfo[]) => all.filter((c) => c.enabled)
+
+function DownloadClientStatusWidget() {
+  const [expanded, setExpanded] = useLocalStorage(STORAGE_KEYS.CLIENT_WIDGET_EXPANDED, false)
+
+  // Set height-based default on first visit (when no preference is stored)
+  useEffect(() => {
+    try {
+      if (localStorage.getItem(STORAGE_KEYS.CLIENT_WIDGET_EXPANDED) === null) {
+        setExpanded(window.innerHeight >= 800)
+      }
+    } catch {}
+  }, [setExpanded])
+
+  // Fetch enabled clients — refetchInterval: 10_000 drives the cache for all consumers
+  const { data: enabledClients = [] } = useQuery({
+    ...clientQueryOptions,
+    refetchInterval: 10_000,
+    select: selectEnabled,
+  })
+
+  // Fetch speeds for each enabled client
+  // Cache stores raw API shape so FleetSpeedSparklines (same key) gets correct data
+  const speedQueries = useQueries({
+    queries: enabledClients.map((client) => ({
+      queryKey: ["client-speeds", client.id] as const,
+      queryFn: async ({ signal }: { signal: AbortSignal }) => {
+        const res = await fetch(`/api/clients/${client.id}/speeds`, { signal })
+        if (!res.ok)
+          return [] as { timestamp: number; uploadSpeed: number; downloadSpeed: number }[]
+        return res.json() as Promise<
+          { timestamp: number; uploadSpeed: number; downloadSpeed: number }[]
+        >
+      },
+      select: (
+        snaps: { timestamp: number; uploadSpeed: number; downloadSpeed: number }[]
+      ): SpeedPoint[] => snaps.map((s) => ({ up: s.uploadSpeed, down: s.downloadSpeed })),
+      refetchInterval: 10_000,
+    })),
+  })
+
+  // Combine clients + speeds into entries
+  const entries: ClientWithSpeeds[] = useMemo(
+    () =>
+      enabledClients.map((client, i) => ({
+        client,
+        speeds: speedQueries[i]?.data ?? [],
+      })),
+    [enabledClients, speedQueries]
+  )
+
+  const loaded = enabledClients.length > 0
+
+  const { activeIndex, direction, animating, goTo, onPointerDownCapture, onPointerUp } =
+    useCarousel({ itemCount: entries.length, autoRotateMs: 8000 })
+
+  if (!loaded || entries.length === 0) return null
+
+  const current = entries[activeIndex]
+
+  return (
+    <div className="px-3 py-3 border-t border-border shrink-0">
+      <div
+        className="nm-inset-sm bg-control-bg px-3 pt-2.5 pb-3.5 flex flex-col gap-2 rounded-nm-md touch-pan-y"
+        onPointerDown={onPointerDownCapture}
+        onPointerUp={onPointerUp}
+      >
+        <div
+          key={activeIndex}
+          className="overflow-hidden"
+          style={{
+            animation: animating
+              ? `slideIn${direction === "left" ? "Left" : "Right"} 300ms ease-out both`
+              : undefined,
+          }}
+        >
+          <ClientSlide
+            entry={current}
+            expanded={expanded}
+            onToggle={() => setExpanded((prev) => !prev)}
+          />
+
+          {/* Collapsible sparklines */}
+          {current.speeds.length >= 2 && (
+            <div
+              className="grid transition-[grid-template-rows,opacity] duration-200 ease-out"
+              style={{
+                gridTemplateRows: expanded ? "1fr" : "0fr",
+                opacity: expanded ? 1 : 0,
+              }}
+            >
+              <div className="overflow-hidden">
+                <div className="flex flex-col gap-0.5 pt-1.5">
+                  {(
+                    [
+                      { key: "up", color: "accent", Icon: UploadArrowIcon },
+                      { key: "down", color: "warn", Icon: DownloadArrowIcon },
+                    ] as const
+                  ).map(({ key, color, Icon }) => (
+                    <div key={key} className="flex items-center gap-2">
+                      <Icon
+                        width="10"
+                        height="10"
+                        stroke={`var(--color-${color})`}
+                        strokeWidth={2.5}
+                        className="shrink-0"
+                      />
+                      <Sparkline
+                        data={current.speeds.map((s) => s[key])}
+                        color={`var(--color-${color})`}
+                        width={160}
+                        height={16}
+                      />
+                      <span className={`text-xs font-mono text-${color} tabular-nums shrink-0`}>
+                        {formatSpeed(current.speeds.at(-1)?.[key] ?? 0)}
+                      </span>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+
+        {/* Dot indicators for carousel */}
+        {entries.length > 1 && (
+          <div className="flex items-center justify-center gap-2 pt-0.5">
+            {entries.map((entry, i) => (
+              <button
+                key={entry.client.id}
+                type="button"
+                onClick={() => goTo(i)}
+                className={clsx(
+                  "w-1.5 h-1.5 rounded-full transition-all duration-200 cursor-pointer",
+                  i === activeIndex ? "bg-accent scale-125" : "bg-muted hover:bg-tertiary"
+                )}
+                aria-label={`Show ${entry.client.name}`}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export { DownloadClientStatusWidget }
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index d25f0751..e3ac11b3 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -1,737 +1,67 @@
 // src/components/layout/Sidebar.tsx
-//
-// Functions:
-//   sortTrackers
-//   SortableTrackerItem
-//   Sparkline
-//   ClientStatusWidget
-//   formatSidebarSpeed
-//   Sidebar
 
 "use client"
 
-import { closestCenter, DndContext, type DragEndEvent } from "@dnd-kit/core"
-import {
-  arrayMove,
-  SortableContext,
-  useSortable,
-  verticalListSortingStrategy,
-} from "@dnd-kit/sortable"
-import { CSS } from "@dnd-kit/utilities"
-import { H2 } from "@typography"
+import { closestCenter, DndContext } from "@dnd-kit/core"
+import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable"
+import { BookIcon, EyeIcon, EyeOffIcon, GitHubIcon } from "@icons"
 import clsx from "clsx"
 import Image from "next/image"
-import Link from "next/link"
 import { usePathname, useRouter } from "next/navigation"
-import { type CSSProperties, useCallback, useEffect, useRef, useState } from "react"
-import Markdown from "react-markdown"
-import remarkGfm from "remark-gfm"
+import { useMemo, useState } from "react"
 import { AddTrackerDialog } from "@/components/AddTrackerDialog"
-import { CHART_THEME } from "@/components/charts/lib/theme"
-import { Button } from "@/components/ui/Button"
-import { ChevronToggle } from "@/components/ui/ChevronToggle"
-import { DownloadArrowIcon, EyeIcon, EyeOffIcon, UploadArrowIcon } from "@/components/ui/Icons"
-import { MarqueeText } from "@/components/ui/MarqueeText"
-import { PulseDot } from "@/components/ui/PulseDot"
-import { Select } from "@/components/ui/Select"
-import { Tooltip } from "@/components/ui/Tooltip"
-import { useLocalStorage } from "@/hooks/useLocalStorage"
+import { ChangelogDialog } from "@/components/layout/ChangelogDialog"
+import { DownloadClientStatusWidget } from "@/components/layout/DownloadClientStatusWidget"
+import { SortableTrackerItem } from "@/components/layout/SortableTrackerItem"
+import { Button, ChevronToggle, PillTag, Select, Shimmer, Tooltip } from "@/components/ui"
+import { useSidebarPreferences } from "@/hooks/useSidebarPreferences"
+import { useTrackerList } from "@/hooks/useTrackerList"
 import { useUpdateCheck } from "@/hooks/useUpdateCheck"
 import { DOCS_URL } from "@/lib/constants"
-import {
-  formatBytesNum,
-  formatStatValue,
-  formatTimeAgo,
-  hexToRgba,
-  type StatMode,
-} from "@/lib/formatters"
-import { STORAGE_KEYS } from "@/lib/storage-keys"
-import { getHealthPulseDot, getTrackerHealth } from "@/lib/tracker-status"
-import type { TrackerSummary } from "@/types/api"
-
-// ---------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------
-
-type SortMode = "index" | "alpha" | "custom"
 
 interface SidebarProps {
-  collapsed?: boolean
-  onToggle?: () => void
-  isMobile?: boolean
-}
-
-// ---------------------------------------------------------------------------
-// Pure helpers
-// ---------------------------------------------------------------------------
-
-function sortTrackers(trackers: TrackerSummary[], mode: SortMode): TrackerSummary[] {
-  const sorted = [...trackers]
-  switch (mode) {
-    case "alpha":
-      return sorted.sort((a, b) => a.name.localeCompare(b.name))
-    case "custom":
-      return sorted.sort((a, b) => (a.sortOrder ?? Infinity) - (b.sortOrder ?? Infinity))
-    default:
-      // "index" — preserve API order (createdAt ascending from the server)
-      return sorted
-  }
-}
-
-// Select extracted to @/components/ui/Select
-
-// ---------------------------------------------------------------------------
-// SortableTrackerItem
-// ---------------------------------------------------------------------------
-
-interface SortableTrackerItemProps {
-  tracker: TrackerSummary
-  isActive: boolean
-  unlocked: boolean
-  statMode: StatMode
-  onToggleFavorite: (id: number, current: boolean) => void
-}
-
-function SortableTrackerItem({
-  tracker,
-  isActive,
-  unlocked,
-  statMode,
-  onToggleFavorite,
-}: SortableTrackerItemProps) {
-  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
-    id: tracker.id,
-  })
-
-  const archived = !tracker.isActive
-  const health = getTrackerHealth(tracker)
-  const tc = tracker.color || CHART_THEME.accent
-  const stat = formatStatValue(tracker.latestStats, statMode)
-
-  const dragStyle: CSSProperties = {
-    transform: CSS.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-  }
-
-  const activeStyle: CSSProperties = isActive
-    ? {
-        backgroundColor: hexToRgba(tc, 0.08),
-        filter: `drop-shadow(0 0 10px ${hexToRgba(tc, 0.15)})`,
-      }
-    : {}
-
-  const itemClasses = clsx(
-    "w-full flex items-center gap-3 px-4 py-3 text-left group",
-    "transition-all duration-150",
-    unlocked ? "animate-jiggle cursor-grab" : "cursor-pointer",
-    archived && "opacity-40",
-    isActive
-      ? "text-primary nm-raised-sm"
-      : "text-secondary nm-raised-sm hover:text-primary hover:nm-raised active:nm-inset-sm active:scale-[0.98]"
-  )
-
-  const children = (
-    <>
-      {unlocked && (
-        <span
-          className="text-tertiary shrink-0 text-sm leading-none select-none"
-          aria-hidden="true"
-        >
-          ⠿
-        </span>
-      )}
-      {archived ? (
-        <span className="w-2 h-2 rounded-full bg-muted shrink-0" aria-hidden="true" />
-      ) : (
-        <PulseDot status={getHealthPulseDot(health)} size="sm" />
-      )}
-      <span className="flex-1 truncate text-[15px] font-semibold">{tracker.name}</span>
-      <span className="font-mono text-xs tabular-nums text-tertiary shrink-0">
-        {archived ? "Archived" : stat}
-      </span>
-      {!unlocked && (
-        // biome-ignore lint/a11y/useSemanticElements: Star must be inside parent button for visual layout
-        <span
-          role="button"
-          tabIndex={0}
-          aria-pressed={tracker.isFavorite}
-          onClick={(e) => {
-            e.stopPropagation()
-            e.preventDefault()
-            onToggleFavorite(tracker.id, tracker.isFavorite)
-          }}
-          onKeyDown={(e) => {
-            if (e.key === "Enter" || e.key === " ") {
-              e.preventDefault()
-              e.stopPropagation()
-              onToggleFavorite(tracker.id, tracker.isFavorite)
-            }
-          }}
-          className={clsx(
-            "shrink-0 text-sm leading-none transition-all duration-150 cursor-pointer bg-transparent border-none p-0",
-            tracker.isFavorite
-              ? "text-warn opacity-100"
-              : "text-muted opacity-0 group-hover:opacity-50 hover:opacity-100!"
-          )}
-          aria-label={tracker.isFavorite ? "Remove from favorites" : "Add to favorites"}
-        >
-          {tracker.isFavorite ? "★" : "☆"}
-        </span>
-      )}
-    </>
-  )
-
-  const cls = `${itemClasses} rounded-nm-md`
-
-  return (
-    <li ref={setNodeRef} style={dragStyle}>
-      {unlocked ? (
-        <button
-          type="button"
-          className={cls}
-          style={activeStyle}
-          aria-current={isActive ? "page" : undefined}
-          {...attributes}
-          {...listeners}
-        >
-          {children}
-        </button>
-      ) : (
-        <Link
-          href={`/trackers/${tracker.id}`}
-          prefetch
-          className={cls}
-          style={activeStyle}
-          aria-current={isActive ? "page" : undefined}
-        >
-          {children}
-        </Link>
-      )}
-    </li>
-  )
-}
-
-// ---------------------------------------------------------------------------
-// Sparkline
-// ---------------------------------------------------------------------------
-
-function Sparkline({
-  data,
-  color,
-  height = 24,
-  width = 80,
-}: {
-  data: number[]
-  color: string
-  height?: number
-  width?: number
-}) {
-  if (data.length < 2) return null
-  const max = Math.max(...data, 1)
-  const step = width / (data.length - 1)
-  const points = data.map((v, i) => `${i * step},${height - (v / max) * (height - 2) - 1}`)
-  const fillPoints = `0,${height} ${points.join(" ")} ${width},${height}`
-
-  return (
-    <svg width={width} height={height} className="shrink-0" aria-hidden="true">
-      <polygon points={fillPoints} fill={color} opacity={0.1} />
-      <polyline
-        points={points.join(" ")}
-        fill="none"
-        stroke={color}
-        strokeWidth="1.5"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </svg>
-  )
-}
-
-// ---------------------------------------------------------------------------
-// Client Status Widget
-// ---------------------------------------------------------------------------
-
-interface ClientInfo {
-  id: number
-  name: string
-  enabled: boolean
-  lastError: string | null
-  errorSince: string | null
-  lastPolledAt: string | null
-}
-
-interface SpeedPoint {
-  up: number
-  down: number
-}
-
-interface ClientWithSpeeds {
-  client: ClientInfo
-  speeds: SpeedPoint[]
-}
-
-function ClientSlide({
-  entry,
-  expanded,
-  onToggle,
-}: {
-  entry: ClientWithSpeeds
-  expanded: boolean
+  collapsed: boolean
   onToggle: () => void
-}) {
-  const { client } = entry
-  const hasError = !!client.lastError
-
-  return (
-    <button
-      type="button"
-      onClick={onToggle}
-      onPointerDown={(e) => e.stopPropagation()}
-      className="flex items-center gap-2 cursor-pointer w-full text-left"
-    >
-      <span
-        className={clsx("w-2 h-2 rounded-full shrink-0", hasError ? "bg-danger" : "bg-success")}
-        style={hasError ? undefined : { boxShadow: "0 0 6px var(--color-success)" }}
-      />
-      <div className="flex flex-col flex-1 min-w-0">
-        <MarqueeText className="text-xs font-mono text-secondary">{client.name}</MarqueeText>
-        <span className="text-[10px] font-mono text-tertiary">
-          {hasError ? (
-            <span className="text-danger">
-              Down{client.errorSince ? ` ${formatTimeAgo(client.errorSince)}` : ""}
-            </span>
-          ) : !expanded && entry.speeds.length > 0 ? (
-            <span className="flex items-center gap-1.5">
-              <span className="text-accent">
-                {formatSidebarSpeed(entry.speeds[entry.speeds.length - 1].up)}↑
-              </span>
-              <span className="text-warn">
-                {formatSidebarSpeed(entry.speeds[entry.speeds.length - 1].down)}↓
-              </span>
-            </span>
-          ) : (
-            "Connected"
-          )}
-        </span>
-      </div>
-      <ChevronToggle expanded={expanded} variant="flip" />
-    </button>
-  )
-}
-
-function ClientStatusWidget() {
-  const [entries, setEntries] = useState<ClientWithSpeeds[]>([])
-  const [loaded, setLoaded] = useState(false)
-  const [activeIndex, setActiveIndex] = useState(0)
-  const [direction, setDirection] = useState<"left" | "right">("left")
-  const [animating, setAnimating] = useState(false)
-  const [expanded, setExpanded] = useLocalStorage(STORAGE_KEYS.CLIENT_WIDGET_EXPANDED, false)
-
-  // Set height-based default on first visit (when no preference is stored)
-  useEffect(() => {
-    try {
-      if (localStorage.getItem(STORAGE_KEYS.CLIENT_WIDGET_EXPANDED) === null) {
-        setExpanded(window.innerHeight >= 800)
-      }
-    } catch {}
-  }, [setExpanded])
-
-  const goTo = useCallback(
-    (next: number) => {
-      setActiveIndex((prev) => {
-        setDirection(next > prev || (prev === entries.length - 1 && next === 0) ? "left" : "right")
-        setAnimating(true)
-        return next
-      })
-    },
-    [entries.length]
-  )
-
-  useEffect(() => {
-    if (!animating) return
-    const t = setTimeout(() => setAnimating(false), 300)
-    return () => clearTimeout(t)
-  }, [animating])
-
-  // Auto-rotate carousel
-  useEffect(() => {
-    if (entries.length <= 1) return
-    const timer = setInterval(() => {
-      goTo((activeIndex + 1) % entries.length)
-    }, 8000)
-    return () => clearInterval(timer)
-  }, [entries.length, activeIndex, goTo])
-
-  useEffect(() => {
-    let cancelled = false
-
-    async function poll() {
-      try {
-        const clientsRes = await fetch("/api/clients")
-        if (!clientsRes.ok) return
-        const clients: ClientInfo[] = await clientsRes.json()
-        const enabled = clients.filter((c) => c.enabled)
-        if (enabled.length === 0 || cancelled) return
-
-        const results: ClientWithSpeeds[] = await Promise.all(
-          enabled.map(async (client) => {
-            try {
-              const snapRes = await fetch(`/api/clients/${client.id}/speeds`)
-              if (!snapRes.ok) return { client, speeds: [] }
-              const snaps: { timestamp: number; uploadSpeed: number; downloadSpeed: number }[] =
-                await snapRes.json()
-              return {
-                client,
-                speeds: snaps.map((s) => ({
-                  up: s.uploadSpeed,
-                  down: s.downloadSpeed,
-                })),
-              }
-            } catch {
-              return { client, speeds: [] }
-            }
-          })
-        )
-
-        if (!cancelled) {
-          setEntries(results)
-          setActiveIndex((prev) => (prev >= results.length ? 0 : prev))
-        }
-      } catch {
-        // ignore
-      } finally {
-        if (!cancelled) setLoaded(true)
-      }
-    }
-
-    poll()
-    const interval = setInterval(poll, 10_000)
-    return () => {
-      cancelled = true
-      clearInterval(interval)
-    }
-  }, [])
-
-  // Swipe/drag gesture for carousel (touch + pointer for desktop)
-  const swipeStartX = useRef(0)
-  const swipeStartY = useRef(0)
-  const pointerDown = useRef(false)
-
-  const handleSwipeStart = useCallback((x: number, y: number) => {
-    swipeStartX.current = x
-    swipeStartY.current = y
-  }, [])
-
-  const handleSwipeEnd = useCallback(
-    (x: number, y: number) => {
-      if (entries.length <= 1) return
-      const dx = x - swipeStartX.current
-      const dy = y - swipeStartY.current
-      if (Math.abs(dx) < 40 || Math.abs(dx) < Math.abs(dy)) return
-      if (dx < 0) goTo((activeIndex + 1) % entries.length)
-      else goTo((activeIndex - 1 + entries.length) % entries.length)
-    },
-    [entries.length, activeIndex, goTo]
-  )
-
-  const onPointerDown = useCallback(
-    (e: React.PointerEvent) => {
-      pointerDown.current = true
-      handleSwipeStart(e.clientX, e.clientY)
-    },
-    [handleSwipeStart]
-  )
-
-  const onPointerUp = useCallback(
-    (e: React.PointerEvent) => {
-      if (!pointerDown.current) return
-      pointerDown.current = false
-      handleSwipeEnd(e.clientX, e.clientY)
-    },
-    [handleSwipeEnd]
-  )
-
-  // Capture pointer so up fires even if cursor leaves the element
-  const onPointerDownCapture = useCallback(
-    (e: React.PointerEvent) => {
-      ;(e.currentTarget as HTMLElement).setPointerCapture(e.pointerId)
-      onPointerDown(e)
-    },
-    [onPointerDown]
-  )
-
-  if (!loaded || entries.length === 0) return null
-
-  const current = entries[activeIndex]
-
-  return (
-    <div className="px-3 py-3 border-t border-border shrink-0">
-      <div
-        className="nm-inset-sm bg-control-bg px-3 pt-2.5 pb-3.5 flex flex-col gap-1.5 rounded-nm-md touch-pan-y"
-        onPointerDown={onPointerDownCapture}
-        onPointerUp={onPointerUp}
-      >
-        <div
-          key={activeIndex}
-          className="overflow-hidden"
-          style={{
-            animation: animating
-              ? `slideIn${direction === "left" ? "Left" : "Right"} 300ms ease-out both`
-              : undefined,
-          }}
-        >
-          <ClientSlide
-            entry={current}
-            expanded={expanded}
-            onToggle={() => setExpanded((prev) => !prev)}
-          />
-
-          {/* Collapsible sparklines */}
-          {current.speeds.length >= 2 && (
-            <div
-              className="grid transition-[grid-template-rows,opacity] duration-200 ease-out"
-              style={{
-                gridTemplateRows: expanded ? "1fr" : "0fr",
-                opacity: expanded ? 1 : 0,
-              }}
-            >
-              <div className="overflow-hidden">
-                <div className="flex items-center gap-3 pt-1.5">
-                  <div className="flex flex-col gap-0.5 flex-1 min-w-0">
-                    <div className="flex items-center gap-2">
-                      <UploadArrowIcon
-                        width="10"
-                        height="10"
-                        stroke="var(--color-accent)"
-                        strokeWidth={2.5}
-                        className="shrink-0"
-                      />
-                      <Sparkline
-                        data={current.speeds.map((s) => s.up)}
-                        color="var(--color-accent)"
-                        width={160}
-                        height={16}
-                      />
-                      <span className="text-xs font-mono text-accent tabular-nums shrink-0">
-                        {formatSidebarSpeed(current.speeds[current.speeds.length - 1].up)}
-                      </span>
-                    </div>
-                    <div className="flex items-center gap-2">
-                      <DownloadArrowIcon
-                        width="10"
-                        height="10"
-                        stroke="var(--color-warn)"
-                        strokeWidth={2.5}
-                        className="shrink-0"
-                      />
-                      <Sparkline
-                        data={current.speeds.map((s) => s.down)}
-                        color="var(--color-warn)"
-                        width={160}
-                        height={16}
-                      />
-                      <span className="text-xs font-mono text-warn tabular-nums shrink-0">
-                        {formatSidebarSpeed(current.speeds[current.speeds.length - 1].down)}
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          )}
-        </div>
-
-        {/* Dot indicators for carousel */}
-        {entries.length > 1 && (
-          <div className="flex items-center justify-center gap-1.5 pt-0.5">
-            {entries.map((entry, i) => (
-              <button
-                key={entry.client.id}
-                type="button"
-                onClick={() => goTo(i)}
-                className={clsx(
-                  "w-1.5 h-1.5 rounded-full transition-all duration-200 cursor-pointer",
-                  i === activeIndex ? "bg-accent scale-125" : "bg-muted hover:bg-tertiary"
-                )}
-                aria-label={`Show ${entry.client.name}`}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
-
-function formatSidebarSpeed(bytesPerSec: number): string {
-  if (!bytesPerSec || bytesPerSec <= 0) return "0 B/s"
-  return `${formatBytesNum(bytesPerSec)}/s`
+  isMobile?: boolean
 }
 
-// ---------------------------------------------------------------------------
-// Sidebar
-// ---------------------------------------------------------------------------
-
-function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: SidebarProps) {
-  const [trackers, setTrackers] = useState<TrackerSummary[]>([])
+function Sidebar({ collapsed, onToggle, isMobile = false }: SidebarProps) {
   const [showAddDialog, setShowAddDialog] = useState(false)
-  const [refreshKey, setRefreshKey] = useState(0)
-  const [statMode, setStatMode] = useState<StatMode>("ratio")
-  const [sortMode, setSortMode] = useState<SortMode>("index")
-  const [unlocked, setUnlocked] = useState(false)
-  const [showFavoritesOnly, setShowFavoritesOnly] = useState(false)
-  const [showArchived, setShowArchived] = useState(false)
-  const [filtersExpanded, setFiltersExpanded] = useLocalStorage("sidebar-filters-expanded", true)
-  const [internalCollapsed, setInternalCollapsed] = useState(false)
   const [changelogOpen, setChangelogOpen] = useState(false)
-  const [changelogContent, setChangelogContent] = useState<string | null>(null)
-  const changelogRef = useRef<HTMLDialogElement>(null)
-  const { latestVersion, updateAvailable } = useUpdateCheck()
 
   const pathname = usePathname()
   const router = useRouter()
+  const { latestVersion, updateAvailable } = useUpdateCheck()
 
-  // Determine whether collapsed is externally controlled or internal
-  const collapsed = collapsedProp !== undefined ? collapsedProp : internalCollapsed
-  const handleToggle = onToggle ?? (() => setInternalCollapsed((c) => !c))
-
-  // Hydrate preferences from localStorage after mount (avoids SSR mismatch)
-  useEffect(() => {
-    try {
-      const savedStat = localStorage.getItem(STORAGE_KEYS.SIDEBAR_STAT_MODE) as StatMode | null
-      if (savedStat) setStatMode(savedStat)
-      const savedSort = localStorage.getItem(STORAGE_KEYS.SIDEBAR_SORT_MODE) as SortMode | null
-      if (savedSort) setSortMode(savedSort)
-    } catch {
-      // ignore
-    }
-  }, [])
-
-  // Fetch trackers on mount and on interval; re-run when refreshKey increments
-  // biome-ignore lint/correctness/useExhaustiveDependencies: refreshKey is a manual trigger — incrementing it intentionally re-runs the fetch
-  useEffect(() => {
-    let cancelled = false
-
-    async function fetchTrackers() {
-      try {
-        const res = await fetch("/api/trackers")
-        if (!res.ok) return
-        const data: TrackerSummary[] = await res.json()
-        if (!cancelled) {
-          setTrackers(data)
-
-          // Auto-detect custom sort on first load if no preference saved
-          if (
-            !localStorage.getItem(STORAGE_KEYS.SIDEBAR_SORT_MODE) &&
-            data.some((t) => t.sortOrder !== null)
-          ) {
-            setSortMode("custom")
-          }
-        }
-      } catch {
-        // silently ignore fetch errors; we'll retry on the next interval
-      }
-    }
-
-    fetchTrackers()
-    const interval = setInterval(fetchTrackers, 60_000)
+  const prefs = useSidebarPreferences()
+  const {
+    trackers,
+    loading: trackersLoading,
+    displayedTrackers,
+    trackerIds,
+    archivedCount,
+    toggleFavorite,
+    handleDragEnd,
+    refresh,
+  } = useTrackerList({
+    sortMode: prefs.sortMode,
+    showFavoritesOnly: prefs.showFavoritesOnly,
+    showArchived: prefs.showArchived,
+    onSortModeChange: prefs.setSortMode,
+  })
 
-    return () => {
-      cancelled = true
-      clearInterval(interval)
-    }
-  }, [refreshKey])
+  const existingBaseUrls = useMemo(() => trackers.map((t) => t.baseUrl), [trackers])
 
-  async function openChangelog() {
-    if (changelogContent === null) {
-      try {
-        const res = await fetch("/api/changelog")
-        const data = await res.json()
-        setChangelogContent(data.content)
-      } catch {
-        setChangelogContent("Failed to load changelog.")
-      }
-    }
+  function openChangelog() {
     setChangelogOpen(true)
-    requestAnimationFrame(() => changelogRef.current?.showModal())
-  }
-
-  const toggleFavorite = useCallback((id: number, current: boolean) => {
-    const next = !current
-    setTrackers((prev) => prev.map((t) => (t.id === id ? { ...t, isFavorite: next } : t)))
-    fetch(`/api/trackers/${id}`, {
-      method: "PATCH",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ isFavorite: next }),
-    }).catch(() => {
-      // Revert on failure
-      setTrackers((prev) => prev.map((t) => (t.id === id ? { ...t, isFavorite: current } : t)))
-    })
-  }, [])
-
-  const handleDragEnd = useCallback((event: DragEndEvent) => {
-    const { active, over } = event
-    if (!over || active.id === over.id) return
-
-    setTrackers((prev) => {
-      const oldIndex = prev.findIndex((t) => t.id === active.id)
-      const newIndex = prev.findIndex((t) => t.id === over.id)
-      if (oldIndex === -1 || newIndex === -1) return prev
-      const reordered = arrayMove(prev, oldIndex, newIndex).map((t, i) => ({
-        ...t,
-        sortOrder: i,
-      }))
-
-      // Fire-and-forget reorder API call
-      const ids = reordered.map((t) => t.id)
-      fetch("/api/trackers/reorder", {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ ids }),
-      }).catch(() => {
-        // ignore network errors
-      })
-
-      return reordered
-    })
-
-    // Switch to custom sort and persist
-    setSortMode("custom")
-    try {
-      localStorage.setItem(STORAGE_KEYS.SIDEBAR_SORT_MODE, "custom")
-    } catch {
-      // ignore
-    }
-  }, [])
-
-  function updateStatMode(mode: StatMode) {
-    setStatMode(mode)
-    try {
-      localStorage.setItem(STORAGE_KEYS.SIDEBAR_STAT_MODE, mode)
-    } catch {}
-  }
-
-  function updateSortMode(mode: SortMode) {
-    setSortMode(mode)
-    try {
-      localStorage.setItem(STORAGE_KEYS.SIDEBAR_SORT_MODE, mode)
-    } catch {}
   }
 
-  const filteredTrackers = trackers
-    .filter((t) => showArchived || t.isActive)
-    .filter((t) => !showFavoritesOnly || t.isFavorite)
-  const displayedTrackers = sortTrackers(filteredTrackers, sortMode)
-  const trackerIds = displayedTrackers.map((t) => t.id)
-  const archivedCount = trackers.filter((t) => !t.isActive).length
-
   return (
     <>
       <aside
         className={clsx(
-          "h-screen flex flex-col bg-base border-r border-border overflow-hidden",
-          isMobile ? "fixed inset-y-0 left-0 z-40 shrink-0" : "shrink-0"
+          "h-screen flex flex-col bg-base border-r border-border overflow-x-clip",
+          isMobile ? "fixed inset-y-0 left-0 z-30 shrink-0" : "shrink-0"
         )}
         style={
           isMobile
@@ -772,7 +102,7 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
             </button>
             <button
               type="button"
-              onClick={handleToggle}
+              onClick={onToggle}
               className="text-tertiary hover:text-secondary transition-colors duration-150 cursor-pointer p-1 rounded-nm-sm"
               aria-label="Collapse sidebar"
             >
@@ -780,79 +110,101 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
             </button>
           </div>
 
-          {/* Control bar — collapsible */}
+          {/* Control bar */}
           <div className="border-b border-border shrink-0">
             <button
               type="button"
-              onClick={() => setFiltersExpanded((prev) => !prev)}
+              onClick={() => prefs.setFiltersExpanded((prev) => !prev)}
               className="w-full flex items-center justify-between px-3 py-1.5 text-tertiary hover:text-secondary transition-colors duration-150 cursor-pointer"
-              aria-expanded={filtersExpanded}
-              aria-label={filtersExpanded ? "Collapse filters" : "Expand filters"}
+              aria-expanded={prefs.filtersExpanded}
+              aria-label={prefs.filtersExpanded ? "Collapse filters" : "Expand filters"}
             >
-              <span className="text-[10px] font-mono uppercase tracking-wider">Filters</span>
-              <ChevronToggle expanded={filtersExpanded} variant="flip" />
+              <span className="text-3xs font-mono uppercase tracking-wider">Filters</span>
+              <ChevronToggle expanded={prefs.filtersExpanded} variant="flip" />
             </button>
-            {filtersExpanded && (
-              <div className="px-3 pb-2 flex items-center gap-2">
-                <Select
-                  value={statMode}
-                  onChange={updateStatMode}
-                  ariaLabel="Stat display mode"
-                  options={[
-                    { value: "ratio", label: "Ratio" },
-                    { value: "seeding", label: "Seeding" },
-                    { value: "uploaded", label: "Uploaded" },
-                    { value: "downloaded", label: "Downloaded" },
-                    { value: "buffer", label: "Buffer" },
-                  ]}
-                />
-
-                <Select
-                  value={sortMode}
-                  onChange={updateSortMode}
-                  ariaLabel="Sort order"
-                  options={[
-                    { value: "index", label: "Index" },
-                    { value: "alpha", label: "A-Z" },
-                    { value: "custom", label: "Custom" },
-                  ]}
-                />
-
-                {/* Favorites filter */}
-                <button
-                  type="button"
-                  onClick={() => setShowFavoritesOnly((f) => !f)}
-                  className={clsx(
-                    "transition-colors duration-150 cursor-pointer px-2 py-1.5 shrink-0 rounded-nm-sm",
-                    showFavoritesOnly ? "text-warn" : "text-tertiary hover:text-secondary"
-                  )}
-                  aria-label={showFavoritesOnly ? "Show all trackers" : "Show favorites only"}
-                >
-                  <Tooltip
-                    content={showFavoritesOnly ? "Show all trackers" : "Show favorites only"}
+            <div
+              className="grid transition-[grid-template-rows,opacity] duration-200 ease-out"
+              style={{
+                gridTemplateRows: prefs.filtersExpanded ? "1fr" : "0fr",
+                opacity: prefs.filtersExpanded ? 1 : 0,
+              }}
+            >
+              <div className={prefs.filtersExpanded ? "overflow-visible" : "overflow-hidden"}>
+                <div className="px-3 pb-2 flex items-center gap-2">
+                  <Select
+                    value={prefs.statMode}
+                    onChange={prefs.setStatMode}
+                    ariaLabel="Stat display mode"
+                    options={[
+                      { value: "ratio", label: "Ratio" },
+                      { value: "seeding", label: "Seeding" },
+                      { value: "uploaded", label: "Uploaded" },
+                      { value: "downloaded", label: "Downloaded" },
+                      { value: "buffer", label: "Buffer" },
+                    ]}
+                  />
+
+                  <Select
+                    value={prefs.sortMode}
+                    onChange={prefs.setSortMode}
+                    ariaLabel="Sort order"
+                    options={[
+                      { value: "index", label: "Index" },
+                      { value: "alpha", label: "A-Z" },
+                      { value: "custom", label: "Custom" },
+                    ]}
+                  />
+
+                  {/* Favorites filter */}
+                  <button
+                    type="button"
+                    onClick={() => prefs.setShowFavoritesOnly((f) => !f)}
+                    className={clsx(
+                      "transition-colors duration-150 cursor-pointer px-2 py-1.5 shrink-0 rounded-nm-sm",
+                      prefs.showFavoritesOnly ? "text-warn" : "text-tertiary hover:text-secondary"
+                    )}
+                    aria-label={
+                      prefs.showFavoritesOnly ? "Show all trackers" : "Show favorites only"
+                    }
                   >
-                    <span>{showFavoritesOnly ? "★" : "☆"}</span>
-                  </Tooltip>
-                </button>
-
-                {/* Lock/unlock drag-and-drop */}
-                <button
-                  type="button"
-                  onClick={() => setUnlocked((u) => !u)}
-                  className="text-tertiary hover:text-secondary transition-colors duration-150 cursor-pointer px-2 py-1.5 shrink-0 rounded-nm-sm"
-                  aria-label={unlocked ? "Lock order" : "Unlock to reorder"}
-                >
-                  <Tooltip content={unlocked ? "Lock order" : "Unlock to reorder"}>
-                    <span>{unlocked ? "🔓" : "🔒"}</span>
-                  </Tooltip>
-                </button>
+                    <Tooltip
+                      content={
+                        prefs.showFavoritesOnly ? "Show all trackers" : "Show favorites only"
+                      }
+                    >
+                      <span>{prefs.showFavoritesOnly ? "★" : "☆"}</span>
+                    </Tooltip>
+                  </button>
+
+                  {/* Lock/unlock drag-and-drop */}
+                  <button
+                    type="button"
+                    onClick={() => prefs.setUnlocked((u) => !u)}
+                    className="text-tertiary hover:text-secondary transition-colors duration-150 cursor-pointer px-2 py-1.5 shrink-0 rounded-nm-sm"
+                    aria-label={prefs.unlocked ? "Lock order" : "Unlock to reorder"}
+                  >
+                    <Tooltip content={prefs.unlocked ? "Lock order" : "Unlock to reorder"}>
+                      <span>{prefs.unlocked ? "🔓" : "🔒"}</span>
+                    </Tooltip>
+                  </button>
+                </div>
               </div>
-            )}
+            </div>
           </div>
 
           {/* Tracker list (scrollable) */}
           <nav className="flex-1 overflow-y-auto py-2 styled-scrollbar" aria-label="Trackers">
-            {trackers.length === 0 ? (
+            {trackersLoading ? (
+              <div className="flex flex-col gap-4 px-4">
+                {Array.from({ length: 4 }, (_, i) => (
+                  <div key={`tracker-${i}`} className="flex items-center gap-3 px-4 py-3">
+                    <Shimmer rounded="full" className="h-4 w-4" />
+                    <Shimmer size="text" className="flex-1" />
+                    <Shimmer size="label" className="w-12" />
+                  </div>
+                ))}
+              </div>
+            ) : trackers.length === 0 ? (
               <p className="px-4 py-3 text-xs text-muted font-mono">No trackers added yet.</p>
             ) : (
               <DndContext collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
@@ -865,8 +217,8 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
                           key={tracker.id}
                           tracker={tracker}
                           isActive={isActive}
-                          unlocked={unlocked}
-                          statMode={statMode}
+                          unlocked={prefs.unlocked}
+                          statMode={prefs.statMode}
                           onToggleFavorite={toggleFavorite}
                         />
                       )
@@ -876,20 +228,20 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
               </DndContext>
             )}
 
-            {/* Archive toggle + Add Tracker — inside scrollable nav */}
+            {/* Archive toggle + Add Tracker */}
             <div className="mx-4 mt-4 pt-4 pb-6 border-t border-border flex flex-col gap-2">
               {archivedCount > 0 && (
                 <button
                   type="button"
-                  onClick={() => setShowArchived((s) => !s)}
-                  className="text-tertiary hover:text-secondary text-xs font-mono flex items-center gap-2 transition-colors duration-150 cursor-pointer w-full"
+                  onClick={() => prefs.setShowArchived((s) => !s)}
+                  className="ghost-link flex items-center gap-2 duration-150 w-full"
                 >
-                  {showArchived ? (
+                  {prefs.showArchived ? (
                     <EyeOffIcon width="14" height="14" className="shrink-0" />
                   ) : (
                     <EyeIcon width="14" height="14" className="shrink-0" />
                   )}
-                  {showArchived ? "Hide" : "Show"} Archived ({archivedCount})
+                  {prefs.showArchived ? "Hide" : "Show"} Archived ({archivedCount})
                 </button>
               )}
               <Button
@@ -897,14 +249,13 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
                 size="sm"
                 className="w-full"
                 onClick={() => setShowAddDialog(true)}
-              >
-                + Add Tracker
-              </Button>
+                text="+ Add Tracker"
+              />
             </div>
           </nav>
 
           {/* Client status widget */}
-          <ClientStatusWidget />
+          <DownloadClientStatusWidget />
 
           {/* Bottom controls — pinned */}
           <div className="px-3 py-4 border-t border-border shrink-0 flex flex-col gap-1">
@@ -935,20 +286,23 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
             </div>
 
             {/* Version + GitHub + Docs */}
-            <div className="flex items-center gap-2 px-1 pt-2">
+            <div className="flex items-center gap-2.5 px-1 pt-4 pb-1">
               <button
                 type="button"
                 onClick={openChangelog}
-                className="text-muted hover:text-secondary text-[10px] font-mono transition-colors duration-150 cursor-pointer text-left"
+                className="font-mono text-xs text-tertiary hover:text-secondary transition-colors duration-150 cursor-pointer text-left"
               >
                 v{process.env.NEXT_PUBLIC_APP_VERSION}
               </button>
+              {process.env.NEXT_PUBLIC_RELEASE_CHANNEL === "development" && (
+                <PillTag color="warn" size="md" label="dev" />
+              )}
               {updateAvailable && latestVersion && (
                 <a
                   href={`https://github.com/jordanlambrecht/tracker-tracker/releases/tag/v${latestVersion}`}
                   target="_blank"
                   rel="noopener noreferrer"
-                  className="inline-flex items-center gap-1 rounded-full bg-accent/15 px-1.5 py-0.5 text-[9px] font-mono text-accent hover:bg-accent/25 transition-colors duration-150"
+                  className="inline-flex items-center gap-1 rounded-full bg-accent/15 px-1.5 py-0.5 text-4xs font-mono text-accent hover:bg-accent/25 transition-colors duration-150"
                 >
                   <Tooltip content={`Update available: v${latestVersion}`}>
                     <span className="flex items-center gap-1">
@@ -958,32 +312,23 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
                   </Tooltip>
                 </a>
               )}
-              {/* biome-ignore lint/a11y/useAnchorContent: aria-label provides accessible content */}
               <a
                 href="https://github.com/jordanlambrecht/tracker-tracker"
                 target="_blank"
                 rel="noopener noreferrer"
-                className="text-muted hover:text-secondary transition-colors duration-150 shrink-0"
+                className="text-tertiary hover:text-secondary transition-colors duration-150 shrink-0"
                 aria-label="GitHub repository"
               >
-                <svg
-                  width="12"
-                  height="12"
-                  viewBox="0 0 16 16"
-                  fill="currentColor"
-                  aria-hidden="true"
-                >
-                  <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0016 8c0-4.42-3.58-8-8-8z" />
-                </svg>
+                <GitHubIcon width="15" height="15" />
               </a>
               <a
                 href={DOCS_URL}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="text-muted hover:text-secondary transition-colors duration-150 shrink-0 text-[11px] font-mono"
+                className="text-tertiary hover:text-secondary transition-colors duration-150 shrink-0"
                 aria-label="Documentation"
               >
-                ?
+                <BookIcon width="15" height="15" />
               </a>
             </div>
           </div>
@@ -995,56 +340,13 @@ function Sidebar({ collapsed: collapsedProp, onToggle, isMobile = false }: Sideb
         onClose={() => setShowAddDialog(false)}
         onAdded={(id) => {
           setShowAddDialog(false)
-          setRefreshKey((k) => k + 1)
+          refresh()
           router.push(`/trackers/${id}`)
         }}
-        existingBaseUrls={trackers.map((t) => t.baseUrl)}
+        existingBaseUrls={existingBaseUrls}
       />
 
-      {/* Changelog modal */}
-      {changelogOpen && (
-        <dialog
-          ref={changelogRef}
-          onClick={(e) => {
-            if (e.target === changelogRef.current) {
-              changelogRef.current?.close()
-              setChangelogOpen(false)
-            }
-          }}
-          onKeyDown={(e) => {
-            if (e.key === "Escape") {
-              changelogRef.current?.close()
-              setChangelogOpen(false)
-            }
-          }}
-          onClose={() => setChangelogOpen(false)}
-          className="fixed inset-0 m-auto w-full max-w-2xl max-h-[80vh] bg-elevated p-0 overflow-hidden backdrop:bg-black/60 backdrop:backdrop-blur-sm open:flex open:flex-col nm-raised-lg rounded-nm-xl border-0"
-        >
-          <div className="flex items-center justify-between px-6 py-4 border-b border-border shrink-0">
-            <H2 className="text-base font-semibold text-primary">
-              Changelog — v{process.env.NEXT_PUBLIC_APP_VERSION}
-            </H2>
-            <button
-              type="button"
-              onClick={() => {
-                changelogRef.current?.close()
-                setChangelogOpen(false)
-              }}
-              className="text-tertiary hover:text-primary transition-colors cursor-pointer p-1 -m-1 rounded-nm-sm"
-              aria-label="Close changelog"
-            >
-              ✕
-            </button>
-          </div>
-          <div className="overflow-y-auto px-6 py-5 styled-scrollbar prose prose-invert prose-sm max-w-none prose-headings:font-mono prose-headings:text-primary prose-h1:text-lg prose-h2:text-base prose-h2:text-white prose-h2:border-b prose-h2:border-border prose-h2:pb-2 prose-h3:text-sm prose-li:text-secondary prose-p:text-secondary prose-strong:text-primary prose-a:text-accent">
-            {changelogContent ? (
-              <Markdown remarkPlugins={[remarkGfm]}>{changelogContent}</Markdown>
-            ) : (
-              <p className="text-muted">Loading...</p>
-            )}
-          </div>
-        </dialog>
-      )}
+      <ChangelogDialog open={changelogOpen} onClose={() => setChangelogOpen(false)} />
     </>
   )
 }
diff --git a/src/components/layout/SortableTrackerItem.tsx b/src/components/layout/SortableTrackerItem.tsx
new file mode 100644
index 00000000..8e980eb9
--- /dev/null
+++ b/src/components/layout/SortableTrackerItem.tsx
@@ -0,0 +1,135 @@
+// src/components/layout/SortableTrackerItem.tsx
+
+"use client"
+
+import { useSortable } from "@dnd-kit/sortable"
+import { CSS } from "@dnd-kit/utilities"
+import clsx from "clsx"
+import Link from "next/link"
+import type { CSSProperties } from "react"
+import { CHART_THEME } from "@/components/charts/lib/theme"
+import { PulseDot } from "@/components/ui/PulseDot"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatStatValue, type StatMode } from "@/lib/formatters"
+import { getHealthPulseDot, getTrackerHealth } from "@/lib/tracker-status"
+import type { TrackerSummary } from "@/types/api"
+
+interface SortableTrackerItemProps {
+  tracker: TrackerSummary
+  isActive: boolean
+  unlocked: boolean
+  statMode: StatMode
+  onToggleFavorite: (id: number, current: boolean) => void
+}
+
+function SortableTrackerItem({
+  tracker,
+  isActive,
+  unlocked,
+  statMode,
+  onToggleFavorite,
+}: SortableTrackerItemProps) {
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
+    id: tracker.id,
+  })
+
+  const archived = !tracker.isActive
+  const health = getTrackerHealth(tracker)
+  const tc = tracker.color || CHART_THEME.accent
+  const stat = formatStatValue(tracker.latestStats, statMode)
+
+  const dragStyle: CSSProperties = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+  }
+
+  const activeStyle: CSSProperties = isActive ? { backgroundColor: hexToRgba(tc, 0.08) } : {}
+
+  const itemClasses = clsx(
+    "w-full flex items-center gap-3 px-4 py-3 text-left group rounded-nm-md",
+    unlocked ? "animate-jiggle cursor-grab" : "cursor-pointer",
+    archived && "opacity-40",
+    isActive ? "text-primary nm-raised-sm" : "text-secondary nm-interactive-sm hover:text-primary"
+  )
+
+  const children = (
+    <>
+      {unlocked && (
+        <span
+          className="text-tertiary shrink-0 text-sm leading-none select-none"
+          aria-hidden="true"
+        >
+          ⠿
+        </span>
+      )}
+      {archived ? (
+        <span className="w-2 h-2 rounded-full bg-muted shrink-0" aria-hidden="true" />
+      ) : (
+        <PulseDot status={getHealthPulseDot(health)} size="sm" />
+      )}
+      <span className="flex-1 truncate text-sm font-semibold">{tracker.name}</span>
+      <span className="font-mono text-xs tabular-nums text-tertiary shrink-0">
+        {archived ? "Archived" : stat}
+      </span>
+      {!unlocked && (
+        // biome-ignore lint/a11y/useSemanticElements: Star must be inside parent button for visual layout
+        <span
+          role="button"
+          tabIndex={0}
+          aria-pressed={tracker.isFavorite}
+          onClick={(e) => {
+            e.stopPropagation()
+            e.preventDefault()
+            onToggleFavorite(tracker.id, tracker.isFavorite)
+          }}
+          onKeyDown={(e) => {
+            if (e.key === "Enter" || e.key === " ") {
+              e.preventDefault()
+              e.stopPropagation()
+              onToggleFavorite(tracker.id, tracker.isFavorite)
+            }
+          }}
+          className={clsx(
+            "shrink-0 text-sm leading-none transition-all duration-150 cursor-pointer bg-transparent border-none p-0",
+            tracker.isFavorite
+              ? "text-warn opacity-100"
+              : "text-muted opacity-0 group-hover:opacity-50 hover:opacity-100!"
+          )}
+          aria-label={tracker.isFavorite ? "Remove from favorites" : "Add to favorites"}
+        >
+          {tracker.isFavorite ? "★" : "☆"}
+        </span>
+      )}
+    </>
+  )
+
+  return (
+    <li ref={setNodeRef} style={dragStyle}>
+      {unlocked ? (
+        <button
+          type="button"
+          className={itemClasses}
+          style={activeStyle}
+          aria-current={isActive ? "page" : undefined}
+          {...attributes}
+          {...listeners}
+        >
+          {children}
+        </button>
+      ) : (
+        <Link
+          href={`/trackers/${tracker.id}`}
+          prefetch
+          className={itemClasses}
+          style={activeStyle}
+          aria-current={isActive ? "page" : undefined}
+        >
+          {children}
+        </Link>
+      )}
+    </li>
+  )
+}
+
+export { SortableTrackerItem }
diff --git a/src/components/layout/WhatsNew.tsx b/src/components/layout/WhatsNew.tsx
new file mode 100644
index 00000000..356c6b22
--- /dev/null
+++ b/src/components/layout/WhatsNew.tsx
@@ -0,0 +1,116 @@
+// src/components/layout/WhatsNew.tsx
+
+"use client"
+
+import { H3, Paragraph, Subheader } from "@typography"
+import { useEffect, useState } from "react"
+import { Button, Dialog, Shimmer } from "@/components/ui"
+
+const APP_VERSION = process.env.NEXT_PUBLIC_APP_VERSION ?? "0.0.0"
+const STORAGE_KEY = "lastSeenVersion"
+
+export function WhatsNew() {
+  const [open, setOpen] = useState(false)
+  const [changes, setChanges] = useState<string[] | null>(null)
+  const [lastSeen, setLastSeen] = useState<string | null>(null)
+
+  useEffect(() => {
+    const seen = localStorage.getItem(STORAGE_KEY)
+    if (seen === APP_VERSION) return
+    setLastSeen(seen)
+    setOpen(true)
+  }, [])
+
+  useEffect(() => {
+    if (!open) return
+
+    fetch("/api/changelog")
+      .then((r) => r.json())
+      .then((data: { content: string }) => {
+        setChanges(parseMissedReleases(data.content, lastSeen))
+      })
+      .catch(() => setChanges([]))
+  }, [open, lastSeen])
+
+  function dismiss() {
+    localStorage.setItem(STORAGE_KEY, APP_VERSION)
+    setOpen(false)
+  }
+
+  return (
+    <Dialog
+      open={open}
+      onClose={dismiss}
+      title="What's New"
+      size="sm"
+      maxWidth="max-w-sm"
+      maxHeight="70vh"
+    >
+      <div className="text-center mb-3">
+        <div className="text-2xl mb-2" aria-hidden="true">
+          &#127881;
+        </div>
+        <H3>New Version</H3>
+        <Subheader className="font-mono text-accent mt-0.5">v{APP_VERSION}</Subheader>
+      </div>
+
+      <div className="max-h-48 overflow-y-auto styled-scrollbar">
+        {changes === null ? (
+          <div className="flex flex-col gap-1.5 py-1">
+            <Shimmer size="bar" className="w-full" />
+            <Shimmer size="bar" className="w-4/5" />
+            <Shimmer size="bar" className="w-full" />
+          </div>
+        ) : changes.length > 0 ? (
+          <ul className="space-y-1.5">
+            {changes.map((line) => (
+              <li key={line} className="text-xs text-secondary leading-relaxed flex gap-2">
+                <span className="text-accent mt-px shrink-0">&bull;</span>
+                <span>{line}</span>
+              </li>
+            ))}
+          </ul>
+        ) : (
+          <Paragraph className="text-center">Bug fixes and improvements.</Paragraph>
+        )}
+      </div>
+
+      <div className="pt-4">
+        <Button variant="primary" size="md" className="w-full" onClick={dismiss} text="Neat" />
+      </div>
+    </Dialog>
+  )
+}
+
+/**
+ * Extract bullet items from all changelog sections between the current
+ * version and the last version the user saw. If lastSeen is null (i.e.
+ * localStorage was cleared or first install), only show the latest release
+ * to avoid dumping the entire history.
+ */
+function parseMissedReleases(content: string, lastSeen: string | null): string[] {
+  const lines = content.split("\n")
+  const items: string[] = []
+  let collecting = false
+  let releasesCollected = 0
+  const maxReleases = lastSeen === null ? 1 : 10
+
+  for (const line of lines) {
+    if (line.startsWith("## ")) {
+      const version = line.match(/## (\d+\.\d+\.\d+)/)?.[1]
+      if (version === lastSeen) break
+      collecting = true
+      releasesCollected++
+      if (releasesCollected > maxReleases) break
+      continue
+    }
+    if (!collecting) continue
+
+    const match = line.match(/^\*\s+(?:\*\*[^*]+\*\*\s*)?(.+)/)
+    if (match) {
+      items.push(match[1].replace(/\*\*/g, "").replace(/`/g, "").trim())
+    }
+  }
+
+  return items
+}
diff --git a/src/components/settings/AccountSection.tsx b/src/components/settings/AccountSection.tsx
index 96463330..dfad6f7c 100644
--- a/src/components/settings/AccountSection.tsx
+++ b/src/components/settings/AccountSection.tsx
@@ -1,16 +1,14 @@
 // src/components/settings/AccountSection.tsx
-//
-// Functions: AccountSection
-
 "use client"
 
 import { H3, Paragraph } from "@typography"
 import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { Input } from "@/components/ui/Input"
-import { extractApiError } from "@/lib/client-helpers"
+import { Button, Input } from "@/components/ui"
+import { SaveDiscardBar } from "@/components/ui/SaveDiscardBar"
+import { extractApiError } from "@/lib/extract-api-error"
+import { PASSWORD_MIN, USERNAME_MIN } from "@/lib/limits"
 
 export interface AccountSectionProps {
   initialUsername: string
@@ -28,8 +26,8 @@ export function AccountSection({ initialUsername }: AccountSectionProps) {
   async function handleSaveUsername() {
     setUsernameError(null)
     const trimmed = username.trim()
-    if (trimmed && trimmed.length < 6) {
-      setUsernameError("Username must be at least 6 characters")
+    if (trimmed && trimmed.length < USERNAME_MIN) {
+      setUsernameError(`Username must be at least ${USERNAME_MIN} characters`)
       return
     }
     setSavingUsername(true)
@@ -65,8 +63,8 @@ export function AccountSection({ initialUsername }: AccountSectionProps) {
       setPasswordError("Current password is required")
       return
     }
-    if (newPassword.length < 8) {
-      setPasswordError("New password must be at least 8 characters")
+    if (newPassword.length < PASSWORD_MIN) {
+      setPasswordError(`New password must be at least ${PASSWORD_MIN} characters`)
       return
     }
     if (newPassword !== confirmPassword) {
@@ -103,7 +101,7 @@ export function AccountSection({ initialUsername }: AccountSectionProps) {
             setUsername(e.target.value)
             setUsernameError(null)
           }}
-          placeholder="Min. 6 characters (optional)"
+          placeholder={`Min. ${USERNAME_MIN} characters (optional)`}
           error={usernameError ?? undefined}
           disabled={savingUsername}
         />
@@ -113,9 +111,8 @@ export function AccountSection({ initialUsername }: AccountSectionProps) {
             size="sm"
             onClick={handleSaveUsername}
             disabled={savingUsername || username === savedUsername}
-          >
-            {savingUsername ? "Saving…" : "Save Username"}
-          </Button>
+            text={savingUsername ? "Saving…" : "Save Username"}
+          />
         </div>
       </div>
 
@@ -158,20 +155,17 @@ export function AccountSection({ initialUsername }: AccountSectionProps) {
           disabled={savingPassword}
         />
         <Paragraph>Re-encrypts all stored API tokens. You will be logged out.</Paragraph>
-        {passwordError && (
-          <p className="text-xs font-sans text-danger" role="alert">
-            {passwordError}
-          </p>
-        )}
-        <div className="flex justify-end">
-          <Button
-            size="sm"
-            onClick={handleChangePassword}
-            disabled={savingPassword || !currentPassword || !newPassword || !confirmPassword}
-          >
-            {savingPassword ? "Updating…" : "Update Password"}
-          </Button>
-        </div>
+        <SaveDiscardBar
+          dirty
+          saving={savingPassword}
+          onSave={handleChangePassword}
+          error={passwordError}
+          saveLabel="Update Password"
+          savingLabel="Updating…"
+          saveDisabled={!currentPassword || !newPassword || !confirmPassword}
+          justify="end"
+          showDivider={false}
+        />
       </div>
     </SettingsSection>
   )
diff --git a/src/components/settings/BackupsSection.tsx b/src/components/settings/BackupsSection.tsx
index 72936316..206bda15 100644
--- a/src/components/settings/BackupsSection.tsx
+++ b/src/components/settings/BackupsSection.tsx
@@ -1,26 +1,30 @@
 // src/components/settings/BackupsSection.tsx
-//
-// Functions: BackupsSection
-
 "use client"
 
 import { H2, Paragraph, Subtext } from "@typography"
+import clsx from "clsx"
 import { type ChangeEvent, useCallback, useEffect, useMemo, useRef, useState } from "react"
-import { Badge } from "@/components/ui/Badge"
-import { Button } from "@/components/ui/Button"
-import { Card } from "@/components/ui/Card"
-import { Input } from "@/components/ui/Input"
-import { NumberInput } from "@/components/ui/NumberInput"
-import { Select } from "@/components/ui/Select"
-import type { Column } from "@/components/ui/Table"
-import { Table } from "@/components/ui/Table"
-import { Toggle } from "@/components/ui/Toggle"
-import { Tooltip } from "@/components/ui/Tooltip"
+import {
+  Badge,
+  Button,
+  Card,
+  type Column,
+  InfoTip,
+  Input,
+  Notice,
+  NumberInput,
+  Select,
+  Table,
+  Toggle,
+  Tooltip,
+} from "@/components/ui"
+
 import { usePatchSettings } from "@/hooks/usePatchSettings"
-import { extractApiError } from "@/lib/client-helpers"
 import { DOCS } from "@/lib/constants"
 import { downloadResponseBlob } from "@/lib/download"
-import { formatBytesNum } from "@/lib/formatters"
+import { extractApiError } from "@/lib/extract-api-error"
+import { formatBytesNum, formatDateTime } from "@/lib/formatters"
+import { BACKUP_RETENTION_MAX, BACKUP_RETENTION_MIN } from "@/lib/limits"
 
 export interface BackupRecord {
   id: number
@@ -29,7 +33,7 @@ export interface BackupRecord {
   encrypted: boolean
   frequency: string | null
   status: string
-  storagePath: string | null
+  hasStoredFile: boolean
   notes: string | null
 }
 
@@ -74,10 +78,18 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
   const [isEncryptedBackup, setIsEncryptedBackup] = useState(false)
   const [deletingBackupId, setDeletingBackupId] = useState<number | null>(null)
   const [isDraggingRestore, setIsDraggingRestore] = useState(false)
+  const [totpWasDisabled, setTotpWasDisabled] = useState(false)
   const restoreInputRef = useRef<HTMLInputElement>(null)
 
   const { saving: savingBackupConfig, patch: patchSettings } = usePatchSettings()
 
+  useEffect(() => {
+    if (sessionStorage.getItem("totp_disabled_on_restore") === "1") {
+      setTotpWasDisabled(true)
+      sessionStorage.removeItem("totp_disabled_on_restore")
+    }
+  }, [])
+
   useEffect(() => {
     fetch("/api/settings/backup/history")
       .then((res) => (res.ok ? res.json() : null))
@@ -128,33 +140,27 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
     if (!newBackupPassword) return
     setSavingPassword(true)
     setBackupError(null)
-    try {
-      const result = await patchSettings({ backupPassword: newBackupPassword })
-      if (result !== null) {
-        setHasStoredPassword(true)
-        setNewBackupPassword("")
-      }
-    } catch (err) {
-      setBackupError(err instanceof Error ? err.message : "Failed to save password")
-    } finally {
-      setSavingPassword(false)
+    const result = await patchSettings({ backupPassword: newBackupPassword })
+    if (!result.ok) {
+      setBackupError(result.error)
+    } else {
+      setHasStoredPassword(true)
+      setNewBackupPassword("")
     }
+    setSavingPassword(false)
   }
 
   async function handleClearBackupPassword() {
     setSavingPassword(true)
     setBackupError(null)
-    try {
-      const result = await patchSettings({ backupPassword: null })
-      if (result !== null) {
-        setHasStoredPassword(false)
-        setNewBackupPassword("")
-      }
-    } catch (err) {
-      setBackupError(err instanceof Error ? err.message : "Failed to clear password")
-    } finally {
-      setSavingPassword(false)
+    const result = await patchSettings({ backupPassword: null })
+    if (!result.ok) {
+      setBackupError(result.error)
+    } else {
+      setHasStoredPassword(false)
+      setNewBackupPassword("")
     }
+    setSavingPassword(false)
   }
 
   async function handleRestoreFileSelect(e: ChangeEvent<HTMLInputElement>) {
@@ -201,6 +207,9 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
       if (!res.ok) {
         throw new Error((data as { error?: string }).error ?? "Restore failed")
       }
+      if ((data as { totpDisabledOnRestore?: boolean }).totpDisabledOnRestore) {
+        sessionStorage.setItem("totp_disabled_on_restore", "1")
+      }
       setShowRestoreConfirm(false)
       setRestoreFile(null)
       setRestorePassword("")
@@ -268,7 +277,7 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
         header: "Date",
         render: (b) => (
           <span className="text-sm font-mono text-primary tabular-nums">
-            {new Date(b.createdAt).toLocaleString()}
+            {formatDateTime(b.createdAt)}
             {b.encrypted && (
               <Tooltip content="Password-protected">
                 <span className="ml-2 text-xs text-accent">🔒</span>
@@ -299,10 +308,13 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
         align: "right",
         render: (b) => (
           <div className="flex gap-2 justify-end">
-            {b.storagePath && (
-              <Button variant="secondary" size="sm" onClick={() => handleDownloadBackup(b.id)}>
-                Download
-              </Button>
+            {b.hasStoredFile && (
+              <Button
+                variant="secondary"
+                size="sm"
+                onClick={() => handleDownloadBackup(b.id)}
+                text="Download"
+              />
             )}
             <Button
               variant="danger"
@@ -321,33 +333,39 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
 
   return (
     <>
+      {totpWasDisabled && (
+        <Notice variant="warn" className="mb-4" header="Two-factor authentication disabled">
+          This happened during restore because the backup predated your TOTP setup. Re-enable it in
+          the Security tab to restore 2FA protection.
+        </Notice>
+      )}
+
       {/* ── Export ──────────────────────────────────────────────── */}
       <section aria-labelledby="backup-export-heading">
         <H2 id="backup-export-heading" className="mb-4 flex items-center gap-2">
           Export
-          <Tooltip
+          <InfoTip
             content="Export and restore your trackers, settings, and snapshots."
             docs={DOCS.BACKUPS}
-          >
-            <span className="text-muted hover:text-secondary cursor-help text-sm">&#9432;</span>
-          </Tooltip>
+          />
         </H2>
 
         <Card elevation="raised" className="flex flex-col gap-4">
           <div className="flex gap-3 items-center">
-            <Button size="sm" onClick={handleBackupNow} disabled={backingUp || backupConfigDirty}>
-              {backingUp ? "Creating Backup…" : "Backup Now"}
-            </Button>
+            <Button
+              size="sm"
+              onClick={handleBackupNow}
+              disabled={backingUp || backupConfigDirty}
+              text={backingUp ? "Creating Backup…" : "Backup Now"}
+            />
             {backupConfigDirty && (
-              <span className="text-xs text-warn">Save configuration before exporting</span>
+              <Notice variant="warn" message="Save configuration before exporting" />
             )}
             {!backupConfigDirty && encryptBackups && !hasStoredPassword && (
-              <span className="text-xs text-warn">
-                Set a backup password in Configuration first
-              </span>
+              <Notice variant="warn" message="Set a backup password in Configuration first" />
             )}
             {!backupConfigDirty && encryptBackups && hasStoredPassword && (
-              <span className="text-xs text-success">Password-protected</span>
+              <Notice variant="success" message="Password-protected" />
             )}
           </div>
           <Paragraph>
@@ -355,7 +373,7 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
             {backupStoragePath ? `Saved to ${backupStoragePath}.` : "Downloaded to your browser."}
           </Paragraph>
 
-          {backupError && <p className="text-sm text-danger font-mono">{backupError}</p>}
+          <Notice message={backupError} />
         </Card>
       </section>
 
@@ -368,11 +386,12 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
         <Card elevation="raised" className="flex flex-col gap-4">
           <button
             type="button"
-            className={`relative flex flex-col items-center justify-center gap-2 rounded-lg border-2 border-dashed p-6 transition-colors cursor-pointer w-full ${
+            className={clsx(
+              "relative flex flex-col items-center justify-center gap-2 rounded-lg border-2 border-dashed p-6 transition-colors cursor-pointer w-full",
               isDraggingRestore
                 ? "border-accent bg-accent/10"
                 : "border-border hover:border-secondary"
-            }`}
+            )}
             onDragOver={(e) => {
               e.preventDefault()
               setIsDraggingRestore(true)
@@ -403,7 +422,7 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
             <span className="text-xs text-tertiary">.json or .ttbak</span>
           </button>
 
-          {backupError && <p className="text-sm text-danger font-mono">{backupError}</p>}
+          <Notice message={backupError} />
         </Card>
       </section>
 
@@ -414,21 +433,21 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
             Confirm Restore
           </H2>
           <Card elevation="raised" className="flex flex-col gap-4">
-            <div className="p-3 rounded-lg bg-warn/10 border border-warn/30">
-              <p className="text-sm text-warn font-sans font-semibold mb-2">
-                Restoring will replace <strong>all</strong> current data. This action cannot be
-                undone.
-              </p>
-              <ul className="text-sm text-warn font-sans space-y-1 ml-4 list-disc">
+            <Notice
+              variant="warn"
+              box
+              header="Restoring will replace all current data. This action cannot be undone."
+            >
+              <ul className="space-y-1 ml-4 list-disc">
                 <li>Tracker API tokens will be cleared (must re-enter)</li>
                 <li>Download client credentials will be cleared (must re-enter)</li>
                 <li>TOTP/2FA will be disabled (can re-enable after restore)</li>
                 <li>Proxy password will be cleared (must re-enter)</li>
               </ul>
-              <p className="text-xs text-warn/80 font-sans mt-2">
+              <p className="text-xs opacity-70 mt-1">
                 Encrypted secrets stored in your current instance cannot be restored from backups.
               </p>
-            </div>
+            </Notice>
             <p className="text-sm text-secondary font-mono">File: {restoreFile?.name}</p>
             <Input
               label="Master password"
@@ -450,7 +469,7 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                 placeholder="Enter backup password"
               />
             )}
-            <div className="p-3 rounded-lg bg-danger/10 border border-danger/30">
+            <Notice variant="danger" box showIcon={false}>
               <Input
                 label="Type RESTORE ALL DATA to confirm"
                 type="text"
@@ -459,11 +478,10 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                 placeholder="RESTORE ALL DATA"
                 autoComplete="off"
                 className="font-mono"
+                hint="This destructive operation cannot be undone. Type the phrase exactly to proceed."
+                hintVariant="danger"
               />
-              <p className="text-xs text-danger/80 mt-2">
-                This destructive operation cannot be undone. Type the phrase exactly to proceed.
-              </p>
-            </div>
+            </Notice>
             <div className="flex gap-3">
               <Button
                 size="sm"
@@ -475,9 +493,8 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                   (isEncryptedBackup && !backupPassword) ||
                   restoreConfirmPhrase !== "RESTORE ALL DATA"
                 }
-              >
-                {restoring ? "Restoring…" : "Confirm Restore"}
-              </Button>
+                text={restoring ? "Restoring…" : "Confirm Restore"}
+              />
               <Button
                 size="sm"
                 variant="secondary"
@@ -489,9 +506,8 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                   setRestoreConfirmPhrase("")
                 }}
                 disabled={restoring}
-              >
-                Cancel
-              </Button>
+                text="Cancel"
+              />
             </div>
           </Card>
         </section>
@@ -527,14 +543,14 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                     variant="secondary"
                     onClick={handleClearBackupPassword}
                     disabled={savingPassword}
-                  >
-                    Clear
-                  </Button>
+                    text="Clear"
+                  />
                 </div>
               ) : (
-                <Subtext className="text-warn">
-                  No password set. Backups will not be encrypted until a password is saved.
-                </Subtext>
+                <Notice
+                  variant="warn"
+                  message="No password set. Backups will not be encrypted until a password is saved."
+                />
               )}
               <div className="flex items-end gap-3">
                 <div className="flex-1">
@@ -552,9 +568,8 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                   size="sm"
                   onClick={handleSaveBackupPassword}
                   disabled={!newBackupPassword || savingPassword}
-                >
-                  {savingPassword ? "Saving…" : "Save Password"}
-                </Button>
+                  text={savingPassword ? "Saving…" : "Save Password"}
+                />
               </div>
             </div>
           )}
@@ -589,8 +604,8 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
                   label="Retention"
                   value={backupRetentionCount}
                   onChange={setBackupRetentionCount}
-                  min={1}
-                  max={365}
+                  min={BACKUP_RETENTION_MIN}
+                  max={BACKUP_RETENTION_MAX}
                 />
               </div>
               <Subtext className="-mt-1">
@@ -619,9 +634,8 @@ export function BackupsSection({ initialConfig }: BackupsSectionProps) {
               size="sm"
               onClick={saveBackupConfig}
               disabled={!backupConfigDirty || savingBackupConfig}
-            >
-              {savingBackupConfig ? "Saving…" : "Save Configuration"}
-            </Button>
+              text={savingBackupConfig ? "Saving…" : "Save Configuration"}
+            />
           </div>
         </Card>
       </section>
diff --git a/src/components/settings/DangerZoneSection.tsx b/src/components/settings/DangerZoneSection.tsx
index 38099387..a58f15a3 100644
--- a/src/components/settings/DangerZoneSection.tsx
+++ b/src/components/settings/DangerZoneSection.tsx
@@ -1,104 +1,34 @@
 // src/components/settings/DangerZoneSection.tsx
-//
-// Functions: DangerZoneSection
-
 "use client"
 
 import { H3, Paragraph } from "@typography"
 import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { Checkbox } from "@/components/ui/Checkbox"
-import { Input } from "@/components/ui/Input"
-import { extractApiError } from "@/lib/client-helpers"
+import { Button, Checkbox, ConfirmAction, Input, Notice } from "@/components/ui"
+import { useDestructiveAction } from "@/hooks/useDestructiveAction"
 
 export function DangerZoneSection() {
   const router = useRouter()
 
-  // --- Reset Stats ---
-  const [confirmResetStats, setConfirmResetStats] = useState(false)
-  const [resetStatsPassword, setResetStatsPassword] = useState("")
-  const [resetStatsSubmitting, setResetStatsSubmitting] = useState(false)
-  const [resetStatsError, setResetStatsError] = useState<string | null>(null)
   const [resetStatsSuccess, setResetStatsSuccess] = useState(false)
 
-  // --- Emergency Lockdown ---
-  const [confirmLockdown, setConfirmLockdown] = useState(false)
-  const [lockdownPassword, setLockdownPassword] = useState("")
+  const resetStats = useDestructiveAction("/api/settings/reset-stats", () => {
+    setResetStatsSuccess(true)
+  })
+
+  const lockdown = useDestructiveAction("/api/settings/lockdown", () => {
+    router.push("/login")
+  })
   const [lockdownChecks, setLockdownChecks] = useState({
     sessions: false,
     tokens: false,
     totp: false,
   })
-  const [lockdownSubmitting, setLockdownSubmitting] = useState(false)
-  const [lockdownError, setLockdownError] = useState<string | null>(null)
-
-  // --- Nuke ---
-  const [confirmNuke, setConfirmNuke] = useState(false)
-  const [nukePassword, setNukePassword] = useState("")
-  const [nukeSubmitting, setNukeSubmitting] = useState(false)
-  const [nukeError, setNukeError] = useState<string | null>(null)
-
-  async function handleResetStats() {
-    setResetStatsSubmitting(true)
-    setResetStatsError(null)
-    try {
-      const res = await fetch("/api/settings/reset-stats", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ password: resetStatsPassword }),
-      })
-      if (!res.ok) {
-        throw new Error(await extractApiError(res, "Reset failed"))
-      }
-      setResetStatsSuccess(true)
-      setConfirmResetStats(false)
-      setResetStatsPassword("")
-    } catch (err) {
-      setResetStatsError(err instanceof Error ? err.message : "Network error")
-    } finally {
-      setResetStatsSubmitting(false)
-    }
-  }
-
-  async function handleLockdown() {
-    setLockdownSubmitting(true)
-    setLockdownError(null)
-    try {
-      const res = await fetch("/api/settings/lockdown", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ password: lockdownPassword }),
-      })
-      if (!res.ok) {
-        throw new Error(await extractApiError(res, "Lockdown failed"))
-      }
-      router.push("/login")
-    } catch (err) {
-      setLockdownError(err instanceof Error ? err.message : "Network error")
-      setLockdownSubmitting(false)
-    }
-  }
 
-  async function handleNuke() {
-    setNukeSubmitting(true)
-    setNukeError(null)
-    try {
-      const res = await fetch("/api/settings/nuke", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ password: nukePassword }),
-      })
-      if (!res.ok) {
-        throw new Error(await extractApiError(res, "Delete failed"))
-      }
-      router.push("/setup")
-    } catch (err) {
-      setNukeError(err instanceof Error ? err.message : "Network error")
-      setNukeSubmitting(false)
-    }
-  }
+  const nuke = useDestructiveAction("/api/settings/nuke", () => {
+    router.push("/setup")
+  })
 
   return (
     <SettingsSection
@@ -118,63 +48,40 @@ export function DangerZoneSection() {
           </Paragraph>
         </div>
 
-        {confirmResetStats ? (
-          <div className="nm-inset-sm p-4 flex flex-col gap-3 rounded-nm-md bg-danger-dim">
-            <p className="text-sm font-sans text-primary leading-relaxed">
-              This will permanently delete all snapshot history for every tracker and download
-              client. This cannot be undone.
-            </p>
+        {resetStats.confirming ? (
+          <ConfirmAction
+            message="This will permanently delete all snapshot history for every tracker and download client. This cannot be undone."
+            confirmLabel="Confirm Reset"
+            confirmingLabel="Resetting…"
+            onConfirm={resetStats.execute}
+            onCancel={resetStats.cancel}
+            confirming={resetStats.submitting}
+            confirmDisabled={!resetStats.password.trim()}
+          >
             <Input
               type="password"
               autoComplete="off"
               data-1p-ignore
               label="Master Password"
-              value={resetStatsPassword}
-              onChange={(e) => {
-                setResetStatsPassword(e.target.value)
-                setResetStatsError(null)
-              }}
+              value={resetStats.password}
+              onChange={(e) => resetStats.setPassword(e.target.value)}
               placeholder="Enter your master password to confirm"
-              disabled={resetStatsSubmitting}
-              error={resetStatsError ?? undefined}
+              disabled={resetStats.submitting}
+              error={resetStats.error ?? undefined}
             />
-            <div className="flex gap-3">
-              <Button
-                size="sm"
-                variant="danger"
-                disabled={resetStatsSubmitting || !resetStatsPassword.trim()}
-                onClick={handleResetStats}
-              >
-                {resetStatsSubmitting ? "Resetting…" : "Confirm Reset"}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => {
-                  setConfirmResetStats(false)
-                  setResetStatsPassword("")
-                  setResetStatsError(null)
-                }}
-              >
-                Cancel
-              </Button>
-            </div>
-          </div>
+          </ConfirmAction>
         ) : (
           <div className="flex items-center gap-3">
             <Button
               size="sm"
               variant="danger"
               onClick={() => {
-                setConfirmResetStats(true)
+                resetStats.open()
                 setResetStatsSuccess(false)
               }}
-            >
-              Reset All Stats
-            </Button>
-            {resetStatsSuccess && (
-              <span className="text-xs font-sans text-success">All stats have been reset.</span>
-            )}
+              text="Reset All Stats"
+            />
+            {resetStatsSuccess && <Notice variant="success" message="All stats have been reset." />}
           </div>
         )}
       </div>
@@ -191,11 +98,24 @@ export function DangerZoneSection() {
           </Paragraph>
         </div>
 
-        {confirmLockdown ? (
-          <div className="nm-inset-sm p-4 flex flex-col gap-3 rounded-nm-md bg-danger-dim">
-            <p className="text-sm font-sans text-primary leading-relaxed">
-              Confirm you understand the consequences:
-            </p>
+        {lockdown.confirming ? (
+          <ConfirmAction
+            message="Confirm you understand the consequences:"
+            confirmLabel="Confirm Lockdown"
+            confirmingLabel="Locking down…"
+            onConfirm={lockdown.execute}
+            onCancel={() => {
+              lockdown.cancel()
+              setLockdownChecks({ sessions: false, tokens: false, totp: false })
+            }}
+            confirming={lockdown.submitting}
+            confirmDisabled={
+              !lockdownChecks.sessions ||
+              !lockdownChecks.tokens ||
+              !lockdownChecks.totp ||
+              !lockdown.password.trim()
+            }
+          >
             <div className="flex flex-col gap-2">
               <Checkbox
                 checked={lockdownChecks.sessions}
@@ -221,49 +141,16 @@ export function DangerZoneSection() {
               autoComplete="off"
               data-1p-ignore
               label="Master Password"
-              value={lockdownPassword}
-              onChange={(e) => {
-                setLockdownPassword(e.target.value)
-                setLockdownError(null)
-              }}
+              value={lockdown.password}
+              onChange={(e) => lockdown.setPassword(e.target.value)}
               placeholder="Enter your master password to confirm"
-              disabled={lockdownSubmitting}
-              error={lockdownError ?? undefined}
+              disabled={lockdown.submitting}
+              error={lockdown.error ?? undefined}
             />
-            <div className="flex gap-3">
-              <Button
-                size="sm"
-                variant="danger"
-                disabled={
-                  lockdownSubmitting ||
-                  !lockdownChecks.sessions ||
-                  !lockdownChecks.tokens ||
-                  !lockdownChecks.totp ||
-                  !lockdownPassword.trim()
-                }
-                onClick={handleLockdown}
-              >
-                {lockdownSubmitting ? "Locking down…" : "Confirm Lockdown"}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => {
-                  setConfirmLockdown(false)
-                  setLockdownPassword("")
-                  setLockdownChecks({ sessions: false, tokens: false, totp: false })
-                  setLockdownError(null)
-                }}
-              >
-                Cancel
-              </Button>
-            </div>
-          </div>
+          </ConfirmAction>
         ) : (
           <div>
-            <Button size="sm" variant="danger" onClick={() => setConfirmLockdown(true)}>
-              Initiate Lockdown
-            </Button>
+            <Button size="sm" variant="danger" onClick={lockdown.open} text="Initiate Lockdown" />
           </div>
         )}
       </div>
@@ -281,50 +168,31 @@ export function DangerZoneSection() {
           </Paragraph>
         </div>
 
-        {confirmNuke ? (
-          <div className="nm-inset-sm p-4 flex flex-col gap-3 rounded-nm-md bg-danger-dim">
-            <p className="text-sm font-sans text-primary leading-relaxed">
-              This will permanently destroy all data. There is no recovery.
-            </p>
+        {nuke.confirming ? (
+          <ConfirmAction
+            message="This will permanently destroy all data. There is no recovery."
+            confirmLabel="Delete Everything"
+            confirmingLabel="Scrubbing…"
+            onConfirm={nuke.execute}
+            onCancel={nuke.cancel}
+            confirming={nuke.submitting}
+            confirmDisabled={!nuke.password.trim()}
+          >
             <Input
               type="password"
               autoComplete="off"
               data-1p-ignore
               label="Master Password"
-              value={nukePassword}
-              onChange={(e) => {
-                setNukePassword(e.target.value)
-                setNukeError(null)
-              }}
+              value={nuke.password}
+              onChange={(e) => nuke.setPassword(e.target.value)}
               placeholder="Enter your master password to confirm"
-              disabled={nukeSubmitting}
-              error={nukeError ?? undefined}
+              disabled={nuke.submitting}
+              error={nuke.error ?? undefined}
             />
-            <div className="flex gap-3">
-              <Button
-                size="sm"
-                variant="danger"
-                disabled={nukeSubmitting || !nukePassword.trim()}
-                onClick={handleNuke}
-              >
-                {nukeSubmitting ? "Scrubbing…" : "Delete Everything"}
-              </Button>
-              <Button
-                size="sm"
-                variant="ghost"
-                onClick={() => {
-                  setConfirmNuke(false)
-                  setNukePassword("")
-                  setNukeError(null)
-                }}
-              >
-                Cancel
-              </Button>
-            </div>
-          </div>
+          </ConfirmAction>
         ) : (
           <div>
-            <Button size="sm" variant="danger" onClick={() => setConfirmNuke(true)}>
+            <Button size="sm" variant="danger" onClick={nuke.open}>
               Scrub &amp; Delete
             </Button>
           </div>
diff --git a/src/components/settings/DataSection.tsx b/src/components/settings/DataSection.tsx
index 8faa88d6..06c225ac 100644
--- a/src/components/settings/DataSection.tsx
+++ b/src/components/settings/DataSection.tsx
@@ -1,14 +1,11 @@
 // src/components/settings/DataSection.tsx
-//
-// Functions: DataSection
-
 "use client"
 
 import { H3, Paragraph } from "@typography"
 import { useState } from "react"
+import { DatabaseSizeChart } from "@/components/settings/DatabaseSizeChart"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { Select } from "@/components/ui/Select"
+import { Divider, SaveDiscardBar, Select } from "@/components/ui"
 import { usePatchSettings } from "@/hooks/usePatchSettings"
 
 export interface DataSectionProps {
@@ -29,9 +26,9 @@ export function DataSection({ initialPollInterval }: DataSectionProps) {
 
   async function handleSavePollInterval() {
     const result = await patch({ trackerPollIntervalMinutes: pollInterval })
-    if (result !== null) {
+    if (result.ok) {
       setSavedPollInterval(
-        (result as { trackerPollIntervalMinutes: number }).trackerPollIntervalMinutes
+        (result.data as { trackerPollIntervalMinutes: number }).trackerPollIntervalMinutes
       )
     }
   }
@@ -65,21 +62,26 @@ export function DataSection({ initialPollInterval }: DataSectionProps) {
             { value: "1440", label: "24 hours" },
           ]}
         />
-        {pollIntervalError && (
-          <p className="text-xs font-sans text-danger" role="alert">
-            {pollIntervalError}
-          </p>
-        )}
-        {pollIntervalSuccess && (
-          <p className="text-xs font-sans text-success">Poll interval saved.</p>
-        )}
-        {pollInterval !== savedPollInterval && (
-          <div className="flex justify-end">
-            <Button size="sm" disabled={savingPollInterval} onClick={handleSavePollInterval}>
-              {savingPollInterval ? "Saving…" : "Save Interval"}
-            </Button>
-          </div>
-        )}
+        <SaveDiscardBar
+          dirty={pollInterval !== savedPollInterval}
+          saving={savingPollInterval}
+          onSave={handleSavePollInterval}
+          error={pollIntervalError}
+          success={pollIntervalSuccess ? "Poll interval saved." : null}
+          saveLabel="Save Interval"
+          justify="end"
+          showDivider={false}
+        />
+      </div>
+
+      {/* Database Size */}
+      <Divider compact />
+      <div className="flex flex-col gap-3">
+        <H3>Storage</H3>
+        <Paragraph>
+          Database size over time. Dashed line shows projected growth at current rate.
+        </Paragraph>
+        <DatabaseSizeChart />
       </div>
     </SettingsSection>
   )
diff --git a/src/components/settings/DatabaseSizeChart.tsx b/src/components/settings/DatabaseSizeChart.tsx
new file mode 100644
index 00000000..57244635
--- /dev/null
+++ b/src/components/settings/DatabaseSizeChart.tsx
@@ -0,0 +1,173 @@
+// src/components/settings/DatabaseSizeChart.tsx
+"use client"
+
+import type { EChartsOption } from "echarts"
+import { useEffect, useState } from "react"
+import { ChartECharts } from "@/components/charts/lib/ChartECharts"
+import { CHART_THEME, chartAxisLabel, chartGrid, chartTooltip } from "@/components/charts/lib/theme"
+import { Shimmer } from "@/components/ui/Shimmer"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatBytesNum, splitValueUnit } from "@/lib/formatters"
+import type { DbSizeResponse } from "@/lib/server-data"
+
+function buildOption(data: DbSizeResponse): EChartsOption {
+  const lineColor = CHART_THEME.textTertiary
+
+  const historicalData = data.history.map((h) => [h.date, Number(h.bytes)])
+
+  // Projection data points
+  const projectionData: [string, number][] = []
+  if (data.history.length >= 2 && data.dailyGrowthBytes > 0) {
+    const lastEntry = data.history[data.history.length - 1]
+    const lastBytes = Number(lastEntry.bytes)
+    const lastDate = new Date(lastEntry.date)
+    const endDate = new Date(data.projectionDate)
+    const days = Math.round((endDate.getTime() - lastDate.getTime()) / 86_400_000)
+
+    // Start projection from the last historical point for continuity
+    projectionData.push([lastEntry.date, lastBytes])
+    for (let i = 1; i <= days; i++) {
+      const date = new Date(lastDate.getTime() + i * 86_400_000)
+      const projected = lastBytes + data.dailyGrowthBytes * i
+      projectionData.push([date.toISOString().slice(0, 10), projected])
+    }
+  }
+
+  return {
+    backgroundColor: "transparent",
+    grid: chartGrid({ top: 8, bottom: 32, left: 56, right: 16 }),
+    tooltip: chartTooltip("axis", {
+      formatter: (params: unknown) => {
+        const items = params as Array<{
+          seriesName: string
+          value: [string, number]
+          color: string
+        }>
+        if (!items?.length) return ""
+        const date = items[0].value[0]
+        const rows = items
+          .map((item) => {
+            const { num, unit } = splitValueUnit(formatBytesNum(item.value[1]))
+            const label = item.seriesName === "Projected" ? "Projected" : "Size"
+            return `<span style="color:${CHART_THEME.textSecondary}">${label}:</span> <b>${num} ${unit}</b>`
+          })
+          .join("<br/>")
+        return `<span style="font-family:${CHART_THEME.fontMono};font-size:${CHART_THEME.fontSizeSmall}px">${date}<br/>${rows}</span>`
+      },
+    }),
+    xAxis: {
+      type: "category",
+      data: [...data.history.map((h) => h.date), ...projectionData.slice(1).map((p) => p[0])],
+      axisLabel: {
+        ...chartAxisLabel(),
+        formatter: (val: string) => {
+          const d = new Date(val)
+          return `${d.getMonth() + 1}/${d.getDate()}`
+        },
+        interval: "auto",
+      },
+      axisLine: { lineStyle: { color: CHART_THEME.gridLine } },
+      axisTick: { show: false },
+    },
+    yAxis: {
+      type: "value",
+      axisLabel: {
+        ...chartAxisLabel(),
+        formatter: (val: number) => {
+          const { num, unit } = splitValueUnit(formatBytesNum(val))
+          return `${num} ${unit}`
+        },
+      },
+      splitLine: { lineStyle: { color: CHART_THEME.gridLine, width: 1 } },
+      axisLine: { show: false },
+    },
+    series: [
+      {
+        name: "Size",
+        type: "line",
+        data: historicalData,
+        symbol: "none",
+        lineStyle: { color: lineColor, width: 1 },
+        itemStyle: { color: lineColor },
+      },
+      ...(projectionData.length > 0
+        ? [
+            {
+              name: "Projected",
+              type: "line" as const,
+              data: projectionData.map((p) => [p[0], p[1]]),
+              symbol: "none",
+              lineStyle: { color: lineColor, width: 1, type: "dashed" as const, opacity: 0.5 },
+              areaStyle: { color: hexToRgba(lineColor, 0.04) },
+              itemStyle: { color: lineColor },
+            },
+          ]
+        : []),
+    ],
+  }
+}
+
+function StatsRow({ data }: { data: DbSizeResponse }) {
+  const current = splitValueUnit(formatBytesNum(Number(data.currentBytes)))
+  const daily = splitValueUnit(formatBytesNum(data.dailyGrowthBytes))
+  const projected = splitValueUnit(formatBytesNum(Number(data.projectedBytes)))
+  const historyDays = data.history.length
+
+  return (
+    <p className="text-xs font-mono text-muted">
+      {current.num} {current.unit} current
+      {data.dailyGrowthBytes > 0 && (
+        <>
+          {" · "}
+          {daily.num} {daily.unit}/day avg growth
+          {" · "}~{projected.num} {projected.unit} in {historyDays} days
+        </>
+      )}
+    </p>
+  )
+}
+
+export function DatabaseSizeChart() {
+  const [data, setData] = useState<DbSizeResponse | null>(null)
+  const [loading, setLoading] = useState(true)
+
+  useEffect(() => {
+    async function fetchData() {
+      try {
+        const res = await fetch("/api/settings/db-size")
+        if (res.ok) setData(await res.json())
+      } catch {
+        // Silently fail — chart is non-critical
+      } finally {
+        setLoading(false)
+      }
+    }
+    fetchData()
+  }, [])
+
+  if (loading) {
+    return (
+      <div className="flex flex-col gap-2">
+        <Shimmer size="bar" className="w-full h-40" />
+        <Shimmer size="text" className="w-48" />
+      </div>
+    )
+  }
+
+  if (!data || data.history.length < 2) {
+    return (
+      <p className="text-xs font-mono text-muted">
+        {data?.history.length === 1
+          ? "Collecting size data — chart available tomorrow."
+          : "No size data recorded yet."}
+      </p>
+    )
+  }
+
+  return (
+    <div className="flex flex-col gap-2">
+      <ChartECharts option={buildOption(data)} style={{ height: 160, width: "100%" }} />
+      <StatsRow data={data} />
+    </div>
+  )
+}
diff --git a/src/components/settings/EventsSection.tsx b/src/components/settings/EventsSection.tsx
index af19a81e..7b3c7c95 100644
--- a/src/components/settings/EventsSection.tsx
+++ b/src/components/settings/EventsSection.tsx
@@ -1,34 +1,34 @@
 // src/components/settings/EventsSection.tsx
 //
 // Functions: formatTime, getDateKey, formatDateLabel, EventsSection
-
 "use client"
 
+import { useQuery, useQueryClient } from "@tanstack/react-query"
 import clsx from "clsx"
-import { useCallback, useEffect, useMemo, useState } from "react"
+import { useCallback, useMemo, useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
+import { CopyButton, DownloadButton } from "@/components/ui/ActionButtons"
 import { Button } from "@/components/ui/Button"
-import { CopyButton } from "@/components/ui/CopyButton"
-import { DownloadButton } from "@/components/ui/DownloadButton"
+import { ConfirmAction } from "@/components/ui/ConfirmAction"
+import { FilterPill } from "@/components/ui/FilterPill"
 import { RefreshIcon, TrashIcon } from "@/components/ui/Icons"
 import { Input } from "@/components/ui/Input"
-import { extractApiError } from "@/lib/client-helpers"
-import {
-  EVENT_CATEGORIES,
-  EVENT_LEVELS,
-  type EventCategory,
-  type EventLevel,
-  type SystemEvent,
-} from "@/lib/events"
-import { formatBytesNum } from "@/lib/formatters"
+import { Notice } from "@/components/ui/Notice"
+import { EventLogSkeleton } from "@/components/ui/skeletons"
+import { useSetToggle } from "@/hooks/useSetToggle"
+import { EVENT_CATEGORIES, EVENT_LEVELS, type EventCategory, type EventLevel } from "@/lib/events"
+import { extractApiError } from "@/lib/extract-api-error"
+import { formatBytesNum, localDateStr } from "@/lib/formatters"
+import { EVENTS_LIMIT_CAP } from "@/lib/limits"
+import type { EventsPageResponse } from "@/types/api"
 
 const CATEGORY_STYLES: Record<EventCategory, { border: string; icon: string; iconColor: string }> =
   {
     polls: { border: "border-l-accent", icon: "✓", iconColor: "text-success" },
+    clients: { border: "border-l-sky-400", icon: "↕", iconColor: "text-sky-400" },
     auth: { border: "border-l-violet-400", icon: "◆", iconColor: "text-violet-400" },
     settings: { border: "border-l-warn", icon: "●", iconColor: "text-warn" },
     backups: { border: "border-l-success", icon: "■", iconColor: "text-success" },
-    errors: { border: "border-l-danger", icon: "✕", iconColor: "text-danger" },
   }
 
 const LEVEL_TEXT_COLORS: Record<EventLevel, string> = {
@@ -38,9 +38,6 @@ const LEVEL_TEXT_COLORS: Record<EventLevel, string> = {
   error: "text-danger",
 }
 
-const ICON_BUTTON_CLASS =
-  "flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-sans font-medium text-tertiary hover:text-primary bg-elevated nm-raised-sm rounded-nm-sm transition-colors duration-150 cursor-pointer"
-
 function formatTime(iso: string): string {
   return new Date(iso).toLocaleTimeString([], {
     hour: "2-digit",
@@ -65,57 +62,51 @@ function formatDateLabel(iso: string): string {
 }
 
 export function EventsSection() {
-  const [events, setEvents] = useState<SystemEvent[]>([])
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
-  const [activeCategories, setActiveCategories] = useState<Set<EventCategory>>(
-    () => new Set(EVENT_CATEGORIES)
-  )
-  const [activeLevels, setActiveLevels] = useState<Set<EventLevel>>(
-    () => new Set<EventLevel>(["info", "warn", "error"])
-  )
+  const queryClient = useQueryClient()
+  const categories = useSetToggle<EventCategory>(EVENT_CATEGORIES)
+  const levels = useSetToggle<EventLevel>(["info", "warn", "error"])
   const [searchQuery, setSearchQuery] = useState("")
-  const [logSizeBytes, setLogSizeBytes] = useState(0)
 
   const [expandedIds, setExpandedIds] = useState<Set<string>>(() => new Set())
 
+  const [downloadError, setDownloadError] = useState<string | null>(null)
   const [clearConfirm, setClearConfirm] = useState(false)
   const [clearLoading, setClearLoading] = useState(false)
   const [clearError, setClearError] = useState<string | null>(null)
 
-  const fetchEvents = useCallback(async () => {
-    setLoading(true)
-    setError(null)
-    try {
-      const params = new URLSearchParams({ category: "all", limit: "1000", offset: "0" })
-      const res = await fetch(`/api/settings/events?${params}`)
+  const {
+    data: eventsData,
+    isLoading: loading,
+    error: queryError,
+  } = useQuery({
+    queryKey: ["events"],
+    queryFn: async ({ signal }) => {
+      const params = new URLSearchParams({
+        category: "all",
+        limit: String(EVENTS_LIMIT_CAP),
+        offset: "0",
+      })
+      const res = await fetch(`/api/settings/events?${params}`, { signal })
       if (!res.ok) throw new Error(await extractApiError(res, "Failed to load events"))
-      const data = (await res.json()) as {
-        events: SystemEvent[]
-        total: number
-        hasMore: boolean
-        logSizeBytes?: number
-      }
-      setEvents(data.events)
-      if (typeof data.logSizeBytes === "number") setLogSizeBytes(data.logSizeBytes)
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to load events")
-    } finally {
-      setLoading(false)
-    }
-  }, [])
+      return res.json() as Promise<EventsPageResponse>
+    },
+  })
 
-  useEffect(() => {
-    fetchEvents()
-  }, [fetchEvents])
+  const events = eventsData?.events ?? []
+  const logSizeBytes = eventsData?.logSizeBytes ?? 0
+  const error = queryError
+    ? queryError instanceof Error
+      ? queryError.message
+      : "Failed to load events"
+    : null
 
   const filteredEvents = useMemo(() => {
     let result = events
-    if (activeCategories.size < EVENT_CATEGORIES.length) {
-      result = result.filter((e) => activeCategories.has(e.category))
+    if (categories.size < EVENT_CATEGORIES.length) {
+      result = result.filter((e) => categories.has(e.category))
     }
-    if (activeLevels.size < EVENT_LEVELS.length) {
-      result = result.filter((e) => activeLevels.has(e.level))
+    if (levels.size < EVENT_LEVELS.length) {
+      result = result.filter((e) => levels.has(e.level))
     }
     if (searchQuery.trim()) {
       const q = searchQuery.toLowerCase()
@@ -127,25 +118,7 @@ export function EventsSection() {
       )
     }
     return result
-  }, [events, activeCategories, activeLevels, searchQuery])
-
-  function toggleCategory(cat: EventCategory) {
-    setActiveCategories((prev) => {
-      const next = new Set(prev)
-      if (next.has(cat)) next.delete(cat)
-      else next.add(cat)
-      return next
-    })
-  }
-
-  function toggleLevel(level: EventLevel) {
-    setActiveLevels((prev) => {
-      const next = new Set(prev)
-      if (next.has(level)) next.delete(level)
-      else next.add(level)
-      return next
-    })
-  }
+  }, [events, categories, levels, searchQuery])
 
   const copyValue = useMemo(() => {
     return filteredEvents
@@ -171,8 +144,7 @@ export function EventsSection() {
         return
       }
       setClearConfirm(false)
-      setLogSizeBytes(0)
-      fetchEvents()
+      queryClient.invalidateQueries({ queryKey: ["events"] })
     } catch {
       setClearError("Failed to clear log file")
     } finally {
@@ -189,7 +161,7 @@ export function EventsSection() {
     })
   }, [])
 
-  const allCategoriesActive = activeCategories.size === EVENT_CATEGORIES.length
+  const allCategoriesActive = categories.size === EVENT_CATEGORIES.length
 
   // Track date separators across the render
   let lastDateKey = ""
@@ -203,68 +175,56 @@ export function EventsSection() {
           placeholder="Search…"
           value={searchQuery}
           onChange={(e) => setSearchQuery(e.target.value)}
-          className="flex-1 min-w-[120px] max-w-[320px] text-xs"
+          className="flex-1 min-w-30 max-w-80 text-xs"
         />
         <span className="flex-1" />
         <CopyButton value={copyValue} />
         <DownloadButton
           url="/api/settings/logs/download"
-          fallbackFilename={`tracker-tracker-${new Date().toISOString().split("T")[0]}.log`}
-          onError={setError}
+          fallbackFilename={`tracker-tracker-${localDateStr()}.log`}
+          notFoundMessage="Log file not available (file logging is only active in Docker)"
+          onError={setDownloadError}
         />
-        <button
-          type="button"
-          onClick={() => fetchEvents()}
+        <Button
+          variant="secondary"
+          size="icon"
+          onClick={() => queryClient.invalidateQueries({ queryKey: ["events"] })}
           aria-label="Refresh events"
-          className={ICON_BUTTON_CLASS}
-        >
-          <RefreshIcon width="12" height="12" />
-        </button>
-        <button
-          type="button"
+          leftIcon={<RefreshIcon width="12" height="12" />}
+        />
+        <Button
+          variant={clearConfirm ? "danger" : "secondary"}
+          size="icon"
           onClick={() => setClearConfirm((v) => !v)}
           aria-label={
             logSizeBytes > 0 ? `Clear logs (${formatBytesNum(logSizeBytes)})` : "Clear logs"
           }
-          className={clsx(ICON_BUTTON_CLASS, clearConfirm && "!text-danger")}
-        >
-          <TrashIcon width="12" height="12" />
-        </button>
+          leftIcon={<TrashIcon width="12" height="12" />}
+        />
       </div>
 
       <div className="border-t border-border my-3" />
 
       {/* ── Filters (categories + levels) ─────────────────────────── */}
-      <div className="flex flex-wrap items-center gap-1.5">
-        <button
-          type="button"
-          onClick={() => setActiveCategories(new Set(EVENT_CATEGORIES))}
-          aria-pressed={allCategoriesActive}
-          className={clsx(
-            "px-2 py-0.5 text-[11px] font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-            allCategoriesActive
-              ? "nm-raised-sm text-primary font-semibold"
-              : "bg-transparent text-muted hover:text-secondary"
-          )}
-        >
-          All
-        </button>
+      <div className="flex flex-wrap items-center gap-2">
+        <FilterPill
+          size="sm"
+          active={allCategoriesActive}
+          onClick={() =>
+            allCategoriesActive ? categories.reset([]) : categories.reset(EVENT_CATEGORIES)
+          }
+          text={allCategoriesActive ? "None" : "All"}
+        />
 
         {EVENT_CATEGORIES.map((cat) => (
-          <button
+          <FilterPill
             key={cat}
-            type="button"
-            onClick={() => toggleCategory(cat)}
-            aria-pressed={activeCategories.has(cat)}
-            className={clsx(
-              "px-2 py-0.5 text-[11px] font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-              activeCategories.has(cat)
-                ? "nm-raised-sm text-primary font-semibold"
-                : "bg-transparent text-muted hover:text-secondary line-through opacity-50"
-            )}
-          >
-            {cat.charAt(0).toUpperCase() + cat.slice(1)}
-          </button>
+            size="sm"
+            active={categories.has(cat)}
+            onClick={() => categories.toggle(cat)}
+            inactive="strikethrough"
+            text={cat.charAt(0).toUpperCase() + cat.slice(1)}
+          />
         ))}
 
         <span className="flex-1" />
@@ -272,20 +232,15 @@ export function EventsSection() {
         <span className="w-px h-4 bg-border shrink-0 mx-0.5" />
 
         {EVENT_LEVELS.map((level) => (
-          <button
+          <FilterPill
             key={level}
-            type="button"
-            onClick={() => toggleLevel(level)}
-            aria-pressed={activeLevels.has(level)}
-            className={clsx(
-              "px-2 py-0.5 text-[11px] font-mono transition-all duration-150 cursor-pointer border-none rounded-nm-sm",
-              activeLevels.has(level)
-                ? clsx("nm-raised-sm font-semibold", LEVEL_TEXT_COLORS[level])
-                : "bg-transparent text-muted hover:text-secondary line-through opacity-50"
-            )}
-          >
-            {level.charAt(0).toUpperCase() + level.slice(1)}
-          </button>
+            size="sm"
+            active={levels.has(level)}
+            onClick={() => levels.toggle(level)}
+            activeColor={LEVEL_TEXT_COLORS[level]}
+            inactive="strikethrough"
+            text={level.charAt(0).toUpperCase() + level.slice(1)}
+          />
         ))}
       </div>
 
@@ -293,89 +248,96 @@ export function EventsSection() {
 
       {/* ── Clear confirmation ───────────────────────────────────── */}
       {clearConfirm && (
-        <div className="nm-inset-sm p-3 rounded-nm-md bg-danger-dim flex items-center gap-3">
-          <p className="text-xs font-mono text-danger flex-1">
-            Truncate log file? DB events are not affected.
-          </p>
-          <Button size="sm" variant="danger" onClick={handleClear} disabled={clearLoading}>
-            {clearLoading ? "Clearing…" : "Confirm"}
-          </Button>
-          <Button
-            size="sm"
-            variant="ghost"
-            onClick={() => {
-              setClearConfirm(false)
-              setClearError(null)
-            }}
-          >
-            Cancel
-          </Button>
-          {clearError && <span className="text-xs text-danger font-mono">{clearError}</span>}
-        </div>
+        <ConfirmAction
+          message="Truncate log file? DB events are not affected."
+          confirmLabel="Confirm"
+          confirmingLabel="Clearing…"
+          confirming={clearLoading}
+          onConfirm={handleClear}
+          onCancel={() => {
+            setClearConfirm(false)
+            setClearError(null)
+          }}
+        >
+          <Notice message={clearError} />
+        </ConfirmAction>
       )}
 
       {/* ── Error ────────────────────────────────────────────────── */}
-      {error && <span className="text-xs text-danger font-mono">{error}</span>}
+      <Notice message={error ?? downloadError} />
 
       {/* ── Event stream ─────────────────────────────────────────── */}
-      <div className="nm-inset-sm bg-control-bg overflow-x-auto overflow-y-auto max-h-[560px] styled-scrollbar rounded-nm-md">
+      <div className="nm-inset-sm bg-control-bg overflow-x-hidden overflow-y-auto max-h-140 styled-scrollbar rounded-nm-md">
         {loading && events.length === 0 ? (
-          <p className="px-3 py-8 text-xs font-mono text-muted text-center">Loading events…</p>
+          <EventLogSkeleton />
         ) : filteredEvents.length === 0 ? (
           <p className="px-3 py-8 text-xs font-mono text-muted text-center">
             {events.length === 0 ? "No events yet." : "No events match the current filters."}
           </p>
         ) : (
           filteredEvents.map((event, i) => {
-            const style = CATEGORY_STYLES[event.category]
+            const baseStyle = CATEGORY_STYLES[event.category]
+            const LEVEL_STYLES: Partial<
+              Record<EventLevel, { border: string; icon: string; iconColor: string }>
+            > = {
+              error: { border: "border-l-danger", icon: "✕", iconColor: "text-danger" },
+              warn: { border: "border-l-warn", icon: "⚠", iconColor: "text-warn" },
+              debug: {
+                border: "border-l-violet-400/50",
+                icon: "·",
+                iconColor: "text-violet-400/60",
+              },
+            }
+            const style = LEVEL_STYLES[event.level] ?? baseStyle
             const dateKey = getDateKey(event.timestamp)
             const showDateSep = dateKey !== lastDateKey
             lastDateKey = dateKey
 
             const isExpanded = expandedIds.has(event.id)
-            const hasDetail = Boolean(event.detail)
+            const hasBatch = Boolean(event.children?.length)
+            const hasDetail = Boolean(event.detail) || hasBatch
+            const isExpandable = hasDetail
 
             return (
               <div key={event.id}>
                 {showDateSep && (
-                  <div className="sticky top-0 z-10 px-3 py-1 text-[10px] font-mono text-tertiary bg-overlay/90 backdrop-blur-sm border-b border-border">
+                  <div className="sticky top-0 z-10 px-3 py-1 text-3xs font-mono text-tertiary bg-overlay/90 backdrop-blur-sm border-b border-border">
                     {formatDateLabel(event.timestamp)}
                   </div>
                 )}
                 {(() => {
                   const rowClass = clsx(
-                    "flex flex-col gap-0 px-3 py-1.5 text-xs font-mono border-l-[3px] w-full text-left",
+                    "flex flex-col gap-0 px-3 py-1.5 text-xs font-mono border-l-3 w-full text-left",
                     style.border,
                     i % 2 === 0 ? "bg-control-bg" : "bg-elevated/50",
-                    hasDetail &&
+                    isExpandable &&
                       "cursor-pointer hover:bg-elevated/80 transition-colors duration-100"
                   )
                   const inner = (
                     <>
-                      <div className="flex items-baseline gap-2 min-w-fit">
+                      <div className="flex items-baseline gap-2 min-w-0">
                         <span
                           className={clsx("shrink-0 w-3 text-center leading-none", style.iconColor)}
                         >
-                          {style.icon}
+                          {hasBatch ? (isExpanded ? "▾" : "▸") : style.icon}
                         </span>
-                        <span className="text-tertiary shrink-0 tabular-nums w-[62px]">
+                        <span className="text-tertiary shrink-0 tabular-nums w-15.5">
                           {formatTime(event.timestamp)}
                         </span>
                         <span className="text-secondary shrink-0">{event.title}</span>
-                        {hasDetail && !isExpanded && (
-                          <span className="text-tertiary truncate whitespace-nowrap">
-                            — {event.detail}
-                          </span>
+                        {hasDetail && !isExpanded && !hasBatch && (
+                          <span className="text-tertiary truncate">— {event.detail}</span>
                         )}
                       </div>
-                      {isExpanded && event.detail && (
-                        <pre className="text-tertiary text-[11px] leading-relaxed whitespace-pre-wrap break-all pl-[calc(0.75rem+62px+0.5rem)] pt-1 pb-0.5 select-text">
+                      {isExpanded && !hasBatch && event.detail && (
+                        <pre className="text-tertiary text-2xs leading-relaxed whitespace-pre-wrap break-all pl-[calc(0.75rem+62px+0.5rem)] pt-1 pb-0.5 select-text">
                           {event.detail}
                         </pre>
                       )}
                     </>
                   )
-                  return hasDetail ? (
+
+                  const row = isExpandable ? (
                     <button
                       type="button"
                       onClick={() => handleToggleExpand(event.id)}
@@ -386,6 +348,30 @@ export function EventsSection() {
                   ) : (
                     <div className={rowClass}>{inner}</div>
                   )
+
+                  return (
+                    <>
+                      {row}
+                      {isExpanded && hasBatch && (
+                        <div className="border-l-3 border-l-accent/30">
+                          {event.children?.map((child, ci) => (
+                            <div
+                              key={child.id}
+                              className={clsx(
+                                "flex items-baseline gap-2 px-3 py-1 text-xs font-mono pl-8",
+                                ci % 2 === 0 ? "bg-control-bg/60" : "bg-elevated/30"
+                              )}
+                            >
+                              <span className="text-success shrink-0 w-3 text-center text-2xs">
+                                ✓
+                              </span>
+                              <span className="text-tertiary truncate">{child.detail}</span>
+                            </div>
+                          ))}
+                        </div>
+                      )}
+                    </>
+                  )
                 })()}
               </div>
             )
@@ -395,9 +381,8 @@ export function EventsSection() {
 
       {/* ── Footer ───────────────────────────────────────────────── */}
       <div className="flex items-center justify-between">
-        <p className="text-[10px] text-muted font-mono">IPs redacted</p>
         {filteredEvents.length > 0 && (
-          <span className="text-[10px] font-mono text-muted">
+          <span className="timestamp">
             {filteredEvents.length === events.length
               ? `${events.length} events`
               : `${filteredEvents.length} of ${events.length}`}
diff --git a/src/components/settings/ImageHostingSection.tsx b/src/components/settings/ImageHostingSection.tsx
index 28ef2b57..d2d9a59a 100644
--- a/src/components/settings/ImageHostingSection.tsx
+++ b/src/components/settings/ImageHostingSection.tsx
@@ -1,13 +1,9 @@
 // src/components/settings/ImageHostingSection.tsx
-//
-// Functions: ImageHostingSection
-
 "use client"
 
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { Input } from "@/components/ui/Input"
+import { Button, Input, SaveDiscardBar } from "@/components/ui"
 import { usePatchSettings } from "@/hooks/usePatchSettings"
 import { DOCS } from "@/lib/constants"
 
@@ -54,7 +50,7 @@ export function ImageHostingSection({ initialHasKeys }: ImageHostingSectionProps
   async function handleSave(field: string, hostKey: "ptpimg" | "oeimg" | "imgbb") {
     clearSuccess()
     const result = await patch({ [field]: values[field] })
-    if (result !== null) {
+    if (result.ok) {
       setHasKeys((prev) => ({ ...prev, [hostKey]: !!values[field] }))
       setValues((prev) => ({ ...prev, [field]: "" }))
       setEditing((prev) => ({ ...prev, [hostKey]: false }))
@@ -64,7 +60,7 @@ export function ImageHostingSection({ initialHasKeys }: ImageHostingSectionProps
   async function handleClear(field: string, hostKey: "ptpimg" | "oeimg" | "imgbb") {
     clearSuccess()
     const result = await patch({ [field]: null })
-    if (result !== null) {
+    if (result.ok) {
       setHasKeys((prev) => ({ ...prev, [hostKey]: false }))
       setValues((prev) => ({ ...prev, [field]: "" }))
       setEditing((prev) => ({ ...prev, [hostKey]: false }))
@@ -124,17 +120,15 @@ export function ImageHostingSection({ initialHasKeys }: ImageHostingSectionProps
                         setEditing((prev) => ({ ...prev, [host.key]: false }))
                         setValues((prev) => ({ ...prev, [host.field]: "" }))
                       }}
-                    >
-                      Cancel
-                    </Button>
+                      text="Cancel"
+                    />
                   )}
                   <Button
                     size="sm"
                     disabled={saving || !values[host.field]}
                     onClick={() => handleSave(host.field, host.key)}
-                  >
-                    {saving ? "Saving…" : "Save Key"}
-                  </Button>
+                    text={saving ? "Saving…" : "Save Key"}
+                  />
                 </div>
               </div>
             ) : (
@@ -143,29 +137,27 @@ export function ImageHostingSection({ initialHasKeys }: ImageHostingSectionProps
                   size="sm"
                   variant="secondary"
                   onClick={() => setEditing((prev) => ({ ...prev, [host.key]: true }))}
-                >
-                  Replace Key
-                </Button>
+                  text="Replace Key"
+                />
                 <Button
                   size="sm"
                   variant="ghost"
                   disabled={saving}
                   onClick={() => handleClear(host.field, host.key)}
-                >
-                  Remove
-                </Button>
+                  text="Remove"
+                />
               </div>
             )}
           </div>
         )
       })}
 
-      {error && (
-        <p className="text-xs font-sans text-danger" role="alert">
-          {error}
-        </p>
-      )}
-      {success && <p className="text-xs font-sans text-success">Image hosting key saved.</p>}
+      <SaveDiscardBar
+        dirty={false}
+        saving={saving}
+        error={error}
+        success={success ? "Image hosting key saved." : null}
+      />
     </SettingsSection>
   )
 }
diff --git a/src/components/settings/PrivacySection.tsx b/src/components/settings/PrivacySection.tsx
index 19520022..6de11181 100644
--- a/src/components/settings/PrivacySection.tsx
+++ b/src/components/settings/PrivacySection.tsx
@@ -1,15 +1,10 @@
 // src/components/settings/PrivacySection.tsx
-//
-// Functions: PrivacySection
-
 "use client"
 
-import { Paragraph, Subtext } from "@typography"
+import { Paragraph } from "@typography"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { RedactedText } from "@/components/ui/RedactedText"
-import { Toggle } from "@/components/ui/Toggle"
+import { Button, ConfirmAction, Notice, RedactedText, Toggle } from "@/components/ui"
 import { usePatchSettings } from "@/hooks/usePatchSettings"
 
 type ScrubState = "idle" | "confirming" | "scrubbing"
@@ -25,8 +20,8 @@ export function PrivacySection({ initialStoreUsernames }: PrivacySectionProps) {
 
   async function patchSettings(payload: { storeUsernames: boolean; scrubExisting?: boolean }) {
     const result = await patchPrivacy(payload)
-    if (result !== null) {
-      setStoreUsernames((result as { storeUsernames: boolean }).storeUsernames)
+    if (result.ok) {
+      setStoreUsernames((result.data as { storeUsernames: boolean }).storeUsernames)
     }
     setScrubState("idle")
   }
@@ -71,42 +66,33 @@ export function PrivacySection({ initialStoreUsernames }: PrivacySectionProps) {
       )}
 
       {scrubState === "confirming" && (
-        <div className="nm-inset-sm p-4 flex flex-col gap-3 rounded-nm-md bg-warn-dim">
-          <p className="text-sm font-sans text-primary leading-relaxed">
-            Also scrub existing usernames from historical data?
-          </p>
+        <ConfirmAction
+          colorScheme="warn"
+          message="Also scrub existing usernames from historical data?"
+          confirmLabel="Yes, scrub history"
+          onConfirm={handleScrubYes}
+          onCancel={handleScrubCancel}
+          additionalActions={
+            <Button size="sm" variant="primary" onClick={handleScrubNo} text="No, keep history" />
+          }
+        >
           <Paragraph>
             This will permanently replace all stored usernames and user classes with redacted
             markers. This cannot be undone.
           </Paragraph>
-          <div className="flex gap-3">
-            <Button size="sm" variant="danger" onClick={handleScrubYes}>
-              Yes, scrub history
-            </Button>
-            <Button size="sm" variant="primary" onClick={handleScrubNo}>
-              No, keep history
-            </Button>
-            <Button size="sm" variant="ghost" onClick={handleScrubCancel}>
-              Cancel
-            </Button>
-          </div>
-        </div>
+        </ConfirmAction>
       )}
 
       {scrubState === "scrubbing" && (
-        <p className="text-xs font-mono text-warn">Scrubbing historical data...</p>
+        <Notice variant="warn" message="Scrubbing historical data..." />
       )}
 
-      <Subtext>
-        This does not provide strong anonymization. Character count and other data points may still
-        allow correlation. For full protection, deploy on an encrypted filesystem.
-      </Subtext>
+      <Notice
+        variant="info"
+        message="This does not provide strong anonymization. Character count and other data points may still allow correlation. For full protection, deploy on an encrypted filesystem."
+      />
 
-      {error && (
-        <p className="text-xs font-sans text-danger" role="alert">
-          {error}
-        </p>
-      )}
+      <Notice message={error} />
     </SettingsSection>
   )
 }
diff --git a/src/components/settings/ProxySection.tsx b/src/components/settings/ProxySection.tsx
index 7b415e37..5e81d55c 100644
--- a/src/components/settings/ProxySection.tsx
+++ b/src/components/settings/ProxySection.tsx
@@ -1,21 +1,15 @@
 // src/components/settings/ProxySection.tsx
-//
-// Functions: ProxySection
-
 "use client"
 
 import { H3, Paragraph, Subtext } from "@typography"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Badge } from "@/components/ui/Badge"
-import { Button } from "@/components/ui/Button"
-import { Input } from "@/components/ui/Input"
-import { NumberInput } from "@/components/ui/NumberInput"
-import { Select } from "@/components/ui/Select"
-import { Toggle } from "@/components/ui/Toggle"
+import { Badge, Button, Input, NumberInput, SaveDiscardBar, Select, Toggle } from "@/components/ui"
+import { useActionStatus } from "@/hooks/useActionStatus"
 import { usePatchSettings } from "@/hooks/usePatchSettings"
-import { extractApiError } from "@/lib/client-helpers"
 import { DOCS } from "@/lib/constants"
+import { extractApiError } from "@/lib/extract-api-error"
+import { PORT_MAX, PORT_MIN } from "@/lib/limits"
 
 export interface ProxySectionProps {
   initialProxy: {
@@ -40,11 +34,12 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
   const [proxyUsername, setProxyUsername] = useState(initialProxy.username)
   const [proxyPassword, setProxyPassword] = useState("")
   const [proxyPasswordPlaceholder, setProxyPasswordPlaceholder] = useState(initialProxy.hasPassword)
-  const [proxyTestStatus, setProxyTestStatus] = useState<"idle" | "testing" | "success" | "failed">(
-    "idle"
-  )
+  const {
+    status: proxyTestStatus,
+    error: proxyTestError,
+    execute: executeProxyTest,
+  } = useActionStatus({ autoResetMs: false })
   const [proxyTestIp, setProxyTestIp] = useState<string | null>(null)
-  const [proxyTestError, setProxyTestError] = useState<string | null>(null)
   const [savedProxy, setSavedProxy] = useState({
     enabled: initialProxy.enabled,
     type: initialProxy.type || "socks5",
@@ -87,9 +82,9 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
     }
 
     const result = await patch(payload)
-    if (!result) return
+    if (!result.ok) return
 
-    const typed = result as {
+    const typed = result.data as {
       proxyEnabled: boolean
       proxyType: string
       proxyHost: string | null
@@ -109,11 +104,9 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
     setProxyPassword("")
   }
 
-  async function handleTestProxy() {
-    setProxyTestStatus("testing")
+  function handleTestProxy() {
     setProxyTestIp(null)
-    setProxyTestError(null)
-    try {
+    executeProxyTest(async () => {
       const res = await fetch("/api/settings/proxy-test", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -127,23 +120,14 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
         }),
       })
       if (!res.ok) {
-        const errMsg = await extractApiError(res, "Connection failed")
-        setProxyTestStatus("failed")
-        setProxyTestError(errMsg)
-        return
+        throw new Error(await extractApiError(res, "Connection failed"))
       }
       const data = (await res.json()) as { success: boolean; proxyIp?: string; error?: string }
-      if (data.success) {
-        setProxyTestStatus("success")
-        setProxyTestIp(data.proxyIp ?? null)
-      } else {
-        setProxyTestStatus("failed")
-        setProxyTestError(data.error ?? "Connection failed")
+      if (!data.success) {
+        throw new Error(data.error ?? "Connection failed")
       }
-    } catch {
-      setProxyTestStatus("failed")
-      setProxyTestError("Network error")
-    }
+      setProxyTestIp(data.proxyIp ?? null)
+    })
   }
 
   return (
@@ -206,8 +190,8 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
               label="Port"
               value={proxyPort}
               onChange={setProxyPort}
-              min={1}
-              max={65535}
+              min={PORT_MIN}
+              max={PORT_MAX}
             />
           </div>
 
@@ -245,24 +229,17 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
 
           <div className="border-t border-border" />
 
-          {/* Save proxy */}
-          {proxyError && (
-            <p className="text-xs font-sans text-danger" role="alert">
-              {proxyError}
-            </p>
-          )}
-          {proxySuccess && <p className="text-xs font-sans text-success">Proxy settings saved.</p>}
-          {proxyHasChanges && (
-            <div className="flex justify-end">
-              <Button
-                size="sm"
-                disabled={savingProxy || !proxyHost.trim()}
-                onClick={handleSaveProxy}
-              >
-                {savingProxy ? "Saving…" : "Save Proxy"}
-              </Button>
-            </div>
-          )}
+          <SaveDiscardBar
+            dirty={proxyHasChanges}
+            saving={savingProxy}
+            onSave={handleSaveProxy}
+            saveDisabled={!proxyHost.trim()}
+            error={proxyError}
+            success={proxySuccess ? "Proxy settings saved." : null}
+            saveLabel="Save Proxy"
+            justify="end"
+            showDivider={false}
+          />
 
           <div className="border-t border-border" />
 
@@ -270,10 +247,10 @@ export function ProxySection({ initialProxy, trackers }: ProxySectionProps) {
             <Button
               size="sm"
               variant="secondary"
-              disabled={!proxyHost.trim() || proxyTestStatus === "testing"}
+              disabled={!proxyHost.trim() || proxyTestStatus === "pending"}
               onClick={handleTestProxy}
             >
-              {proxyTestStatus === "testing"
+              {proxyTestStatus === "pending"
                 ? "Testing..."
                 : proxyTestStatus === "success"
                   ? "Connected"
diff --git a/src/components/settings/SecurityPoliciesSection.tsx b/src/components/settings/SecurityPoliciesSection.tsx
index abbe573c..c8c534ab 100644
--- a/src/components/settings/SecurityPoliciesSection.tsx
+++ b/src/components/settings/SecurityPoliciesSection.tsx
@@ -1,16 +1,19 @@
 // src/components/settings/SecurityPoliciesSection.tsx
-//
-// Functions: SecurityPoliciesSection
-
 "use client"
 
 import { Paragraph } from "@typography"
 import { useState } from "react"
 import { SettingsSection } from "@/components/settings/SettingsSection"
-import { Button } from "@/components/ui/Button"
-import { Checkbox } from "@/components/ui/Checkbox"
-import { NumberInput } from "@/components/ui/NumberInput"
+import { Checkbox, Notice, NumberInput, SaveDiscardBar } from "@/components/ui"
 import { usePatchSettings } from "@/hooks/usePatchSettings"
+import {
+  LOCKOUT_DURATION_MAX,
+  LOCKOUT_DURATION_MIN,
+  LOCKOUT_THRESHOLD_MAX,
+  LOCKOUT_THRESHOLD_MIN,
+  SNAPSHOT_RETENTION_MAX,
+  SNAPSHOT_RETENTION_MIN,
+} from "@/lib/limits"
 
 interface LockoutConfig {
   enabled: boolean
@@ -113,8 +116,8 @@ export function SecurityPoliciesSection({
       lockoutThreshold,
       lockoutDurationMinutes: lockoutDuration,
     })
-    if (result !== null) {
-      const r = result as {
+    if (result.ok) {
+      const r = result.data as {
         lockoutEnabled: boolean
         lockoutThreshold: number
         lockoutDurationMinutes: number
@@ -130,9 +133,9 @@ export function SecurityPoliciesSection({
   async function handleSaveRetention() {
     const value = retentionEnabled ? retentionDays : null
     const result = await patchRetention({ snapshotRetentionDays: value })
-    if (result !== null) {
+    if (result.ok) {
       const saved =
-        (result as { snapshotRetentionDays?: number | null }).snapshotRetentionDays ?? null
+        (result.data as { snapshotRetentionDays?: number | null }).snapshotRetentionDays ?? null
       setSavedRetention({
         enabled: saved !== null && saved > 0,
         days: saved ?? 90,
@@ -146,9 +149,9 @@ export function SecurityPoliciesSection({
       : 0
     const currentValue = currentTotal > 0 ? currentTotal : null
     const result = await patchTimeout({ sessionTimeoutMinutes: currentValue })
-    if (result !== null) {
+    if (result.ok) {
       const saved =
-        (result as { sessionTimeoutMinutes?: number | null }).sessionTimeoutMinutes ?? null
+        (result.data as { sessionTimeoutMinutes?: number | null }).sessionTimeoutMinutes ?? null
       setSavedTimeoutMinutes(saved)
     }
   }
@@ -191,8 +194,8 @@ export function SecurityPoliciesSection({
               setLockoutThreshold(v)
               clearLockoutSuccess()
             }}
-            min={1}
-            max={99}
+            min={LOCKOUT_THRESHOLD_MIN}
+            max={LOCKOUT_THRESHOLD_MAX}
             disabled={!lockoutEnabled}
             className="mx-1 inline-flex align-middle"
           />{" "}
@@ -203,8 +206,8 @@ export function SecurityPoliciesSection({
               setLockoutDuration(v)
               clearLockoutSuccess()
             }}
-            min={1}
-            max={1440}
+            min={LOCKOUT_DURATION_MIN}
+            max={LOCKOUT_DURATION_MAX}
             disabled={!lockoutEnabled}
             className="mx-1 inline-flex align-middle"
           />{" "}
@@ -214,21 +217,17 @@ export function SecurityPoliciesSection({
           Temporarily locks the login page after consecutive failed attempts. Protects against
           brute-force attacks. The lockout resets on successful login.
         </Paragraph>
-        {lockoutError && (
-          <p className="text-xs font-sans text-danger ml-8" role="alert">
-            {lockoutError}
-          </p>
-        )}
-        {lockoutSuccess && (
-          <p className="text-xs font-sans text-success ml-8">Lockout setting saved.</p>
-        )}
-        {lockoutDirty && (
-          <div className="flex justify-end">
-            <Button size="sm" disabled={savingLockout} onClick={handleSaveLockout}>
-              {savingLockout ? "Saving…" : "Save Lockout"}
-            </Button>
-          </div>
-        )}
+        <SaveDiscardBar
+          dirty={lockoutDirty}
+          saving={savingLockout}
+          onSave={handleSaveLockout}
+          error={lockoutError}
+          success={lockoutSuccess ? "Lockout setting saved." : null}
+          saveLabel="Save Lockout"
+          justify="end"
+          showDivider={false}
+          className="ml-8"
+        />
       </div>
 
       <div className="border-t border-border" />
@@ -249,8 +248,8 @@ export function SecurityPoliciesSection({
               setRetentionDays(v)
               clearRetentionSuccess()
             }}
-            min={7}
-            max={3650}
+            min={SNAPSHOT_RETENTION_MIN}
+            max={SNAPSHOT_RETENTION_MAX}
             disabled={!retentionEnabled}
             className="mx-1 inline-flex align-middle"
           />{" "}
@@ -265,21 +264,17 @@ export function SecurityPoliciesSection({
             Current database size: {databaseSize}
           </p>
         )}
-        {retentionError && (
-          <p className="text-xs font-sans text-danger ml-8" role="alert">
-            {retentionError}
-          </p>
-        )}
-        {retentionSuccess && (
-          <p className="text-xs font-sans text-success ml-8">Retention setting saved.</p>
-        )}
-        {retentionDirty && (
-          <div className="flex justify-end">
-            <Button size="sm" disabled={savingRetention} onClick={handleSaveRetention}>
-              {savingRetention ? "Saving…" : "Save Retention"}
-            </Button>
-          </div>
-        )}
+        <SaveDiscardBar
+          dirty={retentionDirty}
+          saving={savingRetention}
+          onSave={handleSaveRetention}
+          error={retentionError}
+          success={retentionSuccess ? "Retention setting saved." : null}
+          saveLabel="Save Retention"
+          justify="end"
+          showDivider={false}
+          className="ml-8"
+        />
       </div>
 
       <div className="border-t border-border" />
@@ -338,31 +333,24 @@ export function SecurityPoliciesSection({
           autoLogoutDays === 0 &&
           autoLogoutHours === 0 &&
           autoLogoutMinutes === 0 && (
-            <p className="text-xs font-sans leading-relaxed ml-8 text-warn">
-              All values are zero — auto-logout is effectively disabled.
-            </p>
+            <Notice
+              variant="warn"
+              message="All values are zero — auto-logout is effectively disabled."
+              className="ml-8"
+            />
           )}
-        {timeoutError && (
-          <p className="text-xs font-sans text-danger ml-8" role="alert">
-            {timeoutError}
-          </p>
-        )}
-        {timeoutSuccess && (
-          <p className="text-xs font-sans text-success ml-8">
-            Session timeout saved. Takes effect on next page load.
-          </p>
-        )}
-        {timeoutDirty && (
-          <div className="flex justify-end">
-            <Button
-              size="sm"
-              disabled={savingTimeout || (autoLogoutEnabled && currentTimeoutTotal === 0)}
-              onClick={handleSaveTimeout}
-            >
-              {savingTimeout ? "Saving…" : "Save Timeout"}
-            </Button>
-          </div>
-        )}
+        <SaveDiscardBar
+          dirty={timeoutDirty}
+          saving={savingTimeout}
+          onSave={handleSaveTimeout}
+          saveDisabled={autoLogoutEnabled && currentTimeoutTotal === 0}
+          error={timeoutError}
+          success={timeoutSuccess ? "Session timeout saved. Takes effect on next page load." : null}
+          saveLabel="Save Timeout"
+          justify="end"
+          showDivider={false}
+          className="ml-8"
+        />
       </div>
     </SettingsSection>
   )
diff --git a/src/components/settings/SettingsSection.tsx b/src/components/settings/SettingsSection.tsx
index 9fec0bfa..3fa28939 100644
--- a/src/components/settings/SettingsSection.tsx
+++ b/src/components/settings/SettingsSection.tsx
@@ -1,11 +1,11 @@
 // src/components/settings/SettingsSection.tsx
-//
-// Functions: SettingsSection
 
 import { H2 } from "@typography"
+import clsx from "clsx"
 import type { ReactNode } from "react"
 import { Card } from "@/components/ui/Card"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { InfoTip } from "@/components/ui/InfoTip"
+import { Notice } from "@/components/ui/Notice"
 
 interface SettingsSectionProps {
   id: string
@@ -30,18 +30,13 @@ export function SettingsSection({
 }: SettingsSectionProps) {
   return (
     <section aria-labelledby={`${id}-heading`}>
-      <H2 id={`${id}-heading`} className={`mb-4 flex items-center gap-2 ${headingClassName ?? ""}`}>
+      <H2 id={`${id}-heading`} className={clsx("mb-4 flex items-center gap-2", headingClassName)}>
         {title}
-        {tooltip && (
-          <Tooltip content={tooltip} docs={docs}>
-            <span className="text-muted hover:text-secondary cursor-help text-sm">&#9432;</span>
-          </Tooltip>
-        )}
+        {tooltip && <InfoTip content={tooltip} docs={docs} />}
       </H2>
       {notice && (
-        <div className="nm-inset-sm rounded-nm-md px-4 py-3 mb-4 border border-warn/20 bg-warn/5">
-          <span className="text-xs text-warn font-medium">{notice.label}</span>
-          <p className="text-xs text-secondary mt-1">{notice.message}</p>
+        <div className="mb-4">
+          <Notice variant="warn" box header={notice.label} message={notice.message} />
         </div>
       )}
       <Card elevation="raised" className={cardClassName}>
diff --git a/src/components/tracker-detail/AnalyticsCharts.tsx b/src/components/tracker-detail/AnalyticsCharts.tsx
index a7b03c5f..f0b712f4 100644
--- a/src/components/tracker-detail/AnalyticsCharts.tsx
+++ b/src/components/tracker-detail/AnalyticsCharts.tsx
@@ -1,18 +1,14 @@
 // src/components/tracker-detail/AnalyticsCharts.tsx
-//
-// Functions: AnalyticsCharts
 
-import { H2 } from "@typography"
 import { BufferCandlestickChart } from "@/components/charts/BufferCandlestickChart"
 import { MetricChart } from "@/components/charts/MetricChart"
 import { PercentileRadarChart } from "@/components/charts/PercentileRadarChart"
 import { UploadDownloadChart } from "@/components/charts/UploadDownloadChart"
 import { UploadPolarChart } from "@/components/charts/UploadPolarChart"
-import type { DayRange } from "@/components/dashboard/DayRangeSidebar"
 import { DayRangeSidebar } from "@/components/dashboard/DayRangeSidebar"
 import { Card } from "@/components/ui/Card"
 import { formatBytesFromString } from "@/lib/formatters"
-import type { GazellePlatformMeta, Snapshot } from "@/types/api"
+import type { DayRange, DeltaDisplay, GazellePlatformMeta, Snapshot } from "@/types/api"
 
 interface AnalyticsChartsProps {
   trackerName: string
@@ -21,7 +17,7 @@ interface AnalyticsChartsProps {
   accentColor: string
   days: DayRange
   onDaysChange: (d: DayRange) => void
-  delta: { uploaded: string; downloaded: string } | null
+  delta: DeltaDisplay
   gazelleMeta: GazellePlatformMeta | null
   minimumRatio?: number
 }
@@ -42,8 +38,7 @@ export function AnalyticsCharts({
     <div className="flex flex-col md:flex-row gap-8">
       <div className="flex-1 flex flex-col gap-8 min-w-0">
         {/* Upload/Download chart */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Upload / Download History</H2>
+        <Card title="Upload / Download History" trackerColor={tc} className="flex flex-col gap-4">
           {delta && (
             <p className="text-xs font-mono text-tertiary">
               24h: <span className="text-primary">{formatBytesFromString(delta.uploaded)}</span> ↑{" "}
@@ -58,8 +53,7 @@ export function AnalyticsCharts({
         </Card>
 
         {/* Ratio */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Ratio</H2>
+        <Card lazy title="Ratio" trackerColor={tc} className="flex flex-col gap-4">
           <MetricChart
             metric="ratio"
             snapshots={snapshots}
@@ -69,43 +63,42 @@ export function AnalyticsCharts({
         </Card>
 
         {/* Buffer */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Buffer</H2>
+        <Card lazy title="Buffer" trackerColor={tc} className="flex flex-col gap-4">
           <MetricChart metric="buffer" snapshots={snapshots} accentColor={tc} />
         </Card>
 
         {/* Buffer Candlestick */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Daily Buffer</H2>
+        <Card lazy title="Daily Buffer" trackerColor={tc} className="flex flex-col gap-4">
           <BufferCandlestickChart trackerData={candlestickData} height={320} />
         </Card>
 
         {/* Seedbonus / Gold */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>{platformType === "ggn" ? "Gold" : "Seedbonus"}</H2>
+        <Card
+          lazy
+          title={platformType === "ggn" ? "Gold" : "Seedbonus"}
+          trackerColor={tc}
+          className="flex flex-col gap-4"
+        >
           <MetricChart metric="seedbonus" snapshots={snapshots} accentColor={tc} />
         </Card>
 
         {/* GGn Share Score chart */}
         {platformType === "ggn" && (
-          <Card trackerColor={tc} className="flex flex-col gap-4">
-            <H2>Share Score</H2>
+          <Card lazy title="Share Score" trackerColor={tc} className="flex flex-col gap-4">
             <MetricChart metric="shareScore" snapshots={snapshots} accentColor={tc} />
           </Card>
         )}
 
         {/* FL Wedges (MAM only) */}
         {platformType === "mam" && (
-          <Card trackerColor={tc} className="flex flex-col gap-4">
-            <H2>FL Wedges</H2>
+          <Card lazy title="FL Wedges" trackerColor={tc} className="flex flex-col gap-4">
             <MetricChart metric="freeleechTokens" snapshots={snapshots} accentColor={tc} />
           </Card>
         )}
 
         {/* Gazelle Percentile Radar */}
         {gazelleMeta?.ranks && (
-          <Card trackerColor={tc} className="flex flex-col gap-4">
-            <H2>Percentile Ranks</H2>
+          <Card lazy title="Percentile Ranks" trackerColor={tc} className="flex flex-col gap-4">
             <p className="text-xs font-mono text-tertiary">
               Your standing relative to all users — {gazelleMeta.ranks.overall}th percentile overall
             </p>
@@ -114,20 +107,22 @@ export function AnalyticsCharts({
         )}
 
         {/* Seeding Count */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Seeding Count</H2>
+        <Card lazy title="Seeding Count" trackerColor={tc} className="flex flex-col gap-4">
           <MetricChart metric="seedingCount" snapshots={snapshots} accentColor={tc} />
         </Card>
 
         {/* Daily Activity */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Daily Activity</H2>
+        <Card lazy title="Daily Activity" trackerColor={tc} className="flex flex-col gap-4">
           <MetricChart metric="dailyDelta" snapshots={snapshots} accentColor={tc} />
         </Card>
 
         {/* Activity by Time of Day */}
-        <Card trackerColor={tc} className="flex flex-col gap-4">
-          <H2>Activity by Time of Day</H2>
+        <Card
+          lazy
+          title="Activity by Time of Day"
+          trackerColor={tc}
+          className="flex flex-col gap-4"
+        >
           <UploadPolarChart snapshots={snapshots} accentColor={tc} />
         </Card>
       </div>
diff --git a/src/components/tracker-detail/AnalyticsTab.tsx b/src/components/tracker-detail/AnalyticsTab.tsx
index bdda89aa..2ac7b9da 100644
--- a/src/components/tracker-detail/AnalyticsTab.tsx
+++ b/src/components/tracker-detail/AnalyticsTab.tsx
@@ -1,16 +1,8 @@
 // src/components/tracker-detail/AnalyticsTab.tsx
-//
-// Functions: AnalyticsTab
-//
-// Renders the Data & Analytics tab with a unified bento grid for all stat cards
-// (core stats + slot cards). Three responsive grids: 2-col (mobile), 3-col (md),
-// 3-or-4-col (lg). Each grid uses its own layout algorithm with explicit positioning.
-
 "use client"
 
 import clsx from "clsx"
 import { type ReactNode, useMemo } from "react"
-import type { DayRange } from "@/components/dashboard/DayRangeSidebar"
 import { AnalyticsCharts } from "@/components/tracker-detail/AnalyticsCharts"
 import { buildCoreStatDescriptors } from "@/components/tracker-detail/CoreStatCards"
 import { PollLog } from "@/components/tracker-detail/PollLog"
@@ -23,8 +15,15 @@ import {
   getCardClasses,
   type LayoutConfig,
 } from "@/lib/grid-layout"
-import type { ResolvedSlot } from "@/lib/slot-types"
-import type { GazellePlatformMeta, Snapshot, TrackerLatestStats, TrackerSummary } from "@/types/api"
+import type {
+  DayRange,
+  DeltaDisplay,
+  GazellePlatformMeta,
+  Snapshot,
+  TrackerLatestStats,
+  TrackerSummary,
+} from "@/types/api"
+import type { ResolvedSlot } from "@/types/slots"
 import { renderSlotElement } from "./slot-registry"
 
 interface AnalyticsTabProps {
@@ -36,7 +35,7 @@ interface AnalyticsTabProps {
   accentColor: string
   days: DayRange
   onDaysChange: (d: DayRange) => void
-  delta: { uploaded: string; downloaded: string } | null
+  delta: DeltaDisplay
   minimumRatio?: number
   statCardSlots: ResolvedSlot[]
   progressSlots: ResolvedSlot[]
@@ -84,7 +83,6 @@ export function AnalyticsTab({
   const renderLayoutCards = (layout: LayoutConfig) =>
     layout.cards.map((card) => {
       const positionClasses = getCardClasses(card)
-      const isTall = card.span > 1
       let element: ReactNode = null
 
       if (card.type === "fixed" || card.type === "single") {
@@ -121,7 +119,7 @@ export function AnalyticsTab({
       if (!element) return null
 
       return (
-        <div key={card.id} className={clsx(positionClasses, isTall && "[&>*]:h-full")}>
+        <div key={card.id} className={clsx(positionClasses, "*:h-full")}>
           {element}
         </div>
       )
@@ -149,6 +147,7 @@ export function AnalyticsTab({
         snapshots={snapshots}
         lastPolledAt={tracker.lastPolledAt}
         lastError={tracker.lastError}
+        lastErrorAt={tracker.lastErrorAt}
         userPausedAt={tracker.userPausedAt}
       />
       <AnalyticsCharts
diff --git a/src/components/tracker-detail/CoreStatCards.tsx b/src/components/tracker-detail/CoreStatCards.tsx
index 2eaa0382..495b05c0 100644
--- a/src/components/tracker-detail/CoreStatCards.tsx
+++ b/src/components/tracker-detail/CoreStatCards.tsx
@@ -1,6 +1,4 @@
 // src/components/tracker-detail/CoreStatCards.tsx
-//
-// Functions: buildCoreStatDescriptors
 
 import type { ReactNode } from "react"
 import {
@@ -14,7 +12,12 @@ import {
   UploadArrowIcon,
 } from "@/components/ui/Icons"
 import type { AlertLevel } from "@/components/ui/StatCard"
-import { formatBytesFromString, formatRatio } from "@/lib/formatters"
+import {
+  formatBytesFromString,
+  formatCount,
+  formatRatio,
+  formatRatioDisplay,
+} from "@/lib/formatters"
 import type { Snapshot, TrackerLatestStats } from "@/types/api"
 
 export interface StatDescriptor {
@@ -46,7 +49,7 @@ export function buildCoreStatDescriptors(
     stats?.ratio != null && effectiveRequiredRatio != null && stats.ratio < effectiveRequiredRatio
   const ratioAlertReason =
     ratioBelowRequired && effectiveRequiredRatio != null
-      ? `Below required ratio (${formatRatio(effectiveRequiredRatio)}x)`
+      ? `Below required ratio (${formatRatioDisplay(effectiveRequiredRatio)})`
       : undefined
   const bufferNegative = latestSnapshot?.bufferBytes?.startsWith("-")
 
@@ -95,19 +98,19 @@ export function buildCoreStatDescriptors(
       key: "seeding",
       label: "Seeding",
       icon: <SeedingIcon width="16" height="16" />,
-      value: stats?.seedingCount != null ? stats.seedingCount.toLocaleString() : "—",
+      value: formatCount(stats?.seedingCount),
     },
     {
       key: "leeching",
       label: "Leeching",
       icon: <LeechingIcon width="16" height="16" />,
-      value: stats?.leechingCount != null ? stats.leechingCount.toLocaleString() : "—",
+      value: formatCount(stats?.leechingCount),
     },
     {
       key: "hnr",
       label: "Hit & Runs",
       icon: <TriangleWarningIcon width="16" height="16" />,
-      value: latestSnapshot?.hitAndRuns != null ? String(latestSnapshot.hitAndRuns) : "—",
+      value: formatCount(latestSnapshot?.hitAndRuns),
     },
     {
       key: "req-ratio",
diff --git a/src/components/tracker-detail/DebugResponseDialog.tsx b/src/components/tracker-detail/DebugResponseDialog.tsx
index 18cc7d58..c1aea6f7 100644
--- a/src/components/tracker-detail/DebugResponseDialog.tsx
+++ b/src/components/tracker-detail/DebugResponseDialog.tsx
@@ -1,10 +1,10 @@
 // src/components/tracker-detail/DebugResponseDialog.tsx
-
 "use client"
 
 import { useEffect, useState } from "react"
-import { CopyButton } from "@/components/ui/CopyButton"
+import { CopyButton } from "@/components/ui/ActionButtons"
 import { Dialog } from "@/components/ui/Dialog"
+import { Notice } from "@/components/ui/Notice"
 import { TabBar } from "@/components/ui/TabBar"
 import type { DebugApiCall } from "@/lib/adapters/types"
 
@@ -101,8 +101,7 @@ export function DebugResponseDialog({
       {!loading && error && (
         <div className="flex items-center justify-center">
           <div className="text-center">
-            <p className="text-danger text-sm font-mono mb-2">Debug poll failed</p>
-            <p className="text-secondary text-xs font-mono">{error}</p>
+            <Notice variant="danger" header="Debug poll failed" message={error} />
           </div>
         </div>
       )}
@@ -135,7 +134,7 @@ export function DebugResponseDialog({
               <CopyButton
                 value={content}
                 label="Copy"
-                className="absolute top-2 right-2 flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-sans font-medium text-tertiary hover:text-primary bg-elevated nm-raised-sm rounded-nm-sm transition-colors duration-150 cursor-pointer"
+                className="absolute top-2 right-2 flex items-center gap-2 px-2.5 py-1.5 text-xs font-sans font-medium text-tertiary hover:text-primary bg-elevated nm-raised-sm rounded-nm-sm transition-colors duration-150 cursor-pointer"
               />
             )}
           </div>
diff --git a/src/components/tracker-detail/PollLog.tsx b/src/components/tracker-detail/PollLog.tsx
index 6482bc6f..a0b5d97c 100644
--- a/src/components/tracker-detail/PollLog.tsx
+++ b/src/components/tracker-detail/PollLog.tsx
@@ -1,59 +1,66 @@
 // src/components/tracker-detail/PollLog.tsx
-
 "use client"
 
 import clsx from "clsx"
 import { useState } from "react"
+import { Button } from "@/components/ui/Button"
 import { ChevronToggle } from "@/components/ui/ChevronToggle"
-import { formatBytesFromString } from "@/lib/formatters"
+import { formatBytesFromString, formatDateTime, formatRatioDisplay } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 
 interface PollLogProps {
   snapshots: Snapshot[]
   lastPolledAt: string | null
   lastError: string | null
+  lastErrorAt: string | null
   userPausedAt?: string | null
 }
 
-export function PollLog({ snapshots, lastPolledAt, lastError, userPausedAt }: PollLogProps) {
+export function PollLog({
+  snapshots,
+  lastPolledAt,
+  lastError,
+  lastErrorAt,
+  userPausedAt,
+}: PollLogProps) {
   const [open, setOpen] = useState(false)
 
-  const lastPolledLabel = lastPolledAt ? new Date(lastPolledAt).toLocaleString() : "Never"
+  const lastPolledLabel = lastPolledAt ? formatDateTime(lastPolledAt) : "Never"
 
   return (
     <div className="flex flex-col gap-2">
-      <button
-        type="button"
+      <Button
+        variant="minimal"
+        size="sm"
+        leftIcon={<ChevronToggle expanded={open} />}
+        className="w-fit"
         onClick={() => setOpen((o) => !o)}
-        className="flex items-center gap-2 text-xs text-tertiary font-mono hover:text-secondary transition-colors duration-150 cursor-pointer w-fit"
-      >
-        <ChevronToggle expanded={open} />
-        Last polled: {lastPolledLabel}
-      </button>
+        text={`Last polled: ${lastPolledLabel}`}
+      />
       {open && (
         <div className="nm-inset-sm bg-control-bg overflow-hidden overflow-x-auto styled-scrollbar rounded-nm-md">
           {userPausedAt && (
             <div className="flex items-center gap-2 px-4 py-2.5 text-xs font-mono text-warn border-b border-border whitespace-nowrap min-w-fit">
               <span className="shrink-0">⏸</span>
-              <span className="text-tertiary shrink-0 w-[160px]">
-                {new Date(userPausedAt).toLocaleString()}
-              </span>
+              <span className="text-tertiary shrink-0 w-40">{formatDateTime(userPausedAt)}</span>
               <span>Polling paused</span>
             </div>
           )}
           {lastError && !userPausedAt && (
             <div className="flex items-center gap-2 px-4 py-2.5 text-xs font-mono text-danger border-b border-border whitespace-nowrap min-w-fit">
               <span className="shrink-0">✕</span>
-              <span className="text-tertiary">{lastPolledLabel}</span>
+              <span className="text-tertiary shrink-0 w-40">
+                {lastErrorAt ? formatDateTime(lastErrorAt) : lastPolledLabel}
+              </span>
               <span className="truncate">{lastError}</span>
             </div>
           )}
           {snapshots.length === 0 ? (
             <p className="px-4 py-3 text-xs font-mono text-muted">No poll history yet.</p>
           ) : (
-            [...snapshots]
+            snapshots
+              .slice(-10)
               .reverse()
-              .slice(0, 10)
               .map((snap, i) => (
                 <div
                   key={snap.polledAt}
@@ -63,8 +70,8 @@ export function PollLog({ snapshots, lastPolledAt, lastError, userPausedAt }: Po
                   )}
                 >
                   <span className="text-success shrink-0">✓</span>
-                  <span className="text-tertiary shrink-0 w-[160px]">
-                    {new Date(snap.polledAt).toLocaleString()}
+                  <span className="text-tertiary shrink-0 w-40">
+                    {formatDateTime(snap.polledAt)}
                   </span>
                   <span className="text-secondary">
                     {formatBytesFromString(snap.uploadedBytes)} ↑
@@ -72,9 +79,12 @@ export function PollLog({ snapshots, lastPolledAt, lastError, userPausedAt }: Po
                   <span className="text-secondary">
                     {formatBytesFromString(snap.downloadedBytes)} ↓
                   </span>
-                  <span className="text-secondary">
-                    {snap.ratio !== null ? `${snap.ratio.toFixed(2)}x` : "—"}
-                  </span>
+                  <span className="text-secondary">{formatRatioDisplay(snap.ratio)}</span>
+                  {snap.isManual && (
+                    <span className="text-accent/60 text-[10px] uppercase tracking-wider">
+                      Manual
+                    </span>
+                  )}
                 </div>
               ))
           )}
diff --git a/src/components/tracker-detail/RankTooltip.tsx b/src/components/tracker-detail/RankTooltip.tsx
index 373dee20..63c2dbc7 100644
--- a/src/components/tracker-detail/RankTooltip.tsx
+++ b/src/components/tracker-detail/RankTooltip.tsx
@@ -1,11 +1,11 @@
 // src/components/tracker-detail/RankTooltip.tsx
-
 "use client"
 
+import { SlotLabel } from "@typography"
 import { Badge } from "@/components/ui/Badge"
 import { Tooltip } from "@/components/ui/Tooltip"
 import type { TrackerUserClass } from "@/data/tracker-registry"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 
 interface RankTooltipProps {
   currentRank: string
@@ -17,10 +17,8 @@ export function RankTooltip({ currentRank, userClasses, accentColor }: RankToolt
   return (
     <Tooltip
       content={
-        <div className="min-w-[200px]">
-          <p className="text-[10px] font-sans font-medium text-tertiary uppercase tracking-wider px-3 pb-1.5">
-            Ranks
-          </p>
+        <div className="min-w-50">
+          <SlotLabel label="Ranks" className="px-3 pb-1.5" />
           {userClasses.map((uc) => {
             const isCurrent = uc.name.toLowerCase() === currentRank.toLowerCase()
             return (
@@ -34,7 +32,7 @@ export function RankTooltip({ currentRank, userClasses, accentColor }: RankToolt
                 }
               >
                 <span className={isCurrent ? "font-semibold" : "text-secondary"}>{uc.name}</span>
-                {isCurrent && <span className="text-[10px]">&larr; you</span>}
+                {isCurrent && <span className="text-3xs">&larr; you</span>}
               </div>
             )
           })}
@@ -48,12 +46,9 @@ export function RankTooltip({ currentRank, userClasses, accentColor }: RankToolt
           color: accentColor,
         }}
       >
-        <span className="flex items-center gap-1.5">
+        <span className="flex items-center gap-2">
           {currentRank}
-          <span
-            className="cursor-help text-[9px] font-bold opacity-70 inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-current"
-            aria-hidden="true"
-          >
+          <span className="help-icon opacity-70" aria-hidden="true">
             ?
           </span>
         </span>
diff --git a/src/components/tracker-detail/SlotRenderer.tsx b/src/components/tracker-detail/SlotRenderer.tsx
index 04e88e30..a0effd46 100644
--- a/src/components/tracker-detail/SlotRenderer.tsx
+++ b/src/components/tracker-detail/SlotRenderer.tsx
@@ -10,7 +10,7 @@
 
 "use client"
 
-import type { ResolvedSlot } from "@/lib/slot-types"
+import type { ResolvedSlot } from "@/types/slots"
 import { renderSlotElement } from "./slot-registry"
 
 interface SlotRendererProps {
diff --git a/src/components/tracker-detail/TrackerDetailHeader.tsx b/src/components/tracker-detail/TrackerDetailHeader.tsx
index 948f1597..6fdf0c8f 100644
--- a/src/components/tracker-detail/TrackerDetailHeader.tsx
+++ b/src/components/tracker-detail/TrackerDetailHeader.tsx
@@ -21,7 +21,6 @@ import {
 import { PulseDot } from "@/components/ui/PulseDot"
 import { Tooltip } from "@/components/ui/Tooltip"
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
-import type { ResolvedSlot } from "@/lib/slot-types"
 import {
   getHealthBadgeVariant,
   getHealthDescription,
@@ -29,6 +28,7 @@ import {
   getTrackerHealth,
 } from "@/lib/tracker-status"
 import type { TrackerLatestStats, TrackerSummary } from "@/types/api"
+import type { ResolvedSlot } from "@/types/slots"
 
 interface TrackerDetailHeaderProps {
   tracker: TrackerSummary
@@ -135,9 +135,13 @@ export function TrackerDetailHeader({
               )}
             </Button>
           </Tooltip>
-          <Button variant="secondary" size="sm" onClick={onPollNow} disabled={polling}>
-            {polling ? "Polling..." : "Poll Now"}
-          </Button>
+          <Button
+            variant="secondary"
+            size="sm"
+            onClick={onPollNow}
+            disabled={polling}
+            text={polling ? "Polling..." : "Poll Now"}
+          />
           <Button
             variant="secondary"
             size="sm"
diff --git a/src/components/tracker-detail/TrackerInfoTab.tsx b/src/components/tracker-detail/TrackerInfoTab.tsx
index 8645c163..a013e08b 100644
--- a/src/components/tracker-detail/TrackerInfoTab.tsx
+++ b/src/components/tracker-detail/TrackerInfoTab.tsx
@@ -1,20 +1,32 @@
 // src/components/tracker-detail/TrackerInfoTab.tsx
-//
-// Functions: TrackerInfoTab
-
 "use client"
 
 import { H2 } from "@typography"
 import clsx from "clsx"
+import dynamic from "next/dynamic"
 import { useState } from "react"
-import Markdown from "react-markdown"
-import remarkGfm from "remark-gfm"
-import { ChevronToggle } from "@/components/ui/ChevronToggle"
+import { InfoTip } from "@/components/ui/InfoTip"
+import { PillTag } from "@/components/ui/PillTag"
+import { SectionToggle } from "@/components/ui/SectionToggle"
 import { Tooltip } from "@/components/ui/Tooltip"
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatCount, formatRatio } from "@/lib/formatters"
 import type { TrackerLatestStats } from "@/types/api"
 
+const Markdown = dynamic(
+  () =>
+    Promise.all([import("react-markdown"), import("remark-gfm")]).then(
+      ([{ default: ReactMarkdown }, { default: remarkGfm }]) => {
+        function GfmMarkdown(props: { children: string; className?: string }) {
+          return <ReactMarkdown remarkPlugins={[remarkGfm]} {...props} />
+        }
+        return GfmMarkdown
+      }
+    ),
+  { ssr: false }
+)
+
 interface TrackerInfoTabProps {
   registryEntry: TrackerRegistryEntry | undefined
   stats: TrackerLatestStats | null
@@ -51,7 +63,7 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
                 label: "Minimum Ratio",
                 value:
                   registryEntry.rules.minimumRatio > 0
-                    ? registryEntry.rules.minimumRatio.toString()
+                    ? formatRatio(registryEntry.rules.minimumRatio)
                     : "None",
                 tip: "Your upload/download ratio must stay above this threshold to avoid demotion or account restrictions.",
               },
@@ -98,13 +110,9 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
                     i > 0 ? "border-t border-border" : ""
                   )}
                 >
-                  <span className="text-sm font-sans text-tertiary flex items-center gap-1.5">
+                  <span className="text-sm font-sans text-tertiary flex items-center gap-2">
                     {rule.label}
-                    <Tooltip content={rule.tip}>
-                      <span className="cursor-help text-[9px] font-bold opacity-50 inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-current hover:opacity-80 transition-opacity">
-                        ?
-                      </span>
-                    </Tooltip>
+                    <InfoTip icon="question" size="sm" content={rule.tip} />
                   </span>
                   <span className="text-base font-mono font-semibold text-primary">
                     {rule.value}
@@ -121,12 +129,9 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
           <H2>Content</H2>
           <div className="flex flex-wrap items-center gap-2">
             {registryEntry.contentCategories.map((cat) => (
-              <span
-                key={cat}
-                className="inline-flex items-center px-3 py-1 font-mono text-xs text-tertiary nm-inset-sm bg-control-bg rounded-nm-pill"
-              >
+              <PillTag key={cat} className="inline-flex items-center">
                 {cat}
-              </span>
+              </PillTag>
             ))}
           </div>
         </div>
@@ -138,21 +143,19 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
           <div className="flex flex-col gap-3">
             <H2>Site Stats</H2>
             {registryEntry.stats.statsUpdatedAt && (
-              <span className="text-[10px] font-mono text-muted">
-                Updated {registryEntry.stats.statsUpdatedAt}
-              </span>
+              <span className="timestamp">Updated {registryEntry.stats.statsUpdatedAt}</span>
             )}
             <div className="flex flex-wrap gap-6">
               {registryEntry.stats.userCount != null && (
                 <div className="flex flex-col gap-1">
                   <span className="text-2xl font-mono font-semibold text-primary">
-                    {registryEntry.stats.userCount.toLocaleString()}
+                    {formatCount(registryEntry.stats.userCount)}
                   </span>
                   <span className="text-xs font-sans text-tertiary">
                     Users
                     {registryEntry.stats.activeUsers != null && (
                       <span className="text-muted ml-1">
-                        ({registryEntry.stats.activeUsers.toLocaleString()} active)
+                        ({formatCount(registryEntry.stats.activeUsers)} active)
                       </span>
                     )}
                   </span>
@@ -161,7 +164,7 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
               {registryEntry.stats.torrentCount != null && (
                 <div className="flex flex-col gap-1">
                   <span className="text-2xl font-mono font-semibold text-primary">
-                    {registryEntry.stats.torrentCount.toLocaleString()}
+                    {formatCount(registryEntry.stats.torrentCount)}
                   </span>
                   <span className="text-xs font-sans text-tertiary">Torrents</span>
                 </div>
@@ -197,7 +200,7 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
                   <div className="flex items-center gap-3 pt-0.5">
                     <span
                       className={clsx(
-                        "text-sm font-mono min-w-[140px]",
+                        "text-sm font-mono min-w-35",
                         isCurrent ? "font-semibold" : "text-secondary"
                       )}
                       style={isCurrent ? { color: tc } : undefined}
@@ -205,7 +208,7 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
                       {uc.name}
                     </span>
                     {isCurrent && (
-                      <span className="text-[10px] font-mono" style={{ color: tc }}>
+                      <span className="text-3xs font-mono" style={{ color: tc }}>
                         ← you
                       </span>
                     )}
@@ -220,12 +223,9 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
                       {uc.perks && uc.perks.length > 0 && (
                         <div className="flex flex-wrap justify-end gap-1 mt-1">
                           {uc.perks.map((perk) => (
-                            <span
-                              key={`${perk.type}-${perk.label}`}
-                              className="text-[10px] font-mono text-muted nm-inset-sm bg-control-bg px-1.5 py-0.5 rounded-nm-pill"
-                            >
+                            <PillTag key={`${perk.type}-${perk.label}`} size="sm" color="muted">
                               {perk.label}
-                            </span>
+                            </PillTag>
                           ))}
                         </div>
                       )}
@@ -247,12 +247,9 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
               const name = typeof g === "string" ? g : g.name
               const desc = typeof g === "string" ? undefined : g.description
               const badge = (
-                <span
-                  key={name}
-                  className="nm-inset-sm bg-control-bg rounded-nm-pill px-3 py-1 text-xs font-mono text-accent"
-                >
+                <PillTag key={name} color="accent">
                   {name}
-                </span>
+                </PillTag>
               )
               return desc ? (
                 <Tooltip key={name} content={desc}>
@@ -272,40 +269,35 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
           <H2>Notable Members</H2>
           <div className="flex flex-wrap gap-2">
             {registryEntry.notableMembers.map((m) => (
-              <span
-                key={m}
-                className="nm-inset-sm bg-control-bg rounded-nm-pill px-3 py-1 text-xs font-mono text-secondary"
-              >
+              <PillTag key={m} color="secondary">
                 {m}
-              </span>
+              </PillTag>
             ))}
           </div>
         </div>
       )}
 
-      {/* Banned Groups (accordion) */}
+      {/* Banned Groups */}
       {registryEntry?.bannedGroups && registryEntry.bannedGroups.length > 0 && (
         <div className="flex flex-col gap-2">
-          <button
-            type="button"
-            className="flex items-center gap-2 text-xs font-sans font-medium text-tertiary uppercase tracking-wider cursor-pointer hover:text-secondary transition-colors"
-            onClick={() => setBannedOpen((o) => !o)}
-          >
-            <ChevronToggle expanded={bannedOpen} />
-            Banned Groups
-            <span className="text-muted font-mono normal-case">
-              ({registryEntry.bannedGroups.length})
-            </span>
-          </button>
+          <SectionToggle
+            expanded={bannedOpen}
+            onToggle={() => setBannedOpen((o) => !o)}
+            label={
+              <>
+                Banned Groups{" "}
+                <span className="text-muted font-mono normal-case">
+                  ({registryEntry.bannedGroups.length})
+                </span>
+              </>
+            }
+          />
           {bannedOpen && (
             <div className="flex flex-wrap gap-2">
               {registryEntry.bannedGroups.map((g) => (
-                <span
-                  key={g}
-                  className="nm-inset-sm bg-control-bg rounded-nm-pill px-3 py-1 text-xs font-mono text-danger"
-                >
+                <PillTag key={g} color="danger">
                   {g}
-                </span>
+                </PillTag>
               ))}
             </div>
           )}
@@ -317,7 +309,7 @@ export function TrackerInfoTab({ registryEntry, stats, accentColor: tc }: Tracke
         <div className="flex flex-col gap-3">
           <H2>Full Rules</H2>
           <div className="nm-inset-sm bg-control-bg px-5 py-4 text-sm font-sans text-secondary leading-relaxed rounded-nm-md prose prose-invert prose-sm max-w-none prose-headings:text-primary prose-headings:font-semibold prose-headings:mt-4 prose-headings:mb-2 prose-table:w-full prose-th:text-left prose-th:py-2 prose-th:px-3 prose-th:text-xs prose-th:font-mono prose-th:uppercase prose-th:tracking-wider prose-th:text-tertiary prose-td:py-2 prose-td:px-3 prose-td:font-mono prose-td:text-sm prose-strong:text-primary prose-li:marker:text-muted">
-            <Markdown remarkPlugins={[remarkGfm]}>
+            <Markdown>
               {registryEntry.rules.fullRulesMarkdown.join("\n").replace(/\*\*(\d+)\.\*\*/g, "$1.")}
             </Markdown>
           </div>
diff --git a/src/components/tracker-detail/TrackerStatusBanner.tsx b/src/components/tracker-detail/TrackerStatusBanner.tsx
index 81e0d63a..a4c906ba 100644
--- a/src/components/tracker-detail/TrackerStatusBanner.tsx
+++ b/src/components/tracker-detail/TrackerStatusBanner.tsx
@@ -3,6 +3,7 @@
 import { Button } from "@/components/ui/Button"
 import { Card } from "@/components/ui/Card"
 import { DOCS } from "@/lib/constants"
+import { formatDateTime } from "@/lib/formatters"
 import { getPauseState } from "@/lib/tracker-status"
 import type { TrackerSummary } from "@/types/api"
 
@@ -51,9 +52,7 @@ export function TrackerStatusBanner({
             <p className="text-xs font-sans font-medium text-warn uppercase tracking-wider">
               Polling Paused
             </p>
-            <span className="text-[10px] font-mono text-muted shrink-0">
-              since {pause.since.toLocaleDateString()}
-            </span>
+            <span className="timestamp shrink-0">since {pause.since.toLocaleDateString()}</span>
           </div>
           <p className="text-sm font-mono text-secondary mt-2">
             Automated polling is paused by the user.
@@ -66,9 +65,7 @@ export function TrackerStatusBanner({
             <p className="text-xs font-sans font-medium text-danger uppercase tracking-wider">
               Polling Paused
             </p>
-            <span className="text-[10px] font-mono text-muted shrink-0">
-              {new Date(pause.since).toLocaleString()}
-            </span>
+            <span className="timestamp shrink-0">{formatDateTime(pause.since)}</span>
           </div>
           <p className="text-sm font-mono text-warn mb-2">
             Polling was paused after repeated failures. Verify your API key is correct before
@@ -85,9 +82,7 @@ export function TrackerStatusBanner({
           {tracker.lastError && (
             <p className="text-xs font-mono text-danger/80 mb-3">Last error: {tracker.lastError}</p>
           )}
-          <Button variant="danger" size="sm" onClick={onResume}>
-            Resume Polling
-          </Button>
+          <Button variant="danger" size="sm" onClick={onResume} text="Resume Polling" />
         </Card>
       )}
       {showLastError && (
@@ -97,9 +92,7 @@ export function TrackerStatusBanner({
               Last Error
             </p>
             {tracker.lastPolledAt && (
-              <span className="text-[10px] font-mono text-muted">
-                {new Date(tracker.lastPolledAt).toLocaleString()}
-              </span>
+              <span className="timestamp">{formatDateTime(tracker.lastPolledAt)}</span>
             )}
           </div>
           <p className="text-danger text-sm font-mono">{tracker.lastError}</p>
diff --git a/src/components/tracker-detail/UserProfileCard.tsx b/src/components/tracker-detail/UserProfileCard.tsx
index e59c238a..b5823d30 100644
--- a/src/components/tracker-detail/UserProfileCard.tsx
+++ b/src/components/tracker-detail/UserProfileCard.tsx
@@ -1,6 +1,4 @@
 // src/components/tracker-detail/UserProfileCard.tsx
-//
-// Functions: UserProfileCard
 
 import { RankTooltip } from "@/components/tracker-detail/RankTooltip"
 import { TrackerAvatar } from "@/components/tracker-detail/TrackerAvatar"
@@ -8,7 +6,8 @@ import { Badge } from "@/components/ui/Badge"
 import { UserIcon } from "@/components/ui/Icons"
 import { RedactedText } from "@/components/ui/RedactedText"
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
-import { formatAccountAge, formatJoinedDate, hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { formatAccountAge, formatJoinedDate } from "@/lib/formatters"
 import { isRedacted } from "@/lib/privacy"
 import type { TrackerLatestStats, TrackerSummary } from "@/types/api"
 
diff --git a/src/components/tracker-detail/platform/GgnAchievementProgress.tsx b/src/components/tracker-detail/platform/GgnAchievementProgress.tsx
index 44357fe0..c1b4158b 100644
--- a/src/components/tracker-detail/platform/GgnAchievementProgress.tsx
+++ b/src/components/tracker-detail/platform/GgnAchievementProgress.tsx
@@ -1,6 +1,7 @@
 // src/components/tracker-detail/platform/GgnAchievementProgress.tsx
 
 import { ProgressBar } from "@/components/ui/ProgressBar"
+import { formatCount } from "@/lib/formatters"
 import type { GGnPlatformMeta } from "@/types/api"
 
 export interface GgnAchievementProgressProps {
@@ -20,13 +21,13 @@ export function GgnAchievementProgress({ ggMeta, accentColor }: GgnAchievementPr
       <div className="flex items-center justify-between text-xs font-mono">
         <span className="text-secondary font-semibold">{userLevel}</span>
         <span className="text-tertiary">
-          {earned.toLocaleString()} / {totalPoints.toLocaleString()} pts
+          {formatCount(earned)} / {formatCount(totalPoints)} pts
         </span>
         <span className="text-muted">{nextLevel}</span>
       </div>
       <ProgressBar percent={pct} color={accentColor} size="sm" />
-      <p className="text-[10px] font-mono text-muted text-right">
-        {pointsToNextLvl.toLocaleString()} pts to {nextLevel}
+      <p className="timestamp text-right">
+        {formatCount(pointsToNextLvl)} pts to {nextLevel}
       </p>
     </div>
   )
diff --git a/src/components/tracker-detail/platform/GgnBuffsDisplay.tsx b/src/components/tracker-detail/platform/GgnBuffsDisplay.tsx
index 90b6c7e6..33a5d74c 100644
--- a/src/components/tracker-detail/platform/GgnBuffsDisplay.tsx
+++ b/src/components/tracker-detail/platform/GgnBuffsDisplay.tsx
@@ -1,7 +1,7 @@
 // src/components/tracker-detail/platform/GgnBuffsDisplay.tsx
 
 import { H2 } from "@typography"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 import type { GGnPlatformMeta } from "@/types/api"
 
 export interface GgnBuffsDisplayProps {
diff --git a/src/components/tracker-detail/platform/GgnShareScoreProgress.tsx b/src/components/tracker-detail/platform/GgnShareScoreProgress.tsx
index 561e8a6a..46a2b40c 100644
--- a/src/components/tracker-detail/platform/GgnShareScoreProgress.tsx
+++ b/src/components/tracker-detail/platform/GgnShareScoreProgress.tsx
@@ -1,6 +1,7 @@
 // src/components/tracker-detail/platform/GgnShareScoreProgress.tsx
 
-import { ProgressBar } from "@/components/ui/ProgressBar"
+import { ProgressWidget } from "@/components/ui/ProgressWidget"
+import { formatRatio } from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 
 export interface GgnShareScoreProgressProps {
@@ -16,14 +17,11 @@ export function GgnShareScoreProgress({ latestSnapshot, accentColor }: GgnShareS
   const pct = (score / maxScore) * 100
 
   return (
-    <div className="flex flex-col gap-2">
-      <div className="flex items-center justify-between text-xs font-mono">
-        <span className="slot-label">Share Score</span>
-        <span className="text-secondary font-semibold">
-          {score.toFixed(2)} / {maxScore}
-        </span>
-      </div>
-      <ProgressBar percent={pct} color={accentColor} size="sm" />
-    </div>
+    <ProgressWidget
+      label="Share Score"
+      value={`${formatRatio(score)} / ${maxScore}`}
+      percent={pct}
+      color={accentColor}
+    />
   )
 }
diff --git a/src/components/tracker-detail/platform/MamHealthOverview.tsx b/src/components/tracker-detail/platform/MamHealthOverview.tsx
index fdadaae0..d12d1931 100644
--- a/src/components/tracker-detail/platform/MamHealthOverview.tsx
+++ b/src/components/tracker-detail/platform/MamHealthOverview.tsx
@@ -1,13 +1,12 @@
 // src/components/tracker-detail/platform/MamHealthOverview.tsx
-//
-// Composite layout for all MAM progress visualizations.
-// Replaces the 4 individual full-width progress slots with a single
-// component that handles internal composition and visual hierarchy.
 
-import { ProgressBar } from "@/components/ui/ProgressBar"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { SlotLabel } from "@typography"
+import { InfoTip } from "@/components/ui/InfoTip"
+import { Notice } from "@/components/ui/Notice"
+import { ProgressWidget } from "@/components/ui/ProgressWidget"
 import { MAM_BONUS_CAP } from "@/lib/adapters/constants"
 import type { MamPlatformMeta } from "@/lib/adapters/types"
+import { formatCount } from "@/lib/formatters"
 
 export interface MamHealthOverviewProps {
   meta: MamPlatformMeta
@@ -21,8 +20,7 @@ export interface MamHealthOverviewProps {
   unsatisfiedLimit: number | null
 }
 
-// ── Bonus cap waste estimate ────────────────────────────────────────────────
-const ESTIMATED_POINTS_PER_SEED_PER_HOUR = 0.5 // Rough average — MAM formula varies by torrent
+const ESTIMATED_POINTS_PER_SEED_PER_HOUR = 0.5 // Rough average
 
 // ── Torrent health segments ─────────────────────────────────────────────────
 const SEGMENTS = [
@@ -31,7 +29,7 @@ const SEGMENTS = [
   { key: "leeching", label: "Leeching", color: "var(--color-accent)" },
   { key: "inactiveHnr", label: "Inactive HnR", color: "var(--color-danger)" },
   { key: "preHnr", label: "Pre-HnR", color: "var(--color-warn)" },
-  { key: "completed", label: "Completed", color: "var(--color-text-tertiary)" },
+  { key: "completed", label: "Completed", color: "var(--color-tertiary)" },
 ] as const
 
 export function MamHealthOverview({
@@ -103,42 +101,37 @@ export function MamHealthOverview({
     <div className="grid grid-cols-1 md:grid-cols-2 gap-5">
       {/* ── Top-left: VIP Countdown ──────────────────────────────────────── */}
       {hasVip && (
-        <div className="nm-inset-sm bg-control-bg rounded-nm-md p-4 flex flex-col gap-2">
-          <div className="flex items-center justify-between">
-            <span className="slot-label">VIP Expires</span>
-            <span className="text-xs font-mono text-secondary font-semibold">{vipDays}d</span>
-          </div>
-          <ProgressBar percent={vipPct} color={vipColor} size="sm" />
-          <p className="text-[10px] font-mono text-muted text-right">{vipDateStr}</p>
-        </div>
+        <ProgressWidget
+          inset
+          label="VIP Expires"
+          value={`${vipDays}d`}
+          percent={vipPct}
+          color={vipColor}
+          footer={vipDateStr}
+        />
       )}
 
       {/* ── Top-right: Download Capacity ─────────────────────────────────── */}
       {hasCapacity && (
-        <div className="nm-inset-sm bg-control-bg rounded-nm-md p-4 flex flex-col gap-2">
-          <div className="flex items-center justify-between">
-            <span className="slot-label">Download Capacity</span>
-            <span className="text-xs font-mono text-secondary font-semibold">
-              {satRemaining} / {unsatisfiedLimit} slots
-            </span>
-          </div>
-          <ProgressBar percent={satPct} color={satColor} size="sm" />
-          <p className="text-[10px] font-mono text-muted text-right">
-            {satUsed} unsatisfied torrent{satUsed !== 1 ? "s" : ""}
-          </p>
-        </div>
+        <ProgressWidget
+          inset
+          label="Download Capacity"
+          value={`${satRemaining} / ${unsatisfiedLimit} slots`}
+          percent={satPct}
+          color={satColor}
+          footer={`${satUsed} unsatisfied torrent${satUsed !== 1 ? "s" : ""}`}
+        />
       )}
 
       {/* ── Bottom-left: Torrent Health ──────────────────────────────────── */}
       {hasHealth && (
         <div className="nm-inset-sm bg-control-bg rounded-nm-md p-4 flex flex-col gap-2">
           <div className="flex items-center gap-1">
-            <span className="slot-label">Torrent Health</span>
-            <Tooltip content="Breakdown of your snatched torrents by seeding status. Green = seeding and satisfied. Amber = seeding but not yet past the 72-hour requirement (pre-HnR or active HnR). Red = not seeding past deadline (Hit & Run). Gray = completed, no longer seeding.">
-              <span className="text-muted hover:text-secondary cursor-help text-[10px]">
-                &#9432;
-              </span>
-            </Tooltip>
+            <SlotLabel label="Torrent Health" />
+            <InfoTip
+              content="Breakdown of your snatched torrents by seeding status. Green = seeding and satisfied. Amber = seeding but not yet past the 72-hour requirement (pre-HnR or active HnR). Red = not seeding past deadline (Hit & Run). Gray = completed, no longer seeding."
+              size="sm"
+            />
           </div>
           <div className="nm-inset h-3 w-full overflow-hidden rounded-nm-pill flex">
             {SEGMENTS.map(({ key, label, color }) => {
@@ -158,15 +151,12 @@ export function MamHealthOverview({
             {SEGMENTS.map(({ key, label, color }) => {
               if (healthValues[key] <= 0) return null
               return (
-                <span
-                  key={key}
-                  className="text-[10px] font-mono text-muted flex items-center gap-1"
-                >
+                <span key={key} className="timestamp flex items-center gap-1">
                   <span
                     className="w-1.5 h-1.5 rounded-full inline-block"
                     style={{ backgroundColor: color }}
                   />
-                  {label}: {healthValues[key].toLocaleString()}
+                  {label}: {formatCount(healthValues[key])}
                 </span>
               )
             })}
@@ -177,14 +167,12 @@ export function MamHealthOverview({
       {/* ── Bottom-right: Bonus Cap Warning ──────────────────────────────── */}
       {atCap && (
         <div className="nm-inset-sm bg-danger-dim rounded-nm-md p-4 flex flex-col gap-1">
-          <span className="slot-label text-danger">Bonus Cap Reached</span>
+          <SlotLabel label="Bonus Cap Reached" className="text-danger" />
           <span className="text-sm font-mono font-semibold text-primary">
-            {(seedbonus ?? 0).toLocaleString()} / {MAM_BONUS_CAP.toLocaleString()}
+            {formatCount(seedbonus ?? 0)} / {formatCount(MAM_BONUS_CAP)}
           </span>
           {wastePerDay > 0 && (
-            <p className="text-[10px] font-mono text-warn">
-              ~{wastePerDay.toLocaleString()} pts/day wasted
-            </p>
+            <Notice variant="warn" message={`~${formatCount(wastePerDay)} pts/day wasted`} />
           )}
         </div>
       )}
diff --git a/src/components/tracker-detail/platform/MamMouseholeCard.tsx b/src/components/tracker-detail/platform/MamMouseholeCard.tsx
index f5103380..9aa75a27 100644
--- a/src/components/tracker-detail/platform/MamMouseholeCard.tsx
+++ b/src/components/tracker-detail/platform/MamMouseholeCard.tsx
@@ -6,7 +6,8 @@ import Image from "next/image"
 import { useCallback, useEffect, useRef, useState } from "react"
 import { Button } from "@/components/ui/Button"
 import { ChevronToggle } from "@/components/ui/ChevronToggle"
-import { Tooltip } from "@/components/ui/Tooltip"
+import { InfoTip } from "@/components/ui/InfoTip"
+import { Notice } from "@/components/ui/Notice"
 import { useLocalStorage } from "@/hooks/useLocalStorage"
 
 interface MouseholeResponse {
@@ -190,7 +191,7 @@ export function MamMouseholeCard({ trackerId, mouseholeUrl }: MamMouseholeCardPr
         />
         <div className="flex flex-col gap-0.5">
           <span className="text-xs font-sans font-medium text-secondary">Mousehole</span>
-          <span className="text-[10px] font-mono text-danger">{fetchError}</span>
+          <Notice message={fetchError} />
         </div>
       </div>
     )
@@ -266,14 +267,12 @@ export function MamMouseholeCard({ trackerId, mouseholeUrl }: MamMouseholeCardPr
                 {countdown}
               </span>
             </span>
-            <Tooltip
+            <InfoTip
               content="Mousehole keeps your MAM seedbox IP updated automatically."
+              size="sm"
+              className="ml-1"
               docs={{ href: "https://github.com/t-mart/mousehole", description: "Mousehole docs" }}
-            >
-              <span className="text-muted hover:text-secondary cursor-help text-xs ml-1">
-                &#9432;
-              </span>
-            </Tooltip>
+            />
           </div>
         </div>
 
@@ -281,7 +280,7 @@ export function MamMouseholeCard({ trackerId, mouseholeUrl }: MamMouseholeCardPr
         <div
           className={clsx(
             "overflow-hidden transition-[max-height,opacity] duration-300 ease-in-out",
-            expanded ? "max-h-[300px] opacity-100" : "max-h-0 opacity-0"
+            expanded ? "max-h-75 opacity-100" : "max-h-0 opacity-0"
           )}
         >
           <div className="flex flex-col gap-2 mt-2.5">
@@ -316,9 +315,13 @@ export function MamMouseholeCard({ trackerId, mouseholeUrl }: MamMouseholeCardPr
                   {countdown}
                 </span>
               </span>
-              <Button variant="secondary" size="sm" disabled={checking} onClick={handleCheckNow}>
-                {checking ? "Checking..." : "Check Now"}
-              </Button>
+              <Button
+                variant="secondary"
+                size="sm"
+                disabled={checking}
+                onClick={handleCheckNow}
+                text={checking ? "Checking..." : "Check Now"}
+              />
             </div>
           </div>
         </div>
diff --git a/src/components/tracker-detail/resolve-slots.ts b/src/components/tracker-detail/resolve-slots.ts
index a3ccb14c..98dd05d1 100644
--- a/src/components/tracker-detail/resolve-slots.ts
+++ b/src/components/tracker-detail/resolve-slots.ts
@@ -2,7 +2,7 @@
 //
 // Functions: resolveSlots
 
-import type { ResolvedSlot, SlotCategory, SlotContext } from "@/lib/slot-types"
+import type { ResolvedSlot, SlotCategory, SlotContext } from "@/types/slots"
 import { SLOT_DEFINITIONS } from "./slot-registry"
 
 export function resolveSlots(ctx: SlotContext): Map<SlotCategory, ResolvedSlot[]> {
diff --git a/src/components/tracker-detail/slot-registry.ts b/src/components/tracker-detail/slot-registry.ts
index 854e492d..7335183b 100644
--- a/src/components/tracker-detail/slot-registry.ts
+++ b/src/components/tracker-detail/slot-registry.ts
@@ -11,6 +11,11 @@
 //          mam-vip, mam-connectable, mam-unread
 //   progress: ggn-achievement-progress, ggn-share-score-progress, ggn-buffs,
 //             mam-health-overview
+//   avistaz stat-card: avistaz-activity
+//   avistaz badge: avistaz-download-disabled, avistaz-upload-disabled, avistaz-vip, avistaz-invites
+//   dc stat-card: dc-activity, dc-real-data
+//   dc badge: dc-download-ban, dc-upload-ban, dc-hnr-warned, dc-parked,
+//             dc-unconnectable, dc-seedbox-donor, dc-invites, dc-hearts
 
 import type { ComponentType, ReactNode } from "react"
 import { createElement } from "react"
@@ -26,12 +31,13 @@ import { PulseDot } from "@/components/ui/PulseDot"
 import type {
   StatCardBasicProps,
   StatCardRingProps,
+  StatCardRow,
   StatCardStackedProps,
 } from "@/components/ui/StatCard"
 import { StatCard } from "@/components/ui/StatCard"
-import type { GazellePlatformMeta, GGnPlatformMeta, MamPlatformMeta } from "@/lib/adapters/types"
-import { formatBytesNum } from "@/lib/formatters"
-import type { SlotCategory, SlotContext } from "@/lib/slot-types"
+import { metaFor } from "@/lib/adapters/types"
+import { formatBytesNum, formatCount, formatRatio } from "@/lib/formatters"
+import type { SlotCategory, SlotContext } from "@/types/slots"
 import type { GgnAchievementProgressProps } from "./platform/GgnAchievementProgress"
 import { GgnAchievementProgress } from "./platform/GgnAchievementProgress"
 import type { GgnBuffsDisplayProps } from "./platform/GgnBuffsDisplay"
@@ -91,24 +97,22 @@ const goldSlot: SlotDefinition<StatCardStackedProps> = {
   priority: 10,
   span: 2,
   resolve(ctx) {
-    const { meta, latestSnapshot, accentColor } = ctx
-    if (!meta || !("hourlyGold" in meta)) return null
-    if (latestSnapshot?.seedbonus == null) return null
-    const ggMeta = meta as GGnPlatformMeta
-    const gold = Math.floor(latestSnapshot.seedbonus)
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta) return null
+    if (ctx.latestSnapshot?.seedbonus == null) return null
+    const gold = Math.floor(ctx.latestSnapshot.seedbonus)
     return {
       type: "stacked" as const,
       title: "Gold",
       rows: [
-        { label: "Balance", value: gold.toLocaleString() },
+        { label: "Balance", value: formatCount(gold) },
         {
           label: "Per Hour",
-          value:
-            ggMeta.hourlyGold != null ? `+${Math.floor(ggMeta.hourlyGold).toLocaleString()}` : "—",
+          value: ggMeta.hourlyGold != null ? `+${formatCount(Math.floor(ggMeta.hourlyGold))}` : "—",
           colorClass: ggMeta.hourlyGold ? "text-success" : undefined,
         },
       ],
-      accentColor,
+      accentColor: ctx.accentColor,
     }
   },
 }
@@ -119,16 +123,12 @@ const snatchedNebulanceSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 10,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta) return null
-    if (!("snatched" in meta)) return null
-    if ("hourlyGold" in meta) return null
-    if ("community" in meta) return null
-    const value = (meta as { snatched: number }).snatched
+    const nebMeta = metaFor(ctx, "nebulance")
+    if (!nebMeta || nebMeta.snatched == null) return null
     return {
       label: "Snatched",
-      value,
-      accentColor,
+      value: nebMeta.snatched,
+      accentColor: ctx.accentColor,
       icon: icon16(DownloadArrowIcon),
     }
   },
@@ -140,15 +140,13 @@ const seedbonusSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 10,
   resolve(ctx) {
-    const { meta, latestSnapshot, accentColor } = ctx
-    if (latestSnapshot?.seedbonus == null) return null
-    if (meta && "hourlyGold" in meta) return null
-    if (meta && "snatched" in meta) return null
+    if (ctx.latestSnapshot?.seedbonus == null) return null
+    if (metaFor(ctx, "ggn") || metaFor(ctx, "gazelle") || metaFor(ctx, "nebulance")) return null
     return {
       label: "Seedbonus",
-      value: Math.floor(latestSnapshot.seedbonus).toLocaleString(),
+      value: formatCount(Math.floor(ctx.latestSnapshot.seedbonus)),
       unit: "BON",
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(StarIcon),
     }
   },
@@ -160,13 +158,13 @@ const ggnShareScoreCardSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 15,
   resolve(ctx) {
-    const { meta, latestSnapshot, accentColor } = ctx
-    if (latestSnapshot?.shareScore == null) return null
-    if (!meta || !("hourlyGold" in meta)) return null
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta) return null
+    if (ctx.latestSnapshot?.shareScore == null) return null
     return {
       label: "Share Score",
-      value: latestSnapshot.shareScore.toFixed(2),
-      accentColor,
+      value: formatRatio(ctx.latestSnapshot.shareScore),
+      accentColor: ctx.accentColor,
       icon: icon16(ShareScoreIcon),
     }
   },
@@ -179,12 +177,11 @@ const gazelleTokensSlot: SlotDefinition<StatCardStackedProps> = {
   priority: 20,
   span: 2,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta) return null
-    const hasGift = "giftTokens" in meta && meta.giftTokens != null
-    const hasMerit = "meritTokens" in meta && meta.meritTokens != null
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
+    const hasGift = gazMeta.giftTokens != null
+    const hasMerit = gazMeta.meritTokens != null
     if (!hasGift && !hasMerit) return null
-    const gazMeta = meta as GazellePlatformMeta
     const gift = gazMeta.giftTokens ?? 0
     const merit = gazMeta.meritTokens ?? 0
     return {
@@ -195,7 +192,7 @@ const gazelleTokensSlot: SlotDefinition<StatCardStackedProps> = {
         { label: "Merit", value: hasMerit ? merit : "—" },
       ],
       total: { label: "Total", value: String(gift + merit) },
-      accentColor,
+      accentColor: ctx.accentColor,
     }
   },
 }
@@ -206,15 +203,14 @@ const perfectFlacsSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 22,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.perfectFlacs == null) return null
     if (gazMeta.community.perfectFlacs <= 0) return null
     return {
       label: "Perfect FLACs",
       value: gazMeta.community.perfectFlacs,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(UploadArrowIcon),
     }
   },
@@ -226,14 +222,13 @@ const snatchedGazelleSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 23,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.snatched == null) return null
     return {
       label: "Snatched",
       value: gazMeta.community.snatched,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(DownloadArrowIcon),
     }
   },
@@ -245,15 +240,14 @@ const torrentsUploadedSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 24,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.uploaded == null) return null
     if (gazMeta.community.uploaded <= 0) return null
     return {
       label: "Torrents Uploaded",
       value: gazMeta.community.uploaded,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(UploadArrowIcon),
     }
   },
@@ -265,15 +259,14 @@ const requestsFilledSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 25,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.requestsFilled == null) return null
     if (gazMeta.community.requestsFilled <= 0) return null
     return {
       label: "Requests Filled",
       value: gazMeta.community.requestsFilled,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(UploadArrowIcon),
     }
   },
@@ -285,15 +278,14 @@ const groupsContributedSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 26,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.groups == null) return null
     if (gazMeta.community.groups <= 0) return null
     return {
       label: "Groups Contributed",
       value: gazMeta.community.groups,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(ShieldIcon),
     }
   },
@@ -305,15 +297,14 @@ const invitedSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 27,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (gazMeta.community?.invited == null) return null
     if (gazMeta.community.invited <= 0) return null
     return {
       label: "Invited",
       value: gazMeta.community.invited,
-      accentColor,
+      accentColor: ctx.accentColor,
       icon: icon16(UserIcon),
     }
   },
@@ -326,9 +317,8 @@ const gazelleBountySlot: SlotDefinition<StatCardStackedProps> = {
   priority: 21,
   span: 2,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (!gazMeta.community) return null
     if (gazMeta.community.bountyEarned == null && gazMeta.community.bountySpent == null) return null
     const earned = gazMeta.community.bountyEarned ?? 0
@@ -349,7 +339,7 @@ const gazelleBountySlot: SlotDefinition<StatCardStackedProps> = {
         },
       ],
       total: { label: "Net", value: formatBytesNum(earned - spent) },
-      accentColor,
+      accentColor: ctx.accentColor,
     }
   },
 }
@@ -361,9 +351,8 @@ const gazelleCommentsSlot: SlotDefinition<StatCardStackedProps> = {
   priority: 29,
   span: 2,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("community" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (!gazMeta.community) return null
     const c = gazMeta.community
     const total =
@@ -381,7 +370,7 @@ const gazelleCommentsSlot: SlotDefinition<StatCardStackedProps> = {
         { label: "Collage", value: c.collageComments },
         { label: "Request", value: c.requestComments },
       ],
-      accentColor,
+      accentColor: ctx.accentColor,
     }
   },
 }
@@ -426,9 +415,11 @@ const donorBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 11,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("donor" in meta)) return null
-    if ((meta as { donor?: boolean }).donor !== true) return null
+    const ggMeta = metaFor(ctx, "ggn")
+    const gazMeta = metaFor(ctx, "gazelle")
+    const dcMeta = metaFor(ctx, "digitalcore")
+    const isDonor = ggMeta?.donor ?? gazMeta?.donor ?? dcMeta?.donor
+    if (isDonor !== true) return null
     return { variant: "accent", label: "Donor" }
   },
 }
@@ -439,9 +430,11 @@ const disabledBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 12,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("enabled" in meta)) return null
-    if ((meta as { enabled?: boolean }).enabled !== false) return null
+    const ggMeta = metaFor(ctx, "ggn")
+    const gazMeta = metaFor(ctx, "gazelle")
+    const dcMeta = metaFor(ctx, "digitalcore")
+    const enabled = ggMeta?.enabled ?? gazMeta?.enabled ?? dcMeta?.enabled
+    if (enabled !== false) return null
     return { variant: "danger", label: "Disabled" }
   },
 }
@@ -452,9 +445,8 @@ const ggnParkedBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 20,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("parked" in meta)) return null
-    if ((meta as GGnPlatformMeta).parked !== true) return null
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta || ggMeta.parked !== true) return null
     return { variant: "warn", label: "Parked" }
   },
 }
@@ -465,9 +457,9 @@ const ggnInvitesBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 21,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("invites" in meta)) return null
-    const invites = (meta as GGnPlatformMeta).invites
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta) return null
+    const invites = ggMeta.invites
     if (typeof invites !== "number" || invites <= 0) return null
     return { variant: "default", label: `${invites} Invites` }
   },
@@ -479,12 +471,11 @@ const ggnIrcBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 22,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("onIRC" in meta)) return null
-    if ((meta as GGnPlatformMeta).onIRC !== true) return null
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta || ggMeta.onIRC !== true) return null
     const children = createElement(
       "span",
-      { className: "inline-flex items-center gap-1.5" },
+      { className: "inline-flex items-center gap-2" },
       createElement(PulseDot, { status: "healthy", size: "sm" }),
       "IRC"
     )
@@ -498,9 +489,8 @@ const gazelleParanoiaBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 30,
   resolve(ctx) {
-    const { meta } = ctx
-    if (!meta || !("paranoiaText" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta) return null
     if (!gazMeta.paranoiaText || gazMeta.paranoiaText === "Off") return null
     return { variant: "default", label: `Paranoia: ${gazMeta.paranoiaText}` }
   },
@@ -513,10 +503,8 @@ const gazelleUnreadBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   priority: 31,
   resolve(ctx) {
     if (ctx.tracker.hideUnreadBadges) return null
-    const { meta } = ctx
-    if (!meta || !("notifications" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
-    if (!gazMeta.notifications) return null
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta?.notifications) return null
     if (gazMeta.notifications.messages <= 0) return null
     return { variant: "warn", label: `${gazMeta.notifications.messages} Unread` }
   },
@@ -529,10 +517,8 @@ const gazelleAnnouncementBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   priority: 32,
   resolve(ctx) {
     if (ctx.tracker.hideUnreadBadges) return null
-    const { meta } = ctx
-    if (!meta || !("notifications" in meta)) return null
-    const gazMeta = meta as GazellePlatformMeta
-    if (!gazMeta.notifications?.newAnnouncement) return null
+    const gazMeta = metaFor(ctx, "gazelle")
+    if (!gazMeta?.notifications?.newAnnouncement) return null
     return { variant: "accent", label: "New Announcement" }
   },
 }
@@ -547,11 +533,9 @@ const ggnAchievementProgressSlot: SlotDefinition<GgnAchievementProgressProps> =
   component: GgnAchievementProgress as ComponentType<GgnAchievementProgressProps>,
   priority: 10,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("achievements" in meta)) return null
-    const ggMeta = meta as GGnPlatformMeta
-    if (!ggMeta.achievements) return null
-    return { ggMeta, accentColor }
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta?.achievements) return null
+    return { ggMeta, accentColor: ctx.accentColor }
   },
 }
 
@@ -561,10 +545,10 @@ const ggnShareScoreProgressSlot: SlotDefinition<GgnShareScoreProgressProps> = {
   component: GgnShareScoreProgress as ComponentType<GgnShareScoreProgressProps>,
   priority: 11,
   resolve(ctx) {
-    const { meta, latestSnapshot, accentColor } = ctx
-    if (!meta || !("hourlyGold" in meta)) return null
-    if (latestSnapshot?.shareScore == null) return null
-    return { latestSnapshot, accentColor }
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta) return null
+    if (ctx.latestSnapshot?.shareScore == null) return null
+    return { latestSnapshot: ctx.latestSnapshot, accentColor: ctx.accentColor }
   },
 }
 
@@ -574,11 +558,9 @@ const ggnBuffsSlot: SlotDefinition<GgnBuffsDisplayProps> = {
   component: GgnBuffsDisplay as ComponentType<GgnBuffsDisplayProps>,
   priority: 12,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!meta || !("buffs" in meta)) return null
-    const ggMeta = meta as GGnPlatformMeta
-    if (!ggMeta.buffs || Object.keys(ggMeta.buffs).length === 0) return null
-    return { ggMeta, accentColor }
+    const ggMeta = metaFor(ctx, "ggn")
+    if (!ggMeta?.buffs || Object.keys(ggMeta.buffs).length === 0) return null
+    return { ggMeta, accentColor: ctx.accentColor }
   },
 }
 
@@ -586,10 +568,6 @@ const ggnBuffsSlot: SlotDefinition<GgnBuffsDisplayProps> = {
 // MAM slot definitions
 // ---------------------------------------------------------------------------
 
-function isMamMeta(meta: unknown): meta is MamPlatformMeta {
-  return !!meta && typeof meta === "object" && "vipUntil" in meta
-}
-
 function getDaysUntilVipExpiry(vipUntil: string): number | null {
   const expiry = new Date(vipUntil)
   if (Number.isNaN(expiry.getTime())) return null
@@ -604,13 +582,13 @@ const mamWedgesSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 14,
   resolve(ctx) {
-    const { meta, latestSnapshot, accentColor } = ctx
-    if (!isMamMeta(meta)) return null
-    if (latestSnapshot?.freeleechTokens == null) return null
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta) return null
+    if (ctx.latestSnapshot?.freeleechTokens == null) return null
     return {
       label: "FL Wedges",
-      value: Math.floor(latestSnapshot.freeleechTokens).toLocaleString(),
-      accentColor,
+      value: formatCount(Math.floor(ctx.latestSnapshot.freeleechTokens)),
+      accentColor: ctx.accentColor,
       icon: icon16(StarIcon),
     }
   },
@@ -622,13 +600,12 @@ const mamCompletedSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 22,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!isMamMeta(meta)) return null
-    if (meta.inactiveSatisfiedCount == null) return null
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta || mamMeta.inactiveSatisfiedCount == null) return null
     return {
       label: "Completed",
-      value: meta.inactiveSatisfiedCount,
-      accentColor,
+      value: mamMeta.inactiveSatisfiedCount,
+      accentColor: ctx.accentColor,
       icon: icon16(DownloadArrowIcon),
     }
   },
@@ -640,13 +617,12 @@ const mamTrackerErrorsSlot: SlotDefinition<StatCardBasicProps> = {
   component: StatCard as ComponentType<StatCardBasicProps>,
   priority: 23,
   resolve(ctx) {
-    const { meta, accentColor } = ctx
-    if (!isMamMeta(meta)) return null
-    if (meta.trackerErrorCount == null || meta.trackerErrorCount <= 0) return null
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta || mamMeta.trackerErrorCount == null || mamMeta.trackerErrorCount <= 0) return null
     return {
       label: "Tracker Errors",
-      value: meta.trackerErrorCount,
-      accentColor,
+      value: mamMeta.trackerErrorCount,
+      accentColor: ctx.accentColor,
       alert: "danger" as const,
     }
   },
@@ -658,8 +634,9 @@ const mamVipBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 10,
   resolve(ctx) {
-    if (!isMamMeta(ctx.meta) || !ctx.meta.vipUntil) return null
-    const days = getDaysUntilVipExpiry(ctx.meta.vipUntil)
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta?.vipUntil) return null
+    const days = getDaysUntilVipExpiry(mamMeta.vipUntil)
     if (days == null) return null
     return { variant: days <= 7 ? "warn" : "accent", label: `VIP (${days}d)` }
   },
@@ -671,8 +648,9 @@ const mamConnectableBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   component: SlotBadge,
   priority: 20,
   resolve(ctx) {
-    if (!isMamMeta(ctx.meta) || ctx.meta.connectable == null) return null
-    const lower = ctx.meta.connectable.toLowerCase()
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta || mamMeta.connectable == null) return null
+    const lower = mamMeta.connectable.toLowerCase()
     const isOnline = lower === "yes" || lower === "true" || lower === "online"
     return {
       variant: isOnline ? "default" : "danger",
@@ -688,8 +666,9 @@ const mamUnreadBadgeSlot: SlotDefinition<SlotBadgeProps> = {
   priority: 30,
   resolve(ctx) {
     if (ctx.tracker.hideUnreadBadges) return null
-    if (!isMamMeta(ctx.meta)) return null
-    const count = (ctx.meta.unreadPMs ?? 0) + (ctx.meta.unreadTopics ?? 0)
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta) return null
+    const count = (mamMeta.unreadPMs ?? 0) + (mamMeta.unreadTopics ?? 0)
     if (count <= 0) return null
     return { variant: "warn", label: `${count} Unread` }
   },
@@ -701,21 +680,281 @@ const mamHealthOverviewSlot: SlotDefinition<MamHealthOverviewProps> = {
   component: MamHealthOverview as ComponentType<MamHealthOverviewProps>,
   priority: 10,
   resolve(ctx) {
-    if (!isMamMeta(ctx.meta)) return null
+    const mamMeta = metaFor(ctx, "mam")
+    if (!mamMeta) return null
     return {
-      meta: ctx.meta,
+      meta: mamMeta,
       seedingCount: ctx.latestSnapshot?.seedingCount ?? 0,
       leechingCount: ctx.latestSnapshot?.leechingCount ?? 0,
       hitAndRuns: ctx.latestSnapshot?.hitAndRuns ?? 0,
       seedbonus: ctx.latestSnapshot?.seedbonus ?? null,
       accentColor: ctx.accentColor,
-      vipUntil: ctx.meta.vipUntil ?? null,
-      unsatisfiedCount: ctx.meta.unsatisfiedCount ?? null,
-      unsatisfiedLimit: ctx.meta.unsatisfiedLimit ?? null,
+      vipUntil: mamMeta.vipUntil ?? null,
+      unsatisfiedCount: mamMeta.unsatisfiedCount ?? null,
+      unsatisfiedLimit: mamMeta.unsatisfiedLimit ?? null,
+    }
+  },
+}
+
+// ---------------------------------------------------------------------------
+// AvistaZ slot definitions
+// ---------------------------------------------------------------------------
+
+const avistazActivitySlot: SlotDefinition<StatCardStackedProps> = {
+  id: "avistaz-activity",
+  category: "stat-card",
+  component: StatCard as ComponentType<StatCardStackedProps>,
+  priority: 14,
+  span: 2,
+  resolve(ctx) {
+    const avMeta = metaFor(ctx, "avistaz")
+    if (!avMeta) return null
+    const uploads = avMeta.totalUploads ?? 0
+    const downloads = avMeta.totalDownloads ?? 0
+    if (uploads === 0 && downloads === 0 && !avMeta.bonusPerHour) return null
+    const rows: StatCardRow[] = [
+      { label: "Uploads", value: uploads },
+      { label: "Downloads", value: downloads },
+    ]
+    if (avMeta.bonusPerHour != null) {
+      rows.push({
+        label: "Bonus/hr",
+        prefix: "+",
+        value: formatCount(Math.floor(avMeta.bonusPerHour)),
+        colorClass: "text-success",
+      })
+    }
+    return {
+      type: "stacked" as const,
+      title: "Activity",
+      rows,
+      accentColor: ctx.accentColor,
     }
   },
 }
 
+const avistazDownloadDisabledBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "avistaz-download-disabled",
+  category: "badge",
+  component: SlotBadge,
+  priority: 12,
+  resolve(ctx) {
+    const avMeta = metaFor(ctx, "avistaz")
+    if (!avMeta || avMeta.canDownload !== false) return null
+    return { variant: "danger", label: "Downloads Disabled" }
+  },
+}
+
+const avistazUploadDisabledBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "avistaz-upload-disabled",
+  category: "badge",
+  component: SlotBadge,
+  priority: 12,
+  resolve(ctx) {
+    const avMeta = metaFor(ctx, "avistaz")
+    if (!avMeta || avMeta.canUpload !== false) return null
+    return { variant: "danger", label: "Uploads Disabled" }
+  },
+}
+
+const avistazVipBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "avistaz-vip",
+  category: "badge",
+  component: SlotBadge,
+  priority: 10,
+  resolve(ctx) {
+    const avMeta = metaFor(ctx, "avistaz")
+    if (!avMeta?.vipExpiry) return null
+    const expiry = new Date(avMeta.vipExpiry)
+    if (Number.isNaN(expiry.getTime())) return null
+    const ms = expiry.getTime() - Date.now()
+    if (ms <= 0) return null
+    const days = Math.ceil(ms / (1000 * 60 * 60 * 24))
+    return { variant: days <= 7 ? "warn" : "accent", label: `VIP (${days}d)` }
+  },
+}
+
+const avistazInvitesBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "avistaz-invites",
+  category: "badge",
+  component: SlotBadge,
+  priority: 21,
+  resolve(ctx) {
+    const avMeta = metaFor(ctx, "avistaz")
+    if (!avMeta) return null
+    const invites = avMeta.invites
+    if (typeof invites !== "number" || invites <= 0) return null
+    return { variant: "default", label: `${invites} Invites` }
+  },
+}
+
+// ---------------------------------------------------------------------------
+// DigitalCore slot definitions
+// ---------------------------------------------------------------------------
+
+const dcActivitySlot: SlotDefinition<StatCardStackedProps> = {
+  id: "dc-activity",
+  category: "stat-card",
+  component: StatCard as ComponentType<StatCardStackedProps>,
+  priority: 14,
+  span: 2,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta) return null
+    const torrents = dcMeta.torrents ?? 0
+    const posts = dcMeta.forumPosts ?? 0
+    const comments = dcMeta.torrentComments ?? 0
+    if (torrents === 0 && posts === 0 && comments === 0) return null
+    return {
+      type: "stacked" as const,
+      title: "Activity",
+      rows: [
+        { label: "Uploads", value: torrents },
+        { label: "Forum Posts", value: posts },
+        { label: "Comments", value: comments },
+      ],
+      accentColor: ctx.accentColor,
+    }
+  },
+}
+
+const dcRealDataSlot: SlotDefinition<StatCardStackedProps> = {
+  id: "dc-real-data",
+  category: "stat-card",
+  component: StatCard as ComponentType<StatCardStackedProps>,
+  priority: 15,
+  span: 2,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta) return null
+    if (dcMeta.uploadedReal == null && dcMeta.downloadedReal == null) return null
+    const upReal = dcMeta.uploadedReal ?? 0
+    const downReal = dcMeta.downloadedReal ?? 0
+    const upCredited = Number(ctx.latestSnapshot?.uploadedBytes ?? 0)
+    const downCredited = Number(ctx.latestSnapshot?.downloadedBytes ?? 0)
+    const upDiff = upCredited - upReal
+    const downDiff = downCredited - downReal
+    if (upDiff === 0 && downDiff === 0) return null
+    return {
+      type: "stacked" as const,
+      title: "Freeleech Impact",
+      rows: [
+        {
+          label: "Upload bonus",
+          value: upDiff > 0 ? `+${formatBytesNum(upDiff)}` : "—",
+          colorClass: upDiff > 0 ? "text-success" : undefined,
+        },
+        {
+          label: "Download saved",
+          value: downDiff < 0 ? formatBytesNum(Math.abs(downDiff)) : "—",
+          colorClass: downDiff < 0 ? "text-success" : undefined,
+        },
+      ],
+      accentColor: ctx.accentColor,
+    }
+  },
+}
+
+const dcDownloadBanBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-download-ban",
+  category: "badge",
+  component: SlotBadge,
+  priority: 13,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.downloadBan !== true) return null
+    return { variant: "danger", label: "Download Ban" }
+  },
+}
+
+const dcUploadBanBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-upload-ban",
+  category: "badge",
+  component: SlotBadge,
+  priority: 13,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.uploadBan !== true) return null
+    return { variant: "danger", label: "Upload Ban" }
+  },
+}
+
+const dcHnrWarnedBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-hnr-warned",
+  category: "badge",
+  component: SlotBadge,
+  priority: 14,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.hnrWarned !== true) return null
+    return { variant: "warn", label: "HnR Warned" }
+  },
+}
+
+const dcParkedBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-parked",
+  category: "badge",
+  component: SlotBadge,
+  priority: 20,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.parked !== true) return null
+    return { variant: "warn", label: "Parked" }
+  },
+}
+
+const dcUnconnectableBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-unconnectable",
+  category: "badge",
+  component: SlotBadge,
+  priority: 20,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.connectable !== false) return null
+    return { variant: "warn", label: "Not Connectable" }
+  },
+}
+
+const dcSeedboxDonorBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-seedbox-donor",
+  category: "badge",
+  component: SlotBadge,
+  priority: 11,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta || dcMeta.seedboxDonor !== true) return null
+    return { variant: "accent", label: "Seedbox Donor" }
+  },
+}
+
+const dcInvitesBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-invites",
+  category: "badge",
+  component: SlotBadge,
+  priority: 21,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta) return null
+    const invites = dcMeta.invites
+    if (typeof invites !== "number" || invites <= 0) return null
+    return { variant: "default", label: `${invites} Invites` }
+  },
+}
+
+const dcHeartsBadgeSlot: SlotDefinition<SlotBadgeProps> = {
+  id: "dc-hearts",
+  category: "badge",
+  component: SlotBadge,
+  priority: 22,
+  resolve(ctx) {
+    const dcMeta = metaFor(ctx, "digitalcore")
+    if (!dcMeta) return null
+    const hearts = dcMeta.hearts
+    if (typeof hearts !== "number" || hearts <= 0) return null
+    return { variant: "accent", label: `${hearts} Hearts` }
+  },
+}
+
 // ---------------------------------------------------------------------------
 // Exported registry
 // ---------------------------------------------------------------------------
@@ -760,6 +999,25 @@ export const SLOT_DEFINITIONS: AnySlotDefinition[] = [
   ggnBuffsSlot,
   // MAM slots (progress)
   mamHealthOverviewSlot,
+  // AvistaZ slots (stat-card)
+  avistazActivitySlot,
+  // AvistaZ slots (badge)
+  avistazDownloadDisabledBadgeSlot,
+  avistazUploadDisabledBadgeSlot,
+  avistazVipBadgeSlot,
+  avistazInvitesBadgeSlot,
+  // DigitalCore slots (stat-card)
+  dcActivitySlot,
+  dcRealDataSlot,
+  // DigitalCore slots (badge)
+  dcDownloadBanBadgeSlot,
+  dcUploadBanBadgeSlot,
+  dcHnrWarnedBadgeSlot,
+  dcParkedBadgeSlot,
+  dcUnconnectableBadgeSlot,
+  dcSeedboxDonorBadgeSlot,
+  dcInvitesBadgeSlot,
+  dcHeartsBadgeSlot,
 ]
 
 // Shared component lookup — single source for rendering resolved slots
diff --git a/src/components/ui/ActionButtons.tsx b/src/components/ui/ActionButtons.tsx
new file mode 100644
index 00000000..39279fee
--- /dev/null
+++ b/src/components/ui/ActionButtons.tsx
@@ -0,0 +1,116 @@
+// src/components/ui/ActionButtons.tsx
+"use client"
+
+import { useCallback, useState } from "react"
+import { Button } from "@/components/ui/Button"
+import { CheckLargeIcon, CopyIcon, DownloadArrowIcon } from "@/components/ui/Icons"
+import { downloadResponseBlob } from "@/lib/download"
+
+// ── CopyButton ───────────────────────────────────────────────────────────────
+
+interface CopyButtonProps {
+  value: string
+  label?: string
+  className?: string
+}
+
+function CopyButton({ value, label, className }: CopyButtonProps) {
+  const [copied, setCopied] = useState(false)
+
+  const handleCopy = useCallback(() => {
+    navigator.clipboard
+      .writeText(value)
+      .then(() => {
+        setCopied(true)
+        setTimeout(() => setCopied(false), 2000)
+      })
+      .catch(() => {
+        // clipboard unavailable. silently skip
+      })
+  }, [value])
+
+  const icon = copied ? (
+    <CheckLargeIcon width="12" height="12" className="text-success" />
+  ) : (
+    <CopyIcon width="12" height="12" />
+  )
+
+  const text = label !== undefined ? (copied ? "Copied" : label) : undefined
+
+  return (
+    <Button
+      variant="secondary"
+      size={text ? "sm" : "icon"}
+      onClick={handleCopy}
+      aria-label="Copy to clipboard"
+      leftIcon={icon}
+      text={text}
+      className={className}
+    />
+  )
+}
+
+// ── DownloadButton ───────────────────────────────────────────────────────────
+
+interface DownloadButtonProps {
+  url: string
+  fallbackFilename: string
+  label?: string
+  notFoundMessage?: string
+  onError?: (message: string) => void
+  className?: string
+}
+
+function DownloadButton({
+  url,
+  fallbackFilename,
+  label,
+  notFoundMessage = "File not found",
+  onError,
+  className,
+}: DownloadButtonProps) {
+  const [loading, setLoading] = useState(false)
+  const [done, setDone] = useState(false)
+
+  const handleDownload = useCallback(async () => {
+    setLoading(true)
+    try {
+      const res = await fetch(url)
+      if (!res.ok) {
+        onError?.(res.status === 404 ? notFoundMessage : "Download failed")
+        return
+      }
+      await downloadResponseBlob(res, fallbackFilename)
+      setDone(true)
+      setTimeout(() => setDone(false), 2000)
+    } catch {
+      onError?.("Download failed")
+    } finally {
+      setLoading(false)
+    }
+  }, [url, fallbackFilename, notFoundMessage, onError])
+
+  const icon = done ? (
+    <CheckLargeIcon width="12" height="12" className="text-success" />
+  ) : (
+    <DownloadArrowIcon width="12" height="12" />
+  )
+
+  const text = label !== undefined ? (done ? "Done" : loading ? "…" : label) : undefined
+
+  return (
+    <Button
+      variant="secondary"
+      size={text ? "sm" : "icon"}
+      onClick={handleDownload}
+      disabled={loading}
+      aria-label="Download file"
+      leftIcon={icon}
+      text={text}
+      className={className}
+    />
+  )
+}
+
+export type { CopyButtonProps, DownloadButtonProps }
+export { CopyButton, DownloadButton }
diff --git a/src/components/ui/AreaInput.tsx b/src/components/ui/AreaInput.tsx
new file mode 100644
index 00000000..66572b05
--- /dev/null
+++ b/src/components/ui/AreaInput.tsx
@@ -0,0 +1,54 @@
+// src/components/ui/AreaInput.tsx
+
+import clsx from "clsx"
+import { type Ref, type TextareaHTMLAttributes, useId } from "react"
+
+interface AreaInputProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
+  label?: string
+  error?: string
+  ref?: Ref<HTMLTextAreaElement>
+}
+
+function AreaInput({ label, error, className, id, ref, ...props }: AreaInputProps) {
+  const generatedId = useId()
+  const inputId = id ?? generatedId
+
+  return (
+    <div className="flex flex-col gap-1 w-full">
+      {label && (
+        <label
+          htmlFor={inputId}
+          className="text-xs font-sans font-medium text-secondary uppercase tracking-wider"
+        >
+          {label}
+        </label>
+      )}
+      <textarea
+        ref={ref}
+        id={inputId}
+        className={clsx(
+          "w-full font-mono text-sm text-primary",
+          "bg-control-bg rounded-nm-md",
+          "px-4 py-3 placeholder:text-muted",
+          "transition-all duration-150",
+          "nm-inset",
+          "focus:outline-none focus:nm-inset",
+          "disabled:opacity-40 disabled:cursor-not-allowed",
+          "border-0 resize-y",
+          className
+        )}
+        aria-invalid={error ? "true" : undefined}
+        aria-describedby={error ? `${inputId}-error` : undefined}
+        {...props}
+      />
+      {error && (
+        <p id={`${inputId}-error`} className="text-xs font-sans text-danger" role="alert">
+          {error}
+        </p>
+      )}
+    </div>
+  )
+}
+
+export type { AreaInputProps }
+export { AreaInput }
diff --git a/src/components/ui/BackToTop.tsx b/src/components/ui/BackToTop.tsx
index bc5626b3..0fa5f647 100644
--- a/src/components/ui/BackToTop.tsx
+++ b/src/components/ui/BackToTop.tsx
@@ -49,6 +49,8 @@ interface BackToTopProps {
   scrollRef: React.RefObject<HTMLElement | null>
 }
 
+export type { BackToTopProps }
+
 export function BackToTop({ scrollRef }: BackToTopProps) {
   const [visible, setVisible] = useState(false)
   const [scrollProgress, setScrollProgress] = useState(0)
@@ -88,7 +90,7 @@ export function BackToTop({ scrollRef }: BackToTopProps) {
     <button
       type="button"
       onClick={scrollToTop}
-      className="fixed bottom-6 right-6 z-40 w-10 h-10 grid place-items-center rounded-full bg-elevated text-tertiary hover:text-primary cursor-pointer"
+      className="fixed bottom-6 right-6 z-30 w-10 h-10 grid place-items-center rounded-full bg-elevated text-tertiary hover:text-primary cursor-pointer"
       style={{
         boxShadow: buildShadow(scrollProgress),
         opacity: visible ? 1 : 0,
diff --git a/src/components/ui/Badge.tsx b/src/components/ui/Badge.tsx
index b2043f7f..f5070c84 100644
--- a/src/components/ui/Badge.tsx
+++ b/src/components/ui/Badge.tsx
@@ -1,5 +1,4 @@
 // src/components/ui/Badge.tsx
-
 import { cva } from "class-variance-authority"
 import clsx from "clsx"
 import type { HTMLAttributes } from "react"
diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx
index 3d9b02a1..47445ad8 100644
--- a/src/components/ui/Button.tsx
+++ b/src/components/ui/Button.tsx
@@ -1,15 +1,19 @@
 // src/components/ui/Button.tsx
-
 import { cva } from "class-variance-authority"
 import clsx from "clsx"
-import type { ButtonHTMLAttributes, Ref } from "react"
+import type { ButtonHTMLAttributes, ReactNode, Ref } from "react"
+import { SpinnerIcon } from "@/components/ui/Icons"
 
-type ButtonVariant = "primary" | "secondary" | "ghost" | "danger"
-type ButtonSize = "sm" | "md" | "lg"
+type ButtonVariant = "primary" | "secondary" | "ghost" | "danger" | "minimal"
+type ButtonSize = "icon" | "sm" | "md" | "lg"
 
 interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
   variant?: ButtonVariant
   size?: ButtonSize
+  text?: string
+  leftIcon?: ReactNode
+  rightIcon?: ReactNode
+  loading?: boolean
   ref?: Ref<HTMLButtonElement>
 }
 
@@ -31,8 +35,10 @@ const button = cva(
           "bg-transparent text-secondary hover:bg-raised hover:text-primary hover:nm-raised-sm active:scale-[0.96]",
         danger:
           "bg-danger-dim text-danger nm-raised-sm hover:nm-raised active:nm-pressed active:scale-[0.93]",
+        minimal: "bg-transparent text-muted hover:text-secondary",
       },
       size: {
+        icon: "p-1.5 rounded-nm-sm",
         sm: "px-4 py-2 text-xs gap-2 rounded-nm-sm",
         md: "px-5 py-2 text-sm gap-2 rounded-nm-md",
         lg: "px-6 py-3 text-base gap-3 rounded-nm-md",
@@ -48,6 +54,11 @@ const button = cva(
 function Button({
   variant = "primary",
   size = "md",
+  text,
+  leftIcon,
+  rightIcon,
+  loading = false,
+  type = "button",
   className,
   disabled,
   children,
@@ -55,15 +66,21 @@ function Button({
   ref,
   ...props
 }: ButtonProps) {
+  const content = children ?? text
+
   return (
     <button
       ref={ref}
-      disabled={disabled}
+      type={type}
+      disabled={disabled || loading}
+      aria-busy={loading || undefined}
       className={clsx(button({ variant, size }), className)}
       style={style}
       {...props}
     >
-      {children}
+      {loading ? <SpinnerIcon className="animate-spin h-4 w-4 shrink-0" /> : leftIcon}
+      {content}
+      {rightIcon}
     </button>
   )
 }
diff --git a/src/components/ui/Card.tsx b/src/components/ui/Card.tsx
index 3f3afa7b..038087b7 100644
--- a/src/components/ui/Card.tsx
+++ b/src/components/ui/Card.tsx
@@ -1,9 +1,9 @@
 // src/components/ui/Card.tsx
-
+import { H2 } from "@typography"
 import { cva } from "class-variance-authority"
 import clsx from "clsx"
 import type { CSSProperties, HTMLAttributes } from "react"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 
 type CardElevation = "raised" | "elevated"
 
@@ -12,6 +12,9 @@ interface CardProps extends HTMLAttributes<HTMLDivElement> {
   glow?: boolean
   glowColor?: string
   trackerColor?: string
+  title?: string
+  subtitle?: string
+  lazy?: boolean
 }
 
 const card = cva("p-5", {
@@ -31,25 +34,46 @@ function Card({
   glow = false,
   glowColor,
   trackerColor,
+  title,
+  subtitle,
+  lazy,
   className,
   style,
   children,
   ...props
 }: CardProps) {
-  const glowStyle: CSSProperties = {}
+  const composedStyle: CSSProperties = {}
 
+  // Outer haze
   if (trackerColor) {
-    glowStyle.filter = `drop-shadow(0 0 16px ${hexToRgba(trackerColor, 0.15)})`
+    composedStyle.filter = `drop-shadow(0 0 16px ${hexToRgba(trackerColor, 0.11)})`
   } else if (glow && glowColor) {
-    glowStyle.filter = `drop-shadow(0 0 16px ${glowColor})`
+    composedStyle.filter = `drop-shadow(0 0 16px ${glowColor})`
+  }
+
+  // Inset accent — pseudo-element for the "face"
+  if (trackerColor) {
+    ;(composedStyle as Record<string, string>)["--card-accent"] = hexToRgba(trackerColor, 0.08)
   }
 
   return (
     <div
-      className={clsx(card({ elevation }), "rounded-nm-lg", className)}
-      style={{ ...glowStyle, ...style }}
+      className={clsx(
+        card({ elevation }),
+        "rounded-nm-lg",
+        lazy && "lazy-card",
+        trackerColor && "card-accent",
+        className
+      )}
+      style={{ ...composedStyle, ...style }}
       {...props}
     >
+      {(title || subtitle) && (
+        <div className="flex flex-col gap-1">
+          {title && <H2 className="card-heading">{title}</H2>}
+          {subtitle && <p className="text-xs font-mono text-tertiary">{subtitle}</p>}
+        </div>
+      )}
       {children}
     </div>
   )
diff --git a/src/components/ui/Checkbox.tsx b/src/components/ui/Checkbox.tsx
index 4d171521..2c66a020 100644
--- a/src/components/ui/Checkbox.tsx
+++ b/src/components/ui/Checkbox.tsx
@@ -1,7 +1,4 @@
 // src/components/ui/Checkbox.tsx
-//
-// Functions: Checkbox
-
 "use client"
 
 import clsx from "clsx"
@@ -52,7 +49,7 @@ function Checkbox({
         <span
           className={clsx(
             "absolute inset-0 block rounded-nm-sm transition-all duration-150",
-            "peer-focus-visible:ring-2 peer-focus-visible:ring-[color:var(--color-control-focus)] peer-focus-visible:ring-offset-1 peer-focus-visible:ring-offset-base",
+            "peer-focus-visible:ring-2 peer-focus-visible:ring-(--color-control-focus) peer-focus-visible:ring-offset-1 peer-focus-visible:ring-offset-base",
             checked ? "nm-raised-sm bg-accent-dim" : "nm-inset-sm bg-control-bg"
           )}
         >
diff --git a/src/components/ui/ChevronToggle.tsx b/src/components/ui/ChevronToggle.tsx
index 8b1aa306..c2d3c429 100644
--- a/src/components/ui/ChevronToggle.tsx
+++ b/src/components/ui/ChevronToggle.tsx
@@ -1,5 +1,4 @@
 // src/components/ui/ChevronToggle.tsx
-
 import { clsx } from "clsx"
 
 interface ChevronToggleProps {
@@ -13,7 +12,7 @@ function ChevronToggle({ expanded, variant = "pivot", className }: ChevronToggle
     return (
       <span
         className={clsx(
-          "inline-block transition-transform duration-150 text-tertiary text-sm shrink-0",
+          "inline-block transition-transform duration-150 ease-in-out text-tertiary text-sm shrink-0",
           expanded ? "rotate-0" : "rotate-180",
           className
         )}
@@ -26,7 +25,7 @@ function ChevronToggle({ expanded, variant = "pivot", className }: ChevronToggle
   return (
     <span
       className={clsx(
-        "inline-block transition-transform duration-150 text-[10px]",
+        "inline-block transition-transform duration-150 text-3xs",
         expanded ? "rotate-90" : "rotate-0",
         className
       )}
diff --git a/src/components/ui/CollapsibleCard.tsx b/src/components/ui/CollapsibleCard.tsx
index 734afa41..f9aa2201 100644
--- a/src/components/ui/CollapsibleCard.tsx
+++ b/src/components/ui/CollapsibleCard.tsx
@@ -1,7 +1,4 @@
 // src/components/ui/CollapsibleCard.tsx
-//
-// Functions: CollapsibleCard
-
 "use client"
 
 import { type ReactNode, useRef, useState } from "react"
@@ -9,22 +6,17 @@ import { Card } from "@/components/ui/Card"
 import { ChevronToggle } from "@/components/ui/ChevronToggle"
 
 interface CollapsibleCardProps {
-  /** Always-visible header content (left side — title, badges, meta) */
   header: ReactNode
-  /** Optional content between header and collapsible body (i.e. uptime bars) — always visible */
   subheader?: ReactNode
-  /** Trailing content in the header row before the chevron (i.e. type label) */
   trailing?: ReactNode
-  /** Collapsible body content */
   children: ReactNode
-  /** Controlled expanded state — if omitted, uses internal state */
   expanded?: boolean
-  /** Controlled toggle callback */
   onToggle?: () => void
-  /** Start expanded */
   defaultExpanded?: boolean
 }
 
+export type { CollapsibleCardProps }
+
 export function CollapsibleCard({
   header,
   subheader,
@@ -47,12 +39,12 @@ export function CollapsibleCard({
   }
 
   return (
-    <Card elevation="raised" className="flex flex-col gap-0 !p-0 overflow-hidden">
+    <Card elevation="raised" className="flex flex-col gap-0 p-0 overflow-hidden">
       <button
         type="button"
         onClick={handleToggle}
         aria-expanded={isExpanded}
-        className="flex items-center gap-3 px-5 py-4 w-full text-left cursor-pointer hover:bg-overlay transition-colors duration-100"
+        className="flex items-center gap-3 px-5 py-4 w-full text-left cursor-pointer hover:bg-overlay active:nm-inset-sm active:scale-[0.99] transition-colors duration-100"
       >
         <div className="flex-1 min-w-0 flex items-center gap-3">{header}</div>
         {trailing && <span className="text-xs font-mono text-tertiary shrink-0">{trailing}</span>}
diff --git a/src/components/ui/ColorPicker.tsx b/src/components/ui/ColorPicker.tsx
index 94c56e2a..1368fa2e 100644
--- a/src/components/ui/ColorPicker.tsx
+++ b/src/components/ui/ColorPicker.tsx
@@ -1,9 +1,13 @@
 // src/components/ui/ColorPicker.tsx
-
 "use client"
 
-import { useCallback, useEffect, useRef, useState } from "react"
+import { H2 } from "@typography"
+import { useCallback, useRef, useState } from "react"
 import { HexColorPicker } from "react-colorful"
+import { useAnimatedPresence } from "@/hooks/useAnimatedPresence"
+import { useClickOutside } from "@/hooks/useClickOutside"
+import { useEscapeKey } from "@/hooks/useEscapeKey"
+import { isValidHex } from "@/lib/validators"
 import { Button } from "./Button"
 
 interface ColorPickerProps {
@@ -14,36 +18,10 @@ interface ColorPickerProps {
 
 function ColorPicker({ value, onChange, label }: ColorPickerProps) {
   const [open, setOpen] = useState(false)
-  const [mounted, setMounted] = useState(false)
-  const [visible, setVisible] = useState(false)
   const [draft, setDraft] = useState(value)
   const [hexInput, setHexInput] = useState(value)
   const ref = useRef<HTMLDivElement>(null)
-  const popoverRef = useRef<HTMLDivElement>(null)
-
-  // Sync draft when value changes externally
-  useEffect(() => {
-    setDraft(value)
-    setHexInput(value)
-  }, [value])
-
-  // Mount/unmount with animation
-  useEffect(() => {
-    if (open) {
-      setMounted(true)
-      requestAnimationFrame(() => {
-        requestAnimationFrame(() => setVisible(true))
-      })
-    } else {
-      setVisible(false)
-    }
-  }, [open])
-
-  function handleTransitionEnd() {
-    if (!visible) {
-      setMounted(false)
-    }
-  }
+  const { mounted, visible, onTransitionEnd } = useAnimatedPresence(open)
 
   const dismiss = useCallback(() => {
     setDraft(value)
@@ -51,30 +29,8 @@ function ColorPicker({ value, onChange, label }: ColorPickerProps) {
     setOpen(false)
   }, [value])
 
-  // Close on click outside — capture phase to beat dialog handlers
-  useEffect(() => {
-    if (!open) return
-    function handleClick(e: MouseEvent) {
-      if (ref.current && !ref.current.contains(e.target as Node)) {
-        dismiss()
-      }
-    }
-    document.addEventListener("mousedown", handleClick, true)
-    return () => document.removeEventListener("mousedown", handleClick, true)
-  }, [open, dismiss])
-
-  // Close on Escape
-  useEffect(() => {
-    if (!open) return
-    function handleKey(e: KeyboardEvent) {
-      if (e.key === "Escape") {
-        e.stopPropagation()
-        dismiss()
-      }
-    }
-    document.addEventListener("keydown", handleKey, true)
-    return () => document.removeEventListener("keydown", handleKey, true)
-  }, [open, dismiss])
+  useClickOutside(ref, dismiss, open)
+  useEscapeKey(dismiss, open, { capture: true, stopPropagation: true })
 
   function handleDraftChange(color: string) {
     setDraft(color)
@@ -83,7 +39,7 @@ function ColorPicker({ value, onChange, label }: ColorPickerProps) {
 
   function handleHexInputChange(v: string) {
     setHexInput(v)
-    if (/^#[0-9a-fA-F]{6}$/.test(v)) {
+    if (isValidHex(v)) {
       setDraft(v)
     }
   }
@@ -95,24 +51,25 @@ function ColorPicker({ value, onChange, label }: ColorPickerProps) {
 
   return (
     <div className="flex flex-col gap-1">
-      {label && (
-        <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-          {label}
-        </span>
-      )}
+      {label && <H2 className="uppercase tracking-wider">{label}</H2>}
       <div ref={ref} className="relative">
         <button
           type="button"
-          onClick={() => setOpen((o) => !o)}
+          onClick={() => {
+            if (!open) {
+              setDraft(value)
+              setHexInput(value)
+            }
+            setOpen((o) => !o)
+          }}
           className="h-10 w-14 nm-inset-sm cursor-pointer focus:outline-none rounded-nm-md border border-border"
           style={{ backgroundColor: value }}
           aria-label={`Color: ${value}`}
         />
         {mounted && (
           <div
-            ref={popoverRef}
-            onTransitionEnd={handleTransitionEnd}
-            className="absolute bottom-full left-0 mb-2 z-50 nm-raised-sm p-3 bg-elevated rounded-nm-md flex flex-col gap-2 w-[220px]"
+            onTransitionEnd={onTransitionEnd}
+            className="absolute bottom-full left-0 mb-2 z-40 nm-raised-sm p-3 bg-elevated rounded-nm-md flex flex-col gap-2 w-55"
             style={{
               transformOrigin: "bottom left",
               opacity: visible ? 1 : 0,
@@ -138,9 +95,7 @@ function ColorPicker({ value, onChange, label }: ColorPickerProps) {
                 spellCheck={false}
               />
             </div>
-            <Button type="button" size="sm" onClick={handleConfirm} className="w-full">
-              Set Color
-            </Button>
+            <Button size="sm" onClick={handleConfirm} className="w-full" text="Set Color" />
           </div>
         )}
       </div>
diff --git a/src/components/ui/ConfirmAction.tsx b/src/components/ui/ConfirmAction.tsx
new file mode 100644
index 00000000..b650455c
--- /dev/null
+++ b/src/components/ui/ConfirmAction.tsx
@@ -0,0 +1,62 @@
+// src/components/ui/ConfirmAction.tsx
+
+import { cva } from "class-variance-authority"
+import type { ReactNode } from "react"
+import { Button } from "@/components/ui/Button"
+
+const confirmVariants = cva("nm-inset-sm p-4 flex flex-col gap-3 rounded-nm-md", {
+  variants: {
+    colorScheme: {
+      danger: "bg-danger-dim",
+      warn: "bg-warn-dim",
+    },
+  },
+  defaultVariants: { colorScheme: "danger" },
+})
+
+interface ConfirmActionProps {
+  colorScheme?: "danger" | "warn"
+  message: ReactNode
+  confirmLabel: string
+  confirmingLabel?: string
+  onConfirm: () => void
+  onCancel: () => void
+  confirming?: boolean
+  confirmDisabled?: boolean
+  children?: ReactNode
+  additionalActions?: ReactNode
+}
+
+function ConfirmAction({
+  colorScheme = "danger",
+  message,
+  confirmLabel,
+  confirmingLabel,
+  onConfirm,
+  onCancel,
+  confirming = false,
+  confirmDisabled = false,
+  children,
+  additionalActions,
+}: ConfirmActionProps) {
+  return (
+    <div className={confirmVariants({ colorScheme })}>
+      <p className="text-sm font-sans text-primary leading-relaxed">{message}</p>
+      {children}
+      <div className="flex gap-3">
+        <Button
+          size="sm"
+          variant="danger"
+          disabled={confirming || confirmDisabled}
+          onClick={onConfirm}
+          text={confirming ? (confirmingLabel ?? confirmLabel) : confirmLabel}
+        />
+        {additionalActions}
+        <Button size="sm" variant="ghost" onClick={onCancel} disabled={confirming} text="Cancel" />
+      </div>
+    </div>
+  )
+}
+
+export type { ConfirmActionProps }
+export { ConfirmAction }
diff --git a/src/components/ui/ConfirmRemove.tsx b/src/components/ui/ConfirmRemove.tsx
new file mode 100644
index 00000000..54ae9190
--- /dev/null
+++ b/src/components/ui/ConfirmRemove.tsx
@@ -0,0 +1,62 @@
+// src/components/ui/ConfirmRemove.tsx
+"use client"
+
+import { useState } from "react"
+import { Button } from "@/components/ui/Button"
+
+interface ConfirmRemoveProps {
+  onConfirm: () => void
+  label?: string
+  confirmLabel?: string
+  variant?: "danger" | "ghost"
+  className?: string
+  /** Disables buttons and shows busyLabel while processing */
+  busy?: boolean
+  busyLabel?: string
+}
+
+function ConfirmRemove({
+  onConfirm,
+  label = "Remove",
+  confirmLabel = "Confirm Remove",
+  variant = "danger",
+  className,
+  busy,
+  busyLabel,
+}: ConfirmRemoveProps) {
+  const [confirming, setConfirming] = useState(false)
+
+  if (confirming) {
+    return (
+      <div className="flex items-center gap-2">
+        <Button
+          size="sm"
+          variant="danger"
+          onClick={onConfirm}
+          disabled={busy}
+          text={busy && busyLabel ? busyLabel : confirmLabel}
+        />
+        <Button
+          size="sm"
+          variant="ghost"
+          onClick={() => setConfirming(false)}
+          disabled={busy}
+          text="Cancel"
+        />
+      </div>
+    )
+  }
+
+  return (
+    <Button
+      size="sm"
+      variant={variant}
+      className={className}
+      onClick={() => setConfirming(true)}
+      text={label}
+    />
+  )
+}
+
+export type { ConfirmRemoveProps }
+export { ConfirmRemove }
diff --git a/src/components/ui/CopyButton.tsx b/src/components/ui/CopyButton.tsx
deleted file mode 100644
index dd9a75b9..00000000
--- a/src/components/ui/CopyButton.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-// src/components/ui/CopyButton.tsx
-
-"use client"
-
-import { useCallback, useState } from "react"
-import { CheckLargeIcon, CopyIcon } from "@/components/ui/Icons"
-
-interface CopyButtonProps {
-  value: string
-  label?: string
-  className?: string
-}
-
-function CopyButton({ value, label, className }: CopyButtonProps) {
-  const [copied, setCopied] = useState(false)
-
-  const handleCopy = useCallback(() => {
-    navigator.clipboard
-      .writeText(value)
-      .then(() => {
-        setCopied(true)
-        setTimeout(() => setCopied(false), 2000)
-      })
-      .catch(() => {
-        // clipboard unavailable. silently skip
-      })
-  }, [value])
-
-  return (
-    <button
-      type="button"
-      onClick={handleCopy}
-      aria-label="Copy to clipboard"
-      className={
-        className ??
-        "flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-sans font-medium text-tertiary hover:text-primary bg-elevated nm-raised-sm rounded-nm-sm transition-colors duration-150 cursor-pointer"
-      }
-    >
-      {copied ? (
-        <>
-          <CheckLargeIcon width="12" height="12" className="text-success" />
-          {label !== undefined ? "Copied" : null}
-        </>
-      ) : (
-        <>
-          <CopyIcon width="12" height="12" />
-          {label !== undefined ? label : null}
-        </>
-      )}
-    </button>
-  )
-}
-
-export type { CopyButtonProps }
-export { CopyButton }
diff --git a/src/components/ui/Dialog.tsx b/src/components/ui/Dialog.tsx
index bfc35ad4..b1f66d9e 100644
--- a/src/components/ui/Dialog.tsx
+++ b/src/components/ui/Dialog.tsx
@@ -1,12 +1,12 @@
 // src/components/ui/Dialog.tsx
-//
-// Functions: Dialog
-
 "use client"
 
-import { type ReactNode, useCallback, useEffect, useRef, useState } from "react"
+import { H2 } from "@typography"
+import clsx from "clsx"
+import { type ReactNode, useCallback, useEffect, useRef } from "react"
 import { Button } from "@/components/ui/Button"
 import { XIcon } from "@/components/ui/Icons"
+import { useAnimatedPresence } from "@/hooks/useAnimatedPresence"
 
 type DialogSize = "sm" | "md" | "lg" | "xl" | "full"
 
@@ -25,10 +25,18 @@ interface DialogProps {
   ariaLabel?: string
   /** Preset size. Defaults to "md". Overridden by explicit maxWidth/maxHeight. */
   size?: DialogSize
-  /** Tailwind max-width class (e.g. "max-w-3xl"). Overrides size preset. */
+  /** Tailwind max-width class (i.e "max-w-3xl"). Overrides size preset. */
   maxWidth?: string
-  /** CSS max-height value (e.g. "85vh"). Overrides size preset. */
+  /** CSS max-height value (i.e "85vh"). Overrides size preset. */
   maxHeight?: string
+  /** Sticky footer content (action buttons, etc.) */
+  footer?: ReactNode
+  /** When true, disables escape, backdrop click, and close button */
+  busy?: boolean
+  /** If provided, the panel renders as a form with this submit handler */
+  onSubmit?: () => void
+  /** Extra attributes spread onto the form element when onSubmit is used */
+  formProps?: React.HTMLAttributes<HTMLFormElement>
   children: ReactNode
 }
 
@@ -40,55 +48,40 @@ function Dialog({
   size = "md",
   maxWidth,
   maxHeight,
+  footer,
+  busy,
+  onSubmit,
+  formProps,
   children,
 }: DialogProps) {
+  const dialogRef = useRef<HTMLDialogElement>(null)
   const preset = SIZE_PRESETS[size]
   const resolvedMaxWidth = maxWidth ?? preset.maxWidth
   const resolvedMaxHeight = maxHeight ?? preset.maxHeight
-  const [mounted, setMounted] = useState(false)
-  const [visible, setVisible] = useState(false)
-  const panelRef = useRef<HTMLDivElement>(null)
-
-  // Mount → animate in, or animate out → unmount
-  useEffect(() => {
-    if (open) {
-      setMounted(true)
-      requestAnimationFrame(() => requestAnimationFrame(() => setVisible(true)))
-    } else {
-      setVisible(false)
-    }
-  }, [open])
-
-  // Unmount after exit transition completes (wait for opacity/transform on panel)
-  useEffect(() => {
-    const panel = panelRef.current
-    if (!panel || visible) return
-
-    function handleEnd(e: TransitionEvent) {
-      if (e.propertyName === "opacity" && !visible) {
-        setMounted(false)
-      }
-    }
-
-    panel.addEventListener("transitionend", handleEnd)
-    return () => panel.removeEventListener("transitionend", handleEnd)
-  }, [visible])
-
-  // Escape key
-  const handleKey = useCallback(
-    (e: KeyboardEvent) => {
-      if (e.key === "Escape") onClose()
+  const {
+    mounted,
+    visible,
+    onTransitionEnd: baseOnTransitionEnd,
+  } = useAnimatedPresence(open, "opacity")
+
+  // Wrap transition end to close native dialog before unmount (restores focus to trigger)
+  const onTransitionEnd = useCallback(
+    (e: { propertyName: string }) => {
+      if (!visible) dialogRef.current?.close()
+      baseOnTransitionEnd(e)
     },
-    [onClose]
+    [visible, baseOnTransitionEnd]
   )
 
+  // Sync native dialog with mount lifecycle
   useEffect(() => {
-    if (!mounted) return
-    document.addEventListener("keydown", handleKey)
-    return () => document.removeEventListener("keydown", handleKey)
-  }, [mounted, handleKey])
+    const dialog = dialogRef.current
+    if (dialog && mounted && !dialog.open) {
+      dialog.showModal()
+    }
+  }, [mounted])
 
-  // Body scroll lock
+  // Body scroll lock — native dialog does not prevent background scrolling
   useEffect(() => {
     if (!mounted) return
     document.body.style.overflow = "hidden"
@@ -97,80 +90,101 @@ function Dialog({
     }
   }, [mounted])
 
+  const handleClose = useCallback(() => {
+    if (!busy) onClose()
+  }, [busy, onClose])
+
   if (!mounted) return null
 
   const titleIsString = typeof title === "string"
+  const panelCls = clsx(
+    "relative w-full flex flex-col bg-elevated nm-raised rounded-nm-xl overflow-hidden",
+    resolvedMaxWidth
+  )
+  const panelStyle = {
+    opacity: visible ? 1 : 0,
+    transform: visible ? "scale(1)" : "scale(0.95)",
+    transition: visible
+      ? "opacity 200ms ease-out, transform 200ms ease-out"
+      : "opacity 150ms ease-in, transform 150ms ease-in",
+    maxHeight: resolvedMaxHeight,
+  }
+
+  const header =
+    title !== undefined ? (
+      <div className="flex items-center justify-between px-6 py-4 border-b border-border shrink-0">
+        {titleIsString ? <H2 className="uppercase tracking-wider">{title}</H2> : title}
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={handleClose}
+          disabled={busy}
+          aria-label="Close dialog"
+          className="px-2 py-1.5"
+        >
+          <XIcon width="16" height="16" />
+        </Button>
+      </div>
+    ) : (
+      <div className="absolute top-3 right-3 z-10">
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={handleClose}
+          disabled={busy}
+          aria-label="Close dialog"
+          className="px-2 py-1.5"
+        >
+          <XIcon width="16" height="16" />
+        </Button>
+      </div>
+    )
 
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
-      {/* Backdrop */}
-      <div
-        className="absolute inset-0 bg-black/60 backdrop-blur-sm"
-        onClick={onClose}
-        aria-hidden="true"
-        style={{
-          opacity: visible ? 1 : 0,
-          transition: visible ? "opacity 200ms ease-out" : "opacity 150ms ease-in",
-        }}
-      />
-
-      {/* Panel */}
-      <div
-        ref={panelRef}
-        role="dialog"
-        aria-modal="true"
-        aria-label={ariaLabel ?? (titleIsString ? (title as string) : undefined)}
-        className={[
-          "relative z-10 w-full flex flex-col bg-elevated nm-raised rounded-nm-xl overflow-hidden",
-          resolvedMaxWidth,
-        ].join(" ")}
-        style={{
-          opacity: visible ? 1 : 0,
-          transform: visible ? "scale(1)" : "scale(0.95)",
-          transition: visible
-            ? "opacity 200ms ease-out, transform 200ms ease-out"
-            : "opacity 150ms ease-in, transform 150ms ease-in",
-          maxHeight: resolvedMaxHeight,
-        }}
-      >
-        {/* Header */}
-        {title !== undefined ? (
-          <div className="flex items-center justify-between px-6 py-4 border-b border-border shrink-0">
-            {titleIsString ? (
-              <span className="text-xs font-sans font-medium text-secondary uppercase tracking-wider">
-                {title}
-              </span>
-            ) : (
-              title
-            )}
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={onClose}
-              aria-label="Close dialog"
-              className="px-2 py-1.5"
-            >
-              <XIcon width="16" height="16" />
-            </Button>
-          </div>
-        ) : (
-          <div className="absolute top-3 right-3 z-10">
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={onClose}
-              aria-label="Close dialog"
-              className="px-2 py-1.5"
-            >
-              <XIcon width="16" height="16" />
-            </Button>
-          </div>
-        )}
+  const body = <div className="overflow-y-auto flex-1 p-6">{children}</div>
+  const footerEl = footer ? (
+    <div className="shrink-0 px-6 py-4 border-t border-border">{footer}</div>
+  ) : null
 
-        {/* Body */}
-        <div className="overflow-y-auto flex-1 p-6">{children}</div>
-      </div>
-    </div>
+  return (
+    // biome-ignore lint/a11y/useKeyWithClickEvents: native dialog onCancel handles keyboard (Escape); onClick is backdrop-only dismiss
+    <dialog
+      ref={dialogRef}
+      data-overlay
+      data-visible={visible || undefined}
+      className="fixed inset-0 m-0 p-4 w-screen h-screen bg-transparent flex items-center justify-center outline-none"
+      aria-modal="true"
+      aria-label={ariaLabel ?? (titleIsString ? (title as string) : undefined)}
+      onCancel={(e) => {
+        e.preventDefault()
+        handleClose()
+      }}
+      onClick={(e) => {
+        if (e.target === dialogRef.current) handleClose()
+      }}
+    >
+      {onSubmit ? (
+        <form
+          {...formProps}
+          onTransitionEnd={onTransitionEnd}
+          className={panelCls}
+          style={panelStyle}
+          onSubmit={(e) => {
+            e.preventDefault()
+            onSubmit()
+          }}
+        >
+          {header}
+          {body}
+          {footerEl}
+        </form>
+      ) : (
+        <div onTransitionEnd={onTransitionEnd} className={panelCls} style={panelStyle}>
+          {header}
+          {body}
+          {footerEl}
+        </div>
+      )}
+    </dialog>
   )
 }
 
diff --git a/src/components/ui/Divider.tsx b/src/components/ui/Divider.tsx
new file mode 100644
index 00000000..c3f056a9
--- /dev/null
+++ b/src/components/ui/Divider.tsx
@@ -0,0 +1,17 @@
+// src/components/ui/Divider.tsx
+
+import clsx from "clsx"
+
+interface DividerProps {
+  /** Removes horizontal margin for use inside cards/sheets */
+  compact?: boolean
+  className?: string
+}
+
+function Divider({ compact, className }: DividerProps) {
+  return (
+    <div className={clsx("h-1.5 nm-inset-sm rounded-nm-pill", !compact && "mx-8", className)} />
+  )
+}
+
+export { Divider }
diff --git a/src/components/ui/DownloadButton.tsx b/src/components/ui/DownloadButton.tsx
deleted file mode 100644
index bdfd91d9..00000000
--- a/src/components/ui/DownloadButton.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// src/components/ui/DownloadButton.tsx
-
-"use client"
-
-import { useCallback, useState } from "react"
-import { CheckLargeIcon, DownloadArrowIcon } from "@/components/ui/Icons"
-import { downloadResponseBlob } from "@/lib/download"
-
-interface DownloadButtonProps {
-  url: string
-  fallbackFilename: string
-  label?: string
-  onError?: (message: string) => void
-  className?: string
-}
-
-function DownloadButton({ url, fallbackFilename, label, onError, className }: DownloadButtonProps) {
-  const [loading, setLoading] = useState(false)
-  const [done, setDone] = useState(false)
-
-  const handleDownload = useCallback(async () => {
-    setLoading(true)
-    try {
-      const res = await fetch(url)
-      if (!res.ok) {
-        onError?.(res.status === 404 ? "File not found" : "Download failed")
-        return
-      }
-      await downloadResponseBlob(res, fallbackFilename)
-      setDone(true)
-      setTimeout(() => setDone(false), 2000)
-    } catch {
-      onError?.("Download failed")
-    } finally {
-      setLoading(false)
-    }
-  }, [url, fallbackFilename, onError])
-
-  return (
-    <button
-      type="button"
-      onClick={handleDownload}
-      disabled={loading}
-      aria-label="Download file"
-      className={
-        className ??
-        "flex items-center gap-1.5 px-2.5 py-1.5 text-xs font-sans font-medium text-tertiary hover:text-primary bg-elevated nm-raised-sm rounded-nm-sm transition-colors duration-150 cursor-pointer disabled:opacity-40 disabled:cursor-not-allowed"
-      }
-    >
-      {done ? (
-        <>
-          <CheckLargeIcon width="12" height="12" className="text-success" />
-          {label !== undefined ? "Done" : null}
-        </>
-      ) : (
-        <>
-          <DownloadArrowIcon width="12" height="12" />
-          {label !== undefined ? (loading ? "…" : label) : null}
-        </>
-      )}
-    </button>
-  )
-}
-
-export type { DownloadButtonProps }
-export { DownloadButton }
diff --git a/src/components/ui/EmojiPickerPopover.tsx b/src/components/ui/EmojiPickerPopover.tsx
index 45691c39..59ed12ff 100644
--- a/src/components/ui/EmojiPickerPopover.tsx
+++ b/src/components/ui/EmojiPickerPopover.tsx
@@ -1,12 +1,13 @@
 // src/components/ui/EmojiPickerPopover.tsx
-//
-// Functions: EmojiPickerPopover
-
 "use client"
 
-import EmojiPicker, { EmojiStyle, Theme } from "emoji-picker-react"
-import { useEffect, useRef, useState } from "react"
+import type { EmojiClickData, EmojiStyle, PickerProps, Theme } from "emoji-picker-react"
+import dynamic from "next/dynamic"
+import { useEffect, useLayoutEffect, useRef, useState } from "react"
 import { createPortal } from "react-dom"
+import { useEscapeKey } from "@/hooks/useEscapeKey"
+
+const EmojiPicker = dynamic<PickerProps>(() => import("emoji-picker-react"), { ssr: false })
 
 interface EmojiPickerPopoverProps {
   value: string
@@ -27,33 +28,24 @@ function EmojiPickerPopover({
   const containerRef = useRef<HTMLDivElement>(null)
   const [pos, setPos] = useState<{ top: number; left: number }>({ top: 0, left: 0 })
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     if (!open || !triggerRef.current) return
     const rect = triggerRef.current.getBoundingClientRect()
     setPos({ top: rect.bottom + 8, left: rect.left })
   }, [open])
 
+  useEscapeKey(() => setOpen(false), open, { stopPropagation: true })
+
   useEffect(() => {
     if (!open) return
-    function handleEvent(e: MouseEvent | KeyboardEvent) {
-      if (e instanceof KeyboardEvent) {
-        if (e.key === "Escape") {
-          e.stopPropagation()
-          setOpen(false)
-        }
-        return
-      }
+    function handleMouseDown(e: MouseEvent) {
       const target = e.target as Node
       if (containerRef.current?.contains(target)) return
       if (pickerRef.current?.contains(target)) return
       setOpen(false)
     }
-    document.addEventListener("mousedown", handleEvent)
-    document.addEventListener("keydown", handleEvent)
-    return () => {
-      document.removeEventListener("mousedown", handleEvent)
-      document.removeEventListener("keydown", handleEvent)
-    }
+    document.addEventListener("mousedown", handleMouseDown)
+    return () => document.removeEventListener("mousedown", handleMouseDown)
   }, [open])
 
   return (
@@ -64,7 +56,7 @@ function EmojiPickerPopover({
           type="button"
           onClick={() => setOpen((v) => !v)}
           disabled={disabled}
-          className="w-14 h-10 flex items-center justify-center text-lg bg-control-bg nm-inset-sm cursor-pointer transition-all duration-150 hover:nm-raised disabled:opacity-40 disabled:cursor-not-allowed rounded-nm-sm"
+          className="w-14 h-10 flex items-center justify-center text-lg bg-control-bg nm-interactive-inset cursor-pointer disabled:opacity-40 disabled:cursor-not-allowed rounded-nm-sm"
           aria-label="Pick emoji"
         >
           {value || <span className="opacity-30">{placeholder}</span>}
@@ -76,7 +68,7 @@ function EmojiPickerPopover({
               e.stopPropagation()
               onChange("")
             }}
-            className="absolute -top-1.5 -right-1.5 w-4 h-4 flex items-center justify-center bg-elevated text-muted hover:text-danger text-[10px] leading-none opacity-0 group-hover:opacity-100 transition-opacity duration-150 cursor-pointer rounded-nm-pill"
+            className="absolute -top-1.5 -right-1.5 w-4 h-4 flex items-center justify-center bg-elevated text-muted hover:text-danger text-3xs leading-none opacity-0 group-hover:opacity-100 transition-opacity duration-150 cursor-pointer rounded-nm-pill"
             aria-label="Clear emoji"
           >
             ✕
@@ -89,19 +81,19 @@ function EmojiPickerPopover({
           // biome-ignore lint/a11y/noStaticElementInteractions: onMouseDown prevents blur-close when clicking inside the picker
           <div
             ref={pickerRef}
-            className="emoji-picker-wrapper fixed z-50 nm-raised-lg"
+            className="emoji-picker-wrapper fixed z-40 nm-raised-lg"
             style={{ top: pos.top, left: pos.left }}
             onMouseDown={(e) => e.stopPropagation()}
           >
             <EmojiPicker
-              theme={Theme.DARK}
-              emojiStyle={EmojiStyle.APPLE}
+              theme={"dark" as Theme}
+              emojiStyle={"apple" as EmojiStyle}
               width={320}
               height={380}
               lazyLoadEmojis
               searchPlaceholder="Search emojis…"
               previewConfig={{ showPreview: false }}
-              onEmojiClick={(emojiData) => {
+              onEmojiClick={(emojiData: EmojiClickData) => {
                 onChange(emojiData.emoji)
                 setOpen(false)
               }}
@@ -113,4 +105,5 @@ function EmojiPickerPopover({
   )
 }
 
+export type { EmojiPickerPopoverProps }
 export { EmojiPickerPopover }
diff --git a/src/components/ui/ErrorDisplay.tsx b/src/components/ui/ErrorDisplay.tsx
index 75ac1814..ec6b1a98 100644
--- a/src/components/ui/ErrorDisplay.tsx
+++ b/src/components/ui/ErrorDisplay.tsx
@@ -4,8 +4,8 @@
 import { H1 } from "@typography"
 import clsx from "clsx"
 import Link from "next/link"
+import { CopyButton } from "@/components/ui/ActionButtons"
 import { Button, buttonVariants } from "@/components/ui/Button"
-import { CopyButton } from "@/components/ui/CopyButton"
 import { Tooltip } from "@/components/ui/Tooltip"
 
 export function ErrorDisplay({
@@ -40,9 +40,7 @@ export function ErrorDisplay({
           </Tooltip>
         </div>
         <div className="flex gap-3">
-          <Button variant="primary" size="sm" onClick={onRetry}>
-            Try Again
-          </Button>
+          <Button variant="primary" size="sm" onClick={onRetry} text="Try Again" />
           <Link
             href={linkHref}
             className={clsx(buttonVariants({ variant: "ghost", size: "sm" }), "rounded-nm-sm")}
diff --git a/src/components/ui/FilterPill.tsx b/src/components/ui/FilterPill.tsx
new file mode 100644
index 00000000..d0c70394
--- /dev/null
+++ b/src/components/ui/FilterPill.tsx
@@ -0,0 +1,67 @@
+// src/components/ui/FilterPill.tsx
+
+import { cva } from "class-variance-authority"
+import clsx from "clsx"
+import type { ButtonHTMLAttributes, ReactNode } from "react"
+
+type FilterPillSize = "sm" | "md"
+type FilterPillInactive = "transparent" | "inset" | "strikethrough"
+
+interface FilterPillProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "children"> {
+  active: boolean
+  text?: string
+  children?: ReactNode
+  size?: FilterPillSize
+  activeColor?: string
+  inactive?: FilterPillInactive
+}
+
+const pill = cva(
+  "font-mono transition-colors duration-150 cursor-pointer border-none disabled:opacity-40 disabled:cursor-not-allowed",
+  {
+    variants: {
+      size: {
+        sm: "px-2 py-0.5 text-2xs rounded-nm-sm",
+        md: "px-2.5 py-1 text-xs rounded-nm-sm",
+      },
+    },
+    defaultVariants: {
+      size: "md",
+    },
+  }
+)
+
+const INACTIVE_STYLES: Record<FilterPillInactive, string> = {
+  transparent: "bg-transparent text-muted hover:text-secondary",
+  inset: "nm-inset-sm text-tertiary hover:text-secondary",
+  strikethrough: "bg-transparent text-muted hover:text-secondary line-through opacity-50",
+}
+
+function FilterPill({
+  active,
+  text,
+  children,
+  size = "md",
+  activeColor = "text-primary",
+  inactive = "transparent",
+  className,
+  ...props
+}: FilterPillProps) {
+  return (
+    <button
+      type="button"
+      aria-pressed={active}
+      className={clsx(
+        pill({ size }),
+        active ? clsx("nm-raised-sm font-semibold", activeColor) : INACTIVE_STYLES[inactive],
+        className
+      )}
+      {...props}
+    >
+      {children ?? text}
+    </button>
+  )
+}
+
+export type { FilterPillInactive, FilterPillProps, FilterPillSize }
+export { FilterPill }
diff --git a/src/components/ui/Icons.tsx b/src/components/ui/Icons.tsx
index dff99bf3..abbbf30d 100644
--- a/src/components/ui/Icons.tsx
+++ b/src/components/ui/Icons.tsx
@@ -2,10 +2,11 @@
 //
 // Functions: ExternalLinkIcon, ExternalLinkSmallIcon, ChevronUpIcon, ChevronUpSmallIcon,
 //            ChevronDownSmallIcon, EyeOffIcon, EyeIcon, GearIcon, HamburgerIcon,
-//            CheckIcon, CheckLargeIcon, CopyIcon, UploadArrowIcon, DownloadArrowIcon,
+//            CheckIcon, CheckLargeIcon, CopyIcon, GitHubIcon, UploadArrowIcon, DownloadArrowIcon,
 //            UserIcon, PlusIcon, ActivityIcon, ShareScoreIcon, ShieldIcon, StarIcon,
 //            LeechingIcon, SeedingIcon, TriangleWarningIcon, RatioIcon, GridIcon,
-//            ClockIcon, BoxIcon, ServerIcon, TagIcon, BugIcon, XIcon, TransitPapersIcon
+//            ClockIcon, BoxIcon, ServerIcon, TagIcon, BookIcon, BugIcon, XIcon,
+//            TransitPapersIcon, SpinnerIcon, InfoIcon, QuestionIcon
 
 import type { SVGProps } from "react"
 
@@ -548,7 +549,7 @@ function BoxIcon(props: IconProps) {
   )
 }
 
-// Server rack — used in TorrentsTab NoClientState empty state
+// Server rack — used in TorrentsTab NoDownloadClientState empty state
 function ServerIcon(props: IconProps) {
   return (
     <svg
@@ -724,8 +725,90 @@ function RefreshIcon(props: IconProps) {
   )
 }
 
+function SpinnerIcon(props: IconProps) {
+  return (
+    <svg viewBox="0 0 24 24" fill="none" aria-hidden="true" {...props}>
+      <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+      <path
+        className="opacity-75"
+        fill="currentColor"
+        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"
+      />
+    </svg>
+  )
+}
+
+// GitHub octocat logo — used in Sidebar footer
+function GitHubIcon(props: IconProps) {
+  return (
+    <svg viewBox="0 0 16 16" fill="currentColor" aria-hidden="true" {...props}>
+      <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0016 8c0-4.42-3.58-8-8-8z" />
+    </svg>
+  )
+}
+
+// Open book — documentation links
+function BookIcon(props: IconProps) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth={2}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      aria-hidden="true"
+      {...props}
+    >
+      <path d="M2 3h6a4 4 0 0 1 4 4v14a3 3 0 0 0-3-3H2z" />
+      <path d="M22 3h-6a4 4 0 0 0-4 4v14a3 3 0 0 1 3-3h7z" />
+    </svg>
+  )
+}
+
+// Question circle — used in InfoTip question variant
+function QuestionIcon(props: IconProps) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth={1.5}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      aria-hidden="true"
+      {...props}
+    >
+      <circle cx="12" cy="12" r="10" />
+      <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" />
+      <line x1="12" y1="17" x2="12.01" y2="17" />
+    </svg>
+  )
+}
+
+// Info circle — used in InfoTip info variant, Notice component
+function InfoIcon(props: IconProps) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth={1.5}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      aria-hidden="true"
+      {...props}
+    >
+      <circle cx="12" cy="12" r="10" />
+      <line x1="12" y1="16" x2="12" y2="12" />
+      <line x1="12" y1="8" x2="12.01" y2="8" />
+    </svg>
+  )
+}
+
 export {
   ActivityIcon,
+  BookIcon,
   BoxIcon,
   BugIcon,
   CheckIcon,
@@ -741,12 +824,15 @@ export {
   EyeIcon,
   EyeOffIcon,
   GearIcon,
+  GitHubIcon,
   GridIcon,
   HamburgerIcon,
+  InfoIcon,
   LeechingIcon,
   PauseIcon,
   PlayIcon,
   PlusIcon,
+  QuestionIcon,
   RatioIcon,
   RefreshIcon,
   RequiredRatioIcon,
@@ -754,6 +840,7 @@ export {
   ServerIcon,
   ShareScoreIcon,
   ShieldIcon,
+  SpinnerIcon,
   StarIcon,
   TagIcon,
   TransitPapersIcon,
diff --git a/src/components/ui/InfoTip.tsx b/src/components/ui/InfoTip.tsx
new file mode 100644
index 00000000..e0db777f
--- /dev/null
+++ b/src/components/ui/InfoTip.tsx
@@ -0,0 +1,52 @@
+// src/components/ui/InfoTip.tsx
+
+import { InfoIcon, QuestionIcon } from "@icons"
+import { cva, type VariantProps } from "class-variance-authority"
+import type { ReactNode } from "react"
+import type { DocsEntry } from "@/lib/constants"
+import { Tooltip } from "./Tooltip"
+
+const infoTipVariants = cva(
+  "inline-flex items-center text-muted hover:text-secondary cursor-help transition-colors duration-150 bg-transparent border-0 p-0 outline-none focus-visible:text-secondary",
+  {
+    variants: {
+      size: {
+        sm: "[&>svg]:w-3 [&>svg]:h-3",
+        md: "[&>svg]:w-3.5 [&>svg]:h-3.5",
+        lg: "[&>svg]:w-4 [&>svg]:h-4",
+      },
+    },
+    defaultVariants: {
+      size: "md",
+    },
+  }
+)
+
+type InfoTipIcon = "info" | "question"
+
+interface InfoTipProps extends VariantProps<typeof infoTipVariants> {
+  content: ReactNode
+  icon?: InfoTipIcon
+  docs?: DocsEntry
+  className?: string
+}
+
+const iconMap: Record<InfoTipIcon, typeof InfoIcon> = {
+  info: InfoIcon,
+  question: QuestionIcon,
+}
+
+function InfoTip({ content, docs, icon = "info", size, className }: InfoTipProps) {
+  const Icon = iconMap[icon]
+
+  return (
+    <Tooltip content={content} docs={docs}>
+      <button type="button" className={infoTipVariants({ size, className })} aria-label="More info">
+        <Icon />
+      </button>
+    </Tooltip>
+  )
+}
+
+export type { InfoTipIcon, InfoTipProps }
+export { InfoTip, infoTipVariants }
diff --git a/src/components/ui/Input.tsx b/src/components/ui/Input.tsx
index c5dbe8a9..09bfe1f5 100644
--- a/src/components/ui/Input.tsx
+++ b/src/components/ui/Input.tsx
@@ -3,15 +3,35 @@
 import clsx from "clsx"
 import { type InputHTMLAttributes, type Ref, useId } from "react"
 
+type HintVariant = "default" | "danger"
+
 interface InputProps extends InputHTMLAttributes<HTMLInputElement> {
   label?: string
   error?: string
+  hint?: string
+  hintVariant?: HintVariant
   ref?: Ref<HTMLInputElement>
 }
 
-function Input({ label, error, className, id, ref, ...props }: InputProps) {
+const HINT_COLORS: Record<HintVariant, string> = {
+  default: "text-muted",
+  danger: "text-danger/80",
+}
+
+function Input({
+  label,
+  error,
+  hint,
+  hintVariant = "default",
+  className,
+  id,
+  ref,
+  ...props
+}: InputProps) {
   const generatedId = useId()
   const inputId = id ?? generatedId
+  const hintId = hint ? `${inputId}-hint` : undefined
+  const describedBy = [error && `${inputId}-error`, hintId].filter(Boolean).join(" ") || undefined
 
   return (
     <div className="flex flex-col gap-1 w-full">
@@ -38,7 +58,7 @@ function Input({ label, error, className, id, ref, ...props }: InputProps) {
           className
         )}
         aria-invalid={error ? "true" : undefined}
-        aria-describedby={error ? `${inputId}-error` : undefined}
+        aria-describedby={describedBy}
         {...props}
       />
       {error && (
@@ -46,6 +66,11 @@ function Input({ label, error, className, id, ref, ...props }: InputProps) {
           {error}
         </p>
       )}
+      {hint && (
+        <p id={hintId} className={clsx("text-xs font-sans", HINT_COLORS[hintVariant])}>
+          {hint}
+        </p>
+      )}
     </div>
   )
 }
diff --git a/src/components/ui/LazySection.tsx b/src/components/ui/LazySection.tsx
new file mode 100644
index 00000000..f8e33f5d
--- /dev/null
+++ b/src/components/ui/LazySection.tsx
@@ -0,0 +1,42 @@
+// src/components/ui/LazySection.tsx
+
+"use client"
+
+import { type ReactNode, useEffect, useRef, useState } from "react"
+
+interface LazySectionProps {
+  children: ReactNode
+  minHeight?: number
+}
+
+// Uses IntersectionObserver to delay rendering of children until the element scrolls into view
+
+function LazySection({ children, minHeight = 200 }: LazySectionProps) {
+  const ref = useRef<HTMLDivElement>(null)
+  const [visible, setVisible] = useState(false)
+
+  useEffect(() => {
+    const el = ref.current
+    if (!el || visible) return
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          setVisible(true)
+          observer.disconnect()
+        }
+      },
+      { rootMargin: "200px" }
+    )
+    observer.observe(el)
+    return () => observer.disconnect()
+  }, [visible])
+
+  return (
+    <div ref={ref} style={{ minHeight: visible ? undefined : minHeight }}>
+      {visible ? children : null}
+    </div>
+  )
+}
+
+export type { LazySectionProps }
+export { LazySection }
diff --git a/src/components/ui/MaskedSecret.tsx b/src/components/ui/MaskedSecret.tsx
index 22d8a552..ca3e41c3 100644
--- a/src/components/ui/MaskedSecret.tsx
+++ b/src/components/ui/MaskedSecret.tsx
@@ -14,9 +14,7 @@ function MaskedSecret({ onChangeClick, label = "Change" }: MaskedSecretProps) {
       <span className="text-sm font-mono text-tertiary nm-inset bg-control-bg px-4 py-3 flex-1 rounded-nm-md">
         ••••••••••••••••
       </span>
-      <Button type="button" variant="ghost" size="sm" onClick={onChangeClick}>
-        {label}
-      </Button>
+      <Button variant="ghost" size="sm" onClick={onChangeClick} text={label} />
     </div>
   )
 }
diff --git a/src/components/ui/Notice.tsx b/src/components/ui/Notice.tsx
new file mode 100644
index 00000000..8c95faeb
--- /dev/null
+++ b/src/components/ui/Notice.tsx
@@ -0,0 +1,99 @@
+// src/components/ui/Notice.tsx
+
+import { cva } from "class-variance-authority"
+import clsx from "clsx"
+import type { ReactElement, ReactNode } from "react"
+import { CheckLargeIcon, InfoIcon, TriangleWarningIcon } from "@/components/ui/Icons"
+
+type NoticeVariant = "danger" | "warn" | "success" | "info" | "default"
+
+interface NoticeProps {
+  message?: string | null
+  header?: string
+  variant?: NoticeVariant
+  box?: boolean
+  showIcon?: boolean
+  icon?: ReactElement
+  children?: ReactNode
+  className?: string
+}
+
+const notice = cva("text-xs font-sans", {
+  variants: {
+    variant: {
+      danger: "text-danger",
+      warn: "text-warn",
+      success: "text-success",
+      info: "text-accent",
+      default: "text-secondary",
+    },
+    box: {
+      true: "nm-inset-sm rounded-nm-md border px-4 py-3",
+      false: "",
+    },
+  },
+  compoundVariants: [
+    { variant: "danger", box: true, class: "bg-danger/5 border-danger/20" },
+    { variant: "warn", box: true, class: "bg-warn/5 border-warn/20" },
+    { variant: "success", box: true, class: "bg-success/5 border-success/20" },
+    { variant: "info", box: true, class: "bg-accent/5 border-accent/20" },
+    { variant: "default", box: true, class: "bg-control-bg border-border" },
+  ],
+  defaultVariants: {
+    variant: "danger",
+    box: false,
+  },
+})
+
+const defaultIcon: Record<NoticeVariant, ReactNode> = {
+  danger: <TriangleWarningIcon width="14" height="14" className="shrink-0" />,
+  warn: <TriangleWarningIcon width="14" height="14" className="shrink-0" />,
+  success: <CheckLargeIcon width="14" height="14" className="shrink-0" />,
+  info: <InfoIcon width="14" height="14" className="shrink-0" />,
+  default: <InfoIcon width="14" height="14" className="shrink-0" />,
+}
+
+function Notice({
+  message,
+  header,
+  variant = "danger",
+  box = false,
+  showIcon,
+  icon,
+  children,
+  className,
+}: NoticeProps) {
+  const body = children ?? message
+  if (!body && !header) return null
+
+  const iconVisible = showIcon ?? (icon !== undefined || box)
+  const iconElement = iconVisible ? (icon ?? defaultIcon[variant]) : null
+
+  return (
+    <div
+      className={clsx(notice({ variant, box }), iconElement && "flex gap-2", className)}
+      role={
+        variant === "danger"
+          ? "alert"
+          : variant === "info" || variant === "default"
+            ? "note"
+            : "status"
+      }
+    >
+      {iconElement && <span className="mt-px">{iconElement}</span>}
+      {header && !body ? (
+        <span className="font-medium">{header}</span>
+      ) : header ? (
+        <div className="flex flex-col gap-1">
+          <span className="font-medium">{header}</span>
+          <span className="text-secondary">{body}</span>
+        </div>
+      ) : (
+        body
+      )}
+    </div>
+  )
+}
+
+export type { NoticeProps, NoticeVariant }
+export { Notice }
diff --git a/src/components/ui/PillTag.tsx b/src/components/ui/PillTag.tsx
new file mode 100644
index 00000000..adf80f40
--- /dev/null
+++ b/src/components/ui/PillTag.tsx
@@ -0,0 +1,39 @@
+// src/components/ui/PillTag.tsx
+
+import { cva, type VariantProps } from "class-variance-authority"
+import clsx from "clsx"
+import type { HTMLAttributes } from "react"
+
+const pillTagVariants = cva("nm-inset-sm bg-control-bg rounded-nm-pill font-mono", {
+  variants: {
+    color: {
+      accent: "text-accent",
+      warn: "text-warn",
+      danger: "text-danger",
+      secondary: "text-secondary",
+      tertiary: "text-tertiary",
+      muted: "text-muted",
+    },
+    size: {
+      sm: "px-1.5 py-0.5 text-3xs",
+      md: "px-3 py-1 text-xs",
+    },
+  },
+  defaultVariants: { color: "tertiary", size: "md" },
+})
+
+interface PillTagProps
+  extends Omit<HTMLAttributes<HTMLSpanElement>, "color">, VariantProps<typeof pillTagVariants> {
+  label?: string
+}
+
+function PillTag({ color, size, label, className, children, ...props }: PillTagProps) {
+  return (
+    <span className={clsx(pillTagVariants({ color, size }), className)} {...props}>
+      {label ?? children}
+    </span>
+  )
+}
+
+export type { PillTagProps }
+export { PillTag }
diff --git a/src/components/ui/ProgressBar.tsx b/src/components/ui/ProgressBar.tsx
index bc67cefe..9b2e3b08 100644
--- a/src/components/ui/ProgressBar.tsx
+++ b/src/components/ui/ProgressBar.tsx
@@ -7,24 +7,19 @@ import clsx from "clsx"
 type ProgressBarSize = "sm" | "md" | "lg"
 
 interface ProgressBarProps {
-  /** Percentage filled (0-100). Clamped internally. */
   percent: number
-  /** Fill color — accepts any CSS color value or CSS variable. Defaults to accent. */
   color?: string
-  /** Track height. sm=4px, md=8px (default), lg=12px */
   size?: ProgressBarSize
   /** Show the percentage as text inside the bar (only visible on lg size) */
   showLabel?: boolean
-  /** Animate width transitions */
   animated?: boolean
-  /** Additional classes on the outer track */
   className?: string
 }
 
 const sizeMap: Record<ProgressBarSize, { track: string; fill: string }> = {
-  sm: { track: "p-[1px]", fill: "h-1.5" },
-  md: { track: "p-[3px]", fill: "h-3" },
-  lg: { track: "p-[2px]", fill: "h-3" },
+  sm: { track: "p-px", fill: "h-1.5" },
+  md: { track: "p-1", fill: "h-3" },
+  lg: { track: "p-2", fill: "h-3" },
 }
 
 function ProgressBar({
@@ -51,7 +46,7 @@ function ProgressBar({
         style={{
           width: `${clamped}%`,
           backgroundColor: resolvedColor,
-          boxShadow: clamped > 0 ? `0 0 12px ${resolvedColor}60` : undefined,
+          filter: clamped > 0 ? `drop-shadow(0 0 8px ${resolvedColor}60)` : undefined,
         }}
         role="progressbar"
         aria-valuenow={clamped}
@@ -59,7 +54,7 @@ function ProgressBar({
         aria-valuemax={100}
       >
         {showLabel && size === "lg" && clamped > 10 && (
-          <span className="absolute inset-0 flex items-center justify-center text-[9px] font-mono font-semibold text-white/80">
+          <span className="absolute inset-0 flex items-center justify-center text-4xs font-mono font-semibold text-white/80">
             {Math.round(clamped)}%
           </span>
         )}
diff --git a/src/components/ui/ProgressWidget.tsx b/src/components/ui/ProgressWidget.tsx
new file mode 100644
index 00000000..ba32ec32
--- /dev/null
+++ b/src/components/ui/ProgressWidget.tsx
@@ -0,0 +1,45 @@
+// src/components/ui/ProgressWidget.tsx
+
+import { SlotLabel } from "@typography"
+import clsx from "clsx"
+import { ProgressBar } from "@/components/ui/ProgressBar"
+
+interface ProgressWidgetProps {
+  label: string
+  value: string
+  percent: number
+  color: string
+  footer?: string
+  inset?: boolean
+  className?: string
+}
+
+function ProgressWidget({
+  label,
+  value,
+  percent,
+  color,
+  footer,
+  inset = false,
+  className,
+}: ProgressWidgetProps) {
+  return (
+    <div
+      className={clsx(
+        "flex flex-col gap-2",
+        inset && "nm-inset-sm bg-control-bg rounded-nm-md p-4",
+        className
+      )}
+    >
+      <div className="flex items-center justify-between">
+        <SlotLabel label={label} />
+        <span className="text-xs font-mono text-secondary font-semibold">{value}</span>
+      </div>
+      <ProgressBar percent={percent} color={color} size="sm" />
+      {footer && <p className="timestamp text-right">{footer}</p>}
+    </div>
+  )
+}
+
+export type { ProgressWidgetProps }
+export { ProgressWidget }
diff --git a/src/components/ui/QbtTagWarning.tsx b/src/components/ui/QbtTagWarning.tsx
index b69d4cc9..eff154bd 100644
--- a/src/components/ui/QbtTagWarning.tsx
+++ b/src/components/ui/QbtTagWarning.tsx
@@ -1,14 +1,17 @@
 // src/components/ui/QbtTagWarning.tsx
 
+import { Notice } from "@/components/ui/Notice"
+
 const QBT_TAG_WARN_PATTERN = /[+&#%?]/
 
 function QbtTagWarning({ tag }: { tag: string }) {
   if (!QBT_TAG_WARN_PATTERN.test(tag)) return null
 
   return (
-    <p className="text-xs font-sans text-warning">
-      Tags with +, &amp;, #, %, or ? may not filter correctly in some qBittorrent versions.
-    </p>
+    <Notice
+      variant="warn"
+      message="Tags with +, &, #, %, or ? may not filter correctly in some qBittorrent versions."
+    />
   )
 }
 
diff --git a/src/components/ui/RedactedText.tsx b/src/components/ui/RedactedText.tsx
index 1be797cc..aad58215 100644
--- a/src/components/ui/RedactedText.tsx
+++ b/src/components/ui/RedactedText.tsx
@@ -1,7 +1,4 @@
 // src/components/ui/RedactedText.tsx
-//
-// Functions: RedactedText
-
 "use client"
 
 import clsx from "clsx"
@@ -9,30 +6,21 @@ import { Tooltip } from "@/components/ui/Tooltip"
 import { redactedLength } from "@/lib/privacy"
 
 interface RedactedTextProps {
-  /** The raw value from the database — either real text or a "▓N" redacted marker */
   value: string | null | undefined
-  /** Accent color for the redaction blocks */
   color?: string
   className?: string
 }
 
-/**
- * Renders either the real text or a visual redaction mosaic.
- * The mosaic consists of small blocks with varying opacity,
- * giving a "classified document" aesthetic. Block count is
- * derived from the original character length for visual consistency.
- */
+// Renders either the real text or a visual redaction mosaic
 function RedactedText({ value, color = "var(--color-tertiary)", className }: RedactedTextProps) {
   const charCount = redactedLength(value)
 
-  // Not redacted — render the real value
+  // Not redacted
   if (charCount === null) {
     return <span className={className}>{value ?? "—"}</span>
   }
 
-  // Generate deterministic-looking blocks from the character count.
-  // Each character maps to 1 block. We vary opacity using a simple
-  // hash-like distribution so adjacent blocks look different.
+  // Generate deterministic-looking blocks from the character count
   const blocks: { id: string; opacity: number }[] = []
   for (let i = 0; i < charCount; i++) {
     const seed = i * 7 + 3
diff --git a/src/components/ui/SaveDiscardBar.tsx b/src/components/ui/SaveDiscardBar.tsx
new file mode 100644
index 00000000..ab6f4d3e
--- /dev/null
+++ b/src/components/ui/SaveDiscardBar.tsx
@@ -0,0 +1,71 @@
+// src/components/ui/SaveDiscardBar.tsx
+
+import clsx from "clsx"
+import { Button } from "@/components/ui/Button"
+
+interface SaveDiscardBarProps {
+  dirty: boolean
+  saving: boolean
+  onSave?: () => void
+  onDiscard?: () => void
+  error?: string | null
+  success?: string | null
+  saveLabel?: string
+  savingLabel?: string
+  className?: string
+  justify?: "start" | "end"
+  showDivider?: boolean
+  saveDisabled?: boolean
+}
+
+function SaveDiscardBar({
+  dirty,
+  saving,
+  onSave,
+  onDiscard,
+  error,
+  success,
+  saveLabel = "Save Changes",
+  savingLabel = "Saving...",
+  className,
+  justify = "start",
+  showDivider = true,
+  saveDisabled = false,
+}: SaveDiscardBarProps) {
+  if (!dirty && !error && !success) return null
+
+  const content = (
+    <>
+      {error && (
+        <p className="text-xs font-sans text-danger" role="alert">
+          {error}
+        </p>
+      )}
+      {success && <p className="text-xs font-sans text-success">{success}</p>}
+      {dirty && (
+        <>
+          {showDivider && <div className="border-t border-border" />}
+          <div className={clsx("flex items-center gap-3", justify === "end" && "justify-end")}>
+            <Button size="sm" onClick={onSave} disabled={saving || saveDisabled || !onSave}>
+              {saving ? savingLabel : saveLabel}
+            </Button>
+            {onDiscard && (
+              <Button
+                size="sm"
+                variant="ghost"
+                onClick={onDiscard}
+                disabled={saving}
+                text="Discard"
+              />
+            )}
+          </div>
+        </>
+      )}
+    </>
+  )
+
+  return className ? <div className={className}>{content}</div> : content
+}
+
+export type { SaveDiscardBarProps }
+export { SaveDiscardBar }
diff --git a/src/components/ui/SectionToggle.tsx b/src/components/ui/SectionToggle.tsx
new file mode 100644
index 00000000..79a0466d
--- /dev/null
+++ b/src/components/ui/SectionToggle.tsx
@@ -0,0 +1,32 @@
+// src/components/ui/SectionToggle.tsx
+
+import clsx from "clsx"
+import type { ReactNode } from "react"
+import { ChevronToggle } from "@/components/ui/ChevronToggle"
+
+interface SectionToggleProps {
+  label: ReactNode
+  expanded: boolean
+  onToggle: () => void
+  className?: string
+}
+
+function SectionToggle({ label, expanded, onToggle, className }: SectionToggleProps) {
+  return (
+    <button
+      type="button"
+      onClick={onToggle}
+      className={clsx(
+        "flex items-center gap-2 text-xs font-sans font-medium text-tertiary uppercase tracking-wider",
+        "hover:text-secondary transition-colors duration-150 cursor-pointer w-fit",
+        className
+      )}
+    >
+      <ChevronToggle expanded={expanded} />
+      {label}
+    </button>
+  )
+}
+
+export type { SectionToggleProps }
+export { SectionToggle }
diff --git a/src/components/ui/Select.tsx b/src/components/ui/Select.tsx
index 857934db..cc751892 100644
--- a/src/components/ui/Select.tsx
+++ b/src/components/ui/Select.tsx
@@ -77,14 +77,14 @@ function Select<T extends string>({
         aria-expanded={open}
       >
         <span className="truncate">{selectedLabel}</span>
-        <span className="text-tertiary text-[10px] shrink-0" aria-hidden="true">
+        <span className="text-tertiary text-3xs shrink-0" aria-hidden="true">
           ▾
         </span>
       </button>
 
       {open && (
         <div
-          className="absolute top-full left-0 right-0 mt-1 z-50 bg-elevated nm-raised-sm py-1 overflow-hidden rounded-nm-md"
+          className="absolute top-full left-0 right-0 mt-1 z-40 bg-elevated nm-raised-sm py-1 overflow-hidden rounded-nm-md"
           role="listbox"
           aria-label={ariaLabel}
         >
diff --git a/src/components/ui/Sheet.tsx b/src/components/ui/Sheet.tsx
index 2baf0af9..c2cab639 100644
--- a/src/components/ui/Sheet.tsx
+++ b/src/components/ui/Sheet.tsx
@@ -1,62 +1,35 @@
 // src/components/ui/Sheet.tsx
-//
-// Functions: Sheet
 
 "use client"
 
 import clsx from "clsx"
-import type { ReactNode } from "react"
-import { useEffect, useRef, useState } from "react"
+import { type ReactNode, useCallback, useEffect } from "react"
+import { Button } from "@/components/ui/Button"
+import { XIcon } from "@/components/ui/Icons"
+import { useAnimatedPresence } from "@/hooks/useAnimatedPresence"
+import { useEscapeKey } from "@/hooks/useEscapeKey"
 
 interface SheetProps {
   open: boolean
   onClose: () => void
   title?: string
+  footer?: ReactNode
+  busy?: boolean
+  onSubmit?: () => void
   children: ReactNode
   className?: string
 }
 
-function Sheet({ open, onClose, title, children, className }: SheetProps) {
-  const [mounted, setMounted] = useState(false)
-  const [visible, setVisible] = useState(false)
-  const panelRef = useRef<HTMLDivElement>(null)
+function Sheet({ open, onClose, title, footer, busy, onSubmit, children, className }: SheetProps) {
+  const { mounted, visible, onTransitionEnd } = useAnimatedPresence(open, "transform")
 
-  // Mount → animate in, or animate out
-  useEffect(() => {
-    if (open) {
-      setMounted(true)
-      requestAnimationFrame(() => requestAnimationFrame(() => setVisible(true)))
-    } else {
-      setVisible(false)
-    }
-  }, [open])
-
-  // Unmount after exit transition completes
-  useEffect(() => {
-    const panel = panelRef.current
-    if (!panel || visible) return
-
-    function handleEnd(e: TransitionEvent) {
-      if (e.propertyName === "transform" && !visible) {
-        setMounted(false)
-      }
-    }
+  const handleClose = useCallback(() => {
+    if (!busy) onClose()
+  }, [busy, onClose])
 
-    panel.addEventListener("transitionend", handleEnd)
-    return () => panel.removeEventListener("transitionend", handleEnd)
-  }, [visible])
+  useEscapeKey(handleClose, visible && !busy)
 
-  // Escape key
-  useEffect(() => {
-    if (!visible) return
-    function handleKey(e: KeyboardEvent) {
-      if (e.key === "Escape") onClose()
-    }
-    document.addEventListener("keydown", handleKey)
-    return () => document.removeEventListener("keydown", handleKey)
-  }, [visible, onClose])
-
-  // Lock body scroll while open
+  // Body scroll lock
   useEffect(() => {
     if (!mounted) return
     document.body.style.overflow = "hidden"
@@ -67,51 +40,89 @@ function Sheet({ open, onClose, title, children, className }: SheetProps) {
 
   if (!mounted) return null
 
+  const panelCls = clsx(
+    "relative w-full max-w-md h-full bg-elevated nm-raised-lg flex flex-col transition-transform duration-300 ease-out",
+    className
+  )
+  const panelStyle = {
+    borderRadius: "var(--radius-lg) 0 0 var(--radius-lg)",
+    transform: visible ? "translateX(0)" : "translateX(100%)",
+  }
+
+  const closeButton = (
+    <Button
+      variant="ghost"
+      size="sm"
+      onClick={handleClose}
+      disabled={busy}
+      aria-label="Close panel"
+      className="px-2 py-1.5"
+    >
+      <XIcon width="16" height="16" />
+    </Button>
+  )
+
+  const header = title ? (
+    <div className="flex items-center justify-between p-6 border-b border-border shrink-0">
+      <span className="text-sm font-sans font-semibold text-primary">{title}</span>
+      {closeButton}
+    </div>
+  ) : (
+    <div className="absolute top-3 right-3 z-10">{closeButton}</div>
+  )
+
+  const body = <div className="flex-1 overflow-y-auto styled-scrollbar">{children}</div>
+  const footerEl = footer ? (
+    <div className="shrink-0 px-6 py-4 border-t border-border">{footer}</div>
+  ) : null
+
+  const panelContent = (
+    <>
+      {header}
+      {body}
+      {footerEl}
+    </>
+  )
+
   return (
-    <div className="fixed inset-0 z-50 flex justify-end">
+    <div
+      className="fixed inset-0 z-40 flex justify-end"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title ?? "Panel"}
+    >
       {/* Backdrop */}
       <button
         type="button"
+        data-overlay
+        data-visible={visible || undefined}
         className={clsx(
-          "absolute inset-0 backdrop-blur-sm bg-black/50 transition-opacity duration-300 ease-out cursor-default",
+          "absolute inset-0 bg-black/60 transition-opacity duration-200 ease-out cursor-default",
           visible ? "opacity-100" : "opacity-0"
         )}
-        onClick={onClose}
+        onClick={handleClose}
         tabIndex={-1}
         aria-label="Close"
       />
+
       {/* Panel */}
-      <div
-        ref={panelRef}
-        className={clsx(
-          "relative w-full max-w-md h-full bg-elevated nm-raised-lg flex flex-col transition-transform duration-300 ease-out",
-          className
-        )}
-        style={{
-          borderRadius: "var(--radius-lg) 0 0 var(--radius-lg)",
-          transform: visible ? "translateX(0)" : "translateX(100%)",
-        }}
-        role="dialog"
-        aria-modal="true"
-        aria-label={title ?? "Panel"}
-      >
-        {/* Header */}
-        {title && (
-          <div className="flex items-center justify-between p-6 border-b border-border shrink-0">
-            <span className="text-sm font-sans font-semibold text-primary">{title}</span>
-            <button
-              type="button"
-              onClick={onClose}
-              className="text-tertiary hover:text-primary transition-colors cursor-pointer p-1 -m-1 rounded-nm-sm"
-              aria-label="Close"
-            >
-              ✕
-            </button>
-          </div>
-        )}
-        {/* Content */}
-        <div className="flex-1 overflow-y-auto styled-scrollbar">{children}</div>
-      </div>
+      {onSubmit ? (
+        <form
+          onTransitionEnd={onTransitionEnd}
+          className={panelCls}
+          style={panelStyle}
+          onSubmit={(e) => {
+            e.preventDefault()
+            onSubmit()
+          }}
+        >
+          {panelContent}
+        </form>
+      ) : (
+        <div onTransitionEnd={onTransitionEnd} className={panelCls} style={panelStyle}>
+          {panelContent}
+        </div>
+      )}
     </div>
   )
 }
diff --git a/src/components/ui/Shimmer.tsx b/src/components/ui/Shimmer.tsx
new file mode 100644
index 00000000..e652f689
--- /dev/null
+++ b/src/components/ui/Shimmer.tsx
@@ -0,0 +1,88 @@
+// src/components/ui/Shimmer.tsx
+
+import { cva, type VariantProps } from "class-variance-authority"
+import clsx from "clsx"
+
+const shimmerVariants = cva("bg-control-bg animate-pulse", {
+  variants: {
+    rounded: {
+      sm: "rounded-nm-sm",
+      md: "rounded-nm-md",
+      full: "rounded-full",
+    },
+    size: {
+      label: "h-2.5",
+      text: "h-3",
+      bar: "h-4",
+      heading: "h-5",
+      value: "h-8",
+    },
+  },
+  defaultVariants: {
+    rounded: "sm",
+  },
+})
+
+type ShimmerProps = VariantProps<typeof shimmerVariants> & {
+  className?: string
+}
+
+function Shimmer({ size, rounded, className }: ShimmerProps) {
+  return <div className={clsx(shimmerVariants({ size, rounded }), className)} />
+}
+
+/** Chart-shaped shimmer  */
+function ChartShimmer({
+  height = "h-[360px]",
+  className,
+}: {
+  height?: string
+  className?: string
+}) {
+  return (
+    <div className={clsx("flex flex-col gap-3", height, className)}>
+      {/* Legend dots */}
+      <div className="flex gap-3 px-1">
+        {Array.from({ length: 5 }, (_, i) => (
+          <div key={`leg-${i}`} className="flex items-center gap-1.5">
+            <div className="w-2 h-2 rounded-full bg-control-bg animate-pulse" />
+            <div className="h-2 w-12 bg-control-bg animate-pulse rounded-nm-sm" />
+          </div>
+        ))}
+      </div>
+      {/* Chart area with y-axis + bars */}
+      <div className="flex-1 flex gap-2">
+        {/* Y-axis labels */}
+        <div className="flex flex-col justify-between py-2 shrink-0">
+          {Array.from({ length: 5 }, (_, i) => (
+            <div key={`y-${i}`} className="h-2 w-8 bg-control-bg animate-pulse rounded-nm-sm" />
+          ))}
+        </div>
+        {/* Chart bars/area */}
+        <div className="flex-1 flex items-end gap-1 pb-6">
+          {Array.from({ length: 20 }, (_, i) => {
+            const h = [
+              35, 55, 45, 70, 60, 80, 50, 65, 75, 40, 55, 85, 70, 45, 60, 90, 50, 75, 65, 55,
+            ][i]
+            return (
+              <div
+                key={`bar-${i}`}
+                className="flex-1 bg-control-bg animate-pulse rounded-t-sm"
+                style={{ height: `${h}%` }}
+              />
+            )
+          })}
+        </div>
+      </div>
+      {/* X-axis labels */}
+      <div className="flex justify-between pl-10">
+        {Array.from({ length: 6 }, (_, i) => (
+          <div key={`x-${i}`} className="h-2 w-10 bg-control-bg animate-pulse rounded-nm-sm" />
+        ))}
+      </div>
+    </div>
+  )
+}
+
+export type { ShimmerProps }
+export { ChartShimmer, Shimmer, shimmerVariants }
diff --git a/src/components/ui/Sparkline.tsx b/src/components/ui/Sparkline.tsx
new file mode 100644
index 00000000..976ff68d
--- /dev/null
+++ b/src/components/ui/Sparkline.tsx
@@ -0,0 +1,33 @@
+// src/components/ui/Sparkline.tsx
+
+interface SparklineProps {
+  data: number[]
+  color: string
+  height?: number
+  width?: number
+}
+
+function Sparkline({ data, color, height = 24, width = 80 }: SparklineProps) {
+  if (data.length < 2) return null
+  const max = data.reduce((m, v) => (v > m ? v : m), 1)
+  const step = width / (data.length - 1)
+  const points = data.map((v, i) => `${i * step},${height - (v / max) * (height - 2) - 1}`)
+  const fillPoints = `0,${height} ${points.join(" ")} ${width},${height}`
+
+  return (
+    <svg width={width} height={height} className="shrink-0" aria-hidden="true">
+      <polygon points={fillPoints} fill={color} opacity={0.1} />
+      <polyline
+        points={points.join(" ")}
+        fill="none"
+        stroke={color}
+        strokeWidth="1.5"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  )
+}
+
+export type { SparklineProps }
+export { Sparkline }
diff --git a/src/components/ui/StatCard.tsx b/src/components/ui/StatCard.tsx
index 99ded844..5eb32582 100644
--- a/src/components/ui/StatCard.tsx
+++ b/src/components/ui/StatCard.tsx
@@ -8,8 +8,9 @@
 import clsx from "clsx"
 import type { HTMLAttributes, ReactNode } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
+import { InfoTip } from "@/components/ui/InfoTip"
 import { Tooltip } from "@/components/ui/Tooltip"
-import { hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
 
 // ---------------------------------------------------------------------------
 //  types
@@ -105,7 +106,7 @@ function Shell({
       )}
       style={{
         filter: glowColor
-          ? `drop-shadow(0 -2px 12px ${hexToRgba(glowColor, alertColor ? 0.25 : 0.1)})`
+          ? `drop-shadow(0 0 14px ${hexToRgba(glowColor, alertColor ? 0.18 : 0.09)})`
           : undefined,
         outline: alertColor ? `1px solid ${hexToRgba(alertColor, 0.25)}` : undefined,
         outlineOffset: "-1px",
@@ -140,26 +141,22 @@ function Header({
 
   return (
     <div className="flex items-center justify-between">
-      <div className="flex items-center gap-1.5">
+      <div className="flex items-center gap-2">
         <p className="text-xs font-sans font-medium text-tertiary uppercase tracking-wider">
           {label}
         </p>
         {tooltip && (
-          <Tooltip content={<span className="w-52 block">{tooltip}</span>}>
-            <button
-              type="button"
-              className="cursor-help text-[9px] font-bold text-muted opacity-50 inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-current hover:opacity-80 focus:opacity-80 transition-opacity outline-none"
-              aria-label={`Info: ${label}`}
-            >
-              ?
-            </button>
-          </Tooltip>
+          <InfoTip
+            icon="question"
+            size="sm"
+            content={<span className="w-52 block">{tooltip}</span>}
+          />
         )}
         {alertReason && alertColor && (
           <Tooltip content={<span className="w-52 block">{alertReason}</span>}>
             <button
               type="button"
-              className="cursor-help text-[9px] font-bold inline-flex items-center justify-center w-3.5 h-3.5 rounded-full border border-current hover:opacity-80 transition-opacity outline-none"
+              className="help-icon hover:opacity-80 transition-opacity outline-none"
               style={{ color: alertColor }}
               aria-label={`Alert: ${alertReason}`}
             >
@@ -383,12 +380,10 @@ function RingContent({
           <span className="font-mono text-lg font-bold leading-none" style={{ color }}>
             {valueText}
           </span>
-          {!isOverdue && (
-            <span className="font-mono text-[10px] text-muted mt-0.5">{unitText}</span>
-          )}
+          {!isOverdue && <span className="timestamp mt-0.5">{unitText}</span>}
         </div>
       </div>
-      <p className="font-mono text-[10px] text-muted text-center">
+      <p className="timestamp text-center">
         {isOverdue
           ? `${overdueDays} ${overdueDays === 1 ? "day" : "days"} overdue`
           : `by ${deadlineDateStr}`}
diff --git a/src/components/ui/TabBar.tsx b/src/components/ui/TabBar.tsx
index 933b6cb8..cd609e7f 100644
--- a/src/components/ui/TabBar.tsx
+++ b/src/components/ui/TabBar.tsx
@@ -1,10 +1,49 @@
 // src/components/ui/TabBar.tsx
-
 "use client"
 
+import { cva } from "class-variance-authority"
 import clsx from "clsx"
 import { useEffect, useRef, useState } from "react"
 
+const track = cva("relative flex bg-control-bg", {
+  variants: {
+    size: {
+      default: "nm-inset gap-2 p-2 rounded-nm-md",
+      compact: "nm-inset-sm gap-0.5 p-1 w-fit rounded-nm-sm",
+    },
+  },
+  defaultVariants: { size: "default" },
+})
+
+const pill = cva("absolute z-[1] bg-raised pointer-events-none", {
+  variants: {
+    size: {
+      default: "top-2.5 bottom-2.5 nm-raised-sm rounded-[4px]",
+      compact:
+        "top-[3px] bottom-1 bg-overlay rounded-[4px] ring-1 ring-black/[0.15] shadow-[2px_0_4px_-2px_rgba(0,0,0,0.4),-2px_0_4px_-2px_rgba(0,0,0,0.4)]",
+    },
+  },
+  defaultVariants: { size: "default" },
+})
+
+const tab = cva("relative z-10 transition-colors duration-150 cursor-pointer rounded-nm-sm", {
+  variants: {
+    size: {
+      default: "flex-1 px-4 py-2.5 text-sm font-sans font-medium",
+      compact: "px-2.5 py-1 text-xs font-mono",
+    },
+    active: {
+      true: "text-primary font-semibold",
+      false: "text-tertiary hover:text-secondary",
+    },
+  },
+  defaultVariants: { size: "default", active: false },
+})
+
+// ---------------------------------------------------------------------------
+// Component
+// ---------------------------------------------------------------------------
+
 interface Tab<T extends string> {
   key: T
   label: string
@@ -20,7 +59,9 @@ interface TabBarProps<T extends string> {
 function TabBar<T extends string>({ tabs, activeTab, onChange, compact = false }: TabBarProps<T>) {
   const containerRef = useRef<HTMLDivElement>(null)
   const buttonRefs = useRef<Map<string, HTMLButtonElement>>(new Map())
-  const [pill, setPill] = useState<{ left: number; width: number } | null>(null)
+  const [pillPos, setPillPos] = useState<{ left: number; width: number } | null>(null)
+
+  const size = compact ? "compact" : "default"
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: refs don't need to be deps
   useEffect(() => {
@@ -31,58 +72,40 @@ function TabBar<T extends string>({ tabs, activeTab, onChange, compact = false }
     const containerRect = container.getBoundingClientRect()
     const buttonRect = button.getBoundingClientRect()
 
-    setPill({
+    setPillPos({
       left: buttonRect.left - containerRect.left,
       width: buttonRect.width,
     })
   }, [activeTab, tabs])
 
   return (
-    <div
-      ref={containerRef}
-      className={clsx(
-        "relative flex bg-control-bg nm-inset rounded-nm-md",
-        compact ? "gap-0.5 p-1 w-fit rounded-nm-sm" : "gap-1.5 p-2.5"
-      )}
-      role="tablist"
-    >
+    <div ref={containerRef} className={track({ size })} role="tablist">
       {/* Sliding pill */}
-      {pill && (
+      {pillPos && (
         <div
-          className={clsx(
-            "absolute nm-raised-sm bg-raised pointer-events-none rounded-nm-sm",
-            compact ? "top-1 bottom-1" : "top-2.5 bottom-2.5"
-          )}
+          className={pill({ size })}
           style={{
-            left: pill.left,
-            width: pill.width,
+            left: pillPos.left,
+            width: pillPos.width,
             transition:
               "left 250ms cubic-bezier(0.4, 0, 0.2, 1), width 250ms cubic-bezier(0.4, 0, 0.2, 1)",
           }}
         />
       )}
 
-      {tabs.map((tab) => (
+      {tabs.map((t) => (
         <button
-          key={tab.key}
+          key={t.key}
           ref={(el) => {
-            if (el) buttonRefs.current.set(tab.key, el)
+            if (el) buttonRefs.current.set(t.key, el)
           }}
           type="button"
-          onClick={() => onChange(tab.key)}
-          className={clsx(
-            "relative z-10 transition-colors duration-150 cursor-pointer rounded-nm-sm",
-            compact
-              ? "px-2.5 py-1 text-xs font-mono"
-              : "flex-1 px-4 py-2.5 text-sm font-sans font-medium",
-            activeTab === tab.key
-              ? "text-primary font-semibold"
-              : "text-tertiary hover:text-secondary"
-          )}
-          aria-selected={activeTab === tab.key}
+          onClick={() => onChange(t.key)}
+          className={clsx(tab({ size, active: activeTab === t.key }))}
+          aria-selected={activeTab === t.key}
           role="tab"
         >
-          {tab.label}
+          {t.label}
         </button>
       ))}
     </div>
diff --git a/src/components/ui/Table.tsx b/src/components/ui/Table.tsx
index d4c0965b..eb1875dc 100644
--- a/src/components/ui/Table.tsx
+++ b/src/components/ui/Table.tsx
@@ -1,9 +1,8 @@
 // src/components/ui/Table.tsx
-//
-// Functions: Table
-
 "use client"
 
+// TODO: Add support for CVA
+
 import { useAutoAnimate } from "@formkit/auto-animate/react"
 import clsx from "clsx"
 import type { CSSProperties, ReactNode } from "react"
@@ -29,6 +28,7 @@ interface TableProps<T> {
   keyExtractor: (item: T) => string | number
   emptyMessage?: string
   surface?: TableSurface
+  trackerColor?: string
   className?: string
   onRowClick?: (item: T) => void
   rowStyle?: (item: T) => CSSProperties | undefined
@@ -58,6 +58,7 @@ function Table<T>({
   keyExtractor,
   emptyMessage = "No data",
   surface = "inset",
+  trackerColor,
   className,
   onRowClick,
   rowStyle,
@@ -108,8 +109,9 @@ function Table<T>({
   return (
     <Card
       elevation="raised"
+      trackerColor={trackerColor}
       className={clsx(
-        "!p-0 overflow-hidden",
+        "p-0! overflow-hidden",
         sortedData.length === 0 && "flex flex-col",
         className
       )}
diff --git a/src/components/ui/Toggle.tsx b/src/components/ui/Toggle.tsx
index 6dda61f1..f488bf64 100644
--- a/src/components/ui/Toggle.tsx
+++ b/src/components/ui/Toggle.tsx
@@ -42,7 +42,7 @@ function Toggle({ label, checked, onChange, disabled = false, description, id }:
             "absolute top-0.5 block w-5 h-5",
             "nm-raised-sm rounded-nm-pill",
             "transition-all duration-200",
-            checked ? "left-[22px] bg-accent" : "left-0.5 bg-secondary"
+            checked ? "left-5.5 bg-accent" : "left-0.5 bg-secondary"
           )}
           aria-hidden="true"
         />
diff --git a/src/components/ui/Tooltip.tsx b/src/components/ui/Tooltip.tsx
index 67cac32d..f316f275 100644
--- a/src/components/ui/Tooltip.tsx
+++ b/src/components/ui/Tooltip.tsx
@@ -1,10 +1,8 @@
 // src/components/ui/Tooltip.tsx
-//
-// Functions: Tooltip
 
 "use client"
 
-import { type ReactNode, useEffect, useRef, useState } from "react"
+import { type ReactNode, useEffect, useLayoutEffect, useRef, useState } from "react"
 import { createPortal } from "react-dom"
 import type { DocsEntry } from "@/lib/constants"
 
@@ -38,12 +36,20 @@ function Tooltip({ content, children, className, docs }: TooltipProps) {
     []
   )
 
-  useEffect(() => {
+  // Portal into the nearest <dialog> ancestor if one exists (top-layer stacking),
+  // otherwise fall back to document.body.
+  const portalTarget = useRef<HTMLElement | null>(null)
+
+  useLayoutEffect(() => {
     if (!visible || !triggerRef.current) return
     const rect = triggerRef.current.getBoundingClientRect()
     setPos({ top: rect.bottom + 6, left: rect.left })
+    portalTarget.current = triggerRef.current.closest("dialog") ?? document.body
   }, [visible])
 
+  const resolvedTarget =
+    portalTarget.current ?? (typeof document !== "undefined" ? document.body : null)
+
   return (
     <>
       {/* biome-ignore lint/a11y/noStaticElementInteractions: tooltip trigger delegates interaction to children */}
@@ -58,18 +64,19 @@ function Tooltip({ content, children, className, docs }: TooltipProps) {
         {children}
       </span>
       {visible &&
+        resolvedTarget &&
         createPortal(
           <div
             ref={tooltipRef}
             role="tooltip"
-            className="fixed z-[9999] px-3 py-2 text-[11px] font-sans font-normal normal-case tracking-normal text-secondary leading-relaxed whitespace-normal bg-overlay nm-raised-sm rounded-nm-sm"
+            className="fixed z-50 px-3 py-2 text-2xs font-sans font-normal normal-case tracking-normal text-secondary leading-relaxed whitespace-normal bg-overlay nm-raised-sm rounded-nm-sm max-w-xs"
             style={{ top: pos.top, left: pos.left }}
             onMouseEnter={show}
             onMouseLeave={hide}
           >
             {content}
             {docs?.description && !docs.href && (
-              <p className="mt-1.5 pt-1.5 border-t border-border text-muted text-[10px]">
+              <p className="mt-1.5 pt-1.5 border-t border-border text-muted text-3xs">
                 {docs.description}
               </p>
             )}
@@ -78,16 +85,17 @@ function Tooltip({ content, children, className, docs }: TooltipProps) {
                 href={docs.href}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="block mt-1.5 pt-1.5 border-t border-border text-accent hover:underline text-[10px]"
+                className="block mt-1.5 pt-1.5 border-t border-border text-accent hover:underline text-3xs"
               >
                 Documentation →
               </a>
             )}
           </div>,
-          document.body
+          resolvedTarget
         )}
     </>
   )
 }
 
+export type { TooltipProps }
 export { Tooltip }
diff --git a/src/components/ui/Typography.tsx b/src/components/ui/Typography.tsx
index fe413d21..cc4c5095 100644
--- a/src/components/ui/Typography.tsx
+++ b/src/components/ui/Typography.tsx
@@ -1,6 +1,6 @@
 // src/components/ui/Typography.tsx
 //
-// Functions: H1, H2, H3, Subheader, Paragraph, Subtext
+// Functions: H1, H2, H3, Subheader, Paragraph, Subtext, SlotLabel, DataCell
 
 import clsx from "clsx"
 import type { HTMLAttributes } from "react"
@@ -9,7 +9,6 @@ interface TypographyProps extends HTMLAttributes<HTMLElement> {
   as?: keyof HTMLElementTagNameMap
 }
 
-/** Page title — used once per page */
 function H1({ className, children, ...props }: HTMLAttributes<HTMLHeadingElement>) {
   return (
     <h1 className={clsx("text-lg font-sans font-bold text-primary", className)} {...props}>
@@ -18,7 +17,6 @@ function H1({ className, children, ...props }: HTMLAttributes<HTMLHeadingElement
   )
 }
 
-/** Section label — uppercase, small, used above Cards to name sections */
 function H2({ className, children, id, ...props }: HTMLAttributes<HTMLHeadingElement>) {
   return (
     <h2
@@ -34,7 +32,6 @@ function H2({ className, children, id, ...props }: HTMLAttributes<HTMLHeadingEle
   )
 }
 
-/** Sub-section heading — used inside Cards to name feature groups */
 function H3({ className, children, ...props }: HTMLAttributes<HTMLHeadingElement>) {
   return (
     <h3 className={clsx("text-sm font-sans font-semibold text-primary", className)} {...props}>
@@ -43,7 +40,6 @@ function H3({ className, children, ...props }: HTMLAttributes<HTMLHeadingElement
   )
 }
 
-/** Supporting heading — secondary label below or beside a heading */
 function Subheader({ as: Tag = "span", className, children, ...props }: TypographyProps) {
   return (
     <Tag className={clsx("text-xs font-sans font-medium text-secondary", className)} {...props}>
@@ -52,7 +48,6 @@ function Subheader({ as: Tag = "span", className, children, ...props }: Typograp
   )
 }
 
-/** Description text — explanations, help text */
 function Paragraph({ className, children, ...props }: HTMLAttributes<HTMLParagraphElement>) {
   return (
     <p className={clsx("text-xs font-sans text-tertiary leading-relaxed", className)} {...props}>
@@ -61,7 +56,7 @@ function Paragraph({ className, children, ...props }: HTMLAttributes<HTMLParagra
   )
 }
 
-/** Fine print — warnings, disclaimers, footnotes */
+/** Fine print: warnings, disclaimers, footnotes */
 function Subtext({ className, children, ...props }: HTMLAttributes<HTMLParagraphElement>) {
   return (
     <p className={clsx("text-xs font-sans text-muted leading-relaxed", className)} {...props}>
@@ -70,4 +65,32 @@ function Subtext({ className, children, ...props }: HTMLAttributes<HTMLParagraph
   )
 }
 
-export { H1, H2, H3, Paragraph, Subheader, Subtext }
+/** uppercase micro text for slot names, field labels in dense UI */
+function SlotLabel({
+  label,
+  className,
+  children,
+  ...props
+}: { label?: string } & HTMLAttributes<HTMLSpanElement>) {
+  return (
+    <span className={clsx("slot-label", className)} {...props}>
+      {label ?? children}
+    </span>
+  )
+}
+
+/** Mono tabular-nums value for leaderboard/table cells */
+function DataCell({
+  value,
+  className,
+  children,
+  ...props
+}: { value?: string } & HTMLAttributes<HTMLSpanElement>) {
+  return (
+    <span className={clsx("tabular-cell", className)} {...props}>
+      {value ?? children}
+    </span>
+  )
+}
+
+export { DataCell, H1, H2, H3, Paragraph, SlotLabel, Subheader, Subtext }
diff --git a/src/components/ui/UptimeBar.tsx b/src/components/ui/UptimeBar.tsx
index 2505405a..0559e30e 100644
--- a/src/components/ui/UptimeBar.tsx
+++ b/src/components/ui/UptimeBar.tsx
@@ -1,9 +1,7 @@
 // src/components/ui/UptimeBar.tsx
-//
-// Functions: UptimeBar
-
 "use client"
 
+import clsx from "clsx"
 import { useMemo, useState } from "react"
 import { CHART_THEME } from "@/components/charts/lib/theme"
 
@@ -63,11 +61,12 @@ function UptimeBar({ buckets, uptimePercent, className = "" }: UptimeBarProps) {
   const percentLabel = uptimePercent != null ? `${uptimePercent}%` : "—"
 
   return (
-    <div className={`flex flex-col gap-1.5 ${className}`}>
+    <div className={clsx("flex flex-col gap-2", className)}>
       <div className="flex items-center justify-between">
         <span className="text-xs font-mono text-tertiary">Uptime (24h)</span>
         <span
-          className={`text-xs font-mono font-semibold ${
+          className={clsx(
+            "text-xs font-mono font-semibold",
             uptimePercent != null && uptimePercent >= 99
               ? "text-success"
               : uptimePercent != null && uptimePercent >= 90
@@ -75,15 +74,15 @@ function UptimeBar({ buckets, uptimePercent, className = "" }: UptimeBarProps) {
                 : uptimePercent != null
                   ? "text-danger"
                   : "text-tertiary"
-          }`}
+          )}
         >
           {percentLabel}
         </span>
       </div>
 
       <div className="relative">
-        <div className="nm-inset rounded-md p-[2px]">
-          <div className="flex gap-[1px] rounded-sm overflow-hidden">
+        <div className="nm-inset rounded-md p-0.5">
+          <div className="flex gap-px rounded-sm overflow-hidden">
             {blocks.map((block, i) => (
               // biome-ignore lint/a11y/noStaticElementInteractions: decorative hover for chart tooltip
               <div
@@ -123,11 +122,12 @@ function UptimeBar({ buckets, uptimePercent, className = "" }: UptimeBarProps) {
       </div>
 
       <div className="flex items-center justify-between">
-        <span className="text-[10px] font-mono text-tertiary/60">24h ago</span>
-        <span className="text-[10px] font-mono text-tertiary/60">now</span>
+        <span className="text-3xs font-mono text-tertiary/60">24h ago</span>
+        <span className="text-3xs font-mono text-tertiary/60">now</span>
       </div>
     </div>
   )
 }
 
+export type { UptimeBarProps, UptimeBucket }
 export { UptimeBar }
diff --git a/src/components/ui/__tests__/Button.test.tsx b/src/components/ui/__tests__/Button.test.tsx
new file mode 100644
index 00000000..7461bcb8
--- /dev/null
+++ b/src/components/ui/__tests__/Button.test.tsx
@@ -0,0 +1,246 @@
+// src/components/ui/__tests__/Button.test.tsx
+
+import { render } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { describe, expect, it, vi } from "vitest"
+import { Button } from "@/components/ui/Button"
+
+// ---------------------------------------------------------------------------
+// default type attribute
+// ---------------------------------------------------------------------------
+
+describe("Button type attribute", () => {
+  it("defaults to type='button'", () => {
+    const { getByRole } = render(<Button>Click</Button>)
+    expect(getByRole("button").getAttribute("type")).toBe("button")
+  })
+
+  it("can be explicitly set to type='submit'", () => {
+    const { getByRole } = render(<Button type="submit">Submit</Button>)
+    expect(getByRole("button").getAttribute("type")).toBe("submit")
+  })
+
+  it("can be explicitly set to type='reset'", () => {
+    const { getByRole } = render(<Button type="reset">Reset</Button>)
+    expect(getByRole("button").getAttribute("type")).toBe("reset")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// text prop and children priority
+// ---------------------------------------------------------------------------
+
+describe("Button text prop and children", () => {
+  it("renders the text prop as content when no children provided", () => {
+    const { getByRole } = render(<Button text="Save changes" />)
+    expect(getByRole("button").textContent).toContain("Save changes")
+  })
+
+  it("renders children when provided and no text prop", () => {
+    const { getByRole } = render(<Button>Child content</Button>)
+    expect(getByRole("button").textContent).toContain("Child content")
+  })
+
+  it("children take priority over text when both are provided", () => {
+    const { getByRole } = render(<Button text="text prop">children content</Button>)
+    const btn = getByRole("button")
+    expect(btn.textContent).toContain("children content")
+    expect(btn.textContent).not.toContain("text prop")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// icon props
+// ---------------------------------------------------------------------------
+
+describe("Button icon props", () => {
+  it("renders leftIcon before content", () => {
+    const { getByRole, getByTestId } = render(
+      <Button leftIcon={<span data-testid="left-icon">L</span>}>Label</Button>
+    )
+    const btn = getByRole("button")
+    const icon = getByTestId("left-icon")
+    const label = btn.lastChild as ChildNode
+    // icon node should come before the text node
+    expect(btn.contains(icon)).toBe(true)
+    expect(btn.firstChild).toBe(icon)
+    expect(label.textContent).toBe("Label")
+  })
+
+  it("renders rightIcon after content", () => {
+    const { getByRole, getByTestId } = render(
+      <Button rightIcon={<span data-testid="right-icon">R</span>}>Label</Button>
+    )
+    const btn = getByRole("button")
+    const icon = getByTestId("right-icon")
+    expect(btn.contains(icon)).toBe(true)
+    expect(btn.lastChild).toBe(icon)
+  })
+
+  it("renders both leftIcon and rightIcon simultaneously", () => {
+    const { getByTestId } = render(
+      <Button
+        leftIcon={<span data-testid="left-icon">L</span>}
+        rightIcon={<span data-testid="right-icon">R</span>}
+      >
+        Label
+      </Button>
+    )
+    expect(getByTestId("left-icon")).toBeDefined()
+    expect(getByTestId("right-icon")).toBeDefined()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// loading state
+// ---------------------------------------------------------------------------
+
+describe("Button loading prop", () => {
+  it("disables the button when loading=true", () => {
+    const { getByRole } = render(<Button loading>Saving</Button>)
+    expect((getByRole("button") as HTMLButtonElement).disabled).toBe(true)
+  })
+
+  it("sets aria-busy='true' when loading=true", () => {
+    const { getByRole } = render(<Button loading>Saving</Button>)
+    expect(getByRole("button").getAttribute("aria-busy")).toBe("true")
+  })
+
+  it("does not set aria-busy when loading=false", () => {
+    const { getByRole } = render(<Button>Idle</Button>)
+    expect(getByRole("button").getAttribute("aria-busy")).toBeNull()
+  })
+
+  it("shows SpinnerIcon (svg) when loading=true", () => {
+    const { getByRole } = render(<Button loading>Saving</Button>)
+    const btn = getByRole("button")
+    const svg = btn.querySelector("svg")
+    expect(svg).not.toBeNull()
+  })
+
+  it("replaces leftIcon with SpinnerIcon when loading=true", () => {
+    const { getByRole, queryByTestId } = render(
+      <Button loading leftIcon={<span data-testid="left-icon">L</span>}>
+        Saving
+      </Button>
+    )
+    const btn = getByRole("button")
+    const svg = btn.querySelector("svg")
+    expect(svg).not.toBeNull()
+    expect(queryByTestId("left-icon")).toBeNull()
+  })
+
+  it("SpinnerIcon has animate-spin class when loading=true", () => {
+    const { getByRole } = render(<Button loading>Saving</Button>)
+    const svg = getByRole("button").querySelector("svg")
+    // SVG elements expose className as SVGAnimatedString; read via getAttribute
+    expect(svg?.getAttribute("class")).toContain("animate-spin")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// size="icon"
+// ---------------------------------------------------------------------------
+
+describe("Button size='icon'", () => {
+  it("applies p-1.5 when size='icon'", () => {
+    const { getByRole } = render(<Button size="icon">i</Button>)
+    expect(getByRole("button").className).toContain("p-1.5")
+  })
+
+  it("applies rounded-nm-sm when size='icon'", () => {
+    const { getByRole } = render(<Button size="icon">i</Button>)
+    expect(getByRole("button").className).toContain("rounded-nm-sm")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// variants
+// ---------------------------------------------------------------------------
+
+describe("Button variants render without error", () => {
+  const variants = ["primary", "secondary", "ghost", "danger", "minimal"] as const
+
+  // Distinguishing class for each variant, derived from the CVA definition in Button.tsx.
+  // These are checked in addition to the render-crash guard (getByRole) so that a
+  // variant silently losing its class is caught even if the component still mounts.
+  const variantClass: Record<(typeof variants)[number], string> = {
+    primary: "bg-accent-dim",
+    secondary: "bg-raised",
+    ghost: "text-secondary", // bg-transparent is shared with minimal; text-secondary is unique to ghost
+    danger: "bg-danger-dim",
+    minimal: "text-muted", // bg-transparent is shared with ghost; text-muted is unique to minimal
+  }
+
+  for (const variant of variants) {
+    it(`renders variant='${variant}'`, () => {
+      const { getByRole } = render(<Button variant={variant}>Label</Button>)
+      const btn = getByRole("button")
+      expect(btn).toBeDefined()
+      expect(btn.className).toContain(variantClass[variant])
+    })
+  }
+})
+
+// ---------------------------------------------------------------------------
+// disabled prop
+// ---------------------------------------------------------------------------
+
+describe("Button disabled prop", () => {
+  it("is not disabled by default", () => {
+    const { getByRole } = render(<Button>Click</Button>)
+    expect((getByRole("button") as HTMLButtonElement).disabled).toBe(false)
+  })
+
+  it("disables the button when disabled=true", () => {
+    const { getByRole } = render(<Button disabled>Click</Button>)
+    expect((getByRole("button") as HTMLButtonElement).disabled).toBe(true)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onClick handler
+// ---------------------------------------------------------------------------
+
+describe("Button onClick", () => {
+  it("fires onClick when clicked", async () => {
+    const user = userEvent.setup()
+    const handler = vi.fn()
+    const { getByRole } = render(<Button onClick={handler}>Click</Button>)
+    await user.click(getByRole("button"))
+    expect(handler).toHaveBeenCalledTimes(1)
+  })
+
+  it("does not fire onClick when disabled", async () => {
+    const user = userEvent.setup()
+    const handler = vi.fn()
+    const { getByRole } = render(
+      <Button disabled onClick={handler}>
+        Click
+      </Button>
+    )
+    await user.click(getByRole("button"))
+    expect(handler).not.toHaveBeenCalled()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// className is appended (not overriding base classes)
+// ---------------------------------------------------------------------------
+
+describe("Button className prop", () => {
+  it("appends the custom className alongside base classes", () => {
+    const { getByRole } = render(<Button className="my-custom-class">Click</Button>)
+    const cls = getByRole("button").className
+    expect(cls).toContain("my-custom-class")
+    // base classes from CVA should still be present
+    expect(cls).toContain("inline-flex")
+  })
+
+  it("base classes remain when className is provided", () => {
+    const { getByRole } = render(<Button className="override-attempt">Click</Button>)
+    const cls = getByRole("button").className
+    expect(cls).toContain("items-center")
+    expect(cls).toContain("justify-center")
+  })
+})
diff --git a/src/components/ui/__tests__/FilterPill.test.tsx b/src/components/ui/__tests__/FilterPill.test.tsx
new file mode 100644
index 00000000..4b3b309f
--- /dev/null
+++ b/src/components/ui/__tests__/FilterPill.test.tsx
@@ -0,0 +1,241 @@
+// src/components/ui/__tests__/FilterPill.test.tsx
+
+import { render } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { describe, expect, it, vi } from "vitest"
+import { FilterPill } from "@/components/ui"
+
+// ---------------------------------------------------------------------------
+// text prop and children priority
+// ---------------------------------------------------------------------------
+
+describe("FilterPill text prop and children", () => {
+  it("renders the text prop as content", () => {
+    const { getByRole } = render(<FilterPill active={false} text="All" />)
+    expect(getByRole("button").textContent).toContain("All")
+  })
+
+  it("renders children when provided and no text prop", () => {
+    const { getByRole } = render(<FilterPill active={false}>Child</FilterPill>)
+    expect(getByRole("button").textContent).toContain("Child")
+  })
+
+  it("children take priority over text when both are provided", () => {
+    const { getByRole } = render(
+      <FilterPill active={false} text="text prop">
+        children content
+      </FilterPill>
+    )
+    const btn = getByRole("button")
+    expect(btn.textContent).toContain("children content")
+    expect(btn.textContent).not.toContain("text prop")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// active prop: aria-pressed and active styles
+// ---------------------------------------------------------------------------
+
+describe("FilterPill active prop", () => {
+  it("sets aria-pressed='true' when active=true", () => {
+    const { getByRole } = render(<FilterPill active={true} text="Active" />)
+    expect(getByRole("button").getAttribute("aria-pressed")).toBe("true")
+  })
+
+  it("sets aria-pressed='false' when active=false", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Inactive" />)
+    expect(getByRole("button").getAttribute("aria-pressed")).toBe("false")
+  })
+
+  it("applies nm-raised-sm when active=true", () => {
+    const { getByRole } = render(<FilterPill active={true} text="Active" />)
+    expect(getByRole("button").className).toContain("nm-raised-sm")
+  })
+
+  it("applies font-semibold when active=true", () => {
+    const { getByRole } = render(<FilterPill active={true} text="Active" />)
+    expect(getByRole("button").className).toContain("font-semibold")
+  })
+
+  it("does not apply nm-raised-sm when active=false", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Inactive" />)
+    expect(getByRole("button").className).not.toContain("nm-raised-sm")
+  })
+
+  it("does not apply font-semibold when active=false", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Inactive" />)
+    expect(getByRole("button").className).not.toContain("font-semibold")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// inactive variants
+// ---------------------------------------------------------------------------
+
+describe("FilterPill inactive='transparent' (default)", () => {
+  it("applies bg-transparent when active=false and no inactive prop", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect(getByRole("button").className).toContain("bg-transparent")
+  })
+
+  it("applies text-muted when active=false and no inactive prop", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect(getByRole("button").className).toContain("text-muted")
+  })
+
+  it("applies bg-transparent when inactive='transparent' explicitly", () => {
+    const { getByRole } = render(<FilterPill active={false} inactive="transparent" text="Label" />)
+    expect(getByRole("button").className).toContain("bg-transparent")
+  })
+})
+
+describe("FilterPill inactive='strikethrough'", () => {
+  it("applies line-through when inactive='strikethrough' and active=false", () => {
+    const { getByRole } = render(
+      <FilterPill active={false} inactive="strikethrough" text="Label" />
+    )
+    expect(getByRole("button").className).toContain("line-through")
+  })
+
+  it("applies opacity-50 when inactive='strikethrough' and active=false", () => {
+    const { getByRole } = render(
+      <FilterPill active={false} inactive="strikethrough" text="Label" />
+    )
+    expect(getByRole("button").className).toContain("opacity-50")
+  })
+})
+
+describe("FilterPill inactive='inset'", () => {
+  it("applies nm-inset-sm when inactive='inset' and active=false", () => {
+    const { getByRole } = render(<FilterPill active={false} inactive="inset" text="Label" />)
+    expect(getByRole("button").className).toContain("nm-inset-sm")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// inactive styles are NOT applied when active=true
+// ---------------------------------------------------------------------------
+
+describe("FilterPill inactive styles suppressed when active=true", () => {
+  it("does not apply line-through when active=true despite inactive='strikethrough'", () => {
+    const { getByRole } = render(<FilterPill active={true} inactive="strikethrough" text="Label" />)
+    expect(getByRole("button").className).not.toContain("line-through")
+  })
+
+  it("does not apply nm-inset-sm when active=true despite inactive='inset'", () => {
+    const { getByRole } = render(<FilterPill active={true} inactive="inset" text="Label" />)
+    expect(getByRole("button").className).not.toContain("nm-inset-sm")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// size prop
+// ---------------------------------------------------------------------------
+
+describe("FilterPill size prop", () => {
+  it("applies text-xs when size='md' (default)", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect(getByRole("button").className).toContain("text-xs")
+  })
+
+  it("applies text-2xs when size='sm'", () => {
+    const { getByRole } = render(<FilterPill active={false} size="sm" text="Label" />)
+    expect(getByRole("button").className).toContain("text-2xs")
+  })
+
+  it("does not apply text-2xs for default (md) size", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect(getByRole("button").className).not.toContain("text-2xs")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// activeColor prop
+// ---------------------------------------------------------------------------
+
+describe("FilterPill activeColor prop", () => {
+  it("applies the activeColor class when active=true", () => {
+    const { getByRole } = render(
+      <FilterPill active={true} activeColor="text-accent" text="Label" />
+    )
+    expect(getByRole("button").className).toContain("text-accent")
+  })
+
+  it("uses default activeColor 'text-primary' when not specified and active=true", () => {
+    const { getByRole } = render(<FilterPill active={true} text="Label" />)
+    expect(getByRole("button").className).toContain("text-primary")
+  })
+
+  it("does not apply activeColor when active=false", () => {
+    const { getByRole } = render(
+      <FilterPill active={false} activeColor="text-accent" text="Label" />
+    )
+    expect(getByRole("button").className).not.toContain("text-accent")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// disabled prop
+// ---------------------------------------------------------------------------
+
+describe("FilterPill disabled prop", () => {
+  it("is not disabled by default", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect((getByRole("button") as HTMLButtonElement).disabled).toBe(false)
+  })
+
+  it("disables the button when disabled=true", () => {
+    const { getByRole } = render(<FilterPill active={false} disabled text="Label" />)
+    expect((getByRole("button") as HTMLButtonElement).disabled).toBe(true)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onClick handler
+// ---------------------------------------------------------------------------
+
+describe("FilterPill onClick", () => {
+  it("fires onClick when clicked", async () => {
+    const user = userEvent.setup()
+    const handler = vi.fn()
+    const { getByRole } = render(<FilterPill active={false} onClick={handler} text="Click me" />)
+    await user.click(getByRole("button"))
+    expect(handler).toHaveBeenCalledTimes(1)
+  })
+
+  it("does not fire onClick when disabled", async () => {
+    const user = userEvent.setup()
+    const handler = vi.fn()
+    const { getByRole } = render(
+      <FilterPill active={false} disabled onClick={handler} text="Click me" />
+    )
+    await user.click(getByRole("button"))
+    expect(handler).not.toHaveBeenCalled()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// always type="button"
+// ---------------------------------------------------------------------------
+
+describe("FilterPill type attribute", () => {
+  it("always has type='button'", () => {
+    const { getByRole } = render(<FilterPill active={false} text="Label" />)
+    expect(getByRole("button").getAttribute("type")).toBe("button")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// className is appended
+// ---------------------------------------------------------------------------
+
+describe("FilterPill className prop", () => {
+  it("appends custom className alongside base classes", () => {
+    const { getByRole } = render(
+      <FilterPill active={false} className="my-custom-class" text="Label" />
+    )
+    const cls = getByRole("button").className
+    expect(cls).toContain("my-custom-class")
+    expect(cls).toContain("font-mono")
+  })
+})
diff --git a/src/components/ui/__tests__/InfoTip.test.tsx b/src/components/ui/__tests__/InfoTip.test.tsx
new file mode 100644
index 00000000..d7ab4c1c
--- /dev/null
+++ b/src/components/ui/__tests__/InfoTip.test.tsx
@@ -0,0 +1,151 @@
+// src/components/ui/__tests__/InfoTip.test.tsx
+
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { describe, expect, it } from "vitest"
+import { InfoTip } from "@/components/ui/InfoTip"
+
+// ---------------------------------------------------------------------------
+// icon variant renders the correct SVG
+// ---------------------------------------------------------------------------
+
+describe("InfoTip icon variant", () => {
+  it("renders info icon by default (circle + two lines)", () => {
+    const { container } = render(<InfoTip content="Help text" />)
+    const svg = container.querySelector("svg")
+    if (!svg) throw new Error("SVG not found")
+    // InfoIcon has a circle + line from y=16→12 (the "i" body) + dot at y=8
+    const lines = svg.querySelectorAll("line")
+    expect(lines.length).toBe(2)
+    expect(lines[0].getAttribute("y1")).toBe("16")
+  })
+
+  it("renders question icon when icon='question'", () => {
+    const { container } = render(<InfoTip icon="question" content="Help text" />)
+    const svg = container.querySelector("svg")
+    if (!svg) throw new Error("SVG not found")
+    // QuestionIcon has a circle + path (the "?" curve) + line at y=17
+    const path = svg.querySelector("path")
+    if (!path) throw new Error("path not found")
+    expect(path.getAttribute("d")).toContain("9.09 9a3")
+    const lines = svg.querySelectorAll("line")
+    expect(lines.length).toBe(1)
+    expect(lines[0].getAttribute("y1")).toBe("17")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// size variant applies correct classes to wrapper
+// ---------------------------------------------------------------------------
+
+describe("InfoTip size variant", () => {
+  it("applies md size classes by default", () => {
+    const { container } = render(<InfoTip content="Help text" />)
+    const wrapper = container.querySelector("span > button")
+    expect(wrapper?.className).toContain("[&>svg]:w-3.5")
+    expect(wrapper?.className).toContain("[&>svg]:h-3.5")
+  })
+
+  it("applies sm size classes", () => {
+    const { container } = render(<InfoTip content="Help text" size="sm" />)
+    const wrapper = container.querySelector("span > button")
+    expect(wrapper?.className).toContain("[&>svg]:w-3")
+    expect(wrapper?.className).toContain("[&>svg]:h-3")
+    // Ensure it's not the md classes (w-3.5)
+    expect(wrapper?.className).not.toContain("w-3.5")
+  })
+
+  it("applies lg size classes", () => {
+    const { container } = render(<InfoTip content="Help text" size="lg" />)
+    const wrapper = container.querySelector("span > button")
+    expect(wrapper?.className).toContain("[&>svg]:w-4")
+    expect(wrapper?.className).toContain("[&>svg]:h-4")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// tooltip content appears on hover
+// ---------------------------------------------------------------------------
+
+describe("InfoTip tooltip behavior", () => {
+  it("shows tooltip content on hover", async () => {
+    const user = userEvent.setup()
+    const { container } = render(<InfoTip content="Explanation of the thing" />)
+    const trigger = container.querySelector("span > button")
+    if (!trigger) throw new Error("trigger not found")
+
+    // Tooltip not visible initially
+    expect(screen.queryByRole("tooltip")).toBeNull()
+
+    await user.hover(trigger)
+    const tooltip = screen.getByRole("tooltip")
+    expect(tooltip.textContent).toContain("Explanation of the thing")
+  })
+
+  it("hides tooltip on unhover", async () => {
+    const user = userEvent.setup()
+    const { container } = render(<InfoTip content="Goes away" />)
+    const trigger = container.querySelector("span > button")
+    if (!trigger) throw new Error("trigger not found")
+
+    await user.hover(trigger)
+    expect(screen.getByRole("tooltip")).toBeTruthy()
+
+    await user.unhover(trigger)
+    // Tooltip has a 150ms hide delay
+    await new Promise((r) => setTimeout(r, 200))
+    expect(screen.queryByRole("tooltip")).toBeNull()
+  })
+
+  it("passes docs prop through to Tooltip", async () => {
+    const user = userEvent.setup()
+    const { container } = render(
+      <InfoTip
+        content="Main content"
+        docs={{ href: "https://example.com", description: "Example docs" }}
+      />
+    )
+    const trigger = container.querySelector("span > button")
+    if (!trigger) throw new Error("trigger not found")
+    await user.hover(trigger)
+
+    const tooltip = screen.getByRole("tooltip")
+    const link = tooltip.querySelector("a")
+    if (!link) throw new Error("link not found")
+    expect(link.getAttribute("href")).toBe("https://example.com")
+    expect(link.textContent).toContain("Documentation")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// className passthrough
+// ---------------------------------------------------------------------------
+
+describe("InfoTip className prop", () => {
+  it("appends custom className to the wrapper", () => {
+    const { container } = render(<InfoTip content="Help" className="ml-2" />)
+    const wrapper = container.querySelector("span > button")
+    expect(wrapper?.className).toContain("ml-2")
+    // Base classes still present
+    expect(wrapper?.className).toContain("cursor-help")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// base styling is always present
+// ---------------------------------------------------------------------------
+
+describe("InfoTip base styles", () => {
+  it("has cursor-help and muted text color", () => {
+    const { container } = render(<InfoTip content="Help" />)
+    const wrapper = container.querySelector("span > button")
+    expect(wrapper?.className).toContain("cursor-help")
+    expect(wrapper?.className).toContain("text-muted")
+  })
+
+  it("SVG has aria-hidden for accessibility", () => {
+    const { container } = render(<InfoTip content="Help" />)
+    const svg = container.querySelector("svg")
+    expect(svg?.getAttribute("aria-hidden")).toBe("true")
+  })
+})
diff --git a/src/components/ui/__tests__/ProgressBar.test.tsx b/src/components/ui/__tests__/ProgressBar.test.tsx
index 395415af..f9adc89e 100644
--- a/src/components/ui/__tests__/ProgressBar.test.tsx
+++ b/src/components/ui/__tests__/ProgressBar.test.tsx
@@ -87,16 +87,6 @@ describe("ProgressBar clamping", () => {
     expect(bar.style.width).toBe("100%")
   })
 
-  it("aria-valuenow reflects the clamped value, not the raw input", () => {
-    const { getByRole } = render(<ProgressBar percent={-999} />)
-    expect(getByRole("progressbar").getAttribute("aria-valuenow")).toBe("0")
-  })
-
-  it("exactly 0 is not clamped further", () => {
-    const { getByRole } = render(<ProgressBar percent={0} />)
-    expect(getByRole("progressbar").getAttribute("aria-valuenow")).toBe("0")
-  })
-
   it("exactly 100 is not clamped further", () => {
     const { getByRole } = render(<ProgressBar percent={100} />)
     expect(getByRole("progressbar").getAttribute("aria-valuenow")).toBe("100")
@@ -129,20 +119,20 @@ describe("ProgressBar color prop", () => {
 })
 
 // ---------------------------------------------------------------------------
-// glow / boxShadow
+// glow / drop-shadow filter
 // ---------------------------------------------------------------------------
 
-describe("ProgressBar box shadow", () => {
-  it("applies glow boxShadow when percent > 0", () => {
+describe("ProgressBar glow", () => {
+  it("applies drop-shadow filter when percent > 0", () => {
     const { getByRole } = render(<ProgressBar percent={50} color="#00d4ff" />)
     const bar = getByRole("progressbar")
-    expect(bar.style.boxShadow).toContain("12px")
+    expect(bar.style.filter).toContain("drop-shadow")
   })
 
-  it("does not apply boxShadow when percent is 0 (fill invisible)", () => {
+  it("does not apply filter when percent is 0 (fill invisible)", () => {
     const { getByRole } = render(<ProgressBar percent={0} color="#00d4ff" />)
     const bar = getByRole("progressbar")
-    expect(bar.style.boxShadow).toBe("")
+    expect(bar.style.filter).toBe("")
   })
 })
 
diff --git a/src/components/ui/index.ts b/src/components/ui/index.ts
index 0a3b131f..083d978d 100644
--- a/src/components/ui/index.ts
+++ b/src/components/ui/index.ts
@@ -1,19 +1,42 @@
 // src/components/ui/index.ts
 
+// ── Components ─────────────────────────────────────────────────────
+export type { CopyButtonProps, DownloadButtonProps } from "./ActionButtons"
+export { CopyButton, DownloadButton } from "./ActionButtons"
+export type { BackToTopProps } from "./BackToTop"
+export { BackToTop } from "./BackToTop"
+export type { BadgeProps, BadgeVariant } from "./Badge"
 export { Badge } from "./Badge"
+export type { ButtonProps, ButtonSize, ButtonVariant } from "./Button"
 export { Button, buttonVariants } from "./Button"
+export type { CardElevation, CardProps } from "./Card"
 export { Card } from "./Card"
+export type { CheckboxProps } from "./Checkbox"
 export { Checkbox } from "./Checkbox"
 export { ChevronToggle } from "./ChevronToggle"
+export type { CollapsibleCardProps } from "./CollapsibleCard"
+export { CollapsibleCard } from "./CollapsibleCard"
+export type { ConfirmActionProps } from "./ConfirmAction"
+export { ConfirmAction } from "./ConfirmAction"
+export type { ConfirmRemoveProps } from "./ConfirmRemove"
+export { ConfirmRemove } from "./ConfirmRemove"
+export type { DialogProps, DialogSize } from "./Dialog"
 export { Dialog } from "./Dialog"
+export { Divider } from "./Divider"
 export { ErrorDisplay } from "./ErrorDisplay"
+export type { FilterPillInactive, FilterPillProps, FilterPillSize } from "./FilterPill"
+export { FilterPill } from "./FilterPill"
 export {
   ActivityIcon,
+  BookIcon,
+  BoxIcon,
+  BugIcon,
   CheckIcon,
   CheckLargeIcon,
   ChevronDownSmallIcon,
   ChevronUpIcon,
   ChevronUpSmallIcon,
+  ClockIcon,
   CopyIcon,
   DownloadArrowIcon,
   ExternalLinkIcon,
@@ -21,29 +44,82 @@ export {
   EyeIcon,
   EyeOffIcon,
   GearIcon,
+  GitHubIcon,
   GridIcon,
   HamburgerIcon,
+  InfoIcon,
   LeechingIcon,
+  PauseIcon,
+  PlayIcon,
   PlusIcon,
+  QuestionIcon,
   RatioIcon,
+  RefreshIcon,
   RequiredRatioIcon,
   SeedingIcon,
+  ServerIcon,
   ShareScoreIcon,
   ShieldIcon,
+  SpinnerIcon,
   StarIcon,
+  TagIcon,
+  TransitPapersIcon,
+  TrashIcon,
   TriangleWarningIcon,
   UploadArrowIcon,
   UserIcon,
+  XIcon,
 } from "./Icons"
+export type { InfoTipIcon, InfoTipProps } from "./InfoTip"
+export { InfoTip } from "./InfoTip"
+export type { InputProps } from "./Input"
 export { Input } from "./Input"
+export type { LazySectionProps } from "./LazySection"
+export { LazySection } from "./LazySection"
 export { MarqueeText } from "./MarqueeText"
 export { MaskedSecret } from "./MaskedSecret"
+export type { NoticeProps, NoticeVariant } from "./Notice"
+export { Notice } from "./Notice"
+export type { NumberInputProps } from "./NumberInput"
 export { NumberInput } from "./NumberInput"
+export type { PillTagProps } from "./PillTag"
+export { PillTag } from "./PillTag"
+export type { ProgressBarProps, ProgressBarSize } from "./ProgressBar"
+export { ProgressBar } from "./ProgressBar"
+export type { ProgressWidgetProps } from "./ProgressWidget"
+export { ProgressWidget } from "./ProgressWidget"
+export type { PulseDotProps, PulseDotSize, PulseDotStatus } from "./PulseDot"
 export { PulseDot } from "./PulseDot"
 export { QBT_TAG_WARN_PATTERN, QbtTagWarning } from "./QbtTagWarning"
 export { RedactedText } from "./RedactedText"
+export type { SaveDiscardBarProps } from "./SaveDiscardBar"
+export { SaveDiscardBar } from "./SaveDiscardBar"
+export type { SectionToggleProps } from "./SectionToggle"
+export { SectionToggle } from "./SectionToggle"
+export type { SelectOption, SelectProps, SelectSize } from "./Select"
+export { Select } from "./Select"
+export type { SheetProps } from "./Sheet"
 export { Sheet } from "./Sheet"
+export type { ShimmerProps } from "./Shimmer"
+export { ChartShimmer, Shimmer, shimmerVariants } from "./Shimmer"
+export type { SparklineProps } from "./Sparkline"
+export { Sparkline } from "./Sparkline"
+export type { AlertLevel, StatCardProps } from "./StatCard"
 export { StatCard } from "./StatCard"
+export {
+  CardListSkeleton,
+  CardSkeleton,
+  ChartGridSkeleton,
+  EventLogSkeleton,
+  TorrentTabSkeleton,
+} from "./skeletons"
+export type { TabBarProps } from "./TabBar"
 export { TabBar } from "./TabBar"
+export type { Column, SortDirection, TableProps } from "./Table"
 export { Table } from "./Table"
+export type { ToggleProps } from "./Toggle"
 export { Toggle } from "./Toggle"
+export type { TooltipProps } from "./Tooltip"
+export { Tooltip } from "./Tooltip"
+export type { UptimeBarProps, UptimeBucket } from "./UptimeBar"
+export { UptimeBar } from "./UptimeBar"
diff --git a/src/components/ui/skeletons.tsx b/src/components/ui/skeletons.tsx
new file mode 100644
index 00000000..41a44094
--- /dev/null
+++ b/src/components/ui/skeletons.tsx
@@ -0,0 +1,110 @@
+// src/components/ui/skeletons.tsx
+
+import { Card } from "./Card"
+import { ChartShimmer, Shimmer } from "./Shimmer"
+
+/**
+ * A collapsed card shape
+ */
+function CardSkeleton() {
+  return (
+    <Card>
+      <div className="flex items-center gap-3 px-1">
+        <Shimmer rounded="full" className="h-4 w-4" />
+        <Shimmer size="text" className="w-32" />
+        <div className="flex-1" />
+        <Shimmer size="label" className="w-16" />
+      </div>
+    </Card>
+  )
+}
+
+/**
+ * A list of card skeletons
+ */
+function CardListSkeleton({ count = 2 }: { count?: number }) {
+  return (
+    <div className="flex flex-col gap-6">
+      {Array.from({ length: count }, (_, i) => (
+        <CardSkeleton key={`card-${i}`} />
+      ))}
+    </div>
+  )
+}
+
+/**
+ * Event log skeleton
+ */
+function EventLogSkeleton({ rows = 6 }: { rows?: number }) {
+  const widths = ["w-full", "w-5/6", "w-4/5", "w-full", "w-3/4", "w-5/6"]
+  return (
+    <div className="nm-inset-sm rounded-nm-md p-3 flex flex-col gap-2.5">
+      {Array.from({ length: rows }, (_, i) => (
+        <Shimmer key={`log-${i}`} size="text" className={widths[i % widths.length]} />
+      ))}
+    </div>
+  )
+}
+
+/**
+ * Chart grid skeleton
+ */
+function ChartGridSkeleton({
+  count = 4,
+  columns = 2,
+  chartHeight = "h-48",
+}: {
+  count?: number
+  columns?: 1 | 2
+  chartHeight?: string
+}) {
+  return (
+    <div className={`grid grid-cols-1 gap-6${columns === 2 ? " lg:grid-cols-2" : ""}`}>
+      {Array.from({ length: count }, (_, i) => (
+        <Card key={`chart-${i}`}>
+          <div className="flex flex-col gap-4">
+            <Shimmer size="heading" className="w-40" />
+            <ChartShimmer height={chartHeight} />
+          </div>
+        </Card>
+      ))}
+    </div>
+  )
+}
+
+/**
+ * Stat row and table skeleton
+ */
+function TorrentTabSkeleton() {
+  return (
+    <div className="flex flex-col gap-6">
+      {/* Stat pills row */}
+      <div className="flex gap-3 flex-wrap">
+        {Array.from({ length: 5 }, (_, i) => (
+          <Shimmer key={`stat-${i}`} className="h-9 w-28" rounded="md" />
+        ))}
+      </div>
+      {/* Table-like rows */}
+      <div className="nm-inset-sm rounded-nm-md p-4 flex flex-col gap-3">
+        <div className="flex gap-4">
+          <Shimmer size="text" className="w-16" />
+          <Shimmer size="text" className="w-48" />
+          <div className="flex-1" />
+          <Shimmer size="text" className="w-20" />
+          <Shimmer size="text" className="w-20" />
+        </div>
+        {Array.from({ length: 4 }, (_, i) => (
+          <div key={`row-${i}`} className="flex gap-4">
+            <Shimmer size="text" className="w-16" />
+            <Shimmer size="text" className="w-48" />
+            <div className="flex-1" />
+            <Shimmer size="text" className="w-20" />
+            <Shimmer size="text" className="w-20" />
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
+
+export { CardListSkeleton, CardSkeleton, ChartGridSkeleton, EventLogSkeleton, TorrentTabSkeleton }
diff --git a/src/data/__tests__/tracker-registry.test.ts b/src/data/__tests__/tracker-registry.test.ts
index 704e2573..2e126867 100644
--- a/src/data/__tests__/tracker-registry.test.ts
+++ b/src/data/__tests__/tracker-registry.test.ts
@@ -11,38 +11,27 @@
 import fs from "node:fs"
 import path from "node:path"
 import { afterAll, describe, expect, it } from "vitest"
-import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+import {
+  getTrackerBySlug,
+  TRACKER_REGISTRY,
+  type TrackerRegistryEntry,
+} from "@/data/tracker-registry"
+import {
+  isEmpty,
+  LOGO_NAME_RE,
+  normalizeTrackerUrl,
+  PLACEHOLDER_RE,
+  SLUG_RE,
+  VALID_CONTENT_CATEGORIES,
+} from "@/data/tracker-validation-rules"
 import { ALL_TRACKERS } from "@/data/trackers"
 import { DEFAULT_API_PATHS } from "@/lib/adapters"
+import { VALID_PLATFORM_TYPES } from "@/lib/adapters/constants"
+import { isValidHex } from "@/lib/validators"
 
-const VALID_PLATFORMS = ["unit3d", "gazelle", "ggn", "nebulance", "mam", "custom"] as const
-const HEX_COLOR_RE = /^#[0-9a-fA-F]{6}$/
-const SLUG_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/
-const LOGO_NAME_RE = /^\/tracker-logos\/[a-z0-9_]+_logo\.(svg|png)$/
+const VALID_PLATFORMS = VALID_PLATFORM_TYPES
 const TRACKER_DIR = path.resolve(__dirname, "../../data/trackers")
 const LOGO_DIR = path.resolve(__dirname, "../../../public/tracker-logos")
-const PLACEHOLDER_RE = /^TODO$/i
-
-// Canonical content categories — add new categories here, not in tracker files.
-// UI filter pills display these directly.
-const VALID_CONTENT_CATEGORIES = new Set([
-  "Movies",
-  "TV",
-  "Music",
-  "Games",
-  "Apps",
-  "Sports",
-  "Books",
-  "Audiobooks",
-  "Comics",
-  "Manga",
-  "Anime",
-  "XXX",
-  "Documentaries",
-  "Education",
-  "Tutorials",
-  "Fanres",
-])
 
 // ---------------------------------------------------------------------------
 // Warning collector — printed after all tests, does not fail CI
@@ -61,13 +50,6 @@ function warn(tracker: string, msg: string) {
 const PRODUCTION_TRACKERS = ALL_TRACKERS.filter((t: TrackerRegistryEntry) => !t.draft)
 const DRAFT_TRACKERS = ALL_TRACKERS.filter((t: TrackerRegistryEntry) => t.draft)
 
-function isEmpty(val: unknown): boolean {
-  if (val === undefined || val === null) return true
-  if (typeof val === "string") return val.trim().length === 0
-  if (Array.isArray(val)) return val.length === 0
-  return false
-}
-
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------
@@ -82,8 +64,7 @@ describe("tracker registry", () => {
   })
 
   it("has no duplicate URLs", () => {
-    const normalize = (u: string) => u.replace(/\/+$/, "").toLowerCase()
-    const urls = ALL_TRACKERS.map((t: TrackerRegistryEntry) => normalize(t.url))
+    const urls = ALL_TRACKERS.map((t: TrackerRegistryEntry) => normalizeTrackerUrl(t.url))
     const dupes = urls.filter((u: string, i: number) => urls.indexOf(u) !== i)
     expect(dupes, `Duplicate URLs: ${dupes.join(", ")}`).toEqual([])
   })
@@ -229,7 +210,7 @@ describe("tracker registry", () => {
 
         if (tracker.color) {
           it("has a valid hex color", () => {
-            expect(tracker.color).toMatch(HEX_COLOR_RE)
+            expect(isValidHex(tracker.color as string)).toBe(true)
           })
         }
 
@@ -278,6 +259,23 @@ describe("tracker registry", () => {
     }
   })
 
+  // ── Migrated from src/data/tracker-registry.test.ts ──────────────────
+
+  it("has at least 2 trackers", () => {
+    expect(TRACKER_REGISTRY.length).toBeGreaterThanOrEqual(2)
+  })
+
+  describe("getTrackerBySlug", () => {
+    it("returns correct tracker", () => {
+      const aither = getTrackerBySlug("aither")
+      expect(aither?.name).toBe("Aither")
+    })
+
+    it("returns undefined for unknown slug", () => {
+      expect(getTrackerBySlug("nonexistent")).toBeUndefined()
+    })
+  })
+
   // ── Print collected warnings after all tests ──────────────────────────
 
   afterAll(() => {
diff --git a/src/data/tracker-registry.test.ts b/src/data/tracker-registry.test.ts
deleted file mode 100644
index 8c94ad80..00000000
--- a/src/data/tracker-registry.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// src/data/tracker-registry.test.ts
-import { describe, expect, it } from "vitest"
-import { getAllTrackers, getTrackerBySlug, TRACKER_REGISTRY } from "./tracker-registry"
-
-describe("tracker registry", () => {
-  it("has at least 2 trackers", () => {
-    expect(TRACKER_REGISTRY.length).toBeGreaterThanOrEqual(2)
-  })
-
-  it("all entries have required fields", () => {
-    for (const tracker of TRACKER_REGISTRY) {
-      expect(tracker.slug).toBeTruthy()
-      expect(tracker.name).toBeTruthy()
-      expect(tracker.url).toMatch(/^https:\/\//)
-      expect(["unit3d", "gazelle", "ggn", "nebulance", "mam"]).toContain(tracker.platform)
-      if (tracker.platform === "unit3d") {
-        expect(tracker.apiPath).toBe("/api/user")
-      } else if (tracker.platform === "gazelle") {
-        expect(tracker.apiPath).toBe("/ajax.php")
-      } else if (tracker.platform === "ggn" || tracker.platform === "nebulance") {
-        expect(tracker.apiPath).toBe("/api.php")
-      } else if (tracker.platform === "mam") {
-        expect(tracker.apiPath).toBe("/jsonLoad.php")
-      }
-      expect(tracker.color).toMatch(/^#[0-9a-f]{6}$/i)
-    }
-  })
-
-  it("has unique slugs", () => {
-    const slugs = TRACKER_REGISTRY.map((t) => t.slug)
-    expect(new Set(slugs).size).toBe(slugs.length)
-  })
-
-  it("getTrackerBySlug returns correct tracker", () => {
-    const aither = getTrackerBySlug("aither")
-    expect(aither?.name).toBe("Aither")
-  })
-
-  it("getTrackerBySlug returns undefined for unknown slug", () => {
-    expect(getTrackerBySlug("nonexistent")).toBeUndefined()
-  })
-
-  it("getAllTrackers returns all entries", () => {
-    expect(getAllTrackers().length).toBe(TRACKER_REGISTRY.length)
-  })
-})
diff --git a/src/data/tracker-registry.ts b/src/data/tracker-registry.ts
index dd7739bf..539e8176 100644
--- a/src/data/tracker-registry.ts
+++ b/src/data/tracker-registry.ts
@@ -1,11 +1,8 @@
 // src/data/tracker-registry.ts
-//
-// Exports: RankPerkType, RankPerk, TrackerUserClass, TrackerRules, TrackerRegistryEntry, TRACKER_REGISTRY, getTrackerBySlug, getAllTrackers, findRegistryEntry
-//
-// Type definitions and public API for the tracker registry.
-// Individual tracker data lives in src/data/trackers/.
 
-import { normalizeUrl } from "@/lib/url"
+import type { PlatformType } from "@/lib/adapters/constants"
+import type { GazelleAuthStyle, Unit3dAuthStyle } from "@/lib/adapters/types"
+import { normalizeUrl } from "@/lib/data-transforms"
 import { ALL_TRACKERS } from "./trackers"
 
 export interface ReleaseGroup {
@@ -50,7 +47,7 @@ export interface TrackerRegistryEntry {
   abbreviation?: string
   url: string
   description: string
-  platform: "unit3d" | "gazelle" | "ggn" | "nebulance" | "mam" | "custom"
+  platform: PlatformType
   apiPath: string
   specialty: string
   contentCategories: string[]
@@ -76,9 +73,9 @@ export interface TrackerRegistryEntry {
   warningNote?: string
   supportsTransitPapers?: boolean
   profileUrlPattern?: string
-  gazelleAuthStyle?: "token" | "raw"
+  gazelleAuthStyle?: GazelleAuthStyle
   gazelleEnrich?: boolean
-  unit3dAuthStyle?: "bearer" | "query"
+  unit3dAuthStyle?: Unit3dAuthStyle
 }
 
 export const TRACKER_REGISTRY: TrackerRegistryEntry[] = ALL_TRACKERS.filter((t) => !t.draft)
@@ -87,10 +84,6 @@ export function getTrackerBySlug(slug: string): TrackerRegistryEntry | undefined
   return TRACKER_REGISTRY.find((t) => t.slug === slug)
 }
 
-export function getAllTrackers(): TrackerRegistryEntry[] {
-  return TRACKER_REGISTRY
-}
-
 export function findRegistryEntry(baseUrl: string): TrackerRegistryEntry | undefined {
   const normalized = normalizeUrl(baseUrl)
   return TRACKER_REGISTRY.find((r) => normalizeUrl(r.url) === normalized)
diff --git a/src/data/tracker-validation-rules.ts b/src/data/tracker-validation-rules.ts
new file mode 100644
index 00000000..774ba3e3
--- /dev/null
+++ b/src/data/tracker-validation-rules.ts
@@ -0,0 +1,36 @@
+// src/data/tracker-validation-rules.ts
+//
+// Shared constants for tracker registry validation.
+// Used by both the CI script and the test suite.
+
+export const SLUG_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/
+export const LOGO_NAME_RE = /^\/tracker-logos\/[a-z0-9_]+_logo\.(svg|png)$/
+export const PLACEHOLDER_RE = /^TODO$/i
+
+export const VALID_CONTENT_CATEGORIES = new Set([
+  "Movies",
+  "TV",
+  "Music",
+  "Games",
+  "Apps",
+  "Sports",
+  "Books",
+  "Audiobooks",
+  "Comics",
+  "Manga",
+  "Anime",
+  "XXX",
+  "Documentaries",
+  "Education",
+  "Tutorials",
+  "Fanres",
+])
+
+export function isEmpty(val: unknown): boolean {
+  if (val === null || val === undefined) return true
+  if (typeof val === "string" && val.trim() === "") return true
+  if (Array.isArray(val) && val.length === 0) return true
+  return false
+}
+
+export { normalizeUrl as normalizeTrackerUrl } from "@/lib/data-transforms"
diff --git a/src/data/trackers/_template.ts b/src/data/trackers/_template.ts
index 612ae9cb..0eace71f 100644
--- a/src/data/trackers/_template.ts
+++ b/src/data/trackers/_template.ts
@@ -14,15 +14,15 @@
 // Allowed content categories:
 //   Movies, TV, Music, Games, Apps, Sports, Books, Audiobooks, Comics,
 //   Manga, Anime, XXX, Documentaries, Education, Tutorials, Fanres,
-//   iOS Apps, Graphics, Audio
 //
 // Validator checks:
 //   - slug: lowercase letters and hyphens only
-//   - platform: "unit3d" | "gazelle" | "ggn" | "nebulance" | "custom"
+//   - platform: "unit3d" | "gazelle" | "ggn" | "nebulance" | "mam" | "avistaz" | "custom"
 //   - apiPath must match platform default:
 //       unit3d   → "/api/user"
 //       gazelle  → "/ajax.php"
 //       ggn      → "/api.php"
+//       avistaz  → "/profile"
 //   - url: https only
 //   - contentCategories: values must come from the allowed list above
 //   - language: required
@@ -39,7 +39,7 @@ export const mytracker: TrackerRegistryEntry = {
   description: "TODO", // 1-2 sentence overview
 
   // ── Platform & API ──────────────────────────────────────────────────
-  platform: "unit3d", // "unit3d" | "gazelle" | "ggn" | "nebulance" | "custom"
+  platform: "unit3d", // "unit3d" | "gazelle" | "ggn" | "nebulance" | "mam" | "avistaz" | "custom"
   // Platform-specific fields (uncomment for your platform):
   //   gazelleAuthStyle: "token",   // gazelle only — "token" | "raw"
   //   gazelleEnrich: true,         // gazelle only — enables enrichment call
diff --git a/src/data/trackers/animez.ts b/src/data/trackers/animez.ts
new file mode 100644
index 00000000..f8d31e57
--- /dev/null
+++ b/src/data/trackers/animez.ts
@@ -0,0 +1,114 @@
+// src/data/trackers/animez.ts
+
+import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+
+export const animez: TrackerRegistryEntry = {
+  // ── Identity ────────────────────────────────────────────────────────
+  slug: "animez",
+  name: "AnimeZ",
+  abbreviation: "AnZ",
+  url: "https://animez.to",
+  description:
+    "Formerly AnimeTorrents. Part of the AvistaZ network, specializing in anime and manga content.",
+
+  // ── Platform & API ──────────────────────────────────────────────────
+  platform: "avistaz",
+  apiPath: "/profile",
+
+  // ── Content ─────────────────────────────────────────────────────────
+  specialty: "Anime / Manga",
+  contentCategories: ["Anime", "Manga"],
+  language: "English",
+
+  // ── Visual ──────────────────────────────────────────────────────────
+  color: "#ff6f00",
+  logo: "/tracker-logos/animez_logo.svg",
+
+  // ── External Links ──────────────────────────────────────────────────
+  trackerHubSlug: "",
+  statusPageUrl: "",
+
+  // ── Community ───────────────────────────────────────────────────────
+  userClasses: [
+    { name: "Banned", requirements: "Violated site rules. Cannot access site" },
+    {
+      name: "Leech",
+      requirements:
+        "Ratio below 1.0 or demoted. 1 download/week, torrents 7+ days old only. No uploads",
+    },
+    {
+      name: "Newbie",
+      requirements:
+        "New user, age ≥ 7 days, ratio ≥ 1.0. 5 downloads/day, torrents 7+ days old only",
+    },
+    {
+      name: "Member",
+      requirements: "Upload ≥ 5 GiB, ratio ≥ 1.0, age ≥ 7 days. 50 downloads/day, can upload",
+    },
+    {
+      name: "Power User",
+      requirements: "Strong upload history and consistent ratio. 50 downloads/day",
+    },
+    { name: "V.I.P.", requirements: "Donor, staff-promoted, or distinguished. 100 downloads/day" },
+    {
+      name: "Uploader",
+      requirements:
+        "Staff-promoted for quality and quantity of uploads. API and tag creation access",
+    },
+  ],
+  releaseGroups: [],
+  bannedGroups: [],
+  notableMembers: [],
+
+  // ── Rules ───────────────────────────────────────────────────────────
+  rules: {
+    minimumRatio: 1,
+    seedTimeHours: 72,
+    loginIntervalDays: 60,
+    fullRulesMarkdown: [
+      "## General Rules",
+      "- **One account per person per lifetime.** No additional accounts under any circumstances.",
+      "- One account per IP address. Multiple accounts on same IP → all banned.",
+      "- No cheating. Cheaters banned without notice.",
+      "- Anti-lurking: Must upload or download within 30 days of account creation.",
+      "- Must login at least once every **60 days** and download at least 1 torrent every **90 days**.",
+      "- Account trading and bonus point trading between sites → ban.",
+      "",
+      "## Ratio",
+      "- Must maintain an overall ratio of **1.0 or better**.",
+      "- Maintain a minimum ratio of **0.5** per torrent where possible.",
+      "- Frequent leeching, hit-and-run, or low ratio → disabled downloads or ban.",
+      "",
+      "## Hit & Run",
+      "- **All torrents** must be seeded (including free/half-free). No exemptions for VIP/Staff.",
+      "- **Under 50 GB:** 72 hours + 2 hours per GB downloaded.",
+      "- **50 GB and over:** Complex logarithmic formula (larger torrents = diminishing time increase).",
+      "- **Alternatively:** Seed until you reach 0.9 ratio on that torrent.",
+      "- **Partial downloads (10%+ downloaded):** Must seed back 90% of what you downloaded, or seed for 60 days.",
+      "- **Under 10% downloaded:** No H&R penalty — you can delete it.",
+      "- H&R can be cleared with **bonus points** at 10 BP per hour of seeding time owed.",
+      "- Re-downloaded torrents must be seeded again.",
+      "",
+      "## User Ranks",
+      "- **Newbie:** New user. 5 downloads/day, 1 week old+ only. No uploads, no RSS.",
+      "- **Member:** 5 GB upload + ratio >= 1.0 + 7 days. 50 downloads/day. Can upload and use RSS.",
+      "- **V.I.P.:** Donor/distinguished. 100 downloads/day.",
+      "- **Uploader:** Staff promoted. 200 downloads/day.",
+      "- **Leech:** Ratio below 1.0. 1 download per 7 days, 1 week old+ only.",
+      "",
+      "## Allowed Clients",
+      "- qBittorrent (preferred), Deluge, Transmission, rTorrent, uTorrent (2.2.1 or latest only).",
+      "- No mobile clients. No cloud-based clients. No Azureus/BiglyBT.",
+      "- qBittorrent: disable Anonymous Mode. Consider disabling Torrent Queuing for proper bonus points.",
+    ],
+  },
+
+  // ── Status ──────────────────────────────────────────────────────────
+  warning: false,
+  warningNote: "",
+
+  // ── Flags ───────────────────────────────────────────────────────────
+  draft: false,
+  supportsTransitPapers: false,
+  profileUrlPattern: "/profile/{username}",
+}
diff --git a/src/data/trackers/avistaz.ts b/src/data/trackers/avistaz.ts
index 8cc2ada5..1acb7bf1 100644
--- a/src/data/trackers/avistaz.ts
+++ b/src/data/trackers/avistaz.ts
@@ -8,36 +8,83 @@ export const avistaz: TrackerRegistryEntry = {
   name: "AvistaZ",
   abbreviation: "AvZ",
   url: "https://avistaz.to",
-  description: "Very good Asian movie and TV tracker, part of the AvistaZ network.",
+  description:
+    "Flagship of the AvistaZ network. Asian movies, TV shows, and some music. Often opens signups.",
 
   // ── Platform & API ──────────────────────────────────────────────────
-  platform: "custom",
-  apiPath: "/api/user",
+  platform: "avistaz",
+  apiPath: "/profile",
 
   // ── Content ─────────────────────────────────────────────────────────
   specialty: "Asian Movies / TV",
-  contentCategories: ["Movies", "TV"],
+  contentCategories: ["Movies", "TV", "Music"],
   language: "English",
 
   // ── Visual ──────────────────────────────────────────────────────────
   color: "#e91e63",
-  logo: "",
+  logo: "/tracker-logos/avistaz_logo.png",
 
   // ── External Links ──────────────────────────────────────────────────
   trackerHubSlug: "",
   statusPageUrl: "",
 
   // ── Community ───────────────────────────────────────────────────────
-  userClasses: [],
+  userClasses: [
+    { name: "Banned", requirements: "Violated site rules" },
+    { name: "Leech", requirements: "Ratio below 1.0. 1 download per 7 days, 1 week old+ only" },
+    {
+      name: "Newbie",
+      requirements: "New user. 5 downloads/day, 1 week old+ only. No uploads or RSS",
+    },
+    { name: "Member", requirements: "5 GB upload, ratio >= 1.0, 7+ days. 50 downloads/day" },
+    { name: "V.I.P.", requirements: "Donor/distinguished. 100 downloads/day" },
+    { name: "Uploader", requirements: "Staff promoted. 200 downloads/day" },
+  ],
   releaseGroups: [],
   bannedGroups: [],
   notableMembers: [],
 
   // ── Rules ───────────────────────────────────────────────────────────
   rules: {
-    minimumRatio: 0,
-    seedTimeHours: 0,
-    loginIntervalDays: 0,
+    minimumRatio: 1,
+    seedTimeHours: 72,
+    loginIntervalDays: 60,
+    fullRulesMarkdown: [
+      "## General Rules",
+      "- **One account per person per lifetime.** No additional accounts under any circumstances.",
+      "- One account per IP address. Multiple accounts on same IP → all banned.",
+      "- No cheating. Cheaters banned without notice.",
+      "- Anti-lurking: Must upload or download within 30 days of account creation.",
+      "- Must login at least once every **60 days** and download at least 1 torrent every **90 days**.",
+      "- Account trading and bonus point trading between sites → ban.",
+      "",
+      "## Ratio",
+      "- Must maintain an overall ratio of **1.0 or better**.",
+      "- Maintain a minimum ratio of **0.5** per torrent where possible.",
+      "- Frequent leeching, hit-and-run, or low ratio → disabled downloads or ban.",
+      "",
+      "## Hit & Run",
+      "- **All torrents** must be seeded (including free/half-free). No exemptions for VIP/Staff.",
+      "- **Under 50 GB:** 72 hours + 2 hours per GB downloaded.",
+      "- **50 GB and over:** Complex logarithmic formula (larger torrents = diminishing time increase).",
+      "- **Alternatively:** Seed until you reach 0.9 ratio on that torrent.",
+      "- **Partial downloads (10%+ downloaded):** Must seed back 90% of what you downloaded, or seed for 60 days.",
+      "- **Under 10% downloaded:** No H&R penalty — you can delete it.",
+      "- H&R can be cleared with **bonus points** at 10 BP per hour of seeding time owed.",
+      "- Re-downloaded torrents must be seeded again.",
+      "",
+      "## User Ranks",
+      "- **Newbie:** New user. 5 downloads/day, 1 week old+ only. No uploads, no RSS.",
+      "- **Member:** 5 GB upload + ratio >= 1.0 + 7 days. 50 downloads/day. Can upload and use RSS.",
+      "- **V.I.P.:** Donor/distinguished. 100 downloads/day.",
+      "- **Uploader:** Staff promoted. 200 downloads/day.",
+      "- **Leech:** Ratio below 1.0. 1 download per 7 days, 1 week old+ only.",
+      "",
+      "## Allowed Clients",
+      "- qBittorrent (preferred), Deluge, Transmission, rTorrent, uTorrent (2.2.1 or latest only).",
+      "- No mobile clients. No cloud-based clients. No Azureus/BiglyBT.",
+      "- qBittorrent: disable Anonymous Mode. Consider disabling Torrent Queuing for proper bonus points.",
+    ],
   },
 
   // ── Status ──────────────────────────────────────────────────────────
@@ -45,7 +92,7 @@ export const avistaz: TrackerRegistryEntry = {
   warningNote: "",
 
   // ── Flags ───────────────────────────────────────────────────────────
-  draft: true,
+  draft: false,
   supportsTransitPapers: false,
-  profileUrlPattern: "",
+  profileUrlPattern: "/profile/{username}",
 }
diff --git a/src/data/trackers/cinemaz.ts b/src/data/trackers/cinemaz.ts
index fed3589a..5d20a446 100644
--- a/src/data/trackers/cinemaz.ts
+++ b/src/data/trackers/cinemaz.ts
@@ -9,11 +9,11 @@ export const cinemaz: TrackerRegistryEntry = {
   abbreviation: "CZ",
   url: "https://cinemaz.to",
   description:
-    "Part of the PrivateHD network which often opens for signups. Foreign and non-mainstream movies and TV.",
+    "Part of the AvistaZ network. Foreign and non-mainstream movies and TV. Often opens signups.",
 
   // ── Platform & API ──────────────────────────────────────────────────
-  platform: "custom",
-  apiPath: "/api/user",
+  platform: "avistaz",
+  apiPath: "/profile",
 
   // ── Content ─────────────────────────────────────────────────────────
   specialty: "Foreign / Non-mainstream",
@@ -22,23 +22,69 @@ export const cinemaz: TrackerRegistryEntry = {
 
   // ── Visual ──────────────────────────────────────────────────────────
   color: "#2980b9",
-  logo: "",
+  logo: "/tracker-logos/cinemaz_logo.png",
 
   // ── External Links ──────────────────────────────────────────────────
   trackerHubSlug: "",
   statusPageUrl: "",
 
   // ── Community ───────────────────────────────────────────────────────
-  userClasses: [],
+  userClasses: [
+    { name: "Banned", requirements: "Violated site rules" },
+    { name: "Leech", requirements: "Ratio below 1.0. 1 download per 7 days, 1 week old+ only" },
+    {
+      name: "Newbie",
+      requirements: "New user. 5 downloads/day, 1 week old+ only. No uploads or RSS",
+    },
+    { name: "Member", requirements: "5 GB upload, ratio >= 1.0, 7+ days. 50 downloads/day" },
+    { name: "V.I.P.", requirements: "Donor/distinguished. 100 downloads/day" },
+    { name: "Uploader", requirements: "Staff promoted. 200 downloads/day" },
+  ],
   releaseGroups: [],
   bannedGroups: [],
   notableMembers: [],
 
   // ── Rules ───────────────────────────────────────────────────────────
   rules: {
-    minimumRatio: 0,
-    seedTimeHours: 0,
-    loginIntervalDays: 0,
+    minimumRatio: 1,
+    seedTimeHours: 72,
+    loginIntervalDays: 60,
+    fullRulesMarkdown: [
+      "## General Rules",
+      "- **One account per person per lifetime.** No additional accounts under any circumstances.",
+      "- One account per IP address. Multiple accounts on same IP → all banned.",
+      "- No cheating. Cheaters banned without notice.",
+      "- Anti-lurking: Must upload or download within 30 days of account creation.",
+      "- Must login at least once every **60 days** and download at least 1 torrent every **90 days**.",
+      "- Account trading and bonus point trading between sites → ban.",
+      "",
+      "## Ratio",
+      "- Must maintain an overall ratio of **1.0 or better**.",
+      "- Maintain a minimum ratio of **0.5** per torrent where possible.",
+      "- Frequent leeching, hit-and-run, or low ratio → disabled downloads or ban.",
+      "",
+      "## Hit & Run",
+      "- **All torrents** must be seeded (including free/half-free). No exemptions for VIP/Staff.",
+      "- **Under 50 GB:** 72 hours + 2 hours per GB downloaded.",
+      "- **50 GB and over:** Complex logarithmic formula (larger torrents = diminishing time increase).",
+      "- **Alternatively:** Seed until you reach 0.9 ratio on that torrent.",
+      "- **Partial downloads (10%+ downloaded):** Must seed back 90% of what you downloaded, or seed for 60 days.",
+      "- **Under 10% downloaded:** No H&R penalty — you can delete it.",
+      "- H&R can be cleared with **bonus points** at 10 BP per hour of seeding time owed.",
+      "- Re-downloaded torrents must be seeded again.",
+      "",
+      "## User Ranks",
+      "- **Newbie:** New user. 5 downloads/day, 1 week old+ only. No uploads, no RSS.",
+      "- **Member:** 5 GB upload + ratio >= 1.0 + 7 days. 50 downloads/day. Can upload and use RSS.",
+      "- **V.I.P.:** Donor/distinguished. 100 downloads/day.",
+      "- **Uploader:** Staff promoted. 200 downloads/day.",
+      "- **Leech:** Ratio below 1.0. 1 download per 7 days, 1 week old+ only.",
+      "",
+      "## Allowed Clients",
+      "- qBittorrent (preferred), Deluge, Transmission, rTorrent, uTorrent (2.2.1 or latest only).",
+      "- No mobile clients. No cloud-based clients. No Azureus/BiglyBT.",
+      "- qBittorrent: disable Anonymous Mode. Consider disabling Torrent Queuing for proper bonus points.",
+    ],
   },
 
   // ── Status ──────────────────────────────────────────────────────────
@@ -46,7 +92,7 @@ export const cinemaz: TrackerRegistryEntry = {
   warningNote: "",
 
   // ── Flags ───────────────────────────────────────────────────────────
-  draft: true,
+  draft: false,
   supportsTransitPapers: false,
-  profileUrlPattern: "",
+  profileUrlPattern: "/profile/{username}",
 }
diff --git a/src/data/trackers/darkpeers.ts b/src/data/trackers/darkpeers.ts
new file mode 100644
index 00000000..06e543b2
--- /dev/null
+++ b/src/data/trackers/darkpeers.ts
@@ -0,0 +1,141 @@
+// src/data/trackers/darkpeers.ts
+
+import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+
+export const darkpeers: TrackerRegistryEntry = {
+  // ── Identity ────────────────────────────────────────────────────────
+  slug: "darkpeers",
+  name: "DarkPeers",
+  abbreviation: "DP",
+  url: "https://darkpeers.org",
+  description:
+    "Nordic-based general tracker covering movies, TV, music, games, and books. UNIT3D. Launched March 2025.",
+
+  // ── Platform & API ──────────────────────────────────────────────────
+  platform: "unit3d",
+  apiPath: "/api/user",
+
+  // ── Content ─────────────────────────────────────────────────────────
+  specialty: "General",
+  contentCategories: ["Movies", "TV", "Music", "Games", "Books"],
+  language: "English",
+
+  // ── Visual ──────────────────────────────────────────────────────────
+  color: "#c0c0c0",
+  logo: "/tracker-logos/darkpeers_logo.png",
+
+  // ── External Links ──────────────────────────────────────────────────
+  trackerHubSlug: "",
+  statusPageUrl: "",
+
+  // ── Community ───────────────────────────────────────────────────────
+  userClasses: [
+    { name: "Validating", requirements: "New account, no privileges" },
+    { name: "User", requirements: "Ratio ≥ 0.8. 10 download slots" },
+    {
+      name: "PowerUser",
+      requirements:
+        "Upload ≥ 1 TiB, ratio ≥ 0.8, age ≥ 1 month. 15 download slots, can upload and invite",
+    },
+    {
+      name: "Seeder",
+      requirements:
+        "Ratio ≥ 0.8, age ≥ 1 month, avg seedtime ≥ 1 month, seed size ≥ 3 TiB. 15 download slots",
+    },
+    {
+      name: "SuperUser",
+      requirements: "Upload ≥ 5 TiB, ratio ≥ 0.8, age ≥ 2 months, 5+ uploads. 20 download slots",
+    },
+    {
+      name: "Collector",
+      requirements:
+        "Ratio ≥ 0.8, age ≥ 2 months, avg seedtime ≥ 2 months, seed size ≥ 8 TiB. 20 download slots",
+    },
+    {
+      name: "ExtremeUser",
+      requirements:
+        "Upload ≥ 20 TiB, ratio ≥ 0.8, age ≥ 4 months, avg seedtime ≥ 2 months, 15+ uploads. 40 download slots, torrent moderation bypass, invite forum",
+    },
+    {
+      name: "Hoarder",
+      requirements:
+        "Ratio ≥ 0.8, age ≥ 4 months, avg seedtime ≥ 3 months, seed size ≥ 16 TiB. 40 download slots, torrent moderation bypass, invite forum",
+    },
+    {
+      name: "InsaneUser",
+      requirements:
+        "Upload ≥ 60 TiB, ratio ≥ 0.8, age ≥ 8 months, avg seedtime ≥ 3 months, seed size ≥ 25 TiB, 25+ uploads. 50 download slots, immune to HnR warnings",
+    },
+    {
+      name: "Veteran",
+      requirements:
+        "Upload ≥ 120 TiB, ratio ≥ 1.0, age ≥ 1 year, avg seedtime ≥ 4 months, seed size ≥ 40 TiB, 50+ uploads. Unlimited download slots, freeleech",
+    },
+    {
+      name: "Legend",
+      requirements:
+        "Upload ≥ 200 TiB, ratio ≥ 1.2, age ≥ 2 years, avg seedtime ≥ 5 months, seed size ≥ 50 TiB, 100+ uploads. Unlimited download slots, freeleech, double upload",
+    },
+  ],
+  releaseGroups: ["DarkSouls", "WhiskeyJack"],
+  bannedGroups: [],
+  notableMembers: [],
+
+  // ── Rules ───────────────────────────────────────────────────────────
+  rules: {
+    minimumRatio: 0.8,
+    seedTimeHours: 144,
+    loginIntervalDays: 90,
+    hnrBanLimit: 3,
+    fullRulesMarkdown: [
+      "## Seeding / Hit & Run",
+      "",
+      "- Must seed to 1:1 ratio or 144 hours (6 days), whichever comes first",
+      "- Applies even to freeleech torrents",
+      "- Rule kicks in after downloading ≥ 10% of the torrent",
+      "- Seedtime only starts counting at 100% downloaded",
+      "- Pre-warning sent after 24 hours disconnected without meeting requirements",
+      "- 3+ active warnings → download privileges revoked",
+      "- Warnings can be removed with BON (both active and expired)",
+      "",
+      "## Ratio",
+      "",
+      "- Minimum ratio: 0.8",
+      "- Below 0.8 → lose download privileges, forum posting, chat, and request access",
+      "- Buffer formula: (Upload / 0.8) − Download",
+      "",
+      "## Account Inactivity",
+      "",
+      "- 90 days without login → account disabled (active seeding prevents disable but does not reset timer)",
+      "- 120 consecutive days → account pruned (staff cannot restore)",
+      "",
+      "## General",
+      "",
+      "- One account per person",
+      "- SFW avatars only",
+      "- No DMs to staff — use the support desk",
+      "- No links to warez, streaming, serial codes, or other trackers in forums",
+      "",
+      "## Uploading",
+      "",
+      "- Must seed uploads for 168 hours (7 days) or until 10+ seeders/snatches",
+      "- Original release names only — no renaming or retagging",
+      "- No repacks or raw ISOs",
+      "- No banned release groups",
+      "",
+      "## Promotions",
+      "",
+      "- Checked daily at midnight UTC",
+      "- Can also be demoted if you no longer meet requirements",
+    ],
+  },
+
+  // ── Status ──────────────────────────────────────────────────────────
+  warning: false,
+  warningNote: "",
+
+  // ── Flags ───────────────────────────────────────────────────────────
+  draft: false,
+  supportsTransitPapers: false,
+  profileUrlPattern: "",
+}
diff --git a/src/data/trackers/digitalcore.ts b/src/data/trackers/digitalcore.ts
new file mode 100644
index 00000000..0797e249
--- /dev/null
+++ b/src/data/trackers/digitalcore.ts
@@ -0,0 +1,114 @@
+// src/data/trackers/digitalcore.ts
+
+import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+
+export const digitalcore: TrackerRegistryEntry = {
+  // ── Identity ────────────────────────────────────────────────────────
+  slug: "digitalcore",
+  name: "DigitalCore",
+  abbreviation: "DC",
+  url: "https://digitalcore.club",
+  description:
+    "Scene-oriented 0day/general tracker with 1.5M+ torrents. Movies, TV, music, apps, games, ebooks.",
+
+  // ── Platform & API ──────────────────────────────────────────────────
+  platform: "digitalcore",
+  apiPath: "/api/v1/status",
+
+  // ── Content ─────────────────────────────────────────────────────────
+  specialty: "0day / General",
+  contentCategories: ["Movies", "TV", "Music", "Games", "Apps", "Books"],
+  language: "English",
+
+  // ── Visual ──────────────────────────────────────────────────────────
+  color: "#ffffff",
+  logo: "/tracker-logos/digitalcore_logo.png",
+
+  // ── External Links ──────────────────────────────────────────────────
+  trackerHubSlug: "",
+  statusPageUrl: "https://status.digitalcore.club/status/digitalcore",
+
+  // ── Community ───────────────────────────────────────────────────────
+  userClasses: [
+    { name: "Rogue", requirements: "Starting class" },
+    {
+      name: "Sentinel",
+      requirements:
+        "Age ≥ 14 days, upload ≥ 50 GiB, ratio ≥ 1.05. Requests, bonus system, moderated uploads",
+    },
+    {
+      name: "Viceroy",
+      requirements:
+        "Age ≥ 105 days, upload ≥ 300 GiB, ratio ≥ 1.10. Top lists, extended stats, IP logging cleared",
+    },
+    {
+      name: "Sentry",
+      requirements:
+        "Age ≥ 210 days, upload ≥ 1.2 TiB, ratio ≥ 1.10. 3 request slots, 2 invites, Sentry+ forums",
+    },
+    {
+      name: "Guardian",
+      requirements:
+        "Age ≥ 500 days, upload ≥ 5 TiB, ratio ≥ 20.0. 5 extra invites, 6 extra request slots, unmoderated uploads",
+    },
+    {
+      name: "Vanguard",
+      requirements:
+        "Age ≥ 730 days, upload ≥ 20 TiB, ratio ≥ 20.0. 10 extra invites, 10 extra request slots",
+    },
+    { name: "Uploader", requirements: "Staff-granted for high-volume uploaders" },
+    { name: "Titan", requirements: "Staff-granted — highest community honor" },
+    { name: "VIP", requirements: "Staff-granted for significant contributions or donation" },
+  ],
+  releaseGroups: [],
+  bannedGroups: [],
+  notableMembers: [],
+
+  // ── Rules ───────────────────────────────────────────────────────────
+  rules: {
+    minimumRatio: 0.5,
+    seedTimeHours: 120,
+    loginIntervalDays: 90,
+    fullRulesMarkdown: [
+      "## Ratio",
+      "",
+      "- Minimum ratio: 0.5",
+      "- Below 0.5 → 5 days to recover (ratio watch), then download privileges revoked",
+      "- Leech bonus system: every 10 GB actively seeded = 1% download discount, up to 100% (site-wide freeleech at 1 TiB seeded)",
+      "- Inverse scarcity bonus: torrents with fewer seeders give higher bonus",
+      "- 24-hour freeleech on all new uploads",
+      "- Large torrents may also be freeleech",
+      "",
+      "## Hit & Run",
+      "",
+      "- A download is any torrent you have started to download 10% or more",
+      "- Seed for 5 days or to 1:1 ratio, whichever comes first",
+      "- If no announce for 1 hour, it shows as a Hit & Run",
+      "- 10 day grace period to fix it before it becomes permanent",
+      "- Permanent HnRs can be removed with bonus points, upload credit, or donation",
+      "- 5 active HnRs triggers an account warning",
+      "- Continued HnRs result in a download ban",
+      "",
+      "## Account Inactivity",
+      "",
+      "- Must remain active — inactive accounts are disabled",
+      "",
+      "## General",
+      "",
+      "- One account per person per lifetime",
+      "- Torrent files are unique to you — do not share or use with debrid services",
+      "- Cross-seeding is allowed",
+      "- VPNs are allowed (bind to torrent client only recommended)",
+      "- No buying/selling invites",
+    ],
+  },
+
+  // ── Status ──────────────────────────────────────────────────────────
+  warning: false,
+  warningNote: "",
+
+  // ── Flags ───────────────────────────────────────────────────────────
+  draft: false,
+  supportsTransitPapers: false,
+  profileUrlPattern: "",
+}
diff --git a/src/data/trackers/exoticaz.ts b/src/data/trackers/exoticaz.ts
index eb2e37e7..8e023e0e 100644
--- a/src/data/trackers/exoticaz.ts
+++ b/src/data/trackers/exoticaz.ts
@@ -8,11 +8,11 @@ export const exoticaz: TrackerRegistryEntry = {
   name: "ExoticaZ",
   abbreviation: "ExZ",
   url: "https://exoticaz.to",
-  description: "Mainly Asian porn but some western content. Part of the PrivateHD network.",
+  description: "Mainly Asian porn but some western content. Part of the AvistaZ network.",
 
   // ── Platform & API ──────────────────────────────────────────────────
-  platform: "custom",
-  apiPath: "/api/user",
+  platform: "avistaz",
+  apiPath: "/profile",
 
   // ── Content ─────────────────────────────────────────────────────────
   specialty: "Asian Adult",
@@ -21,31 +21,78 @@ export const exoticaz: TrackerRegistryEntry = {
 
   // ── Visual ──────────────────────────────────────────────────────────
   color: "#ef5350",
-  logo: "",
+  logo: "/tracker-logos/exoticaz_logo.png",
 
   // ── External Links ──────────────────────────────────────────────────
   trackerHubSlug: "exoticaz",
   statusPageUrl: "",
 
   // ── Community ───────────────────────────────────────────────────────
-  userClasses: [],
+  userClasses: [
+    { name: "Banned", requirements: "Violated site rules" },
+    { name: "Leech", requirements: "Ratio below 1.0. 1 download per 7 days, 1 week old+ only" },
+    {
+      name: "Newbie",
+      requirements: "New user. 5 downloads/day, 1 week old+ only. No uploads or RSS",
+    },
+    { name: "Member", requirements: "5 GB upload, ratio >= 1.0, 7+ days. 50 downloads/day" },
+    { name: "V.I.P.", requirements: "Donor/distinguished. 100 downloads/day" },
+    { name: "Uploader", requirements: "Staff promoted. 200 downloads/day" },
+  ],
   releaseGroups: [],
   bannedGroups: [],
   notableMembers: [],
 
   // ── Rules ───────────────────────────────────────────────────────────
   rules: {
-    minimumRatio: 0,
-    seedTimeHours: 0,
-    loginIntervalDays: 0,
+    minimumRatio: 1,
+    seedTimeHours: 72,
+    loginIntervalDays: 60,
+    fullRulesMarkdown: [
+      "## General Rules",
+      "- **One account per person per lifetime.** No additional accounts under any circumstances.",
+      "- One account per IP address. Multiple accounts on same IP → all banned.",
+      "- No cheating. Cheaters banned without notice.",
+      "- Anti-lurking: Must upload or download within 30 days of account creation.",
+      "- Must login at least once every **60 days** and download at least 1 torrent every **90 days**.",
+      "- Account trading and bonus point trading between sites → ban.",
+      "",
+      "## Ratio",
+      "- Must maintain an overall ratio of **1.0 or better**.",
+      "- Maintain a minimum ratio of **0.5** per torrent where possible.",
+      "- Frequent leeching, hit-and-run, or low ratio → disabled downloads or ban.",
+      "",
+      "## Hit & Run",
+      "- **All torrents** must be seeded (including free/half-free). No exemptions for VIP/Staff.",
+      "- **Under 50 GB:** 72 hours + 2 hours per GB downloaded.",
+      "- **50 GB and over:** Complex logarithmic formula (larger torrents = diminishing time increase).",
+      "- **Alternatively:** Seed until you reach 0.9 ratio on that torrent.",
+      "- **Partial downloads (10%+ downloaded):** Must seed back 90% of what you downloaded, or seed for 60 days.",
+      "- **Under 10% downloaded:** No H&R penalty — you can delete it.",
+      "- H&R can be cleared with **bonus points** at 10 BP per hour of seeding time owed.",
+      "- Re-downloaded torrents must be seeded again.",
+      "",
+      "## User Ranks",
+      "- **Newbie:** New user. 5 downloads/day, 1 week old+ only. No uploads, no RSS.",
+      "- **Member:** 5 GB upload + ratio >= 1.0 + 7 days. 50 downloads/day. Can upload and use RSS.",
+      "- **V.I.P.:** Donor/distinguished. 100 downloads/day.",
+      "- **Uploader:** Staff promoted. 200 downloads/day.",
+      "- **Leech:** Ratio below 1.0. 1 download per 7 days, 1 week old+ only.",
+      "",
+      "## Allowed Clients",
+      "- qBittorrent (preferred), Deluge, Transmission, rTorrent, uTorrent (2.2.1 or latest only).",
+      "- No mobile clients. No cloud-based clients. No Azureus/BiglyBT.",
+      "- qBittorrent: disable Anonymous Mode. Consider disabling Torrent Queuing for proper bonus points.",
+    ],
   },
 
   // ── Status ──────────────────────────────────────────────────────────
-  warning: false,
-  warningNote: "",
+  warning: true,
+  warningNote:
+    "Unverified! HTML structure assumed identical to AvistaZ but not tested against a live account.",
 
   // ── Flags ───────────────────────────────────────────────────────────
-  draft: true,
+  draft: false,
   supportsTransitPapers: false,
-  profileUrlPattern: "",
+  profileUrlPattern: "/profile/{username}",
 }
diff --git a/src/data/trackers/index.ts b/src/data/trackers/index.ts
index 290cb645..1af77289 100644
--- a/src/data/trackers/index.ts
+++ b/src/data/trackers/index.ts
@@ -7,6 +7,7 @@ export * from "./abtorrents"
 export * from "./aither"
 export * from "./alpharatio"
 export * from "./animebytes"
+export * from "./animez"
 export * from "./anthelion"
 export * from "./asiancinema"
 export * from "./avistaz"
@@ -18,6 +19,8 @@ export * from "./cathoderaytube"
 export * from "./cinemageddon"
 export * from "./cinemaz"
 export * from "./concertos"
+export * from "./darkpeers"
+export * from "./digitalcore"
 export * from "./empornium"
 export * from "./exoticaz"
 export * from "./fearnopeer"
@@ -29,6 +32,7 @@ export * from "./hdbits"
 export * from "./hdtorrents"
 export * from "./iptorrents"
 export * from "./lst"
+export * from "./luminarr"
 export * from "./morethantv"
 export * from "./myanonamouse"
 export * from "./nebulance"
@@ -55,6 +59,7 @@ import { abtorrents } from "./abtorrents"
 import { aither } from "./aither"
 import { alpharatio } from "./alpharatio"
 import { animebytes } from "./animebytes"
+import { animez } from "./animez"
 import { anthelion } from "./anthelion"
 import { asiancinema } from "./asiancinema"
 import { avistaz } from "./avistaz"
@@ -66,6 +71,8 @@ import { cathoderaytube } from "./cathoderaytube"
 import { cinemageddon } from "./cinemageddon"
 import { cinemaz } from "./cinemaz"
 import { concertos } from "./concertos"
+import { darkpeers } from "./darkpeers"
+import { digitalcore } from "./digitalcore"
 import { empornium } from "./empornium"
 import { exoticaz } from "./exoticaz"
 import { fearnopeer } from "./fearnopeer"
@@ -77,6 +84,7 @@ import { hdbits } from "./hdbits"
 import { hdtorrents } from "./hdtorrents"
 import { iptorrents } from "./iptorrents"
 import { lst } from "./lst"
+import { luminarr } from "./luminarr"
 import { morethantv } from "./morethantv"
 import { myanonamouse } from "./myanonamouse"
 import { nebulance } from "./nebulance"
@@ -105,6 +113,7 @@ export const ALL_TRACKERS: TrackerRegistryEntry[] = [
   asiancinema,
   alpharatio,
   animebytes,
+  animez,
   anthelion,
   avistaz,
   beyondhd,
@@ -115,6 +124,8 @@ export const ALL_TRACKERS: TrackerRegistryEntry[] = [
   cinemageddon,
   cinemaz,
   concertos,
+  darkpeers,
+  digitalcore,
   empornium,
   exoticaz,
   fearnopeer,
@@ -126,6 +137,7 @@ export const ALL_TRACKERS: TrackerRegistryEntry[] = [
   hdtorrents,
   iptorrents,
   lst,
+  luminarr,
   morethantv,
   myanonamouse,
   nebulance,
diff --git a/src/data/trackers/luminarr.ts b/src/data/trackers/luminarr.ts
new file mode 100644
index 00000000..46e3f9e6
--- /dev/null
+++ b/src/data/trackers/luminarr.ts
@@ -0,0 +1,132 @@
+// src/data/trackers/luminarr.ts
+
+import type { TrackerRegistryEntry } from "@/data/tracker-registry"
+
+export const luminarr: TrackerRegistryEntry = {
+  // ── Identity ────────────────────────────────────────────────────────
+  slug: "luminarr",
+  name: "Luminarr",
+  abbreviation: "LUME",
+  url: "https://luminarr.me",
+  description:
+    "Movies and TV tracker with Radarr/Sonarr integration and TRaSH Guides quality profiles with an Arr-themed UI.",
+
+  // ── Platform & API ──────────────────────────────────────────────────
+  platform: "unit3d",
+  apiPath: "/api/user",
+
+  // ── Content ─────────────────────────────────────────────────────────
+  specialty: "Movies / TV",
+  contentCategories: ["Movies", "TV"],
+  language: "English",
+
+  // ── Visual ──────────────────────────────────────────────────────────
+  color: "#7891d1",
+  logo: "/tracker-logos/luminarr_logo.png",
+
+  // ── External Links ──────────────────────────────────────────────────
+  trackerHubSlug: "",
+  statusPageUrl: "",
+
+  // ── Community ───────────────────────────────────────────────────────
+  userClasses: [
+    { name: "Validating", requirements: "New account, no privileges" },
+    { name: "Leech", requirements: "Ratio below threshold. 0 download slots" },
+    { name: "User", requirements: "Ratio ≥ 0.6. 5 download slots, can upload" },
+    {
+      name: "Member",
+      requirements: "Upload ≥ 50 GiB, ratio ≥ 0.6, age ≥ 2 weeks. 10 download slots, can invite",
+    },
+    {
+      name: "Power User",
+      requirements:
+        "Upload ≥ 500 GiB, ratio ≥ 1.0, age ≥ 1 month, avg seedtime ≥ 2 weeks, 5+ uploads. 25 download slots, invite forum",
+    },
+    {
+      name: "Seeder",
+      requirements:
+        "Ratio ≥ 1.0, age ≥ 1 month, avg seedtime ≥ 1 month, seed size ≥ 2 TiB. 25 download slots",
+    },
+    {
+      name: "Elite",
+      requirements:
+        "Upload ≥ 5 TiB, ratio ≥ 2.0, age ≥ 3 months, avg seedtime ≥ 1 month, 25+ uploads. 50 download slots, freeleech, torrent moderation bypass",
+    },
+    {
+      name: "Archivist",
+      requirements:
+        "Ratio ≥ 2.0, age ≥ 3 months, avg seedtime ≥ 2 months, seed size ≥ 8 TiB. 50 download slots, freeleech, torrent moderation bypass",
+    },
+    {
+      name: "Data Hoarder",
+      requirements:
+        "Upload ≥ 15 TiB, ratio ≥ 3.0, age ≥ 6 months, avg seedtime ≥ 2 months, seed size ≥ 15 TiB, 50+ uploads. 75 download slots, freeleech, double upload, HnR immune",
+    },
+    {
+      name: "Torrent Master",
+      requirements:
+        "Upload ≥ 25 TiB, ratio ≥ 4.0, age ≥ 9 months, avg seedtime ≥ 3 months, seed size ≥ 15 TiB, 75+ uploads. 100 download slots, freeleech, double upload, HnR immune",
+    },
+    {
+      name: "Elite Torrent Master",
+      requirements:
+        "Upload ≥ 50 TiB, ratio ≥ 5.0, age ≥ 1 year, avg seedtime ≥ 3 months, seed size ≥ 20 TiB, 100+ uploads. 100 download slots, freeleech, double upload, HnR immune",
+    },
+  ],
+  releaseGroups: [],
+  bannedGroups: [],
+  notableMembers: [],
+
+  // ── Rules ───────────────────────────────────────────────────────────
+  rules: {
+    minimumRatio: 0.6,
+    seedTimeHours: 72,
+    loginIntervalDays: 90,
+    hnrBanLimit: 3,
+    fullRulesMarkdown: [
+      "## Seeding / Hit & Run",
+      "",
+      "- Must seed for 72 hours (3 days) minimum",
+      "- Applies even to freeleech torrents",
+      "- HnR triggers after downloading ≥ 10% and being disconnected for 7 days",
+      "- Pre-warning sent at day 6 — reconnecting resets the 7-day grace period",
+      "- HnR warnings expire after 4 weeks or can be seeded off",
+      "- 3 active warnings → download privileges revoked",
+      "- BON can also be used to remove warnings",
+      "",
+      "## Ratio",
+      "",
+      "- Minimum ratio: 0.6",
+      "- Below 0.6 → download privileges disabled",
+      "- Ratio recovery via seeding or uploading new content",
+      "",
+      "## Account Inactivity",
+      "",
+      "- 90 days without login → account disabled",
+      "- Disabled accounts can be recovered within 90 days via staff",
+      "- After 180 days total inactivity → account pruned permanently",
+      "",
+      "## General",
+      "",
+      "- One account per person per lifetime",
+      "- No account sharing, trading, or selling",
+      "- Passkey is personal — do not share torrent files or announce URLs",
+      "- No modified clients or ratio manipulation",
+      "",
+      "## Uploading",
+      "",
+      "- Follow naming conventions and quality standards",
+      "- MediaInfo and screenshots required for encodes",
+      "- No scene-renamed releases or quality-misrepresented content",
+    ],
+  },
+
+  // ── Status ──────────────────────────────────────────────────────────
+  warning: true,
+  warningNote: "Unverified! Not tested against a live account.",
+
+  // ── Flags ───────────────────────────────────────────────────────────
+  draft: false,
+  supportsTransitPapers: false,
+  profileUrlPattern: "",
+}
diff --git a/src/data/trackers/privatehd.ts b/src/data/trackers/privatehd.ts
index 75eb2b5b..6e9c6db7 100644
--- a/src/data/trackers/privatehd.ts
+++ b/src/data/trackers/privatehd.ts
@@ -8,11 +8,12 @@ export const privatehd: TrackerRegistryEntry = {
   name: "PrivateHD",
   abbreviation: "PHD",
   url: "https://privatehd.to",
-  description: "Former home of EPSiLON. Part of the PrivateHD network.",
+  description:
+    "HD and UHD movies and TV. Part of the AvistaZ network. 60 day login requirement, must download 1 torrent every 90 days.",
 
   // ── Platform & API ──────────────────────────────────────────────────
-  platform: "custom",
-  apiPath: "/api/user",
+  platform: "avistaz",
+  apiPath: "/profile",
 
   // ── Content ─────────────────────────────────────────────────────────
   specialty: "HD Movies / TV",
@@ -21,31 +22,78 @@ export const privatehd: TrackerRegistryEntry = {
 
   // ── Visual ──────────────────────────────────────────────────────────
   color: "#5c6bc0",
-  logo: "",
+  logo: "/tracker-logos/privatehd_logo.png",
 
   // ── External Links ──────────────────────────────────────────────────
   trackerHubSlug: "private-hd",
   statusPageUrl: "",
 
   // ── Community ───────────────────────────────────────────────────────
-  userClasses: [],
+  userClasses: [
+    { name: "Banned", requirements: "Violated site rules" },
+    { name: "Leech", requirements: "Ratio below 1.0. 1 download per 7 days, 1 week old+ only" },
+    {
+      name: "Newbie",
+      requirements: "New user. 5 downloads/day, 1 week old+ only. No uploads or RSS",
+    },
+    { name: "Member", requirements: "5 GB upload, ratio >= 1.0, 7+ days. 50 downloads/day" },
+    { name: "V.I.P.", requirements: "Donor/distinguished. 100 downloads/day" },
+    { name: "Uploader", requirements: "Staff promoted. 200 downloads/day" },
+  ],
   releaseGroups: [],
   bannedGroups: [],
   notableMembers: [],
 
   // ── Rules ───────────────────────────────────────────────────────────
   rules: {
-    minimumRatio: 0,
-    seedTimeHours: 0,
-    loginIntervalDays: 0,
+    minimumRatio: 1,
+    seedTimeHours: 72,
+    loginIntervalDays: 60,
+    fullRulesMarkdown: [
+      "## General Rules",
+      "- **One account per person per lifetime.** No additional accounts under any circumstances.",
+      "- One account per IP address. Multiple accounts on same IP → all banned.",
+      "- No cheating. Cheaters banned without notice.",
+      "- Anti-lurking: Must upload or download within 30 days of account creation.",
+      "- Must login at least once every **60 days** and download at least 1 torrent every **90 days**.",
+      "- Account trading and bonus point trading between sites → ban.",
+      "",
+      "## Ratio",
+      "- Must maintain an overall ratio of **1.0 or better**.",
+      "- Maintain a minimum ratio of **0.5** per torrent where possible.",
+      "- Frequent leeching, hit-and-run, or low ratio → disabled downloads or ban.",
+      "",
+      "## Hit & Run",
+      "- **All torrents** must be seeded (including free/half-free). No exemptions for VIP/Staff.",
+      "- **Under 50 GB:** 72 hours + 2 hours per GB downloaded.",
+      "- **50 GB and over:** Complex logarithmic formula (larger torrents = diminishing time increase).",
+      "- **Alternatively:** Seed until you reach 0.9 ratio on that torrent.",
+      "- **Partial downloads (10%+ downloaded):** Must seed back 90% of what you downloaded, or seed for 60 days.",
+      "- **Under 10% downloaded:** No H&R penalty — you can delete it.",
+      "- H&R can be cleared with **bonus points** at 10 BP per hour of seeding time owed.",
+      "- Re-downloaded torrents must be seeded again.",
+      "",
+      "## User Ranks",
+      "- **Newbie:** New user. 5 downloads/day, 1 week old+ only. No uploads, no RSS.",
+      "- **Member:** 5 GB upload + ratio >= 1.0 + 7 days. 50 downloads/day. Can upload and use RSS.",
+      "- **V.I.P.:** Donor/distinguished. 100 downloads/day.",
+      "- **Uploader:** Staff promoted. 200 downloads/day.",
+      "- **Leech:** Ratio below 1.0. 1 download per 7 days, 1 week old+ only.",
+      "",
+      "## Allowed Clients",
+      "- qBittorrent (preferred), Deluge, Transmission, rTorrent, uTorrent (2.2.1 or latest only).",
+      "- No mobile clients. No cloud-based clients. No Azureus/BiglyBT.",
+      "- qBittorrent: disable Anonymous Mode. Consider disabling Torrent Queuing for proper bonus points.",
+    ],
   },
 
   // ── Status ──────────────────────────────────────────────────────────
-  warning: false,
-  warningNote: "",
+  warning: true,
+  warningNote:
+    "Unverified! HTML structure assumed identical to AvistaZ but not tested against a live account.",
 
   // ── Flags ───────────────────────────────────────────────────────────
-  draft: true,
+  draft: false,
   supportsTransitPapers: false,
-  profileUrlPattern: "",
+  profileUrlPattern: "/profile/{username}",
 }
diff --git a/src/hooks/__tests__/select-functions.test.ts b/src/hooks/__tests__/select-functions.test.ts
new file mode 100644
index 00000000..056bc61a
--- /dev/null
+++ b/src/hooks/__tests__/select-functions.test.ts
@@ -0,0 +1,261 @@
+// src/hooks/__tests__/select-functions.test.ts
+//
+// Tests for pure selector functions extracted from hooks and components:
+//   selectClientIdName  (FleetDashboard.tsx)
+//   selectMinPollInterval (usePollingIntervals.ts)
+//   selectActiveTrackers  (useDashboardData.ts)
+//   selectClientsForAlerts (useDashboardData.ts)
+//
+// These selectors are passed to TanStack Query's `select` option. They must be
+// pure: same input always produces the same output, no side effects.
+
+import { describe, expect, it } from "vitest"
+import { selectClientIdName } from "@/components/dashboard/FleetDashboard"
+import { selectActiveTrackers, selectClientsForAlerts } from "@/hooks/useDashboardData"
+import { selectMinPollInterval } from "@/hooks/usePollingIntervals"
+import type { SafeDownloadClient, TrackerSummary } from "@/types/api"
+
+// ---------------------------------------------------------------------------
+// Shared test fixtures
+// ---------------------------------------------------------------------------
+
+function makeClient(overrides: Partial<SafeDownloadClient> = {}): SafeDownloadClient {
+  return {
+    id: 1,
+    name: "Client A",
+    type: "qbittorrent",
+    enabled: true,
+    host: "localhost",
+    port: 8080,
+    useSsl: false,
+    hasCredentials: true,
+    pollIntervalSeconds: 300,
+    isDefault: false,
+    crossSeedTags: [],
+    lastPolledAt: null,
+    lastError: null,
+    errorSince: null,
+    createdAt: "2024-01-01T00:00:00.000Z",
+    updatedAt: "2024-01-01T00:00:00.000Z",
+    ...overrides,
+  }
+}
+
+function makeTracker(overrides: Partial<TrackerSummary> = {}): TrackerSummary {
+  return {
+    id: 1,
+    name: "Tracker A",
+    baseUrl: "https://example.com",
+    platformType: "unit3d",
+    isActive: true,
+    lastPolledAt: null,
+    lastError: null,
+    lastErrorAt: null,
+    consecutiveFailures: 0,
+    pausedAt: null,
+    userPausedAt: null,
+    color: "#00d4ff",
+    qbtTag: null,
+    mouseholeUrl: null,
+    hideUnreadBadges: false,
+    useProxy: false,
+    countCrossSeedUnsatisfied: false,
+    isFavorite: false,
+    sortOrder: null,
+    joinedAt: null,
+    lastAccessAt: null,
+    remoteUserId: null,
+    platformMeta: null,
+    createdAt: new Date().toISOString(),
+    latestStats: null,
+    ...overrides,
+  }
+}
+
+// ---------------------------------------------------------------------------
+// selectClientIdName
+// ---------------------------------------------------------------------------
+
+describe("selectClientIdName", () => {
+  it("returns only id and name from each item", () => {
+    const input = [
+      makeClient({ id: 1, name: "qBit Local" }),
+      makeClient({ id: 2, name: "qBit Remote" }),
+    ]
+    const result = selectClientIdName(input)
+    expect(result).toEqual([
+      { id: 1, name: "qBit Local" },
+      { id: 2, name: "qBit Remote" },
+    ])
+  })
+
+  it("strips all fields except id and name", () => {
+    const input = [
+      makeClient({
+        id: 11,
+        name: "Only These",
+        lastPolledAt: "2024-01-01T00:00:00.000Z",
+        lastError: "boom",
+      }),
+    ]
+    const result = selectClientIdName(input)
+    expect(result[0]).toStrictEqual({ id: 11, name: "Only These" })
+    expect(Object.keys(result[0])).toHaveLength(2)
+  })
+
+  it("returns empty array for empty input", () => {
+    expect(selectClientIdName([])).toEqual([])
+  })
+
+  it("preserves order", () => {
+    const input = [
+      makeClient({ id: 3, name: "CCC" }),
+      makeClient({ id: 1, name: "AAA" }),
+      makeClient({ id: 2, name: "BBB" }),
+    ]
+    const ids = selectClientIdName(input).map((c) => c.id)
+    expect(ids).toEqual([3, 1, 2])
+  })
+})
+
+// ---------------------------------------------------------------------------
+// selectMinPollInterval
+// ---------------------------------------------------------------------------
+
+describe("selectMinPollInterval", () => {
+  it("returns null when client list is empty", () => {
+    expect(selectMinPollInterval([])).toBeNull()
+  })
+
+  it("returns null when all clients are disabled", () => {
+    const clients = [
+      makeClient({ enabled: false, pollIntervalSeconds: 60 }),
+      makeClient({ enabled: false, pollIntervalSeconds: 120 }),
+    ]
+    expect(selectMinPollInterval(clients)).toBeNull()
+  })
+
+  it("returns the pollIntervalSeconds of the single enabled client", () => {
+    const clients = [makeClient({ enabled: true, pollIntervalSeconds: 180 })]
+    expect(selectMinPollInterval(clients)).toBe(180)
+  })
+
+  it("returns the minimum pollIntervalSeconds across enabled clients", () => {
+    const clients = [
+      makeClient({ id: 1, enabled: true, pollIntervalSeconds: 300 }),
+      makeClient({ id: 2, enabled: true, pollIntervalSeconds: 60 }),
+      makeClient({ id: 3, enabled: true, pollIntervalSeconds: 120 }),
+    ]
+    expect(selectMinPollInterval(clients)).toBe(60)
+  })
+
+  it("ignores disabled clients when computing the minimum", () => {
+    const clients = [
+      makeClient({ id: 1, enabled: true, pollIntervalSeconds: 300 }),
+      makeClient({ id: 2, enabled: false, pollIntervalSeconds: 10 }),
+    ]
+    // Disabled client has 10s but should be excluded.
+    expect(selectMinPollInterval(clients)).toBe(300)
+  })
+
+  it("returns null when the only enabled client list is mixed with all disabled", () => {
+    const clients = [makeClient({ id: 1, enabled: false, pollIntervalSeconds: 30 })]
+    expect(selectMinPollInterval(clients)).toBeNull()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// selectActiveTrackers
+// ---------------------------------------------------------------------------
+
+describe("selectActiveTrackers", () => {
+  it("returns empty array when no trackers are active", () => {
+    const trackers = [
+      makeTracker({ id: 1, isActive: false }),
+      makeTracker({ id: 2, isActive: false }),
+    ]
+    expect(selectActiveTrackers(trackers)).toEqual([])
+  })
+
+  it("returns all trackers when all are active", () => {
+    const trackers = [
+      makeTracker({ id: 1, isActive: true }),
+      makeTracker({ id: 2, isActive: true }),
+    ]
+    const result = selectActiveTrackers(trackers)
+    expect(result).toHaveLength(2)
+    expect(result.map((t) => t.id)).toEqual([1, 2])
+  })
+
+  it("filters out inactive trackers", () => {
+    const trackers = [
+      makeTracker({ id: 1, isActive: true }),
+      makeTracker({ id: 2, isActive: false }),
+      makeTracker({ id: 3, isActive: true }),
+    ]
+    const result = selectActiveTrackers(trackers)
+    expect(result.map((t) => t.id)).toEqual([1, 3])
+  })
+
+  it("returns empty array for empty input", () => {
+    expect(selectActiveTrackers([])).toEqual([])
+  })
+})
+
+// ---------------------------------------------------------------------------
+// selectClientsForAlerts
+// ---------------------------------------------------------------------------
+
+describe("selectClientsForAlerts", () => {
+  it("narrows each client to only id, name, enabled, lastError", () => {
+    const clients = [makeClient({ id: 1, name: "Local", enabled: true, lastError: null })]
+    const result = selectClientsForAlerts(clients)
+    expect(result[0]).toStrictEqual({ id: 1, name: "Local", enabled: true, lastError: null })
+    expect(Object.keys(result[0])).toHaveLength(4)
+  })
+
+  it("strips all other fields (host, port, lastPolledAt, etc.)", () => {
+    const clients = [
+      makeClient({
+        id: 2,
+        name: "Remote",
+        enabled: false,
+        lastError: "connection refused",
+        host: "192.168.1.100",
+        port: 9090,
+        lastPolledAt: "2024-01-01T00:00:00.000Z",
+      }),
+    ]
+    const result = selectClientsForAlerts(clients)
+    expect(result[0]).not.toHaveProperty("host")
+    expect(result[0]).not.toHaveProperty("port")
+    expect(result[0]).not.toHaveProperty("lastPolledAt")
+    expect(result[0]).toStrictEqual({
+      id: 2,
+      name: "Remote",
+      enabled: false,
+      lastError: "connection refused",
+    })
+  })
+
+  it("preserves lastError value when it is a non-null string", () => {
+    const clients = [
+      makeClient({ id: 3, name: "Errored", enabled: true, lastError: "auth failed" }),
+    ]
+    const result = selectClientsForAlerts(clients)
+    expect(result[0].lastError).toBe("auth failed")
+  })
+
+  it("returns empty array for empty input", () => {
+    expect(selectClientsForAlerts([])).toEqual([])
+  })
+
+  it("processes multiple clients and preserves order", () => {
+    const clients = [
+      makeClient({ id: 10, name: "AAA", enabled: true }),
+      makeClient({ id: 20, name: "BBB", enabled: false }),
+    ]
+    const result = selectClientsForAlerts(clients)
+    expect(result.map((c) => c.id)).toEqual([10, 20])
+  })
+})
diff --git a/src/hooks/__tests__/useDashboardData.test.tsx b/src/hooks/__tests__/useDashboardData.test.tsx
index a9a24928..b7b139d7 100644
--- a/src/hooks/__tests__/useDashboardData.test.tsx
+++ b/src/hooks/__tests__/useDashboardData.test.tsx
@@ -42,6 +42,7 @@ const mockTracker: TrackerSummary = {
   isActive: true,
   lastPolledAt: null,
   lastError: null,
+  lastErrorAt: null,
   consecutiveFailures: 0,
   pausedAt: null,
   userPausedAt: null,
@@ -77,6 +78,7 @@ const mockSnapshot: Snapshot = {
   shareScore: null,
   username: null,
   group: null,
+  isManual: false,
 }
 
 function createWrapper() {
@@ -107,10 +109,10 @@ beforeEach(() => {
         json: () => Promise.resolve([mockTracker]),
       })
     }
-    if (url.includes("/api/trackers/") && url.includes("/snapshots")) {
+    if (url.includes("/api/trackers/snapshots/fleet")) {
       return Promise.resolve({
         ok: true,
-        json: () => Promise.resolve([mockSnapshot]),
+        json: () => Promise.resolve({ "1": [mockSnapshot] }),
       })
     }
     if (url === "/api/clients") {
@@ -193,7 +195,7 @@ describe("useDashboardData", () => {
 
     await waitFor(() => {
       expect(fetchMock).toHaveBeenCalledWith(
-        expect.stringContaining("/api/trackers/1/snapshots?days=30"),
+        expect.stringContaining("/api/trackers/snapshots/fleet?days=30"),
         expect.any(Object)
       )
     })
@@ -216,24 +218,12 @@ describe("useDashboardData", () => {
 
     await waitFor(() => {
       expect(fetchMock).toHaveBeenCalledWith(
-        expect.stringContaining("/api/trackers/1/snapshots?days=7"),
+        expect.stringContaining("/api/trackers/snapshots/fleet?days=7"),
         expect.any(Object)
       )
     })
   })
 
-  it("uses refetchInterval of 60_000ms (not 60)", () => {
-    // Verify the tracker query uses 60_000 by checking the source
-    // (TanStack Query internals don't expose interval easily in tests,
-    // so we verify the constant is correct at the integration level)
-    const { result } = renderHook(() => useDashboardData({ initialTrackers: [mockTracker] }), {
-      wrapper: createWrapper(),
-    })
-    // If refetchInterval were 60 (ms), we'd see rapid re-fetches
-    // With 60_000 (1 min), a single render cycle won't trigger extra calls
-    expect(result.current.trackers).toHaveLength(1)
-  })
-
   it("exposes refresh function that triggers tracker refetch", async () => {
     const { result } = renderHook(() => useDashboardData({ initialTrackers: [mockTracker] }), {
       wrapper: createWrapper(),
diff --git a/src/hooks/__tests__/useTrackerList.test.tsx b/src/hooks/__tests__/useTrackerList.test.tsx
new file mode 100644
index 00000000..3a01ddc5
--- /dev/null
+++ b/src/hooks/__tests__/useTrackerList.test.tsx
@@ -0,0 +1,366 @@
+// src/hooks/__tests__/useTrackerList.test.tsx
+//
+// Tests for useTrackerList TanStack Query hook:
+// - Fetches trackers and exposes derived state
+// - Filters by active/archived and favorites
+// - Optimistic favorite toggle with rollback on failure
+// - Drag-end reorder with rollback on failure
+// - Auto-detects custom sort mode once
+// - refresh() invalidates cache
+
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import { renderHook, waitFor } from "@testing-library/react"
+import { act, type ReactNode } from "react"
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
+import { sortTrackers, useTrackerList } from "@/hooks/useTrackerList"
+import type { TrackerSummary } from "@/types/api"
+
+const base: TrackerSummary = {
+  id: 1,
+  name: "Alpha",
+  baseUrl: "https://alpha.example.com",
+  platformType: "unit3d",
+  isActive: true,
+  lastPolledAt: null,
+  lastError: null,
+  lastErrorAt: null,
+  consecutiveFailures: 0,
+  pausedAt: null,
+  userPausedAt: null,
+  color: "#00d4ff",
+  qbtTag: null,
+  mouseholeUrl: null,
+  hideUnreadBadges: false,
+  useProxy: false,
+  countCrossSeedUnsatisfied: false,
+  isFavorite: false,
+  sortOrder: null,
+  joinedAt: null,
+  lastAccessAt: null,
+  remoteUserId: null,
+  platformMeta: null,
+  createdAt: new Date().toISOString(),
+  latestStats: null,
+}
+
+function t(overrides: Partial<TrackerSummary>): TrackerSummary {
+  return { ...base, ...overrides }
+}
+
+const trackerA = t({ id: 1, name: "Alpha", isActive: true, isFavorite: true })
+const trackerB = t({ id: 2, name: "Bravo", isActive: true, isFavorite: false })
+const trackerC = t({ id: 3, name: "Charlie", isActive: false, isFavorite: false })
+
+function createWrapper() {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  return {
+    queryClient,
+    Wrapper({ children }: { children: ReactNode }) {
+      return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+    },
+  }
+}
+
+let fetchMock: ReturnType<typeof vi.fn>
+
+const defaultParams = {
+  sortMode: "index" as const,
+  showFavoritesOnly: false,
+  showArchived: false,
+  onSortModeChange: vi.fn(),
+}
+
+function mockFetchOk(trackers: TrackerSummary[] = [trackerA, trackerB, trackerC]) {
+  fetchMock.mockImplementation((url: string) => {
+    if (url === "/api/trackers") {
+      return Promise.resolve({ ok: true, json: () => Promise.resolve(trackers) })
+    }
+    return Promise.resolve({ ok: true, json: () => Promise.resolve({}) })
+  })
+}
+
+beforeEach(() => {
+  fetchMock = vi.fn()
+  global.fetch = fetchMock as unknown as typeof fetch
+  mockFetchOk()
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe("useTrackerList", () => {
+  // ─── Data fetching ──────────────────────────────────────────────
+
+  it("fetches trackers from /api/trackers", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => {
+      expect(result.current.trackers).toHaveLength(3)
+    })
+    expect(fetchMock).toHaveBeenCalledWith("/api/trackers", expect.any(Object))
+  })
+
+  it("returns empty array on fetch failure", async () => {
+    fetchMock.mockResolvedValue({ ok: false, json: () => Promise.resolve([]) })
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => {
+      expect(result.current.trackers).toEqual([])
+    })
+  })
+
+  // ─── Derived state ──────────────────────────────────────────────
+
+  it("filters out archived trackers by default", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList({ ...defaultParams, showArchived: false }), {
+      wrapper: Wrapper,
+    })
+
+    await waitFor(() => {
+      expect(result.current.displayedTrackers).toHaveLength(2)
+      expect(result.current.displayedTrackers.every((t) => t.isActive)).toBe(true)
+    })
+  })
+
+  it("includes archived trackers when showArchived is true", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList({ ...defaultParams, showArchived: true }), {
+      wrapper: Wrapper,
+    })
+
+    await waitFor(() => {
+      expect(result.current.displayedTrackers).toHaveLength(3)
+    })
+  })
+
+  it("filters to favorites only when showFavoritesOnly is true", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(
+      () => useTrackerList({ ...defaultParams, showFavoritesOnly: true }),
+      { wrapper: Wrapper }
+    )
+
+    await waitFor(() => {
+      expect(result.current.displayedTrackers).toHaveLength(1)
+      expect(result.current.displayedTrackers[0].name).toBe("Alpha")
+    })
+  })
+
+  it("computes archivedCount from all trackers", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => {
+      expect(result.current.archivedCount).toBe(1)
+    })
+  })
+
+  it("trackerIds matches displayedTrackers order", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => {
+      expect(result.current.trackerIds).toEqual(result.current.displayedTrackers.map((t) => t.id))
+    })
+  })
+
+  // ─── Optimistic favorite toggle ─────────────────────────────────
+
+  it("toggleFavorite optimistically updates the cache", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => expect(result.current.trackers).toHaveLength(3))
+
+    // After PATCH succeeds, the invalidation refetch should return updated data
+    fetchMock.mockImplementation((url: string) => {
+      if (typeof url === "string" && url.includes("/api/trackers/2")) {
+        return Promise.resolve({ ok: true, json: () => Promise.resolve({}) })
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve([trackerA, { ...trackerB, isFavorite: true }, trackerC]),
+      })
+    })
+
+    act(() => {
+      result.current.toggleFavorite(2, false)
+    })
+
+    await waitFor(() => {
+      expect(result.current.trackers.find((t) => t.id === 2)?.isFavorite).toBe(true)
+    })
+  })
+
+  it("toggleFavorite reverts on server error", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => expect(result.current.trackers).toHaveLength(3))
+
+    // Make PATCH fail
+    fetchMock.mockImplementation((url: string) => {
+      if (typeof url === "string" && url.includes("/api/trackers/2")) {
+        return Promise.resolve({ ok: false, status: 500, statusText: "Server Error" })
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve([trackerA, trackerB, trackerC]),
+      })
+    })
+
+    act(() => {
+      result.current.toggleFavorite(2, false)
+    })
+
+    // Wait for optimistic update, then wait for revert
+    await waitFor(() => {
+      expect(result.current.trackers.find((t) => t.id === 2)?.isFavorite).toBe(false)
+    })
+  })
+
+  it("toggleFavorite reverts on network failure", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => expect(result.current.trackers).toHaveLength(3))
+
+    fetchMock.mockImplementation((url: string) => {
+      if (typeof url === "string" && url.includes("/api/trackers/2")) {
+        return Promise.reject(new Error("Network error"))
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve([trackerA, trackerB, trackerC]),
+      })
+    })
+
+    act(() => {
+      result.current.toggleFavorite(2, false)
+    })
+
+    await waitFor(() => {
+      expect(result.current.trackers.find((t) => t.id === 2)?.isFavorite).toBe(false)
+    })
+  })
+
+  // ─── Auto-detect sort mode ──────────────────────────────────────
+
+  it("auto-detects custom sort when trackers have sortOrder", async () => {
+    const onSortModeChange = vi.fn()
+    const withSortOrder = [
+      t({ id: 1, name: "Alpha", sortOrder: 1 }),
+      t({ id: 2, name: "Bravo", sortOrder: 0 }),
+    ]
+    mockFetchOk(withSortOrder)
+
+    const { Wrapper } = createWrapper()
+    renderHook(() => useTrackerList({ ...defaultParams, sortMode: "index", onSortModeChange }), {
+      wrapper: Wrapper,
+    })
+
+    await waitFor(() => {
+      expect(onSortModeChange).toHaveBeenCalledWith("custom")
+    })
+  })
+
+  it("does not auto-detect when sortMode is already non-index", async () => {
+    const onSortModeChange = vi.fn()
+    const withSortOrder = [t({ id: 1, name: "Alpha", sortOrder: 1 })]
+    mockFetchOk(withSortOrder)
+
+    const { Wrapper } = createWrapper()
+    renderHook(() => useTrackerList({ ...defaultParams, sortMode: "alpha", onSortModeChange }), {
+      wrapper: Wrapper,
+    })
+
+    await waitFor(() => {
+      // Give effect time to run
+      expect(onSortModeChange).not.toHaveBeenCalled()
+    })
+  })
+
+  it("does not auto-detect when no trackers have sortOrder", async () => {
+    const onSortModeChange = vi.fn()
+    mockFetchOk([t({ id: 1, sortOrder: null }), t({ id: 2, sortOrder: null })])
+
+    const { Wrapper } = createWrapper()
+    renderHook(() => useTrackerList({ ...defaultParams, onSortModeChange }), { wrapper: Wrapper })
+
+    // Wait for data to arrive
+    await new Promise((r) => setTimeout(r, 50))
+    expect(onSortModeChange).not.toHaveBeenCalled()
+  })
+
+  // ─── Refresh ────────────────────────────────────────────────────
+
+  it("refresh() triggers a new fetch", async () => {
+    const { Wrapper } = createWrapper()
+    const { result } = renderHook(() => useTrackerList(defaultParams), { wrapper: Wrapper })
+
+    await waitFor(() => expect(result.current.trackers).toHaveLength(3))
+
+    const callsBefore = fetchMock.mock.calls.filter(
+      (args: unknown[]) => args[0] === "/api/trackers"
+    ).length
+
+    act(() => {
+      result.current.refresh()
+    })
+
+    await waitFor(() => {
+      const callsAfter = fetchMock.mock.calls.filter(
+        (args: unknown[]) => args[0] === "/api/trackers"
+      ).length
+      expect(callsAfter).toBeGreaterThan(callsBefore)
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// sortTrackers
+// ---------------------------------------------------------------------------
+
+describe("sortTrackers", () => {
+  const trackers: TrackerSummary[] = [
+    { ...base, id: 1, name: "Charlie", sortOrder: 2 },
+    { ...base, id: 2, name: "Alpha", sortOrder: 0 },
+    { ...base, id: 3, name: "Bravo", sortOrder: 1 },
+  ]
+
+  it("returns input order for index mode", () => {
+    const result = sortTrackers(trackers, "index")
+    expect(result.map((t) => t.name)).toEqual(["Charlie", "Alpha", "Bravo"])
+  })
+
+  it("sorts alphabetically for alpha mode", () => {
+    const result = sortTrackers(trackers, "alpha")
+    expect(result.map((t) => t.name)).toEqual(["Alpha", "Bravo", "Charlie"])
+  })
+
+  it("sorts by sortOrder for custom mode", () => {
+    const result = sortTrackers(trackers, "custom")
+    expect(result.map((t) => t.name)).toEqual(["Alpha", "Bravo", "Charlie"])
+  })
+
+  it("treats null sortOrder as Infinity in custom mode", () => {
+    const withNull: TrackerSummary[] = [
+      { ...base, id: 1, name: "A", sortOrder: null },
+      { ...base, id: 2, name: "B", sortOrder: 0 },
+    ]
+    const result = sortTrackers(withNull, "custom")
+    expect(result.map((t) => t.name)).toEqual(["B", "A"])
+  })
+
+  it("does not mutate the input array", () => {
+    const original = [...trackers]
+    sortTrackers(trackers, "alpha")
+    expect(trackers).toEqual(original)
+  })
+})
diff --git a/src/hooks/useActionStatus.ts b/src/hooks/useActionStatus.ts
new file mode 100644
index 00000000..6081a852
--- /dev/null
+++ b/src/hooks/useActionStatus.ts
@@ -0,0 +1,67 @@
+// src/hooks/useActionStatus.ts
+
+import { useCallback, useEffect, useRef, useState } from "react"
+
+type ActionStatus = "idle" | "pending" | "success" | "failed"
+
+interface UseActionStatusOptions {
+  autoResetMs?: number | false
+}
+
+interface UseActionStatusReturn {
+  status: ActionStatus
+  error: string | null
+  execute: (fn: () => Promise<void>) => Promise<void>
+  reset: () => void
+}
+
+/**
+ * Manages a 4-state action lifecycle: idle → pending → success|failed.
+ * The caller provides an async function to `execute`; if it throws,
+ * the error message is captured and status becomes "failed".
+ * On success, auto-resets to "idle" after `autoResetMs` (default 3000).
+ * Pass `autoResetMs: false` to stay on "success" until manually reset.
+ */
+export function useActionStatus(opts?: UseActionStatusOptions): UseActionStatusReturn {
+  const [status, setStatus] = useState<ActionStatus>("idle")
+  const [error, setError] = useState<string | null>(null)
+  const autoResetMs = opts?.autoResetMs ?? 3000
+  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+
+  const execute = useCallback(
+    async (fn: () => Promise<void>) => {
+      if (timerRef.current) clearTimeout(timerRef.current)
+      setStatus("pending")
+      setError(null)
+      try {
+        await fn()
+        setStatus("success")
+        if (autoResetMs !== false) {
+          timerRef.current = setTimeout(() => setStatus("idle"), autoResetMs)
+        }
+      } catch (err) {
+        setError(err instanceof Error ? err.message : String(err))
+        setStatus("failed")
+      }
+    },
+    [autoResetMs]
+  )
+
+  // Clear pending timer on unmount
+  useEffect(
+    () => () => {
+      if (timerRef.current) clearTimeout(timerRef.current)
+    },
+    []
+  )
+
+  const reset = useCallback(() => {
+    if (timerRef.current) clearTimeout(timerRef.current)
+    setStatus("idle")
+    setError(null)
+  }, [])
+
+  return { status, error, execute, reset }
+}
+
+export type { ActionStatus, UseActionStatusOptions, UseActionStatusReturn }
diff --git a/src/hooks/useAnimatedPresence.ts b/src/hooks/useAnimatedPresence.ts
new file mode 100644
index 00000000..997f5ecd
--- /dev/null
+++ b/src/hooks/useAnimatedPresence.ts
@@ -0,0 +1,42 @@
+// src/hooks/useAnimatedPresence.ts
+
+import { useEffect, useRef, useState } from "react"
+
+/**
+ * Manages the mount → double-rAF → visible → transitionend → unmount lifecycle
+ * for CSS-animated overlays (Dialog, Sheet, ColorPicker, etc.).
+ *
+ * Returns `mounted` (controls DOM presence), `visible` (controls CSS classes),
+ * and `onTransitionEnd` (attach to the animated element to trigger unmount).
+ *
+ * @param open      - Whether the overlay should be open
+ * @param watchProperty - If set, only unmount when this CSS property finishes transitioning
+ *                        (i.e "opacity", "transform"). Prevents premature unmount from
+ *                        unrelated child transitions bubbling up.
+ */
+function useAnimatedPresence(open: boolean, watchProperty?: string) {
+  const [mounted, setMounted] = useState(false)
+  const [visible, setVisible] = useState(false)
+  const rafRef = useRef(0)
+
+  useEffect(() => {
+    if (open) {
+      setMounted(true)
+      rafRef.current = requestAnimationFrame(() => {
+        rafRef.current = requestAnimationFrame(() => setVisible(true))
+      })
+    } else {
+      setVisible(false)
+    }
+    return () => cancelAnimationFrame(rafRef.current)
+  }, [open])
+
+  function onTransitionEnd(e: { propertyName: string }) {
+    if (watchProperty && e.propertyName !== watchProperty) return
+    if (!visible) setMounted(false)
+  }
+
+  return { mounted, visible, onTransitionEnd }
+}
+
+export { useAnimatedPresence }
diff --git a/src/hooks/useCarousel.ts b/src/hooks/useCarousel.ts
new file mode 100644
index 00000000..6ccf0a97
--- /dev/null
+++ b/src/hooks/useCarousel.ts
@@ -0,0 +1,95 @@
+// src/hooks/useCarousel.ts
+
+"use client"
+
+import { useCallback, useEffect, useRef, useState } from "react"
+
+interface UseCarouselOptions {
+  itemCount: number
+  autoRotateMs?: number
+  swipeThreshold?: number
+}
+
+interface UseCarouselReturn {
+  activeIndex: number
+  direction: "left" | "right"
+  animating: boolean
+  goTo: (index: number) => void
+  onPointerDownCapture: (e: React.PointerEvent) => void
+  onPointerUp: (e: React.PointerEvent) => void
+}
+
+function useCarousel({
+  itemCount,
+  autoRotateMs,
+  swipeThreshold = 40,
+}: UseCarouselOptions): UseCarouselReturn {
+  const [activeIndex, setActiveIndex] = useState(0)
+  const [direction, setDirection] = useState<"left" | "right">("left")
+  const [animating, setAnimating] = useState(false)
+
+  const swipeStartX = useRef(0)
+  const swipeStartY = useRef(0)
+  const pointerDown = useRef(false)
+
+  // Clamp activeIndex when item count shrinks
+  useEffect(() => {
+    if (itemCount > 0 && activeIndex >= itemCount) {
+      setActiveIndex(0)
+    }
+  }, [itemCount, activeIndex])
+
+  const goTo = useCallback(
+    (next: number) => {
+      setActiveIndex((prev) => {
+        setDirection(next > prev || (prev === itemCount - 1 && next === 0) ? "left" : "right")
+        setAnimating(true)
+        return next
+      })
+    },
+    [itemCount]
+  )
+
+  // Clear animation flag after transition
+  useEffect(() => {
+    if (!animating) return
+    const t = setTimeout(() => setAnimating(false), 300)
+    return () => clearTimeout(t)
+  }, [animating])
+
+  // Auto-rotate
+  useEffect(() => {
+    if (!autoRotateMs || itemCount <= 1) return
+    const timer = setInterval(() => {
+      goTo((activeIndex + 1) % itemCount)
+    }, autoRotateMs)
+    return () => clearInterval(timer)
+  }, [itemCount, activeIndex, goTo, autoRotateMs])
+
+  // Swipe gesture handlers
+  const onPointerDownCapture = useCallback((e: React.PointerEvent) => {
+    ;(e.currentTarget as HTMLElement).setPointerCapture(e.pointerId)
+    pointerDown.current = true
+    swipeStartX.current = e.clientX
+    swipeStartY.current = e.clientY
+  }, [])
+
+  const onPointerUp = useCallback(
+    (e: React.PointerEvent) => {
+      if (!pointerDown.current) return
+      pointerDown.current = false
+      if (itemCount <= 1) return
+      const dx = e.clientX - swipeStartX.current
+      const dy = e.clientY - swipeStartY.current
+      if (Math.abs(dx) < swipeThreshold || Math.abs(dx) < Math.abs(dy)) return
+      if (dx < 0) goTo((activeIndex + 1) % itemCount)
+      else goTo((activeIndex - 1 + itemCount) % itemCount)
+    },
+    [itemCount, activeIndex, goTo, swipeThreshold]
+  )
+
+  return { activeIndex, direction, animating, goTo, onPointerDownCapture, onPointerUp }
+}
+
+export type { UseCarouselOptions, UseCarouselReturn }
+export { useCarousel }
diff --git a/src/hooks/useClickOutside.ts b/src/hooks/useClickOutside.ts
index 4772a87d..3c35532d 100644
--- a/src/hooks/useClickOutside.ts
+++ b/src/hooks/useClickOutside.ts
@@ -10,7 +10,7 @@ function useClickOutside(ref: RefObject<HTMLElement | null>, handler: () => void
   useEffect(() => {
     if (!enabled) return
     function handleClick(e: MouseEvent) {
-      if (ref.current && !ref.current.contains(e.target as Node)) {
+      if (ref.current && e.target instanceof Node && !ref.current.contains(e.target)) {
         handlerRef.current()
       }
     }
diff --git a/src/hooks/useCrudCard.ts b/src/hooks/useCrudCard.ts
new file mode 100644
index 00000000..4446dfd8
--- /dev/null
+++ b/src/hooks/useCrudCard.ts
@@ -0,0 +1,95 @@
+// src/hooks/useCrudCard.ts
+
+import { type Dispatch, type SetStateAction, useEffect, useState } from "react"
+
+interface UseCrudCardOptions<T extends { id: number }> {
+  item: T
+  apiEndpoint: string
+  buildPatch: (draft: T, original: T) => Record<string, unknown> | null
+  onSaved: (id: number, updated: T) => void
+}
+
+interface UseCrudCardReturn<T> {
+  draft: T
+  setDraft: Dispatch<SetStateAction<T>>
+  updateDraft: (patch: Partial<T>) => void
+  dirty: boolean
+  saving: boolean
+  saveError: string | null
+  expanded: boolean
+  toggleExpand: () => void
+  handleSave: () => Promise<void>
+  handleDiscard: () => void
+}
+
+function useCrudCard<T extends { id: number }>({
+  item,
+  apiEndpoint,
+  buildPatch,
+  onSaved,
+}: UseCrudCardOptions<T>): UseCrudCardReturn<T> {
+  const [draft, setDraft] = useState<T>(item)
+  const [saving, setSaving] = useState(false)
+  const [saveError, setSaveError] = useState<string | null>(null)
+  const [expanded, setExpanded] = useState(false)
+
+  const dirty = buildPatch(draft, item) !== null
+
+  // Sync draft when parent pushes new server state (and user isn't editing)
+  useEffect(() => {
+    if (!dirty) setDraft(item)
+  }, [item, dirty])
+
+  function updateDraft(patch: Partial<T>) {
+    setDraft((prev) => ({ ...prev, ...patch }))
+  }
+
+  async function handleSave() {
+    const patch = buildPatch(draft, item)
+    if (!patch) return
+    setSaving(true)
+    setSaveError(null)
+    try {
+      const res = await fetch(`${apiEndpoint}/${item.id}`, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(patch),
+      })
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({}))
+        setSaveError((data as { error?: string }).error ?? "Failed to save")
+        return
+      }
+      onSaved(item.id, draft)
+    } catch {
+      setSaveError("Network error")
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  function handleDiscard() {
+    setDraft(item)
+    setSaveError(null)
+  }
+
+  function toggleExpand() {
+    setExpanded((e) => !e)
+  }
+
+  return {
+    draft,
+    setDraft,
+    updateDraft,
+    dirty,
+    saving,
+    saveError,
+    expanded,
+    toggleExpand,
+    handleSave,
+    handleDiscard,
+  }
+}
+
+export type { UseCrudCardOptions, UseCrudCardReturn }
+export { useCrudCard }
diff --git a/src/hooks/useDashboardData.ts b/src/hooks/useDashboardData.ts
index 9c3bc4d0..d3b28fa4 100644
--- a/src/hooks/useDashboardData.ts
+++ b/src/hooks/useDashboardData.ts
@@ -1,10 +1,9 @@
 // src/hooks/useDashboardData.ts
-
 "use client"
 
-import { useQueries, useQuery, useQueryClient } from "@tanstack/react-query"
+import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query"
 import { useCallback, useMemo, useState } from "react"
-import type { DayRange } from "@/components/dashboard/DayRangeSidebar"
+import { usePollingIntervals } from "@/hooks/usePollingIntervals"
 import { useUpdateCheck } from "@/hooks/useUpdateCheck"
 import type { DashboardAlert } from "@/lib/dashboard"
 import {
@@ -14,7 +13,22 @@ import {
   fetchDismissedKeys,
   postDismissAlert as persistDismiss,
 } from "@/lib/dashboard"
-import type { Snapshot, TodayAtAGlance, TrackerSummary } from "@/types/api"
+import { clientQueryOptions, trackerQueryOptions } from "@/lib/query-options"
+import type {
+  DayRange,
+  SafeDownloadClient,
+  Snapshot,
+  TodayAtAGlance,
+  TrackerSummary,
+} from "@/types/api"
+
+export function selectActiveTrackers(trackers: TrackerSummary[]) {
+  return trackers.filter((t) => t.isActive)
+}
+
+export function selectClientsForAlerts(clients: SafeDownloadClient[]) {
+  return clients.map(({ id, name, enabled, lastError }) => ({ id, name, enabled, lastError }))
+}
 
 interface DashboardData {
   trackers: TrackerSummary[]
@@ -32,12 +46,14 @@ interface DashboardData {
 
 interface UseDashboardDataOptions {
   initialTrackers?: TrackerSummary[]
+  snapshotRetentionDays?: number | null
 }
 
 function useDashboardData(options?: UseDashboardDataOptions): DashboardData {
   const [dayRange, setDayRange] = useState<DayRange>(30)
   const queryClient = useQueryClient()
   const updateCheck = useUpdateCheck()
+  const intervals = usePollingIntervals()
 
   const dismissedQuery = useQuery({
     queryKey: ["dismissed-alert-keys"],
@@ -57,35 +73,29 @@ function useDashboardData(options?: UseDashboardDataOptions): DashboardData {
 
   // Tracker list query
   const trackersQuery = useQuery({
-    queryKey: ["trackers"],
-    queryFn: async ({ signal }) => {
-      const res = await fetch("/api/trackers", { signal })
-      if (!res.ok) return [] as TrackerSummary[]
-      const all: TrackerSummary[] = await res.json()
-      return all.filter((t) => t.isActive)
-    },
-    refetchInterval: 60_000,
-    initialData: options?.initialTrackers?.filter((t) => t.isActive),
+    ...trackerQueryOptions,
+    refetchInterval: intervals.trackerRefetchMs,
+    select: selectActiveTrackers,
+    initialData: options?.initialTrackers,
     initialDataUpdatedAt: options?.initialTrackers ? Date.now() : undefined,
   })
 
   const trackers = trackersQuery.data ?? []
 
-  // Per-tracker snapshot queries
-  const snapshotQueries = useQueries({
-    queries: trackers.map((t) => ({
-      queryKey: ["snapshots", t.id, dayRange] as const,
-      queryFn: async ({ signal }) => {
-        const url =
-          dayRange === 0
-            ? `/api/trackers/${t.id}/snapshots`
-            : `/api/trackers/${t.id}/snapshots?days=${dayRange}`
-        const res = await fetch(url, { signal })
-        if (!res.ok) return [] as Snapshot[]
-        return res.json() as Promise<Snapshot[]>
-      },
-      refetchInterval: 60_000,
-    })),
+  // Fleet snapshot query (all trackers in one request)
+  const fleetSnapshotsQuery = useQuery({
+    queryKey: ["tracker-snapshots-fleet", dayRange],
+    queryFn: async ({ signal }) => {
+      const url =
+        dayRange === 0
+          ? "/api/trackers/snapshots/fleet"
+          : `/api/trackers/snapshots/fleet?days=${dayRange}`
+      const res = await fetch(url, { signal })
+      if (!res.ok) throw new Error(`Fleet snapshot fetch failed: ${res.status}`)
+      return res.json() as Promise<Record<string, Snapshot[]>>
+    },
+    placeholderData: keepPreviousData,
+    refetchInterval: intervals.trackerRefetchMs,
   })
 
   const todayQuery = useQuery({
@@ -95,66 +105,71 @@ function useDashboardData(options?: UseDashboardDataOptions): DashboardData {
       if (!res.ok) throw new Error("Failed to fetch today data")
       return res.json()
     },
-    staleTime: 60_000,
-    refetchInterval: 60_000,
+    staleTime: intervals.trackerRefetchMs,
+    refetchInterval: intervals.trackerRefetchMs,
   })
 
-  // Secondary queries for alert computation (less frequent)
+  // Secondary queries for alert computation (sidebar's 10s poll drives fetches)
   const clientsQuery = useQuery({
-    queryKey: ["clients-for-alerts"],
-    queryFn: async ({ signal }) => {
-      const res = await fetch("/api/clients", { signal })
-      if (!res.ok)
-        return [] as { id: number; name: string; enabled: boolean; lastError: string | null }[]
-      return res.json() as Promise<
-        { id: number; name: string; enabled: boolean; lastError: string | null }[]
-      >
-    },
-    refetchInterval: 5 * 60 * 1000,
+    ...clientQueryOptions,
+    select: selectClientsForAlerts,
   })
 
   const backupQuery = useQuery({
     queryKey: ["backup-history-for-alerts"],
     queryFn: async ({ signal }) => {
       const res = await fetch("/api/settings/backup/history", { signal })
-      if (!res.ok) return [] as { createdAt: string; status: string }[]
+      if (!res.ok) throw new Error(`Backup history fetch failed: ${res.status}`)
       return res.json() as Promise<{ createdAt: string; status: string }[]>
     },
-    refetchInterval: 5 * 60 * 1000,
+    refetchInterval: intervals.clientRefetchMs,
   })
 
-  // Derived: snapshotMap
-
-  const snapshotData = snapshotQueries.map((q) => q.data)
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: spreading individual q.data refs which are referentially stable from TanStack Query — avoids new-array-ref instability from the useQueries result array itself
+  // Derived: snapshotMap (built from fleet response keyed by tracker ID)
   const snapshotMap = useMemo(() => {
     const map = new Map<number, Snapshot[]>()
-    for (let i = 0; i < trackers.length; i++) {
-      map.set(trackers[i].id, snapshotData[i] ?? [])
+    const data = fleetSnapshotsQuery.data
+    if (data) {
+      for (const [key, snapshots] of Object.entries(data)) {
+        map.set(Number(key), snapshots)
+      }
     }
     return map
-  }, [trackers, ...snapshotData])
+  }, [fleetSnapshotsQuery.data])
 
   // Derived: alerts
+  // System alerts depend on client-only queries (update check, clients, backups).
+  // Only include them once those queries have fetched to avoid SSR/client mismatch.
+  const clientQueriesReady =
+    !updateCheck.loading &&
+    !clientsQuery.isLoading &&
+    !backupQuery.isLoading &&
+    !clientsQuery.isError &&
+    !backupQuery.isError
+
   const visibleAlerts = useMemo(() => {
     const trackerAlerts = computeAlerts(trackers)
     const rankAlerts = detectRankChanges(trackers, snapshotMap, 7)
-    const systemAlerts = computeSystemAlerts({
-      latestVersion: updateCheck.latestVersion ?? undefined,
-      currentVersion: process.env.NEXT_PUBLIC_APP_VERSION ?? "0.0.0",
-      failedBackups: (backupQuery.data ?? []).filter((b) => b.status === "failed"),
-      clients: clientsQuery.data ?? [],
-    })
+    const systemAlerts = clientQueriesReady
+      ? computeSystemAlerts({
+          latestVersion: updateCheck.latestVersion ?? undefined,
+          currentVersion: process.env.NEXT_PUBLIC_APP_VERSION ?? "0.0.0",
+          failedBackups: (backupQuery.data ?? []).filter((b) => b.status === "failed"),
+          clients: clientsQuery.data ?? [],
+          snapshotRetentionDays: options?.snapshotRetentionDays ?? null,
+        })
+      : []
     const combined = [...trackerAlerts, ...rankAlerts, ...systemAlerts]
     return combined.filter((a) => !dismissedKeys.has(a.key))
   }, [
     trackers,
     snapshotMap,
+    clientQueriesReady,
     updateCheck.latestVersion,
     backupQuery.data,
     clientsQuery.data,
     dismissedKeys,
+    options?.snapshotRetentionDays,
   ])
 
   // Dismiss handlers
@@ -177,6 +192,13 @@ function useDashboardData(options?: UseDashboardDataOptions): DashboardData {
     })
   }, [visibleAlerts])
 
+  const refresh = useCallback(async () => {
+    await queryClient.refetchQueries({ queryKey: trackerQueryOptions.queryKey })
+    queryClient.invalidateQueries({ queryKey: ["tracker-snapshots-fleet"] })
+    queryClient.invalidateQueries({ queryKey: ["download-client-snapshots"] })
+    queryClient.invalidateQueries({ queryKey: ["dashboard-today"] })
+  }, [queryClient])
+
   return {
     trackers,
     snapshotMap,
@@ -188,11 +210,7 @@ function useDashboardData(options?: UseDashboardDataOptions): DashboardData {
     setDayRange,
     dismissAlert,
     dismissAllAlerts,
-    refresh: async () => {
-      await trackersQuery.refetch()
-      await queryClient.invalidateQueries({ queryKey: ["snapshots"] })
-      queryClient.invalidateQueries({ queryKey: ["dashboard-today"] })
-    },
+    refresh,
   }
 }
 
diff --git a/src/hooks/useDestructiveAction.ts b/src/hooks/useDestructiveAction.ts
new file mode 100644
index 00000000..5f0c160f
--- /dev/null
+++ b/src/hooks/useDestructiveAction.ts
@@ -0,0 +1,66 @@
+// src/hooks/useDestructiveAction.ts
+
+"use client"
+
+import { useCallback, useState } from "react"
+import { extractApiError } from "@/lib/extract-api-error"
+
+interface UseDestructiveActionReturn {
+  confirming: boolean
+  open: () => void
+  cancel: () => void
+  password: string
+  setPassword: (value: string) => void
+  submitting: boolean
+  error: string | null
+  execute: () => Promise<void>
+}
+
+function useDestructiveAction(
+  endpoint: string,
+  onSuccess?: () => void
+): UseDestructiveActionReturn {
+  const [confirming, setConfirming] = useState(false)
+  const [password, setPasswordRaw] = useState("")
+  const [submitting, setSubmitting] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  const open = useCallback(() => setConfirming(true), [])
+
+  const cancel = useCallback(() => {
+    setConfirming(false)
+    setPasswordRaw("")
+    setError(null)
+  }, [])
+
+  const setPassword = useCallback((value: string) => {
+    setPasswordRaw(value)
+    setError(null)
+  }, [])
+
+  const execute = useCallback(async () => {
+    setSubmitting(true)
+    setError(null)
+    try {
+      const res = await fetch(endpoint, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ password }),
+      })
+      if (!res.ok) {
+        throw new Error(await extractApiError(res, "Action failed"))
+      }
+      cancel()
+      onSuccess?.()
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Network error")
+    } finally {
+      setSubmitting(false)
+    }
+  }, [endpoint, password, cancel, onSuccess])
+
+  return { confirming, open, cancel, password, setPassword, submitting, error, execute }
+}
+
+export type { UseDestructiveActionReturn }
+export { useDestructiveAction }
diff --git a/src/hooks/useEscapeKey.ts b/src/hooks/useEscapeKey.ts
new file mode 100644
index 00000000..810e3948
--- /dev/null
+++ b/src/hooks/useEscapeKey.ts
@@ -0,0 +1,37 @@
+// src/hooks/useEscapeKey.ts
+
+import { useEffect, useRef } from "react"
+
+interface UseEscapeKeyOptions {
+  /** Listen in capture phase (intercepts before children). Default: false */
+  capture?: boolean
+  /** Call e.stopPropagation() before handler. Default: false */
+  stopPropagation?: boolean
+}
+
+/**
+ * Registers a global keydown listener for Escape while `enabled` is true.
+ * Handler is kept fresh via ref so callers don't need useCallback.
+ */
+function useEscapeKey(handler: () => void, enabled: boolean, options?: UseEscapeKeyOptions): void {
+  const handlerRef = useRef(handler)
+  handlerRef.current = handler
+
+  const capture = options?.capture ?? false
+  const stop = options?.stopPropagation ?? false
+
+  useEffect(() => {
+    if (!enabled) return
+    function onKeyDown(e: KeyboardEvent) {
+      if (e.key === "Escape") {
+        if (stop) e.stopPropagation()
+        handlerRef.current()
+      }
+    }
+    document.addEventListener("keydown", onKeyDown, capture)
+    return () => document.removeEventListener("keydown", onKeyDown, capture)
+  }, [enabled, capture, stop])
+}
+
+export type { UseEscapeKeyOptions }
+export { useEscapeKey }
diff --git a/src/hooks/useLocalStorage.ts b/src/hooks/useLocalStorage.ts
index f6c3eaf3..d8592dc7 100644
--- a/src/hooks/useLocalStorage.ts
+++ b/src/hooks/useLocalStorage.ts
@@ -1,20 +1,21 @@
 // src/hooks/useLocalStorage.ts
-import { useCallback, useEffect, useState } from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
 
 function useLocalStorage<T>(
   key: string,
   defaultValue: T
 ): [T, (value: T | ((prev: T) => T)) => void] {
+  const defaultValueRef = useRef(defaultValue)
   const [state, setState] = useState<T>(defaultValue)
 
   useEffect(() => {
     try {
       const stored = localStorage.getItem(key)
-      setState(stored !== null ? (JSON.parse(stored) as T) : defaultValue)
+      setState(stored !== null ? (JSON.parse(stored) as T) : defaultValueRef.current)
     } catch {
-      setState(defaultValue)
+      setState(defaultValueRef.current)
     }
-  }, [key, defaultValue])
+  }, [key])
 
   const setValue = useCallback(
     (value: T | ((prev: T) => T)) => {
diff --git a/src/hooks/usePatchSettings.ts b/src/hooks/usePatchSettings.ts
index 121f27f3..86ff1072 100644
--- a/src/hooks/usePatchSettings.ts
+++ b/src/hooks/usePatchSettings.ts
@@ -1,15 +1,15 @@
 // src/hooks/usePatchSettings.ts
-//
-// Functions: usePatchSettings
 
 import { useCallback, useState } from "react"
-import { extractApiError } from "@/lib/client-helpers"
+import { extractApiError } from "@/lib/extract-api-error"
+
+type PatchResult = { ok: true; data: Record<string, unknown> } | { ok: false; error: string }
 
 interface UsePatchSettingsReturn {
   saving: boolean
   error: string | null
   success: boolean
-  patch: (payload: Record<string, unknown>) => Promise<Record<string, unknown> | null>
+  patch: (payload: Record<string, unknown>) => Promise<PatchResult>
   clearError: () => void
   clearSuccess: () => void
 }
@@ -23,32 +23,30 @@ export function usePatchSettings(): UsePatchSettingsReturn {
   const [error, setError] = useState<string | null>(null)
   const [success, setSuccess] = useState(false)
 
-  const patch = useCallback(
-    async (payload: Record<string, unknown>): Promise<Record<string, unknown> | null> => {
-      setSaving(true)
-      setError(null)
-      setSuccess(false)
-      try {
-        const res = await fetch("/api/settings", {
-          method: "PATCH",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(payload),
-        })
-        if (!res.ok) {
-          throw new Error(await extractApiError(res, "Save failed"))
-        }
-        const result = await res.json()
-        setSuccess(true)
-        return result
-      } catch (err) {
-        setError(err instanceof Error ? err.message : "Network error")
-        return null
-      } finally {
-        setSaving(false)
+  const patch = useCallback(async (payload: Record<string, unknown>): Promise<PatchResult> => {
+    setSaving(true)
+    setError(null)
+    setSuccess(false)
+    try {
+      const res = await fetch("/api/settings", {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload),
+      })
+      if (!res.ok) {
+        throw new Error(await extractApiError(res, "Save failed"))
       }
-    },
-    []
-  )
+      const result = await res.json()
+      setSuccess(true)
+      return { ok: true, data: result }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "Network error"
+      setError(msg)
+      return { ok: false, error: msg }
+    } finally {
+      setSaving(false)
+    }
+  }, [])
 
   return {
     saving,
diff --git a/src/hooks/usePollingIntervals.ts b/src/hooks/usePollingIntervals.ts
new file mode 100644
index 00000000..3ab9e431
--- /dev/null
+++ b/src/hooks/usePollingIntervals.ts
@@ -0,0 +1,54 @@
+// src/hooks/usePollingIntervals.ts
+
+"use client"
+
+import { useQuery } from "@tanstack/react-query"
+import { clientQueryOptions } from "@/lib/query-options"
+import type { SafeDownloadClient } from "@/types/api"
+
+interface PollingIntervals {
+  /** Tracker + dashboard refetch interval in ms (from trackerPollIntervalMinutes) */
+  trackerRefetchMs: number
+  /** Client snapshot refetch interval in ms (from minimum pollIntervalSeconds across clients) */
+  clientRefetchMs: number
+}
+
+const DEFAULT_TRACKER_MS = 60_000
+const DEFAULT_CLIENT_MS = 5 * 60 * 1000
+
+export function selectMinPollInterval(clients: SafeDownloadClient[]): number | null {
+  const enabled = clients.filter((c) => c.enabled)
+  if (enabled.length === 0) return null
+  return Math.min(...enabled.map((c) => c.pollIntervalSeconds))
+}
+
+// Reads poll intervals from app settings and client config
+
+export function usePollingIntervals(): PollingIntervals {
+  const { data: settingsData } = useQuery({
+    queryKey: ["polling-intervals"],
+    queryFn: async ({ signal }) => {
+      const res = await fetch("/api/settings", { signal })
+      if (!res.ok) return null
+      const settings = await res.json()
+      return {
+        trackerPollIntervalMinutes: settings.trackerPollIntervalMinutes as number | undefined,
+      }
+    },
+    staleTime: 5 * 60 * 1000,
+    refetchInterval: 5 * 60 * 1000,
+  })
+
+  const { data: clientsData } = useQuery({
+    ...clientQueryOptions,
+    select: selectMinPollInterval,
+  })
+
+  const trackerRefetchMs = settingsData?.trackerPollIntervalMinutes
+    ? settingsData.trackerPollIntervalMinutes * 60 * 1000
+    : DEFAULT_TRACKER_MS
+
+  const clientRefetchMs = clientsData ? clientsData * 1000 : DEFAULT_CLIENT_MS
+
+  return { trackerRefetchMs, clientRefetchMs }
+}
diff --git a/src/hooks/useSetToggle.ts b/src/hooks/useSetToggle.ts
new file mode 100644
index 00000000..ae0d7de6
--- /dev/null
+++ b/src/hooks/useSetToggle.ts
@@ -0,0 +1,39 @@
+// src/hooks/useSetToggle.ts
+
+"use client"
+
+import { useCallback, useState } from "react"
+
+interface UseSetToggleReturn<T> {
+  set: Set<T>
+  toggle: (value: T) => void
+  has: (value: T) => boolean
+  reset: (values: Iterable<T>) => void
+  size: number
+}
+
+function useSetToggle<T>(initial: Iterable<T>): UseSetToggleReturn<T> {
+  const [set, setSet] = useState(() => new Set(initial))
+
+  const toggle = useCallback((value: T) => {
+    setSet((prev) => {
+      const next = new Set(prev)
+      if (next.has(value)) next.delete(value)
+      else next.add(value)
+      return next
+    })
+  }, [])
+
+  const reset = useCallback((values: Iterable<T>) => setSet(new Set(values)), [])
+
+  return {
+    set,
+    toggle,
+    has: useCallback((value: T) => set.has(value), [set]),
+    reset,
+    size: set.size,
+  }
+}
+
+export type { UseSetToggleReturn }
+export { useSetToggle }
diff --git a/src/hooks/useSidebarPreferences.ts b/src/hooks/useSidebarPreferences.ts
new file mode 100644
index 00000000..594c64a3
--- /dev/null
+++ b/src/hooks/useSidebarPreferences.ts
@@ -0,0 +1,55 @@
+// src/hooks/useSidebarPreferences.ts
+"use client"
+
+import { useLocalStorage } from "@/hooks/useLocalStorage"
+import type { SortMode } from "@/hooks/useTrackerList"
+import type { StatMode } from "@/lib/formatters"
+import { STORAGE_KEYS } from "@/lib/storage-keys"
+
+interface UseSidebarPreferencesReturn {
+  statMode: StatMode
+  setStatMode: (mode: StatMode) => void
+  sortMode: SortMode
+  setSortMode: (mode: SortMode) => void
+  filtersExpanded: boolean
+  setFiltersExpanded: (value: boolean | ((prev: boolean) => boolean)) => void
+  showFavoritesOnly: boolean
+  setShowFavoritesOnly: (value: boolean | ((prev: boolean) => boolean)) => void
+  showArchived: boolean
+  setShowArchived: (value: boolean | ((prev: boolean) => boolean)) => void
+  unlocked: boolean
+  setUnlocked: (value: boolean | ((prev: boolean) => boolean)) => void
+}
+
+function useSidebarPreferences(): UseSidebarPreferencesReturn {
+  const [statMode, setStatMode] = useLocalStorage<StatMode>(STORAGE_KEYS.SIDEBAR_STAT_MODE, "ratio")
+  const [sortMode, setSortMode] = useLocalStorage<SortMode>(STORAGE_KEYS.SIDEBAR_SORT_MODE, "index")
+  const [filtersExpanded, setFiltersExpanded] = useLocalStorage(
+    STORAGE_KEYS.SIDEBAR_FILTERS_EXPANDED,
+    true
+  )
+  const [showFavoritesOnly, setShowFavoritesOnly] = useLocalStorage(
+    STORAGE_KEYS.SIDEBAR_FAVORITES_ONLY,
+    false
+  )
+  const [showArchived, setShowArchived] = useLocalStorage(STORAGE_KEYS.SIDEBAR_SHOW_ARCHIVED, false)
+  const [unlocked, setUnlocked] = useLocalStorage(STORAGE_KEYS.SIDEBAR_UNLOCKED, false)
+
+  return {
+    statMode,
+    setStatMode,
+    sortMode,
+    setSortMode,
+    filtersExpanded,
+    setFiltersExpanded,
+    showFavoritesOnly,
+    setShowFavoritesOnly,
+    showArchived,
+    setShowArchived,
+    unlocked,
+    setUnlocked,
+  }
+}
+
+export type { UseSidebarPreferencesReturn }
+export { useSidebarPreferences }
diff --git a/src/hooks/useTrackerList.ts b/src/hooks/useTrackerList.ts
new file mode 100644
index 00000000..cceea099
--- /dev/null
+++ b/src/hooks/useTrackerList.ts
@@ -0,0 +1,168 @@
+// src/hooks/useTrackerList.ts
+"use client"
+
+import type { DragEndEvent } from "@dnd-kit/core"
+import { arrayMove } from "@dnd-kit/sortable"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { useCallback, useEffect, useMemo, useRef } from "react"
+import { usePollingIntervals } from "@/hooks/usePollingIntervals"
+import { trackerQueryOptions } from "@/lib/query-options"
+import type { TrackerSummary } from "@/types/api"
+
+type SortMode = "index" | "alpha" | "custom"
+
+function sortTrackers(trackers: TrackerSummary[], mode: SortMode): TrackerSummary[] {
+  const sorted = [...trackers]
+  switch (mode) {
+    case "alpha":
+      return sorted.sort((a, b) => a.name.localeCompare(b.name))
+    case "custom":
+      return sorted.sort((a, b) => (a.sortOrder ?? Infinity) - (b.sortOrder ?? Infinity))
+    default:
+      return sorted
+  }
+}
+
+interface UseTrackerListParams {
+  sortMode: SortMode
+  showFavoritesOnly: boolean
+  showArchived: boolean
+  onSortModeChange: (mode: SortMode) => void
+}
+
+interface UseTrackerListReturn {
+  trackers: TrackerSummary[]
+  loading: boolean
+  displayedTrackers: TrackerSummary[]
+  trackerIds: number[]
+  archivedCount: number
+  toggleFavorite: (id: number, current: boolean) => void
+  handleDragEnd: (event: DragEndEvent) => void
+  refresh: () => void
+}
+
+function useTrackerList({
+  sortMode,
+  showFavoritesOnly,
+  showArchived,
+  onSortModeChange,
+}: UseTrackerListParams): UseTrackerListReturn {
+  const queryClient = useQueryClient()
+  const intervals = usePollingIntervals()
+
+  const trackersQuery = useQuery({
+    ...trackerQueryOptions,
+    refetchInterval: intervals.trackerRefetchMs,
+  })
+
+  const trackers = trackersQuery.data ?? []
+
+  // Auto-detect custom sort when trackers first arrive with sortOrder data
+  const hasAutoDetected = useRef(false)
+  useEffect(() => {
+    if (hasAutoDetected.current) return
+    if (sortMode === "index" && trackers.length > 0 && trackers.some((t) => t.sortOrder !== null)) {
+      hasAutoDetected.current = true
+      onSortModeChange("custom")
+    }
+  }, [trackers, sortMode, onSortModeChange])
+
+  // Derived state
+  const filteredTrackers = useMemo(
+    () =>
+      trackers
+        .filter((t) => showArchived || t.isActive)
+        .filter((t) => !showFavoritesOnly || t.isFavorite),
+    [trackers, showArchived, showFavoritesOnly]
+  )
+
+  const displayedTrackers = useMemo(
+    () => sortTrackers(filteredTrackers, sortMode),
+    [filteredTrackers, sortMode]
+  )
+
+  const trackerIds = useMemo(() => displayedTrackers.map((t) => t.id), [displayedTrackers])
+
+  const archivedCount = useMemo(() => trackers.filter((t) => !t.isActive).length, [trackers])
+
+  const toggleFavorite = useCallback(
+    (id: number, current: boolean) => {
+      const next = !current
+      queryClient.setQueryData<TrackerSummary[]>(trackerQueryOptions.queryKey, (prev) =>
+        prev?.map((t) => (t.id === id ? { ...t, isFavorite: next } : t))
+      )
+      fetch(`/api/trackers/${id}`, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ isFavorite: next }),
+      })
+        .then((res) => {
+          if (!res.ok) throw new Error()
+          queryClient.invalidateQueries({ queryKey: trackerQueryOptions.queryKey })
+        })
+        .catch(() => {
+          queryClient.setQueryData<TrackerSummary[]>(trackerQueryOptions.queryKey, (prev) =>
+            prev?.map((t) => (t.id === id ? { ...t, isFavorite: current } : t))
+          )
+        })
+    },
+    [queryClient]
+  )
+
+  const handleDragEnd = useCallback(
+    (event: DragEndEvent) => {
+      const { active, over } = event
+      if (!over || active.id === over.id) return
+
+      const snapshot = queryClient.getQueryData<TrackerSummary[]>(trackerQueryOptions.queryKey)
+
+      queryClient.setQueryData<TrackerSummary[]>(trackerQueryOptions.queryKey, (prev) => {
+        if (!prev) return prev
+        const oldIndex = prev.findIndex((t) => t.id === active.id)
+        const newIndex = prev.findIndex((t) => t.id === over.id)
+        if (oldIndex === -1 || newIndex === -1) return prev
+        return arrayMove(prev, oldIndex, newIndex).map((t, i) => ({
+          ...t,
+          sortOrder: i,
+        }))
+      })
+
+      const reordered = queryClient.getQueryData<TrackerSummary[]>(trackerQueryOptions.queryKey)
+      const ids = reordered?.map((t) => t.id) ?? []
+
+      fetch("/api/trackers/reorder", {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ ids }),
+      })
+        .then((res) => {
+          if (!res.ok) throw new Error()
+          queryClient.invalidateQueries({ queryKey: trackerQueryOptions.queryKey })
+        })
+        .catch(() => {
+          queryClient.setQueryData(trackerQueryOptions.queryKey, snapshot)
+        })
+
+      onSortModeChange("custom")
+    },
+    [queryClient, onSortModeChange]
+  )
+
+  const refresh = useCallback(() => {
+    queryClient.invalidateQueries({ queryKey: trackerQueryOptions.queryKey })
+  }, [queryClient])
+
+  return {
+    trackers,
+    loading: trackersQuery.isLoading,
+    displayedTrackers,
+    trackerIds,
+    archivedCount,
+    toggleFavorite,
+    handleDragEnd,
+    refresh,
+  }
+}
+
+export type { SortMode, UseTrackerListParams, UseTrackerListReturn }
+export { sortTrackers, useTrackerList }
diff --git a/src/hooks/useTrackerTorrents.ts b/src/hooks/useTrackerTorrents.ts
index c6d08c2d..7f535e2a 100644
--- a/src/hooks/useTrackerTorrents.ts
+++ b/src/hooks/useTrackerTorrents.ts
@@ -1,24 +1,22 @@
 // src/hooks/useTrackerTorrents.ts
-//
-// Functions: useTrackerTorrents
-
 "use client"
 
-import { useEffect, useMemo, useRef, useState } from "react"
+import { useQuery } from "@tanstack/react-query"
+import { useMemo } from "react"
 import type { TrackerRules } from "@/data/tracker-registry"
+import { usePollingIntervals } from "@/hooks/usePollingIntervals"
+import type { TorrentRaw } from "@/lib/fleet"
 import {
   type AggregatedTorrentsResponse,
   type CategoryStats,
   LEECHING_STATES,
-  mapTorrent,
   parseTorrentTags,
   SEEDING_STATES,
-  type TorrentInfo,
 } from "@/lib/torrent-utils"
 import type { QbitmanageTagConfig, TagGroup } from "@/types/api"
 
 // ---------------------------------------------------------------------------
-// Params / return types
+// Type defs
 // ---------------------------------------------------------------------------
 
 interface UseTrackerTorrentsParams {
@@ -31,6 +29,8 @@ interface UseTrackerTorrentsParams {
     enabled: boolean
     tags: QbitmanageTagConfig
   } | null
+  /** When false, disables the 5s active torrent poll (i.e. tab not visible). */
+  isActive?: boolean
 }
 
 interface TagGroupBreakdown {
@@ -46,8 +46,7 @@ interface QbitmanageBreakdownItem {
 }
 
 interface TrackerTorrentsData {
-  // Fetch state
-  torrents: TorrentInfo[]
+  torrents: TorrentRaw[]
   crossSeedTags: string[]
   loading: boolean
   torrentError: string | null
@@ -56,27 +55,48 @@ interface TrackerTorrentsData {
   stale: boolean
   cachedAt: string | null
 
-  // Derived stats
-  seedingTorrents: TorrentInfo[]
-  leechingTorrents: TorrentInfo[]
-  activelySeedingTorrents: TorrentInfo[]
-  activelyDownloading: TorrentInfo[]
+  seedingTorrents: TorrentRaw[]
+  leechingTorrents: TorrentRaw[]
+  activelySeedingTorrents: TorrentRaw[]
+  activelyDownloading: TorrentRaw[]
   totalUpSpeed: number
   totalSize: number
-  crossSeeded: TorrentInfo[]
+  crossSeeded: TorrentRaw[]
   requiredSeedSeconds: number | null
-  unsatisfiedTorrents: TorrentInfo[]
-  unsatisfiedSorted: TorrentInfo[]
+  unsatisfiedTorrents: TorrentRaw[]
+  unsatisfiedSorted: TorrentRaw[]
   unsatisfiedCount: number | null
   hnrRiskCount: number | null
   deadCount: number | null
   categoryStats: CategoryStats[]
-  topBySeeding: TorrentInfo[]
-  elderTorrents: TorrentInfo[]
+  topBySeeding: TorrentRaw[]
+  elderTorrents: TorrentRaw[]
   tagGroupBreakdowns: TagGroupBreakdown[]
   qbitmanageBreakdown: QbitmanageBreakdownItem[]
 }
 
+// ---------------------------------------------------------------------------
+// SessionStorage cache (Phase 0 — instant restore on page refresh)
+// ---------------------------------------------------------------------------
+
+function loadSessionCache(trackerId: number): AggregatedTorrentsResponse | undefined {
+  try {
+    const raw = sessionStorage.getItem(`torrent-cache-${trackerId}`)
+    if (!raw) return undefined
+    return JSON.parse(raw) as AggregatedTorrentsResponse
+  } catch {
+    return undefined
+  }
+}
+
+function saveSessionCache(trackerId: number, data: AggregatedTorrentsResponse) {
+  try {
+    sessionStorage.setItem(`torrent-cache-${trackerId}`, JSON.stringify(data))
+  } catch {
+    // sessionStorage full or unavailable
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Hook
 // ---------------------------------------------------------------------------
@@ -88,191 +108,121 @@ function useTrackerTorrents({
   tagGroups,
   trackerSeedingCount,
   qbitmanageConfig,
+  isActive = true,
 }: UseTrackerTorrentsParams): TrackerTorrentsData {
-  const [torrents, setTorrents] = useState<TorrentInfo[]>([])
-  const [crossSeedTags, setCrossSeedTags] = useState<string[]>([])
-  const [loading, setLoading] = useState(true)
-  const ready = useRef(false)
-  const [torrentError, setTorrentError] = useState<string | null>(null)
-  const [noClients, setNoClients] = useState(false)
-  const [clientCount, setClientCount] = useState(0)
-  const [stale, setStale] = useState(false)
-  const [cachedAt, setCachedAt] = useState<string | null>(null)
-
-  useEffect(() => {
-    let cancelled = false
-
-    function applyResponse(data: AggregatedTorrentsResponse) {
-      if (cancelled) return
-      setTorrents(data.torrents.map(mapTorrent))
-      setCrossSeedTags(data.crossSeedTags)
-      setClientCount(data.clientCount)
-      setNoClients(data.clientCount === 0)
-    }
-
-    function storeLocal(data: AggregatedTorrentsResponse) {
-      try {
-        sessionStorage.setItem(`torrent-cache-${trackerId}`, JSON.stringify(data))
-      } catch {
-        // sessionStorage full or unavailable — ignore
-      }
-    }
-
-    function loadLocal(): AggregatedTorrentsResponse | null {
-      try {
-        const raw = sessionStorage.getItem(`torrent-cache-${trackerId}`)
-        if (!raw) return null
-        return JSON.parse(raw) as AggregatedTorrentsResponse
-      } catch {
-        return null
+  const enabled = !!qbtTag
+  const intervals = usePollingIntervals()
+
+  // forces an immediate background refetch from the DB cache endpoint
+  const cachedQuery = useQuery({
+    queryKey: ["tracker-torrents-cached", trackerId] as const,
+    queryFn: async ({ signal }) => {
+      const res = await fetch(`/api/trackers/${trackerId}/torrents/cached`, { signal })
+      if (!res.ok) return null
+      const data = (await res.json()) as AggregatedTorrentsResponse
+      if (data.torrents.length > 0) {
+        saveSessionCache(trackerId, data)
+        return data
       }
-    }
-
-    async function init() {
-      if (!qbtTag) {
-        if (!cancelled) setLoading(false)
-        return
-      }
-
-      // Phase 0: Instant — restore from sessionStorage (survives page refresh)
-      const local = loadLocal()
-      if (local && local.torrents.length > 0) {
-        applyResponse(local)
-        if (!cancelled) {
-          setStale(true)
-          setLoading(false)
-          ready.current = true
+      return null
+    },
+    enabled,
+    staleTime: intervals.trackerRefetchMs,
+    initialData: loadSessionCache(trackerId) ?? undefined,
+    initialDataUpdatedAt: 0,
+  })
+
+  // Phase 2: Live qBT torrent data (slow — overrides cached when ready)
+  const liveQuery = useQuery({
+    queryKey: ["tracker-torrents", trackerId] as const,
+    queryFn: async ({ signal }) => {
+      const res = await fetch(`/api/trackers/${trackerId}/torrents`, { signal })
+      if (!res.ok) throw new Error(`Torrent fetch failed: ${res.status}`)
+      const data = (await res.json()) as AggregatedTorrentsResponse
+      saveSessionCache(trackerId, data)
+      return data
+    },
+    enabled,
+    staleTime: intervals.trackerRefetchMs,
+  })
+
+  // Active torrent poll. Only starts after live data has resolved
+  const activeQuery = useQuery({
+    queryKey: ["tracker-torrents-active", trackerId] as const,
+    queryFn: async ({ signal }) => {
+      const res = await fetch(`/api/trackers/${trackerId}/torrents?active=true`, { signal })
+      if (!res.ok) return null
+      return res.json() as Promise<AggregatedTorrentsResponse>
+    },
+    enabled: enabled && liveQuery.isSuccess,
+    refetchInterval: isActive ? 5_000 : false,
+  })
+
+  // Resolve the best available data source: live > cached > sessionStorage placeholder
+  const baseData = liveQuery.data ?? cachedQuery.data ?? null
+  const stale = !liveQuery.data && !!cachedQuery.data
+  const cachedAt = stale ? (cachedQuery.data?.cachedAt ?? null) : null
+  const loading = enabled && !baseData && (cachedQuery.isLoading || liveQuery.isLoading)
+
+  // Merge active speeds into the base torrent list
+  const torrents = useMemo(() => {
+    if (!baseData) return []
+    const base: TorrentRaw[] = baseData.torrents
+    if (!activeQuery.data) return base
+
+    const activeMap = new Map(activeQuery.data.torrents.map((t) => [t.hash, t] as const))
+    return base.map((t) => {
+      const active = activeMap.get(t.hash)
+      if (active) {
+        return {
+          ...t,
+          uploadSpeed: active.uploadSpeed,
+          downloadSpeed: active.downloadSpeed,
+          state: active.state,
+          progress: active.progress,
         }
       }
-
-      // Phase 1: Load from DB cache (fast, may have newer data than sessionStorage)
-      let hasCachedData = local !== null && local.torrents.length > 0
-      try {
-        const cachedRes = await fetch(`/api/trackers/${trackerId}/torrents/cached`)
-        if (cachedRes.ok) {
-          const data: AggregatedTorrentsResponse = await cachedRes.json()
-          if (data.torrents.length > 0) {
-            applyResponse(data)
-            storeLocal(data)
-            hasCachedData = true
-            if (!cancelled) {
-              setStale(true)
-              setCachedAt(data.cachedAt ?? null)
-              setLoading(false)
-              ready.current = true
-            }
-          }
+      if (
+        t.uploadSpeed > 0 ||
+        t.downloadSpeed > 0 ||
+        t.state === "uploading" ||
+        t.state === "downloading"
+      ) {
+        return {
+          ...t,
+          uploadSpeed: 0,
+          downloadSpeed: 0,
+          state: t.state === "downloading" ? ("stalledDL" as const) : ("stalledUP" as const),
         }
-      } catch {
-        // Cache miss — continue to live fetch
       }
+      return t
+    })
+  }, [baseData, activeQuery.data])
 
-      // Phase 2: Refresh with live data (slow qBT fetch)
-      try {
-        const liveRes = await fetch(`/api/trackers/${trackerId}/torrents`)
-        if (liveRes.ok) {
-          const data: AggregatedTorrentsResponse = await liveRes.json()
-          applyResponse(data)
-          storeLocal(data)
-          if (!cancelled) {
-            setStale(false)
-            setCachedAt(null)
-            setTorrentError(
-              data.clientErrors.length > 0
-                ? `Partial data — some clients failed: ${data.clientErrors.join("; ")}`
-                : null
-            )
-          }
-        }
-      } catch {
-        // Live fetch failed — cached data stays visible
-        if (!hasCachedData && !cancelled) {
-          setTorrentError("Client offline — no cached data available")
-        }
-      } finally {
-        if (!cancelled) {
-          setLoading(false)
-          ready.current = true
-        }
-      }
-    }
+  const crossSeedTags = useMemo(() => baseData?.crossSeedTags ?? [], [baseData?.crossSeedTags])
+  const clientCount = baseData?.clientCount ?? 0
+  const noClients = clientCount === 0
 
-    init()
-    return () => {
-      cancelled = true
+  const torrentError = useMemo(() => {
+    if (liveQuery.data?.clientErrors?.length) {
+      return `Partial data — some clients failed: ${liveQuery.data.clientErrors.join("; ")}`
     }
-  }, [trackerId, qbtTag])
-
-  // Poll active torrents every 5s for live upload/download speeds.
-  // Uses a ref instead of `loading` state to avoid tearing down the
-  // interval if loading ever toggled more than once.
-  useEffect(() => {
-    if (!qbtTag) return
-    let cancelled = false
-
-    async function pollActive() {
-      if (!ready.current) return
-      try {
-        const res = await fetch(`/api/trackers/${trackerId}/torrents?active=true`)
-        if (!res.ok || cancelled) return
-        const data: AggregatedTorrentsResponse = await res.json()
-        if (cancelled) return
-        const activeTorrents = data.torrents.map(mapTorrent)
-        const activeMap = new Map(activeTorrents.map((t) => [t.hash, t]))
-
-        setTorrents((prev) =>
-          prev.map((t) => {
-            const active = activeMap.get(t.hash)
-            if (active) {
-              // Update speed and state from live data
-              return {
-                ...t,
-                upspeed: active.upspeed,
-                dlspeed: active.dlspeed,
-                state: active.state,
-                progress: active.progress,
-              }
-            }
-            // Not in active list — zero out speeds and clear active state
-            if (
-              t.upspeed > 0 ||
-              t.dlspeed > 0 ||
-              t.state === "uploading" ||
-              t.state === "downloading"
-            ) {
-              return {
-                ...t,
-                upspeed: 0,
-                dlspeed: 0,
-                state: t.state === "downloading" ? "stalledDL" : "stalledUP",
-              }
-            }
-            return t
-          })
-        )
-      } catch {
-        // Non-critical — stale speeds are acceptable
-      }
+    if (liveQuery.error && !cachedQuery.data) {
+      return "Client offline — no cached data available"
     }
-
-    const interval = setInterval(pollActive, 5000)
-    return () => {
-      cancelled = true
-      clearInterval(interval)
-    }
-  }, [trackerId, qbtTag])
+    return null
+  }, [liveQuery.data, liveQuery.error, cachedQuery.data])
 
   const derived = useMemo(() => {
     const seedingTorrents = torrents.filter((t) => SEEDING_STATES.has(t.state))
     const leechingTorrents = torrents.filter((t) => LEECHING_STATES.has(t.state))
     const activelySeedingTorrents = torrents.filter((t) => t.state === "uploading")
     const activelyDownloading = torrents.filter(
-      (t) => LEECHING_STATES.has(t.state) && t.dlspeed > 0
+      (t) => LEECHING_STATES.has(t.state) && t.downloadSpeed > 0
     )
-    const totalUpSpeed = torrents.reduce((sum, t) => sum + t.upspeed, 0)
+    const totalUpSpeed = torrents.reduce((sum, t) => sum + t.uploadSpeed, 0)
     const totalSize = torrents.reduce((sum, t) => sum + t.size, 0)
 
-    // Cross-seed: torrents that have at least one cross-seed tag (aggregated from all clients)
     const csTagSet = new Set(crossSeedTags.map((t) => t.toLowerCase()))
     const crossSeeded = torrents.filter((t) => {
       const tags = t.tags
@@ -282,7 +232,6 @@ function useTrackerTorrents({
       return tags.some((tag) => csTagSet.has(tag))
     })
 
-    // Unsatisfied: all torrents below min seed time (regardless of state)
     const requiredSeedSeconds =
       rules?.seedTimeHours != null && rules.seedTimeHours > 0 ? rules.seedTimeHours * 3600 : null
     const unsatisfiedTorrents = requiredSeedSeconds
@@ -290,19 +239,16 @@ function useTrackerTorrents({
       : []
     const unsatisfiedCount = requiredSeedSeconds ? unsatisfiedTorrents.length : null
 
-    // H&R risk: unsatisfied AND not seeding AND not downloading — actually at risk
     const hnrRiskCount = requiredSeedSeconds
       ? unsatisfiedTorrents.filter(
           (t) => !SEEDING_STATES.has(t.state) && !LEECHING_STATES.has(t.state)
         ).length
       : null
 
-    // Dead torrents: client has more torrents than tracker reports seeding
     const deadCount =
       trackerSeedingCount != null ? Math.max(0, seedingTorrents.length - trackerSeedingCount) : null
 
-    // --- Category stats ---
-    const categoryMap = new Map<string, TorrentInfo[]>()
+    const categoryMap = new Map<string, TorrentRaw[]>()
     for (const t of torrents) {
       const cat = t.category || "Uncategorized"
       const arr = categoryMap.get(cat) ?? []
@@ -317,41 +263,39 @@ function useTrackerTorrents({
         totalSize: items.reduce((s, t) => s + t.size, 0),
         avgRatio: items.reduce((s, t) => s + t.ratio, 0) / items.length,
         avgSeedTime: items.reduce((s, t) => s + t.seedingTime, 0) / items.length,
-        avgSwarmSeeds: items.reduce((s, t) => s + t.numComplete, 0) / items.length,
+        avgSwarmSeeds: items.reduce((s, t) => s + t.swarmSeeders, 0) / items.length,
       }))
       .sort((a, b) => b.count - a.count)
 
-    // Top 10 by seed time
     const topBySeeding = [...seedingTorrents]
       .sort((a, b) => b.seedingTime - a.seedingTime)
       .slice(0, 10)
 
-    // Elder torrents — oldest by addedOn
     const elderTorrents = [...torrents]
-      .filter((t) => t.addedOn > 0)
-      .sort((a, b) => a.addedOn - b.addedOn)
+      .filter((t) => t.addedAt > 0)
+      .sort((a, b) => a.addedAt - b.addedAt)
       .slice(0, 10)
 
-    // Unsatisfied torrents — sorted by closest to meeting requirement
     const unsatisfiedSorted = requiredSeedSeconds
       ? [...unsatisfiedTorrents].sort((a, b) => b.seedingTime - a.seedingTime)
       : []
 
-    // --- Tag group breakdowns ---
+    const torrentTagSets = torrents.map((t) => new Set(parseTorrentTags(t.tags, false)))
+
     const tagGroupBreakdowns: TagGroupBreakdown[] = (tagGroups ?? [])
       .map((group) => {
-        const allGroupTags = group.members.map((m) => m.tag)
+        const allGroupTagSet = new Set(group.members.map((m) => m.tag))
         const memberCounts = group.members
           .map((member) => {
-            const count = torrents.filter((t) =>
-              parseTorrentTags(t.tags, false).includes(member.tag)
-            ).length
+            const count = torrentTagSets.filter((tags) => tags.has(member.tag)).length
             return { label: member.label, count, color: member.color }
           })
           .filter((m) => m.count > 0)
-        const unmatchedCount = torrents.filter((t) => {
-          const tags = parseTorrentTags(t.tags, false)
-          return !tags.some((tag) => allGroupTags.includes(tag))
+        const unmatchedCount = torrentTagSets.filter((tags) => {
+          for (const tag of tags) {
+            if (allGroupTagSet.has(tag)) return false
+          }
+          return true
         }).length
         return { group, memberCounts, unmatchedCount }
       })
@@ -361,9 +305,7 @@ function useTrackerTorrents({
       ? Object.entries(qbitmanageConfig.tags)
           .filter(([, entry]) => entry.enabled)
           .map(([key, entry]) => {
-            const count = torrents.filter((t) =>
-              parseTorrentTags(t.tags, false).includes(entry.tag)
-            ).length
+            const count = torrentTagSets.filter((tags) => tags.has(entry.tag)).length
             const labelMap: Record<string, string> = {
               issue: "Issue",
               minTimeNotReached: "Min Time Not Reached",
diff --git a/src/hooks/useUpdateCheck.ts b/src/hooks/useUpdateCheck.ts
index f87d5f2c..951be6cb 100644
--- a/src/hooks/useUpdateCheck.ts
+++ b/src/hooks/useUpdateCheck.ts
@@ -1,8 +1,5 @@
 // src/hooks/useUpdateCheck.ts
-//
-// Functions: useUpdateCheck, compareVersions
-
-import { useEffect, useRef, useState } from "react"
+import { useQuery } from "@tanstack/react-query"
 
 const GITHUB_REPO = "jordanlambrecht/tracker-tracker"
 
@@ -12,9 +9,7 @@ interface UpdateCheckResult {
   loading: boolean
 }
 
-/**
- * Compares two semver strings. Returns > 0 if latest is newer, 0 if equal, < 0 if current is newer.
- */
+// Compares two semver strings
 export function compareVersions(current: string, latest: string): number {
   // Strip v prefix and pre-release/build metadata (i.e, "1.3.0-beta.1+build" → "1.3.0")
   const clean = (s: string) => s.replace(/^v/, "").split(/[-+]/)[0]
@@ -28,55 +23,46 @@ export function compareVersions(current: string, latest: string): number {
   return 0
 }
 
-/**
- * Checks GitHub for a newer version. Runs once per session (cached via ref).
- * Tries Releases API first, falls back to Tags API.
- */
-export function useUpdateCheck(): UpdateCheckResult {
-  const [latestVersion, setLatestVersion] = useState<string | null>(null)
-  const [loading, setLoading] = useState(true)
-  const checkedRef = useRef(false)
-
-  useEffect(() => {
-    if (checkedRef.current) return
-    checkedRef.current = true
+async function fetchLatestVersion(): Promise<string | null> {
+  try {
+    // Try GitHub Releases API first
+    const res = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`, {
+      headers: { Accept: "application/vnd.github.v3+json" },
+    })
 
-    async function check() {
-      try {
-        // Try GitHub Releases API first (has explicit "latest" concept)
-        const res = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`, {
-          headers: { Accept: "application/vnd.github.v3+json" },
-        })
-
-        if (res.ok) {
-          const data = await res.json()
-          const tag = (data.tag_name as string)?.replace(/^v/, "")
-          if (tag) {
-            setLatestVersion(tag)
-            return
-          }
-        }
+    if (res.ok) {
+      const data = await res.json()
+      const tag = (data.tag_name as string)?.replace(/^v/, "")
+      if (tag) return tag
+    }
 
-        // Fall back to Tags API (created by `pnpm version` + `git push --tags`)
-        const tagRes = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/tags?per_page=1`, {
-          headers: { Accept: "application/vnd.github.v3+json" },
-        })
+    // Fall back to Tags API
+    const tagRes = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/tags?per_page=1`, {
+      headers: { Accept: "application/vnd.github.v3+json" },
+    })
 
-        if (tagRes.ok) {
-          const tags = (await tagRes.json()) as { name: string }[]
-          if (tags.length > 0) {
-            setLatestVersion(tags[0].name.replace(/^v/, ""))
-          }
-        }
-      } catch {
-        // Network error (offline, blocked, private repo) — silently skip
-      } finally {
-        setLoading(false)
-      }
+    if (tagRes.ok) {
+      const tags = (await tagRes.json()) as { name: string }[]
+      if (tags.length > 0) return tags[0].name.replace(/^v/, "")
     }
+  } catch {
+    // Network error
+  }
+  return null
+}
 
-    check()
-  }, [])
+/**
+ * Checks GitHub for a newer version. Uses TanStack Query with staleTime: Infinity
+ * so the check runs at most once per session, even when called from multiple components.
+ */
+export function useUpdateCheck(): UpdateCheckResult {
+  const { data: latestVersion = null, isLoading: loading } = useQuery({
+    queryKey: ["update-check"],
+    queryFn: fetchLatestVersion,
+    staleTime: Number.POSITIVE_INFINITY,
+    gcTime: Number.POSITIVE_INFINITY,
+    retry: false,
+  })
 
   const currentVersion = process.env.NEXT_PUBLIC_APP_VERSION ?? "0.0.0"
   const updateAvailable =
diff --git a/src/lib/__tests__/api-helpers.test.ts b/src/lib/__tests__/api-helpers.test.ts
new file mode 100644
index 00000000..9ec5b98d
--- /dev/null
+++ b/src/lib/__tests__/api-helpers.test.ts
@@ -0,0 +1,111 @@
+// src/lib/__tests__/api-helpers.test.ts
+
+import { describe, expect, it } from "vitest"
+import { validateIntRange, validateMaxLength } from "@/lib/api-helpers"
+
+// ---------------------------------------------------------------------------
+// validateIntRange
+// ---------------------------------------------------------------------------
+
+describe("validateIntRange", () => {
+  describe("valid inputs (returns null)", () => {
+    it("should return null for a value within range", () => {
+      const result = validateIntRange(5, 1, 10, "Field")
+      expect(result).toBeNull()
+    })
+
+    it("should return null for value at minimum boundary", () => {
+      const result = validateIntRange(1, 1, 10, "Field")
+      expect(result).toBeNull()
+    })
+
+    it("should return null for value at maximum boundary", () => {
+      const result = validateIntRange(10, 1, 10, "Field")
+      expect(result).toBeNull()
+    })
+  })
+
+  describe("invalid inputs (returns NextResponse)", () => {
+    it("should return error response for value below minimum", async () => {
+      const result = validateIntRange(0, 1, 10, "Field")
+      expect(result).not.toBeNull()
+      if (!result) return
+      expect(result.status).toBe(400)
+      const data = await result.json()
+      expect(data.error).toContain("between 1 and 10")
+    })
+
+    it("should return error response for value above maximum", async () => {
+      const result = validateIntRange(11, 1, 10, "Field")
+      expect(result).not.toBeNull()
+      if (!result) return
+      expect(result.status).toBe(400)
+      const data = await result.json()
+      expect(data.error).toContain("between 1 and 10")
+    })
+
+    it("should return error response for a float (non-integer)", async () => {
+      const result = validateIntRange(1.5, 1, 10, "Field")
+      expect(result).not.toBeNull()
+      if (!result) return
+      expect(result.status).toBe(400)
+    })
+
+    it("should return error response for NaN", async () => {
+      const result = validateIntRange(NaN, 1, 10, "Field")
+      expect(result).not.toBeNull()
+      if (!result) return
+      expect(result.status).toBe(400)
+    })
+
+    it("should include the label in the error message", async () => {
+      const result = validateIntRange(0, 1, 10, "PollInterval")
+      expect(result).not.toBeNull()
+      if (!result) return
+      const data = await result.json()
+      expect(data.error).toContain("PollInterval")
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// validateMaxLength
+// ---------------------------------------------------------------------------
+
+describe("validateMaxLength", () => {
+  describe("valid inputs (returns null)", () => {
+    it("should return null for a string under the limit", () => {
+      const result = validateMaxLength("hello", 10, "Name")
+      expect(result).toBeNull()
+    })
+
+    it("should return null for a string exactly at the limit", () => {
+      const result = validateMaxLength("1234567890", 10, "Name")
+      expect(result).toBeNull()
+    })
+
+    it("should return null for an empty string", () => {
+      const result = validateMaxLength("", 10, "Name")
+      expect(result).toBeNull()
+    })
+  })
+
+  describe("invalid inputs (returns NextResponse)", () => {
+    it("should return error response for a string exceeding the limit", async () => {
+      const result = validateMaxLength("12345678901", 10, "Name")
+      expect(result).not.toBeNull()
+      if (!result) return
+      expect(result.status).toBe(400)
+      const data = await result.json()
+      expect(data.error).toContain("10 characters or fewer")
+    })
+
+    it("should include the label in the error message", async () => {
+      const result = validateMaxLength("this string is way too long", 10, "TrackerName")
+      expect(result).not.toBeNull()
+      if (!result) return
+      const data = await result.json()
+      expect(data.error).toContain("TrackerName")
+    })
+  })
+})
diff --git a/src/lib/__tests__/auth-jwe.test.ts b/src/lib/__tests__/auth-jwe.test.ts
index 690428ab..e42e6eb2 100644
--- a/src/lib/__tests__/auth-jwe.test.ts
+++ b/src/lib/__tests__/auth-jwe.test.ts
@@ -163,6 +163,28 @@ describe("auth JWE real crypto", () => {
     expect(result).toBeNull()
   })
 
+  it("should reject a pending token as a session (getSession ignores purpose tokens)", async () => {
+    const { createPendingToken, getSession } = await loadAuth()
+
+    const pendingToken = await createPendingToken(SAMPLE_KEY)
+
+    // Simulate an attacker manually setting the pending token as the session cookie
+    cookieState.set("tt_session", { value: pendingToken })
+
+    const session = await getSession()
+    expect(session).toBeNull()
+  })
+
+  it("should reject a setup token as a session (getSession ignores purpose tokens)", async () => {
+    const { createSetupToken, getSession } = await loadAuth()
+
+    const setupToken = await createSetupToken("JBSWY3DPEHPK3PXP", "[]")
+    cookieState.set("tt_session", { value: setupToken })
+
+    const session = await getSession()
+    expect(session).toBeNull()
+  })
+
   // ---- 5. Setup token round-trip -----------------------------------------
 
   it("should round-trip a setup token preserving totpSecret and backupCodesJson", async () => {
@@ -227,3 +249,38 @@ describe("auth JWE real crypto", () => {
     expect(token1).not.toBe(token2)
   })
 })
+
+// ---------------------------------------------------------------------------
+// getSessionKey config error propagation
+// ---------------------------------------------------------------------------
+
+describe("getSession config error propagation", () => {
+  it("should throw (not return null) when SESSION_SECRET is unset", async () => {
+    // Create a valid token with a good secret first
+    vi.stubEnv("SESSION_SECRET", TEST_SECRET_A)
+    const { createSession: createWithGoodKey } = await loadAuth()
+    const token = await createWithGoodKey(SAMPLE_KEY, 10)
+
+    // Now unset the secret and try to read the session
+    vi.stubEnv("SESSION_SECRET", "")
+    cookieState.set("tt_session", { value: token })
+    const { getSession } = await loadAuth()
+
+    // getSession must throw (config error), not return null (expired/invalid token)
+    await expect(getSession()).rejects.toThrow("SESSION_SECRET")
+  })
+
+  it("should throw (not return null) when SESSION_SECRET is too short", async () => {
+    // Create a valid token with a good secret
+    vi.stubEnv("SESSION_SECRET", TEST_SECRET_A)
+    const { createSession } = await loadAuth()
+    const token = await createSession(SAMPLE_KEY, 10)
+
+    // Now set a short secret
+    vi.stubEnv("SESSION_SECRET", "tooshort")
+    cookieState.set("tt_session", { value: token })
+    const { getSession } = await loadAuth()
+
+    await expect(getSession()).rejects.toThrow("at least 32 characters")
+  })
+})
diff --git a/src/lib/__tests__/backup.test.ts b/src/lib/__tests__/backup.test.ts
index b8579e49..f4399b1c 100644
--- a/src/lib/__tests__/backup.test.ts
+++ b/src/lib/__tests__/backup.test.ts
@@ -1,6 +1,6 @@
 // src/lib/__tests__/backup.test.ts
 
-import { describe, expect, it, vi } from "vitest"
+import { beforeEach, describe, expect, it, vi } from "vitest"
 
 // ---------------------------------------------------------------------------
 // Mocks — must appear before any real module imports
@@ -24,6 +24,9 @@ vi.mock("@/lib/db/schema", () => ({
   tagGroups: {},
   tagGroupMembers: {},
   clientSnapshots: {},
+  clientUptimeBuckets: {},
+  dismissedAlerts: {},
+  notificationTargets: {},
   backupHistory: {},
 }))
 
@@ -31,8 +34,10 @@ import {
   CURRENT_BACKUP_VERSION,
   decryptBackupPayload,
   encryptBackupPayload,
+  generateBackupPayload,
   validateBackupJson,
 } from "@/lib/backup"
+import { db } from "@/lib/db"
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -179,6 +184,30 @@ describe("validateBackupJson", () => {
     expect(() => validateBackupJson(p)).toThrow("trackers[0].baseUrl")
   })
 
+  it("rejects tracker with non-http/https protocol", () => {
+    const p = validPayload()
+    ;(p.trackers[0] as Record<string, unknown>).baseUrl = "ftp://example.com"
+    expect(() => validateBackupJson(p)).toThrow("must use http or https")
+  })
+
+  it("rejects tracker baseUrl targeting localhost", () => {
+    const p = validPayload()
+    ;(p.trackers[0] as Record<string, unknown>).baseUrl = "http://localhost/api"
+    expect(() => validateBackupJson(p)).toThrow("must not target localhost")
+  })
+
+  it("rejects tracker baseUrl targeting private IP", () => {
+    const p = validPayload()
+    ;(p.trackers[0] as Record<string, unknown>).baseUrl = "http://192.168.1.1/api"
+    expect(() => validateBackupJson(p)).toThrow("must not target localhost")
+  })
+
+  it("rejects tracker baseUrl targeting cloud metadata endpoint", () => {
+    const p = validPayload()
+    ;(p.trackers[0] as Record<string, unknown>).baseUrl = "http://169.254.169.254/latest"
+    expect(() => validateBackupJson(p)).toThrow("must not target localhost")
+  })
+
   it("accepts tracker with empty API token (post-restore backups)", () => {
     const p = validPayload()
     ;(p.trackers[0] as Record<string, unknown>).encryptedApiToken = ""
@@ -291,24 +320,6 @@ describe("Backup encryption", () => {
 // ---------------------------------------------------------------------------
 
 describe("Backup security invariants", () => {
-  it("passwordHash must not appear in a valid backup payload", () => {
-    const p = validPayload()
-    expect(p.settings).not.toHaveProperty("passwordHash")
-    expect(p.settings).not.toHaveProperty("password_hash")
-  })
-
-  it("failedLoginAttempts must not appear in a valid backup payload", () => {
-    const p = validPayload()
-    expect(p.settings).not.toHaveProperty("failedLoginAttempts")
-    expect(p.settings).not.toHaveProperty("failed_login_attempts")
-  })
-
-  it("encryptedSchedulerKey must not appear in a valid backup payload", () => {
-    const p = validPayload()
-    expect(p.settings).not.toHaveProperty("encryptedSchedulerKey")
-    expect(p.settings).not.toHaveProperty("encrypted_scheduler_key")
-  })
-
   it("encryptionSalt must be present in settings", () => {
     const p = validPayload()
     expect(p.settings.encryptionSalt).toBeDefined()
@@ -328,4 +339,123 @@ describe("Backup security invariants", () => {
     expect(tracker).not.toHaveProperty("pausedAt")
     expect(tracker).not.toHaveProperty("paused_at")
   })
+
+  it("lastErrorAt is excluded from tracker backup payload (transient runtime state)", () => {
+    const p = validPayload()
+    const tracker = p.trackers[0]
+    expect(tracker).not.toHaveProperty("lastErrorAt")
+    expect(tracker).not.toHaveProperty("last_error_at")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// generateBackupPayload — sensitive field exclusion
+//
+// These tests call the real generateBackupPayload() with a mocked DB that
+// returns a realistic appSettings row including the three sensitive fields
+// that must NEVER appear in a backup:
+//   - passwordHash     (Argon2 credential, must never leave the server)
+//   - failedLoginAttempts  (transient security state)
+//   - encryptedSchedulerKey  (internal key, not user-restorable)
+//
+// If someone accidentally removes a field from the destructuring exclusion list
+// in backup.ts, these tests will catch the regression.
+// ---------------------------------------------------------------------------
+
+describe("generateBackupPayload sensitive field exclusion", () => {
+  // A realistic appSettings DB row that includes every sensitive field.
+  const sensitiveSettingsRow = {
+    id: 1,
+    passwordHash: "$argon2id$v=19$m=65536,t=3,p=4$SUPERSECRETPASSWORDHASH",
+    encryptionSalt: "a".repeat(64),
+    failedLoginAttempts: 3,
+    encryptedSchedulerKey: "base64-encrypted-scheduler-key-value",
+    createdAt: new Date("2026-01-01T00:00:00.000Z"),
+    // Safe fields that should survive into the backup
+    storeUsernames: true,
+    backupScheduleEnabled: false,
+    backupScheduleFrequency: "daily",
+    backupRetentionCount: 14,
+    backupEncryptionEnabled: false,
+    proxyEnabled: false,
+    proxyType: "socks5",
+    qbitmanageEnabled: false,
+  }
+
+  // Build a chainable mock that returns the sensitive row for the settings query
+  // and empty arrays for all other table queries.
+  function makeSelectMock() {
+    const emptyChain = {
+      from: vi.fn().mockReturnThis(),
+      limit: vi.fn().mockResolvedValue([]),
+      orderBy: vi.fn().mockResolvedValue([]),
+      where: vi.fn().mockReturnThis(),
+    }
+
+    const settingsChain = {
+      from: vi.fn().mockReturnThis(),
+      limit: vi.fn().mockResolvedValue([sensitiveSettingsRow]),
+      orderBy: vi.fn().mockResolvedValue([]),
+      where: vi.fn().mockReturnThis(),
+    }
+
+    // db.select() is called multiple times. The first call is for appSettings
+    // (uses .limit(1)), subsequent calls are for other tables (use .orderBy()).
+    // We track call count to distinguish the settings query from the rest.
+    let callCount = 0
+    return vi.fn().mockImplementation(() => {
+      callCount += 1
+      return callCount === 1 ? settingsChain : emptyChain
+    })
+  }
+
+  beforeEach(() => {
+    vi.mocked(db.select).mockImplementation(makeSelectMock())
+  })
+
+  it("does NOT include passwordHash in backup settings output", async () => {
+    const payload = await generateBackupPayload()
+    expect(payload.settings).not.toHaveProperty("passwordHash")
+    expect(JSON.stringify(payload.settings)).not.toContain("SUPERSECRETPASSWORDHASH")
+  })
+
+  it("does NOT include failedLoginAttempts in backup settings output", async () => {
+    const payload = await generateBackupPayload()
+    expect(payload.settings).not.toHaveProperty("failedLoginAttempts")
+  })
+
+  it("does NOT include encryptedSchedulerKey in backup settings output", async () => {
+    const payload = await generateBackupPayload()
+    expect(payload.settings).not.toHaveProperty("encryptedSchedulerKey")
+    expect(JSON.stringify(payload.settings)).not.toContain("base64-encrypted-scheduler-key-value")
+  })
+
+  it("does NOT include id or createdAt in backup settings output", async () => {
+    const payload = await generateBackupPayload()
+    // id and createdAt are also stripped — verify defensively
+    expect(payload.settings).not.toHaveProperty("id")
+    expect(payload.settings).not.toHaveProperty("createdAt")
+  })
+
+  it("DOES include encryptionSalt in backup settings output (needed for restore)", async () => {
+    const payload = await generateBackupPayload()
+    expect(payload.settings).toHaveProperty("encryptionSalt", "a".repeat(64))
+  })
+
+  it("DOES include safe settings fields in backup output", async () => {
+    const payload = await generateBackupPayload()
+    expect(payload.settings).toHaveProperty("storeUsernames", true)
+    expect(payload.settings).toHaveProperty("backupScheduleEnabled", false)
+    expect(payload.settings).toHaveProperty("proxyEnabled", false)
+    expect(payload.settings).toHaveProperty("qbitmanageEnabled", false)
+  })
+
+  it("backup settings output contains no recognizable sensitive string values", async () => {
+    const payload = await generateBackupPayload()
+    const serialized = JSON.stringify(payload.settings)
+    // Raw password hash must not leak in any form
+    expect(serialized).not.toContain("argon2id")
+    // Scheduler key must not leak in any form
+    expect(serialized).not.toContain("base64-encrypted-scheduler-key-value")
+  })
 })
diff --git a/src/lib/__tests__/circuit-breaker.test.ts b/src/lib/__tests__/circuit-breaker.test.ts
index 69148449..b8102b4a 100644
--- a/src/lib/__tests__/circuit-breaker.test.ts
+++ b/src/lib/__tests__/circuit-breaker.test.ts
@@ -5,8 +5,8 @@
 // Functions covered:
 //   pollTracker           — success resets state; failures increment atomically via SQL expression; threshold triggers pause
 //   pollAllTrackers       — skips trackers with pausedAt set; polls overdue non-paused trackers
-//   POST /api/trackers/[id]/resume — clears pausedAt; preserves consecutiveFailures; 400 when not paused; 404 when not found
-//   re-pause after resume — single failure immediately re-pauses when consecutiveFailures >= threshold
+//   POST /api/trackers/[id]/resume — clears pausedAt + lastError + lastErrorAt; resets consecutiveFailures to 0; idempotent 200 when not paused; 404 when not found
+//   post-resume behavior — clean slate after resume; full threshold required to re-pause
 
 import { SQL } from "drizzle-orm"
 import { NextResponse } from "next/server"
@@ -40,7 +40,7 @@ vi.mock("@/lib/privacy", () => ({
   maskUsername: vi.fn((v: string) => `▓${v.length}`),
 }))
 
-vi.mock("@/lib/proxy", () => ({
+vi.mock("@/lib/tunnel", () => ({
   buildProxyAgentFromSettings: vi.fn().mockReturnValue(undefined),
   VALID_PROXY_TYPES: new Set(["socks5", "http", "https"]),
 }))
@@ -67,7 +67,7 @@ vi.mock("@/lib/backup-scheduler", () => ({
   stopBackupScheduler: vi.fn(),
 }))
 
-vi.mock("@/lib/client-scheduler", () => ({
+vi.mock("@/lib/download-client-scheduler", () => ({
   startClientScheduler: vi.fn(),
   stopClientScheduler: vi.fn(),
   ensureClientSchedulerRunning: vi.fn(),
@@ -105,7 +105,7 @@ import { getAdapter } from "@/lib/adapters"
 import { authenticate, parseTrackerId } from "@/lib/api-helpers"
 import { decrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
-import { POLL_FAILURE_THRESHOLD, pollAllTrackers, pollTracker } from "@/lib/scheduler"
+import { POLL_FAILURE_THRESHOLD, pollAllTrackers, pollTracker } from "@/lib/tracker-scheduler"
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -161,6 +161,7 @@ function makeTrackerRow(overrides: Record<string, unknown> = {}) {
     isActive: true,
     lastPolledAt: null,
     lastError: null,
+    lastErrorAt: null,
     consecutiveFailures: 0,
     pausedAt: null,
     useProxy: false,
@@ -237,13 +238,14 @@ describe("pollTracker: success path", () => {
 
     await pollTracker(1, MOCK_KEY, false)
 
-    // The final update must set consecutiveFailures: 0 and pausedAt: null
+    // The final update must set consecutiveFailures: 0, pausedAt: null, lastErrorAt: null
     const setCalls = updateChain.set.mock.calls
     const successReset = setCalls.find(
       (call: unknown[]) =>
         (call[0] as Record<string, unknown>).consecutiveFailures === 0 &&
         (call[0] as Record<string, unknown>).pausedAt === null &&
-        (call[0] as Record<string, unknown>).lastError === null
+        (call[0] as Record<string, unknown>).lastError === null &&
+        (call[0] as Record<string, unknown>).lastErrorAt === null
     )
     expect(successReset).toBeDefined()
   })
@@ -265,6 +267,48 @@ describe("pollTracker: success path", () => {
     )
   })
 
+  it("passes isManual: false to the snapshot insert when called without the isManual arg", async () => {
+    // First select: tracker row. Second select: previous snapshot for notifications.
+    let selectCallCount = 0
+    ;(db.select as ReturnType<typeof vi.fn>).mockImplementation(() => {
+      selectCallCount++
+      if (selectCallCount === 1) {
+        return mockSelectOnce([makeTrackerRow()])
+      }
+      return mockSelectOnce([])
+    })
+
+    mockSuccessAdapter()
+    mockUpdateChain()
+    const insertChain = mockInsertChain()
+
+    // Call without the 7th arg — isManual must default to false
+    await pollTracker(1, MOCK_KEY, false)
+
+    // The first insert call is for trackerSnapshots; check its values argument
+    expect(insertChain.values).toHaveBeenCalledWith(expect.objectContaining({ isManual: false }))
+  })
+
+  it("passes isManual: true to the snapshot insert when called with isManual = true", async () => {
+    let selectCallCount = 0
+    ;(db.select as ReturnType<typeof vi.fn>).mockImplementation(() => {
+      selectCallCount++
+      if (selectCallCount === 1) {
+        return mockSelectOnce([makeTrackerRow()])
+      }
+      return mockSelectOnce([])
+    })
+
+    mockSuccessAdapter()
+    mockUpdateChain()
+    const insertChain = mockInsertChain()
+
+    // 7th arg: isManual = true
+    await pollTracker(1, MOCK_KEY, false, undefined, undefined, undefined, true)
+
+    expect(insertChain.values).toHaveBeenCalledWith(expect.objectContaining({ isManual: true }))
+  })
+
   it("does nothing when tracker is inactive", async () => {
     ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue(
       mockSelectOnce([makeTrackerRow({ isActive: false })])
@@ -337,7 +381,10 @@ describe("pollTracker: failure path — consecutiveFailures increment", () => {
 
     // log.warn must NOT fire because returning.pausedAt is null
     const { log } = await import("@/lib/logger")
-    expect(log.warn).not.toHaveBeenCalled()
+    expect(log.warn).not.toHaveBeenCalledWith(
+      expect.objectContaining({}),
+      expect.stringContaining("auto-paused")
+    )
   })
 
   it("sets pausedAt when consecutiveFailures reaches POLL_FAILURE_THRESHOLD", async () => {
@@ -357,7 +404,10 @@ describe("pollTracker: failure path — consecutiveFailures increment", () => {
 
     // log.warn must fire because returning.pausedAt is truthy
     const { log } = await import("@/lib/logger")
-    expect(log.warn).toHaveBeenCalledWith(expect.stringContaining("auto-paused"))
+    expect(log.warn).toHaveBeenCalledWith(
+      expect.objectContaining({ trackerId: 1, consecutiveFailures: POLL_FAILURE_THRESHOLD }),
+      expect.stringContaining("auto-paused")
+    )
   })
 
   it("records lastError message when poll fails", async () => {
@@ -372,6 +422,32 @@ describe("pollTracker: failure path — consecutiveFailures increment", () => {
     const setArg = updateChain.set.mock.calls[0]?.[0] as Record<string, unknown>
     expect(setArg.lastError).toBe("Bad API key")
   })
+
+  it("sets lastErrorAt to a Date instance (not null, not a SQL expression) on failure", async () => {
+    ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue(mockSelectOnce([makeTrackerRow()]))
+    mockFailureAdapter("Timeout")
+
+    const updateChain = mockUpdateChain([{ consecutiveFailures: 1, pausedAt: null }])
+
+    const before = new Date()
+    await pollTracker(1, MOCK_KEY, false)
+    const after = new Date()
+
+    // Find the set call that carries lastError (the failure update)
+    const failureSetCall = updateChain.set.mock.calls.find((call: unknown[]) => {
+      const arg = call[0] as Record<string, unknown>
+      return arg.lastError !== undefined
+    })
+    expect(failureSetCall).toBeDefined()
+
+    const setArg = (failureSetCall as unknown[])[0] as Record<string, unknown>
+    // lastErrorAt must be a plain Date, not null and not a Drizzle SQL object
+    expect(setArg.lastErrorAt).toBeInstanceOf(Date)
+    // Sanity-check the timestamp is within the window of the test execution
+    const recorded = setArg.lastErrorAt as Date
+    expect(recorded.getTime()).toBeGreaterThanOrEqual(before.getTime())
+    expect(recorded.getTime()).toBeLessThanOrEqual(after.getTime())
+  })
 })
 
 // ---------------------------------------------------------------------------
@@ -508,11 +584,17 @@ describe("POST /api/trackers/[id]/resume", () => {
   })
 
   it("returns 200 and clears pausedAt when tracker is paused", async () => {
-    // Select returns a paused tracker
+    // Select returns a paused tracker with full circuit breaker state
     const selectChain = {
       from: vi.fn().mockReturnValue({
         where: vi.fn().mockReturnValue({
-          limit: vi.fn().mockResolvedValue([{ pausedAt: new Date("2026-03-15") }]),
+          limit: vi.fn().mockResolvedValue([
+            {
+              pausedAt: new Date("2026-03-15"),
+              consecutiveFailures: 4,
+              lastError: "API returned 429",
+            },
+          ]),
         }),
       }),
     }
@@ -534,11 +616,17 @@ describe("POST /api/trackers/[id]/resume", () => {
     expect(data.success).toBe(true)
   })
 
-  it("sets pausedAt: null and lastError: null but NOT consecutiveFailures in the update", async () => {
+  it("resets pausedAt, lastError, lastErrorAt, AND consecutiveFailures in the update", async () => {
     const selectChain = {
       from: vi.fn().mockReturnValue({
         where: vi.fn().mockReturnValue({
-          limit: vi.fn().mockResolvedValue([{ pausedAt: new Date("2026-03-15") }]),
+          limit: vi.fn().mockResolvedValue([
+            {
+              pausedAt: new Date("2026-03-15"),
+              consecutiveFailures: 4,
+              lastError: "API returned 429",
+            },
+          ]),
         }),
       }),
     }
@@ -554,19 +642,20 @@ describe("POST /api/trackers/[id]/resume", () => {
 
     const setArg = mockSet.mock.calls[0]?.[0] as Record<string, unknown>
     expect(setArg).toBeDefined()
-    // pausedAt must be cleared
     expect(setArg.pausedAt).toBeNull()
-    // lastError must also be cleared on resume
     expect(setArg.lastError).toBeNull()
-    // consecutiveFailures must NOT be touched — circuit breaker state is preserved
-    expect(setArg).not.toHaveProperty("consecutiveFailures")
+    expect(setArg.lastErrorAt).toBeNull()
+    // consecutiveFailures must be reset to 0 so the next failure does not immediately re-pause
+    expect(setArg.consecutiveFailures).toBe(0)
   })
 
-  it("returns 400 when tracker is not paused", async () => {
+  it("returns 200 idempotently when tracker is already unpaused", async () => {
     const selectChain = {
       from: vi.fn().mockReturnValue({
         where: vi.fn().mockReturnValue({
-          limit: vi.fn().mockResolvedValue([{ pausedAt: null }]),
+          limit: vi
+            .fn()
+            .mockResolvedValue([{ pausedAt: null, consecutiveFailures: 0, lastError: null }]),
         }),
       }),
     }
@@ -577,8 +666,11 @@ describe("POST /api/trackers/[id]/resume", () => {
     const response = await ResumePost(request, { params })
     const data = await response.json()
 
-    expect(response.status).toBe(400)
-    expect(data.error).toMatch(/not paused/i)
+    expect(response.status).toBe(200)
+    expect(data.success).toBe(true)
+    expect(data.alreadyResumed).toBe(true)
+    // No update should have been issued
+    expect(db.update).not.toHaveBeenCalled()
   })
 
   it("returns 404 when tracker does not exist", async () => {
@@ -628,7 +720,13 @@ describe("POST /api/trackers/[id]/resume", () => {
     const selectChain = {
       from: vi.fn().mockReturnValue({
         where: vi.fn().mockReturnValue({
-          limit: vi.fn().mockResolvedValue([{ pausedAt: new Date("2026-03-15") }]),
+          limit: vi.fn().mockResolvedValue([
+            {
+              pausedAt: new Date("2026-03-15"),
+              consecutiveFailures: 4,
+              lastError: "API returned 429",
+            },
+          ]),
         }),
       }),
     }
@@ -648,52 +746,52 @@ describe("POST /api/trackers/[id]/resume", () => {
 })
 
 // ---------------------------------------------------------------------------
-// Re-pause after resume: single failure immediately re-pauses
+// Post-resume behavior: resume resets consecutiveFailures to 0
 //
-// This is the critical edge case: resume clears pausedAt but does NOT reset
-// consecutiveFailures. If consecutiveFailures is still >= threshold, the very
-// next poll failure immediately re-pauses the tracker.
+// After resume, the tracker gets a clean slate. It takes a full
+// POLL_FAILURE_THRESHOLD consecutive failures to re-pause.
 // ---------------------------------------------------------------------------
 
-describe("re-pause after resume: immediate re-pause when failures remain at threshold", () => {
+describe("post-resume behavior: clean slate after resume", () => {
   beforeEach(() => {
     vi.clearAllMocks()
     ;(decrypt as ReturnType<typeof vi.fn>).mockReturnValue("plain-token")
   })
 
-  it("re-pauses immediately on first failure after resume when consecutiveFailures equals threshold", async () => {
-    // After resume: pausedAt=null, consecutiveFailures=4 (still at threshold)
+  it("does NOT re-pause on first failure after resume (consecutiveFailures starts at 0)", async () => {
+    // After resume: pausedAt=null, consecutiveFailures=0 (reset by resume)
     ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue(
       mockSelectOnce([
         makeTrackerRow({
-          consecutiveFailures: POLL_FAILURE_THRESHOLD,
-          pausedAt: null, // cleared by resume
+          consecutiveFailures: 0,
+          pausedAt: null,
         }),
       ])
     )
 
     mockFailureAdapter("Still broken")
 
-    // Single atomic update: count becomes 5 (>= threshold), CASE sets pausedAt
-    const autoPassedAt = new Date()
-    mockUpdateChain([{ consecutiveFailures: POLL_FAILURE_THRESHOLD + 1, pausedAt: autoPassedAt }])
+    // Failure increments 0+1=1, which is below threshold, so pausedAt stays null
+    mockUpdateChain([{ consecutiveFailures: 1, pausedAt: null }])
 
     await pollTracker(1, MOCK_KEY, false)
 
-    // Only ONE db.update call — the CASE expression handles re-pause atomically
     expect(db.update).toHaveBeenCalledTimes(1)
 
-    // log.warn must fire because returning.pausedAt is truthy
+    // log.warn should NOT fire (no auto-pause, just a failure increment)
     const { log } = await import("@/lib/logger")
-    expect(log.warn).toHaveBeenCalledWith(expect.stringContaining("auto-paused"))
+    expect(log.warn).not.toHaveBeenCalledWith(
+      expect.objectContaining({}),
+      expect.stringContaining("auto-paused")
+    )
   })
 
   it("does NOT re-pause after resume if the next poll succeeds", async () => {
-    // After resume: pausedAt=null, consecutiveFailures=4 still set
+    // After resume: pausedAt=null, consecutiveFailures=0
     ;(db.select as ReturnType<typeof vi.fn>).mockReturnValue(
       mockSelectOnce([
         makeTrackerRow({
-          consecutiveFailures: POLL_FAILURE_THRESHOLD,
+          consecutiveFailures: 0,
           pausedAt: null,
         }),
       ])
@@ -701,7 +799,6 @@ describe("re-pause after resume: immediate re-pause when failures remain at thre
 
     mockSuccessAdapter()
 
-    // On success, the update must reset both consecutiveFailures: 0 and pausedAt: null
     const updateChain = mockUpdateChain()
     mockInsertChain()
 
@@ -727,7 +824,7 @@ describe("pruneOldSnapshots: excludes snapshots for user-paused trackers", () =>
   })
 
   it("passes an AND clause that excludes user-paused tracker IDs from deletion", async () => {
-    const { pruneOldSnapshots } = await import("@/lib/scheduler")
+    const { pruneOldSnapshots } = await import("@/lib/tracker-scheduler")
 
     // db.select() subquery chain (used inside notInArray)
     const subqueryWhere = vi.fn().mockReturnValue([])
@@ -760,7 +857,7 @@ describe("pruneOldSnapshots: excludes snapshots for user-paused trackers", () =>
   })
 
   it("returns count of deleted snapshots", async () => {
-    const { pruneOldSnapshots } = await import("@/lib/scheduler")
+    const { pruneOldSnapshots } = await import("@/lib/tracker-scheduler")
 
     const mockReturning = vi.fn().mockResolvedValue([{ id: 1 }, { id: 2 }, { id: 3 }])
     const mockWhere = vi.fn().mockReturnValue({ returning: mockReturning })
@@ -775,7 +872,7 @@ describe("pruneOldSnapshots: excludes snapshots for user-paused trackers", () =>
   })
 
   it("returns 0 when no snapshots fall outside retention window", async () => {
-    const { pruneOldSnapshots } = await import("@/lib/scheduler")
+    const { pruneOldSnapshots } = await import("@/lib/tracker-scheduler")
 
     const mockReturning = vi.fn().mockResolvedValue([])
     const mockWhere = vi.fn().mockReturnValue({ returning: mockReturning })
diff --git a/src/lib/__tests__/client-decrypt.test.ts b/src/lib/__tests__/client-decrypt.test.ts
index 3b0c6928..2a5ffe52 100644
--- a/src/lib/__tests__/client-decrypt.test.ts
+++ b/src/lib/__tests__/client-decrypt.test.ts
@@ -9,7 +9,7 @@ vi.mock("@/lib/crypto", () => ({
 import { decrypt } from "@/lib/crypto"
 import { isDecryptionError } from "@/lib/error-utils"
 
-const { decryptClientCredentials } = await import("@/lib/client-decrypt")
+const { decryptClientCredentials } = await import("@/lib/download-clients/credentials")
 
 describe("decryptClientCredentials", () => {
   it("returns decrypted username and password", () => {
diff --git a/src/lib/__tests__/client-scheduler-projections.test.ts b/src/lib/__tests__/client-scheduler-projections.test.ts
index 9868ecf9..cfcef71b 100644
--- a/src/lib/__tests__/client-scheduler-projections.test.ts
+++ b/src/lib/__tests__/client-scheduler-projections.test.ts
@@ -22,7 +22,7 @@ vi.mock("node-cron", () => ({
   },
 }))
 
-vi.mock("@/lib/qbt", () => ({
+vi.mock("@/lib/download-clients", () => ({
   aggregateByTag: vi.fn(),
   clearAllSessions: vi.fn(),
   clearSpeedCache: vi.fn(),
@@ -30,6 +30,7 @@ vi.mock("@/lib/qbt", () => ({
   getTransferInfo: vi.fn(),
   parseCrossSeedTags: vi.fn(() => []),
   pushSpeedSnapshot: vi.fn(),
+  slimTorrentForCache: vi.fn((t: unknown) => t),
   stripSensitiveTorrentFields: vi.fn((t: unknown) => t),
   withSessionRetry: vi.fn(),
 }))
@@ -40,7 +41,7 @@ vi.mock("@/lib/uptime", () => ({
   recordHeartbeat: vi.fn(),
 }))
 
-import { DEEP_POLL_COLUMNS, HEARTBEAT_COLUMNS } from "@/lib/client-scheduler"
+import { DEEP_POLL_COLUMNS, HEARTBEAT_COLUMNS } from "@/lib/download-client-scheduler"
 
 type HeartbeatRequiredFields = {
   id: number
diff --git a/src/lib/__tests__/core-stat-alerts.test.ts b/src/lib/__tests__/core-stat-alerts.test.ts
index fe67414f..0e0c2337 100644
--- a/src/lib/__tests__/core-stat-alerts.test.ts
+++ b/src/lib/__tests__/core-stat-alerts.test.ts
@@ -37,6 +37,7 @@ const baseSnapshot: Snapshot = {
   shareScore: null,
   username: "test",
   group: "User",
+  isManual: false,
 }
 
 describe("buildCoreStatDescriptors alerts", () => {
diff --git a/src/lib/__tests__/dashboard.test.ts b/src/lib/__tests__/dashboard.test.ts
index 61eb7ce9..b9012139 100644
--- a/src/lib/__tests__/dashboard.test.ts
+++ b/src/lib/__tests__/dashboard.test.ts
@@ -19,7 +19,6 @@ import {
   fetchDismissedKeys,
   postDismissAlert,
 } from "@/lib/dashboard"
-import { checkAnniversaryMilestone } from "@/lib/tracker-events"
 import { getTrackerHealth } from "@/lib/tracker-status"
 
 const mockFindRegistryEntry = vi.mocked(findRegistryEntry)
@@ -37,6 +36,7 @@ function makeTracker(overrides: Partial<TrackerSummary> = {}): TrackerSummary {
     isActive: true,
     lastPolledAt: new Date().toISOString(),
     lastError: null,
+    lastErrorAt: null,
     consecutiveFailures: 0,
     pausedAt: null,
     userPausedAt: null,
@@ -110,6 +110,7 @@ const makeSnapshot = (overrides: Partial<Snapshot> = {}): Snapshot => ({
   shareScore: null,
   username: "testuser",
   group: "User",
+  isManual: false,
   ...overrides,
 })
 
@@ -424,6 +425,17 @@ describe("computeAlerts", () => {
     const alerts = computeAlerts([tracker])
     const errorAlert = alerts.find((a) => a.type === "error")
     expect(errorAlert?.key).toContain("Timeout")
+
+    // Behavior assertion: two different error messages on the same tracker must
+    // produce different keys so a dismissed alert re-appears when the error changes.
+    const trackerWithDifferentError = makeTracker({
+      id: 1,
+      name: "Aither",
+      lastError: "Connection refused",
+    })
+    const alerts2 = computeAlerts([trackerWithDifferentError])
+    const errorAlert2 = alerts2.find((a) => a.type === "error")
+    expect(errorAlert2?.key).not.toBe(errorAlert?.key)
   })
 
   it("generates a ratio-danger alert when ratio is below minimumRatio", () => {
@@ -809,9 +821,9 @@ describe("fetchDismissedKeys / postDismissAlert / deleteAllDismissed", () => {
     )
   })
 
-  it("postDismissAlert silently swallows fetch errors (best-effort)", async () => {
+  it("postDismissAlert returns false on fetch error (best-effort)", async () => {
     vi.stubGlobal("fetch", vi.fn().mockRejectedValue(new Error("network error")))
-    await expect(postDismissAlert("some-key", "error")).resolves.toBeUndefined()
+    await expect(postDismissAlert("some-key", "error")).resolves.toBe(false)
   })
 
   it("deleteAllDismissed sends DELETE request", async () => {
@@ -824,9 +836,9 @@ describe("fetchDismissedKeys / postDismissAlert / deleteAllDismissed", () => {
     )
   })
 
-  it("deleteAllDismissed silently swallows fetch errors (best-effort)", async () => {
+  it("deleteAllDismissed returns false on fetch error (best-effort)", async () => {
     vi.stubGlobal("fetch", vi.fn().mockRejectedValue(new Error("network error")))
-    await expect(deleteAllDismissed()).resolves.toBeUndefined()
+    await expect(deleteAllDismissed()).resolves.toBe(false)
   })
 })
 
@@ -840,6 +852,7 @@ describe("computeSystemAlerts", () => {
       currentVersion: "1.0.0",
       failedBackups: [],
       clients: [],
+      snapshotRetentionDays: 365,
     })
     expect(result).toHaveLength(0)
   })
@@ -850,6 +863,7 @@ describe("computeSystemAlerts", () => {
       currentVersion: "1.0.0",
       failedBackups: [],
       clients: [],
+      snapshotRetentionDays: 365,
     })
     expect(result).toHaveLength(1)
     expect(result[0].type).toBe("update-available")
@@ -867,6 +881,7 @@ describe("computeSystemAlerts", () => {
       currentVersion: "1.0.0",
       failedBackups: [],
       clients: [],
+      snapshotRetentionDays: 365,
     })
     expect(result.find((a) => a.type === "update-available")).toBeUndefined()
   })
@@ -876,6 +891,7 @@ describe("computeSystemAlerts", () => {
       currentVersion: "1.0.0",
       failedBackups: [],
       clients: [],
+      snapshotRetentionDays: 365,
     })
     expect(result.find((a) => a.type === "update-available")).toBeUndefined()
   })
@@ -886,6 +902,7 @@ describe("computeSystemAlerts", () => {
       currentVersion: "1.0.0",
       failedBackups: [{ createdAt }, { createdAt: "2026-01-14T03:00:00.000Z" }],
       clients: [],
+      snapshotRetentionDays: 365,
     })
     const backupAlert = result.find((a) => a.type === "backup-failed")
     expect(backupAlert).toBeDefined()
@@ -905,6 +922,7 @@ describe("computeSystemAlerts", () => {
         { id: 2, name: "Deluge", enabled: false, lastError: "Timed out" },
         { id: 3, name: "Transmission", enabled: true, lastError: null },
       ],
+      snapshotRetentionDays: 365,
     })
     expect(result).toHaveLength(1)
     const clientAlert = result[0]
@@ -916,25 +934,48 @@ describe("computeSystemAlerts", () => {
     expect(clientAlert.dismissible).toBe(false)
   })
 
-  it("client-error alerts are non-dismissible", () => {
+  it("generates retention-unconfigured alert when snapshotRetentionDays is null", () => {
     const result = computeSystemAlerts({
       currentVersion: "1.0.0",
       failedBackups: [],
-      clients: [{ id: 5, name: "Client", enabled: true, lastError: "Unreachable" }],
+      clients: [],
+      snapshotRetentionDays: null,
     })
-    expect(result[0].dismissible).toBe(false)
+    const retentionAlert = result.find((a) => a.type === "retention-unconfigured")
+    expect(retentionAlert).toBeDefined()
+    expect(retentionAlert?.key).toBe("retention-unconfigured")
+    expect(retentionAlert?.trackerName).toBe("System")
+    expect(retentionAlert?.message).toContain("retention")
+    expect(retentionAlert?.message).toContain("Settings")
+    expect(retentionAlert?.dismissible).toBe(true)
   })
 
-  it("generates all three alert types together", () => {
+  it("does not generate retention alert when snapshotRetentionDays is configured", () => {
+    const result = computeSystemAlerts({
+      currentVersion: "1.0.0",
+      failedBackups: [],
+      clients: [],
+      snapshotRetentionDays: 730,
+    })
+    expect(result.find((a) => a.type === "retention-unconfigured")).toBeUndefined()
+  })
+
+  it("generates all alert types together", () => {
     const result = computeSystemAlerts({
       latestVersion: "2.0.0",
       currentVersion: "1.0.0",
       failedBackups: [{ createdAt: "2026-01-15T03:00:00.000Z" }],
       clients: [{ id: 1, name: "qBt", enabled: true, lastError: "Unreachable" }],
+      snapshotRetentionDays: null,
     })
-    expect(result).toHaveLength(3)
+    expect(result).toHaveLength(4)
     expect(result.map((a) => a.type)).toEqual(
-      expect.arrayContaining(["update-available", "backup-failed", "client-error"])
+      expect.arrayContaining([
+        "update-available",
+        "backup-failed",
+        "client-error",
+        "retention-unconfigured",
+      ])
     )
   })
 })
@@ -1009,63 +1050,13 @@ describe("checkAnniversaryMilestone", () => {
     vi.useRealTimers()
   })
 
-  it("returns 1 month anniversary on exact date", () => {
-    vi.setSystemTime(new Date("2026-04-15"))
-    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "1 month anniversary" })
-  })
-
-  it("returns 6 month anniversary on exact date", () => {
-    vi.setSystemTime(new Date("2026-09-15"))
-    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "6 month anniversary" })
-  })
-
-  it("returns 1 year anniversary on exact date", () => {
-    vi.setSystemTime(new Date("2027-03-15"))
-    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "1 year anniversary" })
-  })
-
-  it("returns multi-year anniversary", () => {
-    vi.setSystemTime(new Date("2031-03-15"))
-    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "5 year anniversary" })
-  })
-
-  it("matches within the ±3 day window", () => {
-    vi.setSystemTime(new Date("2027-03-13")) // 2 days before 1yr anniversary
-    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "1 year anniversary" })
-  })
-
-  it("does not match outside the ±3 day window", () => {
-    vi.setSystemTime(new Date("2027-03-10")) // 5 days before 1yr anniversary
-    expect(checkAnniversaryMilestone("2026-03-15")).toBeNull()
-  })
-
-  it("returns null for dates not near any milestone", () => {
-    vi.setSystemTime(new Date("2026-08-01")) // ~4.5 months in, no milestone nearby
-    expect(checkAnniversaryMilestone("2026-03-15")).toBeNull()
-  })
-
-  it("returns null for invalid date string", () => {
-    expect(checkAnniversaryMilestone("not-a-date")).toBeNull()
-  })
-
-  it("returns null when joinedAt is null", () => {
-    expect(checkAnniversaryMilestone(null)).toBeNull()
-  })
-
-  it("prefers 1 month over 1 year when both could match", () => {
-    // Edge case: 1 month anniversary checked before annual milestones
-    vi.setSystemTime(new Date("2026-04-15"))
-    const result = checkAnniversaryMilestone("2026-03-15")
-    expect(result?.label).toBe("1 month anniversary")
-  })
-
   it("generates anniversary alert in computeAlerts", () => {
     vi.setSystemTime(new Date("2027-06-10"))
     const tracker = makeTracker({ joinedAt: "2026-06-10" })
     const alerts = computeAlerts([tracker])
     const anniversary = alerts.find((a) => a.type === "anniversary")
     expect(anniversary).toBeDefined()
-    expect(anniversary?.message).toBe("1 year anniversary")
+    expect(anniversary?.message).toBe("1-year anniversary")
   })
 
   it("does not generate anniversary alert without joinedAt", () => {
diff --git a/src/lib/__tests__/data-transforms.test.ts b/src/lib/__tests__/data-transforms.test.ts
new file mode 100644
index 00000000..711b6fc0
--- /dev/null
+++ b/src/lib/__tests__/data-transforms.test.ts
@@ -0,0 +1,134 @@
+// src/lib/__tests__/data-transforms.test.ts
+
+import { describe, expect, it } from "vitest"
+import {
+  compareBigIntDesc,
+  computePctChange,
+  isUnixTimestampOnDate,
+  normalizeUrl,
+  sanitizeHost,
+} from "@/lib/data-transforms"
+import { localDateStr } from "@/lib/formatters"
+
+// ---------------------------------------------------------------------------
+// sanitizeHost
+// ---------------------------------------------------------------------------
+
+describe("sanitizeHost", () => {
+  it("strips https:// prefix", () => {
+    expect(sanitizeHost("https://example.com")).toBe("example.com")
+  })
+
+  it("strips http:// prefix", () => {
+    expect(sanitizeHost("http://example.com")).toBe("example.com")
+  })
+
+  it("trims whitespace then strips protocol", () => {
+    expect(sanitizeHost("  https://example.com  ")).toBe("example.com")
+  })
+
+  it("passes through a host with no protocol unchanged", () => {
+    expect(sanitizeHost("example.com")).toBe("example.com")
+  })
+
+  it("does not strip non-http protocols", () => {
+    expect(sanitizeHost("ftp://example.com")).toBe("ftp://example.com")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// normalizeUrl
+// ---------------------------------------------------------------------------
+
+describe("normalizeUrl", () => {
+  it("lowercases the URL", () => {
+    expect(normalizeUrl("HTTPS://FOO.COM")).toBe("https://foo.com")
+  })
+
+  it("strips a single trailing slash", () => {
+    expect(normalizeUrl("https://Example.com/")).toBe("https://example.com")
+  })
+
+  it("strips multiple trailing slashes", () => {
+    expect(normalizeUrl("https://example.com///")).toBe("https://example.com")
+  })
+
+  it("returns the URL unchanged when already normalized", () => {
+    expect(normalizeUrl("https://example.com")).toBe("https://example.com")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// compareBigIntDesc
+// ---------------------------------------------------------------------------
+
+describe("compareBigIntDesc", () => {
+  it("returns 1 when b > a (a sorts after b in descending order)", () => {
+    expect(compareBigIntDesc(1n, 2n)).toBe(1)
+  })
+
+  it("returns -1 when b < a (a sorts before b in descending order)", () => {
+    expect(compareBigIntDesc(2n, 1n)).toBe(-1)
+  })
+
+  it("returns 0 when a and b are equal", () => {
+    expect(compareBigIntDesc(1n, 1n)).toBe(0)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// computePctChange
+// ---------------------------------------------------------------------------
+
+describe("computePctChange", () => {
+  it("returns 100 for a value that doubled", () => {
+    expect(computePctChange("200", "100")).toBe(100)
+  })
+
+  it("returns -50 for a value that halved", () => {
+    expect(computePctChange("100", "200")).toBe(-50)
+  })
+
+  it("returns null when yesterday is null", () => {
+    expect(computePctChange("100", null)).toBeNull()
+  })
+
+  it("returns null when yesterday is zero (division by zero guard)", () => {
+    expect(computePctChange("100", "0")).toBeNull()
+  })
+
+  it("returns null when today is not a valid bigint string", () => {
+    expect(computePctChange("abc", "100")).toBeNull()
+  })
+
+  it("returns null when yesterday is not a valid bigint string", () => {
+    expect(computePctChange("100", "xyz")).toBeNull()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// isUnixTimestampOnDate
+// ---------------------------------------------------------------------------
+
+describe("isUnixTimestampOnDate", () => {
+  it("returns false for 0 (falsy zero guard)", () => {
+    expect(isUnixTimestampOnDate(0, "1970-01-01")).toBe(false)
+  })
+
+  it("returns false for negative timestamps", () => {
+    expect(isUnixTimestampOnDate(-1, "anything")).toBe(false)
+  })
+
+  it("returns true when the timestamp falls on the expected date", () => {
+    // Build the expected date string via the same localDateStr used by the function
+    // so the test is immune to timezone differences on the CI runner.
+    const ts = Math.floor(new Date("2026-03-15T12:00:00").getTime() / 1000)
+    const expected = localDateStr(new Date(ts * 1000))
+    expect(isUnixTimestampOnDate(ts, expected)).toBe(true)
+  })
+
+  it("returns false when the date string does not match", () => {
+    const ts = Math.floor(new Date("2026-03-15T12:00:00").getTime() / 1000)
+    expect(isUnixTimestampOnDate(ts, "1999-01-01")).toBe(false)
+  })
+})
diff --git a/src/lib/__tests__/client-scheduler.test.ts b/src/lib/__tests__/download-client-scheduler.test.ts
similarity index 51%
rename from src/lib/__tests__/client-scheduler.test.ts
rename to src/lib/__tests__/download-client-scheduler.test.ts
index 991a7fd7..b29214b9 100644
--- a/src/lib/__tests__/client-scheduler.test.ts
+++ b/src/lib/__tests__/download-client-scheduler.test.ts
@@ -1,4 +1,4 @@
-// src/lib/__tests__/client-scheduler.test.ts
+// src/lib/__tests__/download-client-scheduler.test.ts
 //
 // Functions:
 //   makeEncryptionKey           - Creates a 32-byte Buffer for use as encryption key
@@ -8,10 +8,15 @@
 //   mockDbUpdateClient          - Sets up db.update chain for downloadClients
 
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import { deepPollClient } from "@/lib/client-scheduler"
-import { decrypt } from "@/lib/crypto"
 import { db } from "@/lib/db"
-import { aggregateByTag, getTorrents, getTransferInfo, withSessionRetry } from "@/lib/qbt"
+import { deepPollClient } from "@/lib/download-client-scheduler"
+import {
+  aggregateByTag,
+  applyMaindataUpdate,
+  createAdapterForClient,
+  getFilteredTorrents,
+  getStoreRevision,
+} from "@/lib/download-clients"
 
 // ---------------------------------------------------------------------------
 // Module mocks (boundaries only)
@@ -26,35 +31,40 @@ vi.mock("@/lib/db", () => ({
   },
 }))
 
-vi.mock("@/lib/crypto", () => ({
-  decrypt: vi.fn(),
-}))
+const mockAdapter = {
+  type: "qbittorrent" as const,
+  baseUrl: "http://192.168.1.100:8080",
+  testConnection: vi.fn(),
+  getTorrents: vi.fn().mockResolvedValue([]),
+  getTransferInfo: vi.fn().mockResolvedValue({ uploadSpeed: 2048, downloadSpeed: 512 }),
+  getDeltaSync: vi.fn().mockResolvedValue({
+    rid: 1,
+    fullUpdate: true,
+    torrents: {},
+    torrentsRemoved: [],
+  }),
+  dispose: vi.fn(),
+}
 
-vi.mock("@/lib/qbt", () => ({
-  // withSessionRetry: by default, call op with a fixed baseUrl+sid so the
-  // getTorrents/getTransferInfo mocks still fire normally. Individual tests that
-  // need to simulate upstream errors replace this with vi.fn().mockRejectedValue(...).
-  withSessionRetry: vi.fn(
-    async (
-      _host: string,
-      _port: number,
-      _ssl: boolean,
-      _username: string,
-      _password: string,
-      op: (baseUrl: string, sid: string) => Promise<unknown>
-    ) => op("http://192.168.1.100:8080", "sid-token")
-  ),
-  getTorrents: vi.fn(),
-  getTransferInfo: vi.fn(),
+vi.mock("@/lib/download-clients", () => ({
+  createAdapterForClient: vi.fn(() => mockAdapter),
   aggregateByTag: vi.fn(),
   parseCrossSeedTags: vi.fn((raw: string[] | null) => raw ?? []),
-  stripSensitiveTorrentFields: vi.fn((t: Record<string, unknown>) => {
-    const { tracker: _t, content_path: _cp, save_path: _sp, ...rest } = t
+  slimTorrentForCache: vi.fn((t: Record<string, unknown>) => {
+    const { tracker: _t, contentPath: _cp, savePath: _sp, ...rest } = t
     return rest
   }),
   pushSpeedSnapshot: vi.fn(),
   clearSpeedCache: vi.fn(),
   clearAllSessions: vi.fn(),
+  applyMaindataUpdate: vi.fn(),
+  getFilteredTorrents: vi.fn(),
+  getStoreRevision: vi.fn(),
+  replaceStoreTorrents: vi.fn(),
+  clearAllStores: vi.fn(),
+  isStoreInitialized: vi.fn(),
+  resetStore: vi.fn(),
+  CLIENT_CONNECTION_COLUMNS: {},
 }))
 
 // Prevent node-cron from spinning up timers
@@ -98,11 +108,11 @@ const MOCK_STATS = {
   ],
 }
 
-const MOCK_TRANSFER_INFO = {
-  up_info_speed: 2048,
-  dl_info_speed: 512,
-  up_info_data: 10000000,
-  dl_info_data: 5000000,
+const MOCK_MAINDATA_RESPONSE = {
+  rid: 1,
+  fullUpdate: true,
+  torrents: {},
+  torrentsRemoved: [],
 }
 
 // ---------------------------------------------------------------------------
@@ -113,27 +123,15 @@ function makeEncryptionKey(): Buffer {
   return Buffer.alloc(32, 0xab)
 }
 
-/**
- * Builds the db.select chain for pollClient's two sequential queries:
- *   1. db.select().from(downloadClients).where(...).limit(1) → client row
- *   2. db.select({ qbtTag }).from(trackers).where(isNotNull(...)) → tag rows
- *
- * Uses mockReturnValueOnce so each call in sequence gets the right data.
- */
-function mockDbSelectSequence(client: typeof MOCK_CLIENT | null, trackerTags: string[]) {
-  // First call: downloadClients lookup
+/** Mocks the db.select chain for deepPollClient's client row lookup.
+ *  Tracker tags are now passed as a parameter, not fetched from DB. */
+function mockDbSelectSequence(client: typeof MOCK_CLIENT | null) {
+  // downloadClients lookup (tracker tags are now passed as a parameter, not fetched from DB)
   const clientMockLimit = vi.fn().mockResolvedValue(client ? [client] : [])
   const clientMockWhere = vi.fn().mockReturnValue({ limit: clientMockLimit })
   const clientMockFrom = vi.fn().mockReturnValue({ where: clientMockWhere })
 
-  // Second call: trackers qbtTag lookup
-  const tagRows = trackerTags.map((t) => ({ qbtTag: t }))
-  const tagMockWhere = vi.fn().mockResolvedValue(tagRows)
-  const tagMockFrom = vi.fn().mockReturnValue({ where: tagMockWhere })
-
-  ;(db.select as ReturnType<typeof vi.fn>)
-    .mockReturnValueOnce({ from: clientMockFrom })
-    .mockReturnValueOnce({ from: tagMockFrom })
+  ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: clientMockFrom })
 }
 
 /** Sets up db.insert to succeed silently. Returns the values mock for assertion. */
@@ -152,16 +150,18 @@ function mockDbUpdateClient() {
 }
 
 /**
- * Wires all mocks for a successful deepPollClient run with the given tracker tags.
+ * Wires all mocks for a successful deepPollClient run.
+ * Tracker tags are passed directly to deepPollClient (no longer fetched from DB).
  * crossSeedTags come from MOCK_CLIENT.crossSeedTags = '["cross-seed"]'.
- * getTorrents returns an empty array per-tag by default (sufficient for happy-path assertions).
+ * getDeltaSync returns MOCK_MAINDATA_RESPONSE; getFilteredTorrents returns [] by default.
  */
-function setupFullHappyPathMocks(trackerTags: string[]) {
-  mockDbSelectSequence(MOCK_CLIENT, trackerTags)
-  ;(decrypt as ReturnType<typeof vi.fn>).mockReturnValueOnce("admin").mockReturnValueOnce("secret")
-  // getTorrents is called once per tag (parallel per-tag fetching)
-  ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-  ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+function setupFullHappyPathMocks() {
+  mockDbSelectSequence(MOCK_CLIENT)
+  ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+  mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+  ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+  ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockReturnValue([])
+  mockAdapter.getTransferInfo.mockResolvedValue({ uploadSpeed: 2048, downloadSpeed: 512 })
   ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
   mockDbInsertSnapshot()
   mockDbUpdateClient()
@@ -176,64 +176,83 @@ describe("deepPollClient per-tag optimization", () => {
     // resetAllMocks clears call history AND pending mockReturnValueOnce queues,
     // preventing leakage of unconsumed queued returns across tests.
     vi.resetAllMocks()
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    mockAdapter.getTransferInfo.mockResolvedValue({ uploadSpeed: 2048, downloadSpeed: 512 })
+    mockAdapter.getTorrents.mockResolvedValue([])
   })
 
   // -------------------------------------------------------------------------
   // Single fetch + client-side filter
   // -------------------------------------------------------------------------
 
-  it("calls getTorrents once per tag in parallel", async () => {
-    setupFullHappyPathMocks(["aither", "blutopia"])
+  it("calls getDeltaSync once (not per-tag) for a single poll", async () => {
+    setupFullHappyPathMocks()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
-    const getTorrentsCalls = (getTorrents as ReturnType<typeof vi.fn>).mock.calls
-    // 2 tracker tags + 1 cross-seed tag = 3 calls
-    expect(getTorrentsCalls).toHaveLength(3)
-    // Each call passes a tag argument
-    const tags = getTorrentsCalls.map((c: unknown[]) => c[2])
-    expect(tags).toContain("aither")
-    expect(tags).toContain("blutopia")
-    expect(tags).toContain("cross-seed")
+    // New flow: a single getDeltaSync call instead of N per-tag getTorrents calls
+    expect(mockAdapter.getDeltaSync).toHaveBeenCalledOnce()
   })
 
-  it("deduplicates overlapping tracker and cross-seed tags", async () => {
-    // ["aither","shared-tag"] ∪ ["cross-seed","shared-tag"] = 3 unique tags = 3 getTorrents calls
+  it("deduplicates overlapping tracker and cross-seed tags via client-side filter", async () => {
+    const aitherTorrent = {
+      hash: "a1",
+      state: "uploading",
+      tags: "aither, shared-tag",
+      uploadSpeed: 100,
+      downloadSpeed: 0,
+    }
+    const crossTorrent = {
+      hash: "c1",
+      state: "uploading",
+      tags: "cross-seed, shared-tag",
+      uploadSpeed: 75,
+      downloadSpeed: 0,
+    }
+    const sharedTorrent = {
+      hash: "shared",
+      state: "uploading",
+      tags: "aither, cross-seed, shared-tag",
+      uploadSpeed: 50,
+      downloadSpeed: 0,
+    }
+
     const clientWithOverlap = {
       ...MOCK_CLIENT,
       crossSeedTags: ["cross-seed", "shared-tag"],
     }
-    mockDbSelectSequence(clientWithOverlap, ["aither", "shared-tag"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+    mockDbSelectSequence(clientWithOverlap)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    // Store contains 3 torrents, all tagged with tracked tags — all should be returned
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) =>
+        [aitherTorrent, crossTorrent, sharedTorrent].filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
-    // 3 unique tags = 3 parallel getTorrents calls
-    const getTorrentsCalls = (getTorrents as ReturnType<typeof vi.fn>).mock.calls
-    expect(getTorrentsCalls).toHaveLength(3)
-    const tags = getTorrentsCalls.map((c: unknown[]) => c[2])
-    expect(new Set(tags).size).toBe(3)
+    // getDeltaSync called once — no per-tag requests
+    expect(mockAdapter.getDeltaSync).toHaveBeenCalledOnce()
   })
 
   // -------------------------------------------------------------------------
-  // Empty tags — zero getTorrents calls, but getTransferInfo still runs
+  // Empty tags — zero relevant torrents, but getTransferInfo still runs
   // -------------------------------------------------------------------------
 
-  it("handles zero configured tags gracefully", async () => {
+  it("handles zero cross-seed tags gracefully", async () => {
     const clientNoTags = { ...MOCK_CLIENT, crossSeedTags: [] as string[] }
-    mockDbSelectSequence(clientNoTags, [])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+    mockDbSelectSequence(clientNoTags)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    // Store may have torrents but the tag filter produces nothing
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockReturnValue([])
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue({
       totalSeedingCount: 0,
       totalLeechingCount: 0,
@@ -244,12 +263,12 @@ describe("deepPollClient per-tag optimization", () => {
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
-    // Zero tags = zero getTorrents calls
-    expect(getTorrents as ReturnType<typeof vi.fn>).not.toHaveBeenCalled()
+    // getDeltaSync still called once — it fetches everything regardless of tag count
+    expect(mockAdapter.getDeltaSync).toHaveBeenCalledOnce()
     // getTransferInfo still runs for speed data
-    expect(getTransferInfo as ReturnType<typeof vi.fn>).toHaveBeenCalledOnce()
+    expect(mockAdapter.getTransferInfo).toHaveBeenCalledOnce()
     // The snapshot insert should still happen
     expect(db.insert as ReturnType<typeof vi.fn>).toHaveBeenCalled()
   })
@@ -258,36 +277,43 @@ describe("deepPollClient per-tag optimization", () => {
   // Result filtering
   // -------------------------------------------------------------------------
 
-  it("passes deduped per-tag results to aggregateByTag", async () => {
-    // isPrivate omitted — real qBT API returns is_private (snake_case), not isPrivate
+  it("passes tag-filtered store results to aggregateByTag", async () => {
     const aitherTorrents = [
-      { hash: "a1", state: "uploading", tags: "aither", upspeed: 100, dlspeed: 0 },
-      { hash: "a2", state: "uploading", tags: "aither", upspeed: 100, dlspeed: 0 },
+      { hash: "a1", state: "uploading", tags: "aither", uploadSpeed: 100, downloadSpeed: 0 },
+      { hash: "a2", state: "uploading", tags: "aither", uploadSpeed: 100, downloadSpeed: 0 },
     ]
     const crossTorrents = [
-      { hash: "c1", state: "uploading", tags: "cross-seed", upspeed: 100, dlspeed: 0 },
-      { hash: "c2", state: "uploading", tags: "cross-seed", upspeed: 100, dlspeed: 0 },
-      { hash: "c3", state: "uploading", tags: "cross-seed", upspeed: 100, dlspeed: 0 },
+      { hash: "c1", state: "uploading", tags: "cross-seed", uploadSpeed: 100, downloadSpeed: 0 },
+      { hash: "c2", state: "uploading", tags: "cross-seed", uploadSpeed: 100, downloadSpeed: 0 },
+      { hash: "c3", state: "uploading", tags: "cross-seed", uploadSpeed: 100, downloadSpeed: 0 },
     ]
+    const untrackedTorrent = {
+      hash: "u1",
+      state: "uploading",
+      tags: "untracked-tag",
+      uploadSpeed: 50,
+      downloadSpeed: 0,
+    }
 
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    // Per-tag: first call returns aither torrents, second returns cross-seed torrents
-    ;(getTorrents as ReturnType<typeof vi.fn>)
-      .mockResolvedValueOnce(aitherTorrents)
-      .mockResolvedValueOnce(crossTorrents)
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    // Store returns all torrents including an untracked one — scheduler filters by tags
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) =>
+        [...aitherTorrents, ...crossTorrents, untrackedTorrent].filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     const aggregateCalls = (aggregateByTag as ReturnType<typeof vi.fn>).mock.calls
     expect(aggregateCalls).toHaveLength(1)
     const passedTorrents = aggregateCalls[0][0]
+    // 2 aither + 3 cross-seed = 5 (untracked-tag torrent is filtered out)
     expect(passedTorrents).toHaveLength(5)
   })
 
@@ -303,10 +329,9 @@ describe("deepPollClient per-tag optimization", () => {
     const clientMockFrom = vi.fn().mockReturnValue({ where: clientMockWhere })
     ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: clientMockFrom })
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
-    expect(withSessionRetry as ReturnType<typeof vi.fn>).not.toHaveBeenCalled()
-    expect(getTorrents as ReturnType<typeof vi.fn>).not.toHaveBeenCalled()
+    expect(createAdapterForClient).not.toHaveBeenCalled()
   })
 
   it("returns without error for a non-existent client ID", async () => {
@@ -317,25 +342,20 @@ describe("deepPollClient per-tag optimization", () => {
     ;(db.select as ReturnType<typeof vi.fn>).mockReturnValueOnce({ from: clientMockFrom })
 
     // Must not throw
-    await expect(deepPollClient(999, makeEncryptionKey())).resolves.toBeUndefined()
-    expect(withSessionRetry as ReturnType<typeof vi.fn>).not.toHaveBeenCalled()
+    await expect(deepPollClient(999, makeEncryptionKey(), [])).resolves.toBeUndefined()
+    expect(createAdapterForClient).not.toHaveBeenCalled()
   })
 
   // -------------------------------------------------------------------------
   // Error recording
   // -------------------------------------------------------------------------
 
-  it("records sanitized error to DB when qBT login fails and does not re-throw", async () => {
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(withSessionRetry as ReturnType<typeof vi.fn>).mockRejectedValue(
-      new Error("connect ECONNREFUSED 192.168.1.100:8080")
-    )
+  it("records sanitized error to DB when client connection fails and does not re-throw", async () => {
+    mockDbSelectSequence(MOCK_CLIENT)
+    mockAdapter.getDeltaSync.mockRejectedValue(new Error("connect ECONNREFUSED 192.168.1.100:8080"))
     const { mockSet } = mockDbUpdateClient()
 
-    await expect(deepPollClient(1, makeEncryptionKey())).resolves.toBeUndefined()
+    await expect(deepPollClient(1, makeEncryptionKey(), ["🕵️ Aither"])).resolves.toBeUndefined()
 
     // Raw error is sanitized — IP and port stripped, generic message stored
     expect(mockSet).toHaveBeenCalledWith(
@@ -344,14 +364,11 @@ describe("deepPollClient per-tag optimization", () => {
   })
 
   it("records a generic message when the thrown value is not an Error instance", async () => {
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(withSessionRetry as ReturnType<typeof vi.fn>).mockRejectedValue("plain string rejection")
+    mockDbSelectSequence(MOCK_CLIENT)
+    mockAdapter.getDeltaSync.mockRejectedValue("plain string rejection")
     const { mockSet } = mockDbUpdateClient()
 
-    await expect(deepPollClient(1, makeEncryptionKey())).resolves.toBeUndefined()
+    await expect(deepPollClient(1, makeEncryptionKey(), ["🕵️ Aither"])).resolves.toBeUndefined()
 
     // Non-Error throws are sanitized to the generic fallback
     expect(mockSet).toHaveBeenCalledWith(
@@ -364,12 +381,12 @@ describe("deepPollClient per-tag optimization", () => {
   // -------------------------------------------------------------------------
 
   it("clears lastError and sets lastPolledAt on successful poll", async () => {
-    setupFullHappyPathMocks(["aither"])
+    setupFullHappyPathMocks()
 
     // Re-wire update mock so we can inspect the set() argument
     const { mockSet } = mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     expect(mockSet).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -384,11 +401,11 @@ describe("deepPollClient per-tag optimization", () => {
   // -------------------------------------------------------------------------
 
   it("inserts a client snapshot after a successful poll", async () => {
-    setupFullHappyPathMocks(["aither"])
+    setupFullHappyPathMocks()
     // Re-wire insert mock to capture the values
     const mockValues = mockDbInsertSnapshot()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     expect(mockValues).toHaveBeenCalledOnce()
     const snapshotValues = mockValues.mock.calls[0][0]
@@ -403,33 +420,32 @@ describe("deepPollClient per-tag optimization", () => {
   // -------------------------------------------------------------------------
 
   it("caches filtered torrents to downloadClients on successful poll", async () => {
-    // isPrivate omitted — real qBT API returns is_private (snake_case), not isPrivate
     const filteredTorrents = [
       {
         hash: "a1",
         name: "Movie.mkv",
         state: "uploading",
         tags: "aither",
-        upspeed: 100,
-        dlspeed: 0,
+        uploadSpeed: 100,
+        downloadSpeed: 0,
       },
       {
         hash: "a2",
         name: "Show.mkv",
         state: "uploading",
         tags: "aither",
-        upspeed: 200,
-        dlspeed: 0,
+        uploadSpeed: 200,
+        downloadSpeed: 0,
       },
     ]
 
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue(filteredTorrents)
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) => filteredTorrents.filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
 
@@ -442,7 +458,7 @@ describe("deepPollClient per-tag optimization", () => {
     })
     ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     // One of the update calls should contain the cached torrents
     const cacheUpdate = updateCalls.find((c) => "cachedTorrents" in c)
@@ -451,29 +467,28 @@ describe("deepPollClient per-tag optimization", () => {
     expect(cacheUpdate?.cachedTorrentsAt).toBeInstanceOf(Date)
   })
 
-  it("strips tracker, content_path, and save_path from cached torrents", async () => {
-    // isPrivate omitted — real qBT API returns is_private (snake_case), not isPrivate
+  it("strips tracker, contentPath, and savePath from cached torrents", async () => {
     const torrentsWithSensitiveFields = [
       {
         hash: "a1",
         name: "Movie.mkv",
         state: "uploading",
         tags: "aither",
-        upspeed: 100,
-        dlspeed: 0,
+        uploadSpeed: 100,
+        downloadSpeed: 0,
         tracker: "https://aither.cc/announce?passkey=SECRET123",
-        content_path: "/data/torrents/Movie.mkv",
-        save_path: "/data/torrents",
+        contentPath: "/data/torrents/Movie.mkv",
+        savePath: "/data/torrents",
       },
     ]
 
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue(torrentsWithSensitiveFields)
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) => torrentsWithSensitiveFields.filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
 
@@ -485,7 +500,7 @@ describe("deepPollClient per-tag optimization", () => {
     })
     ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     const cacheUpdate = updateCalls.find((c) => "cachedTorrents" in c)
     expect(cacheUpdate).toBeDefined()
@@ -495,8 +510,8 @@ describe("deepPollClient per-tag optimization", () => {
 
     // Sensitive fields must be stripped
     expect(cached[0]).not.toHaveProperty("tracker")
-    expect(cached[0]).not.toHaveProperty("content_path")
-    expect(cached[0]).not.toHaveProperty("save_path")
+    expect(cached[0]).not.toHaveProperty("contentPath")
+    expect(cached[0]).not.toHaveProperty("savePath")
 
     // Non-sensitive fields must be preserved
     expect(cached[0]).toHaveProperty("hash", "a1")
@@ -504,52 +519,97 @@ describe("deepPollClient per-tag optimization", () => {
     expect(cached[0]).toHaveProperty("tags", "aither")
   })
 
+  // -------------------------------------------------------------------------
+  // JSONB write skip when no changes
+  // -------------------------------------------------------------------------
+
+  it("omits cachedTorrents from the DB update when syncMaindata reports no delta", async () => {
+    // syncMaindata returns a response with no fullUpdate, no torrents changes, no removals.
+    // hasChanges should be false, so the update set() must NOT include cachedTorrents.
+    const noDeltaResponse = {
+      rid: 2,
+      fullUpdate: false,
+      torrents: {},
+      torrentsRemoved: [],
+    }
+
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(1)
+    mockAdapter.getDeltaSync.mockResolvedValue(noDeltaResponse)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockReturnValue([])
+    ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
+    mockDbInsertSnapshot()
+
+    // Capture all set() argument objects across update calls
+    const setCaptured: Record<string, unknown>[] = []
+    const mockWhere = vi.fn().mockResolvedValue(undefined)
+    const mockSet = vi.fn().mockImplementation((values: Record<string, unknown>) => {
+      setCaptured.push(values)
+      return { where: mockWhere }
+    })
+    ;(db.update as ReturnType<typeof vi.fn>).mockReturnValue({ set: mockSet })
+
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
+
+    // There must be at least one update call (the status update)
+    expect(setCaptured.length).toBeGreaterThan(0)
+
+    // None of the update set() objects may contain cachedTorrents
+    for (const setObj of setCaptured) {
+      expect(Object.keys(setObj)).not.toContain("cachedTorrents")
+    }
+  })
+
   // -------------------------------------------------------------------------
   // Credential flow
   // -------------------------------------------------------------------------
 
-  it("passes decrypted credentials to withSessionRetry", async () => {
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("decrypted-user")
-      .mockReturnValueOnce("decrypted-pass")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue([])
+  it("calls createAdapterForClient with the client row and encryption key", async () => {
+    const encryptionKey = makeEncryptionKey()
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockReturnValue([])
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, encryptionKey, ["aither"])
 
-    // withSessionRetry(host, port, ssl, username, password, op) — username is index 3, password is 4
-    const retryCalls = (withSessionRetry as ReturnType<typeof vi.fn>).mock.calls
-    expect(retryCalls).toHaveLength(1)
-    expect(retryCalls[0][3]).toBe("decrypted-user")
-    expect(retryCalls[0][4]).toBe("decrypted-pass")
+    // createAdapterForClient(client, key) — decryption is handled inside the factory
+    expect(createAdapterForClient).toHaveBeenCalledWith(
+      expect.objectContaining({ id: 1, type: "qbittorrent" }),
+      encryptionKey
+    )
   })
 })
 
 // ---------------------------------------------------------------------------
-// Regression: isPrivate field mismatch — dedup must not rely on t.isPrivate
+// Regression: isPrivate field mismatch — filter must not rely on t.isPrivate
 // ---------------------------------------------------------------------------
 
 describe("deepPollClient dedup without isPrivate", () => {
   beforeEach(() => {
     vi.resetAllMocks()
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    mockAdapter.getTransferInfo.mockResolvedValue({ uploadSpeed: 2048, downloadSpeed: 512 })
+    mockAdapter.getTorrents.mockResolvedValue([])
   })
 
-  // Regression: prevents dedup from silently dropping all torrents when t.isPrivate
-  // is undefined. The old guard `if (!t.isPrivate || seen.has(t.hash)) continue` would
-  // skip every torrent because `t.isPrivate` is always undefined (the real qBT API
-  // returns `is_private` in snake_case, not camelCase). The fix removed the isPrivate
-  // guard entirely, keeping only the hash-based dedup.
-  it("dedup includes torrents that do not have an isPrivate field", async () => {
+  // Regression: the old per-tag fetch path had a dedup guard `if (!t.isPrivate || seen.has(t.hash)) continue`
+  // which silently dropped all torrents because `t.isPrivate` is always undefined (the real qBT API
+  // returns `is_private` in snake_case, not camelCase). The new syncMaindata path uses a pure tag
+  // filter via parseTorrentTags — no isPrivate check at all. This test verifies that torrents
+  // without isPrivate are still included.
+  it("filter includes torrents that do not have an isPrivate field", async () => {
     // Torrents constructed WITHOUT isPrivate — matching real qBT API response shape
     const torrentsWithoutIsPrivate = [
-      { hash: "h1", state: "uploading", tags: "aither", upspeed: 100, dlspeed: 0 },
-      { hash: "h2", state: "uploading", tags: "aither", upspeed: 200, dlspeed: 0 },
-      { hash: "h3", state: "uploading", tags: "aither", upspeed: 300, dlspeed: 0 },
+      { hash: "h1", state: "uploading", tags: "aither", uploadSpeed: 100, downloadSpeed: 0 },
+      { hash: "h2", state: "uploading", tags: "aither", uploadSpeed: 200, downloadSpeed: 0 },
+      { hash: "h3", state: "uploading", tags: "aither", uploadSpeed: 300, downloadSpeed: 0 },
     ]
 
     // Sanity-check the test data itself: none of these objects have isPrivate defined
@@ -557,17 +617,18 @@ describe("deepPollClient dedup without isPrivate", () => {
       expect(Object.hasOwn(t, "isPrivate")).toBe(false)
     }
 
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    ;(getTorrents as ReturnType<typeof vi.fn>).mockResolvedValue(torrentsWithoutIsPrivate)
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) => torrentsWithoutIsPrivate.filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     // aggregateByTag must have been called with all 3 torrents — none were dropped
     const aggregateCalls = (aggregateByTag as ReturnType<typeof vi.fn>).mock.calls
@@ -576,47 +637,58 @@ describe("deepPollClient dedup without isPrivate", () => {
     expect(passedTorrents).toHaveLength(3)
   })
 
-  // Regression: verify that dedup still correctly handles duplicate hashes across tag
-  // fetches even without isPrivate present. The only dedup criterion should be the hash.
-  it("dedup removes duplicate hashes across tag results when isPrivate is absent", async () => {
-    // Same hash "shared" appears in both aither and cross-seed tag responses
-    const aitherResult = [
-      { hash: "shared", state: "uploading", tags: "aither, cross-seed", upspeed: 100, dlspeed: 0 },
-      { hash: "aither-only", state: "uploading", tags: "aither", upspeed: 50, dlspeed: 0 },
-    ]
-    const crossResult = [
-      // "shared" seen again from the cross-seed tag query — should be deduped
-      { hash: "shared", state: "uploading", tags: "aither, cross-seed", upspeed: 100, dlspeed: 0 },
-      { hash: "cross-only", state: "uploading", tags: "cross-seed", upspeed: 75, dlspeed: 0 },
+  // Regression: the syncMaindata store is hash-keyed, so each torrent hash is naturally
+  // unique in the store. Verify that getStoredTorrents results with distinct hashes are
+  // all passed through without phantom dedup.
+  it("all distinct-hash torrents from the store reach aggregateByTag", async () => {
+    // All three have different hashes — none should be dropped
+    const storedTorrents = [
+      {
+        hash: "shared",
+        state: "uploading",
+        tags: "aither, cross-seed",
+        uploadSpeed: 100,
+        downloadSpeed: 0,
+      },
+      {
+        hash: "aither-only",
+        state: "uploading",
+        tags: "aither",
+        uploadSpeed: 50,
+        downloadSpeed: 0,
+      },
+      {
+        hash: "cross-only",
+        state: "uploading",
+        tags: "cross-seed",
+        uploadSpeed: 75,
+        downloadSpeed: 0,
+      },
     ]
 
-    mockDbSelectSequence(MOCK_CLIENT, ["aither"])
-    ;(decrypt as ReturnType<typeof vi.fn>)
-      .mockReturnValueOnce("admin")
-      .mockReturnValueOnce("secret")
-    // First call (aither tag) returns aitherResult; second (cross-seed tag) returns crossResult
-    ;(getTorrents as ReturnType<typeof vi.fn>)
-      .mockResolvedValueOnce(aitherResult)
-      .mockResolvedValueOnce(crossResult)
-    ;(getTransferInfo as ReturnType<typeof vi.fn>).mockResolvedValue(MOCK_TRANSFER_INFO)
+    mockDbSelectSequence(MOCK_CLIENT)
+    ;(getStoreRevision as ReturnType<typeof vi.fn>).mockReturnValue(0)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    ;(applyMaindataUpdate as ReturnType<typeof vi.fn>).mockReturnValue(undefined)
+    ;(getFilteredTorrents as ReturnType<typeof vi.fn>).mockImplementation(
+      (_url: string, pred: (t: unknown) => boolean) => storedTorrents.filter(pred)
+    )
     ;(aggregateByTag as ReturnType<typeof vi.fn>).mockReturnValue(MOCK_STATS)
     mockDbInsertSnapshot()
     mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     const aggregateCalls = (aggregateByTag as ReturnType<typeof vi.fn>).mock.calls
     expect(aggregateCalls).toHaveLength(1)
     const passedTorrents = aggregateCalls[0][0] as Array<{ hash: string }>
 
-    // 3 unique hashes: "shared", "aither-only", "cross-only"
+    // All 3 unique-hash torrents are tagged with tracked tags — all 3 pass through
     expect(passedTorrents).toHaveLength(3)
     const hashes = passedTorrents.map((t) => t.hash)
     expect(hashes).toContain("shared")
     expect(hashes).toContain("aither-only")
     expect(hashes).toContain("cross-only")
-    // "shared" must appear exactly once
-    expect(hashes.filter((h) => h === "shared")).toHaveLength(1)
   })
 })
 
@@ -627,6 +699,10 @@ describe("deepPollClient dedup without isPrivate", () => {
 describe("deepPollClient lastPolledAt written; heartbeat update does not include it", () => {
   beforeEach(() => {
     vi.resetAllMocks()
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getDeltaSync.mockResolvedValue(MOCK_MAINDATA_RESPONSE)
+    mockAdapter.getTransferInfo.mockResolvedValue({ uploadSpeed: 2048, downloadSpeed: 512 })
+    mockAdapter.getTorrents.mockResolvedValue([])
   })
 
   // Regression: prevents heartbeat from starving the deep poll scheduler.
@@ -635,10 +711,10 @@ describe("deepPollClient lastPolledAt written; heartbeat update does not include
   // never be reached after the first heartbeat, and deep polls would stop firing.
   // The fix: heartbeat updates only lastError/errorSince/updatedAt, never lastPolledAt.
   it("deep poll success writes lastPolledAt to the DB", async () => {
-    setupFullHappyPathMocks(["aither"])
+    setupFullHappyPathMocks()
     const { mockSet } = mockDbUpdateClient()
 
-    await deepPollClient(1, makeEncryptionKey())
+    await deepPollClient(1, makeEncryptionKey(), ["aither"])
 
     // At least one update call must include lastPolledAt — this is the status update
     const allSetCalls = mockSet.mock.calls.map((c: unknown[]) => c[0] as Record<string, unknown>)
@@ -647,50 +723,6 @@ describe("deepPollClient lastPolledAt written; heartbeat update does not include
     expect(statusUpdate?.lastPolledAt).toBeInstanceOf(Date)
   })
 
-  // Regression: verifies the scheduling invariant — a client with a recent lastPolledAt
-  // (set during a prior deep poll) should be considered NOT overdue, while a client
-  // with lastPolledAt = null (never polled) should always be considered overdue.
-  // This mirrors the logic in deepPollAllClients without needing to call it directly.
-  it("overdue check: client with null lastPolledAt is always overdue", () => {
-    const pollIntervalSeconds = 30
-    const now = Date.now()
-
-    // Mirrors: const lastPoll = client.lastPolledAt?.getTime() ?? 0
-    // Mirrors: return now - lastPoll >= intervalMs
-    const lastPolledAt = null
-    const intervalMs = pollIntervalSeconds * 1000
-    const lastPoll = lastPolledAt ?? 0
-    const isOverdue = now - lastPoll >= intervalMs
-
-    expect(isOverdue).toBe(true)
-  })
-
-  it("overdue check: client deep-polled within interval is not overdue", () => {
-    const pollIntervalSeconds = 30
-    const now = Date.now()
-
-    // Simulate: heartbeat ran 5s ago but deep poll ran 10s ago (within 30s interval)
-    const lastPolledAt = new Date(now - 10_000) // 10 seconds ago
-    const intervalMs = pollIntervalSeconds * 1000
-    const lastPoll = lastPolledAt.getTime()
-    const isOverdue = now - lastPoll >= intervalMs
-
-    expect(isOverdue).toBe(false)
-  })
-
-  it("overdue check: client whose interval has elapsed is overdue", () => {
-    const pollIntervalSeconds = 30
-    const now = Date.now()
-
-    // Simulate: last deep poll was 35s ago (past the 30s interval)
-    const lastPolledAt = new Date(now - 35_000)
-    const intervalMs = pollIntervalSeconds * 1000
-    const lastPoll = lastPolledAt.getTime()
-    const isOverdue = now - lastPoll >= intervalMs
-
-    expect(isOverdue).toBe(true)
-  })
-
   // Regression: if heartbeat wrote lastPolledAt (the bug), a client polled 5s ago
   // via heartbeat would NOT be considered overdue even after the deep poll interval elapsed.
   // This test documents that scenario: if lastPolledAt reflects a heartbeat timestamp
diff --git a/src/lib/__tests__/error-utils.test.ts b/src/lib/__tests__/error-utils.test.ts
index 41299eed..26de2772 100644
--- a/src/lib/__tests__/error-utils.test.ts
+++ b/src/lib/__tests__/error-utils.test.ts
@@ -1,7 +1,7 @@
 // src/lib/__tests__/error-utils.test.ts
 
 import { describe, expect, it } from "vitest"
-import { isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
+import { classifyFetchError, isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
 
 // ---------------------------------------------------------------------------
 // isDecryptionError
@@ -146,10 +146,6 @@ describe("sanitizeNetworkError", () => {
     expect(sanitizeNetworkError("Unauthorized")).toBe("Authentication failed")
   })
 
-  it("maps 'Forbidden' to 'Authentication failed'", () => {
-    expect(sanitizeNetworkError("403 Forbidden")).toBe("Authentication failed")
-  })
-
   it("maps 'Session expired' to 'Session expired'", () => {
     expect(sanitizeNetworkError("Session expired")).toBe("Session expired")
   })
@@ -175,8 +171,80 @@ describe("sanitizeNetworkError", () => {
   it("uses a custom fallback when provided", () => {
     expect(sanitizeNetworkError("Unknown error", "Polling failed")).toBe("Polling failed")
   })
+})
+
+// classifyFetchError
+// ---------------------------------------------------------------------------
+
+describe("classifyFetchError", () => {
+  const host = "avistaz.to"
+
+  it("unwraps TypeError wrapping ECONNREFUSED (Node.js native fetch)", () => {
+    const cause = Object.assign(new Error("connect ECONNREFUSED 104.21.0.1:443"), {
+      code: "ECONNREFUSED",
+    })
+    const outer = new TypeError("fetch failed", { cause })
+    const result = classifyFetchError(outer, host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: ECONNREFUSED")
+  })
+
+  it("unwraps TypeError wrapping ENOTFOUND", () => {
+    const cause = Object.assign(new Error("getaddrinfo ENOTFOUND avistaz.to"), {
+      code: "ENOTFOUND",
+    })
+    const outer = new TypeError("fetch failed", { cause })
+    const result = classifyFetchError(outer, host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: ENOTFOUND")
+  })
+
+  it("unwraps TypeError wrapping a timeout DOMException", () => {
+    const cause = new DOMException("The operation was timed out.", "TimeoutError")
+    const outer = new TypeError("fetch failed", { cause })
+    const result = classifyFetchError(outer, host)
+    expect(result.message).toBe("Request to avistaz.to timed out")
+  })
+
+  it("handles direct DOMException TimeoutError (non-wrapped)", () => {
+    const err = new DOMException("timeout", "TimeoutError")
+    const result = classifyFetchError(err, host)
+    expect(result.message).toBe("Request to avistaz.to timed out")
+  })
+
+  it("handles direct DOMException AbortError", () => {
+    const err = new DOMException("aborted", "AbortError")
+    const result = classifyFetchError(err, host)
+    expect(result.message).toBe("Request to avistaz.to timed out")
+  })
+
+  it("handles direct ECONNREFUSED error (no TypeError wrapper)", () => {
+    const err = Object.assign(new Error("connect ECONNREFUSED"), { code: "ECONNREFUSED" })
+    const result = classifyFetchError(err, host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: ECONNREFUSED")
+  })
+
+  it("uses inner message when cause has no code", () => {
+    const cause = new Error("some TLS error")
+    const outer = new TypeError("fetch failed", { cause })
+    const result = classifyFetchError(outer, host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: some TLS error")
+  })
+
+  it("uses err.message for bare TypeError with no cause", () => {
+    const err = new TypeError("fetch failed")
+    const result = classifyFetchError(err, host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: fetch failed")
+  })
+
+  it("unwraps string cause from TypeError", () => {
+    const err = new TypeError("fetch failed", { cause: "connect ECONNREFUSED 10.0.0.1:443" })
+    const result = classifyFetchError(err, host)
+    expect(result.message).toBe(
+      "Failed to connect to avistaz.to: connect ECONNREFUSED 10.0.0.1:443"
+    )
+  })
 
-  it("returns default fallback for empty string", () => {
-    expect(sanitizeNetworkError("")).toBe("Connection failed")
+  it("returns Unknown for non-Error values", () => {
+    const result = classifyFetchError("string error", host)
+    expect(result.message).toBe("Failed to connect to avistaz.to: Unknown")
   })
 })
diff --git a/src/lib/__tests__/events.test.ts b/src/lib/__tests__/events.test.ts
index 143e904a..b6ba5cb3 100644
--- a/src/lib/__tests__/events.test.ts
+++ b/src/lib/__tests__/events.test.ts
@@ -3,6 +3,8 @@
 import { describe, expect, it } from "vitest"
 import {
   backupToEvent,
+  EVENT_CATEGORIES,
+  groupPollBatches,
   mergeAndSort,
   parseLogLine,
   type SystemEvent,
@@ -69,7 +71,7 @@ describe("parseLogLine", () => {
     expect(event?.category).toBe("auth")
   })
 
-  it("classifies poll failures as errors category", () => {
+  it("classifies poll failures as polls category (level handles severity)", () => {
     const line = JSON.stringify({
       level: 50,
       time: 1711100000000,
@@ -77,7 +79,7 @@ describe("parseLogLine", () => {
       trackerId: 7,
     })
     const event = parseLogLine(line)
-    expect(event?.category).toBe("errors")
+    expect(event?.category).toBe("polls")
     expect(event?.level).toBe("error")
   })
 })
@@ -224,8 +226,8 @@ describe("mergeAndSort", () => {
   })
 })
 
-describe("redactIps — IPv6", () => {
-  it("redacts a full IPv6 address from the log title", () => {
+describe("IPs in log events — single-user, no redaction", () => {
+  it("preserves IPv6 addresses in log titles (auth-gated, single-user)", () => {
     const line = JSON.stringify({
       level: 30,
       time: 1711100000000,
@@ -233,18 +235,17 @@ describe("redactIps — IPv6", () => {
     })
     const event = parseLogLine(line)
     expect(event).not.toBeNull()
-    expect(event?.title).not.toContain("2001:db8::1")
-    expect(event?.title).toContain("[redacted]")
+    expect(event?.title).toContain("2001:db8::1")
   })
 
-  it("redacts IPv6 loopback (::1) from the log title", () => {
+  it("preserves IPv6 loopback in log titles", () => {
     const line = JSON.stringify({
       level: 30,
       time: 1711100000000,
       msg: "request from ::1",
     })
     const event = parseLogLine(line)
-    expect(event?.title).not.toContain("::1")
+    expect(event?.title).toContain("::1")
   })
 
   it("redacts IPv6 in the ip field via detail", () => {
@@ -285,14 +286,14 @@ describe("parseLogLine — warn/error title sanitization", () => {
     expect(event?.title).toBe("Request timed out")
   })
 
-  it("does NOT sanitize info-level titles beyond IP redaction", () => {
+  it("does NOT sanitize info-level titles (IPs preserved, single-user)", () => {
     const line = JSON.stringify({
       level: 30,
       time: 1711100000000,
       msg: "polling toggled for tracker at 10.0.0.1",
     })
     const event = parseLogLine(line)
-    expect(event?.title).toContain("polling toggled for tracker at [redacted]")
+    expect(event?.title).toContain("polling toggled for tracker at 10.0.0.1")
     expect(event?.title).not.toBe("Connection refused")
   })
 })
@@ -312,7 +313,7 @@ describe("snapshotToEvent — invalid byte strings", () => {
     expect(event.category).toBe("polls")
   })
 
-  it("defaults both to 0.0 GiB when byte fields are empty strings", () => {
+  it("defaults to 0.0 GiB for both when byte fields are empty strings", () => {
     const event = snapshotToEvent({
       id: 100,
       polledAt: "2026-03-22T14:00:00.000Z",
@@ -403,3 +404,294 @@ describe("classifyLogEvent — priority ordering", () => {
     expect(event?.category).toBe("backups")
   })
 })
+
+// ---------------------------------------------------------------------------
+// classifyLogEvent — clients category
+// ---------------------------------------------------------------------------
+
+describe("classifyLogEvent — clients category", () => {
+  it("classifies as clients when clientId is present", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "torrent added",
+      clientId: 3,
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+  })
+
+  it("classifies as clients when msg contains 'heartbeat'", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "heartbeat check passed",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+  })
+
+  it("classifies as clients when msg contains 'deep poll'", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "deep poll completed for qBittorrent",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+  })
+
+  it("classifies as clients when msg contains 'deep.poll' (dot separator)", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "download-client-scheduler: deep.poll cycle finished",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+  })
+
+  it("classifies as clients when msg contains 'client.scheduler'", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "client.scheduler started",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+  })
+
+  it("classifies error-level event with clientId as clients (not settings)", () => {
+    const line = JSON.stringify({
+      level: 50,
+      time: 1711100000000,
+      msg: "failed to connect to download client",
+      clientId: 1,
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("clients")
+    expect(event?.level).toBe("error")
+  })
+
+  it("classifies as polls (not clients) when trackerId is present but no clientId", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "poll succeeded",
+      trackerId: 5,
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("polls")
+  })
+
+  it("auth events take priority over clientId (event field checked first)", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "login successful",
+      event: "login_success",
+      clientId: 2,
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("auth")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// sanitizeLogDetail — clientName in detail string
+// ---------------------------------------------------------------------------
+
+describe("sanitizeLogDetail — clientName", () => {
+  it("includes clientName in the detail string when present", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "torrent sync complete",
+      clientId: 2,
+      clientName: "qBittorrent",
+    })
+    const event = parseLogLine(line)
+    expect(event?.detail).toContain("qBittorrent")
+  })
+
+  it("prefers trackerName over clientName when both are present", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "crossover event",
+      trackerName: "RED",
+      clientName: "qBittorrent",
+    })
+    const event = parseLogLine(line)
+    // trackerName ?? clientName picks trackerName first
+    expect(event?.detail).toContain("RED")
+  })
+
+  it("uses clientName alone when trackerName is absent", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "client connected",
+      clientName: "Deluge",
+    })
+    const event = parseLogLine(line)
+    expect(event?.detail).toContain("Deluge")
+  })
+
+  it("detail is null when no name, action, route, ip, or warn+ message", () => {
+    const line = JSON.stringify({
+      level: 30,
+      time: 1711100000000,
+      msg: "generic startup message",
+    })
+    const event = parseLogLine(line)
+    expect(event?.detail).toBeNull()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// classifyLogEvent — uncategorized errors fall to settings (no errors category)
+// ---------------------------------------------------------------------------
+
+describe("classifyLogEvent — no errors category: uncategorized errors fall to settings", () => {
+  it("classifies error-level event with no trackerId/clientId/event as settings", () => {
+    const line = JSON.stringify({
+      level: 50,
+      time: 1711100000000,
+      msg: "unexpected internal error",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("settings")
+    expect(event?.level).toBe("error")
+  })
+
+  it("classifies warn-level event with no identifying fields as settings", () => {
+    const line = JSON.stringify({
+      level: 40,
+      time: 1711100000000,
+      msg: "config reload warning",
+    })
+    const event = parseLogLine(line)
+    expect(event?.category).toBe("settings")
+    expect(event?.level).toBe("warn")
+  })
+
+  it("clients category exists in EVENT_CATEGORIES", () => {
+    expect(EVENT_CATEGORIES).toContain("clients")
+  })
+
+  it("errors category does NOT exist in EVENT_CATEGORIES", () => {
+    expect(EVENT_CATEGORIES).not.toContain("errors")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// groupPollBatches
+// ---------------------------------------------------------------------------
+
+function makePollEvent(id: string, timestamp: string, trackerName: string): SystemEvent {
+  return {
+    id,
+    timestamp,
+    category: "polls",
+    level: "info",
+    title: "Poll succeeded",
+    detail: `${trackerName} — ↑ 1.0 GiB — ↓ 0.5 GiB — 2.00x`,
+    trackerId: 1,
+    trackerName,
+    source: "db",
+  }
+}
+
+describe("groupPollBatches", () => {
+  it("collapses same-timestamp polls into a single batch with children", () => {
+    const ts = "2026-04-09T12:00:00.000Z"
+    const events = [
+      makePollEvent("s-1", ts, "RED"),
+      makePollEvent("s-2", ts, "OPS"),
+      makePollEvent("s-3", ts, "Aither"),
+    ]
+    const grouped = groupPollBatches(events)
+    expect(grouped).toHaveLength(1)
+    expect(grouped[0].title).toBe("Poll succeeded for 3 trackers")
+    expect(grouped[0].children).toHaveLength(3)
+    expect(grouped[0].detail).toContain("RED")
+    expect(grouped[0].detail).toContain("OPS")
+    expect(grouped[0].detail).toContain("Aither")
+  })
+
+  it("leaves a single poll event ungrouped", () => {
+    const events = [makePollEvent("s-1", "2026-04-09T12:00:00.000Z", "RED")]
+    const grouped = groupPollBatches(events)
+    expect(grouped).toHaveLength(1)
+    expect(grouped[0].children).toBeUndefined()
+    expect(grouped[0].title).toBe("Poll succeeded")
+  })
+
+  it("does not group polls with different timestamps", () => {
+    const events = [
+      makePollEvent("s-1", "2026-04-09T12:00:00.000Z", "RED"),
+      makePollEvent("s-2", "2026-04-09T12:05:00.000Z", "OPS"),
+    ]
+    const grouped = groupPollBatches(events)
+    expect(grouped).toHaveLength(2)
+    expect(grouped[0].children).toBeUndefined()
+    expect(grouped[1].children).toBeUndefined()
+  })
+
+  it("does not group non-poll events even with matching timestamps", () => {
+    const ts = "2026-04-09T12:00:00.000Z"
+    const events: SystemEvent[] = [
+      {
+        id: "b-1",
+        timestamp: ts,
+        category: "backups",
+        level: "info",
+        title: "Backup completed",
+        detail: null,
+        trackerId: null,
+        trackerName: null,
+        source: "db",
+      },
+      {
+        id: "b-2",
+        timestamp: ts,
+        category: "backups",
+        level: "info",
+        title: "Backup completed",
+        detail: null,
+        trackerId: null,
+        trackerName: null,
+        source: "db",
+      },
+    ]
+    const grouped = groupPollBatches(events)
+    expect(grouped).toHaveLength(2)
+  })
+
+  it("preserves interleaved non-poll events between batches", () => {
+    const ts = "2026-04-09T12:00:00.000Z"
+    const events: SystemEvent[] = [
+      makePollEvent("s-1", ts, "RED"),
+      makePollEvent("s-2", ts, "OPS"),
+      {
+        id: "auth-1",
+        timestamp: ts,
+        category: "auth",
+        level: "info",
+        title: "Login",
+        detail: null,
+        trackerId: null,
+        trackerName: null,
+        source: "log",
+      },
+      makePollEvent("s-3", ts, "Aither"),
+    ]
+    const grouped = groupPollBatches(events)
+    // First two polls grouped, auth passes through, last poll is standalone
+    expect(grouped).toHaveLength(3)
+    expect(grouped[0].title).toBe("Poll succeeded for 2 trackers")
+    expect(grouped[1].title).toBe("Login")
+    expect(grouped[2].title).toBe("Poll succeeded")
+  })
+})
diff --git a/src/lib/__tests__/extract-api-error.test.ts b/src/lib/__tests__/extract-api-error.test.ts
new file mode 100644
index 00000000..1772d1b6
--- /dev/null
+++ b/src/lib/__tests__/extract-api-error.test.ts
@@ -0,0 +1,42 @@
+// src/lib/__tests__/extract-api-error.test.ts
+
+import { describe, expect, it } from "vitest"
+import { extractApiError } from "@/lib/extract-api-error"
+
+describe("extractApiError", () => {
+  it("returns the error field from a JSON response", async () => {
+    const res = new Response(JSON.stringify({ error: "Bad request" }), {
+      status: 400,
+      headers: { "Content-Type": "application/json" },
+    })
+    expect(await extractApiError(res)).toBe("Bad request")
+  })
+
+  it("returns the default fallback when error field is undefined", async () => {
+    const res = new Response(JSON.stringify({ error: undefined }), {
+      status: 400,
+      headers: { "Content-Type": "application/json" },
+    })
+    expect(await extractApiError(res)).toBe("Request failed")
+  })
+
+  it("returns the default fallback when JSON has no error field", async () => {
+    const res = new Response(JSON.stringify({}), {
+      status: 500,
+      headers: { "Content-Type": "application/json" },
+    })
+    expect(await extractApiError(res)).toBe("Request failed")
+  })
+
+  it("returns the default fallback on invalid JSON", async () => {
+    const res = new Response("not json", {
+      status: 500,
+    })
+    expect(await extractApiError(res)).toBe("Request failed")
+  })
+
+  it("returns a custom fallback string when provided", async () => {
+    const res = new Response("not json", { status: 503 })
+    expect(await extractApiError(res, "Service unavailable")).toBe("Service unavailable")
+  })
+})
diff --git a/src/lib/__tests__/fleet-aggregation.test.ts b/src/lib/__tests__/fleet-aggregation.test.ts
new file mode 100644
index 00000000..362ef470
--- /dev/null
+++ b/src/lib/__tests__/fleet-aggregation.test.ts
@@ -0,0 +1,734 @@
+// src/lib/__tests__/fleet-aggregation.test.ts
+
+import { describe, expect, it } from "vitest"
+import type { TorrentRaw, TrackerTag } from "@/lib/fleet"
+import { computeFleetAggregation } from "@/lib/fleet-aggregation"
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+const TRACKER_TAGS: TrackerTag[] = [
+  { tag: "aither", name: "Aither", color: "#01d4ff" },
+  { tag: "blutopia", name: "Blutopia", color: "#3b82f6" },
+]
+
+const CROSS_SEED_TAGS = ["cross-seed"]
+
+// Stable base time: 2024-06-15 00:00:00 UTC (Saturday, hour 0)
+// day-of-week = 6, hour = 0
+const BASE_SEC = 1718409600 // 2024-06-15T00:00:00Z
+
+function makeTorrent(overrides: Partial<TorrentRaw> & { hash: string }): TorrentRaw {
+  return {
+    hash: overrides.hash,
+    name: overrides.name ?? `Torrent-${overrides.hash}`,
+    state: overrides.state ?? "uploading",
+    tags: overrides.tags ?? "aither",
+    category: overrides.category ?? "movies",
+    uploaded: overrides.uploaded ?? 1_000_000,
+    downloaded: overrides.downloaded ?? 500_000,
+    ratio: overrides.ratio ?? 2.0,
+    size: overrides.size ?? 5_000_000_000,
+    seedingTime: overrides.seedingTime ?? 86_400,
+    activeTime: overrides.activeTime ?? 90_000,
+    addedAt: overrides.addedAt ?? BASE_SEC - 86_400 * 15,
+    completedAt: overrides.completedAt ?? BASE_SEC - 86_400 * 14,
+    lastActivityAt: overrides.lastActivityAt ?? BASE_SEC - 3_600,
+    remaining: overrides.remaining ?? 0,
+    seedCount: overrides.seedCount ?? 10,
+    leechCount: overrides.leechCount ?? 2,
+    swarmSeeders: overrides.swarmSeeders ?? 50,
+    swarmLeechers: overrides.swarmLeechers ?? 5,
+    uploadSpeed: overrides.uploadSpeed ?? 102_400,
+    downloadSpeed: overrides.downloadSpeed ?? 0,
+    availability: overrides.availability ?? 1.0,
+    progress: overrides.progress ?? 1.0,
+    clientName: overrides.clientName ?? "qbt-1",
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Test torrents
+// ---------------------------------------------------------------------------
+
+// T1: Aither, seeding, ratio 2.0, movies, 15 days ago, recently active
+const T1 = makeTorrent({
+  hash: "t1",
+  name: "Movie.A.2024.mkv",
+  state: "uploading",
+  tags: "aither",
+  category: "movies",
+  ratio: 2.0,
+  size: 5_000_000_000,
+  seedingTime: 86_400,
+  uploadSpeed: 102_400,
+  addedAt: BASE_SEC - 86_400 * 15,
+  lastActivityAt: BASE_SEC - 3_600, // fresh (1 hour ago)
+})
+
+// T2: Blutopia, seeding, ratio 0.3 (under 0.5 bucket), tv, 60 days ago, stale
+const T2 = makeTorrent({
+  hash: "t2",
+  name: "Show.B.S01.mkv",
+  state: "uploading",
+  tags: "blutopia",
+  category: "tv",
+  ratio: 0.3,
+  size: 2_000_000_000,
+  seedingTime: 604_800 * 2, // 14 days
+  uploadSpeed: 50_000,
+  addedAt: BASE_SEC - 86_400 * 60,
+  lastActivityAt: BASE_SEC - 86_400 * 35, // stale (>30 days)
+})
+
+// T3: Aither, leeching, ratio 0.0
+const T3 = makeTorrent({
+  hash: "t3",
+  name: "Movie.C.2023.mkv",
+  state: "downloading",
+  tags: "aither",
+  category: "movies",
+  ratio: 0.0,
+  size: 8_000_000_000,
+  seedingTime: 0,
+  uploadSpeed: 0,
+  downloadSpeed: 512_000,
+  addedAt: BASE_SEC - 86_400 * 5,
+  lastActivityAt: BASE_SEC - 600,
+})
+
+// T4: Aither + Blutopia (cross-seeded by name), no cross-seed tag
+const T4_AITHER = makeTorrent({
+  hash: "t4a",
+  name: "Shared.Movie.2024.mkv",
+  state: "uploading",
+  tags: "aither",
+  category: "movies",
+  ratio: 1.5,
+  size: 4_000_000_000,
+  uploadSpeed: 20_000,
+  addedAt: BASE_SEC - 86_400 * 10,
+  lastActivityAt: BASE_SEC - 7_200,
+})
+
+const T4_BLUTOPIA = makeTorrent({
+  hash: "t4b",
+  name: "Shared.Movie.2024.mkv",
+  state: "uploading",
+  tags: "blutopia",
+  category: "movies",
+  ratio: 1.8,
+  size: 4_000_000_000,
+  uploadSpeed: 30_000,
+  addedAt: BASE_SEC - 86_400 * 10,
+  lastActivityAt: BASE_SEC - 7_200,
+})
+
+// T5: cross-seed tag present
+const T5 = makeTorrent({
+  hash: "t5",
+  name: "Movie.A.2024.mkv",
+  state: "uploading",
+  tags: "aither, cross-seed",
+  category: "movies",
+  ratio: 5.5,
+  size: 5_000_000_000,
+  uploadSpeed: 10_000,
+  addedAt: BASE_SEC - 86_400 * 20,
+  lastActivityAt: BASE_SEC - 1_800,
+})
+
+const ALL_TORRENTS: TorrentRaw[] = [T1, T2, T3, T4_AITHER, T4_BLUTOPIA, T5]
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("computeFleetAggregation", () => {
+  // 1. Empty array
+  describe("empty input", () => {
+    it("returns zero-valued stats for empty torrent array", () => {
+      const result = computeFleetAggregation([], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.torrentCount).toBe(0)
+      expect(result.stats.totalSeeding).toBe(0)
+      expect(result.stats.totalLeeching).toBe(0)
+      expect(result.stats.fleetUploadSpeed).toBe(0)
+      expect(result.stats.fleetDownloadSpeed).toBe(0)
+      expect(result.stats.totalLibrarySize).toBe(0)
+      expect(result.stats.crossSeedPercent).toBe(0)
+      expect(result.stats.staleCount).toBe(0)
+    })
+
+    it("returns empty arrays for empty torrent array", () => {
+      const result = computeFleetAggregation([], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.trackerHealth).toHaveLength(0)
+      expect(result.ageBands).toHaveLength(0)
+      expect(result.ageTimeline).toHaveLength(0)
+      expect(result.sizesByTracker).toHaveLength(0)
+      expect(result.crossSeedNetwork.nodes).toHaveLength(0)
+      expect(result.crossSeedNetwork.edges).toHaveLength(0)
+    })
+
+    it("returns empty ratio distribution counts for empty array", () => {
+      const result = computeFleetAggregation([], TRACKER_TAGS, CROSS_SEED_TAGS)
+      for (const bucket of result.ratioDistribution) {
+        expect(bucket.count).toBe(0)
+      }
+    })
+  })
+
+  // 2. Ratio distribution
+  describe("ratioDistribution", () => {
+    it("buckets torrents into correct ratio ranges", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      // T3: 0.0 -> <0.5; T2: 0.3 -> <0.5
+      const under05 = result.ratioDistribution.find((b) => b.label === "<0.5")
+      expect(under05?.count).toBe(2)
+      // T4a: 1.5, T4b: 1.8 -> 1-2
+      const oneToTwo = result.ratioDistribution.find((b) => b.label === "1-2")
+      expect(oneToTwo?.count).toBe(2)
+      // T1: 2.0 -> 2-5
+      const twoToFive = result.ratioDistribution.find((b) => b.label === "2-5")
+      expect(twoToFive?.count).toBe(1)
+      // T5: 5.5 -> 5-10
+      const fiveToTen = result.ratioDistribution.find((b) => b.label === "5-10")
+      expect(fiveToTen?.count).toBe(1)
+    })
+
+    it("exposes correct min/max on each bucket", () => {
+      const result = computeFleetAggregation([], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const first = result.ratioDistribution[0]
+      expect(first.min).toBe(0)
+      expect(first.max).toBe(0.5)
+      const second = result.ratioDistribution[1]
+      expect(second.min).toBe(0.5)
+      expect(second.max).toBe(1)
+    })
+  })
+
+  // 3. Seed time distribution (seeding only)
+  describe("seedTimeDistribution", () => {
+    it("only counts seeding torrents", () => {
+      // T3 is leeching (state=downloading), should not appear in seed time buckets
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      const total = result.seedTimeDistribution.reduce((sum, b) => sum + b.count, 0)
+      // 5 seeding: T1, T2, T4a, T4b, T5
+      expect(total).toBe(5)
+    })
+
+    it("buckets seeding torrents by seedingTime", () => {
+      // T1 has seedingTime=86400 (exactly 1d) -> 1-7d bucket (max=604800, not <86400)
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const under1d = result.seedTimeDistribution.find((b) => b.label === "<1d")
+      const one7d = result.seedTimeDistribution.find((b) => b.label === "1-7d")
+      expect(under1d?.count).toBe(0)
+      expect(one7d?.count).toBe(1)
+    })
+
+    it("seed time distribution has color from SEED_TIME_BUCKETS", () => {
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      for (const bucket of result.seedTimeDistribution) {
+        expect(bucket.color).toBeTruthy()
+        expect(typeof bucket.color).toBe("string")
+      }
+    })
+  })
+
+  // 4. Cross-seed detection
+  describe("crossSeed", () => {
+    it("counts torrents with cross-seed tag", () => {
+      // T5 has "cross-seed" tag
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.crossSeed.crossSeeded).toBe(1)
+    })
+
+    it("computes unique as total minus crossSeeded", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.crossSeed.unique).toBe(result.crossSeed.total - result.crossSeed.crossSeeded)
+    })
+
+    it("returns zero crossSeeded when no cross-seed tags configured", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, [])
+      expect(result.crossSeed.crossSeeded).toBe(0)
+    })
+
+    it("crossSeedPercent reflects cross-seed ratio", () => {
+      // 1 out of 6 = ~16.67%
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.crossSeedPercent).toBeCloseTo((1 / 6) * 100, 5)
+    })
+  })
+
+  // 5. Activity grid
+  describe("activityGrid", () => {
+    it("returns 7x24 = 168 cells", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.activityGrid.data).toHaveLength(168)
+    })
+
+    it("populates correct hour/day cell from addedAt", () => {
+      // Use a known timestamp and derive expected day/hour from local time (same as Date.getDay/getHours)
+      const torrent = makeTorrent({ hash: "grid1", addedAt: BASE_SEC })
+      const localDate = new Date(BASE_SEC * 1000)
+      const expectedDay = localDate.getDay()
+      const expectedHour = localDate.getHours()
+      const result = computeFleetAggregation([torrent], TRACKER_TAGS, CROSS_SEED_TAGS)
+      // buildActivityMatrix stores as [hour, day, count]
+      const cell = result.activityGrid.data.find(
+        ([h, d]) => h === expectedHour && d === expectedDay
+      )
+      expect(cell?.[2]).toBe(1)
+    })
+
+    it("maxCount is non-negative", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.activityGrid.maxCount).toBeGreaterThanOrEqual(0)
+    })
+  })
+
+  // 6. Stats totals
+  describe("stats", () => {
+    it("counts seeding and leeching correctly", () => {
+      // T3 is leeching, rest are seeding
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.totalSeeding).toBe(5)
+      expect(result.stats.totalLeeching).toBe(1)
+    })
+
+    it("sums upload and download speeds", () => {
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.fleetUploadSpeed).toBe(T1.uploadSpeed + T3.uploadSpeed)
+      expect(result.stats.fleetDownloadSpeed).toBe(T1.downloadSpeed + T3.downloadSpeed)
+    })
+
+    it("sums library sizes", () => {
+      const result = computeFleetAggregation([T1, T2], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.totalLibrarySize).toBe(T1.size + T2.size)
+    })
+
+    it("counts stale torrents (lastActivityAt > 30 days ago)", () => {
+      const nowSec = Math.floor(Date.now() / 1000)
+      const recentTorrent = makeTorrent({
+        hash: "stale-fresh",
+        tags: "aither",
+        lastActivityAt: nowSec - 3_600, // 1 hour ago, not stale
+      })
+      const staleTorrent = makeTorrent({
+        hash: "stale-old",
+        tags: "aither",
+        lastActivityAt: nowSec - 86_400 * 35, // 35 days ago, stale
+      })
+      const result = computeFleetAggregation(
+        [recentTorrent, staleTorrent],
+        TRACKER_TAGS,
+        CROSS_SEED_TAGS
+      )
+      expect(result.stats.staleCount).toBe(1)
+    })
+
+    it("torrentCount equals input array length", () => {
+      const result = computeFleetAggregation(ALL_TORRENTS, TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.stats.torrentCount).toBe(ALL_TORRENTS.length)
+    })
+  })
+
+  // 7. Tracker health
+  describe("trackerHealth", () => {
+    it("computes avgRatio correctly for a single tracker", () => {
+      // Only T1 (ratio 2.0) and T4a (ratio 1.5) and T5 (ratio 5.5) match aither
+      const result = computeFleetAggregation([T1, T4_AITHER, T5], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.trackerHealth.find((t) => t.name === "Aither")
+      expect(aither).toBeDefined()
+      // T5 has tags "aither, cross-seed" -- the first non-cross-seed tracker tag is "aither"
+      const expectedAvg = (T1.ratio + T4_AITHER.ratio + T5.ratio) / 3
+      expect(aither?.avgRatio).toBeCloseTo(expectedAvg, 5)
+    })
+
+    it("computes uploadSpeedSum correctly", () => {
+      const result = computeFleetAggregation([T1, T4_AITHER], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.trackerHealth.find((t) => t.name === "Aither")
+      expect(aither?.uploadSpeedSum).toBe(T1.uploadSpeed + T4_AITHER.uploadSpeed)
+    })
+
+    it("computes freshnessPct for recently active torrents", () => {
+      // T1 lastActivityAt = BASE_SEC - 3600 (1 hour ago = fresh)
+      // T2 lastActivityAt = BASE_SEC - 86400*35 (35 days ago = stale)
+      // Use real now so we need torrents whose lastActivityAt is within 7 days of now
+      const nowSec = Math.floor(Date.now() / 1000)
+      const fresh = makeTorrent({
+        hash: "fresh1",
+        tags: "blutopia",
+        lastActivityAt: nowSec - 3_600, // 1 hour ago
+      })
+      const stale = makeTorrent({
+        hash: "stale1",
+        tags: "blutopia",
+        lastActivityAt: nowSec - 86_400 * 10, // 10 days ago
+      })
+      const result = computeFleetAggregation([fresh, stale], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const blutopia = result.trackerHealth.find((t) => t.name === "Blutopia")
+      expect(blutopia?.freshnessPct).toBeCloseTo(50, 5)
+    })
+
+    it("computes avgSeedTimeDays only from seeding torrents", () => {
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.trackerHealth.find((t) => t.name === "Aither")
+      // T1 seedingTime = 86400 / 86400 = 1 day, torrentCount=1
+      expect(aither?.avgSeedTimeDays).toBeCloseTo(1 / 1, 5)
+    })
+
+    it("excludes trackers with zero torrents from health list", () => {
+      // Only T2 is blutopia, no aither torrents
+      const result = computeFleetAggregation([T2], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.trackerHealth.some((t) => t.name === "Aither")).toBe(false)
+      expect(result.trackerHealth.some((t) => t.name === "Blutopia")).toBe(true)
+    })
+  })
+
+  // 8. Storage treemap
+  describe("storageByTrackerCategory", () => {
+    it("groups by tracker and category", () => {
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.storageByTrackerCategory.find((s) => s.tracker === "Aither")
+      expect(aither).toBeDefined()
+      // Both T1 and T3 are movies/aither
+      const movies = aither?.categories.find((c) => c.name === "movies")
+      expect(movies?.count).toBe(2)
+      expect(movies?.totalSize).toBe(T1.size + T3.size)
+    })
+
+    it("groups multiple categories under same tracker", () => {
+      const tvTorrent = makeTorrent({ hash: "tv1", tags: "aither", category: "tv" })
+      const result = computeFleetAggregation([T1, tvTorrent], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.storageByTrackerCategory.find((s) => s.tracker === "Aither")
+      expect(aither?.categories).toHaveLength(2)
+    })
+
+    it("normalizes empty category to Uncategorized", () => {
+      const nocat = makeTorrent({ hash: "nc1", tags: "aither", category: "" })
+      const result = computeFleetAggregation([nocat], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.storageByTrackerCategory.find((s) => s.tracker === "Aither")
+      const uncategorized = aither?.categories.find((c) => c.name === "Uncategorized")
+      expect(uncategorized).toBeDefined()
+    })
+  })
+
+  // 9. Category breakdown (count-only view, same source data as storageByTrackerCategory)
+  describe("categoryBreakdown", () => {
+    it("returns tracker name and category names matching storageByTrackerCategory", () => {
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      // Both T1 and T3 are aither/movies
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      const storage = result.storageByTrackerCategory.find((s) => s.tracker === "Aither")
+      expect(breakdown).toBeDefined()
+      expect(storage).toBeDefined()
+      // Category names must match
+      const breakdownNames = breakdown?.categories.map((c) => c.name).sort()
+      const storageNames = storage?.categories.map((c) => c.name).sort()
+      expect(breakdownNames).toEqual(storageNames)
+    })
+
+    it("counts match storageByTrackerCategory counts for same input", () => {
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      const storage = result.storageByTrackerCategory.find((s) => s.tracker === "Aither")
+      for (const cat of breakdown?.categories ?? []) {
+        const storageCat = storage?.categories.find((c) => c.name === cat.name)
+        expect(storageCat).toBeDefined()
+        expect(cat.count).toBe(storageCat?.count)
+      }
+    })
+
+    it("single tracker with one category returns correct count", () => {
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      expect(breakdown).toBeDefined()
+      expect(breakdown?.categories).toHaveLength(1)
+      expect(breakdown?.categories[0].name).toBe("movies")
+      expect(breakdown?.categories[0].count).toBe(1)
+    })
+
+    it("multiple categories under the same tracker both appear", () => {
+      const tvTorrent = makeTorrent({ hash: "tv2", tags: "aither", category: "tv" })
+      const result = computeFleetAggregation([T1, tvTorrent], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      expect(breakdown?.categories).toHaveLength(2)
+      const catNames = breakdown?.categories.map((c) => c.name)
+      expect(catNames).toContain("movies")
+      expect(catNames).toContain("tv")
+    })
+
+    it("normalizes empty category to Uncategorized in breakdown", () => {
+      const nocat = makeTorrent({ hash: "nc2", tags: "aither", category: "" })
+      const result = computeFleetAggregation([nocat], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      const uncategorized = breakdown?.categories.find((c) => c.name === "Uncategorized")
+      expect(uncategorized).toBeDefined()
+      expect(uncategorized?.count).toBe(1)
+    })
+
+    it("count increments correctly for multiple torrents in the same category", () => {
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      // T1 and T3 are both aither/movies
+      const movies = breakdown?.categories.find((c) => c.name === "movies")
+      expect(movies?.count).toBe(2)
+    })
+
+    it("does not include totalSize field (count-only shape)", () => {
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const breakdown = result.categoryBreakdown.find((b) => b.tracker === "Aither")
+      const cat = breakdown?.categories[0]
+      expect(cat).toBeDefined()
+      expect(Object.keys(cat ?? {})).not.toContain("totalSize")
+    })
+  })
+
+  // 10. Size arrays grouped by tracker
+  describe("sizesByTracker", () => {
+    it("groups sizes by tracker tag", () => {
+      const result = computeFleetAggregation([T1, T2], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.sizesByTracker.find((s) => s.tag === "aither")
+      expect(aither?.sizes).toEqual([T1.size])
+      const blutopia = result.sizesByTracker.find((s) => s.tag === "blutopia")
+      expect(blutopia?.sizes).toEqual([T2.size])
+    })
+
+    it("includes color and name for each tracker entry", () => {
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.sizesByTracker.find((s) => s.tag === "aither")
+      expect(aither?.name).toBe("Aither")
+      expect(aither?.color).toBe("#01d4ff")
+    })
+  })
+
+  // 10. Age timeline monthly counts
+  describe("ageTimeline", () => {
+    it("produces correct monthly counts per tracker", () => {
+      // T1 addedAt = BASE_SEC - 86400*15 (June 2024 - 15 days = ~May/June 2024)
+      const t1MonthKey = new Date((BASE_SEC - 86_400 * 15) * 1000).toISOString().substring(0, 7)
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.ageTimeline.find((t) => t.name === "Aither")
+      expect(aither).toBeDefined()
+      expect(aither?.months.length).toBeGreaterThan(0)
+      const month = aither?.months.find((m) => m.month === t1MonthKey)
+      expect(month?.count).toBe(1)
+    })
+
+    it("months are sorted ascending", () => {
+      const early = makeTorrent({
+        hash: "early",
+        tags: "aither",
+        addedAt: BASE_SEC - 86_400 * 120,
+      })
+      const late = makeTorrent({ hash: "late", tags: "aither", addedAt: BASE_SEC - 86_400 * 5 })
+      const result = computeFleetAggregation([late, early], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const aither = result.ageTimeline.find((t) => t.name === "Aither")
+      const months = aither?.months ?? []
+      for (let i = 1; i < months.length; i++) {
+        expect(months[i].month >= months[i - 1].month).toBe(true)
+      }
+    })
+  })
+
+  // 11. Category timeline monthly counts
+  describe("categoryTimeline", () => {
+    it("groups torrents by category across trackers", () => {
+      const result = computeFleetAggregation([T1, T2, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const movies = result.categoryTimeline.find((c) => c.category === "movies")
+      expect(movies).toBeDefined()
+      const tv = result.categoryTimeline.find((c) => c.category === "tv")
+      expect(tv).toBeDefined()
+    })
+
+    it("counts months correctly for a category", () => {
+      // T1 and T3 both "movies"; they may share or differ in month
+      const result = computeFleetAggregation([T1, T3], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const movies = result.categoryTimeline.find((c) => c.category === "movies")
+      const totalCount = movies?.months.reduce((sum, m) => sum + m.count, 0) ?? 0
+      expect(totalCount).toBe(2)
+    })
+
+    it("months are sorted ascending", () => {
+      const early = makeTorrent({
+        hash: "ce",
+        tags: "aither",
+        category: "movies",
+        addedAt: BASE_SEC - 86_400 * 120,
+      })
+      const late = makeTorrent({
+        hash: "cl",
+        tags: "aither",
+        category: "movies",
+        addedAt: BASE_SEC - 86_400 * 5,
+      })
+      const result = computeFleetAggregation([late, early], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const movies = result.categoryTimeline.find((c) => c.category === "movies")
+      const months = movies?.months ?? []
+      for (let i = 1; i < months.length; i++) {
+        expect(months[i].month >= months[i - 1].month).toBe(true)
+      }
+    })
+  })
+
+  // 12. Cross-seed network
+  describe("crossSeedNetwork", () => {
+    it("detects shared-name pairs as cross-seeded between trackers", () => {
+      // T4_AITHER and T4_BLUTOPIA share name "Shared.Movie.2024.mkv"
+      const result = computeFleetAggregation(
+        [T4_AITHER, T4_BLUTOPIA],
+        TRACKER_TAGS,
+        CROSS_SEED_TAGS
+      )
+      expect(result.crossSeedNetwork.edges).toHaveLength(1)
+      const edge = result.crossSeedNetwork.edges[0]
+      const pair = [edge.source, edge.target].sort()
+      expect(pair).toEqual(["aither", "blutopia"])
+      expect(edge.weight).toBe(1)
+    })
+
+    it("counts cross-seeded per node correctly", () => {
+      const result = computeFleetAggregation(
+        [T4_AITHER, T4_BLUTOPIA],
+        TRACKER_TAGS,
+        CROSS_SEED_TAGS
+      )
+      const aitherNode = result.crossSeedNetwork.nodes.find((n) => n.id === "aither")
+      expect(aitherNode?.crossSeeded).toBe(1)
+    })
+
+    it("does not create network nodes for trackers with zero torrents", () => {
+      // Only aither torrent, no blutopia
+      const result = computeFleetAggregation([T1], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const blutopiaNode = result.crossSeedNetwork.nodes.find((n) => n.id === "blutopia")
+      expect(blutopiaNode).toBeUndefined()
+    })
+
+    it("excludes cross-seed tags from network tracker matching", () => {
+      // T5 has tags "aither, cross-seed" -- cross-seed should not be a node
+      const result = computeFleetAggregation([T5], TRACKER_TAGS, CROSS_SEED_TAGS)
+      const csNode = result.crossSeedNetwork.nodes.find((n) => n.id === "cross-seed")
+      expect(csNode).toBeUndefined()
+    })
+
+    it("returns no edges when no torrents share names across trackers", () => {
+      // T1 (aither) and T2 (blutopia) have different names
+      const result = computeFleetAggregation([T1, T2], TRACKER_TAGS, CROSS_SEED_TAGS)
+      expect(result.crossSeedNetwork.edges).toHaveLength(0)
+    })
+  })
+
+  // 13. Edge cases
+  describe("edge cases", () => {
+    // ratio -1 sentinel (qBT uses -1 for infinite ratio: downloaded=0, i.e. pure cross-seed)
+    describe("ratio -1 sentinel", () => {
+      it("excludes ratio=-1 torrent from ratioDistribution", () => {
+        const infinite = makeTorrent({ hash: "inf1", tags: "aither", ratio: -1 })
+        const result = computeFleetAggregation([infinite], TRACKER_TAGS, CROSS_SEED_TAGS)
+        for (const bucket of result.ratioDistribution) {
+          expect(bucket.count).toBe(0)
+        }
+      })
+
+      it("excludes ratio=-1 torrent from trackerHealth.avgRatio", () => {
+        const infinite = makeTorrent({ hash: "inf2", tags: "aither", ratio: -1 })
+        const result = computeFleetAggregation([infinite], TRACKER_TAGS, CROSS_SEED_TAGS)
+        const aither = result.trackerHealth.find((t) => t.name === "Aither")
+        // validRatioCount is 0, so avgRatio falls back to 0
+        expect(aither?.avgRatio).toBe(0)
+      })
+    })
+
+    // Torrent whose tags contain no matching tracker tag
+    describe("torrent with no matching tracker tag", () => {
+      const orphan = makeTorrent({
+        hash: "orphan1",
+        tags: "someunknowntracker",
+        state: "uploading",
+        category: "movies",
+        addedAt: BASE_SEC - 86_400 * 3,
+      })
+
+      it("is counted in stats.totalSeeding", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        expect(result.stats.totalSeeding).toBe(1)
+      })
+
+      it("does not appear in trackerHealth", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        expect(result.trackerHealth).toHaveLength(0)
+      })
+
+      it("does not appear in sizesByTracker", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        expect(result.sizesByTracker).toHaveLength(0)
+      })
+
+      it("does not appear in ageBands", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        expect(result.ageBands).toHaveLength(0)
+      })
+
+      it("does not appear in ageTimeline", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        expect(result.ageTimeline).toHaveLength(0)
+      })
+
+      it("does appear in activityGrid when it has a valid addedAt", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        const totalActivity = result.activityGrid.data.reduce((sum, [, , count]) => sum + count, 0)
+        expect(totalActivity).toBe(1)
+      })
+
+      it("does appear in categoryTimeline (categories are not tracker-specific)", () => {
+        const result = computeFleetAggregation([orphan], TRACKER_TAGS, CROSS_SEED_TAGS)
+        const movies = result.categoryTimeline.find((c) => c.category === "movies")
+        expect(movies).toBeDefined()
+        const totalCount = movies?.months.reduce((sum, m) => sum + m.count, 0) ?? 0
+        expect(totalCount).toBe(1)
+      })
+    })
+
+    // Mixed seeding/leeching for seed time and avgSeedTimeDays
+    describe("mixed seeding and leeching torrents for the same tracker", () => {
+      // Seeding torrent: state uploading, seedingTime 86400 (1 day)
+      const seedingTorrent = makeTorrent({
+        hash: "mix-seed",
+        tags: "aither",
+        state: "uploading",
+        seedingTime: 86_400,
+      })
+      // Leeching torrent: state downloading, seedingTime 0 (never seeded)
+      const leechingTorrent = makeTorrent({
+        hash: "mix-leech",
+        tags: "aither",
+        state: "downloading",
+        seedingTime: 0,
+      })
+
+      it("seedTimeDistribution only counts the seeding torrent", () => {
+        const result = computeFleetAggregation(
+          [seedingTorrent, leechingTorrent],
+          TRACKER_TAGS,
+          CROSS_SEED_TAGS
+        )
+        const total = result.seedTimeDistribution.reduce((sum, b) => sum + b.count, 0)
+        expect(total).toBe(1)
+      })
+
+      it("trackerHealth.avgSeedTimeDays averages seedingTime across all tracker torrents", () => {
+        // seedTimeDaysSum = (86400/86400) + (0/86400) = 1.0 + 0 = 1.0
+        // torrentCount = 2
+        // avgSeedTimeDays = 1.0 / 2 = 0.5
+        const result = computeFleetAggregation(
+          [seedingTorrent, leechingTorrent],
+          TRACKER_TAGS,
+          CROSS_SEED_TAGS
+        )
+        const aither = result.trackerHealth.find((t) => t.name === "Aither")
+        expect(aither?.avgSeedTimeDays).toBeCloseTo(0.5, 5)
+      })
+    })
+  })
+})
diff --git a/src/lib/__tests__/fleet-helpers.test.ts b/src/lib/__tests__/fleet-helpers.test.ts
new file mode 100644
index 00000000..03b22e8e
--- /dev/null
+++ b/src/lib/__tests__/fleet-helpers.test.ts
@@ -0,0 +1,94 @@
+// src/lib/__tests__/fleet-helpers.test.ts
+
+import { describe, expect, it } from "vitest"
+import { normalizeCategory, parseTorrentTags, toMonthKey } from "@/lib/fleet"
+
+// ---------------------------------------------------------------------------
+// normalizeCategory
+// ---------------------------------------------------------------------------
+
+describe("normalizeCategory", () => {
+  it("returns Uncategorized for empty string", () => {
+    expect(normalizeCategory("")).toBe("Uncategorized")
+  })
+
+  it("returns Uncategorized for null", () => {
+    expect(normalizeCategory(null)).toBe("Uncategorized")
+  })
+
+  it("returns Uncategorized for undefined", () => {
+    expect(normalizeCategory(undefined)).toBe("Uncategorized")
+  })
+
+  it("returns Uncategorized for whitespace-only string", () => {
+    expect(normalizeCategory("   ")).toBe("Uncategorized")
+  })
+
+  it("trims leading and trailing whitespace", () => {
+    expect(normalizeCategory("  movies  ")).toBe("movies")
+  })
+
+  it("returns category as-is for non-empty input", () => {
+    expect(normalizeCategory("movies")).toBe("movies")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// toMonthKey
+// ---------------------------------------------------------------------------
+
+describe("toMonthKey", () => {
+  it("produces correct YYYY-MM format for a known timestamp", () => {
+    // 1700000000 seconds = 2023-11-14T22:13:20Z
+    const result = toMonthKey(1700000000)
+    expect(result).toBe("2023-11")
+  })
+
+  it("pads single-digit months with a leading zero", () => {
+    // 1704067200 = 2024-01-01T00:00:00Z (January)
+    const result = toMonthKey(1704067200)
+    expect(result).toBe("2024-01")
+  })
+
+  it("uses UTC month, not local time", () => {
+    // Pick a timestamp that sits at the very end of one UTC month but could
+    // fall in the next month in UTC+X timezones:
+    // 1696118399 = 2023-09-30T23:59:59Z (still September in UTC)
+    const result = toMonthKey(1696118399)
+    expect(result).toBe("2023-09")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// parseTorrentTags
+// ---------------------------------------------------------------------------
+
+describe("parseTorrentTags", () => {
+  it("returns empty array for empty string", () => {
+    expect(parseTorrentTags("")).toEqual([])
+  })
+
+  it("returns empty array for null (cast as string)", () => {
+    expect(parseTorrentTags(null as unknown as string)).toEqual([])
+  })
+
+  it("returns empty array for undefined (cast as string)", () => {
+    expect(parseTorrentTags(undefined as unknown as string)).toEqual([])
+  })
+
+  it("parses comma-separated tags", () => {
+    expect(parseTorrentTags("aither, blutopia")).toEqual(["aither", "blutopia"])
+  })
+
+  it("lowercases tags by default", () => {
+    expect(parseTorrentTags("Aither")).toEqual(["aither"])
+  })
+
+  it("preserves case when lowercase=false", () => {
+    expect(parseTorrentTags("Aither", false)).toEqual(["Aither"])
+  })
+
+  it("filters empty strings produced by trailing commas", () => {
+    expect(parseTorrentTags("aither,")).toEqual(["aither"])
+  })
+})
diff --git a/src/lib/__tests__/formatters-today.test.ts b/src/lib/__tests__/formatters-today.test.ts
index 075a10ba..2a186b10 100644
--- a/src/lib/__tests__/formatters-today.test.ts
+++ b/src/lib/__tests__/formatters-today.test.ts
@@ -34,16 +34,6 @@ describe("localDateStr", () => {
     expect(result).toBe(today)
   })
 
-  it("uses en-CA locale formatting (YYYY-MM-DD, not MM/DD/YYYY)", () => {
-    // en-CA produces ISO-style dates; en-US would produce "6/15/2024"
-    const d = new Date(2024, 5, 15)
-    const result = localDateStr(d)
-    // Must not contain slashes
-    expect(result).not.toContain("/")
-    // Must match the ISO date pattern
-    expect(result).toMatch(/^\d{4}-\d{2}-\d{2}$/)
-  })
-
   it("handles the first day of the month without off-by-one", () => {
     const d = new Date(2024, 0, 1) // January 1 local
     expect(localDateStr(d)).toBe("2024-01-01")
@@ -75,12 +65,6 @@ describe("formatBytesFromString MiB/GiB threshold", () => {
   const GiB = 1024 * 1024 * 1024
   const TiB = 1024 * 1024 * 1024 * 1024
 
-  it("value of exactly 0 bytes returns MiB scale", () => {
-    // "0" bigint → 0 bytes → 0 MiB
-    const result = formatBytesFromString("0")
-    expect(result).toContain("MiB")
-  })
-
   it("returns '0 MiB' (zero padded rounds to 0) for 0 bytes", () => {
     expect(formatBytesFromString("0")).toBe("0 MiB")
   })
diff --git a/src/lib/__tests__/formatters.test.ts b/src/lib/__tests__/formatters.test.ts
index fcf51aca..982fda0a 100644
--- a/src/lib/__tests__/formatters.test.ts
+++ b/src/lib/__tests__/formatters.test.ts
@@ -1,7 +1,16 @@
 // src/lib/__tests__/formatters.test.ts
 
 import { describe, expect, it } from "vitest"
-import { bytesToGiB, computeDelta, hexToRgba } from "@/lib/formatters"
+import { hexToRgba } from "@/lib/color-utils"
+import { computeBufferBytes, computeDelta, floatBytesToBigInt } from "@/lib/data-transforms"
+import {
+  bytesToGiB,
+  formatCount,
+  formatDateTime,
+  formatPercent,
+  formatRatio,
+  formatRatioDisplay,
+} from "@/lib/formatters"
 import type { Snapshot } from "@/types/api"
 
 describe("bytesToGiB", () => {
@@ -53,6 +62,7 @@ const makeSnap = (polledAt: string, up: string, down: string): Snapshot => ({
   shareScore: null,
   username: null,
   group: null,
+  isManual: false,
 })
 
 describe("computeDelta", () => {
@@ -90,3 +100,162 @@ describe("computeDelta", () => {
     expect(computeDelta(snaps)).toBeNull()
   })
 })
+
+// ---------------------------------------------------------------------------
+// formatRatio
+// ---------------------------------------------------------------------------
+
+describe("formatRatio", () => {
+  it("formats a ratio to 2 decimal places", () => {
+    expect(formatRatio(1.5)).toBe("1.50")
+    expect(formatRatio(0)).toBe("0.00")
+  })
+
+  it("returns em dash for null and undefined", () => {
+    expect(formatRatio(null)).toBe("—")
+    expect(formatRatio(undefined)).toBe("—")
+  })
+
+  it("returns infinity symbol for non-finite values", () => {
+    expect(formatRatio(Infinity)).toBe("∞")
+    expect(formatRatio(-Infinity)).toBe("∞")
+    expect(formatRatio(NaN)).toBe("∞")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// formatRatioDisplay
+// ---------------------------------------------------------------------------
+
+describe("formatRatioDisplay", () => {
+  it("formats a ratio with 2dp and x suffix", () => {
+    expect(formatRatioDisplay(1.5)).toBe("1.50x")
+    expect(formatRatioDisplay(0)).toBe("0.00x")
+    expect(formatRatioDisplay(12.345)).toBe("12.35x")
+  })
+
+  it("returns em dash for null and undefined", () => {
+    expect(formatRatioDisplay(null)).toBe("—")
+    expect(formatRatioDisplay(undefined)).toBe("—")
+  })
+
+  it("returns infinity symbol for Infinity and NaN", () => {
+    expect(formatRatioDisplay(Infinity)).toBe("∞x")
+    expect(formatRatioDisplay(-Infinity)).toBe("∞x")
+    expect(formatRatioDisplay(NaN)).toBe("∞x")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// formatCount
+// ---------------------------------------------------------------------------
+
+describe("formatCount", () => {
+  it("formats integers with thousand separators", () => {
+    expect(formatCount(0)).toBe("0")
+    expect(formatCount(999)).toBe("999")
+    expect(formatCount(1234)).toBe("1,234")
+    expect(formatCount(1_000_000)).toBe("1,000,000")
+  })
+
+  it("returns em dash for null and undefined", () => {
+    expect(formatCount(null)).toBe("—")
+    expect(formatCount(undefined)).toBe("—")
+  })
+
+  it("handles negative numbers", () => {
+    expect(formatCount(-42)).toBe("-42")
+    expect(formatCount(-1234)).toBe("-1,234")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// formatPercent
+// ---------------------------------------------------------------------------
+
+describe("formatPercent", () => {
+  it("formats with 1 decimal place by default", () => {
+    expect(formatPercent(42.37)).toBe("42.4%")
+    expect(formatPercent(0)).toBe("0.0%")
+    expect(formatPercent(100)).toBe("100.0%")
+  })
+
+  it("respects custom decimal places", () => {
+    expect(formatPercent(85, 0)).toBe("85%")
+    expect(formatPercent(33.333, 2)).toBe("33.33%")
+  })
+
+  it("handles edge values", () => {
+    expect(formatPercent(-5.1)).toBe("-5.1%")
+    expect(formatPercent(0.05, 0)).toBe("0%")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// formatDateTime
+// ---------------------------------------------------------------------------
+
+describe("formatDateTime", () => {
+  it("formats an ISO string", () => {
+    const result = formatDateTime("2026-03-15T14:30:00.000Z")
+    expect(result).toContain("2026")
+    expect(result).not.toBe("Invalid Date")
+  })
+
+  it("formats a Date object", () => {
+    const result = formatDateTime(new Date("2026-03-15T14:30:00.000Z"))
+    expect(result).toContain("2026")
+    expect(result).not.toBe("Invalid Date")
+  })
+
+  it("formats a numeric timestamp", () => {
+    // 1710510600000 = 2024-03-15T16:30:00.000Z
+    const result = formatDateTime(1710510600000)
+    expect(result).toContain("2024")
+    expect(result).not.toBe("Invalid Date")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// floatBytesToBigInt
+// ---------------------------------------------------------------------------
+
+describe("floatBytesToBigInt", () => {
+  it("converts a float to a floored bigint", () => {
+    expect(floatBytesToBigInt(1234.7)).toBe(1234n)
+    expect(floatBytesToBigInt(0)).toBe(0n)
+    expect(floatBytesToBigInt(1024 * 1024 * 1024)).toBe(1073741824n)
+  })
+
+  it("returns 0n for null and undefined", () => {
+    expect(floatBytesToBigInt(null)).toBe(0n)
+    expect(floatBytesToBigInt(undefined)).toBe(0n)
+  })
+
+  it("floors fractional bytes", () => {
+    expect(floatBytesToBigInt(999.999)).toBe(999n)
+    expect(floatBytesToBigInt(0.1)).toBe(0n)
+  })
+
+  it("clamps negative values to 0n", () => {
+    expect(floatBytesToBigInt(-1)).toBe(0n)
+    expect(floatBytesToBigInt(-0.5)).toBe(0n)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// computeBufferBytes
+// ---------------------------------------------------------------------------
+
+describe("computeBufferBytes", () => {
+  it("returns the difference when upload exceeds download", () => {
+    expect(computeBufferBytes(500n, 200n)).toBe(300n)
+    expect(computeBufferBytes(1000n, 0n)).toBe(1000n)
+  })
+
+  it("returns 0n when download exceeds or equals upload", () => {
+    expect(computeBufferBytes(100n, 500n)).toBe(0n)
+    expect(computeBufferBytes(500n, 500n)).toBe(0n)
+    expect(computeBufferBytes(0n, 0n)).toBe(0n)
+  })
+})
diff --git a/src/lib/__tests__/lockout.test.ts b/src/lib/__tests__/lockout.test.ts
index 37c6930f..39002622 100644
--- a/src/lib/__tests__/lockout.test.ts
+++ b/src/lib/__tests__/lockout.test.ts
@@ -62,6 +62,12 @@ describe("recordFailedAttempt", () => {
     expect(mockUpdate).toHaveBeenCalled()
     expect(chain.set).toHaveBeenCalled()
     expect(chain.returning).toHaveBeenCalled()
+    // The argument to .set() must contain a failedLoginAttempts key built from a
+    // drizzle sql`` expression — i.e. not a plain numeric literal — so that the
+    // increment is atomic at the database level and avoids read-modify-write races.
+    const setArg = chain.set.mock.calls[0][0] as Record<string, unknown>
+    expect(setArg).toHaveProperty("failedLoginAttempts")
+    expect(typeof setArg.failedLoginAttempts).not.toBe("number")
   })
 
   it("does not set lockout below threshold", async () => {
diff --git a/src/lib/__tests__/metric-chart.test.ts b/src/lib/__tests__/metric-chart.test.ts
index 5c677467..3bd4a0cc 100644
--- a/src/lib/__tests__/metric-chart.test.ts
+++ b/src/lib/__tests__/metric-chart.test.ts
@@ -1,7 +1,6 @@
 // src/lib/__tests__/metric-chart.test.ts
 
 import { describe, expect, it } from "vitest"
-import { computeDailyDeltas } from "@/components/charts/lib/chart-transforms"
 import { extractRankHistory } from "@/components/dashboard/RankProgress"
 import type { Snapshot } from "@/types/api"
 
@@ -25,6 +24,7 @@ const makeSnapshot = (overrides: Partial<Snapshot> = {}): Snapshot => ({
   shareScore: null,
   username: "testuser",
   group: "User",
+  isManual: false,
   ...overrides,
 })
 
@@ -37,130 +37,6 @@ function isoAt(dayOffset: number, hour = 12): string {
   return d.toISOString()
 }
 
-// 1 GiB in bytes
-const GiB = 1024 ** 3
-
-// ---------------------------------------------------------------------------
-// computeDailyDeltas
-// ---------------------------------------------------------------------------
-
-describe("computeDailyDeltas", () => {
-  it("returns empty array for zero snapshots", () => {
-    expect(computeDailyDeltas([])).toEqual([])
-  })
-
-  it("returns empty array for exactly one snapshot", () => {
-    expect(computeDailyDeltas([makeSnapshot()])).toEqual([])
-  })
-
-  it("computes correct upload and download deltas in GiB between two snapshots", () => {
-    const snapshots = [
-      makeSnapshot({
-        polledAt: isoAt(0, 8),
-        uploadedBytes: "0",
-        downloadedBytes: "0",
-      }),
-      makeSnapshot({
-        polledAt: isoAt(0, 20),
-        uploadedBytes: String(2 * GiB),
-        downloadedBytes: String(GiB),
-      }),
-    ]
-
-    const result = computeDailyDeltas(snapshots)
-
-    expect(result).toHaveLength(1)
-    expect(result[0].uploadDelta).toBeCloseTo(2, 5)
-    expect(result[0].downloadDelta).toBeCloseTo(1, 5)
-  })
-
-  it("produces a labelled bucket per calendar day", () => {
-    const snapshots = [
-      makeSnapshot({ polledAt: isoAt(0), uploadedBytes: "0", downloadedBytes: "0" }),
-      makeSnapshot({ polledAt: isoAt(1), uploadedBytes: String(GiB), downloadedBytes: "0" }),
-      makeSnapshot({ polledAt: isoAt(2), uploadedBytes: String(2 * GiB), downloadedBytes: "0" }),
-    ]
-
-    const result = computeDailyDeltas(snapshots)
-
-    expect(result).toHaveLength(2)
-    // Each bucket should carry a 1 GiB upload delta
-    for (const bucket of result) {
-      expect(bucket.uploadDelta).toBeCloseTo(1, 5)
-    }
-  })
-
-  it("buckets multiple snapshots from the same calendar day into a single entry", () => {
-    // Three snapshots across two intra-day polls — all landing on the same day
-    const snapshots = [
-      makeSnapshot({ polledAt: isoAt(0, 8), uploadedBytes: "0", downloadedBytes: "0" }),
-      makeSnapshot({
-        polledAt: isoAt(0, 14),
-        uploadedBytes: String(GiB),
-        downloadedBytes: String(GiB),
-      }),
-      makeSnapshot({
-        polledAt: isoAt(0, 20),
-        uploadedBytes: String(3 * GiB),
-        downloadedBytes: String(2 * GiB),
-      }),
-    ]
-
-    const result = computeDailyDeltas(snapshots)
-
-    // Both deltas collapse into one calendar-day bucket
-    expect(result).toHaveLength(1)
-    // Total upload delta = (1 GiB - 0) + (3 GiB - 1 GiB) = 3 GiB
-    expect(result[0].uploadDelta).toBeCloseTo(3, 5)
-    // Total download delta = (1 GiB - 0) + (2 GiB - 1 GiB) = 2 GiB
-    expect(result[0].downloadDelta).toBeCloseTo(2, 5)
-  })
-
-  it("handles large byte values correctly via BigInt arithmetic", () => {
-    // Values that would overflow a 32-bit integer (~4 GiB boundary)
-    const fourGiB = BigInt(4) * BigInt(GiB)
-    const eightGiB = BigInt(8) * BigInt(GiB)
-
-    const snapshots = [
-      makeSnapshot({ polledAt: isoAt(0), uploadedBytes: fourGiB.toString(), downloadedBytes: "0" }),
-      makeSnapshot({
-        polledAt: isoAt(1),
-        uploadedBytes: eightGiB.toString(),
-        downloadedBytes: "0",
-      }),
-    ]
-
-    const result = computeDailyDeltas(snapshots)
-
-    expect(result).toHaveLength(1)
-    expect(result[0].uploadDelta).toBeCloseTo(4, 5)
-  })
-
-  it("correctly separates deltas across two distinct days", () => {
-    const snapshots = [
-      makeSnapshot({ polledAt: isoAt(0), uploadedBytes: "0", downloadedBytes: "0" }),
-      makeSnapshot({
-        polledAt: isoAt(1),
-        uploadedBytes: String(GiB),
-        downloadedBytes: String(2 * GiB),
-      }),
-      makeSnapshot({
-        polledAt: isoAt(2),
-        uploadedBytes: String(4 * GiB),
-        downloadedBytes: String(5 * GiB),
-      }),
-    ]
-
-    const result = computeDailyDeltas(snapshots)
-
-    expect(result).toHaveLength(2)
-    expect(result[0].uploadDelta).toBeCloseTo(1, 5)
-    expect(result[0].downloadDelta).toBeCloseTo(2, 5)
-    expect(result[1].uploadDelta).toBeCloseTo(3, 5)
-    expect(result[1].downloadDelta).toBeCloseTo(3, 5)
-  })
-})
-
 // ---------------------------------------------------------------------------
 // extractRankHistory
 // ---------------------------------------------------------------------------
diff --git a/src/lib/__tests__/notification-delivery.test.ts b/src/lib/__tests__/notification-delivery.test.ts
index b37aa938..6e591757 100644
--- a/src/lib/__tests__/notification-delivery.test.ts
+++ b/src/lib/__tests__/notification-delivery.test.ts
@@ -6,6 +6,7 @@
 // and successful delivery reset.
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
+import type { DiscordEmbed } from "@/lib/notifications/payload"
 
 vi.mock("@/lib/logger", () => ({
   log: { warn: vi.fn(), error: vi.fn(), info: vi.fn() },
@@ -21,7 +22,9 @@ vi.mock("@/lib/error-utils", async (importOriginal) => {
 
 const TARGET_ID = 42
 const WEBHOOK_URL = "https://discord.com/api/webhooks/123/abc"
-const EMBEDS = [{ title: "test" }] as Record<string, unknown>[]
+const EMBEDS: DiscordEmbed[] = [
+  { title: "test", description: "test description", color: 0, timestamp: new Date().toISOString() },
+]
 
 function mockFetchOk() {
   vi.stubGlobal("fetch", vi.fn().mockResolvedValue({ ok: true, status: 200, statusText: "OK" }))
@@ -52,8 +55,8 @@ describe("notification delivery circuit breaker", () => {
   beforeEach(async () => {
     vi.resetModules()
     // Clear globalThis circuit breaker state
-    const g = globalThis as Record<string, unknown>
-    delete g.__notificationCircuitBreakers
+    const g = globalThis as typeof globalThis & { __notificationCircuits?: unknown }
+    delete g.__notificationCircuits
 
     const mod = await import("@/lib/notifications/deliver")
     deliverDiscordWebhook = mod.deliverDiscordWebhook
@@ -205,22 +208,28 @@ describe("notification delivery circuit breaker", () => {
     const errorUtils = await import("@/lib/error-utils")
     vi.spyOn(errorUtils, "sanitizeNetworkError")
     mockFetchThrow("connect ECONNREFUSED 192.168.1.100:443")
-    await deliverDiscordWebhook(TARGET_ID, WEBHOOK_URL, EMBEDS)
+    const result = await deliverDiscordWebhook(TARGET_ID, WEBHOOK_URL, EMBEDS)
     expect(errorUtils.sanitizeNetworkError).toHaveBeenCalledWith(
       "connect ECONNREFUSED 192.168.1.100:443",
       "Delivery failed"
     )
+    // Raw IP/port details must not leak through — sanitizeNetworkError maps ECONNREFUSED → "Connection refused"
+    expect(result.error).not.toBe("connect ECONNREFUSED 192.168.1.100:443")
+    expect(result.error).toBe("Connection refused")
   })
 
   it("sanitizes error messages from non-ok HTTP responses", async () => {
     const errorUtils = await import("@/lib/error-utils")
     vi.spyOn(errorUtils, "sanitizeNetworkError")
     mockFetchError(403, "Forbidden")
-    await deliverDiscordWebhook(TARGET_ID, WEBHOOK_URL, EMBEDS)
+    const result = await deliverDiscordWebhook(TARGET_ID, WEBHOOK_URL, EMBEDS)
     expect(errorUtils.sanitizeNetworkError).toHaveBeenCalledWith(
       "Webhook API error: 403 Forbidden",
       "Delivery failed"
     )
+    // 403 Forbidden matches the 401|403|Unauthorized|Forbidden pattern → "Authentication failed"
+    expect(result.error).not.toBe("Webhook API error: 403 Forbidden")
+    expect(result.error).toBe("Authentication failed")
   })
 
   // ─── Isolation between targets ────────────────────────────────────────
diff --git a/src/lib/__tests__/notification-type-guards.test.ts b/src/lib/__tests__/notification-type-guards.test.ts
new file mode 100644
index 00000000..be406eb8
--- /dev/null
+++ b/src/lib/__tests__/notification-type-guards.test.ts
@@ -0,0 +1,215 @@
+// src/lib/__tests__/notification-type-guards.test.ts
+
+import { describe, expect, it } from "vitest"
+import type {
+  DiscordConfig,
+  EmailConfig,
+  GotifyConfig,
+  NotificationConfig,
+  SlackConfig,
+  TelegramConfig,
+} from "@/lib/notifications/types"
+import { isDiscordConfig, isNotificationConfig } from "@/lib/notifications/types"
+
+// ─── isDiscordConfig ──────────────────────────────────────────────────────────
+
+describe("isDiscordConfig", () => {
+  it("returns true for a valid DiscordConfig", () => {
+    const config: NotificationConfig = { webhookUrl: "https://discord.com/api/webhooks/123/abc" }
+    expect(isDiscordConfig(config)).toBe(true)
+  })
+
+  it("returns true for a SlackConfig because both share the webhookUrl shape", () => {
+    // This is the documented limitation — callers must additionally check target.type
+    const config: NotificationConfig = { webhookUrl: "https://hooks.slack.com/services/T/B/X" }
+    expect(isDiscordConfig(config)).toBe(true)
+  })
+
+  it("returns false for GotifyConfig (no webhookUrl field)", () => {
+    const config: NotificationConfig = { serverUrl: "https://gotify.example.com", appToken: "tok" }
+    expect(isDiscordConfig(config)).toBe(false)
+  })
+
+  it("returns false for TelegramConfig (no webhookUrl field)", () => {
+    const config: NotificationConfig = { botToken: "bot123", chatId: "chat456" }
+    expect(isDiscordConfig(config)).toBe(false)
+  })
+
+  it("returns false for EmailConfig (no webhookUrl field)", () => {
+    const config: NotificationConfig = {
+      host: "smtp.example.com",
+      port: 587,
+      username: "user",
+      password: "pass",
+      from: "from@example.com",
+      to: "to@example.com",
+    }
+    expect(isDiscordConfig(config)).toBe(false)
+  })
+
+  it("returns true for an empty string webhookUrl (shape check only, not content)", () => {
+    // isDiscordConfig validates shape, not URL validity — that is validateNotificationConfig's job
+    const config: NotificationConfig = { webhookUrl: "" }
+    expect(isDiscordConfig(config)).toBe(true)
+  })
+})
+
+// ─── isNotificationConfig ─────────────────────────────────────────────────────
+
+describe("isNotificationConfig", () => {
+  // ── null / non-object primitives ─────────────────────────────────────────
+
+  it("returns false for null", () => {
+    expect(isNotificationConfig(null)).toBe(false)
+  })
+
+  it("returns false for undefined", () => {
+    expect(isNotificationConfig(undefined)).toBe(false)
+  })
+
+  it("returns false for a string", () => {
+    expect(isNotificationConfig("https://discord.com/api/webhooks/123/abc")).toBe(false)
+  })
+
+  it("returns false for a number", () => {
+    expect(isNotificationConfig(42)).toBe(false)
+  })
+
+  it("returns false for a boolean", () => {
+    expect(isNotificationConfig(true)).toBe(false)
+  })
+
+  it("returns false for an empty object", () => {
+    expect(isNotificationConfig({})).toBe(false)
+  })
+
+  it("returns false for an array", () => {
+    expect(isNotificationConfig([])).toBe(false)
+  })
+
+  // ── Discord / Slack (webhookUrl: string) ─────────────────────────────────
+
+  it("returns true for a valid DiscordConfig shape", () => {
+    const config: DiscordConfig = { webhookUrl: "https://discord.com/api/webhooks/123/abc" }
+    expect(isNotificationConfig(config)).toBe(true)
+  })
+
+  it("returns true for a valid SlackConfig shape (same shape as Discord)", () => {
+    const config: SlackConfig = { webhookUrl: "https://hooks.slack.com/services/T/B/X" }
+    expect(isNotificationConfig(config)).toBe(true)
+  })
+
+  it("returns false when webhookUrl is a number, not a string", () => {
+    expect(isNotificationConfig({ webhookUrl: 12345 })).toBe(false)
+  })
+
+  it("returns false when webhookUrl is null", () => {
+    expect(isNotificationConfig({ webhookUrl: null })).toBe(false)
+  })
+
+  it("returns false when webhookUrl is missing but an unrelated string field is present", () => {
+    expect(isNotificationConfig({ url: "https://example.com" })).toBe(false)
+  })
+
+  // ── Gotify (serverUrl + appToken) ─────────────────────────────────────────
+
+  it("returns true for a valid GotifyConfig shape", () => {
+    const config: GotifyConfig = { serverUrl: "https://gotify.example.com", appToken: "tok123" }
+    expect(isNotificationConfig(config)).toBe(true)
+  })
+
+  it("returns false for partial Gotify — serverUrl present but appToken missing", () => {
+    expect(isNotificationConfig({ serverUrl: "https://gotify.example.com" })).toBe(false)
+  })
+
+  it("returns false for partial Gotify — appToken present but serverUrl missing", () => {
+    expect(isNotificationConfig({ appToken: "tok123" })).toBe(false)
+  })
+
+  it("returns false when Gotify appToken is a number, not a string", () => {
+    expect(isNotificationConfig({ serverUrl: "https://gotify.example.com", appToken: 9999 })).toBe(
+      false
+    )
+  })
+
+  it("returns false when Gotify serverUrl is a number, not a string", () => {
+    expect(isNotificationConfig({ serverUrl: 8080, appToken: "tok123" })).toBe(false)
+  })
+
+  // ── Telegram (botToken + chatId) ──────────────────────────────────────────
+
+  it("returns true for a valid TelegramConfig shape", () => {
+    const config: TelegramConfig = { botToken: "bot123:ABC", chatId: "-100456789" }
+    expect(isNotificationConfig(config)).toBe(true)
+  })
+
+  it("returns false for partial Telegram — botToken present but chatId missing", () => {
+    expect(isNotificationConfig({ botToken: "bot123" })).toBe(false)
+  })
+
+  it("returns false for partial Telegram — chatId present but botToken missing", () => {
+    expect(isNotificationConfig({ chatId: "-100456789" })).toBe(false)
+  })
+
+  it("returns false when Telegram chatId is a number, not a string", () => {
+    expect(isNotificationConfig({ botToken: "bot123", chatId: 456789 })).toBe(false)
+  })
+
+  // ── Email (host + port + from + to; username/password not checked by guard) ──
+
+  it("returns true for a valid EmailConfig shape", () => {
+    const config: EmailConfig = {
+      host: "smtp.example.com",
+      port: 587,
+      username: "user",
+      password: "pass",
+      from: "from@example.com",
+      to: "to@example.com",
+    }
+    expect(isNotificationConfig(config)).toBe(true)
+  })
+
+  it("returns true for EmailConfig with minimum required fields (host/port/from/to)", () => {
+    // username and password are not checked by the type guard
+    expect(
+      isNotificationConfig({ host: "smtp.example.com", port: 587, from: "a@b.com", to: "c@d.com" })
+    ).toBe(true)
+  })
+
+  it("returns false for partial Email — port missing", () => {
+    expect(isNotificationConfig({ host: "smtp.example.com", from: "a@b.com", to: "c@d.com" })).toBe(
+      false
+    )
+  })
+
+  it("returns false for partial Email — host missing", () => {
+    expect(isNotificationConfig({ port: 587, from: "a@b.com", to: "c@d.com" })).toBe(false)
+  })
+
+  it("returns false for partial Email — from missing", () => {
+    expect(isNotificationConfig({ host: "smtp.example.com", port: 587, to: "c@d.com" })).toBe(false)
+  })
+
+  it("returns false for partial Email — to missing", () => {
+    expect(isNotificationConfig({ host: "smtp.example.com", port: 587, from: "a@b.com" })).toBe(
+      false
+    )
+  })
+
+  it("returns false when Email port is a string, not a number", () => {
+    expect(
+      isNotificationConfig({
+        host: "smtp.example.com",
+        port: "587",
+        from: "a@b.com",
+        to: "c@d.com",
+      })
+    ).toBe(false)
+  })
+
+  it("returns false when Email host is a number, not a string", () => {
+    expect(isNotificationConfig({ host: 1234, port: 587, from: "a@b.com", to: "c@d.com" })).toBe(
+      false
+    )
+  })
+})
diff --git a/src/lib/__tests__/notifications.test.ts b/src/lib/__tests__/notifications.test.ts
index 287f357b..4e7272f5 100644
--- a/src/lib/__tests__/notifications.test.ts
+++ b/src/lib/__tests__/notifications.test.ts
@@ -1,15 +1,8 @@
 // src/lib/__tests__/notifications.test.ts
 
 import { afterEach, describe, expect, it, vi } from "vitest"
-import { CHART_THEME } from "@/components/charts/lib/theme"
-import type { notificationTargets } from "@/lib/db/schema"
-import type { SnapshotContext } from "@/lib/notifications/dispatch"
-import type { NotificationTargetType } from "@/lib/notifications/types"
-
-// Convert "#rrggbb" hex string to Discord embed integer — mirrors payload.ts hexToInt
-function hexToInt(hex: string): number {
-  return Number.parseInt(hex.replace("#", ""), 16)
-}
+import type { NotificationTargetRow } from "@/lib/db/schema"
+import type { NotificationTargetType, SnapshotContext } from "@/lib/notifications/types"
 
 // Mock DB so dispatch.ts can be imported without a live database connection
 vi.mock("@/lib/db", () => ({
@@ -25,9 +18,7 @@ vi.mock("@/lib/db", () => ({
 
 // ─── Test helpers ─────────────────────────────────────────────────────────────
 
-function makeTarget(
-  overrides: Partial<typeof notificationTargets.$inferSelect> = {}
-): typeof notificationTargets.$inferSelect {
+function makeTarget(overrides: Partial<NotificationTargetRow> = {}): NotificationTargetRow {
   return {
     id: 1,
     name: "Test Target",
@@ -43,6 +34,11 @@ function makeTarget(
     notifyZeroSeeding: false,
     notifyRankChange: false,
     notifyAnniversary: false,
+    notifyBonusCap: false,
+    notifyVipExpiring: false,
+    notifyUnsatisfiedLimit: false,
+    notifyActiveHnrs: false,
+    notifyDownloadDisabled: false,
     thresholds: null,
     includeTrackerName: true,
     scope: null,
@@ -52,7 +48,7 @@ function makeTarget(
     createdAt: new Date(),
     updatedAt: new Date(),
     ...overrides,
-  } as typeof notificationTargets.$inferSelect
+  }
 }
 
 function makeContext(overrides: Partial<SnapshotContext> = {}): SnapshotContext {
@@ -77,7 +73,7 @@ function makeContext(overrides: Partial<SnapshotContext> = {}): SnapshotContext
     trackerPausedAt: null,
     trackerJoinedAt: "2020-01-01",
     minimumRatio: 0.6,
-    mamContext: undefined,
+    platformContext: undefined,
     ...overrides,
   }
 }
@@ -133,7 +129,7 @@ describe("validateNotificationConfig", () => {
       "carrier_pigeon" as unknown as NotificationTargetType,
       {}
     )
-    expect(result).toMatch(/Unsupported/)
+    expect(result).toMatch(/not yet supported/)
   })
 })
 
@@ -162,20 +158,6 @@ describe("buildDiscordEmbed", () => {
     expect(embed.description).not.toContain("MyTracker")
   })
 
-  it("never includes baseUrl in any embed", async () => {
-    const { buildDiscordEmbed } = await import("@/lib/notifications/payload")
-    const embed = buildDiscordEmbed({
-      eventType: "tracker_down",
-      trackerName: "MyTracker",
-      includeTrackerName: true,
-      storeUsernames: true,
-      data: { error: "Connection refused" },
-    })
-    const json = JSON.stringify(embed)
-    expect(json).not.toContain("https://")
-    expect(json).not.toContain("http://")
-  })
-
   it("omits tracker name AND any user-identifying data when both privacy flags are off", async () => {
     const { buildDiscordEmbed } = await import("@/lib/notifications/payload")
     const embed = buildDiscordEmbed({
@@ -352,7 +334,7 @@ describe("buildDiscordEmbed new event types", () => {
       data: {},
     })
     expect(embed.title).toBe("Account Warning")
-    expect(embed.color).toBe(hexToInt(CHART_THEME.warn))
+
     expect(embed.description).toContain("MyTracker")
     expect(embed.description).toContain("warning")
   })
@@ -367,7 +349,7 @@ describe("buildDiscordEmbed new event types", () => {
       data: { currentRatio: 0.5, minimumRatio: 0.6 },
     })
     expect(embed.title).toBe("Ratio Below Minimum")
-    expect(embed.color).toBe(hexToInt(CHART_THEME.danger))
+
     expect(embed.description).toContain("0.50")
     expect(embed.description).toContain("0.60")
     expect(embed.description).toContain("MyTracker")
@@ -383,7 +365,7 @@ describe("buildDiscordEmbed new event types", () => {
       data: {},
     })
     expect(embed.title).toBe("Zero Active Seeds")
-    expect(embed.color).toBe(hexToInt(CHART_THEME.warn))
+
     expect(embed.description).toContain("MyTracker")
     expect(embed.description).toContain("no active seeds")
   })
@@ -398,7 +380,7 @@ describe("buildDiscordEmbed new event types", () => {
       data: { newGroup: "Elite", previousGroup: "Power User" },
     })
     expect(embed.title).toBe("Rank Change")
-    expect(embed.color).toBe(hexToInt(CHART_THEME.accent))
+
     expect(embed.description).toContain("Power User")
     expect(embed.description).toContain("Elite")
     expect(embed.description).toContain("MyTracker")
@@ -411,12 +393,12 @@ describe("buildDiscordEmbed new event types", () => {
       trackerName: "MyTracker",
       includeTrackerName: true,
       storeUsernames: true,
-      data: { label: "1 year anniversary" },
+      data: { label: "1-year anniversary" },
     })
     expect(embed.title).toBe("Membership Anniversary")
-    expect(embed.color).toBe(hexToInt(CHART_THEME.accent))
+
     expect(embed.description).toContain("MyTracker")
-    expect(embed.description).toContain("1 year anniversary")
+    expect(embed.description).toContain("1-year anniversary")
   })
 
   it("omits tracker name in rank_change embed when includeTrackerName is false", async () => {
@@ -550,21 +532,6 @@ describe("validateNotificationConfig edge cases", () => {
     expect(result).not.toBeNull()
     expect(result).toMatch(/not yet supported/)
   })
-
-  it("telegram returns a 'not yet supported' message", async () => {
-    // Same as gotify — tests the parallel switch case.
-    const { validateNotificationConfig } = await import("@/lib/notifications/validate")
-    const result = validateNotificationConfig("telegram", {})
-    expect(result).not.toBeNull()
-    expect(result).toMatch(/not yet supported/)
-  })
-
-  it("slack returns a 'not yet supported' message", async () => {
-    const { validateNotificationConfig } = await import("@/lib/notifications/validate")
-    const result = validateNotificationConfig("slack", {})
-    expect(result).not.toBeNull()
-    expect(result).toMatch(/not yet supported/)
-  })
 })
 
 // ─── Part 6: buildDescription fallback branches in payload.ts ─────────────────
diff --git a/src/lib/__tests__/qbt-type-guards.test.ts b/src/lib/__tests__/qbt-type-guards.test.ts
new file mode 100644
index 00000000..6c1e3b2f
--- /dev/null
+++ b/src/lib/__tests__/qbt-type-guards.test.ts
@@ -0,0 +1,248 @@
+// src/lib/__tests__/qbt-type-guards.test.ts
+
+import { describe, expect, it } from "vitest"
+import { parseCachedTorrents } from "@/lib/download-clients/qbt/transport"
+import type { QbtTorrent } from "@/lib/download-clients/qbt/types"
+import { isQbtTorrent } from "@/lib/download-clients/qbt/types"
+
+// ─── Minimal valid torrent fixture ───────────────────────────────────────────
+
+function makeTorrent(overrides: Partial<QbtTorrent> = {}): QbtTorrent {
+  return {
+    hash: "abc123def456",
+    name: "Some.Torrent.Name",
+    state: "uploading",
+    tags: "aither",
+    category: "movies",
+    upspeed: 1024,
+    dlspeed: 0,
+    uploaded: 5000000,
+    downloaded: 1000000,
+    ratio: 5.0,
+    size: 1000000,
+    num_seeds: 3,
+    num_leechs: 0,
+    num_complete: 10,
+    num_incomplete: 2,
+    tracker: "https://tracker.example.com/announce",
+    added_on: 1700000000,
+    completion_on: 1700001000,
+    last_activity: 1700002000,
+    seeding_time: 86400,
+    time_active: 90000,
+    seen_complete: 1700001500,
+    availability: 1.0,
+    amount_left: 0,
+    progress: 1.0,
+    content_path: "/data/torrent",
+    save_path: "/data",
+    ...overrides,
+  }
+}
+
+// ─── isQbtTorrent ─────────────────────────────────────────────────────────────
+
+describe("isQbtTorrent", () => {
+  // ── null / non-object primitives ─────────────────────────────────────────
+
+  it("returns false for null", () => {
+    expect(isQbtTorrent(null)).toBe(false)
+  })
+
+  it("returns false for undefined", () => {
+    expect(isQbtTorrent(undefined)).toBe(false)
+  })
+
+  it("returns false for a string", () => {
+    expect(isQbtTorrent("not a torrent")).toBe(false)
+  })
+
+  it("returns false for a number", () => {
+    expect(isQbtTorrent(42)).toBe(false)
+  })
+
+  it("returns false for an empty object", () => {
+    expect(isQbtTorrent({})).toBe(false)
+  })
+
+  it("returns false for an array", () => {
+    expect(isQbtTorrent([])).toBe(false)
+  })
+
+  // ── valid shape ───────────────────────────────────────────────────────────
+
+  it("returns true for a valid QbtTorrent", () => {
+    expect(isQbtTorrent(makeTorrent())).toBe(true)
+  })
+
+  it("returns true when optional is_private field is absent", () => {
+    const t = makeTorrent()
+    delete (t as Partial<QbtTorrent>).is_private
+    expect(isQbtTorrent(t)).toBe(true)
+  })
+
+  it("returns true when ratio is 0", () => {
+    expect(isQbtTorrent(makeTorrent({ ratio: 0 }))).toBe(true)
+  })
+
+  it("returns true when size is 0", () => {
+    expect(isQbtTorrent(makeTorrent({ size: 0 }))).toBe(true)
+  })
+
+  // ── missing required string fields ───────────────────────────────────────
+
+  it("returns false when hash is missing", () => {
+    const t = { ...makeTorrent() }
+    delete (t as Partial<QbtTorrent>).hash
+    expect(isQbtTorrent(t)).toBe(false)
+  })
+
+  it("returns false when name is missing", () => {
+    const t = { ...makeTorrent() }
+    delete (t as Partial<QbtTorrent>).name
+    expect(isQbtTorrent(t)).toBe(false)
+  })
+
+  it("returns false when state is missing", () => {
+    const t = { ...makeTorrent() }
+    delete (t as Partial<QbtTorrent>).state
+    expect(isQbtTorrent(t)).toBe(false)
+  })
+
+  // ── missing required number fields ───────────────────────────────────────
+
+  it("returns false when size is missing", () => {
+    const t = { ...makeTorrent() }
+    delete (t as Partial<QbtTorrent>).size
+    expect(isQbtTorrent(t)).toBe(false)
+  })
+
+  it("returns false when ratio is missing", () => {
+    const t = { ...makeTorrent() }
+    delete (t as Partial<QbtTorrent>).ratio
+    expect(isQbtTorrent(t)).toBe(false)
+  })
+
+  // ── wrong types on required fields ───────────────────────────────────────
+
+  it("returns false when hash is a number, not a string", () => {
+    expect(isQbtTorrent({ ...makeTorrent(), hash: 12345 })).toBe(false)
+  })
+
+  it("returns false when name is null", () => {
+    expect(isQbtTorrent({ ...makeTorrent(), name: null })).toBe(false)
+  })
+
+  it("returns false when state is a boolean", () => {
+    expect(isQbtTorrent({ ...makeTorrent(), state: true })).toBe(false)
+  })
+
+  it("returns false when ratio is a string, not a number", () => {
+    expect(isQbtTorrent({ ...makeTorrent(), ratio: "5.0" })).toBe(false)
+  })
+
+  it("returns false when size is a string, not a number", () => {
+    expect(isQbtTorrent({ ...makeTorrent(), size: "1000000" })).toBe(false)
+  })
+})
+
+// ─── parseCachedTorrents ──────────────────────────────────────────────────────
+
+describe("parseCachedTorrents", () => {
+  // ── falsy / non-parseable inputs ─────────────────────────────────────────
+
+  it("returns empty array for null", () => {
+    expect(parseCachedTorrents(null)).toEqual([])
+  })
+
+  it("returns empty array for undefined", () => {
+    expect(parseCachedTorrents(undefined)).toEqual([])
+  })
+
+  it("returns empty array for false", () => {
+    expect(parseCachedTorrents(false)).toEqual([])
+  })
+
+  it("returns empty array for 0", () => {
+    expect(parseCachedTorrents(0)).toEqual([])
+  })
+
+  it("returns empty array for an empty string", () => {
+    expect(parseCachedTorrents("")).toEqual([])
+  })
+
+  it("returns empty array for a non-array object", () => {
+    expect(parseCachedTorrents({ hash: "abc" })).toEqual([])
+  })
+
+  it("returns empty array for a number", () => {
+    expect(parseCachedTorrents(42)).toEqual([])
+  })
+
+  // ── JSON string input ────────────────────────────────────────────────────
+
+  it("parses a JSON string containing a valid torrent array", () => {
+    const torrent = makeTorrent()
+    const result = parseCachedTorrents(JSON.stringify([torrent]))
+    expect(result).toHaveLength(1)
+    expect(result[0].hash).toBe(torrent.hash)
+  })
+
+  it("parses a JSON string containing multiple valid torrents", () => {
+    const t1 = makeTorrent({ hash: "aaa" })
+    const t2 = makeTorrent({ hash: "bbb" })
+    const result = parseCachedTorrents(JSON.stringify([t1, t2]))
+    expect(result).toHaveLength(2)
+  })
+
+  it("returns empty array for invalid JSON string", () => {
+    expect(parseCachedTorrents("{not valid json")).toEqual([])
+  })
+
+  it("returns empty array for a JSON string that parses to a non-array (object)", () => {
+    expect(parseCachedTorrents(JSON.stringify({ hash: "abc" }))).toEqual([])
+  })
+
+  it("returns empty array for a JSON string that parses to a non-array (number)", () => {
+    expect(parseCachedTorrents("42")).toEqual([])
+  })
+
+  it("returns empty array for a JSON string whose first element fails isQbtTorrent", () => {
+    const invalid = [{ notAHash: true }]
+    expect(parseCachedTorrents(JSON.stringify(invalid))).toEqual([])
+  })
+
+  it("returns empty array for a JSON string array with valid-looking data but missing ratio", () => {
+    const broken = [{ hash: "abc", name: "test", state: "uploading", size: 1000 }]
+    expect(parseCachedTorrents(JSON.stringify(broken))).toEqual([])
+  })
+
+  // ── array input (JSONB already parsed by the DB driver) ───────────────────
+
+  it("returns the array when passed a pre-parsed array of valid torrents", () => {
+    const torrent = makeTorrent()
+    const result = parseCachedTorrents([torrent])
+    expect(result).toHaveLength(1)
+    expect(result[0].name).toBe(torrent.name)
+  })
+
+  it("returns the array when passed a pre-parsed array with multiple valid torrents", () => {
+    const torrents = [makeTorrent({ hash: "aaa" }), makeTorrent({ hash: "bbb" })]
+    expect(parseCachedTorrents(torrents)).toHaveLength(2)
+  })
+
+  it("returns empty array when the pre-parsed array's first element is invalid", () => {
+    const invalid = [{ notAHash: true }]
+    expect(parseCachedTorrents(invalid)).toEqual([])
+  })
+
+  // ── empty array ───────────────────────────────────────────────────────────
+
+  it("returns an empty array for an empty pre-parsed array", () => {
+    expect(parseCachedTorrents([])).toEqual([])
+  })
+
+  it("returns an empty array for an empty JSON string array '[]'", () => {
+    expect(parseCachedTorrents("[]")).toEqual([])
+  })
+})
diff --git a/src/lib/__tests__/query-options.test.ts b/src/lib/__tests__/query-options.test.ts
new file mode 100644
index 00000000..c32451b0
--- /dev/null
+++ b/src/lib/__tests__/query-options.test.ts
@@ -0,0 +1,34 @@
+// src/lib/__tests__/query-options.test.ts
+//
+// Tests for shared TanStack Query options objects.
+// Verifies queryKey values and that queryFn is callable.
+// Does not test fetch behavior (network/integration concern).
+
+import { describe, expect, it } from "vitest"
+import { clientQueryOptions, trackerQueryOptions } from "@/lib/query-options"
+
+describe("clientQueryOptions", () => {
+  it("has the correct queryKey", () => {
+    expect(clientQueryOptions.queryKey).toEqual(["clients"])
+  })
+
+  it("has a queryFn function", () => {
+    expect(typeof clientQueryOptions.queryFn).toBe("function")
+  })
+})
+
+describe("trackerQueryOptions", () => {
+  it("has the correct queryKey", () => {
+    expect(trackerQueryOptions.queryKey).toEqual(["trackers"])
+  })
+
+  it("has a queryFn function", () => {
+    expect(typeof trackerQueryOptions.queryFn).toBe("function")
+  })
+})
+
+describe("query option key uniqueness", () => {
+  it("clientQueryOptions and trackerQueryOptions have distinct queryKeys", () => {
+    expect(clientQueryOptions.queryKey).not.toEqual(trackerQueryOptions.queryKey)
+  })
+})
diff --git a/src/lib/__tests__/scrub-object.test.ts b/src/lib/__tests__/scrub-object.test.ts
index fe4f4aeb..f555309b 100644
--- a/src/lib/__tests__/scrub-object.test.ts
+++ b/src/lib/__tests__/scrub-object.test.ts
@@ -1,22 +1,7 @@
 // src/lib/__tests__/scrub-object.test.ts
 
 import { describe, expect, it } from "vitest"
-import { SCRUB_KEYS, scrubObject } from "@/lib/scrub-object"
-
-// ---------------------------------------------------------------------------
-// SCRUB_KEYS contract
-// ---------------------------------------------------------------------------
-
-describe("SCRUB_KEYS", () => {
-  it("contains all expected sensitive key names", () => {
-    expect(SCRUB_KEYS.has("authkey")).toBe(true)
-    expect(SCRUB_KEYS.has("passkey")).toBe(true)
-    expect(SCRUB_KEYS.has("ip")).toBe(true)
-    expect(SCRUB_KEYS.has("api_token")).toBe(true)
-    expect(SCRUB_KEYS.has("key")).toBe(true)
-    expect(SCRUB_KEYS.has("torrent_pass")).toBe(true)
-  })
-})
+import { scrubObject } from "@/lib/scrub-object"
 
 // ---------------------------------------------------------------------------
 // Top-level key redaction
diff --git a/src/lib/__tests__/security.test.ts b/src/lib/__tests__/security.test.ts
index 8bc6625e..96362f58 100644
--- a/src/lib/__tests__/security.test.ts
+++ b/src/lib/__tests__/security.test.ts
@@ -40,12 +40,20 @@ vi.mock("@/lib/crypto", () => ({
   generateSalt: vi.fn().mockReturnValue("a".repeat(64)),
 }))
 
-vi.mock("@/lib/scheduler", () => ({
+vi.mock("@/lib/tracker-scheduler", () => ({
   pollTracker: vi.fn(),
-  stopScheduler: vi.fn(),
+  startTrackerPolling: vi.fn(),
+  stopTrackerPolling: vi.fn(),
+  isTrackerPollingRunning: vi.fn(() => false),
   fetchTrackerStats: vi.fn(),
 }))
 
+vi.mock("@/lib/scheduler", () => ({
+  startScheduler: vi.fn(),
+  stopScheduler: vi.fn(),
+  ensureSchedulerRunning: vi.fn(),
+}))
+
 vi.mock("@/lib/transit-papers/report-generator", () => ({
   generateReportPng: vi.fn().mockResolvedValue(Buffer.from("fake-png")),
 }))
@@ -84,6 +92,8 @@ vi.mock("@/lib/totp", () => ({
   hashBackupCode: vi.fn().mockReturnValue({ hash: "abc", salt: "def", used: false }),
   verifyTotpCode: vi.fn().mockReturnValue(false),
   verifyAndConsumeBackupCode: vi.fn().mockReturnValue({ valid: false, updatedEntries: [] }),
+  TOTP_CODE_RE: /^\d{6}$/,
+  BACKUP_CODE_PATTERN: /^[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}$/,
 }))
 
 vi.mock("@/lib/db/schema", () => ({
@@ -129,7 +139,7 @@ vi.mock("@/lib/nuke", () => ({
   scrubAndDeleteAll: vi.fn(),
 }))
 
-vi.mock("@/lib/client-scheduler", () => ({
+vi.mock("@/lib/download-client-scheduler", () => ({
   startClientScheduler: vi.fn(),
   stopClientScheduler: vi.fn(),
 }))
@@ -144,14 +154,14 @@ vi.mock("@/lib/privacy", () => ({
   isRedacted: vi.fn(() => false),
 }))
 
-vi.mock("@/lib/proxy", () => ({
+vi.mock("@/lib/tunnel", () => ({
   VALID_PROXY_TYPES: new Set(["socks5", "http", "https"]),
   PROXY_HOST_PATTERN: /^[\w.\-:[\]]+$/,
   buildProxyAgentFromSettings: vi.fn().mockReturnValue(undefined),
   proxyFetch: vi.fn(),
 }))
 
-vi.mock("@/lib/qbt", () => ({
+vi.mock("@/lib/download-clients", () => ({
   buildBaseUrl: vi.fn().mockReturnValue("http://localhost:8080"),
   getSession: vi.fn(),
   getTorrents: vi.fn().mockResolvedValue([]),
@@ -164,11 +174,28 @@ vi.mock("@/lib/qbt", () => ({
   getSpeedSnapshots: vi.fn().mockReturnValue([]),
   pushSpeedSnapshot: vi.fn(),
   clearSpeedCache: vi.fn(),
-}))
-
-vi.mock("@/lib/qbt/merge", () => ({
   mergeTorrentLists: vi.fn().mockReturnValue([]),
   aggregateCrossSeedTags: vi.fn().mockReturnValue([]),
+  fetchAndMergeTorrents: vi.fn().mockResolvedValue({
+    torrents: [],
+    crossSeedTags: [],
+    clientErrors: [],
+    clientCount: 0,
+    sessionExpired: false,
+  }),
+  stripSensitiveTorrentFields: vi.fn((t: Record<string, unknown>) => {
+    const { tracker: _t, content_path: _cp, save_path: _sp, ...rest } = t
+    return rest
+  }),
+  CLIENT_CONNECTION_COLUMNS: {},
+  decryptClientCredentials: vi.fn().mockReturnValue({ username: "admin", password: "pass" }),
+  parseCrossSeedTags: vi.fn((raw: string[] | null) => raw ?? []),
+  slimTorrentForCache: vi.fn((t: Record<string, unknown>) => t),
+  parseCachedTorrents: vi.fn().mockReturnValue([]),
+  STORE_MAX_AGE_MS: 600000,
+  isStoreFresh: vi.fn().mockReturnValue(false),
+  getFilteredTorrents: vi.fn().mockReturnValue([]),
+  VALID_CLIENT_TYPES: ["qbittorrent"],
 }))
 
 vi.mock("@/lib/privacy-db", () => ({
@@ -204,10 +231,12 @@ import {
   POST as AlertDismissedPOST,
 } from "@/app/api/alerts/dismissed/route"
 import { POST as ChangePasswordPOST } from "@/app/api/auth/change-password/route"
+import { POST as LoginPOST } from "@/app/api/auth/login/route"
 import { POST as LogoutPOST } from "@/app/api/auth/logout/route"
 import { POST as TotpConfirmPOST } from "@/app/api/auth/totp/confirm/route"
 import { POST as TotpDisablePOST } from "@/app/api/auth/totp/disable/route"
 import { POST as TotpSetupPOST } from "@/app/api/auth/totp/setup/route"
+import { POST as TotpVerifyPOST } from "@/app/api/auth/totp/verify/route"
 import { GET as ChangelogGET } from "@/app/api/changelog/route"
 import { DELETE as ClientDELETE, PATCH as ClientPATCH } from "@/app/api/clients/[id]/route"
 import { GET as ClientSnapshotsGET } from "@/app/api/clients/[id]/snapshots/route"
@@ -231,6 +260,7 @@ import { POST as BackupExportPOST } from "@/app/api/settings/backup/export/route
 import { GET as BackupHistoryGET } from "@/app/api/settings/backup/history/route"
 import { POST as BackupRestorePOST } from "@/app/api/settings/backup/restore/route"
 import { GET as DashboardGET, PUT as DashboardPUT } from "@/app/api/settings/dashboard/route"
+import { GET as DbSizeGET } from "@/app/api/settings/db-size/route"
 import { GET as EventsGET } from "@/app/api/settings/events/route"
 import { GET as ImageHostsGET } from "@/app/api/settings/image-hosts/route"
 import { POST as LockdownPOST } from "@/app/api/settings/lockdown/route"
@@ -262,7 +292,7 @@ import { GET as TrackerTorrentsGET } from "@/app/api/trackers/[id]/torrents/rout
 import { POST as PollAllPOST } from "@/app/api/trackers/poll-all/route"
 import { PATCH as ReorderPATCH } from "@/app/api/trackers/reorder/route"
 import { GET, POST } from "@/app/api/trackers/route"
-import { POST as TestPOST } from "@/app/api/trackers/test/route"
+import { POST as TestPOST } from "@/app/api/trackers/test-connection/route"
 import { POST as UploadImagePOST } from "@/app/api/upload-image/route"
 
 // ---------------------------------------------------------------------------
@@ -762,6 +792,11 @@ describe("Auth enforcement: every protected route returns 401 without valid sess
     expect(res.status).toBe(401)
   })
 
+  it("GET /api/settings/db-size returns 401", async () => {
+    const res = await DbSizeGET()
+    expect(res.status).toBe(401)
+  })
+
   it("GET /api/settings/events returns 401", async () => {
     const req = makeRequest("http://localhost/api/settings/events")
     const res = await EventsGET(req)
@@ -797,15 +832,10 @@ describe("Auth enforcement: every protected route returns 401 without valid sess
 // 2. Public endpoint documentation
 // ---------------------------------------------------------------------------
 
-describe("Public endpoints: verify routes do NOT require auth", () => {
-  it("POST /api/verify-report is intentionally public (rate-limited, no auth)", () => {
-    // Documented: verify-report and verify-report/fetch-image are public endpoints.
-    // They use in-memory rate limiting instead of authentication.
-    // Moderators verify reports without needing an account.
-    // Do NOT add authenticate() to these routes.
-    expect(true).toBe(true)
-  })
-})
+// NOTE: POST /api/verify-report and /api/verify-report/fetch-image are
+// intentionally public endpoints. They use in-memory rate limiting instead of
+// authentication. Moderators verify reports without needing an account.
+// Do NOT add authenticate() to these routes.
 
 // ---------------------------------------------------------------------------
 // 3. Encrypted tokens never leak in API responses
@@ -862,16 +892,28 @@ describe("Token leakage prevention", () => {
   })
 
   it("GET /api/notifications never includes encryptedConfig in responses", async () => {
+    // Mock returns the shape produced by notificationTargetColumns projection.
+    // encryptedConfig is never selected; hasConfig is a SQL boolean computed at query level.
     const target = {
       id: 1,
       name: "My Discord",
       type: "discord",
       enabled: true,
-      encryptedConfig: "SUPER_SECRET_ENCRYPTED_CONFIG_SHOULD_NOT_APPEAR",
+      hasConfig: true,
       notifyRatioDrop: true,
       notifyHitAndRun: false,
       notifyTrackerDown: true,
       notifyBufferMilestone: false,
+      notifyWarned: false,
+      notifyRatioDanger: false,
+      notifyZeroSeeding: false,
+      notifyRankChange: false,
+      notifyAnniversary: false,
+      notifyBonusCap: false,
+      notifyVipExpiring: false,
+      notifyUnsatisfiedLimit: false,
+      notifyActiveHnrs: false,
+      notifyDownloadDisabled: false,
       thresholds: null,
       includeTrackerName: true,
       scope: null,
@@ -890,11 +932,10 @@ describe("Token leakage prevention", () => {
     const body = await res.json()
     const json = JSON.stringify(body)
 
-    expect(json).not.toContain("SUPER_SECRET_ENCRYPTED_CONFIG_SHOULD_NOT_APPEAR")
     expect(json).not.toContain("encryptedConfig")
-    // Confirm the safe fields are present
     expect(body[0]).toHaveProperty("hasConfig", true)
     expect(body[0]).toHaveProperty("name", "My Discord")
+    expect(body[0]).toHaveProperty("notifyDownloadDisabled", false)
   })
 
   it("GET /api/trackers/[id] does not include encryptedApiToken or apiPath in response", async () => {
@@ -962,12 +1003,15 @@ describe("Token leakage prevention", () => {
   })
 
   it("GET /api/settings/image-hosts returns booleans, not ciphertext", async () => {
-    // Mock db.select to return settings with encrypted key values present
+    // Mock returns the shape produced by settingsColumns projection.
+    // The encrypted columns are selected under aliased names (hasPtpimgKey etc.)
+    // and coerced to booleans by the serializer. Ciphertext enters server memory
+    // but never reaches the response.
     const mockLimit = vi.fn().mockResolvedValue([
       {
-        encryptedPtpimgApiKey: "ENCRYPTED_PTPIMG_KEY_CIPHERTEXT",
-        encryptedOeimgApiKey: "ENCRYPTED_OEIMG_KEY_CIPHERTEXT",
-        encryptedImgbbApiKey: null,
+        hasPtpimgKey: "ENCRYPTED_PTPIMG_KEY_CIPHERTEXT",
+        hasOeimgKey: "ENCRYPTED_OEIMG_KEY_CIPHERTEXT",
+        hasImgbbKey: null,
       },
     ])
     const mockFrom = vi.fn().mockReturnValue({ limit: mockLimit })
@@ -1103,34 +1147,8 @@ describe("Input validation: POST /api/trackers", () => {
     mockAuthSuccess()
   })
 
-  it("rejects missing required fields", async () => {
-    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({})
-    const req = makeRequest("http://localhost/api/trackers", {}, "POST")
-    const res = await POST(req)
-    expect(res.status).toBe(400)
-  })
-
-  it("rejects oversized name (>100 chars)", async () => {
-    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
-      name: "a".repeat(101),
-      baseUrl: "https://example.com",
-      apiToken: "valid-token",
-    })
-    const req = makeRequest("http://localhost/api/trackers", {}, "POST")
-    const res = await POST(req)
-    expect(res.status).toBe(400)
-  })
-
-  it("rejects invalid URL format", async () => {
-    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
-      name: "Test",
-      baseUrl: "not-a-url",
-      apiToken: "valid-token",
-    })
-    const req = makeRequest("http://localhost/api/trackers", {}, "POST")
-    const res = await POST(req)
-    expect(res.status).toBe(400)
-  })
+  // "rejects missing required fields", "rejects oversized name", and
+  // "rejects invalid URL format" are covered in tracker-routes.test.ts
 
   it("rejects invalid platform type", async () => {
     ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
@@ -1209,18 +1227,7 @@ describe("Input validation: additional field constraints", () => {
     ;(parseTrackerId as ReturnType<typeof vi.fn>).mockResolvedValue(1)
   })
 
-  it("rejects oversized API token (>500 chars)", async () => {
-    ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
-      name: "Test",
-      baseUrl: "https://example.com",
-      apiToken: "a".repeat(501),
-    })
-    const req = makeRequest("http://localhost/api/trackers", {}, "POST")
-    const res = await POST(req)
-    expect(res.status).toBe(400)
-    const data = await res.json()
-    expect(data.error).toMatch(/token/i)
-  })
+  // "rejects oversized API token" is covered in tracker-routes.test.ts
 
   it("rejects oversized qbtTag (>100 chars)", async () => {
     ;(parseJsonBody as ReturnType<typeof vi.fn>).mockResolvedValue({
@@ -1311,88 +1318,29 @@ describe("Input validation: additional field constraints", () => {
 })
 
 // ---------------------------------------------------------------------------
-// 6. Crypto round-trip integrity
+// 6. Crypto round-trip integrity — covered by src/lib/crypto.test.ts
 // ---------------------------------------------------------------------------
 
-describe("Crypto integrity", () => {
-  // Use real crypto functions (unmocked)
-  let realEncrypt: typeof import("@/lib/crypto").encrypt
-  let realDecrypt: typeof import("@/lib/crypto").decrypt
-  let realGenerateSalt: typeof import("@/lib/crypto").generateSalt
-  let realDeriveKey: typeof import("@/lib/crypto").deriveKey
-
-  beforeEach(async () => {
-    // Import real crypto module (bypassing mocks)
-    const crypto = await vi.importActual<typeof import("@/lib/crypto")>("@/lib/crypto")
-    realEncrypt = crypto.encrypt
-    realDecrypt = crypto.decrypt
-    realGenerateSalt = crypto.generateSalt
-    realDeriveKey = crypto.deriveKey
-  })
-
-  it("encrypt then decrypt produces the original plaintext", async () => {
-    const key = await realDeriveKey("test-password", realGenerateSalt())
-    const plaintext = "my-secret-api-token-12345"
-    const encrypted = realEncrypt(plaintext, key)
-    const decrypted = realDecrypt(encrypted, key)
-    expect(decrypted).toBe(plaintext)
-  })
-
-  it("decrypt rejects tampered ciphertext", async () => {
-    const key = await realDeriveKey("test-password", realGenerateSalt())
-    const encrypted = realEncrypt("my-secret", key)
-
-    // Tamper with the ciphertext by flipping a byte
-    const tampered = Buffer.from(encrypted, "base64")
-    tampered[tampered.length - 1] ^= 0xff
-    const tamperedStr = tampered.toString("base64")
-
-    expect(() => realDecrypt(tamperedStr, key)).toThrow()
-  })
-
-  it("decrypt rejects wrong key", async () => {
-    const key1 = await realDeriveKey("password-one", realGenerateSalt())
-    const key2 = await realDeriveKey("password-two", realGenerateSalt())
-    const encrypted = realEncrypt("my-secret", key1)
-
-    expect(() => realDecrypt(encrypted, key2)).toThrow()
-  })
-
-  it("decrypt rejects truncated ciphertext", async () => {
-    const key = await realDeriveKey("test-password", realGenerateSalt())
-    const short = Buffer.from("too-short").toString("base64")
-    expect(() => realDecrypt(short, key)).toThrow()
-  })
-
-  it("each encryption produces unique ciphertext (random IV)", async () => {
-    const key = await realDeriveKey("test-password", realGenerateSalt())
-    const plaintext = "same-input"
-    const enc1 = realEncrypt(plaintext, key)
-    const enc2 = realEncrypt(plaintext, key)
-    expect(enc1).not.toBe(enc2)
-  })
-})
-
 // ---------------------------------------------------------------------------
 // 7. Encryption key zeroing on scheduler stop
 // ---------------------------------------------------------------------------
 
 describe("Encryption key zeroing", () => {
   it("stopScheduler zero-fills the encryption key buffer", async () => {
-    const { startScheduler, stopScheduler, _getSchedulerKeyForTest } =
-      await vi.importActual<typeof import("@/lib/scheduler")>("@/lib/scheduler")
+    const { startTrackerPolling, stopTrackerPolling, _getSchedulerKeyForTest } =
+      await vi.importActual<typeof import("@/lib/tracker-scheduler")>("@/lib/tracker-scheduler")
 
     const key = Buffer.from("a]1b2c3d4e5f6".repeat(3).slice(0, 32))
     const originalBytes = Buffer.from(key) // snapshot before zeroing
 
-    startScheduler(key)
+    startTrackerPolling(key)
 
     // Key reference should be stored
     const storedKey = _getSchedulerKeyForTest()
     expect(storedKey).not.toBeNull()
     expect(storedKey).toBe(key) // same Buffer instance
 
-    stopScheduler()
+    stopTrackerPolling()
 
     // Buffer bytes should all be zero
     expect(key.every((byte) => byte === 0)).toBe(true)
@@ -1403,14 +1351,22 @@ describe("Encryption key zeroing", () => {
   })
 
   it("stopScheduler is safe to call when no scheduler is running", async () => {
-    const { stopScheduler, _getSchedulerKeyForTest } =
-      await vi.importActual<typeof import("@/lib/scheduler")>("@/lib/scheduler")
+    const { stopTrackerPolling, _getSchedulerKeyForTest } =
+      await vi.importActual<typeof import("@/lib/tracker-scheduler")>("@/lib/tracker-scheduler")
 
     // Ensure clean state
-    stopScheduler()
+    stopTrackerPolling()
     expect(_getSchedulerKeyForTest()).toBeNull()
     // Should not throw
-    expect(() => stopScheduler()).not.toThrow()
+    expect(() => stopTrackerPolling()).not.toThrow()
+  })
+
+  it("SIGTERM handler is registered on scheduler module import", async () => {
+    const before = process.listenerCount("SIGTERM")
+    // Import the real scheduler module to trigger the side effect
+    await vi.importActual<typeof import("@/lib/scheduler")>("@/lib/scheduler")
+    const after = process.listenerCount("SIGTERM")
+    expect(after).toBeGreaterThan(before)
   })
 })
 
@@ -1912,3 +1868,294 @@ describe("Backup restore: new notify* column round-trip", () => {
     expect(ntInsert?.notifyAnniversary).toBe(false)
   })
 })
+
+// ---------------------------------------------------------------------------
+// 10. Login route: crypto failure produces 500
+// ---------------------------------------------------------------------------
+
+describe("Login route crypto failure handling", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("returns 500 with safe message when verifyPassword throws (corrupted hash)", async () => {
+    vi.mocked(db.select).mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        limit: vi
+          .fn()
+          .mockResolvedValue([
+            { id: 1, passwordHash: "corrupted-not-argon2", encryptionSalt: "a".repeat(64) },
+          ]),
+      }),
+    } as unknown as ReturnType<typeof db.select>)
+
+    vi.mocked(parseJsonBody).mockResolvedValue({ password: "test-password-123" })
+
+    const { verifyPassword } = await import("@/lib/auth")
+    vi.mocked(verifyPassword).mockRejectedValue(
+      new Error("pchstr must contain a $ as the first character")
+    )
+
+    const req = new Request("http://localhost/api/auth/login", { method: "POST" })
+    const res = await LoginPOST(req)
+
+    expect(res.status).toBe(500)
+    const data = await res.json()
+    expect(data.error).toBe("Login system error. Contact administrator.")
+    expect(JSON.stringify(data)).not.toContain("pchstr")
+    expect(JSON.stringify(data)).not.toContain("argon2")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// 11. TOTP verify: decrypt failure produces 500
+// ---------------------------------------------------------------------------
+
+describe("TOTP verify decrypt failure handling", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("returns 500 with safe message when TOTP secret decrypt fails", async () => {
+    const { verifyPendingToken } = await import("@/lib/auth")
+    const { decrypt } = await import("@/lib/crypto")
+
+    vi.mocked(parseJsonBody).mockResolvedValue({
+      pendingToken: "valid-pending-token",
+      code: "123456",
+    })
+
+    vi.mocked(verifyPendingToken).mockResolvedValue({
+      encryptionKey: "a".repeat(64),
+    })
+
+    vi.mocked(db.select).mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        limit: vi.fn().mockResolvedValue([
+          {
+            id: 1,
+            totpSecret: "corrupt-ciphertext",
+            passwordHash: "hash",
+            encryptionSalt: "a".repeat(64),
+          },
+        ]),
+      }),
+    } as unknown as ReturnType<typeof db.select>)
+
+    vi.mocked(decrypt).mockImplementation(() => {
+      throw new Error("Unsupported state or unable to authenticate data")
+    })
+
+    const req = new Request("http://localhost/api/auth/totp/verify", { method: "POST" })
+    const res = await TotpVerifyPOST(req)
+
+    expect(res.status).toBe(500)
+    const data = await res.json()
+    expect(data.error).toBe("Failed to decrypt TOTP secret")
+    expect(JSON.stringify(data)).not.toContain("authenticate data")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// 12. Backup export: decrypt failure returns 500, not unencrypted backup
+// ---------------------------------------------------------------------------
+
+describe("Backup export decrypt failure handling", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("returns 500 when backup password decrypt fails (not unencrypted backup)", async () => {
+    const { decrypt } = await import("@/lib/crypto")
+    const { generateBackupPayload } = await import("@/lib/backup")
+
+    vi.mocked(authenticate).mockResolvedValue({ encryptionKey: "a".repeat(64) })
+
+    vi.mocked(db.select).mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        limit: vi.fn().mockResolvedValue([
+          {
+            id: 1,
+            backupEncryptionEnabled: true,
+            encryptedBackupPassword: "corrupt-ciphertext",
+            backupStoragePath: "/data/backups",
+          },
+        ]),
+      }),
+    } as unknown as ReturnType<typeof db.select>)
+
+    vi.mocked(generateBackupPayload).mockResolvedValue({
+      manifest: { version: 1 },
+      settings: {},
+      trackers: [],
+      trackerSnapshots: [],
+      trackerRoles: [],
+      downloadClients: [],
+      tagGroups: [],
+      tagGroupMembers: [],
+      clientSnapshots: [],
+    } as unknown as Awaited<ReturnType<typeof generateBackupPayload>>)
+
+    vi.mocked(decrypt).mockImplementation(() => {
+      throw new Error("Invalid ciphertext: too short")
+    })
+
+    const formData = new FormData()
+    const req = new Request("http://localhost/api/settings/backup/export", { method: "POST" })
+    req.formData = vi.fn().mockResolvedValue(formData)
+
+    const res = await BackupExportPOST(req)
+
+    expect(res.status).toBe(500)
+    const data = await res.json()
+    expect(data.error).toContain("Failed to decrypt backup password")
+    expect(JSON.stringify(data)).not.toContain("ciphertext")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// 13. Backup restore: security hardening
+// ---------------------------------------------------------------------------
+
+describe("Backup restore security hardening", () => {
+  const VALID_BACKUP = {
+    manifest: {
+      version: 1,
+      appVersion: "1.0.0",
+      createdAt: new Date().toISOString(),
+      encrypted: false,
+      counts: {
+        trackers: 0,
+        trackerSnapshots: 0,
+        trackerRoles: 0,
+        downloadClients: 0,
+        tagGroups: 0,
+        tagGroupMembers: 0,
+        clientSnapshots: 0,
+      },
+    },
+    settings: {
+      encryptionSalt: "a".repeat(64),
+      backupScheduleFrequency: "daily",
+      backupRetentionCount: 7,
+    },
+    trackers: [],
+    trackerSnapshots: [],
+    trackerRoles: [],
+    downloadClients: [],
+    tagGroups: [],
+    tagGroupMembers: [],
+    clientSnapshots: [],
+  }
+
+  function createRestoreRequest(fileContent: string, masterPassword: string): Request {
+    const blob = new Blob([fileContent], { type: "application/json" })
+    const formData = new FormData()
+    formData.append("file", blob, "backup.json")
+    formData.append("masterPassword", masterPassword)
+
+    const req = new Request("http://localhost/api/settings/backup/restore", {
+      method: "POST",
+    })
+    req.formData = vi.fn().mockResolvedValue(formData)
+    return req
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("rejects master password shorter than PASSWORD_MIN with 400", async () => {
+    const { POST } = await import("@/app/api/settings/backup/restore/route")
+
+    vi.mocked(authenticate).mockResolvedValue({
+      encryptionKey: "a".repeat(64),
+    })
+
+    const req = createRestoreRequest(JSON.stringify(VALID_BACKUP), "short")
+    const res = await POST(req)
+
+    expect(res.status).toBe(400)
+    const data = await res.json()
+    expect(data.error).toBe("Master password is required to restore backups")
+    // Must reject before any DB interaction
+    expect(db.select).not.toHaveBeenCalled()
+  })
+
+  it("returns 500 when key derivation fails instead of proceeding", async () => {
+    const { POST } = await import("@/app/api/settings/backup/restore/route")
+    const { verifyPassword } = await import("@/lib/auth")
+    const { deriveKey } = await import("@/lib/crypto")
+    const { validateBackupJson } = await import("@/lib/backup")
+
+    vi.mocked(authenticate).mockResolvedValue({
+      encryptionKey: "a".repeat(64),
+    })
+    vi.mocked(verifyPassword).mockResolvedValue(true)
+    vi.mocked(validateBackupJson).mockImplementation(() => undefined)
+
+    vi.mocked(db.select).mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        limit: vi.fn().mockResolvedValue([
+          {
+            id: 1,
+            passwordHash: "hashed_password",
+            encryptionSalt: "a".repeat(64),
+          },
+        ]),
+      }),
+    } as unknown as ReturnType<typeof db.select>)
+
+    // deriveKey throws (simulating scrypt OOM or crypto failure)
+    vi.mocked(deriveKey).mockRejectedValue(new Error("scrypt: memory allocation failed"))
+
+    const req = createRestoreRequest(JSON.stringify(VALID_BACKUP), "a]3$kF9!mZq2vR7x")
+    const res = await POST(req)
+
+    expect(res.status).toBe(500)
+    const data = await res.json()
+    expect(data.error).toContain("derive encryption keys")
+    // Must NOT start the destructive transaction
+    expect(db.transaction).not.toHaveBeenCalled()
+  })
+
+  it("restarts scheduler after failed transaction (DB rolled back)", async () => {
+    const { POST } = await import("@/app/api/settings/backup/restore/route")
+    const { verifyPassword } = await import("@/lib/auth")
+    const { deriveKey } = await import("@/lib/crypto")
+    const { validateBackupJson } = await import("@/lib/backup")
+    const { stopScheduler, ensureSchedulerRunning } = await import("@/lib/scheduler")
+
+    vi.mocked(authenticate).mockResolvedValue({
+      encryptionKey: "a".repeat(64),
+    })
+    vi.mocked(deriveKey).mockResolvedValue(Buffer.from("a".repeat(32)))
+    vi.mocked(verifyPassword).mockResolvedValue(true)
+    vi.mocked(validateBackupJson).mockImplementation(() => undefined)
+
+    vi.mocked(db.select).mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        limit: vi.fn().mockResolvedValue([
+          {
+            id: 1,
+            passwordHash: "hashed_password",
+            encryptionSalt: "a".repeat(64),
+          },
+        ]),
+      }),
+    } as unknown as ReturnType<typeof db.select>)
+
+    // Transaction throws (simulating DB constraint violation)
+    ;(db.transaction as ReturnType<typeof vi.fn>).mockRejectedValue(
+      new Error("unique constraint violation")
+    )
+
+    const req = createRestoreRequest(JSON.stringify(VALID_BACKUP), "a]3$kF9!mZq2vR7x")
+    const res = await POST(req)
+
+    expect(res.status).toBe(500)
+    expect(stopScheduler).toHaveBeenCalledOnce()
+    expect(ensureSchedulerRunning).toHaveBeenCalledOnce()
+    expect(ensureSchedulerRunning).toHaveBeenCalledWith("a".repeat(64))
+  })
+})
diff --git a/src/lib/__tests__/server-data.test.ts b/src/lib/__tests__/server-data.test.ts
index 2d22faa0..11ee3849 100644
--- a/src/lib/__tests__/server-data.test.ts
+++ b/src/lib/__tests__/server-data.test.ts
@@ -73,6 +73,7 @@ vi.mock("@/lib/db/schema", () => ({
     remoteUserId: "remoteUserId",
     platformMeta: "platformMeta",
     avatarData: "avatarData",
+    avatarMimeType: "avatarMimeType",
     avatarCachedAt: "avatarCachedAt",
     avatarRemoteUrl: "avatarRemoteUrl",
     useProxy: "useProxy",
@@ -88,6 +89,54 @@ vi.mock("@/lib/db/schema", () => ({
     trackerId: "trackerId",
     polledAt: "polledAt",
   },
+  downloadClients: {
+    id: "id",
+    name: "name",
+    type: "type",
+    enabled: "enabled",
+    host: "host",
+    port: "port",
+    useSsl: "useSsl",
+    encryptedUsername: "encryptedUsername",
+    encryptedPassword: "encryptedPassword",
+    pollIntervalSeconds: "pollIntervalSeconds",
+    isDefault: "isDefault",
+    crossSeedTags: "crossSeedTags",
+    lastPolledAt: "lastPolledAt",
+    lastError: "lastError",
+    errorSince: "errorSince",
+    createdAt: "createdAt",
+    updatedAt: "updatedAt",
+  },
+  notificationTargets: {
+    id: "id",
+    name: "name",
+    type: "type",
+    enabled: "enabled",
+    encryptedConfig: "encryptedConfig",
+    notifyRatioDrop: "notifyRatioDrop",
+    notifyHitAndRun: "notifyHitAndRun",
+    notifyTrackerDown: "notifyTrackerDown",
+    notifyBufferMilestone: "notifyBufferMilestone",
+    notifyWarned: "notifyWarned",
+    notifyRatioDanger: "notifyRatioDanger",
+    notifyZeroSeeding: "notifyZeroSeeding",
+    notifyRankChange: "notifyRankChange",
+    notifyAnniversary: "notifyAnniversary",
+    notifyBonusCap: "notifyBonusCap",
+    notifyVipExpiring: "notifyVipExpiring",
+    notifyUnsatisfiedLimit: "notifyUnsatisfiedLimit",
+    notifyActiveHnrs: "notifyActiveHnrs",
+    notifyDownloadDisabled: "notifyDownloadDisabled",
+    thresholds: "thresholds",
+    includeTrackerName: "includeTrackerName",
+    scope: "scope",
+    lastDeliveryStatus: "lastDeliveryStatus",
+    lastDeliveryAt: "lastDeliveryAt",
+    lastDeliveryError: "lastDeliveryError",
+    createdAt: "createdAt",
+    updatedAt: "updatedAt",
+  },
 }))
 
 vi.mock("@/lib/privacy-db", () => ({
@@ -301,6 +350,7 @@ describe("serializeTrackerResponse excludes encryptedApiToken", () => {
       isActive: true,
       lastPolledAt: null,
       lastError: null,
+      lastErrorAt: null,
       consecutiveFailures: 0,
       pausedAt: null,
       userPausedAt: null,
@@ -311,6 +361,7 @@ describe("serializeTrackerResponse excludes encryptedApiToken", () => {
       remoteUserId: null,
       platformMeta: null,
       avatarData: null,
+      avatarMimeType: null,
       avatarCachedAt: null,
       avatarRemoteUrl: null,
       useProxy: false,
@@ -346,6 +397,7 @@ describe("trackerColumns security invariant", () => {
 
   it("does NOT include avatarData (large binary, served via dedicated route)", () => {
     expect(columnKeys).not.toContain("avatarData")
+    expect(columnKeys).not.toContain("avatarMimeType")
     expect(columnKeys).not.toContain("avatarCachedAt")
     expect(columnKeys).not.toContain("avatarRemoteUrl")
   })
diff --git a/src/lib/__tests__/slot-resolve.test.tsx b/src/lib/__tests__/slot-resolve.test.tsx
index 8483abbe..5b176335 100644
--- a/src/lib/__tests__/slot-resolve.test.tsx
+++ b/src/lib/__tests__/slot-resolve.test.tsx
@@ -3,12 +3,13 @@
 import { describe, expect, it } from "vitest"
 import { resolveSlots } from "@/components/tracker-detail/resolve-slots"
 import type {
+  DigitalCorePlatformMeta,
   GazellePlatformMeta,
   GGnPlatformMeta,
   NebulancePlatformMeta,
 } from "@/lib/adapters/types"
-import type { SlotContext } from "@/lib/slot-types"
 import type { Snapshot, TrackerSummary } from "@/types/api"
+import type { SlotContext } from "@/types/slots"
 
 // ---------------------------------------------------------------------------
 // Fixtures
@@ -23,6 +24,7 @@ function makeTracker(overrides: Partial<TrackerSummary> = {}): TrackerSummary {
     isActive: true,
     lastPolledAt: null,
     lastError: null,
+    lastErrorAt: null,
     consecutiveFailures: 0,
     pausedAt: null,
     userPausedAt: null,
@@ -61,6 +63,7 @@ function makeSnapshot(overrides: Partial<Snapshot> = {}): Snapshot {
     shareScore: null,
     username: "testuser",
     group: null,
+    isManual: false,
     ...overrides,
   }
 }
@@ -101,7 +104,6 @@ describe("GGn context", () => {
   const ctx: SlotContext = {
     tracker: makeTracker({ platformType: "ggn" }),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: ggnMeta,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -225,7 +227,6 @@ describe("Gazelle context", () => {
   const ctx: SlotContext = {
     tracker: makeTracker({ platformType: "gazelle" }),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: gazMeta,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -312,7 +313,6 @@ describe("minimal context (no meta, seedbonus present)", () => {
   const ctx: SlotContext = {
     tracker: makeTracker({ platformType: "unit3d" }),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: null,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -350,7 +350,6 @@ describe("null latestSnapshot", () => {
   const ctx: SlotContext = {
     tracker: makeTracker(),
     latestSnapshot: null,
-    snapshots: [],
     meta: null,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -395,7 +394,6 @@ describe("priority ordering", () => {
   const ctx: SlotContext = {
     tracker: makeTracker(),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: ggnMeta,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -441,7 +439,6 @@ describe("mutual exclusion: Nebulance snatched-nebulance vs seedbonus", () => {
   const ctx: SlotContext = {
     tracker: makeTracker({ platformType: "nebulance" }),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: nebMeta,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -480,7 +477,6 @@ describe("mutual exclusion: GGn hourlyGold blocks seedbonus", () => {
   const ctx: SlotContext = {
     tracker: makeTracker({ platformType: "ggn" }),
     latestSnapshot: snap,
-    snapshots: [snap],
     meta: ggnMeta,
     registry: undefined,
     accentColor: BASE_ACCENT,
@@ -509,7 +505,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -524,7 +519,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -537,7 +531,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -550,7 +543,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -563,7 +555,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -595,7 +586,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -608,7 +598,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: makeSnapshot({ seedbonus: 100 }),
-      snapshots: [],
       meta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -620,7 +609,6 @@ describe("edge cases", () => {
     const ctx: SlotContext = {
       tracker: makeTracker(),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -639,7 +627,6 @@ describe("login-deadline slot", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ lastAccessAt: "2026-01-01T00:00:00Z" }),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: {
         slug: "test",
@@ -677,7 +664,6 @@ describe("login-deadline slot", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ lastAccessAt: null }),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: {
         slug: "test",
@@ -709,7 +695,6 @@ describe("login-deadline slot", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ lastAccessAt: "2026-01-01T00:00:00Z" }),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: {
         slug: "test",
@@ -741,7 +726,6 @@ describe("login-deadline slot", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ lastAccessAt: "2026-01-01T00:00:00Z" }),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: {
         slug: "test",
@@ -768,7 +752,6 @@ describe("login-deadline slot", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ lastAccessAt: "2026-01-01T00:00:00Z" }),
       latestSnapshot: null,
-      snapshots: [],
       meta: null,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -809,7 +792,6 @@ describe("security: slot resolution does not expose secrets", () => {
         lastAccessAt: "2026-01-01T00:00:00Z",
       }),
       latestSnapshot: snap,
-      snapshots: [snap],
       meta: ggnMeta,
       registry: {
         slug: "test",
@@ -864,7 +846,6 @@ describe("security: slot resolution does not expose secrets", () => {
     const ctx: SlotContext = {
       tracker: makeTracker({ platformType: "unit3d" }),
       latestSnapshot: makeSnapshot({ seedbonus: 100 }),
-      snapshots: [],
       meta: poisonedMeta,
       registry: undefined,
       accentColor: BASE_ACCENT,
@@ -880,3 +861,127 @@ describe("security: slot resolution does not expose secrets", () => {
     expect(() => resolveSlots(ctx)).not.toThrow()
   })
 })
+
+// ---------------------------------------------------------------------------
+// DigitalCore context
+// ---------------------------------------------------------------------------
+
+describe("slot resolution — DigitalCore", () => {
+  const dcMeta: DigitalCorePlatformMeta = {
+    donor: true,
+    seedboxDonor: true,
+    parked: false,
+    enabled: true,
+    invites: 3,
+    leechBonus: 0,
+    uploadedReal: 500000000000,
+    downloadedReal: 1800000000000,
+    torrents: 15,
+    forumPosts: 42,
+    torrentComments: 8,
+    hnr: 0,
+    hnrWarned: false,
+    downloadBan: false,
+    uploadBan: false,
+    connectable: true,
+    hearts: 5,
+  }
+
+  function dcCtx(
+    metaOverrides?: Partial<DigitalCorePlatformMeta>,
+    snapOverrides?: Partial<Snapshot>
+  ): SlotContext {
+    return {
+      tracker: makeTracker({ platformType: "digitalcore" }),
+      latestSnapshot: makeSnapshot({
+        seedbonus: 4200,
+        uploadedBytes: "717751051245",
+        downloadedBytes: "252473792698",
+        ...snapOverrides,
+      }),
+      meta: { ...dcMeta, ...metaOverrides },
+      registry: undefined,
+      accentColor: BASE_ACCENT,
+    }
+  }
+
+  it("resolves donor badge for DC donor", () => {
+    expect(slotIds(dcCtx(), "badge")).toContain("donor")
+  })
+
+  it("does not resolve donor badge when donor is false", () => {
+    expect(slotIds(dcCtx({ donor: false }), "badge")).not.toContain("donor")
+  })
+
+  it("resolves seedbox donor badge", () => {
+    expect(slotIds(dcCtx(), "badge")).toContain("dc-seedbox-donor")
+  })
+
+  it("resolves download ban badge when banned", () => {
+    expect(slotIds(dcCtx({ downloadBan: true }), "badge")).toContain("dc-download-ban")
+  })
+
+  it("does not resolve download ban badge when not banned", () => {
+    expect(slotIds(dcCtx(), "badge")).not.toContain("dc-download-ban")
+  })
+
+  it("resolves upload ban badge when banned", () => {
+    expect(slotIds(dcCtx({ uploadBan: true }), "badge")).toContain("dc-upload-ban")
+  })
+
+  it("resolves HnR warned badge when warned", () => {
+    expect(slotIds(dcCtx({ hnrWarned: true }), "badge")).toContain("dc-hnr-warned")
+  })
+
+  it("resolves parked badge when parked", () => {
+    expect(slotIds(dcCtx({ parked: true }), "badge")).toContain("dc-parked")
+  })
+
+  it("resolves unconnectable badge when not connectable", () => {
+    expect(slotIds(dcCtx({ connectable: false }), "badge")).toContain("dc-unconnectable")
+  })
+
+  it("does not resolve unconnectable badge when connectable", () => {
+    expect(slotIds(dcCtx(), "badge")).not.toContain("dc-unconnectable")
+  })
+
+  it("resolves invites badge when invites > 0", () => {
+    expect(slotIds(dcCtx(), "badge")).toContain("dc-invites")
+  })
+
+  it("does not resolve invites badge when invites is 0", () => {
+    expect(slotIds(dcCtx({ invites: 0 }), "badge")).not.toContain("dc-invites")
+  })
+
+  it("resolves hearts badge when hearts > 0", () => {
+    expect(slotIds(dcCtx(), "badge")).toContain("dc-hearts")
+  })
+
+  it("resolves activity stat card when community data exists", () => {
+    expect(slotIds(dcCtx(), "stat-card")).toContain("dc-activity")
+  })
+
+  it("does not resolve activity card when all community counts are 0", () => {
+    expect(
+      slotIds(dcCtx({ torrents: 0, forumPosts: 0, torrentComments: 0 }), "stat-card")
+    ).not.toContain("dc-activity")
+  })
+
+  it("resolves freeleech impact card when real differs from credited", () => {
+    expect(slotIds(dcCtx(), "stat-card")).toContain("dc-real-data")
+  })
+
+  it("does not resolve freeleech impact card when real equals credited", () => {
+    expect(
+      slotIds(dcCtx({ uploadedReal: 717751051245, downloadedReal: 252473792698 }), "stat-card")
+    ).not.toContain("dc-real-data")
+  })
+
+  it("resolves generic seedbonus card (not excluded by DC)", () => {
+    expect(slotIds(dcCtx(), "stat-card")).toContain("seedbonus")
+  })
+
+  it("resolves disabled badge when enabled is false", () => {
+    expect(slotIds(dcCtx({ enabled: false }), "badge")).toContain("disabled")
+  })
+})
diff --git a/src/lib/__tests__/snapshot-bucket.test.ts b/src/lib/__tests__/snapshot-bucket.test.ts
new file mode 100644
index 00000000..24c3ce3c
--- /dev/null
+++ b/src/lib/__tests__/snapshot-bucket.test.ts
@@ -0,0 +1,117 @@
+// src/lib/__tests__/snapshot-bucket.test.ts
+//
+// Tests for getSnapshotBucket — the pure bucketing function that picks
+// a date_trunc granularity based on the requested day range.
+//
+// Boundary map:
+//   days <= 0        -> "day"  (all-time / edge)
+//   days 1-2         -> null   (raw, no bucketing)
+//   days 3-90        -> "hour"
+//   days >= 91       -> "day"
+
+// ---------------------------------------------------------------------------
+// Mocks required before server-only imports
+// ---------------------------------------------------------------------------
+
+import { vi } from "vitest"
+
+vi.mock("server-only", () => ({}))
+
+vi.mock("@/lib/db", () => ({
+  db: {
+    select: vi
+      .fn()
+      .mockReturnValue({ from: vi.fn().mockReturnValue({ limit: vi.fn().mockResolvedValue([]) }) }),
+    execute: vi.fn().mockResolvedValue([]),
+  },
+}))
+
+vi.mock("@/lib/db/schema", () => ({
+  appSettings: {},
+  trackers: {},
+  trackerSnapshots: {},
+  downloadClients: {},
+  notificationTargets: {},
+  dbSizeHistory: {},
+  tagGroups: {},
+  tagGroupMembers: {},
+}))
+
+vi.mock("@/lib/privacy-db", () => ({
+  createPrivacyMaskSync: vi.fn().mockReturnValue((v: string | null) => v),
+}))
+
+vi.mock("@/lib/download-clients/qbt/qbitmanage-defaults", () => ({
+  parseQbitmanageTags: vi.fn().mockReturnValue({}),
+}))
+
+vi.mock("@/lib/tracker-serializer", () => ({
+  serializeTrackerResponse: vi.fn(),
+}))
+
+vi.mock("@/lib/constants", () => ({
+  DEFAULT_TRACKER_COLOR: "#00d4ff",
+}))
+
+vi.mock("@/lib/formatters", () => ({
+  localDateStr: vi.fn((d: Date) => d.toISOString().slice(0, 10)),
+}))
+
+vi.mock("@/lib/limits", () => ({
+  SNAPSHOT_QUERY_MAX: 365,
+}))
+
+// ---------------------------------------------------------------------------
+// Imports (after mocks)
+// ---------------------------------------------------------------------------
+
+import { describe, expect, it } from "vitest"
+import { getSnapshotBucket } from "@/lib/server-data"
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("getSnapshotBucket", () => {
+  // ---- null (raw) range: days 1-2 -----------------------------------------
+
+  it("returns null for days = 1 (raw snapshots, no bucketing)", () => {
+    expect(getSnapshotBucket(1)).toBeNull()
+  })
+
+  it("returns null for days = 2 (upper edge of raw window)", () => {
+    expect(getSnapshotBucket(2)).toBeNull()
+  })
+
+  // ---- "hour" range: days 3-90 --------------------------------------------
+
+  it("returns 'hour' for days = 3 (lower edge of hourly window)", () => {
+    expect(getSnapshotBucket(3)).toBe("hour")
+  })
+
+  it("returns 'hour' for days = 30 (typical monthly view)", () => {
+    expect(getSnapshotBucket(30)).toBe("hour")
+  })
+
+  it("returns 'hour' for days = 90 (upper edge of hourly window)", () => {
+    expect(getSnapshotBucket(90)).toBe("hour")
+  })
+
+  // ---- "day" range: days > 90 or days <= 0 --------------------------------
+
+  it("returns 'day' for days = 91 (first value past hourly window)", () => {
+    expect(getSnapshotBucket(91)).toBe("day")
+  })
+
+  it("returns 'day' for days = 365 (full year)", () => {
+    expect(getSnapshotBucket(365)).toBe("day")
+  })
+
+  it("returns 'day' for days = 0 (all-time query)", () => {
+    expect(getSnapshotBucket(0)).toBe("day")
+  })
+
+  it("returns 'day' for negative days (invalid input falls to else branch)", () => {
+    expect(getSnapshotBucket(-1)).toBe("day")
+  })
+})
diff --git a/src/lib/__tests__/today.test.ts b/src/lib/__tests__/today.test.ts
index d36cc27d..c765cd07 100644
--- a/src/lib/__tests__/today.test.ts
+++ b/src/lib/__tests__/today.test.ts
@@ -180,8 +180,8 @@ function makeTorrent(
   tags: string,
   uploaded: number,
   downloaded: number,
-  addedOn = 0,
-  completionOn = -1
+  addedAt = 0,
+  completedAt = -1
 ) {
   return {
     hash,
@@ -189,28 +189,24 @@ function makeTorrent(
     state: "uploading",
     tags,
     category: "",
-    upspeed: 0,
-    dlspeed: 0,
+    uploadSpeed: 0,
+    downloadSpeed: 0,
     uploaded,
     downloaded,
     ratio: 1.0,
     size: downloaded || 1,
-    num_seeds: 5,
-    num_leechs: 0,
-    num_complete: 5,
-    num_incomplete: 0,
-    tracker: "",
-    added_on: addedOn,
-    completion_on: completionOn,
-    last_activity: 0,
-    seeding_time: 0,
-    time_active: 0,
-    seen_complete: 0,
+    seedCount: 5,
+    leechCount: 0,
+    swarmSeeders: 5,
+    swarmLeechers: 0,
+    addedAt,
+    completedAt,
+    lastActivityAt: 0,
+    seedingTime: 0,
+    activeTime: 0,
     availability: 1,
-    amount_left: 0,
+    remaining: 0,
     progress: 1,
-    content_path: "",
-    save_path: "",
   }
 }
 
@@ -668,7 +664,7 @@ describe("computeTodayAtAGlance — ratio weighted average", () => {
 // ---------------------------------------------------------------------------
 
 describe("computeTodayAtAGlance — activity counts", () => {
-  it("counts torrents whose added_on unix timestamp falls on today", async () => {
+  it("counts torrents whose addedAt unix timestamp falls on today", async () => {
     const tracker = makeTracker(1, { qbtTag: "aither" })
     const snap1 = makeSnapshot(1, new Date(Date.now() - 3600000), "1000000000", "500000000")
     const snap2 = makeSnapshot(1, new Date(), "2000000000", "1000000000")
@@ -691,7 +687,7 @@ describe("computeTodayAtAGlance — activity counts", () => {
     expect(result.activity.addedToday).toBe(1)
   })
 
-  it("does not count torrents with added_on of 0 (unix epoch, not today)", async () => {
+  it("does not count torrents with addedAt of 0 (unix epoch, not today)", async () => {
     const tracker = makeTracker(1, { qbtTag: "aither" })
     const snap1 = makeSnapshot(1, new Date(Date.now() - 3600000), "1000000000", "500000000")
     const snap2 = makeSnapshot(1, new Date(), "2000000000", "1000000000")
@@ -703,7 +699,7 @@ describe("computeTodayAtAGlance — activity counts", () => {
     expect(result.activity.addedToday).toBe(0)
   })
 
-  it("counts torrents whose completion_on unix timestamp falls on today", async () => {
+  it("counts torrents whose completedAt unix timestamp falls on today", async () => {
     const tracker = makeTracker(1, { qbtTag: "aither" })
     const snap1 = makeSnapshot(1, new Date(Date.now() - 3600000), "1000000000", "500000000")
     const snap2 = makeSnapshot(1, new Date(), "2000000000", "1000000000")
@@ -726,7 +722,7 @@ describe("computeTodayAtAGlance — activity counts", () => {
     expect(result.activity.completedToday).toBe(1)
   })
 
-  it("ignores completion_on of -1 (torrent is still downloading)", async () => {
+  it("ignores completedAt of -1 (torrent is still downloading)", async () => {
     const tracker = makeTracker(1, { qbtTag: "aither" })
     const snap1 = makeSnapshot(1, new Date(Date.now() - 3600000), "1000000000", "500000000")
     const snap2 = makeSnapshot(1, new Date(), "2000000000", "1000000000")
@@ -738,7 +734,7 @@ describe("computeTodayAtAGlance — activity counts", () => {
     expect(result.activity.completedToday).toBe(0)
   })
 
-  it("ignores completion_on of 0 (qBittorrent sentinel for 'not completed')", async () => {
+  it("ignores completedAt of 0 (qBittorrent sentinel for 'not completed')", async () => {
     const tracker = makeTracker(1, { qbtTag: "aither" })
     const snap1 = makeSnapshot(1, new Date(Date.now() - 3600000), "1000000000", "500000000")
     const snap2 = makeSnapshot(1, new Date(), "2000000000", "1000000000")
diff --git a/src/lib/__tests__/totp.test.ts b/src/lib/__tests__/totp.test.ts
index b1d862cc..9e53d218 100644
--- a/src/lib/__tests__/totp.test.ts
+++ b/src/lib/__tests__/totp.test.ts
@@ -160,13 +160,6 @@ describe("verifyAndConsumeBackupCode", () => {
     expect(updatedEntries[2].used).toBe(false)
   })
 
-  it("returns valid=false when all codes are used", () => {
-    const code = "ABCD-EF01"
-    const entry = { ...hashBackupCode(code), used: true }
-    const { valid } = verifyAndConsumeBackupCode(code, [entry])
-    expect(valid).toBe(false)
-  })
-
   it("works with a full set of generated codes", () => {
     const codes = generateBackupCodes()
     const entries = codes.map((c) => hashBackupCode(c))
diff --git a/src/lib/__tests__/tracker-events.test.ts b/src/lib/__tests__/tracker-events.test.ts
index ad4f35dd..7561e23c 100644
--- a/src/lib/__tests__/tracker-events.test.ts
+++ b/src/lib/__tests__/tracker-events.test.ts
@@ -1,7 +1,6 @@
 // src/lib/__tests__/tracker-events.test.ts
 
 import { afterEach, describe, expect, it, vi } from "vitest"
-import type { NotificationEventType } from "@/lib/notifications/types"
 import { VALID_EVENT_TYPES } from "@/lib/notifications/types"
 import {
   checkActiveHnrs,
@@ -16,7 +15,6 @@ import {
   checkTrackerError,
   checkUnsatisfiedLimitApproaching,
   checkVipExpiringSoon,
-  checkWarned,
   checkWarnedTransition,
   checkZeroSeeding,
   EVENT_SNOOZE_MS,
@@ -88,21 +86,6 @@ describe("checkTrackerError", () => {
   })
 })
 
-describe("checkWarned", () => {
-  it("returns true when warned is true", () => {
-    expect(checkWarned(true)).toBe(true)
-  })
-  it("returns false when warned is false", () => {
-    expect(checkWarned(false)).toBe(false)
-  })
-  it("returns false when warned is null", () => {
-    expect(checkWarned(null)).toBe(false)
-  })
-  it("returns false when warned is undefined", () => {
-    expect(checkWarned(undefined)).toBe(false)
-  })
-})
-
 describe("checkWarnedTransition", () => {
   it("returns true when previous is false and current is true", () => {
     expect(checkWarnedTransition(false, true)).toBe(true)
@@ -275,27 +258,60 @@ describe("checkAnniversaryMilestone with date mocking", () => {
     vi.useRealTimers()
   })
 
+  it("returns 1 month anniversary on exact date", () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date("2026-04-15"))
+    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "1 month anniversary" })
+    vi.useRealTimers()
+  })
+
+  it("returns 6 month anniversary on exact date", () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date("2026-09-15"))
+    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "6 month anniversary" })
+    vi.useRealTimers()
+  })
+
   it("returns 1 year anniversary on exact date", () => {
     vi.useFakeTimers()
     vi.setSystemTime(new Date("2026-03-19T12:00:00"))
-    expect(checkAnniversaryMilestone("2025-03-19")).toEqual({ label: "1 year anniversary" })
+    expect(checkAnniversaryMilestone("2025-03-19")).toEqual({ label: "1-year anniversary" })
     vi.useRealTimers()
   })
+
+  it("returns multi-year anniversary", () => {
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date("2031-03-15"))
+    expect(checkAnniversaryMilestone("2026-03-15")).toEqual({ label: "5-year anniversary" })
+    vi.useRealTimers()
+  })
+
   it("returns null for invalid date string", () => {
     expect(checkAnniversaryMilestone("not-a-date")).toBeNull()
   })
+
   it("matches within the +/-3 day window", () => {
     vi.useFakeTimers()
     vi.setSystemTime(new Date("2026-03-21T12:00:00")) // 2 days after 1yr anniversary
-    expect(checkAnniversaryMilestone("2025-03-19")).toEqual({ label: "1 year anniversary" })
+    expect(checkAnniversaryMilestone("2025-03-19")).toEqual({ label: "1-year anniversary" })
     vi.useRealTimers()
   })
+
   it("does not match outside the +/-3 day window", () => {
     vi.useFakeTimers()
     vi.setSystemTime(new Date("2026-03-25T12:00:00")) // 6 days after
     expect(checkAnniversaryMilestone("2025-03-19")).toBeNull()
     vi.useRealTimers()
   })
+
+  it("prefers 1 month over 1 year when both could match", () => {
+    // Edge case: 1 month anniversary checked before annual milestones
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date("2026-04-15"))
+    const result = checkAnniversaryMilestone("2026-03-15")
+    expect(result?.label).toBe("1 month anniversary")
+    vi.useRealTimers()
+  })
 })
 
 describe("EVENT_SNOOZE_MS", () => {
@@ -306,28 +322,6 @@ describe("EVENT_SNOOZE_MS", () => {
       expect(EVENT_SNOOZE_MS[type]).toBeGreaterThan(0)
     }
   })
-  it("uses 6h for ratio_drop, hit_and_run, tracker_down, buffer_milestone, warned", () => {
-    const sixHours = 6 * 60 * 60 * 1000
-    for (const type of [
-      "ratio_drop",
-      "hit_and_run",
-      "tracker_down",
-      "buffer_milestone",
-      "warned",
-    ] as NotificationEventType[]) {
-      expect(EVENT_SNOOZE_MS[type]).toBe(sixHours)
-    }
-  })
-  it("uses 24h for ratio_danger and zero_seeding", () => {
-    const twentyFourHours = 24 * 60 * 60 * 1000
-    expect(EVENT_SNOOZE_MS.ratio_danger).toBe(twentyFourHours)
-    expect(EVENT_SNOOZE_MS.zero_seeding).toBe(twentyFourHours)
-  })
-  it("uses 7 days for rank_change and anniversary", () => {
-    const sevenDays = 7 * 24 * 60 * 60 * 1000
-    expect(EVENT_SNOOZE_MS.rank_change).toBe(sevenDays)
-    expect(EVENT_SNOOZE_MS.anniversary).toBe(sevenDays)
-  })
 })
 
 describe("checkBonusCapReached", () => {
diff --git a/src/lib/__tests__/tracker-serializer.test.ts b/src/lib/__tests__/tracker-serializer.test.ts
index 5bb6191b..de1496a5 100644
--- a/src/lib/__tests__/tracker-serializer.test.ts
+++ b/src/lib/__tests__/tracker-serializer.test.ts
@@ -12,6 +12,7 @@ const mockTracker = {
   isActive: true,
   lastPolledAt: new Date("2026-01-01"),
   lastError: null,
+  lastErrorAt: null,
   consecutiveFailures: 0,
   pausedAt: null,
   userPausedAt: null,
@@ -22,6 +23,7 @@ const mockTracker = {
   remoteUserId: null,
   platformMeta: null,
   avatarData: null,
+  avatarMimeType: null,
   avatarCachedAt: null,
   avatarRemoteUrl: null,
   useProxy: false,
@@ -53,6 +55,7 @@ const mockSnapshot = {
   seedbonus: null,
   hitAndRuns: null,
   shareScore: null,
+  isManual: false,
 }
 
 describe("parsePlatformMeta", () => {
@@ -95,11 +98,6 @@ describe("serializeTrackerResponse new fields", () => {
     expect(result.latestStats?.bufferBytes).toBeNull()
   })
 
-  it("serializes all 4 new fields as null when snapshot is null", () => {
-    const result = serializeTrackerResponse(mockTracker, null, (v) => v ?? null)
-    expect(result.latestStats).toBeNull()
-  })
-
   it("serializes hitAndRuns, seedbonus, shareScore when present", () => {
     const snapshotWithStats = {
       ...mockSnapshot,
diff --git a/src/lib/__tests__/upload-polar-chart.test.ts b/src/lib/__tests__/upload-polar-chart.test.ts
index 9bdc155c..008bdc52 100644
--- a/src/lib/__tests__/upload-polar-chart.test.ts
+++ b/src/lib/__tests__/upload-polar-chart.test.ts
@@ -22,6 +22,7 @@ const makeSnapshot = (overrides: Partial<Snapshot> = {}): Snapshot => ({
   shareScore: null,
   username: "testuser",
   group: "User",
+  isManual: false,
   ...overrides,
 })
 
diff --git a/src/lib/__tests__/uptime.test.ts b/src/lib/__tests__/uptime.test.ts
index 464b6687..4c815050 100644
--- a/src/lib/__tests__/uptime.test.ts
+++ b/src/lib/__tests__/uptime.test.ts
@@ -14,7 +14,7 @@ import { floorToFiveMin, flushCompletedBuckets, recordHeartbeat } from "@/lib/up
 function mockDbInsert() {
   const chain = {
     values: vi.fn().mockReturnValue({
-      onConflictDoNothing: vi.fn().mockResolvedValue(undefined),
+      onConflictDoUpdate: vi.fn().mockResolvedValue(undefined),
     }),
   }
   vi.mocked(db.insert).mockReturnValue(chain as never)
diff --git a/src/lib/__tests__/validators.test.ts b/src/lib/__tests__/validators.test.ts
new file mode 100644
index 00000000..5e25c821
--- /dev/null
+++ b/src/lib/__tests__/validators.test.ts
@@ -0,0 +1,221 @@
+// src/lib/__tests__/validators.test.ts
+import { describe, expect, it } from "vitest"
+import { isIntegerInRange, isValidHex, isValidPort, parseIntClamped } from "@/lib/validators"
+
+describe("isValidHex", () => {
+  describe("strict mode (default)", () => {
+    it("accepts a lowercase 6-digit hex", () => {
+      expect(isValidHex("#000000")).toBe(true)
+    })
+
+    it("accepts an uppercase 6-digit hex", () => {
+      expect(isValidHex("#FFFFFF")).toBe(true)
+    })
+
+    it("accepts a mixed-case 6-digit hex", () => {
+      expect(isValidHex("#aAbBcC")).toBe(true)
+    })
+
+    it("rejects a 3-digit shorthand hex", () => {
+      expect(isValidHex("#fff")).toBe(false)
+    })
+
+    it("rejects a 4-digit hex", () => {
+      expect(isValidHex("#ffff")).toBe(false)
+    })
+
+    it("rejects an 8-digit hex with alpha", () => {
+      expect(isValidHex("#ffffffaa")).toBe(false)
+    })
+
+    it("rejects a hex without leading hash", () => {
+      expect(isValidHex("fff000")).toBe(false)
+    })
+
+    it("rejects an empty string", () => {
+      expect(isValidHex("")).toBe(false)
+    })
+
+    it("rejects non-hex characters in the value", () => {
+      expect(isValidHex("#gggggg")).toBe(false)
+    })
+
+    it("rejects a named color string", () => {
+      expect(isValidHex("red")).toBe(false)
+    })
+  })
+
+  describe("permissive mode", () => {
+    it("accepts a 3-digit shorthand hex", () => {
+      expect(isValidHex("#fff", true)).toBe(true)
+    })
+
+    it("accepts a 4-digit shorthand hex with alpha", () => {
+      expect(isValidHex("#ffff", true)).toBe(true)
+    })
+
+    it("accepts a 6-digit hex", () => {
+      expect(isValidHex("#ffffff", true)).toBe(true)
+    })
+
+    it("accepts an 8-digit hex with alpha", () => {
+      expect(isValidHex("#ffffffaa", true)).toBe(true)
+    })
+
+    it("rejects a hex without leading hash", () => {
+      expect(isValidHex("fff", true)).toBe(false)
+    })
+
+    it("rejects an empty string", () => {
+      expect(isValidHex("", true)).toBe(false)
+    })
+
+    it("rejects non-hex characters", () => {
+      expect(isValidHex("#gg", true)).toBe(false)
+    })
+
+    it("rejects a 5-digit hex (invalid length)", () => {
+      expect(isValidHex("#12345", true)).toBe(false)
+    })
+
+    it("rejects a named color string", () => {
+      expect(isValidHex("red", true)).toBe(false)
+    })
+
+    it("rejects a 1-digit hex (invalid length)", () => {
+      expect(isValidHex("#1", true)).toBe(false)
+    })
+  })
+})
+
+describe("isValidPort", () => {
+  it("accepts the minimum valid port (1)", () => {
+    expect(isValidPort(1)).toBe(true)
+  })
+
+  it("accepts port 80", () => {
+    expect(isValidPort(80)).toBe(true)
+  })
+
+  it("accepts port 443", () => {
+    expect(isValidPort(443)).toBe(true)
+  })
+
+  it("accepts a common application port (8080)", () => {
+    expect(isValidPort(8080)).toBe(true)
+  })
+
+  it("accepts the maximum valid port (65535)", () => {
+    expect(isValidPort(65535)).toBe(true)
+  })
+
+  it("rejects port 0 (below minimum)", () => {
+    expect(isValidPort(0)).toBe(false)
+  })
+
+  it("rejects a negative port", () => {
+    expect(isValidPort(-1)).toBe(false)
+  })
+
+  it("rejects a port above the maximum (65536)", () => {
+    expect(isValidPort(65536)).toBe(false)
+  })
+
+  it("rejects a fractional port number", () => {
+    expect(isValidPort(1.5)).toBe(false)
+  })
+
+  it("rejects NaN", () => {
+    expect(isValidPort(NaN)).toBe(false)
+  })
+
+  it("rejects Infinity", () => {
+    expect(isValidPort(Infinity)).toBe(false)
+  })
+})
+
+describe("isIntegerInRange", () => {
+  it("accepts the minimum boundary value", () => {
+    expect(isIntegerInRange(1, 1, 100)).toBe(true)
+  })
+
+  it("accepts the maximum boundary value", () => {
+    expect(isIntegerInRange(100, 1, 100)).toBe(true)
+  })
+
+  it("accepts a value in the middle of the range", () => {
+    expect(isIntegerInRange(50, 1, 100)).toBe(true)
+  })
+
+  it("rejects a value below the minimum", () => {
+    expect(isIntegerInRange(0, 1, 100)).toBe(false)
+  })
+
+  it("rejects a value above the maximum", () => {
+    expect(isIntegerInRange(101, 1, 100)).toBe(false)
+  })
+
+  it("rejects a fractional value", () => {
+    expect(isIntegerInRange(1.5, 1, 100)).toBe(false)
+  })
+
+  it("rejects NaN", () => {
+    expect(isIntegerInRange(NaN, 1, 100)).toBe(false)
+  })
+
+  it("rejects Infinity", () => {
+    expect(isIntegerInRange(Infinity, 1, 100)).toBe(false)
+  })
+
+  it("accepts 0 when 0 is within range", () => {
+    expect(isIntegerInRange(0, -10, 10)).toBe(true)
+  })
+
+  it("accepts negative integers within a negative range", () => {
+    expect(isIntegerInRange(-5, -10, -1)).toBe(true)
+  })
+
+  it("accepts a value when min equals max (single-value range)", () => {
+    expect(isIntegerInRange(42, 42, 42)).toBe(true)
+  })
+
+  it("rejects a value outside a single-value range", () => {
+    expect(isIntegerInRange(43, 42, 42)).toBe(false)
+  })
+})
+
+describe("parseIntClamped", () => {
+  it("defaults to fallback when null", () => {
+    expect(parseIntClamped(null, 1, 3650, 30)).toBe(30)
+  })
+
+  it("defaults to fallback for non-numeric strings", () => {
+    expect(parseIntClamped("abc", 1, 3650, 30)).toBe(30)
+    expect(parseIntClamped("", 1, 3650, 30)).toBe(30)
+  })
+
+  it("parses valid numeric strings", () => {
+    expect(parseIntClamped("7", 1, 3650, 30)).toBe(7)
+    expect(parseIntClamped("90", 1, 3650, 30)).toBe(90)
+  })
+
+  it("clamps to minimum", () => {
+    expect(parseIntClamped("0", 1, 3650, 30)).toBe(1)
+    expect(parseIntClamped("-5", 1, 3650, 30)).toBe(1)
+  })
+
+  it("clamps to maximum", () => {
+    expect(parseIntClamped("3651", 1, 3650, 30)).toBe(3650)
+    expect(parseIntClamped("999999", 1, 3650, 30)).toBe(3650)
+  })
+
+  it("truncates decimals via parseInt", () => {
+    expect(parseIntClamped("7.9", 1, 3650, 30)).toBe(7)
+  })
+
+  it("works with different min/max/default", () => {
+    expect(parseIntClamped(null, 0, 100, 50)).toBe(50)
+    expect(parseIntClamped("200", 0, 100, 50)).toBe(100)
+    expect(parseIntClamped("-1", 0, 100, 50)).toBe(0)
+  })
+})
diff --git a/src/lib/adapters/adapter-fetch.test.ts b/src/lib/adapters/adapter-fetch.test.ts
new file mode 100644
index 00000000..c8fd016f
--- /dev/null
+++ b/src/lib/adapters/adapter-fetch.test.ts
@@ -0,0 +1,126 @@
+// src/lib/adapters/adapter-fetch.test.ts
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { adapterFetch } from "./adapter-fetch"
+
+describe("adapterFetch - AbortSignal", () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("uses AbortSignal.timeout for request cancellation", async () => {
+    let capturedSignal: AbortSignal | undefined
+
+    vi.spyOn(global, "fetch").mockImplementationOnce((_url, init) => {
+      capturedSignal = init?.signal as AbortSignal | undefined
+      return Promise.resolve({
+        ok: true,
+        json: async () => ({ result: "ok" }),
+      } as Response)
+    })
+
+    await adapterFetch("https://example.com/api", "example.com")
+
+    expect(capturedSignal).toBeDefined()
+    expect(capturedSignal).toBeInstanceOf(AbortSignal)
+    // AbortSignal.timeout() produces a signal whose abortReason is a TimeoutError
+    // i.e. it has a finite timeout rather than being manually abortable with no reason
+    expect(capturedSignal?.aborted).toBe(false)
+  })
+
+  it("throws a timeout-specific message when AbortSignal fires", async () => {
+    const timeoutError = new DOMException("signal timed out", "TimeoutError")
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(timeoutError)
+
+    await expect(adapterFetch("https://example.com/api", "example.com")).rejects.toThrow(
+      "Request to example.com timed out"
+    )
+  })
+})
+
+describe("adapterFetch - TypeError unwrapping (Node.js native fetch)", () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("unwraps TypeError wrapping ECONNREFUSED into a readable message", async () => {
+    const cause = Object.assign(new Error("connect ECONNREFUSED 104.21.0.1:443"), {
+      code: "ECONNREFUSED",
+    })
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapterFetch("https://tracker.example/api", "tracker.example")).rejects.toThrow(
+      "Failed to connect to tracker.example: ECONNREFUSED"
+    )
+  })
+
+  it("unwraps TypeError wrapping ENOTFOUND into a readable message", async () => {
+    const cause = Object.assign(new Error("getaddrinfo ENOTFOUND tracker.example"), {
+      code: "ENOTFOUND",
+    })
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapterFetch("https://tracker.example/api", "tracker.example")).rejects.toThrow(
+      "Failed to connect to tracker.example: ENOTFOUND"
+    )
+  })
+
+  it("unwraps TypeError wrapping a DOMException TimeoutError", async () => {
+    const cause = new DOMException("The operation was timed out.", "TimeoutError")
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapterFetch("https://tracker.example/api", "tracker.example")).rejects.toThrow(
+      "Request to tracker.example timed out"
+    )
+  })
+
+  it("produces a useful fallback for a TypeError with no cause property", async () => {
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed"))
+
+    await expect(adapterFetch("https://tracker.example/api", "tracker.example")).rejects.toThrow(
+      "Failed to connect to tracker.example"
+    )
+  })
+})
+
+describe("adapterFetch - token sanitization", () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("does not expose the API token in error messages when fetch throws with a URL containing the token", async () => {
+    const secretToken = "super-secret-api-token-12345"
+    const urlWithToken = `https://example.com/api/user?api_token=${secretToken}`
+
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(
+      new Error(`request to ${urlWithToken} failed, reason: connect ECONNREFUSED`)
+    )
+
+    await expect(adapterFetch(`${urlWithToken}`, "example.com")).rejects.toSatisfy((err: Error) => {
+      expect(err.message).not.toContain(secretToken)
+      expect(err.message).toContain("example.com")
+      return true
+    })
+  })
+
+  it("does not expose the API token in HTTP error responses", async () => {
+    const secretToken = "super-secret-api-token-12345"
+
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: false,
+      status: 403,
+      statusText: "Forbidden",
+    } as Response)
+
+    // The token lives in the URL query string (i.e. ?api_token=…). adapterFetch receives
+    // the fully-constructed URL as its first argument. A non-ok response throws using only
+    // the status code and statusText — neither of which contains the token — so the
+    // caller-supplied token must not appear in the thrown message.
+    await expect(
+      adapterFetch(`https://example.com/api/user?api_token=${secretToken}`, "example.com")
+    ).rejects.toSatisfy((err: Error) => {
+      expect(err.message).not.toContain(secretToken)
+      expect(err.message).toContain("403")
+      return true
+    })
+  })
+})
diff --git a/src/lib/adapters/adapter-fetch.ts b/src/lib/adapters/adapter-fetch.ts
index 3b5adb74..d5c7b5ef 100644
--- a/src/lib/adapters/adapter-fetch.ts
+++ b/src/lib/adapters/adapter-fetch.ts
@@ -1,8 +1,8 @@
 // src/lib/adapters/adapter-fetch.ts
-//
-// Functions: adapterFetch
 
-import { proxyFetch } from "@/lib/proxy"
+import { classifyFetchError } from "@/lib/error-utils"
+import { ADAPTER_FETCH_TIMEOUT_MS } from "@/lib/limits"
+import { proxyFetch } from "@/lib/tunnel"
 import type { FetchOptions } from "./types"
 
 async function adapterFetch<T>(
@@ -36,20 +36,10 @@ async function adapterFetch<T>(
   try {
     response = await fetch(url, {
       headers: mergedHeaders,
-      signal: AbortSignal.timeout(15000),
+      signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
     })
   } catch (err) {
-    const name =
-      err !== null && typeof err === "object" && "name" in (err as object)
-        ? String((err as { name: unknown }).name)
-        : ""
-    if (name === "TimeoutError" || name === "AbortError") {
-      throw new Error(`Request to ${hostname} timed out`)
-    }
-    const code =
-      err instanceof Error && "code" in err ? (err as NodeJS.ErrnoException).code : undefined
-    const detail = code ?? (name || "Unknown")
-    throw new Error(`Failed to connect to ${hostname}: ${detail}`)
+    throw classifyFetchError(err, hostname)
   }
 
   if (!response.ok) {
diff --git a/src/lib/adapters/avistaz.test.ts b/src/lib/adapters/avistaz.test.ts
new file mode 100644
index 00000000..f85ceec7
--- /dev/null
+++ b/src/lib/adapters/avistaz.test.ts
@@ -0,0 +1,390 @@
+// src/lib/adapters/avistaz.test.ts
+
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { AvistazAdapter, parseAvistazCredentials, parseAvistazProfile } from "./avistaz"
+import type { AvistazPlatformMeta } from "./types"
+
+// Minimal ratio bar HTML fixture matching the real AvistaZ DOM structure
+const RATIO_BAR_HTML = `
+<div class="ratio-bar">
+  <div class="container">
+    <ul class="list-inline">
+      <li><i class="fa fa-user"></i>
+        <a href="/profile/testuser"><span class="badge-user group-member">testuser</span></a>
+      </li>
+      <li><i class="fa fa-group"></i>
+        <span class="badge-user group-member">Member</span>
+      </li>
+      <li data-toggle="tooltip" title="Upload">
+        <i class="fa fa-arrow-up text-success"></i> 32.64 GB</li>
+      <li data-toggle="tooltip" title="Download">
+        <i class="fa fa-arrow-down text-orange"></i> 1.00 KB</li>
+      <li data-toggle="tooltip" title="Ratio">
+        <i class="fa fa-signal"></i> 999999.99</li>
+      <li data-toggle="tooltip" title="Buffer">
+        <i class="fa fa-database"></i> 32.64 GB
+      </li>
+      <li><i class="fa fa-upload text-success"></i>
+        <a href="/profile/testuser/active">Seeding:</a>
+        2
+      </li>
+      <li><i class="fa fa-download text-orange"></i>
+        <a href="/profile/testuser/active">Leeching:</a>
+        0
+      </li>
+      <li><i class="fa fa-star text-gold"></i>
+        <a href="/profile/testuser/bonus">Bonus:</a>
+        285.80
+      </li>
+      <li><i class="fa fa-exclamation-triangle text-orange"></i>
+        <a href="/profile/testuser/reseed">Reseed:</a>
+        0
+      </li>
+      <li><i class="fa fa-exclamation-triangle text-yellow"></i>
+        <a href="/profile/testuser/history?hnr=1">Hit
+          & Run:</a>
+        0
+      </li>
+    </ul>
+  </div>
+</div>`
+
+const PROFILE_TABLE_HTML = `
+<table class="table table-condensed table-bordered table-striped">
+  <tbody>
+    <tr>
+      <td><i class="fa fa-lock"></i> User ID</td>
+      <td class="col-sm-7"><span>540792</span></td>
+      <td rowspan="8" class="avatar-cell"></td>
+    </tr>
+    <tr><td>Username</td><td><span class="badge-user group-member">testuser</span></td></tr>
+    <tr><td>Rank</td><td><span class="badge-user group-member">Member</span></td></tr>
+    <tr><td>Joined</td><td>27 Feb 2026 07:21 pm (1 month ago)</td></tr>
+    <tr><td>Downloaded</td><td>1.00 KB <span class="badge-extra small">0 MB</span></td></tr>
+    <tr><td>Uploaded</td><td>32.64 GB <span class="badge-extra small">33,421 MB</span></td></tr>
+    <tr><td>Ratio</td><td>999999.99</td></tr>
+    <tr><td>Buffer</td><td>32.64 GB <span class="badge-extra small">33,421 MB</span></td></tr>
+  </tbody>
+</table>
+<div class="well well-sm">
+  <ul class="list-inline mb-0">
+    <li><i class="fa fa-upload text-success"></i> Total Uploads: <strong>0</strong></li>
+    <li><i class="fa fa-download text-danger"></i> Downloads: <strong>4</strong></li>
+    <li><i class="fa fa-cloud-upload text-success"></i> Seeding: <strong>2</strong></li>
+    <li><i class="fa fa-cloud-download text-danger"></i> Leeching: <strong>0</strong></li>
+    <li><i class="fa fa-exclamation-triangle text-danger"></i> Hit & Run: <strong>0</strong></li>
+  </ul>
+</div>
+<table class="table table-condensed table-bordered table-striped">
+  <tbody>
+    <tr><td><i class="fa fa-lock"></i> 2FA</td>
+      <td><span class="text-danger"><i class="fa fa-times"></i> Not Enabled</span></td></tr>
+    <tr><td><i class="fa fa-lock"></i> Last Access</td>
+      <td>29 Mar 2026 08:08 pm (15 minutes ago)</td></tr>
+    <tr><td><i class="fa fa-lock"></i> Bonus Points</td><td>285.80</td></tr>
+    <tr><td><i class="fa fa-lock"></i> Invites</td><td>0</td></tr>
+    <tr><td><i class="fa fa-lock"></i> Can Download</td><td>Yes</td></tr>
+    <tr><td><i class="fa fa-lock"></i> Can Upload</td><td>Yes</td></tr>
+    <tr><td><i class="fa fa-lock"></i> Donor</td><td>No</td></tr>
+    <tr><td><i class="fa fa-lock"></i> VIP Expiry</td><td>-</td></tr>
+  </tbody>
+</table>`
+
+const AVATAR_HTML = `
+<div id="avatar-uploader" class="img-avatar pull-right"><div><div class="qq-uploader-selector text-center">
+  <img src="https://avistaz.to/images/avatar/z/2/k/z2kyjx7a08ea.jpg" class="avatar-original img-thumbnail">
+</div></div></div>`
+
+const FULL_PAGE = `<!doctype html><html><head></head><body>${RATIO_BAR_HTML}<section class="container content" id="content-area">${PROFILE_TABLE_HTML}</section>${AVATAR_HTML}</body></html>`
+
+describe("parseAvistazProfile", () => {
+  it("extracts core stats from the ratio bar", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.username).toBe("testuser")
+    expect(stats.group).toBe("Member")
+    expect(stats.uploadedBytes).toBe(BigInt(32_640_000_000)) // 32.64 GB decimal
+    expect(stats.downloadedBytes).toBe(BigInt(1_000)) // 1.00 KB decimal
+    expect(stats.ratio).toBe(999999.99)
+    expect(stats.seedingCount).toBe(2)
+    expect(stats.leechingCount).toBe(0)
+    expect(stats.seedbonus).toBe(285.8)
+    expect(stats.hitAndRuns).toBe(0)
+  })
+
+  it("extracts remoteUserId from profile table", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.remoteUserId).toBe(540792)
+  })
+
+  it("extracts joinedDate from profile table", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.joinedDate).toContain("2026")
+  })
+
+  it("extracts lastAccessDate from private table", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.lastAccessDate).toContain("2026")
+  })
+
+  it("extracts platformMeta fields", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    const meta = stats.platformMeta as AvistazPlatformMeta
+    expect(meta.donor).toBe(false)
+    expect(meta.invites).toBe(0)
+    expect(meta.canDownload).toBe(true)
+    expect(meta.canUpload).toBe(true)
+    expect(meta.totalUploads).toBe(0)
+    expect(meta.totalDownloads).toBe(4)
+    expect(meta.twoFactorEnabled).toBe(false)
+    expect(meta.reseedRequests).toBe(0)
+  })
+
+  it("extracts avatar URL from profile page", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.avatarUrl).toBe("https://avistaz.to/images/avatar/z/2/k/z2kyjx7a08ea.jpg")
+  })
+
+  it("computes bufferBytes as upload minus download", () => {
+    const stats = parseAvistazProfile(FULL_PAGE, "testuser")
+    expect(stats.bufferBytes).toBe(BigInt(32_640_000_000) - BigInt(1_000))
+  })
+
+  it("detects login redirect and throws", () => {
+    const loginRedirect = `<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url='https://avistaz.to/auth/login'" /></head></html>`
+    expect(() => parseAvistazProfile(loginRedirect, "testuser")).toThrow("Session expired")
+  })
+
+  it("detects Cloudflare challenge and throws", () => {
+    const cfChallenge = `<!DOCTYPE html><html><head><title>Just a moment...</title></head><body></body></html>`
+    expect(() => parseAvistazProfile(cfChallenge, "testuser")).toThrow("Cloudflare")
+  })
+
+  it("throws when ratio bar is missing", () => {
+    const noRatioBar = `<!DOCTYPE html><html><head></head><body><p>No ratio bar here.</p></body></html>`
+    expect(() => parseAvistazProfile(noRatioBar, "testuser")).toThrow("ratio bar")
+  })
+
+  it("falls back to passed username when badge-user span is absent", () => {
+    const minimalPage = `<!doctype html><html><head></head><body>
+      <div class="ratio-bar"><div class="container"><ul class="list-inline">
+        <li data-toggle="tooltip" title="Upload"><i></i> 1.00 GB</li>
+        <li data-toggle="tooltip" title="Download"><i></i> 500.00 MB</li>
+        <li data-toggle="tooltip" title="Ratio"><i></i> 2.00</li>
+        <li><a href="#">Seeding:</a> 1</li>
+        <li><a href="#">Leeching:</a> 0</li>
+        <li><a href="#">Bonus:</a> 100.00</li>
+        <li><a href="#">Reseed:</a> 0</li>
+        <li><a href="#">Hit & Run:</a> 0</li>
+      </ul></div></div>
+    </body></html>`
+    const stats = parseAvistazProfile(minimalPage, "fallbackuser")
+    expect(stats.username).toBe("fallbackuser")
+  })
+
+  it("parses BS5 ratio bar (data-bs-toggle, Uploaded/Downloaded titles)", () => {
+    const bs5Page = `<!doctype html><html><head></head><body>
+      <div class="ratio-bar"><div class="container"><ul class="list-inline">
+        <li class="list-inline-item"><span class="badge-user">bs5user</span></li>
+        <li class="list-inline-item"><span class="badge-user">Power User</span></li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Uploaded">
+          <i class="fa fa-arrow-up"></i> 27.05 GB</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Downloaded">
+          <i class="fa fa-arrow-down"></i> 6.44 GB</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Ratio">
+          <i class="fa fa-exchange"></i> 4.20</li>
+      </ul></div></div>
+    </body></html>`
+    const stats = parseAvistazProfile(bs5Page, "bs5user")
+    expect(stats.username).toBe("bs5user")
+    expect(stats.group).toBe("Power User")
+    expect(stats.uploadedBytes).toBe(27050000000n)
+    expect(stats.downloadedBytes).toBe(6440000000n)
+    expect(stats.ratio).toBeCloseTo(4.2)
+  })
+
+  it("extracts all fields from AnimeZ BS5 structure (datagrid + tooltip stats)", () => {
+    const animezPage = `<!doctype html><html><head></head><body>
+      <span class="badge bg-secondary-lt text-secondary badge-sm">Member</span>
+      <div class="ratio-bar"><div class="container"><ul class="list-inline">
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Uploaded">
+          <i class="fa fa-arrow-up"></i> 10.00 GB</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Downloaded">
+          <i class="fa fa-arrow-down"></i> 5.00 GB</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Ratio">
+          <i class="fa fa-exchange"></i> 2.00</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Active Seeds">
+          <i class="fa fa-arrow-up"></i> 7</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Active Leeches">
+          <i class="fa fa-arrow-down"></i> 1</li>
+        <li class="list-inline-item" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Bonus Points">
+          <i class="fa fa-star"></i> BP: 344</li>
+      </ul></div></div>
+      <div class="datagrid">
+        <div class="datagrid-item">
+          <div class="datagrid-title">Member Since</div>
+          <div class="datagrid-content ">February 27, 2026</div>
+        </div>
+        <div class="datagrid-item">
+          <div class="datagrid-title">Last Seen</div>
+          <div class="datagrid-content ">11 seconds ago</div>
+        </div>
+        <div class="datagrid-item">
+          <div class="datagrid-title">Invites</div>
+          <div class="datagrid-content ">0</div>
+        </div>
+        <div class="datagrid-item">
+          <div class="datagrid-title">2FA</div>
+          <div class="datagrid-content ">Enabled</div>
+        </div>
+      </div>
+    </body></html>`
+    const stats = parseAvistazProfile(animezPage, "animezuser")
+    expect(stats.username).toBe("animezuser")
+    expect(stats.group).toBe("Member")
+    expect(stats.uploadedBytes).toBe(10000000000n)
+    expect(stats.downloadedBytes).toBe(5000000000n)
+    expect(stats.ratio).toBeCloseTo(2.0)
+    expect(stats.seedingCount).toBe(7)
+    expect(stats.leechingCount).toBe(1)
+    expect(stats.seedbonus).toBe(344)
+    expect(stats.joinedDate).toBe("2026-02-27")
+    expect((stats.platformMeta as { twoFactorEnabled?: boolean })?.twoFactorEnabled).toBe(true)
+  })
+})
+
+describe("parseAvistazCredentials", () => {
+  it("parses a valid JSON credential blob", () => {
+    const json = JSON.stringify({
+      cookies: "cf_clearance=abc; session=xyz",
+      userAgent: "Mozilla/5.0",
+      username: "testuser",
+    })
+    const creds = parseAvistazCredentials(json)
+    expect(creds.cookies).toBe("cf_clearance=abc; session=xyz")
+    expect(creds.userAgent).toBe("Mozilla/5.0")
+    expect(creds.username).toBe("testuser")
+  })
+
+  it("throws on missing cookies field", () => {
+    const json = JSON.stringify({ userAgent: "Mozilla/5.0", username: "testuser" })
+    expect(() => parseAvistazCredentials(json)).toThrow("cookies")
+  })
+
+  it("throws on missing userAgent field", () => {
+    const json = JSON.stringify({ cookies: "cf_clearance=abc", username: "testuser" })
+    expect(() => parseAvistazCredentials(json)).toThrow()
+  })
+
+  it("throws on missing username field", () => {
+    const json = JSON.stringify({ cookies: "cf_clearance=abc", userAgent: "Mozilla/5.0" })
+    expect(() => parseAvistazCredentials(json)).toThrow()
+  })
+
+  it("throws on non-JSON string", () => {
+    expect(() => parseAvistazCredentials("just-a-plain-string")).toThrow()
+  })
+
+  it("throws on empty cookies", () => {
+    const json = JSON.stringify({ cookies: "   ", userAgent: "Mozilla/5.0", username: "user" })
+    expect(() => parseAvistazCredentials(json)).toThrow("cookies")
+  })
+
+  it("throws when user pastes a cookie name instead of the full header", () => {
+    const json = JSON.stringify({
+      cookies: "cf_clearance",
+      userAgent: "Mozilla/5.0",
+      username: "user",
+    })
+    expect(() => parseAvistazCredentials(json)).toThrow("cookie name")
+  })
+
+  it("throws when cookie string has no key=value pairs", () => {
+    const json = JSON.stringify({
+      cookies: "some-random-text-no-equals",
+      userAgent: "Mozilla/5.0",
+      username: "user",
+    })
+    expect(() => parseAvistazCredentials(json)).toThrow("key=value")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// AvistazAdapter.fetchStats — fetchHtml network error paths
+// These tests verify that classifyFetchError is correctly wired in fetchHtml,
+// i.e. that TypeError-wrapping from Node.js native fetch is unwrapped into a
+// useful message before propagating up to the caller.
+// ---------------------------------------------------------------------------
+
+describe("AvistazAdapter.fetchStats — network error classification", () => {
+  const adapter = new AvistazAdapter()
+  const validToken = JSON.stringify({
+    cookies: "cf_clearance=aaaa; session=bbbb",
+    userAgent: "Mozilla/5.0",
+    username: "testuser",
+  })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("unwraps TypeError wrapping ECONNREFUSED (Node.js native fetch pattern)", async () => {
+    const cause = Object.assign(new Error("connect ECONNREFUSED 192.0.2.1:443"), {
+      code: "ECONNREFUSED",
+    })
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Failed to connect to avistaz.to: ECONNREFUSED"
+    )
+  })
+
+  it("unwraps TypeError wrapping ENOTFOUND", async () => {
+    const cause = Object.assign(new Error("getaddrinfo ENOTFOUND avistaz.to"), {
+      code: "ENOTFOUND",
+    })
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Failed to connect to avistaz.to: ENOTFOUND"
+    )
+  })
+
+  it("produces a timeout message when the AbortSignal fires (TypeError wrapping TimeoutError)", async () => {
+    const cause = new DOMException("The operation was timed out.", "TimeoutError")
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed", { cause }))
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Request to avistaz.to timed out"
+    )
+  })
+
+  it("produces a timeout message for a bare DOMException TimeoutError", async () => {
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(
+      new DOMException("signal timed out", "TimeoutError")
+    )
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Request to avistaz.to timed out"
+    )
+  })
+
+  it("produces a useful message for a bare TypeError with no cause", async () => {
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new TypeError("fetch failed"))
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Failed to connect to avistaz.to"
+    )
+  })
+
+  it("propagates session-expired error when server returns 302 redirect", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: false,
+      status: 302,
+      statusText: "Found",
+    } as Response)
+
+    await expect(adapter.fetchStats("https://avistaz.to", validToken, "")).rejects.toThrow(
+      "Session expired"
+    )
+  })
+})
diff --git a/src/lib/adapters/avistaz.ts b/src/lib/adapters/avistaz.ts
new file mode 100644
index 00000000..046d2405
--- /dev/null
+++ b/src/lib/adapters/avistaz.ts
@@ -0,0 +1,457 @@
+// src/lib/adapters/avistaz.ts
+//
+// Functions: parseAvistazCredentials, safeParseBytes, textAfterLabel,
+//            extractRatioBarValue, parseAvistazProfile, fetchHtml, AvistazAdapter
+
+import { type HTMLElement as ParsedElement, parse as parseHtml } from "node-html-parser"
+import { computeBufferBytes } from "@/lib/data-transforms"
+import { classifyFetchError, sanitizeNetworkError } from "@/lib/error-utils"
+import { localDateStr } from "@/lib/formatters"
+import { ADAPTER_FETCH_TIMEOUT_MS } from "@/lib/limits"
+import { parseBytes } from "@/lib/parser"
+import type {
+  AvistazPlatformMeta,
+  DebugApiCall,
+  FetchOptions,
+  TrackerAdapter,
+  TrackerStats,
+} from "./types"
+
+// ---------------------------------------------------------------------------
+// Credential handling
+// ---------------------------------------------------------------------------
+
+export interface AvistazCredentials {
+  cookies: string
+  userAgent: string
+  username: string
+}
+
+export function parseAvistazCredentials(apiToken: string): AvistazCredentials {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(apiToken)
+  } catch {
+    throw new Error(
+      "AvistaZ credentials must be a JSON object with cookies, userAgent, and username"
+    )
+  }
+
+  if (
+    typeof parsed !== "object" ||
+    parsed === null ||
+    typeof (parsed as Record<string, unknown>).cookies !== "string" ||
+    typeof (parsed as Record<string, unknown>).userAgent !== "string" ||
+    typeof (parsed as Record<string, unknown>).username !== "string"
+  ) {
+    throw new Error(
+      "AvistaZ credentials must contain cookies (string), userAgent (string), and username (string)"
+    )
+  }
+
+  const { cookies, userAgent, username } = parsed as Record<string, string>
+  if (!cookies.trim()) throw new Error("AvistaZ credentials: cookies cannot be empty")
+  if (!userAgent.trim()) throw new Error("AvistaZ credentials: userAgent cannot be empty")
+  if (!username.trim()) throw new Error("AvistaZ credentials: username cannot be empty")
+
+  // Strip "Cookie: " prefix if user copied from raw headers view
+  const trimmedCookies = cookies.trim().replace(/^Cookie:\s*/i, "")
+  const cookieNameOnly = /^(cf_clearance|[a-z]+x_session|remember_web_\w+|XSRF-TOKEN|love)$/i
+  if (cookieNameOnly.test(trimmedCookies)) {
+    throw new Error(
+      `It looks like you pasted a cookie name ("${trimmedCookies}") instead of the full Cookie header value. Copy the entire value after "Cookie:" in DevTools.`
+    )
+  }
+
+  // Should contain at least one key=value pair
+  if (!trimmedCookies.includes("=")) {
+    throw new Error(
+      "Cookie string doesn't look right — it should contain key=value pairs (i.e. cf_clearance=abc123; session=xyz)"
+    )
+  }
+
+  // HTTP headers only allow byte-safe characters (0-255). Non-ASCII chars like
+  // ellipsis (U+2026) appear when DevTools truncates long values during copy.
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional byte-range check
+  const nonAscii = trimmedCookies.match(/[^\x00-\xFF]/)
+  if (nonAscii) {
+    const char = nonAscii[0]
+    const code = char.codePointAt(0)
+    const idx = nonAscii.index
+    throw new Error(
+      `Cookie string contains a non-ASCII character ("${char}", U+${code?.toString(16).toUpperCase().padStart(4, "0")}) at position ${idx}. ` +
+        "This usually means the browser truncated a long value when copying. Re-copy the full cookie string from DevTools."
+    )
+  }
+
+  return { cookies: trimmedCookies, userAgent, username }
+}
+
+// ---------------------------------------------------------------------------
+// Byte parsing — reuses existing parseBytes from @/lib/parser which handles
+// both binary (GiB) and decimal (GB) units with exact bigint arithmetic.
+// AvistaZ uses decimal units (GB, KB).
+// ---------------------------------------------------------------------------
+
+function strictParseBytes(text: string, field: string): bigint {
+  const trimmed = text.trim()
+  if (!trimmed) throw new Error(`AvistaZ: empty ${field} byte string`)
+  return parseBytes(trimmed)
+}
+
+// ---------------------------------------------------------------------------
+// HTML parsing helpers
+// ---------------------------------------------------------------------------
+
+function textAfterLabel(rows: ParsedElement[], label: string): string {
+  for (const row of rows) {
+    const cells = row.querySelectorAll("td")
+    if (cells.length >= 2 && cells[0].textContent?.includes(label)) {
+      return cells[1].textContent?.trim() ?? ""
+    }
+  }
+  return ""
+}
+
+// BS5 (AnimeZ) uses datagrid divs instead of tables
+function textFromDatagrid(doc: ParsedElement, label: string): string {
+  const items = doc.querySelectorAll(".datagrid-item")
+  for (const item of items) {
+    const title = item.querySelector(".datagrid-title")?.textContent?.trim()
+    if (title === label) {
+      return item.querySelector(".datagrid-content")?.textContent?.trim() ?? ""
+    }
+  }
+  return ""
+}
+
+/**
+ * Extracts the numeric value after a labeled entry in ratio bar items.
+ * Uses regex-only matching to handle whitespace variations in the DOM
+ * (i.e. "Hit & Run:" may have line breaks between words).
+ */
+function extractRatioBarValue(items: ParsedElement[], labelRegex: RegExp): string {
+  for (const li of items) {
+    const text = li.textContent?.replace(/\s+/g, " ").trim() ?? ""
+    const match = text.match(labelRegex)
+    if (match?.[1]) return match[1].replace(/,/g, "")
+  }
+  return ""
+}
+
+// ---------------------------------------------------------------------------
+// Profile page parser
+// ---------------------------------------------------------------------------
+
+export function parseAvistazProfile(html: string, username: string): TrackerStats {
+  // Detect login redirect. AvistaZ uses /auth/login, AnimeZ and others use /login.
+  if (html.includes("/auth/login") || html.includes('action="/login"')) {
+    throw new Error("Session expired — browser cookies need to be refreshed")
+  }
+
+  // Detect Cloudflare challenge (classic JS challenge or Turnstile widget)
+  if (
+    html.includes("<title>Just a moment...</title>") ||
+    html.includes("cf_chl_opt") ||
+    html.includes("challenges.cloudflare.com/turnstile")
+  ) {
+    throw new Error("Cloudflare challenge detected — cf_clearance cookie needs refreshing")
+  }
+
+  const doc = parseHtml(html)
+
+  // ── Ratio bar ──────────────────────────────────────────────────────────────
+  const ratioBar = doc.querySelector("div.ratio-bar")
+  if (!ratioBar) {
+    throw new Error("Could not find ratio bar in profile page — the page may not be authenticated")
+  }
+
+  const items = Array.from(ratioBar.querySelectorAll("ul.list-inline > li"))
+
+  // Username: BS3 uses span.badge-user in the ratio bar, BS5 omits it.
+  // Fall back to the username passed from credentials.
+  const parsedUsername = ratioBar.querySelector("span.badge-user")?.textContent?.trim() ?? username
+
+  // Group: BS3 has two badge-user spans (username, group) in the ratio bar.
+  // BS5 puts the group in a separate badge element elsewhere on the page.
+  const groupSpans = ratioBar.querySelectorAll("span.badge-user")
+  let group = "Unknown"
+  if (groupSpans.length >= 2) {
+    group = groupSpans[1].textContent?.trim() ?? "Unknown"
+  } else {
+    const badgeEl = doc.querySelector(".badge.bg-secondary-lt, .badge-extra.badge-sm")
+    if (badgeEl) group = badgeEl.textContent?.trim() ?? "Unknown"
+  }
+
+  // Upload / download / ratio / seeding / leeching / bonus from tooltip-titled items
+  let uploadedBytes = 0n
+  let downloadedBytes = 0n
+  let ratio = 0
+  let seedingCount = 0
+  let leechingCount = 0
+  let seedbonus = 0
+
+  for (const li of items) {
+    // AvistaZ (BS3): data-toggle="tooltip" title="Upload"
+    // AnimeZ (BS5): data-bs-toggle="tooltip" title="Uploaded"
+    const isTooltip =
+      li.getAttribute("data-toggle") === "tooltip" ||
+      li.getAttribute("data-bs-toggle") === "tooltip"
+    const title = isTooltip ? (li.getAttribute("title")?.trim() ?? null) : null
+    // Strip everything except digits, decimal point, and unit letters/spaces
+    const text = li.textContent?.replace(/[^\d.a-zA-Z\s]/g, "").trim() ?? ""
+
+    if (title === "Upload" || title === "Uploaded") {
+      uploadedBytes = strictParseBytes(text, "upload")
+    } else if (title === "Download" || title === "Downloaded") {
+      downloadedBytes = strictParseBytes(text, "download")
+    } else if (title === "Ratio") {
+      const ratioMatch = text.match(/([\d.]+)/)
+      ratio = ratioMatch ? parseFloat(ratioMatch[1]) : 0
+    } else if (title === "Active Seeds") {
+      seedingCount = parseInt(text.replace(/,/g, ""), 10) || 0
+    } else if (title === "Active Leeches") {
+      leechingCount = parseInt(text.replace(/,/g, ""), 10) || 0
+    } else if (title === "Bonus Points") {
+      const numMatch = text.match(/([\d,.]+)/)
+      seedbonus = numMatch ? parseFloat(numMatch[1].replace(/,/g, "")) : 0
+    }
+  }
+
+  if (uploadedBytes === 0n && downloadedBytes === 0n) {
+    throw new Error(
+      "Could not extract upload/download bytes from AvistaZ ratio bar. The page structure may have changed."
+    )
+  }
+
+  // BS3 (AvistaZ) uses text labels like "Seeding: 2". BS5 (AnimeZ) uses tooltip
+  // titles handled above. Fall back to text-based extraction for BS3.
+  if (!seedingCount)
+    seedingCount = parseInt(extractRatioBarValue(items, /Seeding:\s*([\d,]+)/), 10) || 0
+  if (!leechingCount)
+    leechingCount = parseInt(extractRatioBarValue(items, /Leeching:\s*([\d,]+)/), 10) || 0
+  if (!seedbonus) seedbonus = parseFloat(extractRatioBarValue(items, /Bonus:\s*([\d,.]+)/)) || 0
+  const hitAndRuns = parseInt(extractRatioBarValue(items, /Hit\s*&\s*Run:\s*([\d,]+)/), 10) || 0
+  const reseedRequests = parseInt(extractRatioBarValue(items, /Reseed:\s*([\d,]+)/), 10) || 0
+
+  // ── Profile table rows ─────────────────────────────────────────────────────
+  const allRows = Array.from(
+    doc.querySelectorAll("table.table-striped tr, table.table-bordered tr")
+  )
+
+  // BS3 uses table rows, BS5 uses datagrid divs. Try both, preferring table.
+  const field = (label: string, ...altLabels: string[]) => {
+    const fromTable = textAfterLabel(allRows, label)
+    if (fromTable) return fromTable
+    for (const alt of altLabels) {
+      const fromGrid = textFromDatagrid(doc, alt)
+      if (fromGrid) return fromGrid
+    }
+    return textFromDatagrid(doc, label)
+  }
+
+  const userIdText = field("User ID")
+  const userIdMatch = userIdText.match(/(\d+)/)
+  const remoteUserId = userIdMatch ? parseInt(userIdMatch[1], 10) : undefined
+
+  const joinedRaw = field("Joined", "Member Since")
+    .replace(/\s*\(.*\)/, "")
+    .trim()
+  const joinedDate = joinedRaw ? localDateStr(new Date(joinedRaw)) : undefined
+
+  const lastAccessRaw = field("Last Access", "Last Seen")
+    .replace(/\s*\(.*\)/, "")
+    .trim()
+  const lastAccessDate = lastAccessRaw ? localDateStr(new Date(lastAccessRaw)) : undefined
+
+  // ── Private account-detail rows ────────────────────────────────────────────
+  const donorText = field("Donor")
+  const vipExpiryText = field("VIP Expiry")
+  const invitesText = field("Invites")
+  const canDownloadText = field("Can Download")
+  const canUploadText = field("Can Upload")
+  const twoFaText = field("2FA")
+
+  // ── Avatar ─────────────────────────────────────────────────────────────────
+  // On your own profile, the avatar <img> is JS-rendered by the Fine Uploader
+  // widget (static HTML parsing misses it). The URL
+  // does appear in the raw HTML though, so we scan for the /images/avatar/ pattern.
+  let avatarUrl: string | undefined
+
+  const avatarSelectors = ["#avatar-uploader img", ".avatar-cell img", "img.avatar-original"]
+  for (const sel of avatarSelectors) {
+    const img = doc.querySelector(sel)
+    const src = img?.getAttribute("src")?.trim()
+    if (src) {
+      avatarUrl = src.replace(/&amp;/g, "&")
+      break
+    }
+  }
+
+  if (!avatarUrl) {
+    // Fallback: scan raw HTML for avatar image URLs (catches JS-rendered content)
+    const htmlAvatarMatch = html.match(
+      /https?:\/\/[^"'\s<>]+\/images\/avatar\/[^"'\s<>]+\.(?:jpg|png|gif|webp)/i
+    )
+    if (htmlAvatarMatch) {
+      avatarUrl = htmlAvatarMatch[0].replace(/&amp;/g, "&")
+    }
+  }
+
+  // ── Activity summary (.well-sm block) ──────────────────────────────────────
+  const wellItems = Array.from(doc.querySelectorAll(".well-sm li"))
+  let totalUploads = 0
+  let totalDownloads = 0
+
+  for (const li of wellItems) {
+    const text = li.textContent?.trim() ?? ""
+    const strong = li.querySelector("strong")?.textContent?.trim() ?? "0"
+    if (text.includes("Total Uploads")) {
+      totalUploads = parseInt(strong, 10) || 0
+    } else if (text.includes("Downloads")) {
+      totalDownloads = parseInt(strong, 10) || 0
+    }
+  }
+
+  const platformMeta: AvistazPlatformMeta = {
+    donor: donorText.toLowerCase().includes("yes") || donorText.toLowerCase().includes("true"),
+    vipExpiry: vipExpiryText === "-" ? null : vipExpiryText || null,
+    invites: parseInt(invitesText, 10) || 0,
+    canDownload: canDownloadText.toLowerCase() !== "no",
+    canUpload: canUploadText.toLowerCase() !== "no",
+    totalUploads,
+    totalDownloads,
+    reseedRequests,
+    twoFactorEnabled: !twoFaText.includes("Not Enabled"),
+  }
+
+  return {
+    username: parsedUsername,
+    group,
+    uploadedBytes,
+    downloadedBytes,
+    ratio,
+    bufferBytes: computeBufferBytes(uploadedBytes, downloadedBytes),
+    seedingCount,
+    leechingCount,
+    seedbonus,
+    hitAndRuns,
+    requiredRatio: null,
+    warned: null,
+    freeleechTokens: null,
+    remoteUserId,
+    joinedDate,
+    lastAccessDate,
+    avatarUrl,
+    platformMeta,
+  }
+}
+
+// ---------------------------------------------------------------------------
+// HTML fetcher — direct fetch or proxy
+// ---------------------------------------------------------------------------
+
+async function fetchHtml(
+  url: string,
+  cookies: string,
+  userAgent: string,
+  proxyAgent?: FetchOptions["proxyAgent"]
+): Promise<string> {
+  const headers: Record<string, string> = {
+    Cookie: cookies,
+    "User-Agent": userAgent,
+    Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+    "Accept-Language": "en-US,en;q=0.9",
+    DNT: "1",
+    "Sec-Fetch-Dest": "document",
+    "Sec-Fetch-Mode": "navigate",
+    "Sec-Fetch-Site": "same-origin",
+    Connection: "keep-alive",
+  }
+
+  if (proxyAgent) {
+    const { proxyFetch } = await import("@/lib/tunnel")
+    const result = await proxyFetch(url, proxyAgent, { headers })
+    if (!result.ok) {
+      throw new Error(
+        sanitizeNetworkError(
+          `${result.status} ${result.statusText}`,
+          `AvistaZ page fetch failed: ${result.status}`
+        )
+      )
+    }
+    return (await result.buffer()).toString("utf8")
+  }
+
+  let response: Response
+  try {
+    response = await fetch(url, {
+      headers,
+      signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
+      redirect: "manual",
+    })
+  } catch (err) {
+    throw classifyFetchError(err, new URL(url).hostname)
+  }
+
+  // 302 redirect usually means the session expired and the server redirected to login
+  if (response.status === 302) {
+    throw new Error("Session expired — browser cookies need to be refreshed")
+  }
+
+  if (!response.ok) {
+    throw new Error(
+      sanitizeNetworkError(
+        `${response.status} ${response.statusText}`,
+        `AvistaZ page fetch failed: ${response.status}`
+      )
+    )
+  }
+
+  return response.text()
+}
+
+// ---------------------------------------------------------------------------
+// Adapter class
+// ---------------------------------------------------------------------------
+
+export class AvistazAdapter implements TrackerAdapter {
+  async fetchStats(
+    baseUrl: string,
+    apiToken: string,
+    _apiPath: string,
+    options?: FetchOptions
+  ): Promise<TrackerStats> {
+    const creds = parseAvistazCredentials(apiToken)
+    const profileUrl = `${baseUrl}/profile/${encodeURIComponent(creds.username)}`
+    const html = await fetchHtml(profileUrl, creds.cookies, creds.userAgent, options?.proxyAgent)
+    return parseAvistazProfile(html, creds.username)
+  }
+
+  async fetchRaw(
+    baseUrl: string,
+    apiToken: string,
+    _apiPath: string,
+    options?: FetchOptions
+  ): Promise<DebugApiCall[]> {
+    const calls: DebugApiCall[] = []
+    const creds = parseAvistazCredentials(apiToken)
+    const profileUrl = `${baseUrl}/profile/${encodeURIComponent(creds.username)}`
+    const endpoint = `/profile/${creds.username}`
+
+    try {
+      const html = await fetchHtml(profileUrl, creds.cookies, creds.userAgent, options?.proxyAgent)
+      const stats = parseAvistazProfile(html, creds.username)
+      calls.push({ label: "Profile Page", endpoint, data: stats, error: null })
+    } catch (err) {
+      calls.push({
+        label: "Profile Page",
+        endpoint,
+        data: null,
+        error: err instanceof Error ? err.message : "Request failed",
+      })
+    }
+
+    return calls
+  }
+}
diff --git a/src/lib/adapters/constants.ts b/src/lib/adapters/constants.ts
index 634352d3..f6c5e272 100644
--- a/src/lib/adapters/constants.ts
+++ b/src/lib/adapters/constants.ts
@@ -1,6 +1,16 @@
 // src/lib/adapters/constants.ts
 
-export const VALID_PLATFORM_TYPES = ["unit3d", "gazelle", "ggn", "nebulance", "mam"] as const
+export const VALID_PLATFORM_TYPES = [
+  "unit3d",
+  "gazelle",
+  "ggn",
+  "nebulance",
+  "mam",
+  "avistaz",
+  "digitalcore",
+  "custom",
+] as const
+export type PlatformType = (typeof VALID_PLATFORM_TYPES)[number]
 
 export const MAM_BONUS_CAP = 99999
 
@@ -10,4 +20,6 @@ export const DEFAULT_API_PATHS: Record<string, string> = {
   ggn: "/api.php",
   nebulance: "/api.php",
   mam: "/jsonLoad.php",
+  avistaz: "/profile",
+  digitalcore: "/api/v1/status",
 }
diff --git a/src/lib/adapters/digitalcore.test.ts b/src/lib/adapters/digitalcore.test.ts
new file mode 100644
index 00000000..fd8ecdfd
--- /dev/null
+++ b/src/lib/adapters/digitalcore.test.ts
@@ -0,0 +1,981 @@
+// src/lib/adapters/digitalcore.test.ts
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { DigitalCoreAdapter, parseDigitalCoreCredentials } from "./digitalcore"
+import type { DigitalCorePlatformMeta } from "./types"
+
+// ---------------------------------------------------------------------------
+// Fixture factories
+// ---------------------------------------------------------------------------
+
+function mockStatusResponse(overrides?: Partial<Record<string, unknown>>) {
+  return {
+    user: {
+      id: 54321,
+      username: "dcuser",
+      class: 20,
+      avatar: "https://digitalcore.club/avatars/dcuser.jpg",
+      uploaded: 536870912000,
+      downloaded: 134217728000,
+      warned: "no",
+      bonuspoang: 4200,
+      hit_and_run_total: 1,
+      hnr: 1,
+      hnr_warned: "no",
+      myseedstotal: 88,
+      invites: 2,
+      donor: "no",
+      seedboxdonor: "yes",
+      enabled: "yes",
+      leechbonus: 0,
+      parkerad: 0,
+      downloadban: 0,
+      uploadban: 0,
+      connectable: 1,
+      crown: 0,
+      skull: 0,
+      pokal: 1,
+      coin: 0,
+      ...overrides,
+    },
+    settings: { serverTime: 1712500000 },
+  }
+}
+
+function mockUserProfileResponse(overrides?: Partial<Record<string, unknown>>) {
+  return {
+    id: 54321,
+    username: "dcuser",
+    added: "2021-06-15 09:00:00",
+    last_access: "2026-04-08 12:30:00",
+    uploaded: 536870912000,
+    downloaded: 134217728000,
+    uploaded_real: 536870912000,
+    downloaded_real: 134217728000,
+    class: 20,
+    avatar: "https://digitalcore.club/avatars/dcuser.jpg",
+    warned: "no",
+    bonuspoang: 4200,
+    donor: "no",
+    seedboxdonor: "yes",
+    enabled: "yes",
+    parkerad: 0,
+    peersSeeder: 88,
+    peersLeecher: 3,
+    torrents: 120,
+    requests: 5,
+    forumPosts: 42,
+    torrentComments: 10,
+    invites: 2,
+    invitees: 7,
+    leechbonus: 0,
+    hnr_warned: "no",
+    crown: 0,
+    skull: 0,
+    pokal: 1,
+    coin: 0,
+    hearts: 2,
+    ...overrides,
+  }
+}
+
+/** Build a mock Response that uses .text() (matching fetchDCJson's parseJsonSafe path) */
+function mockResponse(data: unknown, status = 200): Response {
+  return {
+    ok: status >= 200 && status < 300,
+    status,
+    statusText: status === 200 ? "OK" : `Error ${status}`,
+    text: async () => JSON.stringify(data),
+  } as Response
+}
+
+function mockErrorResponse(status: number, body?: string): Response {
+  return {
+    ok: false,
+    status,
+    statusText: `Error ${status}`,
+    text: async () => body ?? "",
+  } as Response
+}
+
+// ---------------------------------------------------------------------------
+// parseDigitalCoreCredentials
+// ---------------------------------------------------------------------------
+
+describe("parseDigitalCoreCredentials", () => {
+  it("parses a valid JSON credential blob with uid and pass", () => {
+    const json = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+    const creds = parseDigitalCoreCredentials(json)
+    expect(creds.uid).toBe("54321")
+    expect(creds.pass).toBe("abc123xyz")
+  })
+
+  it("trims whitespace from uid and pass", () => {
+    const json = JSON.stringify({ uid: "  54321  ", pass: "  abc123xyz  " })
+    const creds = parseDigitalCoreCredentials(json)
+    expect(creds.uid).toBe("54321")
+    expect(creds.pass).toBe("abc123xyz")
+  })
+
+  it("throws on non-JSON string", () => {
+    expect(() => parseDigitalCoreCredentials("just-a-plain-string")).toThrow(
+      "DigitalCore credentials must be a JSON object"
+    )
+  })
+
+  it("throws on missing uid field", () => {
+    const json = JSON.stringify({ pass: "abc123xyz" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("uid")
+  })
+
+  it("throws on missing pass field", () => {
+    const json = JSON.stringify({ uid: "54321" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("pass")
+  })
+
+  it("throws when uid is not a string", () => {
+    const json = JSON.stringify({ uid: 54321, pass: "abc123xyz" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow()
+  })
+
+  it("throws when pass is not a string", () => {
+    const json = JSON.stringify({ uid: "54321", pass: 9999 })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow()
+  })
+
+  it("throws on empty uid after trimming", () => {
+    const json = JSON.stringify({ uid: "   ", pass: "abc123xyz" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("uid cannot be empty")
+  })
+
+  it("throws on empty pass after trimming", () => {
+    const json = JSON.stringify({ uid: "54321", pass: "   " })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("pass cannot be empty")
+  })
+
+  it("throws when uid contains a semicolon (injection guard)", () => {
+    const json = JSON.stringify({ uid: "54321; HttpOnly", pass: "abc123xyz" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("invalid characters")
+  })
+
+  it("throws when pass contains a newline (injection guard)", () => {
+    const json = JSON.stringify({ uid: "54321", pass: "abc\nSet-Cookie: evil=1" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("invalid characters")
+  })
+
+  it("throws when uid contains a carriage return (injection guard)", () => {
+    const json = JSON.stringify({ uid: "543\r21", pass: "abc123xyz" })
+    expect(() => parseDigitalCoreCredentials(json)).toThrow("invalid characters")
+  })
+
+  it("throws on a JSON array instead of object", () => {
+    expect(() => parseDigitalCoreCredentials('["uid", "pass"]')).toThrow()
+  })
+
+  it("throws on a JSON null value", () => {
+    expect(() => parseDigitalCoreCredentials("null")).toThrow()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — happy path
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — core stats", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("returns correct username and class group name from status", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.username).toBe("dcuser")
+    expect(stats.group).toBe("Viceroy") // class 20 maps to "Viceroy"
+  })
+
+  it("converts uploaded/downloaded to BigInt from integer bytes", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.uploadedBytes).toBe(BigInt(536870912000))
+    expect(stats.downloadedBytes).toBe(BigInt(134217728000))
+  })
+
+  it("floors float values before BigInt conversion", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(
+        mockResponse(mockStatusResponse({ uploaded: 1073741824.9, downloaded: 536870912.7 }))
+      )
+      .mockResolvedValueOnce(
+        mockResponse(mockUserProfileResponse({ uploaded: 1073741824.9, downloaded: 536870912.7 }))
+      )
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.uploadedBytes).toBe(BigInt(1073741824))
+    expect(stats.downloadedBytes).toBe(BigInt(536870912))
+  })
+
+  it("computes ratio as uploaded / downloaded", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    // 536870912000 / 134217728000 = 4.0
+    expect(stats.ratio).toBeCloseTo(4.0)
+  })
+
+  it("returns Infinity for ratio when downloaded is zero and uploaded is positive", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ uploaded: 1000000, downloaded: 0 })))
+      .mockResolvedValueOnce(
+        mockResponse(mockUserProfileResponse({ uploaded: 1000000, downloaded: 0 }))
+      )
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.ratio).toBe(Infinity)
+  })
+
+  it("returns 0 for ratio when both uploaded and downloaded are zero", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ uploaded: 0, downloaded: 0 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ uploaded: 0, downloaded: 0 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.ratio).toBe(0)
+  })
+
+  it("computes bufferBytes as max(uploaded - downloaded, 0)", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.bufferBytes).toBe(BigInt(536870912000) - BigInt(134217728000))
+  })
+
+  it("clamps bufferBytes to zero when downloaded exceeds uploaded", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ uploaded: 100, downloaded: 500 })))
+      .mockResolvedValueOnce(
+        mockResponse(mockUserProfileResponse({ uploaded: 100, downloaded: 500 }))
+      )
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.bufferBytes).toBe(BigInt(0))
+  })
+
+  it("maps seedingCount from myseedstotal", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ myseedstotal: 77 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ peersSeeder: 77 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.seedingCount).toBe(77)
+  })
+
+  it("maps hitAndRuns from hit_and_run_total", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ hit_and_run_total: 3 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.hitAndRuns).toBe(3)
+  })
+
+  it("maps seedbonus from bonuspoang", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ bonuspoang: 9876 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ bonuspoang: 9876 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.seedbonus).toBe(9876)
+  })
+
+  it("sets warned to false when warned is 'no'", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ warned: "no" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ warned: "no" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.warned).toBe(false)
+  })
+
+  it("sets warned to true when warned is 'yes'", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ warned: "yes" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ warned: "yes" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.warned).toBe(true)
+  })
+
+  it("resolves requiredRatio as null (DigitalCore does not expose required ratio)", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.requiredRatio).toBeNull()
+  })
+
+  it("resolves freeleechTokens as null (DigitalCore does not expose freeleech tokens)", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.freeleechTokens).toBeNull()
+  })
+
+  it("sets avatarUrl from user.avatar when present", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.avatarUrl).toBe("https://digitalcore.club/avatars/dcuser.jpg")
+  })
+
+  it("sets avatarUrl to undefined when avatar is empty string", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ avatar: "" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ avatar: "" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.avatarUrl).toBeUndefined()
+  })
+
+  it("sets remoteUserId from user.id", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.remoteUserId).toBe(54321)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — "yes"/"no" boolean normalization
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — boolean string normalization", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("normalizes donor 'yes' to true in baseMeta", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ donor: "yes" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ donor: "yes" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.donor).toBe(true)
+  })
+
+  it("normalizes donor 'no' to false in baseMeta", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ donor: "no" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ donor: "no" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.donor).toBe(false)
+  })
+
+  it("normalizes seedboxdonor 'yes' to seedboxDonor true", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ seedboxdonor: "yes" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ seedboxdonor: "yes" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.seedboxDonor).toBe(true)
+  })
+
+  it("normalizes parkerad 1 to parked true", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ parkerad: 1 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ parkerad: 1 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.parked).toBe(true)
+  })
+
+  it("normalizes downloadban 1 to downloadBan true", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ downloadban: 1 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.downloadBan).toBe(true)
+  })
+
+  it("normalizes uploadban 1 to uploadBan true", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ uploadban: 1 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.uploadBan).toBe(true)
+  })
+
+  it("normalizes connectable 1 to true, connectable 0 to false", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ connectable: 0 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.connectable).toBe(false)
+  })
+
+  it("normalizes hnr_warned 'yes' to hnrWarned true", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ hnr_warned: "yes" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ hnr_warned: "yes" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.hnrWarned).toBe(true)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — class ID mapping
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — class ID mapping", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  const knownClasses: Array<[number, string]> = [
+    [0, "Rogue"],
+    [10, "Sentinel"],
+    [20, "Viceroy"],
+    [30, "Sentry"],
+    [31, "Guardian"],
+    [32, "Vanguard"],
+    [50, "Uploader"],
+    [51, "Titan"],
+    [60, "Developer"],
+    [70, "VIP"],
+    [75, "FLS"],
+    [80, "Moderator"],
+    [90, "Administrator"],
+  ]
+
+  for (const [classId, expectedName] of knownClasses) {
+    it(`maps class ID ${classId} to "${expectedName}"`, async () => {
+      vi.spyOn(global, "fetch")
+        .mockResolvedValueOnce(mockResponse(mockStatusResponse({ class: classId })))
+        .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ class: classId })))
+
+      const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+      expect(stats.group).toBe(expectedName)
+    })
+  }
+
+  it("falls back to 'Class N' for an unknown class ID", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ class: 99 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ class: 99 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.group).toBe("Class 99")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — enrichment (second call)
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — enrichment", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("populates joinedDate and lastAccessDate from user profile", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.joinedDate).toBe("2021-06-15 09:00:00")
+    expect(stats.lastAccessDate).toBe("2026-04-08 12:30:00")
+  })
+
+  it("populates leechingCount from peersLeecher in user profile", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ peersLeecher: 7 })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.leechingCount).toBe(7)
+  })
+
+  it("overrides warned with user profile value (more authoritative)", async () => {
+    // Status says not warned, profile says warned — profile wins
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ warned: "no" })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ warned: "yes" })))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.warned).toBe(true)
+  })
+
+  it("merges extended platformMeta fields from user profile", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta.uploadedReal).toBe(536870912000)
+    expect(meta.downloadedReal).toBe(134217728000)
+    expect(meta.torrents).toBe(120)
+    expect(meta.requests).toBe(5)
+    expect(meta.forumPosts).toBe(42)
+    expect(meta.torrentComments).toBe(10)
+    expect(meta.invitees).toBe(7)
+    expect(meta.hearts).toBe(2)
+  })
+
+  it("preserves baseMeta fields after enrichment merge", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ donor: "yes", crown: 1, pokal: 1 })))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    // baseMeta fields must survive the enrichment merge
+    expect(meta.donor).toBe(true)
+    expect(meta.crown).toBe(true)
+    expect(meta.pokal).toBe(true)
+  })
+
+  it("uses options.remoteUserId for the enrichment call URL when provided", async () => {
+    const fetchSpy = vi
+      .spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse({ id: 99999 })))
+
+    await adapter.fetchStats("https://digitalcore.club", validToken, "", {
+      remoteUserId: 99999,
+    })
+
+    const enrichmentUrl = fetchSpy.mock.calls[1][0] as string
+    expect(enrichmentUrl).toContain("/api/v1/users/99999")
+  })
+
+  it("falls back to status user.id for enrichment URL when remoteUserId not provided", async () => {
+    const fetchSpy = vi
+      .spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    const enrichmentUrl = fetchSpy.mock.calls[1][0] as string
+    expect(enrichmentUrl).toContain("/api/v1/users/54321")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — enrichment failure fallback
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — enrichment failure fallback", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("still returns core stats when enrichment call throws a network error", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockRejectedValueOnce(new Error("network error"))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.username).toBe("dcuser")
+    expect(stats.uploadedBytes).toBe(BigInt(536870912000))
+    expect(stats.downloadedBytes).toBe(BigInt(134217728000))
+  })
+
+  it("retains baseMeta (not undefined) when enrichment fails", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse({ donor: "yes", invites: 3 })))
+      .mockRejectedValueOnce(new Error("timeout"))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+    const meta = stats.platformMeta as DigitalCorePlatformMeta
+
+    expect(meta).toBeDefined()
+    expect(meta.donor).toBe(true)
+    expect(meta.invites).toBe(3)
+  })
+
+  it("leaves joinedDate and lastAccessDate undefined when enrichment fails", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockRejectedValueOnce(new Error("network error"))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.joinedDate).toBeUndefined()
+    expect(stats.lastAccessDate).toBeUndefined()
+  })
+
+  it("leaves leechingCount at 0 when enrichment fails", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockRejectedValueOnce(new Error("network error"))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    // leechingCount comes only from enrichment; falls back to initialised-to-0 value
+    expect(stats.leechingCount).toBe(0)
+  })
+
+  it("logs a warning (does not throw) when enrichment fails", async () => {
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => undefined)
+
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockRejectedValueOnce(new Error("upstream timeout"))
+
+    await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(warnSpy).toHaveBeenCalledOnce()
+    expect(warnSpy.mock.calls[0][0]).toMatch(/\[digitalcore\].*Enrichment failed/i)
+  })
+
+  it("still returns stats when enrichment returns a non-ok HTTP response", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockErrorResponse(500))
+
+    const stats = await adapter.fetchStats("https://digitalcore.club", validToken, "")
+
+    expect(stats.username).toBe("dcuser")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — 401 / error responses
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — HTTP error handling", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("throws session-expired message on 401 from status endpoint", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce(mockErrorResponse(401))
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "Session expired"
+    )
+  })
+
+  it("throws session-expired on 401 from enrichment (auth errors propagate)", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockErrorResponse(401))
+
+    // Auth failures during enrichment are NOT swallowed. They propagate so
+    // the user knows their cookies need refreshing.
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "Session expired"
+    )
+  })
+
+  it("throws on non-401 non-ok response from status endpoint", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce(mockErrorResponse(503))
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "503"
+    )
+  })
+
+  it("throws with sanitized message on network failure", async () => {
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new Error("fetch failed"))
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "Failed to connect to digitalcore.club"
+    )
+  })
+
+  it("throws a timeout message when AbortSignal fires", async () => {
+    const timeoutError = new DOMException("signal timed out", "TimeoutError")
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(timeoutError)
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "timed out"
+    )
+  })
+
+  it("throws when status response is missing user data", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce(mockResponse({ user: null, settings: {} }))
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "missing user data"
+    )
+  })
+
+  it("throws when status response is missing upload/download fields", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce(
+      mockResponse({
+        user: { id: 1, username: "dcuser", class: 20, uploaded: undefined, downloaded: undefined },
+        settings: {},
+      })
+    )
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "missing upload/download data"
+    )
+  })
+})
+
+// ---------------------------------------------------------------------------
+// parseJsonSafe — HTML/Cloudflare/invalid JSON detection
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — non-JSON response handling", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("throws a clear message when the API returns an HTML page (maintenance)", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      status: 200,
+      statusText: "OK",
+      text: async () => "<!DOCTYPE html><html><body>Maintenance</body></html>",
+    } as Response)
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "HTML instead of JSON"
+    )
+  })
+
+  it("throws a clear message when the API returns a Cloudflare challenge page", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      status: 200,
+      statusText: "OK",
+      text: async () =>
+        "<html><head><title>Just a moment...</title></head><body>Checking your browser</body></html>",
+    } as Response)
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "HTML instead of JSON"
+    )
+  })
+
+  it("throws invalid JSON message for non-HTML non-JSON responses", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      status: 200,
+      statusText: "OK",
+      text: async () => "this is not json or html",
+    } as Response)
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "invalid JSON"
+    )
+  })
+
+  it("handles empty response body gracefully", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      status: 200,
+      statusText: "OK",
+      text: async () => "",
+    } as Response)
+
+    await expect(adapter.fetchStats("https://digitalcore.club", validToken, "")).rejects.toThrow(
+      "invalid JSON"
+    )
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchStats — cookie header construction
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchStats — cookie header", () => {
+  const adapter = new DigitalCoreAdapter()
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("sends uid and pass as Cookie header", async () => {
+    const fetchSpy = vi
+      .spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const token = JSON.stringify({ uid: "54321", pass: "secretpass" })
+    await adapter.fetchStats("https://digitalcore.club", token, "")
+
+    const fetchOptions = fetchSpy.mock.calls[0][1] as RequestInit
+    const headers = fetchOptions.headers as Record<string, string>
+    expect(headers.Cookie).toBe("uid=54321; pass=secretpass")
+  })
+
+  it("hits the /api/v1/status endpoint for the first call", async () => {
+    const fetchSpy = vi
+      .spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    await adapter.fetchStats(
+      "https://digitalcore.club",
+      JSON.stringify({ uid: "1", pass: "p" }),
+      ""
+    )
+
+    const statusUrl = fetchSpy.mock.calls[0][0] as string
+    expect(statusUrl).toBe("https://digitalcore.club/api/v1/status")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// DigitalCoreAdapter.fetchRaw
+// ---------------------------------------------------------------------------
+
+describe("DigitalCoreAdapter.fetchRaw", () => {
+  const adapter = new DigitalCoreAdapter()
+  const validToken = JSON.stringify({ uid: "54321", pass: "abc123xyz" })
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("returns two DebugApiCall entries on full success", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const calls = await adapter.fetchRaw("https://digitalcore.club", validToken, "")
+
+    expect(calls).toHaveLength(2)
+    expect(calls[0].label).toBe("Status")
+    expect(calls[0].endpoint).toBe("/api/v1/status")
+    expect(calls[0].data).toBeDefined()
+    expect(calls[0].error).toBeNull()
+
+    expect(calls[1].label).toBe("User Profile")
+    expect(calls[1].endpoint).toBe("/api/v1/users/54321")
+    expect(calls[1].data).toBeDefined()
+    expect(calls[1].error).toBeNull()
+  })
+
+  it("returns only the status entry (with error) when status call fails", async () => {
+    vi.spyOn(global, "fetch").mockRejectedValueOnce(new Error("network failure"))
+
+    const calls = await adapter.fetchRaw("https://digitalcore.club", validToken, "")
+
+    expect(calls).toHaveLength(1)
+    expect(calls[0].label).toBe("Status")
+    expect(calls[0].data).toBeNull()
+    expect(calls[0].error).toMatch(/network failure|Failed to connect/)
+  })
+
+  it("captures error on user profile call when that call fails", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockRejectedValueOnce(new Error("profile timeout"))
+
+    const calls = await adapter.fetchRaw("https://digitalcore.club", validToken, "")
+
+    expect(calls).toHaveLength(2)
+    expect(calls[1].label).toBe("User Profile")
+    expect(calls[1].data).toBeNull()
+    expect(calls[1].error).toMatch(/profile timeout|Failed to connect/)
+  })
+
+  it("uses options.remoteUserId in user profile endpoint when provided", async () => {
+    vi.spyOn(global, "fetch")
+      .mockResolvedValueOnce(mockResponse(mockStatusResponse()))
+      .mockResolvedValueOnce(mockResponse(mockUserProfileResponse()))
+
+    const calls = await adapter.fetchRaw("https://digitalcore.club", validToken, "", {
+      remoteUserId: 77777,
+    })
+
+    expect(calls[1].endpoint).toBe("/api/v1/users/77777")
+  })
+
+  it("throws immediately on invalid credentials before any fetch", async () => {
+    await expect(adapter.fetchRaw("https://digitalcore.club", "not-json", "")).rejects.toThrow(
+      "DigitalCore credentials"
+    )
+  })
+})
diff --git a/src/lib/adapters/digitalcore.ts b/src/lib/adapters/digitalcore.ts
new file mode 100644
index 00000000..4a3e39ea
--- /dev/null
+++ b/src/lib/adapters/digitalcore.ts
@@ -0,0 +1,398 @@
+// src/lib/adapters/digitalcore.ts
+//
+// Functions: parseDigitalCoreCredentials, dcClassNameFromId, parseJsonSafe,
+//            fetchDCJson, DigitalCoreAdapter
+
+import { computeBufferBytes } from "@/lib/data-transforms"
+import { classifyFetchError, sanitizeNetworkError } from "@/lib/error-utils"
+import { ADAPTER_FETCH_TIMEOUT_MS } from "@/lib/limits"
+import type {
+  DebugApiCall,
+  DigitalCorePlatformMeta,
+  FetchOptions,
+  TrackerAdapter,
+  TrackerStats,
+} from "./types"
+
+// ---------------------------------------------------------------------------
+// Credential handling
+// ---------------------------------------------------------------------------
+
+export interface DigitalCoreCredentials {
+  uid: string
+  pass: string
+}
+
+export function parseDigitalCoreCredentials(apiToken: string): DigitalCoreCredentials {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(apiToken)
+  } catch {
+    throw new Error("DigitalCore credentials must be a JSON object with uid and pass cookie values")
+  }
+
+  if (
+    typeof parsed !== "object" ||
+    parsed === null ||
+    typeof (parsed as Record<string, unknown>).uid !== "string" ||
+    typeof (parsed as Record<string, unknown>).pass !== "string"
+  ) {
+    throw new Error("DigitalCore credentials must contain uid (string) and pass (string)")
+  }
+
+  const trimmedUid = (parsed as Record<string, string>).uid.trim()
+  const trimmedPass = (parsed as Record<string, string>).pass.trim()
+  if (!trimmedUid) throw new Error("DigitalCore credentials: uid cannot be empty")
+  if (!trimmedPass) throw new Error("DigitalCore credentials: pass cannot be empty")
+
+  // Guard against header injection via cookie values
+  const unsafeChars = /[;\r\n]/
+  if (unsafeChars.test(trimmedUid)) {
+    throw new Error(
+      "DigitalCore credentials: uid contains invalid characters (semicolons or newlines)"
+    )
+  }
+  if (unsafeChars.test(trimmedPass)) {
+    throw new Error(
+      "DigitalCore credentials: pass contains invalid characters (semicolons or newlines)"
+    )
+  }
+
+  return { uid: trimmedUid, pass: trimmedPass }
+}
+
+// ---------------------------------------------------------------------------
+// Class ID mapping (from DigitalCore's Angular userClasses constant)
+// ---------------------------------------------------------------------------
+
+const DC_CLASS_MAP: Record<number, string> = {
+  0: "Rogue",
+  10: "Sentinel",
+  20: "Viceroy",
+  30: "Sentry",
+  31: "Guardian",
+  32: "Vanguard",
+  50: "Uploader",
+  51: "Titan",
+  60: "Developer",
+  70: "VIP",
+  75: "FLS",
+  80: "Moderator",
+  90: "Administrator",
+}
+
+function dcClassNameFromId(classId: number): string {
+  return DC_CLASS_MAP[classId] ?? `Class ${classId}`
+}
+
+// ---------------------------------------------------------------------------
+// API response types
+// ---------------------------------------------------------------------------
+
+interface DCStatusUser {
+  id: number
+  username: string
+  class: number
+  avatar: string
+  uploaded: number
+  downloaded: number
+  warned: string
+  bonuspoang: number
+  hit_and_run_total: number
+  hnr: number
+  hnr_warned: string
+  myseedstotal: number
+  invites: number
+  donor: string
+  seedboxdonor: string
+  enabled: string
+  leechbonus: number
+  parkerad: number
+  downloadban: number
+  uploadban: number
+  connectable: number
+  crown: number
+  skull: number
+  pokal: number
+  coin: number
+}
+
+interface DCStatusResponse {
+  user: DCStatusUser
+  settings: { serverTime: number; donatedAmount?: number }
+}
+
+interface DCUserResponse {
+  id: number
+  username: string
+  added: string
+  last_access: string
+  uploaded: number
+  downloaded: number
+  uploaded_real: number
+  downloaded_real: number
+  class: number
+  avatar: string
+  warned: string
+  bonuspoang: number
+  donor: string
+  seedboxdonor: string
+  enabled: string
+  parkerad: number
+  peersSeeder: number
+  peersLeecher: number
+  torrents: number
+  requests: number
+  forumPosts: number
+  torrentComments: number
+  invites: number
+  invitees: number
+  leechbonus: number
+  hnr_warned: string
+  crown: number
+  skull: number
+  pokal: number
+  coin: number
+  hearts: number
+}
+
+// ---------------------------------------------------------------------------
+// Cookie-based JSON fetcher
+// ---------------------------------------------------------------------------
+
+function parseJsonSafe<T>(text: string, pathname: string): T {
+  try {
+    return JSON.parse(text) as T
+  } catch {
+    if (text.includes("<!DOCTYPE") || text.includes("<html")) {
+      throw new Error(
+        "DigitalCore returned HTML instead of JSON (maintenance page or Cloudflare challenge)"
+      )
+    }
+    throw new Error(`DigitalCore returned invalid JSON from ${pathname}`)
+  }
+}
+
+async function fetchDCJson<T>(
+  url: string,
+  creds: DigitalCoreCredentials,
+  proxyAgent?: FetchOptions["proxyAgent"]
+): Promise<T> {
+  const parsed = new URL(url)
+  const hostname = parsed.hostname
+  const headers: Record<string, string> = {
+    Cookie: `uid=${creds.uid}; pass=${creds.pass}`,
+    Accept: "application/json",
+  }
+
+  if (proxyAgent) {
+    const { proxyFetch } = await import("@/lib/tunnel")
+    const result = await proxyFetch(url, proxyAgent, { headers })
+
+    if (result.status === 401) {
+      throw new Error("Session expired. Re-copy uid and pass cookies from your browser.")
+    }
+    if (!result.ok) {
+      throw new Error(
+        sanitizeNetworkError(
+          `${result.status} ${result.statusText}`,
+          `DigitalCore API error: ${result.status}`
+        )
+      )
+    }
+    const text = (await result.buffer()).toString("utf8")
+    return parseJsonSafe<T>(text, parsed.pathname)
+  }
+
+  let response: Response
+  try {
+    response = await fetch(url, {
+      headers,
+      signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
+    })
+  } catch (err) {
+    throw classifyFetchError(err, hostname)
+  }
+
+  if (response.status === 401) {
+    throw new Error("Session expired. Re-copy uid and pass cookies from your browser.")
+  }
+
+  if (!response.ok) {
+    throw new Error(
+      sanitizeNetworkError(
+        `${response.status} ${response.statusText}`,
+        `DigitalCore API error: ${response.status}`
+      )
+    )
+  }
+
+  const text = await response.text()
+  return parseJsonSafe<T>(text, parsed.pathname)
+}
+
+// ---------------------------------------------------------------------------
+// Adapter class
+// ---------------------------------------------------------------------------
+
+export class DigitalCoreAdapter implements TrackerAdapter {
+  async fetchStats(
+    baseUrl: string,
+    apiToken: string,
+    _apiPath: string,
+    options?: FetchOptions
+  ): Promise<TrackerStats> {
+    const creds = parseDigitalCoreCredentials(apiToken)
+
+    // Call 1: /api/v1/status (core stats)
+    const statusUrl = `${baseUrl}/api/v1/status`
+    const statusData = await fetchDCJson<DCStatusResponse>(statusUrl, creds, options?.proxyAgent)
+
+    const user = statusData.user
+    if (!user?.id) {
+      throw new Error("DigitalCore status response missing user data")
+    }
+
+    if (typeof user.uploaded !== "number" || typeof user.downloaded !== "number") {
+      throw new Error("DigitalCore status response missing upload/download data")
+    }
+
+    const uploaded = BigInt(Math.floor(user.uploaded))
+    const downloaded = BigInt(Math.floor(user.downloaded))
+
+    // Build baseline platformMeta from status (survives enrichment failure)
+    const baseMeta: DigitalCorePlatformMeta = {
+      donor: user.donor === "yes",
+      seedboxDonor: user.seedboxdonor === "yes",
+      parked: user.parkerad === 1,
+      enabled: user.enabled === "yes",
+      invites: user.invites ?? 0,
+      leechBonus: user.leechbonus ?? 0,
+      hnr: user.hnr ?? 0,
+      hnrWarned: user.hnr_warned === "yes",
+      downloadBan: user.downloadban === 1,
+      uploadBan: user.uploadban === 1,
+      connectable: user.connectable === 1,
+      crown: user.crown === 1,
+      skull: user.skull === 1,
+      pokal: user.pokal === 1,
+      coin: user.coin === 1,
+    }
+
+    const stats: TrackerStats = {
+      username: user.username,
+      group: dcClassNameFromId(user.class),
+      uploadedBytes: uploaded,
+      downloadedBytes: downloaded,
+      ratio:
+        downloaded === 0n ? (uploaded > 0n ? Infinity : 0) : Number(uploaded) / Number(downloaded),
+      bufferBytes: computeBufferBytes(uploaded, downloaded),
+      seedingCount: user.myseedstotal ?? 0,
+      leechingCount: 0,
+      seedbonus: user.bonuspoang ?? 0,
+      hitAndRuns: user.hit_and_run_total ?? 0,
+      requiredRatio: null,
+      warned: user.warned === "yes",
+      freeleechTokens: null,
+      remoteUserId: user.id,
+      avatarUrl: user.avatar || undefined,
+      platformMeta: baseMeta,
+    }
+
+    // Call 2: /api/v1/users/:id (enrichment)
+    const userId = options?.remoteUserId ?? user.id
+    try {
+      const userUrl = `${baseUrl}/api/v1/users/${userId}`
+      const profile = await fetchDCJson<DCUserResponse>(userUrl, creds, options?.proxyAgent)
+
+      stats.joinedDate = profile.added || undefined
+      stats.lastAccessDate = profile.last_access || undefined
+      stats.leechingCount = profile.peersLeecher ?? 0
+
+      // Override warned from enrichment (more authoritative source)
+      stats.warned = profile.warned === "yes"
+
+      stats.platformMeta = {
+        ...baseMeta,
+        uploadedReal: profile.uploaded_real,
+        downloadedReal: profile.downloaded_real,
+        torrents: profile.torrents ?? 0,
+        requests: profile.requests ?? 0,
+        forumPosts: profile.forumPosts ?? 0,
+        torrentComments: profile.torrentComments ?? 0,
+        invitees: profile.invitees ?? 0,
+        hnrWarned: profile.hnr_warned === "yes",
+        hearts: profile.hearts ?? 0,
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "unknown"
+      // Auth failures during enrichment mean the session is degrading. Surface them
+      // so the user knows their cookies need refreshing.
+      if (msg.includes("Session expired")) {
+        throw err
+      }
+      // Other enrichment failures are non-fatal, core stats + baseMeta from /status are still valid
+      console.warn(`[digitalcore] Enrichment failed: ${msg}`)
+    }
+
+    return stats
+  }
+
+  async fetchRaw(
+    baseUrl: string,
+    apiToken: string,
+    _apiPath: string,
+    options?: FetchOptions
+  ): Promise<DebugApiCall[]> {
+    const creds = parseDigitalCoreCredentials(apiToken)
+    const calls: DebugApiCall[] = []
+
+    // Call 1: Status
+    let userId: number | undefined = options?.remoteUserId
+    try {
+      const statusUrl = `${baseUrl}/api/v1/status`
+      const statusData = await fetchDCJson<Record<string, unknown>>(
+        statusUrl,
+        creds,
+        options?.proxyAgent
+      )
+      calls.push({ label: "Status", endpoint: "/api/v1/status", data: statusData, error: null })
+
+      if (!userId) {
+        const user = statusData.user as { id?: number } | undefined
+        userId = user?.id
+      }
+    } catch (err) {
+      calls.push({
+        label: "Status",
+        endpoint: "/api/v1/status",
+        data: null,
+        error: err instanceof Error ? err.message : "Request failed",
+      })
+      return calls
+    }
+
+    // Call 2: User profile
+    if (userId) {
+      const endpoint = `/api/v1/users/${userId}`
+      try {
+        const userUrl = `${baseUrl}${endpoint}`
+        const userData = await fetchDCJson<Record<string, unknown>>(
+          userUrl,
+          creds,
+          options?.proxyAgent
+        )
+        calls.push({ label: "User Profile", endpoint, data: userData, error: null })
+      } catch (err) {
+        calls.push({
+          label: "User Profile",
+          endpoint,
+          data: null,
+          error: err instanceof Error ? err.message : "Request failed",
+        })
+      }
+    }
+
+    return calls
+  }
+}
diff --git a/src/lib/adapters/gazelle.test.ts b/src/lib/adapters/gazelle.test.ts
index 087f51d1..fe5a81e9 100644
--- a/src/lib/adapters/gazelle.test.ts
+++ b/src/lib/adapters/gazelle.test.ts
@@ -395,16 +395,4 @@ describe("GazelleAdapter - security", () => {
       "Request to example.com timed out"
     )
   })
-
-  it("uses AbortSignal for timeout protection", async () => {
-    const fetchSpy = vi.spyOn(global, "fetch").mockResolvedValueOnce({
-      ok: true,
-      json: async () => mockGazelleResponse(),
-    } as Response)
-
-    await adapter.fetchStats("https://example.com", "token", "/ajax.php")
-
-    const fetchOptions = fetchSpy.mock.calls[0][1] as RequestInit
-    expect(fetchOptions.signal).toBeDefined()
-  })
 })
diff --git a/src/lib/adapters/gazelle.ts b/src/lib/adapters/gazelle.ts
index db6b7c01..ab8904c2 100644
--- a/src/lib/adapters/gazelle.ts
+++ b/src/lib/adapters/gazelle.ts
@@ -2,6 +2,7 @@
 //
 // Functions: GazelleAdapter, GazelleAdapter.fetchStats, GazelleAdapter.fetchRaw
 
+import { computeBufferBytes, floatBytesToBigInt } from "@/lib/data-transforms"
 import { adapterFetch } from "./adapter-fetch"
 import type {
   DebugApiCall,
@@ -130,8 +131,8 @@ export class GazelleAdapter implements TrackerAdapter {
       throw new Error(`Unexpected response from ${hostname}: missing userstats`)
     }
 
-    const uploaded = BigInt(Math.floor(userStats.uploaded ?? 0))
-    const downloaded = BigInt(Math.floor(userStats.downloaded ?? 0))
+    const uploaded = floatBytesToBigInt(userStats.uploaded)
+    const downloaded = floatBytesToBigInt(userStats.downloaded)
 
     const stats: TrackerStats = {
       username: response.username,
@@ -139,7 +140,7 @@ export class GazelleAdapter implements TrackerAdapter {
       uploadedBytes: uploaded,
       downloadedBytes: downloaded,
       ratio: typeof userStats.ratio === "number" ? userStats.ratio : 0,
-      bufferBytes: uploaded > downloaded ? uploaded - downloaded : BigInt(0),
+      bufferBytes: computeBufferBytes(uploaded, downloaded),
       seedingCount: userStats.seedingcount ?? 0,
       leechingCount: userStats.leechingcount ?? 0,
       seedbonus: userStats.bonusPoints ?? userStats.bonuspoints ?? null,
@@ -188,7 +189,7 @@ export class GazelleAdapter implements TrackerAdapter {
             stats.platformMeta = enriched.platformMeta
           }
         } catch (err) {
-          // security-audit-ignore: enrichment failure is non-fatal — core stats from index are still valid
+          // security-audit-ignore: enrichment failure is non-fatal and core stats from index are still valid
           console.warn(
             `[${hostname}] Enrichment failed: ${err instanceof Error ? err.message : "unknown"}`
           )
@@ -349,7 +350,7 @@ export class GazelleAdapter implements TrackerAdapter {
       warned: resp.personal?.warned ?? false,
       joinedDate: resp.stats?.joinedDate ?? undefined,
       lastAccessDate: resp.stats?.lastAccess ?? undefined,
-      bufferBytes: resp.stats?.buffer != null ? BigInt(Math.floor(resp.stats.buffer)) : undefined,
+      bufferBytes: resp.stats?.buffer != null ? floatBytesToBigInt(resp.stats.buffer) : undefined,
       seedingCount: resp.community?.seeding,
       leechingCount: resp.community?.leeching,
       avatarUrl: resp.avatar || undefined,
diff --git a/src/lib/adapters/ggn.test.ts b/src/lib/adapters/ggn.test.ts
index 6558548c..fc71851f 100644
--- a/src/lib/adapters/ggn.test.ts
+++ b/src/lib/adapters/ggn.test.ts
@@ -95,14 +95,6 @@ describe("GGnAdapter", () => {
     expect(stats.freeleechTokens).toBeNull()
   })
 
-  it("handles numeric ratio from API", async () => {
-    mockBothCalls({ stats: { ratio: 2.5 } })
-
-    const stats = await adapter.fetchStats("https://gazellegames.net", "key", "/api.php")
-
-    expect(stats.ratio).toBeCloseTo(2.5)
-  })
-
   it("handles seeding/leeching when paranoia allows", async () => {
     mockBothCalls({ community: { seeding: 150, leeching: 2 } })
 
@@ -288,24 +280,4 @@ describe("GGnAdapter - security", () => {
       "Request to gazellegames.net timed out"
     )
   })
-
-  it("uses AbortSignal for timeout protection", async () => {
-    const fetchSpy = vi
-      .spyOn(global, "fetch")
-      .mockResolvedValueOnce({
-        ok: true,
-        json: async () => mockQuickUserResponse(),
-      } as Response)
-      .mockResolvedValueOnce({
-        ok: true,
-        json: async () => mockUserResponse(),
-      } as Response)
-
-    await adapter.fetchStats("https://gazellegames.net", "key", "/api.php")
-
-    const firstCallOpts = fetchSpy.mock.calls[0][1] as RequestInit
-    const secondCallOpts = fetchSpy.mock.calls[1][1] as RequestInit
-    expect(firstCallOpts.signal).toBeDefined()
-    expect(secondCallOpts.signal).toBeDefined()
-  })
 })
diff --git a/src/lib/adapters/ggn.ts b/src/lib/adapters/ggn.ts
index 25e459cd..fbe8cce3 100644
--- a/src/lib/adapters/ggn.ts
+++ b/src/lib/adapters/ggn.ts
@@ -1,7 +1,6 @@
 // src/lib/adapters/ggn.ts
-//
-// Functions: GGnAdapter, GGnAdapter.fetchStats, GGnAdapter.fetchRaw
 
+import { computeBufferBytes, floatBytesToBigInt } from "@/lib/data-transforms"
 import { adapterFetch } from "./adapter-fetch"
 import type {
   DebugApiCall,
@@ -76,7 +75,7 @@ export class GGnAdapter implements TrackerAdapter {
     let username: string
 
     if (options?.remoteUserId) {
-      // Skip quick_user call — we already resolved this user's ID on a prior poll
+      // Skip quick_user call because we already resolved this user's ID on a prior poll
       userId = options.remoteUserId
       username = "" // Will be overwritten from the full user response
     } else {
@@ -119,8 +118,8 @@ export class GGnAdapter implements TrackerAdapter {
       throw new Error(`Unexpected response from ${hostname}: missing stats`)
     }
 
-    const uploaded = BigInt(Math.floor(resp.stats.uploaded ?? 0))
-    const downloaded = BigInt(Math.floor(resp.stats.downloaded ?? 0))
+    const uploaded = floatBytesToBigInt(resp.stats.uploaded)
+    const downloaded = floatBytesToBigInt(resp.stats.downloaded)
     const ratio =
       typeof resp.stats.ratio === "number" ? resp.stats.ratio : parseFloat(resp.stats.ratio) || 0
 
@@ -144,7 +143,7 @@ export class GGnAdapter implements TrackerAdapter {
       uploadedBytes: uploaded,
       downloadedBytes: downloaded,
       ratio,
-      bufferBytes: uploaded > downloaded ? uploaded - downloaded : BigInt(0),
+      bufferBytes: computeBufferBytes(uploaded, downloaded),
       seedingCount: resp.community?.seeding ?? 0,
       leechingCount: resp.community?.leeching ?? 0,
       seedbonus: resp.stats.gold ?? 0,
diff --git a/src/lib/adapters/index.ts b/src/lib/adapters/index.ts
index 20f56f12..7bedadc5 100644
--- a/src/lib/adapters/index.ts
+++ b/src/lib/adapters/index.ts
@@ -1,10 +1,9 @@
 // src/lib/adapters/index.ts
-//
-// Functions: getAdapter, buildFetchOptions
-// Exports: DEFAULT_API_PATHS
 
 import type { Agent as HttpAgent } from "node:http"
 import { findRegistryEntry } from "@/data/tracker-registry"
+import { AvistazAdapter } from "./avistaz"
+import { DigitalCoreAdapter } from "./digitalcore"
 import { GazelleAdapter } from "./gazelle"
 import { GGnAdapter } from "./ggn"
 import { MamAdapter } from "./mam"
@@ -12,9 +11,12 @@ import { NebulanceAdapter } from "./nebulance"
 import type { FetchOptions, TrackerAdapter } from "./types"
 import { Unit3dAdapter } from "./unit3d"
 
+export type { PlatformType } from "./constants"
 export { DEFAULT_API_PATHS, VALID_PLATFORM_TYPES } from "./constants"
 
 const adapters: Record<string, TrackerAdapter> = {
+  avistaz: new AvistazAdapter(),
+  digitalcore: new DigitalCoreAdapter(),
   gazelle: new GazelleAdapter(),
   ggn: new GGnAdapter(),
   mam: new MamAdapter(),
@@ -47,4 +49,10 @@ export function buildFetchOptions(
   return fetchOptions
 }
 
-export type { FetchOptions, TrackerAdapter, TrackerStats } from "./types"
+export type {
+  FetchOptions,
+  GazelleAuthStyle,
+  TrackerAdapter,
+  TrackerStats,
+  Unit3dAuthStyle,
+} from "./types"
diff --git a/src/lib/adapters/mam.test.ts b/src/lib/adapters/mam.test.ts
index 0c90758d..4ef60eb5 100644
--- a/src/lib/adapters/mam.test.ts
+++ b/src/lib/adapters/mam.test.ts
@@ -66,7 +66,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "fake-session-id",
+      "a1b2c3a1b2c3a1b2c3a1b2c3a1b2c3a1",
       "/jsonLoad.php"
     )
 
@@ -89,7 +89,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "fake-session-id",
+      "a1b2c3a1b2c3a1b2c3a1b2c3a1b2c3a1",
       "/jsonLoad.php"
     )
 
@@ -97,18 +97,6 @@ describe("MamAdapter - parsing", () => {
     expect(stats.seedingCount).toBe(18)
   })
 
-  it("reads leechingCount directly from leeching.count", async () => {
-    mockFetch()
-
-    const stats = await adapter.fetchStats(
-      "https://www.myanonamouse.net",
-      "fake-session-id",
-      "/jsonLoad.php"
-    )
-
-    expect(stats.leechingCount).toBe(2)
-  })
-
   it("returns zero bufferBytes when downloaded exceeds uploaded", async () => {
     mockFetch({
       uploaded_bytes: 100_000_000,
@@ -117,7 +105,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
@@ -136,7 +124,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
@@ -150,7 +138,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
@@ -162,7 +150,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
@@ -174,7 +162,7 @@ describe("MamAdapter - parsing", () => {
 
     const stats = await adapter.fetchStats(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
@@ -222,11 +210,15 @@ describe("MamAdapter - auth", () => {
       json: async () => mockMamResponse(),
     } as Response)
 
-    await adapter.fetchStats("https://www.myanonamouse.net", "my-session-cookie", "/jsonLoad.php")
+    await adapter.fetchStats(
+      "https://www.myanonamouse.net",
+      "abc123abc123abc123abc123abc123ab",
+      "/jsonLoad.php"
+    )
 
     const callOpts = fetchSpy.mock.calls[0][1] as RequestInit
     const headers = callOpts.headers as Record<string, string>
-    expect(headers.Cookie).toBe("mam_id=my-session-cookie")
+    expect(headers.Cookie).toBe("mam_id=abc123abc123abc123abc123abc123ab")
   })
 
   it("includes snatch_summary in the request URL", async () => {
@@ -235,7 +227,11 @@ describe("MamAdapter - auth", () => {
       json: async () => mockMamResponse(),
     } as Response)
 
-    await adapter.fetchStats("https://www.myanonamouse.net", "session-id", "/jsonLoad.php")
+    await adapter.fetchStats(
+      "https://www.myanonamouse.net",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
+      "/jsonLoad.php"
+    )
 
     const calledUrl = fetchSpy.mock.calls[0][0] as string
     expect(calledUrl).toContain("snatch_summary")
@@ -244,6 +240,63 @@ describe("MamAdapter - auth", () => {
   })
 })
 
+describe("MamAdapter - mam_id validation", () => {
+  const adapter = new MamAdapter()
+
+  beforeEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it("strips mam_id= prefix if user pasted the full cookie", async () => {
+    const fetchSpy = vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      json: async () => mockMamResponse(),
+    } as Response)
+
+    await adapter.fetchStats(
+      "https://www.myanonamouse.net",
+      "mam_id=abc123session",
+      "/jsonLoad.php"
+    )
+
+    const headers = (fetchSpy.mock.calls[0][1] as RequestInit).headers as Record<string, string>
+    expect(headers.Cookie).toBe("mam_id=abc123session")
+  })
+
+  it("throws on empty token", async () => {
+    await expect(
+      adapter.fetchStats("https://www.myanonamouse.net", "  ", "/jsonLoad.php")
+    ).rejects.toThrow("cannot be empty")
+  })
+
+  it("throws when token contains semicolons", async () => {
+    await expect(
+      adapter.fetchStats("https://www.myanonamouse.net", "abc;evil=1", "/jsonLoad.php")
+    ).rejects.toThrow("invalid characters")
+  })
+
+  it("throws when token contains newlines", async () => {
+    await expect(
+      adapter.fetchStats("https://www.myanonamouse.net", "abc\nSet-Cookie: evil", "/jsonLoad.php")
+    ).rejects.toThrow("invalid characters")
+  })
+
+  it("allows non-hex characters in session cookies", async () => {
+    vi.spyOn(global, "fetch").mockResolvedValueOnce({
+      ok: true,
+      json: async () => mockMamResponse(),
+    } as Response)
+
+    // MAM cookies can contain alphanumeric + other safe chars
+    const stats = await adapter.fetchStats(
+      "https://www.myanonamouse.net",
+      "abc123XYZ_session.value",
+      "/jsonLoad.php"
+    )
+    expect(stats.username).toBe("trackerfan")
+  })
+})
+
 describe("MamAdapter - error handling", () => {
   const adapter = new MamAdapter()
 
@@ -258,12 +311,16 @@ describe("MamAdapter - error handling", () => {
     } as Response)
 
     await expect(
-      adapter.fetchStats("https://www.myanonamouse.net", "session-id", "/jsonLoad.php")
+      adapter.fetchStats(
+        "https://www.myanonamouse.net",
+        "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
+        "/jsonLoad.php"
+      )
     ).rejects.toThrow("missing username")
   })
 
   it("does not leak the session cookie in error messages", async () => {
-    const secretToken = "ultra-secret-mam-session-abc123"
+    const secretToken = "aabbccaabbccaabbccaabbccaabbccaa"
 
     vi.spyOn(global, "fetch").mockRejectedValueOnce(new Error("fetch failed"))
 
@@ -281,21 +338,13 @@ describe("MamAdapter - error handling", () => {
     vi.spyOn(global, "fetch").mockRejectedValueOnce(timeoutError)
 
     await expect(
-      adapter.fetchStats("https://www.myanonamouse.net", "session-id", "/jsonLoad.php")
+      adapter.fetchStats(
+        "https://www.myanonamouse.net",
+        "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
+        "/jsonLoad.php"
+      )
     ).rejects.toThrow("Request to www.myanonamouse.net timed out")
   })
-
-  it("passes an AbortSignal to fetch for timeout protection", async () => {
-    const fetchSpy = vi.spyOn(global, "fetch").mockResolvedValueOnce({
-      ok: true,
-      json: async () => mockMamResponse(),
-    } as Response)
-
-    await adapter.fetchStats("https://www.myanonamouse.net", "session-id", "/jsonLoad.php")
-
-    const callOpts = fetchSpy.mock.calls[0][1] as RequestInit
-    expect(callOpts.signal).toBeDefined()
-  })
 })
 
 describe("MamAdapter - fetchRaw", () => {
@@ -313,7 +362,7 @@ describe("MamAdapter - fetchRaw", () => {
 
     const calls = await adapter.fetchRaw(
       "https://www.myanonamouse.net",
-      "session-id",
+      "f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0",
       "/jsonLoad.php"
     )
 
diff --git a/src/lib/adapters/mam.ts b/src/lib/adapters/mam.ts
index 57ef4de3..ccc5bff0 100644
--- a/src/lib/adapters/mam.ts
+++ b/src/lib/adapters/mam.ts
@@ -1,7 +1,6 @@
 // src/lib/adapters/mam.ts
-//
-// Functions: MamAdapter, MamAdapter.fetchStats, MamAdapter.fetchRaw
 
+import { computeBufferBytes, floatBytesToBigInt } from "@/lib/data-transforms"
 import { adapterFetch } from "./adapter-fetch"
 import type {
   DebugApiCall,
@@ -40,7 +39,6 @@ interface MamJsonLoadResponse {
   partial?: boolean
   recently_deleted?: number
 
-  // snatch_summary categories (present when ?snatch_summary is set)
   leeching?: MamSnatchCategory
   sSat?: MamSnatchCategory
   seedHnr?: MamSnatchCategory
@@ -55,7 +53,6 @@ interface MamJsonLoadResponse {
   reseed?: { name: string; count: number; inactive: number; red: boolean }
   ite?: { name: string; count: number; latest: number }
 
-  // notif (present when ?notif is set)
   notifs?: {
     pms: number
     aboutToDropClient: number
@@ -65,10 +62,31 @@ interface MamJsonLoadResponse {
     topics: number
   }
 
-  // clientStats (present when ?clientStats is set)
   clientStats?: unknown[]
 }
 
+// Validate mam_id before interpolation into Cookie header to prevent injection.
+// Strips "mam_id=" prefix if someone pasted the full cookie name+value.
+function validateMamId(token: string): string {
+  let trimmed = token.trim()
+  if (!trimmed) throw new Error("MAM session cookie (mam_id) cannot be empty")
+
+  // Common copy-paste mistake: user pastes "mam_id=abc123" instead of just "abc123"
+  if (trimmed.toLowerCase().startsWith("mam_id=")) {
+    trimmed = trimmed.slice(7).trim()
+    if (!trimmed)
+      throw new Error("MAM session cookie value is empty after stripping mam_id= prefix")
+  }
+
+  // Block header injection characters
+  if (/[;\r\n]/.test(trimmed)) {
+    throw new Error(
+      "MAM session cookie (mam_id) contains invalid characters (semicolons or newlines)"
+    )
+  }
+  return trimmed
+}
+
 export class MamAdapter implements TrackerAdapter {
   async fetchStats(
     baseUrl: string,
@@ -76,21 +94,22 @@ export class MamAdapter implements TrackerAdapter {
     apiPath: string,
     options?: FetchOptions
   ): Promise<TrackerStats> {
+    const mamId = validateMamId(apiToken)
     const hostname = new URL(baseUrl).hostname
     const url = new URL(apiPath, baseUrl)
     url.searchParams.set("snatch_summary", "")
     url.searchParams.set("notif", "")
 
     const data = await adapterFetch<MamJsonLoadResponse>(url.toString(), hostname, options, {
-      Cookie: `mam_id=${apiToken}`,
+      Cookie: `mam_id=${mamId}`,
     })
 
     if (!data.username) {
       throw new Error(`Unexpected response from ${hostname}: missing username`)
     }
 
-    const uploaded = BigInt(Math.floor(data.uploaded_bytes ?? 0))
-    const downloaded = BigInt(Math.floor(data.downloaded_bytes ?? 0))
+    const uploaded = floatBytesToBigInt(data.uploaded_bytes)
+    const downloaded = floatBytesToBigInt(data.downloaded_bytes)
 
     const seedingCount =
       (data.sSat?.count ?? 0) +
@@ -121,7 +140,7 @@ export class MamAdapter implements TrackerAdapter {
       uploadedBytes: uploaded,
       downloadedBytes: downloaded,
       ratio: typeof data.ratio === "number" ? data.ratio : parseFloat(String(data.ratio)) || 0,
-      bufferBytes: uploaded > downloaded ? uploaded - downloaded : BigInt(0),
+      bufferBytes: computeBufferBytes(uploaded, downloaded),
       seedingCount,
       leechingCount: data.leeching?.count ?? 0,
       seedbonus: data.seedbonus ?? null,
@@ -139,6 +158,7 @@ export class MamAdapter implements TrackerAdapter {
     apiPath: string,
     options?: FetchOptions
   ): Promise<DebugApiCall[]> {
+    const mamId = validateMamId(apiToken)
     const hostname = new URL(baseUrl).hostname
     const calls: DebugApiCall[] = []
 
@@ -149,7 +169,7 @@ export class MamAdapter implements TrackerAdapter {
 
     try {
       const data = await adapterFetch<Record<string, unknown>>(url.toString(), hostname, options, {
-        Cookie: `mam_id=${apiToken}`,
+        Cookie: `mam_id=${mamId}`,
       })
       calls.push({ label: "User Stats", endpoint, data, error: null })
     } catch (err) {
diff --git a/src/lib/adapters/nebulance.ts b/src/lib/adapters/nebulance.ts
index 2ca55b8e..bf12be02 100644
--- a/src/lib/adapters/nebulance.ts
+++ b/src/lib/adapters/nebulance.ts
@@ -5,10 +5,11 @@
 //   - SubClass field: Nebulance "SubClass" (singular), Anthelion "SubClasses" (plural)
 //   - HnR field: present on Nebulance, absent on Anthelion
 //   - Response may be wrapped {"status":"success","response":{...}} or flat
-//
-// Functions: NebulanceAdapter, NebulanceAdapter.fetchStats, NebulanceAdapter.fetchRaw
 
-import { proxyFetch } from "@/lib/proxy"
+import { computeBufferBytes, floatBytesToBigInt } from "@/lib/data-transforms"
+import { classifyFetchError } from "@/lib/error-utils"
+import { ADAPTER_FETCH_TIMEOUT_MS } from "@/lib/limits"
+import { proxyFetch } from "@/lib/tunnel"
 import type {
   DebugApiCall,
   FetchOptions,
@@ -89,22 +90,14 @@ export class NebulanceAdapter implements TrackerAdapter {
       } else {
         const response = await fetch(url.toString(), {
           headers,
-          signal: AbortSignal.timeout(15000),
+          signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
         })
         ok = response.ok
         status = response.status
         data = (await response.json()) as NebulanceResponse
       }
     } catch (err) {
-      if (
-        err instanceof DOMException &&
-        (err.name === "TimeoutError" || err.name === "AbortError")
-      ) {
-        throw new Error(`Request to ${hostname} timed out`)
-      }
-      throw new Error(
-        `Failed to connect to ${hostname}: ${err instanceof Error ? err.message : "Unknown"}`
-      )
+      throw classifyFetchError(err, hostname)
     }
 
     if (!ok || "error" in data) {
@@ -128,8 +121,8 @@ export class NebulanceAdapter implements TrackerAdapter {
       throw new Error(`Unexpected response from ${hostname}: missing user data`)
     }
 
-    const uploaded = BigInt(Math.floor(resp.Uploaded ?? 0))
-    const downloaded = BigInt(Math.floor(resp.Downloaded ?? 0))
+    const uploaded = floatBytesToBigInt(resp.Uploaded)
+    const downloaded = floatBytesToBigInt(resp.Downloaded)
 
     let ratio: number
     if (downloaded === 0n) {
@@ -155,7 +148,7 @@ export class NebulanceAdapter implements TrackerAdapter {
       uploadedBytes: uploaded,
       downloadedBytes: downloaded,
       ratio,
-      bufferBytes: uploaded > downloaded ? uploaded - downloaded : 0n,
+      bufferBytes: computeBufferBytes(uploaded, downloaded),
       seedingCount: resp.SeedCount ?? 0,
       leechingCount: 0, // Not available from Nebulance API
       seedbonus: null, // Not available from Nebulance API
@@ -200,7 +193,7 @@ export class NebulanceAdapter implements TrackerAdapter {
       } else {
         const response = await fetch(url.toString(), {
           headers,
-          signal: AbortSignal.timeout(15000),
+          signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
         })
         data = await response.json()
       }
diff --git a/src/lib/adapters/types.ts b/src/lib/adapters/types.ts
index f9ef0e4f..8ba49d02 100644
--- a/src/lib/adapters/types.ts
+++ b/src/lib/adapters/types.ts
@@ -21,7 +21,13 @@ export interface TrackerStats {
   lastAccessDate?: string
   shareScore?: number
   avatarUrl?: string
-  platformMeta?: GGnPlatformMeta | GazellePlatformMeta | NebulancePlatformMeta | MamPlatformMeta
+  platformMeta?:
+    | GGnPlatformMeta
+    | GazellePlatformMeta
+    | NebulancePlatformMeta
+    | MamPlatformMeta
+    | AvistazPlatformMeta
+    | DigitalCorePlatformMeta
 }
 
 export interface GGnPlatformMeta {
@@ -112,11 +118,90 @@ export interface MamPlatformMeta {
   unreadTopics?: number
 }
 
+export interface DigitalCorePlatformMeta {
+  donor?: boolean
+  seedboxDonor?: boolean
+  parked?: boolean
+  enabled?: boolean
+  invites?: number
+  invitees?: number
+  leechBonus?: number
+  uploadedReal?: number
+  downloadedReal?: number
+  torrents?: number
+  requests?: number
+  forumPosts?: number
+  torrentComments?: number
+  hnr?: number
+  hnrWarned?: boolean
+  downloadBan?: boolean
+  uploadBan?: boolean
+  connectable?: boolean
+  crown?: boolean
+  skull?: boolean
+  pokal?: boolean
+  coin?: boolean
+  hearts?: number
+}
+
+export interface AvistazPlatformMeta {
+  donor?: boolean
+  vipExpiry?: string | null
+  invites?: number
+  canDownload?: boolean
+  canUpload?: boolean
+  totalUploads?: number
+  totalDownloads?: number
+  reseedRequests?: number
+  twoFactorEnabled?: boolean
+  bonusPerHour?: number
+  bonusBreakdown?: {
+    totalTorrents: { count: number; points: number }
+    oldTorrents: { count: number; points: number }
+    bigTorrents: { count: number; points: number }
+    hugeTorrents: { count: number; points: number }
+  }
+}
+
+/** Union of all platform-specific metadata types */
+export type PlatformMeta =
+  | GGnPlatformMeta
+  | GazellePlatformMeta
+  | NebulancePlatformMeta
+  | MamPlatformMeta
+  | AvistazPlatformMeta
+  | DigitalCorePlatformMeta
+
+/** Maps platformType string → the corresponding PlatformMeta variant */
+export interface PlatformMetaMap {
+  ggn: GGnPlatformMeta
+  gazelle: GazellePlatformMeta
+  nebulance: NebulancePlatformMeta
+  mam: MamPlatformMeta
+  avistaz: AvistazPlatformMeta
+  digitalcore: DigitalCorePlatformMeta
+}
+
+/**
+ * Type-safe narrowing of PlatformMeta using the existing platformType discriminant.
+ * Returns the narrowed meta if `ctx.tracker.platformType` matches, otherwise `null`.
+ */
+export function metaFor<P extends keyof PlatformMetaMap>(
+  ctx: { tracker: { platformType: string }; meta: PlatformMeta | null },
+  platform: P
+): PlatformMetaMap[P] | null {
+  if (!ctx.meta || ctx.tracker.platformType !== platform) return null
+  return ctx.meta as PlatformMetaMap[P]
+}
+
+export type GazelleAuthStyle = "token" | "raw"
+export type Unit3dAuthStyle = "bearer" | "query"
+
 export interface FetchOptions {
   proxyAgent?: HttpAgent
   remoteUserId?: number
-  authStyle?: "token" | "raw"
-  unit3dAuthStyle?: "bearer" | "query"
+  authStyle?: GazelleAuthStyle
+  unit3dAuthStyle?: Unit3dAuthStyle
   enrich?: boolean
 }
 
diff --git a/src/lib/adapters/unit3d.test.ts b/src/lib/adapters/unit3d.test.ts
index bad8211a..e5d6a4e8 100644
--- a/src/lib/adapters/unit3d.test.ts
+++ b/src/lib/adapters/unit3d.test.ts
@@ -136,26 +136,5 @@ describe("Unit3dAdapter - security", () => {
     )
   })
 
-  it("uses AbortSignal for timeout protection", async () => {
-    const fetchSpy = vi.spyOn(global, "fetch").mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({
-        username: "Test",
-        group: "User",
-        uploaded: "0 GiB",
-        downloaded: "0 GiB",
-        ratio: "0",
-        buffer: "0 GiB",
-        seeding: 0,
-        leeching: 0,
-        seedbonus: "0",
-        hit_and_runs: 0,
-      }),
-    } as Response)
-
-    await adapter.fetchStats("https://example.com", "token", "/api/user")
-
-    const fetchOptions = fetchSpy.mock.calls[0][1] as RequestInit
-    expect(fetchOptions.signal).toBeDefined()
-  })
+  // AbortSignal timeout coverage is in adapterFetch — tested via timeout-message test above
 })
diff --git a/src/lib/alert-pruning.ts b/src/lib/alert-pruning.ts
index dbd48c08..2cdcd01d 100644
--- a/src/lib/alert-pruning.ts
+++ b/src/lib/alert-pruning.ts
@@ -1,13 +1,12 @@
 // src/lib/alert-pruning.ts
-//
-// Functions: pruneDismissedAlerts
 
 import { and, inArray, lt } from "drizzle-orm"
+import type { AlertType } from "@/lib/dashboard"
 import { db } from "@/lib/db"
 import { dismissedAlerts } from "@/lib/db/schema"
 
-export const EXPIRING_ALERT_TYPES = ["stale-data", "zero-seeding"]
-export const NON_DISMISSIBLE_ALERT_TYPES = new Set(["client-error", "poll-paused"])
+export const EXPIRING_ALERT_TYPES: AlertType[] = ["stale-data", "zero-seeding"]
+export const NON_DISMISSIBLE_ALERT_TYPES = new Set<AlertType>(["client-error", "poll-paused"])
 export const ALERT_EXPIRY_MS = 24 * 60 * 60 * 1000
 
 export async function pruneDismissedAlerts(): Promise<void> {
diff --git a/src/lib/api-helpers.ts b/src/lib/api-helpers.ts
index 74bd97d2..c0a00988 100644
--- a/src/lib/api-helpers.ts
+++ b/src/lib/api-helpers.ts
@@ -1,11 +1,19 @@
 // src/lib/api-helpers.ts
 //
 // Functions: authenticate, parseRouteId, parseTrackerId, parseJsonBody,
-//            validateHttpUrl, validateHexColor, validatePort, validateJoinedAt, decodeKey
+//            validateHttpUrl, validateHexColor, validatePort, validateJoinedAt,
+//            validateIntRange, validateMaxLength, decodeKey
 
 import { NextResponse } from "next/server"
 import { getSession } from "@/lib/auth"
+import { localDateStr } from "@/lib/formatters"
 import { isUnsafeNetworkHost } from "@/lib/network"
+import { DATE_RE, isValidHex, isValidPort } from "@/lib/validators"
+
+/** Shared route handler context for dynamic [id] segments */
+export type RouteContext<P = { id: string }> = {
+  params: Promise<P>
+}
 
 export async function authenticate(): Promise<NextResponse | { encryptionKey: string }> {
   const session = await getSession()
@@ -41,36 +49,33 @@ export async function parseJsonBody(
   }
 }
 
-export function validateHttpUrl(url: string): NextResponse | null {
+export function validateHttpUrl(url: string, label = "baseUrl"): NextResponse | null {
   try {
     const parsed = new URL(url)
     if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
-      return NextResponse.json({ error: "baseUrl must use https:// or http://" }, { status: 400 })
+      return NextResponse.json({ error: `${label} must use https:// or http://` }, { status: 400 })
     }
     if (isUnsafeNetworkHost(parsed.hostname)) {
       return NextResponse.json(
-        { error: "baseUrl must not target localhost or a private network address" },
+        { error: `${label} must not target localhost or a private network address` },
         { status: 400 }
       )
     }
     return null
   } catch {
-    return NextResponse.json({ error: "Invalid baseUrl format" }, { status: 400 })
+    return NextResponse.json({ error: `Invalid ${label} format` }, { status: 400 })
   }
 }
 
 export function validateHexColor(color: string): NextResponse | null {
-  if (!/^#([0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(color)) {
-    return NextResponse.json(
-      { error: "Color must be a valid hex color (i.e #00d4ff)" },
-      { status: 400 }
-    )
+  if (!isValidHex(color, true)) {
+    return NextResponse.json({ error: "Color must be a valid hex color" }, { status: 400 })
   }
   return null
 }
 
 export function validatePort(port: number): NextResponse | null {
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+  if (!isValidPort(port)) {
     return NextResponse.json(
       { error: "Port must be an integer between 1 and 65535" },
       { status: 400 }
@@ -80,15 +85,41 @@ export function validatePort(port: number): NextResponse | null {
 }
 
 export function validateJoinedAt(value: string): NextResponse | null {
-  if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+  if (!DATE_RE.test(value)) {
     return NextResponse.json({ error: "joinedAt must be YYYY-MM-DD" }, { status: 400 })
   }
-  if (value > new Date().toISOString().split("T")[0]) {
+  if (value > localDateStr()) {
     return NextResponse.json({ error: "Join date cannot be in the future" }, { status: 400 })
   }
   return null
 }
 
+export function validateIntRange(
+  value: number,
+  min: number,
+  max: number,
+  label: string,
+  message?: string
+): NextResponse | null {
+  if (!Number.isInteger(value) || value < min || value > max) {
+    return NextResponse.json(
+      { error: message ?? `${label} must be between ${min} and ${max}` },
+      { status: 400 }
+    )
+  }
+  return null
+}
+
+export function validateMaxLength(value: string, max: number, label: string): NextResponse | null {
+  if (value.length > max) {
+    return NextResponse.json(
+      { error: `${label} must be ${max} characters or fewer` },
+      { status: 400 }
+    )
+  }
+  return null
+}
+
 export function decodeKey(auth: { encryptionKey: string }): Buffer {
   return Buffer.from(auth.encryptionKey, "hex")
 }
diff --git a/src/lib/auth.test.ts b/src/lib/auth.test.ts
index 873ba5b5..f1472fcc 100644
--- a/src/lib/auth.test.ts
+++ b/src/lib/auth.test.ts
@@ -49,10 +49,4 @@ describe("auth - security", () => {
     const valid = await verifyPassword(hash, unicodePass)
     expect(valid).toBe(true)
   })
-
-  it("rejects password with single character difference", async () => {
-    const hash = await hashPassword("correct-password")
-    const valid = await verifyPassword(hash, "correct-passwore")
-    expect(valid).toBe(false)
-  })
 })
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index b35146c7..d39ea9ed 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -76,8 +76,10 @@ export async function getSession(): Promise<{ encryptionKey: string } | null> {
   const token = cookieStore.get(SESSION_COOKIE)?.value
   if (!token) return null
 
+  const key = getSessionKey() // Config errors propagate as 500, not silent 401
   try {
-    const { payload } = await jwtDecrypt(token, getSessionKey())
+    const { payload } = await jwtDecrypt(token, key)
+    if (payload.purpose) return null // reject pending/setup tokens
     return { encryptionKey: payload.ek as string }
   } catch {
     return null
@@ -105,8 +107,9 @@ export async function createPendingToken(encryptionKey: string): Promise<string>
 }
 
 export async function verifyPendingToken(token: string): Promise<{ encryptionKey: string } | null> {
+  const key = getSessionKey()
   try {
-    const { payload } = await jwtDecrypt(token, getSessionKey())
+    const { payload } = await jwtDecrypt(token, key)
     if (payload.purpose !== "pending") return null
     return { encryptionKey: payload.ek as string }
   } catch {
@@ -135,8 +138,9 @@ export async function createSetupToken(
 export async function verifySetupToken(
   token: string
 ): Promise<{ totpSecret: string; backupCodesJson: string } | null> {
+  const key = getSessionKey()
   try {
-    const { payload } = await jwtDecrypt(token, getSessionKey())
+    const { payload } = await jwtDecrypt(token, key)
     if (payload.purpose !== "setup") return null
     return {
       totpSecret: payload.ts as string,
diff --git a/src/lib/backup-scheduler.ts b/src/lib/backup-scheduler.ts
index 377d5f65..2fce5523 100644
--- a/src/lib/backup-scheduler.ts
+++ b/src/lib/backup-scheduler.ts
@@ -5,8 +5,12 @@
 import { mkdir, writeFile } from "node:fs/promises"
 import path from "node:path"
 import cron, { type ScheduledTask } from "node-cron"
-import { encryptBackupPayload, generateBackupPayload, pruneOldBackups } from "@/lib/backup"
-import { decrypt } from "@/lib/crypto"
+import {
+  encryptBackupPayload,
+  generateBackupPayload,
+  pruneOldBackups,
+  resolveBackupPassword,
+} from "@/lib/backup"
 import { db } from "@/lib/db"
 import { appSettings, backupHistory } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
@@ -34,12 +38,15 @@ function setBackupKey(key: Buffer | null) {
 // Cron expressions for backup frequencies (run at 03:00)
 function getCronExpression(frequency: string): string {
   switch (frequency) {
+    case "daily":
+      return "0 3 * * *" // 03:00 every day
     case "weekly":
       return "0 3 * * 0" // 03:00 every Sunday
     case "monthly":
       return "0 3 1 * *" // 03:00 first of month
     default:
-      return "0 3 * * *" // 03:00 every day (covers "daily" and any unknown value)
+      log.warn(`Unknown backup frequency "${frequency}", defaulting to daily`)
+      return "0 3 * * *"
   }
 }
 
@@ -60,15 +67,29 @@ export async function runScheduledBackup(encryptionKey: Buffer): Promise<void> {
 
     if (settings.backupEncryptionEnabled && settings.encryptedBackupPassword) {
       try {
-        const backupPassword = decrypt(settings.encryptedBackupPassword, encryptionKey)
+        const backupPassword = resolveBackupPassword(
+          true,
+          settings.encryptedBackupPassword,
+          encryptionKey
+        )
+        if (!backupPassword) throw new Error("resolveBackupPassword returned null unexpectedly")
         const envelope = await encryptBackupPayload(payload, backupPassword)
         serialized = JSON.stringify(envelope)
         ext = "ttbak"
         encrypted = true
       } catch {
-        log.error("Failed to decrypt stored backup password — falling back to plain JSON backup")
-        serialized = JSON.stringify(payload)
-        ext = "json"
+        log.error(
+          "Scheduled backup aborted: cannot decrypt stored backup password. " +
+            "Re-enter backup password in settings to resume encrypted backups."
+        )
+        await db.insert(backupHistory).values({
+          sizeBytes: 0,
+          encrypted: false,
+          frequency: settings.backupScheduleFrequency,
+          status: "failed",
+          storagePath: null,
+        })
+        return
       }
     } else {
       serialized = JSON.stringify(payload)
diff --git a/src/lib/backup.ts b/src/lib/backup.ts
index 61622bb4..b34822d3 100644
--- a/src/lib/backup.ts
+++ b/src/lib/backup.ts
@@ -1,6 +1,6 @@
 // src/lib/backup.ts
 //
-// Functions: generateBackupPayload, validateBackupJson, encryptBackupPayload, decryptBackupPayload, pruneOldBackups
+// Functions: generateBackupPayload, validateBackupJson, encryptBackupPayload, decryptBackupPayload, resolveBackupPassword, pruneOldBackups
 
 import { unlink } from "node:fs/promises"
 import path from "node:path"
@@ -22,7 +22,9 @@ import {
   trackers,
 } from "@/lib/db/schema"
 import { log } from "@/lib/logger"
+import { isUnsafeNetworkHost } from "@/lib/network"
 import { VALID_NOTIFICATION_TYPES } from "@/lib/notifications/types"
+import { HEX_64_RE, ISO_8601_RE, isValidHex, isValidPort } from "@/lib/validators"
 import packageJson from "../../package.json"
 
 export const CURRENT_BACKUP_VERSION = 1
@@ -59,7 +61,7 @@ export interface EncryptedBackupEnvelope {
   ciphertext: string
 }
 
-// Serialize a single value — converts BigInt to decimal string and Date to ISO 8601.
+// Serialize a single value. Converts BigInt to decimal string and Date to ISO 8601.
 function serializeValue(value: unknown): unknown {
   if (typeof value === "bigint") {
     return value.toString()
@@ -82,8 +84,53 @@ function serializeRow(row: Record<string, unknown>): Record<string, unknown> {
 export async function generateBackupPayload(): Promise<BackupPayload> {
   const now = new Date().toISOString()
 
+  // Parallel fetch with all tables independent
+  const [
+    [rawSettings],
+    rawTrackers,
+    rawSnapshots,
+    rawRoles,
+    rawClients,
+    rawTagGroups,
+    rawTagGroupMembers,
+    rawClientSnapshots,
+    rawUptimeBuckets,
+    rawDismissedAlerts,
+    allNotificationTargets,
+  ] = await Promise.all([
+    db.select().from(appSettings).limit(1),
+    db.select().from(trackers).orderBy(trackers.id),
+    db.select().from(trackerSnapshots).orderBy(trackerSnapshots.id),
+    db.select().from(trackerRoles).orderBy(trackerRoles.id),
+    db
+      .select({
+        id: downloadClients.id,
+        name: downloadClients.name,
+        type: downloadClients.type,
+        enabled: downloadClients.enabled,
+        host: downloadClients.host,
+        port: downloadClients.port,
+        useSsl: downloadClients.useSsl,
+        encryptedUsername: downloadClients.encryptedUsername,
+        encryptedPassword: downloadClients.encryptedPassword,
+        pollIntervalSeconds: downloadClients.pollIntervalSeconds,
+        isDefault: downloadClients.isDefault,
+        crossSeedTags: downloadClients.crossSeedTags,
+        errorSince: downloadClients.errorSince,
+        createdAt: downloadClients.createdAt,
+        updatedAt: downloadClients.updatedAt,
+      })
+      .from(downloadClients)
+      .orderBy(downloadClients.id),
+    db.select().from(tagGroups).orderBy(tagGroups.id),
+    db.select().from(tagGroupMembers).orderBy(tagGroupMembers.id),
+    db.select().from(clientSnapshots).orderBy(clientSnapshots.id),
+    db.select().from(clientUptimeBuckets).orderBy(clientUptimeBuckets.id),
+    db.select().from(dismissedAlerts).orderBy(dismissedAlerts.id),
+    db.select().from(notificationTargets).orderBy(notificationTargets.id),
+  ])
+
   // appSettings — exclude: id, passwordHash, failedLoginAttempts, encryptedSchedulerKey, createdAt
-  const [rawSettings] = await db.select().from(appSettings).limit(1)
   const settingsPayload: Record<string, unknown> = {}
   if (rawSettings) {
     const {
@@ -100,11 +147,11 @@ export async function generateBackupPayload(): Promise<BackupPayload> {
   }
 
   // trackers — exclude transient runtime state
-  const rawTrackers = await db.select().from(trackers).orderBy(trackers.id)
   const trackersPayload = rawTrackers.map((t) => {
     const {
       lastPolledAt: _lpa,
       lastError: _le,
+      lastErrorAt: _lea,
       consecutiveFailures: _cf,
       pausedAt: _pa,
       ...rest
@@ -112,63 +159,25 @@ export async function generateBackupPayload(): Promise<BackupPayload> {
     return serializeRow(rest as Record<string, unknown>)
   })
 
-  // trackerSnapshots — include all columns
-  const rawSnapshots = await db.select().from(trackerSnapshots).orderBy(trackerSnapshots.id)
   const snapshotsPayload = rawSnapshots.map((s) => serializeRow(s as Record<string, unknown>))
-
-  // trackerRoles — include all columns
-  const rawRoles = await db.select().from(trackerRoles).orderBy(trackerRoles.id)
   const rolesPayload = rawRoles.map((r) => serializeRow(r as Record<string, unknown>))
 
-  // downloadClients — exclude: lastPolledAt, lastError, cachedTorrents, cachedTorrentsAt
-  const rawClients = await db.select().from(downloadClients).orderBy(downloadClients.id)
-  const clientsPayload = rawClients.map((c) => {
-    const {
-      lastPolledAt: _lpa,
-      lastError: _le,
-      cachedTorrents: _ct,
-      cachedTorrentsAt: _cta,
-      ...rest
-    } = c
-    return serializeRow(rest as Record<string, unknown>)
-  })
+  // downloadClients — cachedTorrents/cachedTorrentsAt/lastPolledAt/lastError excluded at query level
+  const clientsPayload = rawClients.map((c) => serializeRow(c as Record<string, unknown>))
 
-  // tagGroups — include all columns
-  const rawTagGroups = await db.select().from(tagGroups).orderBy(tagGroups.id)
   const tagGroupsPayload = rawTagGroups.map((g) => serializeRow(g as Record<string, unknown>))
-
-  // tagGroupMembers — include all columns
-  const rawTagGroupMembers = await db.select().from(tagGroupMembers).orderBy(tagGroupMembers.id)
   const tagGroupMembersPayload = rawTagGroupMembers.map((m) =>
     serializeRow(m as Record<string, unknown>)
   )
-
-  // clientSnapshots — include all columns
-  const rawClientSnapshots = await db.select().from(clientSnapshots).orderBy(clientSnapshots.id)
   const clientSnapshotsPayload = rawClientSnapshots.map((cs) =>
     serializeRow(cs as Record<string, unknown>)
   )
-
-  // clientUptimeBuckets — heartbeat history
-  const rawUptimeBuckets = await db
-    .select()
-    .from(clientUptimeBuckets)
-    .orderBy(clientUptimeBuckets.id)
   const uptimeBucketsPayload = rawUptimeBuckets.map((ub) =>
     serializeRow(ub as Record<string, unknown>)
   )
-
-  // dismissedAlerts — include all columns
-  const rawDismissedAlerts = await db.select().from(dismissedAlerts).orderBy(dismissedAlerts.id)
   const dismissedAlertsPayload = rawDismissedAlerts.map((a) =>
     serializeRow(a as Record<string, unknown>)
   )
-
-  // notificationTargets — exclude transient delivery state columns
-  const allNotificationTargets = await db
-    .select()
-    .from(notificationTargets)
-    .orderBy(notificationTargets.id)
   const backupNotificationTargets = allNotificationTargets.map(
     ({ lastDeliveryStatus, lastDeliveryAt, lastDeliveryError, ...rest }) =>
       serializeRow(rest as Record<string, unknown>)
@@ -214,9 +223,6 @@ export async function generateBackupPayload(): Promise<BackupPayload> {
 
 // ─── Validation helpers ───────────────────────────────────────────────────────
 
-const ISO_8601_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/
-const HEX_64_RE = /^[0-9a-fA-F]{64}$/
-const HEX_COLOR_RE = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/
 export const VALID_BACKUP_FREQUENCIES = new Set(["daily", "weekly", "monthly"])
 
 function assertString(value: unknown, label: string): asserts value is string {
@@ -367,18 +373,27 @@ export function validateBackupJson(payload: unknown): asserts payload is BackupP
     }
 
     assertString(t.baseUrl, `${prefix}.baseUrl`)
+    let parsedUrl: URL
     try {
-      new URL(t.baseUrl)
+      parsedUrl = new URL(t.baseUrl)
     } catch {
       throw new Error(`Backup validation: ${prefix}.baseUrl is not a valid URL`)
     }
+    if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+      throw new Error(`Backup validation: ${prefix}.baseUrl must use http or https`)
+    }
+    if (isUnsafeNetworkHost(parsedUrl.hostname)) {
+      throw new Error(
+        `Backup validation: ${prefix}.baseUrl must not target localhost or a private network address`
+      )
+    }
 
     assertString(t.encryptedApiToken, `${prefix}.encryptedApiToken`)
     // Empty token is valid — happens after a restore clears encrypted fields
 
     if (t.color !== null && t.color !== undefined) {
       assertString(t.color, `${prefix}.color`)
-      if (!HEX_COLOR_RE.test(t.color)) {
+      if (!isValidHex(t.color, true)) {
         throw new Error(`Backup validation: ${prefix}.color must be a valid hex color or null`)
       }
     }
@@ -416,7 +431,7 @@ export function validateBackupJson(payload: unknown): asserts payload is BackupP
     assertString(c.host, `${prefix}.host`)
 
     assertNumber(c.port, `${prefix}.port`)
-    if (!Number.isInteger(c.port) || c.port < 1 || c.port > 65535) {
+    if (!isValidPort(c.port)) {
       throw new Error(`Backup validation: ${prefix}.port must be an integer between 1 and 65535`)
     }
 
@@ -477,6 +492,20 @@ export function decryptBackupPayload(
   return parsed
 }
 
+/**
+ * Decrypts the stored backup password if encryption is enabled.
+ * Returns null if encryption is not enabled or no password is stored.
+ * Throws on decrypt failure (callers handle errors differently).
+ */
+export function resolveBackupPassword(
+  encryptionEnabled: boolean,
+  encryptedPassword: string | null,
+  key: Buffer
+): string | null {
+  if (!encryptionEnabled || !encryptedPassword) return null
+  return decrypt(encryptedPassword, key)
+}
+
 // ─── Pruning ──────────────────────────────────────────────────────────────────
 
 export async function pruneOldBackups(retentionCount: number, basePath: string): Promise<number> {
diff --git a/src/lib/client-helpers.ts b/src/lib/client-helpers.ts
deleted file mode 100644
index d5f75166..00000000
--- a/src/lib/client-helpers.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// src/lib/client-helpers.ts
-//
-// Functions: extractApiError
-
-/**
- * Extracts an error message from a failed API response.
- * Falls back to the provided default if the response body has no `error` field.
- * For use in client-side fetch handlers.
- */
-export async function extractApiError(res: Response, fallback = "Request failed"): Promise<string> {
-  try {
-    const data: { error?: string } = await res.json()
-    return data.error ?? fallback
-  } catch {
-    return fallback
-  }
-}
diff --git a/src/lib/client-scheduler.ts b/src/lib/client-scheduler.ts
deleted file mode 100644
index 349c9823..00000000
--- a/src/lib/client-scheduler.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-// src/lib/client-scheduler.ts
-//
-// Two polling loops with different cadences:
-//   heartbeat  — lightweight: login + getTransferInfo (2 requests). Runs every 5s.
-//                Stores upload/download speed in memory cache. Updates connection status.
-//                Records success/failure in uptime accumulator (5-min buckets).
-//   deep poll  — heavy: login + getTorrents (all) + filter/dedup + aggregation.
-//                Runs on each client's configured pollIntervalSeconds.
-//                Stores full tagStats alongside speed data.
-//
-// Functions: heartbeatClient, heartbeatAllClients, deepPollClient, deepPollAllClients,
-//            startClientScheduler, stopClientScheduler, ensureClientSchedulerRunning
-//
-// Side effects of deepPollClient:
-//   - Writes torrent daily checkpoints (torrentDailyCheckpoints) for "Movers & Shakers".
-//     Uses onConflictDoNothing so the first poll of the day wins; subsequent polls skip.
-
-import { eq, isNotNull, lt, sql } from "drizzle-orm"
-import cron, { type ScheduledTask } from "node-cron"
-import { decryptClientCredentials } from "@/lib/client-decrypt"
-import { db } from "@/lib/db"
-import {
-  appSettings,
-  clientSnapshots,
-  clientUptimeBuckets,
-  downloadClients,
-  torrentDailyCheckpoints,
-  trackers,
-} from "@/lib/db/schema"
-import { sanitizeNetworkError } from "@/lib/error-utils"
-import { localDateStr } from "@/lib/formatters"
-import { log } from "@/lib/logger"
-import type { QbtTorrent } from "@/lib/qbt"
-import {
-  aggregateByTag,
-  clearAllSessions,
-  clearSpeedCache,
-  getTorrents,
-  getTransferInfo,
-  parseCrossSeedTags,
-  pushSpeedSnapshot,
-  stripSensitiveTorrentFields,
-  withSessionRetry,
-} from "@/lib/qbt"
-import { clearUptimeAccumulator, flushCompletedBuckets, recordHeartbeat } from "@/lib/uptime"
-
-/** Columns needed by heartbeatClient. Excludes large blobs like cachedTorrents */
-export const HEARTBEAT_COLUMNS = {
-  id: downloadClients.id,
-  enabled: downloadClients.enabled,
-  name: downloadClients.name,
-  host: downloadClients.host,
-  port: downloadClients.port,
-  useSsl: downloadClients.useSsl,
-  encryptedUsername: downloadClients.encryptedUsername,
-  encryptedPassword: downloadClients.encryptedPassword,
-} as const
-
-/** Columns needed by deepPollClient. Heartbeat fields + poll config + tags */
-export const DEEP_POLL_COLUMNS = {
-  ...HEARTBEAT_COLUMNS,
-  crossSeedTags: downloadClients.crossSeedTags,
-  pollIntervalSeconds: downloadClients.pollIntervalSeconds,
-  lastPolledAt: downloadClients.lastPolledAt,
-} as const
-
-// Store on globalThis to survive HMR in development.
-// Without this, each hot-reload orphans the old cron job while creating a new one.
-const g = globalThis as typeof globalThis & {
-  __clientHeartbeatTask?: ScheduledTask | null
-  __clientDeepPollTask?: ScheduledTask | null
-}
-
-let heartbeatInFlight = false
-let deepPollInFlight = false
-
-function getHeartbeatTask(): ScheduledTask | null {
-  return g.__clientHeartbeatTask ?? null
-}
-function setHeartbeatTask(task: ScheduledTask | null) {
-  g.__clientHeartbeatTask = task
-}
-function getDeepPollTask(): ScheduledTask | null {
-  return g.__clientDeepPollTask ?? null
-}
-function setDeepPollTask(task: ScheduledTask | null) {
-  g.__clientDeepPollTask = task
-}
-
-// ---------------------------------------------------------------------------
-// Heartbeat
-// ---------------------------------------------------------------------------
-
-async function heartbeatClient(clientId: number, encryptionKey: Buffer): Promise<void> {
-  const [client] = await db
-    .select(HEARTBEAT_COLUMNS)
-    .from(downloadClients)
-    .where(eq(downloadClients.id, clientId))
-    .limit(1)
-
-  if (!client?.enabled) return
-  if (!client.encryptedUsername || !client.encryptedPassword) return
-
-  try {
-    const { username, password } = decryptClientCredentials(client, encryptionKey)
-
-    const transfer = await withSessionRetry(
-      client.host,
-      client.port,
-      client.useSsl,
-      username,
-      password,
-      (baseUrl, sid) => getTransferInfo(baseUrl, sid)
-    )
-
-    pushSpeedSnapshot(clientId, transfer.up_info_speed, transfer.dl_info_speed)
-    recordHeartbeat(clientId, true)
-
-    await db
-      .update(downloadClients)
-      .set({ lastError: null, errorSince: null, updatedAt: new Date() })
-      .where(eq(downloadClients.id, clientId))
-  } catch (error) {
-    recordHeartbeat(clientId, false)
-    const raw = error instanceof Error ? error.message : "Unknown error"
-    const message = sanitizeNetworkError(raw)
-    await db
-      .update(downloadClients)
-      .set({
-        lastError: message,
-        errorSince: sql`COALESCE(${downloadClients.errorSince}, NOW())`,
-        updatedAt: new Date(),
-      })
-      .where(eq(downloadClients.id, clientId))
-    log.error(`Heartbeat failed for client ${clientId}: ${raw}`)
-  }
-}
-
-async function heartbeatAllClients(encryptionKey: Buffer): Promise<void> {
-  const allClients = await db
-    .select({ id: downloadClients.id })
-    .from(downloadClients)
-    .where(eq(downloadClients.enabled, true))
-
-  if (allClients.length === 0) return
-
-  await Promise.allSettled(allClients.map((c) => heartbeatClient(c.id, encryptionKey)))
-}
-
-// ---------------------------------------------------------------------------
-// Deep poll
-// ---------------------------------------------------------------------------
-
-export async function deepPollClient(clientId: number, encryptionKey: Buffer): Promise<void> {
-  const [client] = await db
-    .select(DEEP_POLL_COLUMNS)
-    .from(downloadClients)
-    .where(eq(downloadClients.id, clientId))
-    .limit(1)
-
-  if (!client?.enabled) return
-  if (!client.encryptedUsername || !client.encryptedPassword) return
-
-  try {
-    const { username, password } = decryptClientCredentials(client, encryptionKey)
-
-    // Collect known tags
-    const trackerTagRows = await db
-      .select({ qbtTag: trackers.qbtTag })
-      .from(trackers)
-      .where(isNotNull(trackers.qbtTag))
-
-    const trackerTags = trackerTagRows.map((r) => r.qbtTag as string)
-    const crossSeedTags = parseCrossSeedTags(client.crossSeedTags)
-    const allTags = [...new Set([...trackerTags, ...crossSeedTags])]
-
-    // Fetch torrents per-tag in parallel (avoids downloading the full unfiltered
-    // torrent list). Each request returns only torrents matching that tag.
-    // Dedup by hash in case a torrent has multiple known tags.
-    const { torrents, transfer } = await withSessionRetry(
-      client.host,
-      client.port,
-      client.useSsl,
-      username,
-      password,
-      async (baseUrl, sid) => {
-        const [tagSettled, xfer] = await Promise.all([
-          Promise.allSettled(allTags.map((tag) => getTorrents(baseUrl, sid, tag))),
-          getTransferInfo(baseUrl, sid),
-        ])
-        const seen = new Set<string>()
-        const deduped: QbtTorrent[] = []
-        for (const result of tagSettled) {
-          if (result.status !== "fulfilled") continue
-          for (const t of result.value) {
-            if (seen.has(t.hash)) continue
-            seen.add(t.hash)
-            deduped.push(t)
-          }
-        }
-        return { torrents: deduped, transfer: xfer }
-      }
-    )
-
-    log.debug(
-      `[deep-poll] client=${clientId} → ${torrents.length} relevant torrents (${allTags.length} tags)`
-    )
-
-    // Write daily torrent checkpoints for "Movers & Shakers" — first-seen-today wins
-    const checkpointDate = localDateStr()
-    const checkpointable = torrents.filter(
-      (t) => t.uploaded != null && t.downloaded != null && t.hash && t.name
-    )
-    if (checkpointable.length > 0) {
-      const CHUNK = 500
-      try {
-        for (let i = 0; i < checkpointable.length; i += CHUNK) {
-          await db
-            .insert(torrentDailyCheckpoints)
-            .values(
-              checkpointable.slice(i, i + CHUNK).map((t) => ({
-                clientId,
-                hash: t.hash,
-                name: t.name,
-                checkpointDate,
-                uploadedStart: BigInt(t.uploaded),
-                downloadedStart: BigInt(t.downloaded),
-              }))
-            )
-            .onConflictDoNothing()
-        }
-      } catch (err) {
-        log.warn(
-          `Torrent checkpoint insert failed for client ${clientId}: ${err instanceof Error ? err.message : "Unknown"}`
-        )
-      }
-    }
-
-    const stats = aggregateByTag(torrents, trackerTags, crossSeedTags)
-
-    // Cache the filtered torrent list for fallback when client is offline.
-    const sanitizedTorrents = torrents.map(stripSensitiveTorrentFields)
-    await db
-      .update(downloadClients)
-      .set({
-        cachedTorrents: sanitizedTorrents,
-        cachedTorrentsAt: new Date(),
-      })
-      .where(eq(downloadClients.id, clientId))
-
-    await db.insert(clientSnapshots).values({
-      clientId,
-      polledAt: new Date(),
-      totalSeedingCount: stats.totalSeedingCount,
-      totalLeechingCount: stats.totalLeechingCount,
-      uploadSpeedBytes: BigInt(transfer.up_info_speed),
-      downloadSpeedBytes: BigInt(transfer.dl_info_speed),
-      tagStats: JSON.stringify(stats.tagStats),
-    })
-
-    await db
-      .update(downloadClients)
-      .set({ lastPolledAt: new Date(), lastError: null, errorSince: null, updatedAt: new Date() })
-      .where(eq(downloadClients.id, clientId))
-  } catch (error) {
-    const raw = error instanceof Error ? error.message : "Unknown error"
-    const message = sanitizeNetworkError(raw)
-    await db
-      .update(downloadClients)
-      .set({
-        lastError: message,
-        errorSince: sql`COALESCE(${downloadClients.errorSince}, NOW())`,
-        updatedAt: new Date(),
-      })
-      .where(eq(downloadClients.id, clientId))
-    log.error(`Deep poll failed for client ${clientId}: ${raw}`)
-  }
-}
-
-async function deepPollAllClients(encryptionKey: Buffer): Promise<void> {
-  const allClients = await db
-    .select({
-      id: downloadClients.id,
-      enabled: downloadClients.enabled,
-      pollIntervalSeconds: downloadClients.pollIntervalSeconds,
-      lastPolledAt: downloadClients.lastPolledAt,
-    })
-    .from(downloadClients)
-    .where(eq(downloadClients.enabled, true))
-
-  const now = Date.now()
-
-  const overdue = allClients.filter((client) => {
-    const intervalMs = client.pollIntervalSeconds * 1000
-    const lastPoll = client.lastPolledAt?.getTime() ?? 0
-    return now - lastPoll >= intervalMs
-  })
-
-  if (overdue.length === 0) return
-
-  await Promise.allSettled(overdue.map((c) => deepPollClient(c.id, encryptionKey)))
-}
-
-// ---------------------------------------------------------------------------
-// Scheduler lifecycle
-// ---------------------------------------------------------------------------
-
-export function startClientScheduler(encryptionKey: Buffer): void {
-  if (getHeartbeatTask()) return
-
-  // Run both immediately on start
-  heartbeatAllClients(encryptionKey).catch((error) => {
-    log.error(error, "Initial heartbeat error")
-  })
-  deepPollAllClients(encryptionKey).catch((error) => {
-    log.error(error, "Initial deep poll error")
-  })
-
-  // Heartbeat: every 5 seconds
-  const hbTask = cron.schedule("*/5 * * * * *", async () => {
-    if (heartbeatInFlight) return
-    heartbeatInFlight = true
-    try {
-      await heartbeatAllClients(encryptionKey)
-      await flushCompletedBuckets()
-    } catch (error) {
-      log.error(error, "Client heartbeat error")
-    } finally {
-      heartbeatInFlight = false
-    }
-  })
-  setHeartbeatTask(hbTask)
-
-  // Deep poll
-  const dpTask = cron.schedule("*/5 * * * *", async () => {
-    if (deepPollInFlight) return
-    deepPollInFlight = true
-    try {
-      await deepPollAllClients(encryptionKey)
-      // Prune client snapshots + uptime buckets using snapshotRetentionDays
-      const [settings] = await db
-        .select({ retention: appSettings.snapshotRetentionDays })
-        .from(appSettings)
-        .limit(1)
-      const retentionDays = settings?.retention ?? 90
-      const cutoff = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000)
-      await db.delete(clientSnapshots).where(lt(clientSnapshots.polledAt, cutoff))
-      await db.delete(clientUptimeBuckets).where(lt(clientUptimeBuckets.bucketTs, cutoff))
-    } catch (error) {
-      log.error(error, "Client deep poll error")
-    } finally {
-      deepPollInFlight = false
-    }
-  })
-  setDeepPollTask(dpTask)
-
-  log.info("Client scheduler started (heartbeat: 5s, deep poll: 5m)")
-}
-
-export function stopClientScheduler(): void {
-  const hb = getHeartbeatTask()
-  if (hb) {
-    hb.stop()
-    setHeartbeatTask(null)
-  }
-  const dp = getDeepPollTask()
-  if (dp) {
-    dp.stop()
-    setDeepPollTask(null)
-  }
-  clearAllSessions()
-  clearSpeedCache()
-
-  flushCompletedBuckets().catch(() => {})
-  clearUptimeAccumulator()
-}
-
-/**
- * Restarts the client scheduler if it died (i.e, after server restart).
- * Called from ensureSchedulerRunning in scheduler.ts.
- */
-export function ensureClientSchedulerRunning(encryptionKeyHex: string): void {
-  if (getHeartbeatTask()) return
-  const key = Buffer.from(encryptionKeyHex, "hex")
-  startClientScheduler(key)
-}
diff --git a/src/lib/color-utils.ts b/src/lib/color-utils.ts
index 83d82279..cca585c5 100644
--- a/src/lib/color-utils.ts
+++ b/src/lib/color-utils.ts
@@ -1,134 +1,104 @@
 // src/lib/color-utils.ts
 //
-// Shared color conversion utilities. Pure math only — no browser or Node.js APIs.
+// Shared color conversion utilities. Only does maths. Do not use browser/Node APIs here please.
 //
-// Functions: hslToRgb, rgbToHsl, hslToRgbBuffer, hexToRgbTuple, byteToColor, colorToByte
+// Functions: hexToRgba, hexToInt, hexToHsl, hslToHex, generatePalette, getComplementaryColor
 
-/**
- * Convert HSL to an RGB tuple.
- * h: 0-360, s: 0-1, l: 0-1
- * Returns [r, g, b] each in 0-255.
- */
-export function hslToRgb(h: number, s: number, l: number): [number, number, number] {
-  const c = (1 - Math.abs(2 * l - 1)) * s
-  const x = c * (1 - Math.abs(((h / 60) % 2) - 1))
-  const m = l - c / 2
-  let r = 0,
-    g = 0,
-    b = 0
-  if (h < 60) {
-    r = c
-    g = x
-  } else if (h < 120) {
-    r = x
-    g = c
-  } else if (h < 180) {
-    g = c
-    b = x
-  } else if (h < 240) {
-    g = x
-    b = c
-  } else if (h < 300) {
-    r = x
-    b = c
-  } else {
-    r = c
-    b = x
-  }
-  return [Math.round((r + m) * 255), Math.round((g + m) * 255), Math.round((b + m) * 255)]
+import { DEFAULT_TRACKER_COLOR } from "@/lib/constants"
+import { isValidHex } from "@/lib/validators"
+
+export function hexToRgba(hex: string, alpha: number): string {
+  const safe = isValidHex(hex) ? hex : DEFAULT_TRACKER_COLOR
+  const r = parseInt(safe.slice(1, 3), 16)
+  const g = parseInt(safe.slice(3, 5), 16)
+  const b = parseInt(safe.slice(5, 7), 16)
+  return `rgba(${r}, ${g}, ${b}, ${alpha})`
+}
+
+export function hexToInt(hex: string): number {
+  return Number.parseInt(hex.replace("#", ""), 16)
 }
 
 /**
- * Convert RGB to an HSL tuple.
- * r, g, b: 0-255
- * Returns [h, s, l] where h is 0-360, s and l are 0-1.
+ * Converts a hex color (#rrggbb) to HSL components.
+ * Returns [hue (0-360), saturation (0-1), lightness (0-1)].
  */
-export function rgbToHsl(r: number, g: number, b: number): [number, number, number] {
-  r /= 255
-  g /= 255
-  b /= 255
+export function hexToHsl(hex: string): [number, number, number] {
+  const r = parseInt(hex.slice(1, 3), 16) / 255
+  const g = parseInt(hex.slice(3, 5), 16) / 255
+  const b = parseInt(hex.slice(5, 7), 16) / 255
   const max = Math.max(r, g, b)
   const min = Math.min(r, g, b)
   const l = (max + min) / 2
+
   if (max === min) return [0, 0, l]
+
   const d = max - min
   const s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
+
   let h = 0
   if (max === r) h = ((g - b) / d + (g < b ? 6 : 0)) / 6
   else if (max === g) h = ((b - r) / d + 2) / 6
   else h = ((r - g) / d + 4) / 6
+
   return [h * 360, s, l]
 }
 
 /**
- * Write an HSL color directly into a Uint8ClampedArray at the given pixel index.
- * Used for per-pixel writes in fractal renderers (avoids allocating a tuple per pixel).
- * h: 0-360, s: 0-1, l: 0-1
- * Writes r, g, b, a (255) into data[idx..idx+3].
+ * Converts HSL components to a hex color string.
  */
-export function hslToRgbBuffer(
-  h: number,
-  s: number,
-  l: number,
-  data: Uint8ClampedArray,
-  idx: number
-): void {
-  const c = (1 - Math.abs(2 * l - 1)) * s
-  const x = c * (1 - Math.abs(((h / 60) % 2) - 1))
-  const m = l - c / 2
-  let r = 0,
-    g = 0,
-    b = 0
+export function hslToHex(h: number, s: number, l: number): string {
+  const hNorm = (((h % 360) + 360) % 360) / 360
 
-  if (h < 60) {
-    r = c
-    g = x
-  } else if (h < 120) {
-    r = x
-    g = c
-  } else if (h < 180) {
-    g = c
-    b = x
-  } else if (h < 240) {
-    g = x
-    b = c
-  } else if (h < 300) {
-    r = x
-    b = c
-  } else {
-    r = c
-    b = x
+  function hue2rgb(p: number, q: number, t: number): number {
+    if (t < 0) t += 1
+    if (t > 1) t -= 1
+    if (t < 1 / 6) return p + (q - p) * 6 * t
+    if (t < 1 / 2) return q
+    if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6
+    return p
   }
 
-  data[idx] = Math.round((r + m) * 255)
-  data[idx + 1] = Math.round((g + m) * 255)
-  data[idx + 2] = Math.round((b + m) * 255)
-  data[idx + 3] = 255
-}
+  let r: number
+  let g: number
+  let b: number
+  if (s === 0) {
+    r = g = b = l
+  } else {
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s
+    const p = 2 * l - q
+    r = hue2rgb(p, q, hNorm + 1 / 3)
+    g = hue2rgb(p, q, hNorm)
+    b = hue2rgb(p, q, hNorm - 1 / 3)
+  }
 
-/**
- * Parse a CSS hex color string into an RGB tuple.
- * Accepts "#rrggbb" or "rrggbb".
- * Returns [r, g, b] each in 0-255.
- */
-export function hexToRgbTuple(hex: string): [number, number, number] {
-  const h = hex.startsWith("#") ? hex.slice(1) : hex
-  return [parseInt(h.slice(0, 2), 16), parseInt(h.slice(2, 4), 16), parseInt(h.slice(4, 6), 16)]
+  const toHex = (x: number) =>
+    Math.round(x * 255)
+      .toString(16)
+      .padStart(2, "0")
+  return `#${toHex(r)}${toHex(g)}${toHex(b)}`
 }
 
 /**
- * Map a byte value (0-255) to an RGB color via the full HSL hue wheel.
- * Fixed saturation (0.85) and lightness (0.5) for maximum discriminating power.
+ * Generates `count` visually distinct colors by rotating hue evenly across
+ * 360°, anchored at the hue of `baseColor`. Saturation and lightness are
+ * clamped to values that look good on dark backgrounds.
  */
-export function byteToColor(byte: number): [number, number, number] {
-  const hue = (byte / 256) * 360
-  return hslToRgb(hue, 0.85, 0.5)
+export function generatePalette(count: number, baseColor: string): string[] {
+  if (count === 0) return []
+  const [baseH, baseS, baseL] = hexToHsl(baseColor)
+  const sat = Math.max(baseS, 0.55)
+  const lit = Math.min(Math.max(baseL, 0.45), 0.65)
+  if (count === 1) return [hslToHex(baseH, sat, lit)]
+  const step = 360 / count
+  return Array.from({ length: count }, (_, i) => hslToHex(baseH + i * step, sat, lit))
 }
 
 /**
- * Recover a byte (0-255) from an RGB color by inverting the hue mapping.
+ * Generates a visually complementary color by rotating the hue.
+ * Ensures visibility on dark backgrounds (min lightness 0.4, min saturation 0.5).
  */
-export function colorToByte(r: number, g: number, b: number): number {
-  const [hue] = rgbToHsl(r, g, b)
-  return Math.round((hue / 360) * 256) % 256
+export function getComplementaryColor(hex: string, rotation = 150): string {
+  const [h, s, l] = hexToHsl(hex)
+  return hslToHex(h + rotation, Math.max(s, 0.5), Math.max(0.4, Math.min(0.7, l)))
 }
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 6c963a7a..6fa0bb2f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -3,6 +3,7 @@
 // Available: DEFAULT_LOG_FILE, DOCS_URL, DOCS, DocsEntry
 
 export const DEFAULT_LOG_FILE = "/data/logs/tracker-tracker.log"
+export const DEV_LOG_FILE = ".next/tracker-tracker.log"
 
 export const DOCS_URL = "https://jordanlambrecht.github.io/tracker-tracker"
 
@@ -35,7 +36,7 @@ export const DOCS = {
     description: "Route tracker requests through a SOCKS5, HTTP, or HTTPS proxy",
   },
   TOTP: {
-    href: `${DOCS_URL}/features/totp/`,
+    href: `${DOCS_URL}/reference/settings/#two-factor-authentication`,
     description: "Two-factor authentication with backup codes",
   },
   BACKUPS: {
@@ -59,7 +60,7 @@ export const DOCS = {
     description: "Get alerts in Discord when something happens on your trackers",
   },
   IMAGE_HOSTING: {
-    href: `${DOCS_URL}/features/image-hosting/`,
+    href: `${DOCS_URL}/features/`,
     description: "Upload tracker proof to image hosting sites",
   },
   TRANSIT_PAPERS: {
@@ -79,15 +80,18 @@ export const DOCS = {
 
   // Troubleshooting
   TRACKER_OFFLINE: {
-    href: `${DOCS_URL}/troubleshooting/tracker-offline/`,
+    href: `${DOCS_URL}/troubleshooting/`,
     description: "Tracker shows offline or polling is paused",
   },
   RATIO_NOT_UPDATING: {
-    href: `${DOCS_URL}/troubleshooting/ratio-not-updating/`,
+    href: `${DOCS_URL}/troubleshooting/`,
     description: "Ratio or stats appear stuck",
   },
   COMMON_ERRORS: {
-    href: `${DOCS_URL}/troubleshooting/common-errors/`,
+    href: `${DOCS_URL}/troubleshooting/`,
     description: "Error messages and what they mean",
   },
 } as const satisfies Record<string, DocsEntry>
+
+// ─── Defaults ─────────────────────────────────────────────────────────────────
+export const DEFAULT_TRACKER_COLOR = "#00d4ff"
diff --git a/src/lib/dashboard.ts b/src/lib/dashboard.ts
index 47ac67ba..60ac5e6b 100644
--- a/src/lib/dashboard.ts
+++ b/src/lib/dashboard.ts
@@ -1,14 +1,15 @@
 // src/lib/dashboard.ts
 //
-// Functions: computeAggregateStats, computeAlerts, detectRankChanges, fetchDismissedKeys, postDismissAlert, deleteAllDismissed, computeSystemAlerts
+// Functions: computeAggregateStats, computeAlerts, detectRankChanges, fetchDismissedKeys,
+// postDismissAlert, deleteAllDismissed, computeSystemAlerts
 
 import { findRegistryEntry } from "@/data/tracker-registry"
+import { formatDateTime, formatRatio, formatTimeAgo } from "@/lib/formatters"
 import { isRedacted } from "@/lib/privacy"
 import {
   checkAnniversaryMilestone,
   checkRatioBelowMinimum,
   checkTrackerError,
-  checkWarned,
   checkZeroSeeding,
 } from "@/lib/tracker-events"
 import type { Snapshot, TrackerSummary } from "@/types/api"
@@ -26,18 +27,22 @@ export interface AggregateStats {
   totalLeeching: number
 }
 
-export type AlertType =
-  | "error"
-  | "poll-paused"
-  | "ratio-danger"
-  | "stale-data"
-  | "rank-change"
-  | "zero-seeding"
-  | "warned"
-  | "anniversary"
-  | "update-available"
-  | "backup-failed"
-  | "client-error"
+export const VALID_ALERT_TYPES = new Set([
+  "error",
+  "poll-paused",
+  "ratio-danger",
+  "stale-data",
+  "rank-change",
+  "zero-seeding",
+  "warned",
+  "anniversary",
+  "update-available",
+  "backup-failed",
+  "client-error",
+  "retention-unconfigured",
+] as const)
+
+export type AlertType = typeof VALID_ALERT_TYPES extends Set<infer T> ? T : never
 
 export interface DashboardAlert {
   key: string
@@ -133,7 +138,7 @@ export function computeAlerts(trackers: TrackerSummary[]): DashboardAlert[] {
         trackerId: tracker.id,
         trackerName: tracker.name,
         trackerColor: tracker.color,
-        message: `Ratio ${tracker.latestStats?.ratio?.toFixed(2)} is below the minimum of ${minimumRatio}`,
+        message: `Ratio ${formatRatio(tracker.latestStats?.ratio)} is below the minimum of ${minimumRatio}`,
         timestamp: tracker.lastPolledAt ?? undefined,
         dismissible: true,
       })
@@ -142,17 +147,16 @@ export function computeAlerts(trackers: TrackerSummary[]): DashboardAlert[] {
     // --- Stale data (skip if paused — staleness is expected) ---
     if (!tracker.pausedAt && !tracker.userPausedAt && tracker.lastPolledAt) {
       const lastPolled = new Date(tracker.lastPolledAt)
-      const thresholdMs = 2 * 60 * 60 * 1000 // 2 hours — stale if no poll in this window
+      const thresholdMs = 2 * 60 * 60 * 1000 // 2 hours
       const ageMs = Date.now() - lastPolled.getTime()
       if (ageMs > thresholdMs) {
-        const hoursAgo = Math.floor(ageMs / (1000 * 60 * 60))
         alerts.push({
           key: `stale-data-${tracker.id}`,
           type: "stale-data",
           trackerId: tracker.id,
           trackerName: tracker.name,
           trackerColor: tracker.color,
-          message: `Last polled ${hoursAgo}h ago`,
+          message: `Last polled ${formatTimeAgo(tracker.lastPolledAt)}`,
           timestamp: tracker.lastPolledAt,
           dismissible: true,
         })
@@ -174,7 +178,7 @@ export function computeAlerts(trackers: TrackerSummary[]): DashboardAlert[] {
     }
 
     // --- Warned by tracker ---
-    if (checkWarned(tracker.latestStats?.warned)) {
+    if (tracker.latestStats?.warned === true) {
       alerts.push({
         key: `warned-${tracker.id}`,
         type: "warned",
@@ -223,15 +227,11 @@ export function detectRankChanges(
   const cutoff = Date.now() - freshnessDays * 24 * 60 * 60 * 1000
 
   for (const t of trackers) {
-    const raw = snapshotMap.get(t.id)
-    if (!raw || raw.length < 2) continue
+    const snapshots = snapshotMap.get(t.id)
+    if (!snapshots || snapshots.length < 2) continue
 
-    // Sort ascending by polledAt so index 0 is oldest, last is newest
-    const snapshots = [...raw].sort(
-      (a, b) => new Date(a.polledAt).getTime() - new Date(b.polledAt).getTime()
-    )
-
-    // Walk backwards through snapshots to find the most recent rank change
+    // INVARIANT: snapshots arrive sorted ascending by polledAt from the API
+    // Walk backwards to find the most recent rank change
     for (let i = snapshots.length - 1; i > 0; i--) {
       const current = snapshots[i]
       const previous = snapshots[i - 1]
@@ -242,7 +242,7 @@ export function detectRankChanges(
       // Skip if same group
       if (current.group === previous.group) continue
 
-      // Found a rank change — check freshness
+      // Found a rank change. check freshness
       const changeTime = new Date(current.polledAt).getTime()
       if (changeTime < cutoff) break // Older than freshness window, stop looking
 
@@ -281,27 +281,29 @@ export async function fetchDismissedKeys(): Promise<Set<string>> {
   }
 }
 
-export async function postDismissAlert(key: string, type: string): Promise<void> {
+export async function postDismissAlert(key: string, type: string): Promise<boolean> {
   try {
-    await fetch("/api/alerts/dismissed", {
+    const res = await fetch("/api/alerts/dismissed", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ key, type }),
       signal: AbortSignal.timeout(5000),
     })
+    return res.ok
   } catch {
-    // security-audit-ignore: best-effort. alert will reappear on next load if POST failed
+    return false
   }
 }
 
-export async function deleteAllDismissed(): Promise<void> {
+export async function deleteAllDismissed(): Promise<boolean> {
   try {
-    await fetch("/api/alerts/dismissed", {
+    const res = await fetch("/api/alerts/dismissed", {
       method: "DELETE",
       signal: AbortSignal.timeout(5000),
     })
+    return res.ok
   } catch {
-    // security-audit-ignore: best-effort. dismissals will be re-fetched on next load
+    return false
   }
 }
 
@@ -314,6 +316,7 @@ export interface SystemAlertData {
   currentVersion: string
   failedBackups: { createdAt: string }[]
   clients: { id: number; name: string; enabled: boolean; lastError: string | null }[]
+  snapshotRetentionDays: number | null
 }
 
 export function computeSystemAlerts(data: SystemAlertData): DashboardAlert[] {
@@ -341,7 +344,7 @@ export function computeSystemAlerts(data: SystemAlertData): DashboardAlert[] {
       trackerId: null,
       trackerName: "Backups",
       trackerColor: "var(--color-danger)",
-      message: `Scheduled backup failed at ${new Date(latest.createdAt).toLocaleString()}`,
+      message: `Scheduled backup failed at ${formatDateTime(latest.createdAt)}`,
       timestamp: latest.createdAt,
       dismissible: true,
     })
@@ -362,5 +365,19 @@ export function computeSystemAlerts(data: SystemAlertData): DashboardAlert[] {
     }
   }
 
+  // Snapshot retention unconfigured
+  if (data.snapshotRetentionDays === null) {
+    alerts.push({
+      key: "retention-unconfigured",
+      type: "retention-unconfigured",
+      trackerId: null,
+      trackerName: "System",
+      trackerColor: "var(--color-warn)",
+      message:
+        "Snapshot retention is not configured — database and backups will grow indefinitely. Configure in Settings > Security.",
+      dismissible: true,
+    })
+  }
+
   return alerts
 }
diff --git a/src/lib/data-transforms.ts b/src/lib/data-transforms.ts
new file mode 100644
index 00000000..f023e196
--- /dev/null
+++ b/src/lib/data-transforms.ts
@@ -0,0 +1,90 @@
+// src/lib/data-transforms.ts
+
+// Functions: computeDelta, compareBigIntDesc, computePctChange,
+//            floatBytesToBigInt, computeBufferBytes, isUnixTimestampOnDate,
+//            sanitizeHost, normalizeUrl
+
+import { localDateStr } from "@/lib/formatters"
+import type { Snapshot } from "@/types/api"
+
+/**
+ * Computes the 24-hour upload/download delta from a snapshot array.
+ * Sorts snapshots ascending by polledAt before processing, so the result
+ * is correct regardless of the order snapshots arrive in.
+ * Returns null if fewer than 2 snapshots exist or no snapshot falls within
+ * the 24-hour window.
+ */
+export function computeDelta(snaps: Snapshot[]): { uploaded: string; downloaded: string } | null {
+  if (snaps.length < 2) return null
+
+  const sorted = [...snaps].sort(
+    (a, b) => new Date(a.polledAt).getTime() - new Date(b.polledAt).getTime()
+  )
+
+  const latest = sorted[sorted.length - 1]
+  const cutoff = Date.now() - 24 * 60 * 60 * 1000
+
+  let earliest: Snapshot | null = null
+  for (const s of sorted) {
+    if (new Date(s.polledAt).getTime() >= cutoff) {
+      earliest = s
+      break
+    }
+  }
+
+  if (!earliest || earliest === latest) return null
+  if (
+    !latest.uploadedBytes ||
+    !earliest.uploadedBytes ||
+    !latest.downloadedBytes ||
+    !earliest.downloadedBytes
+  )
+    return null
+
+  try {
+    const uploadDelta = BigInt(latest.uploadedBytes) - BigInt(earliest.uploadedBytes)
+    const downloadDelta = BigInt(latest.downloadedBytes) - BigInt(earliest.downloadedBytes)
+    return { uploaded: uploadDelta.toString(), downloaded: downloadDelta.toString() }
+  } catch {
+    return null
+  }
+}
+
+export function compareBigIntDesc(a: bigint, b: bigint): number {
+  if (b > a) return 1
+  if (b < a) return -1
+  return 0
+}
+
+export function computePctChange(today: string, yesterday: string | null): number | null {
+  if (yesterday === null) return null
+  try {
+    const y = Number(BigInt(yesterday))
+    if (y === 0) return null
+    const t = Number(BigInt(today))
+    return ((t - y) / y) * 100
+  } catch {
+    return null
+  }
+}
+
+export function floatBytesToBigInt(n: number | null | undefined): bigint {
+  return BigInt(Math.max(0, Math.floor(n ?? 0)))
+}
+
+export function computeBufferBytes(uploaded: bigint, downloaded: bigint): bigint {
+  return uploaded > downloaded ? uploaded - downloaded : 0n
+}
+
+export function isUnixTimestampOnDate(unixSeconds: number, dateStr: string): boolean {
+  if (unixSeconds <= 0) return false
+  return localDateStr(new Date(unixSeconds * 1000)) === dateStr
+}
+
+export function sanitizeHost(host: string): string {
+  return host.trim().replace(/^https?:\/\//, "")
+}
+
+export function normalizeUrl(url: string): string {
+  return url.replace(/\/+$/, "").toLowerCase()
+}
diff --git a/src/lib/db/ensure-indexes.ts b/src/lib/db/ensure-indexes.ts
new file mode 100644
index 00000000..e850e215
--- /dev/null
+++ b/src/lib/db/ensure-indexes.ts
@@ -0,0 +1,48 @@
+// src/lib/db/ensure-indexes.ts
+//
+// Creates covering indexes that can't be expressed in Drizzle's schema DSL.
+// Called once per server start. PostgreSQL's IF NOT EXISTS makes this idempotent.
+
+import { sql } from "drizzle-orm"
+import { db } from "@/lib/db"
+import { errMsg } from "@/lib/error-utils"
+import { log } from "@/lib/logger"
+
+const g = globalThis as typeof globalThis & { __indexesEnsured?: boolean }
+
+/**
+ * Creates a covering index on tracker_snapshots that enables index-only scans
+ * for the selectDistinctOn + date_trunc query in getSnapshotsForTracker.
+ *
+ * Without this, PostgreSQL scans all raw rows (potentially millions after years
+ * of polling) to compute hourly/daily buckets. With the covering index, it reads
+ * the index instead of visiting heap pages.
+ *
+ * The INCLUDE columns match snapshotColumns in server-data.ts. If snapshotColumns
+ * changes, this index should be updated to match.
+ */
+export async function ensureIndexes(): Promise<void> {
+  if (g.__indexesEnsured) return
+
+  try {
+    await db.execute(sql`
+      CREATE INDEX IF NOT EXISTS idx_snapshots_tracker_polled_covering
+      ON tracker_snapshots (tracker_id, polled_at)
+      INCLUDE (
+        uploaded_bytes, downloaded_bytes, ratio, buffer_bytes,
+        seeding_count, leeching_count, seedbonus, hit_and_runs,
+        required_ratio, warned, freeleech_tokens, share_score,
+        username, group_name
+      )
+    `)
+    g.__indexesEnsured = true
+    log.debug("Covering index on tracker_snapshots verified")
+  } catch (err) {
+    // Non-fatal. The app works without the covering index, just slower for
+    // long-range chart queries. Log and continue.
+    log.warn(
+      { error: errMsg(err) },
+      "Failed to create covering index on tracker_snapshots — chart queries may be slow for long ranges"
+    )
+  }
+}
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
index 1746fa4c..039beb35 100644
--- a/src/lib/db/schema.ts
+++ b/src/lib/db/schema.ts
@@ -3,7 +3,7 @@
 // Tables: appSettings, trackers, trackerSnapshots, trackerRoles, downloadClients,
 // tagGroups, tagGroupMembers, clientSnapshots, backupHistory, dismissedAlerts,
 // draftQuicklinks (column on appSettings), notificationTargets, notificationDeliveryState,
-// trackerDailyCheckpoints, torrentDailyCheckpoints
+// trackerDailyCheckpoints, torrentDailyCheckpoints, dbSizeHistory
 
 import {
   bigint,
@@ -73,6 +73,7 @@ export const trackers = pgTable("trackers", {
   isActive: boolean("is_active").default(true).notNull(),
   lastPolledAt: timestamp("last_polled_at"),
   lastError: text("last_error"),
+  lastErrorAt: timestamp("last_error_at"),
   consecutiveFailures: integer("consecutive_failures").default(0).notNull(),
   pausedAt: timestamp("paused_at"),
   userPausedAt: timestamp("user_paused_at"),
@@ -82,6 +83,7 @@ export const trackers = pgTable("trackers", {
   platformMeta: text("platform_meta"),
   mouseholeUrl: text("mousehole_url"),
   avatarData: text("avatar_data"),
+  avatarMimeType: varchar("avatar_mime_type", { length: 50 }),
   avatarCachedAt: timestamp("avatar_cached_at"),
   avatarRemoteUrl: text("avatar_remote_url"),
   useProxy: boolean("use_proxy").default(false).notNull(),
@@ -118,6 +120,7 @@ export const trackerSnapshots = pgTable(
     shareScore: real("share_score"),
     username: varchar("username", { length: 255 }),
     group: varchar("group_name", { length: 255 }),
+    isManual: boolean("is_manual").default(false).notNull(),
   },
   (table) => [
     index("idx_snapshots_tracker_polled").on(table.trackerId, table.polledAt),
@@ -215,7 +218,10 @@ export const clientSnapshots = pgTable(
     downloadSpeedBytes: bigint("download_speed_bytes", { mode: "bigint" }),
     tagStats: text("tag_stats"),
   },
-  (table) => [index("idx_client_snapshots_client_polled").on(table.clientId, table.polledAt)]
+  (table) => [
+    index("idx_client_snapshots_client_polled").on(table.clientId, table.polledAt),
+    index("idx_client_snapshots_polled_brin").using("brin", table.polledAt),
+  ]
 )
 
 export const backupHistory = pgTable("backup_history", {
@@ -288,6 +294,7 @@ export const notificationTargets = pgTable("notification_targets", {
   notifyVipExpiring: boolean("notify_vip_expiring").default(false).notNull(),
   notifyUnsatisfiedLimit: boolean("notify_unsatisfied_limit").default(false).notNull(),
   notifyActiveHnrs: boolean("notify_active_hnrs").default(false).notNull(),
+  notifyDownloadDisabled: boolean("notify_download_disabled").default(false).notNull(),
 
   // Event thresholds — nullable JSONB; null means use application defaults.
   // Shape: { ratioDropDelta?: number, bufferMilestoneBytes?: number }
@@ -427,3 +434,31 @@ export const torrentDailyCheckpoints = pgTable(
     index("idx_torrent_checkpoint_date").on(table.checkpointDate),
   ]
 )
+
+export const dbSizeHistory = pgTable(
+  "db_size_history",
+  {
+    id: serial("id").primaryKey(),
+    recordedAt: date("recorded_at").notNull(),
+    totalBytes: bigint("total_bytes", { mode: "bigint" }).notNull(),
+  },
+  (table) => [uniqueIndex("uq_db_size_recorded_at").on(table.recordedAt)]
+)
+
+// ── Named type exports ──────────────────────────────────────────────
+export type AppSettingsRow = typeof appSettings.$inferSelect
+export type TrackerRow = typeof trackers.$inferSelect
+export type TrackerSnapshotRow = typeof trackerSnapshots.$inferSelect
+export type TrackerRoleRow = typeof trackerRoles.$inferSelect
+export type DownloadClientRow = typeof downloadClients.$inferSelect
+export type ClientUptimeBucketRow = typeof clientUptimeBuckets.$inferSelect
+export type TagGroupRow = typeof tagGroups.$inferSelect
+export type TagGroupMemberRow = typeof tagGroupMembers.$inferSelect
+export type ClientSnapshotRow = typeof clientSnapshots.$inferSelect
+export type BackupHistoryRow = typeof backupHistory.$inferSelect
+export type DismissedAlertRow = typeof dismissedAlerts.$inferSelect
+export type NotificationTargetRow = typeof notificationTargets.$inferSelect
+export type NotificationDeliveryStateRow = typeof notificationDeliveryState.$inferSelect
+export type TrackerDailyCheckpointRow = typeof trackerDailyCheckpoints.$inferSelect
+export type TorrentDailyCheckpointRow = typeof torrentDailyCheckpoints.$inferSelect
+export type DbSizeHistoryRow = typeof dbSizeHistory.$inferSelect
diff --git a/src/lib/download-client-scheduler.ts b/src/lib/download-client-scheduler.ts
new file mode 100644
index 00000000..e3cdc59d
--- /dev/null
+++ b/src/lib/download-client-scheduler.ts
@@ -0,0 +1,452 @@
+// src/lib/download-client-scheduler.ts
+//
+// Two polling loops with different cadences:
+//   heartbeat  — lightweight: login + getTransferInfo (2 requests). Runs every 5s.
+//                Stores upload/download speed in memory cache. Updates connection status.
+//                Records success/failure in uptime accumulator (5-min buckets).
+//   deep poll  — heavy: login + syncMaindata (delta) + post-filter + aggregation.
+//                Runs on each client's configured pollIntervalSeconds.
+//                Stores full tagStats alongside speed data.
+//
+// Functions: heartbeatClient, heartbeatAllClients, deepPollClient, deepPollAllClients,
+//            startClientScheduler, stopClientScheduler, ensureClientSchedulerRunning
+//
+// Side effects of deepPollClient:
+//   - Writes torrent daily checkpoints (torrentDailyCheckpoints) for "Movers & Shakers".
+//     Uses onConflictDoNothing so the first poll of the day wins; subsequent polls skip.
+
+import { eq, isNotNull, lt, sql } from "drizzle-orm"
+import cron, { type ScheduledTask } from "node-cron"
+import { db } from "@/lib/db"
+import {
+  appSettings,
+  clientSnapshots,
+  clientUptimeBuckets,
+  downloadClients,
+  torrentDailyCheckpoints,
+  trackers,
+} from "@/lib/db/schema"
+import {
+  aggregateByTag,
+  applyMaindataUpdate,
+  clearAllSessions,
+  clearSpeedCache,
+  createAdapterForClient,
+  getFilteredTorrents,
+  getStoreRevision,
+  pushSpeedSnapshot,
+  replaceStoreTorrents,
+  slimTorrentForCache,
+} from "@/lib/download-clients"
+import { sanitizeNetworkError } from "@/lib/error-utils"
+import { parseTorrentTags } from "@/lib/fleet"
+import { localDateStr } from "@/lib/formatters"
+import { SNAPSHOT_RETENTION_DEFAULT } from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { clearUptimeAccumulator, flushCompletedBuckets, recordHeartbeat } from "@/lib/uptime"
+
+/** Needed by heartbeatClient. Excludes large blobs like cachedTorrents */
+export const HEARTBEAT_COLUMNS = {
+  id: downloadClients.id,
+  enabled: downloadClients.enabled,
+  name: downloadClients.name,
+  type: downloadClients.type,
+  host: downloadClients.host,
+  port: downloadClients.port,
+  useSsl: downloadClients.useSsl,
+  encryptedUsername: downloadClients.encryptedUsername,
+  encryptedPassword: downloadClients.encryptedPassword,
+  crossSeedTags: downloadClients.crossSeedTags,
+  lastError: downloadClients.lastError,
+} as const
+
+/** Needed by deepPollClient. Heartbeat fields + poll config */
+export const DEEP_POLL_COLUMNS = {
+  ...HEARTBEAT_COLUMNS,
+  pollIntervalSeconds: downloadClients.pollIntervalSeconds,
+  lastPolledAt: downloadClients.lastPolledAt,
+} as const
+
+// Store on globalThis to survive HMR in development.
+// Without this, each hot-reload orphans the old cron job while creating a new one.
+const g = globalThis as typeof globalThis & {
+  __clientHeartbeatTask?: ScheduledTask | null
+  __clientDeepPollTask?: ScheduledTask | null
+  __heartbeatInFlight?: boolean
+  __deepPollInFlight?: boolean
+  __lastPruneAt?: number
+}
+const PRUNE_INTERVAL_MS = 60 * 60 * 1000 // 1 hour
+
+function getHeartbeatTask(): ScheduledTask | null {
+  return g.__clientHeartbeatTask ?? null
+}
+function setHeartbeatTask(task: ScheduledTask | null) {
+  g.__clientHeartbeatTask = task
+}
+function getDeepPollTask(): ScheduledTask | null {
+  return g.__clientDeepPollTask ?? null
+}
+function setDeepPollTask(task: ScheduledTask | null) {
+  g.__clientDeepPollTask = task
+}
+
+// ---------------------------------------------------------------------------
+// Heartbeat
+// ---------------------------------------------------------------------------
+
+async function heartbeatClient(
+  client: {
+    id: number
+    name: string
+    type: string
+    host: string
+    port: number
+    useSsl: boolean
+    encryptedUsername: string
+    encryptedPassword: string
+    crossSeedTags: string[] | null
+    lastError: string | null
+  },
+  encryptionKey: Buffer
+): Promise<void> {
+  try {
+    const adapter = createAdapterForClient(client, encryptionKey)
+    const stats = await adapter.getTransferInfo()
+    pushSpeedSnapshot(client.id, stats)
+    recordHeartbeat(client.id, true)
+
+    // Only write to DB if recovering from error — skip if already healthy
+    if (client.lastError !== null) {
+      await db
+        .update(downloadClients)
+        .set({ lastError: null, errorSince: null, updatedAt: new Date() })
+        .where(eq(downloadClients.id, client.id))
+    }
+  } catch (error) {
+    recordHeartbeat(client.id, false)
+    const raw = error instanceof Error ? error.message : "Unknown error"
+    const message = sanitizeNetworkError(raw)
+    const isRepeat = client.lastError !== null
+    const logFn = isRepeat ? log.debug.bind(log) : log.error.bind(log)
+    logFn(
+      { clientId: client.id, clientName: client.name },
+      `Heartbeat failed for client ${client.id} (${client.name}): ${message}`
+    )
+    try {
+      await db
+        .update(downloadClients)
+        .set({
+          lastError: message,
+          errorSince: sql`COALESCE(${downloadClients.errorSince}, NOW())`,
+          updatedAt: new Date(),
+        })
+        .where(eq(downloadClients.id, client.id))
+    } catch (dbErr) {
+      log.error(
+        `Failed to record heartbeat error for client ${client.id}: ${dbErr instanceof Error ? dbErr.message : String(dbErr)}`
+      )
+    }
+  }
+}
+
+async function heartbeatAllClients(encryptionKey: Buffer): Promise<void> {
+  const allClients = await db
+    .select(HEARTBEAT_COLUMNS)
+    .from(downloadClients)
+    .where(eq(downloadClients.enabled, true))
+
+  if (allClients.length === 0) return
+
+  await Promise.allSettled(allClients.map((c) => heartbeatClient(c, encryptionKey)))
+}
+
+// ---------------------------------------------------------------------------
+// Deep poll
+// ---------------------------------------------------------------------------
+
+export async function deepPollClient(
+  clientId: number,
+  encryptionKey: Buffer,
+  trackerTags: string[]
+): Promise<void> {
+  const [client] = await db
+    .select(DEEP_POLL_COLUMNS)
+    .from(downloadClients)
+    .where(eq(downloadClients.id, clientId))
+    .limit(1)
+
+  if (!client?.enabled) return
+  if (!client.encryptedUsername || !client.encryptedPassword) return
+
+  try {
+    const adapter = createAdapterForClient(client, encryptionKey)
+
+    const crossSeedTags = client.crossSeedTags ?? []
+    const allTags = [...new Set([...trackerTags, ...crossSeedTags])]
+
+    let hasChanges = false
+    let syncSummary = ""
+    let isFullSync = false
+
+    if (adapter.getDeltaSync) {
+      // Delta sync path (qBittorrent). First call (rid=0) returns everything;
+      // subsequent calls return only changed fields.
+      const rid = getStoreRevision(adapter.baseUrl)
+      const data = await adapter.getDeltaSync(rid)
+      applyMaindataUpdate(adapter.baseUrl, data)
+
+      const changedCount = Object.keys(data.torrents ?? {}).length
+      const removedCount = data.torrentsRemoved?.length ?? 0
+      if (data.fullUpdate) {
+        isFullSync = true
+        syncSummary = `rid 0→${data.rid} (full sync, ${changedCount} torrents)`
+      } else {
+        syncSummary = `rid ${rid}→${data.rid} (delta, ${changedCount} changed, ${removedCount} removed)`
+      }
+
+      hasChanges =
+        data.fullUpdate ||
+        (data.torrents != null && Object.keys(data.torrents).length > 0) ||
+        (data.torrentsRemoved != null && data.torrentsRemoved.length > 0)
+    } else {
+      // Full fetch path (rTorrent and other non-delta clients).
+      const allTorrents = await adapter.getTorrents()
+      replaceStoreTorrents(adapter.baseUrl, allTorrents)
+      hasChanges = true
+      isFullSync = true
+      syncSummary = `full fetch, ${allTorrents.length} torrents`
+    }
+
+    const stats = await adapter.getTransferInfo()
+
+    // Post-filter to only torrents carrying at least one app-tracked tag
+    const tagSet = new Set(allTags.map((t) => t.toLowerCase()))
+    const torrents = getFilteredTorrents(adapter.baseUrl, (t) => {
+      if (!t.tags) return false
+      return parseTorrentTags(t.tags).some((tag) => tagSet.has(tag))
+    })
+
+    const syncMsg = `[deep-poll] client=${clientId} → ${syncSummary}, ${torrents.length} relevant (${allTags.length} tags)`
+    if (isFullSync) log.info(syncMsg)
+    else log.debug(syncMsg)
+
+    // Write daily torrent checkpoints for "Movers & Shakers" — first-seen-today wins
+    const checkpointDate = localDateStr()
+    const checkpointable = torrents.filter(
+      (t) => t.uploaded != null && t.downloaded != null && t.hash && t.name
+    )
+    if (checkpointable.length > 0) {
+      const CHUNK = 500
+      try {
+        for (let i = 0; i < checkpointable.length; i += CHUNK) {
+          await db
+            .insert(torrentDailyCheckpoints)
+            .values(
+              checkpointable.slice(i, i + CHUNK).map((t) => ({
+                clientId,
+                hash: t.hash,
+                name: t.name,
+                checkpointDate,
+                uploadedStart: BigInt(t.uploaded),
+                downloadedStart: BigInt(t.downloaded),
+              }))
+            )
+            .onConflictDoNothing()
+        }
+      } catch (err) {
+        log.warn(
+          `Torrent checkpoint insert failed for client ${clientId}: ${err instanceof Error ? err.message : "Unknown"}`
+        )
+      }
+    }
+
+    const tagStatsResult = aggregateByTag(torrents, trackerTags, crossSeedTags)
+
+    // Cache the filtered torrent list for fallback when client is offline.
+    const sanitizedTorrents = torrents.map(slimTorrentForCache)
+    const now = new Date()
+
+    await Promise.all([
+      db
+        .update(downloadClients)
+        .set(
+          hasChanges
+            ? {
+                cachedTorrents: sanitizedTorrents,
+                cachedTorrentsAt: now,
+                lastPolledAt: now,
+                lastError: null,
+                errorSince: null,
+                updatedAt: now,
+              }
+            : {
+                cachedTorrentsAt: now,
+                lastPolledAt: now,
+                lastError: null,
+                errorSince: null,
+                updatedAt: now,
+              }
+        )
+        .where(eq(downloadClients.id, clientId)),
+      db.insert(clientSnapshots).values({
+        clientId,
+        polledAt: now,
+        totalSeedingCount: tagStatsResult.totalSeedingCount,
+        totalLeechingCount: tagStatsResult.totalLeechingCount,
+        uploadSpeedBytes: BigInt(stats.uploadSpeed),
+        downloadSpeedBytes: BigInt(stats.downloadSpeed),
+        tagStats: JSON.stringify(tagStatsResult.tagStats),
+      }),
+    ])
+    if (!hasChanges) {
+      log.debug(`[deep-poll] client=${clientId} → no torrent changes, JSONB write skipped`)
+    }
+  } catch (error) {
+    const raw = error instanceof Error ? error.message : "Unknown error"
+    const message = sanitizeNetworkError(raw)
+    const isRepeat = client?.lastError !== null
+    const logFn = isRepeat ? log.debug.bind(log) : log.error.bind(log)
+    logFn(
+      { clientId, clientName: client?.name },
+      `Deep poll failed for client ${clientId} (${client?.name ?? "unknown"}): ${message}`
+    )
+    try {
+      await db
+        .update(downloadClients)
+        .set({
+          lastError: message,
+          errorSince: sql`COALESCE(${downloadClients.errorSince}, NOW())`,
+          updatedAt: new Date(),
+        })
+        .where(eq(downloadClients.id, clientId))
+    } catch (dbErr) {
+      log.error(
+        `Failed to record deep poll error for client ${clientId}: ${dbErr instanceof Error ? dbErr.message : String(dbErr)}`
+      )
+    }
+  }
+}
+
+async function deepPollAllClients(encryptionKey: Buffer): Promise<void> {
+  const allClients = await db
+    .select({
+      id: downloadClients.id,
+      enabled: downloadClients.enabled,
+      pollIntervalSeconds: downloadClients.pollIntervalSeconds,
+      lastPolledAt: downloadClients.lastPolledAt,
+    })
+    .from(downloadClients)
+    .where(eq(downloadClients.enabled, true))
+
+  const now = Date.now()
+
+  const overdue = allClients.filter((client) => {
+    const intervalMs = client.pollIntervalSeconds * 1000
+    const lastPoll = client.lastPolledAt?.getTime() ?? 0
+    return now - lastPoll >= intervalMs
+  })
+
+  if (overdue.length === 0) return
+
+  // Fetch tracker tags once for the entire cycle (same for all clients)
+  const trackerTagRows = await db
+    .select({ qbtTag: trackers.qbtTag })
+    .from(trackers)
+    .where(isNotNull(trackers.qbtTag))
+  const trackerTags = trackerTagRows.map((r) => r.qbtTag as string)
+
+  await Promise.allSettled(overdue.map((c) => deepPollClient(c.id, encryptionKey, trackerTags)))
+}
+
+// ---------------------------------------------------------------------------
+// Scheduler lifecycle
+// ---------------------------------------------------------------------------
+
+export function startClientScheduler(encryptionKey: Buffer): void {
+  if (getHeartbeatTask()) return
+
+  // Run both immediately on start
+  heartbeatAllClients(encryptionKey).catch((error) => {
+    log.error(error, "Initial heartbeat error")
+  })
+  deepPollAllClients(encryptionKey).catch((error) => {
+    log.error(error, "Initial deep poll error")
+  })
+
+  // Heartbeat: every 5 seconds
+  const hbTask = cron.schedule("*/5 * * * * *", async () => {
+    if (g.__heartbeatInFlight) return
+    g.__heartbeatInFlight = true
+    try {
+      await heartbeatAllClients(encryptionKey)
+      await flushCompletedBuckets()
+    } catch (error) {
+      log.error(error, "Client heartbeat error")
+    } finally {
+      g.__heartbeatInFlight = false
+    }
+  })
+  setHeartbeatTask(hbTask)
+
+  // Deep poll: 30s tick so per-client pollIntervalSeconds (min 60s) is honored
+  const dpTask = cron.schedule("*/30 * * * * *", async () => {
+    if (g.__deepPollInFlight) return
+    g.__deepPollInFlight = true
+    try {
+      await deepPollAllClients(encryptionKey)
+      // Prune client snapshots + uptime buckets at most once per hour
+      const now = Date.now()
+      if (now - (g.__lastPruneAt ?? 0) >= PRUNE_INTERVAL_MS) {
+        const [settings] = await db
+          .select({ retention: appSettings.snapshotRetentionDays })
+          .from(appSettings)
+          .limit(1)
+        const retentionDays = settings?.retention ?? SNAPSHOT_RETENTION_DEFAULT
+        if (retentionDays > 0) {
+          const cutoff = new Date(now - retentionDays * 24 * 60 * 60 * 1000)
+          await db.delete(clientSnapshots).where(lt(clientSnapshots.polledAt, cutoff))
+          await db.delete(clientUptimeBuckets).where(lt(clientUptimeBuckets.bucketTs, cutoff))
+        }
+        g.__lastPruneAt = now
+      }
+    } catch (error) {
+      log.error(error, "Client deep poll error")
+    } finally {
+      g.__deepPollInFlight = false
+    }
+  })
+  setDeepPollTask(dpTask)
+
+  log.info("Client scheduler started (heartbeat: 5s, deep poll: 30s tick)")
+}
+
+export function stopClientScheduler(): void {
+  const hb = getHeartbeatTask()
+  if (hb) {
+    hb.stop()
+    setHeartbeatTask(null)
+  }
+  const dp = getDeepPollTask()
+  if (dp) {
+    dp.stop()
+    setDeepPollTask(null)
+  }
+  clearAllSessions()
+  clearSpeedCache()
+
+  flushCompletedBuckets().catch((err) => {
+    log.warn(err, "Failed to flush uptime buckets during scheduler stop")
+  })
+  clearUptimeAccumulator()
+}
+
+/**
+ * Restarts the client scheduler if it died.
+ * Called from ensureSchedulerRunning in scheduler.ts.
+ */
+export function ensureClientSchedulerRunning(encryptionKeyHex: string): void {
+  if (getHeartbeatTask()) return
+  const key = Buffer.from(encryptionKeyHex, "hex")
+  startClientScheduler(key)
+}
diff --git a/src/lib/download-clients/__tests__/barrel-exports.test.ts b/src/lib/download-clients/__tests__/barrel-exports.test.ts
new file mode 100644
index 00000000..593713f4
--- /dev/null
+++ b/src/lib/download-clients/__tests__/barrel-exports.test.ts
@@ -0,0 +1,57 @@
+// src/lib/download-clients/__tests__/barrel-exports.test.ts
+//
+// Verifies the barrel export surface does not leak internal credential types.
+
+import { describe, expect, it, vi } from "vitest"
+
+vi.mock("server-only", () => ({}))
+vi.mock("@/lib/db", () => ({ db: {} }))
+vi.mock("@/lib/db/schema", () => ({
+  downloadClients: {},
+  trackers: {},
+  appSettings: {},
+  clientSnapshots: {},
+  notificationTargets: {},
+}))
+vi.mock("@/lib/crypto", () => ({ encrypt: vi.fn(), decrypt: vi.fn() }))
+vi.mock("@/lib/error-utils", () => ({
+  isDecryptionError: vi.fn(),
+  sanitizeNetworkError: vi.fn(),
+}))
+vi.mock("@/lib/logger", () => ({
+  log: { info: vi.fn(), error: vi.fn(), warn: vi.fn(), debug: vi.fn() },
+}))
+vi.mock("@/lib/fleet", () => ({
+  parseTorrentTags: vi.fn(),
+  SEEDING_STATES: new Set(),
+  LEECHING_STATES: new Set(),
+}))
+vi.mock("@/lib/fleet-aggregation", () => ({ computeFleetAggregation: vi.fn() }))
+vi.mock("drizzle-orm", () => ({ eq: vi.fn(), isNotNull: vi.fn() }))
+
+describe("download-clients barrel exports", () => {
+  it("does not export DownloadClientRow as a runtime value", async () => {
+    const barrel = await import("../index")
+    const exportedKeys = Object.keys(barrel)
+    expect(exportedKeys).not.toContain("DownloadClientRow")
+  })
+
+  it("does not export tryDecryptClientCredentials", async () => {
+    const barrel = await import("../index")
+    const exportedKeys = Object.keys(barrel)
+    expect(exportedKeys).not.toContain("tryDecryptClientCredentials")
+  })
+
+  it("does not export createClientAdapter (internal only)", async () => {
+    const barrel = await import("../index")
+    const exportedKeys = Object.keys(barrel)
+    expect(exportedKeys).not.toContain("createClientAdapter")
+  })
+
+  it("exports safety-critical functions", async () => {
+    const barrel = await import("../index")
+    expect(typeof barrel.stripSensitiveTorrentFields).toBe("function")
+    expect(typeof barrel.assertClientType).toBe("function")
+    expect(typeof barrel.createAdapterForClient).toBe("function")
+  })
+})
diff --git a/src/lib/download-clients/__tests__/client-parse.test.ts b/src/lib/download-clients/__tests__/client-parse.test.ts
new file mode 100644
index 00000000..5c085a3a
--- /dev/null
+++ b/src/lib/download-clients/__tests__/client-parse.test.ts
@@ -0,0 +1,205 @@
+// src/lib/download-clients/__tests__/client-parse.test.ts
+
+import { describe, expect, it, vi } from "vitest"
+import { parseCachedTorrents } from "../qbt/transport"
+
+// Silence the warn calls that parseCachedTorrents makes on failure paths
+vi.mock("@/lib/logger", () => ({
+  log: {
+    warn: vi.fn(),
+    info: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  },
+}))
+
+// ---------------------------------------------------------------------------
+// Minimal valid QbtTorrent fixture
+// isQbtTorrent checks: hash (string), name (string), state (string), size (number), ratio (number)
+// ---------------------------------------------------------------------------
+
+const VALID_TORRENT = {
+  hash: "abc123def456",
+  name: "Test.Torrent.2024",
+  state: "uploading",
+  size: 5_000_000_000,
+  ratio: 2.0,
+  // Additional fields that the real API returns (not checked by isQbtTorrent)
+  tags: "aither",
+  category: "movies",
+  upspeed: 1024,
+  dlspeed: 0,
+  uploaded: 2_000_000_000,
+  downloaded: 1_000_000_000,
+  num_seeds: 10,
+  num_leechs: 2,
+  num_complete: 50,
+  num_incomplete: 5,
+  added_on: 1700000000,
+  completion_on: 1700003600,
+  last_activity: 1700090000,
+  seeding_time: 86400,
+  time_active: 90000,
+  seen_complete: 1700003600,
+  availability: 1.0,
+  amount_left: 0,
+  progress: 1.0,
+  tracker: "https://tracker.example.com/announce",
+  content_path: "/data/movies/test",
+  save_path: "/data/movies",
+}
+
+const VALID_TORRENT_2 = {
+  ...VALID_TORRENT,
+  hash: "def456abc123",
+  name: "Another.Torrent.2024",
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("parseCachedTorrents", () => {
+  describe("falsy inputs", () => {
+    it("returns [] for null input", () => {
+      expect(parseCachedTorrents(null)).toEqual([])
+    })
+
+    it("returns [] for undefined input", () => {
+      expect(parseCachedTorrents(undefined)).toEqual([])
+    })
+
+    it("returns [] for false input", () => {
+      expect(parseCachedTorrents(false)).toEqual([])
+    })
+
+    it("returns [] for empty string", () => {
+      // empty string is falsy, caught by the !raw guard
+      expect(parseCachedTorrents("")).toEqual([])
+    })
+  })
+
+  describe("empty array", () => {
+    it("returns [] for a pre-parsed empty array", () => {
+      expect(parseCachedTorrents([])).toEqual([])
+    })
+
+    it("returns [] for a JSON string of an empty array", () => {
+      expect(parseCachedTorrents("[]")).toEqual([])
+    })
+  })
+
+  describe("valid pre-parsed array", () => {
+    it("returns the array when given a valid pre-parsed array with one torrent", () => {
+      const result = parseCachedTorrents([VALID_TORRENT])
+      expect(result).toHaveLength(1)
+      expect(result[0].hash).toBe("abc123def456")
+    })
+
+    it("returns all elements when the first element passes isQbtTorrent", () => {
+      // Only the first element is validated; the rest pass through
+      const result = parseCachedTorrents([VALID_TORRENT, VALID_TORRENT_2])
+      expect(result).toHaveLength(2)
+    })
+  })
+
+  describe("valid JSON string", () => {
+    it("parses a JSON string containing a valid torrent array", () => {
+      const json = JSON.stringify([VALID_TORRENT])
+      const result = parseCachedTorrents(json)
+      expect(result).toHaveLength(1)
+      expect(result[0].hash).toBe("abc123def456")
+    })
+
+    it("returns all elements when JSON string contains multiple torrents", () => {
+      const json = JSON.stringify([VALID_TORRENT, VALID_TORRENT_2])
+      const result = parseCachedTorrents(json)
+      expect(result).toHaveLength(2)
+    })
+  })
+
+  describe("invalid JSON string", () => {
+    it("returns [] for a JSON string of a non-array object (object root)", () => {
+      const json = JSON.stringify({ hash: "abc", name: "x", state: "uploading" })
+      expect(parseCachedTorrents(json)).toEqual([])
+    })
+
+    it("returns [] for malformed JSON string", () => {
+      expect(parseCachedTorrents("{not valid json}")).toEqual([])
+    })
+
+    it("returns [] for a JSON string of a plain number", () => {
+      expect(parseCachedTorrents("42")).toEqual([])
+    })
+
+    it("returns [] for a JSON string of null", () => {
+      // JSON.parse("null") = null, which is not an array
+      expect(parseCachedTorrents("null")).toEqual([])
+    })
+  })
+
+  describe("isQbtTorrent validation failure", () => {
+    it("returns [] when first element is missing hash field", () => {
+      const bad = { name: "Test", state: "uploading", size: 100, ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element is missing name field", () => {
+      const bad = { hash: "abc", state: "uploading", size: 100, ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element is missing state field", () => {
+      const bad = { hash: "abc", name: "Test", size: 100, ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element is missing size field", () => {
+      const bad = { hash: "abc", name: "Test", state: "uploading", ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element is missing ratio field", () => {
+      const bad = { hash: "abc", name: "Test", state: "uploading", size: 100 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element has non-string hash", () => {
+      const bad = { hash: 123, name: "Test", state: "uploading", size: 100, ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element has non-number size", () => {
+      const bad = { hash: "abc", name: "Test", state: "uploading", size: "100", ratio: 1.0 }
+      expect(parseCachedTorrents([bad])).toEqual([])
+    })
+
+    it("returns [] when first element is null", () => {
+      expect(parseCachedTorrents([null])).toEqual([])
+    })
+
+    it("returns [] when first element is a plain string", () => {
+      expect(parseCachedTorrents(["not-an-object"])).toEqual([])
+    })
+  })
+
+  describe("non-array non-string inputs", () => {
+    it("returns [] for a plain object input (not array, not string)", () => {
+      expect(parseCachedTorrents({ hash: "abc", name: "x" })).toEqual([])
+    })
+
+    it("returns [] for a number input", () => {
+      expect(parseCachedTorrents(42)).toEqual([])
+    })
+  })
+
+  describe("only first element checked", () => {
+    it("returns all elements when first is valid, even if later elements are malformed", () => {
+      // parseCachedTorrents only validates index 0 — subsequent items pass through unchecked
+      const malformed = { hash: "bad", missing_name: true }
+      const result = parseCachedTorrents([VALID_TORRENT, malformed])
+      expect(result).toHaveLength(2)
+      expect(result[0].hash).toBe("abc123def456")
+    })
+  })
+})
diff --git a/src/lib/download-clients/__tests__/coordinator.test.ts b/src/lib/download-clients/__tests__/coordinator.test.ts
new file mode 100644
index 00000000..0a837c8e
--- /dev/null
+++ b/src/lib/download-clients/__tests__/coordinator.test.ts
@@ -0,0 +1,1143 @@
+// src/lib/download-clients/__tests__/coordinator.test.ts
+//
+// Functions:
+//   makeTracker           - Build a minimal tracker row for DB mock returns
+//   makeFetchClient       - Build a client row with credential columns (FETCH_CLIENT_COLUMNS shape)
+//   makeCachedClient      - Build a client row for cached reads (CACHED_CLIENT_COLUMNS shape)
+//   makeCachedClientFull  - Build a client row for fetchTrackerTorrentsCached (includes cachedTorrents)
+//   makeTorrent           - Build a minimal TorrentRecord for tests
+//   makeSlimTorrent       - Build a SlimTorrent for tests
+//   makeEmptyAggregation  - Build an empty FleetAggregation for mocked returns
+
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+// ---------------------------------------------------------------------------
+// Module mocks (must be before any imports from the module under test)
+// ---------------------------------------------------------------------------
+
+vi.mock("server-only", () => ({}))
+
+// Drizzle operators: just pass-through identity stubs
+vi.mock("drizzle-orm", () => ({
+  eq: vi.fn((...args: unknown[]) => ({ type: "eq", args })),
+  isNotNull: vi.fn((col: unknown) => ({ type: "isNotNull", col })),
+}))
+
+// DB mock
+const mockSelect = vi.fn()
+
+vi.mock("@/lib/db", () => ({
+  db: { select: (...args: unknown[]) => mockSelect(...args) },
+}))
+
+vi.mock("@/lib/db/schema", () => ({
+  trackers: {
+    id: "trackers.id",
+    name: "trackers.name",
+    qbtTag: "trackers.qbtTag",
+    color: "trackers.color",
+    isActive: "trackers.isActive",
+  },
+  downloadClients: {
+    id: "downloadClients.id",
+    name: "downloadClients.name",
+    host: "downloadClients.host",
+    port: "downloadClients.port",
+    useSsl: "downloadClients.useSsl",
+    enabled: "downloadClients.enabled",
+    encryptedUsername: "downloadClients.encryptedUsername",
+    encryptedPassword: "downloadClients.encryptedPassword",
+    crossSeedTags: "downloadClients.crossSeedTags",
+    cachedTorrents: "downloadClients.cachedTorrents",
+    cachedTorrentsAt: "downloadClients.cachedTorrentsAt",
+  },
+}))
+
+vi.mock("@/lib/fleet", () => ({
+  parseTorrentTags: vi.fn((tags: string) =>
+    tags
+      .split(",")
+      .map((t: string) => t.trim().toLowerCase())
+      .filter(Boolean)
+  ),
+}))
+
+vi.mock("@/lib/fleet-aggregation", () => ({
+  computeFleetAggregation: vi.fn(() => makeEmptyAggregation()),
+}))
+
+vi.mock("../credentials", () => ({
+  CLIENT_CONNECTION_COLUMNS: {
+    name: "downloadClients.name",
+    host: "downloadClients.host",
+    port: "downloadClients.port",
+    useSsl: "downloadClients.useSsl",
+    encryptedUsername: "downloadClients.encryptedUsername",
+    encryptedPassword: "downloadClients.encryptedPassword",
+  },
+}))
+
+vi.mock("../fetch", () => ({
+  fetchAndMergeTorrents: vi.fn(),
+  stripSensitiveTorrentFields: vi.fn((t: Record<string, unknown>) => {
+    const { tracker: _t, contentPath: _cp, savePath: _sp, ...rest } = t
+    return rest
+  }),
+}))
+
+vi.mock("../merge", () => ({
+  mergeTorrentLists: vi.fn((lists: unknown[][]) => lists.flat()),
+  stampClientNames: vi.fn(
+    (
+      clientTorrents: { clientName: string; torrents: { hash: string }[] }[],
+      merged: { hash: string }[]
+    ) => {
+      const hashClients = new Map<string, string[]>()
+      for (const { clientName, torrents } of clientTorrents) {
+        for (const t of torrents) {
+          const names = hashClients.get(t.hash) ?? []
+          names.push(clientName)
+          hashClients.set(t.hash, names)
+        }
+      }
+      return merged.map((t) => ({
+        ...t,
+        clientName: (hashClients.get(t.hash) ?? []).join(", "),
+      }))
+    }
+  ),
+  aggregateCrossSeedTags: vi.fn((clients: { crossSeedTags: string[] }[]) => {
+    const tagSet = new Set<string>()
+    for (const c of clients) {
+      for (const tag of c.crossSeedTags) tagSet.add(tag)
+    }
+    return [...tagSet]
+  }),
+}))
+
+vi.mock("../sync-store", () => ({
+  STORE_MAX_AGE_MS: 10 * 60 * 1000,
+  isStoreFresh: vi.fn(() => false),
+  getFilteredTorrents: vi.fn(() => []),
+}))
+
+vi.mock("../transforms", () => ({
+  parseCrossSeedTags: vi.fn((raw: string[] | null) => raw ?? []),
+  slimTorrentForCache: vi.fn((t: unknown) => t),
+}))
+
+vi.mock("../qbt/transport", () => ({
+  buildBaseUrl: vi.fn(
+    (host: string, port: number, ssl: boolean) => `${ssl ? "https" : "http"}://${host}:${port}`
+  ),
+  parseCachedTorrents: vi.fn(() => []),
+}))
+
+// ---------------------------------------------------------------------------
+// Re-import mocked modules for assertions
+// ---------------------------------------------------------------------------
+
+import type { TorrentRecord } from "@/lib/download-clients"
+import { parseTorrentTags } from "@/lib/fleet"
+import { computeFleetAggregation } from "@/lib/fleet-aggregation"
+// Import module under test (after all mocks are registered)
+import {
+  fetchFleetAggregation,
+  fetchFleetTorrents,
+  fetchTrackerTorrents,
+  fetchTrackerTorrentsCached,
+} from "../coordinator"
+import { fetchAndMergeTorrents } from "../fetch"
+import { aggregateCrossSeedTags, mergeTorrentLists, stampClientNames } from "../merge"
+import { buildBaseUrl, parseCachedTorrents } from "../qbt/transport"
+import { getFilteredTorrents, isStoreFresh } from "../sync-store"
+import { slimTorrentForCache } from "../transforms"
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function makeTracker(overrides: { qbtTag?: string | null; name?: string; color?: string } = {}) {
+  return {
+    qbtTag: "aither",
+    name: "Aither",
+    color: "#00d4ff",
+    ...overrides,
+  }
+}
+
+function makeFetchClient(
+  overrides: Partial<{
+    name: string
+    host: string
+    port: number
+    useSsl: boolean
+    encryptedUsername: string
+    encryptedPassword: string
+    crossSeedTags: string[] | null
+  }> = {}
+) {
+  return {
+    name: "Home qBT",
+    host: "localhost",
+    port: 8080,
+    useSsl: false,
+    encryptedUsername: "enc-admin",
+    encryptedPassword: "enc-pass",
+    crossSeedTags: null,
+    ...overrides,
+  }
+}
+
+function makeCachedClient(
+  overrides: Partial<{
+    id: number
+    name: string
+    host: string
+    port: number
+    useSsl: boolean
+    crossSeedTags: string[] | null
+    cachedTorrentsAt: Date | null
+  }> = {}
+) {
+  return {
+    id: 1,
+    name: "Home qBT",
+    host: "localhost",
+    port: 8080,
+    useSsl: false,
+    crossSeedTags: null,
+    cachedTorrentsAt: new Date("2026-04-01T12:00:00Z"),
+    ...overrides,
+  }
+}
+
+function makeCachedClientFull(
+  overrides: Partial<{
+    id: number
+    name: string
+    cachedTorrents: unknown
+    cachedTorrentsAt: Date | null
+    crossSeedTags: string[] | null
+  }> = {}
+) {
+  return {
+    id: 1,
+    name: "Home qBT",
+    cachedTorrents: null,
+    cachedTorrentsAt: new Date("2026-04-01T12:00:00Z"),
+    crossSeedTags: null,
+    ...overrides,
+  }
+}
+
+function makeTorrent(hash: string, overrides: Partial<TorrentRecord> = {}): TorrentRecord {
+  return {
+    hash,
+    name: `Torrent ${hash}`,
+    state: "stalledUP",
+    tags: "aither",
+    category: "movies",
+    uploadSpeed: 0,
+    downloadSpeed: 0,
+    uploaded: 1000,
+    downloaded: 500,
+    ratio: 2.0,
+    size: 1_000_000,
+    seedCount: 5,
+    leechCount: 1,
+    swarmSeeders: 10,
+    swarmLeechers: 2,
+    tracker: "https://tracker.example.com/announce",
+    addedAt: 1700000000,
+    completedAt: 1700001000,
+    lastActivityAt: 1700002000,
+    seedingTime: 86400,
+    activeTime: 86400,
+    lastSeenComplete: 1700001500,
+    availability: 1.0,
+    remaining: 0,
+    progress: 1.0,
+    contentPath: "/data/movies/torrent",
+    savePath: "/data/movies",
+    ...overrides,
+  }
+}
+
+function _makeSlimTorrent(hash: string, overrides: Partial<TorrentRecord> = {}) {
+  const t = makeTorrent(hash, overrides)
+  return {
+    hash: t.hash,
+    name: t.name,
+    state: t.state,
+    tags: t.tags,
+    category: t.category,
+    uploaded: t.uploaded,
+    downloaded: t.downloaded,
+    ratio: t.ratio,
+    size: t.size,
+    seedingTime: t.seedingTime,
+    activeTime: t.activeTime,
+    addedAt: t.addedAt,
+    completedAt: t.completedAt,
+    lastActivityAt: t.lastActivityAt,
+    remaining: t.remaining,
+    seedCount: t.seedCount,
+    leechCount: t.leechCount,
+    swarmSeeders: t.swarmSeeders,
+    swarmLeechers: t.swarmLeechers,
+    uploadSpeed: t.uploadSpeed,
+    downloadSpeed: t.downloadSpeed,
+    availability: t.availability,
+    progress: t.progress,
+  }
+}
+
+function makeEmptyAggregation() {
+  return {
+    stats: {
+      torrentCount: 0,
+      totalUploaded: 0,
+      totalDownloaded: 0,
+      avgRatio: 0,
+      seedingCount: 0,
+      leechingCount: 0,
+      uploadSpeed: 0,
+      downloadSpeed: 0,
+      totalSize: 0,
+    },
+    ratioDistribution: [],
+    seedTimeDistribution: [],
+    crossSeed: { crossSeeded: 0, unique: 0, total: 0 },
+    activityGrid: { data: [], maxCount: 0 },
+    trackerHealth: [],
+    storageByTrackerCategory: [],
+    categoryBreakdown: [],
+    crossSeedNetwork: { nodes: [], edges: [] },
+    sizesByTracker: [],
+    ageTimeline: [],
+    categoryTimeline: [],
+    ageBands: [],
+  }
+}
+
+function makeKey(): Buffer {
+  return Buffer.alloc(32, 0xab)
+}
+
+// ---------------------------------------------------------------------------
+// DB mock helpers
+// ---------------------------------------------------------------------------
+
+// The coordinator makes multiple sequential db.select() calls per function.
+// We need to control what each call returns based on invocation order.
+// selectCallIndex tracks the call sequence; each test sets up the expected returns.
+
+let selectReturns: unknown[][]
+let selectCallIndex: number
+
+/**
+ * Set up sequential db.select() return values. Each entry in the array
+ * corresponds to one db.select() invocation in call order.
+ * Each entry is an array of row objects that the query chain resolves to.
+ */
+function setupDbReturns(returns: unknown[][]) {
+  selectReturns = returns
+  selectCallIndex = 0
+
+  mockSelect.mockImplementation((..._args: unknown[]) => {
+    const rows = selectReturns[selectCallIndex] ?? []
+    selectCallIndex++
+
+    const chain = {
+      from: vi.fn().mockReturnValue({
+        where: vi.fn().mockImplementation(() => {
+          // Return rows directly (for queries without .limit())
+          // AND as an object with .limit() (for queries that chain .limit())
+          const result = Object.assign(Promise.resolve(rows), {
+            limit: vi.fn().mockResolvedValue(rows),
+          })
+          return result
+        }),
+      }),
+    }
+    return chain
+  })
+}
+
+// ---------------------------------------------------------------------------
+// Tests: fetchFleetTorrents
+// ---------------------------------------------------------------------------
+
+describe("fetchFleetTorrents", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("should query active trackers and enabled clients in parallel", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    // Call 0: trackers query, Call 1: clients query (parallel via Promise.all)
+    setupDbReturns([[{ qbtTag: "aither" }, { qbtTag: "blutopia" }], [makeFetchClient()]])
+
+    await fetchFleetTorrents(makeKey())
+
+    // db.select was called twice (once for trackers, once for clients)
+    expect(mockSelect).toHaveBeenCalledTimes(2)
+  })
+
+  it("should collect and deduplicate tags from all active trackers", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([
+      [{ qbtTag: "aither" }, { qbtTag: "aither" }, { qbtTag: "blutopia" }],
+      [makeFetchClient()],
+    ])
+
+    await fetchFleetTorrents(makeKey())
+
+    // fetchAndMergeTorrents receives deduplicated tags
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither", "blutopia"], // deduplicated
+      expect.any(Buffer),
+      undefined
+    )
+  })
+
+  it("should filter out null and empty tags", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([
+      [{ qbtTag: null }, { qbtTag: "" }, { qbtTag: "  " }, { qbtTag: "aither" }],
+      [makeFetchClient()],
+    ])
+
+    await fetchFleetTorrents(makeKey())
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither"],
+      expect.any(Buffer),
+      undefined
+    )
+  })
+
+  it("should trim whitespace from tags", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([[{ qbtTag: "  aither  " }, { qbtTag: "blutopia " }], [makeFetchClient()]])
+
+    await fetchFleetTorrents(makeKey())
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither", "blutopia"],
+      expect.any(Buffer),
+      undefined
+    )
+  })
+
+  it("should pass the filter parameter through to fetchAndMergeTorrents", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeFetchClient()]])
+
+    await fetchFleetTorrents(makeKey(), "active")
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither"],
+      expect.any(Buffer),
+      "active"
+    )
+  })
+
+  it("should pass all enabled clients to fetchAndMergeTorrents", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 2,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    const client1 = makeFetchClient({ name: "Client A" })
+    const client2 = makeFetchClient({ name: "Client B" })
+
+    setupDbReturns([[{ qbtTag: "aither" }], [client1, client2]])
+
+    await fetchFleetTorrents(makeKey())
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      [client1, client2],
+      expect.any(Array),
+      expect.any(Buffer),
+      undefined
+    )
+  })
+
+  it("should return the MergedResult from fetchAndMergeTorrents directly", async () => {
+    const mergedResult = {
+      torrents: [{ hash: "abc", clientName: "Home qBT" }],
+      crossSeedTags: ["cross-seed"],
+      clientErrors: [],
+      clientCount: 1,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult as never)
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeFetchClient()]])
+
+    const result = await fetchFleetTorrents(makeKey())
+    expect(result).toBe(mergedResult)
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Tests: fetchTrackerTorrents
+// ---------------------------------------------------------------------------
+
+describe("fetchTrackerTorrents", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("should return 404 when tracker is not found", async () => {
+    setupDbReturns([
+      [], // tracker lookup returns nothing
+    ])
+
+    const result = await fetchTrackerTorrents(999, makeKey())
+
+    expect(result).toEqual({ error: "Tracker not found", status: 404 })
+  })
+
+  it("should return 400 when tracker has no qbtTag", async () => {
+    setupDbReturns([[{ qbtTag: null }]])
+
+    const result = await fetchTrackerTorrents(1, makeKey())
+
+    expect(result).toEqual({
+      error: "No qBittorrent tag configured for this tracker",
+      status: 400,
+    })
+  })
+
+  it("should query enabled clients and call fetchAndMergeTorrents with the single tag", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 1,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    const client = makeFetchClient()
+    setupDbReturns([
+      [{ qbtTag: "aither" }], // tracker lookup
+      [client], // clients query
+    ])
+
+    const result = await fetchTrackerTorrents(1, makeKey())
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      [client],
+      ["aither"],
+      expect.any(Buffer),
+      undefined
+    )
+    expect(result).toEqual({ result: mergedResult })
+  })
+
+  it("should trim the qbtTag before passing to fetchAndMergeTorrents", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([[{ qbtTag: "  aither  " }], []])
+
+    await fetchTrackerTorrents(1, makeKey())
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither"],
+      expect.any(Buffer),
+      undefined
+    )
+  })
+
+  it("should pass the filter parameter through", async () => {
+    const mergedResult = {
+      torrents: [],
+      crossSeedTags: [],
+      clientErrors: [],
+      clientCount: 0,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult)
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeFetchClient()]])
+
+    await fetchTrackerTorrents(1, makeKey(), "active")
+
+    expect(fetchAndMergeTorrents).toHaveBeenCalledWith(
+      expect.any(Array),
+      ["aither"],
+      expect.any(Buffer),
+      "active"
+    )
+  })
+
+  it("should wrap successful result in { result: ... }", async () => {
+    const mergedResult = {
+      torrents: [{ hash: "t1", clientName: "Home qBT" }],
+      crossSeedTags: [],
+      clientErrors: ["Client B: timeout"],
+      clientCount: 2,
+      sessionExpired: false,
+    }
+    vi.mocked(fetchAndMergeTorrents).mockResolvedValue(mergedResult as never)
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeFetchClient()]])
+
+    const result = await fetchTrackerTorrents(1, makeKey())
+
+    expect(result).toEqual({ result: mergedResult })
+    expect(result).not.toHaveProperty("error")
+    expect(result).not.toHaveProperty("status")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Tests: fetchFleetAggregation
+// ---------------------------------------------------------------------------
+
+describe("fetchFleetAggregation", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+    vi.mocked(parseCachedTorrents).mockReturnValue([])
+  })
+
+  it("should return empty aggregation with zero clientCount when no enabled clients", async () => {
+    setupDbReturns([
+      [], // clients query returns nothing
+    ])
+
+    const result = await fetchFleetAggregation()
+
+    expect(computeFleetAggregation).toHaveBeenCalledWith([], [], [])
+    expect(result.clientCount).toBe(0)
+    expect(result.clientErrors).toEqual([])
+    expect(result.cachedAt).toBeNull()
+  })
+
+  it("should query tracker tag metadata when clients exist", async () => {
+    setupDbReturns([
+      [makeCachedClient()], // clients
+      [makeTracker({ qbtTag: "aither", name: "Aither", color: "#00d4ff" })], // trackerTagRows
+      [{ cachedTorrents: null }], // DB fallback for client
+    ])
+
+    await fetchFleetAggregation()
+
+    // At least 2 db.select calls: one for clients, one for trackerTagRows
+    expect(mockSelect).toHaveBeenCalledTimes(3)
+  })
+
+  it("should use sync store fast path when store is fresh", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([[makeCachedClient()], [makeTracker()]])
+
+    await fetchFleetAggregation()
+
+    expect(isStoreFresh).toHaveBeenCalledWith("http://localhost:8080", expect.any(Number))
+    expect(getFilteredTorrents).toHaveBeenCalledWith("http://localhost:8080", expect.any(Function))
+  })
+
+  it("should fall back to Postgres JSONB when store is stale", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    vi.mocked(parseCachedTorrents).mockReturnValue([])
+
+    setupDbReturns([
+      [makeCachedClient()],
+      [makeTracker()],
+      [{ cachedTorrents: "[]" }], // DB fallback query
+    ])
+
+    await fetchFleetAggregation()
+
+    // parseCachedTorrents called for the DB fallback
+    expect(parseCachedTorrents).toHaveBeenCalled()
+    // getFilteredTorrents should NOT have been called (store is stale)
+    expect(getFilteredTorrents).not.toHaveBeenCalled()
+  })
+
+  it("should slim torrents from sync store via slimTorrentForCache", async () => {
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([[makeCachedClient()], [makeTracker()]])
+
+    await fetchFleetAggregation()
+
+    // slimTorrentForCache is called via .map(), so it receives (element, index, array)
+    expect(slimTorrentForCache).toHaveBeenCalled()
+    expect(vi.mocked(slimTorrentForCache).mock.calls[0][0]).toEqual(torrent)
+  })
+
+  it("should call mergeTorrentLists and stampClientNames with collected data", async () => {
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([[makeCachedClient({ name: "My Client" })], [makeTracker()]])
+
+    await fetchFleetAggregation()
+
+    expect(mergeTorrentLists).toHaveBeenCalled()
+    expect(stampClientNames).toHaveBeenCalled()
+  })
+
+  it("should pass trackerTagsWithMeta and crossSeedTags to computeFleetAggregation", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([
+      [makeCachedClient({ crossSeedTags: ["cross-seed"] })],
+      [makeTracker({ qbtTag: "aither", name: "Aither", color: "#ff0000" })],
+    ])
+
+    await fetchFleetAggregation()
+
+    expect(computeFleetAggregation).toHaveBeenCalledWith(
+      expect.any(Array), // stamped torrents
+      [{ tag: "aither", name: "Aither", color: "#ff0000" }],
+      expect.any(Array) // crossSeedTags
+    )
+  })
+
+  it("should use default color #01d4ff when tracker color is null", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([
+      [makeCachedClient()],
+      [makeTracker({ qbtTag: "aither", name: "Aither", color: null as unknown as string })],
+    ])
+
+    await fetchFleetAggregation()
+
+    expect(computeFleetAggregation).toHaveBeenCalledWith(
+      expect.any(Array),
+      [{ tag: "aither", name: "Aither", color: "#01d4ff" }],
+      expect.any(Array)
+    )
+  })
+
+  it("should return correct clientCount matching the number of enabled clients", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([[makeCachedClient({ id: 1 }), makeCachedClient({ id: 2 })], [makeTracker()]])
+
+    const result = await fetchFleetAggregation()
+
+    expect(result.clientCount).toBe(2)
+  })
+
+  it("should track the oldest cachedTorrentsAt across clients", async () => {
+    const olderDate = new Date("2026-03-01T12:00:00Z")
+    const newerDate = new Date("2026-04-01T12:00:00Z")
+
+    const torrent1 = makeTorrent("h1", { tags: "aither" })
+    const torrent2 = makeTorrent("h2", { tags: "aither" })
+
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+
+    // getFilteredTorrents will be called for each client; return a torrent each time
+    // so the client contributes to clientTorrents (otherwise it's skipped)
+    vi.mocked(getFilteredTorrents).mockReturnValueOnce([torrent1]).mockReturnValueOnce([torrent2])
+
+    vi.mocked(buildBaseUrl)
+      .mockReturnValueOnce("http://client1:8080")
+      .mockReturnValueOnce("http://client2:8080")
+
+    setupDbReturns([
+      [
+        makeCachedClient({ id: 1, name: "Old", host: "client1", cachedTorrentsAt: olderDate }),
+        makeCachedClient({ id: 2, name: "New", host: "client2", cachedTorrentsAt: newerDate }),
+      ],
+      [makeTracker()],
+    ])
+
+    const result = await fetchFleetAggregation()
+
+    expect(result.cachedAt).toBe(olderDate.toISOString())
+  })
+
+  it("should return null cachedAt when no client has cachedTorrentsAt", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([[makeCachedClient({ cachedTorrentsAt: null })], [makeTracker()]])
+
+    const result = await fetchFleetAggregation()
+
+    expect(result.cachedAt).toBeNull()
+  })
+
+  it("should skip clients with zero torrents from the clientTorrents array", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([]) // no torrents
+
+    setupDbReturns([[makeCachedClient()], [makeTracker()]])
+
+    await fetchFleetAggregation()
+
+    // mergeTorrentLists receives an empty array of lists (client was skipped)
+    expect(mergeTorrentLists).toHaveBeenCalledWith([])
+  })
+
+  it("should report clientErrors when a client with cachedTorrentsAt returns 0 torrents", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    setupDbReturns([[makeCachedClient()], [makeTracker()]])
+
+    const result = await fetchFleetAggregation()
+
+    expect(result.clientErrors).toEqual(["Home qBT: cached data unavailable or corrupt"])
+  })
+
+  it("should build the correct allTags set from trackers and crossSeedTags", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+
+    // The tag predicate uses allTags to filter. We can verify it works by
+    // having getFilteredTorrents invoke the predicate.
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => {
+        const t1 = makeTorrent("h1", { tags: "aither" })
+        const t2 = makeTorrent("h2", { tags: "cross-seed" })
+        const t3 = makeTorrent("h3", { tags: "untracked" })
+        return [t1, t2, t3].filter(pred)
+      }
+    )
+
+    setupDbReturns([
+      [makeCachedClient({ crossSeedTags: ["cross-seed"] })],
+      [makeTracker({ qbtTag: "aither" })],
+    ])
+
+    await fetchFleetAggregation()
+
+    // The predicate should match "aither" and "cross-seed" but not "untracked"
+    // mergeTorrentLists should receive 2 torrents (h1 and h2)
+    const mergeCall = vi.mocked(mergeTorrentLists).mock.calls[0]
+    const flatTorrents = (mergeCall[0] as { hash: string }[][]).flat()
+    const hashes = flatTorrents.map((t) => t.hash)
+    expect(hashes).toContain("h1")
+    expect(hashes).toContain("h2")
+    expect(hashes).not.toContain("h3")
+  })
+})
+
+// ---------------------------------------------------------------------------
+// Tests: fetchTrackerTorrentsCached
+// ---------------------------------------------------------------------------
+
+describe("fetchTrackerTorrentsCached", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(parseCachedTorrents).mockReturnValue([])
+  })
+
+  it("should return 404 when tracker is not found", async () => {
+    setupDbReturns([
+      [], // tracker lookup returns nothing
+    ])
+
+    const result = await fetchTrackerTorrentsCached(999)
+
+    expect(result).toEqual({ error: "Tracker not found", status: 404 })
+  })
+
+  it("should return 400 when tracker has no qbtTag", async () => {
+    setupDbReturns([[{ qbtTag: null }]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    expect(result).toEqual({ error: "No qBittorrent tag configured", status: 400 })
+  })
+
+  it("should return empty result when no enabled clients exist", async () => {
+    setupDbReturns([
+      [{ qbtTag: "aither" }], // tracker found
+      [], // no clients
+    ])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    expect(result).toEqual({
+      result: {
+        torrents: [],
+        crossSeedTags: [],
+        clientErrors: [],
+        clientCount: 0,
+        cachedAt: null,
+      },
+    })
+  })
+
+  it("should parse cached torrents from each client and filter by tracker tag", async () => {
+    const matchTorrent = makeTorrent("match", { tags: "aither" })
+    const noMatchTorrent = makeTorrent("nomatch", { tags: "blutopia" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([matchTorrent, noMatchTorrent])
+
+    setupDbReturns([
+      [{ qbtTag: "aither" }],
+      [makeCachedClientFull({ cachedTorrents: "cached-json" })],
+    ])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    expect(parseCachedTorrents).toHaveBeenCalledWith("cached-json")
+    expect(parseTorrentTags).toHaveBeenCalled()
+
+    // Should only include the matching torrent
+    expect("result" in result).toBe(true)
+    if ("result" in result) {
+      // The merge mock flattens; stampClientNames adds clientName;
+      // stripSensitiveTorrentFields removes tracker/contentPath/savePath
+      expect(result.result.torrents.length).toBeGreaterThanOrEqual(1)
+      const hashes = result.result.torrents.map((t) => t.hash)
+      expect(hashes).toContain("match")
+      expect(hashes).not.toContain("nomatch")
+    }
+  })
+
+  it("should trim and lowercase the qbtTag for case-insensitive matching", async () => {
+    const torrent = makeTorrent("h1", { tags: "Aither" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([torrent])
+
+    // parseTorrentTags returns lowercase tags (as the mock does)
+    // The coordinator trims and lowercases the tag before comparing
+    setupDbReturns([[{ qbtTag: "  Aither  " }], [makeCachedClientFull()]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    expect("result" in result).toBe(true)
+    if ("result" in result) {
+      expect(result.result.torrents.length).toBe(1)
+    }
+  })
+
+  it("should skip clients whose cached torrents are all empty after parse", async () => {
+    vi.mocked(parseCachedTorrents).mockReturnValue([])
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeCachedClientFull()]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    // No clientTorrents contributed, so merge gets empty input
+    expect(mergeTorrentLists).toHaveBeenCalledWith([])
+    if ("result" in result) {
+      expect(result.result.clientCount).toBe(1) // still counted
+    }
+  })
+
+  it("should collect crossSeedTags from all clients with parsed torrents", async () => {
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([
+      [{ qbtTag: "aither" }],
+      [
+        makeCachedClientFull({ id: 1, crossSeedTags: ["cross-seed-a"] }),
+        makeCachedClientFull({ id: 2, crossSeedTags: ["cross-seed-b"] }),
+      ],
+    ])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    expect(aggregateCrossSeedTags).toHaveBeenCalled()
+    if ("result" in result) {
+      expect(result.result.crossSeedTags).toEqual(
+        expect.arrayContaining(["cross-seed-a", "cross-seed-b"])
+      )
+    }
+  })
+
+  it("should not expose tracker, contentPath, or savePath on returned torrents", async () => {
+    // parseCachedTorrents returns SlimTorrent objects which were stripped of sensitive fields
+    // at cache-write time. Use a slim fixture (no tracker/contentPath/savePath) to match
+    // the real shape of what comes out of the JSONB cache.
+    const slimTorrent = {
+      hash: "h1",
+      name: "Test.mkv",
+      state: "uploading",
+      tags: "aither",
+      category: "movies",
+      uploaded: 1000,
+      downloaded: 500,
+      ratio: 2.0,
+      size: 1_000_000,
+      seedingTime: 86400,
+      activeTime: 86400,
+      addedAt: 1700000000,
+      completedAt: 1700001000,
+      lastActivityAt: 1700002000,
+      remaining: 0,
+      seedCount: 5,
+      leechCount: 1,
+      swarmSeeders: 10,
+      swarmLeechers: 2,
+      uploadSpeed: 0,
+      downloadSpeed: 0,
+      availability: 1.0,
+      progress: 1.0,
+    }
+    vi.mocked(parseCachedTorrents).mockReturnValue([slimTorrent] as never)
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeCachedClientFull({ name: "Client A" })]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.torrents).toHaveLength(1)
+      for (const t of result.result.torrents) {
+        expect(t).not.toHaveProperty("tracker")
+        expect(t).not.toHaveProperty("contentPath")
+        expect(t).not.toHaveProperty("savePath")
+        expect(t).toHaveProperty("hash", "h1")
+      }
+    }
+  })
+
+  it("should track the oldest cachedTorrentsAt across clients", async () => {
+    const olderDate = new Date("2026-01-15T00:00:00Z")
+    const newerDate = new Date("2026-04-01T00:00:00Z")
+
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([
+      [{ qbtTag: "aither" }],
+      [
+        makeCachedClientFull({ id: 1, name: "Old", cachedTorrentsAt: olderDate }),
+        makeCachedClientFull({ id: 2, name: "New", cachedTorrentsAt: newerDate }),
+      ],
+    ])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.cachedAt).toBe(olderDate.toISOString())
+    }
+  })
+
+  it("should return null cachedAt when no clients have cachedTorrentsAt", async () => {
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeCachedClientFull({ cachedTorrentsAt: null })]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.cachedAt).toBeNull()
+    }
+  })
+
+  it("should set clientCount to the total number of enabled clients regardless of data", async () => {
+    vi.mocked(parseCachedTorrents).mockReturnValue([]) // no data from any client
+
+    setupDbReturns([
+      [{ qbtTag: "aither" }],
+      [
+        makeCachedClientFull({ id: 1 }),
+        makeCachedClientFull({ id: 2 }),
+        makeCachedClientFull({ id: 3 }),
+      ],
+    ])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.clientCount).toBe(3)
+    }
+  })
+
+  it("should always return empty clientErrors array", async () => {
+    vi.mocked(parseCachedTorrents).mockReturnValue([])
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeCachedClientFull()]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.clientErrors).toEqual([])
+    }
+  })
+
+  it("should include clientName on each returned torrent", async () => {
+    const torrent = makeTorrent("h1", { tags: "aither" })
+    vi.mocked(parseCachedTorrents).mockReturnValue([torrent])
+
+    setupDbReturns([[{ qbtTag: "aither" }], [makeCachedClientFull({ name: "My qBT" })]])
+
+    const result = await fetchTrackerTorrentsCached(1)
+
+    if ("result" in result) {
+      expect(result.result.torrents.length).toBe(1)
+      expect(result.result.torrents[0].clientName).toBe("My qBT")
+    }
+  })
+})
diff --git a/src/lib/download-clients/__tests__/factory.test.ts b/src/lib/download-clients/__tests__/factory.test.ts
new file mode 100644
index 00000000..2714fdd9
--- /dev/null
+++ b/src/lib/download-clients/__tests__/factory.test.ts
@@ -0,0 +1,55 @@
+// src/lib/download-clients/__tests__/factory.test.ts
+
+import { describe, expect, it, vi } from "vitest"
+
+vi.mock("@/lib/download-clients/qbt/transport", () => ({
+  buildBaseUrl: vi.fn(() => "http://localhost:8080"),
+  login: vi.fn(),
+  getTorrents: vi.fn(),
+  getTransferInfo: vi.fn(),
+  syncMaindata: vi.fn(),
+  invalidateSession: vi.fn(),
+  withSessionRetry: vi.fn(),
+}))
+
+vi.mock("@/lib/download-clients/credentials", () => ({
+  decryptClientCredentials: vi.fn(() => ({ username: "admin", password: "pass" })),
+}))
+
+import { createAdapterForClient } from "../factory"
+
+describe("createAdapterForClient", () => {
+  it("decrypts credentials and creates a qbittorrent adapter", () => {
+    const client = {
+      name: "Test",
+      host: "localhost",
+      port: 8080,
+      useSsl: false,
+      encryptedUsername: "enc-user",
+      encryptedPassword: "enc-pass",
+      crossSeedTags: null,
+      type: "qbittorrent",
+    }
+    const key = Buffer.alloc(32, 0xab)
+    const adapter = createAdapterForClient(client, key)
+    expect(adapter.type).toBe("qbittorrent")
+    expect(adapter.baseUrl).toBe("http://localhost:8080")
+    expect(adapter.getDeltaSync).toBeDefined()
+  })
+
+  it("throws for unsupported client type", () => {
+    const client = {
+      name: "Bad",
+      host: "localhost",
+      port: 8080,
+      useSsl: false,
+      encryptedUsername: "enc-user",
+      encryptedPassword: "enc-pass",
+      crossSeedTags: null,
+      type: "deluge",
+    }
+    expect(() => createAdapterForClient(client, Buffer.alloc(32))).toThrow(
+      /unsupported client type/i
+    )
+  })
+})
diff --git a/src/lib/download-clients/__tests__/fetch-merged.test.ts b/src/lib/download-clients/__tests__/fetch-merged.test.ts
new file mode 100644
index 00000000..acf154fb
--- /dev/null
+++ b/src/lib/download-clients/__tests__/fetch-merged.test.ts
@@ -0,0 +1,516 @@
+// src/lib/download-clients/__tests__/fetch-merged.test.ts
+//
+// Functions:
+//   makeClient  - Build a minimal DownloadClientRow for tests
+//   makeTorrent - Build a minimal TorrentRecord for tests
+
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import type { TorrentRecord } from "@/lib/download-clients"
+import { fetchAndMergeTorrents } from "../fetch"
+import type { DownloadClientRow } from "../types"
+
+// ---------------------------------------------------------------------------
+// Module mocks
+// ---------------------------------------------------------------------------
+
+vi.mock("server-only", () => ({}))
+
+const mockAdapter = {
+  type: "qbittorrent" as const,
+  baseUrl: "http://localhost:8080",
+  testConnection: vi.fn(),
+  getTorrents: vi.fn().mockResolvedValue([]),
+  getTransferInfo: vi.fn().mockResolvedValue({ uploadSpeed: 0, downloadSpeed: 0 }),
+  getDeltaSync: vi.fn(),
+  dispose: vi.fn(),
+}
+
+vi.mock("@/lib/download-clients/factory", () => ({
+  createAdapterForClient: vi.fn(() => mockAdapter),
+}))
+
+vi.mock("../qbt/transport", () => ({
+  buildBaseUrl: vi.fn(() => "http://localhost:8080"),
+}))
+
+vi.mock("../transforms", () => ({
+  parseCrossSeedTags: vi.fn((raw: string[] | null) => raw ?? []),
+}))
+
+vi.mock("../sync-store", () => ({
+  STORE_MAX_AGE_MS: 10 * 60 * 1000,
+  isStoreFresh: vi.fn(() => false),
+  getFilteredTorrents: vi.fn(() => []),
+}))
+
+// ---------------------------------------------------------------------------
+// Re-import mocked modules for assertions
+// ---------------------------------------------------------------------------
+
+import { createAdapterForClient } from "@/lib/download-clients/factory"
+import { buildBaseUrl } from "../qbt/transport"
+import { getFilteredTorrents, isStoreFresh } from "../sync-store"
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function makeClient(overrides: Partial<DownloadClientRow> = {}): DownloadClientRow {
+  return {
+    name: "Home qBT",
+    host: "localhost",
+    port: 8080,
+    useSsl: false,
+    encryptedUsername: "enc-admin",
+    encryptedPassword: "enc-pass",
+    crossSeedTags: null,
+    type: "qbittorrent",
+    ...overrides,
+  }
+}
+
+function makeTorrent(hash: string, overrides: Partial<TorrentRecord> = {}): TorrentRecord {
+  return {
+    hash,
+    name: `Torrent ${hash}`,
+    state: "stalledUP",
+    tags: "aither",
+    category: "movies",
+    uploadSpeed: 0,
+    downloadSpeed: 0,
+    uploaded: 1000,
+    downloaded: 500,
+    ratio: 2.0,
+    size: 1_000_000,
+    seedCount: 5,
+    leechCount: 1,
+    swarmSeeders: 10,
+    swarmLeechers: 2,
+    tracker: "https://tracker.example.com/announce",
+    addedAt: 1700000000,
+    completedAt: 1700001000,
+    lastActivityAt: 1700002000,
+    seedingTime: 86400,
+    activeTime: 86400,
+    lastSeenComplete: 1700001500,
+    availability: 1.0,
+    remaining: 0,
+    progress: 1.0,
+    contentPath: "/data/movies/torrent",
+    savePath: "/data/movies",
+    ...overrides,
+  }
+}
+
+function makeKey(): Buffer {
+  return Buffer.alloc(32, 0xab)
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("fetchAndMergeTorrents — early-exit cases", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    // Re-establish defaults after resetAllMocks clears them
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("returns empty result when no clients are provided", async () => {
+    const result = await fetchAndMergeTorrents([], ["aither"], makeKey())
+    expect(result.torrents).toEqual([])
+    expect(result.clientErrors).toEqual([])
+    expect(result.clientCount).toBe(0)
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+  })
+
+  it("returns empty result when no tags are provided", async () => {
+    const result = await fetchAndMergeTorrents([makeClient()], [], makeKey())
+    expect(result.torrents).toEqual([])
+    expect(result.clientErrors).toEqual([])
+    expect(result.clientCount).toBe(0)
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+  })
+})
+
+describe("fetchAndMergeTorrents — fast path (store is fresh, no filter)", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("does NOT call createAdapterForClient when store is fresh and no filter is provided", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+  })
+
+  it("serves torrents from the store when fast path is taken", async () => {
+    const storedTorrents = [
+      makeTorrent("abc1", { tags: "aither" }),
+      makeTorrent("abc2", { tags: "aither" }),
+    ]
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => storedTorrents.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+    expect(result.torrents).toHaveLength(2)
+    const hashes = result.torrents.map((t) => t.hash)
+    expect(hashes).toContain("abc1")
+    expect(hashes).toContain("abc2")
+  })
+
+  it("builds the base URL before checking store freshness", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(buildBaseUrl).toHaveBeenCalledWith("localhost", 8080, false)
+    expect(isStoreFresh).toHaveBeenCalledWith("http://localhost:8080", expect.any(Number))
+  })
+
+  it("reads stored torrents for the correct base URL", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(getFilteredTorrents).toHaveBeenCalledWith("http://localhost:8080", expect.any(Function))
+  })
+
+  it("stamps each torrent with the originating client name", async () => {
+    const stampTorrents = [makeTorrent("h1", { tags: "aither" })]
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stampTorrents.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents(
+      [makeClient({ name: "My Client" })],
+      ["aither"],
+      makeKey()
+    )
+
+    expect(result.torrents[0].clientName).toBe("My Client")
+  })
+
+  it("reports correct clientCount", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    const result = await fetchAndMergeTorrents(
+      [makeClient(), makeClient({ name: "Second" })],
+      ["aither"],
+      makeKey()
+    )
+
+    expect(result.clientCount).toBe(2)
+  })
+})
+
+describe("fetchAndMergeTorrents — fast path tag filtering", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("only returns torrents whose tags match the requested tags", async () => {
+    const stored = [
+      makeTorrent("match1", { tags: "aither" }),
+      makeTorrent("match2", { tags: "blutopia" }),
+      makeTorrent("no-match", { tags: "untracked-tag" }),
+    ]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stored.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither", "blutopia"], makeKey())
+
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+    expect(result.torrents).toHaveLength(2)
+    const hashes = result.torrents.map((t) => t.hash)
+    expect(hashes).toContain("match1")
+    expect(hashes).toContain("match2")
+    expect(hashes).not.toContain("no-match")
+  })
+
+  it("excludes torrents that have no tags", async () => {
+    const stored = [makeTorrent("has-tag", { tags: "aither" }), makeTorrent("no-tag", { tags: "" })]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stored.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(result.torrents).toHaveLength(1)
+    expect(result.torrents[0].hash).toBe("has-tag")
+  })
+
+  it("tag matching is case-insensitive", async () => {
+    const stored = [makeTorrent("h1", { tags: "Aither" }), makeTorrent("h2", { tags: "BLUTOPIA" })]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stored.filter(pred)
+    )
+
+    // Tags requested in lowercase — stored tags have mixed case
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither", "blutopia"], makeKey())
+
+    expect(createAdapterForClient).not.toHaveBeenCalled()
+    expect(result.torrents).toHaveLength(2)
+  })
+
+  it("includes torrents that match any one of multiple requested tags", async () => {
+    const stored = [
+      makeTorrent("only-aither", { tags: "aither" }),
+      makeTorrent("only-blu", { tags: "blutopia" }),
+      makeTorrent("both", { tags: "aither, blutopia" }),
+    ]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stored.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither", "blutopia"], makeKey())
+
+    expect(result.torrents).toHaveLength(3)
+  })
+
+  it("returns no torrents when none match the tags", async () => {
+    const stored = [makeTorrent("h1", { tags: "some-other-tag" })]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stored.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(result.torrents).toHaveLength(0)
+  })
+})
+
+describe("fetchAndMergeTorrents — fast path skipped when filter is present", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+    const filterBeforeEachData = [makeTorrent("h1", { tags: "aither" })]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => filterBeforeEachData.filter(pred)
+    )
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("calls createAdapterForClient instead of reading the store when filter is provided", async () => {
+    // Store is fresh but filter is present — must fall back to live fetch
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey(), "active")
+
+    expect(createAdapterForClient).toHaveBeenCalled()
+  })
+
+  it("does NOT read from getFilteredTorrents when filter bypasses the fast path", async () => {
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey(), "active")
+
+    // getFilteredTorrents should never be called when filter forces the cold path
+    expect(getFilteredTorrents).not.toHaveBeenCalled()
+  })
+
+  it("passes the filter to getTorrents on the cold path for single-tag requests", async () => {
+    mockAdapter.getTorrents.mockResolvedValue([])
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey(), "active")
+
+    expect(mockAdapter.getTorrents).toHaveBeenCalledWith({ tag: "aither", filter: "active" })
+  })
+})
+
+describe("fetchAndMergeTorrents — fast path skipped when store is stale", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("calls createAdapterForClient when the store is stale (isStoreFresh returns false)", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(createAdapterForClient).toHaveBeenCalled()
+  })
+
+  it("does NOT call getFilteredTorrents when store is stale", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(getFilteredTorrents).not.toHaveBeenCalled()
+  })
+
+  it("falls back to per-tag live fetch for a single tag", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    mockAdapter.getTorrents.mockResolvedValue([makeTorrent("live1", { tags: "aither" })])
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(mockAdapter.getTorrents).toHaveBeenCalledWith({ tag: "aither" })
+    expect(result.torrents).toHaveLength(1)
+    expect(result.torrents[0].hash).toBe("live1")
+  })
+
+  it("falls back to parallel per-tag live fetch for multiple tags", async () => {
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    mockAdapter.getTorrents
+      .mockResolvedValueOnce([makeTorrent("a1", { tags: "aither" })])
+      .mockResolvedValueOnce([makeTorrent("b1", { tags: "blutopia" })])
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither", "blutopia"], makeKey())
+
+    // Two tags → two getTorrents calls (no filter passed)
+    expect(mockAdapter.getTorrents).toHaveBeenCalledTimes(2)
+    expect(result.torrents).toHaveLength(2)
+  })
+})
+
+describe("fetchAndMergeTorrents — fast path skipped when store is uninitialized", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("calls createAdapterForClient when store has never been initialized (isStoreFresh returns false)", async () => {
+    // isStoreFresh returns false for both stale AND uninitialized stores
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+
+    await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(createAdapterForClient).toHaveBeenCalled()
+    expect(getFilteredTorrents).not.toHaveBeenCalled()
+  })
+})
+
+describe("fetchAndMergeTorrents — error handling", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+    vi.mocked(isStoreFresh).mockReturnValue(false)
+    vi.mocked(getFilteredTorrents).mockReturnValue([])
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("records a client error and does not throw when getTorrents rejects", async () => {
+    mockAdapter.getTorrents.mockRejectedValue(new Error("connect ECONNREFUSED"))
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(result.clientErrors).toHaveLength(1)
+    expect(result.torrents).toEqual([])
+  })
+
+  it("records errors per failing client while succeeding clients still contribute", async () => {
+    const goodTorrent = makeTorrent("good", { tags: "aither" })
+
+    // First call (Bad Client) fails, second call (Good Client) succeeds
+    mockAdapter.getTorrents
+      .mockRejectedValueOnce(new Error("refused"))
+      .mockResolvedValueOnce([goodTorrent])
+
+    const failClient = makeClient({ name: "Bad Client" })
+    const goodClient = makeClient({ name: "Good Client" })
+    const result = await fetchAndMergeTorrents([failClient, goodClient], ["aither"], makeKey())
+
+    expect(result.clientErrors).toHaveLength(1)
+    expect(result.clientErrors[0]).toMatch(/Bad Client/)
+    expect(result.torrents).toHaveLength(1)
+    expect(result.torrents[0].hash).toBe("good")
+  })
+
+  it("sets sessionExpired when all clients fail with decryption errors", async () => {
+    vi.mocked(createAdapterForClient).mockImplementation(() => {
+      throw new Error("decrypt credentials failed for client")
+    })
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(result.sessionExpired).toBe(true)
+    expect(result.torrents).toEqual([])
+  })
+
+  it("does not set sessionExpired when only some clients have decryption failures", async () => {
+    vi.mocked(createAdapterForClient)
+      .mockImplementationOnce(() => {
+        throw new Error("decrypt credentials failed for client")
+      })
+      .mockReturnValueOnce(mockAdapter)
+
+    mockAdapter.getTorrents.mockResolvedValue([])
+
+    const result = await fetchAndMergeTorrents(
+      [makeClient({ name: "Failing" }), makeClient({ name: "Working" })],
+      ["aither"],
+      makeKey()
+    )
+
+    expect(result.sessionExpired).toBe(false)
+  })
+})
+
+describe("fetchAndMergeTorrents — sensitive field stripping", () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(buildBaseUrl).mockReturnValue("http://localhost:8080")
+    vi.mocked(isStoreFresh).mockReturnValue(true)
+
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+    mockAdapter.getTorrents.mockResolvedValue([])
+  })
+
+  it("strips tracker, contentPath, and savePath from fast-path results", async () => {
+    const stripTorrents = [
+      makeTorrent("h1", {
+        tags: "aither",
+        tracker: "https://aither.cc/announce?passkey=SECRET",
+        contentPath: "/data/Secret.mkv",
+        savePath: "/data",
+      }),
+    ]
+    vi.mocked(getFilteredTorrents).mockImplementation(
+      (_url: string, pred: (t: TorrentRecord) => boolean) => stripTorrents.filter(pred)
+    )
+
+    const result = await fetchAndMergeTorrents([makeClient()], ["aither"], makeKey())
+
+    expect(result.torrents).toHaveLength(1)
+    expect(result.torrents[0]).not.toHaveProperty("tracker")
+    expect(result.torrents[0]).not.toHaveProperty("contentPath")
+    expect(result.torrents[0]).not.toHaveProperty("savePath")
+    expect(result.torrents[0]).toHaveProperty("hash", "h1")
+  })
+})
diff --git a/src/lib/download-clients/__tests__/field-map.test.ts b/src/lib/download-clients/__tests__/field-map.test.ts
new file mode 100644
index 00000000..38c2cb6b
--- /dev/null
+++ b/src/lib/download-clients/__tests__/field-map.test.ts
@@ -0,0 +1,96 @@
+// src/lib/download-clients/__tests__/field-map.test.ts
+
+import { describe, expect, it } from "vitest"
+import { mapQbtDelta, mapQbtTorrent } from "../field-map"
+
+describe("mapQbtTorrent", () => {
+  const RAW = {
+    hash: "abc",
+    name: "Test",
+    state: "uploading",
+    tags: "aither",
+    category: "movies",
+    upspeed: 1024,
+    dlspeed: 512,
+    uploaded: 5000,
+    downloaded: 2500,
+    ratio: 2.0,
+    size: 1_000_000,
+    num_seeds: 10,
+    num_leechs: 3,
+    num_complete: 50,
+    num_incomplete: 5,
+    tracker: "https://tracker.example.com/announce",
+    added_on: 1700000000,
+    completion_on: 1700001000,
+    last_activity: 1700002000,
+    seeding_time: 86400,
+    time_active: 90000,
+    seen_complete: 1700001500,
+    availability: 1.0,
+    amount_left: 0,
+    progress: 1.0,
+    content_path: "/data/movies/test",
+    save_path: "/data/movies",
+    is_private: true,
+  }
+
+  it("maps all snake_case fields to camelCase", () => {
+    const result = mapQbtTorrent(RAW)
+    expect(result.uploadSpeed).toBe(1024)
+    expect(result.downloadSpeed).toBe(512)
+    expect(result.seedCount).toBe(10)
+    expect(result.leechCount).toBe(3)
+    expect(result.swarmSeeders).toBe(50)
+    expect(result.swarmLeechers).toBe(5)
+    expect(result.addedAt).toBe(1700000000)
+    expect(result.completedAt).toBe(1700001000)
+    expect(result.lastActivityAt).toBe(1700002000)
+    expect(result.seedingTime).toBe(86400)
+    expect(result.activeTime).toBe(90000)
+    expect(result.lastSeenComplete).toBe(1700001500)
+    expect(result.remaining).toBe(0)
+    expect(result.contentPath).toBe("/data/movies/test")
+    expect(result.savePath).toBe("/data/movies")
+    expect(result.isPrivate).toBe(true)
+  })
+
+  it("preserves fields that need no mapping", () => {
+    const result = mapQbtTorrent(RAW)
+    expect(result.hash).toBe("abc")
+    expect(result.name).toBe("Test")
+    expect(result.state).toBe("uploading")
+    expect(result.tags).toBe("aither")
+    expect(result.ratio).toBe(2.0)
+    expect(result.size).toBe(1_000_000)
+  })
+
+  it("does not include old field names in output", () => {
+    const result = mapQbtTorrent(RAW) as unknown as Record<string, unknown>
+    expect(result).not.toHaveProperty("upspeed")
+    expect(result).not.toHaveProperty("dlspeed")
+    expect(result).not.toHaveProperty("num_seeds")
+    expect(result).not.toHaveProperty("added_on")
+    expect(result).not.toHaveProperty("content_path")
+  })
+})
+
+describe("mapQbtDelta", () => {
+  it("maps partial torrent updates", () => {
+    const delta = { upspeed: 2048, num_seeds: 15 }
+    const result = mapQbtDelta(delta)
+    expect(result).toEqual({ uploadSpeed: 2048, seedCount: 15 })
+    expect(result).not.toHaveProperty("upspeed")
+  })
+
+  it("passes through fields that need no mapping", () => {
+    const delta = { ratio: 3.5, progress: 0.5 }
+    const result = mapQbtDelta(delta)
+    expect(result).toEqual({ ratio: 3.5, progress: 0.5 })
+  })
+
+  it("handles empty delta", () => {
+    const result = mapQbtDelta({})
+    expect(result).toEqual({})
+  })
+})
diff --git a/src/lib/download-clients/__tests__/merge.test.ts b/src/lib/download-clients/__tests__/merge.test.ts
new file mode 100644
index 00000000..61cc1ab6
--- /dev/null
+++ b/src/lib/download-clients/__tests__/merge.test.ts
@@ -0,0 +1,299 @@
+// src/lib/download-clients/__tests__/merge.test.ts
+
+import { describe, expect, it } from "vitest"
+import { aggregateCrossSeedTags, mergeTorrentLists, type RawTorrent } from "../merge"
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function makeTorrent(overrides: Partial<RawTorrent> & { hash: string }): RawTorrent {
+  return {
+    hash: overrides.hash,
+    uploadSpeed: overrides.uploadSpeed ?? 1000,
+    downloadSpeed: overrides.downloadSpeed ?? 500,
+    seedingTime: overrides.seedingTime ?? 3600,
+    progress: overrides.progress ?? 1.0,
+    seedCount: overrides.seedCount ?? 10,
+    swarmSeeders: overrides.swarmSeeders ?? 50,
+    leechCount: overrides.leechCount ?? 2,
+    swarmLeechers: overrides.swarmLeechers ?? 5,
+    uploaded: overrides.uploaded ?? 2_000_000,
+    downloaded: overrides.downloaded ?? 1_000_000,
+    ratio: overrides.ratio ?? 2.0,
+  }
+}
+
+// ---------------------------------------------------------------------------
+// mergeTorrentLists
+// ---------------------------------------------------------------------------
+
+describe("mergeTorrentLists", () => {
+  describe("no overlap", () => {
+    it("returns concatenation when lists share no hashes", () => {
+      const a = makeTorrent({ hash: "aaa" })
+      const b = makeTorrent({ hash: "bbb" })
+      const result = mergeTorrentLists([[a], [b]])
+      expect(result).toHaveLength(2)
+      const hashes = result.map((t) => t.hash).sort()
+      expect(hashes).toEqual(["aaa", "bbb"])
+    })
+
+    it("preserves all field values when no overlap exists", () => {
+      const a = makeTorrent({ hash: "aaa", uploadSpeed: 100, downloadSpeed: 200 })
+      const b = makeTorrent({ hash: "bbb", uploadSpeed: 300, downloadSpeed: 400 })
+      const result = mergeTorrentLists([[a], [b]])
+      const ra = result.find((t) => t.hash === "aaa")
+      expect(ra?.uploadSpeed).toBe(100)
+      expect(ra?.downloadSpeed).toBe(200)
+      const rb = result.find((t) => t.hash === "bbb")
+      expect(rb?.uploadSpeed).toBe(300)
+      expect(rb?.downloadSpeed).toBe(400)
+    })
+  })
+
+  describe("full overlap (same hash on two clients)", () => {
+    it("sums uploadSpeed and downloadSpeed", () => {
+      const t1 = makeTorrent({ hash: "hhh", uploadSpeed: 1000, downloadSpeed: 200 })
+      const t2 = makeTorrent({ hash: "hhh", uploadSpeed: 500, downloadSpeed: 100 })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.uploadSpeed).toBe(1500)
+      expect(result.downloadSpeed).toBe(300)
+    })
+
+    it("sums uploaded and downloaded", () => {
+      const t1 = makeTorrent({ hash: "hhh", uploaded: 3_000_000, downloaded: 1_500_000 })
+      const t2 = makeTorrent({ hash: "hhh", uploaded: 1_000_000, downloaded: 500_000 })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.uploaded).toBe(4_000_000)
+      expect(result.downloaded).toBe(2_000_000)
+    })
+
+    it("takes max for seedingTime", () => {
+      const t1 = makeTorrent({ hash: "hhh", seedingTime: 7200 })
+      const t2 = makeTorrent({ hash: "hhh", seedingTime: 3600 })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.seedingTime).toBe(7200)
+    })
+
+    it("takes max for progress", () => {
+      const t1 = makeTorrent({ hash: "hhh", progress: 0.7 })
+      const t2 = makeTorrent({ hash: "hhh", progress: 1.0 })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.progress).toBe(1.0)
+    })
+
+    it("takes max for swarm counts", () => {
+      const t1 = makeTorrent({
+        hash: "hhh",
+        seedCount: 5,
+        swarmSeeders: 30,
+        leechCount: 1,
+        swarmLeechers: 3,
+      })
+      const t2 = makeTorrent({
+        hash: "hhh",
+        seedCount: 15,
+        swarmSeeders: 20,
+        leechCount: 4,
+        swarmLeechers: 7,
+      })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.seedCount).toBe(15)
+      expect(result.swarmSeeders).toBe(30)
+      expect(result.leechCount).toBe(4)
+      expect(result.swarmLeechers).toBe(7)
+    })
+
+    it("keeps non-numeric fields from the first occurrence", () => {
+      // hash is the only non-numeric field in RawTorrent; first occurrence wins
+      const t1 = makeTorrent({ hash: "hhh" })
+      const t2 = makeTorrent({ hash: "hhh" })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.hash).toBe("hhh")
+    })
+  })
+
+  describe("ratio recalculation", () => {
+    it("recalculates ratio as totalUploaded / totalDownloaded when downloaded > 0", () => {
+      // t1: uploaded=3MB, downloaded=1MB; t2: uploaded=1MB, downloaded=1MB
+      // merged: uploaded=4MB, downloaded=2MB, ratio should be 2.0
+      const t1 = makeTorrent({
+        hash: "hhh",
+        uploaded: 3_000_000,
+        downloaded: 1_000_000,
+        ratio: 3.0,
+      })
+      const t2 = makeTorrent({
+        hash: "hhh",
+        uploaded: 1_000_000,
+        downloaded: 1_000_000,
+        ratio: 1.0,
+      })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      expect(result.ratio).toBeCloseTo(4_000_000 / 2_000_000, 10)
+    })
+
+    it("falls back to Math.max of ratios when downloaded = 0 on both clients", () => {
+      // downloaded=0 on both means we cannot compute a meaningful ratio
+      const t1 = makeTorrent({ hash: "hhh", uploaded: 5_000_000, downloaded: 0, ratio: 4.5 })
+      const t2 = makeTorrent({ hash: "hhh", uploaded: 2_000_000, downloaded: 0, ratio: 3.2 })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      // total downloaded is still 0, so ratio = max(4.5, 3.2) = 4.5
+      expect(result.ratio).toBe(4.5)
+    })
+
+    it("recalculates ratio correctly when only one client has downloaded > 0", () => {
+      // t1 downloaded=0 (e.g. pure cross-seed), t2 downloaded=1MB
+      // merged: downloaded=1MB, so ratio is computable
+      const t1 = makeTorrent({ hash: "hhh", uploaded: 2_000_000, downloaded: 0, ratio: 99.0 })
+      const t2 = makeTorrent({
+        hash: "hhh",
+        uploaded: 1_000_000,
+        downloaded: 1_000_000,
+        ratio: 1.0,
+      })
+      const [result] = mergeTorrentLists([[t1], [t2]])
+      // after merge: uploaded=3_000_000, downloaded=1_000_000 -> ratio = 3.0
+      expect(result.ratio).toBeCloseTo(3.0, 10)
+    })
+  })
+
+  describe("single list with no duplicates", () => {
+    it("passes through unchanged when given one list with distinct hashes", () => {
+      const torrents = [
+        makeTorrent({ hash: "a1", uploadSpeed: 100 }),
+        makeTorrent({ hash: "a2", uploadSpeed: 200 }),
+        makeTorrent({ hash: "a3", uploadSpeed: 300 }),
+      ]
+      const result = mergeTorrentLists([torrents])
+      expect(result).toHaveLength(3)
+      for (const t of torrents) {
+        const found = result.find((r) => r.hash === t.hash)
+        expect(found?.uploadSpeed).toBe(t.uploadSpeed)
+      }
+    })
+  })
+
+  describe("empty inputs", () => {
+    it("returns empty array for empty outer list", () => {
+      expect(mergeTorrentLists([])).toEqual([])
+    })
+
+    it("returns empty array for single empty inner list", () => {
+      expect(mergeTorrentLists([[]])).toEqual([])
+    })
+
+    it("returns empty array when all inner lists are empty", () => {
+      expect(mergeTorrentLists([[], [], []])).toEqual([])
+    })
+
+    it("returns torrents from non-empty list when other lists are empty", () => {
+      const t = makeTorrent({ hash: "solo" })
+      const result = mergeTorrentLists([[], [t], []])
+      expect(result).toHaveLength(1)
+      expect(result[0].hash).toBe("solo")
+    })
+  })
+
+  describe("three-way overlap", () => {
+    it("sums speeds across all three clients", () => {
+      const t1 = makeTorrent({ hash: "tri", uploadSpeed: 100, downloadSpeed: 10 })
+      const t2 = makeTorrent({ hash: "tri", uploadSpeed: 200, downloadSpeed: 20 })
+      const t3 = makeTorrent({ hash: "tri", uploadSpeed: 300, downloadSpeed: 30 })
+      const [result] = mergeTorrentLists([[t1], [t2], [t3]])
+      expect(result.uploadSpeed).toBe(600)
+      expect(result.downloadSpeed).toBe(60)
+    })
+
+    it("sums uploaded and downloaded across all three clients", () => {
+      const t1 = makeTorrent({ hash: "tri", uploaded: 1_000_000, downloaded: 500_000 })
+      const t2 = makeTorrent({ hash: "tri", uploaded: 2_000_000, downloaded: 1_000_000 })
+      const t3 = makeTorrent({ hash: "tri", uploaded: 3_000_000, downloaded: 1_500_000 })
+      const [result] = mergeTorrentLists([[t1], [t2], [t3]])
+      expect(result.uploaded).toBe(6_000_000)
+      expect(result.downloaded).toBe(3_000_000)
+    })
+
+    it("takes max seedingTime across all three clients", () => {
+      const t1 = makeTorrent({ hash: "tri", seedingTime: 1000 })
+      const t2 = makeTorrent({ hash: "tri", seedingTime: 9999 })
+      const t3 = makeTorrent({ hash: "tri", seedingTime: 500 })
+      const [result] = mergeTorrentLists([[t1], [t2], [t3]])
+      expect(result.seedingTime).toBe(9999)
+    })
+
+    it("recalculates ratio from three-way summed totals", () => {
+      // uploaded sum: 6MB, downloaded sum: 3MB -> ratio = 2.0
+      const t1 = makeTorrent({ hash: "tri", uploaded: 1_000_000, downloaded: 500_000, ratio: 2.0 })
+      const t2 = makeTorrent({
+        hash: "tri",
+        uploaded: 2_000_000,
+        downloaded: 1_000_000,
+        ratio: 2.0,
+      })
+      const t3 = makeTorrent({
+        hash: "tri",
+        uploaded: 3_000_000,
+        downloaded: 1_500_000,
+        ratio: 2.0,
+      })
+      const [result] = mergeTorrentLists([[t1], [t2], [t3]])
+      expect(result.ratio).toBeCloseTo(2.0, 10)
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// aggregateCrossSeedTags
+// ---------------------------------------------------------------------------
+
+describe("aggregateCrossSeedTags", () => {
+  it("returns empty array for empty input", () => {
+    expect(aggregateCrossSeedTags([])).toEqual([])
+  })
+
+  it("returns tags from a single client unchanged", () => {
+    const result = aggregateCrossSeedTags([{ crossSeedTags: ["cross-seed", "fill"] }])
+    expect(result).toHaveLength(2)
+    expect(result).toContain("cross-seed")
+    expect(result).toContain("fill")
+  })
+
+  it("deduplicates overlapping tags across multiple clients", () => {
+    const result = aggregateCrossSeedTags([
+      { crossSeedTags: ["cross-seed", "fill"] },
+      { crossSeedTags: ["cross-seed", "other"] },
+    ])
+    // cross-seed appears in both clients but should only appear once
+    const csCount = result.filter((t) => t === "cross-seed").length
+    expect(csCount).toBe(1)
+    expect(result).toContain("fill")
+    expect(result).toContain("other")
+  })
+
+  it("returns union of all tags when no overlap", () => {
+    const result = aggregateCrossSeedTags([
+      { crossSeedTags: ["tag-a", "tag-b"] },
+      { crossSeedTags: ["tag-c", "tag-d"] },
+    ])
+    expect(result).toHaveLength(4)
+    expect(result).toContain("tag-a")
+    expect(result).toContain("tag-b")
+    expect(result).toContain("tag-c")
+    expect(result).toContain("tag-d")
+  })
+
+  it("handles a client with an empty tag array without including empty strings", () => {
+    const result = aggregateCrossSeedTags([
+      { crossSeedTags: [] },
+      { crossSeedTags: ["cross-seed"] },
+    ])
+    expect(result).toEqual(["cross-seed"])
+  })
+
+  it("handles all clients having empty tag arrays", () => {
+    const result = aggregateCrossSeedTags([{ crossSeedTags: [] }, { crossSeedTags: [] }])
+    expect(result).toEqual([])
+  })
+})
diff --git a/src/lib/download-clients/__tests__/qbt-adapter.test.ts b/src/lib/download-clients/__tests__/qbt-adapter.test.ts
new file mode 100644
index 00000000..e284aac0
--- /dev/null
+++ b/src/lib/download-clients/__tests__/qbt-adapter.test.ts
@@ -0,0 +1,239 @@
+// src/lib/download-clients/__tests__/qbt-adapter.test.ts
+
+import { describe, expect, it, vi } from "vitest"
+
+vi.mock("@/lib/download-clients/qbt/transport", () => ({
+  buildBaseUrl: vi.fn(
+    (host: string, port: number, ssl: boolean) => `${ssl ? "https" : "http"}://${host}:${port}`
+  ),
+  login: vi.fn().mockResolvedValue("test-sid"),
+  getTorrents: vi.fn().mockResolvedValue([
+    {
+      hash: "abc",
+      name: "Test",
+      state: "uploading",
+      tags: "aither",
+      category: "tv",
+      upspeed: 100,
+      dlspeed: 50,
+      uploaded: 1000000,
+      downloaded: 500000,
+      ratio: 2.0,
+      size: 500000,
+      num_seeds: 5,
+      num_leechs: 2,
+      num_complete: 20,
+      num_incomplete: 3,
+      tracker: "https://tracker.example.com",
+      added_on: 1700000000,
+      completion_on: 1700001000,
+      last_activity: 1700002000,
+      seeding_time: 86400,
+      time_active: 90000,
+      seen_complete: 1700001500,
+      availability: 1.0,
+      amount_left: 0,
+      progress: 1.0,
+      content_path: "/data/test",
+      save_path: "/data",
+      is_private: true,
+    },
+  ]),
+  getTransferInfo: vi.fn().mockResolvedValue({ up_info_speed: 100, dl_info_speed: 200 }),
+  syncMaindata: vi.fn().mockResolvedValue({
+    rid: 1,
+    full_update: true,
+    torrents: {
+      abc: {
+        upspeed: 500,
+        dlspeed: 200,
+        num_seeds: 10,
+        seeding_time: 3600,
+      },
+    },
+    server_state: {
+      up_info_speed: 500,
+      dl_info_speed: 200,
+    },
+  }),
+  invalidateSession: vi.fn(),
+  withSessionRetry: vi.fn(
+    async (
+      _h: string,
+      _p: number,
+      _s: boolean,
+      _u: string,
+      _pw: string,
+      op: (baseUrl: string, sid: string) => unknown
+    ) => op("http://localhost:8080", "test-sid")
+  ),
+}))
+
+import {
+  getTorrents,
+  getTransferInfo,
+  invalidateSession,
+  login,
+  syncMaindata,
+  withSessionRetry,
+} from "@/lib/download-clients/qbt/transport"
+import { QbtClientAdapter } from "../adapters/qbt"
+
+describe("QbtClientAdapter", () => {
+  const adapter = new QbtClientAdapter("localhost", 8080, false, "admin", "pass")
+
+  it("has type 'qbittorrent'", () => {
+    expect(adapter.type).toBe("qbittorrent")
+  })
+
+  it("builds correct baseUrl", () => {
+    expect(adapter.baseUrl).toBe("http://localhost:8080")
+  })
+
+  it("returns normalized TorrentRecord shapes from getTorrents", async () => {
+    const torrents = await adapter.getTorrents()
+    expect(getTorrents).toHaveBeenCalled()
+
+    // Verify camelCase normalized fields are present
+    expect(torrents[0].uploadSpeed).toBe(100)
+    expect(torrents[0].downloadSpeed).toBe(50)
+    expect(torrents[0].seedCount).toBe(5)
+    expect(torrents[0].leechCount).toBe(2)
+    expect(torrents[0].swarmSeeders).toBe(20)
+    expect(torrents[0].swarmLeechers).toBe(3)
+    expect(torrents[0].addedAt).toBe(1700000000)
+    expect(torrents[0].completedAt).toBe(1700001000)
+    expect(torrents[0].lastActivityAt).toBe(1700002000)
+    expect(torrents[0].seedingTime).toBe(86400)
+    expect(torrents[0].activeTime).toBe(90000)
+    expect(torrents[0].lastSeenComplete).toBe(1700001500)
+    expect(torrents[0].remaining).toBe(0)
+    expect(torrents[0].contentPath).toBe("/data/test")
+    expect(torrents[0].savePath).toBe("/data")
+    expect(torrents[0].isPrivate).toBe(true)
+
+    // Pass-through fields (same in both raw and normalized)
+    expect(torrents[0].hash).toBe("abc")
+    expect(torrents[0].name).toBe("Test")
+
+    // Verify raw snake_case fields are NOT present on the result
+    expect(torrents[0]).not.toHaveProperty("upspeed")
+    expect(torrents[0]).not.toHaveProperty("dlspeed")
+    expect(torrents[0]).not.toHaveProperty("num_seeds")
+    expect(torrents[0]).not.toHaveProperty("num_leechs")
+    expect(torrents[0]).not.toHaveProperty("num_complete")
+    expect(torrents[0]).not.toHaveProperty("num_incomplete")
+    expect(torrents[0]).not.toHaveProperty("added_on")
+    expect(torrents[0]).not.toHaveProperty("completion_on")
+    expect(torrents[0]).not.toHaveProperty("last_activity")
+    expect(torrents[0]).not.toHaveProperty("seeding_time")
+    expect(torrents[0]).not.toHaveProperty("time_active")
+    expect(torrents[0]).not.toHaveProperty("seen_complete")
+    expect(torrents[0]).not.toHaveProperty("amount_left")
+    expect(torrents[0]).not.toHaveProperty("content_path")
+    expect(torrents[0]).not.toHaveProperty("save_path")
+    expect(torrents[0]).not.toHaveProperty("is_private")
+  })
+
+  it("passes tag and filter options to getTorrents", async () => {
+    vi.mocked(getTorrents).mockClear()
+    await adapter.getTorrents({ tag: "aither", filter: "active" })
+    expect(getTorrents).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.any(String),
+      "aither",
+      "active"
+    )
+  })
+
+  it("returns normalized TransferStats from getTransferInfo", async () => {
+    const stats = await adapter.getTransferInfo()
+    expect(getTransferInfo).toHaveBeenCalled()
+    expect(stats).toEqual({ uploadSpeed: 100, downloadSpeed: 200 })
+  })
+
+  it("supports delta sync via getDeltaSync method", () => {
+    expect(adapter.getDeltaSync).toBeDefined()
+  })
+
+  it("returns normalized DeltaSyncResponse from getDeltaSync", async () => {
+    const data = await adapter.getDeltaSync?.(0)
+    expect(syncMaindata).toHaveBeenCalledWith(expect.any(String), expect.any(String), 0)
+
+    // Top-level fields pass through
+    expect(data?.rid).toBe(1)
+    expect(data?.fullUpdate).toBe(true)
+
+    // Torrent partial is mapped to camelCase
+    const torrentPartial = data?.torrents?.abc
+    expect(torrentPartial).toBeDefined()
+    expect(torrentPartial?.uploadSpeed).toBe(500)
+    expect(torrentPartial?.downloadSpeed).toBe(200)
+    expect(torrentPartial?.seedCount).toBe(10)
+    expect(torrentPartial?.seedingTime).toBe(3600)
+    expect(torrentPartial).not.toHaveProperty("upspeed")
+    expect(torrentPartial).not.toHaveProperty("dlspeed")
+    expect(torrentPartial).not.toHaveProperty("num_seeds")
+    expect(torrentPartial).not.toHaveProperty("seeding_time")
+
+    // serverState is mapped to TransferStats shape
+    expect(data?.serverState?.uploadSpeed).toBe(500)
+    expect(data?.serverState?.downloadSpeed).toBe(200)
+  })
+
+  it("testConnection invalidates session, logs in fresh, and calls getTransferInfo", async () => {
+    vi.mocked(invalidateSession).mockClear()
+    vi.mocked(login).mockClear()
+    vi.mocked(getTransferInfo).mockClear()
+
+    await adapter.testConnection()
+
+    expect(invalidateSession).toHaveBeenCalledWith("http://localhost:8080")
+    expect(login).toHaveBeenCalledWith("localhost", 8080, false, "admin", "pass")
+    expect(getTransferInfo).toHaveBeenCalled()
+  })
+
+  it("dispose invalidates the session", () => {
+    vi.mocked(invalidateSession).mockClear()
+    adapter.dispose()
+    expect(invalidateSession).toHaveBeenCalledWith("http://localhost:8080")
+  })
+
+  it("does not leak plaintext credentials in error messages from getTorrents", async () => {
+    const sensitiveAdapter = new QbtClientAdapter(
+      "localhost",
+      8080,
+      false,
+      "secret-user",
+      "secret-pass"
+    )
+    vi.mocked(withSessionRetry).mockRejectedValueOnce(new Error("Auth failed"))
+
+    try {
+      await sensitiveAdapter.getTorrents()
+      expect.unreachable("should have thrown")
+    } catch (err) {
+      expect((err as Error).message).not.toContain("secret-user")
+      expect((err as Error).message).not.toContain("secret-pass")
+    }
+  })
+
+  it("does not leak plaintext credentials in error messages from testConnection", async () => {
+    const sensitiveAdapter = new QbtClientAdapter(
+      "localhost",
+      8080,
+      false,
+      "secret-user",
+      "secret-pass"
+    )
+    vi.mocked(login).mockRejectedValueOnce(new Error("HTTP 403 Forbidden"))
+
+    try {
+      await sensitiveAdapter.testConnection()
+      expect.unreachable("should have thrown")
+    } catch (err) {
+      expect((err as Error).message).not.toContain("secret-user")
+      expect((err as Error).message).not.toContain("secret-pass")
+    }
+  })
+})
diff --git a/src/lib/qbt/qbt.test.ts b/src/lib/download-clients/__tests__/qbt.test.ts
similarity index 89%
rename from src/lib/qbt/qbt.test.ts
rename to src/lib/download-clients/__tests__/qbt.test.ts
index fdd6bd31..69418229 100644
--- a/src/lib/qbt/qbt.test.ts
+++ b/src/lib/download-clients/__tests__/qbt.test.ts
@@ -1,9 +1,9 @@
-// src/lib/qbt/qbt.test.ts
+// src/lib/download-clients/__tests__/qbt.test.ts
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import { aggregateByTag } from "./aggregator"
-import { buildBaseUrl, getTorrents, getTransferInfo, login } from "./client"
-import type { QbtTorrent } from "./types"
-import { parseCrossSeedTags } from "./utils"
+import type { TorrentRecord } from "@/lib/download-clients"
+import { aggregateByTag } from "../aggregator"
+import { buildBaseUrl, getTorrents, getTransferInfo, login } from "../qbt/transport"
+import type { QbtTorrent } from "../qbt/types"
 
 // ---------------------------------------------------------------------------
 // buildBaseUrl
@@ -334,47 +334,42 @@ describe("getTransferInfo", () => {
 // ---------------------------------------------------------------------------
 
 describe("aggregateByTag", () => {
-  // Regression: prevents isPrivate camelCase/snake_case mismatch from masking real API shape.
-  // The real qBT API returns `is_private` (snake_case), not `isPrivate`. Tests that set
-  // `isPrivate: true` would hide bugs that relied on that field being defined. This factory
-  // deliberately omits it to match the real API response shape.
-  function makeTorrent(overrides: Partial<QbtTorrent>): QbtTorrent {
+  // Factory uses TorrentRecord (normalized camelCase) shape — what the aggregator receives.
+  function makeTorrent(overrides: Partial<TorrentRecord>): TorrentRecord {
     return {
       hash: "deadbeef",
       name: "Test Torrent",
       state: "uploading",
       tags: "",
       category: "",
-      upspeed: 0,
-      dlspeed: 0,
+      uploadSpeed: 0,
+      downloadSpeed: 0,
       uploaded: 0,
       downloaded: 0,
       ratio: 0,
       size: 0,
-      num_seeds: 0,
-      num_leechs: 0,
-      num_complete: 0,
-      num_incomplete: 0,
+      seedCount: 0,
+      leechCount: 0,
+      swarmSeeders: 0,
+      swarmLeechers: 0,
       tracker: "",
-      added_on: 0,
-      completion_on: -1,
-      last_activity: 0,
-      seeding_time: 0,
-      time_active: 0,
-      seen_complete: 0,
+      addedAt: 0,
+      completedAt: -1,
+      lastActivityAt: 0,
+      seedingTime: 0,
+      activeTime: 0,
+      lastSeenComplete: 0,
       availability: -1,
-      amount_left: 0,
+      remaining: 0,
       progress: 1,
-      content_path: "/downloads/Test Torrent",
-      save_path: "/downloads",
-      // isPrivate intentionally omitted — real qBT API returns `is_private` (snake_case).
-      // Only override explicitly in tests that specifically need to test isPrivate handling.
+      contentPath: "/downloads/Test Torrent",
+      savePath: "/downloads",
       ...overrides,
     }
   }
 
   it("counts seeding torrents for a matched tag", () => {
-    const torrents = [makeTorrent({ state: "uploading", tags: "aither", upspeed: 512 })]
+    const torrents = [makeTorrent({ state: "uploading", tags: "aither", uploadSpeed: 512 })]
     const result = aggregateByTag(torrents, ["aither"], [])
 
     expect(result.totalSeedingCount).toBe(1)
@@ -385,7 +380,7 @@ describe("aggregateByTag", () => {
   })
 
   it("counts leeching torrents for a matched tag", () => {
-    const torrents = [makeTorrent({ state: "downloading", tags: "aither", dlspeed: 1024 })]
+    const torrents = [makeTorrent({ state: "downloading", tags: "aither", downloadSpeed: 1024 })]
     const result = aggregateByTag(torrents, ["aither"], [])
 
     expect(result.totalLeechingCount).toBe(1)
@@ -396,7 +391,9 @@ describe("aggregateByTag", () => {
   })
 
   it("routes torrents with no matching tag into untagged bucket", () => {
-    const torrents = [makeTorrent({ state: "uploading", tags: "some-other-tracker", upspeed: 200 })]
+    const torrents = [
+      makeTorrent({ state: "uploading", tags: "some-other-tracker", uploadSpeed: 200 }),
+    ]
     const result = aggregateByTag(torrents, ["aither"], [])
 
     const untagged = result.tagStats.find((t) => t.tag === "untagged")
@@ -415,7 +412,9 @@ describe("aggregateByTag", () => {
   })
 
   it("handles torrents with multiple tags, crediting all matched buckets", () => {
-    const torrents = [makeTorrent({ state: "uploading", tags: "aither, cross-seed", upspeed: 300 })]
+    const torrents = [
+      makeTorrent({ state: "uploading", tags: "aither, cross-seed", uploadSpeed: 300 }),
+    ]
     const result = aggregateByTag(torrents, ["aither"], ["cross-seed"])
 
     const aitherStats = result.tagStats.find((t) => t.tag === "aither")
@@ -494,8 +493,8 @@ describe("aggregateByTag", () => {
 
   it("sums speeds across multiple seeding torrents for the same tag", () => {
     const torrents = [
-      makeTorrent({ state: "uploading", tags: "aither", upspeed: 100 }),
-      makeTorrent({ state: "stalledUP", tags: "aither", upspeed: 200 }),
+      makeTorrent({ state: "uploading", tags: "aither", uploadSpeed: 100 }),
+      makeTorrent({ state: "stalledUP", tags: "aither", uploadSpeed: 200 }),
     ]
     const result = aggregateByTag(torrents, ["aither"], [])
     const aitherStats = result.tagStats.find((t) => t.tag === "aither")
@@ -513,16 +512,6 @@ describe("aggregateByTag", () => {
   })
 })
 
-// ---------------------------------------------------------------------------
-// parseCrossSeedTags
-// ---------------------------------------------------------------------------
-
-describe("parseCrossSeedTags", () => {
-  it("returns an empty array for null", () => {
-    expect(parseCrossSeedTags(null)).toEqual([])
-  })
-})
-
 // ---------------------------------------------------------------------------
 // Mock factory realism
 // ---------------------------------------------------------------------------
@@ -587,48 +576,48 @@ describe("makeTorrent factory shape", () => {
 // ---------------------------------------------------------------------------
 
 describe("aggregateByTag case-insensitive tag matching", () => {
-  // Local helper that does NOT include isPrivate, matching real API shape
-  function makeRealTorrent(overrides: Partial<QbtTorrent>): QbtTorrent {
+  // Factory uses TorrentRecord (normalized camelCase) shape.
+  function makeRealTorrent(overrides: Partial<TorrentRecord>): TorrentRecord {
     return {
       hash: "deadbeef",
       name: "Test Torrent",
       state: "uploading",
       tags: "",
       category: "",
-      upspeed: 0,
-      dlspeed: 0,
+      uploadSpeed: 0,
+      downloadSpeed: 0,
       uploaded: 0,
       downloaded: 0,
       ratio: 0,
       size: 0,
-      num_seeds: 0,
-      num_leechs: 0,
-      num_complete: 0,
-      num_incomplete: 0,
+      seedCount: 0,
+      leechCount: 0,
+      swarmSeeders: 0,
+      swarmLeechers: 0,
       tracker: "",
-      added_on: 0,
-      completion_on: -1,
-      last_activity: 0,
-      seeding_time: 0,
-      time_active: 0,
-      seen_complete: 0,
+      addedAt: 0,
+      completedAt: -1,
+      lastActivityAt: 0,
+      seedingTime: 0,
+      activeTime: 0,
+      lastSeenComplete: 0,
       availability: -1,
-      amount_left: 0,
+      remaining: 0,
       progress: 1,
-      content_path: "/downloads/Test Torrent",
-      save_path: "/downloads",
+      contentPath: "/downloads/Test Torrent",
+      savePath: "/downloads",
       ...overrides,
     }
   }
 
   // Regression: prevents tag case mismatch between DB-stored tags and parseTorrentTags output.
   // aggregateByTag builds its internal map with lowercase keys. parseTorrentTags lowercases
-  // torrent tags by default. If the map were built with original-case keys (e.g. "Blutopia"),
+  // torrent tags by default. If the map were built with original-case keys (i.e. "Blutopia"),
   // a torrent tagged "blutopia" (lowercased by parseTorrentTags) would never match and would
   // fall into the untagged bucket instead.
   it("matches torrent tags case-insensitively when DB tag has title case", () => {
     // Torrent tags as parseTorrentTags returns them: lowercase
-    const torrents = [makeRealTorrent({ state: "uploading", tags: "blutopia", upspeed: 512 })]
+    const torrents = [makeRealTorrent({ state: "uploading", tags: "blutopia", uploadSpeed: 512 })]
     // DB stores the tag with title case
     const result = aggregateByTag(torrents, ["Blutopia"], [])
 
@@ -645,9 +634,9 @@ describe("aggregateByTag case-insensitive tag matching", () => {
   // Regression: verifies the fix handles all common tracker tag casing patterns from DB.
   it("handles mixed case tags from DB — ALL_CAPS, lowercase, TitleCase", () => {
     const torrents = [
-      makeRealTorrent({ state: "uploading", tags: "red", upspeed: 100 }),
-      makeRealTorrent({ state: "uploading", tags: "ops", upspeed: 200 }),
-      makeRealTorrent({ state: "uploading", tags: "nebulance", upspeed: 300 }),
+      makeRealTorrent({ state: "uploading", tags: "red", uploadSpeed: 100 }),
+      makeRealTorrent({ state: "uploading", tags: "ops", uploadSpeed: 200 }),
+      makeRealTorrent({ state: "uploading", tags: "nebulance", uploadSpeed: 300 }),
     ]
     // DB may store these as "RED", "ops", "Nebulance"
     const result = aggregateByTag(torrents, ["RED", "ops", "Nebulance"], [])
@@ -669,7 +658,7 @@ describe("aggregateByTag case-insensitive tag matching", () => {
   })
 
   it("cross-seed tags from DB are also lowercased for matching", () => {
-    const torrents = [makeRealTorrent({ state: "uploading", tags: "cross-seed", upspeed: 50 })]
+    const torrents = [makeRealTorrent({ state: "uploading", tags: "cross-seed", uploadSpeed: 50 })]
     // DB cross-seed tag stored with mixed case
     const result = aggregateByTag(torrents, [], ["Cross-Seed"])
 
diff --git a/src/lib/download-clients/__tests__/strip-sensitive.test.ts b/src/lib/download-clients/__tests__/strip-sensitive.test.ts
new file mode 100644
index 00000000..836667c7
--- /dev/null
+++ b/src/lib/download-clients/__tests__/strip-sensitive.test.ts
@@ -0,0 +1,75 @@
+// src/lib/download-clients/__tests__/strip-sensitive.test.ts
+
+import { describe, expect, it, vi } from "vitest"
+
+vi.mock("server-only", () => ({}))
+
+import { stripSensitiveTorrentFields } from "../fetch"
+
+const baseTorrent = {
+  hash: "abc123",
+  name: "Test.Torrent",
+  state: "uploading",
+  tags: "aither",
+  category: "tv",
+  uploadSpeed: 1024,
+  downloadSpeed: 0,
+  uploaded: 5000000,
+  downloaded: 3000000,
+  ratio: 1.67,
+  size: 3000000,
+  seedCount: 10,
+  leechCount: 2,
+  swarmSeeders: 15,
+  swarmLeechers: 3,
+  tracker: "https://aither.cc/announce/abc123secretpasskey",
+  addedAt: 1700000000,
+  completedAt: 1700001000,
+  lastActivityAt: 1700002000,
+  seedingTime: 86400,
+  activeTime: 90000,
+  lastSeenComplete: 1700002000,
+  availability: 1,
+  remaining: 0,
+  progress: 1,
+  contentPath: "/data/media/tv/Test.Torrent",
+  savePath: "/data/media/tv",
+}
+
+describe("stripSensitiveTorrentFields", () => {
+  it("removes tracker field (may contain passkeys)", () => {
+    const result = stripSensitiveTorrentFields(baseTorrent)
+    expect(result).not.toHaveProperty("tracker")
+    expect(JSON.stringify(result)).not.toContain("secretpasskey")
+  })
+
+  it("removes contentPath field (exposes server filesystem)", () => {
+    const result = stripSensitiveTorrentFields(baseTorrent)
+    expect(result).not.toHaveProperty("contentPath")
+  })
+
+  it("removes savePath field (exposes server filesystem)", () => {
+    const result = stripSensitiveTorrentFields(baseTorrent)
+    expect(result).not.toHaveProperty("savePath")
+  })
+
+  it("preserves all non-sensitive fields", () => {
+    const result = stripSensitiveTorrentFields(baseTorrent)
+    expect(result.hash).toBe("abc123")
+    expect(result.name).toBe("Test.Torrent")
+    expect(result.state).toBe("uploading")
+    expect(result.tags).toBe("aither")
+    expect(result.uploadSpeed).toBe(1024)
+    expect(result.ratio).toBe(1.67)
+    expect(result.seedCount).toBe(10)
+    expect(result.addedAt).toBe(1700000000)
+  })
+
+  it("does not mutate the original object", () => {
+    const original = { ...baseTorrent }
+    stripSensitiveTorrentFields(original)
+    expect(original).toHaveProperty("tracker")
+    expect(original).toHaveProperty("contentPath")
+    expect(original).toHaveProperty("savePath")
+  })
+})
diff --git a/src/lib/download-clients/__tests__/sync-store.test.ts b/src/lib/download-clients/__tests__/sync-store.test.ts
new file mode 100644
index 00000000..757502b1
--- /dev/null
+++ b/src/lib/download-clients/__tests__/sync-store.test.ts
@@ -0,0 +1,321 @@
+// src/lib/download-clients/__tests__/sync-store.test.ts
+
+import { afterEach, describe, expect, it, vi } from "vitest"
+import type { DeltaSyncResponse } from "@/lib/download-clients"
+import {
+  applyMaindataUpdate,
+  clearAllStores,
+  getStoredTorrents,
+  getStoreRevision,
+  isStoreFresh,
+  isStoreInitialized,
+  replaceStoreTorrents,
+  resetStore,
+} from "../sync-store"
+
+afterEach(() => clearAllStores())
+
+const BASE_URL = "http://localhost:8080"
+const BASE = BASE_URL
+
+function makeTorrent(hash: string, overrides: Record<string, unknown> = {}) {
+  return {
+    hash,
+    name: `Torrent ${hash}`,
+    state: "stalledUP",
+    tags: "🕵️ Aither",
+    category: "movies",
+    uploadSpeed: 0,
+    downloadSpeed: 0,
+    uploaded: 1000,
+    downloaded: 500,
+    ratio: 2.0,
+    size: 1_000_000,
+    seedCount: 5,
+    leechCount: 1,
+    swarmSeeders: 10,
+    swarmLeechers: 2,
+    tracker: "https://tracker.example.com/announce",
+    addedAt: 1700000000,
+    completedAt: 1700001000,
+    lastActivityAt: 1700002000,
+    seedingTime: 86400,
+    activeTime: 86400,
+    lastSeenComplete: 1700001500,
+    availability: 1.0,
+    remaining: 0,
+    progress: 1.0,
+    contentPath: "/data/movies/torrent",
+    savePath: "/data/movies",
+    ...overrides,
+  }
+}
+
+describe("sync-store", () => {
+  it("starts uninitialized with rid=0", () => {
+    expect(isStoreInitialized(BASE_URL)).toBe(false)
+    expect(getStoreRevision(BASE_URL)).toBe(0)
+    expect(getStoredTorrents(BASE_URL)).toEqual([])
+  })
+
+  it("applies a full update (rid=0 response)", () => {
+    const response: DeltaSyncResponse = {
+      rid: 1,
+      fullUpdate: true,
+      torrents: {
+        abc123: makeTorrent("abc123"),
+        def456: makeTorrent("def456", { name: "Second Torrent" }),
+      },
+    }
+    applyMaindataUpdate(BASE_URL, response)
+
+    expect(isStoreInitialized(BASE_URL)).toBe(true)
+    expect(getStoreRevision(BASE_URL)).toBe(1)
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(2)
+  })
+
+  it("applies a delta update — merges changed fields only", () => {
+    // Initial full sync
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: {
+        abc123: makeTorrent("abc123", { seedingTime: 100, uploaded: 1000 }),
+      },
+    })
+
+    // Delta: only seedingTime changed
+    applyMaindataUpdate(BASE_URL, {
+      rid: 2,
+      torrents: { abc123: { seedingTime: 200 } },
+    })
+
+    expect(getStoreRevision(BASE_URL)).toBe(2)
+    const torrents = getStoredTorrents(BASE_URL)
+    expect(torrents).toHaveLength(1)
+    expect(torrents[0].seedingTime).toBe(200) // updated
+    expect(torrents[0].uploaded).toBe(1000) // preserved
+    expect(torrents[0].name).toBe("Torrent abc123") // preserved
+  })
+
+  it("handles torrentsRemoved", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: {
+        abc123: makeTorrent("abc123"),
+        def456: makeTorrent("def456"),
+      },
+    })
+
+    applyMaindataUpdate(BASE_URL, {
+      rid: 2,
+      torrentsRemoved: ["abc123"],
+    })
+
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(1)
+    expect(getStoredTorrents(BASE_URL)[0].hash).toBe("def456")
+  })
+
+  it("adds new torrents via delta (not fullUpdate)", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    applyMaindataUpdate(BASE_URL, {
+      rid: 2,
+      torrents: { newone: makeTorrent("newone") },
+    })
+
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(2)
+  })
+
+  it("fullUpdate clears existing data before applying", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    // Second fullUpdate with different data
+    applyMaindataUpdate(BASE_URL, {
+      rid: 5,
+      fullUpdate: true,
+      torrents: { xyz999: makeTorrent("xyz999") },
+    })
+
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(1)
+    expect(getStoredTorrents(BASE_URL)[0].hash).toBe("xyz999")
+    expect(getStoreRevision(BASE_URL)).toBe(5)
+  })
+
+  it("resetStore clears state and forces re-sync", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 10,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    resetStore(BASE_URL)
+
+    expect(isStoreInitialized(BASE_URL)).toBe(false)
+    expect(getStoreRevision(BASE_URL)).toBe(0)
+    expect(getStoredTorrents(BASE_URL)).toEqual([])
+  })
+
+  it("isolates stores by baseUrl", () => {
+    applyMaindataUpdate("http://client-a:8080", {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { aaa: makeTorrent("aaa") },
+    })
+    applyMaindataUpdate("http://client-b:8080", {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { bbb: makeTorrent("bbb"), ccc: makeTorrent("ccc") },
+    })
+
+    expect(getStoredTorrents("http://client-a:8080")).toHaveLength(1)
+    expect(getStoredTorrents("http://client-b:8080")).toHaveLength(2)
+  })
+
+  it("returns a snapshot array, not a live reference", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    const first = getStoredTorrents(BASE_URL)
+    const second = getStoredTorrents(BASE_URL)
+    expect(first).not.toBe(second) // different array instances
+    expect(first).toEqual(second) // same content
+  })
+
+  it("delta on uninitialized store does NOT mark it initialized", () => {
+    // A delta without a prior fullUpdate should not be trusted
+    applyMaindataUpdate(BASE_URL, {
+      rid: 5,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    expect(isStoreInitialized(BASE_URL)).toBe(false)
+    expect(getStoredTorrents(BASE_URL)).toEqual([])
+    expect(getStoreRevision(BASE_URL)).toBe(5)
+  })
+
+  it("handles empty delta (no changes)", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    // Empty delta — nothing changed
+    applyMaindataUpdate(BASE_URL, { rid: 2 })
+
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(1)
+    expect(getStoreRevision(BASE_URL)).toBe(2)
+  })
+
+  it("torrentsRemoved for non-existent hash is a no-op", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    applyMaindataUpdate(BASE_URL, {
+      rid: 2,
+      torrentsRemoved: ["nonexistent"],
+    })
+
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(1)
+  })
+
+  it("skips incomplete new torrents in delta (missing required fields)", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123") },
+    })
+
+    // Delta adds a torrent with only partial fields (no name, state, size, ratio)
+    applyMaindataUpdate(BASE_URL, {
+      rid: 2,
+      torrents: { incomplete: { uploadSpeed: 100 } },
+    })
+
+    // Should NOT add the incomplete torrent
+    expect(getStoredTorrents(BASE_URL)).toHaveLength(1)
+  })
+
+  it("isStoreFresh returns false for uninitialized store", () => {
+    expect(isStoreFresh(BASE_URL, 60_000)).toBe(false)
+  })
+
+  it("isStoreFresh returns true when within max age, false when exceeded", () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(new Date("2026-01-01T00:00:00Z"))
+      applyMaindataUpdate(BASE_URL, {
+        rid: 1,
+        fullUpdate: true,
+        torrents: { abc123: makeTorrent("abc123") },
+      })
+
+      // Immediately after update — within 5 min
+      expect(isStoreFresh(BASE_URL, 5 * 60 * 1000)).toBe(true)
+
+      // Advance 6 minutes — exceeds 5 min max age
+      vi.advanceTimersByTime(6 * 60 * 1000)
+      expect(isStoreFresh(BASE_URL, 5 * 60 * 1000)).toBe(false)
+
+      // But still within 10 min max age
+      expect(isStoreFresh(BASE_URL, 10 * 60 * 1000)).toBe(true)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it("returned torrents are shallow copies — mutating them does not corrupt the store", () => {
+    applyMaindataUpdate(BASE_URL, {
+      rid: 1,
+      fullUpdate: true,
+      torrents: { abc123: makeTorrent("abc123", { uploaded: 1000 }) },
+    })
+
+    const first = getStoredTorrents(BASE_URL)
+    first[0].uploaded = 999_999
+
+    const second = getStoredTorrents(BASE_URL)
+    expect(second[0].uploaded).toBe(1000) // store unaffected
+  })
+})
+
+describe("replaceStoreTorrents", () => {
+  it("replaces all torrents for a client", () => {
+    replaceStoreTorrents(BASE, [makeTorrent("h1"), makeTorrent("h2")])
+    expect(getStoredTorrents(BASE)).toHaveLength(2)
+  })
+
+  it("marks store as initialized", () => {
+    replaceStoreTorrents(BASE, [])
+    expect(isStoreInitialized(BASE)).toBe(true)
+  })
+
+  it("clears previous torrents before replacing", () => {
+    replaceStoreTorrents(BASE, [makeTorrent("old")])
+    replaceStoreTorrents(BASE, [makeTorrent("new")])
+    const stored = getStoredTorrents(BASE)
+    expect(stored).toHaveLength(1)
+    expect(stored[0].hash).toBe("new")
+  })
+
+  it("updates lastUpdatedAt so isStoreFresh returns true", () => {
+    replaceStoreTorrents(BASE, [])
+    expect(isStoreFresh(BASE, 60_000)).toBe(true)
+  })
+})
diff --git a/src/lib/download-clients/__tests__/test-connection.test.ts b/src/lib/download-clients/__tests__/test-connection.test.ts
new file mode 100644
index 00000000..fd590941
--- /dev/null
+++ b/src/lib/download-clients/__tests__/test-connection.test.ts
@@ -0,0 +1,291 @@
+// src/lib/download-clients/__tests__/test-connection.test.ts
+//
+// Tests for testClientConnection in coordinator.ts
+
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+// ---------------------------------------------------------------------------
+// Module mocks
+// ---------------------------------------------------------------------------
+
+vi.mock("server-only", () => ({}))
+
+// Drizzle operators: pass-through identity stubs
+vi.mock("drizzle-orm", () => ({
+  eq: vi.fn((...args: unknown[]) => ({ type: "eq", args })),
+  isNotNull: vi.fn((col: unknown) => ({ type: "isNotNull", col })),
+}))
+
+// DB mock
+const mockSelect = vi.fn()
+
+vi.mock("@/lib/db", () => ({
+  db: { select: (...args: unknown[]) => mockSelect(...args) },
+}))
+
+vi.mock("@/lib/db/schema", () => ({
+  trackers: {
+    id: "trackers.id",
+    name: "trackers.name",
+    qbtTag: "trackers.qbtTag",
+    isActive: "trackers.isActive",
+    color: "trackers.color",
+  },
+  downloadClients: {
+    id: "downloadClients.id",
+    name: "downloadClients.name",
+    host: "downloadClients.host",
+    port: "downloadClients.port",
+    useSsl: "downloadClients.useSsl",
+    type: "downloadClients.type",
+    enabled: "downloadClients.enabled",
+    encryptedUsername: "downloadClients.encryptedUsername",
+    encryptedPassword: "downloadClients.encryptedPassword",
+    crossSeedTags: "downloadClients.crossSeedTags",
+    cachedTorrents: "downloadClients.cachedTorrents",
+    cachedTorrentsAt: "downloadClients.cachedTorrentsAt",
+    lastPolledAt: "downloadClients.lastPolledAt",
+    lastError: "downloadClients.lastError",
+    pollIntervalSeconds: "downloadClients.pollIntervalSeconds",
+  },
+}))
+
+vi.mock("@/lib/fleet", () => ({
+  parseTorrentTags: vi.fn((tags: string) =>
+    tags
+      .split(",")
+      .map((t: string) => t.trim().toLowerCase())
+      .filter(Boolean)
+  ),
+}))
+
+vi.mock("@/lib/fleet-aggregation", () => ({
+  computeFleetAggregation: vi.fn(() => ({})),
+}))
+
+// Mock adapter
+const mockAdapter = {
+  testConnection: vi.fn(),
+  getTorrents: vi.fn(),
+  getTransferInfo: vi.fn(),
+  dispose: vi.fn(),
+  type: "qbittorrent" as const,
+  baseUrl: "http://localhost:8080",
+}
+
+vi.mock("../factory", () => ({
+  createAdapterForClient: vi.fn(() => mockAdapter),
+}))
+
+vi.mock("@/lib/error-utils", () => ({
+  sanitizeNetworkError: vi.fn((raw: string, fallback = "Connection failed") => {
+    if (/timed?\s*out/i.test(raw)) return "Request timed out"
+    if (/ECONNREFUSED/i.test(raw)) return "Connection refused"
+    if (/40[13]|Unauthorized|Forbidden/i.test(raw)) return "Authentication failed"
+    return fallback
+  }),
+  isDecryptionError: vi.fn((err: unknown) => {
+    if (!(err instanceof Error)) return false
+    return /decrypt|bad\s*decrypt/i.test(err.message)
+  }),
+}))
+
+vi.mock("../credentials", () => ({
+  CLIENT_CONNECTION_COLUMNS: {
+    name: "downloadClients.name",
+    host: "downloadClients.host",
+    port: "downloadClients.port",
+    useSsl: "downloadClients.useSsl",
+    encryptedUsername: "downloadClients.encryptedUsername",
+    encryptedPassword: "downloadClients.encryptedPassword",
+  },
+}))
+
+vi.mock("../fetch", () => ({
+  fetchAndMergeTorrents: vi.fn(),
+  stripSensitiveTorrentFields: vi.fn((t: Record<string, unknown>) => t),
+}))
+
+vi.mock("../merge", () => ({
+  mergeTorrentLists: vi.fn((lists: unknown[][]) => lists.flat()),
+  stampClientNames: vi.fn(
+    (
+      clientTorrents: { clientName: string; torrents: { hash: string }[] }[],
+      merged: { hash: string }[]
+    ) => {
+      const hashClients = new Map<string, string[]>()
+      for (const { clientName, torrents } of clientTorrents) {
+        for (const t of torrents) {
+          const names = hashClients.get(t.hash) ?? []
+          names.push(clientName)
+          hashClients.set(t.hash, names)
+        }
+      }
+      return merged.map((t) => ({
+        ...t,
+        clientName: (hashClients.get(t.hash) ?? []).join(", "),
+      }))
+    }
+  ),
+  aggregateCrossSeedTags: vi.fn((clients: { crossSeedTags: string[] }[]) => {
+    const tagSet = new Set<string>()
+    for (const c of clients) {
+      for (const tag of c.crossSeedTags) tagSet.add(tag)
+    }
+    return [...tagSet]
+  }),
+}))
+
+vi.mock("../sync-store", () => ({
+  STORE_MAX_AGE_MS: 10 * 60 * 1000,
+  isStoreFresh: vi.fn(() => false),
+  getFilteredTorrents: vi.fn(() => []),
+}))
+
+vi.mock("../transforms", () => ({
+  slimTorrentForCache: vi.fn((t: unknown) => t),
+}))
+
+vi.mock("../qbt/transport", () => ({
+  buildBaseUrl: vi.fn(
+    (host: string, port: number, ssl: boolean) => `${ssl ? "https" : "http"}://${host}:${port}`
+  ),
+  parseCachedTorrents: vi.fn(() => []),
+}))
+
+// ---------------------------------------------------------------------------
+// Re-import mocked modules + module under test
+// ---------------------------------------------------------------------------
+
+import { testClientConnection } from "../coordinator"
+import { createAdapterForClient } from "../factory"
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function setupDbSelect(rows: unknown[]) {
+  const mockLimit = vi.fn().mockResolvedValue(rows)
+  const mockWhere = vi.fn().mockReturnValue({ limit: mockLimit })
+  const mockFrom = vi.fn().mockReturnValue({ where: mockWhere })
+  mockSelect.mockReturnValue({ from: mockFrom })
+}
+
+function makeClientRow() {
+  return {
+    name: "Home qBT",
+    host: "localhost",
+    port: 8080,
+    useSsl: false,
+    type: "qbittorrent",
+    encryptedUsername: "enc-admin",
+    encryptedPassword: "enc-pass",
+    crossSeedTags: null,
+  }
+}
+
+const FAKE_KEY = Buffer.from("0".repeat(64), "hex")
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("testClientConnection", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockAdapter.testConnection.mockReset()
+    vi.mocked(createAdapterForClient).mockReturnValue(mockAdapter)
+  })
+
+  it("returns 404 when no client is found in the DB", async () => {
+    setupDbSelect([])
+
+    const result = await testClientConnection(99, FAKE_KEY)
+
+    expect(result).toEqual({ error: "Client not found", status: 404 })
+  })
+
+  it("returns 401 when credential decryption fails (stale key)", async () => {
+    setupDbSelect([makeClientRow()])
+    vi.mocked(createAdapterForClient).mockImplementation(() => {
+      throw new Error("decrypt credentials failed for client")
+    })
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({ error: "Session expired. Please log in again", status: 401 })
+  })
+
+  it("returns { success: true } when adapter.testConnection() resolves", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockResolvedValue(undefined)
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({ success: true })
+    expect(createAdapterForClient).toHaveBeenCalledWith(
+      expect.objectContaining({ host: "localhost", type: "qbittorrent" }),
+      FAKE_KEY
+    )
+  })
+
+  it("returns 422 with descriptive message on timeout error", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockRejectedValue(new Error("request timed out after 10s"))
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({
+      error: "Request timed out",
+      status: 422,
+    })
+  })
+
+  it("returns 422 with descriptive message on ECONNREFUSED", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockRejectedValue(new Error("connect ECONNREFUSED 127.0.0.1:8080"))
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({
+      error: "Connection refused",
+      status: 422,
+    })
+  })
+
+  it("returns 422 with descriptive message on 403 error", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockRejectedValue(new Error("HTTP 403 Forbidden"))
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({
+      error: "Authentication failed",
+      status: 422,
+    })
+  })
+
+  it("returns 422 with fallback message for unknown errors", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockRejectedValue(new Error("some unexpected problem"))
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({
+      error: "Connection test failed",
+      status: 422,
+    })
+  })
+
+  it("handles non-Error throws (raw string)", async () => {
+    setupDbSelect([makeClientRow()])
+    mockAdapter.testConnection.mockRejectedValue("something went wrong")
+
+    const result = await testClientConnection(1, FAKE_KEY)
+
+    expect(result).toEqual({
+      error: "Connection test failed",
+      status: 422,
+    })
+  })
+})
diff --git a/src/lib/download-clients/__tests__/utils.test.ts b/src/lib/download-clients/__tests__/utils.test.ts
new file mode 100644
index 00000000..a8bcf0a4
--- /dev/null
+++ b/src/lib/download-clients/__tests__/utils.test.ts
@@ -0,0 +1,93 @@
+// src/lib/download-clients/__tests__/utils.test.ts
+
+import { describe, expect, it } from "vitest"
+import { slimTorrentForCache } from "../transforms"
+
+const FULL_TORRENT = {
+  hash: "abc123",
+  name: "Test Torrent",
+  state: "uploading",
+  tags: "aither, blutopia",
+  category: "movies",
+  uploaded: 1048576000,
+  downloaded: 524288000,
+  ratio: 2.0,
+  size: 524288000,
+  seedingTime: 86400,
+  activeTime: 90000,
+  addedAt: 1700000000,
+  completedAt: 1700003600,
+  lastActivityAt: 1700090000,
+  remaining: 0,
+  seedCount: 10,
+  leechCount: 2,
+  swarmSeeders: 50,
+  swarmLeechers: 5,
+  uploadSpeed: 102400,
+  downloadSpeed: 0,
+  availability: 1.0,
+  progress: 1.0,
+  tracker: "https://tracker.example.com/announce?passkey=secret",
+  contentPath: "/data/movies/test",
+  savePath: "/data/movies",
+  lastSeenComplete: 1700003600,
+  isPrivate: true,
+}
+
+describe("slimTorrentForCache", () => {
+  it("retains exactly 23 fields", () => {
+    const slim = slimTorrentForCache(FULL_TORRENT)
+    expect(Object.keys(slim)).toHaveLength(23)
+  })
+
+  it("retains only the expected fields in sorted order", () => {
+    const slim = slimTorrentForCache(FULL_TORRENT)
+    expect(Object.keys(slim).sort()).toEqual([
+      "activeTime",
+      "addedAt",
+      "availability",
+      "category",
+      "completedAt",
+      "downloadSpeed",
+      "downloaded",
+      "hash",
+      "lastActivityAt",
+      "leechCount",
+      "name",
+      "progress",
+      "ratio",
+      "remaining",
+      "seedCount",
+      "seedingTime",
+      "size",
+      "state",
+      "swarmLeechers",
+      "swarmSeeders",
+      "tags",
+      "uploadSpeed",
+      "uploaded",
+    ])
+  })
+
+  it("preserves field values exactly", () => {
+    const slim = slimTorrentForCache(FULL_TORRENT)
+    expect(slim.hash).toBe("abc123")
+    expect(slim.uploaded).toBe(1048576000)
+    expect(slim.ratio).toBe(2.0)
+    expect(slim.seedingTime).toBe(86400)
+    expect(slim.tags).toBe("aither, blutopia")
+  })
+
+  it("excludes sensitive fields", () => {
+    const slim = slimTorrentForCache(FULL_TORRENT) as Record<string, unknown>
+    expect(slim.tracker).toBeUndefined()
+    expect(slim.contentPath).toBeUndefined()
+    expect(slim.savePath).toBeUndefined()
+  })
+
+  it("excludes unused qBT config fields", () => {
+    const slim = slimTorrentForCache(FULL_TORRENT) as Record<string, unknown>
+    expect(slim.isPrivate).toBeUndefined()
+    expect(slim.lastSeenComplete).toBeUndefined()
+  })
+})
diff --git a/src/lib/download-clients/adapters/qbt.ts b/src/lib/download-clients/adapters/qbt.ts
new file mode 100644
index 00000000..0e6ec749
--- /dev/null
+++ b/src/lib/download-clients/adapters/qbt.ts
@@ -0,0 +1,101 @@
+// src/lib/download-clients/adapters/qbt.ts
+
+import { mapQbtDelta, mapQbtTorrent } from "../field-map"
+import {
+  buildBaseUrl,
+  invalidateSession,
+  login,
+  getTorrents as qbtGetTorrents,
+  getTransferInfo as qbtGetTransferInfo,
+  syncMaindata,
+  withSessionRetry,
+} from "../qbt/transport"
+import type { ClientAdapter, DeltaSyncResponse, TorrentRecord, TransferStats } from "../types"
+
+/**
+ * qBittorrent adapter. Wraps the existing transport layer, managing SID
+ * session cookies internally via withSessionRetry. Returns normalized
+ * TorrentRecord/DeltaSyncResponse shapes (camelCase) rather than raw qBT types.
+ */
+export class QbtClientAdapter implements ClientAdapter {
+  readonly type = "qbittorrent" as const
+  readonly baseUrl: string
+
+  constructor(
+    private readonly host: string,
+    private readonly port: number,
+    private readonly ssl: boolean,
+    private readonly username: string,
+    private readonly password: string
+  ) {
+    this.baseUrl = buildBaseUrl(host, port, ssl)
+  }
+
+  async testConnection(): Promise<void> {
+    invalidateSession(this.baseUrl)
+    const sid = await login(this.host, this.port, this.ssl, this.username, this.password)
+    await qbtGetTransferInfo(this.baseUrl, sid)
+  }
+
+  async getTorrents(options?: { tag?: string; filter?: string }): Promise<TorrentRecord[]> {
+    const raw = await withSessionRetry(
+      this.host,
+      this.port,
+      this.ssl,
+      this.username,
+      this.password,
+      (baseUrl, sid) => qbtGetTorrents(baseUrl, sid, options?.tag, options?.filter)
+    )
+    return raw.map((t) => mapQbtTorrent(t as unknown as Record<string, unknown>))
+  }
+
+  async getTransferInfo(): Promise<TransferStats> {
+    const info = await withSessionRetry(
+      this.host,
+      this.port,
+      this.ssl,
+      this.username,
+      this.password,
+      (baseUrl, sid) => qbtGetTransferInfo(baseUrl, sid)
+    )
+    return { uploadSpeed: info.up_info_speed, downloadSpeed: info.dl_info_speed }
+  }
+
+  async getDeltaSync(rid: number): Promise<DeltaSyncResponse> {
+    const raw = await withSessionRetry(
+      this.host,
+      this.port,
+      this.ssl,
+      this.username,
+      this.password,
+      (baseUrl, sid) => syncMaindata(baseUrl, sid, rid)
+    )
+    return {
+      rid: raw.rid,
+      fullUpdate: raw.full_update,
+      torrents: raw.torrents
+        ? Object.fromEntries(
+            Object.entries(raw.torrents).map(([hash, partial]) => [
+              hash,
+              mapQbtDelta(partial as Record<string, unknown>),
+            ])
+          )
+        : undefined,
+      torrentsRemoved: raw.torrents_removed,
+      serverState: raw.server_state
+        ? {
+            uploadSpeed: (raw.server_state as Record<string, number>).up_info_speed ?? 0,
+            downloadSpeed: (raw.server_state as Record<string, number>).dl_info_speed ?? 0,
+          }
+        : undefined,
+      tags: raw.tags,
+      tagsRemoved: raw.tags_removed,
+      categories: raw.categories,
+      categoriesRemoved: raw.categories_removed,
+    }
+  }
+
+  dispose(): void {
+    invalidateSession(this.baseUrl)
+  }
+}
diff --git a/src/lib/qbt/aggregator.ts b/src/lib/download-clients/aggregator.ts
similarity index 76%
rename from src/lib/qbt/aggregator.ts
rename to src/lib/download-clients/aggregator.ts
index 9033c32a..559dd87d 100644
--- a/src/lib/qbt/aggregator.ts
+++ b/src/lib/download-clients/aggregator.ts
@@ -1,10 +1,11 @@
-// src/lib/qbt/aggregator.ts
+// src/lib/download-clients/aggregator.ts
 
 import { LEECHING_STATES, parseTorrentTags, SEEDING_STATES } from "@/lib/fleet"
-import type { ClientStats, QbtTorrent, TagStats } from "./types"
+import type { ClientStats, TagStats } from "./qbt/types"
+import type { TorrentRecord } from "./types"
 
 export function aggregateByTag(
-  torrents: QbtTorrent[],
+  torrents: TorrentRecord[],
   trackerTags: string[],
   crossSeedTags: string[]
 ): ClientStats {
@@ -49,12 +50,12 @@ export function aggregateByTag(
     if (matchedTags.length === 0) {
       if (seeding) {
         untaggedBucket.seedingCount++
-        untaggedBucket.uploadSpeed += torrent.upspeed
-        untaggedBucket.downloadSpeed += torrent.dlspeed
+        untaggedBucket.uploadSpeed += torrent.uploadSpeed
+        untaggedBucket.downloadSpeed += torrent.downloadSpeed
       } else if (leeching) {
         untaggedBucket.leechingCount++
-        untaggedBucket.uploadSpeed += torrent.upspeed
-        untaggedBucket.downloadSpeed += torrent.dlspeed
+        untaggedBucket.uploadSpeed += torrent.uploadSpeed
+        untaggedBucket.downloadSpeed += torrent.downloadSpeed
       }
     } else {
       for (const matchedTag of matchedTags) {
@@ -62,12 +63,12 @@ export function aggregateByTag(
         if (!bucket) continue
         if (seeding) {
           bucket.seedingCount++
-          bucket.uploadSpeed += torrent.upspeed
-          bucket.downloadSpeed += torrent.dlspeed
+          bucket.uploadSpeed += torrent.uploadSpeed
+          bucket.downloadSpeed += torrent.downloadSpeed
         } else if (leeching) {
           bucket.leechingCount++
-          bucket.uploadSpeed += torrent.upspeed
-          bucket.downloadSpeed += torrent.dlspeed
+          bucket.uploadSpeed += torrent.uploadSpeed
+          bucket.downloadSpeed += torrent.downloadSpeed
         }
       }
     }
diff --git a/src/lib/download-clients/coordinator.ts b/src/lib/download-clients/coordinator.ts
new file mode 100644
index 00000000..59fb4903
--- /dev/null
+++ b/src/lib/download-clients/coordinator.ts
@@ -0,0 +1,338 @@
+// src/lib/download-clients/coordinator.ts
+//
+// Functions: fetchFleetTorrents, fetchTrackerTorrents,
+//            fetchFleetAggregation, fetchTrackerTorrentsCached,
+//            testClientConnection
+//
+// Multi-client orchestration layer for fleet and per-tracker torrent data.
+// Owns credential queries, tag collection, fan-out, merge, and aggregation.
+
+import "server-only"
+
+import { eq, isNotNull } from "drizzle-orm"
+import { db } from "@/lib/db"
+import { downloadClients, trackers } from "@/lib/db/schema"
+import { isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
+import { parseTorrentTags } from "@/lib/fleet"
+import { computeFleetAggregation, type FleetAggregation } from "@/lib/fleet-aggregation"
+import { CLIENT_CONNECTION_COLUMNS } from "./credentials"
+import { createAdapterForClient } from "./factory"
+import type { MergedResult } from "./fetch"
+import { fetchAndMergeTorrents } from "./fetch"
+import { aggregateCrossSeedTags, mergeTorrentLists, stampClientNames } from "./merge"
+import { buildBaseUrl, parseCachedTorrents } from "./qbt/transport"
+import { getFilteredTorrents, isStoreFresh, STORE_MAX_AGE_MS } from "./sync-store"
+import { type SlimTorrent, slimTorrentForCache } from "./transforms"
+import type { TorrentRecord } from "./types"
+
+// ---------------------------------------------------------------------------
+// Shared helpers
+// ---------------------------------------------------------------------------
+
+/** CLIENT_CONNECTION_COLUMNS + crossSeedTags + type (needed by fetchAndMergeTorrents via adapter factory). */
+const FETCH_CLIENT_COLUMNS = {
+  ...CLIENT_CONNECTION_COLUMNS,
+  crossSeedTags: downloadClients.crossSeedTags,
+  type: downloadClients.type,
+} as const
+
+/** Columns for cached reads (no credentials, includes connection info for sync store lookup). */
+const CACHED_CLIENT_COLUMNS = {
+  id: downloadClients.id,
+  name: downloadClients.name,
+  host: downloadClients.host,
+  port: downloadClients.port,
+  useSsl: downloadClients.useSsl,
+  crossSeedTags: downloadClients.crossSeedTags,
+  cachedTorrentsAt: downloadClients.cachedTorrentsAt,
+} as const
+
+function collectTags(rows: { qbtTag: string | null }[]): string[] {
+  return [
+    ...new Set(
+      rows
+        .map((t) => t.qbtTag)
+        .filter((t): t is string => t !== null && t.trim() !== "")
+        .map((t) => t.trim())
+    ),
+  ]
+}
+
+// ---------------------------------------------------------------------------
+// Live fetch (requires encryption key)
+// ---------------------------------------------------------------------------
+
+/**
+ * Fetch and merge torrents across all enabled clients for all active tracker tags.
+ * Used by the fleet torrents page.
+ */
+export async function fetchFleetTorrents(key: Buffer, filter?: string): Promise<MergedResult> {
+  const [allTrackers, clients] = await Promise.all([
+    db.select({ qbtTag: trackers.qbtTag }).from(trackers).where(eq(trackers.isActive, true)),
+    db.select(FETCH_CLIENT_COLUMNS).from(downloadClients).where(eq(downloadClients.enabled, true)),
+  ])
+
+  const tags = collectTags(allTrackers)
+  return fetchAndMergeTorrents(clients, tags, key, filter)
+}
+
+/**
+ * Fetch and merge torrents across all enabled clients for a single tracker's tag.
+ * Used by the per-tracker torrent page.
+ */
+export async function fetchTrackerTorrents(
+  trackerId: number,
+  key: Buffer,
+  filter?: string
+): Promise<{ result: MergedResult } | { error: string; status: number }> {
+  const [tracker] = await db
+    .select({ qbtTag: trackers.qbtTag })
+    .from(trackers)
+    .where(eq(trackers.id, trackerId))
+    .limit(1)
+
+  if (!tracker) {
+    return { error: "Tracker not found", status: 404 }
+  }
+
+  if (!tracker.qbtTag) {
+    return { error: "No qBittorrent tag configured for this tracker", status: 400 }
+  }
+
+  const clients = await db
+    .select(FETCH_CLIENT_COLUMNS)
+    .from(downloadClients)
+    .where(eq(downloadClients.enabled, true))
+
+  const tag = tracker.qbtTag.trim()
+  const result = await fetchAndMergeTorrents(clients, [tag], key, filter)
+  return { result }
+}
+
+// ---------------------------------------------------------------------------
+// Cached reads (no encryption key needed)
+// ---------------------------------------------------------------------------
+
+export interface FleetAggregationResponse extends FleetAggregation {
+  clientErrors: string[]
+  clientCount: number
+  cachedAt: string | null
+}
+
+/**
+ * Read cached torrent data across all clients, merge, and compute fleet aggregation.
+ * Fast path: in-memory sync store. Fallback: Postgres JSONB (cold start only).
+ * No live qBT HTTP requests.
+ */
+export async function fetchFleetAggregation(): Promise<FleetAggregationResponse> {
+  const clients = await db
+    .select(CACHED_CLIENT_COLUMNS)
+    .from(downloadClients)
+    .where(eq(downloadClients.enabled, true))
+
+  if (clients.length === 0) {
+    return {
+      ...computeFleetAggregation([], [], []),
+      clientErrors: [],
+      clientCount: 0,
+      cachedAt: null,
+    }
+  }
+
+  const trackerTagRows = await db
+    .select({
+      qbtTag: trackers.qbtTag,
+      name: trackers.name,
+      color: trackers.color,
+    })
+    .from(trackers)
+    .where(isNotNull(trackers.qbtTag))
+  const trackerTagStrings = trackerTagRows.map((r) => r.qbtTag as string)
+  const trackerTagsWithMeta = trackerTagRows.map((r) => ({
+    tag: r.qbtTag as string,
+    name: r.name,
+    color: r.color ?? "#01d4ff",
+  }))
+
+  const crossSeedTags = aggregateCrossSeedTags(
+    clients.map((c) => ({ crossSeedTags: c.crossSeedTags ?? [] }))
+  )
+  const allTags = [...new Set([...trackerTagStrings, ...crossSeedTags])]
+  const tagSet = new Set(allTags.map((t) => t.toLowerCase()))
+  const tagPredicate = (t: TorrentRecord) => {
+    if (!t.tags) return false
+    return parseTorrentTags(t.tags).some((tag) => tagSet.has(tag))
+  }
+
+  const clientTorrents: { clientName: string; torrents: (TorrentRecord | SlimTorrent)[] }[] = []
+  const clientErrors: string[] = []
+  let oldestCacheAt: Date | null = null
+
+  for (const client of clients) {
+    const baseUrl = buildBaseUrl(client.host, client.port, client.useSsl)
+    let torrents: TorrentRecord[] | SlimTorrent[]
+
+    if (isStoreFresh(baseUrl, STORE_MAX_AGE_MS)) {
+      torrents = getFilteredTorrents(baseUrl, tagPredicate).map(slimTorrentForCache)
+    } else {
+      const [row] = await db
+        .select({ cachedTorrents: downloadClients.cachedTorrents })
+        .from(downloadClients)
+        .where(eq(downloadClients.id, client.id))
+        .limit(1)
+      torrents = row ? parseCachedTorrents(row.cachedTorrents) : []
+    }
+
+    if (torrents.length === 0) {
+      if (client.cachedTorrentsAt) {
+        clientErrors.push(`${client.name}: cached data unavailable or corrupt`)
+      }
+      continue
+    }
+    clientTorrents.push({ clientName: client.name, torrents })
+
+    if (client.cachedTorrentsAt) {
+      if (!oldestCacheAt || client.cachedTorrentsAt < oldestCacheAt) {
+        oldestCacheAt = client.cachedTorrentsAt
+      }
+    }
+  }
+
+  const merged = mergeTorrentLists(clientTorrents.map((c) => c.torrents))
+  const stamped = stampClientNames(clientTorrents, merged)
+
+  const aggregation = computeFleetAggregation(stamped, trackerTagsWithMeta, crossSeedTags)
+
+  return {
+    ...aggregation,
+    clientErrors,
+    clientCount: clients.length,
+    cachedAt: oldestCacheAt?.toISOString() ?? null,
+  }
+}
+
+interface CachedTorrentResult {
+  torrents: (SlimTorrent & { clientName: string })[]
+  crossSeedTags: string[]
+  clientErrors: string[]
+  clientCount: number
+  cachedAt: string | null
+}
+
+/**
+ * Read cached torrent data for a single tracker from Postgres JSONB.
+ * Used as fallback when live qBT connection fails.
+ */
+export async function fetchTrackerTorrentsCached(
+  trackerId: number
+): Promise<{ result: CachedTorrentResult } | { error: string; status: number }> {
+  const [tracker] = await db
+    .select({ qbtTag: trackers.qbtTag })
+    .from(trackers)
+    .where(eq(trackers.id, trackerId))
+    .limit(1)
+
+  if (!tracker) {
+    return { error: "Tracker not found", status: 404 }
+  }
+
+  if (!tracker.qbtTag) {
+    return { error: "No qBittorrent tag configured", status: 400 }
+  }
+
+  const clients = await db
+    .select({
+      id: downloadClients.id,
+      name: downloadClients.name,
+      cachedTorrents: downloadClients.cachedTorrents,
+      cachedTorrentsAt: downloadClients.cachedTorrentsAt,
+      crossSeedTags: downloadClients.crossSeedTags,
+    })
+    .from(downloadClients)
+    .where(eq(downloadClients.enabled, true))
+
+  if (clients.length === 0) {
+    return {
+      result: { torrents: [], crossSeedTags: [], clientErrors: [], clientCount: 0, cachedAt: null },
+    }
+  }
+
+  const tag = tracker.qbtTag.trim().toLowerCase()
+  const clientTorrents: { clientName: string; torrents: SlimTorrent[] }[] = []
+  const crossSeedClients: { crossSeedTags: string[] }[] = []
+  let oldestCacheAt: Date | null = null
+
+  for (const client of clients) {
+    const all = parseCachedTorrents(client.cachedTorrents)
+    if (all.length === 0) continue
+
+    const filtered = all.filter((t) => parseTorrentTags(t.tags).includes(tag))
+    if (filtered.length > 0) {
+      clientTorrents.push({ clientName: client.name, torrents: filtered })
+    }
+
+    crossSeedClients.push({ crossSeedTags: client.crossSeedTags ?? [] })
+
+    if (client.cachedTorrentsAt) {
+      if (!oldestCacheAt || client.cachedTorrentsAt < oldestCacheAt) {
+        oldestCacheAt = client.cachedTorrentsAt
+      }
+    }
+  }
+
+  const merged = mergeTorrentLists(clientTorrents.map((c) => c.torrents))
+  const crossSeedTags = aggregateCrossSeedTags(crossSeedClients)
+
+  // SlimTorrent already has sensitive fields stripped (done at cache-write time by slimTorrentForCache).
+  const stamped = stampClientNames(clientTorrents, merged)
+
+  return {
+    result: {
+      torrents: stamped,
+      crossSeedTags,
+      clientErrors: [],
+      clientCount: clients.length,
+      cachedAt: oldestCacheAt?.toISOString() ?? null,
+    },
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Connection testing (adapter-based)
+// ---------------------------------------------------------------------------
+
+/**
+ * Test a download client connection via the adapter layer.
+ * Returns a plain result object (not NextResponse) so route handlers
+ * control the HTTP response shape.
+ */
+export async function testClientConnection(
+  clientId: number,
+  key: Buffer
+): Promise<{ success: true } | { error: string; status: number }> {
+  const [client] = await db
+    .select({
+      ...CLIENT_CONNECTION_COLUMNS,
+      type: downloadClients.type,
+      crossSeedTags: downloadClients.crossSeedTags,
+    })
+    .from(downloadClients)
+    .where(eq(downloadClients.id, clientId))
+    .limit(1)
+
+  if (!client) {
+    return { error: "Client not found", status: 404 }
+  }
+
+  try {
+    const adapter = createAdapterForClient(client, key)
+    await adapter.testConnection()
+    return { success: true }
+  } catch (error) {
+    if (isDecryptionError(error)) {
+      return { error: "Session expired. Please log in again", status: 401 }
+    }
+    const raw = error instanceof Error ? error.message : ""
+    return { error: sanitizeNetworkError(raw, "Connection test failed"), status: 422 }
+  }
+}
diff --git a/src/lib/client-decrypt.ts b/src/lib/download-clients/credentials.ts
similarity index 63%
rename from src/lib/client-decrypt.ts
rename to src/lib/download-clients/credentials.ts
index 6af2d763..8d9ccb47 100644
--- a/src/lib/client-decrypt.ts
+++ b/src/lib/download-clients/credentials.ts
@@ -1,12 +1,20 @@
-// src/lib/client-decrypt.ts
-//
-// Functions: decryptClientCredentials
-
+// src/lib/download-clients/credentials.ts
 import "server-only"
 
 import { decrypt } from "@/lib/crypto"
+import { downloadClients } from "@/lib/db/schema"
 import { isDecryptionError } from "@/lib/error-utils"
 
+/** Columns needed for client connection + credential decryption. */
+export const CLIENT_CONNECTION_COLUMNS = {
+  name: downloadClients.name,
+  host: downloadClients.host,
+  port: downloadClients.port,
+  useSsl: downloadClients.useSsl,
+  encryptedUsername: downloadClients.encryptedUsername,
+  encryptedPassword: downloadClients.encryptedPassword,
+} as const
+
 export function decryptClientCredentials(
   client: { name: string; encryptedUsername: string; encryptedPassword: string },
   key: Buffer
@@ -17,7 +25,7 @@ export function decryptClientCredentials(
       password: decrypt(client.encryptedPassword, key),
     }
   } catch (err) {
-    // Use "decrypt" prefix only for genuine AES-GCM auth failures so
+    // Use "decrypt" prefix only for AES-GCM auth failures so
     // isDecryptionError() in callers correctly classifies key mismatches.
     const cause = err instanceof Error ? err.message : String(err)
     if (isDecryptionError(err)) {
diff --git a/src/lib/download-clients/factory.ts b/src/lib/download-clients/factory.ts
new file mode 100644
index 00000000..52422d59
--- /dev/null
+++ b/src/lib/download-clients/factory.ts
@@ -0,0 +1,40 @@
+// src/lib/download-clients/factory.ts
+
+import { QbtClientAdapter } from "./adapters/qbt"
+import { decryptClientCredentials } from "./credentials"
+import type { ClientAdapter, ClientType, DownloadClientRow } from "./types"
+import { assertClientType } from "./types"
+
+/** Internal: create adapter from decrypted credentials + validated type. */
+function createClientAdapter(
+  type: ClientType,
+  host: string,
+  port: number,
+  ssl: boolean,
+  username: string,
+  password: string
+): ClientAdapter {
+  switch (type) {
+    case "qbittorrent":
+      return new QbtClientAdapter(host, port, ssl, username, password)
+    default:
+      throw new Error(`Unsupported client type: "${type}"`)
+  }
+}
+
+/**
+ * Create an adapter from an encrypted client row. Handles credential decryption
+ * and client type validation in one call. Eliminates the repeated
+ * decrypt-then-create pattern across coordinator, fetch, and scheduler.
+ */
+export function createAdapterForClient(client: DownloadClientRow, key: Buffer): ClientAdapter {
+  const { username, password } = decryptClientCredentials(client, key)
+  return createClientAdapter(
+    assertClientType(client.type),
+    client.host,
+    client.port,
+    client.useSsl,
+    username,
+    password
+  )
+}
diff --git a/src/lib/download-clients/fetch.ts b/src/lib/download-clients/fetch.ts
new file mode 100644
index 00000000..6c726b30
--- /dev/null
+++ b/src/lib/download-clients/fetch.ts
@@ -0,0 +1,167 @@
+// src/lib/download-clients/fetch.ts
+import "server-only"
+
+import { isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
+import { parseTorrentTags } from "@/lib/fleet"
+import { createAdapterForClient } from "./factory"
+import { aggregateCrossSeedTags, mergeTorrentLists, stampClientNames } from "./merge"
+import { buildBaseUrl } from "./qbt/transport"
+import { getFilteredTorrents, isStoreFresh, STORE_MAX_AGE_MS } from "./sync-store"
+import type { DownloadClientRow, TorrentRecord } from "./types"
+
+// ---------------------------------------------------------------------------
+// Sensitive field stripping
+// ---------------------------------------------------------------------------
+
+/**
+ * Strips tracker announce URL, contentPath, and savePath from a torrent object.
+ * These fields may contain passkeys or expose server filesystem paths.
+ */
+export function stripSensitiveTorrentFields<
+  T extends Pick<TorrentRecord, "tracker" | "contentPath" | "savePath">,
+>(torrent: T): Omit<T, "tracker" | "contentPath" | "savePath"> {
+  const { tracker: _t, contentPath: _cp, savePath: _sp, ...rest } = torrent
+  return rest
+}
+
+// ---------------------------------------------------------------------------
+// Fetch + merge orchestration
+// ---------------------------------------------------------------------------
+
+export interface MergedResult {
+  torrents: (Omit<TorrentRecord, "tracker" | "contentPath" | "savePath"> & {
+    clientName: string
+  })[]
+  crossSeedTags: string[]
+  clientErrors: string[]
+  clientCount: number
+  /** True when every client failure was a decryption error, indicating a stale session key. */
+  sessionExpired: boolean
+}
+
+async function fetchClientTorrents(
+  client: DownloadClientRow,
+  tags: string[],
+  key: Buffer,
+  filter?: string
+): Promise<TorrentRecord[]> {
+  const baseUrl = buildBaseUrl(client.host, client.port, client.useSsl)
+
+  // Fast path: store is warm from scheduler, serve from memory.
+  // Falls back to live fetch if store is stale (i.e. scheduler missed 2+ cycles).
+  // Skip when filter is requested. Active speeds need live qBT data.
+  if (!filter && isStoreFresh(baseUrl, STORE_MAX_AGE_MS)) {
+    const tagSet = new Set(tags.map((t) => t.toLowerCase()))
+    return getFilteredTorrents(baseUrl, (t) => {
+      if (!t.tags) return false
+      return parseTorrentTags(t.tags).some((tag) => tagSet.has(tag))
+    })
+  }
+
+  // Cold path: store not yet populated, stale, or filter requested (i.e. active).
+  // Fall back to live per-tag fetch.
+  const adapter = createAdapterForClient(client, key)
+
+  if (tags.length === 1) {
+    return adapter.getTorrents({ tag: tags[0], filter: filter as "active" | undefined })
+  }
+
+  const results = await Promise.allSettled(tags.map((tag) => adapter.getTorrents({ tag })))
+  const allTorrents: TorrentRecord[] = []
+  for (const result of results) {
+    if (result.status === "fulfilled") allTorrents.push(...result.value)
+  }
+  return allTorrents
+}
+
+/**
+ * Fetch torrents from all provided clients for the given tags, merge and
+ * deduplicate by hash, aggregate cross-seed tags, strip sensitive fields,
+ * and stamp each merged torrent with the originating client name(s).
+ *
+ * @param clients  Enabled download client rows (credentials encrypted).
+ * @param tags     qBT tag(s) to fetch. Single-tag callers may also pass filter.
+ * @param key      AES-256-GCM decryption key derived from the master password.
+ * @param filter   Optional qBT filter string (i.e. "active"). Only applied when
+ *                 tags has exactly one entry.
+ */
+/** Per-client deadline for live fetches (seconds). Keeps the UI responsive
+ *  when one client is offline — the online client's data arrives immediately
+ *  while the offline one is cut short after this deadline instead of waiting
+ *  for the full 30s retry cycle (15s timeout x 2 attempts). */
+const CLIENT_DEADLINE_MS = 5_000
+
+export async function fetchAndMergeTorrents(
+  clients: DownloadClientRow[],
+  tags: string[],
+  key: Buffer,
+  filter?: string
+): Promise<MergedResult> {
+  const empty: MergedResult = {
+    torrents: [],
+    crossSeedTags: [],
+    clientErrors: [],
+    clientCount: 0,
+    sessionExpired: false,
+  }
+
+  if (clients.length === 0 || tags.length === 0) {
+    return empty
+  }
+
+  const results = await Promise.allSettled(
+    clients.map(async (client) => {
+      const deadline = new Promise<never>((_, reject) =>
+        setTimeout(() => reject(new Error("Client deadline exceeded")), CLIENT_DEADLINE_MS)
+      )
+      const work = (async () => ({
+        clientName: client.name,
+        crossSeedTags: client.crossSeedTags ?? [],
+        torrents: await fetchClientTorrents(client, tags, key, filter),
+      }))()
+      return Promise.race([work, deadline])
+    })
+  )
+
+  const clientTorrents: { clientName: string; torrents: TorrentRecord[] }[] = []
+  const crossSeedClients: { crossSeedTags: string[] }[] = []
+  const clientErrors: string[] = []
+  let decryptionFailureCount = 0
+
+  for (let i = 0; i < results.length; i++) {
+    const result = results[i]
+    if (result.status === "fulfilled") {
+      clientTorrents.push({
+        clientName: result.value.clientName,
+        torrents: result.value.torrents,
+      })
+      crossSeedClients.push({ crossSeedTags: result.value.crossSeedTags })
+    } else {
+      const clientName = clients[i].name
+      const isDecrypt = isDecryptionError(result.reason)
+      if (isDecrypt) decryptionFailureCount++
+      const raw = result.reason instanceof Error ? result.reason.message : "Unknown error"
+      const message = isDecrypt ? "Credential decryption failed" : sanitizeNetworkError(raw)
+      clientErrors.push(`${clientName}: ${message}`)
+    }
+  }
+
+  // All clients failed with decryption errors. Which means the session key is stale.
+  const sessionExpired =
+    clients.length > 0 && clientTorrents.length === 0 && decryptionFailureCount === clients.length
+
+  const merged = mergeTorrentLists(clientTorrents.map((c) => c.torrents))
+  const crossSeedTags = aggregateCrossSeedTags(crossSeedClients)
+
+  const torrents = stampClientNames(clientTorrents, merged).map((t) => ({
+    ...stripSensitiveTorrentFields(t),
+  }))
+
+  return {
+    torrents,
+    crossSeedTags,
+    clientErrors,
+    clientCount: clients.length,
+    sessionExpired,
+  }
+}
diff --git a/src/lib/download-clients/field-map.ts b/src/lib/download-clients/field-map.ts
new file mode 100644
index 00000000..06880bc8
--- /dev/null
+++ b/src/lib/download-clients/field-map.ts
@@ -0,0 +1,50 @@
+// src/lib/download-clients/field-map.ts
+
+import { log } from "@/lib/logger"
+import type { TorrentRecord } from "./types"
+
+const FIELD_MAP: Record<string, string> = {
+  upspeed: "uploadSpeed",
+  dlspeed: "downloadSpeed",
+  num_seeds: "seedCount",
+  num_leechs: "leechCount",
+  num_complete: "swarmSeeders",
+  num_incomplete: "swarmLeechers",
+  added_on: "addedAt",
+  completion_on: "completedAt",
+  last_activity: "lastActivityAt",
+  seeding_time: "seedingTime",
+  time_active: "activeTime",
+  seen_complete: "lastSeenComplete",
+  amount_left: "remaining",
+  content_path: "contentPath",
+  save_path: "savePath",
+  is_private: "isPrivate",
+}
+
+const REQUIRED_NUMERIC = ["uploadSpeed", "downloadSpeed", "size", "ratio", "uploaded", "downloaded"]
+
+export function mapQbtTorrent(raw: Record<string, unknown>): TorrentRecord {
+  const result: Record<string, unknown> = {}
+  for (const [key, value] of Object.entries(raw)) {
+    result[FIELD_MAP[key] ?? key] = value
+  }
+  for (const field of REQUIRED_NUMERIC) {
+    if (typeof result[field] !== "number") {
+      log.warn(
+        { hash: result.hash, field, value: result[field] },
+        "mapQbtTorrent: missing or non-numeric field, defaulting to 0"
+      )
+      result[field] = 0
+    }
+  }
+  return result as unknown as TorrentRecord
+}
+
+export function mapQbtDelta(partial: Record<string, unknown>): Partial<TorrentRecord> {
+  const result: Record<string, unknown> = {}
+  for (const [key, value] of Object.entries(partial)) {
+    result[FIELD_MAP[key] ?? key] = value
+  }
+  return result as Partial<TorrentRecord>
+}
diff --git a/src/lib/download-clients/index.ts b/src/lib/download-clients/index.ts
new file mode 100644
index 00000000..4bf901a0
--- /dev/null
+++ b/src/lib/download-clients/index.ts
@@ -0,0 +1,45 @@
+// src/lib/download-clients/index.ts
+
+export { QbtClientAdapter } from "./adapters/qbt"
+export { aggregateByTag } from "./aggregator"
+export type { FleetAggregationResponse } from "./coordinator"
+export {
+  fetchFleetAggregation,
+  fetchFleetTorrents,
+  fetchTrackerTorrents,
+  fetchTrackerTorrentsCached,
+  testClientConnection,
+} from "./coordinator"
+export { CLIENT_CONNECTION_COLUMNS, decryptClientCredentials } from "./credentials"
+export { createAdapterForClient } from "./factory"
+export type { MergedResult } from "./fetch"
+export { fetchAndMergeTorrents, stripSensitiveTorrentFields } from "./fetch"
+export { mapQbtDelta, mapQbtTorrent } from "./field-map"
+export type { RawTorrent } from "./merge"
+export { aggregateCrossSeedTags, mergeTorrentLists, stampClientNames } from "./merge"
+export { clearAllSessions, parseCachedTorrents } from "./qbt/transport"
+export type { ClientStats, TagStats } from "./qbt/types"
+export type { SpeedSnapshot } from "./speed-cache"
+export { clearSpeedCache, getSpeedSnapshots, pushSpeedSnapshot } from "./speed-cache"
+export {
+  applyMaindataUpdate,
+  clearAllStores,
+  getFilteredTorrents,
+  getStoredTorrents,
+  getStoreRevision,
+  isStoreFresh,
+  isStoreInitialized,
+  replaceStoreTorrents,
+  resetStore,
+  STORE_MAX_AGE_MS,
+} from "./sync-store"
+export type { SlimTorrent } from "./transforms"
+export { slimTorrentForCache } from "./transforms"
+export type {
+  ClientAdapter,
+  ClientType,
+  DeltaSyncResponse,
+  TorrentRecord,
+  TransferStats,
+} from "./types"
+export { assertClientType, VALID_CLIENT_TYPES } from "./types"
diff --git a/src/lib/qbt/merge.ts b/src/lib/download-clients/merge.ts
similarity index 53%
rename from src/lib/qbt/merge.ts
rename to src/lib/download-clients/merge.ts
index de568908..d0a724bd 100644
--- a/src/lib/qbt/merge.ts
+++ b/src/lib/download-clients/merge.ts
@@ -1,22 +1,21 @@
-// src/lib/qbt/merge.ts
+// src/lib/download-clients/merge.ts
 //
 // Functions: mergeTorrentLists, aggregateCrossSeedTags
 
 /**
- * Raw torrent shape returned by the qBT API (snake_case).
- * Intentionally minimal — only fields the merge logic touches.
+ * Minimal torrent shape the merge algorithm touches.
  * The full object passes through untouched.
  */
 export interface RawTorrent {
   hash: string
-  upspeed: number
-  dlspeed: number
-  seeding_time: number
+  uploadSpeed: number
+  downloadSpeed: number
+  seedingTime: number
   progress: number
-  num_seeds: number
-  num_complete: number
-  num_leechs: number
-  num_incomplete: number
+  seedCount: number
+  swarmSeeders: number
+  leechCount: number
+  swarmLeechers: number
   uploaded: number
   downloaded: number
   ratio: number
@@ -27,7 +26,7 @@ export interface RawTorrent {
  *
  * Same hash across clients = same torrent seeded from multiple places.
  *   - Speeds are summed (different peers per client)
- *   - seeding_time takes the max (longest-running instance)
+ *   - seedingTime takes the max (longest-running instance)
  *   - progress takes the max (most complete instance)
  *   - Swarm counts take the max (best visibility)
  *   - uploaded/downloaded are summed (total contribution across clients)
@@ -44,23 +43,17 @@ export function mergeTorrentLists<T extends RawTorrent>(lists: T[][]): T[] {
         continue
       }
 
-      // Sum speeds — each client contributes to different peers
-      existing.upspeed += torrent.upspeed
-      existing.dlspeed += torrent.dlspeed
-
-      // Sum total transfer — cumulative contribution
+      existing.uploadSpeed += torrent.uploadSpeed
+      existing.downloadSpeed += torrent.downloadSpeed
       existing.uploaded += torrent.uploaded
       existing.downloaded += torrent.downloaded
-
-      // Take best values
-      existing.seeding_time = Math.max(existing.seeding_time, torrent.seeding_time)
+      existing.seedingTime = Math.max(existing.seedingTime, torrent.seedingTime)
       existing.progress = Math.max(existing.progress, torrent.progress)
-      existing.num_seeds = Math.max(existing.num_seeds, torrent.num_seeds)
-      existing.num_complete = Math.max(existing.num_complete, torrent.num_complete)
-      existing.num_leechs = Math.max(existing.num_leechs, torrent.num_leechs)
-      existing.num_incomplete = Math.max(existing.num_incomplete, torrent.num_incomplete)
+      existing.seedCount = Math.max(existing.seedCount, torrent.seedCount)
+      existing.swarmSeeders = Math.max(existing.swarmSeeders, torrent.swarmSeeders)
+      existing.leechCount = Math.max(existing.leechCount, torrent.leechCount)
+      existing.swarmLeechers = Math.max(existing.swarmLeechers, torrent.swarmLeechers)
 
-      // Recalculate ratio from summed transfer totals
       existing.ratio =
         existing.downloaded > 0
           ? existing.uploaded / existing.downloaded
@@ -71,6 +64,28 @@ export function mergeTorrentLists<T extends RawTorrent>(lists: T[][]): T[] {
   return [...merged.values()]
 }
 
+/**
+ * Build a hash → client name(s) lookup from per-client torrent lists,
+ * then stamp each merged torrent with a `clientName` field.
+ */
+export function stampClientNames<T extends { hash: string }>(
+  clientTorrents: { clientName: string; torrents: T[] }[],
+  merged: T[]
+): (T & { clientName: string })[] {
+  const hashClients = new Map<string, string[]>()
+  for (const { clientName, torrents } of clientTorrents) {
+    for (const t of torrents) {
+      const names = hashClients.get(t.hash) ?? []
+      names.push(clientName)
+      hashClients.set(t.hash, names)
+    }
+  }
+  return merged.map((t) => ({
+    ...t,
+    clientName: (hashClients.get(t.hash) ?? []).join(", "),
+  }))
+}
+
 /**
  * Union cross-seed tags from all clients into a single deduplicated array.
  */
diff --git a/src/lib/qbitmanage-defaults.ts b/src/lib/download-clients/qbt/qbitmanage-defaults.ts
similarity index 83%
rename from src/lib/qbitmanage-defaults.ts
rename to src/lib/download-clients/qbt/qbitmanage-defaults.ts
index 2d2a8567..d5412247 100644
--- a/src/lib/qbitmanage-defaults.ts
+++ b/src/lib/download-clients/qbt/qbitmanage-defaults.ts
@@ -1,6 +1,4 @@
-// src/lib/qbitmanage-defaults.ts
-//
-// Functions: QBITMANAGE_TAG_DEFAULTS, QBITMANAGE_KEYS, parseQbitmanageTags
+// src/lib/download-clients/qbt/qbitmanage-defaults.ts
 
 import type { QbitmanageTagConfig } from "@/types/api"
 
@@ -32,7 +30,9 @@ export function parseQbitmanageTags(raw: string | null): QbitmanageTagConfig {
       }
     }
     return result
-  } catch {
+  } catch (err) {
+    // console.warn because this file is imported by client components (can't use pino logger)
+    console.warn("Malformed qbitmanage tag config, falling back to defaults:", String(err))
     return { ...QBITMANAGE_TAG_DEFAULTS }
   }
 }
diff --git a/src/lib/qbt/client.ts b/src/lib/download-clients/qbt/transport.ts
similarity index 74%
rename from src/lib/qbt/client.ts
rename to src/lib/download-clients/qbt/transport.ts
index aa3df638..f45e20fc 100644
--- a/src/lib/qbt/client.ts
+++ b/src/lib/download-clients/qbt/transport.ts
@@ -1,4 +1,4 @@
-// src/lib/qbt/client.ts
+// src/lib/download-clients/qbt/transport.ts
 //
 // Available functions:
 //   buildBaseUrl          - Construct base URL from host/port/ssl
@@ -8,16 +8,25 @@
 //   clearAllSessions      - Remove all cached SIDs (called on logout)
 //   withSessionRetry      - Run an operation with automatic session retry on expiry
 //   qbtFetch              - Shared fetch + error handler for authenticated qBT requests
-//   parseCachedTorrents   - Safely parse JSONB cachedTorrents column (string or object)
+//   parseCachedTorrents   - Parse cachedTorrents column (string or object)
 //   getTorrents           - Fetch torrent info from qBittorrent (optionally filtered by tag)
 //   getTransferInfo       - Fetch global transfer stats from qBittorrent
+//   syncMaindata          - Fetch delta sync data from qBittorrent (maindata endpoint)
 
-import type { QbtTorrent, QbtTransferInfo } from "./types"
+import { sanitizeHost } from "@/lib/data-transforms"
+import { ADAPTER_FETCH_TIMEOUT_MS } from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { clearAllStores, resetStore } from "../sync-store"
+import type { SlimTorrent } from "../transforms"
+import {
+  isQbtMaindataResponse,
+  isQbtTorrent,
+  type QbtMaindataResponse,
+  type QbtTorrent,
+  type QbtTransferInfo,
+} from "./types"
 
-/** Extract a human-readable detail string from a fetch error.
- *  Node's fetch wraps the real error in `cause`, i.e
- *  TypeError("fetch failed") { cause: Error("ECONNREFUSED ...") }
- */
+// Extract detail string from a fetch error.
 function describeFetchError(err: unknown): string {
   const cause =
     err !== null && typeof err === "object" && "cause" in (err as object)
@@ -40,7 +49,7 @@ function describeFetchError(err: unknown): string {
 
 export function buildBaseUrl(host: string, port: number, ssl: boolean): string {
   // Strip any protocol the user may have included (i.e "http://myhost")
-  const cleanHost = host.replace(/^https?:\/\//, "")
+  const cleanHost = sanitizeHost(host)
   return `${ssl ? "https" : "http"}://${cleanHost}:${port}`
 }
 
@@ -71,14 +80,16 @@ export async function getSession(
   return { baseUrl, sid }
 }
 
-/** Invalidate a cached SID (i.e after a 403). */
+/** Invalidate a cached SID */
 export function invalidateSession(baseUrl: string): void {
   sidCache.delete(baseUrl)
+  resetStore(baseUrl)
 }
 
-/** Clear all cached SIDs (called on logout). */
+/** Clear all cached SIDs and torrent stores (called on logout/scheduler stop). */
 export function clearAllSessions(): void {
   sidCache.clear()
+  clearAllStores()
 }
 
 /**
@@ -128,7 +139,7 @@ export async function login(
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       body,
-      signal: AbortSignal.timeout(15000),
+      signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
     })
   } catch (err) {
     const errName =
@@ -136,7 +147,7 @@ export async function login(
         ? String((err as { name: unknown }).name)
         : ""
     if (errName === "TimeoutError" || errName === "AbortError") {
-      throw new Error(`Request to ${host} timed out after 15s`)
+      throw new Error(`Request to ${host} timed out after ${ADAPTER_FETCH_TIMEOUT_MS / 1000}s`)
     }
     throw new Error(`Failed to connect to ${baseUrl}: ${describeFetchError(err)}`)
   }
@@ -169,7 +180,7 @@ async function qbtFetch(
   try {
     response = await fetch(url, {
       headers: { Cookie: `SID=${sid}` },
-      signal: AbortSignal.timeout(15000),
+      signal: AbortSignal.timeout(ADAPTER_FETCH_TIMEOUT_MS),
     })
   } catch (err) {
     const errName =
@@ -177,7 +188,7 @@ async function qbtFetch(
         ? String((err as { name: unknown }).name)
         : ""
     if (errName === "TimeoutError" || errName === "AbortError") {
-      throw new Error(`Request to ${host} timed out after 15s`)
+      throw new Error(`Request to ${host} timed out after ${ADAPTER_FETCH_TIMEOUT_MS / 1000}s`)
     }
     throw new Error(`Failed to connect to ${host}: ${describeFetchError(err)}`)
   }
@@ -197,18 +208,32 @@ async function qbtFetch(
 /**
  * Parses the cachedTorrents JSONB column
  */
-export function parseCachedTorrents(raw: unknown): QbtTorrent[] {
+export function parseCachedTorrents(raw: unknown): SlimTorrent[] {
   if (!raw) return []
+  let arr: unknown[]
   if (typeof raw === "string") {
     try {
       const parsed = JSON.parse(raw)
-      return Array.isArray(parsed) ? (parsed as QbtTorrent[]) : []
-    } catch {
+      if (!Array.isArray(parsed)) {
+        log.warn({ type: typeof parsed }, "parseCachedTorrents: parsed JSON is not an array")
+        return []
+      }
+      arr = parsed
+    } catch (err) {
+      log.warn({ err }, "parseCachedTorrents: JSON parse failed")
       return []
     }
+  } else if (Array.isArray(raw)) {
+    arr = raw
+  } else {
+    return []
+  }
+  if (arr.length === 0) return arr as SlimTorrent[]
+  if (!isQbtTorrent(arr[0])) {
+    log.warn({ sample: arr[0] }, "parseCachedTorrents: first element failed isQbtTorrent check")
+    return []
   }
-  if (Array.isArray(raw)) return raw as QbtTorrent[]
-  return []
+  return arr as SlimTorrent[]
 }
 
 export async function getTorrents(
@@ -233,3 +258,18 @@ export async function getTransferInfo(baseUrl: string, sid: string): Promise<Qbt
   const response = await qbtFetch(url, host, baseUrl, sid)
   return response.json() as Promise<QbtTransferInfo>
 }
+
+export async function syncMaindata(
+  baseUrl: string,
+  sid: string,
+  rid: number
+): Promise<QbtMaindataResponse> {
+  const url = `${baseUrl}/api/v2/sync/maindata?rid=${rid}`
+  const host = new URL(baseUrl).hostname
+  const response = await qbtFetch(url, host, baseUrl, sid)
+  const data: unknown = await response.json()
+  if (!isQbtMaindataResponse(data)) {
+    throw new Error("Invalid maindata response from qBittorrent")
+  }
+  return data
+}
diff --git a/src/lib/qbt/types.ts b/src/lib/download-clients/qbt/types.ts
similarity index 58%
rename from src/lib/qbt/types.ts
rename to src/lib/download-clients/qbt/types.ts
index b86ec143..5b6a9003 100644
--- a/src/lib/qbt/types.ts
+++ b/src/lib/download-clients/qbt/types.ts
@@ -1,4 +1,4 @@
-// src/lib/qbt/types.ts
+// src/lib/download-clients/qbt/types.ts
 
 // From GET /api/v2/torrents/info
 export interface QbtTorrent {
@@ -57,4 +57,39 @@ export interface ClientStats {
   tagStats: TagStats[]
 }
 
-export const VALID_CLIENT_TYPES = ["qbittorrent"] as const
+// Re-exported from client-adapters/types.ts (the single source of truth).
+// Kept here for backwards compatibility with existing consumers.
+export { VALID_CLIENT_TYPES } from "../types"
+
+// Spot-checks a single value for the QbtTorrent shape (key fields only).
+// Used to validate the first element of a JSONB array before trusting the rest.
+export function isQbtTorrent(value: unknown): value is QbtTorrent {
+  if (!value || typeof value !== "object") return false
+  const t = value as Record<string, unknown>
+  return (
+    typeof t.hash === "string" &&
+    typeof t.name === "string" &&
+    typeof t.state === "string" &&
+    typeof t.size === "number" &&
+    typeof t.ratio === "number"
+  )
+}
+
+/** Response from GET /api/v2/sync/maindata?rid=N */
+export interface QbtMaindataResponse {
+  rid: number
+  full_update?: boolean
+  torrents?: Record<string, Partial<QbtTorrent>>
+  torrents_removed?: string[]
+  server_state?: Partial<QbtTransferInfo> & Record<string, unknown>
+  tags?: string[]
+  tags_removed?: string[]
+  categories?: Record<string, { name: string; savePath: string }>
+  categories_removed?: string[]
+}
+
+/** Spot-checks a sync/maindata response for basic structural validity. */
+export function isQbtMaindataResponse(value: unknown): value is QbtMaindataResponse {
+  if (!value || typeof value !== "object") return false
+  return typeof (value as Record<string, unknown>).rid === "number"
+}
diff --git a/src/lib/qbt/speed-cache.ts b/src/lib/download-clients/speed-cache.ts
similarity index 70%
rename from src/lib/qbt/speed-cache.ts
rename to src/lib/download-clients/speed-cache.ts
index 7e909128..e829241b 100644
--- a/src/lib/qbt/speed-cache.ts
+++ b/src/lib/download-clients/speed-cache.ts
@@ -1,10 +1,12 @@
-// src/lib/qbt/speed-cache.ts
+// src/lib/download-clients/speed-cache.ts
 //
 // Available functions:
 //   pushSpeedSnapshot  - Append a speed sample for a client, trimming to MAX_ENTRIES
 //   getSpeedSnapshots  - Return the speed history array for a client (empty if none)
 //   clearSpeedCache    - Wipe all in-memory speed data (called on logout)
 
+import type { TransferStats } from "./types"
+
 const MAX_ENTRIES = 60
 
 export interface SpeedSnapshot {
@@ -19,16 +21,20 @@ const g = globalThis as typeof globalThis & {
 if (!g.__qbtSpeedCache) g.__qbtSpeedCache = new Map()
 const speedCache = g.__qbtSpeedCache
 
-export function pushSpeedSnapshot(clientId: number, up: number, down: number): void {
+export function pushSpeedSnapshot(clientId: number, stats: TransferStats): void {
   const existing = speedCache.get(clientId) ?? []
-  existing.push({ timestamp: Date.now(), uploadSpeed: up, downloadSpeed: down })
+  existing.push({
+    timestamp: Date.now(),
+    uploadSpeed: stats.uploadSpeed,
+    downloadSpeed: stats.downloadSpeed,
+  })
   if (existing.length > MAX_ENTRIES) {
     existing.splice(0, existing.length - MAX_ENTRIES)
   }
   speedCache.set(clientId, existing)
 }
 
-export function getSpeedSnapshots(clientId: number): SpeedSnapshot[] {
+export function getSpeedSnapshots(clientId: number): readonly SpeedSnapshot[] {
   return speedCache.get(clientId) ?? []
 }
 
diff --git a/src/lib/download-clients/sync-store.ts b/src/lib/download-clients/sync-store.ts
new file mode 100644
index 00000000..2ce0ef8c
--- /dev/null
+++ b/src/lib/download-clients/sync-store.ts
@@ -0,0 +1,152 @@
+// src/lib/download-clients/sync-store.ts
+//
+// Functions:
+//   applyMaindataUpdate    - Merge a maindata delta (or full update) into the store
+//   getStoredTorrents      - Return a snapshot array of all torrents for a client
+//   getFilteredTorrents    - Copy + filter in one pass (avoids copying irrelevant torrents)
+//   getStoreRevision       - Return the current rid for a client (0 if uninitialized)
+//   isStoreInitialized     - Whether the store has received at least one fullUpdate
+//   isStoreFresh           - Whether the store is initialized and updated within a max age
+//   resetStore             - Clear a single client's store (forces rid=0 on next sync)
+//   clearAllStores         - Clear all stores (called on logout/scheduler stop)
+//   replaceStoreTorrents   - Replace all torrents for a client (for non-delta-sync clients)
+
+import { log } from "@/lib/logger"
+import type { DeltaSyncResponse, TorrentRecord } from "./types"
+
+/** How long a sync store entry is considered fresh */
+export const STORE_MAX_AGE_MS = 10 * 60 * 1000
+
+interface TorrentStore {
+  rid: number
+  torrents: Map<string, TorrentRecord>
+  lastUpdatedAt: number
+  initialized: boolean
+}
+
+const g = globalThis as typeof globalThis & {
+  __qbtTorrentStores?: Map<string, TorrentStore>
+}
+if (!g.__qbtTorrentStores) g.__qbtTorrentStores = new Map()
+const stores = g.__qbtTorrentStores
+
+function getOrCreateStore(baseUrl: string): TorrentStore {
+  let store = stores.get(baseUrl)
+  if (!store) {
+    store = { rid: 0, torrents: new Map(), lastUpdatedAt: 0, initialized: false }
+    stores.set(baseUrl, store)
+  }
+  return store
+}
+
+// Checks a value for the TorrentRecord shape (key fields only).
+// Used to validate new torrents before inserting into the store.
+function isTorrentRecord(value: unknown): value is TorrentRecord {
+  if (!value || typeof value !== "object") return false
+  const t = value as Record<string, unknown>
+  return (
+    typeof t.hash === "string" &&
+    typeof t.name === "string" &&
+    typeof t.state === "string" &&
+    typeof t.size === "number" &&
+    typeof t.ratio === "number"
+  )
+}
+
+export function applyMaindataUpdate(baseUrl: string, data: DeltaSyncResponse): void {
+  const store = getOrCreateStore(baseUrl)
+
+  if (data.fullUpdate) {
+    store.torrents.clear()
+    store.initialized = true
+  }
+
+  if (data.torrents) {
+    for (const [hash, partial] of Object.entries(data.torrents)) {
+      const existing = store.torrents.get(hash)
+      if (existing) {
+        Object.assign(existing, partial)
+      } else {
+        // New torrent. Validate it has required fields before inserting.
+        // qBT sends all fields for new torrents, but guard against partials.
+        const candidate = { ...partial, hash }
+        if (isTorrentRecord(candidate)) {
+          store.torrents.set(hash, candidate as TorrentRecord)
+        } else {
+          log.warn(
+            { hash, keys: Object.keys(partial) },
+            "sync-store: dropped new torrent, failed shape check"
+          )
+        }
+      }
+    }
+  }
+
+  if (data.torrentsRemoved) {
+    for (const hash of data.torrentsRemoved) {
+      store.torrents.delete(hash)
+    }
+  }
+
+  store.rid = data.rid
+  store.lastUpdatedAt = Date.now()
+}
+
+export function getStoredTorrents(baseUrl: string): TorrentRecord[] {
+  const store = stores.get(baseUrl)
+  if (!store?.initialized) return []
+  return Array.from(store.torrents.values(), (t) => ({ ...t }))
+}
+
+// Copy + filter in one pass. Only copies torrents matching the predicate.
+export function getFilteredTorrents(
+  baseUrl: string,
+  predicate: (torrent: TorrentRecord) => boolean
+): TorrentRecord[] {
+  const store = stores.get(baseUrl)
+  if (!store?.initialized) return []
+  const result: TorrentRecord[] = []
+  for (const t of store.torrents.values()) {
+    if (predicate(t)) result.push({ ...t })
+  }
+  return result
+}
+
+export function getStoreRevision(baseUrl: string): number {
+  return stores.get(baseUrl)?.rid ?? 0
+}
+
+export function isStoreInitialized(baseUrl: string): boolean {
+  return stores.get(baseUrl)?.initialized ?? false
+}
+
+/** Returns true if the store is initialized and was updated within the given max age (ms). */
+export function isStoreFresh(baseUrl: string, maxAgeMs: number): boolean {
+  const store = stores.get(baseUrl)
+  if (!store?.initialized) return false
+  return Date.now() - store.lastUpdatedAt <= maxAgeMs
+}
+
+export function resetStore(baseUrl: string): void {
+  const store = stores.get(baseUrl)
+  if (store) {
+    store.rid = 0
+    store.torrents.clear()
+    store.initialized = false
+    store.lastUpdatedAt = 0
+  }
+}
+
+export function clearAllStores(): void {
+  stores.clear()
+}
+
+export function replaceStoreTorrents(baseUrl: string, torrents: TorrentRecord[]): void {
+  const store = getOrCreateStore(baseUrl)
+  store.torrents.clear()
+  for (const t of torrents) {
+    store.torrents.set(t.hash, t)
+  }
+  store.initialized = true
+  store.lastUpdatedAt = Date.now()
+}
diff --git a/src/lib/download-clients/transforms.ts b/src/lib/download-clients/transforms.ts
new file mode 100644
index 00000000..a1f05b67
--- /dev/null
+++ b/src/lib/download-clients/transforms.ts
@@ -0,0 +1,37 @@
+// src/lib/download-clients/transforms.ts
+
+import type { TorrentRecord } from "./types"
+
+/**
+ * Maps a full TorrentRecord (normalized camelCase) to the 23-field shape stored in cachedTorrents JSONB.
+ * The resulting shape matches TorrentRaw from fleet.ts sans clientName (stamped at query time).
+ */
+export type SlimTorrent = ReturnType<typeof slimTorrentForCache>
+
+export function slimTorrentForCache(t: TorrentRecord) {
+  return {
+    hash: t.hash,
+    name: t.name,
+    state: t.state,
+    tags: t.tags,
+    category: t.category,
+    uploaded: t.uploaded,
+    downloaded: t.downloaded,
+    ratio: t.ratio,
+    size: t.size,
+    seedingTime: t.seedingTime,
+    activeTime: t.activeTime,
+    addedAt: t.addedAt,
+    completedAt: t.completedAt,
+    lastActivityAt: t.lastActivityAt,
+    remaining: t.remaining,
+    seedCount: t.seedCount,
+    leechCount: t.leechCount,
+    swarmSeeders: t.swarmSeeders,
+    swarmLeechers: t.swarmLeechers,
+    uploadSpeed: t.uploadSpeed,
+    downloadSpeed: t.downloadSpeed,
+    availability: t.availability,
+    progress: t.progress,
+  }
+}
diff --git a/src/lib/download-clients/types.ts b/src/lib/download-clients/types.ts
new file mode 100644
index 00000000..4a50b8d9
--- /dev/null
+++ b/src/lib/download-clients/types.ts
@@ -0,0 +1,112 @@
+// src/lib/download-clients/types.ts
+
+export const VALID_CLIENT_TYPES = ["qbittorrent"] as const
+
+export type ClientType = (typeof VALID_CLIENT_TYPES)[number]
+
+/** Global transfer speed stats. */
+export interface TransferStats {
+  uploadSpeed: number // bytes/sec
+  downloadSpeed: number // bytes/sec
+}
+
+/** Normalized torrent shape. All field names are camelCase regardless of client origin. */
+export interface TorrentRecord {
+  hash: string
+  name: string
+  state: string // "uploading", "stalledUP", "downloading", "stalledDL", "pausedUP", "pausedDL", etc.
+  tags: string // comma-separated, i.e "aither, cross-seed"
+  category: string
+  uploadSpeed: number // bytes/sec
+  downloadSpeed: number // bytes/sec
+  uploaded: number // total bytes uploaded
+  downloaded: number // total bytes downloaded
+  ratio: number
+  size: number // bytes
+  seedCount: number // connected seeds
+  leechCount: number // connected leechers
+  swarmSeeders: number // total seeders in swarm
+  swarmLeechers: number // total leechers in swarm
+  tracker: string // primary tracker URL
+  addedAt: number // unix timestamp — when torrent was added
+  completedAt: number // unix timestamp — when download completed (-1 if incomplete)
+  lastActivityAt: number // unix timestamp — last transfer activity
+  seedingTime: number // seconds spent seeding
+  activeTime: number // seconds total active time
+  lastSeenComplete: number // unix timestamp — last time a complete copy was seen in swarm
+  availability: number // float 0-1, piece availability
+  remaining: number // bytes remaining to download
+  progress: number // float 0-1, download progress
+  contentPath: string // full path to content
+  savePath: string // save directory
+  isPrivate?: boolean
+}
+
+/** Normalized delta sync response. torrents values use TorrentRecord field names. */
+export interface DeltaSyncResponse {
+  rid: number
+  fullUpdate?: boolean
+  torrents?: Record<string, Partial<TorrentRecord>>
+  torrentsRemoved?: string[]
+  serverState?: Partial<TransferStats>
+  tags?: string[]
+  tagsRemoved?: string[]
+  categories?: Record<string, { name: string; savePath: string }>
+  categoriesRemoved?: string[]
+}
+
+/** Minimal DB row shape needed to construct a ClientAdapter. */
+export interface DownloadClientRow {
+  name: string
+  host: string
+  port: number
+  useSsl: boolean
+  encryptedUsername: string
+  encryptedPassword: string
+  crossSeedTags: string[] | null
+  type: string
+}
+
+export function assertClientType(type: string): ClientType {
+  if (!(VALID_CLIENT_TYPES as readonly string[]).includes(type)) {
+    throw new Error(`Unsupported client type: "${type}"`)
+  }
+  return type as ClientType
+}
+
+/**
+ * Download client adapter interface. Each supported client type (qBittorrent,
+ * rTorrent) implements this contract. Adapters produce TorrentRecord-shaped
+ * output so downstream code (charts, aggregation, merge) is client-agnostic.
+ *
+ * Session management is internal to each adapter. qBT uses SID cookies,
+ * rTorrent uses Basic Auth per request. Callers don't manage sessions.
+ */
+export interface ClientAdapter {
+  /** Client type identifier. */
+  readonly type: ClientType
+
+  /** Test that the client is reachable and credentials are valid. Throws on failure. */
+  testConnection(): Promise<void>
+
+  /** Fetch torrents, optionally filtered by tag or activity state.
+   *  Note: only handles single-tag filtering. Multi-tag fan-out is the caller's job. */
+  getTorrents(options?: { tag?: string; filter?: string }): Promise<TorrentRecord[]>
+
+  /** Fetch global upload/download speeds. */
+  getTransferInfo(): Promise<TransferStats>
+
+  /**
+   * Get incremental changes since the given revision ID.
+   * Only implemented by clients that support delta sync (i.e. qBittorrent maindata).
+   * Callers check method existence: `if (adapter.getDeltaSync) { ... }`
+   * Returns a normalized DeltaSyncResponse with TorrentRecord field names.
+   */
+  getDeltaSync?(rid: number): Promise<DeltaSyncResponse>
+
+  /** Base URL for this client (used as sync store key). */
+  readonly baseUrl: string
+
+  /** Clean up cached sessions. Called on logout or scheduler stop. */
+  dispose(): void
+}
diff --git a/src/lib/error-utils.ts b/src/lib/error-utils.ts
index 86665a24..7267fb95 100644
--- a/src/lib/error-utils.ts
+++ b/src/lib/error-utils.ts
@@ -1,6 +1,11 @@
 // src/lib/error-utils.ts
 //
-// Functions: sanitizeNetworkError, isDecryptionError
+// Functions: errMsg, sanitizeNetworkError, isDecryptionError, classifyFetchError
+
+/** Extracts a string message from an unknown error value. */
+export function errMsg(err: unknown): string {
+  return err instanceof Error ? err.message : String(err)
+}
 
 /**
  * Returns true when an error originates from AES-256-GCM authentication failure
@@ -33,3 +38,59 @@ export function sanitizeNetworkError(raw: string, fallback = "Connection failed"
   if (apiMatch) return `API returned ${apiMatch[1]}`
   return fallback
 }
+
+/**
+ * Classifies a fetch() error into a human-readable Error.
+ *
+ * Node.js native fetch (undici) wraps all network failures in a TypeError
+ * per the Fetch spec. The actual cause (ECONNREFUSED, timeout, TLS error,
+ * etc.) is in `err.cause`. This helper unwraps the cause chain so callers
+ * get a useful error message instead of the opaque "TypeError".
+ */
+export function classifyFetchError(err: unknown, hostname: string): Error {
+  const inner = err instanceof TypeError ? unwrapCause(err) : null
+  const effective =
+    inner ??
+    (err instanceof Error
+      ? {
+          name: err.name,
+          message: err.message,
+          code: "code" in err ? String((err as NodeJS.ErrnoException).code) : undefined,
+        }
+      : err !== null &&
+          typeof err === "object" &&
+          typeof (err as Record<string, unknown>).name === "string"
+        ? { name: String((err as Record<string, unknown>).name), message: "", code: undefined }
+        : null)
+
+  const name = effective?.name ?? ""
+  if (name === "TimeoutError" || name === "AbortError") {
+    return new Error(`Request to ${hostname} timed out`)
+  }
+  if (effective?.code) {
+    return new Error(`Failed to connect to ${hostname}: ${effective.code}`)
+  }
+  // Use inner cause message if available. For the outer error, only use
+  // message from TypeError (always "fetch failed", safe). Other error messages
+  // may contain URLs with embedded API tokens, so fall back to name only.
+  const detail =
+    inner?.message || (err instanceof TypeError ? effective?.message : null) || name || "Unknown"
+  return new Error(`Failed to connect to ${hostname}: ${detail}`)
+}
+
+function unwrapCause(err: TypeError): { name: string; message: string; code?: string } | null {
+  const cause = (err as { cause?: unknown }).cause
+  if (!cause) return null
+  // Some undici versions set cause to a string
+  if (typeof cause === "string") return { name: "", message: cause, code: undefined }
+  if (typeof cause !== "object") return null
+  const c = cause as Record<string, unknown>
+  if (typeof c.name === "string" || typeof c.message === "string" || typeof c.code === "string") {
+    return {
+      name: typeof c.name === "string" ? c.name : "",
+      message: typeof c.message === "string" ? c.message : "",
+      code: typeof c.code === "string" ? c.code : undefined,
+    }
+  }
+  return null
+}
diff --git a/src/lib/events.ts b/src/lib/events.ts
index 402273c3..905c37d5 100644
--- a/src/lib/events.ts
+++ b/src/lib/events.ts
@@ -1,13 +1,14 @@
 // src/lib/events.ts
 //
-// Functions: parseLogLine, sanitizeLogDetail, classifyLogEvent,
-//            pinoLevelToSeverity, snapshotToEvent, backupToEvent, mergeAndSort
+// Functions: parseLogLine, sanitizeLogDetail, classifyLogEvent, pinoLevelToSeverity,
+//            snapshotToEvent, backupToEvent, mergeAndSort, groupPollBatches
 
 import { sanitizeNetworkError } from "@/lib/error-utils"
+import { bytesToGiB, formatBytesNum, formatRatioDisplay } from "@/lib/formatters"
 
 // ── Types ────────────────────────────────────────────────────────────────────
 
-export const EVENT_CATEGORIES = ["polls", "auth", "settings", "backups", "errors"] as const
+export const EVENT_CATEGORIES = ["polls", "clients", "auth", "settings", "backups"] as const
 export type EventCategory = (typeof EVENT_CATEGORIES)[number]
 export const EVENT_LEVELS = ["debug", "info", "warn", "error"] as const
 export type EventLevel = (typeof EVENT_LEVELS)[number]
@@ -22,15 +23,14 @@ export interface SystemEvent {
   trackerId: number | null
   trackerName: string | null
   source: "log" | "db"
+  children?: SystemEvent[]
 }
 
 // ── Constants ────────────────────────────────────────────────────────────────
 
-const REDACT_IPV4_REGEX = /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/g
-const REDACT_IPV6_REGEX = /(?:[0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}/g
-
+/** No-op: single-user self-hosted app, events tab is auth-gated. */
 function redactIps(s: string): string {
-  return s.replace(REDACT_IPV4_REGEX, "[redacted]").replace(REDACT_IPV6_REGEX, "[redacted]")
+  return s
 }
 
 /** Pino numeric levels → our severity */
@@ -82,6 +82,8 @@ interface PinoLine {
   route?: string
   trackerId?: number
   trackerName?: string
+  clientId?: number
+  clientName?: string
   ip?: string
   action?: string
   [key: string]: unknown
@@ -94,16 +96,18 @@ function classifyLogEvent(line: PinoLine): EventCategory {
   // Backup events
   if (line.event && BACKUP_EVENTS.has(line.event)) return "backups"
 
-  // Errors (level >= 50)
-  if (line.level >= 50) return "errors"
-
   // Settings/CRUD routes
   if (line.route && SETTINGS_ROUTES.some((r) => line.route?.startsWith(r))) return "settings"
 
-  // Poll-related (has trackerId or mentions poll)
+  // Download client events (heartbeat, deep-poll, client connection)
+  if (line.clientId || (line.msg && /heartbeat|deep.poll|client.scheduler/i.test(line.msg))) {
+    return "clients"
+  }
+
+  // Tracker poll events
   if (line.trackerId || (line.msg && /poll/i.test(line.msg))) return "polls"
 
-  // Default: settings (system startup, config, etc.)
+  // Default: settings (system startup, config, uncategorized errors)
   return "settings"
 }
 
@@ -112,6 +116,12 @@ function classifyLogEvent(line: PinoLine): EventCategory {
 function sanitizeLogDetail(line: PinoLine): string | null {
   const parts: string[] = []
 
+  // Include tracker/client name so errors are identifiable
+  const entityName = line.trackerName ?? line.clientName
+  if (entityName && typeof entityName === "string") {
+    parts.push(entityName)
+  }
+
   // Include action if present (e.g., "paused", "resumed")
   if (line.action) parts.push(String(line.action))
 
@@ -187,12 +197,12 @@ export function snapshotToEvent(row: SnapshotRow): SystemEvent {
   let upGib = "0.0"
   let downGib = "0.0"
   try {
-    upGib = (Number(BigInt(row.uploadedBytes)) / 1024 ** 3).toFixed(1)
-    downGib = (Number(BigInt(row.downloadedBytes)) / 1024 ** 3).toFixed(1)
+    upGib = bytesToGiB(row.uploadedBytes).toFixed(1)
+    downGib = bytesToGiB(row.downloadedBytes).toFixed(1)
   } catch {
     // Non-numeric byte strings default to 0
   }
-  const ratioStr = row.ratio !== null ? `${row.ratio.toFixed(2)}×` : ""
+  const ratioStr = row.ratio !== null ? formatRatioDisplay(row.ratio) : ""
 
   return {
     id: `snap-${row.id}`,
@@ -219,7 +229,6 @@ interface BackupRow {
 }
 
 export function backupToEvent(row: BackupRow): SystemEvent {
-  const sizeKb = Math.round(row.sizeBytes / 1024)
   const isError = row.status === "failed"
 
   return {
@@ -228,7 +237,7 @@ export function backupToEvent(row: BackupRow): SystemEvent {
     category: "backups",
     level: isError ? "error" : "info",
     title: `Backup ${row.status}`,
-    detail: [row.frequency, row.encrypted ? "encrypted" : null, `${sizeKb} KB`]
+    detail: [row.frequency, row.encrypted ? "encrypted" : null, formatBytesNum(row.sizeBytes)]
       .filter(Boolean)
       .join(" — "),
     trackerId: null,
@@ -259,3 +268,60 @@ export function mergeAndSort(
   // Paginate
   return combined.slice(offset, offset + limit)
 }
+
+// ── Batch Grouping ──────────────────────────────────────────────────────────
+
+/**
+ * Collapses consecutive "Poll succeeded" events that share the same timestamp
+ * (from a single scheduler batch) into a single parent event with children.
+ * Non-poll events and lone polls pass through unchanged.
+ */
+export function groupPollBatches(events: SystemEvent[]): SystemEvent[] {
+  const result: SystemEvent[] = []
+
+  let i = 0
+  while (i < events.length) {
+    const event = events[i]
+
+    if (event.category !== "polls" || event.title !== "Poll succeeded") {
+      result.push(event)
+      i++
+      continue
+    }
+
+    // Collect consecutive poll-succeeded events with the same timestamp
+    const batch: SystemEvent[] = [event]
+    let j = i + 1
+    while (
+      j < events.length &&
+      events[j].category === "polls" &&
+      events[j].title === "Poll succeeded" &&
+      events[j].timestamp === event.timestamp
+    ) {
+      batch.push(events[j])
+      j++
+    }
+
+    if (batch.length === 1) {
+      result.push(event)
+    } else {
+      const names = batch.map((e) => e.trackerName ?? "Unknown").join(", ")
+      result.push({
+        id: `batch-${event.timestamp}`,
+        timestamp: event.timestamp,
+        category: "polls",
+        level: "info",
+        title: `Poll succeeded for ${batch.length} trackers`,
+        detail: names,
+        trackerId: null,
+        trackerName: null,
+        source: "db",
+        children: batch,
+      })
+    }
+
+    i = j
+  }
+
+  return result
+}
diff --git a/src/lib/extract-api-error.ts b/src/lib/extract-api-error.ts
new file mode 100644
index 00000000..51e0138e
--- /dev/null
+++ b/src/lib/extract-api-error.ts
@@ -0,0 +1,10 @@
+// src/lib/extract-api-error.ts
+
+export async function extractApiError(res: Response, fallback = "Request failed"): Promise<string> {
+  try {
+    const data: { error?: string } = await res.json()
+    return data.error ?? fallback
+  } catch {
+    return fallback
+  }
+}
diff --git a/src/lib/fleet-aggregation.ts b/src/lib/fleet-aggregation.ts
new file mode 100644
index 00000000..5006e0f9
--- /dev/null
+++ b/src/lib/fleet-aggregation.ts
@@ -0,0 +1,496 @@
+// src/lib/fleet-aggregation.ts
+//
+// Functions: computeFleetAggregation
+
+import { buildActivityMatrix } from "@/components/charts/lib/chart-transforms"
+import {
+  AGE_BUCKETS,
+  type AgeBucket,
+  type Bucket,
+  type FleetStats,
+  normalizeCategory,
+  parseTorrentTags,
+  RATIO_BUCKETS,
+  SEED_TIME_BUCKETS,
+  SEEDING_STATES,
+  STALE_THRESHOLD_MS,
+  type TorrentRaw,
+  type TrackerTag,
+  toMonthKey,
+} from "@/lib/fleet"
+
+// Re-export types used by callers so they don't need to import from fleet.ts
+export type { FleetStats, TorrentRaw, TrackerTag }
+
+const FRESHNESS_WINDOW_MS = 7 * 24 * 60 * 60 * 1000
+
+// ---------------------------------------------------------------------------
+// Named output element types
+// ---------------------------------------------------------------------------
+
+export interface TrackerHealthMetric {
+  name: string
+  color: string
+  torrentCount: number
+  avgRatio: number
+  uploadSpeedSum: number
+  freshnessPct: number
+  avgSeedTimeDays: number
+}
+
+export interface TrackerCategoryStorage {
+  tracker: string
+  categories: { name: string; count: number; totalSize: number }[]
+}
+
+export interface TrackerCategoryCount {
+  tracker: string
+  categories: { name: string; count: number }[]
+}
+
+export interface CrossSeedNode {
+  id: string
+  name: string
+  color: string
+  torrentCount: number
+  crossSeeded: number
+}
+
+export interface CrossSeedEdge {
+  source: string
+  target: string
+  weight: number
+}
+
+export interface TrackerSizes {
+  tag: string
+  name: string
+  color: string
+  sizes: number[]
+}
+
+export interface AgeTimelineEntry {
+  name: string
+  color: string
+  months: { month: string; count: number }[]
+}
+
+export interface CategoryTimelineEntry {
+  category: string
+  months: { month: string; count: number }[]
+}
+
+export interface AgeBandEntry {
+  name: string
+  color: string
+  counts: number[]
+  total: number
+  avgDays: number
+}
+
+// ---------------------------------------------------------------------------
+// Output shape
+// ---------------------------------------------------------------------------
+
+export interface FleetAggregation {
+  stats: FleetStats & { torrentCount: number }
+
+  ratioDistribution: { label: string; count: number; min: number; max: number }[]
+
+  seedTimeDistribution: { label: string; count: number; color: string; max: number }[]
+
+  crossSeed: { crossSeeded: number; unique: number; total: number }
+
+  activityGrid: { data: [number, number, number][]; maxCount: number }
+
+  trackerHealth: TrackerHealthMetric[]
+
+  storageByTrackerCategory: TrackerCategoryStorage[]
+
+  categoryBreakdown: TrackerCategoryCount[]
+
+  crossSeedNetwork: { nodes: CrossSeedNode[]; edges: CrossSeedEdge[] }
+
+  sizesByTracker: TrackerSizes[]
+
+  ageTimeline: AgeTimelineEntry[]
+
+  categoryTimeline: CategoryTimelineEntry[]
+
+  ageBands: AgeBandEntry[]
+}
+
+// ---------------------------------------------------------------------------
+// Internal accumulator types
+// ---------------------------------------------------------------------------
+
+interface TrackerAccumulator {
+  tag: string
+  name: string
+  color: string
+  torrentCount: number
+  ratioSum: number
+  validRatioCount: number
+  uploadSpeedSum: number
+  seedTimeDaysSum: number
+  freshnessCount: number
+  sizes: number[]
+  // category -> { count, totalSize }
+  categoryStorage: Map<string, { count: number; totalSize: number }>
+  // monthKey -> count
+  monthCounts: Map<string, number>
+  // age bucket counts
+  ageCounts: number[]
+  ageTotalDays: number
+}
+
+// ---------------------------------------------------------------------------
+// Main aggregation function -- single O(n) pass
+// ---------------------------------------------------------------------------
+
+export function computeFleetAggregation(
+  torrents: TorrentRaw[],
+  trackerTags: TrackerTag[],
+  crossSeedTags: string[]
+): FleetAggregation {
+  const now = Date.now()
+  const nowSec = now / 1000
+
+  // Precompute lookup structures
+  const crossSeedSet = new Set(crossSeedTags.map((t) => t.toLowerCase()))
+  const trackerTagMap = new Map<string, TrackerTag>()
+  for (const tt of trackerTags) trackerTagMap.set(tt.tag.toLowerCase(), tt)
+
+  // Initialize per-tracker accumulators
+  const trackerAccMap = new Map<string, TrackerAccumulator>()
+  for (const tt of trackerTags) {
+    trackerAccMap.set(tt.tag.toLowerCase(), {
+      tag: tt.tag,
+      name: tt.name,
+      color: tt.color,
+      torrentCount: 0,
+      ratioSum: 0,
+      validRatioCount: 0,
+      uploadSpeedSum: 0,
+      seedTimeDaysSum: 0,
+      freshnessCount: 0,
+      sizes: [],
+      categoryStorage: new Map(),
+      monthCounts: new Map(),
+      ageCounts: new Array(AGE_BUCKETS.length).fill(0) as number[],
+      ageTotalDays: 0,
+    })
+  }
+
+  // Initialize ratio bucket counters
+  const ratioCounts = new Array(RATIO_BUCKETS.length).fill(0) as number[]
+
+  // Initialize seed time bucket counters
+  const seedTimeCounts = new Array(SEED_TIME_BUCKETS.length).fill(0) as number[]
+
+  // Stats accumulators
+  let totalSeeding = 0
+  let totalLeeching = 0
+  let fleetUploadSpeed = 0
+  let fleetDownloadSpeed = 0
+  let totalLibrarySize = 0
+  let crossSeededCount = 0
+  let staleCount = 0
+
+  // Activity matrix timestamps
+  const addedOnTimestamps: number[] = []
+
+  // Cross-seed network: torrent name -> set of tracker tags it appears on
+  const nameToTrackers = new Map<string, Set<string>>()
+
+  // Category timeline: category -> monthKey -> count
+  const categoryMonthMap = new Map<string, Map<string, number>>()
+
+  // ---------------------------------------------------------------------------
+  // Single pass
+  // ---------------------------------------------------------------------------
+
+  for (const torrent of torrents) {
+    // Parse tags once
+    const parsedTags = parseTorrentTags(torrent.tags)
+    const isCrossSeed = crossSeedSet.size > 0 && parsedTags.some((t) => crossSeedSet.has(t))
+
+    // Find matching tracker tag (first match wins)
+    const matchedTrackerTag =
+      parsedTags.find((t) => !crossSeedSet.has(t) && trackerTagMap.has(t)) ?? null
+
+    // -- Stats --
+    const isSeeding = SEEDING_STATES.has(torrent.state)
+    if (isSeeding) totalSeeding++
+    else totalLeeching++
+    fleetUploadSpeed += torrent.uploadSpeed
+    fleetDownloadSpeed += torrent.downloadSpeed
+    totalLibrarySize += torrent.size
+    if (torrent.lastActivityAt > 0 && now - torrent.lastActivityAt * 1000 > STALE_THRESHOLD_MS) {
+      staleCount++
+    }
+    if (isCrossSeed) crossSeededCount++
+
+    // -- Ratio bucket --
+    // qBT returns ratio: -1 for infinite ratio (zero downloads, i.e. cross-seeded).
+    // Exclude these from the distribution since they don't have a meaningful ratio.
+    // Cross-seed coverage is shown by the dedicated cross-seed donut chart.
+    if (torrent.ratio >= 0) {
+      const rBucketIdx = RATIO_BUCKETS.findIndex((b: Bucket) => torrent.ratio < b.max)
+      ratioCounts[rBucketIdx === -1 ? RATIO_BUCKETS.length - 1 : rBucketIdx]++
+    }
+
+    // -- Seed time bucket (seeding torrents only) --
+    if (isSeeding) {
+      const sBucketIdx = SEED_TIME_BUCKETS.findIndex((b: Bucket) => torrent.seedingTime < b.max)
+      seedTimeCounts[sBucketIdx === -1 ? SEED_TIME_BUCKETS.length - 1 : sBucketIdx]++
+    }
+
+    // -- Activity matrix --
+    if (torrent.addedAt > 0) {
+      addedOnTimestamps.push(torrent.addedAt)
+    }
+
+    // -- Category timeline --
+    if (torrent.addedAt > 0) {
+      const category = normalizeCategory(torrent.category)
+      const monthKey = toMonthKey(torrent.addedAt)
+      const catMap = categoryMonthMap.get(category) ?? new Map<string, number>()
+      catMap.set(monthKey, (catMap.get(monthKey) ?? 0) + 1)
+      categoryMonthMap.set(category, catMap)
+    }
+
+    // -- Cross-seed network tracker matching (exclude cross-seed tags) --
+    const networkTrackerTags = parsedTags.filter(
+      (t) => !crossSeedSet.has(t) && trackerTagMap.has(t)
+    )
+    if (networkTrackerTags.length > 0) {
+      const existing = nameToTrackers.get(torrent.name) ?? new Set<string>()
+      for (const tag of networkTrackerTags) existing.add(tag)
+      nameToTrackers.set(torrent.name, existing)
+    }
+
+    // -- Per-tracker accumulators --
+    if (matchedTrackerTag !== null) {
+      const acc = trackerAccMap.get(matchedTrackerTag)
+      if (acc) {
+        acc.torrentCount++
+        if (torrent.ratio >= 0) {
+          acc.ratioSum += torrent.ratio
+          acc.validRatioCount++
+        }
+        acc.uploadSpeedSum += torrent.uploadSpeed
+        acc.seedTimeDaysSum += torrent.seedingTime / 86400
+        if (
+          torrent.lastActivityAt > 0 &&
+          now - torrent.lastActivityAt * 1000 < FRESHNESS_WINDOW_MS
+        ) {
+          acc.freshnessCount++
+        }
+        acc.sizes.push(torrent.size)
+
+        // Category storage
+        const cat = normalizeCategory(torrent.category)
+        const catEntry = acc.categoryStorage.get(cat) ?? { count: 0, totalSize: 0 }
+        catEntry.count++
+        catEntry.totalSize += torrent.size
+        acc.categoryStorage.set(cat, catEntry)
+
+        // Age timeline
+        if (torrent.addedAt > 0) {
+          const monthKey = toMonthKey(torrent.addedAt)
+          acc.monthCounts.set(monthKey, (acc.monthCounts.get(monthKey) ?? 0) + 1)
+        }
+
+        // Age bands
+        if (torrent.addedAt > 0) {
+          const ageDays = (nowSec - torrent.addedAt) / 86400
+          if (ageDays >= 0) {
+            acc.ageTotalDays += ageDays
+            const idx = AGE_BUCKETS.findIndex((b: AgeBucket) => ageDays < b.maxDays)
+            acc.ageCounts[idx === -1 ? AGE_BUCKETS.length - 1 : idx]++
+          }
+        }
+      }
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Finalize after the pass
+  // ---------------------------------------------------------------------------
+
+  const torrentCount = torrents.length
+
+  // Stats
+  const stats: FleetAggregation["stats"] = {
+    torrentCount,
+    totalSeeding,
+    totalLeeching,
+    fleetUploadSpeed,
+    fleetDownloadSpeed,
+    totalLibrarySize,
+    crossSeedPercent: torrentCount > 0 ? (crossSeededCount / torrentCount) * 100 : 0,
+    staleCount,
+  }
+
+  // Ratio distribution
+  const ratioDistribution = RATIO_BUCKETS.map((b: Bucket, i: number) => ({
+    label: b.label,
+    count: ratioCounts[i],
+    min: i === 0 ? 0 : RATIO_BUCKETS[i - 1].max,
+    max: b.max,
+  }))
+
+  // Seed time distribution
+  const seedTimeDistribution = SEED_TIME_BUCKETS.map((b: Bucket, i: number) => ({
+    label: b.label,
+    count: seedTimeCounts[i],
+    color: b.color,
+    max: b.max,
+  }))
+
+  // Cross-seed totals
+  const crossSeed = {
+    crossSeeded: crossSeededCount,
+    unique: torrentCount - crossSeededCount,
+    total: torrentCount,
+  }
+
+  // Activity grid
+  const activityGrid = buildActivityMatrix(addedOnTimestamps)
+
+  // Tracker health, storageByTrackerCategory, categoryBreakdown, sizesByTracker, ageTimeline, ageBands
+  const trackerHealth: FleetAggregation["trackerHealth"] = []
+  const storageByTrackerCategory: FleetAggregation["storageByTrackerCategory"] = []
+  const categoryBreakdown: FleetAggregation["categoryBreakdown"] = []
+  const sizesByTracker: FleetAggregation["sizesByTracker"] = []
+  const ageTimeline: FleetAggregation["ageTimeline"] = []
+  const ageBands: FleetAggregation["ageBands"] = []
+
+  for (const [, acc] of trackerAccMap) {
+    if (acc.torrentCount === 0) continue
+
+    trackerHealth.push({
+      name: acc.name,
+      color: acc.color,
+      torrentCount: acc.torrentCount,
+      avgRatio: acc.validRatioCount > 0 ? acc.ratioSum / acc.validRatioCount : 0,
+      uploadSpeedSum: acc.uploadSpeedSum,
+      freshnessPct: (acc.freshnessCount / acc.torrentCount) * 100,
+      avgSeedTimeDays: acc.seedTimeDaysSum / acc.torrentCount,
+    })
+
+    storageByTrackerCategory.push({
+      tracker: acc.name,
+      categories: Array.from(acc.categoryStorage.entries()).map(([name, { count, totalSize }]) => ({
+        name,
+        count,
+        totalSize,
+      })),
+    })
+
+    categoryBreakdown.push({
+      tracker: acc.name,
+      categories: Array.from(acc.categoryStorage.entries()).map(([name, { count }]) => ({
+        name,
+        count,
+      })),
+    })
+
+    sizesByTracker.push({
+      tag: acc.tag,
+      name: acc.name,
+      color: acc.color,
+      sizes: acc.sizes,
+    })
+
+    // Age timeline: sort months ascending
+    const sortedMonths = Array.from(acc.monthCounts.entries())
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([month, count]) => ({ month, count }))
+
+    ageTimeline.push({
+      name: acc.name,
+      color: acc.color,
+      months: sortedMonths,
+    })
+
+    ageBands.push({
+      name: acc.name,
+      color: acc.color,
+      counts: acc.ageCounts,
+      total: acc.torrentCount,
+      avgDays: acc.torrentCount > 0 ? acc.ageTotalDays / acc.torrentCount : 0,
+    })
+  }
+
+  // Category timeline: sort months ascending per category
+  const categoryTimeline: FleetAggregation["categoryTimeline"] = Array.from(
+    categoryMonthMap.entries()
+  ).map(([category, monthMap]) => ({
+    category,
+    months: Array.from(monthMap.entries())
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([month, count]) => ({ month, count })),
+  }))
+
+  // Cross-seed network
+  const trackerTorrentCount = new Map<string, number>()
+  const crossSeededPerTracker = new Map<string, number>()
+  const pairCounts = new Map<string, number>()
+
+  for (const [, acc] of trackerAccMap) {
+    if (acc.torrentCount > 0) {
+      trackerTorrentCount.set(acc.tag.toLowerCase(), acc.torrentCount)
+    }
+  }
+
+  for (const [, trackerSet] of nameToTrackers) {
+    if (trackerSet.size < 2) continue
+    const arr = Array.from(trackerSet).sort()
+    for (const t of arr) {
+      crossSeededPerTracker.set(t, (crossSeededPerTracker.get(t) ?? 0) + 1)
+    }
+    for (let i = 0; i < arr.length; i++) {
+      for (let j = i + 1; j < arr.length; j++) {
+        const key = `${arr[i]}\0${arr[j]}`
+        pairCounts.set(key, (pairCounts.get(key) ?? 0) + 1)
+      }
+    }
+  }
+
+  const networkNodes: CrossSeedNode[] = []
+  for (const [tagKey, tt] of trackerTagMap) {
+    const count = trackerTorrentCount.get(tagKey) ?? 0
+    if (count === 0) continue
+    networkNodes.push({
+      id: tagKey,
+      name: tt.name,
+      color: tt.color,
+      torrentCount: count,
+      crossSeeded: crossSeededPerTracker.get(tagKey) ?? 0,
+    })
+  }
+
+  const networkEdges: CrossSeedEdge[] = []
+  for (const [key, weight] of pairCounts) {
+    const [source, target] = key.split("\0")
+    networkEdges.push({ source, target, weight })
+  }
+
+  return {
+    stats,
+    ratioDistribution,
+    seedTimeDistribution,
+    crossSeed,
+    activityGrid,
+    trackerHealth,
+    storageByTrackerCategory,
+    categoryBreakdown,
+    crossSeedNetwork: { nodes: networkNodes, edges: networkEdges },
+    sizesByTracker,
+    ageTimeline,
+    categoryTimeline,
+    ageBands,
+  }
+}
diff --git a/src/lib/fleet.ts b/src/lib/fleet.ts
index 67b6fa0d..23573920 100644
--- a/src/lib/fleet.ts
+++ b/src/lib/fleet.ts
@@ -1,10 +1,11 @@
 // src/lib/fleet.ts
 //
-// Functions: parseTorrentTags, getRatioBuckets, getSeedTimeBuckets, computeFleetStats, extractTagsFromSnapshots
+// Functions: parseTorrentTags, getRatioBuckets, getSeedTimeBuckets,
+// extractTagsFromSnapshots, normalizeCategory, toMonthKey
 
 import { CHART_THEME } from "@/components/charts/lib/theme"
 
-/** Raw torrent data from qBittorrent — shared by fleet charts */
+/** Normalized torrent record shape returned by the API — shared by fleet charts and components */
 export interface TorrentRaw {
   hash: string
   name: string
@@ -15,32 +16,33 @@ export interface TorrentRaw {
   downloaded: number
   ratio: number
   size: number
-  seeding_time: number
-  time_active: number
-  added_on: number
-  completion_on: number
-  last_activity: number
-  amount_left: number
-  num_seeds: number
-  num_leechs: number
-  num_complete: number
-  num_incomplete: number
-  upspeed: number
-  dlspeed: number
+  seedingTime: number
+  activeTime: number
+  addedAt: number
+  completedAt: number
+  lastActivityAt: number
+  remaining: number
+  seedCount: number
+  leechCount: number
+  swarmSeeders: number
+  swarmLeechers: number
+  uploadSpeed: number
+  downloadSpeed: number
   availability: number
   progress: number
-  client_name: string
+  clientName: string
 }
 
-/** Tracker tag with display metadata — shared by fleet charts */
+/** Tracker tag with display metadata */
 export interface TrackerTag {
   tag: string
   name: string
   color: string
 }
 
-/** Parse comma-separated qBT tag string into trimmed array. Lowercases by default. */
+/** Parse comma-separated qBT tag string into trimmed array */
 export function parseTorrentTags(rawTags: string, lowercase = true): string[] {
+  if (!rawTags) return []
   return rawTags
     .split(",")
     .map((t) => (lowercase ? t.trim().toLowerCase() : t.trim()))
@@ -104,6 +106,33 @@ export const SEED_TIME_BUCKETS: Bucket[] = [
   { label: "90d+", max: Infinity, color: CHART_THEME.scale[4] },
 ]
 
+/** Age band bucket definitions for torrent age distribution charts */
+export interface AgeBucket {
+  label: string
+  maxDays: number
+}
+
+export const AGE_BUCKETS: readonly AgeBucket[] = [
+  { label: "0-30d", maxDays: 30 },
+  { label: "1-3mo", maxDays: 90 },
+  { label: "3-6mo", maxDays: 180 },
+  { label: "6mo-1y", maxDays: 365 },
+  { label: "1-2y", maxDays: 730 },
+  { label: "2y+", maxDays: Infinity },
+]
+
+/** Normalize a qBT category string to a consistent display value */
+export function normalizeCategory(raw: string | undefined | null): string {
+  const trimmed = raw?.trim()
+  return trimmed || "Uncategorized"
+}
+
+/** Convert a Unix timestamp (seconds) to a YYYY-MM month key */
+export function toMonthKey(addedOnSeconds: number): string {
+  const d = new Date(addedOnSeconds * 1000)
+  return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`
+}
+
 /** Ratio buckets with optional accent color override on the "2-5" range */
 export function getRatioBuckets(accentColor?: string): Bucket[] {
   if (!accentColor) return RATIO_BUCKETS
@@ -146,48 +175,4 @@ export const LEECHING_STATES = new Set([
   "queuedDL",
   "metaDL",
 ])
-const STALE_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000
-
-export function computeFleetStats(
-  torrents: {
-    state: string
-    upspeed: number
-    dlspeed: number
-    size: number
-    lastActivity: number
-    tags: string
-  }[],
-  crossSeedTags: string[]
-): FleetStats {
-  const csTagSet = new Set(crossSeedTags.map((t) => t.toLowerCase()))
-  const now = Date.now()
-  let totalSeeding = 0
-  let totalLeeching = 0
-  let fleetUploadSpeed = 0
-  let fleetDownloadSpeed = 0
-  let totalLibrarySize = 0
-  let crossSeeded = 0
-  let staleCount = 0
-
-  for (const t of torrents) {
-    if (SEEDING_STATES.has(t.state)) totalSeeding++
-    else totalLeeching++
-    fleetUploadSpeed += t.upspeed
-    fleetDownloadSpeed += t.dlspeed
-    totalLibrarySize += t.size
-    if (t.lastActivity > 0 && now - t.lastActivity * 1000 > STALE_THRESHOLD_MS) staleCount++
-    if (csTagSet.size > 0) {
-      if (parseTorrentTags(t.tags).some((tag) => csTagSet.has(tag))) crossSeeded++
-    }
-  }
-
-  return {
-    totalSeeding,
-    totalLeeching,
-    fleetUploadSpeed,
-    fleetDownloadSpeed,
-    totalLibrarySize,
-    crossSeedPercent: torrents.length > 0 ? (crossSeeded / torrents.length) * 100 : 0,
-    staleCount,
-  }
-}
+export const STALE_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000
diff --git a/src/lib/formatters.test.ts b/src/lib/formatters.test.ts
index 791e85b9..0ba32129 100644
--- a/src/lib/formatters.test.ts
+++ b/src/lib/formatters.test.ts
@@ -1,22 +1,8 @@
 // src/lib/formatters.test.ts
 import { describe, expect, it } from "vitest"
-import {
-  bytesToGiB,
-  formatBytesFromString,
-  formatBytesNum,
-  formatRatio,
-  formatStatValue,
-} from "./formatters"
+import { formatBytesFromString, formatBytesNum, formatRatio, formatStatValue } from "./formatters"
 
 describe("formatBytesFromString", () => {
-  it("returns — for null", () => {
-    expect(formatBytesFromString(null)).toBe("—")
-  })
-
-  it("returns — for undefined", () => {
-    expect(formatBytesFromString(undefined)).toBe("—")
-  })
-
   it("formats GiB values", () => {
     // 500 GiB in bytes
     const bytes = String(BigInt(500) * BigInt(1024 ** 3))
@@ -30,13 +16,6 @@ describe("formatBytesFromString", () => {
   })
 })
 
-describe("bytesToGiB", () => {
-  it("converts bytes string to GiB number", () => {
-    const bytes = String(BigInt(1024 ** 3))
-    expect(bytesToGiB(bytes)).toBeCloseTo(1.0)
-  })
-})
-
 describe("formatBytesNum", () => {
   it("returns 0 B for zero bytes", () => {
     expect(formatBytesNum(0)).toBe("0 B")
@@ -83,14 +62,6 @@ describe("formatRatio", () => {
   it("formats a number to 2 decimal places", () => {
     expect(formatRatio(3.99)).toBe("3.99")
   })
-
-  it("returns — for null", () => {
-    expect(formatRatio(null)).toBe("—")
-  })
-
-  it("returns — for undefined", () => {
-    expect(formatRatio(undefined)).toBe("—")
-  })
 })
 
 describe("formatStatValue", () => {
diff --git a/src/lib/formatters.ts b/src/lib/formatters.ts
index aae13ecf..e9b09127 100644
--- a/src/lib/formatters.ts
+++ b/src/lib/formatters.ts
@@ -1,12 +1,12 @@
 // src/lib/formatters.ts
 //
 // Functions: formatBytesFromString, bytesToGiB, formatBytesNum,
-// formatRatio, formatAccountAge, formatJoinedDate, hexToRgba, hexToHsl,
-// hslToHex, generatePalette, getComplementaryColor, formatStatValue,
-// computeDelta, formatDuration, formatTimeAgo, splitValueUnit, compareBigIntDesc,
-// computePctChange, localDateStr, isUnixTimestampOnDate
+// formatRatio, formatAccountAge, formatJoinedDate, formatStatValue,
+// formatDuration, formatTimeAgo, splitValueUnit,
+// localDateStr, formatSpeed,
+// formatRatioDisplay, formatCount, formatPercent, formatDateTime
 
-import type { Snapshot, TrackerLatestStats } from "@/types/api"
+import type { TrackerLatestStats } from "@/types/api"
 
 /**
  * Formats a bigint byte string (from API) to human-readable GiB/TiB.
@@ -14,13 +14,17 @@ import type { Snapshot, TrackerLatestStats } from "@/types/api"
  */
 export function formatBytesFromString(bytesStr: string | null | undefined): string {
   if (!bytesStr) return "—"
-  const bytes = Number(BigInt(bytesStr))
-  const tib = bytes / 1024 ** 4
-  if (tib >= 1) return `${tib.toFixed(2)} TiB`
-  const gib = bytes / 1024 ** 3
-  if (gib >= 1) return `${gib.toFixed(2)} GiB`
-  const mib = bytes / 1024 ** 2
-  return `${Math.round(mib)} MiB`
+  try {
+    const bytes = Number(BigInt(bytesStr))
+    const tib = bytes / 1024 ** 4
+    if (tib >= 1) return `${tib.toFixed(2)} TiB`
+    const gib = bytes / 1024 ** 3
+    if (gib >= 1) return `${gib.toFixed(2)} GiB`
+    const mib = bytes / 1024 ** 2
+    return `${Math.round(mib)} MiB`
+  } catch {
+    return "—"
+  }
 }
 
 /**
@@ -29,7 +33,11 @@ export function formatBytesFromString(bytesStr: string | null | undefined): stri
  */
 export function bytesToGiB(bytesStr: string | null | undefined): number {
   if (!bytesStr) return 0
-  return Number(BigInt(bytesStr)) / 1024 ** 3
+  try {
+    return Number(BigInt(bytesStr)) / 1024 ** 3
+  } catch {
+    return 0
+  }
 }
 
 /**
@@ -39,6 +47,7 @@ export function bytesToGiB(bytesStr: string | null | undefined): number {
  * Adaptive precision: 0dp for ≥100, 1dp for ≥10, 2dp for <10.
  */
 export function formatBytesNum(bytes: number, binary = true): string {
+  if (!Number.isFinite(bytes)) return "—"
   if (bytes === 0) return "0 B"
   const sign = bytes < 0 ? "-" : ""
   const abs = Math.abs(bytes)
@@ -55,9 +64,10 @@ export function formatBytesNum(bytes: number, binary = true): string {
  * Formats a ratio number to 2 decimal places.
  * Returns "—" for null/undefined.
  */
-export function formatRatio(ratio: number | null | undefined): string {
+export function formatRatio(ratio: number | null | undefined, suffix = ""): string {
   if (ratio === null || ratio === undefined) return "—"
-  return ratio.toFixed(2)
+  if (!Number.isFinite(ratio)) return `∞${suffix}`
+  return `${ratio.toFixed(2)}${suffix}`
 }
 
 /**
@@ -94,104 +104,6 @@ export function formatJoinedDate(joinedAt: string | null): string | null {
   return date.toLocaleDateString("en-US", { month: "long", day: "numeric", year: "numeric" })
 }
 
-const VALID_HEX_RE = /^#[0-9a-fA-F]{6}$/
-const FALLBACK_HEX = "#00d4ff"
-
-/**
- * Converts a hex color (#rrggbb) to rgba with the given alpha.
- */
-export function hexToRgba(hex: string, alpha: number): string {
-  const safe = VALID_HEX_RE.test(hex) ? hex : FALLBACK_HEX
-  const r = parseInt(safe.slice(1, 3), 16)
-  const g = parseInt(safe.slice(3, 5), 16)
-  const b = parseInt(safe.slice(5, 7), 16)
-  return `rgba(${r}, ${g}, ${b}, ${alpha})`
-}
-
-/**
- * Converts a hex color (#rrggbb) to HSL components.
- * Returns [hue (0-360), saturation (0-1), lightness (0-1)].
- */
-export function hexToHsl(hex: string): [number, number, number] {
-  const r = parseInt(hex.slice(1, 3), 16) / 255
-  const g = parseInt(hex.slice(3, 5), 16) / 255
-  const b = parseInt(hex.slice(5, 7), 16) / 255
-  const max = Math.max(r, g, b)
-  const min = Math.min(r, g, b)
-  const l = (max + min) / 2
-
-  if (max === min) return [0, 0, l]
-
-  const d = max - min
-  const s = l > 0.5 ? d / (2 - max - min) : d / (max + min)
-
-  let h = 0
-  if (max === r) h = ((g - b) / d + (g < b ? 6 : 0)) / 6
-  else if (max === g) h = ((b - r) / d + 2) / 6
-  else h = ((r - g) / d + 4) / 6
-
-  return [h * 360, s, l]
-}
-
-/**
- * Converts HSL components to a hex color string.
- */
-export function hslToHex(h: number, s: number, l: number): string {
-  const hNorm = (((h % 360) + 360) % 360) / 360
-
-  function hue2rgb(p: number, q: number, t: number): number {
-    if (t < 0) t += 1
-    if (t > 1) t -= 1
-    if (t < 1 / 6) return p + (q - p) * 6 * t
-    if (t < 1 / 2) return q
-    if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6
-    return p
-  }
-
-  let r: number
-  let g: number
-  let b: number
-  if (s === 0) {
-    r = g = b = l
-  } else {
-    const q = l < 0.5 ? l * (1 + s) : l + s - l * s
-    const p = 2 * l - q
-    r = hue2rgb(p, q, hNorm + 1 / 3)
-    g = hue2rgb(p, q, hNorm)
-    b = hue2rgb(p, q, hNorm - 1 / 3)
-  }
-
-  const toHex = (x: number) =>
-    Math.round(x * 255)
-      .toString(16)
-      .padStart(2, "0")
-  return `#${toHex(r)}${toHex(g)}${toHex(b)}`
-}
-
-/**
- * Generates `count` visually distinct colors by rotating hue evenly across
- * 360°, anchored at the hue of `baseColor`. Saturation and lightness are
- * clamped to values that look good on dark backgrounds.
- */
-export function generatePalette(count: number, baseColor: string): string[] {
-  if (count === 0) return []
-  const [baseH, baseS, baseL] = hexToHsl(baseColor)
-  const sat = Math.max(baseS, 0.55)
-  const lit = Math.min(Math.max(baseL, 0.45), 0.65)
-  if (count === 1) return [hslToHex(baseH, sat, lit)]
-  const step = 360 / count
-  return Array.from({ length: count }, (_, i) => hslToHex(baseH + i * step, sat, lit))
-}
-
-/**
- * Generates a visually complementary color by rotating the hue.
- * Ensures visibility on dark backgrounds (min lightness 0.4, min saturation 0.5).
- */
-export function getComplementaryColor(hex: string, rotation = 150): string {
-  const [h, s, l] = hexToHsl(hex)
-  return hslToHex(h + rotation, Math.max(s, 0.5), Math.max(0.4, Math.min(0.7, l)))
-}
-
 export type StatMode = "ratio" | "seeding" | "uploaded" | "downloaded" | "buffer"
 
 /**
@@ -203,10 +115,10 @@ export function formatStatValue(stats: TrackerLatestStats | null, mode: StatMode
 
   switch (mode) {
     case "ratio":
-      return stats.ratio !== null && stats.ratio !== undefined ? `${stats.ratio.toFixed(2)}x` : "—"
+      return formatRatioDisplay(stats.ratio)
     case "seeding":
       return stats.seedingCount !== null && stats.seedingCount !== undefined
-        ? `${stats.seedingCount.toLocaleString()} seeding`
+        ? `${formatCount(stats.seedingCount)} seeding`
         : "—"
     case "uploaded":
       return stats.uploadedBytes ? `${formatBytesFromString(stats.uploadedBytes)} ↑` : "—"
@@ -222,54 +134,12 @@ export function formatStatValue(stats: TrackerLatestStats | null, mode: StatMode
   }
 }
 
-/**
- * Computes the 24-hour upload/download delta from a snapshot array.
- * Sorts snapshots ascending by polledAt before processing, so the result
- * is correct regardless of the order snapshots arrive in.
- * Returns null if fewer than 2 snapshots exist or no snapshot falls within
- * the 24-hour window.
- */
-export function computeDelta(snaps: Snapshot[]): { uploaded: string; downloaded: string } | null {
-  if (snaps.length < 2) return null
-
-  const sorted = [...snaps].sort(
-    (a, b) => new Date(a.polledAt).getTime() - new Date(b.polledAt).getTime()
-  )
-
-  const latest = sorted[sorted.length - 1]
-  const cutoff = Date.now() - 24 * 60 * 60 * 1000
-
-  let earliest: Snapshot | null = null
-  for (const s of sorted) {
-    if (new Date(s.polledAt).getTime() >= cutoff) {
-      earliest = s
-      break
-    }
-  }
-
-  if (!earliest || earliest === latest) return null
-  if (
-    !latest.uploadedBytes ||
-    !earliest.uploadedBytes ||
-    !latest.downloadedBytes ||
-    !earliest.downloadedBytes
-  )
-    return null
-
-  try {
-    const uploadDelta = BigInt(latest.uploadedBytes) - BigInt(earliest.uploadedBytes)
-    const downloadDelta = BigInt(latest.downloadedBytes) - BigInt(earliest.downloadedBytes)
-    return { uploaded: uploadDelta.toString(), downloaded: downloadDelta.toString() }
-  } catch {
-    return null
-  }
-}
-
 /**
  * Formats a duration in seconds to a compact human-readable string.
  * i.e 90 → "1m", 7200 → "2.0h", 172800 → "2.0d"
  */
 export function formatDuration(seconds: number): string {
+  if (!Number.isFinite(seconds) || seconds < 0) return "—"
   if (seconds < 3600) return `${Math.floor(seconds / 60)}m`
   if (seconds < 86400) return `${(seconds / 3600).toFixed(1)}h`
   return `${(seconds / 86400).toFixed(1)}d`
@@ -280,6 +150,7 @@ export function formatDuration(seconds: number): string {
  */
 export function formatTimeAgo(dateOrIso: Date | string): string {
   const ms = typeof dateOrIso === "string" ? new Date(dateOrIso).getTime() : dateOrIso.getTime()
+  if (Number.isNaN(ms)) return "—"
   const seconds = Math.floor((Date.now() - ms) / 1000)
   if (seconds < 60) return "just now"
   const minutes = Math.floor(seconds / 60)
@@ -298,44 +169,40 @@ export function splitValueUnit(formatted: string): { num: string; unit: string }
   return { num: formatted.slice(0, idx), unit: formatted.slice(idx + 1) }
 }
 
-/** Comparator for sorting bigint values in descending order. */
-export function compareBigIntDesc(a: bigint, b: bigint): number {
-  if (b > a) return 1
-  if (b < a) return -1
-  return 0
-}
-
-/** Compute percentage change between two bigint-encoded decimal strings. */
-export function computePctChange(today: string, yesterday: string | null): number | null {
-  if (yesterday === null) return null
-  try {
-    // NOTE: Converting BigInt to Number can lose precision for values larger than
-    // Number.MAX_SAFE_INTEGER (~8 PiB). For typical tracker upload/download totals
-    // this is unlikely to be a problem, but a full bigint arithmetic refactor would
-    // be required to handle extreme values correctly.
-    const y = Number(BigInt(yesterday))
-    if (y === 0) return null
-    const t = Number(BigInt(today))
-    return ((t - y) / y) * 100
-  } catch {
-    return null
-  }
-}
-
 /**
  * Returns a YYYY-MM-DD date string in the server's local timezone (respects TZ env).
- * Use this instead of `.toISOString().slice(0, 10)` which always returns UTC.
  */
 export function localDateStr(date?: Date | number): string {
   const d = date instanceof Date ? date : date !== undefined ? new Date(date) : new Date()
   return d.toLocaleDateString("en-CA")
 }
 
-/**
- * Returns true if a unix timestamp (seconds) falls on the given date string (YYYY-MM-DD)
- * in the server's local timezone. Returns false for timestamps <= 0.
- */
-export function isUnixTimestampOnDate(unixSeconds: number, dateStr: string): boolean {
-  if (unixSeconds <= 0) return false
-  return localDateStr(new Date(unixSeconds * 1000)) === dateStr
+export function formatSpeed(bytesPerSec: number): string {
+  if (!bytesPerSec || bytesPerSec <= 0) return "0 B/s"
+  return `${formatBytesNum(bytesPerSec)}/s`
+}
+
+/** Formats a ratio with "x" suffix for display. Returns "—" for null/undefined, "∞x" for Infinity. */
+export function formatRatioDisplay(ratio: number | null | undefined): string {
+  return formatRatio(ratio, "x")
+}
+
+/** Formats an integer with locale-aware thousand separators. Returns "—" for null/undefined. */
+export function formatCount(n: number | null | undefined): string {
+  if (n === null || n === undefined) return "—"
+  return n.toLocaleString("en-US")
+}
+
+/** Formats a percentage value with configurable decimal places. */
+export function formatPercent(value: number, decimals = 1): string {
+  if (!Number.isFinite(value)) return "—"
+  return `${value.toFixed(decimals)}%`
+}
+
+/** Formats a Date, ISO string, or timestamp as a locale-pinned datetime string. */
+export function formatDateTime(dateOrIso: Date | string | number): string {
+  const d =
+    typeof dateOrIso === "string" || typeof dateOrIso === "number" ? new Date(dateOrIso) : dateOrIso
+  if (Number.isNaN(d.getTime())) return "—"
+  return d.toLocaleString("en-US")
 }
diff --git a/src/lib/image-hosting/__tests__/onlyimage.test.ts b/src/lib/image-hosting/__tests__/onlyimage.test.ts
index 65014d7f..6c882d11 100644
--- a/src/lib/image-hosting/__tests__/onlyimage.test.ts
+++ b/src/lib/image-hosting/__tests__/onlyimage.test.ts
@@ -75,18 +75,6 @@ describe("onlyimageAdapter", () => {
     expect(body.get("expiration_date")).toBe("P1D")
   })
 
-  it("converts 5-minute expiration correctly", async () => {
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      json: async () => CHEVERETO_RESPONSE,
-    })
-
-    await onlyimageAdapter.upload(Buffer.from("img"), "test.png", "key", { expirationSeconds: 300 })
-
-    const body = mockFetch.mock.calls[0][1].body as FormData
-    expect(body.get("expiration_date")).toBe("PT5M")
-  })
-
   it("throws on error response", async () => {
     mockFetch.mockResolvedValueOnce({
       ok: false,
diff --git a/src/lib/image-hosting/__tests__/ptpimg.test.ts b/src/lib/image-hosting/__tests__/ptpimg.test.ts
index c8b41e31..3fc952fa 100644
--- a/src/lib/image-hosting/__tests__/ptpimg.test.ts
+++ b/src/lib/image-hosting/__tests__/ptpimg.test.ts
@@ -11,10 +11,6 @@ describe("ptpimgAdapter", () => {
     mockFetch.mockReset()
   })
 
-  it("has correct id", () => {
-    expect(ptpimgAdapter.id).toBe("ptpimg")
-  })
-
   it("sends correct multipart request and parses response", async () => {
     mockFetch.mockResolvedValueOnce({
       ok: true,
diff --git a/src/lib/image-hosting/__tests__/utils.test.ts b/src/lib/image-hosting/__tests__/utils.test.ts
new file mode 100644
index 00000000..5d7ed1b4
--- /dev/null
+++ b/src/lib/image-hosting/__tests__/utils.test.ts
@@ -0,0 +1,51 @@
+// src/lib/image-hosting/__tests__/utils.test.ts
+import { describe, expect, it } from "vitest"
+import { safeImageUrl, validateImageUrl } from "@/lib/validators"
+
+describe("validateImageUrl", () => {
+  it("returns the URL for a valid https URL", () => {
+    const url = "https://example.com/img.png"
+    expect(validateImageUrl(url)).toBe(url)
+  })
+
+  it("returns the URL for a valid http URL", () => {
+    const url = "http://example.com/img.png"
+    expect(validateImageUrl(url)).toBe(url)
+  })
+
+  it("throws for an ftp URL", () => {
+    expect(() => validateImageUrl("ftp://example.com/img.png")).toThrow(
+      "Invalid URL in image host response"
+    )
+  })
+
+  it("throws for a non-URL string", () => {
+    expect(() => validateImageUrl("not-a-url")).toThrow("Invalid URL in image host response")
+  })
+
+  it("throws for an empty string", () => {
+    expect(() => validateImageUrl("")).toThrow("Invalid URL in image host response")
+  })
+})
+
+describe("safeImageUrl", () => {
+  it("returns undefined for undefined input", () => {
+    expect(safeImageUrl(undefined)).toBeUndefined()
+  })
+
+  it("returns the URL for a valid https URL", () => {
+    expect(safeImageUrl("https://example.com/img.png")).toBe("https://example.com/img.png")
+  })
+
+  it("returns undefined for an ftp URL instead of throwing", () => {
+    expect(safeImageUrl("ftp://bad.com/x")).toBeUndefined()
+  })
+
+  it("returns undefined for a non-URL string instead of throwing", () => {
+    expect(safeImageUrl("not-a-url")).toBeUndefined()
+  })
+
+  it("returns undefined for an empty string instead of throwing", () => {
+    expect(safeImageUrl("")).toBeUndefined()
+  })
+})
diff --git a/src/lib/image-hosting/imgbb.ts b/src/lib/image-hosting/imgbb.ts
index 99acbae3..764730c6 100644
--- a/src/lib/image-hosting/imgbb.ts
+++ b/src/lib/image-hosting/imgbb.ts
@@ -1,32 +1,11 @@
 // src/lib/image-hosting/imgbb.ts
 
+import { IMAGE_EXPIRATION_MAX, IMAGE_EXPIRATION_MIN } from "@/lib/limits"
+import { safeImageUrl, validateImageUrl } from "@/lib/validators"
 import type { ImageHostAdapter, UploadOptions, UploadResult } from "./types"
 
 const UPLOAD_URL = "https://api.imgbb.com/1/upload"
 
-function validateImageUrl(url: string): string {
-  try {
-    const parsed = new URL(url)
-    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
-      throw new Error("Invalid URL protocol")
-    }
-    return url
-  } catch {
-    throw new Error("Invalid URL in image host response")
-  }
-}
-
-function safeImageUrl(url: string | undefined): string | undefined {
-  if (!url) return undefined
-  try {
-    return validateImageUrl(url)
-  } catch {
-    return undefined
-  }
-}
-const MIN_EXPIRATION = 60
-const MAX_EXPIRATION = 15_552_000
-
 interface ImgBBResponse {
   success: boolean
   status: number
@@ -57,7 +36,10 @@ export const imgbbAdapter: ImageHostAdapter = {
     form.set("image", new Blob([new Uint8Array(fileBuffer)]), fileName)
 
     if (options?.expirationSeconds && options.expirationSeconds > 0) {
-      const clamped = Math.max(MIN_EXPIRATION, Math.min(MAX_EXPIRATION, options.expirationSeconds))
+      const clamped = Math.max(
+        IMAGE_EXPIRATION_MIN,
+        Math.min(IMAGE_EXPIRATION_MAX, options.expirationSeconds)
+      )
       form.set("expiration", String(clamped))
     }
 
diff --git a/src/lib/image-hosting/onlyimage.ts b/src/lib/image-hosting/onlyimage.ts
index 1cb523e3..4501e71f 100644
--- a/src/lib/image-hosting/onlyimage.ts
+++ b/src/lib/image-hosting/onlyimage.ts
@@ -1,32 +1,10 @@
 // src/lib/image-hosting/onlyimage.ts
-//
-// Functions: upload (via onlyimageAdapter), secondsToIsoDuration
 
+import { safeImageUrl, validateImageUrl } from "@/lib/validators"
 import type { ImageHostAdapter, UploadOptions, UploadResult } from "./types"
 
 const UPLOAD_URL = "https://onlyimage.org/api/1/upload/"
 
-function validateImageUrl(url: string): string {
-  try {
-    const parsed = new URL(url)
-    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
-      throw new Error("Invalid URL protocol")
-    }
-    return url
-  } catch {
-    throw new Error("Invalid URL in image host response")
-  }
-}
-
-function safeImageUrl(url: string | undefined): string | undefined {
-  if (!url) return undefined
-  try {
-    return validateImageUrl(url)
-  } catch {
-    return undefined
-  }
-}
-
 interface CheveretoResponse {
   status_code: number
   image: {
diff --git a/src/lib/limits.ts b/src/lib/limits.ts
new file mode 100644
index 00000000..891bdfa5
--- /dev/null
+++ b/src/lib/limits.ts
@@ -0,0 +1,94 @@
+// src/lib/limits.ts
+
+// ─── Auth ─────────────────────────────────────────────────────────────────────
+export const PASSWORD_MIN = 8
+export const PASSWORD_MAX = 128
+export const USERNAME_MIN = 3
+export const USERNAME_MAX = 100
+export const TOTP_TOKEN_MAX = 2048
+
+// ─── Network ──────────────────────────────────────────────────────────────────
+export const PORT_MIN = 1
+export const PORT_MAX = 65535
+
+// ─── Tracker ──────────────────────────────────────────────────────────────────
+export const TRACKER_NAME_MAX = 100
+export const TRACKER_URL_MAX = 500
+export const TRACKER_TOKEN_MAX = 500
+export const AVISTAZ_TOKEN_MAX = 5000
+export const TRACKER_TAG_MAX = 100
+export const TRACKER_NOTES_MAX = 2000
+export const TRACKER_ROLE_NAME_MAX = 255
+
+// ─── Polling & Retention ──────────────────────────────────────────────────────
+export const POLL_INTERVAL_MIN = 15
+export const POLL_INTERVAL_MAX = 1440
+export const POLL_INTERVAL_DEFAULT = 60
+export const POLL_MANUAL_COOLDOWN_MS = 10_000
+export const CLIENT_POLL_INTERVAL_MIN = 60
+export const CLIENT_POLL_INTERVAL_MAX = 86400
+export const CLIENT_POLL_INTERVAL_DEFAULT = 300
+export const SNAPSHOT_RETENTION_MIN = 7
+export const SNAPSHOT_RETENTION_MAX = 3650
+export const SNAPSHOT_RETENTION_DEFAULT = 90
+export const SNAPSHOT_QUERY_MAX = 3650
+export const FLEET_SNAPSHOT_QUERY_MAX = 365
+
+// ─── Session & Lockout ────────────────────────────────────────────────────────
+export const SESSION_TIMEOUT_MIN = 1
+export const SESSION_TIMEOUT_MAX = 525960
+export const LOCKOUT_THRESHOLD_MIN = 1
+export const LOCKOUT_THRESHOLD_MAX = 99
+export const LOCKOUT_THRESHOLD_DEFAULT = 5
+export const LOCKOUT_DURATION_MIN = 1
+export const LOCKOUT_DURATION_MAX = 1440
+export const LOCKOUT_DURATION_DEFAULT = 15
+
+// ─── Backup ───────────────────────────────────────────────────────────────────
+export const BACKUP_RETENTION_MIN = 1
+export const BACKUP_RETENTION_MAX = 365
+export const BACKUP_PASSWORD_MAX = 128
+
+// ─── String Lengths ───────────────────────────────────────────────────────────
+export const SHORT_NAME_MAX = 100
+export const HOST_MAX = 255
+export const CREDENTIAL_MAX = 255
+export const LONG_STRING_MAX = 500
+export const EMOJI_MAX = 10
+export const ALERT_KEY_MAX = 255
+export const ALERT_TYPE_MAX = 30
+export const SORT_ORDER_MAX = 9999
+export const COLOR_STRING_MAX = 20
+export const BATCH_MEMBERS_MAX = 500
+
+// ─── Download Clients ─────────────────────────────────────────────────────────
+export const CROSS_SEED_TAGS_MAX = 50
+export const CROSS_SEED_TAG_MAX = 100
+
+// ─── File Sizes ───────────────────────────────────────────────────────────────
+export const UPLOAD_IMAGE_MAX_BYTES = 32 * 1024 * 1024
+export const BACKUP_RESTORE_MAX_BYTES = 50 * 1024 * 1024
+export const AVATAR_FETCH_MAX_BYTES = 5 * 1024 * 1024
+export const MOUSEHOLE_BODY_MAX_BYTES = 256
+
+// ─── Image Hosting ────────────────────────────────────────────────────────────
+export const IMAGE_EXPIRATION_MIN = 60
+export const IMAGE_EXPIRATION_MAX = 15_552_000
+
+// ─── Notifications ────────────────────────────────────────────────────────────
+export const NOTIFICATION_COOLDOWN_MAX_MS = 300_000
+export const VIP_EXPIRING_DAYS_DEFAULT = 7
+export const UNSATISFIED_LIMIT_PCT_DEFAULT = 80
+export const RATIO_DROP_DELTA_DEFAULT = 0.1
+export const BUFFER_MILESTONE_DEFAULT_BYTES = 10_737_418_240
+
+// ─── Misc ─────────────────────────────────────────────────────────────────────
+export const QUICKLINK_SLUGS_MAX = 100
+export const QUICKLINK_SLUG_MAX = 200
+export const REORDER_IDS_MAX = 500
+export const EVENTS_LIMIT_DEFAULT = 50
+export const EVENTS_LIMIT_CAP = 1000
+
+// ─── Time ─────────────────────────────────────────────────────────────────────
+export const MS_PER_DAY = 24 * 60 * 60 * 1000
+export const ADAPTER_FETCH_TIMEOUT_MS = 15_000
diff --git a/src/lib/lockout.ts b/src/lib/lockout.ts
index 7180f0b2..3d744458 100644
--- a/src/lib/lockout.ts
+++ b/src/lib/lockout.ts
@@ -1,13 +1,11 @@
 // src/lib/lockout.ts
-//
-// Functions: checkLockout, recordFailedAttempt, resetFailedAttempts
 
 import { eq, sql } from "drizzle-orm"
 import { NextResponse } from "next/server"
 import { db } from "@/lib/db"
 import { appSettings } from "@/lib/db/schema"
 
-interface LockoutSettings {
+export interface LockoutSettings {
   lockoutEnabled: boolean
   lockoutThreshold: number
   lockoutDurationMinutes: number
diff --git a/src/lib/log-reader.ts b/src/lib/log-reader.ts
index 79dc5f60..ce196a8a 100644
--- a/src/lib/log-reader.ts
+++ b/src/lib/log-reader.ts
@@ -2,13 +2,17 @@
 //
 // Functions: readLogTail
 
+import { existsSync } from "node:fs"
 import { open, stat } from "node:fs/promises"
-import { DEFAULT_LOG_FILE } from "@/lib/constants"
+import { dirname } from "node:path"
+import { DEFAULT_LOG_FILE, DEV_LOG_FILE } from "@/lib/constants"
 
 export async function readLogTail(
   maxBytes: number
 ): Promise<{ content: string; sizeBytes: number }> {
-  const logFile = process.env.LOG_FILE || DEFAULT_LOG_FILE
+  const logFile =
+    process.env.LOG_FILE ??
+    (existsSync(dirname(DEFAULT_LOG_FILE)) ? DEFAULT_LOG_FILE : DEV_LOG_FILE)
 
   const info = await stat(logFile)
   const readSize = Math.min(maxBytes, info.size)
diff --git a/src/lib/logger.ts b/src/lib/logger.ts
index a9498bcd..fa14da7d 100644
--- a/src/lib/logger.ts
+++ b/src/lib/logger.ts
@@ -2,17 +2,21 @@
 //
 // Exports: log
 
-import { mkdirSync } from "node:fs"
+import { existsSync, mkdirSync } from "node:fs"
 import { dirname } from "node:path"
 import pino from "pino"
 import pretty from "pino-pretty"
-import { DEFAULT_LOG_FILE } from "@/lib/constants"
+import { DEFAULT_LOG_FILE, DEV_LOG_FILE } from "@/lib/constants"
 
 const g = globalThis as typeof globalThis & { __logger?: pino.Logger }
 
 function createLogger(): pino.Logger {
-  const level = process.env.LOG_LEVEL || "info"
-  const logFile = process.env.LOG_FILE ?? DEFAULT_LOG_FILE
+  const stdoutLevel = process.env.LOG_LEVEL || "info"
+  // Explicit LOG_FILE always wins. Otherwise use the Docker path if it exists,
+  // or fall back to a local .next/ file so the events tab works in dev.
+  const explicitLogFile = process.env.LOG_FILE
+  const logFile =
+    explicitLogFile ?? (existsSync(dirname(DEFAULT_LOG_FILE)) ? DEFAULT_LOG_FILE : DEV_LOG_FILE)
 
   const prettyStream = pretty({
     colorize: process.stdout.isTTY ?? false,
@@ -20,21 +24,25 @@ function createLogger(): pino.Logger {
     ignore: "pid,hostname",
   })
 
-  const streams: pino.StreamEntry[] = [{ level: "trace", stream: prettyStream }]
+  // Stdout uses the user-configured level (defaults to "info").
+  // File always captures debug+ so the events tab can show all levels.
+  const streams: pino.StreamEntry[] = [{ level: stdoutLevel as pino.Level, stream: prettyStream }]
 
   if (logFile) {
     try {
       mkdirSync(dirname(logFile), { recursive: true })
       streams.push({
-        level: "trace",
+        level: "debug",
         stream: pino.destination({ dest: logFile, mkdir: false, sync: false }),
       })
-    } catch {
-      // Can't create log directory (e.g. /data on macOS without root) — stdout only
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err)
+      process.stderr.write(`[logger] Log file "${logFile}" unavailable: ${msg}\n`)
     }
   }
 
-  return pino({ level }, pino.multistream(streams))
+  // Root level must be the lowest of all streams so messages reach them
+  return pino({ level: "debug" }, pino.multistream(streams))
 }
 
 export const log: pino.Logger = g.__logger ?? createLogger()
diff --git a/src/lib/notifications/decrypt.ts b/src/lib/notifications/decrypt.ts
index e3e5df38..fbf8016c 100644
--- a/src/lib/notifications/decrypt.ts
+++ b/src/lib/notifications/decrypt.ts
@@ -1,20 +1,24 @@
 // src/lib/notifications/decrypt.ts
-//
-// Functions: decryptNotificationConfig
-
 import "server-only"
 
 import { decrypt } from "@/lib/crypto"
 import type { NotificationConfig } from "@/lib/notifications/types"
+import { isNotificationConfig } from "@/lib/notifications/types"
 
 export function decryptNotificationConfig(
   target: { name: string; encryptedConfig: string },
   key: Buffer
 ): NotificationConfig {
+  let parsed: unknown
   try {
     const json = decrypt(target.encryptedConfig, key)
-    return JSON.parse(json) as NotificationConfig
+    parsed = JSON.parse(json)
   } catch {
+    // never surface raw crypto or parse error details
+    throw new Error(`Config is missing or invalid for notification target "${target.name}"`)
+  }
+  if (!isNotificationConfig(parsed)) {
     throw new Error(`Config is missing or invalid for notification target "${target.name}"`)
   }
+  return parsed
 }
diff --git a/src/lib/notifications/deliver.ts b/src/lib/notifications/deliver.ts
index ee9fcd35..7030b9b5 100644
--- a/src/lib/notifications/deliver.ts
+++ b/src/lib/notifications/deliver.ts
@@ -1,21 +1,22 @@
 // src/lib/notifications/deliver.ts
-//
-// Functions: getCircuits, getCircuitState, resetCircuitBreaker, isCircuitOpen, recordFailure, recordSuccess, deliverDiscordWebhook
 
 import { sanitizeNetworkError } from "@/lib/error-utils"
+import { NOTIFICATION_COOLDOWN_MAX_MS } from "@/lib/limits"
 import { log } from "@/lib/logger"
+import type { DiscordEmbed } from "./payload"
 
-interface CircuitState {
+export interface CircuitState {
   failures: number
   openUntil: Date | null
 }
 
 // HMR-safe circuit breaker state — one per notification target
-const CIRCUIT_KEY = "__notificationCircuitBreakers"
+const g = globalThis as typeof globalThis & {
+  __notificationCircuits?: Map<number, CircuitState>
+}
 function getCircuits(): Map<number, CircuitState> {
-  const g = globalThis as Record<string, unknown>
-  if (!g[CIRCUIT_KEY]) g[CIRCUIT_KEY] = new Map<number, CircuitState>()
-  return g[CIRCUIT_KEY] as Map<number, CircuitState>
+  if (!g.__notificationCircuits) g.__notificationCircuits = new Map<number, CircuitState>()
+  return g.__notificationCircuits
 }
 
 const MAX_FAILURES = 3
@@ -64,7 +65,7 @@ export interface DeliveryResult {
 export async function deliverDiscordWebhook(
   targetId: number,
   webhookUrl: string,
-  embeds: Record<string, unknown>[]
+  embeds: DiscordEmbed[]
 ): Promise<DeliveryResult> {
   if (isCircuitOpen(targetId)) {
     return { success: false, status: "failed", error: "Circuit breaker open — skipping delivery" }
@@ -88,7 +89,7 @@ export async function deliverDiscordWebhook(
       const rawRetryAfter = Number(res.headers.get("Retry-After") ?? "60")
       const retryAfter = Math.min(
         Number.isFinite(rawRetryAfter) ? rawRetryAfter * 1000 : 60_000,
-        300_000
+        NOTIFICATION_COOLDOWN_MAX_MS
       ) // cap at 5 min
       recordFailure(targetId, retryAfter)
       log.warn(`Discord rate limit for target ${targetId} — retry after ${retryAfter}ms`)
diff --git a/src/lib/notifications/dispatch.ts b/src/lib/notifications/dispatch.ts
index 0a650a81..689c8397 100644
--- a/src/lib/notifications/dispatch.ts
+++ b/src/lib/notifications/dispatch.ts
@@ -1,25 +1,34 @@
 // src/lib/notifications/dispatch.ts
-//
-// Functions: dispatchNotifications, detectEvents, buildEventData
 
 import { eq } from "drizzle-orm"
 import { MAM_BONUS_CAP } from "@/lib/adapters/constants"
 import { db } from "@/lib/db"
+import type { NotificationTargetRow } from "@/lib/db/schema"
 import { notificationDeliveryState, notificationTargets } from "@/lib/db/schema"
+import {
+  BUFFER_MILESTONE_DEFAULT_BYTES,
+  RATIO_DROP_DELTA_DEFAULT,
+  UNSATISFIED_LIMIT_PCT_DEFAULT,
+  VIP_EXPIRING_DAYS_DEFAULT,
+} from "@/lib/limits"
 import { log } from "@/lib/logger"
 import { decryptNotificationConfig } from "@/lib/notifications/decrypt"
 import { deliverDiscordWebhook } from "@/lib/notifications/deliver"
 import { buildDiscordEmbed } from "@/lib/notifications/payload"
-import type {
-  DiscordConfig,
-  NotificationEventType,
-  NotificationThresholds,
+import {
+  type DiscordConfig,
+  isDiscordConfig,
+  type NotificationEventType,
+  type NotificationThresholds,
+  parseThresholds,
+  type SnapshotContext,
 } from "@/lib/notifications/types"
 import {
   checkActiveHnrs,
   checkAnniversaryMilestone,
   checkBonusCapReached,
   checkBufferMilestoneCrossed,
+  checkDownloadDisabled,
   checkHnrIncrease,
   checkRankChange,
   checkRatioBelowMinimumTransition,
@@ -31,46 +40,13 @@ import {
   EVENT_SNOOZE_MS,
 } from "@/lib/tracker-events"
 
-export interface SnapshotContext {
-  trackerId: number
-  trackerName: string
-  storeUsernames: boolean
-  currentRatio: number | null
-  previousRatio: number | null
-  currentHnrs: number | null
-  previousHnrs: number | null
-  currentBufferBytes: bigint | null
-  previousBufferBytes: bigint | null
-  trackerDown: boolean
-  trackerError: string | null
-  currentWarned: boolean | null
-  previousWarned: boolean | null
-  currentSeedingCount: number | null
-  currentGroup: string | null
-  previousGroup: string | null
-  trackerIsActive: boolean
-  trackerPausedAt: string | null
-  trackerJoinedAt: string | null
-  minimumRatio: number | undefined
-  // MAM-specific fields grouped into sub-object; undefined for non-MAM trackers
-  mamContext?: {
-    currentSeedbonus: number | null
-    previousSeedbonus: number | null
-    vipUntil: string | null
-    unsatisfiedCount: number | null
-    unsatisfiedLimit: number | null
-    inactiveHnrCount: number | null
-    previousInactiveHnrCount: number | null
-  }
-}
-
 export async function dispatchNotifications(
   ctx: SnapshotContext,
   encryptionKey: Buffer,
-  enabledTargets?: (typeof notificationTargets.$inferSelect)[]
+  enabledTargets?: NotificationTargetRow[]
 ): Promise<void> {
   // Use pre-fetched targets if provided, otherwise query (backward-compat)
-  let targets: (typeof notificationTargets.$inferSelect)[]
+  let targets: NotificationTargetRow[]
   if (enabledTargets) {
     targets = enabledTargets
   } else {
@@ -90,24 +66,29 @@ export async function dispatchNotifications(
   if (targets.length === 0) return
 
   // Batch-fetch all cooldown state for this tracker in one query
-  const cooldownRows = await db
-    .select({
-      targetId: notificationDeliveryState.targetId,
-      eventType: notificationDeliveryState.eventType,
-      snoozedUntil: notificationDeliveryState.snoozedUntil,
-    })
-    .from(notificationDeliveryState)
-    .where(eq(notificationDeliveryState.trackerId, ctx.trackerId))
-
-  const cooldownMap = new Map(
-    cooldownRows.map((r) => [`${r.targetId}:${r.eventType}`, r.snoozedUntil])
-  )
+  let cooldownMap = new Map<string, Date | null>()
+  try {
+    const cooldownRows = await db
+      .select({
+        targetId: notificationDeliveryState.targetId,
+        eventType: notificationDeliveryState.eventType,
+        snoozedUntil: notificationDeliveryState.snoozedUntil,
+      })
+      .from(notificationDeliveryState)
+      .where(eq(notificationDeliveryState.trackerId, ctx.trackerId))
+
+    cooldownMap = new Map(cooldownRows.map((r) => [`${r.targetId}:${r.eventType}`, r.snoozedUntil]))
+  } catch (err) {
+    log.error(
+      `dispatchNotifications: failed to fetch cooldown state for tracker ${ctx.trackerId}: ${err instanceof Error ? err.message : "Unknown"}. Proceeding without cooldown checks.`
+    )
+  }
 
   const now = new Date()
 
   for (const target of targets) {
     try {
-      // Scope filter — null means all trackers, array means specific tracker IDs
+      // Scope filter. null means all trackers, array means specific tracker IDs
       if (target.scope !== null && !target.scope.includes(ctx.trackerId)) continue
 
       const events = detectEvents(ctx, target)
@@ -117,9 +98,9 @@ export async function dispatchNotifications(
       const anniversaryLabel = events.includes("anniversary")
         ? checkAnniversaryMilestone(ctx.trackerJoinedAt)?.label
         : undefined
-      const targetThresholds = (target.thresholds as NotificationThresholds | null) ?? null
+      const targetThresholds = parseThresholds(target.thresholds)
 
-      // Only Discord is currently supported — skip unknown types
+      // Only Discord is currently supported. Skip unknown types
       if (target.type !== "discord") {
         log.warn(
           `dispatchNotifications: skipping unsupported target type "${target.type}" for "${target.name}" (id=${target.id})`
@@ -129,7 +110,14 @@ export async function dispatchNotifications(
 
       let config: DiscordConfig
       try {
-        config = decryptNotificationConfig(target, encryptionKey) as DiscordConfig
+        const raw = decryptNotificationConfig(target, encryptionKey)
+        if (!isDiscordConfig(raw)) {
+          log.error(
+            `dispatchNotifications: decrypted config is not a valid DiscordConfig for "${target.name}" (id=${target.id})`
+          )
+          continue
+        }
+        config = raw
       } catch {
         log.error(
           `dispatchNotifications: cannot decrypt config for notification target "${target.name}" (id=${target.id})`
@@ -137,13 +125,13 @@ export async function dispatchNotifications(
         continue
       }
 
-      // Collect per-target delivery results — write once after the event loop
+      // Collect per-target delivery results
       let finalStatus: "delivered" | "failed" | "rate_limited" | null = null
       let finalError: string | null = null
 
       for (const event of events) {
         try {
-          // Cooldown check — in-memory lookup from batched query
+          // Cooldown check. In-memory lookup from batched query
           const snoozedUntil = cooldownMap.get(`${target.id}:${event}`)
           if (snoozedUntil && now < snoozedUntil) continue
 
@@ -155,9 +143,7 @@ export async function dispatchNotifications(
             data: buildEventData(event, ctx, targetThresholds, anniversaryLabel),
           })
 
-          const result = await deliverDiscordWebhook(target.id, config.webhookUrl, [
-            embed as unknown as Record<string, unknown>,
-          ])
+          const result = await deliverDiscordWebhook(target.id, config.webhookUrl, [embed])
 
           // Track worst-case status for this target: failed > rate_limited > delivered
           if (
@@ -171,24 +157,30 @@ export async function dispatchNotifications(
 
           // Record cooldown only if delivered successfully
           if (result.success) {
-            const snoozedUntilDate = new Date(now.getTime() + EVENT_SNOOZE_MS[event])
-            await db
-              .insert(notificationDeliveryState)
-              .values({
-                targetId: target.id,
-                trackerId: ctx.trackerId,
-                eventType: event,
-                lastNotifiedAt: now,
-                snoozedUntil: snoozedUntilDate,
-              })
-              .onConflictDoUpdate({
-                target: [
-                  notificationDeliveryState.targetId,
-                  notificationDeliveryState.trackerId,
-                  notificationDeliveryState.eventType,
-                ],
-                set: { lastNotifiedAt: now, snoozedUntil: snoozedUntilDate },
-              })
+            try {
+              const snoozedUntilDate = new Date(now.getTime() + EVENT_SNOOZE_MS[event])
+              await db
+                .insert(notificationDeliveryState)
+                .values({
+                  targetId: target.id,
+                  trackerId: ctx.trackerId,
+                  eventType: event,
+                  lastNotifiedAt: now,
+                  snoozedUntil: snoozedUntilDate,
+                })
+                .onConflictDoUpdate({
+                  target: [
+                    notificationDeliveryState.targetId,
+                    notificationDeliveryState.trackerId,
+                    notificationDeliveryState.eventType,
+                  ],
+                  set: { lastNotifiedAt: now, snoozedUntil: snoozedUntilDate },
+                })
+            } catch (cooldownErr) {
+              log.error(
+                `dispatchNotifications: delivered "${event}" to "${target.name}" but failed to record cooldown (may re-send next cycle): ${cooldownErr instanceof Error ? cooldownErr.message : "Unknown"}`
+              )
+            }
           }
         } catch (err) {
           log.error(
@@ -197,16 +189,22 @@ export async function dispatchNotifications(
         }
       }
 
-      // Write delivery status once per target, not per event
+      // Write delivery status
       if (finalStatus) {
-        await db
-          .update(notificationTargets)
-          .set({
-            lastDeliveryStatus: finalStatus,
-            lastDeliveryAt: now,
-            lastDeliveryError: finalError,
-          })
-          .where(eq(notificationTargets.id, target.id))
+        try {
+          await db
+            .update(notificationTargets)
+            .set({
+              lastDeliveryStatus: finalStatus,
+              lastDeliveryAt: now,
+              lastDeliveryError: finalError,
+            })
+            .where(eq(notificationTargets.id, target.id))
+        } catch (statusErr) {
+          log.error(
+            `dispatchNotifications: delivered to "${target.name}" but failed to write delivery status: ${statusErr instanceof Error ? statusErr.message : "Unknown"}`
+          )
+        }
       }
     } catch (err) {
       log.error(
@@ -218,14 +216,18 @@ export async function dispatchNotifications(
 
 export function detectEvents(
   ctx: SnapshotContext,
-  target: typeof notificationTargets.$inferSelect
+  target: NotificationTargetRow
 ): NotificationEventType[] {
   const events: NotificationEventType[] = []
-  const thresholds = (target.thresholds as NotificationThresholds | null) ?? {}
+  const thresholds = parseThresholds(target.thresholds)
 
   if (
     target.notifyRatioDrop &&
-    checkRatioDelta(ctx.previousRatio, ctx.currentRatio, thresholds.ratioDropDelta ?? 0.1)
+    checkRatioDelta(
+      ctx.previousRatio,
+      ctx.currentRatio,
+      thresholds.ratioDropDelta ?? RATIO_DROP_DELTA_DEFAULT
+    )
   ) {
     events.push("ratio_drop")
   }
@@ -243,7 +245,7 @@ export function detectEvents(
     checkBufferMilestoneCrossed(
       ctx.currentBufferBytes,
       ctx.previousBufferBytes,
-      BigInt(thresholds.bufferMilestoneBytes ?? 10737418240)
+      BigInt(thresholds.bufferMilestoneBytes ?? BUFFER_MILESTONE_DEFAULT_BYTES)
     )
   ) {
     events.push("buffer_milestone")
@@ -277,8 +279,8 @@ export function detectEvents(
     const capLimit = (thresholds?.bonusCapLimit as number | undefined) ?? MAM_BONUS_CAP
     if (
       checkBonusCapReached(
-        ctx.mamContext?.currentSeedbonus ?? null,
-        ctx.mamContext?.previousSeedbonus ?? null,
+        ctx.platformContext?.currentSeedbonus ?? null,
+        ctx.platformContext?.previousSeedbonus ?? null,
         capLimit
       )
     ) {
@@ -287,18 +289,19 @@ export function detectEvents(
   }
 
   if (target.notifyVipExpiring) {
-    const days = (thresholds?.vipExpiringDays as number | undefined) ?? 7
-    if (checkVipExpiringSoon(ctx.mamContext?.vipUntil ?? null, days)) {
+    const days = (thresholds?.vipExpiringDays as number | undefined) ?? VIP_EXPIRING_DAYS_DEFAULT
+    if (checkVipExpiringSoon(ctx.platformContext?.vipUntil ?? null, days)) {
       events.push("vip_expiring")
     }
   }
 
   if (target.notifyUnsatisfiedLimit) {
-    const pct = (thresholds?.unsatisfiedLimitPercent as number | undefined) ?? 80
+    const pct =
+      (thresholds?.unsatisfiedLimitPercent as number | undefined) ?? UNSATISFIED_LIMIT_PCT_DEFAULT
     if (
       checkUnsatisfiedLimitApproaching(
-        ctx.mamContext?.unsatisfiedCount ?? null,
-        ctx.mamContext?.unsatisfiedLimit ?? null,
+        ctx.platformContext?.unsatisfiedCount ?? null,
+        ctx.platformContext?.unsatisfiedLimit ?? null,
         pct
       )
     ) {
@@ -309,14 +312,25 @@ export function detectEvents(
   if (target.notifyActiveHnrs) {
     if (
       checkActiveHnrs(
-        ctx.mamContext?.inactiveHnrCount ?? null,
-        ctx.mamContext?.previousInactiveHnrCount ?? null
+        ctx.platformContext?.inactiveHnrCount ?? null,
+        ctx.platformContext?.previousInactiveHnrCount ?? null
       )
     ) {
       events.push("active_hnrs")
     }
   }
 
+  if (target.notifyDownloadDisabled) {
+    if (
+      checkDownloadDisabled(
+        ctx.platformContext?.canDownload ?? null,
+        ctx.platformContext?.previousCanDownload ?? null
+      )
+    ) {
+      events.push("download_disabled")
+    }
+  }
+
   return events
 }
 
@@ -347,17 +361,19 @@ export function buildEventData(
       return { label: anniversaryLabel ?? "Anniversary" }
     case "bonus_cap": {
       const effectiveCap = (thresholds?.bonusCapLimit as number | undefined) ?? MAM_BONUS_CAP
-      return { currentBonus: ctx.mamContext?.currentSeedbonus ?? null, capLimit: effectiveCap }
+      return { currentBonus: ctx.platformContext?.currentSeedbonus ?? null, capLimit: effectiveCap }
     }
     case "vip_expiring":
-      return { vipUntil: ctx.mamContext?.vipUntil ?? null }
+      return { vipUntil: ctx.platformContext?.vipUntil ?? null }
     case "unsatisfied_limit":
       return {
-        count: ctx.mamContext?.unsatisfiedCount ?? null,
-        limit: ctx.mamContext?.unsatisfiedLimit ?? null,
+        count: ctx.platformContext?.unsatisfiedCount ?? null,
+        limit: ctx.platformContext?.unsatisfiedLimit ?? null,
       }
     case "active_hnrs":
-      return { count: ctx.mamContext?.inactiveHnrCount ?? null }
+      return { count: ctx.platformContext?.inactiveHnrCount ?? null }
+    case "download_disabled":
+      return {}
     default:
       return {}
   }
diff --git a/src/lib/notifications/payload.ts b/src/lib/notifications/payload.ts
index a0ac77f8..59aa41b8 100644
--- a/src/lib/notifications/payload.ts
+++ b/src/lib/notifications/payload.ts
@@ -1,9 +1,10 @@
 // src/lib/notifications/payload.ts
 //
-// Functions: hexToInt, buildDiscordEmbed, buildDescription
+// Functions: buildDiscordEmbed, buildDescription
 
 import { CHART_THEME } from "@/components/charts/lib/theme"
-import { formatBytesNum } from "@/lib/formatters"
+import { hexToInt } from "@/lib/color-utils"
+import { formatBytesNum, formatCount, formatPercent, formatRatio } from "@/lib/formatters"
 import type { NotificationEventType } from "@/lib/notifications/types"
 
 interface EmbedInput {
@@ -14,7 +15,7 @@ interface EmbedInput {
   data: Record<string, unknown>
 }
 
-interface DiscordEmbed {
+export interface DiscordEmbed {
   title: string
   description: string
   color: number
@@ -22,11 +23,6 @@ interface DiscordEmbed {
   fields?: { name: string; value: string; inline?: boolean }[]
 }
 
-// Convert "#rrggbb" hex string to Discord embed integer
-function hexToInt(hex: string): number {
-  return Number.parseInt(hex.replace("#", ""), 16)
-}
-
 const EVENT_COLORS: Record<NotificationEventType, number> = {
   ratio_drop: hexToInt(CHART_THEME.warn),
   hit_and_run: hexToInt(CHART_THEME.danger),
@@ -41,6 +37,7 @@ const EVENT_COLORS: Record<NotificationEventType, number> = {
   vip_expiring: hexToInt(CHART_THEME.warn),
   unsatisfied_limit: hexToInt(CHART_THEME.danger),
   active_hnrs: hexToInt(CHART_THEME.danger),
+  download_disabled: hexToInt(CHART_THEME.danger),
 }
 
 const EVENT_TITLES: Record<NotificationEventType, string> = {
@@ -57,6 +54,7 @@ const EVENT_TITLES: Record<NotificationEventType, string> = {
   vip_expiring: "VIP Expiring Soon",
   unsatisfied_limit: "Unsatisfied Limit Approaching",
   active_hnrs: "New Inactive Hit & Run",
+  download_disabled: "Download Privileges Revoked",
 }
 
 export function buildDiscordEmbed(input: EmbedInput): DiscordEmbed {
@@ -81,8 +79,8 @@ function buildDescription(
 ): string {
   switch (eventType) {
     case "ratio_drop": {
-      const prev = Number(data.previousRatio ?? 0).toFixed(2)
-      const curr = Number(data.currentRatio ?? 0).toFixed(2)
+      const prev = formatRatio(Number(data.previousRatio ?? 0))
+      const curr = formatRatio(Number(data.currentRatio ?? 0))
       return `${source} ratio dropped from **${prev}** to **${curr}**`
     }
     case "hit_and_run":
@@ -97,8 +95,8 @@ function buildDescription(
     case "warned":
       return `${source} has been issued a warning by the tracker`
     case "ratio_danger": {
-      const curr = Number(data.currentRatio ?? 0).toFixed(2)
-      const min = Number(data.minimumRatio ?? 0).toFixed(2)
+      const curr = formatRatio(Number(data.currentRatio ?? 0))
+      const min = formatRatio(Number(data.minimumRatio ?? 0))
       return `${source} ratio **${curr}** is below the required minimum of **${min}**`
     }
     case "zero_seeding":
@@ -116,8 +114,8 @@ function buildDescription(
       return label ? `${source} — ${label}` : `${source} membership anniversary`
     }
     case "bonus_cap": {
-      const current = Number(data.currentBonus ?? 0).toLocaleString()
-      const cap = Number(data.capLimit ?? 0).toLocaleString()
+      const current = formatCount(Number(data.currentBonus ?? 0))
+      const cap = formatCount(Number(data.capLimit ?? 0))
       return `${source} bonus points at **${current}** (cap: ${cap}). Spend them before they're wasted!`
     }
     case "vip_expiring": {
@@ -129,12 +127,14 @@ function buildDescription(
       const count = Number(data.count ?? 0)
       const limit = Number(data.limit ?? 0)
       const pct = limit > 0 ? Math.round((count / limit) * 100) : 0
-      return `${source} unsatisfied torrents at **${count}/${limit}** (${pct}%). Download capacity running low.`
+      return `${source} unsatisfied torrents at **${count}/${limit}** (${formatPercent(pct, 0)}). Download capacity running low.`
     }
     case "active_hnrs": {
       const count = Number(data.count ?? 0)
       return `${source} has **${count}** active Hit & Run${count !== 1 ? "s" : ""}. Seed them to avoid penalties.`
     }
+    case "download_disabled":
+      return `${source} has lost download privileges — ratio may have dropped or account was restricted`
     default:
       return `${source} triggered a notification`
   }
diff --git a/src/lib/notifications/types.ts b/src/lib/notifications/types.ts
index 62a80872..8156acd2 100644
--- a/src/lib/notifications/types.ts
+++ b/src/lib/notifications/types.ts
@@ -1,7 +1,6 @@
 // src/lib/notifications/types.ts
-//
-// Functions: (types only — no runtime code)
 
+export const SUPPORTED_NOTIFICATION_TYPES = ["discord"] as const
 export const VALID_NOTIFICATION_TYPES = ["discord", "gotify", "telegram", "slack", "email"] as const
 export type NotificationTargetType = (typeof VALID_NOTIFICATION_TYPES)[number]
 
@@ -19,18 +18,18 @@ export const VALID_EVENT_TYPES = [
   "vip_expiring",
   "unsatisfied_limit",
   "active_hnrs",
+  "download_disabled",
 ] as const
 export type NotificationEventType = (typeof VALID_EVENT_TYPES)[number]
 
 export interface NotificationThresholds {
-  ratioDropDelta?: number // i.e 0.1 — alert when ratio falls by ≥0.1
-  bufferMilestoneBytes?: number //i.e 10737418240 — alert when buffer crosses 10 GiB
-  bonusCapLimit?: number // default 99999 — fires when seedbonus hits or exceeds cap
-  vipExpiringDays?: number // default 7 — fires when VIP expiry is within N days
-  unsatisfiedLimitPercent?: number // default 80 — fires at 80% of unsatisfied limit
+  ratioDropDelta?: number
+  bufferMilestoneBytes?: number
+  bonusCapLimit?: number // default 99999, used for MAM specifically
+  vipExpiringDays?: number // default 7
+  unsatisfiedLimitPercent?: number // default 80
 }
 
-// Per-type config shapes (decrypted form — never stored plaintext)
 export interface DiscordConfig {
   webhookUrl: string
 }
@@ -61,5 +60,79 @@ export type NotificationConfig =
   | SlackConfig
   | EmailConfig
 
-// Discord webhook URL pattern — used for validation
+export interface SnapshotContext {
+  trackerId: number
+  trackerName: string
+  storeUsernames: boolean
+  currentRatio: number | null
+  previousRatio: number | null
+  currentHnrs: number | null
+  previousHnrs: number | null
+  currentBufferBytes: bigint | null
+  previousBufferBytes: bigint | null
+  trackerDown: boolean
+  trackerError: string | null
+  currentWarned: boolean | null
+  previousWarned: boolean | null
+  currentSeedingCount: number | null
+  currentGroup: string | null
+  previousGroup: string | null
+  trackerIsActive: boolean
+  trackerPausedAt: string | null
+  trackerJoinedAt: string | null
+  minimumRatio: number | undefined
+  // Platform-specific extended fields; populated for MAM and AvistaZ, undefined for others
+  platformContext?: {
+    currentSeedbonus: number | null
+    previousSeedbonus: number | null
+    vipUntil: string | null
+    unsatisfiedCount: number | null
+    unsatisfiedLimit: number | null
+    inactiveHnrCount: number | null
+    previousInactiveHnrCount: number | null
+    canDownload: boolean | null
+    previousCanDownload: boolean | null
+  }
+}
+
+/** Safely parse JSONB thresholds with runtime field validation */
+export function parseThresholds(raw: unknown): NotificationThresholds {
+  if (!raw || typeof raw !== "object") return {}
+  const r = raw as Record<string, unknown>
+  return {
+    ...(typeof r.ratioDropDelta === "number" ? { ratioDropDelta: r.ratioDropDelta } : {}),
+    ...(typeof r.bufferMilestoneBytes === "number"
+      ? { bufferMilestoneBytes: r.bufferMilestoneBytes }
+      : {}),
+    ...(typeof r.bonusCapLimit === "number" ? { bonusCapLimit: r.bonusCapLimit } : {}),
+    ...(typeof r.vipExpiringDays === "number" ? { vipExpiringDays: r.vipExpiringDays } : {}),
+    ...(typeof r.unsatisfiedLimitPercent === "number"
+      ? { unsatisfiedLimitPercent: r.unsatisfiedLimitPercent }
+      : {}),
+  }
+}
+
+// Type guards — validates shape only. Callers must also check target.type
+// since DiscordConfig and SlackConfig share the same { webhookUrl } shape.
+export function isDiscordConfig(config: NotificationConfig): config is DiscordConfig {
+  return "webhookUrl" in config && typeof config.webhookUrl === "string"
+}
+
+export function isNotificationConfig(value: unknown): value is NotificationConfig {
+  if (!value || typeof value !== "object") return false
+  const obj = value as Record<string, unknown>
+  if (typeof obj.webhookUrl === "string") return true
+  if (typeof obj.serverUrl === "string" && typeof obj.appToken === "string") return true
+  if (typeof obj.botToken === "string" && typeof obj.chatId === "string") return true
+  if (
+    typeof obj.host === "string" &&
+    typeof obj.port === "number" &&
+    typeof obj.from === "string" &&
+    typeof obj.to === "string"
+  )
+    return true
+  return false
+}
+
+// Discord webhook URL pattern
 export const DISCORD_WEBHOOK_RE = /^https:\/\/discord\.com\/api\/webhooks\/\d+\/[\w-]+$/
diff --git a/src/lib/notifications/validate.ts b/src/lib/notifications/validate.ts
index 6ba21cdd..718521a6 100644
--- a/src/lib/notifications/validate.ts
+++ b/src/lib/notifications/validate.ts
@@ -6,7 +6,7 @@ import { isUnsafeNetworkHost } from "@/lib/network"
 import {
   DISCORD_WEBHOOK_RE,
   type NotificationTargetType,
-  VALID_NOTIFICATION_TYPES,
+  SUPPORTED_NOTIFICATION_TYPES,
 } from "@/lib/notifications/types"
 
 /**
@@ -17,8 +17,8 @@ export function validateNotificationConfig(
   type: NotificationTargetType,
   config: Record<string, unknown>
 ): string | null {
-  if (!VALID_NOTIFICATION_TYPES.includes(type)) {
-    return `Unsupported notification type: ${type}`
+  if (!(SUPPORTED_NOTIFICATION_TYPES as readonly string[]).includes(type)) {
+    return `${type} notifications are not yet supported`
   }
 
   switch (type) {
@@ -28,7 +28,7 @@ export function validateNotificationConfig(
         return "Discord config requires a webhookUrl string"
       }
       if (!DISCORD_WEBHOOK_RE.test(url.trim())) {
-        return "Invalid Discord webhook URL — must match https://discord.com/api/webhooks/{id}/{token}"
+        return "Invalid Discord webhook URL - must match https://discord.com/api/webhooks/{id}/{token}"
       }
       // Defense-in-depth SSRF check
       try {
@@ -40,11 +40,6 @@ export function validateNotificationConfig(
       }
       return null
     }
-    case "gotify":
-    case "telegram":
-    case "slack":
-    case "email":
-      return `${type} notifications are not yet supported`
     default:
       return `Unsupported notification type: ${type}`
   }
diff --git a/src/lib/nuke.ts b/src/lib/nuke.ts
index c4ed8866..53651b44 100644
--- a/src/lib/nuke.ts
+++ b/src/lib/nuke.ts
@@ -86,4 +86,5 @@ export async function scrubAndDeleteAll(): Promise<void> {
     await tx.delete(trackers)
     await tx.delete(appSettings)
   })
+  ;(globalThis as unknown as Record<string, unknown>).__backfillDone = false
 }
diff --git a/src/lib/parser.test.ts b/src/lib/parser.test.ts
index 81da9242..0ca0c235 100644
--- a/src/lib/parser.test.ts
+++ b/src/lib/parser.test.ts
@@ -64,14 +64,6 @@ describe("formatBytes", () => {
 })
 
 describe("parseBytes - security", () => {
-  it("rejects script injection in format string", () => {
-    expect(() => parseBytes("<script>alert('xss')</script>")).toThrow()
-  })
-
-  it("rejects SQL injection attempts", () => {
-    expect(() => parseBytes("1; DROP TABLE trackers; --")).toThrow()
-  })
-
   it("handles extremely large values without crashing", () => {
     // 999 PiB equivalent - should not crash
     expect(() => parseBytes("999999999 TiB")).not.toThrow()
diff --git a/src/lib/qbt/fetch-merged.ts b/src/lib/qbt/fetch-merged.ts
deleted file mode 100644
index e7d9cb03..00000000
--- a/src/lib/qbt/fetch-merged.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-// src/lib/qbt/fetch-merged.ts
-//
-// Functions: fetchAndMergeTorrents
-
-import "server-only"
-
-import { decryptClientCredentials } from "@/lib/client-decrypt"
-import { isDecryptionError, sanitizeNetworkError } from "@/lib/error-utils"
-import {
-  getTorrents,
-  parseCrossSeedTags,
-  type QbtTorrent,
-  stripSensitiveTorrentFields,
-  withSessionRetry,
-} from "@/lib/qbt"
-import { aggregateCrossSeedTags, mergeTorrentLists } from "@/lib/qbt/merge"
-
-export interface ClientRow {
-  name: string
-  host: string
-  port: number
-  useSsl: boolean
-  encryptedUsername: string
-  encryptedPassword: string
-  crossSeedTags: string[] | null
-}
-
-export interface MergedResult {
-  torrents: (Omit<QbtTorrent, "tracker" | "content_path" | "save_path"> & {
-    client_name: string
-  })[]
-  crossSeedTags: string[]
-  clientErrors: string[]
-  clientCount: number
-  /** True when every client failure was a decryption error, indicating a stale session key. */
-  sessionExpired: boolean
-}
-
-async function fetchClientTorrents(
-  client: ClientRow,
-  tags: string[],
-  key: Buffer,
-  filter?: string
-): Promise<QbtTorrent[]> {
-  const { username, password } = decryptClientCredentials(client, key)
-  return withSessionRetry(
-    client.host,
-    client.port,
-    client.useSsl,
-    username,
-    password,
-    async (baseUrl, sid) => {
-      if (tags.length === 1) {
-        return getTorrents(baseUrl, sid, tags[0], filter)
-      }
-      // Multiple tags: fetch all in parallel, ignore per-tag failures
-      const results = await Promise.allSettled(tags.map((tag) => getTorrents(baseUrl, sid, tag)))
-      const allTorrents: QbtTorrent[] = []
-      for (const result of results) {
-        if (result.status === "fulfilled") allTorrents.push(...result.value)
-      }
-      return allTorrents
-    }
-  )
-}
-
-/**
- * Fetch torrents from all provided clients for the given tags, merge and
- * deduplicate by hash, aggregate cross-seed tags, strip sensitive fields,
- * and stamp each merged torrent with the originating client name(s).
- *
- * @param clients  Enabled download client rows (credentials encrypted).
- * @param tags     qBT tag(s) to fetch. Single-tag callers may also pass filter.
- * @param key      AES-256-GCM decryption key derived from the master password.
- * @param filter   Optional qBT filter string (e.g. "active"). Only applied when
- *                 tags has exactly one entry.
- */
-/** Per-client deadline for live fetches (seconds). Keeps the UI responsive
- *  when one client is offline — the online client's data arrives immediately
- *  while the offline one is cut short after this deadline instead of waiting
- *  for the full 30s retry cycle (15s timeout × 2 attempts). */
-const CLIENT_DEADLINE_MS = 5_000
-
-export async function fetchAndMergeTorrents(
-  clients: ClientRow[],
-  tags: string[],
-  key: Buffer,
-  filter?: string
-): Promise<MergedResult> {
-  const empty: MergedResult = {
-    torrents: [],
-    crossSeedTags: [],
-    clientErrors: [],
-    clientCount: 0,
-    sessionExpired: false,
-  }
-
-  if (clients.length === 0 || tags.length === 0) {
-    return empty
-  }
-
-  const results = await Promise.allSettled(
-    clients.map(async (client) => {
-      const deadline = new Promise<never>((_, reject) =>
-        setTimeout(() => reject(new Error("Client deadline exceeded")), CLIENT_DEADLINE_MS)
-      )
-      const work = (async () => ({
-        clientName: client.name,
-        crossSeedTags: parseCrossSeedTags(client.crossSeedTags),
-        torrents: await fetchClientTorrents(client, tags, key, filter),
-      }))()
-      return Promise.race([work, deadline])
-    })
-  )
-
-  const torrentLists: QbtTorrent[][] = []
-  const crossSeedClients: { crossSeedTags: string[] }[] = []
-  const clientErrors: string[] = []
-  let decryptionFailureCount = 0
-
-  for (let i = 0; i < results.length; i++) {
-    const result = results[i]
-    if (result.status === "fulfilled") {
-      torrentLists.push(result.value.torrents)
-      crossSeedClients.push({ crossSeedTags: result.value.crossSeedTags })
-    } else {
-      const clientName = clients[i].name
-      const isDecrypt = isDecryptionError(result.reason)
-      if (isDecrypt) decryptionFailureCount++
-      const raw = result.reason instanceof Error ? result.reason.message : "Unknown error"
-      const message = isDecrypt ? "Credential decryption failed" : sanitizeNetworkError(raw)
-      clientErrors.push(`${clientName}: ${message}`)
-    }
-  }
-
-  // All clients failed with decryption errors → the session key is stale.
-  const sessionExpired =
-    clients.length > 0 && torrentLists.length === 0 && decryptionFailureCount === clients.length
-
-  // Build hash → client name(s) lookup before merge flattens provenance
-  const hashClients = new Map<string, string[]>()
-  for (let i = 0; i < results.length; i++) {
-    const result = results[i]
-    if (result.status === "fulfilled") {
-      for (const torrent of result.value.torrents) {
-        const names = hashClients.get(torrent.hash) ?? []
-        names.push(result.value.clientName)
-        hashClients.set(torrent.hash, names)
-      }
-    }
-  }
-
-  const merged = mergeTorrentLists(torrentLists)
-  const crossSeedTags = aggregateCrossSeedTags(crossSeedClients)
-
-  // Strip sensitive fields, then stamp client name(s).
-  const torrents = merged.map((t) => ({
-    ...stripSensitiveTorrentFields(t),
-    client_name: (hashClients.get(t.hash) ?? []).join(", "),
-  }))
-
-  return {
-    torrents,
-    crossSeedTags,
-    clientErrors,
-    clientCount: clients.length,
-    sessionExpired,
-  }
-}
diff --git a/src/lib/qbt/index.ts b/src/lib/qbt/index.ts
deleted file mode 100644
index 5efcf6f8..00000000
--- a/src/lib/qbt/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// src/lib/qbt/index.ts
-
-export { aggregateByTag } from "./aggregator"
-export {
-  buildBaseUrl,
-  clearAllSessions,
-  getSession,
-  getTorrents,
-  getTransferInfo,
-  invalidateSession,
-  login,
-  parseCachedTorrents,
-  withSessionRetry,
-} from "./client"
-export type { SpeedSnapshot } from "./speed-cache"
-export { clearSpeedCache, getSpeedSnapshots, pushSpeedSnapshot } from "./speed-cache"
-export type { ClientStats, QbtTorrent, QbtTransferInfo, TagStats } from "./types"
-export { parseCrossSeedTags, stripSensitiveTorrentFields } from "./utils"
diff --git a/src/lib/qbt/utils.ts b/src/lib/qbt/utils.ts
deleted file mode 100644
index 71bdd01f..00000000
--- a/src/lib/qbt/utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// src/lib/qbt/utils.ts
-//
-// Functions: parseCrossSeedTags, stripSensitiveTorrentFields
-
-import type { QbtTorrent } from "./types"
-
-/**
- * Normalizes the crossSeedTags column value. The column is a native text[]
- * array, so Drizzle returns string[] | null. Returns [] for null.
- */
-export function parseCrossSeedTags(raw: string[] | null): string[] {
-  return raw ?? []
-}
-
-/**
- * Strips tracker announce URL, content_path, and save_path from a torrent object.
- * These fields may contain passkeys or expose server filesystem paths.
- */
-export function stripSensitiveTorrentFields<
-  T extends Pick<QbtTorrent, "tracker" | "content_path" | "save_path">,
->(torrent: T): Omit<T, "tracker" | "content_path" | "save_path"> {
-  const { tracker: _t, content_path: _cp, save_path: _sp, ...rest } = torrent
-  return rest
-}
diff --git a/src/lib/query-options.ts b/src/lib/query-options.ts
new file mode 100644
index 00000000..9b90a627
--- /dev/null
+++ b/src/lib/query-options.ts
@@ -0,0 +1,25 @@
+// src/lib/query-options.ts
+//
+// Shared TanStack Query options for endpoints with multiple consumers.
+// Each consumer subscribes to the shared cache via `select`.
+
+import { queryOptions } from "@tanstack/react-query"
+import type { SafeDownloadClient, TrackerSummary } from "@/types/api"
+
+export const clientQueryOptions = queryOptions({
+  queryKey: ["clients"] as const,
+  queryFn: async ({ signal }) => {
+    const res = await fetch("/api/clients", { signal })
+    if (!res.ok) return [] as SafeDownloadClient[]
+    return res.json() as Promise<SafeDownloadClient[]>
+  },
+})
+
+export const trackerQueryOptions = queryOptions({
+  queryKey: ["trackers"] as const,
+  queryFn: async ({ signal }) => {
+    const res = await fetch("/api/trackers", { signal })
+    if (!res.ok) return [] as TrackerSummary[]
+    return res.json() as Promise<TrackerSummary[]>
+  },
+})
diff --git a/src/lib/scheduler-key-store.ts b/src/lib/scheduler-key-store.ts
index 650b22d0..73228569 100644
--- a/src/lib/scheduler-key-store.ts
+++ b/src/lib/scheduler-key-store.ts
@@ -1,7 +1,4 @@
 // src/lib/scheduler-key-store.ts
-//
-// Functions: persistSchedulerKey, loadSchedulerKey, clearSchedulerKey
-
 import "server-only"
 
 import { eq } from "drizzle-orm"
@@ -66,6 +63,9 @@ export async function clearSchedulerKey(settingsId: number): Promise<void> {
       .set({ encryptedSchedulerKey: null })
       .where(eq(appSettings.id, settingsId))
   } catch (err) {
-    log.warn({ err }, "Failed to clear scheduler key from DB")
+    log.error(
+      { err, settingsId },
+      "SECURITY: Failed to clear scheduler key from DB. Old key may persist."
+    )
   }
 }
diff --git a/src/lib/scheduler.ts b/src/lib/scheduler.ts
index e14c4714..7d05c7a1 100644
--- a/src/lib/scheduler.ts
+++ b/src/lib/scheduler.ts
@@ -1,571 +1,59 @@
 // src/lib/scheduler.ts
 //
-// Functions: pollTracker, pollAllTrackers, pruneOldSnapshots, pruneOldCheckpoints, startScheduler, stopScheduler, ensureSchedulerRunning, fetchTrackerStats, POLL_FAILURE_THRESHOLD
-import type { Agent as HttpAgent } from "node:http"
+// Functions: startScheduler, stopScheduler, ensureSchedulerRunning
+//
+// Master scheduler orchestrator. Coordinates all three polling subsystems:
+//   tracker-scheduler  — polls tracker APIs for stats
+//   download-client-scheduler — polls download clients for torrent data
+//   backup-scheduler   — runs automated backups
 
-import { and, desc, eq, isNotNull, lt, notInArray, sql } from "drizzle-orm"
-import cron, { type ScheduledTask } from "node-cron"
-import { findRegistryEntry } from "@/data/tracker-registry"
-import { buildFetchOptions, getAdapter } from "@/lib/adapters"
-import type { MamPlatformMeta, TrackerStats } from "@/lib/adapters/types"
-import { pruneDismissedAlerts } from "@/lib/alert-pruning"
 import { startBackupScheduler, stopBackupScheduler } from "@/lib/backup-scheduler"
+import { ensureIndexes } from "@/lib/db/ensure-indexes"
 import {
   ensureClientSchedulerRunning,
   startClientScheduler,
   stopClientScheduler,
-} from "@/lib/client-scheduler"
-import { decrypt } from "@/lib/crypto"
-import { db } from "@/lib/db"
-import {
-  appSettings,
-  notificationTargets,
-  torrentDailyCheckpoints,
-  trackerDailyCheckpoints,
-  trackerSnapshots,
-  trackers,
-} from "@/lib/db/schema"
-import { sanitizeNetworkError } from "@/lib/error-utils"
-import { localDateStr } from "@/lib/formatters"
+} from "@/lib/download-client-scheduler"
 import { log } from "@/lib/logger"
-import { dispatchNotifications } from "@/lib/notifications/dispatch"
-import { maskUsername } from "@/lib/privacy"
-import { buildProxyAgentFromSettings } from "@/lib/proxy"
-import { getPauseState } from "@/lib/tracker-status"
-
-// Store on globalThis to survive HMR in development.
-// Without this, each hot-reload orphans the old cron job (it keeps firing)
-// while creating a new one which causes duplicate polls that hammer tracker APIs.
-const g = globalThis as typeof globalThis & {
-  __schedulerTask?: ScheduledTask | null
-  __schedulerKey?: Buffer | null
-  __pollInFlight?: boolean
-}
-
-function getSchedulerTask(): ScheduledTask | null {
-  return g.__schedulerTask ?? null
-}
-function setSchedulerTask(task: ScheduledTask | null) {
-  g.__schedulerTask = task
-}
-function getSchedulerKey(): Buffer | null {
-  return g.__schedulerKey ?? null
-}
-function setSchedulerKey(key: Buffer | null) {
-  g.__schedulerKey = key
-}
-
-function getPollInFlight(): boolean {
-  return g.__pollInFlight ?? false
-}
-function setPollInFlight(v: boolean) {
-  g.__pollInFlight = v
-}
-
-/** After this many consecutive poll failures, auto-pause the tracker. */
-export const POLL_FAILURE_THRESHOLD = 4
-
-/**
- * Fetch fresh stats from a tracker's API without writing a snapshot.
- * Used by the transit papers report route to get live data for the report.
- * Also updates tracker metadata side effects (remoteUserId, joinedAt, lastAccessAt, platformMeta, avatarUrl).
- */
-export async function fetchTrackerStats(
-  trackerId: number,
-  encryptionKey: Buffer,
-  proxyAgent?: HttpAgent
-): Promise<{ stats: TrackerStats; tracker: typeof trackers.$inferSelect }> {
-  const [tracker] = await db.select().from(trackers).where(eq(trackers.id, trackerId)).limit(1)
-  if (!tracker?.isActive) throw new Error("Tracker not found or inactive")
-
-  let apiToken: string
-  try {
-    apiToken = decrypt(tracker.encryptedApiToken, encryptionKey)
-  } catch (err) {
-    const cause = err instanceof Error ? err.message : String(err)
-    throw new Error(`API key is missing or invalid for tracker "${tracker.name}": ${cause}`)
-  }
-
-  const adapter = getAdapter(tracker.platformType)
-  if (tracker.useProxy && !proxyAgent) {
-    throw new Error("Proxy required but not available, refusing to leak IP via direct connection")
-  }
-
-  const fetchOptions = buildFetchOptions(tracker.baseUrl, {
-    proxyAgent: tracker.useProxy ? proxyAgent : undefined,
-    remoteUserId: tracker.remoteUserId ?? undefined,
-  })
-  const stats = await adapter.fetchStats(tracker.baseUrl, apiToken, tracker.apiPath, fetchOptions)
-
-  // Write metadata side effects
-  const metaUpdates: Record<string, unknown> = {}
-  if (stats.remoteUserId && stats.remoteUserId !== tracker.remoteUserId) {
-    metaUpdates.remoteUserId = stats.remoteUserId
-  }
-  if (stats.joinedDate && !tracker.joinedAt) {
-    const parsed = new Date(stats.joinedDate)
-    if (!Number.isNaN(parsed.getTime())) metaUpdates.joinedAt = parsed.toISOString().split("T")[0]
-  }
-  if (stats.lastAccessDate) {
-    const parsed = new Date(stats.lastAccessDate)
-    if (!Number.isNaN(parsed.getTime()))
-      metaUpdates.lastAccessAt = parsed.toISOString().split("T")[0]
-  }
-  if (stats.platformMeta) metaUpdates.platformMeta = JSON.stringify(stats.platformMeta)
-  if (stats.avatarUrl) metaUpdates.avatarRemoteUrl = stats.avatarUrl
-  if (Object.keys(metaUpdates).length > 0) {
-    await db.update(trackers).set(metaUpdates).where(eq(trackers.id, tracker.id))
-  }
-
-  // Re-fetch tracker with updated metadata
-  const [freshTracker] = await db.select().from(trackers).where(eq(trackers.id, trackerId))
-  return { stats, tracker: freshTracker }
-}
-
-export async function pollTracker(
-  trackerId: number,
-  encryptionKey: Buffer,
-  privacyMode: boolean,
-  proxyAgent?: HttpAgent,
-  batchTimestamp?: Date,
-  enabledTargets?: (typeof notificationTargets.$inferSelect)[]
-): Promise<void> {
-  const [tracker] = await db.select().from(trackers).where(eq(trackers.id, trackerId)).limit(1)
-
-  if (!tracker?.isActive) return
-
-  const timestamp = batchTimestamp ?? new Date()
-
-  try {
-    let apiToken: string
-    try {
-      apiToken = decrypt(tracker.encryptedApiToken, encryptionKey)
-    } catch (err) {
-      const cause = err instanceof Error ? err.message : String(err)
-      throw new Error(`API key is missing or invalid for tracker "${tracker.name}": ${cause}`)
-    }
-    const adapter = getAdapter(tracker.platformType)
-    if (tracker.useProxy && !proxyAgent) {
-      throw new Error("Proxy required but not available, refusing to leak IP via direct connection")
-    }
-    const fetchOptions = buildFetchOptions(tracker.baseUrl, {
-      proxyAgent: tracker.useProxy ? proxyAgent : undefined,
-      remoteUserId: tracker.remoteUserId ?? undefined,
-    })
-    const stats = await adapter.fetchStats(tracker.baseUrl, apiToken, tracker.apiPath, fetchOptions)
-
-    // Cache metadata from poll (remoteUserId saves an API call, joinedDate/platformMeta enrich the UI)
-    const metaUpdates: Record<string, unknown> = {}
-    if (stats.remoteUserId && stats.remoteUserId !== tracker.remoteUserId) {
-      metaUpdates.remoteUserId = stats.remoteUserId
-    }
-    if (stats.joinedDate && !tracker.joinedAt) {
-      const parsed = new Date(stats.joinedDate)
-      if (!Number.isNaN(parsed.getTime())) {
-        metaUpdates.joinedAt = parsed.toISOString().split("T")[0]
-      }
-    }
-    if (stats.lastAccessDate) {
-      const parsed = new Date(stats.lastAccessDate)
-      if (!Number.isNaN(parsed.getTime())) {
-        metaUpdates.lastAccessAt = parsed.toISOString().split("T")[0]
-      }
-    }
-    if (stats.platformMeta) {
-      metaUpdates.platformMeta = JSON.stringify(stats.platformMeta)
-    }
-    if (stats.avatarUrl) {
-      metaUpdates.avatarRemoteUrl = stats.avatarUrl
-    }
-    if (Object.keys(metaUpdates).length > 0) {
-      await db.update(trackers).set(metaUpdates).where(eq(trackers.id, tracker.id))
-    }
-
-    // Fetch previous snapshot before inserting the new one (used for change detection in notifications)
-    const [previousSnapshot] = await db
-      .select({
-        ratio: trackerSnapshots.ratio,
-        hitAndRuns: trackerSnapshots.hitAndRuns,
-        bufferBytes: trackerSnapshots.bufferBytes,
-        warned: trackerSnapshots.warned,
-        group: trackerSnapshots.group,
-        seedingCount: trackerSnapshots.seedingCount,
-        seedbonus: trackerSnapshots.seedbonus,
-      })
-      .from(trackerSnapshots)
-      .where(eq(trackerSnapshots.trackerId, tracker.id))
-      .orderBy(desc(trackerSnapshots.polledAt))
-      .limit(1)
-
-    await db.insert(trackerSnapshots).values({
-      trackerId: tracker.id,
-      polledAt: timestamp,
-      uploadedBytes: stats.uploadedBytes,
-      downloadedBytes: stats.downloadedBytes,
-      ratio: stats.ratio,
-      bufferBytes: stats.bufferBytes,
-      seedingCount: stats.seedingCount,
-      leechingCount: stats.leechingCount,
-      seedbonus: stats.seedbonus,
-      hitAndRuns: stats.hitAndRuns,
-      requiredRatio: stats.requiredRatio,
-      warned: stats.warned,
-      freeleechTokens: stats.freeleechTokens,
-      shareScore: stats.shareScore ?? null,
-      username: privacyMode ? maskUsername(stats.username) : stats.username,
-      group: privacyMode ? maskUsername(stats.group) : stats.group,
-    })
-
-    try {
-      // Upsert daily checkpoint for "Today At A Glance" comparisons
-      const checkpointDate = localDateStr(timestamp)
-      await db
-        .insert(trackerDailyCheckpoints)
-        .values({
-          trackerId: tracker.id,
-          checkpointDate,
-          uploadedBytesEnd: stats.uploadedBytes !== null ? BigInt(stats.uploadedBytes) : 0n,
-          downloadedBytesEnd: stats.downloadedBytes !== null ? BigInt(stats.downloadedBytes) : 0n,
-          bufferBytesEnd: stats.bufferBytes !== null ? BigInt(stats.bufferBytes) : null,
-          ratioEnd: stats.ratio,
-          seedbonusEnd: stats.seedbonus,
-          snapshotCount: 1,
-        })
-        .onConflictDoUpdate({
-          target: [trackerDailyCheckpoints.trackerId, trackerDailyCheckpoints.checkpointDate],
-          set: {
-            uploadedBytesEnd: stats.uploadedBytes !== null ? BigInt(stats.uploadedBytes) : 0n,
-            downloadedBytesEnd: stats.downloadedBytes !== null ? BigInt(stats.downloadedBytes) : 0n,
-            bufferBytesEnd: stats.bufferBytes !== null ? BigInt(stats.bufferBytes) : null,
-            ratioEnd: stats.ratio,
-            seedbonusEnd: stats.seedbonus,
-            snapshotCount: sql`${trackerDailyCheckpoints.snapshotCount} + 1`,
-          },
-        })
-    } catch (checkpointErr) {
-      log.warn(
-        `Daily checkpoint upsert failed for tracker ${tracker.id}: ${checkpointErr instanceof Error ? checkpointErr.message : "Unknown"}`
-      )
-    }
-
-    try {
-      const mamMeta =
-        tracker.platformType === "mam"
-          ? (stats.platformMeta as MamPlatformMeta | undefined)
-          : undefined
-
-      await dispatchNotifications(
-        {
-          trackerId: tracker.id,
-          trackerName: tracker.name,
-          storeUsernames: privacyMode === false,
-          currentRatio: stats.ratio,
-          previousRatio: previousSnapshot?.ratio ?? null,
-          currentHnrs: stats.hitAndRuns,
-          previousHnrs: previousSnapshot?.hitAndRuns ?? null,
-          currentBufferBytes: stats.bufferBytes,
-          previousBufferBytes: previousSnapshot?.bufferBytes ?? null,
-          trackerDown: false,
-          trackerError: null,
-          currentWarned: stats.warned ?? null,
-          previousWarned: previousSnapshot?.warned ?? null,
-          currentSeedingCount: stats.seedingCount ?? null,
-          currentGroup: stats.group ?? null,
-          previousGroup: previousSnapshot?.group ?? null,
-          trackerIsActive: tracker.isActive,
-          trackerPausedAt: null,
-          trackerJoinedAt: tracker.joinedAt ?? null,
-          minimumRatio: findRegistryEntry(tracker.baseUrl)?.rules?.minimumRatio,
-          mamContext:
-            tracker.platformType === "mam"
-              ? {
-                  currentSeedbonus: stats.seedbonus ?? null,
-                  previousSeedbonus: previousSnapshot?.seedbonus ?? null,
-                  vipUntil: mamMeta?.vipUntil ?? null,
-                  unsatisfiedCount: mamMeta?.unsatisfiedCount ?? null,
-                  unsatisfiedLimit: mamMeta?.unsatisfiedLimit ?? null,
-                  inactiveHnrCount: stats.hitAndRuns ?? null,
-                  previousInactiveHnrCount: previousSnapshot?.hitAndRuns ?? null,
-                }
-              : undefined,
-        },
-        encryptionKey,
-        enabledTargets
-      )
-    } catch (err) {
-      log.error(
-        `Notification dispatch failed for ${tracker.name}: ${err instanceof Error ? err.message : "Unknown"}`
-      )
-    }
-
-    await db
-      .update(trackers)
-      .set({
-        lastPolledAt: timestamp,
-        lastError: null,
-        consecutiveFailures: 0,
-        pausedAt: null,
-        updatedAt: timestamp,
-      })
-      .where(eq(trackers.id, tracker.id))
-  } catch (error) {
-    const raw = error instanceof Error ? error.message : "Unknown error"
-    const message = sanitizeNetworkError(raw, "Poll failed")
-    log.error(`Poll failed for tracker ${trackerId}: ${raw}`)
-
-    try {
-      const now = new Date()
-      const [updated] = await db
-        .update(trackers)
-        .set({
-          lastError: message,
-          consecutiveFailures: sql`${trackers.consecutiveFailures} + 1`,
-          pausedAt: sql`CASE WHEN ${trackers.consecutiveFailures} + 1 >= ${POLL_FAILURE_THRESHOLD} THEN ${now.toISOString()}::timestamp ELSE ${trackers.pausedAt} END`,
-          updatedAt: now,
-        })
-        .where(eq(trackers.id, trackerId))
-        .returning({
-          consecutiveFailures: trackers.consecutiveFailures,
-          pausedAt: trackers.pausedAt,
-        })
-
-      if (updated?.pausedAt) {
-        log.warn(
-          `Tracker ${trackerId} auto-paused after ${updated.consecutiveFailures} consecutive failures`
-        )
-      }
-    } catch (dbError) {
-      log.error(dbError, `Failed to record poll failure for tracker ${trackerId}`)
-    }
-
-    try {
-      await dispatchNotifications(
-        {
-          trackerId: tracker?.id ?? trackerId,
-          trackerName: tracker?.name ?? String(trackerId),
-          storeUsernames: false,
-          currentRatio: null,
-          previousRatio: null,
-          currentHnrs: null,
-          previousHnrs: null,
-          currentBufferBytes: null,
-          previousBufferBytes: null,
-          trackerDown: true,
-          trackerError: message,
-          currentWarned: null,
-          previousWarned: null,
-          currentSeedingCount: null,
-          currentGroup: null,
-          previousGroup: null,
-          trackerIsActive: tracker?.isActive ?? true,
-          trackerPausedAt: tracker?.pausedAt?.toISOString() ?? null,
-          trackerJoinedAt: tracker?.joinedAt ?? null,
-          minimumRatio: undefined,
-          mamContext: undefined,
-        },
-        encryptionKey,
-        enabledTargets
-      )
-    } catch {
-      // security-audit-ignore: notification dispatch is non-critical, errors logged inside dispatchNotifications
-    }
-  }
-}
-
-export async function pruneOldSnapshots(retentionDays: number): Promise<number> {
-  const cutoff = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000)
-  const deleted = await db
-    .delete(trackerSnapshots)
-    .where(
-      and(
-        lt(trackerSnapshots.polledAt, cutoff),
-        notInArray(
-          trackerSnapshots.trackerId,
-          db.select({ id: trackers.id }).from(trackers).where(isNotNull(trackers.userPausedAt))
-        )
-      )
-    )
-    .returning({ id: trackerSnapshots.id })
-  return deleted.length
-}
-
-export async function pruneOldCheckpoints(retentionDays: number): Promise<number> {
-  const cutoffDate = localDateStr(Date.now() - retentionDays * 24 * 60 * 60 * 1000)
-
-  const deletedTracker = await db
-    .delete(trackerDailyCheckpoints)
-    .where(lt(trackerDailyCheckpoints.checkpointDate, cutoffDate))
-    .returning({ id: trackerDailyCheckpoints.id })
-
-  const deletedTorrent = await db
-    .delete(torrentDailyCheckpoints)
-    .where(lt(torrentDailyCheckpoints.checkpointDate, cutoffDate))
-    .returning({ id: torrentDailyCheckpoints.id })
-
-  return deletedTracker.length + deletedTorrent.length
-}
-
-export async function pollAllTrackers(encryptionKey: Buffer): Promise<void> {
-  // Query settings first; global interval is needed for overdue filtering
-  const [settings] = await db
-    .select({
-      storeUsernames: appSettings.storeUsernames,
-      snapshotRetentionDays: appSettings.snapshotRetentionDays,
-      trackerPollIntervalMinutes: appSettings.trackerPollIntervalMinutes,
-      proxyEnabled: appSettings.proxyEnabled,
-      proxyType: appSettings.proxyType,
-      proxyHost: appSettings.proxyHost,
-      proxyPort: appSettings.proxyPort,
-      proxyUsername: appSettings.proxyUsername,
-      encryptedProxyPassword: appSettings.encryptedProxyPassword,
-    })
-    .from(appSettings)
-    .limit(1)
-
-  const globalIntervalMs = (settings?.trackerPollIntervalMinutes ?? 60) * 60 * 1000
-
-  const allTrackers = await db.select().from(trackers).where(eq(trackers.isActive, true))
-
-  const now = Date.now()
-
-  const overdue = allTrackers.filter((tracker) => {
-    const pause = getPauseState(tracker)
-    if (pause.isPaused) {
-      log.debug({ tracker: tracker.name, reason: pause.reason }, "skipping paused tracker")
-      return false
-    }
-    const lastPoll = tracker.lastPolledAt?.getTime() ?? 0
-    return now - lastPoll >= globalIntervalMs
-  })
-
-  if (overdue.length === 0) return
-
-  const privacyMode = settings ? !settings.storeUsernames : false
-
-  // Build proxy agent once for all trackers that need it
-  const proxyAgent = settings ? buildProxyAgentFromSettings(settings, encryptionKey) : undefined
-
-  // Fetch notification targets once for the entire poll cycle (avoids N identical queries)
-  let enabledNotificationTargets: (typeof notificationTargets.$inferSelect)[] = []
-  try {
-    enabledNotificationTargets = await db
-      .select()
-      .from(notificationTargets)
-      .where(eq(notificationTargets.enabled, true))
-  } catch (err) {
-    log.error(
-      `pollAllTrackers: failed to fetch notification targets: ${err instanceof Error ? err.message : "Unknown"}`
-    )
-  }
-
-  // Capture a single timestamp for the whole batch so all snapshots in one
-  // cycle share the same polledAt value, simplifying time-series queries
-  const batchTimestamp = new Date()
-
-  // Poll all overdue trackers in parallel so one slow tracker won't block the rest
-  await Promise.allSettled(
-    overdue.map((tracker) =>
-      pollTracker(
-        tracker.id,
-        encryptionKey,
-        privacyMode,
-        proxyAgent,
-        batchTimestamp,
-        enabledNotificationTargets
-      )
-    )
-  )
-
-  // Prune old snapshots if retention is configured
-  if (settings?.snapshotRetentionDays && settings.snapshotRetentionDays > 0) {
-    try {
-      const pruned = await pruneOldSnapshots(settings.snapshotRetentionDays)
-      if (pruned > 0) {
-        log.info(`Pruned ${pruned} snapshots older than ${settings.snapshotRetentionDays} days`)
-      }
-    } catch (error) {
-      log.error(error, "Snapshot pruning failed")
-    }
-
-    try {
-      const prunedCheckpoints = await pruneOldCheckpoints(settings.snapshotRetentionDays)
-      if (prunedCheckpoints > 0) {
-        log.info(
-          `Pruned ${prunedCheckpoints} checkpoint rows older than ${settings.snapshotRetentionDays} days`
-        )
-      }
-    } catch (error) {
-      log.error(error, "Checkpoint pruning failed")
-    }
-  }
-
-  // Prune expired dismissed alerts (stale-data and zero-seeding types expire after 24h)
-  try {
-    await pruneDismissedAlerts()
-  } catch (error) {
-    log.error(error, "Dismissed alerts pruning failed")
-  }
-}
+import {
+  isTrackerPollingRunning,
+  startTrackerPolling,
+  stopTrackerPolling,
+} from "@/lib/tracker-scheduler"
 
 export function startScheduler(encryptionKey: Buffer): void {
-  if (getSchedulerTask()) return
-
-  setSchedulerKey(encryptionKey)
-
-  // Poll immediately on start, don't wait for first 5-minute tick
-  pollAllTrackers(encryptionKey).catch((error) => {
-    log.error(error, "Initial poll error")
-  })
-
-  // Then check every 5 minutes for overdue trackers
-  const task = cron.schedule("*/5 * * * *", async () => {
-    if (getPollInFlight()) return
-    setPollInFlight(true)
-    try {
-      await pollAllTrackers(encryptionKey)
-    } catch (error) {
-      log.error(error, "Scheduler error")
-    } finally {
-      setPollInFlight(false)
-    }
-  })
-  setSchedulerTask(task)
-
-  log.info("Polling scheduler started (checking every 5 minutes)")
-
+  startTrackerPolling(encryptionKey)
   startClientScheduler(encryptionKey)
   startBackupScheduler(encryptionKey)
 }
 
 export function stopScheduler(): void {
-  const task = getSchedulerTask()
-  if (task) {
-    task.stop()
-    setSchedulerTask(null)
-  }
-  // Zero-fill the encryption key buffer to prevent it from lingering in memory
-  const key = getSchedulerKey()
-  if (key) {
-    key.fill(0)
-    setSchedulerKey(null)
-  }
-
+  stopTrackerPolling()
   stopClientScheduler()
   stopBackupScheduler()
 }
 
-/** Exposed for testing. Returns the raw schedulerKey buffer reference. */
-export function _getSchedulerKeyForTest(): Buffer | null {
-  return getSchedulerKey()
-}
+// Graceful shutdown: zero-fill encryption key and stop cron tasks before exit.
+// Without this, Docker stop leaves the key buffer in process memory until the
+// OS reclaims the pages and skips any flush/cleanup in subsystem stop functions.
+process.on("SIGTERM", () => {
+  log.info("SIGTERM received, shutting down")
+  stopScheduler()
+  process.exit(0)
+})
 
 /**
- * Restarts the scheduler if it died (i.e, after server restart).
+ * Restarts all schedulers if they died (i.e. after server restart).
  * Called from the auth layout on every authenticated page load.
  */
 export function ensureSchedulerRunning(encryptionKeyHex: string): void {
-  if (getSchedulerTask()) return
+  if (isTrackerPollingRunning()) return
   const key = Buffer.from(encryptionKeyHex, "hex")
   startScheduler(key)
   ensureClientSchedulerRunning(encryptionKeyHex)
+  // Fire-and-forget: create covering indexes that Drizzle's schema DSL can't express.
+  // Idempotent (IF NOT EXISTS), guarded by globalThis flag, non-fatal on failure.
+  ensureIndexes().catch((err) => {
+    log.warn(err, "ensureIndexes fire-and-forget failed")
+  })
 }
diff --git a/src/lib/scrub-object.ts b/src/lib/scrub-object.ts
index a6d834f8..78876d9f 100644
--- a/src/lib/scrub-object.ts
+++ b/src/lib/scrub-object.ts
@@ -7,7 +7,9 @@ export const SCRUB_KEYS = new Set(["authkey", "passkey", "ip", "api_token", "key
 
 export function scrubObject(obj: unknown, depth = 0): unknown {
   if (depth > 10) return obj
-  if (obj === null || typeof obj !== "object") return obj
+  if (obj === null || typeof obj !== "object") {
+    return typeof obj === "bigint" ? obj.toString() : obj
+  }
   if (Array.isArray(obj)) {
     return obj.map((item) => scrubObject(item, depth + 1))
   }
diff --git a/src/lib/server-data.ts b/src/lib/server-data.ts
index 59c8eeb2..d5461958 100644
--- a/src/lib/server-data.ts
+++ b/src/lib/server-data.ts
@@ -1,9 +1,13 @@
 // src/lib/server-data.ts
 //
 // Functions: fetchSettings, serializeSettingsResponse, getSettingsForClient,
-// getTrackerListForDashboard, getTrackerForClient, getSnapshotsForTracker,
-// getTagGroupsWithMembers, getProxyTrackers, getDatabaseSize
-// Constants: settingsColumns, trackerColumns
+// getTrackerListForDashboard, getTrackerForClient, getSnapshotBucket,
+// getSnapshotsForTracker, getFleetSnapshots, getTagGroupsWithMembers,
+// getProxyTrackers, getDatabaseSize, getDatabaseSizeBytes, recordDatabaseSize,
+// getDbSizeHistory, fetchDownloadClients, serializeDownloadClientResponse,
+// fetchNotificationTargets, serializeNotificationTarget
+// Constants: settingsColumns, trackerColumns, snapshotColumns, clientColumns,
+// notificationTargetColumns
 //
 // Server-side data fetchers: single source of truth for safe DB queries
 // that return client-safe shapes. Used by both API route handlers and
@@ -21,18 +25,24 @@
 import "server-only"
 
 import { and, asc, desc, eq, gte, sql } from "drizzle-orm"
+import { DEFAULT_TRACKER_COLOR } from "@/lib/constants"
 import { db } from "@/lib/db"
 import {
   appSettings,
+  dbSizeHistory,
+  downloadClients,
+  notificationTargets,
   tagGroupMembers,
   tagGroups as tagGroupsTable,
   trackerSnapshots,
   trackers,
 } from "@/lib/db/schema"
+import { parseQbitmanageTags } from "@/lib/download-clients/qbt/qbitmanage-defaults"
+import { localDateStr } from "@/lib/formatters"
+import { SNAPSHOT_QUERY_MAX } from "@/lib/limits"
 import { createPrivacyMaskSync } from "@/lib/privacy-db"
-import { parseQbitmanageTags } from "@/lib/qbitmanage-defaults"
 import { serializeTrackerResponse } from "@/lib/tracker-serializer"
-import type { Snapshot, TagGroup, TagGroupChartType } from "@/types/api"
+import type { Snapshot, TagGroup, TagGroupChartType, TrackerSummary } from "@/types/api"
 
 // ---------------------------------------------------------------------------
 // Settings
@@ -125,6 +135,109 @@ export async function getSettingsForClient() {
   return serializeSettingsResponse(row)
 }
 
+// ---------------------------------------------------------------------------
+// Download clients
+// ---------------------------------------------------------------------------
+
+/**
+ * Explicit column projection for downloadClients. Excludes encryptedUsername
+ * and encryptedPassword at the query level via a SQL boolean expression so the
+ * ciphertext never enters server process memory. Also excludes cachedTorrents
+ * (potentially large JSONB) and cachedTorrentsAt (internal scheduler state).
+ */
+export const clientColumns = {
+  id: downloadClients.id,
+  name: downloadClients.name,
+  type: downloadClients.type,
+  enabled: downloadClients.enabled,
+  host: downloadClients.host,
+  port: downloadClients.port,
+  useSsl: downloadClients.useSsl,
+  hasCredentials:
+    sql<boolean>`(${downloadClients.encryptedUsername} IS NOT NULL AND ${downloadClients.encryptedPassword} IS NOT NULL)`.as(
+      "has_credentials"
+    ),
+  pollIntervalSeconds: downloadClients.pollIntervalSeconds,
+  isDefault: downloadClients.isDefault,
+  crossSeedTags: downloadClients.crossSeedTags,
+  lastPolledAt: downloadClients.lastPolledAt,
+  lastError: downloadClients.lastError,
+  errorSince: downloadClients.errorSince,
+  createdAt: downloadClients.createdAt,
+  updatedAt: downloadClients.updatedAt,
+}
+
+export function fetchDownloadClients() {
+  return db.select(clientColumns).from(downloadClients).orderBy(downloadClients.createdAt)
+}
+
+export type DownloadClientListRow = Awaited<ReturnType<typeof fetchDownloadClients>>[number]
+
+export function serializeDownloadClientResponse(row: DownloadClientListRow) {
+  return {
+    ...row,
+    crossSeedTags: row.crossSeedTags ?? [],
+    lastPolledAt: row.lastPolledAt?.toISOString() ?? null,
+    errorSince: row.errorSince?.toISOString() ?? null,
+    createdAt: row.createdAt.toISOString(),
+    updatedAt: row.updatedAt.toISOString(),
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Notification targets
+// ---------------------------------------------------------------------------
+
+/**
+ * Explicit column projection for notificationTargets. Excludes encryptedConfig
+ * at the query level via a SQL boolean expression so the ciphertext never
+ * enters server process memory.
+ */
+export const notificationTargetColumns = {
+  id: notificationTargets.id,
+  name: notificationTargets.name,
+  type: notificationTargets.type,
+  enabled: notificationTargets.enabled,
+  hasConfig: sql<boolean>`(${notificationTargets.encryptedConfig} IS NOT NULL)`.as("has_config"),
+  notifyRatioDrop: notificationTargets.notifyRatioDrop,
+  notifyHitAndRun: notificationTargets.notifyHitAndRun,
+  notifyTrackerDown: notificationTargets.notifyTrackerDown,
+  notifyBufferMilestone: notificationTargets.notifyBufferMilestone,
+  notifyWarned: notificationTargets.notifyWarned,
+  notifyRatioDanger: notificationTargets.notifyRatioDanger,
+  notifyZeroSeeding: notificationTargets.notifyZeroSeeding,
+  notifyRankChange: notificationTargets.notifyRankChange,
+  notifyAnniversary: notificationTargets.notifyAnniversary,
+  notifyBonusCap: notificationTargets.notifyBonusCap,
+  notifyVipExpiring: notificationTargets.notifyVipExpiring,
+  notifyUnsatisfiedLimit: notificationTargets.notifyUnsatisfiedLimit,
+  notifyActiveHnrs: notificationTargets.notifyActiveHnrs,
+  notifyDownloadDisabled: notificationTargets.notifyDownloadDisabled,
+  thresholds: notificationTargets.thresholds,
+  includeTrackerName: notificationTargets.includeTrackerName,
+  scope: notificationTargets.scope,
+  lastDeliveryStatus: notificationTargets.lastDeliveryStatus,
+  lastDeliveryAt: notificationTargets.lastDeliveryAt,
+  lastDeliveryError: notificationTargets.lastDeliveryError,
+  createdAt: notificationTargets.createdAt,
+  updatedAt: notificationTargets.updatedAt,
+}
+
+export function fetchNotificationTargets() {
+  return db.select(notificationTargetColumns).from(notificationTargets)
+}
+
+export type NotificationTargetRow = Awaited<ReturnType<typeof fetchNotificationTargets>>[number]
+
+export function serializeNotificationTarget(row: NotificationTargetRow) {
+  return {
+    ...row,
+    lastDeliveryAt: row.lastDeliveryAt?.toISOString() ?? null,
+    createdAt: row.createdAt.toISOString(),
+    updatedAt: row.updatedAt.toISOString(),
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Tracker list (dashboard)
 // ---------------------------------------------------------------------------
@@ -144,6 +257,7 @@ export const trackerColumns = {
   isActive: trackers.isActive,
   lastPolledAt: trackers.lastPolledAt,
   lastError: trackers.lastError,
+  lastErrorAt: trackers.lastErrorAt,
   consecutiveFailures: trackers.consecutiveFailures,
   pausedAt: trackers.pausedAt,
   userPausedAt: trackers.userPausedAt,
@@ -164,17 +278,18 @@ export const trackerColumns = {
   updatedAt: trackers.updatedAt,
 }
 
-/** Return type for serialized tracker + latest snapshot. */
-export type TrackerSummary = ReturnType<typeof serializeTrackerResponse>
-
 /**
  * Fetches all trackers with their latest snapshot for the dashboard.
  * Applies privacy masking at response time. Never returns encryptedApiToken.
  */
 export async function getTrackerListForDashboard(): Promise<TrackerSummary[]> {
-  const [allTrackers, [privacySettings]] = await Promise.all([
+  const [allTrackers, [privacySettings], latestSnapshots] = await Promise.all([
     db.select(trackerColumns).from(trackers).orderBy(trackers.createdAt),
     db.select({ storeUsernames: appSettings.storeUsernames }).from(appSettings).limit(1),
+    db
+      .selectDistinctOn([trackerSnapshots.trackerId])
+      .from(trackerSnapshots)
+      .orderBy(trackerSnapshots.trackerId, desc(trackerSnapshots.polledAt)),
   ])
 
   // Enforce masking at response time
@@ -182,11 +297,6 @@ export async function getTrackerListForDashboard(): Promise<TrackerSummary[]> {
   // behavior when no settings row exists. Do NOT change to false.
   const mask = createPrivacyMaskSync(privacySettings?.storeUsernames ?? true)
 
-  const latestSnapshots = await db
-    .selectDistinctOn([trackerSnapshots.trackerId])
-    .from(trackerSnapshots)
-    .orderBy(trackerSnapshots.trackerId, desc(trackerSnapshots.polledAt))
-
   const snapshotByTracker = new Map(latestSnapshots.map((s) => [s.trackerId, s]))
 
   // SECURITY: Never include encryptedApiToken in response
@@ -233,12 +343,40 @@ export async function getTrackerForClient(id: number): Promise<TrackerSummary |
 // Snapshots for a tracker
 // ---------------------------------------------------------------------------
 
+const snapshotColumns = {
+  polledAt: trackerSnapshots.polledAt,
+  uploadedBytes: trackerSnapshots.uploadedBytes,
+  downloadedBytes: trackerSnapshots.downloadedBytes,
+  ratio: trackerSnapshots.ratio,
+  bufferBytes: trackerSnapshots.bufferBytes,
+  seedingCount: trackerSnapshots.seedingCount,
+  leechingCount: trackerSnapshots.leechingCount,
+  seedbonus: trackerSnapshots.seedbonus,
+  hitAndRuns: trackerSnapshots.hitAndRuns,
+  requiredRatio: trackerSnapshots.requiredRatio,
+  warned: trackerSnapshots.warned,
+  freeleechTokens: trackerSnapshots.freeleechTokens,
+  shareScore: trackerSnapshots.shareScore,
+  username: trackerSnapshots.username,
+  group: trackerSnapshots.group,
+  isManual: trackerSnapshots.isManual,
+}
+
+/** Pick a date_trunc bucket for chart queries based on requested day range. null = raw. */
+export function getSnapshotBucket(days: number): "hour" | "day" | null {
+  if (days > 0 && days <= 2) return null
+  if (days > 0 && days <= 90) return "hour"
+  return "day"
+}
+
 /**
  * Fetches snapshots for a tracker, filtered by day range.
- * Pass days=0 for all snapshots. Applies privacy masking.
+ * Pass days=0 for all snapshots. Applies adaptive time-bucketing for
+ * longer ranges (hourly for 3-90d, daily for >90d) to bound response size.
+ * Applies privacy masking.
  */
 export async function getSnapshotsForTracker(trackerId: number, days: number): Promise<Snapshot[]> {
-  const safeDays = days === 0 ? 0 : Math.min(Math.max(days, 1), 3650)
+  const safeDays = days === 0 ? 0 : Math.min(Math.max(days, 1), SNAPSHOT_QUERY_MAX)
 
   const conditions = [eq(trackerSnapshots.trackerId, trackerId)]
   if (safeDays > 0) {
@@ -246,23 +384,54 @@ export async function getSnapshotsForTracker(trackerId: number, days: number): P
     conditions.push(gte(trackerSnapshots.polledAt, since))
   }
 
+  const bucket = getSnapshotBucket(safeDays)
+  const whereClause = and(...conditions)
+
   const [snapshots, [privacySettings]] = await Promise.all([
-    db
-      .select()
-      .from(trackerSnapshots)
-      .where(and(...conditions))
-      .orderBy(trackerSnapshots.polledAt),
+    bucket
+      ? (() => {
+          const bucketExpr = sql`date_trunc(${sql.raw(`'${bucket}'`)}, ${trackerSnapshots.polledAt})`
+          return db
+            .selectDistinctOn([bucketExpr], snapshotColumns)
+            .from(trackerSnapshots)
+            .where(whereClause)
+            .orderBy(bucketExpr, desc(trackerSnapshots.polledAt))
+        })()
+      : db
+          .select(snapshotColumns)
+          .from(trackerSnapshots)
+          .where(whereClause)
+          .orderBy(trackerSnapshots.polledAt),
     db.select({ storeUsernames: appSettings.storeUsernames }).from(appSettings).limit(1),
   ])
 
-  // Enforce masking at response time. even if DB has plaintext from before
-  // privacy mode was enabled. Fallback true = "store usernames" = no masking.
   const mask = createPrivacyMaskSync(privacySettings?.storeUsernames ?? true)
 
-  // Serialize bigints to strings for JSON. Username/group are included because
-  // detectRankChanges needs them. When privacy mode is on, values are masked
-  // before leaving the server.
-  return snapshots.map((s) => ({
+  return snapshots.map((s) => serializeSnapshot(s, mask))
+}
+
+function serializeSnapshot(
+  s: {
+    polledAt: Date
+    uploadedBytes: bigint | null
+    downloadedBytes: bigint | null
+    ratio: number | null
+    bufferBytes: bigint | null
+    seedingCount: number | null
+    leechingCount: number | null
+    seedbonus: number | null
+    hitAndRuns: number | null
+    requiredRatio: number | null
+    warned: boolean | null
+    freeleechTokens: number | null
+    shareScore: number | null
+    username: string | null
+    group: string | null
+    isManual: boolean
+  },
+  mask: (v: string | null) => string | null
+): Snapshot {
+  return {
     polledAt: s.polledAt.toISOString(),
     uploadedBytes: s.uploadedBytes?.toString() ?? "0",
     downloadedBytes: s.downloadedBytes?.toString() ?? "0",
@@ -278,7 +447,55 @@ export async function getSnapshotsForTracker(trackerId: number, days: number): P
     shareScore: s.shareScore,
     username: mask(s.username),
     group: mask(s.group),
-  }))
+    isManual: s.isManual,
+  }
+}
+
+/**
+ * Fetches bucketed snapshots for ALL trackers in a single query.
+ * Same bucketing logic as getSnapshotsForTracker but partitioned by tracker_id.
+ * Eliminates N+1 queries from the dashboard.
+ */
+export type FleetSnapshotMap = Record<string, Snapshot[]>
+
+export async function getFleetSnapshots(days: number): Promise<FleetSnapshotMap> {
+  const safeDays = days === 0 ? 0 : Math.min(Math.max(days, 1), SNAPSHOT_QUERY_MAX)
+  const bucket = getSnapshotBucket(safeDays)
+
+  const sinceCondition =
+    safeDays > 0
+      ? gte(trackerSnapshots.polledAt, new Date(Date.now() - safeDays * 24 * 60 * 60 * 1000))
+      : undefined
+
+  const columnsWithTracker = { ...snapshotColumns, trackerId: trackerSnapshots.trackerId }
+
+  const [rows, [privacySettings]] = await Promise.all([
+    bucket
+      ? (() => {
+          const bucketExpr = sql`date_trunc(${sql.raw(`'${bucket}'`)}, ${trackerSnapshots.polledAt})`
+          return db
+            .selectDistinctOn([trackerSnapshots.trackerId, bucketExpr], columnsWithTracker)
+            .from(trackerSnapshots)
+            .where(sinceCondition)
+            .orderBy(trackerSnapshots.trackerId, bucketExpr, desc(trackerSnapshots.polledAt))
+        })()
+      : db
+          .select(columnsWithTracker)
+          .from(trackerSnapshots)
+          .where(sinceCondition)
+          .orderBy(trackerSnapshots.trackerId, trackerSnapshots.polledAt),
+    db.select({ storeUsernames: appSettings.storeUsernames }).from(appSettings).limit(1),
+  ])
+
+  const mask = createPrivacyMaskSync(privacySettings?.storeUsernames ?? true)
+
+  const result: FleetSnapshotMap = {}
+  for (const s of rows) {
+    const key = String(s.trackerId)
+    if (!result[key]) result[key] = []
+    result[key].push(serializeSnapshot(s, mask))
+  }
+  return result
 }
 
 // ---------------------------------------------------------------------------
@@ -334,7 +551,7 @@ export async function getProxyTrackers(): Promise<{ id: number; name: string; co
   return rows.map((r) => ({
     id: r.id,
     name: r.name,
-    color: r.color ?? "#00d4ff",
+    color: r.color ?? DEFAULT_TRACKER_COLOR,
   }))
 }
 
@@ -349,3 +566,86 @@ export async function getDatabaseSize(): Promise<string> {
   )
   return (rows as unknown as Array<{ size: string }>)[0]?.size ?? "Unknown"
 }
+
+/** Returns database size in bytes as a bigint */
+// security-audit-ignore: read-only PostgreSQL system function, no user input
+export async function getDatabaseSizeBytes(): Promise<bigint> {
+  const rows = await db.execute(sql`SELECT pg_database_size(current_database()) as size_bytes`)
+  const raw = (rows as unknown as Array<{ size_bytes: string }>)[0]?.size_bytes
+  return raw ? BigInt(raw) : 0n
+}
+
+/** Record today's database size. Upserts — safe to call multiple times per day. */
+export async function recordDatabaseSize(): Promise<void> {
+  const totalBytes = await getDatabaseSizeBytes()
+  const today = localDateStr(new Date())
+  await db.insert(dbSizeHistory).values({ recordedAt: today, totalBytes }).onConflictDoUpdate({
+    target: dbSizeHistory.recordedAt,
+    set: { totalBytes },
+  })
+}
+
+export interface DbSizeHistoryRow {
+  date: string
+  bytes: string // bigint serialized as string for JSON
+}
+
+export interface DbSizeResponse {
+  history: DbSizeHistoryRow[]
+  currentBytes: string
+  dailyGrowthBytes: number
+  projectedBytes: string
+  projectionDate: string
+}
+
+/** Fetch full db size history and compute linear projection. */
+export async function getDbSizeHistory(): Promise<DbSizeResponse> {
+  const rows = await db
+    .select({
+      recordedAt: dbSizeHistory.recordedAt,
+      totalBytes: dbSizeHistory.totalBytes,
+    })
+    .from(dbSizeHistory)
+    .orderBy(dbSizeHistory.recordedAt)
+
+  const history: DbSizeHistoryRow[] = rows.map((r) => ({
+    date: r.recordedAt,
+    bytes: r.totalBytes.toString(),
+  }))
+
+  const currentBytes = rows.length > 0 ? rows[rows.length - 1].totalBytes : 0n
+
+  // Compute average daily growth from consecutive deltas
+  let dailyGrowthBytes = 0
+  if (rows.length >= 2) {
+    const deltas: number[] = []
+    for (let i = 1; i < rows.length; i++) {
+      const delta = Number(rows[i].totalBytes - rows[i - 1].totalBytes)
+      // Count days between points (may skip days if scheduler was off)
+      const daysBetween = Math.max(
+        1,
+        Math.round(
+          (new Date(rows[i].recordedAt).getTime() - new Date(rows[i - 1].recordedAt).getTime()) /
+            86_400_000
+        )
+      )
+      deltas.push(delta / daysBetween)
+    }
+    dailyGrowthBytes = Math.round(deltas.reduce((a, b) => a + b, 0) / deltas.length)
+  }
+
+  // Project forward by the same number of days as we have history
+  const historyDays = rows.length
+  const projectedGrowth = Math.max(0, dailyGrowthBytes) * historyDays
+  const projectedBytes = currentBytes + BigInt(Math.round(projectedGrowth))
+
+  const projectionDate = new Date(Date.now() + historyDays * 86_400_000).toISOString().slice(0, 10)
+
+  return {
+    history,
+    currentBytes: currentBytes.toString(),
+    dailyGrowthBytes: Math.max(0, dailyGrowthBytes),
+    projectedBytes: projectedBytes.toString(),
+    projectionDate,
+  }
+}
diff --git a/src/lib/storage-keys.ts b/src/lib/storage-keys.ts
index 4616232e..89146def 100644
--- a/src/lib/storage-keys.ts
+++ b/src/lib/storage-keys.ts
@@ -4,8 +4,12 @@
 // Prevents silent key mismatches from typos across components.
 
 export const STORAGE_KEYS = {
-  SIDEBAR_STAT_MODE: "sidebar-stat-mode",
-  SIDEBAR_SORT_MODE: "sidebar-sort-mode",
+  SIDEBAR_STAT_MODE: "tracker-tracker:sidebar-stat-mode",
+  SIDEBAR_SORT_MODE: "tracker-tracker:sidebar-sort-mode",
+  SIDEBAR_FILTERS_EXPANDED: "tracker-tracker:sidebar-filters-expanded",
+  SIDEBAR_FAVORITES_ONLY: "tracker-tracker:sidebar-favorites-only",
+  SIDEBAR_SHOW_ARCHIVED: "tracker-tracker:sidebar-show-archived",
+  SIDEBAR_UNLOCKED: "tracker-tracker:sidebar-unlocked",
   CHART_PREFERENCES: "tracker-tracker:chart-preferences",
   FLEET_CHART_PREFERENCES: "tracker-tracker:fleet-chart-preferences",
   DASHBOARD_SETTINGS: "tracker-tracker:dashboard-settings",
diff --git a/src/lib/today.ts b/src/lib/today.ts
index ea8da1df..eb243339 100644
--- a/src/lib/today.ts
+++ b/src/lib/today.ts
@@ -5,6 +5,7 @@
 import "server-only"
 
 import { eq, gte, inArray, sql } from "drizzle-orm"
+import { compareBigIntDesc, isUnixTimestampOnDate } from "@/lib/data-transforms"
 import { db } from "@/lib/db"
 import {
   downloadClients,
@@ -13,10 +14,10 @@ import {
   trackerSnapshots,
   trackers,
 } from "@/lib/db/schema"
+import { parseCachedTorrents } from "@/lib/download-clients"
 import { parseTorrentTags } from "@/lib/fleet"
-import { compareBigIntDesc, isUnixTimestampOnDate, localDateStr } from "@/lib/formatters"
+import { localDateStr } from "@/lib/formatters"
 import { log } from "@/lib/logger"
-import { parseCachedTorrents } from "@/lib/qbt/client"
 import type { TodayAtAGlance } from "@/types/api"
 
 interface TrackerDelta {
@@ -263,11 +264,11 @@ export async function computeTodayAtAGlance(): Promise<TodayAtAGlance> {
     const torrents = parseCachedTorrents(client.cachedTorrents)
 
     for (const torrent of torrents) {
-      // Activity counts. added_on and completion_on are unix timestamps (seconds)
-      if (isUnixTimestampOnDate(torrent.added_on, todayStr)) {
+      // Activity counts. addedAt and completedAt are unix timestamps (seconds)
+      if (isUnixTimestampOnDate(torrent.addedAt, todayStr)) {
         addedToday++
       }
-      if (torrent.completion_on !== -1 && isUnixTimestampOnDate(torrent.completion_on, todayStr)) {
+      if (torrent.completedAt !== -1 && isUnixTimestampOnDate(torrent.completedAt, todayStr)) {
         completedToday++
       }
 
diff --git a/src/lib/torrent-utils.ts b/src/lib/torrent-utils.ts
index eb280c8d..bae1f557 100644
--- a/src/lib/torrent-utils.ts
+++ b/src/lib/torrent-utils.ts
@@ -1,57 +1,20 @@
 // src/lib/torrent-utils.ts
 //
-// Functions: mapTorrent
-// Types: QbtTorrentRaw, TorrentInfo, AggregatedTorrentsResponse, CategoryStats
+// Types: AggregatedTorrentsResponse, CategoryStats
 //
 // Re-exports SEEDING_STATES, LEECHING_STATES from fleet.ts (single source of truth).
-// QbtTorrentRaw is an alias for TorrentRaw from fleet.ts.
 
 import { LEECHING_STATES, parseTorrentTags, SEEDING_STATES, type TorrentRaw } from "@/lib/fleet"
 
 // Re-export constants and utilities from fleet.ts — single source of truth
 export { LEECHING_STATES, parseTorrentTags, SEEDING_STATES }
 
-// QbtTorrentRaw is the same shape as TorrentRaw (fleet.ts) — aliased here
-// for semantic clarity in per-tracker contexts vs fleet-wide contexts.
-export type QbtTorrentRaw = TorrentRaw
-
-// ---------------------------------------------------------------------------
-// Mapped torrent shape (camelCase for component use)
-// ---------------------------------------------------------------------------
-
-export interface TorrentInfo {
-  hash: string
-  name: string
-  state: string
-  tags: string
-  category: string
-  uploaded: number
-  downloaded: number
-  ratio: number
-  size: number
-  seedingTime: number
-  timeActive: number
-  addedOn: number
-  completionOn: number
-  lastActivity: number
-  amountLeft: number
-  numSeeds: number
-  numLeechs: number
-  numComplete: number
-  numIncomplete: number
-  upspeed: number
-  dlspeed: number
-  availability: number
-  progress: number
-  clientName: string
-}
-
 // ---------------------------------------------------------------------------
 // API response shape
 // ---------------------------------------------------------------------------
 
 export interface AggregatedTorrentsResponse {
-  torrents: QbtTorrentRaw[]
+  torrents: TorrentRaw[]
   crossSeedTags: string[]
   clientErrors: string[]
   clientCount: number
@@ -70,36 +33,3 @@ export interface CategoryStats {
   avgSeedTime: number
   avgSwarmSeeds: number
 }
-
-// ---------------------------------------------------------------------------
-// Mappers
-// ---------------------------------------------------------------------------
-
-export function mapTorrent(raw: QbtTorrentRaw): TorrentInfo {
-  return {
-    hash: raw.hash,
-    name: raw.name,
-    state: raw.state,
-    tags: raw.tags,
-    category: raw.category,
-    uploaded: raw.uploaded,
-    downloaded: raw.downloaded,
-    ratio: raw.ratio,
-    size: raw.size,
-    seedingTime: raw.seeding_time,
-    timeActive: raw.time_active,
-    addedOn: raw.added_on,
-    completionOn: raw.completion_on,
-    lastActivity: raw.last_activity,
-    amountLeft: raw.amount_left,
-    numSeeds: raw.num_seeds,
-    numLeechs: raw.num_leechs,
-    numComplete: raw.num_complete,
-    numIncomplete: raw.num_incomplete,
-    upspeed: raw.upspeed,
-    dlspeed: raw.dlspeed,
-    availability: raw.availability,
-    progress: raw.progress,
-    clientName: raw.client_name,
-  }
-}
diff --git a/src/lib/totp.ts b/src/lib/totp.ts
index a45ba88b..fd4cb015 100644
--- a/src/lib/totp.ts
+++ b/src/lib/totp.ts
@@ -14,6 +14,7 @@ const BACKUP_CODE_COUNT = 8
 const BACKUP_CODE_LENGTH = 8
 
 export const BACKUP_CODE_PATTERN = /^[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}$/
+export const TOTP_CODE_RE = /^\d{6}$/
 
 export interface BackupCodeEntry {
   hash: string
diff --git a/src/lib/tracker-events.ts b/src/lib/tracker-events.ts
index 8388ca50..5a0b070a 100644
--- a/src/lib/tracker-events.ts
+++ b/src/lib/tracker-events.ts
@@ -1,10 +1,11 @@
 // src/lib/tracker-events.ts
 //
 // Functions: checkRatioBelowMinimum, checkRatioDelta, checkRatioBelowMinimumTransition,
-//            checkTrackerError, checkWarned, checkWarnedTransition, checkZeroSeeding,
+//            checkTrackerError, checkWarnedTransition, checkZeroSeeding,
 //            checkHnrIncrease, checkBufferMilestoneCrossed, checkRankChange,
 //            checkAnniversaryMilestone, checkBonusCapReached, checkVipExpiringSoon,
-//            checkUnsatisfiedLimitApproaching, checkActiveHnrs, EVENT_SNOOZE_MS
+//            checkUnsatisfiedLimitApproaching, checkActiveHnrs, checkDownloadDisabled,
+//            EVENT_SNOOZE_MS
 //
 // Shared pure-function event detection checks. No framework imports, no DB imports.
 // Importable from both client-side dashboard code and server-side scheduler code.
@@ -57,10 +58,6 @@ export function checkTrackerError(
   return { paused: false, pausedByUser: false, hasError: false }
 }
 
-export function checkWarned(warned: boolean | null | undefined): boolean {
-  return warned === true
-}
-
 export function checkWarnedTransition(
   previousWarned: boolean | null | undefined,
   currentWarned: boolean | null | undefined
@@ -135,7 +132,7 @@ export function checkAnniversaryMilestone(
   for (let y = 1; y <= Math.max(yearsSinceJoin + 1, 1); y++) {
     const ann = new Date(joined)
     ann.setFullYear(ann.getFullYear() + y)
-    candidates.push({ date: ann, label: `${y} year anniversary` })
+    candidates.push({ date: ann, label: `${y}-year anniversary` })
   }
 
   for (const { date, label } of candidates) {
@@ -194,6 +191,16 @@ export function checkActiveHnrs(
   return true
 }
 
+// ─── Download Privileges ────────────────────────────────────────────────────
+
+export function checkDownloadDisabled(
+  canDownload: boolean | null,
+  previousCanDownload: boolean | null
+): boolean {
+  if (canDownload === null || previousCanDownload === null) return false
+  return previousCanDownload === true && canDownload === false
+}
+
 // ─── Snooze durations ────────────────────────────────────────────────────────
 
 // Per-event-type snooze duration map. Events with different urgency/frequency profiles
@@ -212,4 +219,5 @@ export const EVENT_SNOOZE_MS: Record<NotificationEventType, number> = {
   vip_expiring: 24 * 60 * 60 * 1000, // 24 hours
   unsatisfied_limit: 6 * 60 * 60 * 1000, // 6 hours
   active_hnrs: 6 * 60 * 60 * 1000, // 6 hours
+  download_disabled: 6 * 60 * 60 * 1000, // 6 hours
 }
diff --git a/src/lib/tracker-scheduler.ts b/src/lib/tracker-scheduler.ts
new file mode 100644
index 00000000..84b6cdc4
--- /dev/null
+++ b/src/lib/tracker-scheduler.ts
@@ -0,0 +1,731 @@
+// src/lib/tracker-scheduler.ts
+//
+// Functions: pollTracker, pollAllTrackers, pruneOldSnapshots, pruneOldCheckpoints,
+// startScheduler, stopScheduler, ensureSchedulerRunning, fetchTrackerStats, POLL_FAILURE_THRESHOLD
+// Constants: POLL_TRACKER_COLUMNS
+import type { Agent as HttpAgent } from "node:http"
+
+import { and, desc, eq, isNotNull, lt, notInArray, sql } from "drizzle-orm"
+import cron, { type ScheduledTask } from "node-cron"
+import { findRegistryEntry } from "@/data/tracker-registry"
+import { buildFetchOptions, getAdapter } from "@/lib/adapters"
+import type {
+  AvistazPlatformMeta,
+  DigitalCorePlatformMeta,
+  MamPlatformMeta,
+} from "@/lib/adapters/types"
+import { pruneDismissedAlerts } from "@/lib/alert-pruning"
+import { decrypt } from "@/lib/crypto"
+import { db } from "@/lib/db"
+import type { NotificationTargetRow, TrackerRow } from "@/lib/db/schema"
+import {
+  appSettings,
+  notificationTargets,
+  torrentDailyCheckpoints,
+  trackerDailyCheckpoints,
+  trackerSnapshots,
+  trackers,
+} from "@/lib/db/schema"
+import { errMsg, sanitizeNetworkError } from "@/lib/error-utils"
+import { localDateStr } from "@/lib/formatters"
+import { POLL_INTERVAL_DEFAULT } from "@/lib/limits"
+import { log } from "@/lib/logger"
+import { dispatchNotifications } from "@/lib/notifications/dispatch"
+import { maskUsername } from "@/lib/privacy"
+import { recordDatabaseSize } from "@/lib/server-data"
+import { getPauseState } from "@/lib/tracker-status"
+import { buildProxyAgentFromSettings } from "@/lib/tunnel"
+
+// Store on globalThis to survive HMR in development.
+// Without this, each hot-reload orphans the old cron job (it keeps firing)
+// while creating a new one which causes duplicate polls that hammer tracker APIs.
+const g = globalThis as typeof globalThis & {
+  __schedulerTask?: ScheduledTask | null
+  __schedulerKey?: Buffer | null
+  __pollInFlight?: boolean
+}
+
+function getSchedulerTask(): ScheduledTask | null {
+  return g.__schedulerTask ?? null
+}
+function setSchedulerTask(task: ScheduledTask | null) {
+  g.__schedulerTask = task
+}
+function getSchedulerKey(): Buffer | null {
+  return g.__schedulerKey ?? null
+}
+function setSchedulerKey(key: Buffer | null) {
+  g.__schedulerKey = key
+}
+
+function getPollInFlight(): boolean {
+  return g.__pollInFlight ?? false
+}
+function setPollInFlight(v: boolean) {
+  g.__pollInFlight = v
+}
+
+/** Columns needed for poll cycle. Excludes avatarData (~5MB), avatarMimeType, avatarCachedAt, color, qbtTag, etc. */
+const POLL_TRACKER_COLUMNS = {
+  id: trackers.id,
+  name: trackers.name,
+  isActive: trackers.isActive,
+  encryptedApiToken: trackers.encryptedApiToken,
+  platformType: trackers.platformType,
+  baseUrl: trackers.baseUrl,
+  apiPath: trackers.apiPath,
+  useProxy: trackers.useProxy,
+  remoteUserId: trackers.remoteUserId,
+  platformMeta: trackers.platformMeta,
+  joinedAt: trackers.joinedAt,
+  lastPolledAt: trackers.lastPolledAt,
+  lastError: trackers.lastError,
+  lastErrorAt: trackers.lastErrorAt,
+  consecutiveFailures: trackers.consecutiveFailures,
+  pausedAt: trackers.pausedAt,
+  userPausedAt: trackers.userPausedAt,
+  updatedAt: trackers.updatedAt,
+} as const
+
+export const POLL_FAILURE_THRESHOLD = 4
+
+/**
+ * Tolerance window for the overdue check. Trackers that would become overdue
+ * within this window are included in the current batch instead of waiting for
+ * the next cron cycle. Prevents permanent drift caused by manual polls or
+ * missed batches from keeping a tracker in its own solo cycle forever.
+ */
+const BATCH_TOLERANCE_MS = 60_000
+
+/**
+ * Fetch fresh stats from a tracker's API without writing a snapshot.
+ * Used by the (currently unreleased) transit papers report route to get live data for the report.
+ * Also updates tracker metadata side effects (remoteUserId, joinedAt, lastAccessAt, platformMeta, avatarUrl).
+ */
+export async function fetchTrackerStats(
+  trackerId: number,
+  encryptionKey: Buffer,
+  proxyAgent?: HttpAgent
+) {
+  const [tracker] = await db
+    .select(POLL_TRACKER_COLUMNS)
+    .from(trackers)
+    .where(eq(trackers.id, trackerId))
+    .limit(1)
+  if (!tracker?.isActive) throw new Error("Tracker not found or inactive")
+
+  let apiToken: string
+  try {
+    apiToken = decrypt(tracker.encryptedApiToken, encryptionKey)
+  } catch (err) {
+    const cause = errMsg(err)
+    throw new Error(`API key is missing or invalid for tracker "${tracker.name}": ${cause}`)
+  }
+
+  const adapter = getAdapter(tracker.platformType)
+  if (tracker.useProxy && !proxyAgent) {
+    throw new Error("Proxy required but not available, refusing to leak IP via direct connection")
+  }
+
+  const fetchOptions = buildFetchOptions(tracker.baseUrl, {
+    proxyAgent: tracker.useProxy ? proxyAgent : undefined,
+    remoteUserId: tracker.remoteUserId ?? undefined,
+  })
+  const stats = await adapter.fetchStats(tracker.baseUrl, apiToken, tracker.apiPath, fetchOptions)
+
+  // Write metadata side effects
+  const metaUpdates: Partial<TrackerRow> = {}
+  if (stats.remoteUserId && stats.remoteUserId !== tracker.remoteUserId) {
+    metaUpdates.remoteUserId = stats.remoteUserId
+  }
+  if (stats.joinedDate && !tracker.joinedAt) {
+    const parsed = new Date(stats.joinedDate)
+    if (!Number.isNaN(parsed.getTime())) metaUpdates.joinedAt = localDateStr(parsed)
+  }
+  if (stats.lastAccessDate) {
+    const parsed = new Date(stats.lastAccessDate)
+    if (!Number.isNaN(parsed.getTime())) metaUpdates.lastAccessAt = localDateStr(parsed)
+  }
+  if (stats.platformMeta) metaUpdates.platformMeta = JSON.stringify(stats.platformMeta)
+  if (stats.avatarUrl) metaUpdates.avatarRemoteUrl = stats.avatarUrl
+  if (Object.keys(metaUpdates).length > 0) {
+    await db.update(trackers).set(metaUpdates).where(eq(trackers.id, tracker.id))
+  }
+
+  // Merge metadata in-memory instead of re-fetching
+  return { stats, tracker: { ...tracker, ...metaUpdates } }
+}
+
+export async function pollTracker(
+  trackerId: number,
+  encryptionKey: Buffer,
+  privacyMode: boolean,
+  proxyAgent?: HttpAgent,
+  batchTimestamp?: Date,
+  enabledTargets?: NotificationTargetRow[],
+  isManual = false
+): Promise<void> {
+  const [tracker] = await db
+    .select(POLL_TRACKER_COLUMNS)
+    .from(trackers)
+    .where(eq(trackers.id, trackerId))
+    .limit(1)
+
+  if (!tracker?.isActive) return
+
+  const timestamp = batchTimestamp ?? new Date()
+
+  try {
+    let apiToken: string
+    try {
+      apiToken = decrypt(tracker.encryptedApiToken, encryptionKey)
+    } catch (err) {
+      const cause = errMsg(err)
+      throw new Error(`API key is missing or invalid for tracker "${tracker.name}": ${cause}`)
+    }
+    const adapter = getAdapter(tracker.platformType)
+    if (tracker.useProxy && !proxyAgent) {
+      throw new Error("Proxy required but not available, refusing to leak IP via direct connection")
+    }
+    const fetchOptions = buildFetchOptions(tracker.baseUrl, {
+      proxyAgent: tracker.useProxy ? proxyAgent : undefined,
+      remoteUserId: tracker.remoteUserId ?? undefined,
+    })
+    const stats = await adapter.fetchStats(tracker.baseUrl, apiToken, tracker.apiPath, fetchOptions)
+
+    // Snapshot the previous platformMeta BEFORE writing the current poll's metadata to DB.
+    // dispatchNotifications uses this for change detection (i.e. canDownload transition).
+    let previousPlatformMeta: Record<string, unknown> | null = null
+    if (
+      (tracker.platformType === "avistaz" || tracker.platformType === "digitalcore") &&
+      tracker.platformMeta
+    ) {
+      try {
+        previousPlatformMeta = JSON.parse(tracker.platformMeta) as Record<string, unknown>
+      } catch (err) {
+        log.warn(
+          { trackerId: tracker.id, error: err instanceof Error ? err.message : "unknown" },
+          "failed to parse previous platformMeta"
+        )
+      }
+    }
+
+    // Cache metadata from poll (remoteUserId saves an API call, joinedDate/platformMeta enrich the UI)
+    const metaUpdates: Record<string, unknown> = {}
+    if (stats.remoteUserId && stats.remoteUserId !== tracker.remoteUserId) {
+      metaUpdates.remoteUserId = stats.remoteUserId
+    }
+    if (stats.joinedDate && !tracker.joinedAt) {
+      const parsed = new Date(stats.joinedDate)
+      if (!Number.isNaN(parsed.getTime())) {
+        metaUpdates.joinedAt = localDateStr(parsed)
+      }
+    }
+    if (stats.lastAccessDate) {
+      const parsed = new Date(stats.lastAccessDate)
+      if (!Number.isNaN(parsed.getTime())) {
+        metaUpdates.lastAccessAt = localDateStr(parsed)
+      }
+    }
+    if (stats.platformMeta) {
+      metaUpdates.platformMeta = JSON.stringify(stats.platformMeta)
+    }
+    if (stats.avatarUrl) {
+      metaUpdates.avatarRemoteUrl = stats.avatarUrl
+    }
+    if (Object.keys(metaUpdates).length > 0) {
+      await db.update(trackers).set(metaUpdates).where(eq(trackers.id, tracker.id))
+    }
+
+    // Fetch previous snapshot before inserting the new one (used for change detection in notifications)
+    const [previousSnapshot] = await db
+      .select({
+        ratio: trackerSnapshots.ratio,
+        hitAndRuns: trackerSnapshots.hitAndRuns,
+        bufferBytes: trackerSnapshots.bufferBytes,
+        warned: trackerSnapshots.warned,
+        group: trackerSnapshots.group,
+        seedingCount: trackerSnapshots.seedingCount,
+        seedbonus: trackerSnapshots.seedbonus,
+      })
+      .from(trackerSnapshots)
+      .where(eq(trackerSnapshots.trackerId, tracker.id))
+      .orderBy(desc(trackerSnapshots.polledAt))
+      .limit(1)
+
+    await db.insert(trackerSnapshots).values({
+      trackerId: tracker.id,
+      polledAt: timestamp,
+      uploadedBytes: stats.uploadedBytes,
+      downloadedBytes: stats.downloadedBytes,
+      ratio: stats.ratio,
+      bufferBytes: stats.bufferBytes,
+      seedingCount: stats.seedingCount,
+      leechingCount: stats.leechingCount,
+      seedbonus: stats.seedbonus,
+      hitAndRuns: stats.hitAndRuns,
+      requiredRatio: stats.requiredRatio,
+      warned: stats.warned,
+      freeleechTokens: stats.freeleechTokens,
+      shareScore: stats.shareScore ?? null,
+      username: privacyMode ? maskUsername(stats.username) : stats.username,
+      group: privacyMode ? maskUsername(stats.group) : stats.group,
+      isManual,
+    })
+
+    try {
+      // Upsert daily checkpoint for "Today At A Glance" comparisons
+      const checkpointDate = localDateStr(timestamp)
+      await db
+        .insert(trackerDailyCheckpoints)
+        .values({
+          trackerId: tracker.id,
+          checkpointDate,
+          uploadedBytesEnd: stats.uploadedBytes !== null ? BigInt(stats.uploadedBytes) : 0n,
+          downloadedBytesEnd: stats.downloadedBytes !== null ? BigInt(stats.downloadedBytes) : 0n,
+          bufferBytesEnd: stats.bufferBytes !== null ? BigInt(stats.bufferBytes) : null,
+          ratioEnd: stats.ratio,
+          seedbonusEnd: stats.seedbonus,
+          snapshotCount: 1,
+        })
+        .onConflictDoUpdate({
+          target: [trackerDailyCheckpoints.trackerId, trackerDailyCheckpoints.checkpointDate],
+          set: {
+            uploadedBytesEnd: stats.uploadedBytes !== null ? BigInt(stats.uploadedBytes) : 0n,
+            downloadedBytesEnd: stats.downloadedBytes !== null ? BigInt(stats.downloadedBytes) : 0n,
+            bufferBytesEnd: stats.bufferBytes !== null ? BigInt(stats.bufferBytes) : null,
+            ratioEnd: stats.ratio,
+            seedbonusEnd: stats.seedbonus,
+            snapshotCount: sql`${trackerDailyCheckpoints.snapshotCount} + 1`,
+          },
+        })
+    } catch (checkpointErr) {
+      log.warn(
+        `Daily checkpoint upsert failed for tracker ${tracker.id}: ${checkpointErr instanceof Error ? checkpointErr.message : "Unknown"}`
+      )
+    }
+
+    try {
+      const mamMeta =
+        tracker.platformType === "mam"
+          ? (stats.platformMeta as MamPlatformMeta | undefined)
+          : undefined
+
+      const avistazMeta =
+        tracker.platformType === "avistaz"
+          ? (stats.platformMeta as AvistazPlatformMeta | undefined)
+          : undefined
+
+      const dcMeta =
+        tracker.platformType === "digitalcore"
+          ? (stats.platformMeta as DigitalCorePlatformMeta | undefined)
+          : undefined
+
+      await dispatchNotifications(
+        {
+          trackerId: tracker.id,
+          trackerName: tracker.name,
+          storeUsernames: privacyMode === false,
+          currentRatio: stats.ratio,
+          previousRatio: previousSnapshot?.ratio ?? null,
+          currentHnrs: stats.hitAndRuns,
+          previousHnrs: previousSnapshot?.hitAndRuns ?? null,
+          currentBufferBytes: stats.bufferBytes,
+          previousBufferBytes: previousSnapshot?.bufferBytes ?? null,
+          trackerDown: false,
+          trackerError: null,
+          currentWarned: stats.warned ?? null,
+          previousWarned: previousSnapshot?.warned ?? null,
+          currentSeedingCount: stats.seedingCount ?? null,
+          currentGroup: stats.group ?? null,
+          previousGroup: previousSnapshot?.group ?? null,
+          trackerIsActive: tracker.isActive,
+          trackerPausedAt: null,
+          trackerJoinedAt: tracker.joinedAt ?? null,
+          minimumRatio: findRegistryEntry(tracker.baseUrl)?.rules?.minimumRatio,
+          platformContext:
+            tracker.platformType === "mam"
+              ? {
+                  currentSeedbonus: stats.seedbonus ?? null,
+                  previousSeedbonus: previousSnapshot?.seedbonus ?? null,
+                  vipUntil: mamMeta?.vipUntil ?? null,
+                  unsatisfiedCount: mamMeta?.unsatisfiedCount ?? null,
+                  unsatisfiedLimit: mamMeta?.unsatisfiedLimit ?? null,
+                  inactiveHnrCount: stats.hitAndRuns ?? null,
+                  previousInactiveHnrCount: previousSnapshot?.hitAndRuns ?? null,
+                  canDownload: null,
+                  previousCanDownload: null,
+                }
+              : tracker.platformType === "avistaz"
+                ? {
+                    currentSeedbonus: stats.seedbonus ?? null,
+                    previousSeedbonus: previousSnapshot?.seedbonus ?? null,
+                    vipUntil: avistazMeta?.vipExpiry ?? null,
+                    unsatisfiedCount: null,
+                    unsatisfiedLimit: null,
+                    inactiveHnrCount: null,
+                    previousInactiveHnrCount: null,
+                    canDownload: avistazMeta?.canDownload ?? null,
+                    previousCanDownload:
+                      (previousPlatformMeta?.canDownload as boolean | null) ?? null,
+                  }
+                : tracker.platformType === "digitalcore"
+                  ? {
+                      currentSeedbonus: stats.seedbonus ?? null,
+                      previousSeedbonus: previousSnapshot?.seedbonus ?? null,
+                      vipUntil: null,
+                      unsatisfiedCount: null,
+                      unsatisfiedLimit: null,
+                      inactiveHnrCount: null,
+                      previousInactiveHnrCount: null,
+                      canDownload:
+                        dcMeta?.downloadBan === true
+                          ? false
+                          : dcMeta?.downloadBan === false
+                            ? true
+                            : null,
+                      previousCanDownload:
+                        previousPlatformMeta?.downloadBan === true
+                          ? false
+                          : previousPlatformMeta?.downloadBan === false
+                            ? true
+                            : null,
+                    }
+                  : undefined,
+        },
+        encryptionKey,
+        enabledTargets
+      )
+    } catch (err) {
+      log.error(
+        `Notification dispatch failed for ${tracker.name}: ${err instanceof Error ? err.message : "Unknown"}`
+      )
+    }
+
+    const wasPaused = !!tracker.pausedAt
+    const hadFailures = tracker.consecutiveFailures > 0
+
+    await db
+      .update(trackers)
+      .set({
+        lastPolledAt: timestamp,
+        lastError: null,
+        lastErrorAt: null,
+        consecutiveFailures: 0,
+        pausedAt: null,
+        updatedAt: timestamp,
+      })
+      .where(eq(trackers.id, tracker.id))
+
+    if (wasPaused || hadFailures) {
+      log.info(
+        {
+          trackerId: tracker.id,
+          trackerName: tracker.name,
+          previousFailures: tracker.consecutiveFailures,
+          wasPaused,
+          source: isManual ? "manual" : "scheduled",
+        },
+        "circuit breaker reset by successful poll"
+      )
+    }
+  } catch (error) {
+    const raw = error instanceof Error ? error.message : "Unknown error"
+    const message = sanitizeNetworkError(raw, "Poll failed")
+    log.error(
+      {
+        trackerId,
+        trackerName: tracker?.name,
+        source: isManual ? "manual" : "scheduled",
+        previousFailures: tracker?.consecutiveFailures ?? "unknown",
+      },
+      `Poll failed for tracker ${trackerId}: ${message}`
+    )
+
+    try {
+      const now = new Date()
+      const [updated] = await db
+        .update(trackers)
+        .set({
+          lastError: message,
+          lastErrorAt: now,
+          consecutiveFailures: sql`${trackers.consecutiveFailures} + 1`,
+          pausedAt: sql`CASE WHEN ${trackers.consecutiveFailures} + 1 >= ${POLL_FAILURE_THRESHOLD} THEN ${now.toISOString()}::timestamp ELSE ${trackers.pausedAt} END`,
+          updatedAt: now,
+        })
+        .where(eq(trackers.id, trackerId))
+        .returning({
+          consecutiveFailures: trackers.consecutiveFailures,
+          pausedAt: trackers.pausedAt,
+        })
+
+      if (updated?.pausedAt) {
+        log.warn(
+          {
+            trackerId,
+            trackerName: tracker?.name,
+            consecutiveFailures: updated.consecutiveFailures,
+            threshold: POLL_FAILURE_THRESHOLD,
+            lastError: message,
+          },
+          `Tracker ${trackerId} auto-paused after ${updated.consecutiveFailures} consecutive failures`
+        )
+      } else if (updated) {
+        log.info(
+          {
+            trackerId,
+            consecutiveFailures: updated.consecutiveFailures,
+            threshold: POLL_FAILURE_THRESHOLD,
+          },
+          `Poll failure ${updated.consecutiveFailures}/${POLL_FAILURE_THRESHOLD} for tracker ${trackerId}`
+        )
+      }
+    } catch (dbError) {
+      log.error(dbError, `Failed to record poll failure for tracker ${trackerId}`)
+    }
+
+    try {
+      await dispatchNotifications(
+        {
+          trackerId: tracker?.id ?? trackerId,
+          trackerName: tracker?.name ?? String(trackerId),
+          storeUsernames: false,
+          currentRatio: null,
+          previousRatio: null,
+          currentHnrs: null,
+          previousHnrs: null,
+          currentBufferBytes: null,
+          previousBufferBytes: null,
+          trackerDown: true,
+          trackerError: message,
+          currentWarned: null,
+          previousWarned: null,
+          currentSeedingCount: null,
+          currentGroup: null,
+          previousGroup: null,
+          trackerIsActive: tracker?.isActive ?? true,
+          trackerPausedAt: tracker?.pausedAt?.toISOString() ?? null,
+          trackerJoinedAt: tracker?.joinedAt ?? null,
+          minimumRatio: undefined,
+          platformContext: undefined,
+        },
+        encryptionKey,
+        enabledTargets
+      )
+    } catch (err) {
+      log.warn(
+        {
+          trackerId: tracker?.id ?? trackerId,
+          error: errMsg(err),
+        },
+        "Error-path notification dispatch failed"
+      )
+    }
+  }
+}
+
+export async function pruneOldSnapshots(retentionDays: number): Promise<number> {
+  const cutoff = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000)
+  const deleted = await db
+    .delete(trackerSnapshots)
+    .where(
+      and(
+        lt(trackerSnapshots.polledAt, cutoff),
+        notInArray(
+          trackerSnapshots.trackerId,
+          db.select({ id: trackers.id }).from(trackers).where(isNotNull(trackers.userPausedAt))
+        )
+      )
+    )
+    .returning({ id: trackerSnapshots.id })
+  return deleted.length
+}
+
+export async function pruneOldCheckpoints(retentionDays: number): Promise<number> {
+  const cutoffDate = localDateStr(Date.now() - retentionDays * 24 * 60 * 60 * 1000)
+
+  const [deletedTracker, deletedTorrent] = await Promise.all([
+    db
+      .delete(trackerDailyCheckpoints)
+      .where(lt(trackerDailyCheckpoints.checkpointDate, cutoffDate))
+      .returning({ id: trackerDailyCheckpoints.id }),
+    db
+      .delete(torrentDailyCheckpoints)
+      .where(lt(torrentDailyCheckpoints.checkpointDate, cutoffDate))
+      .returning({ id: torrentDailyCheckpoints.id }),
+  ])
+
+  return deletedTracker.length + deletedTorrent.length
+}
+
+export async function pollAllTrackers(encryptionKey: Buffer): Promise<void> {
+  // Query settings first; global interval is needed for overdue filtering
+  const [settings] = await db
+    .select({
+      storeUsernames: appSettings.storeUsernames,
+      snapshotRetentionDays: appSettings.snapshotRetentionDays,
+      trackerPollIntervalMinutes: appSettings.trackerPollIntervalMinutes,
+      proxyEnabled: appSettings.proxyEnabled,
+      proxyType: appSettings.proxyType,
+      proxyHost: appSettings.proxyHost,
+      proxyPort: appSettings.proxyPort,
+      proxyUsername: appSettings.proxyUsername,
+      encryptedProxyPassword: appSettings.encryptedProxyPassword,
+    })
+    .from(appSettings)
+    .limit(1)
+
+  const globalIntervalMs =
+    (settings?.trackerPollIntervalMinutes ?? POLL_INTERVAL_DEFAULT) * 60 * 1000
+
+  const allTrackers = await db
+    .select(POLL_TRACKER_COLUMNS)
+    .from(trackers)
+    .where(eq(trackers.isActive, true))
+
+  const now = Date.now()
+
+  const overdue = allTrackers.filter((tracker) => {
+    const pause = getPauseState(tracker)
+    if (pause.isPaused) {
+      log.debug(
+        {
+          tracker: tracker.name,
+          reason: pause.reason,
+          consecutiveFailures: tracker.consecutiveFailures,
+          pausedAt: tracker.pausedAt?.toISOString() ?? null,
+          userPausedAt: tracker.userPausedAt?.toISOString() ?? null,
+        },
+        "skipping paused tracker"
+      )
+      return false
+    }
+    const lastPoll = tracker.lastPolledAt?.getTime() ?? 0
+    return now - lastPoll >= globalIntervalMs - BATCH_TOLERANCE_MS
+  })
+
+  if (overdue.length === 0) return
+
+  const privacyMode = settings ? !settings.storeUsernames : false
+
+  // Build proxy agent once for all trackers that need it
+  const proxyAgent = settings ? buildProxyAgentFromSettings(settings, encryptionKey) : undefined
+
+  // Fetch notification targets once for the entire poll cycle (avoids N identical queries)
+  let enabledNotificationTargets: NotificationTargetRow[] = []
+  try {
+    enabledNotificationTargets = await db
+      .select()
+      .from(notificationTargets)
+      .where(eq(notificationTargets.enabled, true))
+  } catch (err) {
+    log.error(
+      `pollAllTrackers: failed to fetch notification targets: ${err instanceof Error ? err.message : "Unknown"}`
+    )
+  }
+
+  // Capture a single timestamp for the whole batch so all snapshots in one
+  // cycle share the same polledAt value, simplifying time-series queries
+  const batchTimestamp = new Date()
+
+  // Poll all overdue trackers in parallel so one slow tracker won't block the rest
+  await Promise.allSettled(
+    overdue.map((tracker) =>
+      pollTracker(
+        tracker.id,
+        encryptionKey,
+        privacyMode,
+        proxyAgent,
+        batchTimestamp,
+        enabledNotificationTargets
+      )
+    )
+  )
+
+  // Prune old snapshots if retention is configured in app settings
+  if (settings?.snapshotRetentionDays && settings.snapshotRetentionDays > 0) {
+    try {
+      const pruned = await pruneOldSnapshots(settings.snapshotRetentionDays)
+      if (pruned > 0) {
+        log.info(`Pruned ${pruned} snapshots older than ${settings.snapshotRetentionDays} days`)
+      }
+    } catch (error) {
+      log.error(error, "Snapshot pruning failed")
+    }
+
+    try {
+      const prunedCheckpoints = await pruneOldCheckpoints(settings.snapshotRetentionDays)
+      if (prunedCheckpoints > 0) {
+        log.info(
+          `Pruned ${prunedCheckpoints} checkpoint rows older than ${settings.snapshotRetentionDays} days`
+        )
+      }
+    } catch (error) {
+      log.error(error, "Checkpoint pruning failed")
+    }
+  }
+
+  // Record daily database size for storage chart
+  try {
+    await recordDatabaseSize()
+  } catch (error) {
+    log.error(error, "Database size recording failed")
+  }
+
+  // Prune expired dismissed alerts (stale-data and zero-seeding types expire after 24h)
+  try {
+    await pruneDismissedAlerts()
+  } catch (error) {
+    log.error(error, "Dismissed alerts pruning failed")
+  }
+}
+
+export function startTrackerPolling(encryptionKey: Buffer): void {
+  if (getSchedulerTask()) return
+
+  setSchedulerKey(encryptionKey)
+
+  // Poll immediately on start, don't wait for first 5-minute tick
+  pollAllTrackers(encryptionKey).catch((error) => {
+    log.error(error, "Initial poll error")
+  })
+
+  // Then check every 5 minutes for overdue trackers
+  const task = cron.schedule("*/5 * * * *", async () => {
+    if (getPollInFlight()) return
+    setPollInFlight(true)
+    try {
+      await pollAllTrackers(encryptionKey)
+    } catch (error) {
+      log.error(error, "Scheduler error")
+    } finally {
+      setPollInFlight(false)
+    }
+  })
+  setSchedulerTask(task)
+
+  log.info("Tracker polling started (checking every 5 minutes)")
+}
+
+export function stopTrackerPolling(): void {
+  const task = getSchedulerTask()
+  if (task) {
+    task.stop()
+    setSchedulerTask(null)
+  }
+  // Zero-fill the encryption key buffer to prevent it from lingering in memory
+  const key = getSchedulerKey()
+  if (key) {
+    key.fill(0)
+    setSchedulerKey(null)
+  }
+}
+
+export function isTrackerPollingRunning(): boolean {
+  return getSchedulerTask() !== null
+}
+
+/** Exposed for testing. Returns the raw schedulerKey buffer reference. */
+export function _getSchedulerKeyForTest(): Buffer | null {
+  return getSchedulerKey()
+}
diff --git a/src/lib/tracker-serializer.ts b/src/lib/tracker-serializer.ts
index 3664403f..3636a4f5 100644
--- a/src/lib/tracker-serializer.ts
+++ b/src/lib/tracker-serializer.ts
@@ -1,18 +1,18 @@
 // src/lib/tracker-serializer.ts
-//
-// Functions: parsePlatformMeta, serializeTrackerResponse
-
 import "server-only"
 
-import type { trackerSnapshots, trackers } from "@/lib/db/schema"
+import type { PlatformType } from "@/lib/adapters/constants"
+import type { PlatformMeta } from "@/lib/adapters/types"
+import { DEFAULT_TRACKER_COLOR } from "@/lib/constants"
+import type { TrackerRow as FullTrackerRow, TrackerSnapshotRow } from "@/lib/db/schema"
+import type { TrackerSummary } from "@/types/api"
 
 type TrackerRow = Omit<
-  typeof trackers.$inferSelect,
-  "encryptedApiToken" | "avatarData" | "avatarCachedAt" | "avatarRemoteUrl"
+  FullTrackerRow,
+  "encryptedApiToken" | "avatarData" | "avatarMimeType" | "avatarCachedAt" | "avatarRemoteUrl"
 >
-type SnapshotRow = typeof trackerSnapshots.$inferSelect
 
-export function parsePlatformMeta(raw: string | null): unknown {
+export function parsePlatformMeta(raw: string | null): PlatformMeta | null {
   if (!raw) return null
   try {
     return JSON.parse(raw)
@@ -23,21 +23,22 @@ export function parsePlatformMeta(raw: string | null): unknown {
 
 export function serializeTrackerResponse(
   tracker: TrackerRow,
-  latest: SnapshotRow | null,
+  latest: TrackerSnapshotRow | null,
   mask: (val: string | null | undefined) => string | null
-) {
+): TrackerSummary {
   return {
     id: tracker.id,
     name: tracker.name,
     baseUrl: tracker.baseUrl,
-    platformType: tracker.platformType,
+    platformType: tracker.platformType as PlatformType,
     isActive: tracker.isActive,
     lastPolledAt: tracker.lastPolledAt?.toISOString() ?? null,
     lastError: tracker.lastError,
+    lastErrorAt: tracker.lastErrorAt?.toISOString() ?? null,
     consecutiveFailures: tracker.consecutiveFailures,
     pausedAt: tracker.pausedAt?.toISOString() ?? null,
     userPausedAt: tracker.userPausedAt?.toISOString() ?? null,
-    color: tracker.color ?? "#00d4ff",
+    color: tracker.color ?? DEFAULT_TRACKER_COLOR,
     qbtTag: tracker.qbtTag,
     mouseholeUrl: tracker.mouseholeUrl ?? null,
     useProxy: tracker.useProxy,
@@ -53,8 +54,8 @@ export function serializeTrackerResponse(
     latestStats: latest
       ? {
           ratio: latest.ratio,
-          uploadedBytes: latest.uploadedBytes?.toString(),
-          downloadedBytes: latest.downloadedBytes?.toString(),
+          uploadedBytes: latest.uploadedBytes.toString(),
+          downloadedBytes: latest.downloadedBytes.toString(),
           seedingCount: latest.seedingCount,
           leechingCount: latest.leechingCount,
           requiredRatio: latest.requiredRatio ?? null,
diff --git a/src/lib/tracker-status.ts b/src/lib/tracker-status.ts
index c208d4bb..b68e7d82 100644
--- a/src/lib/tracker-status.ts
+++ b/src/lib/tracker-status.ts
@@ -7,7 +7,6 @@
 
 import type { BadgeVariant } from "@/components/ui/Badge"
 import type { PulseDotStatus } from "@/components/ui/PulseDot"
-import { checkWarned } from "@/lib/tracker-events"
 import type { TrackerSummary } from "@/types/api"
 
 type TrackerHealth =
@@ -94,7 +93,7 @@ function getTrackerHealth(tracker: TrackerSummary): TrackerHealth {
   if (ratio === null) return "offline"
 
   // Warned by tracker is always critical — potential ban risk
-  if (checkWarned(tracker.latestStats?.warned)) return "critical"
+  if (tracker.latestStats?.warned === true) return "critical"
 
   let status: TrackerHealth
   if (ratio >= 2) status = "healthy"
diff --git a/src/lib/proxy.ts b/src/lib/tunnel.ts
similarity index 99%
rename from src/lib/proxy.ts
rename to src/lib/tunnel.ts
index 6c79cbd9..bae11090 100644
--- a/src/lib/proxy.ts
+++ b/src/lib/tunnel.ts
@@ -1,4 +1,4 @@
-// src/lib/proxy.ts
+// src/lib/tunnel.ts
 //
 // Functions: buildProxyUrl, createProxyAgent, proxyFetch, buildProxyAgentFromSettings
 // Exports: VALID_PROXY_TYPES, PROXY_HOST_PATTERN, ProxyType, ProxyConfig, ProxyFetchResult, ProxySettings
diff --git a/src/lib/uptime.ts b/src/lib/uptime.ts
index 77b1cbf0..8099dd61 100644
--- a/src/lib/uptime.ts
+++ b/src/lib/uptime.ts
@@ -4,8 +4,9 @@
 // Buckets are 5 minutes wide. The accumulator lives on globalThis
 // to survive HMR reloads in development.
 //
-// Functions: floorToFiveMin, recordHeartbeat, flushCompletedBuckets, removeClientFromAccumulator, clearUptimeAccumulator
+// Functions: floorToFiveMin, recordHeartbeat, flushCompletedBuckets, removeDownloadClientFromAccumulator, clearUptimeAccumulator
 
+import { sql } from "drizzle-orm"
 import { db } from "@/lib/db"
 import { clientUptimeBuckets } from "@/lib/db/schema"
 
@@ -87,21 +88,32 @@ export async function flushCompletedBuckets(): Promise<number> {
   const queue = getFlushQueue()
   if (queue.length === 0) return 0
 
-  const entries = queue.splice(0, queue.length)
-
-  const rows = entries.map((entry) => ({
+  const count = queue.length
+  const rows = queue.map((entry) => ({
     clientId: entry.clientId,
     bucketTs: new Date(entry.ts),
     ok: entry.ok,
     fail: entry.fail,
   }))
-  await db.insert(clientUptimeBuckets).values(rows).onConflictDoNothing()
-
-  return entries.length
+  await db
+    .insert(clientUptimeBuckets)
+    .values(rows)
+    .onConflictDoUpdate({
+      target: [clientUptimeBuckets.clientId, clientUptimeBuckets.bucketTs],
+      set: {
+        ok: sql`${clientUptimeBuckets.ok} + excluded.ok`,
+        fail: sql`${clientUptimeBuckets.fail} + excluded.fail`,
+      },
+    })
+
+  // Only remove from queue after successful write
+  queue.splice(0, count)
+
+  return count
 }
 
-/** Remove a single client from the accumulator and flush queue. Called when a client is deleted. */
-export function removeClientFromAccumulator(clientId: number): void {
+/** Remove a single download client from the accumulator and flush queue. Called when a client is deleted. */
+export function removeDownloadClientFromAccumulator(clientId: number): void {
   getAccumulator().delete(clientId)
   const queue = getFlushQueue()
   const filtered = queue.filter((e) => e.clientId !== clientId)
diff --git a/src/lib/url.ts b/src/lib/url.ts
deleted file mode 100644
index 43f6e330..00000000
--- a/src/lib/url.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// src/lib/url.ts
-
-function normalizeUrl(url: string): string {
-  return url.replace(/\/+$/, "").toLowerCase()
-}
-
-export { normalizeUrl }
diff --git a/src/lib/validators.ts b/src/lib/validators.ts
new file mode 100644
index 00000000..d814fc9a
--- /dev/null
+++ b/src/lib/validators.ts
@@ -0,0 +1,60 @@
+// src/lib/validators.ts
+//
+// Pure validation predicates and regex constants.
+// No framework dependencies — usable anywhere.
+//
+// Functions: isValidHex, isValidPort, isIntegerInRange, parseIntClamped, validateImageUrl, safeImageUrl
+// Constants: ISO_8601_RE, HEX_64_RE, DATE_RE
+
+import { PORT_MAX, PORT_MIN } from "@/lib/limits"
+
+const STRICT_HEX_RE = /^#[0-9a-fA-F]{6}$/
+const PERMISSIVE_HEX_RE = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/
+
+export const ISO_8601_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z$/
+export const HEX_64_RE = /^[0-9a-fA-F]{64}$/
+export const DATE_RE = /^\d{4}-\d{2}-\d{2}$/
+
+export function isValidHex(value: string, permissive = false): boolean {
+  return permissive ? PERMISSIVE_HEX_RE.test(value) : STRICT_HEX_RE.test(value)
+}
+
+export function isValidPort(port: number): boolean {
+  return Number.isInteger(port) && port >= PORT_MIN && port <= PORT_MAX
+}
+
+export function isIntegerInRange(value: number, min: number, max: number): boolean {
+  return Number.isInteger(value) && value >= min && value <= max
+}
+
+/** Parse a string to int, clamp to [min, max], fall back to defaultValue for null/NaN. */
+export function parseIntClamped(
+  raw: string | null,
+  min: number,
+  max: number,
+  defaultValue: number
+): number {
+  const parsed = parseInt(raw ?? String(defaultValue), 10)
+  return Math.min(Math.max(min, Number.isNaN(parsed) ? defaultValue : parsed), max)
+}
+
+export function validateImageUrl(url: string): string {
+  try {
+    const parsed = new URL(url)
+    if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+      throw new Error("Invalid URL protocol")
+    }
+    return url
+  } catch {
+    throw new Error("Invalid URL in image host response")
+  }
+}
+
+export function safeImageUrl(url: string | undefined): string | undefined {
+  if (!url) return undefined
+  try {
+    return validateImageUrl(url)
+  } catch {
+    return undefined
+  }
+}
diff --git a/src/test/smoke.test.ts b/src/test/smoke.test.ts
deleted file mode 100644
index 6707c7b4..00000000
--- a/src/test/smoke.test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// src/test/smoke.test.ts
-import { describe, expect, it } from "vitest"
-
-describe("vitest setup", () => {
-  it("runs tests successfully", () => {
-    expect(1 + 1).toBe(2)
-  })
-})
diff --git a/src/types/api.ts b/src/types/api.ts
index fb781adf..0ec40185 100644
--- a/src/types/api.ts
+++ b/src/types/api.ts
@@ -1,30 +1,30 @@
 // src/types/api.ts
 
-import type {
-  GazellePlatformMeta,
-  GGnPlatformMeta,
-  MamPlatformMeta,
-  NebulancePlatformMeta,
-} from "@/lib/adapters/types"
-
 export type {
+  AvistazPlatformMeta,
+  DigitalCorePlatformMeta,
   GazellePlatformMeta,
   GazelleRanks,
   GGnPlatformMeta,
   MamPlatformMeta,
   NebulancePlatformMeta,
+  PlatformMeta,
 } from "@/lib/adapters/types"
 
-export interface TrackerLatestStats {
+import type { PlatformType } from "@/lib/adapters/constants"
+import type { PlatformMeta } from "@/lib/adapters/types"
+import type { DownloadClientRow, NotificationTargetRow } from "@/lib/db/schema"
+import type { SystemEvent } from "@/lib/events"
+import type { NotificationThresholds } from "@/lib/notifications/types"
+
+/** Fields shared between TrackerLatestStats and Snapshot */
+interface TrackerStatFields {
   ratio: number | null
-  uploadedBytes: string | null
-  downloadedBytes: string | null
   seedingCount: number | null
   leechingCount: number | null
   requiredRatio: number | null
   warned: boolean | null
   freeleechTokens: number | null
-  bufferBytes: string | null
   hitAndRuns: number | null
   seedbonus: number | null
   shareScore: number | null
@@ -32,14 +32,21 @@ export interface TrackerLatestStats {
   group: string | null
 }
 
+export interface TrackerLatestStats extends TrackerStatFields {
+  uploadedBytes: string | null
+  downloadedBytes: string | null
+  bufferBytes: string | null
+}
+
 export interface TrackerSummary {
   id: number
   name: string
   baseUrl: string
-  platformType: string
+  platformType: PlatformType
   isActive: boolean
   lastPolledAt: string | null
   lastError: string | null
+  lastErrorAt: string | null
   consecutiveFailures: number
   pausedAt: string | null
   userPausedAt: string | null
@@ -54,32 +61,17 @@ export interface TrackerSummary {
   joinedAt: string | null
   lastAccessAt: string | null
   remoteUserId: number | null
-  platformMeta:
-    | GGnPlatformMeta
-    | GazellePlatformMeta
-    | NebulancePlatformMeta
-    | MamPlatformMeta
-    | null
+  platformMeta: PlatformMeta | null
   createdAt: string
   latestStats: TrackerLatestStats | null
 }
 
-export interface Snapshot {
+export interface Snapshot extends TrackerStatFields {
   polledAt: string
   uploadedBytes: string
   downloadedBytes: string
-  ratio: number | null
   bufferBytes: string
-  seedbonus: number | null
-  seedingCount: number | null
-  leechingCount: number | null
-  hitAndRuns: number | null
-  requiredRatio: number | null
-  warned: boolean | null
-  freeleechTokens: number | null
-  shareScore: number | null
-  username: string | null
-  group: string | null
+  isManual: boolean
 }
 
 export interface TagGroupMember {
@@ -171,8 +163,54 @@ export interface TodayAtAGlance {
   clientLastUpdated: string | null
 }
 
+/** Response from GET /api/auth/status */
+/** Response from GET /api/settings/events */
+export interface EventsPageResponse {
+  events: SystemEvent[]
+  total: number
+  hasMore: boolean
+  logSizeBytes?: number
+}
+
+/** Upload/download delta pair returned by computeDelta() */
+export type DeltaDisplay = { uploaded: string; downloaded: string } | null
+
+/** Time range selection for snapshot queries */
+export type DayRange = 0 | 1 | 7 | 30 | 90 | 365
+
 export const DASHBOARD_SETTINGS_DEFAULTS: DashboardSettings = {
   showHealthIndicators: true,
   showLoginTimers: true,
   showTodayAtAGlance: true,
 }
+
+/** API response shape for download clients (credentials stripped, dates serialized) */
+export type SafeDownloadClient = Omit<
+  DownloadClientRow,
+  | "encryptedUsername"
+  | "encryptedPassword"
+  | "cachedTorrents"
+  | "cachedTorrentsAt"
+  | "lastPolledAt"
+  | "errorSince"
+  | "createdAt"
+  | "updatedAt"
+> & {
+  hasCredentials: boolean
+  lastPolledAt: string | null
+  errorSince: string | null
+  createdAt: string
+  updatedAt: string
+}
+
+/** API response shape for notification targets (encrypted config stripped, dates serialized) */
+export type SafeNotificationTarget = Omit<
+  NotificationTargetRow,
+  "encryptedConfig" | "lastDeliveryAt" | "createdAt" | "updatedAt" | "thresholds"
+> & {
+  hasConfig: boolean
+  thresholds: NotificationThresholds | null
+  lastDeliveryAt: string | null
+  createdAt: string
+  updatedAt: string
+}
diff --git a/src/types/charts.ts b/src/types/charts.ts
index 5e4e5000..f1ec109f 100644
--- a/src/types/charts.ts
+++ b/src/types/charts.ts
@@ -2,11 +2,23 @@
 
 import type { Snapshot } from "@/types/api"
 
-/** A tracker's color-coded snapshot series — shared by all multi-tracker chart components */
 interface TrackerSnapshotSeries {
   name: string
   color: string
   snapshots: Snapshot[]
 }
 
-export type { TrackerSnapshotSeries }
+interface FleetChartProps {
+  trackerData: TrackerSnapshotSeries[]
+  height?: number
+}
+
+type VolumeField = "upload" | "download"
+
+interface StackedAreaSeries {
+  name: string
+  color: string
+  monthMap: Map<string, number>
+}
+
+export type { FleetChartProps, StackedAreaSeries, TrackerSnapshotSeries, VolumeField }
diff --git a/src/lib/slot-types.ts b/src/types/slots.ts
similarity index 65%
rename from src/lib/slot-types.ts
rename to src/types/slots.ts
index 5bb0db56..97f6d000 100644
--- a/src/lib/slot-types.ts
+++ b/src/types/slots.ts
@@ -1,14 +1,9 @@
-// src/lib/slot-types.ts
+// src/types/slots.ts
 //
 // Functions: (types only)
 
 import type { TrackerRegistryEntry } from "@/data/tracker-registry"
-import type {
-  GazellePlatformMeta,
-  GGnPlatformMeta,
-  MamPlatformMeta,
-  NebulancePlatformMeta,
-} from "@/lib/adapters/types"
+import type { PlatformMeta } from "@/lib/adapters/types"
 import type { Snapshot, TrackerSummary } from "@/types/api"
 
 export type SlotCategory = "badge" | "stat-card" | "progress"
@@ -16,8 +11,7 @@ export type SlotCategory = "badge" | "stat-card" | "progress"
 export interface SlotContext {
   tracker: TrackerSummary
   latestSnapshot: Snapshot | null
-  snapshots: Snapshot[]
-  meta: GGnPlatformMeta | GazellePlatformMeta | NebulancePlatformMeta | MamPlatformMeta | null
+  meta: PlatformMeta | null
   registry: TrackerRegistryEntry | undefined
   accentColor: string
 }
diff --git a/tsconfig.json b/tsconfig.json
index eaea8a11..4b29e987 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,8 @@
     ],
     "paths": {
       "@/*": ["./src/*"],
-      "@typography": ["./src/components/ui/Typography"]
+      "@typography": ["./src/components/ui/Typography"],
+      "@icons": ["./src/components/ui/Icons.tsx"]
     }
   },
   "include": [
diff --git a/vitest.config.ts b/vitest.config.ts
index 47ec62d9..9e370aac 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -12,6 +12,7 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": resolve(__dirname, "./src"),
+      "@icons": resolve(__dirname, "./src/components/ui/Icons"),
       "@typography": resolve(__dirname, "./src/components/ui/Typography"),
       "server-only": resolve(__dirname, "./src/test/server-only-mock.ts"),
     },