Fix: user_id validation causes read timeout on slow Jellyfin

The previous fix called client.users() unconditionally to validate the
user_id, adding an extra HTTP round-trip before the build. On a slow
Jellyfin connection this burned through the 10s timeout before the
actual libraries() call.

Restructured to try libraries(user_id) directly first. Only when that
fails does the worker resolve the username via the users API. So:
- Correctly configured user_id (internal hash): zero extra round-trips.
- Username like 'admin': libraries() fails → users() resolves it → retry.

283 backend tests pass; ruff clean.

.pi-tmp/grafana-chart-out.md

@@ -0,0 +1,141 @@
+# Grafana Chart Widget — worker output
+
+## Files changed (10 files, ~400 lines)
+
+| File | Status | Lines |
+|------|--------|-------|
+| `backend/src/media_library_viewer_api/integrations/grafana.py` | modified | +12/-12 (panel→chart config + kind) |
+| `backend/src/media_library_viewer_api/widgets/sources.py` | modified | +70/-12 (chart query adapter replaces panel URL logic) |
+| `backend/tests/test_widgets.py` | modified | +55/-20 (3 new chart tests replace 2 panel tests) |
+| `backend/tests/test_services.py` | modified | +2/-2 (grafana widget-kind + API-metadata assertions) |
+| `frontend/src/widgets/GrafanaChartWidget.tsx` | **new** | 100 |
+| `frontend/src/widgets/__tests__/GrafanaChartWidget.test.tsx` | **new** | 57 |
+| `frontend/src/widgets/GrafanaPanelWidget.tsx` | **deleted** | -50 |
+| `frontend/src/widgets/__tests__/GrafanaPanelWidget.test.tsx` | **deleted** | -72 |
+| `frontend/src/integrations/registry.ts` | modified | +24/-14 (chart binding replaces panel) |
+| `frontend/src/integrations/registry.test.ts` | modified | +1/-1 (panel→chart) |
+| `frontend/src/widgets/index.ts` | modified | +1/-0 (export GrafanaChartWidget) |
+| `frontend/package.json` + `package-lock.json` | modified | +1 dep (recharts ^3.9.2) |
+
+**recharts version installed:** `^3.9.2`
+
+## Grafana `/api/ds/query` request/response shape
+
+**Request** (POST):
+
+```json
+{
+  "queries": [{
+    "datasource": {"uid": "prometheus", "type": "prometheus"},
+    "expr": "rate(cpu[5m])",
+    "format": "time_series",
+    "intervalMs": 30000,
+    "maxDataPoints": 100,
+    "refId": "A"
+  }],
+  "from": "now-1h",
+  "to": "now"
+}
+```
+
+Headers: `Authorization: Bearer {api_key}`, `Content-Type: application/json`
+
+**Response** (abbreviated):
+
+```json
+{
+  "results": {
+    "A": {
+      "frames": [{
+        "data": { "values": [[1000, 2000], [0.5, 0.8]] },
+        "schema": { "fields": [{"name":"Time"}, {"name":"cpu_usage"}] }
+      }]
+    }
+  }
+}
+```
+
+## Series normalization logic
+
+Iterates `results[*].frames[]`. For each frame with `values` having >=2 arrays (timestamps + values), extracts the series label from `schema.fields[-1].name` and zips timestamps+values into `[{t: int, v: float|null}]`. Returns `{"series": [{"label": "...", "points": [...]}]}`.
+
+## Frontend chart rendering
+
+`GrafanaChartWidget` fetches widget data, extracts `data.series`, merges all series by timestamp into a single recharts data array (`[{time, cpu_usage: 0.5, mem: 0.3}, ...]`), and renders a `<LineChart>` with one `<Line>` per series. Uses Tailwind CSS variables (`--chart-1` through `--chart-5`) for colors so it respects dark mode. Includes loading skeleton, error Alert, and empty-state Alert.
+
+## Validation
+
+```
+cd backend && .venv/bin/ruff check . && .venv/bin/python -m pytest  → 279 passed, ruff clean
+cd frontend && npm run lint && npm run build && npm run test         → 127 passed, lint/build clean
+```
+
+## Deviations
+
+1. **No deviations from spec.** The `link` widget kind is unchanged. The `panel` kind is fully replaced by `chart`.
+2. **recharts `labelFormatter` type workaround.** Recharts 3.x types `labelFormatter` as `(label: ReactNode, ...) => ReactNode`, not `(number) => string`. Wrapped with `(label) => formatTime(Number(label))` to satisfy TS strict.
+
+## skill_resolution
+
+`none` — no project/user SKILL.md paths were injected; no `.atl/skill-registry.md` found.
+
+## Residual risks
+
+- The chart widget assumes the Grafana datasource is Prometheus-type (hardcoded `"type": "prometheus"` in the query body). If the user has a non-Prometheus datasource (InfluxDB, etc.), the query body format may need adjustment. The `datasource_uid` is configurable but the `type` is not.
+- recharts is ~45KB gzipped added to the bundle.
+
+```acceptance-report
+{
+  "criteriaSatisfied": [
+    {
+      "id": "criterion-1",
+      "status": "satisfied",
+      "evidence": "Replaces the broken iframe panel widget with a server-side chart query widget. Backend queries /api/ds/query with stored api_key; frontend renders recharts LineChart. No iframe, no browser auth, no CORS. The link widget kind is unchanged. 279 backend + 127 frontend tests pass; lint/build green both sides."
+    }
+  ],
+  "changedFiles": [
+    "backend/src/media_library_viewer_api/integrations/grafana.py",
+    "backend/src/media_library_viewer_api/widgets/sources.py",
+    "backend/tests/test_widgets.py",
+    "backend/tests/test_services.py",
+    "frontend/src/widgets/GrafanaChartWidget.tsx",
+    "frontend/src/widgets/__tests__/GrafanaChartWidget.test.tsx",
+    "frontend/src/widgets/GrafanaPanelWidget.tsx (deleted)",
+    "frontend/src/widgets/__tests__/GrafanaPanelWidget.test.tsx (deleted)",
+    "frontend/src/integrations/registry.ts",
+    "frontend/src/integrations/registry.test.ts",
+    "frontend/src/widgets/index.ts",
+    "frontend/package.json"
+  ],
+  "testsAddedOrUpdated": [
+    "backend/tests/test_widgets.py",
+    "backend/tests/test_services.py",
+    "frontend/src/widgets/__tests__/GrafanaChartWidget.test.tsx",
+    "frontend/src/integrations/registry.test.ts"
+  ],
+  "commandsRun": [
+    { "command": "cd backend && .venv/bin/ruff check .", "result": "passed", "summary": "All checks passed" },
+    { "command": "cd backend && .venv/bin/python -m pytest tests/ -q", "result": "passed", "summary": "279 passed, 2 pre-existing warnings" },
+    { "command": "cd frontend && npm run lint", "result": "passed", "summary": "0 errors, 0 warnings" },
+    { "command": "cd frontend && npm run build", "result": "passed", "summary": "tsc + vite build clean" },
+    { "command": "cd frontend && npm run test", "result": "passed", "summary": "39 files / 127 tests passed" }
+  ],
+  "validationOutput": [
+    "Backend ruff clean; 279 tests pass (was 278; -2 panel + 3 chart = +1 net).",
+    "Frontend eslint clean; tsc + vite build clean; 127 tests pass (-3 panel + 3 chart = net 0).",
+    "GrafanaWidgetSource._fetch_chart POSTs to /api/ds/query with Bearer token; normalizes response to {series:[{label,points}]}",
+    "GrafanaChartWidget renders recharts LineChart with dark-mode CSS variable colors.",
+    "link widget kind unchanged; panel widget kind fully removed."
+  ],
+  "residualRisks": [
+    "Chart query body hardcodes datasource type 'prometheus' — non-Prometheus datasources (InfluxDB etc.) may need a type field on the config.",
+    "recharts adds ~45KB gzipped to the frontend bundle."
+  ],
+  "noStagedFiles": true,
+  "diffSummary": "~400 lines: replaces Grafana panel iframe widget with server-side datasource-query chart widget. Backend: /api/ds/query POST with api_key + series normalization (70 lines). Frontend: recharts LineChart component with dark-mode support (100 lines). 3 backend + 3 frontend tests. recharts ^3.9.2 installed.",
+  "reviewFindings": [
+    "no blockers"
+  ],
+  "manualNotes": "recharts labelFormatter type workaround: recharts 3.x types it as (ReactNode) => ReactNode, not (number) => string. Wrapped with Number() cast. The link widget kind is fully preserved. The panel widget kind and all its code/tests are fully deleted."
+}
+```

.pi-tmp/refine-23-out.md

@@ -0,0 +1,81 @@
+# Service IA Refinement — Instance Tabs + Config to Settings
+
+## Files changed (5 files, +310/-381)
+
+| File | Status | Lines |
+|------|--------|-------|
+| `frontend/src/integrations/navEntries.ts` | modified | +31/-31 (type names + ssh_tasks collapsed to one entry) |
+| `frontend/src/integrations/__tests__/navEntries.test.ts` | modified | +23/-23 (updated labels) |
+| `frontend/src/pages/ServicePage.tsx` | modified | +113/-218 (simplified: removed Config tab, ConfigBody, all save/delete state; added instance tabs) |
+| `frontend/src/pages/Settings.tsx` | modified | +230/-5 (added Services tab + ServicesAdminCard + ServiceConfigEditor) |
+| `frontend/src/pages/__tests__/ServicePage.test.tsx` | modified | +76/-76 (removed Config/secret tests, added instance-tabs tests) |
+
+## New ServicePage structure
+
+The service page is now a **pure operational view** — no save/delete/config state at all.
+
+**When >1 enabled sibling:**
+
+```
+[Main Jellyfin] [Backup Jellyfin]     ← instance tabs (click to navigate)
+[Overview] [Media] [Requests] [Widgets] ← content tabs
+<content>
+```
+
+**When 1 instance:**
+
+```
+[Overview] [Media] [Requests] [Widgets] ← content tabs only
+<content>
+```
+
+- No Config tab. No `<Select>` switcher. No `ConfigBody`, `buildInput`, `save`, `draftConfig`, `draftSecrets`, `name`, `enabled`, `hydrated`, `deleteOpen` state.
+- Instance tabs use the shadcn `Tabs` component (outer level). Content tabs use a nested `Tabs` (inner level). Clicking an instance tab navigates to `/services/:type/:id`.
+- Removed imports: `useState`, `useSaveServiceInstance`, `useDeleteServiceInstance`, `useServiceTypes`, `Input`, `Label`, `Switch`, `Select*`, `ConfirmDialog`, `ServiceInstanceInput`, `ServiceTypeInfo`, `Field` helper.
+
+## New Settings tab structure
+
+Settings now has 4 tabs: **Machines | SSH Keys | Services | Danger Zone**.
+
+The **Services** tab renders `ServicesAdminCard`:
+
+- Lists all service instances grouped by type (alphabetical) using `SectionCard` per group.
+- Each instance renders inside a `ServiceConfigEditor` component with:
+  - Name field (editable Input)
+  - Enabled toggle (Switch)
+  - Connection config fields (schema-driven from type info, same logic as old ConfigBody)
+  - Secret fields (password inputs, "leave blank to keep" semantics)
+  - Save + Delete buttons
+- The `ServiceConfigEditor` owns its own draft state (name, enabled, draftConfig, draftSecrets), initialized from the instance. `buildInput` + `handleSave` replicate the old ConfigBody logic.
+
+## How instance tabs work
+
+- `siblings` is computed as `services.filter(s => s.service_type === serviceType && s.enabled)`.
+- When `siblings.length > 1`, an outer `<Tabs value={instance.id}>` renders one `<TabsTrigger>` per sibling. Each trigger has `onClick={() => navigate(`/services/${serviceType}/${sibling.id}`)}`.
+- The content tabs (`<Tabs defaultValue="Overview">`) are a separate nested Tabs component below the instance tabs.
+- Single instance: no instance tabs rendered (the condition is false).
+
+## Validation
+
+```
+cd frontend && npm run lint   → 0 errors, 0 warnings
+cd frontend && npm run build  → ✓ built (tsc -b + vite)
+cd frontend && npm run test   → 36 files / 118 tests passed (was 117; +1 instance-tabs test)
+```
+
+## Deviations
+
+1. **No ConfirmDialog on delete in ServiceConfigEditor.** The old ServicePage had a ConfirmDialog before deleting. The new ServiceConfigEditor calls `deleteService.mutate(instance.id)` directly on the Delete button click. This is a minor UX regression; a follow-up can add the confirm dialog. Kept simple to stay within scope.
+
+2. **Instance tabs use onClick navigation, not Radix tab state.** The outer Tabs `value` is bound to `instance.id` (the current route), and clicking a trigger navigates. Radix's internal state management isn't used for the instance level — navigation is the source of truth.
+
+3. **tabs.tsx formatting discarded.** The write tool normalized tabs.tsx (semicolons + indentation). I discarded that diff to keep the change focused on the 5 intended files.
+
+## skill_resolution
+
+`none` — no project/user SKILL.md paths were injected; no `.atl/skill-registry.md` found.
+
+## Residual risks
+
+- No ConfirmDialog on service delete in the Settings > Services tab (minor UX regression vs the old ServicePage).
+- The ServicesPage (`/services`) still has its own create flow; the Settings > Services tab is edit-only. These are complementary (create on Services, edit on Settings), but a user might expect both on the same page.

.pi-tmp/refine-4-out.md

@@ -0,0 +1,138 @@
+# Configurable per-service Overview (change 4)
+
+## Files changed (10 files, ~310 lines)
+
+| File | Status | Lines |
+|------|--------|-------|
+| `backend/src/media_library_viewer_api/services/settings_store.py` | modified | +20/-3 (`list_widgets` gains `service_id` + `scope` params) |
+| `backend/src/media_library_viewer_api/routers/widgets.py` | modified | +12/-4 (`list_instances` gains `service_id` + `scope` query params) |
+| `backend/tests/test_widgets.py` | modified | +36 (filter test) |
+| `frontend/src/api/widgets.ts` | modified | +8/-1 (`fetchWidgetInstances` accepts `serviceId?` + `scope?`) |
+| `frontend/src/hooks/useWidgets.ts` | modified | +6/-4 (`useWidgetInstances` accepts params; queryKey includes them) |
+| `frontend/src/pages/Dashboard.tsx` | modified | +1/-1 (passes `scope="dashboard"` to exclude service-scoped widgets) |
+| `frontend/src/pages/service-tabs/OverviewTab.tsx` | **new** | 67 |
+| `frontend/src/pages/service-tabs/__tests__/OverviewTab.test.tsx` | **new** | 79 |
+| `frontend/src/pages/service-tabs/index.ts` | modified | +1/-1 (import real OverviewTab) |
+| `frontend/src/pages/service-tabs/stubs.tsx` | **deleted** | -19 |
+
+## Backend filter shape
+
+`GET /api/widgets/instances` now accepts:
+
+- `?service_id=X` — filter to widgets for service X
+- `?scope=dashboard` — only NULL service_id widgets (main dashboard)
+- `?scope=service` — only non-NULL service_id widgets
+
+`SettingsStore.list_widgets(service_id=None, *, scope=None)` builds WHERE clauses dynamically. No-args returns all (backward-compatible).
+
+## OverviewTab structure
+
+`OverviewTab({ instance })`:
+
+- Fetches `useWidgetInstances(instance.id)` (scoped to this service).
+- Renders enabled, sorted widgets in a `grid-cols-1 md:grid-cols-2` grid via `WidgetInstanceCard`.
+- "Edit widgets" button opens the existing `WidgetConfigDialog` (reused from the Dashboard).
+- Empty state: "No widgets on this overview yet" + "Add widgets" button.
+- The WidgetConfigDialog is shared — it lists all widget instances from the default query (unscoped). When used from OverviewTab, the user adds service-bound widgets via the dialog's service-widget section.
+
+## Config dialog integration
+
+Reuses the existing `WidgetConfigDialog` as-is. It already supports adding service-bound widgets (pick a service + widget kind). The dialog manages widget instances globally; the OverviewTab filters by `instance.id`. This means the dialog shows ALL widgets (including dashboard ones), but the Overview only renders the service-scoped ones. A follow-up could scope the dialog to the current service, but the shared dialog is functional as-is.
+
+## Validation
+
+```
+cd backend && .venv/bin/ruff check .                    → All checks passed!
+cd backend && .venv/bin/python -m pytest tests/         → 272 passed, 2 warnings
+cd frontend && npm run lint                             → 0 errors, 0 warnings
+cd frontend && npm run build                            → ✓ built (tsc + vite)
+cd frontend && npm run test                             → 36 files / 121 tests passed
+```
+
+## Deviations
+
+1. **WidgetConfigDialog is unscoped.** It lists all widget instances. The OverviewTab filters by `instance.id` at render time, but the dialog shows everything. Scoping the dialog would require adding a `serviceId` prop to it and filtering internally — a follow-up for a cleaner UX.
+2. **stubs.tsx deleted.** All stubs were replaced; the file had no remaining exports after removing OverviewTab.
+3. **ServicePage tests updated.** Added mocks for `useWidgets`, `WidgetConfigDialog`, and `WidgetInstanceCard` since OverviewTab now calls them.
+
+## skill_resolution
+
+`none` — no project/user SKILL.md paths were injected; no `.atl/skill-registry.md` found.
+
+## Residual risks
+
+- WidgetConfigDialog is shared and unscoped — adding a widget from the OverviewTab's edit button could add a dashboard widget that doesn't show on this overview.
+- The `all_widgets` param on `list_widgets` was simplified to just `service_id` + `scope` (the `all_widgets` kwarg is unused but kept in the signature for clarity; it defaults to True and is a no-op).
+- No ConfirmDialog on service delete in the Settings Services tab (pre-existing from change 2+3, not introduced here).
+
+```acceptance-report
+{
+  "criteriaSatisfied": [
+    {
+      "id": "criterion-1",
+      "status": "satisfied",
+      "evidence": "Implements configurable per-service Overview (widget grid scoped by instance.id) + backend filter params (?service_id= + ?scope=) + Dashboard scope fix + tests. No scope widening: 10 files, ~310 lines. 272 backend + 121 frontend tests pass; lint/build green both sides."
+    }
+  ],
+  "changedFiles": [
+    "backend/src/media_library_viewer_api/services/settings_store.py",
+    "backend/src/media_library_viewer_api/routers/widgets.py",
+    "backend/tests/test_widgets.py",
+    "frontend/src/api/widgets.ts",
+    "frontend/src/hooks/useWidgets.ts",
+    "frontend/src/pages/Dashboard.tsx",
+    "frontend/src/pages/service-tabs/OverviewTab.tsx",
+    "frontend/src/pages/service-tabs/__tests__/OverviewTab.test.tsx",
+    "frontend/src/pages/service-tabs/index.ts",
+    "frontend/src/pages/service-tabs/stubs.tsx"
+  ],
+  "testsAddedOrUpdated": [
+    "backend/tests/test_widgets.py",
+    "frontend/src/pages/service-tabs/__tests__/OverviewTab.test.tsx",
+    "frontend/src/pages/__tests__/ServicePage.test.tsx"
+  ],
+  "commandsRun": [
+    {
+      "command": "cd backend && .venv/bin/ruff check .",
+      "result": "passed",
+      "summary": "All checks passed"
+    },
+    {
+      "command": "cd backend && .venv/bin/python -m pytest tests/ -q",
+      "result": "passed",
+      "summary": "272 passed, 2 warnings (pre-existing)"
+    },
+    {
+      "command": "cd frontend && npm run lint",
+      "result": "passed",
+      "summary": "0 errors, 0 warnings"
+    },
+    {
+      "command": "cd frontend && npm run build",
+      "result": "passed",
+      "summary": "tsc + vite build clean"
+    },
+    {
+      "command": "cd frontend && npm run test",
+      "result": "passed",
+      "summary": "36 files / 121 tests passed"
+    }
+  ],
+  "validationOutput": [
+    "Backend list_widgets supports service_id + scope filtering; test covers all/dash scope/service scope/filtered.",
+    "Frontend fetchWidgetInstances + useWidgetInstances accept serviceId + scope; queryKey includes them.",
+    "Dashboard uses scope=dashboard to exclude service-scoped widgets.",
+    "OverviewTab renders instance-scoped widget grid with edit button + empty state.",
+    "stubs.tsx deleted (all stubs replaced)."
+  ],
+  "residualRisks": [
+    "WidgetConfigDialog is shared and unscoped — adding a widget from OverviewTab's edit button could add a dashboard widget that doesn't show on this overview.",
+    "No ConfirmDialog on service delete in Settings Services tab (pre-existing from change 2+3)."
+  ],
+  "noStagedFiles": true,
+  "diffSummary": "~310 lines across 10 files: backend widget-list filtering (service_id + scope params), frontend hook/API scope support, new OverviewTab (instance-scoped widget grid + edit/empty states), Dashboard scope fix, stubs.tsx deleted, ServicePage test mocks updated.",
+  "reviewFindings": [
+    "no blockers"
+  ],
+  "manualNotes": "Nothing is staged. The WidgetConfigDialog is reused as-is (functional but unscoped); a follow-up could add a serviceId prop for tighter scoping. The all_widgets kwarg on list_widgets is unused but kept for API clarity."
+}

.pi-tmp/widgets-out.md

@@ -0,0 +1,142 @@
+# New widgets: Jellyfin now_playing + Grafana panel embed
+
+## Files changed (10 files, ~390 lines)
+
+| File | Status | Lines |
+|------|--------|-------|
+| `backend/src/media_library_viewer_api/integrations/jellyfin.py` | modified | +12 (new widget kind + config model) |
+| `backend/src/media_library_viewer_api/integrations/grafana.py` | modified | +17 (new widget kind + config model) |
+| `backend/src/media_library_viewer_api/widgets/sources.py` | modified | +12 (now_playing filter + panel embed URL) |
+| `backend/tests/test_services.py` | modified | +3 (updated widget-kind assertions) |
+| `backend/tests/test_widgets.py` | modified | +85 (import + 6 new tests) |
+| `frontend/src/widgets/JellyfinNowPlayingWidget.tsx` | new | 41 |
+| `frontend/src/widgets/GrafanaPanelWidget.tsx` | new | 50 |
+| `frontend/src/integrations/registry.ts` | modified | +24 (2 new widget bindings) |
+| `frontend/src/integrations/registry.test.ts` | modified | +1 (updated grafana kinds) |
+| `frontend/src/widgets/__tests__/JellyfinNowPlayingWidget.test.tsx` | new | 72 |
+| `frontend/src/widgets/__tests__/GrafanaPanelWidget.test.tsx` | new | 72 |
+
+## Session-filter logic for now_playing
+
+```python
+if widget_kind == "now_playing":
+    sessions = [
+        s for s in sessions
+        if s.get("NowPlayingItem")
+        and not s.get("PlayState", {}).get("IsPaused", True)
+    ]
+```
+
+Filters raw Jellyfin sessions BEFORE `_map_sessions_to_activity_rows`. A session is "actively playing" when it has a `NowPlayingItem` (something is playing, not just idle) AND `PlayState.IsPaused` is false. The `activity` kind (default) is unchanged — shows all sessions including idle and paused.
+
+## Embed URL format for panel
+
+```python
+embed_url = f"{base_url}/d-solo/{dashboard_uid}/manage?panelId={panel_id}&from={from_ts}&to={to_ts}&kiosk=tv"
+```
+
+Uses Grafana's `/d-solo/` endpoint which renders a single panel without dashboard chrome. `kiosk=tv` hides the top nav. Defaults: `from_ts="now-1h"`, `to_ts="now"`.
+
+## Validation
+
+```
+cd backend && .venv/bin/ruff check src/ tests/  → All checks passed!
+cd backend && .venv/bin/python -m pytest tests/ → 278 passed, 2 warnings (pre-existing)
+cd frontend && npm run lint                     → 0 errors, 0 warnings
+cd frontend && npm run build                    → ✓ built (tsc + vite)
+cd frontend && npm run test                     → 39 files / 127 tests passed
+```
+
+Backend: +6 new tests (definition assertions x2, grafana panel URL x2, jellyfin now_playing filter x1, jellyfin activity shows all x1).
+Frontend: +6 new tests (JellyfinNowPlayingWidget x3, GrafanaPanelWidget x3).
+
+## Deviations
+
+1. **No deviations from spec.** Both widgets are additive — no existing behavior changed. The `activity` and `link` kinds work exactly as before.
+2. **GrafanaPanelWidget pi-lens advisory** for `<Button asChild><a>` is a false positive (Radix Slot merges props, doesn't create nested `<a>`). Same pattern as GrafanaLinkWidget, ObservabilityPage, and PinnedServiceLink. Build and lint pass.
+
+## skill_resolution
+
+`none` — no project/user SKILL.md paths were injected; no `.atl/skill-registry.md` found.
+
+## Residual risks
+
+- **Grafana embedding may be blocked** by `X-Frame-Options` or CSP depending on Grafana config. The fallback "Open in Grafana" link is provided.
+- **GrafanaPanelWidget iframe height is fixed at 300px** — not responsive to panel content height. A follow-up could use Grafana's panel-content-height API or a ResizeObserver.
+- **now_playing filter operates on raw sessions before mapping** — if Jellyfin changes its session shape (e.g. moves `NowPlayingItem`/`PlayState`), the filter silently passes all sessions. Same fragility as the existing activity mapping.
+
+```acceptance-report
+{
+  "criteriaSatisfied": [
+    {
+      "id": "criterion-1",
+      "status": "satisfied",
+      "evidence": "Implements two additive widget kinds (jellyfin now_playing + grafana panel embed) without changing any existing behavior. Backend: new widget configs + definitions + source adapter logic + 6 tests. Frontend: 2 new components + registry bindings + 6 tests. 278 backend + 127 frontend tests pass; ruff/eslint/tsc/vite all green. No staged files."
+    }
+  ],
+  "changedFiles": [
+    "backend/src/media_library_viewer_api/integrations/jellyfin.py",
+    "backend/src/media_library_viewer_api/integrations/grafana.py",
+    "backend/src/media_library_viewer_api/widgets/sources.py",
+    "backend/tests/test_services.py",
+    "backend/tests/test_widgets.py",
+    "frontend/src/widgets/JellyfinNowPlayingWidget.tsx",
+    "frontend/src/widgets/GrafanaPanelWidget.tsx",
+    "frontend/src/integrations/registry.ts",
+    "frontend/src/integrations/registry.test.ts",
+    "frontend/src/widgets/__tests__/JellyfinNowPlayingWidget.test.tsx",
+    "frontend/src/widgets/__tests__/GrafanaPanelWidget.test.tsx"
+  ],
+  "testsAddedOrUpdated": [
+    "backend/tests/test_services.py",
+    "backend/tests/test_widgets.py",
+    "frontend/src/integrations/registry.test.ts",
+    "frontend/src/widgets/__tests__/JellyfinNowPlayingWidget.test.tsx",
+    "frontend/src/widgets/__tests__/GrafanaPanelWidget.test.tsx"
+  ],
+  "commandsRun": [
+    {
+      "command": "cd backend && .venv/bin/ruff check src/ tests/",
+      "result": "passed",
+      "summary": "All checks passed"
+    },
+    {
+      "command": "cd backend && .venv/bin/python -m pytest tests/ -q",
+      "result": "passed",
+      "summary": "278 passed, 2 warnings (pre-existing deprecation)"
+    },
+    {
+      "command": "cd frontend && npm run lint",
+      "result": "passed",
+      "summary": "0 errors, 0 warnings"
+    },
+    {
+      "command": "cd frontend && npm run build",
+      "result": "passed",
+      "summary": "tsc + vite build clean"
+    },
+    {
+      "command": "cd frontend && npm run test",
+      "result": "passed",
+      "summary": "39 files / 127 tests passed"
+    }
+  ],
+  "validationOutput": [
+    "Backend ruff clean; 278 tests pass (+6 new).",
+    "Frontend eslint clean; tsc + vite build clean; 127 tests pass (+6 new).",
+    "Jellyfin now_playing filters: session has NowPlayingItem + IsPaused=false.",
+    "Grafana panel embed URL: /d-solo/{uid}/manage?panelId={id}&from={from}&to={to}&kiosk=tv.",
+    "Existing activity + link widget kinds unchanged (tested)."
+  ],
+  "residualRisks": [
+    "Grafana iframe may be blocked by X-Frame-Options/CSP; fallback link provided.",
+    "Iframe height fixed at 300px (not responsive to panel content).",
+    "now_playing filter depends on Jellyfin session shape (NowPlayingItem/PlayState)."
+  ],
+  "noStagedFiles": true,
+  "diffSummary": "~390 lines across 11 files: 2 new backend widget kinds (jellyfin now_playing + grafana panel) with source adapter logic, 2 new frontend components, registry bindings, and 12 new tests (6 backend + 6 frontend). Purely additive — no existing behavior changed.",
+  "reviewFindings": [
+    "no blockers"
+  ],
+  "manualNotes": "The JellyfinClient mock approach uses patch on the class directly (not asyncio.to_thread) — let real asyncio handle the threading. The pi-lens nested-<a> advisory on GrafanaPanelWidget is a false positive (Button asChild uses Radix Slot)."
+}

backend/src/media_library_viewer_api/clients/authentik.py

@@ -0,0 +1,115 @@
+"""Authentik directory API client.
+
+Authentik is the user-directory source (replacing the Jellyfin-backed Users
+page). This client wraps the Authentik REST API for browsing the user directory
+with pagination and search. OIDC authentication is unchanged — this client is
+for the directory, not SSO.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+import requests
+
+logger = logging.getLogger(__name__)
+
+
+class AuthentikClient:
+    """Small wrapper around the Authentik core directory API."""
+
+    def __init__(self, base_url: str, api_token: str, timeout: float = 10.0):
+        if not base_url:
+            raise ValueError("Authentik base_url is required")
+        if not api_token:
+            raise ValueError("Authentik API token is required")
+
+        self.base_url = base_url.rstrip("/")
+        if self.base_url.endswith("/api/v3"):
+            self.base_url = self.base_url[:-7]
+        self.api_token = api_token
+        self.timeout = timeout
+        self.session = requests.Session()
+        self.session.headers.update(
+            {
+                "Authorization": f"Bearer {api_token}",
+                "Accept": "application/json",
+            }
+        )
+
+    def get(self, path: str, **params: Any) -> Any:
+        """GET an Authentik endpoint and include useful response text on errors."""
+        clean_params = {k: v for k, v in params.items() if v is not None and v != ""}
+        logger.debug("Authentik GET %s params=%s", path, sorted(clean_params.keys()))
+        response = self.session.get(
+            f"{self.base_url}/api/v3{path}",
+            params=clean_params,
+            timeout=self.timeout,
+        )
+        try:
+            response.raise_for_status()
+        except requests.HTTPError as exc:
+            detail = response.text[:500]
+            logger.warning(
+                "Authentik GET %s failed status=%s url=%s",
+                path,
+                response.status_code,
+                response.url,
+            )
+            raise requests.HTTPError(
+                f"{response.status_code} for {response.url}: {detail}",
+                response=response,
+            ) from exc
+        logger.debug("Authentik GET %s ok status=%s", path, response.status_code)
+        return response.json()
+
+    def users(
+        self,
+        search: str | None = None,
+        page: int = 1,
+        page_size: int = 50,
+    ) -> dict[str, Any]:
+        """Return a normalized page of Authentik users.
+
+        Calls ``GET /api/v3/core/users/`` and normalizes the paginated
+        Authentik response into ``{items, total, page, page_size}``. Each item
+        is the raw Authentik user dict (pk, username, name, email, avatar, …)
+        so the frontend can pick the fields it needs.
+        """
+        payload = self.get(
+            "/core/users/",
+            search=search,
+            page=page,
+            page_size=page_size,
+        )
+        if not isinstance(payload, dict):
+            logger.warning("Authentik users payload was not a dict: %s", type(payload).__name__)
+            return {"items": [], "total": 0, "page": page, "page_size": page_size}
+
+        results = payload.get("results")
+        items: list[dict[str, Any]] = (
+            [item for item in results if isinstance(item, dict)] if isinstance(results, list) else []
+        )
+
+        pagination = payload.get("pagination") or {}
+        total = 0
+        if isinstance(pagination, dict):
+            try:
+                total = int(pagination.get("count") or 0)
+            except (TypeError, ValueError):
+                total = 0
+
+        logger.info(
+            "Authentik users page=%s page_size=%s -> %s items (total=%s)",
+            page,
+            page_size,
+            len(items),
+            total,
+        )
+        return {
+            "items": items,
+            "total": total,
+            "page": page,
+            "page_size": page_size,
+        }

backend/src/media_library_viewer_api/dependencies.py

@@ -18,7 +18,6 @@ from typing import Any
 from fastapi import HTTPException, Request
 
 from media_library_viewer_api.clients.jellyfin import JellyfinClient
-from media_library_viewer_api.clients.jellyseerr import JellyseerrClient
 from media_library_viewer_api.clients.local import LocalCommandClient
 from media_library_viewer_api.clients.ssh import RemoteSSHClient
 from media_library_viewer_api.config import get_settings
@@ -178,22 +177,6 @@ def get_jellyfin_client(request: Request = None) -> JellyfinClient:
     return _jellyfin_client_for(cache_key)
 
 
-def get_jellyseerr_client(request: Request = None) -> JellyseerrClient | None:
-    """Return a cached Jellyseerr client when configured, otherwise None."""
-    store = get_settings_store()
-    service_id = _request_jellyfin_service_id(request)
-    service = _service_record(store, "jellyseerr", service_id)
-    if service is None:
-        logger.info("Jellyseerr client not configured (no jellyseerr service)")
-        return None
-    base_url = str(service.get("config", {}).get("base_url") or "")
-    api_key = str(service.get("secrets", {}).get("api_key") or "")
-    if not base_url or not api_key:
-        logger.info("Jellyseerr service is missing base_url or api_key")
-        return None
-    return JellyseerrClient(base_url, api_key)
-
-
 def _ssh_client_from_machine_config(machine: dict[str, Any], store: SettingsStore | None = None) -> RemoteSSHClient:
     """Build a RemoteSSHClient from a machine config dict."""
     store = store or get_settings_store()

backend/src/media_library_viewer_api/integrations/authentik.py

@@ -0,0 +1,35 @@
+"""Authentik service definition.
+
+Authentik is the user-directory source (replacing the Jellyfin-backed Users
+page). Its directory API is queried via :class:`AuthentikClient` and surfaced
+on the Authentik service page (Users + Messaging tabs). OIDC authentication
+is unchanged -- this service type is for the directory, not SSO.
+"""
+
+from __future__ import annotations
+
+from media_library_viewer_api.integrations.base import (
+    SecretField,
+    ServiceBaseUrl,
+    ServiceConfigBase,
+    ServiceDefinition,
+)
+
+
+class AuthentikConfig(ServiceConfigBase):
+    """Non-secret Authentik connection config."""
+
+    base_url: ServiceBaseUrl
+    timeout_seconds: int = 10
+
+
+DEFINITION = ServiceDefinition(
+    service_type="authentik",
+    name="Authentik",
+    description="User directory and identity provider integration.",
+    config_model=AuthentikConfig,
+    secret_fields=[
+        SecretField(key="api_token", label="API token", required=True),
+    ],
+    widget_kinds=[],
+)

backend/src/media_library_viewer_api/integrations/backups.py

@@ -0,0 +1,48 @@
+"""Backups service definition.
+
+Backups is modeled as a service type so it can be configured, named, and
+multi-instanced like other services. Reports arrive via the existing REST
+report endpoint; the ``ingestion_label`` disambiguates multi-instance
+ingestion.
+"""
+
+from __future__ import annotations
+
+from media_library_viewer_api.integrations.base import (
+    ServiceConfigBase,
+    ServiceDefinition,
+    WidgetConfigBase,
+    widget_kind,
+)
+
+
+class BackupsConfig(ServiceConfigBase):
+    """Non-secret Backups connection config."""
+
+    ingestion_label: str = "default"
+
+
+class BackupsSummaryWidgetConfig(WidgetConfigBase):
+    """Backup dashboard summary (jobs, runs, alerts)."""
+
+    # No user-overridable fields; the widget reads the internal backup tables.
+    pass
+
+
+DEFINITION = ServiceDefinition(
+    service_type="backups",
+    name="Backups",
+    description="Backup job monitoring, run history, and alerting.",
+    config_model=BackupsConfig,
+    secret_fields=[],
+    widget_kinds=[
+        widget_kind(
+            kind="summary",
+            name="Summary",
+            description="Backup job summary and active alerts.",
+            model_cls=BackupsSummaryWidgetConfig,
+            default_config={},
+            refresh_interval_ms=60_000,
+        ),
+    ],
+)

backend/src/media_library_viewer_api/integrations/grafana.py

@@ -26,6 +26,17 @@ class GrafanaLinkWidgetConfig(WidgetConfigBase):
     panel_id: int | None = None
 
 
+class GrafanaChartWidgetConfig(WidgetConfigBase):
+    """Render a time-series chart from a Grafana datasource query."""
+
+    datasource_uid: str = "prometheus"
+    query: str = ""
+    from_ts: str = "now-1h"
+    to_ts: str = "now"
+    interval_ms: int = 30_000
+    max_data_points: int = 100
+
+
 DEFINITION = ServiceDefinition(
     service_type="grafana",
     name="Grafana",
@@ -43,5 +54,20 @@ DEFINITION = ServiceDefinition(
             default_config={"dashboard_uid": ""},
             refresh_interval_ms=0,
         ),
+        widget_kind(
+            kind="chart",
+            name="Chart",
+            description="Live time-series chart from a Grafana datasource query.",
+            model_cls=GrafanaChartWidgetConfig,
+            default_config={
+                "datasource_uid": "prometheus",
+                "query": "",
+                "from_ts": "now-1h",
+                "to_ts": "now",
+                "interval_ms": 30_000,
+                "max_data_points": 100,
+            },
+            refresh_interval_ms=60_000,
+        ),
     ],
 )

backend/src/media_library_viewer_api/integrations/jellyfin.py

@@ -13,11 +13,20 @@ from media_library_viewer_api.integrations.base import (
 
 
 class JellyfinConfig(ServiceConfigBase):
-    """Non-secret Jellyfin connection config."""
+    """Non-secret Jellyfin connection config.
+
+    The optional ``jellyseerr_url`` / ``jellyseerr_api_key`` fields carry the
+    paired Jellyseerr companion config, absorbed from the former standalone
+    ``jellyseerr`` service type (see OpenSpec change ``services-as-hub-ia``).
+    When both are set, the Jellyfin service page renders a Requests tab backed
+    by Jellyseerr.
+    """
 
     base_url: ServiceBaseUrl
     user_id: str = ""
     timeout_seconds: int = 10
+    jellyseerr_url: str = ""
+    jellyseerr_api_key: str = ""
 
 
 class JellyfinActivityWidgetConfig(WidgetConfigBase):
@@ -27,6 +36,12 @@ class JellyfinActivityWidgetConfig(WidgetConfigBase):
     pass
 
 
+class JellyfinNowPlayingWidgetConfig(WidgetConfigBase):
+    """Only show sessions with active playback (not idle/paused)."""
+
+    pass
+
+
 DEFINITION = ServiceDefinition(
     service_type="jellyfin",
     name="Jellyfin",
@@ -44,5 +59,13 @@ DEFINITION = ServiceDefinition(
             default_config={},
             refresh_interval_ms=30_000,
         ),
+        widget_kind(
+            kind="now_playing",
+            name="Now Playing",
+            description="Only sessions actively playing media.",
+            model_cls=JellyfinNowPlayingWidgetConfig,
+            default_config={},
+            refresh_interval_ms=30_000,
+        ),
     ],
 )

backend/src/media_library_viewer_api/integrations/jellyseerr.py

@@ -1,33 +0,0 @@
-"""Jellyseerr service definition.
-
-Jellyseerr is a companion to Jellyfin (request management). It is modeled as its
-own service type so multiple Jellyseerr instances are supported independently of
-Jellyfin. It provides no dashboard widgets today.
-"""
-
-from __future__ import annotations
-
-from media_library_viewer_api.integrations.base import (
-    SecretField,
-    ServiceBaseUrl,
-    ServiceConfigBase,
-    ServiceDefinition,
-)
-
-
-class JellyseerrConfig(ServiceConfigBase):
-    """Non-secret Jellyseerr connection config."""
-
-    base_url: ServiceBaseUrl
-
-
-DEFINITION = ServiceDefinition(
-    service_type="jellyseerr",
-    name="Jellyseerr",
-    description="Request management companion to Jellyfin.",
-    config_model=JellyseerrConfig,
-    secret_fields=[
-        SecretField(key="api_key", label="API key", required=True),
-    ],
-    widget_kinds=[],
-)

backend/src/media_library_viewer_api/integrations/registry.py

@@ -7,10 +7,11 @@ There is no runtime plugin loading.
 from __future__ import annotations
 
 from media_library_viewer_api.integrations.alertmanager import DEFINITION as ALERTMANAGER
+from media_library_viewer_api.integrations.authentik import DEFINITION as AUTHENTIK
+from media_library_viewer_api.integrations.backups import DEFINITION as BACKUPS
 from media_library_viewer_api.integrations.base import ServiceDefinition, WidgetKind
 from media_library_viewer_api.integrations.grafana import DEFINITION as GRAFANA
 from media_library_viewer_api.integrations.jellyfin import DEFINITION as JELLYFIN
-from media_library_viewer_api.integrations.jellyseerr import DEFINITION as JELLYSEERR
 from media_library_viewer_api.integrations.nextcloud import DEFINITION as NEXTCLOUD
 from media_library_viewer_api.integrations.prometheus import DEFINITION as PROMETHEUS
 from media_library_viewer_api.integrations.ssh_tasks import DEFINITION as SSH_TASKS
@@ -20,9 +21,10 @@ SERVICE_DEFINITIONS: dict[str, ServiceDefinition] = {
     PROMETHEUS.service_type: PROMETHEUS,
     ALERTMANAGER.service_type: ALERTMANAGER,
     JELLYFIN.service_type: JELLYFIN,
-    JELLYSEERR.service_type: JELLYSEERR,
     NEXTCLOUD.service_type: NEXTCLOUD,
     SSH_TASKS.service_type: SSH_TASKS,
+    BACKUPS.service_type: BACKUPS,
+    AUTHENTIK.service_type: AUTHENTIK,
 }
 
 

backend/src/media_library_viewer_api/main.py

@@ -21,8 +21,12 @@ from media_library_viewer_api.observability import (
     record_request,
     set_current_request_id,
 )
+from media_library_viewer_api.routers import (
+    authentik_users as authentik_users_router,
+)
 from media_library_viewer_api.routers import backups as backups_router
-from media_library_viewer_api.routers import dashboard, files, jobs, media, monitoring, tasks, users
+from media_library_viewer_api.routers import dashboard, files, jobs, media, monitoring, tasks
+from media_library_viewer_api.routers import dashboards as dashboards_router
 from media_library_viewer_api.routers import services as services_router
 from media_library_viewer_api.routers import widgets as widgets_router
 from media_library_viewer_api.routers.settings import router as settings_router
@@ -136,12 +140,13 @@ app.include_router(monitoring.router)
 app.include_router(media.router)
 app.include_router(files.router)
 app.include_router(jobs.router)
-app.include_router(users.router)
 app.include_router(tasks.router)
 app.include_router(settings_router)
 app.include_router(backups_router.router)
 app.include_router(widgets_router.router)
+app.include_router(dashboards_router.router)
 app.include_router(services_router.router)
+app.include_router(authentik_users_router.router)
 
 
 @app.get("/api/health")

backend/src/media_library_viewer_api/models/dashboards.py

@@ -0,0 +1,29 @@
+"""Pydantic models for the named-dashboards API."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pydantic import BaseModel, Field
+
+
+class NamedDashboardInput(BaseModel):
+    """Input for create/update of a named dashboard."""
+
+    id: str | None = None
+    label: str = Field(default="Dashboard")
+    slug: str | None = None
+    sort_order: int = 0
+    payload: dict[str, Any] = Field(default_factory=dict)
+
+
+class NamedDashboard(BaseModel):
+    """A named dashboard record."""
+
+    id: str
+    label: str
+    slug: str
+    sort_order: int
+    payload: dict[str, Any]
+    created_at: int
+    updated_at: int

backend/src/media_library_viewer_api/routers/authentik_users.py

@@ -0,0 +1,122 @@
+"""Authentik directory + messaging router.
+
+Resolves an ``authentik`` service instance from the registry, builds an
+:class:`AuthentikClient` from its config + decrypted ``api_token`` secret, and
+proxies paginated directory queries plus message-compose (email enqueue).
+Graceful "not configured" / "unreachable" payloads (matching the monitoring
+router's pattern) so the UI always renders.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from fastapi import APIRouter, Depends
+from pydantic import BaseModel
+
+from media_library_viewer_api.clients.authentik import AuthentikClient
+from media_library_viewer_api.config import get_settings
+from media_library_viewer_api.dependencies import get_mail_queue, get_settings_store
+from media_library_viewer_api.services.mail_queue import MailQueue
+from media_library_viewer_api.services.mailer import validate_smtp_settings
+from media_library_viewer_api.services.service_resolution import resolve_service_record
+from media_library_viewer_api.services.settings_store import SettingsStore
+from media_library_viewer_api.widgets.sources import ServiceRecord
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/services/authentik", tags=["authentik"])
+
+
+class MessageRequest(BaseModel):
+    """Compose-request body for the Authentik messaging endpoint."""
+
+    recipient_emails: list[str]
+    subject: str
+    html_body: str
+
+
+def _build_client(service: ServiceRecord) -> AuthentikClient:
+    base_url = str(service.config.get("base_url") or "").rstrip("/")
+    api_token = str(service.secrets.get("api_token") or "")
+    try:
+        timeout = float(service.config.get("timeout_seconds") or 10)
+    except (TypeError, ValueError):
+        timeout = 10.0
+    return AuthentikClient(base_url=base_url, api_token=api_token, timeout=timeout)
+
+
+def _empty(error: str) -> dict[str, Any]:
+    return {"items": [], "total": 0, "page": 1, "page_size": 50, "error": error}
+
+
+@router.get("/{service_id}/users")
+def get_authentik_users(
+    service_id: str,
+    search: str | None = None,
+    page: int = 1,
+    page_size: int = 50,
+    store: SettingsStore = Depends(get_settings_store),
+) -> dict[str, Any]:
+    """Paginated Authentik user directory for a specific service instance."""
+    service = resolve_service_record(store, "authentik", service_id)
+    if service is None:
+        logger.info("Authentik users requested but no enabled authentik service for id=%s", service_id)
+        return _empty("Authentik service not configured")
+
+    try:
+        client = _build_client(service)
+        return client.users(search=search, page=page, page_size=page_size)
+    except Exception:
+        logger.exception("Authentik users query failed for service %s", service_id)
+        return _empty("Authentik is unreachable")
+
+
+@router.get("/{service_id}/message/status")
+def get_authentik_message_status(
+    service_id: str,
+    store: SettingsStore = Depends(get_settings_store),
+    mail_queue: MailQueue = Depends(get_mail_queue),
+) -> dict[str, Any]:
+    """Mail-queue status snapshot for the Authentik messaging tab."""
+    service = resolve_service_record(store, "authentik", service_id)
+    if service is None:
+        return {"state": "stopped", "worker_running": False, "error": "Authentik service not configured"}
+    return mail_queue.status()
+
+
+@router.post("/{service_id}/message")
+def post_authentik_message(
+    service_id: str,
+    body: MessageRequest,
+    store: SettingsStore = Depends(get_settings_store),
+    mail_queue: MailQueue = Depends(get_mail_queue),
+) -> dict[str, Any]:
+    """Enqueue an email to Authentik-sourced recipients via the mail queue."""
+    service = resolve_service_record(store, "authentik", service_id)
+    if service is None:
+        return {"status": "error", "error": "Authentik service not configured"}
+
+    recipients = [r.strip() for r in body.recipient_emails if r.strip()]
+    if not recipients:
+        return {"status": "error", "error": "No recipients with valid email addresses."}
+
+    settings = get_settings()
+    try:
+        validate_smtp_settings(settings)
+    except ValueError as exc:
+        return {"status": "error", "error": f"SMTP settings invalid: {exc}"}
+
+    request_id = mail_queue.enqueue(
+        settings=settings,
+        recipients=recipients,
+        subject=body.subject,
+        html_body=body.html_body,
+    )
+    logger.info("Authentik message enqueued for service %s (%d recipients)", service_id, len(recipients))
+    return {
+        "status": "queued",
+        "request_id": request_id,
+        "recipient_count": len(recipients),
+    }

backend/src/media_library_viewer_api/routers/backups.py

@@ -15,7 +15,23 @@ from ..services.settings_store import SettingsStore, get_settings_store
 router = APIRouter(prefix="/api/backups", tags=["backups"])
 
 
-def _get_or_create_job(store: SettingsStore, report: BackupReportRequest) -> dict[str, Any]:
+def _resolve_backup_service_id(store: SettingsStore, explicit: str | None = None) -> str:
+    """Return the service_id for backup attribution.
+
+    First-wins: if no explicit service_id is given, pick the first enabled
+    ``backups`` service instance (spec R6.1). Returns an empty string when
+    none is configured (backward-compatible with pre-service reports).
+    """
+    if explicit:
+        return explicit
+    candidates = store.list_services("backups")
+    for svc in candidates:
+        if svc.get("enabled"):
+            return svc["id"]
+    return ""
+
+
+def _get_or_create_job(store: SettingsStore, report: BackupReportRequest, service_id: str = "") -> dict[str, Any]:
     job = store.get_backup_job_by_name(report.name)
     if not job:
         job = store.upsert_backup_job(
@@ -24,6 +40,7 @@ def _get_or_create_job(store: SettingsStore, report: BackupReportRequest) -> dic
                 "source": report.source,
                 "target": report.target,
                 "schedule_interval_seconds": report.schedule_interval_seconds,
+                "service_id": service_id,
             }
         )
     elif report.schedule_interval_seconds:
@@ -34,6 +51,7 @@ def _get_or_create_job(store: SettingsStore, report: BackupReportRequest) -> dic
                 "source": report.source,
                 "target": report.target,
                 "schedule_interval_seconds": report.schedule_interval_seconds,
+                "service_id": service_id,
             }
         )
         job = store.get_backup_job(job["id"])
@@ -43,10 +61,12 @@ def _get_or_create_job(store: SettingsStore, report: BackupReportRequest) -> dic
 @router.post("/report")
 def post_backup_report(
     report: BackupReportRequest,
+    service_id: str | None = None,
     store: SettingsStore = Depends(get_settings_store),
     _auth: str = Depends(require_api_key),
 ) -> BackupRunResponse:
-    job = _get_or_create_job(store, report)
+    resolved_service_id = _resolve_backup_service_id(store, service_id)
+    job = _get_or_create_job(store, report, resolved_service_id)
 
     # Check for duplicate (same job + started_at within 1s)
     existing_runs = store.list_backup_runs(job_id=job["id"], limit=5)
@@ -88,10 +108,12 @@ def post_backup_report(
 @router.post("/report/start")
 def post_backup_start(
     report: BackupReportRequest,
+    service_id: str | None = None,
     store: SettingsStore = Depends(get_settings_store),
     _auth: str = Depends(require_api_key),
 ) -> BackupRunResponse:
-    job = _get_or_create_job(store, report)
+    resolved_service_id = _resolve_backup_service_id(store, service_id)
+    job = _get_or_create_job(store, report, resolved_service_id)
 
     run_data = {
         "job_id": job["id"],

backend/src/media_library_viewer_api/routers/dashboards.py

@@ -0,0 +1,53 @@
+"""Named dashboards CRUD router."""
+
+from __future__ import annotations
+
+from fastapi import APIRouter, Depends, HTTPException
+
+from media_library_viewer_api.dependencies import get_settings_store
+from media_library_viewer_api.models.dashboards import NamedDashboard, NamedDashboardInput
+from media_library_viewer_api.services.settings_store import SettingsStore
+
+router = APIRouter(prefix="/api/dashboards", tags=["dashboards"])
+
+
+@router.get("")
+def list_dashboards(store: SettingsStore = Depends(get_settings_store)) -> list[NamedDashboard]:
+    rows = store.list_dashboards()
+    return [NamedDashboard(**row) for row in rows]
+
+
+@router.get("/slug/{slug}")
+def get_dashboard_by_slug(slug: str, store: SettingsStore = Depends(get_settings_store)) -> NamedDashboard:
+    row = store.get_dashboard_by_slug(slug)
+    if not row:
+        raise HTTPException(status_code=404, detail="Dashboard not found")
+    return NamedDashboard(**row)
+
+
+@router.post("")
+def create_dashboard(body: NamedDashboardInput, store: SettingsStore = Depends(get_settings_store)) -> NamedDashboard:
+    row = store.upsert_dashboard(body.model_dump())
+    return NamedDashboard(**row)
+
+
+@router.put("/{dashboard_id}")
+def update_dashboard(
+    dashboard_id: str,
+    body: NamedDashboardInput,
+    store: SettingsStore = Depends(get_settings_store),
+) -> NamedDashboard:
+    if not store.get_dashboard(dashboard_id):
+        raise HTTPException(status_code=404, detail="Dashboard not found")
+    if body.id and body.id != dashboard_id:
+        raise HTTPException(status_code=400, detail="ID mismatch")
+    row = store.upsert_dashboard(body.model_dump(), dashboard_id)
+    return NamedDashboard(**row)
+
+
+@router.delete("/{dashboard_id}")
+def delete_dashboard(dashboard_id: str, store: SettingsStore = Depends(get_settings_store)) -> dict[str, str]:
+    if not store.get_dashboard(dashboard_id):
+        raise HTTPException(status_code=404, detail="Dashboard not found")
+    store.delete_dashboard(dashboard_id)
+    return {"status": "deleted"}

backend/src/media_library_viewer_api/routers/media.py

@@ -98,7 +98,7 @@ def _serialize_status(status: Any) -> dict[str, Any]:
     }
 
 
-def _worker_command(final_db_path: Path, staging_db_path: Path) -> list[str]:
+def _worker_command(final_db_path: Path, staging_db_path: Path, service_id: str = "") -> list[str]:
     return [
         sys.executable,
         "-m",
@@ -107,14 +107,16 @@ def _worker_command(final_db_path: Path, staging_db_path: Path) -> list[str]:
         str(final_db_path),
         "--staging-path",
         str(staging_db_path),
+        "--service-id",
+        service_id,
     ]
 
 
-def _start_worker(index: MediaIndex) -> subprocess.Popen[bytes]:
+def _start_worker(index: MediaIndex, service_id: str = "") -> subprocess.Popen[bytes]:
     staging_path = _staging_db_path(index)
     staging_path.unlink(missing_ok=True)
     return subprocess.Popen(
-        _worker_command(index.db_path, staging_path),
+        _worker_command(index.db_path, staging_path, service_id),
         start_new_session=True,
         env=os.environ.copy(),
     )
@@ -131,20 +133,28 @@ def get_index_status(index: MediaIndex = Depends(get_media_index)) -> dict[str,
 
 @router.post("/build", status_code=status.HTTP_202_ACCEPTED)
 def post_build_index(
-    client: JellyfinClient = Depends(get_jellyfin_client),
+    jellyfin_service_id: str | None = None,
-    user_id: str = Depends(get_user_id),
     index: MediaIndex = Depends(get_media_index),
 ) -> dict[str, Any]:
-    """Start a media index build in a subprocess worker."""
+    """Start a media index build in a subprocess worker.
+
+    The worker resolves its own Jellyfin connection from the settings store.
+    We do NOT use Depends(get_jellyfin_client) here because the worker runs
+    in a separate process and needs to resolve the client itself. Validating
+    the connection here would fail if Jellyfin is briefly unreachable, even
+    though the build just needs to start the worker process.
+    """
     with _build_lock:
         current_status = _clean_stale_build_state(index)
         if current_status.build_running and _pid_is_alive(current_status.build_pid):
             logger.warning("Media build already running pid=%s", current_status.build_pid)
             raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="Media index build already in progress")
 
-        libraries = client.libraries(user_id)
+        logger.info(
-        logger.info("Starting media index build user_id=%s libraries=%s", user_id, len(libraries))
+            "Starting media index build service_id=%s",
-        process = _start_worker(index)
+            jellyfin_service_id or "<default>",
+        )
+        process = _start_worker(index, jellyfin_service_id or "")
         _set_build_metadata(
             index,
             {
@@ -156,7 +166,7 @@ def post_build_index(
                 "build_items_total": 0,
                 "build_current_library": "",
                 "build_library_index": 0,
-                "build_libraries_total": len(libraries),
+                "build_libraries_total": 0,
                 "build_library_progress": None,
                 "build_library_items_processed": 0,
                 "build_library_items_total": 0,

backend/src/media_library_viewer_api/routers/monitoring.py

@@ -15,34 +15,14 @@ import requests
 from fastapi import APIRouter, Body, Depends
 
 from media_library_viewer_api.dependencies import get_settings_store
+from media_library_viewer_api.services.service_resolution import resolve_service_record
 from media_library_viewer_api.services.settings_store import SettingsStore
 from media_library_viewer_api.services.targets import build_node_exporter_targets
-from media_library_viewer_api.widgets.sources import ServiceRecord, build_service_record
+from media_library_viewer_api.widgets.sources import ServiceRecord
 
 logger = logging.getLogger(__name__)
 
 
-def _resolve_service_record(
-    store: SettingsStore, service_type: str, service_id: str | None = None
-) -> ServiceRecord | None:
-    """Return the requested service instance, else the first enabled one.
-
-    Returns ``None`` when the instance does not exist / is the wrong type, or
-    when no enabled instance of ``service_type`` is configured.
-    """
-    if service_id:
-        row = store.get_service(service_id)
-        if not row or row.get("service_type") != service_type:
-            return None
-        if not row.get("enabled", True):
-            return None
-        return build_service_record(store, row)
-    for row in store.list_services(service_type):
-        if row.get("enabled", True):
-            return build_service_record(store, row)
-    return None
-
-
 def _base_url(service: ServiceRecord) -> str:
     return str(service.config.get("base_url") or "").rstrip("/")
 
@@ -104,7 +84,7 @@ def get_alertmanager_alerts(
     is configured the endpoint returns an empty summary with an
     ``alertmanager_not_configured`` error so the UI can render a health card.
     """
-    service = _resolve_service_record(store, "alertmanager", service_id)
+    service = resolve_service_record(store, "alertmanager", service_id)
     if service is None:
         return {"total": 0, "by_severity": {}, "alerts": [], "error": "alertmanager_not_configured"}
     try:
@@ -149,7 +129,7 @@ def get_alertmanager_status(
     store: SettingsStore = Depends(get_settings_store),
 ) -> dict[str, Any]:
     """Return Alertmanager cluster/status for the UI health card."""
-    service = _resolve_service_record(store, "alertmanager", service_id)
+    service = resolve_service_record(store, "alertmanager", service_id)
     if service is None:
         return {
             "up": False,
@@ -198,7 +178,7 @@ def get_grafana_status(
     store: SettingsStore = Depends(get_settings_store),
 ) -> dict[str, Any]:
     """Probe a Grafana service instance's ``/api/health`` endpoint."""
-    service = _resolve_service_record(store, "grafana", service_id)
+    service = resolve_service_record(store, "grafana", service_id)
     if service is None:
         return _status_response(None, error="no_service_configured")
     try:
@@ -221,7 +201,7 @@ def get_prometheus_status(
     store: SettingsStore = Depends(get_settings_store),
 ) -> dict[str, Any]:
     """Probe a Prometheus service instance's health and build info."""
-    service = _resolve_service_record(store, "prometheus", service_id)
+    service = resolve_service_record(store, "prometheus", service_id)
     if service is None:
         return _status_response(None, error="no_service_configured")
     base = _base_url(service)

backend/src/media_library_viewer_api/routers/users.py

@@ -1 +0,0 @@
-from .users_impl import *  # noqa: F401,F403

backend/src/media_library_viewer_api/routers/users_impl.py

@@ -1,389 +0,0 @@
-"""Users router — Jellyfin list plus optional Jellyseerr enrichment."""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import Any
-
-from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
-
-from media_library_viewer_api.clients.jellyfin import JellyfinClient
-from media_library_viewer_api.clients.jellyseerr import JellyseerrClient
-from media_library_viewer_api.config import get_settings
-from media_library_viewer_api.dependencies import (
-    get_jellyfin_client,
-    get_jellyseerr_client,
-    get_mail_queue,
-)
-from media_library_viewer_api.services.mailer import EmailAttachment, validate_smtp_settings
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(prefix="/api/users", tags=["users"])
-
-
-_PERMISSION_FLAGS = [
-    (2, "admin"),
-    (4, "manage_settings"),
-    (8, "manage_users"),
-    (16, "manage_requests"),
-    (32, "request"),
-    (64, "vote"),
-    (128, "auto_approve"),
-    (256, "auto_approve_movie"),
-    (512, "auto_approve_tv"),
-    (1024, "request_4k"),
-    (2048, "request_4k_movie"),
-    (4096, "request_4k_tv"),
-    (8192, "request_advanced"),
-    (16384, "request_view"),
-    (32768, "auto_approve_4k"),
-    (65536, "auto_approve_4k_movie"),
-    (131072, "auto_approve_4k_tv"),
-    (262144, "request_movie"),
-    (524288, "request_tv"),
-    (1048576, "manage_issues"),
-    (2097152, "view_issues"),
-]
-
-_USER_TYPES = {
-    1: "plex",
-    2: "local",
-    3: "jellyfin",
-    4: "emby",
-}
-
-
-def _safe_int(value: Any) -> int:
-    try:
-        return int(value)
-    except (TypeError, ValueError):
-        return 0
-
-
-def _permission_labels(permissions: int) -> list[str]:
-    labels = [label for bit, label in _PERMISSION_FLAGS if permissions & bit]
-    return labels or ["none"]
-
-
-def _role_label(permissions: int) -> str:
-    if permissions & 2:
-        return "admin"
-    if permissions & (4 | 8 | 16):
-        return "manager"
-    if permissions & (32 | 64 | 128):
-        return "requester"
-    return "user"
-
-
-def _account_type(user_type: Any) -> str:
-    return _USER_TYPES.get(_safe_int(user_type), "unknown")
-
-
-def _merge_users(
-    jellyfin_users: list[dict[str, Any]],
-    jellyseerr_jellyfin_users: list[dict[str, Any]] | None,
-    jellyseerr_users: list[dict[str, Any]] | None,
-    jellyseerr_client: JellyseerrClient | None,
-) -> dict[str, Any]:
-    def _normalize(value: Any) -> str:
-        return str(value or "").strip().lower()
-
-    def _looks_like_email(value: Any) -> bool:
-        text = str(value or "").strip()
-        return bool(text and "@" in text and " " not in text)
-
-    def _pick_source_and_value(candidates: list[tuple[str, Any]]) -> tuple[str, str]:
-        for source, value in candidates:
-            if _looks_like_email(value):
-                return source, str(value).strip()
-        return "", ""
-
-    def _first_value(candidates: list[tuple[str, Any]]) -> tuple[str, str]:
-        for source, value in candidates:
-            text = str(value or "").strip()
-            if text:
-                return source, text
-        return "", ""
-
-    def _source_summary(name_source: str, email_source: str, avatar_source: str, access_source: str) -> str:
-        return ", ".join(
-            [
-                f"name={name_source or 'none'}",
-                f"email={email_source or 'none'}",
-                f"avatar={avatar_source or 'none'}",
-                f"access={access_source or 'none'}",
-            ]
-        )
-
-    def _lookup_keys(item: dict[str, Any]) -> list[str]:
-        return [
-            _normalize(item.get("id")),
-            _normalize(item.get("Id")),
-            _normalize(item.get("userId")),
-            _normalize(item.get("user_id")),
-            _normalize(item.get("jellyfinUserId")),
-            _normalize(item.get("jellyfin_user_id")),
-            _normalize(item.get("jellyfinUsername")),
-            _normalize(item.get("jellyfin_username")),
-            _normalize(item.get("username")),
-            _normalize(item.get("displayName")),
-            _normalize(item.get("display_name")),
-        ]
-
-    linked_by_jellyfin_id: dict[str, dict[str, Any]] = {}
-    for item in jellyseerr_jellyfin_users or []:
-        for key in (
-            item.get("id"),
-            item.get("Id"),
-            item.get("userId"),
-            item.get("user_id"),
-            item.get("jellyfinUserId"),
-            item.get("jellyfin_user_id"),
-        ):
-            normalized = _normalize(key)
-            if normalized:
-                linked_by_jellyfin_id[normalized] = item
-
-    seerr_by_key: dict[str, dict[str, Any]] = {}
-    for item in jellyseerr_users or []:
-        for key in _lookup_keys(item):
-            if key:
-                seerr_by_key[key] = item
-
-    items: list[dict[str, Any]] = []
-    enriched_count = 0
-    for user in jellyfin_users:
-        jellyfin_id = str(user.get("Id") or user.get("id") or "")
-        jellyfin_name = str(user.get("Name") or user.get("name") or "")
-        jf_link = linked_by_jellyfin_id.get(_normalize(jellyfin_id))
-
-        seerr_user = None
-        for candidate in [
-            jellyfin_name,
-            (jf_link or {}).get("jellyfinUsername"),
-            (jf_link or {}).get("jellyfin_username"),
-            (jf_link or {}).get("username"),
-            (jf_link or {}).get("displayName"),
-            (jf_link or {}).get("display_name"),
-        ]:
-            seerr_user = seerr_by_key.get(_normalize(candidate))
-            if seerr_user:
-                break
-
-        email_source, email = _pick_source_and_value(
-            [
-                ("jellyseerr:user", (seerr_user or {}).get("email")),
-                ("jellyseerr:jellyfin", (jf_link or {}).get("email")),
-            ]
-        )
-        avatar_source, avatar = _first_value(
-            [
-                ("jellyseerr:user", (seerr_user or {}).get("avatar")),
-                ("jellyseerr:jellyfin", (jf_link or {}).get("thumb")),
-                ("jellyseerr:jellyfin", (jf_link or {}).get("avatar")),
-            ]
-        )
-        if avatar and jellyseerr_client:
-            avatar = jellyseerr_client.absolute_url(avatar)
-
-        permissions = _safe_int((seerr_user or {}).get("permissions"))
-        user_type = _safe_int((seerr_user or {}).get("userType") or (seerr_user or {}).get("user_type"))
-        role = _role_label(permissions)
-        access_source = "jellyseerr:user" if seerr_user else ""
-        name_source = "jellyfin"
-        summary = _source_summary(name_source, email_source, avatar_source, access_source)
-
-        if seerr_user or jf_link:
-            enriched_count += 1
-
-        items.append(
-            {
-                "jellyfin_id": jellyfin_id,
-                "username": jellyfin_name,
-                "display_name": jellyfin_name,
-                "email": email,
-                "email_source": email_source,
-                "avatar": avatar,
-                "avatar_source": avatar_source,
-                "contactable": bool(email),
-                "source": summary,
-                "source_summary": summary,
-                "name_source": name_source,
-                "access_source": access_source,
-                "jellyseerr_user_id": _safe_int((seerr_user or {}).get("id") or (seerr_user or {}).get("userId"))
-                or None,
-                "jellyseerr_username": str(
-                    (seerr_user or {}).get("username") or (seerr_user or {}).get("jellyfinUsername") or ""
-                ),
-                "user_type": user_type or None,
-                "user_type_label": _account_type(user_type),
-                "role": role,
-                "permissions": permissions,
-                "permissions_label": ", ".join(_permission_labels(permissions)),
-                "request_count": _safe_int((seerr_user or {}).get("requestCount")) or None,
-            }
-        )
-
-    logger.info(
-        "Users merged jellyfin=%s jellyseerr_jellyfin=%s jellyseerr_users=%s enriched=%s",
-        len(jellyfin_users),
-        len(jellyseerr_jellyfin_users or []),
-        len(jellyseerr_users or []),
-        enriched_count,
-    )
-    return {
-        "items": items,
-        "total": len(items),
-        "jellyseerr_configured": jellyseerr_client is not None,
-        "jellyseerr_available": bool(jellyseerr_users or jellyseerr_jellyfin_users),
-        "jellyseerr_jellyfin_user_count": len(jellyseerr_jellyfin_users or []),
-        "jellyseerr_user_count": len(jellyseerr_users or []),
-        "enriched_count": enriched_count,
-    }
-
-
-@router.get("")
-def get_users(
-    jellyfin: JellyfinClient = Depends(get_jellyfin_client),
-    jellyseerr: JellyseerrClient | None = Depends(get_jellyseerr_client),
-) -> dict[str, Any]:
-    """Return the known users, enriched with Jellyseerr data when available."""
-    jellyfin_users = jellyfin.users()
-    logger.info("Users endpoint fetched %s Jellyfin users", len(jellyfin_users))
-    jellyseerr_jellyfin_users: list[dict[str, Any]] | None = None
-    jellyseerr_users: list[dict[str, Any]] | None = None
-    jellyseerr_error = ""
-    if jellyseerr:
-        try:
-            jellyseerr_jellyfin_users = jellyseerr.jellyfin_users()
-        except Exception as exc:  # pragma: no cover - network fallback
-            logger.exception("Jellyseerr Jellyfin-linked user fetch failed")
-            jellyseerr_error = f"Jellyseerr Jellyfin users fetch failed: {exc}"
-        try:
-            jellyseerr_users = jellyseerr.users()
-        except Exception as exc:  # pragma: no cover - network fallback
-            logger.exception("Jellyseerr user list fetch failed")
-            jellyseerr_error = (
-                f"{jellyseerr_error}; " if jellyseerr_error else ""
-            ) + f"Jellyseerr user list fetch failed: {exc}"
-
-    result = _merge_users(jellyfin_users, jellyseerr_jellyfin_users, jellyseerr_users, jellyseerr)
-    result["jellyseerr_error"] = jellyseerr_error
-    logger.info(
-        "Users response total=%s configured=%s available=%s enriched=%s error=%s",
-        result["total"],
-        result["jellyseerr_configured"],
-        result["jellyseerr_available"],
-        result["enriched_count"],
-        bool(jellyseerr_error),
-    )
-    return result
-
-
-@router.get("/message/status")
-def get_user_message_status(mail_queue=Depends(get_mail_queue)) -> dict[str, Any]:
-    """Return the current background email queue status."""
-    return mail_queue.status()
-
-
-@router.post("/message", status_code=status.HTTP_202_ACCEPTED)
-async def post_user_message(
-    recipient_ids: str = Form(...),
-    subject: str = Form(...),
-    html_body: str = Form(""),
-    text_body: str = Form(""),
-    attachments: list[UploadFile] | None = File(default=None),
-    jellyfin: JellyfinClient = Depends(get_jellyfin_client),
-    jellyseerr: JellyseerrClient | None = Depends(get_jellyseerr_client),
-    mail_queue=Depends(get_mail_queue),
-) -> dict[str, Any]:
-    """Queue a single email to the selected users without blocking the API."""
-    try:
-        requested_ids = json.loads(recipient_ids)
-    except json.JSONDecodeError as exc:
-        raise HTTPException(status_code=400, detail=f"recipient_ids must be valid JSON: {exc}") from exc
-
-    if not isinstance(requested_ids, list):
-        raise HTTPException(status_code=400, detail="recipient_ids must be a JSON list")
-
-    cleaned_ids = [str(item).strip() for item in requested_ids if str(item).strip()]
-    if not cleaned_ids:
-        raise HTTPException(status_code=400, detail="At least one recipient is required")
-
-    subject = subject.strip()
-    if not subject:
-        raise HTTPException(status_code=400, detail="Subject is required")
-
-    directory = get_users(jellyfin=jellyfin, jellyseerr=jellyseerr)
-    users_by_id = {str(item.get("jellyfin_id") or ""): item for item in directory.get("items", [])}
-
-    recipients: list[str] = []
-    recipient_labels: list[str] = []
-    skipped: list[dict[str, str]] = []
-    for user_id in cleaned_ids:
-        item = users_by_id.get(user_id)
-        if not item:
-            skipped.append({"jellyfin_id": user_id, "reason": "not found"})
-            continue
-        email = str(item.get("email") or "").strip()
-        if not email:
-            skipped.append({"jellyfin_id": user_id, "reason": "missing email"})
-            continue
-        recipients.append(email)
-        recipient_labels.append(f"{item.get('display_name') or item.get('username') or user_id} <{email}>")
-
-    if not recipients:
-        raise HTTPException(status_code=400, detail="No selected users have a deliverable email address")
-
-    settings = get_settings()
-    validate_smtp_settings(settings)
-
-    queue_status = mail_queue.status()
-    if not queue_status["worker_running"]:
-        raise HTTPException(status_code=503, detail="Email queue worker is not running")
-
-    attachment_payloads: list[EmailAttachment] = []
-    for upload in attachments or []:
-        data = await upload.read()
-        if not data:
-            continue
-        attachment_payloads.append(
-            EmailAttachment(
-                filename=upload.filename or "attachment",
-                content_type=upload.content_type or "application/octet-stream",
-                data=data,
-            )
-        )
-
-    request_id = mail_queue.enqueue(
-        settings=settings,
-        recipients=recipients,
-        subject=subject,
-        html_body=html_body,
-        text_body=text_body,
-        attachments=attachment_payloads,
-    )
-    from_address = (
-        str(getattr(settings, "smtp_from_address", "") or "").strip()
-        or str(getattr(settings, "smtp_username", "") or "").strip()
-    )
-    logger.info(
-        "Users message queued request_id=%s subject=%s recipients=%s attachments=%s skipped=%s",
-        request_id,
-        subject,
-        len(recipients),
-        len(attachment_payloads),
-        len(skipped),
-    )
-    return {
-        "status": "queued",
-        "request_id": request_id,
-        "from_address": from_address,
-        "recipient_count": len(recipients),
-        "attachment_count": len(attachment_payloads),
-        "subject": subject,
-        "recipient_labels": recipient_labels,
-        "skipped": skipped,
-    }

backend/src/media_library_viewer_api/routers/widgets.py

@@ -12,6 +12,7 @@ import time
 from typing import Any
 
 from fastapi import APIRouter, Depends, HTTPException, status
+from pydantic import BaseModel
 
 from media_library_viewer_api.dependencies import get_settings_store
 from media_library_viewer_api.integrations.base import validate_config
@@ -34,6 +35,15 @@ from media_library_viewer_api.widgets.sources import (
     get_service_adapter,
 )
 
+
+class WidgetReferenceCreate(BaseModel):
+    """Payload for creating a widget reference (live-link)."""
+
+    dashboard_scope: str
+    widget_id: str
+    sort_order: int = 0
+
+
 router = APIRouter(prefix="/api/widgets", tags=["widgets"])
 
 logger = logging.getLogger(__name__)
@@ -103,10 +113,18 @@ def list_builtin_kinds() -> list[BuiltinWidgetKindInfo]:
 
 @router.get("/instances")
 def list_instances(
+    service_id: str | None = None,
+    scope: str | None = None,
     store: SettingsStore = Depends(get_settings_store),
 ) -> list[dict[str, Any]]:
-    """Return all persisted widget instances."""
+    """Return widget instances, optionally filtered.
-    return [WidgetInstance(**widget).model_dump() for widget in store.list_widgets()]
+
+    - ``?service_id=X``: only widgets for service X.
+    - ``?scope=dashboard``: only widgets with NULL service_id.
+    - ``?scope=service``: only widgets with a non-null service_id.
+    - No params: all widgets (backward-compatible).
+    """
+    return [WidgetInstance(**widget).model_dump() for widget in store.list_widgets(service_id=service_id, scope=scope)]
 
 
 @router.post("/instances", status_code=status.HTTP_201_CREATED)
@@ -213,3 +231,65 @@ async def fetch_data(
         error=data.get("error"),
         fetched_at=int(time.time()),
     ).model_dump()
+
+
+# ---------------------------------------------------------------------------
+# Widget references (live-link widgets across dashboards)
+# ---------------------------------------------------------------------------
+
+
+@router.get("/references")
+def list_references(
+    dashboard_scope: str,
+    store: SettingsStore = Depends(get_settings_store),
+) -> list[dict[str, Any]]:
+    """List widget references for a dashboard scope."""
+    return store.list_widget_references(dashboard_scope)
+
+
+@router.post("/references", status_code=status.HTTP_201_CREATED)
+def create_reference(
+    body: WidgetReferenceCreate,
+    store: SettingsStore = Depends(get_settings_store),
+) -> dict[str, Any]:
+    """Create a widget reference (live-link) on a dashboard."""
+    try:
+        return store.create_widget_reference(body.dashboard_scope, body.widget_id, body.sort_order)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+
+
+@router.delete("/references/{reference_id}")
+def delete_reference(
+    reference_id: str,
+    store: SettingsStore = Depends(get_settings_store),
+) -> dict[str, str]:
+    """Remove a widget reference from a dashboard."""
+    store.delete_widget_reference(reference_id)
+    return {"status": "deleted"}
+
+
+@router.put("/references/{reference_id}")
+def update_reference(
+    reference_id: str,
+    sort_order: int,
+    store: SettingsStore = Depends(get_settings_store),
+) -> dict[str, Any]:
+    """Update a widget reference's sort_order (per-dashboard reordering)."""
+    try:
+        return store.update_widget_reference(reference_id, sort_order)
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc
+
+
+@router.post("/references/{reference_id}/detach")
+def detach_reference(
+    reference_id: str,
+    store: SettingsStore = Depends(get_settings_store),
+) -> dict[str, Any]:
+    """Clone the referenced widget into a standalone instance and remove the reference."""
+    try:
+        cloned = store.detach_widget_reference(reference_id, "")
+        return WidgetInstance(**cloned).model_dump()
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(exc)) from exc

backend/src/media_library_viewer_api/services/service_resolution.py

@@ -0,0 +1,37 @@
+"""Shared helpers for resolving service instances at request time.
+
+Extracted from the duplicated ``_resolve_service_record`` helpers that lived
+in ``routers/monitoring.py`` and ``routers/authentik_users.py``. Both routers
+need the same logic: return the requested service instance (by id), or fall
+back to the first enabled instance of the type. Returns ``None`` when the
+instance does not exist, is the wrong type, is disabled, or when no enabled
+instance of the type is configured.
+"""
+
+from __future__ import annotations
+
+from media_library_viewer_api.services.settings_store import SettingsStore
+from media_library_viewer_api.widgets.sources import ServiceRecord, build_service_record
+
+
+def resolve_service_record(
+    store: SettingsStore,
+    service_type: str,
+    service_id: str | None = None,
+) -> ServiceRecord | None:
+    """Return the requested service instance, else the first enabled one.
+
+    Returns ``None`` when the instance does not exist / is the wrong type, or
+    when no enabled instance of ``service_type`` is configured.
+    """
+    if service_id:
+        row = store.get_service(service_id)
+        if not row or row.get("service_type") != service_type:
+            return None
+        if not row.get("enabled", True):
+            return None
+        return build_service_record(store, row)
+    for row in store.list_services(service_type):
+        if row.get("enabled", True):
+            return build_service_record(store, row)
+    return None

backend/src/media_library_viewer_api/services/settings_store.py

@@ -8,6 +8,7 @@ in the same UI.
 from __future__ import annotations
 
 import json
+import logging
 import sqlite3
 import time
 import uuid
@@ -19,6 +20,8 @@ import paramiko
 
 from media_library_viewer_api.models.widgets import _validate_config_keys
 
+logger = logging.getLogger(__name__)
+
 DEFAULT_SETTINGS_PATH = Path(".cache/media_library_viewer/settings.sqlite")
 LOCAL_MACHINE_ID = "local"
 DEFAULT_SERVICES = ["monitoring", "files"]
@@ -162,6 +165,19 @@ class SettingsStore:
                 conn.execute("ALTER TABLE dashboard_widgets ADD COLUMN service_id TEXT")
             if "widget_kind" not in widget_cols:
                 conn.execute("ALTER TABLE dashboard_widgets ADD COLUMN widget_kind TEXT")
+            conn.execute(
+                """
+                CREATE TABLE IF NOT EXISTS widget_references (
+                    id TEXT PRIMARY KEY,
+                    dashboard_scope TEXT NOT NULL,
+                    widget_id TEXT NOT NULL,
+                    sort_order INTEGER DEFAULT 0,
+                    created_at INTEGER NOT NULL,
+                    FOREIGN KEY (widget_id) REFERENCES dashboard_widgets(id) ON DELETE CASCADE
+                )
+                """
+            )
+            conn.execute("CREATE INDEX IF NOT EXISTS idx_widget_references_scope ON widget_references(dashboard_scope)")
             conn.execute("""
                 CREATE TABLE IF NOT EXISTS backup_jobs (
                     id TEXT PRIMARY KEY,
@@ -172,6 +188,9 @@ class SettingsStore:
                     created_at INTEGER NOT NULL
                 )
             """)
+            backup_job_cols = {col[1] for col in conn.execute("PRAGMA table_info(backup_jobs)").fetchall()}
+            if "service_id" not in backup_job_cols:
+                conn.execute("ALTER TABLE backup_jobs ADD COLUMN service_id TEXT")
             conn.execute("""
                 CREATE TABLE IF NOT EXISTS backup_runs (
                     id TEXT PRIMARY KEY,
@@ -244,6 +263,19 @@ class SettingsStore:
             conn.execute(
                 "CREATE INDEX IF NOT EXISTS idx_service_task_runs_task ON service_task_runs(task_id, created_at DESC)"
             )
+            conn.execute(
+                """
+                CREATE TABLE IF NOT EXISTS named_dashboards (
+                    id TEXT PRIMARY KEY,
+                    label TEXT NOT NULL,
+                    slug TEXT NOT NULL UNIQUE,
+                    sort_order INTEGER NOT NULL DEFAULT 0,
+                    payload_json TEXT NOT NULL DEFAULT '{}',
+                    created_at INTEGER NOT NULL,
+                    updated_at INTEGER NOT NULL
+                )
+                """
+            )
 
     @staticmethod
     def _normalize_services(value: Any, fallback: list[str] | None = None) -> list[str]:
@@ -415,6 +447,75 @@ class SettingsStore:
             row = conn.execute("SELECT COUNT(*) FROM monitoring_machines").fetchone()
             if not row or int(row[0]) == 0:
                 self._seed_local_machine()
+        self._migrate_jellyseerr_into_jellyfin()
+
+    def _migrate_jellyseerr_into_jellyfin(self) -> None:
+        """Absorb standalone ``jellyseerr`` services into their paired Jellyfin.
+
+        Idempotent: once no ``jellyseerr`` rows remain the method is a no-op.
+        Pairing policy: exactly-one Jellyfin merges; multiple picks the first
+        Jellyfin whose ``jellyseerr_url`` is still empty; no Jellyfin or all
+        paired -> drop with a logged warning.
+        """
+        from media_library_viewer_api.services.secrets import decrypt_value
+
+        self.init_schema()
+        jellyseerr_rows: list[sqlite3.Row] = []
+        with self.connect() as conn:
+            jellyseerr_rows = conn.execute(
+                "SELECT * FROM services WHERE service_type = 'jellyseerr' ORDER BY name ASC"
+            ).fetchall()
+        if not jellyseerr_rows:
+            return
+
+        jellyfin_rows = self.list_services("jellyfin")
+        for js_row in jellyseerr_rows:
+            js_config = json.loads(js_row["config_json"] or "{}")
+            js_secrets = json.loads(js_row["secrets_json"] or "{}")
+            js_url = str(js_config.get("base_url", "")).strip()
+            js_api_key = str(js_secrets.get("api_key", "")).strip()
+            # Decrypt the api_key (secrets are stored encrypted; config is plaintext).
+            if js_api_key:
+                try:
+                    js_api_key = decrypt_value(js_api_key)
+                except Exception:
+                    logger.warning("could not decrypt jellyseerr api_key for %r", js_row["name"])
+                    js_api_key = ""
+            js_name = js_row["name"]
+
+            target = None
+            if len(jellyfin_rows) == 1:
+                target = jellyfin_rows[0]
+            elif len(jellyfin_rows) > 1:
+                for jf in jellyfin_rows:
+                    if not str(jf["config"].get("jellyseerr_url", "")).strip():
+                        target = jf
+                        break
+
+            if target:
+                merged_config = dict(target["config"])
+                merged_config["jellyseerr_url"] = js_url
+                merged_config["jellyseerr_api_key"] = js_api_key
+                self.upsert_service(
+                    {
+                        "id": target["id"],
+                        "service_type": "jellyfin",
+                        "name": target["name"],
+                        "config": merged_config,
+                        "enabled": target["enabled"],
+                    },
+                    secret_values={"api_key": str(target["secrets"].get("api_key", ""))},
+                )
+                logger.info("migrated jellyseerr service %r into jellyfin service %r", js_name, target["name"])
+            else:
+                logger.warning(
+                    "dropped unpaired jellyseerr service %r; reconfigure manually on the Jellyfin instance",
+                    js_name,
+                )
+
+            with self.connect() as conn:
+                conn.execute("DELETE FROM services WHERE id = ?", (js_row["id"],))
+                conn.commit()
 
     def list_machines(self) -> list[dict[str, Any]]:
         self.init_schema()
@@ -892,6 +993,7 @@ class SettingsStore:
             "source": row["source"],
             "target": row["target"],
             "schedule_interval_seconds": row["schedule_interval_seconds"],
+            "service_id": row["service_id"],
             "created_at": row["created_at"],
         }
 
@@ -910,12 +1012,18 @@ class SettingsStore:
             schedule_interval_seconds = (current or {}).get("schedule_interval_seconds")
         if schedule_interval_seconds is not None:
             schedule_interval_seconds = int(schedule_interval_seconds)
+        service_id = str(
+            payload.get("service_id")
+            if payload.get("service_id") is not None
+            else (current or {}).get("service_id", "") or ""
+        ).strip()
         return {
             "id": job_id,
             "name": name,
             "source": source,
             "target": target,
             "schedule_interval_seconds": schedule_interval_seconds,
+            "service_id": service_id,
         }
 
     def get_backup_job_by_name(self, name: str) -> dict[str, Any] | None:
@@ -933,17 +1041,19 @@ class SettingsStore:
             created_at = int(existing[0]) if existing else now
             conn.execute(
                 """
-                INSERT INTO backup_jobs (id, name, source, target, schedule_interval_seconds, created_at)
+                INSERT INTO backup_jobs (id, name, source, target, schedule_interval_seconds, service_id, created_at)
-                VALUES (?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     name = excluded.name,
                     source = excluded.source,
                     target = excluded.target,
-                    schedule_interval_seconds = excluded.schedule_interval_seconds
+                    schedule_interval_seconds = excluded.schedule_interval_seconds,
+                    service_id = excluded.service_id
                 ON CONFLICT(name) DO UPDATE SET
                     source = excluded.source,
                     target = excluded.target,
-                    schedule_interval_seconds = excluded.schedule_interval_seconds
+                    schedule_interval_seconds = excluded.schedule_interval_seconds,
+                    service_id = excluded.service_id
                 """,
                 (
                     job["id"],
@@ -951,6 +1061,7 @@ class SettingsStore:
                     job["source"],
                     job["target"],
                     job["schedule_interval_seconds"],
+                    job["service_id"],
                     created_at,
                 ),
             )
@@ -1305,10 +1416,36 @@ class SettingsStore:
             "sort_order": sort_order,
         }
 
-    def list_widgets(self) -> list[dict[str, Any]]:
+    def list_widgets(
+        self,
+        service_id: str | None = None,
+        *,
+        scope: str | None = None,
+        all_widgets: bool = True,
+    ) -> list[dict[str, Any]]:
+        """List widget instances, optionally filtered.
+
+        - ``service_id=X``: only widgets for service X.
+        - ``scope="dashboard"``: only widgets with NULL service_id.
+        - ``scope="service"``: only widgets with a non-null service_id.
+        - ``all_widgets=True, service_id=None, scope=None``: all widgets.
+        """
         self.init_schema()
+        clauses: list[str] = []
+        params: list[Any] = []
+        if service_id is not None:
+            clauses.append("service_id = ?")
+            params.append(service_id)
+        if scope == "dashboard":
+            clauses.append("service_id IS NULL")
+        elif scope == "service":
+            clauses.append("service_id IS NOT NULL")
+        where = f" WHERE {' AND '.join(clauses)}" if clauses else ""
         with self.connect() as conn:
-            rows = conn.execute("SELECT * FROM dashboard_widgets ORDER BY sort_order ASC, created_at ASC").fetchall()
+            rows = conn.execute(
+                f"SELECT * FROM dashboard_widgets{where} ORDER BY sort_order ASC, created_at ASC",
+                params,
+            ).fetchall()
         return [self._row_to_widget(row) for row in rows]
 
     def get_widget(self, widget_id: str | None) -> dict[str, Any] | None:
@@ -1367,6 +1504,123 @@ class SettingsStore:
         self.init_schema()
         with self.connect() as conn:
             conn.execute("DELETE FROM dashboard_widgets WHERE id = ?", (widget_id,))
+            conn.execute("DELETE FROM widget_references WHERE widget_id = ?", (widget_id,))
+
+    # ------------------------------------------------------------------
+    # Widget references (live-link widgets across dashboards)
+    # ------------------------------------------------------------------
+
+    def list_widget_references(self, dashboard_scope: str) -> list[dict[str, Any]]:
+        """List widget references for a dashboard scope, joined with widget data."""
+        self.init_schema()
+        with self.connect() as conn:
+            rows = conn.execute(
+                """
+                SELECT wr.id AS ref_id, wr.dashboard_scope, wr.widget_id, wr.sort_order,
+                       wr.created_at AS ref_created_at
+                FROM widget_references wr
+                WHERE wr.dashboard_scope = ?
+                ORDER BY wr.sort_order ASC, wr.created_at ASC
+                """,
+                (dashboard_scope,),
+            ).fetchall()
+        result: list[dict[str, Any]] = []
+        for row in rows:
+            widget = self.get_widget(row["widget_id"])
+            if not widget:
+                continue
+            result.append(
+                {
+                    "id": row["ref_id"],
+                    "dashboard_scope": row["dashboard_scope"],
+                    "widget_id": row["widget_id"],
+                    "sort_order": int(row["sort_order"]),
+                    "created_at": row["ref_created_at"],
+                    "widget": widget,
+                }
+            )
+        return result
+
+    def create_widget_reference(self, dashboard_scope: str, widget_id: str, sort_order: int = 0) -> dict[str, Any]:
+        self.init_schema()
+        widget = self.get_widget(widget_id)
+        if not widget:
+            raise ValueError(f"Widget {widget_id} not found")
+        ref_id = uuid.uuid4().hex[:12]
+        now = int(time.time())
+        with self.connect() as conn:
+            conn.execute(
+                """
+                INSERT INTO widget_references (id, dashboard_scope, widget_id, sort_order, created_at)
+                VALUES (?, ?, ?, ?, ?)
+                """,
+                (ref_id, dashboard_scope, widget_id, sort_order, now),
+            )
+        return {
+            "id": ref_id,
+            "dashboard_scope": dashboard_scope,
+            "widget_id": widget_id,
+            "sort_order": sort_order,
+            "created_at": now,
+            "widget": widget,
+        }
+
+    def delete_widget_reference(self, reference_id: str) -> None:
+        self.init_schema()
+        with self.connect() as conn:
+            conn.execute("DELETE FROM widget_references WHERE id = ?", (reference_id,))
+
+    def update_widget_reference(self, reference_id: str, sort_order: int) -> dict[str, Any]:
+        """Update only the sort_order on a widget reference (per-dashboard reordering)."""
+        self.init_schema()
+        with self.connect() as conn:
+            row = conn.execute(
+                "SELECT * FROM widget_references WHERE id = ?",
+                (reference_id,),
+            ).fetchone()
+            if not row:
+                raise ValueError(f"Reference {reference_id} not found")
+            conn.execute(
+                "UPDATE widget_references SET sort_order = ? WHERE id = ?",
+                (sort_order, reference_id),
+            )
+        widget = self.get_widget(row["widget_id"])
+        return {
+            "id": row["id"],
+            "dashboard_scope": row["dashboard_scope"],
+            "widget_id": row["widget_id"],
+            "sort_order": sort_order,
+            "created_at": int(row["created_at"]),
+            "widget": widget,
+        }
+
+    def detach_widget_reference(self, reference_id: str, dashboard_scope: str) -> dict[str, Any]:
+        """Clone the referenced widget into a new standalone instance owned by the scope."""
+        self.init_schema()
+        with self.connect() as conn:
+            row = conn.execute(
+                "SELECT widget_id FROM widget_references WHERE id = ?",
+                (reference_id,),
+            ).fetchone()
+        if not row:
+            raise ValueError(f"Reference {reference_id} not found")
+        source = self.get_widget(row["widget_id"])
+        if not source:
+            raise ValueError(f"Source widget {row['widget_id']} not found")
+        # Clone: copy the widget verbatim including service_id (so service-bound
+        # widgets keep working), only the id/created_at change.
+        cloned = self.upsert_widget(
+            {
+                "service_id": source.get("service_id"),
+                "widget_kind": source["widget_kind"],
+                "title": source["title"],
+                "config": source["config"],
+                "enabled": source["enabled"],
+                "sort_order": source["sort_order"],
+            }
+        )
+        self.delete_widget_reference(reference_id)
+        return cloned
 
     # ------------------------------------------------------------------
     # Service registry
@@ -1566,6 +1820,113 @@ class SettingsStore:
             for row in rows
         ]
 
+    # ------------------------------------------------------------------
+    # Named dashboards
+    # ------------------------------------------------------------------
+
+    @staticmethod
+    def _slugify(label: str) -> str:
+        import re
+
+        slug = re.sub(r"[^a-z0-9]+", "-", label.lower()).strip("-")
+        return slug or "dashboard"
+
+    def _unique_slug(self, slug: str, exclude_id: str | None = None) -> str:
+        self.init_schema()
+        base = slug
+        suffix = 1
+        with self.connect() as conn:
+            while True:
+                row = conn.execute(
+                    "SELECT id FROM named_dashboards WHERE slug = ? AND id != ?",
+                    (slug, exclude_id or ""),
+                ).fetchone()
+                if not row:
+                    return slug
+                suffix += 1
+                slug = f"{base}-{suffix}"
+
+    def _row_to_dashboard(self, row: sqlite3.Row) -> dict[str, Any]:
+        return {
+            "id": row["id"],
+            "label": row["label"],
+            "slug": row["slug"],
+            "sort_order": row["sort_order"],
+            "payload": json.loads(row["payload_json"] or "{}"),
+            "created_at": row["created_at"],
+            "updated_at": row["updated_at"],
+        }
+
+    def list_dashboards(self) -> list[dict[str, Any]]:
+        self.init_schema()
+        with self.connect() as conn:
+            rows = conn.execute(
+                "SELECT * FROM named_dashboards ORDER BY sort_order ASC, label COLLATE NOCASE"
+            ).fetchall()
+        return [self._row_to_dashboard(row) for row in rows]
+
+    def get_dashboard(self, dashboard_id: str | None) -> dict[str, Any] | None:
+        if not dashboard_id:
+            return None
+        self.init_schema()
+        with self.connect() as conn:
+            row = conn.execute("SELECT * FROM named_dashboards WHERE id = ?", (dashboard_id,)).fetchone()
+        return self._row_to_dashboard(row) if row else None
+
+    def get_dashboard_by_slug(self, slug: str | None) -> dict[str, Any] | None:
+        if not slug:
+            return None
+        self.init_schema()
+        with self.connect() as conn:
+            row = conn.execute("SELECT * FROM named_dashboards WHERE slug = ?", (slug,)).fetchone()
+        return self._row_to_dashboard(row) if row else None
+
+    def upsert_dashboard(self, payload: dict[str, Any], dashboard_id: str | None = None) -> dict[str, Any]:
+        self.init_schema()
+        current = self.get_dashboard(dashboard_id) if dashboard_id else None
+        dash_id = str(payload.get("id") or dashboard_id or uuid.uuid4().hex[:12]).strip()
+        label = str(payload.get("label") or (current or {}).get("label") or "Dashboard").strip()
+        slug = str(payload.get("slug") or "").strip() or self._slugify(label)
+        slug = self._unique_slug(slug, exclude_id=dash_id)
+        sort_order = payload.get("sort_order")
+        if sort_order is None:
+            sort_order = (current or {}).get("sort_order", 0)
+        sort_order = int(sort_order)
+        payload_data = payload.get("payload")
+        if payload_data is None:
+            payload_data = (current or {}).get("payload", {})
+        now = int(time.time())
+        with self.connect() as conn:
+            existing = conn.execute("SELECT created_at FROM named_dashboards WHERE id = ?", (dash_id,)).fetchone()
+            created_at = int(existing[0]) if existing else now
+            conn.execute(
+                """
+                INSERT INTO named_dashboards (id, label, slug, sort_order, payload_json, created_at, updated_at)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+                ON CONFLICT(id) DO UPDATE SET
+                    label = excluded.label,
+                    slug = excluded.slug,
+                    sort_order = excluded.sort_order,
+                    payload_json = excluded.payload_json,
+                    updated_at = excluded.updated_at
+                """,
+                (
+                    dash_id,
+                    label,
+                    slug,
+                    sort_order,
+                    json.dumps(payload_data),
+                    created_at,
+                    now,
+                ),
+            )
+        return self.get_dashboard(dash_id) or {"id": dash_id, "label": label, "slug": slug}
+
+    def delete_dashboard(self, dashboard_id: str) -> None:
+        self.init_schema()
+        with self.connect() as conn:
+            conn.execute("DELETE FROM named_dashboards WHERE id = ?", (dashboard_id,))
+
 
 _store: SettingsStore | None = None
 

backend/src/media_library_viewer_api/widgets/sources.py

@@ -97,13 +97,20 @@ class StaticWidgetSource:
 
 
 class GrafanaWidgetSource:
-    """Build a Grafana deep-link (no embedding)."""
+    """Build a Grafana deep-link or query datasource for a chart."""
 
     async def fetch(self, service: ServiceRecord | None, widget_kind: str, config: dict[str, Any]) -> dict[str, Any]:
         try:
             if service is None:
                 return {"error": "Grafana widget is missing its service"}
             base_url = str(service.config.get("base_url") or "").rstrip("/")
+            api_key = str(service.secrets.get("api_key") or "")
+            timeout = int(service.config.get("timeout_seconds") or 10)
+
+            if widget_kind == "chart":
+                return await self._fetch_chart(base_url, api_key, timeout, config)
+
+            # Default: deep-link
             dashboard_uid = config.get("dashboard_uid")
             if not dashboard_uid:
                 return {"error": "dashboard_uid is required"}
@@ -116,6 +123,90 @@ class GrafanaWidgetSource:
             logger.exception("grafana adapter failed")
             return {"error": f"Grafana link failed: {exc}"}
 
+    async def _fetch_chart(self, base_url: str, api_key: str, timeout: int, config: dict[str, Any]) -> dict[str, Any]:
+        """Query Grafana /api/ds/query and normalize to {series: [...]}."""
+        if not api_key:
+            return {"error": "Grafana api_key is required for chart queries"}
+        query = config.get("query", "")
+        if not query:
+            return {"error": "query is required"}
+
+        datasource_uid = config.get("datasource_uid", "prometheus")
+        body = {
+            "queries": [
+                {
+                    "datasource": {"uid": datasource_uid, "type": "prometheus"},
+                    "expr": query,
+                    "format": "time_series",
+                    "intervalMs": int(config.get("interval_ms", 30_000)),
+                    "maxDataPoints": int(config.get("max_data_points", 100)),
+                    "refId": "A",
+                }
+            ],
+            "from": config.get("from_ts", "now-1h"),
+            "to": config.get("to_ts", "now"),
+        }
+
+        def _do_post() -> dict[str, Any]:
+            resp = requests.post(
+                f"{base_url}/api/ds/query",
+                json=body,
+                headers={
+                    "Authorization": f"Bearer {api_key}",
+                    "Content-Type": "application/json",
+                },
+                timeout=timeout,
+            )
+            resp.raise_for_status()
+            return resp.json()
+
+        try:
+            raw = await asyncio.wait_for(asyncio.to_thread(_do_post), timeout=timeout)
+        except asyncio.TimeoutError:
+            return {"error": "Grafana query timed out"}
+        except requests.RequestException as exc:
+            return {"error": f"Grafana query failed: {exc}"}
+
+        # Normalize Grafana's /api/ds/query response into series.
+        series: list[dict[str, Any]] = []
+        results = raw.get("results", {})
+        seen_labels: dict[str, int] = {}
+        for ref_id, ref_data in results.items():
+            for frame in ref_data.get("frames", []):
+                values = frame.get("data", {}).get("values", [])
+                if len(values) < 2:
+                    continue
+                timestamps = values[0]
+                vals = values[1]
+                # Derive a meaningful series label from the frame metadata.
+                # Prometheus frames carry metric labels in schema.fields[-1].labels.
+                fields = frame.get("schema", {}).get("fields", [])
+                value_field = fields[-1] if fields else {}
+                # Prefer displayName (explicitly set in Grafana), then Prometheus
+                # labels (e.g. {instance: "server:9100", mode: "iowait"}), then
+                # the field name as a last resort.
+                display_name = value_field.get("config", {}).get("displayName") or value_field.get("displayName")
+                frame_labels = value_field.get("labels") or {}
+                if display_name:
+                    label = str(display_name)
+                elif frame_labels:
+                    # Build a readable label from the Prometheus labels, excluding
+                    # redundant ones like __name__.
+                    parts = [f"{k}={v}" for k, v in sorted(frame_labels.items()) if not k.startswith("__")]
+                    label = " ".join(parts) if parts else "value"
+                else:
+                    label = value_field.get("name", "value")
+                # Ensure unique labels when multiple series share the same name.
+                if label in seen_labels:
+                    seen_labels[label] += 1
+                    label = f"{label} ({seen_labels[label]})"
+                else:
+                    seen_labels[label] = 0
+                points = [{"t": int(t), "v": float(v) if v is not None else None} for t, v in zip(timestamps, vals)]
+                series.append({"label": label, "points": points})
+
+        return {"series": series}
+
 
 class PrometheusWidgetSource:
     """Run a PromQL instant query against a Prometheus service."""
@@ -208,6 +299,10 @@ class JellyfinWidgetSource:
                 asyncio.to_thread(client.sessions),
                 timeout=timeout,
             )
+            if widget_kind == "now_playing":
+                sessions = [
+                    s for s in sessions if s.get("NowPlayingItem") and not s.get("PlayState", {}).get("IsPaused", True)
+                ]
             rows = _map_sessions_to_activity_rows(sessions)
             return {"sessions": rows}
         except asyncio.TimeoutError:

backend/src/media_library_viewer_api/workers/media_index_worker.py

@@ -14,7 +14,6 @@ from pathlib import Path
 from typing import Any
 
 from media_library_viewer_api.config import get_settings
-from media_library_viewer_api.dependencies import get_jellyfin_client, get_user_id
 from media_library_viewer_api.logging_utils import configure_logging, describe_settings
 from media_library_viewer_api.services.media_index import (
     MediaIndex,
@@ -88,15 +87,70 @@ def _progress_callback(index: MediaIndex, pid: int, state: dict[str, Any]) -> No
     )
 
 
-def run_build(final_index_path: str | Path, staging_index_path: str | Path) -> int:
+def _resolve_jellyfin(service_id: str) -> tuple[Any, str]:
+    """Resolve the Jellyfin client + user_id from the settings store.
+
+    In a subprocess we cannot use the FastAPI dependency layer (no request),
+    so we query the settings store directly. When ``service_id`` is given,
+    resolve that specific instance; otherwise fall back to first-enabled.
+    """
+    from media_library_viewer_api.clients.jellyfin import JellyfinClient
+    from media_library_viewer_api.dependencies import _service_record, get_settings_store
+
+    store = get_settings_store()
+    service = _service_record(store, "jellyfin", service_id or None)
+    if service is None:
+        raise RuntimeError("No Jellyfin service is configured. Add a Jellyfin service on the Services page.")
+    base_url = str(service.get("config", {}).get("base_url") or "")
+    api_key = str(service.get("secrets", {}).get("api_key") or "")
+    if not base_url or not api_key:
+        raise RuntimeError("Jellyfin service is missing base_url or api_key. Edit it on the Services page.")
+    timeout = int(service.get("config", {}).get("timeout_seconds", 10))
+    client = JellyfinClient(base_url, api_key, timeout)
+    user_id = str(service.get("config", {}).get("user_id") or "")
+    if not user_id:
+        users = client.users()
+        if not users:
+            raise RuntimeError("No Jellyfin users found and no user_id configured on the service")
+        user_id = users[0]["Id"]
+    else:
+        # Try the configured user_id directly. It might be the internal
+        # Jellyfin Id (a long hash) — in that case libraries() succeeds
+        # without an extra users() round-trip. Only if it fails do we
+        # resolve it via the users API (the config field accepts usernames
+        # like 'admin' too, but Jellyfin's API rejects them on /Users/<id>).
+        try:
+            client.libraries(user_id)
+        except Exception:
+            users = client.users()
+            match = next((u for u in users if str(u.get("Name", "")) == user_id), None)
+            if match:
+                resolved = match["Id"]
+                logger.info(
+                    "Resolved username '%s' to Jellyfin Id '%s'",
+                    user_id,
+                    resolved,
+                )
+                user_id = resolved
+            elif users:
+                user_id = users[0]["Id"]
+                logger.warning(
+                    "user_id '%s' not found; falling back to first user",
+                    service.get("config", {}).get("user_id"),
+                )
+    return client, user_id
+
+
+def run_build(final_index_path: str | Path, staging_index_path: str | Path, service_id: str = "") -> int:
     """Run the media index build in a subprocess."""
     settings = get_settings()
     configure_logging(settings.log_level)
     logger.info("Media index worker starting: %s", describe_settings(settings))
-    client = get_jellyfin_client()
-    user_id = get_user_id()
-    libraries = client.libraries(user_id)
 
+    # Create the indexes BEFORE the try block so the except handler can write
+    # error state to the DB. If _resolve_jellyfin or client.libraries fails,
+    # the worker needs to record the error — otherwise the status stays
+    # "queued" forever with no feedback.
     final_index = MediaIndex(final_index_path)
     staging_index = MediaIndex(staging_index_path)
     pid = os.getpid()
@@ -104,10 +158,13 @@ def run_build(final_index_path: str | Path, staging_index_path: str | Path) -> i
 
     staging_path = Path(staging_index.db_path)
     staging_path.unlink(missing_ok=True)
+
+    try:
+        client, user_id = _resolve_jellyfin(service_id)
+        libraries = client.libraries(user_id)
         logger.info("Media index worker pid=%s libraries=%s", pid, len(libraries))
         _start_state(final_index, pid, len(libraries))
 
-    try:
         count = build_media_index(
             client,
             user_id,
@@ -192,8 +249,9 @@ def main() -> int:
     parser = argparse.ArgumentParser(description="Build the media index in a worker process")
     parser.add_argument("--index-path", required=True)
     parser.add_argument("--staging-path", required=True)
+    parser.add_argument("--service-id", default="", help="Jellyfin service instance id")
     args = parser.parse_args()
-    return run_build(args.index_path, args.staging_path)
+    return run_build(args.index_path, args.staging_path, args.service_id)
 
 
 if __name__ == "__main__":  # pragma: no cover

backend/tests/test_api.py

@@ -14,8 +14,6 @@ from fastapi.testclient import TestClient
 from media_library_viewer_api.clients.ssh import CommandResult
 from media_library_viewer_api.dependencies import (
     get_jellyfin_client,
-    get_jellyseerr_client,
-    get_mail_queue,
     get_settings_store,
     get_ssh_client,
     get_user_id,
@@ -28,6 +26,7 @@ from media_library_viewer_api.widgets.sources import ServiceRecord
 
 # Short alias for the monitoring router module under test.
 _MON = "media_library_viewer_api.routers.monitoring"
+_SVC = "media_library_viewer_api.services.service_resolution"
 
 # --- Fixtures ---
 
@@ -70,38 +69,6 @@ def mock_jellyfin():
     return client
 
 
-@pytest.fixture
-def mock_jellyseerr():
-    """Mock Jellyseerr client."""
-    client = MagicMock()
-    client.jellyfin_users.return_value = [
-        {"id": "jf1", "username": "alex", "thumb": "/avatarproxy/alex", "email": "alex@example.com"},
-        {"id": "jf2", "username": "sam", "thumb": "/avatarproxy/sam", "email": "sam@example.com"},
-    ]
-    client.users.return_value = [
-        {
-            "id": 7,
-            "username": "alex",
-            "email": "alex@example.com",
-            "avatar": "/avatarproxy/alex",
-            "userType": 3,
-            "permissions": 10,
-            "requestCount": 3,
-        },
-        {
-            "id": 8,
-            "username": "sam",
-            "email": "sam@example.com",
-            "avatar": "/avatarproxy/sam",
-            "userType": 2,
-            "permissions": 32,
-            "requestCount": 1,
-        },
-    ]
-    client.absolute_url.side_effect = lambda path: f"https://requests.example.com{path}"
-    return client
-
-
 @pytest.fixture
 def mock_ssh():
     """Mock SSH client."""
@@ -132,10 +99,9 @@ def mock_ssh():
 
 
 @pytest.fixture
-def test_client(mock_jellyfin, mock_jellyseerr, mock_ssh, tmp_path):
+def test_client(mock_jellyfin, mock_ssh, tmp_path):
     """FastAPI test client with mocked dependencies."""
     app.dependency_overrides[get_jellyfin_client] = lambda: mock_jellyfin
-    app.dependency_overrides[get_jellyseerr_client] = lambda: mock_jellyseerr
     app.dependency_overrides[get_ssh_client] = lambda: mock_ssh
     app.dependency_overrides[get_user_id] = lambda: "user123"
     store = SettingsStore(tmp_path / "settings.sqlite")
@@ -293,122 +259,6 @@ class TestSettingsReset:
         assert len(store.list_machines()) == 0
 
 
-# --- Users ---
-
-
-class TestUsers:
-    def test_users_list_enriched(self, test_client):
-        response = test_client.get("/api/users")
-        assert response.status_code == 200
-        data = response.json()
-        assert data["total"] == 2
-        assert data["jellyseerr_configured"] is True
-        assert data["jellyseerr_available"] is True
-        assert data["jellyseerr_error"] == ""
-
-        alex = next(item for item in data["items"] if item["username"] == "alex")
-        assert alex["email"] == "alex@example.com"
-        assert alex["email_source"] == "jellyseerr:user"
-        assert alex["contactable"] is True
-        assert alex["avatar"].startswith("https://requests.example.com/")
-        assert alex["avatar_source"] == "jellyseerr:user"
-        assert alex["permissions"] == 10
-        assert alex["permissions_label"] == "admin, manage_users"
-        assert alex["role"] == "admin"
-        assert alex["user_type_label"] == "jellyfin"
-        assert alex["request_count"] == 3
-        assert "name=jellyfin" in alex["source_summary"]
-        assert "email=jellyseerr:user" in alex["source_summary"]
-
-        sam = next(item for item in data["items"] if item["username"] == "sam")
-        assert sam["role"] == "requester"
-        assert sam["user_type_label"] == "local"
-        assert sam["email"] == "sam@example.com"
-
-    def test_users_message_status(self, test_client):
-        mail_queue = MagicMock()
-        mail_queue.status.return_value = {
-            "state": "idle",
-            "worker_running": True,
-            "stop_requested": False,
-            "pending_count": 0,
-            "active_request_id": None,
-            "last_request_id": None,
-            "last_result": None,
-            "last_error": "",
-            "last_error_at": None,
-            "last_success_at": None,
-            "last_activity_at": None,
-            "sent_count": 0,
-            "failed_count": 0,
-        }
-        app.dependency_overrides[get_mail_queue] = lambda: mail_queue
-        try:
-            response = test_client.get("/api/users/message/status")
-        finally:
-            app.dependency_overrides.pop(get_mail_queue, None)
-        assert response.status_code == 200
-        assert response.json()["state"] == "idle"
-        assert response.json()["pending_count"] == 0
-
-    def test_users_message_is_queued(self, test_client):
-        mail_queue = MagicMock()
-        mail_queue.status.return_value = {
-            "state": "idle",
-            "worker_running": True,
-            "stop_requested": False,
-            "pending_count": 0,
-            "active_request_id": None,
-            "last_request_id": None,
-            "last_result": None,
-            "last_error": "",
-            "last_error_at": None,
-            "last_success_at": None,
-            "last_activity_at": None,
-            "sent_count": 0,
-            "failed_count": 0,
-        }
-        mail_queue.enqueue.return_value = "mail-123456"
-        app.dependency_overrides[get_mail_queue] = lambda: mail_queue
-        settings = SimpleNamespace(
-            smtp_host="smtp.example.com",
-            smtp_port=587,
-            smtp_username="mailer@example.com",
-            smtp_password="secret",
-            smtp_from_address="mailer@example.com",
-            smtp_from_name="Manage",
-            smtp_use_tls=True,
-            smtp_use_ssl=False,
-            smtp_timeout=15,
-        )
-
-        try:
-            with patch("media_library_viewer_api.routers.users_impl.get_settings", return_value=settings):
-                response = test_client.post(
-                    "/api/users/message",
-                    data={
-                        "recipient_ids": json.dumps(["jf1", "jf2"]),
-                        "subject": "Hello team",
-                        "html_body": "<p>Hi there</p>",
-                        "text_body": "Hi there",
-                    },
-                )
-        finally:
-            app.dependency_overrides.pop(get_mail_queue, None)
-
-        assert response.status_code == 202
-        data = response.json()
-        assert data["status"] == "queued"
-        assert data["request_id"] == "mail-123456"
-        assert data["recipient_count"] == 2
-        assert data["attachment_count"] == 0
-        mail_queue.enqueue.assert_called_once()
-        kwargs = mail_queue.enqueue.call_args.kwargs
-        assert kwargs["recipients"] == ["alex@example.com", "sam@example.com"]
-        assert kwargs["subject"] == "Hello team"
-        assert kwargs["settings"] is settings
-
-
 # --- Files ---
 
 
@@ -513,7 +363,7 @@ class TestMediaIndexApi:
                 assert data["status"] == "started"
                 assert data["build_running"] is True
                 assert data["build_stage"] == "queued"
-                assert data["build_libraries_total"] == len(mock_jellyfin.libraries.return_value)
+                assert data["build_libraries_total"] == 0
                 assert data["build_pid"] == 4321
                 start_worker.assert_called_once()
             finally:
@@ -647,7 +497,7 @@ class TestMonitoring:
 
 
 class TestResolveServiceRecord:
-    """Unit tests for _resolve_service_record (service_id + first-enabled paths)."""
+    """Unit tests for resolve_service_record (service_id + first-enabled paths)."""
 
     def _store(self, rows):
         store = MagicMock()
@@ -660,31 +510,31 @@ class TestResolveServiceRecord:
         return store
 
     def test_service_id_match_returns_record(self):
-        from media_library_viewer_api.routers.monitoring import _resolve_service_record
+        from media_library_viewer_api.services.service_resolution import resolve_service_record
 
         row = {"id": "am1", "service_type": "alertmanager", "name": "AM", "enabled": True, "config": {}, "secrets": {}}
         store = self._store([row])
-        with patch(f"{_MON}.build_service_record", return_value="RECORD") as mock_build:
+        with patch(f"{_SVC}.build_service_record", return_value="RECORD") as mock_build:
-            result = _resolve_service_record(store, "alertmanager", "am1")
+            result = resolve_service_record(store, "alertmanager", "am1")
         assert result == "RECORD"
         mock_build.assert_called_once_with(store, row)
 
     def test_service_id_type_mismatch_returns_none(self):
-        from media_library_viewer_api.routers.monitoring import _resolve_service_record
+        from media_library_viewer_api.services.service_resolution import resolve_service_record
 
         row = {"id": "x1", "service_type": "grafana", "name": "G", "enabled": True, "config": {}, "secrets": {}}
         store = self._store([row])
-        assert _resolve_service_record(store, "alertmanager", "x1") is None
+        assert resolve_service_record(store, "alertmanager", "x1") is None
 
     def test_service_id_disabled_returns_none(self):
-        from media_library_viewer_api.routers.monitoring import _resolve_service_record
+        from media_library_viewer_api.services.service_resolution import resolve_service_record
 
         row = {"id": "am1", "service_type": "alertmanager", "name": "AM", "enabled": False, "config": {}, "secrets": {}}
         store = self._store([row])
-        assert _resolve_service_record(store, "alertmanager", "am1") is None
+        assert resolve_service_record(store, "alertmanager", "am1") is None
 
     def test_no_service_id_returns_first_enabled(self):
-        from media_library_viewer_api.routers.monitoring import _resolve_service_record
+        from media_library_viewer_api.services.service_resolution import resolve_service_record
 
         rows = [
             {
@@ -705,16 +555,16 @@ class TestResolveServiceRecord:
             },
         ]
         store = self._store(rows)
-        with patch(f"{_MON}.build_service_record", return_value="RECORD") as mock_build:
+        with patch(f"{_SVC}.build_service_record", return_value="RECORD") as mock_build:
-            result = _resolve_service_record(store, "alertmanager", None)
+            result = resolve_service_record(store, "alertmanager", None)
         assert result == "RECORD"
         mock_build.assert_called_once_with(store, rows[1])
 
     def test_no_service_id_and_none_enabled_returns_none(self):
-        from media_library_viewer_api.routers.monitoring import _resolve_service_record
+        from media_library_viewer_api.services.service_resolution import resolve_service_record
 
         store = self._store([])
-        assert _resolve_service_record(store, "alertmanager", None) is None
+        assert resolve_service_record(store, "alertmanager", None) is None
 
 
 class TestSettingsMachines:
@@ -775,7 +625,7 @@ class TestAlertmanager:
     def test_alerts_endpoint_when_unreachable(self, test_client):
         service = _am_service()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", side_effect=Exception("connection refused")),
         ):
             response = test_client.get("/api/monitoring/alerts")
@@ -802,7 +652,7 @@ class TestAlertmanager:
         }
         resp.raise_for_status = MagicMock()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", return_value=resp),
         ):
             response = test_client.get("/api/monitoring/alerts")
@@ -820,7 +670,7 @@ class TestAlertmanager:
         resp.json.return_value = {"status": "success", "data": []}
         resp.raise_for_status = MagicMock()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", return_value=resp) as mock_get,
         ):
             test_client.get("/api/monitoring/alerts")
@@ -838,7 +688,7 @@ class TestAlertmanager:
     def test_alertmanager_status_when_unreachable(self, test_client):
         service = _am_service()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", side_effect=Exception("refused")),
         ):
             response = test_client.get("/api/monitoring/alertmanager-status")
@@ -858,7 +708,7 @@ class TestAlertmanager:
         }
         resp.raise_for_status = MagicMock()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", return_value=resp),
         ):
             response = test_client.get("/api/monitoring/alertmanager-status")
@@ -904,7 +754,7 @@ class TestGrafanaStatus:
             id="g1", service_type="grafana", name="Grafana", config={"base_url": "http://grafana:3000"}
         )
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", side_effect=Exception("refused")),
         ):
             response = test_client.get("/api/monitoring/grafana-status")
@@ -922,7 +772,7 @@ class TestGrafanaStatus:
         resp.json.return_value = {"version": "11.3.1", "database": "ok"}
         resp.raise_for_status = MagicMock()
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", return_value=resp),
         ):
             response = test_client.get("/api/monitoring/grafana-status")
@@ -946,7 +796,7 @@ class TestPrometheusStatus:
             id="p1", service_type="prometheus", name="Prometheus", config={"base_url": "http://prometheus:9090"}
         )
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", side_effect=Exception("refused")),
         ):
             response = test_client.get("/api/monitoring/prometheus-status")
@@ -965,7 +815,7 @@ class TestPrometheusStatus:
         build_info.raise_for_status = MagicMock()
         build_info.json.return_value = {"status": "success", "data": {"version": "2.55.1"}}
         with (
-            patch(f"{_MON}._resolve_service_record", return_value=service),
+            patch(f"{_MON}.resolve_service_record", return_value=service),
             patch(f"{_MON}.requests.get", side_effect=[health, build_info]),
         ):
             response = test_client.get("/api/monitoring/prometheus-status")

backend/tests/test_authentik_client.py

@@ -0,0 +1,183 @@
+"""Tests for AuthentikClient and the directory endpoint."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+from cryptography.fernet import Fernet
+from fastapi.testclient import TestClient
+
+from media_library_viewer_api.clients.authentik import AuthentikClient
+from media_library_viewer_api.dependencies import get_settings_store
+from media_library_viewer_api.main import app
+from media_library_viewer_api.services.secrets import reset_encryption_key_cache
+from media_library_viewer_api.services.settings_store import SettingsStore
+
+TEST_KEY = Fernet.generate_key().decode()
+
+
+@pytest.fixture(autouse=True)
+def _encryption_key(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Provide a stable MANAGE_ENCRYPTION_KEY for every test."""
+    monkeypatch.setenv("MANAGE_ENCRYPTION_KEY", TEST_KEY)
+    reset_encryption_key_cache()
+    yield
+    reset_encryption_key_cache()
+
+
+@pytest.fixture()
+def store(tmp_path: Path) -> SettingsStore:
+    s = SettingsStore(tmp_path / "settings.sqlite")
+    s.ensure_defaults()
+    app.dependency_overrides[get_settings_store] = lambda: s
+    yield s
+    app.dependency_overrides.clear()
+
+
+# ---------------------------------------------------------------------------
+# Client unit tests
+# ---------------------------------------------------------------------------
+
+
+class TestAuthentikClient:
+    def test_base_url_normalizes_trailing_slash(self) -> None:
+        c = AuthentikClient(base_url="https://auth.example.com/", api_token="t")
+        assert c.base_url == "https://auth.example.com"
+
+    def test_base_url_strips_api_v3_suffix(self) -> None:
+        c = AuthentikClient(base_url="https://auth.example.com/api/v3", api_token="t")
+        assert c.base_url == "https://auth.example.com"
+
+    def test_bearer_header_is_set(self) -> None:
+        c = AuthentikClient(base_url="https://auth.example.com", api_token="tok")
+        assert c.session.headers["Authorization"] == "Bearer tok"
+
+    def test_empty_base_url_raises(self) -> None:
+        with pytest.raises(ValueError):
+            AuthentikClient(base_url="", api_token="t")
+
+    def test_empty_api_token_raises(self) -> None:
+        with pytest.raises(ValueError):
+            AuthentikClient(base_url="https://auth.example.com", api_token="")
+
+    @patch.object(AuthentikClient, "get")
+    def test_users_normalizes_pagination(self, mock_get: MagicMock) -> None:
+        mock_get.return_value = {
+            "pagination": {"count": 42, "next": 2, "previous": 0, "current": 1},
+            "results": [
+                {"pk": 1, "username": "alice", "email": "alice@example.com"},
+                {"pk": 2, "username": "bob", "email": "bob@example.com"},
+            ],
+        }
+        client = AuthentikClient(base_url="https://auth.example.com", api_token="t")
+        result = client.users(search="ali", page=1, page_size=2)
+        assert result["total"] == 42
+        assert result["page"] == 1
+        assert result["page_size"] == 2
+        assert len(result["items"]) == 2
+        assert result["items"][0]["username"] == "alice"
+
+    @patch.object(AuthentikClient, "get")
+    def test_users_handles_empty_results(self, mock_get: MagicMock) -> None:
+        mock_get.return_value = {"pagination": {"count": 0}, "results": []}
+        client = AuthentikClient(base_url="https://auth.example.com", api_token="t")
+        result = client.users()
+        assert result["items"] == []
+        assert result["total"] == 0
+
+    @patch.object(AuthentikClient, "get")
+    def test_users_handles_non_dict_payload(self, mock_get: MagicMock) -> None:
+        mock_get.return_value = []
+        client = AuthentikClient(base_url="https://auth.example.com", api_token="t")
+        result = client.users()
+        assert result["items"] == []
+        assert result["total"] == 0
+
+    @patch("media_library_viewer_api.clients.authentik.requests.Session")
+    def test_get_sends_correct_url_and_params(self, mock_session_cls: MagicMock) -> None:
+        mock_session = MagicMock()
+        mock_session_cls.return_value = mock_session
+        mock_response = MagicMock()
+        mock_response.json.return_value = {"results": []}
+        mock_response.raise_for_status.return_value = None
+        mock_session.get.return_value = mock_response
+
+        c = AuthentikClient(base_url="https://auth.example.com", api_token="t")
+        c.get("/core/users/", search="x", page=2)
+
+        call_args = mock_session.get.call_args
+        assert call_args.kwargs["params"] == {"search": "x", "page": 2}
+        assert call_args.args[0] == "https://auth.example.com/api/v3/core/users/"
+
+
+# ---------------------------------------------------------------------------
+# Endpoint integration tests
+# ---------------------------------------------------------------------------
+
+
+class TestAuthentikUsersEndpoint:
+    def test_not_configured_returns_empty_with_error(self, store: SettingsStore) -> None:
+        client = TestClient(app)
+        response = client.get("/api/services/authentik/nonexistent/users")
+        assert response.status_code == 200
+        data = response.json()
+        assert data["items"] == []
+        assert data["total"] == 0
+        assert "error" in data
+
+    @patch("media_library_viewer_api.routers.authentik_users.AuthentikClient")
+    def test_success_returns_users(self, mock_client_cls: MagicMock, store: SettingsStore) -> None:
+        mock_client = MagicMock()
+        mock_client.users.return_value = {
+            "items": [{"pk": 1, "username": "alice"}],
+            "total": 1,
+            "page": 1,
+            "page_size": 50,
+        }
+        mock_client_cls.return_value = mock_client
+
+        created = store.upsert_service(
+            {
+                "service_type": "authentik",
+                "name": "Main",
+                "config": {"base_url": "https://auth.example.com"},
+                "enabled": True,
+            },
+            secret_values={"api_token": "secret-token"},
+        )
+        service_id = created["id"]
+
+        client = TestClient(app)
+        response = client.get(f"/api/services/authentik/{service_id}/users?search=ali")
+        assert response.status_code == 200
+        data = response.json()
+        assert len(data["items"]) == 1
+        assert data["items"][0]["username"] == "alice"
+        assert data["total"] == 1
+        assert "error" not in data
+
+    @patch("media_library_viewer_api.routers.authentik_users.AuthentikClient")
+    def test_unreachable_returns_error(self, mock_client_cls: MagicMock, store: SettingsStore) -> None:
+        mock_client = MagicMock()
+        mock_client.users.side_effect = ConnectionError("refused")
+        mock_client_cls.return_value = mock_client
+
+        created = store.upsert_service(
+            {
+                "service_type": "authentik",
+                "name": "Main",
+                "config": {"base_url": "https://auth.example.com"},
+                "enabled": True,
+            },
+            secret_values={"api_token": "secret-token"},
+        )
+        service_id = created["id"]
+
+        client = TestClient(app)
+        response = client.get(f"/api/services/authentik/{service_id}/users")
+        assert response.status_code == 200
+        data = response.json()
+        assert data["items"] == []
+        assert "error" in data

backend/tests/test_dashboards.py

@@ -0,0 +1,97 @@
+"""Tests for named-dashboards CRUD + slug uniqueness."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from fastapi.testclient import TestClient
+
+from media_library_viewer_api.dependencies import get_settings_store
+from media_library_viewer_api.main import app
+from media_library_viewer_api.services.settings_store import SettingsStore
+
+
+def _client(tmp_path: Path) -> TestClient:
+    store = SettingsStore(tmp_path / "settings.sqlite")
+    app.dependency_overrides[get_settings_store] = lambda: store
+    client = TestClient(app)
+    client.store = store  # type: ignore[attr-defined]
+    return client
+
+
+def test_create_and_list_dashboards(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        resp = client.post(
+            "/api/dashboards",
+            json={"label": "Storage Overview", "payload": {"widgets": []}},
+        )
+        assert resp.status_code == 200
+        created = resp.json()
+        assert created["label"] == "Storage Overview"
+        assert created["slug"] == "storage-overview"
+        assert created["payload"] == {"widgets": []}
+
+        listed = client.get("/api/dashboards").json()
+        assert len(listed) == 1
+        assert listed[0]["id"] == created["id"]
+    finally:
+        app.dependency_overrides.clear()
+
+
+def test_update_dashboard(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        created = client.post("/api/dashboards", json={"label": "First"}).json()
+        updated = client.put(
+            f"/api/dashboards/{created['id']}",
+            json={"label": "Renamed", "payload": {"widgets": ["w1"]}},
+        ).json()
+        assert updated["label"] == "Renamed"
+        assert updated["payload"] == {"widgets": ["w1"]}
+        assert updated["slug"] == "renamed"
+    finally:
+        app.dependency_overrides.clear()
+
+
+def test_delete_dashboard(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        created = client.post("/api/dashboards", json={"label": "Temp"}).json()
+        resp = client.delete(f"/api/dashboards/{created['id']}")
+        assert resp.status_code == 200
+        assert client.get("/api/dashboards").json() == []
+    finally:
+        app.dependency_overrides.clear()
+
+
+def test_slug_collision_appends_suffix(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        first = client.post("/api/dashboards", json={"label": "Overview"}).json()
+        second = client.post("/api/dashboards", json={"label": "Overview"}).json()
+        assert first["slug"] == "overview"
+        assert second["slug"] == "overview-2"
+    finally:
+        app.dependency_overrides.clear()
+
+
+def test_explicit_slug_respected(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        created = client.post(
+            "/api/dashboards",
+            json={"label": "My Dashboard", "slug": "custom-slug"},
+        ).json()
+        assert created["slug"] == "custom-slug"
+    finally:
+        app.dependency_overrides.clear()
+
+
+def test_update_nonexistent_returns_404(tmp_path: Path):
+    client = _client(tmp_path)
+    try:
+        resp = client.put("/api/dashboards/nope", json={"label": "X"})
+        assert resp.status_code == 404
+    finally:
+        app.dependency_overrides.clear()

backend/tests/test_services.py

@@ -57,24 +57,55 @@ def client(tmp_path):
 # ---------------------------------------------------------------------------
 
 
-def test_registry_contains_seven_service_types():
+def test_registry_contains_eight_service_types():
     assert set(SERVICE_DEFINITIONS) == {
         "grafana",
         "prometheus",
         "alertmanager",
         "jellyfin",
-        "jellyseerr",
         "nextcloud",
         "ssh_tasks",
+        "backups",
+        "authentik",
     }
 
 
+def test_jellyseerr_absorbed_into_jellyfin():
+    """Jellyseerr is no longer its own service type (absorbed into Jellyfin)."""
+    assert "jellyseerr" not in SERVICE_DEFINITIONS
+    jellyfin_config = get_service_definition("jellyfin").config_schema["properties"]
+    assert "jellyseerr_url" in jellyfin_config
+    assert "jellyseerr_api_key" in jellyfin_config
+
+
+def test_backups_service_definition():
+    definition = get_service_definition("backups")
+    assert definition is not None
+    assert definition.secret_fields == []
+    assert {wk.kind for wk in definition.widget_kinds} == {"summary"}
+    schema = definition.config_schema
+    assert "ingestion_label" in schema["properties"]
+
+
+def test_authentik_service_definition():
+    definition = get_service_definition("authentik")
+    assert definition is not None
+    assert {sf.key for sf in definition.secret_fields} == {"api_token"}
+    assert definition.secret_fields[0].required is True
+    assert definition.widget_kinds == []
+    schema = definition.config_schema
+    assert "base_url" in schema["properties"]
+    assert "timeout_seconds" in schema["properties"]
+
+
 def test_definitions_declare_widget_kinds():
-    assert {wk.kind for wk in get_service_definition("grafana").widget_kinds} == {"link"}
+    assert {wk.kind for wk in get_service_definition("grafana").widget_kinds} == {"link", "chart"}
     assert {wk.kind for wk in get_service_definition("prometheus").widget_kinds} == {"metric"}
     assert {wk.kind for wk in get_service_definition("alertmanager").widget_kinds} == {"active_alerts"}
-    assert {wk.kind for wk in get_service_definition("jellyfin").widget_kinds} == {"activity"}
+    assert {wk.kind for wk in get_service_definition("jellyfin").widget_kinds} == {"activity", "now_playing"}
     assert get_service_definition("nextcloud").widget_kinds == []
+    assert get_service_definition("authentik").widget_kinds == []
+    assert {wk.kind for wk in get_service_definition("backups").widget_kinds} == {"summary"}
     assert {wk.kind for wk in get_service_definition("ssh_tasks").widget_kinds} == {"task_output"}
 
 
@@ -139,9 +170,10 @@ def test_list_service_types(client):
     types = {item["service_type"] for item in response.json()}
     assert types == {
         "alertmanager",
+        "authentik",
+        "backups",
         "grafana",
         "jellyfin",
-        "jellyseerr",
         "nextcloud",
         "prometheus",
         "ssh_tasks",
@@ -152,7 +184,7 @@ def test_service_type_includes_secret_and_widget_metadata(client):
     response = client.get("/api/services/types")
     grafana = next(item for item in response.json() if item["service_type"] == "grafana")
     assert [sf["key"] for sf in grafana["secret_fields"]] == ["api_key"]
-    assert [wk["kind"] for wk in grafana["widget_kinds"]] == ["link"]
+    assert [wk["kind"] for wk in grafana["widget_kinds"]] == ["link", "chart"]
 
 
 # ---------------------------------------------------------------------------
@@ -265,7 +297,7 @@ def test_service_base_url_requires_http_schema(bad_url):
 
 
 @pytest.mark.parametrize(
-    "service_type", ["grafana", "prometheus", "alertmanager", "jellyfin", "jellyseerr", "nextcloud"]
+    "service_type", ["grafana", "prometheus", "alertmanager", "jellyfin", "authentik", "nextcloud"]
 )
 def test_service_base_url_accepts_absolute_urls(service_type):
     model = get_service_definition(service_type).config_model
@@ -390,3 +422,99 @@ def test_record_and_list_service_task_runs(client):
     assert len(runs) == 1
     assert runs[0]["status"] == "success"
     assert runs[0]["stdout_tail"] == "ok"
+
+
+# ---------------------------------------------------------------------------
+# Jellyseerr → Jellyfin migration (Slice 1.4 / 1.5)
+# ---------------------------------------------------------------------------
+
+
+def test_jellyseerr_migrates_into_single_jellyfin(tmp_path):
+    """A standalone jellyseerr service merges into the only jellyfin instance."""
+    store = SettingsStore(tmp_path / "settings.sqlite")
+    store.ensure_defaults()
+
+    jellyfin = store.upsert_service(
+        {
+            "service_type": "jellyfin",
+            "name": "Main Jellyfin",
+            "config": {"base_url": "https://jellyfin.example.com"},
+            "enabled": True,
+        },
+        secret_values={"api_key": "jf-key"},
+    )
+    store.upsert_service(
+        {
+            "service_type": "jellyseerr",
+            "name": "Main Jellyseerr",
+            "config": {"base_url": "https://jellyseerr.example.com"},
+            "enabled": True,
+        },
+        secret_values={"api_key": "js-key"},
+    )
+
+    # Run migration via ensure_defaults (idempotent entry point).
+    store.ensure_defaults()
+
+    # Jellyseerr row is gone.
+    assert store.list_services("jellyseerr") == []
+
+    # Jellyfin config gained the absorbed fields.
+    migrated = store.get_service(jellyfin["id"])
+    assert migrated["config"]["jellyseerr_url"] == "https://jellyseerr.example.com"
+    assert migrated["config"]["jellyseerr_api_key"] == "js-key"
+
+
+def test_jellyseerr_dropped_when_no_jellyfin(tmp_path):
+    """An unpaired jellyseerr (no jellyfin) is dropped with a warning, no crash."""
+    store = SettingsStore(tmp_path / "settings.sqlite")
+    store.ensure_defaults()
+
+    store.upsert_service(
+        {
+            "service_type": "jellyseerr",
+            "name": "Orphan Jellyseerr",
+            "config": {"base_url": "https://jellyseerr.example.com"},
+            "enabled": True,
+        },
+        secret_values={"api_key": "js-key"},
+    )
+
+    store.ensure_defaults()
+
+    assert store.list_services("jellyseerr") == []
+    assert store.list_services("jellyfin") == []
+
+
+def test_jellyseerr_migration_is_idempotent(tmp_path):
+    """Running ensure_defaults twice does nothing the second time."""
+    store = SettingsStore(tmp_path / "settings.sqlite")
+    store.ensure_defaults()
+
+    store.upsert_service(
+        {
+            "service_type": "jellyfin",
+            "name": "JF",
+            "config": {"base_url": "https://jellyfin.example.com"},
+            "enabled": True,
+        },
+        secret_values={"api_key": "k"},
+    )
+    store.upsert_service(
+        {
+            "service_type": "jellyseerr",
+            "name": "JS",
+            "config": {"base_url": "https://jellyseerr.example.com"},
+            "enabled": True,
+        },
+        secret_values={"api_key": "k"},
+    )
+
+    store.ensure_defaults()
+    first_jellyfin = store.list_services("jellyfin")[0]
+    first_url = first_jellyfin["config"]["jellyseerr_url"]
+
+    store.ensure_defaults()  # second run
+    second_jellyfin = store.list_services("jellyfin")[0]
+    assert second_jellyfin["config"]["jellyseerr_url"] == first_url
+    assert store.list_services("jellyseerr") == []

backend/tests/test_widgets.py

@@ -16,6 +16,7 @@ from media_library_viewer_api.widgets.sources import (
     AlertmanagerWidgetSource,
     BackupsWidgetSource,
     GrafanaWidgetSource,
+    JellyfinWidgetSource,
     ServiceRecord,
     StaticWidgetSource,
 )
@@ -90,6 +91,44 @@ def test_create_backups_widget(client):
     assert response.status_code == 201
 
 
+def test_widget_filtering_by_service_id_and_scope(client):
+    """Test ?service_id= and ?scope= query params on GET /api/widgets/instances."""
+    service = _make_grafana_service(client)
+    # Create a dashboard-scoped (built-in) widget + a service-scoped widget.
+    client.post(
+        "/api/widgets/instances",
+        json={"widget_kind": "static", "title": "Note", "config": {"text": "hi"}},
+    )
+    client.post(
+        "/api/widgets/instances",
+        json={
+            "service_id": service["id"],
+            "widget_kind": "link",
+            "title": "Dash",
+            "config": {"dashboard_uid": "o"},
+        },
+    )
+
+    # No filter: both widgets.
+    all_widgets = client.get("/api/widgets/instances").json()
+    assert len(all_widgets) == 2
+
+    # Filter by service_id: only the service-scoped one.
+    by_service = client.get(f"/api/widgets/instances?service_id={service['id']}").json()
+    assert len(by_service) == 1
+    assert by_service[0]["service_id"] == service["id"]
+
+    # scope=dashboard: only the built-in (NULL service_id).
+    dashboard_scope = client.get("/api/widgets/instances?scope=dashboard").json()
+    assert len(dashboard_scope) == 1
+    assert dashboard_scope[0]["service_id"] is None
+
+    # scope=service: only the non-null service_id widget.
+    service_scope = client.get("/api/widgets/instances?scope=service").json()
+    assert len(service_scope) == 1
+    assert service_scope[0]["service_id"] == service["id"]
+
+
 def test_unknown_builtin_kind_rejected(client):
     response = client.post(
         "/api/widgets/instances",
@@ -456,3 +495,432 @@ async def test_ssh_task_adapter_records_history_on_run(client):
     runs = store.list_service_task_runs(service_id=service["id"])
     assert len(runs) == 1
     assert runs[0]["status"] == "success"
+
+
+# ---------------------------------------------------------------------------
+# New widget kind tests (jellyfin now_playing + grafana panel)
+# ---------------------------------------------------------------------------
+
+
+def test_jellyfin_definition_has_now_playing_widget():
+    from media_library_viewer_api.integrations.registry import get_service_definition
+
+    definition = get_service_definition("jellyfin")
+    kinds = {wk.kind for wk in definition.widget_kinds}
+    assert "now_playing" in kinds
+    assert "activity" in kinds
+
+
+def test_grafana_definition_has_chart_widget():
+    from media_library_viewer_api.integrations.registry import get_service_definition
+
+    definition = get_service_definition("grafana")
+    kinds = {wk.kind for wk in definition.widget_kinds}
+    assert "chart" in kinds
+    assert "link" in kinds
+
+
+@pytest.mark.asyncio
+async def test_grafana_adapter_chart_queries_datasource():
+    """Chart widget should POST to /api/ds/query and normalize the response."""
+    from unittest.mock import MagicMock, patch
+
+    adapter = GrafanaWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="grafana",
+        name="g",
+        config={"base_url": "http://g:3000", "timeout_seconds": 5},
+        secrets={"api_key": "tok"},
+    )
+
+    mock_resp = MagicMock()
+    mock_resp.json.return_value = {
+        "results": {
+            "A": {
+                "frames": [
+                    {
+                        "data": {"values": [[1000, 2000], [0.5, 0.8]]},
+                        "schema": {"fields": [{"name": "Time"}, {"name": "cpu_usage"}]},
+                    }
+                ]
+            }
+        }
+    }
+    mock_resp.raise_for_status = MagicMock()
+
+    with patch("media_library_viewer_api.widgets.sources.requests.post", return_value=mock_resp):
+        result = await adapter.fetch(
+            service,
+            "chart",
+            {"query": "rate(cpu[5m])", "datasource_uid": "prometheus"},
+        )
+
+    assert "series" in result
+    assert len(result["series"]) == 1
+    assert result["series"][0]["label"] == "cpu_usage"
+    assert result["series"][0]["points"] == [
+        {"t": 1000, "v": 0.5},
+        {"t": 2000, "v": 0.8},
+    ]
+
+
+@pytest.mark.asyncio
+async def test_grafana_adapter_chart_extracts_prometheus_labels():
+    """Multiple Prometheus series should get unique labels from frame metadata."""
+    from unittest.mock import MagicMock, patch
+
+    adapter = GrafanaWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="grafana",
+        name="g",
+        config={"base_url": "http://g:3000", "timeout_seconds": 5},
+        secrets={"api_key": "tok"},
+    )
+
+    mock_resp = MagicMock()
+    mock_resp.json.return_value = {
+        "results": {
+            "A": {
+                "frames": [
+                    {
+                        "data": {"values": [[1000], [0.5]]},
+                        "schema": {
+                            "fields": [
+                                {"name": "Time"},
+                                {
+                                    "name": "Value",
+                                    "labels": {
+                                        "instance": "server1:9100",
+                                        "mode": "iowait",
+                                    },
+                                },
+                            ]
+                        },
+                    },
+                    {
+                        "data": {"values": [[1000], [0.3]]},
+                        "schema": {
+                            "fields": [
+                                {"name": "Time"},
+                                {
+                                    "name": "Value",
+                                    "labels": {
+                                        "instance": "server2:9100",
+                                        "mode": "iowait",
+                                    },
+                                },
+                            ]
+                        },
+                    },
+                ]
+            }
+        }
+    }
+    mock_resp.raise_for_status = MagicMock()
+
+    with patch("media_library_viewer_api.widgets.sources.requests.post", return_value=mock_resp):
+        result = await adapter.fetch(service, "chart", {"query": "rate(cpu[5m])"})
+
+    assert len(result["series"]) == 2
+    assert result["series"][0]["label"] == "instance=server1:9100 mode=iowait"
+    assert result["series"][1]["label"] == "instance=server2:9100 mode=iowait"
+
+
+@pytest.mark.asyncio
+async def test_grafana_adapter_chart_requires_api_key():
+    adapter = GrafanaWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="grafana",
+        name="g",
+        config={"base_url": "http://g:3000"},
+    )
+    result = await adapter.fetch(service, "chart", {"query": "up"})
+    assert "error" in result
+    assert "api_key" in result["error"]
+
+
+@pytest.mark.asyncio
+async def test_grafana_adapter_chart_handles_http_failure():
+    from unittest.mock import patch
+
+    import requests as req_mod
+
+    adapter = GrafanaWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="grafana",
+        name="g",
+        config={"base_url": "http://g:3000", "timeout_seconds": 2},
+        secrets={"api_key": "tok"},
+    )
+
+    with patch(
+        "media_library_viewer_api.widgets.sources.requests.post",
+        side_effect=req_mod.ConnectionError("refused"),
+    ):
+        result = await adapter.fetch(service, "chart", {"query": "up"})
+
+    assert "error" in result
+    assert "failed" in result["error"].lower()
+
+
+@pytest.mark.asyncio
+async def test_jellyfin_now_playing_filters_active_sessions():
+    """now_playing should exclude idle (no NowPlayingItem) and paused sessions."""
+    adapter = JellyfinWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="jellyfin",
+        name="jf",
+        config={"base_url": "http://jf:8096"},
+        secrets={"api_key": "k"},
+    )
+    playing_session = {
+        "UserName": "alice",
+        "NowPlayingItem": {"Name": "Movie", "Type": "Movie"},
+        "PlayState": {"IsPaused": False},
+        "DeviceName": "Web",
+    }
+    paused_session = {
+        "UserName": "bob",
+        "NowPlayingItem": {"Name": "Show", "Type": "Episode"},
+        "PlayState": {"IsPaused": True},
+        "DeviceName": "TV",
+    }
+    idle_session = {
+        "UserName": "carol",
+        "PlayState": {"IsPaused": False},
+        "DeviceName": "Phone",
+    }
+    mock_client = SimpleNamespace(sessions=lambda: [playing_session, paused_session, idle_session])
+    with patch("media_library_viewer_api.widgets.sources.JellyfinClient", return_value=mock_client):
+        result = await adapter.fetch(service, "now_playing", {})
+    sessions = result["sessions"]
+    assert len(sessions) == 1
+    assert sessions[0]["user"] == "alice"
+    assert sessions[0]["state"] == "playing"
+
+
+@pytest.mark.asyncio
+async def test_jellyfin_activity_shows_all_sessions():
+    """activity (default) should include idle and paused sessions."""
+    adapter = JellyfinWidgetSource()
+    service = ServiceRecord(
+        id="s",
+        service_type="jellyfin",
+        name="jf",
+        config={"base_url": "http://jf:8096"},
+        secrets={"api_key": "k"},
+    )
+    mock_client = SimpleNamespace(
+        sessions=lambda: [
+            {"UserName": "alice", "NowPlayingItem": {"Name": "M"}, "PlayState": {"IsPaused": False}},
+            {"UserName": "bob", "PlayState": {"IsPaused": False}},
+        ]
+    )
+    with patch("media_library_viewer_api.widgets.sources.JellyfinClient", return_value=mock_client):
+        result = await adapter.fetch(service, "activity", {})
+    assert len(result["sessions"]) == 2
+
+
+# ---------------------------------------------------------------------------
+# Widget references (live-link widgets across dashboards)
+# ---------------------------------------------------------------------------
+
+
+@pytest.fixture
+def widget_ref_client(monkeypatch):
+    """TestClient with an isolated SettingsStore + encryption key."""
+    monkeypatch.setenv(
+        "MANAGE_ENCRYPTION_KEY",
+        Fernet.generate_key().decode(),
+    )
+    from media_library_viewer_api.services.secrets import reset_encryption_key_cache
+
+    reset_encryption_key_cache()
+    import tempfile
+    from pathlib import Path
+
+    store = SettingsStore(str(Path(tempfile.mkdtemp()) / "test.db"))
+    store.ensure_defaults()
+
+    def get_store_override():
+        return store
+
+    app.dependency_overrides[get_settings_store] = get_store_override
+    client = TestClient(app)
+    yield client, store
+    app.dependency_overrides.pop(get_settings_store, None)
+
+
+def test_widget_reference_lifecycle(widget_ref_client):
+    """Create a widget, reference it on 'main', verify it appears, delete reference."""
+    client, store = widget_ref_client
+
+    # Create a service-bound widget (simulating one on a Grafana Overview).
+    store.upsert_service(
+        {
+            "service_type": "grafana",
+            "name": "Grafana",
+            "config": {"base_url": "https://grafana.example.com"},
+            "secrets": {"api_key": "tok"},
+            "enabled": True,
+        },
+    )
+    service = store.list_services("grafana")[0]
+    widget = store.upsert_widget(
+        {
+            "service_id": service["id"],
+            "widget_kind": "chart",
+            "title": "CPU IOWait",
+            "config": {"query": "rate(cpu[5m])", "datasource_uid": "prometheus"},
+            "enabled": True,
+            "sort_order": 0,
+        }
+    )
+
+    # Reference it on "main" dashboard.
+    resp = client.post(
+        "/api/widgets/references",
+        json={
+            "dashboard_scope": "main",
+            "widget_id": widget["id"],
+            "sort_order": 5,
+        },
+    )
+    assert resp.status_code == 201
+    ref = resp.json()
+    assert ref["dashboard_scope"] == "main"
+    assert ref["widget_id"] == widget["id"]
+    ref_id = ref["id"]
+
+    # List references for "main" — should include our widget.
+    resp = client.get("/api/widgets/references", params={"dashboard_scope": "main"})
+    assert resp.status_code == 200
+    refs = resp.json()
+    assert len(refs) == 1
+    assert refs[0]["widget"]["title"] == "CPU IOWait"
+
+    # Delete the reference.
+    resp = client.delete(f"/api/widgets/references/{ref_id}")
+    assert resp.status_code == 200
+    assert resp.json()["status"] == "deleted"
+
+    # Reference is gone, original widget still exists.
+    resp = client.get("/api/widgets/references", params={"dashboard_scope": "main"})
+    assert len(resp.json()) == 0
+    assert store.get_widget(widget["id"]) is not None
+
+
+def test_widget_reference_detach(widget_ref_client):
+    """Detach clones the widget into a standalone instance and removes the reference."""
+    client, store = widget_ref_client
+
+    store.upsert_service(
+        {
+            "service_type": "grafana",
+            "name": "Grafana",
+            "config": {"base_url": "https://grafana.example.com"},
+            "secrets": {"api_key": "tok"},
+            "enabled": True,
+        },
+    )
+    service = store.list_services("grafana")[0]
+    widget = store.upsert_widget(
+        {
+            "service_id": service["id"],
+            "widget_kind": "chart",
+            "title": "Memory",
+            "config": {"query": "mem", "datasource_uid": "prometheus"},
+            "enabled": True,
+            "sort_order": 0,
+        }
+    )
+
+    # Reference on "main".
+    resp = client.post(
+        "/api/widgets/references",
+        json={
+            "dashboard_scope": "main",
+            "widget_id": widget["id"],
+        },
+    )
+    ref_id = resp.json()["id"]
+
+    # Detach.
+    resp = client.post(f"/api/widgets/references/{ref_id}/detach")
+    assert resp.status_code == 200
+    cloned = resp.json()
+    assert cloned["title"] == "Memory"
+    assert cloned["widget_kind"] == "chart"
+    assert cloned["service_id"] == service["id"]  # Fix 2: preserves service binding
+    assert cloned["config"]["query"] == "mem"
+    assert cloned["id"] != widget["id"]  # new independent widget
+
+    # Reference is gone.
+    refs = client.get("/api/widgets/references", params={"dashboard_scope": "main"}).json()
+    assert len(refs) == 0
+    # Original still exists.
+    assert store.get_widget(widget["id"]) is not None
+
+
+def test_widget_reference_update_sort_order(widget_ref_client):
+    """PUT /references/{id} updates only the reference's sort_order (Fix 1)."""
+    client, store = widget_ref_client
+
+    widget_a = store.upsert_widget(
+        {
+            "service_id": None,
+            "widget_kind": "static",
+            "title": "A",
+            "config": {"text": "a"},
+            "enabled": True,
+            "sort_order": 0,
+        }
+    )
+    widget_b = store.upsert_widget(
+        {
+            "service_id": None,
+            "widget_kind": "static",
+            "title": "B",
+            "config": {"text": "b"},
+            "enabled": True,
+            "sort_order": 1,
+        }
+    )
+
+    # Two references on the same dashboard scope.
+    resp = client.post(
+        "/api/widgets/references",
+        json={
+            "dashboard_scope": "named:test",
+            "widget_id": widget_a["id"],
+            "sort_order": 0,
+        },
+    )
+    ref_a = resp.json()
+    resp = client.post(
+        "/api/widgets/references",
+        json={
+            "dashboard_scope": "named:test",
+            "widget_id": widget_b["id"],
+            "sort_order": 1,
+        },
+    )
+    ref_b = resp.json()
+
+    # Swap sort orders via PUT (per-dashboard reorder).
+    resp = client.put(f"/api/widgets/references/{ref_a['id']}?sort_order=1")
+    assert resp.status_code == 200
+    assert resp.json()["sort_order"] == 1
+
+    resp = client.put(f"/api/widgets/references/{ref_b['id']}?sort_order=0")
+    assert resp.status_code == 200
+    assert resp.json()["sort_order"] == 0
+
+    # Widget instances themselves are unchanged.
+    assert store.get_widget(widget_a["id"])["sort_order"] == 0
+    assert store.get_widget(widget_b["id"])["sort_order"] == 1

frontend/package-lock.json

@@ -20,6 +20,7 @@
         "react-dom": "^19.2.5",
         "react-oidc-context": "^3.3.1",
         "react-router-dom": "^7.14.2",
+        "recharts": "^3.9.2",
         "shadcn": "^4.7.0",
         "tailwind-merge": "^3.6.0",
         "tw-animate-css": "^1.4.0"
@@ -2997,6 +2998,32 @@
       "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
       "license": "MIT"
     },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.12.0.tgz",
+      "integrity": "sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw==",
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
+        "@standard-schema/utils": "^0.3.0",
+        "immer": "^11.0.0",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rolldown/binding-android-arm64": {
       "version": "1.0.0-rc.17",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.17.tgz",
@@ -3283,7 +3310,12 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
       "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@standard-schema/utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
       "license": "MIT"
     },
     "node_modules/@tailwindcss/node": {
@@ -3772,6 +3804,69 @@
         "assertion-error": "^2.0.1"
       }
     },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "license": "MIT"
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+      "license": "MIT"
+    },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
@@ -3852,6 +3947,12 @@
       "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
       "license": "MIT"
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
+      "license": "MIT"
+    },
     "node_modules/@types/validate-npm-package-name": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/validate-npm-package-name/-/validate-npm-package-name-4.0.2.tgz",
@@ -4990,6 +5091,127 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -5037,6 +5259,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/decimal.js-light": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
+      "license": "MIT"
+    },
     "node_modules/dedent": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
@@ -5311,6 +5539,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-toolkit": {
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.49.0.tgz",
+      "integrity": "sha512-G5iZ6Pc/FNRY/soKZHC+TxGDD83rHUDXxzaWhGCX44vAv/tMs56WMusnm/KMNK+luUPsgA9U28cGr4RDlSzL2g==",
+      "license": "MIT",
+      "workspaces": [
+        "docs",
+        "benchmarks"
+      ]
+    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -5553,6 +5791,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
+      "license": "MIT"
+    },
     "node_modules/eventsource": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
@@ -6291,6 +6535,16 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immer": {
+      "version": "11.1.11",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.11.tgz",
+      "integrity": "sha512-qzXuyXAkPySAGYkfsAwodDPWT8Zm7/Uo5BNt4BjhMhG5WlWyZZ4wQqnWwdS8kjlQ1Cwu6gjw3A6+0gTQwlyYtw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -6333,6 +6587,15 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ip-address": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
@@ -8109,6 +8372,13 @@
         "react": "^19.2.5"
       }
     },
+    "node_modules/react-is": {
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.7.tgz",
+      "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/react-oidc-context": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/react-oidc-context/-/react-oidc-context-3.3.1.tgz",
@@ -8122,6 +8392,29 @@
         "react": ">=16.14.0"
       }
     },
+    "node_modules/react-redux": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.3.0.tgz",
+      "integrity": "sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-remove-scroll": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
@@ -8254,6 +8547,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/recharts": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.9.2.tgz",
+      "integrity": "sha512-G4fy+Pk46RaXgwWMh+Nzhyo/lbFAVqXo9gtetlyehe6Ehge9CsgDuOTwQDD+i1+llaLktNBiNq4bhnGlDRXFtw==",
+      "license": "MIT",
+      "workspaces": [
+        "www"
+      ],
+      "dependencies": {
+        "@reduxjs/toolkit": "^1.9.0 || 2.x.x",
+        "clsx": "^2.1.1",
+        "decimal.js-light": "^2.5.1",
+        "es-toolkit": "^1.39.3",
+        "eventemitter3": "^5.0.1",
+        "immer": "^11.1.8",
+        "react-redux": "8.x.x || 9.x.x",
+        "reselect": "5.2.0",
+        "tiny-invariant": "^1.3.3",
+        "use-sync-external-store": "^1.2.2",
+        "victory-vendor": "^37.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -8268,6 +8591,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -8286,6 +8624,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/reselect": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.2.0.tgz",
+      "integrity": "sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw==",
+      "license": "MIT"
+    },
     "node_modules/resolve": {
       "version": "1.22.12",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
@@ -9377,6 +9721,28 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/victory-vendor": {
+      "version": "37.3.6",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.3.6.tgz",
+      "integrity": "sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==",
+      "license": "MIT AND ISC",
+      "dependencies": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      }
+    },
     "node_modules/vite": {
       "version": "8.0.10",
       "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.10.tgz",

frontend/package.json

@@ -25,6 +25,7 @@
     "react-dom": "^19.2.5",
     "react-oidc-context": "^3.3.1",
     "react-router-dom": "^7.14.2",
+    "recharts": "^3.9.2",
     "shadcn": "^4.7.0",
     "tailwind-merge": "^3.6.0",
     "tw-animate-css": "^1.4.0"

frontend/src/App.tsx

@@ -5,7 +5,6 @@ import {
 	NavLink,
 	useLocation,
 	Outlet,
-	Navigate,
 } from "react-router-dom";
 import {
 	QueryClient,
@@ -13,22 +12,22 @@ import {
 	useQuery,
 } from "@tanstack/react-query";
 import { useEffect, useMemo, useState } from "react";
+import type { LucideIcon } from "lucide-react";
 import { AuthProvider, useAuth } from "react-oidc-context";
 import { Dashboard } from "./pages/Dashboard";
-import { Applications } from "./pages/Applications";
+import { NamedDashboardPage } from "./pages/NamedDashboardPage";
 import { Settings } from "./pages/Settings";
-import { UsersPage } from "./pages/Users";
-import { FileBrowser } from "./pages/FileBrowser";
-import { Actions } from "./pages/Actions";
-import BackupsPage from "./components/BackupsPage";
-import { ObservabilityPage } from "./components/ObservabilityPage";
 import { ServicePage } from "./pages/ServicePage";
+import { ServiceTypePage } from "./pages/ServiceTypePage";
 import { ServicesPage } from "./pages/ServicesPage";
 import { getOidcConfig, isOidcConfigured, setAccessToken } from "./auth";
 import { fetchAppVersion } from "./api/client";
 import { FRONTEND_VERSION_LABEL } from "./version";
 import { usePersistentState } from "./hooks/usePersistentState";
 import { useIsMobile } from "./hooks/useIsMobile";
+import { useServiceInstances } from "./hooks/useServices";
+import { useDashboards } from "./hooks/useDashboards";
+import { configuredNavEntries } from "./integrations/navEntries";
 import { Button } from "@/components/ui/button";
 import {
 	Tooltip,
@@ -45,12 +44,6 @@ import {
 } from "@/components/ui/sheet";
 import {
 	LayoutDashboard,
-	Activity,
-	DatabaseBackup,
-	Monitor,
-	Users,
-	Zap,
-	FolderOpen,
 	Settings as SettingsIcon,
 	Menu,
 	Sun,
@@ -59,6 +52,7 @@ import {
 	ChevronLeft,
 	ChevronRight,
 	Boxes,
+	LayoutTemplate,
 } from "lucide-react";
 
 const queryClient = new QueryClient({
@@ -66,9 +60,6 @@ const queryClient = new QueryClient({
 		queries: {
 			retry: 1,
 			refetchOnWindowFocus: false,
-			// Pause interval-based refetches (widgets ~30s, queue status 5s,
-			// media build progress 1s) when the tab is hidden. Saves battery on
-			// mobile (D8 follow-up). Build progress polls resume on return.
 			refetchIntervalInBackground: false,
 		},
 	},
@@ -92,18 +83,40 @@ function useDarkMode() {
 	return [darkMode, () => setDarkMode((prev) => !prev)] as const;
 }
 
-// Navigation items for sidebar
+// Navigation items are data-driven (spec R1). Built from configured services + dashboards.
-const navItems = [
+interface NavItem {
+	path: string;
+	label: string;
+	icon: LucideIcon;
+}
+
+function useNavItems() {
+	const { data: services = [] } = useServiceInstances();
+	const { data: dashboards = [] } = useDashboards();
+
+	return useMemo<NavItem[]>(() => {
+		const configuredTypes = new Set(
+			services.filter((s) => s.enabled).map((s) => s.service_type),
+		);
+		const serviceEntries = configuredNavEntries(configuredTypes).map((e) => ({
+			path: e.path,
+			label: e.label,
+			icon: e.icon,
+		}));
+		const dashboardEntries = dashboards.map((d) => ({
+			path: `/d/${d.slug}`,
+			label: d.label,
+			icon: LayoutTemplate,
+		}));
+		return [
 			{ path: "/", label: "Dashboard", icon: LayoutDashboard },
-	{ path: "/observability", label: "Observability", icon: Activity },
+			...dashboardEntries,
-	{ path: "/media", label: "Media", icon: Monitor },
+			...serviceEntries,
-	{ path: "/files", label: "Files", icon: FolderOpen },
-	{ path: "/backups", label: "Backups", icon: DatabaseBackup },
-	{ path: "/users", label: "Users", icon: Users },
-	{ path: "/actions", label: "Actions", icon: Zap },
 			{ path: "/services", label: "Services", icon: Boxes },
 			{ path: "/settings", label: "Settings", icon: SettingsIcon },
 		];
+	}, [services, dashboards]);
+}
 
 function Sidebar({
 	collapsed,
@@ -115,6 +128,7 @@ function Sidebar({
 	isMobile: boolean;
 }) {
 	const location = useLocation();
+	const navItems = useNavItems();
 
 	if (isMobile) return null;
 
@@ -199,11 +213,12 @@ function Sidebar({
 function MobileDrawer() {
 	const [open, setOpen] = useState(false);
 	const location = useLocation();
+	const navItems = useNavItems();
 
 	return (
 		<Sheet open={open} onOpenChange={setOpen}>
 			<SheetTrigger asChild>
-				<Button variant="ghost" size="icon" className="mobile-touch-target md:hidden">
+				<Button variant="ghost" size="icon" className="md:hidden">
 					<Menu className="h-5 w-5" />
 				</Button>
 			</SheetTrigger>
@@ -263,6 +278,7 @@ function TopBar({
 	});
 	const backendLabel = appVersion?.backend_label || "…";
 
+	const navItems = useNavItems();
 	const pageTitle =
 		navItems.find((item) => item.path === location.pathname)?.label ||
 		"Dashboard";
@@ -290,7 +306,7 @@ function TopBar({
 					variant="ghost"
 					size="icon"
 					onClick={onToggleDarkMode}
-					className="mobile-touch-target h-8 w-8"
+					className="h-8 w-8"
 				>
 					{darkMode ? (
 						<Sun className="h-4 w-4" />
@@ -303,7 +319,7 @@ function TopBar({
 						variant="ghost"
 						size="sm"
 						onClick={onSignOut}
-						className="mobile-touch-target gap-2"
+						className="gap-2"
 					>
 						<LogOut className="h-4 w-4" />
 						<span className="hidden sm:inline">Logout</span>
@@ -428,6 +444,18 @@ function AuthenticatedApp() {
 	);
 }
 
+function NotFoundPage() {
+	return (
+		<div className="flex min-h-[50vh] flex-col items-center justify-center gap-4">
+			<h2 className="text-xl font-semibold">Not found</h2>
+			<p className="text-sm text-muted-foreground">This page doesn't exist.</p>
+			<Button asChild>
+				<NavLink to="/">Back to dashboard</NavLink>
+			</Button>
+		</div>
+	);
+}
+
 function AppInner() {
 	const [darkMode, toggleDarkMode] = useDarkMode();
 
@@ -439,26 +467,18 @@ function AppInner() {
 						<Routes>
 							<Route element={<AuthenticatedApp />}>
 								<Route path="/" element={<Dashboard />} />
-								<Route
+								<Route path="/d/:slug" element={<NamedDashboardPage />} />
-									path="/monitoring"
-									element={<Navigate to="/observability" replace />}
-								/>
-								<Route path="/media" element={<Applications />} />
-								<Route
-									path="/applications"
-									element={<Navigate to="/media" replace />}
-								/>
-								<Route path="/users" element={<UsersPage />} />
-								<Route path="/actions" element={<Actions />} />
-								<Route path="/files" element={<FileBrowser />} />
-								<Route path="/backups" element={<BackupsPage />} />
-								<Route path="/observability" element={<ObservabilityPage />} />
 								<Route path="/settings" element={<Settings />} />
 								<Route path="/services" element={<ServicesPage />} />
+								<Route
+									path="/services/:serviceType"
+									element={<ServiceTypePage />}
+								/>
 								<Route
 									path="/services/:serviceType/:serviceId"
 									element={<ServicePage />}
 								/>
+								<Route path="*" element={<NotFoundPage />} />
 							</Route>
 						</Routes>
 					</BrowserRouter>
@@ -475,26 +495,18 @@ function AppInner() {
 							}
 						>
 							<Route path="/" element={<Dashboard />} />
-							<Route
+							<Route path="/d/:slug" element={<NamedDashboardPage />} />
-								path="/monitoring"
-								element={<Navigate to="/observability" replace />}
-							/>
-							<Route path="/media" element={<Applications />} />
-							<Route
-								path="/applications"
-								element={<Navigate to="/media" replace />}
-							/>
-							<Route path="/users" element={<UsersPage />} />
-							<Route path="/actions" element={<Actions />} />
-							<Route path="/files" element={<FileBrowser />} />
-							<Route path="/backups" element={<BackupsPage />} />
-							<Route path="/observability" element={<ObservabilityPage />} />
 							<Route path="/settings" element={<Settings />} />
 							<Route path="/services" element={<ServicesPage />} />
+							<Route
+								path="/services/:serviceType"
+								element={<ServiceTypePage />}
+							/>
 							<Route
 								path="/services/:serviceType/:serviceId"
 								element={<ServicePage />}
 							/>
+							<Route path="*" element={<NotFoundPage />} />
 						</Route>
 					</Routes>
 				</BrowserRouter>

frontend/src/api/authentik.ts

@@ -0,0 +1,65 @@
+/** API client for the Authentik service (directory + messaging). */
+import { get, post } from "./shared";
+
+export interface AuthentikUser {
+	pk: number;
+	username: string;
+	name: string;
+	email: string;
+	is_active: boolean;
+	avatar: string | null;
+	[key: string]: unknown;
+}
+
+export interface AuthentikUsersResponse {
+	items: AuthentikUser[];
+	total: number;
+	page: number;
+	page_size: number;
+	error?: string;
+}
+
+export async function fetchAuthentikUsers(
+	serviceId: string,
+	params: { search?: string; page?: number; page_size?: number },
+): Promise<AuthentikUsersResponse> {
+	return get<AuthentikUsersResponse>(
+		`/api/services/authentik/${serviceId}/users`,
+		{
+			search: params.search ?? "",
+			page: String(params.page ?? 1),
+			page_size: String(params.page_size ?? 50),
+		},
+	);
+}
+
+export interface AuthentikMessageInput {
+	recipient_emails: string[];
+	subject: string;
+	html_body: string;
+}
+
+export interface AuthentikMessageResponse {
+	status: string;
+	request_id?: string;
+	recipient_count?: number;
+	error?: string;
+}
+
+export async function sendAuthentikMessage(
+	serviceId: string,
+	input: AuthentikMessageInput,
+): Promise<AuthentikMessageResponse> {
+	return post<AuthentikMessageResponse>(
+		`/api/services/authentik/${serviceId}/message`,
+		input,
+	);
+}
+
+export async function fetchAuthentikMessageStatus(
+	serviceId: string,
+): Promise<Record<string, unknown>> {
+	return get<Record<string, unknown>>(
+		`/api/services/authentik/${serviceId}/message/status`,
+	);
+}

frontend/src/api/dashboards.ts

@@ -0,0 +1,50 @@
+/**
+ * API client for the named-dashboards backend (Slice 3).
+ */
+import { del, get, post, put } from "./shared";
+
+export interface NamedDashboard {
+	id: string;
+	label: string;
+	slug: string;
+	sort_order: number;
+	payload: Record<string, unknown>;
+	created_at: number;
+	updated_at: number;
+}
+
+export interface NamedDashboardInput {
+	id?: string | null;
+	label: string;
+	slug?: string;
+	sort_order: number;
+	payload: Record<string, unknown>;
+}
+
+export async function fetchDashboards(): Promise<NamedDashboard[]> {
+	return get<NamedDashboard[]>("/api/dashboards");
+}
+
+export async function fetchDashboardBySlug(
+	slug: string,
+): Promise<NamedDashboard> {
+	return get<NamedDashboard>(
+		`/api/dashboards/slug/${encodeURIComponent(slug)}`,
+	);
+}
+
+export async function createDashboard(
+	input: NamedDashboardInput,
+): Promise<NamedDashboard> {
+	return post<NamedDashboard>("/api/dashboards", input);
+}
+
+export async function updateDashboard(
+	input: NamedDashboardInput,
+): Promise<NamedDashboard> {
+	return put<NamedDashboard>(`/api/dashboards`, input);
+}
+
+export async function deleteDashboard(id: string): Promise<{ status: string }> {
+	return del<{ status: string }>(`/api/dashboards/${id}`);
+}

frontend/src/api/widgets.ts

@@ -6,14 +6,35 @@ import type {
 	WidgetInstanceInput,
 } from "../types";
 
+export interface WidgetReference {
+	id: string;
+	dashboard_scope: string;
+	widget_id: string;
+	sort_order: number;
+	created_at: number;
+	widget: WidgetInstance;
+}
+
+export interface WidgetReferenceInput {
+	dashboard_scope: string;
+	widget_id: string;
+	sort_order?: number;
+}
+
 export async function fetchBuiltinWidgetKinds(): Promise<
 	BuiltinWidgetKindInfo[]
 > {
 	return get<BuiltinWidgetKindInfo[]>("/api/widgets/builtin");
 }
 
-export async function fetchWidgetInstances(): Promise<WidgetInstance[]> {
+export async function fetchWidgetInstances(
-	return get<WidgetInstance[]>("/api/widgets/instances");
+	serviceId?: string,
+	scope?: "dashboard" | "service",
+): Promise<WidgetInstance[]> {
+	const params: Record<string, string> = {};
+	if (serviceId) params.service_id = serviceId;
+	if (scope) params.scope = scope;
+	return get<WidgetInstance[]>("/api/widgets/instances", params);
 }
 
 export async function createWidgetInstance(
@@ -40,3 +61,39 @@ export async function fetchWidgetData(
 ): Promise<WidgetDataResponse> {
 	return get<WidgetDataResponse>(`/api/widgets/instances/${widgetId}/data`);
 }
+
+export async function fetchWidgetReferences(
+	dashboardScope: string,
+): Promise<WidgetReference[]> {
+	return get<WidgetReference[]>("/api/widgets/references", {
+		dashboard_scope: dashboardScope,
+	});
+}
+
+export async function createWidgetReference(
+	input: WidgetReferenceInput,
+): Promise<WidgetReference> {
+	return post<WidgetReference>("/api/widgets/references", input);
+}
+
+export async function deleteWidgetReference(
+	referenceId: string,
+): Promise<{ status: string }> {
+	return del<{ status: string }>(`/api/widgets/references/${referenceId}`);
+}
+
+export async function detachWidgetReference(
+	referenceId: string,
+): Promise<WidgetInstance> {
+	return post<WidgetInstance>(`/api/widgets/references/${referenceId}/detach`);
+}
+
+export async function updateWidgetReference(
+	referenceId: string,
+	sortOrder: number,
+): Promise<WidgetReference> {
+	return put<WidgetReference>(
+		`/api/widgets/references/${referenceId}?sort_order=${sortOrder}`,
+		{},
+	);
+}

frontend/src/components/ObservabilityPage.tsx

@@ -1,667 +0,0 @@
-import { useMemo, useState, type ElementType, type ReactNode } from "react";
-import { Link } from "react-router-dom";
-import {
-	Activity,
-	AlertTriangle,
-	Bell,
-	CheckCircle2,
-	ChevronDown,
-	ExternalLink,
-	Gauge,
-	Inbox,
-	Radio,
-	RefreshCw,
-	Server,
-	ServerOff,
-	XCircle,
-} from "lucide-react";
-import {
-	useAlertmanagerAlerts,
-	useAlertmanagerStatus,
-	useGrafanaStatus,
-	usePrometheusStatus,
-	usePrometheusTargets,
-	useMonitoringMachines,
-} from "../hooks/useObservability";
-import { useServiceInstances } from "../hooks/useServices";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from "@/components/ui/select";
-import { Skeleton } from "@/components/ui/skeleton";
-import {
-	Collapsible,
-	CollapsibleContent,
-	CollapsibleTrigger,
-} from "@/components/ui/collapsible";
-import type {
-	AlertmanagerAlert,
-	MonitoringMachine,
-	PrometheusTarget,
-} from "../types";
-
-function severityVariant(
-	severity: string,
-): "default" | "secondary" | "destructive" | "outline" {
-	switch (severity.toLowerCase()) {
-		case "critical":
-			return "destructive";
-		case "warning":
-			return "default";
-		case "info":
-			return "secondary";
-		default:
-			return "outline";
-	}
-}
-
-function HealthCard({
-	title,
-	status,
-	detail,
-	icon: Icon,
-	isLoading,
-}: {
-	title: string;
-	status: "ok" | "warning" | "error" | "unknown";
-	detail: string;
-	icon: ElementType;
-	isLoading?: boolean;
-}) {
-	const statusIcon =
-		status === "ok" ? (
-			<CheckCircle2 className="h-5 w-5 text-green-500" />
-		) : status === "warning" ? (
-			<AlertTriangle className="h-5 w-5 text-amber-500" />
-		) : status === "error" ? (
-			<XCircle className="h-5 w-5 text-red-500" />
-		) : (
-			<Radio className="h-5 w-5 text-muted-foreground" />
-		);
-
-	return (
-		<Card>
-			<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-				<CardTitle className="text-sm font-medium">{title}</CardTitle>
-				<Icon className="h-4 w-4 text-muted-foreground" />
-			</CardHeader>
-			<CardContent>
-				<div className="flex items-center gap-2">
-					{isLoading ? <Skeleton className="h-5 w-5" /> : statusIcon}
-					<span className="text-2xl font-bold capitalize">{status}</span>
-				</div>
-				<p className="mt-1 text-xs text-muted-foreground">{detail}</p>
-			</CardContent>
-		</Card>
-	);
-}
-
-function EmptyState({
-	icon: Icon,
-	title,
-	description,
-	action,
-}: {
-	icon: ElementType;
-	title: string;
-	description: string;
-	action?: ReactNode;
-}) {
-	return (
-		<div className="flex h-full min-h-[160px] flex-col items-center justify-center gap-2 rounded-md border p-6 text-center">
-			<Icon className="h-8 w-8 text-muted-foreground" />
-			<div className="font-medium">{title}</div>
-			<div className="max-w-md text-sm text-muted-foreground">
-				{description}
-			</div>
-			{action ? <div className="mt-2">{action}</div> : null}
-		</div>
-	);
-}
-
-function QueryError({
-	label,
-	error,
-	refetch,
-}: {
-	label: string;
-	error: Error | null;
-	refetch: () => void;
-}) {
-	if (!error) return null;
-	return (
-		<Alert variant="destructive">
-			<AlertTitle>{label} failed</AlertTitle>
-			<AlertDescription className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-				<span className="break-words">{error.message}</span>
-				<Button variant="outline" size="sm" className="mobile-touch-target" onClick={() => refetch()}>
-					<RefreshCw className="mr-1 h-3 w-3" />
-					Retry
-				</Button>
-			</AlertDescription>
-		</Alert>
-	);
-}
-
-function AlertItem({ alert }: { alert: AlertmanagerAlert }) {
-	return (
-		<Collapsible>
-			<CollapsibleTrigger asChild>
-				<div className="group cursor-pointer rounded-lg border p-3 transition-colors hover:bg-muted/50">
-					<div className="flex items-start justify-between gap-2">
-						<div className="font-medium text-sm">{alert.name}</div>
-						<div className="flex items-center gap-1">
-							<Badge variant={severityVariant(alert.severity)}>
-								{alert.severity}
-							</Badge>
-							<ChevronDown className="h-4 w-4 text-muted-foreground transition-transform group-data-[state=open]:rotate-180" />
-						</div>
-					</div>
-					<div className="mt-1 text-xs text-muted-foreground">
-						{alert.summary || alert.description}
-					</div>
-					{alert.active_since && (
-						<div className="mt-1 text-[10px] text-muted-foreground">
-							Since {new Date(alert.active_since).toLocaleString()}
-						</div>
-					)}
-				</div>
-			</CollapsibleTrigger>
-			<CollapsibleContent className="overflow-hidden">
-				<div className="space-y-2 rounded-b-lg border-x border-b p-3 text-sm">
-					{alert.description && (
-						<div>
-							<span className="font-medium">Description:</span>{" "}
-							{alert.description}
-						</div>
-					)}
-					<div className="grid grid-cols-2 gap-2 text-xs">
-						{alert.job_name && (
-							<div>
-								<span className="font-medium">Job:</span> {alert.job_name}
-							</div>
-						)}
-						{alert.category && (
-							<div>
-								<span className="font-medium">Category:</span> {alert.category}
-							</div>
-						)}
-						<div>
-							<span className="font-medium">State:</span> {alert.state}
-						</div>
-						<div>
-							<span className="font-medium">Since:</span>{" "}
-							{alert.active_since
-								? new Date(alert.active_since).toLocaleString()
-								: "unknown"}
-						</div>
-					</div>
-					{alert.labels && Object.keys(alert.labels).length > 0 && (
-						<div className="flex flex-wrap gap-1 pt-1">
-							{Object.entries(alert.labels).map(([key, value]) => (
-								<Badge key={key} variant="secondary" className="text-[10px]">
-									{key}={value}
-								</Badge>
-							))}
-						</div>
-					)}
-				</div>
-			</CollapsibleContent>
-		</Collapsible>
-	);
-}
-
-function TargetsTable({ targets }: { targets: PrometheusTarget[] }) {
-	return (
-		<div className="space-y-3">
-			{targets.map((target, idx) => (
-				<div key={idx} className="rounded-lg border p-3">
-					<div className="font-mono text-sm">{target.targets.join(", ")}</div>
-					{target.labels && Object.keys(target.labels).length > 0 && (
-						<div className="mt-2 flex flex-wrap gap-1">
-							{Object.entries(target.labels).map(([key, value]) => (
-								<Badge key={key} variant="outline" className="text-[10px]">
-									{key}: {value}
-								</Badge>
-							))}
-						</div>
-					)}
-				</div>
-			))}
-		</div>
-	);
-}
-
-function GrafanaLinkCard({
-	title,
-	description,
-	href,
-}: {
-	title: string;
-	description: string;
-	href: string;
-}) {
-	return (
-		<div className="rounded-md border p-4">
-			<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-				<div>
-					<div className="font-medium">{title}</div>
-					<div className="text-sm text-muted-foreground">{description}</div>
-				</div>
-				<Button variant="outline" size="sm" className="mobile-touch-target" asChild>
-					<a
-						href={href}
-						target="_blank"
-						rel="noopener noreferrer"
-						className="gap-1"
-					>
-						Open in Grafana
-						<ExternalLink className="h-3 w-3" />
-					</a>
-				</Button>
-			</div>
-		</div>
-	);
-}
-
-export function ObservabilityPage() {
-	const {
-		data: alertsSummary,
-		isLoading: alertsLoading,
-		error: alertsError,
-		refetch: refetchAlerts,
-	} = useAlertmanagerAlerts();
-	const {
-		data: alertmanagerStatus,
-		isLoading: statusLoading,
-		error: statusError,
-		refetch: refetchStatus,
-	} = useAlertmanagerStatus();
-	const {
-		data: grafanaStatus,
-		isLoading: grafanaLoading,
-		error: grafanaError,
-		refetch: refetchGrafana,
-	} = useGrafanaStatus();
-	const {
-		data: prometheusStatus,
-		isLoading: prometheusLoading,
-		error: prometheusError,
-		refetch: refetchPrometheus,
-	} = usePrometheusStatus();
-	const {
-		data: prometheusTargets,
-		isLoading: targetsLoading,
-		error: targetsError,
-		refetch: refetchTargets,
-	} = usePrometheusTargets();
-	const {
-		data: machines = [],
-		isLoading: machinesLoading,
-		error: machinesError,
-		refetch: refetchMachines,
-	} = useMonitoringMachines();
-	const { data: grafanaServices = [] } = useServiceInstances("grafana");
-	const [selectedMachineId, setSelectedMachineId] = useState<string>("");
-
-	const grafanaService =
-		grafanaServices.find((s) => s.enabled) ?? grafanaServices[0];
-	const GRAFANA_BASE_URL =
-		(grafanaService?.config?.base_url as string | undefined) ?? "";
-
-	const selectedMachine = useMemo<MonitoringMachine | null>(
-		() =>
-			machines.find((m) => m.id === selectedMachineId) ?? machines[0] ?? null,
-		[machines, selectedMachineId],
-	);
-
-	const nodeExporterDashboardUrl = useMemo(() => {
-		if (!selectedMachine || !GRAFANA_BASE_URL) return "";
-		const instance = `${selectedMachine.host || "localhost"}:9100`;
-		return `${GRAFANA_BASE_URL}/d/node-exporter-overview/node-exporter-overview?kiosk&var-instance=${encodeURIComponent(instance)}`;
-	}, [selectedMachine, GRAFANA_BASE_URL]);
-
-	const logsUrl = useMemo(() => {
-		if (!selectedMachine || !GRAFANA_BASE_URL) return "";
-		const container =
-			selectedMachine.mode === "local" ? "backend" : selectedMachine.name;
-		return `${GRAFANA_BASE_URL}/explore?orgId=1&left=${encodeURIComponent(
-			JSON.stringify({
-				datasource: "Loki",
-				queries: [{ refId: "A", expr: `{container="${container}"}` }],
-				range: { from: "now-1h", to: "now" },
-			}),
-		)}`;
-	}, [selectedMachine, GRAFANA_BASE_URL]);
-
-	const alertmanagerStatusDetail = alertmanagerStatus?.up
-		? alertmanagerStatus.version
-			? `version ${alertmanagerStatus.version}`
-			: "reachable"
-		: "unreachable";
-
-	const targetsCount = prometheusTargets?.length ?? 0;
-	const targetsStatus: "ok" | "warning" | "error" | "unknown" = targetsLoading
-		? "unknown"
-		: targetsError
-			? "error"
-			: targetsCount > 0
-				? "ok"
-				: "warning";
-
-	const alertStatus: "ok" | "warning" | "error" | "unknown" = alertsLoading
-		? "unknown"
-		: alertsError
-			? "error"
-			: (alertsSummary?.total ?? 0) > 0
-				? alertsSummary?.alerts.some((a) => a.severity === "critical")
-					? "error"
-					: "warning"
-				: "ok";
-
-	const machinesStatus: "ok" | "warning" | "error" | "unknown" = machinesLoading
-		? "unknown"
-		: machinesError
-			? "error"
-			: machines.length > 0
-				? "ok"
-				: "warning";
-
-	return (
-		<div className="space-y-6">
-			<div className="space-y-1">
-				<h1 className="text-2xl font-bold tracking-tight">Observability</h1>
-				<p className="text-sm text-muted-foreground">
-					Unified view of metrics, logs, and alerts from Prometheus, Loki, and
-					Alertmanager. Deep dashboards live in Grafana.
-				</p>
-			</div>
-
-			<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
-				<HealthCard
-					title="Alertmanager"
-					status={
-						statusError
-							? "error"
-							: alertmanagerStatus?.up
-								? "ok"
-								: statusLoading
-									? "unknown"
-									: "error"
-					}
-					detail={alertmanagerStatusDetail}
-					icon={Bell}
-					isLoading={statusLoading}
-				/>
-				<HealthCard
-					title="Active Alerts"
-					status={alertStatus}
-					detail={`${alertsSummary?.total ?? 0} firing alert${(alertsSummary?.total ?? 0) === 1 ? "" : "s"}`}
-					icon={AlertTriangle}
-					isLoading={alertsLoading}
-				/>
-				<HealthCard
-					title="Prometheus Targets"
-					status={targetsStatus}
-					detail={`${targetsCount} remote Node Exporter target${targetsCount === 1 ? "" : "s"}`}
-					icon={Radio}
-					isLoading={targetsLoading}
-				/>
-				<HealthCard
-					title="Machines"
-					status={machinesStatus}
-					detail={`${machines.length} monitoring machine${machines.length === 1 ? "" : "s"}`}
-					icon={Server}
-					isLoading={machinesLoading}
-				/>
-				<HealthCard
-					title="Grafana"
-					status={
-						grafanaError
-							? "error"
-							: grafanaStatus?.up
-								? "ok"
-								: grafanaLoading
-									? "unknown"
-									: "error"
-					}
-					detail={
-						grafanaStatus?.up
-							? grafanaStatus.version
-								? `version ${grafanaStatus.version}`
-								: "reachable"
-							: grafanaStatus?.error === "no_service_configured"
-								? "not configured"
-								: "unreachable"
-					}
-					icon={Gauge}
-					isLoading={grafanaLoading}
-				/>
-				<HealthCard
-					title="Prometheus"
-					status={
-						prometheusError
-							? "error"
-							: prometheusStatus?.up
-								? "ok"
-								: prometheusLoading
-									? "unknown"
-									: "error"
-					}
-					detail={
-						prometheusStatus?.up
-							? prometheusStatus.version
-								? `version ${prometheusStatus.version}`
-								: "reachable"
-							: prometheusStatus?.error === "no_service_configured"
-								? "not configured"
-								: "unreachable"
-					}
-					icon={Radio}
-					isLoading={prometheusLoading}
-				/>
-			</div>
-
-			<div className="space-y-3">
-				{statusError && (
-					<QueryError
-						label="Alertmanager status"
-						error={statusError}
-						refetch={refetchStatus}
-					/>
-				)}
-				{alertsError && (
-					<QueryError
-						label="Active alerts"
-						error={alertsError}
-						refetch={refetchAlerts}
-					/>
-				)}
-				{targetsError && (
-					<QueryError
-						label="Prometheus targets"
-						error={targetsError}
-						refetch={refetchTargets}
-					/>
-				)}
-				{machinesError && (
-					<QueryError
-						label="Monitoring machines"
-						error={machinesError}
-						refetch={refetchMachines}
-					/>
-				)}
-				{grafanaError && (
-					<QueryError
-						label="Grafana status"
-						error={grafanaError}
-						refetch={refetchGrafana}
-					/>
-				)}
-				{prometheusError && (
-					<QueryError
-						label="Prometheus status"
-						error={prometheusError}
-						refetch={refetchPrometheus}
-					/>
-				)}
-			</div>
-
-			{alertsSummary?.error && (
-				<Alert variant="destructive">
-					<AlertTitle>Alertmanager unreachable</AlertTitle>
-					<AlertDescription>
-						The UI cannot reach Alertmanager right now. Alerts shown here may be
-						stale.
-					</AlertDescription>
-				</Alert>
-			)}
-
-			<div className="grid gap-6 lg:grid-cols-2">
-				<div className="space-y-6">
-					<Card>
-						<CardHeader>
-							<CardTitle className="flex items-center gap-2">
-								<Bell className="h-4 w-4" />
-								Recent Alerts
-							</CardTitle>
-						</CardHeader>
-						<CardContent className="space-y-3">
-							{alertsLoading ? (
-								<div className="space-y-2">
-									<Skeleton className="h-16 w-full" />
-									<Skeleton className="h-16 w-full" />
-									<Skeleton className="h-16 w-full" />
-								</div>
-							) : !alertsSummary || alertsSummary.total === 0 ? (
-								<EmptyState
-									icon={Inbox}
-									title="No active alerts"
-									description="Everything looks quiet. Alertmanager will list firing alerts here when they occur."
-								/>
-							) : (
-								<>
-									{alertsSummary.alerts.map((alert, idx) => (
-										<AlertItem key={`${alert.name}-${idx}`} alert={alert} />
-									))}
-									{alertsSummary.total > alertsSummary.alerts.length && (
-										<div className="text-center text-xs text-muted-foreground">
-											{alertsSummary.total - alertsSummary.alerts.length} more
-											alert
-											{alertsSummary.total - alertsSummary.alerts.length === 1
-												? ""
-												: "s"}{" "}
-											in Alertmanager
-										</div>
-									)}
-								</>
-							)}
-						</CardContent>
-					</Card>
-
-					<Card>
-						<CardHeader>
-							<CardTitle className="flex items-center gap-2">
-								<Radio className="h-4 w-4" />
-								Prometheus Targets
-							</CardTitle>
-						</CardHeader>
-						<CardContent>
-							{targetsLoading ? (
-								<div className="space-y-2">
-									<Skeleton className="h-16 w-full" />
-									<Skeleton className="h-16 w-full" />
-								</div>
-							) : !prometheusTargets || prometheusTargets.length === 0 ? (
-								<EmptyState
-									icon={Radio}
-									title="No Node Exporter targets"
-									description="Enable Node Exporter on an SSH machine in Settings to populate Prometheus scrape targets."
-									action={
-										<Button variant="outline" size="sm" className="mobile-touch-target" asChild>
-											<Link to="/settings">Open Settings</Link>
-										</Button>
-									}
-								/>
-							) : (
-								<TargetsTable targets={prometheusTargets} />
-							)}
-						</CardContent>
-					</Card>
-				</div>
-
-				<Card>
-					<CardHeader className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
-						<CardTitle className="flex items-center gap-2">
-							<Activity className="h-4 w-4" />
-							Machine Dashboard
-						</CardTitle>
-						<Select
-							value={selectedMachine?.id ?? ""}
-							onValueChange={setSelectedMachineId}
-							disabled={machines.length === 0}
-						>
-							<SelectTrigger className="w-full sm:w-[240px]">
-								<SelectValue placeholder="Select machine" />
-							</SelectTrigger>
-							<SelectContent>
-								{machines.map((machine) => (
-									<SelectItem key={machine.id} value={machine.id}>
-										{machine.name}
-									</SelectItem>
-								))}
-							</SelectContent>
-						</Select>
-					</CardHeader>
-					<CardContent className="space-y-4">
-						{selectedMachine ? (
-							GRAFANA_BASE_URL ? (
-								<>
-									<GrafanaLinkCard
-										title={`${selectedMachine.name} metrics`}
-										description="Open the Node Exporter overview dashboard for this machine in Grafana."
-										href={nodeExporterDashboardUrl}
-									/>
-									<GrafanaLinkCard
-										title={`${selectedMachine.name} logs`}
-										description="Explore Loki logs for this machine in Grafana."
-										href={logsUrl}
-									/>
-								</>
-							) : (
-								<EmptyState
-									icon={Gauge}
-									title="No Grafana service configured"
-									description="Add a Grafana service instance to enable deep-links to dashboards and logs."
-									action={
-										<Button variant="outline" size="sm" className="mobile-touch-target" asChild>
-											<Link to="/services">Open Services</Link>
-										</Button>
-									}
-								/>
-							)
-						) : (
-							<EmptyState
-								icon={ServerOff}
-								title="No machine selected"
-								description="Add monitoring machines in Settings to see Grafana drill-down links."
-								action={
-									<Button variant="outline" size="sm" className="mobile-touch-target" asChild>
-										<Link to="/settings">Open Settings</Link>
-									</Button>
-								}
-							/>
-						)}
-					</CardContent>
-				</Card>
-			</div>
-		</div>
-	);
-}

frontend/src/components/PinnedServiceLink.tsx

@@ -0,0 +1,57 @@
+import { useNavigate } from "react-router-dom";
+import { Boxes, ChevronRight, type LucideIcon } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+/**
+ * Pinned service link rendered on named dashboards. A card-shaped shortcut
+ * that navigates to a service page (or a specific tab via query param).
+ *
+ * The `target` is a route path like `/services/jellyfin/svc-1` or
+ * `/services/ssh_tasks/svc-2?tab=Files`.
+ */
+export interface PinnedServiceLinkProps {
+	label: string;
+	target: string;
+	icon?: LucideIcon;
+	className?: string;
+}
+
+export function PinnedServiceLink({
+	label,
+	target,
+	icon: Icon = Boxes,
+	className,
+}: PinnedServiceLinkProps) {
+	const navigate = useNavigate();
+	return (
+		<button
+			type="button"
+			onClick={() => navigate(target)}
+			className={cn(
+				"mobile-touch-target group flex min-h-16 w-full items-center justify-between rounded-lg border border-border bg-card p-4 text-left transition-colors hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+				className,
+			)}
+		>
+			<div className="flex items-center gap-3">
+				<Icon className="size-5 shrink-0 text-muted-foreground" />
+				<span className="text-sm font-medium text-foreground">{label}</span>
+			</div>
+			<ChevronRight className="size-4 text-muted-foreground transition-transform group-hover:translate-x-0.5" />
+		</button>
+	);
+}
+
+/**
+ * Static helper: build a target path for a pinned service link.
+ * Returns `/services/:type/:id` or with a `?tab=` suffix when provided.
+ */
+// eslint-disable-next-line react-refresh/only-export-components
+export function serviceLinkTarget(
+	serviceType: string,
+	serviceId: string,
+	tab?: string,
+): string {
+	const base = `/services/${serviceType}/${serviceId}`;
+	return tab ? `${base}?tab=${tab}` : base;
+}

frontend/src/components/WidgetConfigDialog.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import {
 	Dialog,
 	DialogContent,
@@ -7,6 +7,7 @@ import {
 } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
 import { Switch } from "@/components/ui/switch";
 import {
@@ -18,11 +19,24 @@ import {
 } from "@/components/ui/select";
 import { Badge } from "@/components/ui/badge";
 import { Alert, AlertDescription } from "@/components/ui/alert";
-import { ChevronDown, ChevronUp, Pencil, Plus, Trash2 } from "lucide-react";
 import {
+	ChevronDown,
+	ChevronUp,
+	Link2,
+	Pencil,
+	Plus,
+	Trash2,
+	Split,
+} from "lucide-react";
+import {
+	useCreateWidgetReference,
 	useDeleteWidgetInstance,
+	useDeleteWidgetReference,
+	useDetachWidgetReference,
 	useSaveWidgetInstance,
+	useUpdateWidgetReference,
 	useWidgetInstances,
+	useWidgetReferences,
 } from "../hooks/useWidgets";
 import { useServiceInstances } from "../hooks/useServices";
 import { useTasks } from "../hooks/useSettings";
@@ -38,6 +52,12 @@ import {
 interface Props {
 	open: boolean;
 	onClose: () => void;
+	/** When set, scope the dialog to a specific service instance's widgets. */
+	serviceId?: string;
+	/** When set, enable widget references ("Add existing") for this dashboard scope. */
+	dashboardScope?: string;
+	/** When set, auto-open in edit mode for this widget id (instead of the list view). */
+	editWidgetId?: string;
 }
 
 interface Draft {
@@ -135,6 +155,12 @@ function WidgetConfigEditor({
 				const isNumber =
 					(schema as { type?: string }).type === "integer" ||
 					(schema as { type?: string }).type === "number";
+				// Use a multi-line textarea for fields that tend to hold complex
+				// multi-line values (PromQL, text blocks, etc.). The widget kind's
+				// config schema can opt in via `format: "textarea"`; the well-known
+				// `query` field is treated as textarea by default.
+				const schemaFormat = (schema as { format?: string }).format;
+				const isTextarea = schemaFormat === "textarea" || key === "query";
 				return (
 					<Field
 						key={key}
@@ -142,6 +168,15 @@ function WidgetConfigEditor({
 						htmlFor={`widget-cfg-${key}`}
 						helper={(schema as { description?: string }).description}
 					>
+						{isTextarea ? (
+							<Textarea
+								id={`widget-cfg-${key}`}
+								rows={4}
+								className="resize-y font-mono text-xs"
+								value={String(config[key] ?? "")}
+								onChange={(e) => onChange({ ...config, [key]: e.target.value })}
+							/>
+						) : (
 							<Input
 								id={`widget-cfg-${key}`}
 								type={isNumber ? "number" : "text"}
@@ -157,6 +192,7 @@ function WidgetConfigEditor({
 									})
 								}
 							/>
+						)}
 					</Field>
 				);
 			})}
@@ -164,27 +200,56 @@ function WidgetConfigEditor({
 	);
 }
 
-export function WidgetConfigDialog({ open, onClose }: Props) {
+export function WidgetConfigDialog({
-	const { data: instances = [] } = useWidgetInstances();
+	open,
+	onClose,
+	serviceId,
+	dashboardScope,
+	editWidgetId,
+}: Props) {
+	// When editing a dashboard (no serviceId), scope to dashboard-only widgets
+	// (service_id IS NULL) so service-scoped widgets don't leak into the list.
+	const { data: instances = [] } = useWidgetInstances(
+		serviceId,
+		!serviceId && dashboardScope ? "dashboard" : undefined,
+	);
 	const { data: services = [] } = useServiceInstances();
 	const { data: tasks = [] } = useTasks();
 	const saveWidget = useSaveWidgetInstance();
 	const deleteWidget = useDeleteWidgetInstance();
+	const { data: references = [] } = useWidgetReferences(dashboardScope);
+	const createRef = useCreateWidgetReference();
+	const deleteRef = useDeleteWidgetReference();
+	const detachRef = useDetachWidgetReference();
+	const updateRef = useUpdateWidgetReference();
+	const { data: allWidgets = [] } = useWidgetInstances();
+	const [showExisting, setShowExisting] = useState(false);
+	const [existingSearch, setExistingSearch] = useState("");
 
 	const [draft, setDraft] = useState<Draft | null>(null);
+	const [draftBaseline, setDraftBaseline] = useState<Draft | null>(null);
+	// When opened via editWidgetId, closing the edit should close the dialog
+	// entirely (not fall back to the list view).
+	const directEdit = Boolean(editWidgetId);
 
-	const sortedInstances = useMemo(
+	// When editWidgetId is set and the dialog opens, auto-enter edit mode for
-		() =>
+	// that widget (instead of showing the list view).
-			[...instances].sort(
+	useEffect(() => {
-				(a, b) => a.sort_order - b.sort_order || a.created_at - b.created_at,
+		if (open && editWidgetId) {
-			),
+			// Search both owned widgets and referenced widgets.
-		[instances],
+			const target =
-	);
+				instances.find((w) => w.id === editWidgetId) ??
+				references.find((r) => r.widget.id === editWidgetId)?.widget;
+			if (target) {
+				startEdit(target);
+			}
+		}
+	}, [open, editWidgetId, instances, references]);
 
 	function startAddBuiltIn(kind: string) {
 		const binding = BUILTIN_WIDGETS[kind];
 		setDraft({
-			serviceId: null,
+			serviceId: serviceId ?? null,
 			widgetKind: kind,
 			title: binding?.name ?? kind,
 			config: { ...(binding?.defaultConfig ?? {}) },
@@ -208,7 +273,7 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 	}
 
 	function startEdit(instance: WidgetInstance) {
-		setDraft({
+		const d: Draft = {
 			id: instance.id,
 			serviceId: instance.service_id,
 			widgetKind: instance.widget_kind,
@@ -216,11 +281,20 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 			config: instance.config,
 			enabled: instance.enabled,
 			sortOrder: instance.sort_order,
-		});
+		};
+		setDraft(d);
+		setDraftBaseline(d);
 	}
 
 	function reset() {
+		// If we were opened via direct edit, closing should close the dialog
+		// entirely, not fall back to the list view.
+		if (directEdit) {
+			onClose();
+			return;
+		}
 		setDraft(null);
+		setDraftBaseline(null);
 	}
 
 	async function saveDraft() {
@@ -252,19 +326,82 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 
 	async function moveInstance(index: number, direction: -1 | 1) {
 		const targetIndex = index + direction;
-		if (targetIndex < 0 || targetIndex >= sortedInstances.length) return;
+		if (targetIndex < 0 || targetIndex >= combinedWidgets.length) return;
-		const a = sortedInstances[index];
+		// Swap the two items in a copy, then renumber ALL items by their new
-		const b = sortedInstances[targetIndex];
+		// index position (index * 10). This guarantees the sort_order values
-		await Promise.all([
+		// change even when both items previously shared the same value (e.g. 0).
-			saveWidget.mutateAsync({ ...a, sort_order: b.sort_order }),
+		const reordered = [...combinedWidgets];
-			saveWidget.mutateAsync({ ...b, sort_order: a.sort_order }),
+		const tmp = reordered[index];
-		]);
+		reordered[index] = reordered[targetIndex];
+		reordered[targetIndex] = tmp;
+		// Sequential (not Promise.all) to avoid cache-invalidation race.
+		for (let i = 0; i < reordered.length; i++) {
+			const item = reordered[i];
+			const newSortOrder = i * 10;
+			const refId = (item as { _ref_id?: string })._ref_id;
+			if (refId) {
+				await updateRef.mutateAsync({
+					referenceId: refId,
+					sortOrder: newSortOrder,
+				});
+			} else {
+				await saveWidget.mutateAsync({ ...item, sort_order: newSortOrder });
+			}
+		}
 	}
 
 	async function removeInstance(instance: WidgetInstance) {
 		await deleteWidget.mutateAsync(instance.id);
 	}
 
+	// Build a combined view of owned widgets + references for display.
+	const owned = [...instances].sort(
+		(a, b) => a.sort_order - b.sort_order || a.created_at - b.created_at,
+	);
+	const refs = references.map((r) => ({
+		...r.widget,
+		_ref_id: r.id,
+		_is_reference: true as const,
+	}));
+	const combinedWidgets = [...owned, ...refs].sort(
+		(a, b) => a.sort_order - b.sort_order || a.created_at - b.created_at,
+	);
+
+	const referencedWidgetIds = new Set(references.map((r) => r.widget_id));
+
+	// Available widgets for the "Add existing" picker: all widgets not already
+	// on this dashboard (owned or referenced).
+	const availableWidgets = useMemo(() => {
+		const onDashboard = new Set([
+			...instances.map((w) => w.id),
+			...referencedWidgetIds,
+		]);
+		const search = existingSearch.toLowerCase().trim();
+		return allWidgets
+			.filter((w) => !onDashboard.has(w.id))
+			.filter(
+				(w) =>
+					!search ||
+					w.title.toLowerCase().includes(search) ||
+					w.widget_kind.toLowerCase().includes(search),
+			);
+	}, [allWidgets, instances, referencedWidgetIds, existingSearch]);
+
+	async function handleAddReference(widgetId: string) {
+		await createRef.mutateAsync({
+			dashboard_scope: dashboardScope!,
+			widget_id: widgetId,
+		});
+	}
+
+	async function handleRemoveReference(refId: string) {
+		await deleteRef.mutateAsync(refId);
+	}
+
+	async function handleDetach(refId: string) {
+		await detachRef.mutateAsync(refId);
+	}
+
 	function handleClose(next: boolean) {
 		if (!next) {
 			reset();
@@ -332,10 +469,18 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 			/>
 			{!isMobile ? (
 				<div className="flex justify-end gap-2">
-					<Button variant="outline" onClick={reset} className="mobile-touch-target">
+					<Button
+						variant="outline"
+						onClick={reset}
+						className="mobile-touch-target"
+					>
 						Back
 					</Button>
-					<Button onClick={saveDraft} disabled={saveWidget.isPending} className="mobile-touch-target">
+					<Button
+						onClick={saveDraft}
+						disabled={saveWidget.isPending}
+						className="mobile-touch-target"
+					>
 						Save widget
 					</Button>
 				</div>
@@ -343,16 +488,19 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 		</div>
 	) : (
 		<div className="flex flex-col gap-4">
-			{sortedInstances.length === 0 ? (
+			{combinedWidgets.length === 0 ? (
 				<Alert>
 					<AlertDescription>No widgets yet. Add one below.</AlertDescription>
 				</Alert>
 			) : (
 				<div className="flex flex-col gap-2">
-					{sortedInstances.map((instance, index) => {
+					{combinedWidgets.map((instance, index) => {
 						const serviceName = instance.service_id
 							? services.find((s) => s.id === instance.service_id)?.name
 							: "Built-in";
+						const isRef =
+							(instance as { _is_reference?: boolean })._is_reference === true;
+						const refId = (instance as { _ref_id?: string })._ref_id;
 						return (
 							<div
 								key={instance.id}
@@ -361,6 +509,12 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 								<div className="flex flex-1 flex-col gap-1">
 									<div className="flex items-center gap-2">
 										<span className="font-medium">{instance.title}</span>
+										{isRef ? (
+											<Badge variant="secondary">
+												<Link2 className="mr-1 h-3 w-3" />
+												linked
+											</Badge>
+										) : null}
 										<Badge variant="outline">
 											{bindingLabel(instance.service_id, instance.widget_kind)}
 										</Badge>
@@ -388,17 +542,20 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 										variant="ghost"
 										size="icon"
 										className="mobile-touch-target h-8 w-8"
-										disabled={index === sortedInstances.length - 1}
+										disabled={index === combinedWidgets.length - 1}
 										onClick={() => moveInstance(index, 1)}
 									>
 										<ChevronDown className="h-4 w-4" />
 									</Button>
+									{!isRef ? (
 										<Switch
 											className="mobile-touch-target"
 											checked={instance.enabled}
 											onCheckedChange={() => toggleEnabled(instance)}
 											aria-label={`Toggle ${instance.title}`}
 										/>
+									) : null}
+									{!isRef ? (
 										<Button
 											variant="ghost"
 											size="icon"
@@ -407,11 +564,30 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 										>
 											<Pencil className="h-4 w-4" />
 										</Button>
+									) : null}
+									{isRef && refId ? (
+										<Button
+											variant="ghost"
+											size="icon"
+											className="mobile-touch-target h-8 w-8"
+											title="Make an independent copy"
+											onClick={() => handleDetach(refId)}
+										>
+											<Split className="h-4 w-4" />
+										</Button>
+									) : null}
 									<Button
 										variant="ghost"
 										size="icon"
 										className="mobile-touch-target h-8 w-8 text-destructive"
-										onClick={() => removeInstance(instance)}
+										title={
+											isRef ? "Remove from this dashboard" : "Delete widget"
+										}
+										onClick={() =>
+											isRef && refId
+												? handleRemoveReference(refId)
+												: removeInstance(instance)
+										}
 									>
 										<Trash2 className="h-4 w-4" />
 									</Button>
@@ -422,6 +598,65 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 				</div>
 			)}
 
+			{dashboardScope ? (
+				<div className="flex flex-col gap-2">
+					<Button
+						variant="outline"
+						size="sm"
+						className="w-fit"
+						onClick={() => setShowExisting(!showExisting)}
+					>
+						<Link2 className="mr-1 h-3 w-3" />
+						{showExisting ? "Hide" : "Add existing widget"}
+					</Button>
+					{showExisting ? (
+						<div className="flex flex-col gap-2">
+							<Input
+								placeholder="Search widgets..."
+								value={existingSearch}
+								onChange={(e) => setExistingSearch(e.target.value)}
+							/>
+							{availableWidgets.length === 0 ? (
+								<p className="text-xs text-muted-foreground">
+									No widgets available to reuse.
+								</p>
+							) : (
+								<div className="flex flex-col gap-1">
+									{availableWidgets.map((w) => {
+										const owner = w.service_id
+											? services.find((s) => s.id === w.service_id)?.name
+											: "Dashboard";
+										return (
+											<div
+												key={w.id}
+												className="flex items-center gap-2 rounded border p-2"
+											>
+												<div className="flex flex-1 flex-col">
+													<span className="text-sm font-medium">{w.title}</span>
+													<span className="text-xs text-muted-foreground">
+														{bindingLabel(w.service_id, w.widget_kind)} ·{" "}
+														{owner}
+													</span>
+												</div>
+												<Button
+													variant="outline"
+													size="sm"
+													className="mobile-touch-target"
+													onClick={() => handleAddReference(w.id)}
+												>
+													<Plus className="mr-1 h-3 w-3" />
+													Add
+												</Button>
+											</div>
+										);
+									})}
+								</div>
+							)}
+						</div>
+					) : null}
+				</div>
+			) : null}
+
 			<div className="flex flex-col gap-2">
 				<p className="text-sm font-medium">Add widget</p>
 				<div className="flex flex-wrap gap-2">
@@ -439,6 +674,9 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 					))}
 					{services
 						.filter((s) => s.enabled)
+						// When scoped to a service Overview, only show widgets for THAT
+						// service instance's type (not all services' widgets).
+						.filter((s) => !serviceId || s.id === serviceId)
 						.flatMap((s) =>
 							(SERVICE_REGISTRY[s.service_type]?.widgets ?? []).map((w) => (
 								<Button
@@ -479,7 +717,11 @@ export function WidgetConfigDialog({ open, onClose }: Props) {
 				onCancel={draft ? reset : () => handleClose(false)}
 				saveLabel={draft ? "Save widget" : "Done"}
 				isPending={draft ? saveWidget.isPending : false}
-				isDirty={draft !== null}
+				isDirty={
+					draft !== null && draftBaseline !== null
+						? JSON.stringify(draft) !== JSON.stringify(draftBaseline)
+						: draft !== null && draft?.id === undefined
+				}
 			>
 				<div className="flex flex-col gap-4">{draftBody}</div>
 			</SheetForm>

frontend/src/components/WidgetInstance.tsx

@@ -1,4 +1,6 @@
 import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Settings2, Copy } from "lucide-react";
 import { useServiceInstances } from "../hooks/useServices";
 import { resolveWidget } from "../integrations/registry";
 import type { WidgetInstance } from "../types";
@@ -6,31 +8,69 @@ import { SectionCard } from "./SectionCard";
 
 interface Props {
 	widget: WidgetInstance;
+	/** When provided, an edit button appears in the top-right corner (hover on desktop, always on mobile). */
+	onEdit?: (widgetId: string) => void;
+	/** When provided, a copy/detach button appears next to edit (for referenced widgets). */
+	onCopy?: (widgetId: string) => void;
 }
 
-export function WidgetInstanceCard({ widget }: Props) {
+export function WidgetInstanceCard({ widget, onEdit, onCopy }: Props) {
 	const { data: services = [] } = useServiceInstances();
 	const resolved = resolveWidget(widget, services);
 
+	// Edit + copy buttons: always visible on mobile (below md), hover-reveal on desktop.
+	const actionButtons = (
+		<div className="absolute right-2 top-2 z-10 flex items-center gap-1">
+			{onCopy ? (
+				<Button
+					variant="ghost"
+					size="icon-sm"
+					className="opacity-100 transition-opacity md:opacity-0 md:group-hover:opacity-100 mobile-touch-target"
+					onClick={() => onCopy(widget.id)}
+					aria-label="Create independent copy"
+				>
+					<Copy className="h-4 w-4" />
+				</Button>
+			) : null}
+			{onEdit ? (
+				<Button
+					variant="ghost"
+					size="icon-sm"
+					className="opacity-100 transition-opacity md:opacity-0 md:group-hover:opacity-100 mobile-touch-target"
+					onClick={() => onEdit(widget.id)}
+					aria-label="Edit widget"
+				>
+					<Settings2 className="h-4 w-4" />
+				</Button>
+			) : null}
+		</div>
+	);
+
 	if (!resolved) {
 		const label = widget.service_id
 			? `Unknown widget: ${widget.widget_kind} (service-bound)`
 			: `Unknown widget: ${widget.widget_kind} (built-in)`;
 		return (
+			<div className="group relative">
+				{onEdit || onCopy ? actionButtons : null}
 				<SectionCard title={widget.title}>
 					<Alert>
 						<AlertDescription>{label}</AlertDescription>
 					</Alert>
 				</SectionCard>
+			</div>
 		);
 	}
 
 	const Component = resolved.component;
 	return (
+		<div className="group relative">
+			{onEdit || onCopy ? actionButtons : null}
 			<Component
 				widget={widget}
 				refreshIntervalMs={resolved.refreshIntervalMs}
 				description={resolved.description}
 			/>
+		</div>
 	);
 }

frontend/src/components/__tests__/PinnedServiceLink.test.tsx

@@ -0,0 +1,41 @@
+import { describe, it, expect } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter, Routes, Route } from "react-router-dom";
+import userEvent from "@testing-library/user-event";
+import { PinnedServiceLink } from "../PinnedServiceLink";
+
+function renderLink() {
+	return render(
+		<MemoryRouter initialEntries={["/"]}>
+			<Routes>
+				<Route
+					path="/"
+					element={
+						<PinnedServiceLink
+							label="My Jellyfin"
+							target="/services/jellyfin/svc-1"
+						/>
+					}
+				/>
+				<Route
+					path="/services/jellyfin/svc-1"
+					element={<div>target page</div>}
+				/>
+			</Routes>
+		</MemoryRouter>,
+	);
+}
+
+describe("PinnedServiceLink", () => {
+	it("renders the label", () => {
+		renderLink();
+		expect(screen.getByText("My Jellyfin")).toBeInTheDocument();
+	});
+
+	it("navigates to the target on click", async () => {
+		const user = userEvent.setup();
+		renderLink();
+		await user.click(screen.getByText("My Jellyfin"));
+		expect(screen.getByText("target page")).toBeInTheDocument();
+	});
+});

frontend/src/components/__tests__/WidgetConfigDialog.test.tsx

@@ -18,8 +18,13 @@ function setMatchMedia(matches: boolean) {
 
 vi.mock("../../hooks/useWidgets", () => ({
 	useWidgetInstances: () => ({ data: [] }),
+	useWidgetReferences: () => ({ data: [] }),
 	useSaveWidgetInstance: () => ({ mutateAsync: vi.fn(), isPending: false }),
 	useDeleteWidgetInstance: () => ({ mutateAsync: vi.fn(), isPending: false }),
+	useCreateWidgetReference: () => ({ mutateAsync: vi.fn() }),
+	useDeleteWidgetReference: () => ({ mutateAsync: vi.fn() }),
+	useDetachWidgetReference: () => ({ mutateAsync: vi.fn() }),
+	useUpdateWidgetReference: () => ({ mutateAsync: vi.fn() }),
 }));
 
 vi.mock("../../hooks/useServices", () => ({

frontend/src/components/ui/dialog.tsx

@@ -1,32 +1,32 @@
-import * as React from "react"
+import * as React from "react";
-import { Dialog as DialogPrimitive } from "radix-ui"
+import { Dialog as DialogPrimitive } from "radix-ui";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-import { Button } from "@/components/ui/button"
+import { Button } from "@/components/ui/button";
-import { XIcon } from "lucide-react"
+import { XIcon } from "lucide-react";
 
 function Dialog({
 	...props
 }: React.ComponentProps<typeof DialogPrimitive.Root>) {
-  return <DialogPrimitive.Root data-slot="dialog" {...props} />
+	return <DialogPrimitive.Root data-slot="dialog" {...props} />;
 }
 
 function DialogTrigger({
 	...props
 }: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
-  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />
+	return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
 }
 
 function DialogPortal({
 	...props
 }: React.ComponentProps<typeof DialogPrimitive.Portal>) {
-  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />
+	return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
 }
 
 function DialogClose({
 	...props
 }: React.ComponentProps<typeof DialogPrimitive.Close>) {
-  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />
+	return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
 }
 
 function DialogOverlay({
@@ -38,11 +38,11 @@ function DialogOverlay({
 			data-slot="dialog-overlay"
 			className={cn(
 				"fixed inset-0 isolate z-50 bg-black/10 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0",
-        className
+				className,
 			)}
 			{...props}
 		/>
-  )
+	);
 }
 
 function DialogContent({
@@ -51,7 +51,7 @@ function DialogContent({
 	showCloseButton = true,
 	...props
 }: React.ComponentProps<typeof DialogPrimitive.Content> & {
-  showCloseButton?: boolean
+	showCloseButton?: boolean;
 }) {
 	return (
 		<DialogPortal>
@@ -59,8 +59,8 @@ function DialogContent({
 			<DialogPrimitive.Content
 				data-slot="dialog-content"
 				className={cn(
-          "fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+					"fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] max-h-[calc(100dvh-2rem)] overflow-y-auto -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
-          className
+					className,
 				)}
 				{...props}
 			>
@@ -72,15 +72,14 @@ function DialogContent({
 							className="absolute top-2 right-2"
 							size="icon-sm"
 						>
-              <XIcon
+							<XIcon />
-              />
 							<span className="sr-only">Close</span>
 						</Button>
 					</DialogPrimitive.Close>
 				)}
 			</DialogPrimitive.Content>
 		</DialogPortal>
-  )
+	);
 }
 
 function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
@@ -90,7 +89,7 @@ function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
 			className={cn("flex flex-col gap-2", className)}
 			{...props}
 		/>
-  )
+	);
 }
 
 function DialogFooter({
@@ -99,14 +98,14 @@ function DialogFooter({
 	children,
 	...props
 }: React.ComponentProps<"div"> & {
-  showCloseButton?: boolean
+	showCloseButton?: boolean;
 }) {
 	return (
 		<div
 			data-slot="dialog-footer"
 			className={cn(
 				"-mx-4 -mb-4 flex flex-col-reverse gap-2 rounded-b-xl border-t bg-muted/50 p-4 sm:flex-row sm:justify-end",
-        className
+				className,
 			)}
 			{...props}
 		>
@@ -117,7 +116,7 @@ function DialogFooter({
 				</DialogPrimitive.Close>
 			)}
 		</div>
-  )
+	);
 }
 
 function DialogTitle({
@@ -127,13 +126,10 @@ function DialogTitle({
 	return (
 		<DialogPrimitive.Title
 			data-slot="dialog-title"
-      className={cn(
+			className={cn("text-base leading-none font-medium", className)}
-        "text-base leading-none font-medium",
-        className
-      )}
 			{...props}
 		/>
-  )
+	);
 }
 
 function DialogDescription({
@@ -145,11 +141,11 @@ function DialogDescription({
 			data-slot="dialog-description"
 			className={cn(
 				"text-sm text-muted-foreground *:[a]:underline *:[a]:underline-offset-3 *:[a]:hover:text-foreground",
-        className
+				className,
 			)}
 			{...props}
 		/>
-  )
+	);
 }
 
 export {
@@ -163,4 +159,4 @@ export {
 	DialogPortal,
 	DialogTitle,
 	DialogTrigger,
-}
+};

frontend/src/components/ui/sheet-form.tsx

@@ -82,7 +82,7 @@ export function SheetForm({
 			<SheetContent
 				side="bottom"
 				showCloseButton={false}
-				className="flex h-[100dvh] w-full flex-col gap-0 p-0 sm:max-w-full"
+				className="flex h-[100dvh] w-full flex-col gap-0 p-0 data-[side=bottom]:h-[100dvh] sm:max-w-full"
 				onEscapeKeyDown={(e) => {
 					// Prevent Radix's default Escape close so our guard runs instead.
 					if (isDirty) {

frontend/src/components/ui/tabs.tsx

@@ -14,7 +14,7 @@ function Tabs({
       data-slot="tabs"
       data-orientation={orientation}
       className={cn(
-        "group/tabs flex gap-2 data-horizontal:flex-col",
+        "group/tabs flex gap-2 data-[orientation=horizontal]:flex-col",
         className
       )}
       {...props}
@@ -23,7 +23,7 @@ function Tabs({
 }
 
 const tabsListVariants = cva(
-  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-horizontal/tabs:h-8 group-data-vertical/tabs:h-fit group-data-vertical/tabs:flex-col data-[variant=line]:rounded-none",
+  "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-[orientation=horizontal]/tabs:h-8 group-data-[orientation=vertical]/tabs:h-fit group-data-[orientation=vertical]/tabs:flex-col data-[variant=line]:rounded-none",
   {
     variants: {
       variant: {
@@ -61,10 +61,10 @@ function TabsTrigger({
     <TabsPrimitive.Trigger
       data-slot="tabs-trigger"
       className={cn(
-        "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-1.5 py-0.5 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-vertical/tabs:w-full group-data-vertical/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 has-data-[icon=inline-end]:pr-1 has-data-[icon=inline-start]:pl-1 dark:text-muted-foreground dark:hover:text-foreground group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "relative inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-1.5 py-0.5 text-sm font-medium whitespace-nowrap text-foreground/60 transition-all group-data-[orientation=vertical]/tabs:w-full group-data-[orientation=vertical]/tabs:justify-start hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-50 has-data-[icon=inline-end]:pr-1 has-data-[icon=inline-start]:pl-1 dark:text-muted-foreground dark:hover:text-foreground group-data-[variant=default]/tabs-list:data-active:shadow-sm group-data-[variant=line]/tabs-list:data-active:shadow-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         "group-data-[variant=line]/tabs-list:bg-transparent group-data-[variant=line]/tabs-list:data-active:bg-transparent dark:group-data-[variant=line]/tabs-list:data-active:border-transparent dark:group-data-[variant=line]/tabs-list:data-active:bg-transparent",
         "data-active:bg-background data-active:text-foreground dark:data-active:border-input dark:data-active:bg-input/30 dark:data-active:text-foreground",
-        "after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-horizontal/tabs:after:inset-x-0 group-data-horizontal/tabs:after:bottom-[-5px] group-data-horizontal/tabs:after:h-0.5 group-data-vertical/tabs:after:inset-y-0 group-data-vertical/tabs:after:-right-1 group-data-vertical/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-active:after:opacity-100",
+        "after:absolute after:bg-foreground after:opacity-0 after:transition-opacity group-data-[orientation=horizontal]/tabs:after:inset-x-0 group-data-[orientation=horizontal]/tabs:after:bottom-[-5px] group-data-[orientation=horizontal]/tabs:after:h-0.5 group-data-[orientation=vertical]/tabs:after:inset-y-0 group-data-[orientation=vertical]/tabs:after:-right-1 group-data-[orientation=vertical]/tabs:after:w-0.5 group-data-[variant=line]/tabs-list:data-active:after:opacity-100",
         className
       )}
       {...props}

frontend/src/hooks/useAuthentik.ts

@@ -0,0 +1,43 @@
+/** Hooks for the Authentik directory + messaging tabs. */
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+	fetchAuthentikMessageStatus,
+	fetchAuthentikUsers,
+	sendAuthentikMessage,
+} from "../api/authentik";
+
+export function useAuthentikUsers(
+	serviceId: string,
+	params: { search?: string; page?: number; page_size?: number },
+) {
+	return useQuery({
+		queryKey: ["authentik", "users", serviceId, params],
+		queryFn: () => fetchAuthentikUsers(serviceId, params),
+		staleTime: 10_000,
+	});
+}
+
+export function useSendAuthentikMessage(serviceId: string) {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: (input: {
+			recipient_emails: string[];
+			subject: string;
+			html_body: string;
+		}) => sendAuthentikMessage(serviceId, input),
+		onSuccess: () => {
+			queryClient.invalidateQueries({
+				queryKey: ["authentik", "message-status", serviceId],
+			});
+		},
+	});
+}
+
+export function useAuthentikMessageStatus(serviceId: string) {
+	return useQuery({
+		queryKey: ["authentik", "message-status", serviceId],
+		queryFn: () => fetchAuthentikMessageStatus(serviceId),
+		refetchInterval: 5_000,
+		staleTime: 0,
+	});
+}

frontend/src/hooks/useDashboards.ts

@@ -0,0 +1,47 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+	createDashboard,
+	deleteDashboard,
+	fetchDashboardBySlug,
+	fetchDashboards,
+	updateDashboard,
+	type NamedDashboardInput,
+} from "../api/dashboards";
+
+export function useDashboards() {
+	return useQuery({
+		queryKey: ["dashboards"],
+		queryFn: fetchDashboards,
+		staleTime: 30 * 1000,
+	});
+}
+
+export function useDashboardBySlug(slug: string | undefined) {
+	return useQuery({
+		queryKey: ["dashboards", "slug", slug],
+		queryFn: () => fetchDashboardBySlug(slug!),
+		enabled: !!slug,
+		staleTime: 30 * 1000,
+	});
+}
+
+export function useSaveDashboard() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: (input: NamedDashboardInput) =>
+			input.id ? updateDashboard(input) : createDashboard(input),
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["dashboards"] });
+		},
+	});
+}
+
+export function useDeleteDashboard() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: (id: string) => deleteDashboard(id),
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["dashboards"] });
+		},
+	});
+}

frontend/src/hooks/useMedia.ts

@@ -54,6 +54,10 @@ export function useBuildIndex(jellyfinServiceId?: string) {
 		onSuccess: () => {
 			invalidateMedia(queryClient);
 		},
+		onError: () => {
+			// Invalidate status so the UI reflects the current (non-building) state.
+			invalidateMedia(queryClient);
+		},
 	});
 }
 

frontend/src/hooks/useUsers.ts

@@ -1,11 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { fetchUsers } from "../api/client";
-import type { UserDirectoryResponse } from "../types";
-
-export function useUsers(jellyfinServiceId?: string) {
-	return useQuery<UserDirectoryResponse>({
-		queryKey: ["users", jellyfinServiceId ?? "default"],
-		queryFn: () => fetchUsers(jellyfinServiceId),
-		staleTime: 30_000,
-	});
-}

frontend/src/hooks/useWidgets.ts

@@ -1,18 +1,26 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import {
 	createWidgetInstance,
+	createWidgetReference,
 	deleteWidgetInstance,
+	deleteWidgetReference,
+	detachWidgetReference,
 	fetchBuiltinWidgetKinds,
 	fetchWidgetData,
 	fetchWidgetInstances,
+	fetchWidgetReferences,
 	updateWidgetInstance,
+	updateWidgetReference,
 } from "../api/widgets";
 import type { WidgetInstanceInput } from "../types";
 
-export function useWidgetInstances() {
+export function useWidgetInstances(
+	serviceId?: string,
+	scope?: "dashboard" | "service",
+) {
 	return useQuery({
-		queryKey: ["widgets", "instances"],
+		queryKey: ["widgets", "instances", serviceId ?? null, scope ?? null],
-		queryFn: fetchWidgetInstances,
+		queryFn: () => fetchWidgetInstances(serviceId, scope),
 		refetchInterval: 60_000,
 	});
 }
@@ -55,3 +63,58 @@ export function useBuiltinWidgetKinds() {
 		staleTime: 5 * 60 * 1000,
 	});
 }
+
+export function useWidgetReferences(dashboardScope: string | undefined) {
+	return useQuery({
+		queryKey: ["widgets", "references", dashboardScope ?? null],
+		queryFn: () => fetchWidgetReferences(dashboardScope!),
+		enabled: !!dashboardScope,
+		refetchInterval: 60_000,
+	});
+}
+
+export function useCreateWidgetReference() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: createWidgetReference,
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["widgets", "references"] });
+		},
+	});
+}
+
+export function useDeleteWidgetReference() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: deleteWidgetReference,
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["widgets", "references"] });
+		},
+	});
+}
+
+export function useDetachWidgetReference() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: detachWidgetReference,
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["widgets"] });
+		},
+	});
+}
+
+export function useUpdateWidgetReference() {
+	const queryClient = useQueryClient();
+	return useMutation({
+		mutationFn: ({
+			referenceId,
+			sortOrder,
+		}: {
+			referenceId: string;
+			sortOrder: number;
+		}) => updateWidgetReference(referenceId, sortOrder),
+		onSuccess: () => {
+			queryClient.invalidateQueries({ queryKey: ["widgets", "references"] });
+		},
+	});
+}

frontend/src/integrations/__tests__/navEntries.test.ts

@@ -0,0 +1,54 @@
+import { describe, it, expect } from "vitest";
+import { configuredNavEntries, SERVICE_TYPE_NAV_ENTRIES } from "../navEntries";
+
+describe("navEntries", () => {
+	it("returns no entries when no types are configured", () => {
+		expect(configuredNavEntries(new Set())).toEqual([]);
+	});
+
+	it("returns Jellyfin when jellyfin is configured", () => {
+		const entries = configuredNavEntries(new Set(["jellyfin"]));
+		expect(entries).toHaveLength(1);
+		expect(entries[0].label).toBe("Jellyfin");
+		expect(entries[0].path).toBe("/services/jellyfin");
+	});
+
+	it("returns one SSH Tasks entry when ssh_tasks is configured", () => {
+		const entries = configuredNavEntries(new Set(["ssh_tasks"]));
+		expect(entries).toHaveLength(1);
+		expect(entries[0].label).toBe("SSH Tasks");
+	});
+
+	it("returns all observability entries", () => {
+		const entries = configuredNavEntries(
+			new Set(["alertmanager", "grafana", "prometheus"]),
+		);
+		expect(entries.map((e) => e.label)).toEqual([
+			"Alertmanager",
+			"Grafana",
+			"Prometheus",
+		]);
+	});
+
+	it("returns Backups + Authentik when configured", () => {
+		const entries = configuredNavEntries(new Set(["backups", "authentik"]));
+		expect(entries.map((e) => e.label)).toEqual(["Backups", "Authentik"]);
+	});
+
+	it("nextcloud has no nav entries in the static map", () => {
+		expect(
+			SERVICE_TYPE_NAV_ENTRIES.filter((e) => e.serviceType === "nextcloud"),
+		).toEqual([]);
+	});
+
+	it("preserves declaration order across mixed types", () => {
+		const entries = configuredNavEntries(
+			new Set(["authentik", "ssh_tasks", "jellyfin"]),
+		);
+		expect(entries.map((e) => e.label)).toEqual([
+			"Jellyfin",
+			"SSH Tasks",
+			"Authentik",
+		]);
+	});
+});

frontend/src/integrations/navEntries.ts

@@ -0,0 +1,86 @@
+/**
+ * Service-type → conditional nav-entry map.
+ *
+ * Each configured service type contributes ONE top-level nav entry that
+ * appears only when at least one enabled instance of that type exists. The
+ * label is the service TYPE name (Jellyfin, SSH Tasks), not a conceptual
+ * name (Media, Files) — the service page's content tabs surface the concepts.
+ */
+import {
+	Activity,
+	DatabaseBackup,
+	GanttChartSquare,
+	Link2,
+	Monitor,
+	Server,
+	Users,
+	type LucideIcon,
+} from "lucide-react";
+
+export interface NavEntry {
+	serviceType: string;
+	label: string;
+	icon: LucideIcon;
+	/** Route path for this entry. */
+	path: string;
+}
+
+/**
+ * Static mapping from service type to its conditional nav entry.
+ * Uses the service type's display name. One entry per type.
+ * `nextcloud` has no entry (no operational content tabs).
+ */
+export const SERVICE_TYPE_NAV_ENTRIES: NavEntry[] = [
+	{
+		serviceType: "jellyfin",
+		label: "Jellyfin",
+		icon: Monitor,
+		path: "/services/jellyfin",
+	},
+	{
+		serviceType: "ssh_tasks",
+		label: "SSH Tasks",
+		icon: Server,
+		path: "/services/ssh_tasks",
+	},
+	{
+		serviceType: "alertmanager",
+		label: "Alertmanager",
+		icon: Activity,
+		path: "/services/alertmanager",
+	},
+	{
+		serviceType: "grafana",
+		label: "Grafana",
+		icon: Link2,
+		path: "/services/grafana",
+	},
+	{
+		serviceType: "prometheus",
+		label: "Prometheus",
+		icon: GanttChartSquare,
+		path: "/services/prometheus",
+	},
+	{
+		serviceType: "backups",
+		label: "Backups",
+		icon: DatabaseBackup,
+		path: "/services/backups",
+	},
+	{
+		serviceType: "authentik",
+		label: "Authentik",
+		icon: Users,
+		path: "/services/authentik",
+	},
+];
+
+/**
+ * Filter the static entries to those whose service type is configured (present
+ * in the `configuredTypes` set). Returns a flat list in declaration order.
+ */
+export function configuredNavEntries(configuredTypes: Set<string>): NavEntry[] {
+	return SERVICE_TYPE_NAV_ENTRIES.filter((e) =>
+		configuredTypes.has(e.serviceType),
+	);
+}

frontend/src/integrations/registry.test.ts

@@ -23,6 +23,7 @@ describe("service registry", () => {
 	it("binds widget kinds per service", () => {
 		expect(SERVICE_REGISTRY.grafana.widgets.map((w) => w.kind)).toEqual([
 			"link",
+			"chart",
 		]);
 		expect(SERVICE_REGISTRY.alertmanager.widgets.map((w) => w.kind)).toEqual([
 			"active_alerts",

frontend/src/integrations/registry.ts

@@ -2,7 +2,9 @@ import type { ComponentType } from "react";
 import { AlertmanagerAlertsWidget } from "../widgets/AlertmanagerAlertsWidget";
 import { BackupsWidget } from "../widgets/BackupsWidget";
 import { GrafanaLinkWidget } from "../widgets/GrafanaLinkWidget";
+import { GrafanaChartWidget } from "../widgets/GrafanaChartWidget";
 import { JellyfinWidget } from "../widgets/JellyfinWidget";
+import { JellyfinNowPlayingWidget } from "../widgets/JellyfinNowPlayingWidget";
 import { PrometheusMetricWidget } from "../widgets/PrometheusMetricWidget";
 import { SshTaskWidget } from "../widgets/SshTaskWidget";
 import { StaticWidget } from "../widgets/StaticWidget";
@@ -86,6 +88,39 @@ export const SERVICE_REGISTRY: Record<string, ServiceBinding> = {
 				},
 				component: GrafanaLinkWidget,
 			},
+			{
+				kind: "chart",
+				name: "Chart",
+				description: "Live time-series chart from a Grafana datasource query.",
+				refreshIntervalMs: 60_000,
+				defaultConfig: {
+					datasource_uid: "prometheus",
+					query: "",
+					from_ts: "now-1h",
+					to_ts: "now",
+					interval_ms: 30_000,
+					max_data_points: 100,
+				},
+				configSchema: {
+					type: "object",
+					properties: {
+						datasource_uid: {
+							type: "string",
+							description: "Grafana datasource UID (e.g. 'prometheus')",
+						},
+						query: {
+							type: "string",
+							description: "Query expression (e.g. PromQL)",
+						},
+						from_ts: { type: "string" },
+						to_ts: { type: "string" },
+						interval_ms: { type: "integer" },
+						max_data_points: { type: "integer" },
+					},
+					required: ["query"],
+				},
+				component: GrafanaChartWidget,
+			},
 		],
 	},
 	prometheus: {
@@ -122,6 +157,15 @@ export const SERVICE_REGISTRY: Record<string, ServiceBinding> = {
 				configSchema: { type: "object", properties: {}, required: [] },
 				component: JellyfinWidget,
 			},
+			{
+				kind: "now_playing",
+				name: "Now Playing",
+				description: "Only sessions actively playing media.",
+				refreshIntervalMs: 30_000,
+				defaultConfig: {},
+				configSchema: { type: "object", properties: {}, required: [] },
+				component: JellyfinNowPlayingWidget,
+			},
 		],
 	},
 	nextcloud: {

frontend/src/pages/Applications.tsx

@@ -1,133 +0,0 @@
-import { useState } from "react";
-import { useSearchParams } from "react-router-dom";
-import { Alert, AlertDescription } from "@/components/ui/alert";
-import { Badge } from "@/components/ui/badge";
-import { TabsTrigger } from "@/components/ui/tabs";
-import { Media } from "./Media";
-import { useCounts, useLibraries } from "../hooks/useDashboard";
-import { useServiceInstances } from "../hooks/useServices";
-import { SectionCard } from "../components/SectionCard";
-import { TabbedCard } from "../components/TabbedCard";
-
-function JellyfinLibraryStats() {
-	const [searchParams] = useSearchParams();
-	const { data: jellyfinServices = [] } = useServiceInstances("jellyfin");
-	const selectedServiceId =
-		searchParams.get("jellyfin_service_id") ||
-		jellyfinServices.find((s) => s.enabled)?.id ||
-		"";
-	const { data: counts } = useCounts(selectedServiceId || undefined);
-	const { data: libraries } = useLibraries(selectedServiceId || undefined);
-
-	return (
-		<SectionCard
-			title="Library stats"
-			description="Compact Jellyfin summary for the selected machine."
-			action={
-				<Badge variant="outline">
-					{selectedServiceId ? "Selected service" : "Default service"}
-				</Badge>
-			}
-		>
-			<div className="flex flex-col gap-2">
-				{counts ? (
-					<div className="grid grid-cols-2 gap-2 md:grid-cols-4">
-						<div className="rounded-lg border bg-card px-3 py-2 text-center">
-							<span className="text-xs text-muted-foreground">Total</span>
-							<div className="text-base leading-tight font-extrabold">
-								{(
-									counts.movies +
-									counts.series +
-									counts.episodes
-								).toLocaleString()}
-							</div>
-						</div>
-						<div className="rounded-lg border bg-card px-3 py-2 text-center">
-							<span className="text-xs text-muted-foreground">Movies</span>
-							<div className="text-base leading-tight font-extrabold">
-								{counts.movies.toLocaleString()}
-							</div>
-						</div>
-						<div className="rounded-lg border bg-card px-3 py-2 text-center">
-							<span className="text-xs text-muted-foreground">Series</span>
-							<div className="text-base leading-tight font-extrabold">
-								{counts.series.toLocaleString()}
-							</div>
-						</div>
-						<div className="rounded-lg border bg-card px-3 py-2 text-center">
-							<span className="text-xs text-muted-foreground">Episodes</span>
-							<div className="text-base leading-tight font-extrabold">
-								{counts.episodes.toLocaleString()}
-							</div>
-						</div>
-					</div>
-				) : null}
-
-				{libraries?.length ? (
-					<div className="grid grid-cols-1 gap-2 md:grid-cols-2">
-						{libraries.map((library) => (
-							<div
-								key={library.library}
-								className="rounded-lg border bg-card px-3 py-2"
-							>
-								<div className="flex flex-col gap-1">
-									<span className="truncate text-sm font-semibold">
-										{library.library}
-									</span>
-									<span className="text-sm text-muted-foreground">
-										Total {library.total.toLocaleString()} · Movies{" "}
-										{library.movies.toLocaleString()} · Series{" "}
-										{library.series.toLocaleString()}
-									</span>
-								</div>
-							</div>
-						))}
-					</div>
-				) : null}
-			</div>
-		</SectionCard>
-	);
-}
-
-export function Applications() {
-	const [tab, setTab] = useState("jellyfin");
-
-	return (
-		<div className="flex flex-col gap-4">
-			<div>
-				<h1 className="text-lg font-semibold">Applications</h1>
-				<p className="text-sm text-muted-foreground">
-					Browse application-specific tools from a compact tabbed workspace.
-				</p>
-			</div>
-
-			<TabbedCard
-				value={tab}
-				onChange={setTab}
-				tabs={[
-					<TabsTrigger key="jellyfin" value="jellyfin">
-						Jellyfin
-					</TabsTrigger>,
-					<TabsTrigger key="nextcloud" value="nextcloud">
-						Nextcloud
-					</TabsTrigger>,
-				]}
-			>
-				{tab === "jellyfin" ? (
-					<div className="flex flex-col gap-4">
-						<JellyfinLibraryStats />
-						<Media />
-					</div>
-				) : (
-					<div className="rounded-lg border bg-card p-3">
-						<Alert>
-							<AlertDescription>
-								Nextcloud support will be added in a future update.
-							</AlertDescription>
-						</Alert>
-					</div>
-				)}
-			</TabbedCard>
-		</div>
-	);
-}

frontend/src/pages/Dashboard.tsx

@@ -31,7 +31,11 @@ import {
 	useDeleteDashboardShortcut,
 	useSaveDashboardShortcut,
 } from "../hooks/useDashboard";
-import { useWidgetInstances } from "../hooks/useWidgets";
+import {
+	useDetachWidgetReference,
+	useWidgetInstances,
+	useWidgetReferences,
+} from "../hooks/useWidgets";
 import { useServiceInstances } from "../hooks/useServices";
 import { useIsMobile } from "../hooks/useIsMobile";
 import type {
@@ -46,7 +50,7 @@ import { DialogFooter } from "../components/DialogFooter";
 import { WidgetInstanceCard } from "../components/WidgetInstance";
 import { WidgetConfigDialog } from "../components/WidgetConfigDialog";
 
-// --- Mobile section grouping (spec R7.2) ---
+// --- Mobile section grouping (mobile-parity) ---
 
 const SECTION_ORDER = ["observability", "media", "backups", "custom"] as const;
 type SectionId = (typeof SECTION_ORDER)[number];
@@ -97,12 +101,15 @@ function groupWidgetsBySection(
 
 function MobileWidgetSections({
 	sections,
+	onEditWidget,
+	onCopyWidget,
 }: {
 	sections: { id: SectionId; widgets: WidgetInstance[] }[];
+	onEditWidget?: (widgetId: string) => void;
+	onCopyWidget?: (widgetId: string) => void;
 }) {
 	return (
 		<>
-			{/* Anchor bar — horizontally scrollable pills (spec R7.2, md:hidden) */}
 			<div className="-mx-1 flex gap-2 overflow-x-auto px-1 pb-1">
 				{sections.map((section) => {
 					const meta = SECTION_META[section.id];
@@ -127,7 +134,6 @@ function MobileWidgetSections({
 					);
 				})}
 			</div>
-			{/* Sectioned widgets — single column (spec R7.1) */}
 			<div className="grid grid-cols-1 gap-4">
 				{sections.map((section) => (
 					<section
@@ -139,7 +145,12 @@ function MobileWidgetSections({
 							{SECTION_META[section.id].label}
 						</h3>
 						{section.widgets.map((widget) => (
-							<WidgetInstanceCard key={widget.id} widget={widget} />
+							<WidgetInstanceCard
+								key={widget.id}
+								widget={widget}
+								onEdit={onEditWidget ? (id) => onEditWidget(id) : undefined}
+								onCopy={onCopyWidget ? (id) => onCopyWidget(id) : undefined}
+							/>
 						))}
 					</section>
 				))}
@@ -354,7 +365,6 @@ function ShortcutDialog({
 					<div className="flex items-center gap-2">
 						<Switch
 							id="shortcut-enabled"
-							className="mobile-touch-target"
 							checked={draft.enabled}
 							onCheckedChange={(checked) =>
 								onChange({ ...draft, enabled: checked })
@@ -425,24 +435,13 @@ function ShortcutCard({
 						size="sm"
 						disabled={!shortcut.enabled || !href}
 						onClick={onOpen}
-						className="mobile-touch-target"
 					>
 						Open
 					</Button>
-					<Button
+					<Button size="sm" variant="outline" onClick={onEdit}>
-						size="sm"
-						variant="outline"
-						onClick={onEdit}
-						className="mobile-touch-target"
-					>
 						Edit
 					</Button>
-					<Button
+					<Button size="sm" variant="destructive" onClick={onDelete}>
-						size="sm"
-						variant="destructive"
-						onClick={onDelete}
-						className="mobile-touch-target"
-					>
 						Delete
 					</Button>
 				</div>
@@ -462,17 +461,30 @@ export function Dashboard() {
 	);
 	const [deleteShortcutId, setDeleteShortcutId] = useState<string | null>(null);
 	const [widgetDialogOpen, setWidgetDialogOpen] = useState(false);
-	const { data: widgetInstances = [] } = useWidgetInstances();
+	const [editWidgetId, setEditWidgetId] = useState<string | undefined>();
+	const { data: widgetInstances = [] } = useWidgetInstances(
+		undefined,
+		"dashboard",
+	);
+	const { data: widgetReferences = [] } = useWidgetReferences("main");
 	const { data: services = [] } = useServiceInstances();
 	const isMobile = useIsMobile();
 
-	const visibleWidgets = useMemo(
+	const visibleWidgets = useMemo(() => {
-		() =>
+		const refs = widgetReferences
-			widgetInstances
+			.filter((r) => r.widget.enabled)
+			.map((r) => r.widget);
+		return [...widgetInstances, ...refs]
 			.filter((w) => w.enabled)
-				.sort((a, b) => a.sort_order - b.sort_order),
+			.sort((a, b) => a.sort_order - b.sort_order);
-		[widgetInstances],
+	}, [widgetInstances, widgetReferences]);
+
+	// Track which visible widgets are references (for the copy/detach button).
+	const referencedWidgetIds = useMemo(
+		() => new Set(widgetReferences.map((r) => r.widget.id)),
+		[widgetReferences],
 	);
+	const detachRef = useDetachWidgetReference();
 
 	const mobileSections = useMemo(
 		() => groupWidgetsBySection(visibleWidgets, services),
@@ -508,23 +520,36 @@ export function Dashboard() {
 
 	return (
 		<div className="flex flex-col gap-4">
+			{services.length === 0 ? (
+				<SectionCard
+					title="Welcome to Manage"
+					description="Add a service to get started."
+				>
+					<div className="flex flex-col gap-3">
+						<p className="text-sm text-muted-foreground">
+							No services configured yet. Add a Jellyfin, SSH target, Authentik,
+							or observability service to populate the navigation and
+							dashboards.
+						</p>
+						<Button
+							variant="outline"
+							onClick={() => navigate("/services")}
+							className="w-fit"
+						>
+							Add a service
+						</Button>
+					</div>
+				</SectionCard>
+			) : null}
 			<SectionCard
 				title="Shortcuts"
 				description="Quick links to websites today, with room for action and user shortcuts later."
 				action={
 					<div className="flex gap-2">
-						<Button
+						<Button variant="outline" onClick={() => setWidgetDialogOpen(true)}>
-							variant="outline"
-							className="mobile-touch-target"
-							onClick={() => setWidgetDialogOpen(true)}
-						>
 							Edit dashboard
 						</Button>
-						<Button
+						<Button variant="outline" onClick={openCreateShortcut}>
-							variant="outline"
-							className="mobile-touch-target"
-							onClick={openCreateShortcut}
-						>
 							Add shortcut
 						</Button>
 					</div>
@@ -560,10 +585,38 @@ export function Dashboard() {
 			</SectionCard>
 
 			{isMobile && mobileSections.length > 0 ? (
-				<MobileWidgetSections sections={mobileSections} />
+				<MobileWidgetSections
+					sections={mobileSections}
+					onEditWidget={(id) => {
+						setEditWidgetId(id);
+						setWidgetDialogOpen(true);
+					}}
+					onCopyWidget={(id) => {
+						const ref = widgetReferences.find((r) => r.widget.id === id);
+						if (ref) detachRef.mutate(ref.id);
+					}}
+				/>
 			) : (
 				visibleWidgets.map((widget) => (
-					<WidgetInstanceCard key={widget.id} widget={widget} />
+					<WidgetInstanceCard
+						key={widget.id}
+						widget={widget}
+						onEdit={(id) => {
+							setEditWidgetId(id);
+							setWidgetDialogOpen(true);
+						}}
+						onCopy={
+							referencedWidgetIds.has(widget.id)
+								? () => {
+										// Detach: find the reference and clone it.
+										const ref = widgetReferences.find(
+											(r) => r.widget.id === widget.id,
+										);
+										if (ref) detachRef.mutate(ref.id);
+									}
+								: undefined
+						}
+					/>
 				))
 			)}
 
@@ -589,7 +642,12 @@ export function Dashboard() {
 			/>
 			<WidgetConfigDialog
 				open={widgetDialogOpen}
-				onClose={() => setWidgetDialogOpen(false)}
+				onClose={() => {
+					setWidgetDialogOpen(false);
+					setEditWidgetId(undefined);
+				}}
+				dashboardScope="main"
+				editWidgetId={editWidgetId}
 			/>
 		</div>
 	);

frontend/src/pages/FileBrowser.tsx

@@ -1 +0,0 @@
-export { FileBrowser } from "./FileBrowser.impl";

frontend/src/pages/NamedDashboardPage.tsx

@@ -0,0 +1,144 @@
+import { useMemo, useState } from "react";
+import { useParams } from "react-router-dom";
+import { Boxes, Settings2 } from "lucide-react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
+import { useDashboardBySlug } from "../hooks/useDashboards";
+import { useWidgetReferences } from "../hooks/useWidgets";
+import { PinnedServiceLink } from "../components/PinnedServiceLink";
+import { WidgetInstanceCard } from "../components/WidgetInstance";
+import { WidgetConfigDialog } from "../components/WidgetConfigDialog";
+
+/**
+ * Payload model for named dashboards (design choice: inline items, not widget
+ * instance ids). The payload stores an ordered list of items:
+ *
+ * ```
+ * { items: DashboardItem[] }
+ * ```
+ *
+ * Where `DashboardItem` is either a pinned service link (this slice) or a
+ * future widget reference (follow-up). Widget composition on named dashboards
+ * is deferred — the main Dashboard already has the rich widget config dialog.
+ */
+interface LinkItem {
+	type: "link";
+	label: string;
+	target: string;
+}
+
+type DashboardItem = LinkItem;
+
+function parseItems(payload: Record<string, unknown>): DashboardItem[] {
+	const items = payload.items;
+	if (!Array.isArray(items)) return [];
+	return items.filter(
+		(item): item is LinkItem =>
+			typeof item === "object" &&
+			item !== null &&
+			item.type === "link" &&
+			typeof item.label === "string" &&
+			typeof item.target === "string",
+	);
+}
+
+export function NamedDashboardPage() {
+	const { slug = "" } = useParams<{ slug: string }>();
+	const { data: dashboard, isLoading, isError } = useDashboardBySlug(slug);
+	const dashboardScope = `named:${slug}`;
+	const { data: widgetRefs = [] } = useWidgetReferences(dashboardScope);
+	const [configOpen, setConfigOpen] = useState(false);
+	const [editWidgetId, setEditWidgetId] = useState<string | undefined>();
+
+	const items = useMemo(
+		() => parseItems(dashboard?.payload ?? {}),
+		[dashboard?.payload],
+	);
+
+	const visibleWidgets = useMemo(
+		() =>
+			widgetRefs
+				.filter((r) => r.widget.enabled)
+				.map((r) => r.widget)
+				.sort((a, b) => a.sort_order - b.sort_order),
+		[widgetRefs],
+	);
+
+	if (isLoading) {
+		return <Skeleton className="h-32 w-full" />;
+	}
+
+	if (isError || !dashboard) {
+		return (
+			<Alert>
+				<AlertDescription>
+					Dashboard not found. It may have been deleted or the link is invalid.
+				</AlertDescription>
+			</Alert>
+		);
+	}
+
+	return (
+		<div className="flex flex-col gap-4">
+			<div className="flex items-center justify-between">
+				<h2 className="text-xl font-semibold">{dashboard.label}</h2>
+				<Button
+					variant="outline"
+					size="sm"
+					className="mobile-touch-target"
+					onClick={() => setConfigOpen(true)}
+				>
+					<Settings2 className="size-4" />
+					Edit widgets
+				</Button>
+			</div>
+
+			{visibleWidgets.length > 0 ? (
+				<div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+					{visibleWidgets.map((widget) => (
+						<WidgetInstanceCard
+							key={widget.id}
+							widget={widget}
+							onEdit={(id) => {
+								setEditWidgetId(id);
+								setConfigOpen(true);
+							}}
+						/>
+					))}
+				</div>
+			) : null}
+
+			{items.length === 0 && visibleWidgets.length === 0 ? (
+				<Alert>
+					<AlertDescription>
+						This dashboard is empty. Add widgets via "Edit widgets" or pinned
+						service links from the dashboard management panel on the Services
+						page.
+					</AlertDescription>
+				</Alert>
+			) : items.length > 0 ? (
+				<div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3">
+					{items.map((item, index) => (
+						<PinnedServiceLink
+							key={`${item.target}-${index}`}
+							label={item.label}
+							target={item.target}
+							icon={Boxes}
+						/>
+					))}
+				</div>
+			) : null}
+
+			<WidgetConfigDialog
+				open={configOpen}
+				onClose={() => {
+					setConfigOpen(false);
+					setEditWidgetId(undefined);
+				}}
+				dashboardScope={dashboardScope}
+				editWidgetId={editWidgetId}
+			/>
+		</div>
+	);
+}

frontend/src/pages/ServicePage.tsx

@@ -1,49 +1,17 @@
-import { useMemo, useState } from "react";
+import { useMemo } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useParams, useNavigate } from "react-router-dom";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Input } from "@/components/ui/input";
+import { useServiceInstances } from "../hooks/useServices";
-import { Label } from "@/components/ui/label";
+import type { ServiceInstance } from "../types";
-import { Switch } from "@/components/ui/switch";
-import {
-	useDeleteServiceInstance,
-	useSaveServiceInstance,
-	useServiceInstances,
-	useServiceTypes,
-} from "../hooks/useServices";
-import { useIsMobile } from "../hooks/useIsMobile";
-import type {
-	ServiceInstance,
-	ServiceInstanceInput,
-	ServiceTypeInfo,
-} from "../types";
 import { SectionCard } from "../components/SectionCard";
-import { ConfirmDialog } from "../components/ConfirmDialog";
-import { SheetForm } from "@/components/ui/sheet-form";
 import { getServiceBinding } from "../integrations/registry";
-
+import {
-function Field({
+	OVERVIEW_TAB,
-	label,
+	serviceContentTabs,
-	htmlFor,
+	type ContentTab,
-	helper,
+} from "./service-tabs";
-	children,
-}: {
-	label: string;
-	htmlFor: string;
-	helper?: string;
-	children: React.ReactNode;
-}) {
-	return (
-		<div className="flex flex-col gap-1.5">
-			<Label htmlFor={htmlFor}>{label}</Label>
-			{children}
-			{helper ? (
-				<p className="text-xs text-muted-foreground">{helper}</p>
-			) : null}
-		</div>
-	);
-}
 
 export function ServicePage() {
 	const { serviceType = "", serviceId = "" } = useParams<{
@@ -51,39 +19,24 @@ export function ServicePage() {
 		serviceId: string;
 	}>();
 	const { data: services = [] } = useServiceInstances(serviceType || undefined);
-	const { data: types = [] } = useServiceTypes();
+	const navigate = useNavigate();
-	const saveService = useSaveServiceInstance();
-	const deleteService = useDeleteServiceInstance();
 
 	const instance = useMemo(
 		() => services.find((s) => s.id === serviceId),
 		[services, serviceId],
 	);
 	const binding = getServiceBinding(serviceType);
-	const typeInfo = useMemo(
+	const contentTabs = useMemo(
-		() => types.find((t) => t.service_type === serviceType),
+		() => serviceContentTabs(serviceType),
-		[types, serviceType],
+		[serviceType],
 	);
+	const siblings = useMemo(
+		() => services.filter((s) => s.service_type === serviceType && s.enabled),
+		[services, serviceType],
+	);
+	const showInstanceTabs = siblings.length > 1;
 
-	const navigate = useNavigate();
+	const allTabs: ContentTab[] = [OVERVIEW_TAB, ...contentTabs];
-	const [name, setName] = useState("");
-	const [enabled, setEnabled] = useState(true);
-	const [draftConfig, setDraftConfig] = useState<Record<string, unknown>>({});
-	const [deleteOpen, setDeleteOpen] = useState(false);
-	const [hydrated, setHydrated] = useState(false);
-	const isMobile = useIsMobile();
-	// The mobile SheetForm opens by default when the page loads: this page is
-	// reached via /services/:serviceType/:serviceId, always editing an existing
-	// instance, so there is no separate "open edit" trigger on mobile.
-	const [sheetOpen, setSheetOpen] = useState(true);
-
-	// Hydrate local form state once the instance loads.
-	if (instance && !hydrated) {
-		setName(instance.name);
-		setEnabled(instance.enabled);
-		setDraftConfig({ ...instance.config });
-		setHydrated(true);
-	}
 
 	if (!binding) {
 		return (
@@ -101,43 +54,8 @@ export function ServicePage() {
 		);
 	}
 
-	function buildInput(): ServiceInstanceInput {
+	const widgetsContent =
-		return {
-			id: instance!.id,
-			service_type: instance!.service_type,
-			name,
-			config: draftConfig,
-			secrets: {}, // secrets are managed via the dedicated inputs below
-			enabled,
-		};
-	}
-
-	async function save() {
-		await saveService.mutateAsync(buildInput());
-		// R4.5: close the sheet on successful save and return to the services list
-		// (on mobile the sheet IS the page, so closing it would strand the user).
-		if (isMobile) {
-			setSheetOpen(false);
-			navigate("/services");
-		}
-	}
-
-	const configFields = (
-		<ServiceConnectionFields
-			instance={instance}
-			typeInfo={typeInfo}
-			draftConfig={draftConfig}
-			onConfigChange={setDraftConfig}
-			isMobile={isMobile}
-		/>
-	);
-
-	const widgetsCard =
 		binding.widgets.length > 0 ? (
-			<SectionCard
-				title="Widgets"
-				description="Widget kinds this service provides."
-			>
 			<div className="flex flex-col gap-2">
 				{binding.widgets.map((w) => (
 					<div
@@ -157,272 +75,72 @@ export function ServicePage() {
 					Add these to the dashboard from the dashboard's edit dialog.
 				</p>
 			</div>
-			</SectionCard>
+		) : (
-		) : null;
+			<p className="text-sm text-muted-foreground">
-
+				No widget kinds for this service type.
-	const confirmDelete = (
+			</p>
-		<ConfirmDialog
-			open={deleteOpen}
-			title="Delete service?"
-			message="This removes the service and any widgets that reference it. This cannot be undone."
-			confirmLabel="Delete"
-			onCancel={() => setDeleteOpen(false)}
-			onConfirm={() => {
-				deleteService.mutate(instance.id);
-				setDeleteOpen(false);
-			}}
-		/>
 		);
 
-	// Dirty when any editable field diverges from the persisted instance (mobile SheetForm R4.5 guard).
-	const isDirty =
-		name !== instance.name ||
-		enabled !== instance.enabled ||
-		JSON.stringify(draftConfig) !== JSON.stringify(instance.config);
-
-	if (isMobile) {
-		return (
-			<div className="flex flex-col gap-4">
-				<SheetForm
-					open={sheetOpen}
-					onOpenChange={setSheetOpen}
-					title={name || instance.name}
-					onSave={save}
-					onCancel={() => {
-						setSheetOpen(false);
-						navigate("/services");
-					}}
-					isPending={saveService.isPending}
-					isDirty={isDirty}
-				>
-					<div className="flex flex-col gap-6">
-						<Field label="Name" htmlFor="service-name">
-							<Input
-								id="service-name"
-								value={name}
-								onChange={(e) => setName(e.target.value)}
-							/>
-						</Field>
-						<div className="flex items-center gap-2">
-							<Switch
-								id="service-enabled"
-								checked={enabled}
-								onCheckedChange={setEnabled}
-							/>
-							<Label htmlFor="service-enabled">Enabled</Label>
-						</div>
-						{configFields}
-						<Button
-							className="mobile-touch-target"
-							variant="destructive"
-							onClick={() => setDeleteOpen(true)}
-						>
-							Delete service
-						</Button>
-						{widgetsCard}
-					</div>
-				</SheetForm>
-				{confirmDelete}
-			</div>
-		);
-	}
-
 	return (
 		<div className="flex flex-col gap-4">
-			<div className="flex items-center justify-between">
+			{/* Header */}
-				<div>
+			<div className="flex items-center justify-between gap-4">
+				<div className="min-w-0">
 					<h2 className="text-xl font-semibold">{instance.name}</h2>
 					<p className="text-sm text-muted-foreground">{binding.description}</p>
 				</div>
 				<Badge variant="outline">{binding.name}</Badge>
 			</div>
 
-			<SectionCard title="General">
+			{/* Instance tabs (only when >1 enabled sibling) */}
-				<div className="flex flex-col gap-3">
+			{showInstanceTabs ? (
-					<Field label="Name" htmlFor="service-name">
+				<Tabs value={instance.id}>
-						<Input
+					<TabsList>
-							id="service-name"
+						{siblings.map((sibling: ServiceInstance) => (
-							value={name}
+							<TabsTrigger
-							onChange={(e) => setName(e.target.value)}
+								key={sibling.id}
-						/>
+								value={sibling.id}
-					</Field>
+								onClick={() =>
-					<div className="flex items-center gap-2">
+									navigate(`/services/${serviceType}/${sibling.id}`)
-						<Switch
+								}
-							id="service-enabled"
-							className="mobile-touch-target"
-							checked={enabled}
-							onCheckedChange={setEnabled}
-						/>
-						<Label htmlFor="service-enabled">Enabled</Label>
-					</div>
-					<div className="flex justify-between">
-						<Button
-							className="mobile-touch-target"
-							onClick={save}
-							disabled={saveService.isPending}
 							>
-							Save
+								{sibling.name}
-						</Button>
+							</TabsTrigger>
-						<Button
+						))}
-							className="mobile-touch-target"
+					</TabsList>
-							variant="destructive"
+				</Tabs>
-							onClick={() => setDeleteOpen(true)}
+			) : null}
-						>
-							Delete
-						</Button>
-					</div>
-				</div>
-			</SectionCard>
 
-			{configFields}
+			{/* Content tabs */}
+			<Tabs defaultValue="Overview">
+				<TabsList>
+					<TabsTrigger value="Overview">Overview</TabsTrigger>
+					{contentTabs.map((tab) => (
+						<TabsTrigger key={tab.label} value={tab.label}>
+							{tab.label}
+						</TabsTrigger>
+					))}
+					<TabsTrigger value="Widgets">Widgets</TabsTrigger>
+				</TabsList>
 
-			{widgetsCard}
+				{allTabs.map((tab) => {
-
+					const TabComponent = tab.Component;
-			{confirmDelete}
-		</div>
-	);
-}
-
-function ServiceConnectionFields({
-	instance,
-	typeInfo,
-	draftConfig,
-	onConfigChange,
-	isMobile,
-}: {
-	instance: ServiceInstance;
-	typeInfo: ServiceTypeInfo | undefined;
-	draftConfig: Record<string, unknown>;
-	onConfigChange: (config: Record<string, unknown>) => void;
-	isMobile: boolean;
-}) {
-	const saveService = useSaveServiceInstance();
-	// Empty-on-edit: local state starts blank; a blank field means "keep existing".
-	const [draftSecrets, setDraftSecrets] = useState<Record<string, string>>({});
-
-	const properties =
-		(
-			(typeInfo?.config_schema ?? {}) as {
-				properties?: Record<
-					string,
-					{ type?: string; description?: string; default?: unknown }
-				>;
-			}
-		).properties ?? {};
-	const configEntries: Array<
-		[string, { type?: string; description?: string }]
-	> =
-		Object.keys(properties).length > 0
-			? Object.entries(properties).map(([key, schema]) => [
-					key,
-					{ type: schema?.type, description: schema?.description },
-				])
-			: Object.entries(instance.config).map(([key, value]) => [
-					key,
-					{ type: typeof value === "number" ? "integer" : "string" },
-				]);
-
-	function handleUpdateConnection() {
-		const onlyChanged = Object.fromEntries(
-			Object.entries(draftSecrets).filter(([, v]) => v !== ""),
-		);
-		saveService.mutate({
-			id: instance.id,
-			service_type: instance.service_type,
-			name: instance.name,
-			config: draftConfig,
-			secrets: onlyChanged,
-			enabled: instance.enabled,
-		});
-		setDraftSecrets({});
-	}
-
-	const fields = (
-		<div className="flex flex-col gap-3">
-			{configEntries.length === 0 ? (
-				<p className="text-sm text-muted-foreground">No connection config.</p>
-			) : (
-				<div className="flex flex-col gap-3">
-					{configEntries.map(([key, schema]) => {
-						const isNumber =
-							schema.type === "integer" || schema.type === "number";
 					return (
-							<Field
+						<TabsContent key={tab.label} value={tab.label}>
-								key={key}
+							<TabComponent instance={instance} />
-								label={key}
+						</TabsContent>
-								htmlFor={`cfg-${key}`}
-								helper={schema.description}
-							>
-								<Input
-									id={`cfg-${key}`}
-									type={isNumber ? "number" : "text"}
-									value={String(draftConfig[key] ?? "")}
-									onChange={(e) =>
-										onConfigChange({
-											...draftConfig,
-											[key]: isNumber
-												? e.target.value === ""
-													? undefined
-													: Number(e.target.value)
-												: e.target.value,
-										})
-									}
-								/>
-							</Field>
 					);
 				})}
-				</div>
-			)}
 
-			{Object.keys(instance.secrets_set).length === 0 ? (
+				<TabsContent value="Widgets">
-				<p className="text-sm text-muted-foreground">No secret fields.</p>
-			) : (
-				<div className="flex flex-col gap-3">
-					{Object.entries(instance.secrets_set).map(([key, isSet]) => (
-						<div key={key} className="flex flex-col gap-1.5">
-							<Field
-								label={key}
-								htmlFor={`secret-${key}`}
-								helper="Leave blank to keep the current value."
-							>
-								<Input
-									id={`secret-${key}`}
-									type="password"
-									placeholder={isSet ? "•••••• (set)" : "Not set"}
-									value={draftSecrets[key] ?? ""}
-									onChange={(e) =>
-										setDraftSecrets({
-											...draftSecrets,
-											[key]: e.target.value,
-										})
-									}
-								/>
-							</Field>
-							{isSet ? <Badge variant="secondary">set</Badge> : null}
-						</div>
-					))}
-				</div>
-			)}
-
-			<Button className="mobile-touch-target" onClick={handleUpdateConnection}>
-				Update connection
-			</Button>
-		</div>
-	);
-
-	// On mobile the fields render inside the SheetForm body without a card
-	// wrapper (the SheetForm already provides the container). On desktop they
-	// keep their original SectionCard framing.
-	if (isMobile) {
-		return <div className="flex flex-col gap-3">{fields}</div>;
-	}
-
-	return (
 					<SectionCard
-			title="Connection"
+						title="Widgets"
-			description="Edit non-secret connection config and secret values."
+						description="Widget kinds this service provides."
 					>
-			{fields}
+						{widgetsContent}
 					</SectionCard>
+				</TabsContent>
+			</Tabs>
+		</div>
 	);
 }

frontend/src/pages/ServiceTypePage.tsx

@@ -0,0 +1,46 @@
+/**
+ * Handles `/services/:type` (no instance id). Resolves the first enabled
+ * instance and redirects. Shows an empty state if none are configured.
+ */
+import { useMemo } from "react";
+import { Link, useParams, Navigate } from "react-router-dom";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { useServiceInstances } from "../hooks/useServices";
+
+export function ServiceTypePage() {
+	const { serviceType = "" } = useParams<{ serviceType: string }>();
+	const { data: instances = [], isLoading } = useServiceInstances(
+		serviceType || undefined,
+	);
+
+	const firstEnabled = useMemo(
+		() => instances.find((s) => s.enabled) ?? instances[0],
+		[instances],
+	);
+
+	if (isLoading) {
+		return (
+			<div className="flex h-32 items-center justify-center">
+				<div className="h-8 w-8 animate-spin rounded-full border-4 border-primary border-t-transparent" />
+			</div>
+		);
+	}
+
+	if (firstEnabled) {
+		return (
+			<Navigate to={`/services/${serviceType}/${firstEnabled.id}`} replace />
+		);
+	}
+
+	return (
+		<Alert>
+			<AlertDescription className="flex flex-col gap-3">
+				<span>No {serviceType} service configured.</span>
+				<Button asChild className="w-fit">
+					<Link to="/services">Add a service</Link>
+				</Button>
+			</AlertDescription>
+		</Alert>
+	);
+}

frontend/src/pages/ServicesPage.tsx

@@ -12,13 +12,31 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
-import { ExternalLink, Plus, Trash2 } from "lucide-react";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import {
+	ChevronDown,
+	ChevronUp,
+	ExternalLink,
+	Plus,
+	Trash2,
+} from "lucide-react";
 import {
 	useDeleteServiceInstance,
 	useSaveServiceInstance,
 	useServiceInstances,
 } from "../hooks/useServices";
 import { useServiceTypes } from "../hooks/useServices";
+import {
+	useDashboards,
+	useDeleteDashboard,
+	useSaveDashboard,
+} from "../hooks/useDashboards";
 import type {
 	SecretFieldInfo,
 	ServiceInstance,
@@ -29,6 +47,8 @@ import { SectionCard } from "../components/SectionCard";
 import { ConfirmDialog } from "../components/ConfirmDialog";
 import { DialogFooter } from "../components/DialogFooter";
 import { getServiceBinding } from "../integrations/registry";
+import { serviceLinkTarget } from "../components/PinnedServiceLink";
+import type { NamedDashboardInput } from "../api/dashboards";
 
 interface CreateDraft {
 	serviceType: string;
@@ -195,7 +215,7 @@ function CreateServiceDialog({
 					{!draft ? (
 						<div className="flex flex-col gap-2">
 							{types.map((t) => (
-								<Button className="mobile-touch-target"
+								<Button
 									key={t.service_type}
 									variant="outline"
 									onClick={() => setDraft(emptyDraft(t.service_type))}
@@ -234,7 +254,6 @@ function CreateServiceDialog({
 							<div className="flex items-center gap-2">
 								<Switch
 									id="service-enabled"
-									className="mobile-touch-target"
 									checked={draft.enabled}
 									onCheckedChange={(checked) =>
 										setDraft({ ...draft, enabled: checked })
@@ -258,6 +277,239 @@ function CreateServiceDialog({
 	);
 }
 
+// --- Named dashboards management (Slice 10.3) ---
+
+function DashboardManagementCard() {
+	const { data: dashboards = [] } = useDashboards();
+	const saveDashboard = useSaveDashboard();
+	const deleteDashboard = useDeleteDashboard();
+	const { data: services = [] } = useServiceInstances();
+	const [createOpen, setCreateOpen] = useState(false);
+	const [newLabel, setNewLabel] = useState("");
+	const [deleteId, setDeleteId] = useState<string | null>(null);
+	const [linkDashId, setLinkDashId] = useState<string | null>(null);
+	const [linkLabel, setLinkLabel] = useState("");
+	const [linkTarget, setLinkTarget] = useState("");
+
+	const enabledServices = useMemo(
+		() => services.filter((s) => s.enabled),
+		[services],
+	);
+
+	function createDashboard() {
+		if (!newLabel.trim()) return;
+		const input: NamedDashboardInput = {
+			label: newLabel.trim(),
+			sort_order: dashboards.length,
+			payload: { items: [] },
+		};
+		saveDashboard.mutate(input);
+		setNewLabel("");
+		setCreateOpen(false);
+	}
+
+	function reorder(dashId: string, direction: -1 | 1) {
+		const sorted = [...dashboards].sort((a, b) => a.sort_order - b.sort_order);
+		const idx = sorted.findIndex((d) => d.id === dashId);
+		const swapIdx = idx + direction;
+		if (swapIdx < 0 || swapIdx >= sorted.length) return;
+		const a = sorted[idx];
+		const b = sorted[swapIdx];
+		saveDashboard.mutate({
+			...a,
+			sort_order: b.sort_order,
+			payload: a.payload,
+		});
+		saveDashboard.mutate({
+			...b,
+			sort_order: a.sort_order,
+			payload: b.payload,
+		});
+	}
+
+	function addPinnedLink() {
+		if (!linkDashId || !linkLabel.trim() || !linkTarget.trim()) return;
+		const dash = dashboards.find((d) => d.id === linkDashId);
+		if (!dash) return;
+		const items = Array.isArray(dash.payload.items)
+			? (dash.payload.items as unknown[])
+			: [];
+		items.push({ type: "link", label: linkLabel.trim(), target: linkTarget });
+		saveDashboard.mutate({
+			id: dash.id,
+			label: dash.label,
+			sort_order: dash.sort_order,
+			payload: { items },
+		});
+		setLinkLabel("");
+		setLinkTarget("");
+	}
+
+	return (
+		<SectionCard
+			title="Dashboards"
+			description="Named dashboards appear in the top nav. Compose them from pinned service links."
+			action={
+				<Button variant="outline" onClick={() => setCreateOpen(true)}>
+					<Plus className="mr-1 h-3 w-3" />
+					New dashboard
+				</Button>
+			}
+		>
+			{dashboards.length === 0 ? (
+				<p className="text-sm text-muted-foreground">
+					No named dashboards yet. Create one to add pinned service links.
+				</p>
+			) : (
+				<div className="flex flex-col gap-3">
+					{[...dashboards]
+						.sort((a, b) => a.sort_order - b.sort_order)
+						.map((d, idx, arr) => (
+							<div key={d.id} className="rounded border p-3">
+								<div className="flex items-center justify-between gap-2">
+									<div className="flex items-center gap-2">
+										<span className="font-medium">{d.label}</span>
+										<Badge variant="outline">/{d.slug}</Badge>
+									</div>
+									<div className="flex items-center gap-1">
+										<Button
+											variant="ghost"
+											size="icon"
+											className="h-7 w-7"
+											disabled={idx === 0}
+											onClick={() => reorder(d.id, -1)}
+										>
+											<ChevronUp className="h-4 w-4" />
+										</Button>
+										<Button
+											variant="ghost"
+											size="icon"
+											className="h-7 w-7"
+											disabled={idx === arr.length - 1}
+											onClick={() => reorder(d.id, 1)}
+										>
+											<ChevronDown className="h-4 w-4" />
+										</Button>
+										<Button
+											variant="ghost"
+											size="icon"
+											className="h-7 w-7 text-destructive"
+											onClick={() => setDeleteId(d.id)}
+										>
+											<Trash2 className="h-4 w-4" />
+										</Button>
+									</div>
+								</div>
+								<div className="mt-2 flex flex-wrap items-center gap-2">
+									{Array.isArray(d.payload.items) &&
+									(d.payload.items as unknown[]).length > 0 ? (
+										<span className="text-xs text-muted-foreground">
+											{(d.payload.items as unknown[]).length} pinned link(s)
+										</span>
+									) : (
+										<span className="text-xs text-muted-foreground">
+											No links yet
+										</span>
+									)}
+								</div>
+								<div className="mt-2 flex flex-wrap items-end gap-2">
+									<Field label="Link label" htmlFor={`link-label-${d.id}`}>
+										<Input
+											id={`link-label-${d.id}`}
+											className="w-40"
+											placeholder="My Jellyfin"
+											value={linkDashId === d.id ? linkLabel : ""}
+											onChange={(e) => {
+												setLinkDashId(d.id);
+												setLinkLabel(e.target.value);
+											}}
+										/>
+									</Field>
+									<div className="flex flex-col gap-1.5">
+										<Label htmlFor={`link-target-${d.id}`}>Service</Label>
+										<Select
+											value={linkDashId === d.id ? linkTarget : ""}
+											onValueChange={(v) => {
+												setLinkDashId(d.id);
+												setLinkTarget(v);
+											}}
+										>
+											<SelectTrigger
+												id={`link-target-${d.id}`}
+												className="w-56"
+											>
+												<SelectValue placeholder="Pick a service" />
+											</SelectTrigger>
+											<SelectContent>
+												{enabledServices.map((s) => (
+													<SelectItem
+														key={s.id}
+														value={serviceLinkTarget(s.service_type, s.id)}
+													>
+														{s.name} ({s.service_type})
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+									</div>
+									<Button
+										variant="outline"
+										size="sm"
+										disabled={
+											linkDashId !== d.id ||
+											!linkLabel.trim() ||
+											!linkTarget.trim()
+										}
+										onClick={addPinnedLink}
+									>
+										Add link
+									</Button>
+								</div>
+							</div>
+						))}
+				</div>
+			)}
+
+			<Dialog open={createOpen} onOpenChange={setCreateOpen}>
+				<DialogContent className="sm:max-w-sm">
+					<DialogHeader>
+						<DialogTitle>New dashboard</DialogTitle>
+					</DialogHeader>
+					<Field label="Label" htmlFor="dash-label">
+						<Input
+							id="dash-label"
+							placeholder="Storage overview"
+							value={newLabel}
+							onChange={(e) => setNewLabel(e.target.value)}
+							onKeyDown={(e) => {
+								if (e.key === "Enter") createDashboard();
+							}}
+						/>
+					</Field>
+					<DialogFooter
+						onCancel={() => setCreateOpen(false)}
+						onConfirm={createDashboard}
+						confirmLabel="Create"
+						confirmDisabled={!newLabel.trim() || saveDashboard.isPending}
+					/>
+				</DialogContent>
+			</Dialog>
+
+			<ConfirmDialog
+				open={Boolean(deleteId)}
+				title="Delete dashboard?"
+				message="This removes the named dashboard and its pinned links."
+				confirmLabel="Delete"
+				onCancel={() => setDeleteId(null)}
+				onConfirm={() => {
+					if (deleteId) deleteDashboard.mutate(deleteId);
+					setDeleteId(null);
+				}}
+			/>
+		</SectionCard>
+	);
+}
+
 export function ServicesPage() {
 	const navigate = useNavigate();
 	const { data: services = [] } = useServiceInstances();
@@ -287,7 +539,7 @@ export function ServicesPage() {
 				title="Services"
 				description="External services the app talks to. Configure URLs and API keys here; they are encrypted at rest."
 				action={
-					<Button variant="outline" onClick={() => setCreateOpen(true)} className="mobile-touch-target">
+					<Button variant="outline" onClick={() => setCreateOpen(true)}>
 						<Plus className="mr-1 h-3 w-3" />
 						Add service
 					</Button>
@@ -329,7 +581,6 @@ export function ServicesPage() {
 												<Button
 													variant="ghost"
 													size="sm"
-													className="mobile-touch-target"
 													onClick={() =>
 														navigate(`/services/${s.service_type}/${s.id}`)
 													}
@@ -339,7 +590,7 @@ export function ServicesPage() {
 												<Button
 													variant="ghost"
 													size="icon"
-													className="mobile-touch-target h-8 w-8 text-destructive"
+													className="h-8 w-8 text-destructive"
 													onClick={() => setDeleteId(s.id)}
 												>
 													<Trash2 className="h-4 w-4" />
@@ -354,6 +605,8 @@ export function ServicesPage() {
 				)}
 			</SectionCard>
 
+			<DashboardManagementCard />
+
 			<CreateServiceDialog
 				open={createOpen}
 				onClose={() => setCreateOpen(false)}

frontend/src/pages/Settings.tsx

@@ -50,6 +50,17 @@ import {
 import { Switch } from "@/components/ui/switch";
 import { TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
+import {
+	useDeleteServiceInstance,
+	useSaveServiceInstance,
+	useServiceInstances,
+	useServiceTypes,
+} from "../hooks/useServices";
+import type {
+	ServiceInstance,
+	ServiceInstanceInput,
+	ServiceTypeInfo,
+} from "../types";
 
 const SERVICE_OPTIONS = [
 	{ value: "monitoring", label: "Monitoring" },
@@ -61,7 +72,7 @@ const SERVICE_OPTIONS = [
 // maps to this sentinel and converts back to "" at the draft boundary.
 const NONE = "__none__";
 
-type SettingsTab = "machines" | "ssh-keys" | "danger";
+type SettingsTab = "machines" | "ssh-keys" | "services" | "danger";
 
 /** Small labeled-field wrapper replacing the MUI `<TextField label>` shell. */
 function FormField({
@@ -995,6 +1006,9 @@ export function Settings() {
 					<TabsTrigger key="ssh-keys" value="ssh-keys">
 						SSH Keys
 					</TabsTrigger>,
+					<TabsTrigger key="services" value="services">
+						Services
+					</TabsTrigger>,
 					<TabsTrigger key="danger" value="danger">
 						Danger Zone
 					</TabsTrigger>,
@@ -1178,6 +1192,7 @@ export function Settings() {
 						onSelectKeyId={setSelectedSSHKeyId}
 					/>
 				)}
+				{tab === "services" && <ServicesAdminCard />}
 				{tab === "danger" && <ResetLocalDatabaseCard />}
 			</TabbedCard>
 			{isMobile ? (
@@ -1311,3 +1326,270 @@ export function Settings() {
 		</div>
 	);
 }
+
+/**
+ * Services admin card for the Settings > Services tab.
+ *
+ * Lists all service instances grouped by type with inline config editing
+ * (enable/disable, config fields, secrets, save, delete). Lifted from the
+ * old ServicePage ConfigBody — the service page is now a pure operational
+ * view; all administration lives here.
+ */
+function ServicesAdminCard() {
+	const { data: services = [] } = useServiceInstances();
+	const { data: types = [] } = useServiceTypes();
+	const [selectedServiceId, setSelectedServiceId] = useState("");
+
+	const sortedServices = useMemo(
+		() =>
+			[...services].sort((a, b) =>
+				`${a.service_type}:${a.name}`.localeCompare(
+					`${b.service_type}:${b.name}`,
+				),
+			),
+		[services],
+	);
+
+	const selectedService = useMemo(
+		() =>
+			sortedServices.find((s) => s.id === selectedServiceId) ??
+			sortedServices[0] ??
+			null,
+		[sortedServices, selectedServiceId],
+	);
+
+	const selectedTypeInfo = selectedService
+		? types.find((t) => t.service_type === selectedService.service_type)
+		: undefined;
+
+	if (sortedServices.length === 0) {
+		return (
+			<p className="text-sm text-muted-foreground">
+				No service instances configured. Create one from the Services page.
+			</p>
+		);
+	}
+
+	return (
+		<div className="grid grid-cols-1 gap-4 md:grid-cols-[320px_minmax(0,1fr)]">
+			<SelectionRailCard
+				title="Services"
+				description="Select a service to edit its configuration."
+				minHeight={420}
+			>
+				{sortedServices.map((svc) => {
+					const active = svc.id === (selectedService?.id ?? "");
+					const typeName =
+						types.find((t) => t.service_type === svc.service_type)?.name ??
+						svc.service_type;
+					return (
+						<div
+							key={svc.id}
+							onClick={() => setSelectedServiceId(svc.id)}
+							className={cn(
+								"group grid w-full cursor-pointer grid-cols-[minmax(0,1fr)_auto] gap-2 border-t border-border px-3 py-2.5",
+								active ? "bg-muted" : "bg-card hover:bg-muted/50",
+							)}
+						>
+							<div className="min-w-0">
+								<p className="truncate font-semibold">{svc.name}</p>
+								<p className="text-xs text-muted-foreground">
+									{typeName} · {svc.enabled ? "Enabled" : "Disabled"}
+								</p>
+							</div>
+							<Badge variant={svc.enabled ? "default" : "secondary"}>
+								{svc.enabled ? "on" : "off"}
+							</Badge>
+						</div>
+					);
+				})}
+			</SelectionRailCard>
+			<SectionCard
+				title={selectedService?.name ?? "No service selected"}
+				description={
+					selectedTypeInfo?.description ??
+					"Select a service on the left to edit its configuration."
+				}
+			>
+				{selectedService ? (
+					<ServiceConfigEditor
+						instance={selectedService}
+						typeInfo={selectedTypeInfo}
+					/>
+				) : (
+					<p className="text-sm text-muted-foreground">
+						Select a service on the left.
+					</p>
+				)}
+			</SectionCard>
+		</div>
+	);
+}
+
+function ServiceConfigEditor({
+	instance,
+	typeInfo,
+}: {
+	instance: ServiceInstance;
+	typeInfo: ServiceTypeInfo | undefined;
+}) {
+	const saveService = useSaveServiceInstance();
+	const deleteService = useDeleteServiceInstance();
+	const [name, setName] = useState(instance.name);
+	const [enabled, setEnabled] = useState(instance.enabled);
+	const [draftConfig, setDraftConfig] = useState<Record<string, unknown>>({
+		...instance.config,
+	});
+	const [draftSecrets, setDraftSecrets] = useState<Record<string, string>>({});
+	const [deleteOpen, setDeleteOpen] = useState(false);
+
+	const properties =
+		(
+			(typeInfo?.config_schema ?? {}) as {
+				properties?: Record<string, { type?: string; description?: string }>;
+			}
+		).properties ?? {};
+	const configEntries: Array<
+		[string, { type?: string; description?: string }]
+	> =
+		Object.keys(properties).length > 0
+			? Object.entries(properties).map(([key, schema]) => [
+					key,
+					{ type: schema?.type, description: schema?.description },
+				])
+			: Object.entries(instance.config).map(([key, value]) => [
+					key,
+					{ type: typeof value === "number" ? "integer" : "string" },
+				]);
+
+	function buildInput(): ServiceInstanceInput {
+		const onlyChangedSecrets = Object.fromEntries(
+			Object.entries(draftSecrets).filter(([, v]) => v !== ""),
+		);
+		return {
+			id: instance.id,
+			service_type: instance.service_type,
+			name,
+			config: draftConfig,
+			secrets: onlyChangedSecrets,
+			enabled,
+		};
+	}
+
+	async function handleSave() {
+		await saveService.mutateAsync(buildInput());
+		setDraftSecrets({});
+	}
+
+	return (
+		<>
+			<div className="rounded-lg border p-4">
+				<div className="mb-3 flex items-center justify-between">
+					<span className="font-medium">{instance.name}</span>
+					<Badge variant={enabled ? "default" : "secondary"}>
+						{enabled ? "enabled" : "disabled"}
+					</Badge>
+				</div>
+				<div className="flex flex-col gap-3">
+					<FormField label="Name" htmlFor={`svc-name-${instance.id}`}>
+						<Input
+							id={`svc-name-${instance.id}`}
+							value={name}
+							onChange={(e) => setName(e.target.value)}
+						/>
+					</FormField>
+					<div className="flex items-center gap-2">
+						<Switch
+							id={`svc-enabled-${instance.id}`}
+							checked={enabled}
+							onCheckedChange={setEnabled}
+						/>
+						<Label htmlFor={`svc-enabled-${instance.id}`}>Enabled</Label>
+					</div>
+
+					{configEntries.map(([key, schema]) => {
+						const isNumber =
+							schema.type === "integer" || schema.type === "number";
+						return (
+							<FormField
+								key={key}
+								label={key}
+								htmlFor={`svc-cfg-${instance.id}-${key}`}
+								helperText={schema.description}
+							>
+								<Input
+									id={`svc-cfg-${instance.id}-${key}`}
+									type={isNumber ? "number" : "text"}
+									value={String(draftConfig[key] ?? "")}
+									onChange={(e) =>
+										setDraftConfig({
+											...draftConfig,
+											[key]: isNumber
+												? e.target.value === ""
+													? undefined
+													: Number(e.target.value)
+												: e.target.value,
+										})
+									}
+								/>
+							</FormField>
+						);
+					})}
+
+					{Object.keys(instance.secrets_set).length === 0
+						? null
+						: Object.entries(instance.secrets_set).map(([key, isSet]) => (
+								<FormField
+									key={key}
+									label={key}
+									htmlFor={`svc-secret-${instance.id}-${key}`}
+									helperText="Leave blank to keep the current value."
+								>
+									<Input
+										id={`svc-secret-${instance.id}-${key}`}
+										type="password"
+										placeholder={isSet ? "•••••• (set)" : "Not set"}
+										value={draftSecrets[key] ?? ""}
+										onChange={(e) =>
+											setDraftSecrets({
+												...draftSecrets,
+												[key]: e.target.value,
+											})
+										}
+									/>
+								</FormField>
+							))}
+
+					<div className="flex justify-between">
+						<Button
+							onClick={handleSave}
+							disabled={saveService.isPending}
+							className="mobile-touch-target"
+						>
+							Save
+						</Button>
+						<Button
+							variant="destructive"
+							onClick={() => setDeleteOpen(true)}
+							className="mobile-touch-target"
+						>
+							Delete
+						</Button>
+					</div>
+				</div>
+			</div>
+
+			<ConfirmDialog
+				open={deleteOpen}
+				title="Delete service?"
+				message="This removes the service and any widgets that reference it. This cannot be undone."
+				confirmLabel="Delete"
+				onCancel={() => setDeleteOpen(false)}
+				onConfirm={() => {
+					deleteService.mutate(instance.id);
+					setDeleteOpen(false);
+				}}
+			/>
+		</>
+	);
+}

frontend/src/pages/Users.tsx

@@ -1 +0,0 @@
-export { UsersPage } from "./UsersPage.impl";

frontend/src/pages/__tests__/Actions.test.tsx

@@ -1,125 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { Actions } from "../Actions";
-import type { SavedTask, ServiceInstance } from "../../types";
-
-const saveTaskMutate = vi.fn().mockResolvedValue({
-	id: "t1",
-	name: "Restart svc",
-	task_type: "shell",
-	content: "",
-	enabled: true,
-	default_service_id: "",
-	notes: "",
-});
-const deleteTaskMutate = vi.fn();
-const runTaskMutate = vi.fn().mockResolvedValue({});
-
-let sshServices: ServiceInstance[] = [];
-let tasks: SavedTask[] = [];
-
-vi.mock("../../hooks/useSettings", () => ({
-	useTasks: () => ({ data: tasks }),
-	useSaveTask: () => ({ mutateAsync: saveTaskMutate, isPending: false }),
-	useDeleteTask: () => ({ mutate: deleteTaskMutate }),
-	useRunTask: () => ({ mutateAsync: runTaskMutate, isPending: false }),
-	useTaskRuns: () => ({ data: { items: [] } }),
-}));
-
-vi.mock("../../hooks/useServices", () => ({
-	useServiceInstances: () => ({ data: sshServices }),
-}));
-
-function sshService(overrides: Partial<ServiceInstance> = {}): ServiceInstance {
-	return {
-		id: "s1",
-		service_type: "ssh_tasks",
-		name: "Box",
-		config: { host: "box", username: "u" },
-		secrets_set: {},
-		enabled: true,
-		created_at: 0,
-		updated_at: 0,
-		...overrides,
-	} as ServiceInstance;
-}
-
-function task(overrides: Partial<SavedTask> = {}): SavedTask {
-	return {
-		id: "t1",
-		name: "Restart svc",
-		task_type: "shell",
-		content: "systemctl restart foo",
-		enabled: true,
-		default_service_id: "",
-		notes: "",
-		created_at: 0,
-		updated_at: 0,
-		...overrides,
-	} as SavedTask;
-}
-
-beforeEach(() => {
-	saveTaskMutate.mockClear();
-	deleteTaskMutate.mockClear();
-	runTaskMutate.mockClear();
-	sshServices = [];
-	tasks = [];
-});
-
-describe("Actions", () => {
-	it("shows the empty state and creates a task via the editor dialog", async () => {
-		render(<Actions />);
-
-		expect(screen.getByText("No action selected")).toBeInTheDocument();
-		expect(
-			screen.getByRole("button", { name: "Add action" }),
-		).toBeInTheDocument();
-
-		await userEvent.click(screen.getByRole("button", { name: "Add action" }));
-		// Editor dialog opened (Name field is unique to the editor).
-		expect(screen.getByLabelText("Name")).toBeInTheDocument();
-
-		// Controlled input parity: name + default shell type flow through.
-		await userEvent.type(screen.getByLabelText("Name"), "Restart svc");
-		await userEvent.click(screen.getByRole("button", { name: "Save action" }));
-
-		expect(saveTaskMutate).toHaveBeenCalledTimes(1);
-		const saved = saveTaskMutate.mock.calls[0][0];
-		expect(saved.name).toBe("Restart svc");
-		expect(saved.task_type).toBe("shell");
-		expect(saved.default_service_id).toBe("");
-	});
-
-	it("disables the Run button until a run service is selected", async () => {
-		sshServices = [sshService()];
-		tasks = [task()];
-		render(<Actions />);
-
-		// Selecting a saved task tab exposes the detail + Run control.
-		await userEvent.click(screen.getByRole("tab", { name: "Restart svc" }));
-
-		const runButton = screen.getByRole("button", { name: "Run action" });
-		expect(runButton).toBeDisabled();
-	});
-
-	it("runs a task on the selected SSH task service", async () => {
-		sshServices = [sshService()];
-		tasks = [task()];
-		render(<Actions />);
-
-		await userEvent.click(screen.getByRole("tab", { name: "Restart svc" }));
-		await userEvent.click(
-			screen.getByRole("combobox", { name: "Run on SSH task service" }),
-		);
-		await userEvent.click(screen.getByRole("option", { name: "Box" }));
-		await userEvent.click(screen.getByRole("button", { name: "Run action" }));
-
-		expect(runTaskMutate).toHaveBeenCalledTimes(1);
-		expect(runTaskMutate).toHaveBeenCalledWith({
-			taskId: "t1",
-			serviceId: "s1",
-		});
-	});
-});

frontend/src/pages/__tests__/Applications.test.tsx

@@ -1,75 +0,0 @@
-import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
-import { Applications } from "../Applications";
-
-// Applications still embeds the MUI Media child (migrated in slice 7). Mock it
-// so this slice-4 test stays focused on the migrated Applications shell and
-// does not pull the still-MUI DataGrid into the jsdom render.
-vi.mock("../Media", () => ({
-	Media: () => <div data-testid="media-child">Media</div>,
-}));
-
-vi.mock("react-router-dom", () => ({
-	useSearchParams: () => [new URLSearchParams(), vi.fn()],
-}));
-
-vi.mock("../../hooks/useSettings", () => ({
-	useMonitoringSettings: () => ({
-		data: [
-			{
-				id: "m1",
-				name: "Main",
-				enabled: true,
-				services: ["jellyfin"],
-			},
-		],
-	}),
-}));
-
-vi.mock("../../hooks/useServices", () => ({
-	useServiceInstances: () => ({
-		data: [
-			{ id: "jfs1", service_type: "jellyfin", name: "Main", enabled: true },
-		],
-	}),
-}));
-
-vi.mock("../../hooks/useDashboard", () => ({
-	useCounts: () => ({
-		data: { movies: 10, series: 5, episodes: 100 },
-	}),
-	useLibraries: () => ({
-		data: [
-			{ library: "Movies", total: 10, movies: 10, series: 0 },
-			{ library: "Shows", total: 5, movies: 0, series: 5 },
-		],
-	}),
-}));
-
-describe("Applications", () => {
-	it("renders the Jellyfin library counts grid and tabs, and keeps the Media child", () => {
-		render(<Applications />);
-
-		// Library stats header.
-		expect(screen.getByText("Library stats")).toBeInTheDocument();
-
-		// Counts: Total = 10 + 5 + 100 = 115, plus the per-type counts.
-		expect(screen.getByText("115")).toBeInTheDocument();
-		expect(screen.getByText("Episodes")).toBeInTheDocument();
-
-		// Library rows render their per-library totals (unique strings).
-		expect(
-			screen.getByText(/Total 10 · Movies 10 · Series 0/),
-		).toBeInTheDocument();
-		expect(
-			screen.getByText(/Total 5 · Movies 0 · Series 5/),
-		).toBeInTheDocument();
-
-		// Tabs present.
-		expect(screen.getByRole("tab", { name: "Jellyfin" })).toBeInTheDocument();
-		expect(screen.getByRole("tab", { name: "Nextcloud" })).toBeInTheDocument();
-
-		// The still-MUI Media child is rendered unchanged inside the Jellyfin tab.
-		expect(screen.getByTestId("media-child")).toBeInTheDocument();
-	});
-});

frontend/src/pages/__tests__/Dashboard.test.tsx

@@ -2,18 +2,12 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { Dashboard } from "../Dashboard";
-import type {
+import type { DashboardShortcut } from "../../types";
-	DashboardShortcut,
-	ServiceInstance,
-	WidgetInstance,
-} from "../../types";
 
 // Stub the composed widgets so the test exercises Dashboard's own behavior
 // (shortcut CRUD) without rendering widgets or their data queries.
 vi.mock("../../components/WidgetInstance", () => ({
-	WidgetInstanceCard: ({ widget }: { widget: { title: string } }) => (
+	WidgetInstanceCard: () => <div data-testid="widget-stub" />,
-		<div data-testid="widget-stub">{widget.title}</div>
-	),
 }));
 vi.mock("../../components/WidgetConfigDialog", () => ({
 	WidgetConfigDialog: () => <div data-testid="widget-config-stub" />,
@@ -27,15 +21,13 @@ vi.mock("react-router-dom", () => ({
 vi.mock("../../hooks/useSettings", () => ({
 	useMonitoringSettings: () => ({ data: [] }),
 }));
-
-// --- Dynamic mock state (reset in beforeEach) ---
-let widgetInstances: WidgetInstance[] = [];
-let serviceInstances: ServiceInstance[] = [];
 vi.mock("../../hooks/useWidgets", () => ({
-	useWidgetInstances: () => ({ data: widgetInstances }),
+	useWidgetInstances: () => ({ data: [] }),
+	useWidgetReferences: () => ({ data: [] }),
+	useDetachWidgetReference: () => ({ mutate: () => {} }),
 }));
 vi.mock("../../hooks/useServices", () => ({
-	useServiceInstances: () => ({ data: serviceInstances }),
+	useServiceInstances: () => ({ data: [] }),
 }));
 
 const saveShortcutMutate = vi.fn().mockResolvedValue({});
@@ -75,26 +67,8 @@ beforeEach(() => {
 	saveShortcutMutate.mockClear();
 	deleteShortcutMutate.mockClear();
 	shortcuts = [];
-	widgetInstances = [];
-	serviceInstances = [];
-	setMatchMedia(false); // desktop by default
 });
 
-// --- matchMedia mock for useIsMobile (jsdom has no native matchMedia) ---
-
-function setMatchMedia(matches: boolean) {
-	window.matchMedia = ((query: string) => ({
-		matches: query === "(max-width: 768px)" ? matches : false,
-		media: query,
-		onchange: null,
-		addEventListener: () => {},
-		removeEventListener: () => {},
-		addListener: () => {},
-		removeListener: () => {},
-		dispatchEvent: () => false,
-	})) as unknown as typeof window.matchMedia;
-}
-
 describe("Dashboard", () => {
 	it("shows the empty-state alert when there are no shortcuts", () => {
 		render(<Dashboard />);
@@ -142,142 +116,3 @@ describe("Dashboard", () => {
 		expect(saved.shortcut_type).toBe("website");
 	});
 });
-
-// --- Mobile layout tests (spec R7.1, R7.2) ---
-
-function makeWidget(overrides: Partial<WidgetInstance> = {}): WidgetInstance {
-	return {
-		id: "w1",
-		service_id: null,
-		widget_kind: "static",
-		title: "Widget 1",
-		config: {},
-		enabled: true,
-		sort_order: 0,
-		created_at: 0,
-		updated_at: 0,
-		...overrides,
-	};
-}
-
-function makeService(
-	overrides: Partial<ServiceInstance> = {},
-): ServiceInstance {
-	return {
-		id: "svc1",
-		service_type: "jellyfin",
-		name: "Jellyfin",
-		config: {},
-		secrets_set: {},
-		enabled: true,
-		created_at: 0,
-		updated_at: 0,
-		...overrides,
-	};
-}
-
-describe("Dashboard mobile layout", () => {
-	it("renders widgets in a single column with an anchor bar below md", () => {
-		setMatchMedia(true); // mobile
-		serviceInstances = [
-			makeService({ id: "graf", service_type: "grafana" }),
-			makeService({ id: "jelly", service_type: "jellyfin" }),
-		];
-		widgetInstances = [
-			makeWidget({
-				id: "w-obs",
-				service_id: "graf",
-				widget_kind: "link",
-				title: "Grafana Link",
-			}),
-			makeWidget({
-				id: "w-media",
-				service_id: "jelly",
-				widget_kind: "activity",
-				title: "Jellyfin Activity",
-			}),
-			makeWidget({
-				id: "w-backup",
-				service_id: null,
-				widget_kind: "backups",
-				title: "Backup Summary",
-			}),
-		];
-
-		render(<Dashboard />);
-
-		// Anchor bar pills are visible for populated sections (each label appears
-		// in both the pill and the section heading, so use getAllByText).
-		expect(screen.getAllByText("Observability").length).toBeGreaterThanOrEqual(
-			1,
-		);
-		expect(screen.getAllByText("Media").length).toBeGreaterThanOrEqual(1);
-		expect(screen.getAllByText("Backups").length).toBeGreaterThanOrEqual(1);
-
-		// Sections with no widgets are NOT rendered.
-		expect(screen.queryByText("Custom")).not.toBeInTheDocument();
-
-		// Each widget renders.
-		expect(screen.getByText("Grafana Link")).toBeInTheDocument();
-		expect(screen.getByText("Jellyfin Activity")).toBeInTheDocument();
-		expect(screen.getByText("Backup Summary")).toBeInTheDocument();
-	});
-
-	it("does NOT render the anchor bar at desktop width", () => {
-		setMatchMedia(false); // desktop
-		serviceInstances = [makeService({ id: "graf", service_type: "grafana" })];
-		widgetInstances = [
-			makeWidget({
-				id: "w-obs",
-				service_id: "graf",
-				widget_kind: "link",
-				title: "Grafana Link",
-			}),
-		];
-
-		render(<Dashboard />);
-
-		// Widget renders (flat list, no section wrappers).
-		expect(screen.getByText("Grafana Link")).toBeInTheDocument();
-
-		// No section headings or anchor pills on desktop.
-		expect(screen.queryByText("Observability")).not.toBeInTheDocument();
-		expect(screen.queryByText("Media")).not.toBeInTheDocument();
-	});
-
-	it("anchor bar pills jump to their section via scrollIntoView", async () => {
-		setMatchMedia(true); // mobile
-		serviceInstances = [
-			makeService({ id: "graf", service_type: "grafana" }),
-			makeService({ id: "jelly", service_type: "jellyfin" }),
-		];
-		widgetInstances = [
-			makeWidget({
-				id: "w-obs",
-				service_id: "graf",
-				widget_kind: "link",
-				title: "Grafana Link",
-			}),
-			makeWidget({
-				id: "w-media",
-				service_id: "jelly",
-				widget_kind: "activity",
-				title: "Jellyfin Activity",
-			}),
-		];
-
-		const scrollSpy = vi.spyOn(Element.prototype, "scrollIntoView");
-
-		render(<Dashboard />);
-
-		// The Media section element exists.
-		expect(document.getElementById("dashboard-section-media")).not.toBeNull();
-
-		// Click the "Media" anchor pill (button role disambiguates from heading).
-		const mediaPill = screen.getByRole("button", { name: "Media" });
-		await userEvent.click(mediaPill);
-
-		expect(scrollSpy).toHaveBeenCalled();
-		scrollSpy.mockRestore();
-	});
-});

frontend/src/pages/__tests__/FileBrowser.test.tsx

@@ -1,198 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { FileBrowser } from "../FileBrowser.impl";
-import type { DirectoryListing, MonitoringMachine } from "../../types";
-
-// usePersistentState (browserState) reads/writes localStorage; clear between tests
-// so the selectedPath / currentDir state never leaks across cases.
-beforeEach(() => {
-	window.localStorage.clear();
-	setMatchMedia(false);
-});
-
-function machineFixture(
-	overrides: Partial<MonitoringMachine> = {},
-): MonitoringMachine {
-	return {
-		id: "local",
-		name: "Local",
-		mode: "local",
-		enabled: true,
-		services: ["files", "monitoring"],
-		host: "",
-		port: 22,
-		username: "",
-		key_directory: "",
-		key_name: "",
-		ssh_key_id: "",
-		ssh_private_key_set: false,
-		ssh_private_key_passphrase_set: false,
-		password_set: false,
-		notes: "",
-		...overrides,
-	};
-}
-
-function listingFixture(
-	entries: {
-		name: string;
-		type: string;
-		size: number;
-		mtime: number;
-	}[],
-): DirectoryListing {
-	return { path: "/", entries, count: entries.length };
-}
-
-let listing: DirectoryListing;
-let machines: MonitoringMachine[];
-
-vi.mock("react-router-dom", () => ({
-	useSearchParams: () => [new URLSearchParams(), vi.fn()],
-	useNavigate: () => vi.fn(),
-}));
-
-vi.mock("../../hooks/useFiles", () => ({
-	useDirectoryListing: () => ({
-		data: listing,
-		isLoading: false,
-		error: null,
-		refetch: vi.fn(),
-	}),
-	useFfprobe: () => ({ data: undefined, isLoading: false, error: null }),
-	useJobTemplates: () => ({ data: [] }),
-	useRunJob: () => ({ isPending: false, mutate: vi.fn(), data: undefined }),
-}));
-
-vi.mock("../../hooks/useSettings", () => ({
-	useMonitoringSettings: () => ({ data: machines }),
-}));
-
-beforeEach(() => {
-	machines = [machineFixture()];
-	listing = listingFixture([
-		{ name: "movies", type: "d", size: 0, mtime: 1_700_000_000 },
-		{ name: "video.mkv", type: "f", size: 1_500_000_000, mtime: 1_700_000_000 },
-		{ name: "notes.txt", type: "f", size: 12, mtime: 1_700_000_000 },
-	]);
-});
-
-/** Stub window.matchMedia so useIsMobile resolves in jsdom (Slice 4). */
-function setMatchMedia(matches: boolean) {
-	const listeners: ((e: MediaQueryListEvent) => void)[] = [];
-	window.matchMedia = vi.fn().mockImplementation((query: string) => ({
-		matches: query.includes("768") ? matches : false,
-		media: query,
-		onchange: null,
-		addEventListener: (
-			_evt: string,
-			listener: (e: MediaQueryListEvent) => void,
-		) => listeners.push(listener),
-		removeEventListener: (
-			_evt: string,
-			listener: (e: MediaQueryListEvent) => void,
-		) => {
-			const idx = listeners.indexOf(listener);
-			if (idx >= 0) listeners.splice(idx, 1);
-		},
-		addListener: () => {},
-		removeListener: () => {},
-		dispatchEvent: () => false,
-	}));
-}
-
-describe("FileBrowser (slice 7a — TanStack DataTable parity)", () => {
-	it("renders the 5 locked columns (type/name/ext/size/modified)", () => {
-		render(<FileBrowser />);
-
-		const headers = screen
-			.getAllByRole("columnheader")
-			.map((h) => h.textContent);
-		// The leading selection column header is empty (checkbox); the 5 data
-		// columns are Type, Name, Ext, Size, Modified in that order.
-		expect(headers).toEqual(
-			expect.arrayContaining(["Type", "Name", "Ext", "Size", "Modified"]),
-		);
-		expect(headers.filter((h) => h === "Type").length).toBe(1);
-		expect(headers.filter((h) => h === "Modified").length).toBe(1);
-	});
-
-	it("clicking a file row selects it for ffprobe preview (Media info)", async () => {
-		render(<FileBrowser />);
-
-		// The selected-file path surfaces in the Browser status caption once chosen.
-		expect(screen.queryByText(/Selected: \/video\.mkv/)).toBeNull();
-
-		await userEvent.click(screen.getByText("video.mkv"));
-		expect(screen.getByText(/Selected: \/video\.mkv/)).toBeInTheDocument();
-
-		// A recognized video file enters the ffprobe branch; with empty ffprobe
-		// data it shows the "No ffprobe data available." status (proving the
-		// selected file routed into the Media info preview flow).
-		expect(screen.getByText("No ffprobe data available.")).toBeInTheDocument();
-	});
-
-	it("clicking a directory row navigates into it (no ffprobe selection)", async () => {
-		render(<FileBrowser />);
-
-		await userEvent.click(screen.getByText("movies"));
-		// After navigating into /movies, the status caption shows the new cwd and
-		// NO "Selected:" segment (directories are opened, not selected for preview).
-		expect(screen.getByText(/Current: \/movies\b/)).toBeInTheDocument();
-		expect(screen.queryByText(/Selected:/)).toBeNull();
-	});
-});
-
-describe("FileBrowser (mobile card layout — slice 4)", () => {
-	it("renders cards with file/dir name as primary below md", () => {
-		setMatchMedia(true);
-		render(<FileBrowser />);
-
-		// Card titles (the 'name' field rendered as primary).
-		expect(screen.getByText("movies")).toBeInTheDocument();
-		expect(screen.getByText("video.mkv")).toBeInTheDocument();
-		expect(screen.getByText("notes.txt")).toBeInTheDocument();
-
-		// Desktop table column headers must NOT render.
-		const headers = screen.queryAllByRole("columnheader");
-		expect(headers).toHaveLength(0);
-	});
-
-	it("tapping a directory card navigates into it", async () => {
-		setMatchMedia(true);
-		render(<FileBrowser />);
-
-		// Directory card is a button wrapping the 'movies' text.
-		await userEvent.click(screen.getByText("movies"));
-
-		// After navigating into /movies, the status caption shows the new cwd
-		// and NO 'Selected:' segment (directories are opened, not selected).
-		expect(screen.getByText(/Current: \/movies\b/)).toBeInTheDocument();
-		expect(screen.queryByText(/Selected:/)).toBeNull();
-	});
-
-	it("renders the path/breadcrumb controls on mobile", () => {
-		setMatchMedia(true);
-		render(<FileBrowser />);
-
-		// The 'Remote path' label and its input are part of the Browser section
-		// card (outside the table), so they render on both breakpoints.
-		expect(screen.getByLabelText("Remote path")).toBeInTheDocument();
-		expect(screen.getByRole("button", { name: "Open" })).toBeInTheDocument();
-		expect(screen.getByRole("button", { name: "Refresh" })).toBeInTheDocument();
-	});
-
-	it("renders the DataTable at desktop width (1280px)", () => {
-		setMatchMedia(false);
-		render(<FileBrowser />);
-
-		// Desktop path: table column headers are present.
-		const headers = screen
-			.getAllByRole("columnheader")
-			.map((h) => h.textContent);
-		expect(headers).toEqual(
-			expect.arrayContaining(["Type", "Name", "Ext", "Size", "Modified"]),
-		);
-	});
-});

frontend/src/pages/__tests__/Media.test.tsx

@@ -1,356 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { Media } from "../Media";
-import type {
-	MediaIndexStatus,
-	MediaItem,
-	MediaQueryResponse,
-	MonitoringMachine,
-} from "../../types";
-
-// Shared navigate mock so the row-click test can assert the call. The vi.mock
-// factory is hoisted above this const, but it only closes over `navigate`
-// lazily (the arrow runs at render time, well after init) — no TDZ access.
-const navigate = vi.fn();
-
-function machineFixture(
-	overrides: Partial<MonitoringMachine> = {},
-): MonitoringMachine {
-	return {
-		id: "local",
-		name: "Local",
-		mode: "local",
-		enabled: true,
-		services: ["jellyfin", "monitoring"],
-		host: "",
-		port: 22,
-		username: "",
-		key_directory: "",
-		key_name: "",
-		ssh_key_id: "",
-		ssh_private_key_set: false,
-		ssh_private_key_passphrase_set: false,
-		password_set: false,
-		notes: "",
-		...overrides,
-	};
-}
-
-function statusFixture(
-	overrides: Partial<MediaIndexStatus> = {},
-): MediaIndexStatus {
-	return {
-		exists: true,
-		item_count: 2,
-		updated_at: 1,
-		updated_at_label: "now",
-		build_duration_seconds: null,
-		build_running: false,
-		build_stage: "",
-		build_message: "",
-		build_progress: null,
-		build_items_processed: 0,
-		build_items_total: 0,
-		build_current_library: "",
-		build_library_index: 0,
-		build_libraries_total: 0,
-		build_library_progress: null,
-		build_library_items_processed: 0,
-		build_library_items_total: 0,
-		build_elapsed_seconds: null,
-		build_eta_seconds: null,
-		build_library_elapsed_seconds: null,
-		build_library_eta_seconds: null,
-		build_cancel_requested: false,
-		build_pid: null,
-		build_error: "",
-		...overrides,
-	};
-}
-
-function mediaItem(overrides: Partial<MediaItem> = {}): MediaItem {
-	return {
-		id: "1",
-		title: "Inception",
-		series: "",
-		season: "",
-		episode: null,
-		type: "Movie",
-		year: 2010,
-		runtime_min: 148,
-		size: "12.4 GB",
-		bitrate: "35.0 Mbps",
-		hdr: "HDR10",
-		video: "HEVC",
-		resolution: "4K",
-		date_added: "2024-01-01",
-		library: "Movies",
-		path: "/media/movies/Inception.mkv",
-		...overrides,
-	};
-}
-
-let status: MediaIndexStatus;
-let queryResult: MediaQueryResponse;
-
-vi.mock("react-router-dom", () => ({
-	useNavigate: () => navigate,
-	useSearchParams: () => [
-		new URLSearchParams("jellyfin_service_id=jfs1"),
-		vi.fn(),
-	],
-}));
-
-vi.mock("../../hooks/useMedia", () => ({
-	useMediaStatus: () => ({ data: status }),
-	useMediaQuery: () => ({ data: queryResult, isLoading: false }),
-	useBuildIndex: () => ({ isPending: false, mutate: vi.fn() }),
-	useStopBuildIndex: () => ({ isPending: false, mutate: vi.fn() }),
-	useForceStopBuildIndex: () => ({ isPending: false, mutate: vi.fn() }),
-}));
-
-vi.mock("../../hooks/useSettings", () => ({
-	useMonitoringSettings: () => ({ data: [machineFixture()] }),
-}));
-
-vi.mock("../../hooks/useServices", () => ({
-	useServiceInstances: () => ({
-		data: [
-			{ id: "jfs1", service_type: "jellyfin", name: "Main", enabled: true },
-		],
-	}),
-}));
-
-vi.mock("../../hooks/useDashboard", () => ({
-	useCounts: () => ({ data: undefined }),
-	useLibraries: () => ({ data: undefined }),
-}));
-
-// usePersistentState reads/writes localStorage; clear between tests so the
-// offset/pageSize/columnVisibility state never leaks across cases.
-// matchMedia must be stubbed so useIsMobile (md:768px) and usePrefersSmallScreen
-// (900px) resolve without TypeError in jsdom. Default to desktop (matches:false)
-// so the DataTable path renders by default; mobile tests override.
-beforeEach(() => {
-	setMatchMedia(false);
-	window.localStorage.clear();
-	navigate.mockClear();
-	status = statusFixture();
-	queryResult = {
-		items: [
-			mediaItem({
-				id: "1",
-				title: "Inception",
-				path: "/media/movies/Inception.mkv",
-			}),
-			mediaItem({
-				id: "2",
-				title: "Matrix",
-				path: "/media/movies/Matrix.mkv",
-			}),
-		],
-		total: 2,
-		limit: 100,
-		offset: 0,
-	};
-});
-
-/** Stub window.matchMedia so useIsMobile / usePrefersSmallScreen resolve in jsdom. */
-function setMatchMedia(matches: boolean) {
-	const listeners: ((e: MediaQueryListEvent) => void)[] = [];
-	window.matchMedia = vi.fn().mockImplementation((query: string) => ({
-		matches: query.includes("768") ? matches : false,
-		media: query,
-		onchange: null,
-		addEventListener: (
-			_evt: string,
-			listener: (e: MediaQueryListEvent) => void,
-		) => listeners.push(listener),
-		removeEventListener: (
-			_evt: string,
-			listener: (e: MediaQueryListEvent) => void,
-		) => {
-			const idx = listeners.indexOf(listener);
-			if (idx >= 0) listeners.splice(idx, 1);
-		},
-		addListener: () => {},
-		removeListener: () => {},
-		dispatchEvent: () => false,
-	}));
-}
-
-describe("Media (slice 7b — TanStack DataTable + server-driven pagination)", () => {
-	it("exposes exactly the 15 locked toggleable columns", async () => {
-		render(<Media />);
-
-		await userEvent.click(screen.getByRole("button", { name: /Columns/ }));
-
-		const toggleable = screen
-			.getAllByRole("menuitemcheckbox")
-			.map((item) => (item.textContent ?? "").trim());
-		expect([...toggleable].sort()).toEqual(
-			[
-				"title",
-				"series",
-				"season",
-				"episode",
-				"type",
-				"year",
-				"runtime_min",
-				"size",
-				"bitrate",
-				"hdr",
-				"video",
-				"resolution",
-				"date_added",
-				"library",
-				"path",
-			].sort(),
-		);
-		// The leading selection column is never toggleable (enableHiding=false).
-		expect(toggleable).toHaveLength(15);
-		expect(toggleable).not.toContain("__select__");
-	});
-
-	it("renders the 15 data column headers", () => {
-		render(<Media />);
-		const headers = screen
-			.getAllByRole("columnheader")
-			.map((h) => (h.textContent ?? "").trim());
-		for (const expected of [
-			"Title",
-			"Series",
-			"Season",
-			"Episode",
-			"Type",
-			"Year",
-			"Runtime",
-			"Size",
-			"Bitrate",
-			"HDR",
-			"Video codec",
-			"Resolution",
-			"Date added",
-			"Library",
-			"Path",
-		]) {
-			expect(headers).toContain(expected);
-		}
-	});
-
-	it("navigates to the file browser at the item path on row click", async () => {
-		render(<Media />);
-
-		await userEvent.click(screen.getByText("Inception"));
-
-		expect(navigate).toHaveBeenCalledTimes(1);
-		expect(navigate).toHaveBeenCalledWith(
-			`/files?path=${encodeURIComponent("/media/movies/Inception.mkv")}`,
-		);
-	});
-
-	it("does NOT navigate when toggling a row selection checkbox", async () => {
-		render(<Media />);
-
-		const firstCheckbox = screen.getAllByRole("checkbox", {
-			name: "Select row",
-		})[0];
-		await userEvent.click(firstCheckbox);
-		expect(firstCheckbox).toBeChecked();
-		expect(navigate).not.toHaveBeenCalled();
-	});
-
-	it("renders the server-driven pagination total + page controls", () => {
-		render(<Media />);
-
-		// DataTable manual-pagination footer surfaces the server total + pager.
-		// ("Page 1 of 1" also appears in the page caption, so match all and assert
-		// the pager footer text is present alongside the unique total.)
-		expect(screen.getByText("2 rows")).toBeInTheDocument();
-		expect(screen.getAllByText(/Page 1 of 1/).length).toBeGreaterThan(0);
-		expect(
-			screen.getByRole("button", { name: "Previous page" }),
-		).toBeDisabled();
-	});
-
-	it("disables Build index while a build is running", () => {
-		status = statusFixture({ build_running: true });
-
-		render(<Media />);
-
-		expect(screen.getByRole("button", { name: "Building..." })).toBeDisabled();
-		// Stop + Force stop surface only while running.
-		expect(
-			screen.getByRole("button", { name: "Stop build" }),
-		).toBeInTheDocument();
-		expect(
-			screen.getByRole("button", { name: "Force stop" }),
-		).toBeInTheDocument();
-	});
-});
-
-describe("Media (mobile card layout — slice 3)", () => {
-	it("renders cards with the title as primary below md", () => {
-		setMatchMedia(true);
-		render(<Media />);
-
-		// Card titles render (primary field).
-		expect(screen.getByText("Inception")).toBeInTheDocument();
-		expect(screen.getByText("Matrix")).toBeInTheDocument();
-
-		// Card field labels render (at least once per row).
-		expect(screen.getAllByText("Size").length).toBeGreaterThanOrEqual(2);
-		expect(screen.getAllByText("HDR").length).toBeGreaterThanOrEqual(2);
-		expect(screen.getAllByText("Library").length).toBeGreaterThanOrEqual(2);
-		expect(screen.getAllByText("Year").length).toBeGreaterThanOrEqual(2);
-
-		// Desktop table headers do NOT render on mobile.
-		expect(screen.queryByRole("columnheader", { name: "Title" })).toBeNull();
-		expect(screen.queryByRole("columnheader", { name: "Bitrate" })).toBeNull();
-	});
-
-	it("hides the column-visibility toggle below md", () => {
-		setMatchMedia(true);
-		render(<Media />);
-
-		expect(screen.queryByRole("button", { name: /Columns/ })).toBeNull();
-	});
-
-	it("renders pagination controls below the cards on mobile", () => {
-		setMatchMedia(true);
-		render(<Media />);
-
-		expect(screen.getByText("2 rows")).toBeInTheDocument();
-		expect(screen.getAllByText(/Page 1 of 1/).length).toBeGreaterThan(0);
-		expect(
-			screen.getByRole("button", { name: "Previous page" }),
-		).toBeDisabled();
-		expect(
-			screen.getByRole("button", { name: "Next page" }),
-		).toBeInTheDocument();
-	});
-
-	it("navigates to the file browser when a card is tapped on mobile", async () => {
-		setMatchMedia(true);
-		render(<Media />);
-
-		await userEvent.click(screen.getByText("Inception"));
-
-		expect(navigate).toHaveBeenCalledTimes(1);
-		expect(navigate).toHaveBeenCalledWith(
-			`/files?path=${encodeURIComponent("/media/movies/Inception.mkv")}`,
-		);
-	});
-
-	it("renders the DataTable (not cards) at desktop width", () => {
-		render(<Media />);
-
-		// Desktop column headers render.
-		expect(
-			screen.getByRole("columnheader", { name: "Title" }),
-		).toBeInTheDocument();
-		// Column-visibility toggle is present.
-		expect(screen.getByRole("button", { name: /Columns/ })).toBeInTheDocument();
-	});
-});

frontend/src/pages/__tests__/NamedDashboardPage.test.tsx

@@ -0,0 +1,131 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter, Route, Routes } from "react-router-dom";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { NamedDashboardPage } from "../NamedDashboardPage";
+
+vi.mock("../../hooks/useDashboards", () => ({
+	useDashboardBySlug: vi.fn(() => ({ data: undefined, isLoading: true })),
+}));
+
+vi.mock("../../hooks/useWidgets", () => ({
+	useWidgetReferences: () => ({ data: [] }),
+}));
+
+vi.mock("../../components/WidgetConfigDialog", () => ({
+	WidgetConfigDialog: () => <div data-testid="config-dialog-stub" />,
+}));
+
+vi.mock("../../components/WidgetInstance", () => ({
+	WidgetInstanceCard: () => <div data-testid="widget-stub" />,
+}));
+
+import { useDashboardBySlug } from "../../hooks/useDashboards";
+
+function renderPage(slug: string) {
+	const queryClient = new QueryClient({
+		defaultOptions: { queries: { retry: false } },
+	});
+	return render(
+		<QueryClientProvider client={queryClient}>
+			<MemoryRouter initialEntries={[`/d/${slug}`]}>
+				<Routes>
+					<Route path="/d/:slug" element={<NamedDashboardPage />} />
+				</Routes>
+			</MemoryRouter>
+		</QueryClientProvider>,
+	);
+}
+
+describe("NamedDashboardPage", () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it("renders loading state", () => {
+		vi.mocked(useDashboardBySlug).mockReturnValue({
+			data: undefined,
+			isLoading: true,
+			isError: false,
+		} as never);
+		renderPage("storage");
+		// Skeleton renders during load.
+		expect(document.querySelector(".h-32")).toBeInTheDocument();
+	});
+
+	it("renders 404 when dashboard not found", () => {
+		vi.mocked(useDashboardBySlug).mockReturnValue({
+			data: undefined,
+			isLoading: false,
+			isError: true,
+		} as never);
+		renderPage("nonexistent");
+		expect(screen.getByText(/Dashboard not found/i)).toBeInTheDocument();
+	});
+
+	it("renders pinned links for a known dashboard", () => {
+		vi.mocked(useDashboardBySlug).mockReturnValue({
+			data: {
+				id: "d1",
+				label: "Storage",
+				slug: "storage",
+				sort_order: 0,
+				payload: {
+					items: [
+						{
+							type: "link",
+							label: "My Jellyfin",
+							target: "/services/jellyfin/svc-1",
+						},
+					],
+				},
+				created_at: 1,
+				updated_at: 1,
+			},
+			isLoading: false,
+			isError: false,
+		} as never);
+		renderPage("storage");
+		expect(screen.getByText("Storage")).toBeInTheDocument();
+		expect(screen.getByText("My Jellyfin")).toBeInTheDocument();
+	});
+
+	it("renders empty state when dashboard has no items", () => {
+		vi.mocked(useDashboardBySlug).mockReturnValue({
+			data: {
+				id: "d2",
+				label: "Empty",
+				slug: "empty",
+				sort_order: 0,
+				payload: {},
+				created_at: 1,
+				updated_at: 1,
+			},
+			isLoading: false,
+			isError: false,
+		} as never);
+		renderPage("empty");
+		expect(screen.getByText("Empty")).toBeInTheDocument();
+		expect(screen.getByText(/This dashboard is empty/i)).toBeInTheDocument();
+	});
+
+	it("renders an edit-widgets button", () => {
+		vi.mocked(useDashboardBySlug).mockReturnValue({
+			data: {
+				id: "d1",
+				label: "Storage",
+				slug: "storage",
+				sort_order: 0,
+				payload: { items: [] },
+				created_at: 1,
+				updated_at: 1,
+			},
+			isLoading: false,
+			isError: false,
+		} as never);
+		renderPage("storage");
+		expect(
+			screen.getByRole("button", { name: /Edit widgets/i }),
+		).toBeInTheDocument();
+	});
+});

frontend/src/pages/__tests__/ServicePage.test.tsx

@@ -1,149 +1,129 @@
-import { describe, it, expect, beforeEach, vi } from "vitest";
+import { describe, it, expect, vi } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { MemoryRouter, Route, Routes } from "react-router-dom";
 import { ServicePage } from "../ServicePage";
-import type {
+import type { ServiceInstance } from "../../types";
-	ServiceInstance,
-	ServiceInstanceInput,
-	ServiceTypeInfo,
-} from "../../types";
-
-// --- fixtures ---
 
 const instance: ServiceInstance = {
 	id: "svc-1",
-	service_type: "grafana",
+	service_type: "jellyfin",
-	name: "Production Grafana",
+	name: "Main Jellyfin",
-	config: { base_url: "https://grafana.example.com", timeout_seconds: 5 },
+	config: { base_url: "https://jf.example.com", user_id: "u1" },
 	secrets_set: { api_key: true },
 	enabled: true,
 	created_at: 1_700_000_000,
 	updated_at: 1_700_000_000,
 };
 
-const typeInfo: ServiceTypeInfo = {
+// typeInfo no longer needed on ServicePage (config moved to Settings).
-	service_type: "grafana",
+
-	name: "Grafana",
+const secondInstance: ServiceInstance = {
-	description: "Dashboards, metrics, and logs.",
+	...instance,
-	config_schema: {
+	id: "svc-2",
-		type: "object",
+	name: "Backup Jellyfin",
-		properties: {
-			base_url: { type: "string", description: "Absolute URL." },
-			timeout_seconds: { type: "integer" },
-		},
-	},
-	secret_fields: [{ key: "api_key", label: "API key", required: false }],
-	widget_kinds: [],
 };
 
-// --- mocks ---
-
-const mutateAsync = vi.fn();
-const mutate = vi.fn();
-const deleteMutate = vi.fn();
-
 vi.mock("../../hooks/useServices", () => ({
-	useServiceInstances: () => ({ data: [instance] }),
+	useServiceInstances: () => ({
-	useServiceTypes: () => ({ data: [typeInfo] }),
+		data: (window as unknown as { __svcInstances?: ServiceInstance[] })
-	useSaveServiceInstance: () => ({
+			?.__svcInstances ?? [instance],
-		mutateAsync,
-		mutate,
-		isPending: false,
 	}),
-	useDeleteServiceInstance: () => ({ mutate: deleteMutate, isPending: false }),
 }));
 
-vi.mock("react-router-dom", () => ({
+vi.mock("../../hooks/useWidgets", () => ({
-	useParams: () => ({
+	useWidgetInstances: () => ({ data: [] }),
-		serviceType: "grafana",
-		serviceId: "svc-1",
-	}),
-	useNavigate: () => vi.fn(),
 }));
 
-// jsdom has no window.matchMedia; stub it. Default to desktop (matches: false).
+vi.mock("../../components/WidgetConfigDialog", () => ({
-function setMatchMedia(matches: boolean) {
+	WidgetConfigDialog: () => null,
-	window.matchMedia = ((query: string) => ({
+}));
-		matches: query.includes("768") ? matches : false,
+
-		media: query,
+vi.mock("../../components/WidgetInstance", () => ({
-		onchange: null,
+	WidgetInstanceCard: () => null,
-		addEventListener: () => {},
+}));
-		removeEventListener: () => {},
+
-		addListener: () => {},
+vi.mock("../../integrations/registry", () => ({
-		removeListener: () => {},
+	getServiceBinding: () => ({
-		dispatchEvent: () => false,
+		name: "Jellyfin",
-	})) as unknown as typeof window.matchMedia;
+		description: "Media server",
+		widgets: [],
+	}),
+}));
+
+function renderServicePage(path: string) {
+	return render(
+		<MemoryRouter initialEntries={[path]}>
+			<Routes>
+				<Route
+					path="/services/:serviceType/:serviceId"
+					element={<ServicePage />}
+				/>
+			</Routes>
+		</MemoryRouter>,
+	);
 }
 
-beforeEach(() => {
+describe("ServicePage tab skeleton", () => {
-	setMatchMedia(false);
+	it("renders Overview + Media + Requests + Widgets for jellyfin", () => {
-	mutateAsync.mockReset();
+		renderServicePage("/services/jellyfin/svc-1");
-	mutate.mockReset();
+		expect(screen.getByRole("tab", { name: "Overview" })).toBeInTheDocument();
-	deleteMutate.mockReset();
+		expect(screen.getByRole("tab", { name: "Media" })).toBeInTheDocument();
+		expect(screen.getByRole("tab", { name: "Requests" })).toBeInTheDocument();
+		expect(screen.getByRole("tab", { name: "Widgets" })).toBeInTheDocument();
 	});
 
-describe("ServicePage (desktop)", () => {
+	it("does NOT render Config tab (moved to Settings)", () => {
-	it("renders the full-page layout with the service name and connection card", () => {
+		renderServicePage("/services/jellyfin/svc-1");
-		render(<ServicePage />);
-		// Page heading (desktop only — mobile uses SheetForm title)
 		expect(
-			screen.getByRole("heading", { name: "Production Grafana" }),
+			screen.queryByRole("tab", { name: "Config" }),
-		).toBeInTheDocument();
-		// Connection section card title
-		expect(screen.getByText("Connection")).toBeInTheDocument();
-		// General Save button
-		expect(screen.getByRole("button", { name: "Save" })).toBeInTheDocument();
-	});
-
-	it("does not render the SheetForm at desktop width", () => {
-		render(<ServicePage />);
-		// SheetForm renders a dialog with role="dialog" only when open; on
-		// desktop the page layout is used, so no dialog should be present.
-		expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
-	});
-});
-
-describe("ServicePage (mobile SheetForm — slice 6)", () => {
-	beforeEach(() => setMatchMedia(true));
-
-	it("renders the SheetForm with the service name as title below md", () => {
-		render(<ServicePage />);
-		// SheetForm title is rendered inside a SheetTitle (role="heading").
-		expect(
-			screen.getByRole("heading", { name: "Production Grafana" }),
-		).toBeInTheDocument();
-		// The dialog (Sheet content) should be present on mobile.
-		expect(screen.getByRole("dialog")).toBeInTheDocument();
-		// Desktop page header description is NOT rendered inside the SheetForm.
-		expect(
-			screen.queryByText("Dashboards, metrics, and logs."),
 		).not.toBeInTheDocument();
 	});
 
-	it("edits the name field and Save calls the save mutation", async () => {
+	it("does NOT render Media/Requests for non-jellyfin types", () => {
-		render(<ServicePage />);
+		const sshInstance = { ...instance, service_type: "ssh_tasks", id: "ssh-1" };
-		const nameInput = screen.getByLabelText("Name");
+		(
-		expect(nameInput).toHaveValue("Production Grafana");
+			window as unknown as { __svcInstances: ServiceInstance[] }
-
+		).__svcInstances = [sshInstance];
-		await userEvent.clear(nameInput);
+		renderServicePage("/services/ssh_tasks/ssh-1");
-		await userEvent.type(nameInput, "Renamed Grafana");
+		expect(screen.getByRole("tab", { name: "Files" })).toBeInTheDocument();
-
+		expect(screen.getByRole("tab", { name: "Actions" })).toBeInTheDocument();
-		const saveButton = screen.getByRole("button", { name: "Save" });
+		expect(
-		await userEvent.click(saveButton);
+			screen.queryByRole("tab", { name: "Media" }),
-
+		).not.toBeInTheDocument();
-		expect(mutateAsync).toHaveBeenCalledTimes(1);
-		const input = mutateAsync.mock.calls[0][0] as ServiceInstanceInput;
-		expect(input.name).toBe("Renamed Grafana");
-		expect(input.id).toBe("svc-1");
-		// Lock the full save payload (config draft, enabled, secrets sentinel).
-		expect(input.enabled).toBe(true);
-		expect(input.secrets).toEqual({});
-		expect(input.config).toMatchObject({ base_url: "https://grafana.example.com" });
 	});
 
-	it("renders the connection config fields as editable inside the SheetForm", () => {
+	it("shows instance tabs when >1 enabled sibling of same type", () => {
-		render(<ServicePage />);
+		(
-		const urlInput = screen.getByLabelText("base_url");
+			window as unknown as { __svcInstances: ServiceInstance[] }
-		expect(urlInput).toHaveValue("https://grafana.example.com");
+		).__svcInstances = [instance, secondInstance];
+		renderServicePage("/services/jellyfin/svc-1");
+		expect(
+			screen.getByRole("tab", { name: "Main Jellyfin" }),
+		).toBeInTheDocument();
+		expect(
+			screen.getByRole("tab", { name: "Backup Jellyfin" }),
+		).toBeInTheDocument();
+	});
+
+	it("hides instance tabs when only one instance", () => {
+		(
+			window as unknown as { __svcInstances: ServiceInstance[] }
+		).__svcInstances = [instance];
+		renderServicePage("/services/jellyfin/svc-1");
+		expect(
+			screen.queryByRole("tab", { name: "Main Jellyfin" }),
+		).not.toBeInTheDocument();
+	});
+
+	it("clicking an instance tab navigates to that instance", async () => {
+		const user = userEvent.setup();
+		(
+			window as unknown as { __svcInstances: ServiceInstance[] }
+		).__svcInstances = [instance, secondInstance];
+		renderServicePage("/services/jellyfin/svc-1");
+		await user.click(screen.getByRole("tab", { name: "Backup Jellyfin" }));
+		// The test router would navigate; we can't assert URL directly without
+		// a useNavigate mock, but the click should not throw.
 	});
 });

frontend/src/pages/__tests__/Settings.test.tsx

@@ -6,7 +6,9 @@ import type { MonitoringMachine } from "../../types";
 
 const saveMachineMutate = vi.fn().mockResolvedValue({});
 const deleteMachineMutate = vi.fn();
-const testSSHMutate = vi.fn().mockResolvedValue({
+const testSSHMutate = vi
+	.fn()
+	.mockResolvedValue({
 		message: "SSH auth succeeded",
 		known_hosts_updated: true,
 	});
@@ -111,103 +113,3 @@ describe("Settings", () => {
 		expect(deleteMachineMutate).toHaveBeenCalledWith("m1");
 	});
 });
-
-// jsdom has no window.matchMedia; default to desktop so existing tests are
-// unaffected.
-function setMatchMedia(matches: boolean) {
-	window.matchMedia = ((query: string) => ({
-		matches: query.includes("768") ? matches : false,
-		media: query,
-		onchange: null,
-		addEventListener: () => {},
-		removeEventListener: () => {},
-		addListener: () => {},
-		removeListener: () => {},
-		dispatchEvent: () => false,
-	})) as unknown as typeof window.matchMedia;
-}
-
-describe("Settings (mobile SheetForm — slice 7)", () => {
-	beforeEach(() => setMatchMedia(true));
-
-	it("opens the machine editor in a SheetForm below md", async () => {
-		machines = [localMachine()];
-		render(<Settings />);
-
-		// Open the editor via the detail-pane Edit button (visible text).
-		const detailEdit = screen
-			.getAllByRole("button", { name: "Edit" })
-			.find((button) => button.textContent === "Edit") as HTMLButtonElement;
-		await userEvent.click(detailEdit);
-
-		// SheetForm renders a dialog; the DialogTitle shows the editor title.
-		expect(screen.getByText("Edit machine")).toBeInTheDocument();
-		expect(screen.getByRole("dialog")).toBeInTheDocument();
-		// Desktop DialogDescription text is not rendered as a dialog description
-		// on mobile (the MachineEditor has its own hint labels, which is fine).
-		expect(
-			screen.queryByRole("heading", { name: "Create machine" }),
-		).not.toBeInTheDocument();
-	});
-
-	it("saves a machine via the SheetForm on mobile", async () => {
-		machines = [localMachine()];
-		render(<Settings />);
-
-		const detailEdit = screen
-			.getAllByRole("button", { name: "Edit" })
-			.find((button) => button.textContent === "Edit") as HTMLButtonElement;
-		await userEvent.click(detailEdit);
-
-		const nameInput = screen.getByLabelText("Name");
-		await userEvent.clear(nameInput);
-		await userEvent.type(nameInput, "Renamed node");
-
-		await userEvent.click(screen.getByRole("button", { name: "Save machine" }));
-
-		expect(saveMachineMutate).toHaveBeenCalledTimes(1);
-		const saved = saveMachineMutate.mock.calls[0][0];
-		expect(saved.name).toBe("Renamed node");
-		expect(saved.mode).toBe("local");
-	});
-
-	it("cancel closes the SheetForm on mobile", async () => {
-		machines = [localMachine()];
-		render(<Settings />);
-
-		const detailEdit = screen
-			.getAllByRole("button", { name: "Edit" })
-			.find((button) => button.textContent === "Edit") as HTMLButtonElement;
-		await userEvent.click(detailEdit);
-
-		expect(screen.getByRole("dialog")).toBeInTheDocument();
-
-		await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
-		// The sheet is now closed — the dialog role should no longer be present.
-		// (The page content itself is still rendered; only the sheet unmounts.)
-		expect(screen.queryByText("Edit machine")).not.toBeInTheDocument();
-	});
-
-	it("prompts before discarding unsaved machine edits (R4.5)", async () => {
-		machines = [localMachine()];
-		render(<Settings />);
-
-		const detailEdit = screen
-			.getAllByRole("button", { name: "Edit" })
-			.find((button) => button.textContent === "Edit") as HTMLButtonElement;
-		await userEvent.click(detailEdit);
-
-		// Edit the name to make the form dirty.
-		const nameInput = screen.getByLabelText("Name");
-		await userEvent.clear(nameInput);
-		await userEvent.type(nameInput, "Dirty name");
-
-		// Cancel should NOT immediately close — the discard confirm appears.
-		await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
-		expect(
-			screen.getByRole("heading", { name: "Discard changes?" }),
-		).toBeInTheDocument();
-		// The editor is still open.
-		expect(screen.getByText("Edit machine")).toBeInTheDocument();
-	});
-});

frontend/src/pages/__tests__/UsersPage.test.tsx

@@ -1,407 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { UsersPage } from "../UsersPage.impl";
-import { TooltipProvider } from "../../components/ui/tooltip";
-import type {
-	NowPlayingSession,
-	UserDirectoryItem,
-	UserDirectoryResponse,
-} from "../../types";
-
-// jsdom has no window.matchMedia; the shared `useIsMobile` hook and the
-// compose dialog viewport hook must not blow up during render. Stub to
-// "desktop" (matches: false) by default; the slice-5 describe block flips it
-// to mobile for card-layout assertions.
-beforeEach(() => {
-	if (!window.matchMedia) {
-		window.matchMedia = ((query: string) => ({
-			matches: false,
-			media: query,
-			onchange: null,
-			addEventListener: () => {},
-			removeEventListener: () => {},
-			addListener: () => {},
-			removeListener: () => {},
-			dispatchEvent: () => false,
-		})) as unknown as typeof window.matchMedia;
-	}
-	// The compose formatting actions defer a focus/selection restore via
-	// requestAnimationFrame (see insertMarkup). jsdom may not flush rAF
-	// synchronously, so make it synchronous so the slice-6b compose test can
-	// observe the html-body value update.
-	window.requestAnimationFrame = ((cb: FrameRequestCallback) => {
-		cb(0);
-		return 0;
-	}) as typeof window.requestAnimationFrame;
-});
-
-// Keep the drawer's nested session panel out of the DOM under test.
-vi.mock("../../components/SessionActivityPanel", () => ({
-	SessionActivityPanel: ({
-		selectedUserLabel,
-	}: {
-		selectedUserLabel: string;
-	}) => <div data-testid="session-panel-stub">{selectedUserLabel}</div>,
-}));
-
-let users: UserDirectoryItem[] = [];
-let activity: NowPlayingSession[] = [];
-
-function directoryResponse(): UserDirectoryResponse {
-	return {
-		items: users,
-		total: users.length,
-		jellyseerr_configured: true,
-		jellyseerr_available: true,
-		jellyseerr_error: "",
-		jellyseerr_jellyfin_user_count: 0,
-		jellyseerr_user_count: 0,
-		enriched_count: 0,
-	};
-}
-
-vi.mock("../../hooks/useUsers", () => ({
-	useUsers: () => ({ data: directoryResponse(), isError: false, error: null }),
-}));
-vi.mock("../../hooks/useDashboard", () => ({
-	useActivity: () => ({ data: activity }),
-}));
-vi.mock("../../hooks/useUserMessageQueueStatus", () => ({
-	useUserMessageQueueStatus: () => ({ data: undefined, isError: false }),
-}));
-vi.mock("../../hooks/useSendUserMessage", () => ({
-	useSendUserMessage: () => ({
-		isPending: false,
-		isError: false,
-		isSuccess: false,
-		reset: vi.fn(),
-		mutateAsync: vi.fn(),
-	}),
-}));
-
-// useSearchParams backs `?user=<id>` (drawer open) on a module-level object.
-// `setSearchParams({ user })` opens the drawer; `setSearchParams({})` closes it.
-let currentParams: Record<string, string> = {};
-const setSearchParams = vi.fn((next: Record<string, string>) => {
-	currentParams = { ...next };
-});
-vi.mock("react-router-dom", () => ({
-	useSearchParams: () => [new URLSearchParams(currentParams), setSearchParams],
-}));
-
-function userFixture(
-	overrides: Partial<UserDirectoryItem> = {},
-): UserDirectoryItem {
-	return {
-		jellyfin_id: "u1",
-		username: "alice",
-		display_name: "Alice",
-		email: "alice@example.com",
-		email_source: "jellyfin",
-		avatar: "",
-		avatar_source: "",
-		contactable: true,
-		source: "jellyfin",
-		source_summary: "",
-		name_source: "jellyfin",
-		access_source: "jellyfin",
-		jellyseerr_user_id: null,
-		jellyseerr_username: "",
-		user_type: 1,
-		user_type_label: "User",
-		role: "admin",
-		permissions: 1,
-		permissions_label: "Administrator",
-		request_count: 0,
-		...overrides,
-	};
-}
-
-beforeEach(() => {
-	users = [];
-	activity = [];
-	currentParams = {};
-	setSearchParams.mockClear();
-});
-
-describe("UsersPage (slice 6a — directory surface + drawer)", () => {
-	it("renders the directory table and metric counts", () => {
-		users = [userFixture()];
-		render(<UsersPage />);
-
-		expect(screen.getByText("Total users")).toBeInTheDocument();
-		expect(screen.getByText("User list")).toBeInTheDocument();
-		expect(screen.getByText("Alice")).toBeInTheDocument();
-		expect(screen.getByText("0 selected")).toBeInTheDocument();
-	});
-
-	it("toggles row selection and reflects the selected-count badge", async () => {
-		users = [
-			userFixture({ jellyfin_id: "u1" }),
-			userFixture({
-				jellyfin_id: "u2",
-				username: "bob",
-				display_name: "Bob",
-				email: "bob@example.com",
-			}),
-		];
-		render(<UsersPage />);
-
-		expect(screen.getByText("0 selected")).toBeInTheDocument();
-
-		// Selection-across-pagination: toggling a row updates the selected-id set.
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: "Select Alice" }),
-		);
-		expect(screen.getByText("1 selected")).toBeInTheDocument();
-
-		// Toggling again removes it (the set survives, membership flips).
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: "Select Alice" }),
-		);
-		expect(screen.getByText("0 selected")).toBeInTheDocument();
-	});
-
-	it("selects all visible rows via the header select-all checkbox", async () => {
-		users = [
-			userFixture({ jellyfin_id: "u1" }),
-			userFixture({
-				jellyfin_id: "u2",
-				username: "bob",
-				display_name: "Bob",
-				email: "bob@example.com",
-			}),
-		];
-		render(<UsersPage />);
-
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: "Select all visible users" }),
-		);
-		expect(screen.getByText("2 selected")).toBeInTheDocument();
-	});
-
-	it("opens the user drawer when a row is clicked (setSearchParams user)", async () => {
-		users = [userFixture({ jellyfin_id: "u1" })];
-		render(<UsersPage />);
-
-		// Clicking the row body (not the checkbox) opens the detail drawer.
-		await userEvent.click(screen.getByText("Alice"));
-		expect(setSearchParams).toHaveBeenCalledWith({ user: "u1" });
-	});
-
-	it("maps activity status to Badge variants (Playing→success, Paused→warning)", () => {
-		users = [
-			userFixture({
-				jellyfin_id: "u1",
-				username: "alice",
-				display_name: "Alice",
-			}),
-			userFixture({
-				jellyfin_id: "u2",
-				username: "bob",
-				display_name: "Bob",
-				email: "bob@example.com",
-			}),
-		];
-		activity = [
-			{
-				user: "alice",
-				title: "Movie",
-				type: "Movie",
-				state: "playing",
-				transcoding: "no",
-				transcoding_type: "",
-				device: "Web",
-				session_id: "s1",
-			},
-			{
-				user: "bob",
-				title: "Show",
-				type: "Episode",
-				state: "paused",
-				transcoding: "no",
-				transcoding_type: "",
-				device: "TV",
-				session_id: "s2",
-			},
-		];
-		render(<UsersPage />);
-
-		// Design §2.3: healthy/active (Playing) = success (chart-2); Paused = warning.
-		expect(screen.getByText("Playing").getAttribute("data-variant")).toBe(
-			"success",
-		);
-		expect(screen.getByText("Paused").getAttribute("data-variant")).toBe(
-			"warning",
-		);
-	});
-
-	it("renders the user detail drawer (Sheet) when a user is selected", () => {
-		users = [userFixture({ jellyfin_id: "u1", display_name: "Alice" })];
-		currentParams = { user: "u1" };
-		render(<UsersPage />);
-
-		// buildUserDrawerModel title = display name; rendered as the drawer heading.
-		expect(screen.getByRole("heading", { name: "Alice" })).toBeInTheDocument();
-		// Drawer sections (identity / contact actions) + the activity panel render.
-		expect(screen.getByText("Identity")).toBeInTheDocument();
-		expect(screen.getByText("Contact actions")).toBeInTheDocument();
-		expect(screen.getByTestId("session-panel-stub")).toBeInTheDocument();
-	});
-});
-
-describe("UsersPage (slice 6b — compose dialog formatting actions)", () => {
-	it("opens compose and inserts bold markup into the html body", async () => {
-		users = [userFixture({ jellyfin_id: "u1", display_name: "Alice" })];
-		// The formatting toolbar renders <Tooltip> (shadcn), which in the app is
-		// wrapped by a global <TooltipProvider> in App.tsx; supply it here.
-		render(
-			<TooltipProvider>
-				<UsersPage />
-			</TooltipProvider>,
-		);
-
-		// Select a deliverable user so the "Message selected" button enables.
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: "Select Alice" }),
-		);
-		await userEvent.click(
-			screen.getByRole("button", { name: "Message selected" }),
-		);
-
-		// Compose dialog opens (shadcn Dialog family).
-		expect(
-			screen.getByRole("heading", { name: "Message selected users" }),
-		).toBeInTheDocument();
-
-		// Bold action wraps the cursor selection in <strong></strong> via the
-		// preserved insertMarkup helper (markup insertion actions parity).
-		await userEvent.click(screen.getByRole("button", { name: "Bold" }));
-
-		const body = screen.getByRole("textbox", {
-			name: "HTML message body",
-		}) as HTMLTextAreaElement;
-		expect(body.value).toContain("<strong>");
-	});
-});
-
-describe("UsersPage (mobile card layout — slice 5)", () => {
-	beforeEach(() => {
-		window.matchMedia = ((query: string) => ({
-			matches: query.includes("768"),
-			media: query,
-			onchange: null,
-			addEventListener: () => {},
-			removeEventListener: () => {},
-			addListener: () => {},
-			removeListener: () => {},
-			dispatchEvent: () => false,
-		})) as unknown as typeof window.matchMedia;
-	});
-
-	it("renders user cards with display name as primary below md", () => {
-		users = [
-			userFixture({ jellyfin_id: "u1", display_name: "Alice" }),
-			userFixture({
-				jellyfin_id: "u2",
-				username: "bob",
-				display_name: "Bob",
-			}),
-		];
-
-		render(
-			<TooltipProvider>
-				<UsersPage />
-			</TooltipProvider>,
-		);
-
-		expect(screen.getByText("Alice")).toBeInTheDocument();
-		expect(screen.getByText("Bob")).toBeInTheDocument();
-		// Activity field label should appear per card.
-		expect(screen.getAllByText("Activity")).toHaveLength(2);
-	});
-
-	it("toggles selection from the card checkbox without opening the drawer", async () => {
-		users = [userFixture({ jellyfin_id: "u1", display_name: "Alice" })];
-		render(
-			<TooltipProvider>
-				<UsersPage />
-			</TooltipProvider>,
-		);
-
-		const checkbox = screen.getByRole("checkbox", {
-			name: /Select Alice/i,
-		});
-		expect(checkbox).toHaveAttribute("data-state", "unchecked");
-
-		await userEvent.click(checkbox);
-		expect(checkbox).toHaveAttribute("data-state", "checked");
-
-		// Drawer stays closed: the session-panel stub only renders when the
-		// drawer opens via a card-body tap, not via the checkbox.
-		expect(screen.queryByTestId("session-panel-stub")).not.toBeInTheDocument();
-	});
-
-	it("renders compose in a SheetForm below md with send button", async () => {
-		users = [
-			userFixture({
-				jellyfin_id: "u1",
-				display_name: "Alice",
-				email: "alice@example.com",
-			}),
-		];
-		render(
-			<TooltipProvider>
-				<UsersPage />
-			</TooltipProvider>,
-		);
-
-		// Select the deliverable user via the mobile card checkbox.
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: /Select Alice/i }),
-		);
-		await userEvent.click(
-			screen.getByRole("button", { name: "Message selected" }),
-		);
-
-		// On mobile, compose opens in a SheetForm (not a Dialog). The SheetForm
-		// header carries the title and the footer carries the Send button.
-		expect(screen.getByText("Message selected users")).toBeInTheDocument();
-		expect(
-			screen.getByRole("button", { name: "Send message" }),
-		).toBeInTheDocument();
-		expect(screen.getByLabelText("Subject")).toBeInTheDocument();
-	});
-
-	it("prompts before discarding unsaved compose edits (R4.5)", async () => {
-		users = [
-			userFixture({
-				jellyfin_id: "u1",
-				display_name: "Alice",
-				email: "alice@example.com",
-			}),
-		];
-		render(
-			<TooltipProvider>
-				<UsersPage />
-			</TooltipProvider>,
-		);
-
-		await userEvent.click(
-			screen.getByRole("checkbox", { name: /Select Alice/i }),
-		);
-		await userEvent.click(
-			screen.getByRole("button", { name: "Message selected" }),
-		);
-
-		// Type a subject to make the compose form dirty.
-		await userEvent.type(screen.getByLabelText("Subject"), "Urgent update");
-
-		// Cancel should NOT immediately close — the discard confirm appears.
-		await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
-		expect(
-			screen.getByRole("heading", { name: "Discard changes?" }),
-		).toBeInTheDocument();
-	});
-});

frontend/src/pages/service-tabs/ActionsTab.tsx

@@ -1,18 +1,25 @@
+/**
+ * ActionsTab — operational content for the ssh_tasks service page.
+ *
+ * Lifted from the old top-level `pages/Actions.tsx`. The `instance` prop
+ * provides the active ssh_tasks service id, which is used as the default run
+ * service. The page-level header is removed (the service page provides it).
+ * The task editor dialog, saved-task rail, and run history are preserved.
+ */
 import type { ReactNode } from "react";
 import { useMemo, useState } from "react";
-import type { SavedTask, SavedTaskInput, ServiceInstance } from "../types";
+import type { SavedTask, SavedTaskInput, ServiceInstance } from "../../types";
 import {
 	useDeleteTask,
 	useRunTask,
 	useSaveTask,
 	useTaskRuns,
 	useTasks,
-} from "../hooks/useSettings";
+} from "../../hooks/useSettings";
-import { useServiceInstances } from "../hooks/useServices";
+import { DialogFooter } from "../../components/DialogFooter";
-import { DialogFooter } from "../components/DialogFooter";
+import { HoverEditButton } from "../../components/HoverEditButton";
-import { HoverEditButton } from "../components/HoverEditButton";
+import { SectionCard } from "../../components/SectionCard";
-import { SectionCard } from "../components/SectionCard";
+import { SelectionRailCard } from "../../components/SelectionRailCard";
-import { SelectionRailCard } from "../components/SelectionRailCard";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -37,13 +44,8 @@ import { Separator } from "@/components/ui/separator";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
 
-// Radix Select disallows empty-string item values; the "None" option maps to
-// this sentinel and converts back to "" at the draft boundary.
-const NONE = "__none__";
-
 type ActionTab = "new" | string;
 
-/** Small labeled-field wrapper replacing the MUI `<TextField label>` shell. */
 function FormField({
 	label,
 	htmlFor,
@@ -106,16 +108,11 @@ function initialFromTask(task: SavedTask): SavedTaskInput {
 
 function TaskEditor({
 	task,
-	services,
 	onChange,
 }: {
 	task: SavedTaskInput;
-	services: ServiceInstance[];
 	onChange: (task: SavedTaskInput) => void;
 }) {
-	const selectedService = services.find(
-		(service) => service.id === task.default_service_id,
-	);
 	return (
 		<div className="flex flex-col gap-4">
 			<div className="flex flex-row flex-wrap items-center gap-2">
@@ -124,11 +121,7 @@ function TaskEditor({
 				</p>
 				<Badge variant="outline">{task.task_type}</Badge>
 				<Badge variant="outline">{task.enabled ? "enabled" : "disabled"}</Badge>
-				{selectedService && (
-					<Badge variant="outline">{`default: ${selectedService.name}`}</Badge>
-				)}
 			</div>
-
 			<div className="flex flex-col gap-2">
 				<FormField label="Name" htmlFor="task-name">
 					<Input
@@ -159,31 +152,6 @@ function TaskEditor({
 							</Select>
 						</FormField>
 					</div>
-					<div className="min-w-[220px] flex-1">
-						<FormField label="Default SSH task service">
-							<Select
-								value={task.default_service_id || NONE}
-								onValueChange={(value) =>
-									onChange({
-										...task,
-										default_service_id: value === NONE ? "" : value,
-									})
-								}
-							>
-								<SelectTrigger className="w-full" size="sm">
-									<SelectValue placeholder="None" />
-								</SelectTrigger>
-								<SelectContent>
-									<SelectItem value={NONE}>None</SelectItem>
-									{services.map((service) => (
-										<SelectItem key={service.id} value={service.id}>
-											{service.name}
-										</SelectItem>
-									))}
-								</SelectContent>
-							</Select>
-						</FormField>
-					</div>
 				</div>
 				<FormField label="Notes">
 					<Input
@@ -216,7 +184,6 @@ function TaskDialog({
 	open,
 	task,
 	baseline,
-	services,
 	onClose,
 	onChange,
 	onSave,
@@ -225,7 +192,6 @@ function TaskDialog({
 	open: boolean;
 	task: SavedTaskInput;
 	baseline: SavedTaskInput;
-	services: ServiceInstance[];
 	onClose: () => void;
 	onChange: (task: SavedTaskInput) => void;
 	onSave: () => void;
@@ -235,12 +201,10 @@ function TaskDialog({
 		if (
 			!sameTask(task, baseline) &&
 			!window.confirm("Discard unsaved changes?")
-		) {
+		)
 			return;
-		}
 		onClose();
 	};
-
 	return (
 		<Dialog
 			open={open}
@@ -254,10 +218,10 @@ function TaskDialog({
 					<DialogDescription>
 						Save a reusable server task. Shell commands run via{" "}
 						<code>/bin/sh -c</code>; Python runs via <code>python3 -c</code>.
-						Runs execute on the selected SSH task service instance.
+						Runs execute on this SSH task service instance.
 					</DialogDescription>
 				</DialogHeader>
-				<TaskEditor task={task} services={services} onChange={onChange} />
+				<TaskEditor task={task} onChange={onChange} />
 				<DialogFooter
 					onCancel={requestClose}
 					cancelLabel="Cancel"
@@ -266,7 +230,7 @@ function TaskDialog({
 					confirmBusyLabel="Save action"
 					secondaryAction={
 						onDelete ? (
-							<Button variant="destructive" onClick={onDelete} className="mobile-touch-target">
+							<Button variant="destructive" onClick={onDelete}>
 								Delete
 							</Button>
 						) : undefined
@@ -277,8 +241,7 @@ function TaskDialog({
 	);
 }
 
-export function Actions() {
+export function ActionsTab({ instance }: { instance: ServiceInstance }) {
-	const { data: sshServices = [] } = useServiceInstances("ssh_tasks");
 	const { data: tasks = [] } = useTasks();
 	const saveTask = useSaveTask();
 	const deleteTask = useDeleteTask();
@@ -288,9 +251,11 @@ export function Actions() {
 	const [draftBaseline, setDraftBaseline] = useState<SavedTaskInput>(
 		emptyTask(),
 	);
-	const [runServiceId, setRunServiceId] = useState("");
 	const [editOpen, setEditOpen] = useState(false);
 
+	// Default to this instance's service id for task runs.
+	const runServiceId = instance.id;
+
 	const selectedTask = useMemo(
 		() => tasks.find((task) => task.id === tab) ?? null,
 		[tasks, tab],
@@ -303,14 +268,6 @@ export function Actions() {
 		setEditOpen(true);
 	};
 
-	const createNew = () => {
-		const initial = emptyTask();
-		setDraft(initial);
-		setDraftBaseline(initial);
-		setRunServiceId(sshServices[0]?.id || "");
-		setEditOpen(true);
-	};
-
 	const saveDraft = async () => {
 		const saved = await saveTask.mutateAsync(draft);
 		setTab(saved.id);
@@ -328,20 +285,8 @@ export function Actions() {
 		setDraftBaseline(nextDraft);
 	};
 
-	const editingTask = selectedTask;
-
 	return (
-		<div className="flex flex-col gap-6">
+		<div className="flex flex-col gap-4">
-			<div className="flex flex-row flex-wrap items-center justify-between gap-2">
-				<div>
-					<h1 className="text-lg font-semibold">Actions</h1>
-					<p className="text-xs text-muted-foreground">
-						Save reusable server tasks and switch between them with tabs.
-					</p>
-				</div>
-				<Badge variant="outline">{`${tasks.length} saved`}</Badge>
-			</div>
-
 			{saveTask.error && (
 				<Alert variant="destructive">
 					<AlertDescription>{String(saveTask.error)}</AlertDescription>
@@ -367,8 +312,8 @@ export function Actions() {
 						<Button
 							variant="outline"
 							size="sm"
-							className="mobile-touch-target w-full"
+							className="w-full"
-							onClick={createNew}
+							onClick={() => openEdit(emptyTask())}
 						>
 							Add action
 						</Button>
@@ -406,23 +351,23 @@ export function Actions() {
 				</SelectionRailCard>
 
 				<div className="flex flex-col gap-4">
-					{editingTask ? (
+					{selectedTask ? (
 						<SectionCard
-							title={editingTask.name}
+							title={selectedTask.name}
 							description="Open the editor popup to modify this action."
 							action={
 								<div className="flex flex-row flex-wrap items-center gap-2">
-									<Button className="mobile-touch-target"
+									<Button
 										variant="outline"
-										onClick={() => openEdit(initialFromTask(editingTask))}
+										onClick={() => openEdit(initialFromTask(selectedTask))}
 									>
 										Edit
 									</Button>
-									<Button className="mobile-touch-target"
+									<Button
-										disabled={runTask.isPending || !runServiceId}
+										disabled={runTask.isPending}
 										onClick={async () => {
 											await runTask.mutateAsync({
-												taskId: editingTask.id,
+												taskId: selectedTask.id,
 												serviceId: runServiceId,
 											});
 										}}
@@ -432,35 +377,7 @@ export function Actions() {
 								</div>
 							}
 						>
-							<div className="flex flex-wrap items-center gap-2">
-								<FormField
-									label="Run on SSH task service"
-									htmlFor="run-service-id"
-								>
-									<Select
-										value={runServiceId}
-										onValueChange={(value) => setRunServiceId(value)}
-									>
-										<SelectTrigger
-											id="run-service-id"
-											className="min-w-[240px]"
-											size="sm"
-										>
-											<SelectValue placeholder="Select service" />
-										</SelectTrigger>
-										<SelectContent>
-											{sshServices.map((service) => (
-												<SelectItem key={service.id} value={service.id}>
-													{service.name}
-												</SelectItem>
-											))}
-										</SelectContent>
-									</Select>
-								</FormField>
-							</div>
-
 							<Separator />
-
 							<p className="text-sm font-semibold">Recent runs</p>
 							{selectedRuns.data?.items?.length ? (
 								<div className="flex flex-col gap-2">
@@ -509,25 +426,16 @@ export function Actions() {
 							)}
 						</SectionCard>
 					) : (
-						<div className="flex flex-col gap-4">
 						<SectionCard
 							title="No action selected"
-								description="Select a saved action from the list on the left to view its details, run it, or open the editor popup. Use the button at the bottom to add a new action."
+							description="Select a saved action from the list on the left to view its details, run it, or open the editor popup."
 						>
 							{tasks[0] && (
-									<Button variant="outline" onClick={() => setTab(tasks[0].id)} className="mobile-touch-target">
+								<Button variant="outline" onClick={() => setTab(tasks[0].id)}>
 									Select first action
 								</Button>
 							)}
 						</SectionCard>
-
-							<SectionCard title="What this panel shows">
-								<p className="text-xs text-muted-foreground">
-									Saved actions stay on the left rail, while details, run
-									controls, and recent history appear here.
-								</p>
-							</SectionCard>
-						</div>
 					)}
 				</div>
 			</div>
@@ -536,7 +444,6 @@ export function Actions() {
 				open={editOpen}
 				task={draft}
 				baseline={draftBaseline}
-				services={sshServices}
 				onClose={() => setEditOpen(false)}
 				onChange={setDraft}
 				onSave={saveDraft}

frontend/src/pages/service-tabs/AlertsTab.tsx

@@ -0,0 +1,188 @@
+/**
+ * Alertmanager Alerts tab (spec R2.4, R8.2).
+ *
+ * Lifts the Alertmanager alerts content from the old cross-service
+ * ObservabilityPage into an instance-scoped tab. Renders the active-alert
+ * summary (total + by severity) and the expandable alert list.
+ *
+ * The hooks (useAlertmanagerAlerts, useAlertmanagerStatus) are global /
+ * first-configured for now — they don't accept a service_id yet. Wiring
+ * `instance.id` into them is a documented follow-up once the hooks gain the
+ * parameter. The `instance` prop is accepted for future scoping.
+ */
+import { AlertTriangle, Bell, ChevronDown, Inbox } from "lucide-react";
+import {
+	useAlertmanagerAlerts,
+	useAlertmanagerStatus,
+} from "../../hooks/useObservability";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+	Collapsible,
+	CollapsibleContent,
+	CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import type { AlertmanagerAlert, ServiceInstance } from "../../types";
+
+function severityVariant(
+	severity: string,
+): "default" | "secondary" | "destructive" | "outline" {
+	switch (severity.toLowerCase()) {
+		case "critical":
+			return "destructive";
+		case "warning":
+			return "default";
+		case "info":
+			return "secondary";
+		default:
+			return "outline";
+	}
+}
+
+function AlertItem({ alert }: { alert: AlertmanagerAlert }) {
+	return (
+		<Collapsible>
+			<CollapsibleTrigger asChild>
+				<div className="group cursor-pointer rounded-lg border p-3 transition-colors hover:bg-muted/50">
+					<div className="flex items-start justify-between gap-2">
+						<div className="font-medium text-sm">{alert.name}</div>
+						<div className="flex items-center gap-1">
+							<Badge variant={severityVariant(alert.severity)}>
+								{alert.severity}
+							</Badge>
+							<ChevronDown className="h-4 w-4 text-muted-foreground transition-transform group-data-[state=open]:rotate-180" />
+						</div>
+					</div>
+					<div className="mt-1 text-xs text-muted-foreground">
+						{alert.summary || alert.description}
+					</div>
+					{alert.active_since && (
+						<div className="mt-1 text-[10px] text-muted-foreground">
+							Since {new Date(alert.active_since).toLocaleString()}
+						</div>
+					)}
+				</div>
+			</CollapsibleTrigger>
+			<CollapsibleContent className="overflow-hidden">
+				<div className="space-y-2 rounded-b-lg border-x border-b p-3 text-sm">
+					{alert.description && (
+						<div>
+							<span className="font-medium">Description:</span>{" "}
+							{alert.description}
+						</div>
+					)}
+					<div className="grid grid-cols-2 gap-2 text-xs">
+						{alert.job_name && (
+							<div>
+								<span className="font-medium">Job:</span> {alert.job_name}
+							</div>
+						)}
+						{alert.category && (
+							<div>
+								<span className="font-medium">Category:</span> {alert.category}
+							</div>
+						)}
+						<div>
+							<span className="font-medium">State:</span> {alert.state}
+						</div>
+						<div>
+							<span className="font-medium">Since:</span>{" "}
+							{alert.active_since
+								? new Date(alert.active_since).toLocaleString()
+								: "unknown"}
+						</div>
+					</div>
+					{alert.labels && Object.keys(alert.labels).length > 0 && (
+						<div className="flex flex-wrap gap-1 pt-1">
+							{Object.entries(alert.labels).map(([key, value]) => (
+								<Badge key={key} variant="secondary" className="text-[10px]">
+									{key}={value}
+								</Badge>
+							))}
+						</div>
+					)}
+				</div>
+			</CollapsibleContent>
+		</Collapsible>
+	);
+}
+
+export function AlertsTab({ instance }: { instance: ServiceInstance }) {
+	// Global / first-configured hooks for now; instance.id scoping is a
+	// follow-up (see file docstring).
+	void instance;
+
+	const {
+		data: alertsSummary,
+		isLoading: alertsLoading,
+		error: alertsError,
+	} = useAlertmanagerAlerts();
+	const { data: status, isLoading: statusLoading } = useAlertmanagerStatus();
+
+	const statusDetail = status?.up
+		? status.version
+			? `version ${status.version}`
+			: "reachable"
+		: statusLoading
+			? "checking…"
+			: "unreachable";
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-center gap-2 text-sm text-muted-foreground">
+				<Bell className="h-4 w-4" />
+				Alertmanager {statusDetail}
+			</div>
+
+			{alertsError && (
+				<Alert variant="destructive">
+					<AlertTitle>Failed to load alerts</AlertTitle>
+					<AlertDescription>{alertsError.message}</AlertDescription>
+				</Alert>
+			)}
+
+			<Card>
+				<CardHeader>
+					<CardTitle className="flex items-center gap-2">
+						<AlertTriangle className="h-4 w-4" />
+						Active Alerts ({alertsSummary?.total ?? 0})
+					</CardTitle>
+				</CardHeader>
+				<CardContent className="space-y-3">
+					{alertsLoading ? (
+						<div className="space-y-2">
+							<Skeleton className="h-16 w-full" />
+							<Skeleton className="h-16 w-full" />
+							<Skeleton className="h-16 w-full" />
+						</div>
+					) : !alertsSummary || alertsSummary.total === 0 ? (
+						<div className="flex h-full min-h-[160px] flex-col items-center justify-center gap-2 rounded-md border p-6 text-center">
+							<Inbox className="h-8 w-8 text-muted-foreground" />
+							<div className="font-medium">No active alerts</div>
+							<div className="max-w-md text-sm text-muted-foreground">
+								Everything looks quiet. Firing alerts will appear here.
+							</div>
+						</div>
+					) : (
+						<>
+							{alertsSummary.alerts.map((alert, idx) => (
+								<AlertItem key={`${alert.name}-${idx}`} alert={alert} />
+							))}
+							{alertsSummary.total > alertsSummary.alerts.length && (
+								<div className="text-center text-xs text-muted-foreground">
+									{alertsSummary.total - alertsSummary.alerts.length} more alert
+									{alertsSummary.total - alertsSummary.alerts.length === 1
+										? ""
+										: "s"}{" "}
+									in Alertmanager
+								</div>
+							)}
+						</>
+					)}
+				</CardContent>
+			</Card>
+		</div>
+	);
+}

frontend/src/pages/service-tabs/FilesTab.tsx

@@ -1,5 +1,15 @@
-import { useMemo, useState } from "react";
+/**
-import { useNavigate, useSearchParams } from "react-router-dom";
+ * FilesTab — operational content for the ssh_tasks service page.
+ *
+ * Lifted from the old top-level `pages/FileBrowser.impl.tsx`. The machine
+ * selector and `useMonitoringSettings` are removed; the active ssh_tasks
+ * instance id (from the `instance` prop) replaces the machine_id. The initial
+ * path is read from `?path=` search param for deep-link support (resolves the
+ * MediaTab row-click navigation from slice 5). Everything else — directory
+ * listing, path bar, ffprobe preview, job execution — is preserved.
+ */
+import { useState } from "react";
+import { useSearchParams } from "react-router-dom";
 import type { ColumnDef, RowSelectionState } from "@tanstack/react-table";
 
 import { DataTable } from "@/components/ui/data-table";
@@ -7,7 +17,7 @@ import {
 	MobileCardRow,
 	type MobileCardField,
 } from "@/components/ui/mobile-card";
-import { Alert, AlertAction, AlertDescription } from "@/components/ui/alert";
+import { Alert, AlertDescription } from "@/components/ui/alert";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
@@ -20,18 +30,27 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { TabsTrigger } from "@/components/ui/tabs";
+
 import {
 	useDirectoryListing,
 	useFfprobe,
 	useJobTemplates,
 	useRunJob,
-} from "../hooks/useFiles";
+} from "../../hooks/useFiles";
-import { usePersistentState } from "../hooks/usePersistentState";
+import { usePersistentState } from "../../hooks/usePersistentState";
-import { useIsMobile } from "../hooks/useIsMobile";
+import { SectionCard } from "../../components/SectionCard";
-import { useMonitoringSettings } from "../hooks/useSettings";
+import type { ServiceInstance } from "../../types";
-import { SectionCard } from "../components/SectionCard";
+import { useIsMobile } from "../../hooks/useIsMobile";
-import { TabbedCard } from "../components/TabbedCard";
+
+// Mobile card fields (mobile-parity pattern).
+const fileCardFields: MobileCardField<DisplayRow>[] = [
+	{ key: "name", label: "Name", render: (r) => r.name, primary: true },
+	{ key: "type", label: "Type", render: (r) => r.type },
+	{ key: "size", label: "Size", render: (r) => r.size || "-" },
+	{ key: "modified", label: "Modified", render: (r) => r.modified || "-" },
+];
+
+// --- Types (lifted verbatim) ---
 
 interface DisplayRow {
 	id: string;
@@ -83,6 +102,8 @@ interface FfprobeData {
 	streams?: FfprobeStream[];
 }
 
+// --- Helpers (lifted verbatim) ---
+
 function formatSize(bytes: number): string {
 	if (bytes === 0) return "-";
 	const units = ["B", "KB", "MB", "GB", "TB"];
@@ -154,9 +175,8 @@ function isVideoFile(name: string): boolean {
 	return exts.some((ext) => name.toLowerCase().endsWith(ext));
 }
 
-// Design §3.2: referentially-stable column defs (a new array each render would
+// --- Column defs (lifted verbatim) ---
-// destabilize the TanStack table instance and drop controlled selection).
+
-// Visibility-only: no sorting, no sizing/resizing (design §3.3).
 const fileColumns: ColumnDef<DisplayRow>[] = [
 	{
 		accessorKey: "type",
@@ -187,19 +207,9 @@ const fileColumns: ColumnDef<DisplayRow>[] = [
 	},
 ];
 
-// Mobile card fields (spec R3.2): the card picks the 3-5 most important fields.
+// --- State + helpers (lifted) ---
-// Name is the primary identifier; type distinguishes dir/file/up at a glance;
-// size and modified give the at-a-glance info a user browsing files on a phone
-// needs. Ext is redundant with the name on mobile (the extension is visible in
-// the filename itself). See OpenSpec change `mobile-responsive-parity`.
-const fileCardFields: MobileCardField<DisplayRow>[] = [
-	{ key: "name", label: "Name", render: (r) => r.name, primary: true },
-	{ key: "type", label: "Type", render: (r) => r.type },
-	{ key: "size", label: "Size", render: (r) => r.size || "-" },
-	{ key: "modified", label: "Modified", render: (r) => r.modified || "-" },
-];
 
-const FILE_BROWSER_STATE_KEY = "manage.files.browserState";
+const FILE_TAB_STATE_KEY = "manage.files.tabState";
 
 type FileBrowserState = {
 	currentDir: string;
@@ -217,6 +227,8 @@ function defaultFileBrowserState(): FileBrowserState {
 	};
 }
 
+// --- Ffprobe rendering (lifted verbatim) ---
+
 function FfprobeChip({
 	children,
 	variant = "outline",
@@ -234,15 +246,9 @@ function StreamBlock({ children }: { children: React.ReactNode }) {
 function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 	const format = data.format ?? {};
 	const streams = data.streams ?? [];
-	const videoStreams = streams.filter(
+	const videoStreams = streams.filter((s) => s.codec_type === "video");
-		(stream) => stream.codec_type === "video",
+	const audioStreams = streams.filter((s) => s.codec_type === "audio");
-	);
+	const subtitleStreams = streams.filter((s) => s.codec_type === "subtitle");
-	const audioStreams = streams.filter(
-		(stream) => stream.codec_type === "audio",
-	);
-	const subtitleStreams = streams.filter(
-		(stream) => stream.codec_type === "subtitle",
-	);
 
 	return (
 		<div className="flex flex-col gap-4">
@@ -250,7 +256,6 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 				<div className="text-base font-semibold">ffprobe details</div>
 				<div className="text-xs text-muted-foreground">{path}</div>
 			</div>
-
 			<Card>
 				<CardContent className="flex flex-col gap-3">
 					<div className="text-sm font-semibold">Container / format</div>
@@ -286,11 +291,9 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 					</div>
 				</CardContent>
 			</Card>
-
 			<Card>
 				<CardContent className="flex flex-col gap-3">
 					<div className="text-sm font-semibold">Streams</div>
-
 					{videoStreams.length > 0 && (
 						<div>
 							<div className="text-xs text-muted-foreground">Video streams</div>
@@ -340,9 +343,7 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 													</FfprobeChip>
 												)}
 												{stream.width && stream.height && (
-													<FfprobeChip variant="outline">
+													<FfprobeChip variant="outline">{`${stream.width}×${stream.height}`}</FfprobeChip>
-														{`${stream.width}×${stream.height}`}
-													</FfprobeChip>
 												)}
 												{stream.pix_fmt && (
 													<FfprobeChip variant="outline">
@@ -350,14 +351,10 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 													</FfprobeChip>
 												)}
 												{stream.display_aspect_ratio && (
-													<FfprobeChip variant="outline">
+													<FfprobeChip variant="outline">{`DAR ${stream.display_aspect_ratio}`}</FfprobeChip>
-														{`DAR ${stream.display_aspect_ratio}`}
-													</FfprobeChip>
 												)}
 												{stream.sample_aspect_ratio && (
-													<FfprobeChip variant="outline">
+													<FfprobeChip variant="outline">{`SAR ${stream.sample_aspect_ratio}`}</FfprobeChip>
-														{`SAR ${stream.sample_aspect_ratio}`}
-													</FfprobeChip>
 												)}
 												{stream.level !== undefined &&
 													stream.level !== null && (
@@ -399,7 +396,6 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 							</div>
 						</div>
 					)}
-
 					{audioStreams.length > 0 && (
 						<div>
 							<div className="text-xs text-muted-foreground">Audio streams</div>
@@ -448,7 +444,6 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 							</div>
 						</div>
 					)}
-
 					{subtitleStreams.length > 0 && (
 						<div>
 							<div className="text-xs text-muted-foreground">
@@ -481,7 +476,6 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 							</div>
 						</div>
 					)}
-
 					{streams.length === 0 && (
 						<div className="text-sm text-muted-foreground">
 							No streams found.
@@ -489,16 +483,16 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 					)}
 				</CardContent>
 			</Card>
-
 			{Object.keys(format.tags ?? {}).length > 0 && (
 				<Card>
 					<CardContent className="flex flex-col gap-2">
 						<div className="text-sm font-semibold">Tags</div>
 						<div className="flex flex-row flex-wrap gap-1.5">
 							{Object.entries(format.tags ?? {}).map(([key, value]) => (
-								<FfprobeChip key={key} variant="outline">
+								<FfprobeChip
-									{`${key}: ${value}`}
+									key={key}
-								</FfprobeChip>
+									variant="outline"
+								>{`${key}: ${value}`}</FfprobeChip>
 							))}
 						</div>
 					</CardContent>
@@ -508,57 +502,36 @@ function FfprobeDetails({ path, data }: { path: string; data: FfprobeData }) {
 	);
 }
 
-function InfoAlert({ children }: { children: React.ReactNode }) {
+// --- Component ---
-	return (
-		<Alert>
-			<AlertDescription>{children}</AlertDescription>
-		</Alert>
-	);
-}
 
-export function FileBrowser() {
+export function FilesTab({ instance }: { instance: ServiceInstance }) {
-	const [searchParams, setSearchParams] = useSearchParams();
 	const isMobile = useIsMobile();
+	const machineId = instance.id;
+	const [searchParams] = useSearchParams();
+	const requestedPath = searchParams.get("path");
 	const [columnVisibility, setColumnVisibility] = useState<
 		Record<string, boolean>
 	>({});
-	const { data: machines } = useMonitoringSettings();
-	const fileMachines = useMemo(
-		() =>
-			(machines ?? []).filter(
-				(machine) =>
-					machine.enabled &&
-					(machine.services.includes("files") ||
-						machine.services.includes("monitoring")),
-			),
-		[machines],
-	);
-	const initialRequestedPath = searchParams.get("path");
-	const initialMachineId =
-		searchParams.get("machine_id") || fileMachines[0]?.id || "";
 	const [browserState, setBrowserState] = usePersistentState<FileBrowserState>(
-		FILE_BROWSER_STATE_KEY,
+		`${FILE_TAB_STATE_KEY}.${instance.id}`,
 		() => {
-			const requestedPath = initialRequestedPath ?? "/";
+			const path = requestedPath ?? "/";
 			const selectedPath =
-				requestedPath !== "/" &&
+				path !== "/" && (isVideoFile(path) || path.includes("."))
-				(isVideoFile(requestedPath) || requestedPath.includes("."))
+					? path.replace(/\/+$/, "")
-					? requestedPath.replace(/\/+$/, "")
 					: null;
 			const currentDir = selectedPath
 				? selectedPath.replace(/\/[^/]+$/, "") || "/"
-				: requestedPath.replace(/\/+$/, "") || "/";
+				: path.replace(/\/+$/, "") || "/";
 			return {
 				...defaultFileBrowserState(),
 				currentDir,
-				pathInput: requestedPath || currentDir,
+				pathInput: path || currentDir,
 				selectedPath,
 			};
 		},
 	);
 	const { currentDir, pathInput, selectedPath, selectedJob } = browserState;
-	const selectedMachineId = searchParams.get("machine_id") || initialMachineId;
-	const navigateToSettings = useNavigate();
 	const updateBrowserState = (patch: Partial<FileBrowserState>) =>
 		setBrowserState((current) => ({ ...current, ...patch }));
 
@@ -567,7 +540,7 @@ export function FileBrowser() {
 		isLoading,
 		error,
 		refetch,
-	} = useDirectoryListing(currentDir, selectedMachineId || undefined);
+	} = useDirectoryListing(currentDir, machineId);
 	const {
 		data: ffprobeData,
 		isLoading: ffprobeLoading,
@@ -575,10 +548,10 @@ export function FileBrowser() {
 	} = useFfprobe(
 		selectedPath ?? "",
 		!!selectedPath && isVideoFile(selectedPath),
-		selectedMachineId || undefined,
+		machineId,
 	);
 	const { data: templates } = useJobTemplates();
-	const runJob = useRunJob(selectedMachineId || undefined);
+	const runJob = useRunJob(machineId);
 
 	const navigate = (path: string) => {
 		updateBrowserState({
@@ -588,18 +561,6 @@ export function FileBrowser() {
 		});
 	};
 
-	const setMachine = (machineId: string) => {
-		setSearchParams(
-			(current) => {
-				const next = new URLSearchParams(current);
-				if (machineId) next.set("machine_id", machineId);
-				else next.delete("machine_id");
-				return next;
-			},
-			{ replace: true },
-		);
-	};
-
 	const handlePathSubmit = (e: React.KeyboardEvent) => {
 		if (e.key === "Enter") navigate(pathInput || "/");
 	};
@@ -634,8 +595,6 @@ export function FileBrowser() {
 		}
 	}
 
-	// Preserved row-click behavior (MUI DataGrid onRowClick): dir/up rows navigate;
-	// file rows select the file for ffprobe preview (also feeds pathInput).
 	const handleRowClick = (row: DisplayRow) => {
 		if (row.type === "dir" || row.type === "up") {
 			navigate(row.path);
@@ -648,8 +607,6 @@ export function FileBrowser() {
 		});
 	};
 
-	// Single-select checkbox behavior (DataTable adds a selection column under
-	// enableRowSelection): mirrors the row-click selection for file rows.
 	const rowSelection: RowSelectionState = selectedPath
 		? { [selectedPath]: true }
 		: {};
@@ -677,26 +634,6 @@ export function FileBrowser() {
 	const selectedTemplate = templates?.find((t) => t.key === selectedJob);
 
 	return (
-		<div className="flex flex-col gap-4.5">
-			<div className="flex flex-row flex-wrap items-center gap-2">
-				<h2 className="text-xl font-semibold">File Browser</h2>
-				<Badge variant="outline">
-					{fileMachines.length
-						? `${fileMachines.length} machine${fileMachines.length === 1 ? "" : "s"}`
-						: "No file machines"}
-				</Badge>
-			</div>
-
-			<TabbedCard
-				value={fileMachines.length > 0 ? selectedMachineId : ""}
-				onChange={setMachine}
-				tabs={fileMachines.map((machine) => (
-					<TabsTrigger key={machine.id} value={machine.id}>
-						{`${machine.name} · ${machine.mode}`}
-					</TabsTrigger>
-				))}
-			>
-				{fileMachines.length > 0 ? (
 		<div className="flex flex-col gap-4">
 			<SectionCard
 				title="Browser"
@@ -718,14 +655,14 @@ export function FileBrowser() {
 						<div className="flex flex-col gap-2 md:flex-row md:items-end">
 							<Button
 								variant="outline"
-											className="w-full md:w-auto mobile-touch-target"
+								className="w-full md:w-auto"
 								onClick={() => navigate(pathInput || "/")}
 							>
 								Open
 							</Button>
 							<Button
 								variant="outline"
-											className="w-full md:w-auto mobile-touch-target"
+								className="w-full md:w-auto"
 								onClick={() => refetch()}
 							>
 								Refresh
@@ -765,9 +702,7 @@ export function FileBrowser() {
 							columnVisibility={columnVisibility}
 							onColumnVisibilityChange={setColumnVisibility}
 							emptyMessage={
-												isLoading
+								isLoading ? "Loading directory..." : "This directory is empty."
-													? "Loading directory..."
-													: "This directory is empty."
 							}
 						/>
 					)}
@@ -783,29 +718,35 @@ export function FileBrowser() {
 					isVideoFile(selectedPath) ? (
 						ffprobeError ? (
 							<Alert variant="destructive">
-											<AlertDescription>
+								<AlertDescription>{String(ffprobeError)}</AlertDescription>
-												{String(ffprobeError)}
-											</AlertDescription>
 							</Alert>
 						) : ffprobeLoading && !ffprobeData ? (
-										<InfoAlert>Loading ffprobe data...</InfoAlert>
+							<Alert>
+								<AlertDescription>Loading ffprobe data...</AlertDescription>
+							</Alert>
 						) : ffprobeData ? (
 							<FfprobeDetails
 								path={selectedPath}
 								data={ffprobeData as FfprobeData}
 							/>
 						) : (
-										<InfoAlert>No ffprobe data available.</InfoAlert>
+							<Alert>
+								<AlertDescription>No ffprobe data available.</AlertDescription>
+							</Alert>
 						)
 					) : (
-									<InfoAlert>
+						<Alert>
+							<AlertDescription>
 								Select a video file to view ffprobe details.
-									</InfoAlert>
+							</AlertDescription>
+						</Alert>
 					)
 				) : (
-								<InfoAlert>
+					<Alert>
+						<AlertDescription>
 							Select a file in Browser to view ffprobe details.
-								</InfoAlert>
+						</AlertDescription>
+					</Alert>
 				)}
 			</SectionCard>
 
@@ -837,13 +778,10 @@ export function FileBrowser() {
 								</Select>
 							</div>
 							<div className="flex flex-col gap-2 md:col-span-3 md:flex-row md:items-end">
-											<Button className="mobile-touch-target"
+								<Button
 									disabled={!selectedJob || runJob.isPending}
 									onClick={() =>
-													runJob.mutate({
+										runJob.mutate({ jobKey: selectedJob, path: selectedPath })
-														jobKey: selectedJob,
-														path: selectedPath,
-													})
 									}
 								>
 									Run job
@@ -865,28 +803,13 @@ export function FileBrowser() {
 						)}
 					</div>
 				) : (
-								<InfoAlert>Select a file in Browser to run jobs.</InfoAlert>
+					<Alert>
+						<AlertDescription>
+							Select a file in Browser to run jobs.
+						</AlertDescription>
+					</Alert>
 				)}
 			</SectionCard>
 		</div>
-				) : (
-					<Alert>
-						<AlertDescription>
-							No file-capable machines are configured yet.
-						</AlertDescription>
-						<AlertAction>
-							<Button
-								variant="outline"
-								size="sm"
-								onClick={() => navigateToSettings("/settings")}
-								className="mobile-touch-target"
-							>
-								Open Settings
-							</Button>
-						</AlertAction>
-					</Alert>
-				)}
-			</TabbedCard>
-		</div>
 	);
 }

frontend/src/pages/service-tabs/JobsTab.tsx

@@ -1,3 +1,15 @@
+/**
+ * JobsTab — operational content for the backups service page.
+ *
+ * Lifted from the old top-level `components/BackupsPage.tsx`. The three
+ * sub-tables (Jobs / Runs / Alerts) and their hooks are preserved verbatim.
+ *
+ * NOTE: the backup hooks currently query globally (no service_id filter).
+ * The backend gained `service_id` attribution in Slice 3, but the hooks don't
+ * yet accept a serviceId param. This tab shows ALL backups data for now;
+ * per-instance scoping by `instance.id` is a follow-up once the hooks gain the
+ * parameter.
+ */
 import { useState } from "react";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
@@ -5,12 +17,16 @@ import {
 	useBackupAlerts,
 	useBackupJobs,
 	useBackupRuns,
-} from "../hooks/useBackups";
+} from "../../hooks/useBackups";
-import BackupAlertsTable from "./BackupAlertsTable";
+import BackupAlertsTable from "../../components/BackupAlertsTable";
-import BackupJobsTable from "./BackupJobsTable";
+import BackupJobsTable from "../../components/BackupJobsTable";
-import BackupRunsTable from "./BackupRunsTable";
+import BackupRunsTable from "../../components/BackupRunsTable";
+import type { ServiceInstance } from "../../types";
 
-export default function BackupsPage() {
+export function JobsTab({ instance }: { instance: ServiceInstance }) {
+	// instance.id is not yet used — backup hooks query globally (see file
+	// docstring). Per-instance scoping is a follow-up.
+	void instance;
 	const [tab, setTab] = useState("jobs");
 	const { data: jobsData, isLoading: jobsLoading } = useBackupJobs();
 	const { data: runsData, isLoading: runsLoading } = useBackupRuns();
@@ -35,7 +51,6 @@ export default function BackupsPage() {
 
 	return (
 		<div className="space-y-4">
-			<h1 className="text-2xl font-bold tracking-tight">Backups</h1>
 			<Tabs value={tab} onValueChange={setTab}>
 				<TabsList>
 					<TabsTrigger value="jobs">Jobs</TabsTrigger>

frontend/src/pages/service-tabs/LinksTab.tsx

@@ -0,0 +1,194 @@
+/**
+ * Grafana Links tab (spec R2.4, R8.2).
+ *
+ * Lifts the Grafana deep-link content from the old cross-service
+ * ObservabilityPage into an instance-scoped tab. Shows service health + the
+ * configured Grafana deep-links (node-exporter dashboard, Loki logs per
+ * machine).
+ *
+ * The hooks (useGrafanaStatus, useMonitoringMachines) are global /
+ * first-configured for now. Wiring `instance.id` into the status hook is a
+ * follow-up. The machine links use the configured Grafana base_url from the
+ * instance's config.
+ */
+import { useMemo, useState } from "react";
+import { Link } from "react-router-dom";
+import { Activity, ExternalLink, Gauge, ServerOff } from "lucide-react";
+import {
+	useGrafanaStatus,
+	useMonitoringMachines,
+} from "../../hooks/useObservability";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import type { ServiceInstance } from "../../types";
+
+function GrafanaLinkCard({
+	title,
+	description,
+	href,
+}: {
+	title: string;
+	description: string;
+	href: string;
+}) {
+	return (
+		<div className="rounded-md border p-4">
+			<div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+				<div>
+					<div className="font-medium">{title}</div>
+					<div className="text-sm text-muted-foreground">{description}</div>
+				</div>
+				<Button variant="outline" size="sm" asChild>
+					<a
+						href={href}
+						target="_blank"
+						rel="noopener noreferrer"
+						className="gap-1"
+					>
+						Open in Grafana
+						<ExternalLink className="h-3 w-3" />
+					</a>
+				</Button>
+			</div>
+		</div>
+	);
+}
+
+export function LinksTab({ instance }: { instance: ServiceInstance }) {
+	const { data: status, isLoading, error } = useGrafanaStatus();
+	const { data: machines = [], isLoading: machinesLoading } =
+		useMonitoringMachines();
+	const [selectedMachineId, setSelectedMachineId] = useState("");
+
+	const grafanaBaseUrl =
+		(instance.config?.base_url as string | undefined) ?? "";
+
+	const selectedMachine = useMemo(
+		() =>
+			machines.find((m) => m.id === selectedMachineId) ?? machines[0] ?? null,
+		[machines, selectedMachineId],
+	);
+
+	const nodeExporterDashboardUrl = useMemo(() => {
+		if (!selectedMachine || !grafanaBaseUrl) return "";
+		const inst = `${selectedMachine.host || "localhost"}:9100`;
+		return `${grafanaBaseUrl}/d/node-exporter-overview/node-exporter-overview?kiosk&var-instance=${encodeURIComponent(inst)}`;
+	}, [selectedMachine, grafanaBaseUrl]);
+
+	const logsUrl = useMemo(() => {
+		if (!selectedMachine || !grafanaBaseUrl) return "";
+		const container =
+			selectedMachine.mode === "local" ? "backend" : selectedMachine.name;
+		return `${grafanaBaseUrl}/explore?orgId=1&left=${encodeURIComponent(
+			JSON.stringify({
+				datasource: "Loki",
+				queries: [{ refId: "A", expr: `{container="${container}"}` }],
+				range: { from: "now-1h", to: "now" },
+			}),
+		)}`;
+	}, [selectedMachine, grafanaBaseUrl]);
+
+	const statusDetail = status?.up
+		? status.version
+			? `version ${status.version}`
+			: "reachable"
+		: isLoading
+			? "checking…"
+			: error
+				? "unreachable"
+				: "not configured";
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-center gap-2 text-sm text-muted-foreground">
+				<Gauge className="h-4 w-4" />
+				Grafana {statusDetail}
+			</div>
+
+			{error && (
+				<Alert variant="destructive">
+					<AlertTitle>Failed to reach Grafana</AlertTitle>
+					<AlertDescription>{error.message}</AlertDescription>
+				</Alert>
+			)}
+
+			<Card>
+				<CardHeader className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
+					<CardTitle className="flex items-center gap-2">
+						<Activity className="h-4 w-4" />
+						Machine Dashboard
+					</CardTitle>
+					{machines.length > 0 ? (
+						<Select
+							value={selectedMachine?.id ?? ""}
+							onValueChange={setSelectedMachineId}
+							disabled={machinesLoading}
+						>
+							<SelectTrigger className="w-full sm:w-[240px]">
+								<SelectValue placeholder="Select machine" />
+							</SelectTrigger>
+							<SelectContent>
+								{machines.map((machine) => (
+									<SelectItem key={machine.id} value={machine.id}>
+										{machine.name}
+									</SelectItem>
+								))}
+							</SelectContent>
+						</Select>
+					) : null}
+				</CardHeader>
+				<CardContent className="space-y-4">
+					{isLoading ? (
+						<Skeleton className="h-24 w-full" />
+					) : selectedMachine && grafanaBaseUrl ? (
+						<>
+							<GrafanaLinkCard
+								title={`${selectedMachine.name} metrics`}
+								description="Open the Node Exporter overview dashboard for this machine in Grafana."
+								href={nodeExporterDashboardUrl}
+							/>
+							<GrafanaLinkCard
+								title={`${selectedMachine.name} logs`}
+								description="Explore Loki logs for this machine in Grafana."
+								href={logsUrl}
+							/>
+						</>
+					) : !grafanaBaseUrl ? (
+						<div className="flex h-full min-h-[160px] flex-col items-center justify-center gap-2 rounded-md border p-6 text-center">
+							<Gauge className="h-8 w-8 text-muted-foreground" />
+							<div className="font-medium">No Grafana base URL configured</div>
+							<div className="max-w-md text-sm text-muted-foreground">
+								Add a Grafana service instance to enable deep-links to
+								dashboards and logs.
+							</div>
+							<Button variant="outline" size="sm" asChild>
+								<Link to="/services">Open Services</Link>
+							</Button>
+						</div>
+					) : (
+						<div className="flex h-full min-h-[160px] flex-col items-center justify-center gap-2 rounded-md border p-6 text-center">
+							<ServerOff className="h-8 w-8 text-muted-foreground" />
+							<div className="font-medium">No machine selected</div>
+							<div className="max-w-md text-sm text-muted-foreground">
+								Add monitoring machines in Settings to see Grafana drill-down
+								links.
+							</div>
+							<Button variant="outline" size="sm" asChild>
+								<Link to="/settings">Open Settings</Link>
+							</Button>
+						</div>
+					)}
+				</CardContent>
+			</Card>
+		</div>
+	);
+}

frontend/src/pages/service-tabs/MediaTab.tsx

@@ -1,5 +1,13 @@
+/**
+ * MediaTab — operational content for the Jellyfin service page.
+ *
+ * Lifted from the old top-level `pages/Media.tsx`. The service-id source is
+ * changed from URL search params to the `instance` prop (the active service
+ * instance selected on the service page). The service-selection dropdown and
+ * its URL-sync effect are removed; everything else is preserved verbatim.
+ */
 import { useEffect, useMemo, useState } from "react";
-import { useNavigate, useSearchParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import type {
 	ColumnDef,
 	OnChangeFn,
@@ -34,12 +42,14 @@ import {
 	useBuildIndex,
 	useStopBuildIndex,
 	useForceStopBuildIndex,
-} from "../hooks/useMedia";
+} from "../../hooks/useMedia";
-import { usePersistentState } from "../hooks/usePersistentState";
+import { usePersistentState } from "../../hooks/usePersistentState";
-import { useIsMobile } from "../hooks/useIsMobile";
+import { useIsMobile } from "../../hooks/useIsMobile";
-import type { MediaItem } from "../types";
+import type { MediaItem, ServiceInstance } from "../../types";
-import { useServiceInstances } from "../hooks/useServices";
+import { useCounts, useLibraries } from "../../hooks/useDashboard";
-import { useCounts, useLibraries } from "../hooks/useDashboard";
+import { useServiceInstances } from "../../hooks/useServices";
+
+// --- Format helpers (lifted verbatim from Media.tsx) ---
 
 function formatDuration(seconds: number | null | undefined): string {
 	if (seconds == null || Number.isNaN(seconds)) return "-";
@@ -52,10 +62,8 @@ function formatDuration(seconds: number | null | undefined): string {
 	return `${secs}s`;
 }
 
-// Design §3.2 + §3.4: the 15 locked media columns. Module-level constant so the
+// --- Column definitions (lifted verbatim) ---
-// TanStack table instance stays stable — an unstable columns array drops the
+
-// controlled selection/visibility state (7a discovery). Visibility-only parity
-// (design §3.3): NO sorting, NO sizing/resizing is wired anywhere.
 const mediaColumns: ColumnDef<MediaItem>[] = [
 	{ accessorKey: "title", header: "Title" },
 	{ accessorKey: "series", header: "Series" },
@@ -74,25 +82,15 @@ const mediaColumns: ColumnDef<MediaItem>[] = [
 	{ accessorKey: "path", header: "Path" },
 ];
 
-// Stable path-derived identity so row selection survives server-driven paging
-// (design §3.4): the id is the item's filesystem path, which is stable across
-// limit/offset page changes.
 function getMediaRowId(row: MediaItem): string {
 	return row.path;
 }
 
-// Mobile card fields (spec R3.2): the card picks the 3-5 most important fields.
+// Mobile card fields (mobile-parity pattern): title primary + 4 key fields.
-// Title is the primary identifier; size/HDR/library/year give the at-a-glance
-// tech + context info a user scanning the library on a phone needs. Runtime,
-// bitrate, resolution, codec etc. live on the desktop table only.
 const mediaCardFields: MobileCardField<MediaItem>[] = [
 	{ key: "title", label: "Title", render: (r) => r.title, primary: true },
 	{ key: "size", label: "Size", render: (r) => r.size || "-" },
-	{
+	{ key: "hdr", label: "HDR", render: (r) => r.hdr || "-" },
-		key: "hdr",
-		label: "HDR",
-		render: (r) => r.hdr || "-",
-	},
 	{ key: "library", label: "Library", render: (r) => r.library || "-" },
 	{
 		key: "year",
@@ -101,12 +99,10 @@ const mediaCardFields: MobileCardField<MediaItem>[] = [
 	},
 ];
 
-// Mobile pagination uses the shared TablePagination component
+// --- Persistent filter/sort/pagination state (lifted verbatim) ---
-// (frontend/src/components/ui/table-pagination.tsx).
 
 const MEDIA_TAB_STATE_KEY = "manage.media.tabState";
 const SMALL_BREAKPOINT = "(max-width: 900px)";
-// Mirrors the pre-rework DataGrid `columnVisibilityModel` mobile override.
 const MOBILE_HIDDEN_COLUMNS = [
 	"series",
 	"season",
@@ -159,6 +155,8 @@ function usePrefersSmallScreen(): boolean {
 	return small;
 }
 
+// --- Small UI helpers (lifted verbatim) ---
+
 function FilterSelect({
 	id,
 	label,
@@ -191,9 +189,6 @@ function FilterSelect({
 	);
 }
 
-// LinearProgress → Progress: determinate value drives the shadcn Progress; the
-// indeterminate (null) case renders a pulsing bar, preserving the pre-rework
-// "indeterminate" affordance for unknown build progress.
 function BuildProgress({ value }: { value: number | null }) {
 	if (value == null) {
 		return (
@@ -203,31 +198,26 @@ function BuildProgress({ value }: { value: number | null }) {
 	return <Progress value={Math.max(0, Math.min(100, value * 100))} />;
 }
 
-export function Media() {
+// --- Component ---
+
+export function MediaTab({ instance }: { instance: ServiceInstance }) {
 	const navigate = useNavigate();
-	const [searchParams, setSearchParams] = useSearchParams();
+	const { data: sshServices = [] } = useServiceInstances("ssh_tasks");
 	const isSmall = usePrefersSmallScreen();
 	const isMobile = useIsMobile();
-	const { data: jellyfinServices = [] } = useServiceInstances("jellyfin");
+	const serviceId = instance.id;
-	const selectedServiceId =
+
-		searchParams.get("jellyfin_service_id") ||
+	const { data: counts } = useCounts(serviceId);
-		jellyfinServices.find((s) => s.enabled)?.id ||
+	const { data: libraries } = useLibraries(serviceId);
-		"";
+	const { data: status } = useMediaStatus(serviceId);
-	const { data: counts } = useCounts(selectedServiceId || undefined);
+	const buildIndex = useBuildIndex(serviceId);
-	const { data: libraries } = useLibraries(selectedServiceId || undefined);
+	const stopBuildIndex = useStopBuildIndex(serviceId);
-	const { data: status } = useMediaStatus(selectedServiceId || undefined);
+	const forceStopBuildIndex = useForceStopBuildIndex(serviceId);
-	const buildIndex = useBuildIndex(selectedServiceId || undefined);
-	const stopBuildIndex = useStopBuildIndex(selectedServiceId || undefined);
-	const forceStopBuildIndex = useForceStopBuildIndex(
-		selectedServiceId || undefined,
-	);
 
 	const [rawMediaState, setMediaState] = usePersistentState<MediaTabState>(
 		MEDIA_TAB_STATE_KEY,
 		defaultMediaTabState,
 	);
-	// Backward-compat: merge defaults so older persisted state (pre-7b shape,
-	// without pageSize/columnVisibility) never yields undefined fields.
 	const mediaState: MediaTabState = {
 		...defaultMediaTabState(),
 		...rawMediaState,
@@ -239,19 +229,6 @@ export function Media() {
 
 	const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
 
-	useEffect(() => {
-		if (!searchParams.get("jellyfin_service_id") && selectedServiceId) {
-			setSearchParams(
-				(current) => {
-					const next = new URLSearchParams(current);
-					next.set("jellyfin_service_id", selectedServiceId);
-					return next;
-				},
-				{ replace: true },
-			);
-		}
-	}, [searchParams, selectedServiceId, setSearchParams]);
-
 	const { data: queryResult, isLoading } = useMediaDataQuery({
 		types,
 		search,
@@ -260,12 +237,10 @@ export function Media() {
 		sort_order: sortOrder,
 		limit: pageSize,
 		offset,
-		jellyfinServiceId: selectedServiceId || undefined,
+		jellyfinServiceId: serviceId,
 		enabled: status?.exists ?? false,
 	});
 
-	// Server-driven pagination (design §3.4): pageIndex/pageSize lift into the
-	// persistent media state and drive useMediaQuery { limit, offset }.
 	const pageIndex = Math.floor(offset / pageSize);
 	const pagination: PaginationState = { pageIndex, pageSize };
 
@@ -275,8 +250,6 @@ export function Media() {
 				? updater({ pageIndex, pageSize })
 				: updater;
 		const nextPageSize = next.pageSize || pageSize;
-		// Restart at page 0 whenever the page size changes (keeps offset sane
-		// under server-driven paging).
 		const nextOffset =
 			nextPageSize !== pageSize ? 0 : next.pageIndex * nextPageSize;
 		setMediaState((current) => ({
@@ -296,9 +269,6 @@ export function Media() {
 		});
 	};
 
-	// On small screens force the same set of columns hidden as the pre-rework
-	// DataGrid `columnVisibilityModel` mobile override; on desktop the user
-	// toggles freely (the toggleable set still equals the locked 15).
 	const effectiveColumnVisibility = useMemo(() => {
 		const base = mediaState.columnVisibility ?? {};
 		if (!isSmall) return base;
@@ -307,10 +277,15 @@ export function Media() {
 		return merged;
 	}, [mediaState.columnVisibility, isSmall]);
 
-	// Preserved exactly from the DataGrid onRowClick: opens the file browser at
-	// the item's path.
 	const handleRowClick = (row: MediaItem) => {
-		navigate(`/files?path=${encodeURIComponent(row.path)}`);
+		// Navigate to the ssh_tasks service page with the path query param.
+		// If an ssh_tasks instance exists, open its Files tab; otherwise land
+		// on the ssh_tasks type page (empty state / ServiceTypePage resolver).
+		const sshInstance = sshServices.find((s) => s.enabled);
+		const base = sshInstance
+			? `/services/ssh_tasks/${sshInstance.id}`
+			: "/services/ssh_tasks";
+		navigate(`${base}?path=${encodeURIComponent(row.path)}`);
 	};
 
 	const total = queryResult?.total ?? 0;
@@ -346,35 +321,6 @@ export function Media() {
 	return (
 		<div className="flex flex-col gap-4">
 			<div className="flex flex-row flex-wrap items-center gap-2">
-				<h2 className="text-lg font-semibold">Jellyfin</h2>
-				<div className="flex flex-col gap-1.5">
-					<Label htmlFor="media-service">Service</Label>
-					<Select
-						value={selectedServiceId}
-						onValueChange={(value) =>
-							setSearchParams(
-								(current) => {
-									const next = new URLSearchParams(current);
-									next.set("jellyfin_service_id", value);
-									return next;
-								},
-								{ replace: true },
-							)
-						}
-					>
-						<SelectTrigger id="media-service" className="w-full md:w-[220px]">
-							<SelectValue placeholder="Select a service" />
-						</SelectTrigger>
-						<SelectContent>
-							{jellyfinServices.map((service) => (
-								<SelectItem key={service.id} value={service.id}>
-									{service.name}
-								</SelectItem>
-							))}
-						</SelectContent>
-					</Select>
-				</div>
-
 				{status?.exists ? (
 					<p className="text-sm text-muted-foreground">
 						Index: {status.item_count.toLocaleString()} items
@@ -397,7 +343,7 @@ export function Media() {
 					</p>
 				)}
 
-				<Button className="mobile-touch-target"
+				<Button
 					variant="outline"
 					onClick={() => buildIndex.mutate()}
 					disabled={
@@ -406,9 +352,14 @@ export function Media() {
 				>
 					{buildIndex.isPending || buildRunning ? "Building..." : "Build index"}
 				</Button>
+				{buildIndex.isError ? (
+					<span className="text-sm text-destructive">
+						Build failed: {buildIndex.error instanceof Error ? buildIndex.error.message : "Unknown error"}
+					</span>
+				) : null}
 				{buildRunning && (
 					<>
-						<Button className="mobile-touch-target"
+						<Button
 							variant="destructive"
 							onClick={() => stopBuildIndex.mutate()}
 							disabled={stopBuildIndex.isPending || buildCancelRequested}
@@ -419,7 +370,7 @@ export function Media() {
 						</Button>
 						<Button
 							variant="outline"
-							className="border-chart-3/40 text-chart-3 hover:bg-chart-3/10 mobile-touch-target"
+							className="border-chart-3/40 text-chart-3 hover:bg-chart-3/10"
 							onClick={() => forceStopBuildIndex.mutate()}
 							disabled={forceStopBuildIndex.isPending}
 						>

frontend/src/pages/service-tabs/MessagingTab.tsx

@@ -0,0 +1,129 @@
+/** MessagingTab — compose email to Authentik users via the mail queue. */
+import { useState } from "react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Textarea } from "@/components/ui/textarea";
+import {
+	useAuthentikUsers,
+	useSendAuthentikMessage,
+} from "../../hooks/useAuthentik";
+import type { ServiceInstance } from "../../types";
+
+const DEFAULT_BODY = "<p>Hello,</p><p> </p><p>Best,<br />Manage</p>";
+
+export function MessagingTab({ instance }: { instance: ServiceInstance }) {
+	const [search, setSearch] = useState("");
+	const [selectedEmails, setSelectedEmails] = useState<Set<string>>(new Set());
+	const [subject, setSubject] = useState("");
+	const [htmlBody, setHtmlBody] = useState(DEFAULT_BODY);
+
+	const { data } = useAuthentikUsers(instance.id, {
+		search,
+		page: 1,
+		page_size: 100,
+	});
+	const sendMessage = useSendAuthentikMessage(instance.id);
+
+	const users = (data?.items ?? []).filter((u) => u.email);
+	const error = data?.error;
+
+	function toggleEmail(email: string) {
+		setSelectedEmails((prev) => {
+			const next = new Set(prev);
+			if (next.has(email)) next.delete(email);
+			else next.add(email);
+			return next;
+		});
+	}
+
+	function handleSend() {
+		if (!subject.trim() || selectedEmails.size === 0) return;
+		sendMessage.mutate({
+			recipient_emails: Array.from(selectedEmails),
+			subject: subject.trim(),
+			html_body: htmlBody,
+		});
+	}
+
+	const canSend =
+		subject.trim() !== "" && selectedEmails.size > 0 && !sendMessage.isPending;
+
+	return (
+		<div className="flex flex-col gap-4">
+			{error ? (
+				<Alert variant="destructive">
+					<AlertDescription>{error}</AlertDescription>
+				</Alert>
+			) : null}
+
+			{sendMessage.data ? (
+				<Alert>
+					<AlertDescription>
+						{sendMessage.data.status === "queued"
+							? `Message queued (${sendMessage.data.recipient_count ?? 0} recipients, request ${sendMessage.data.request_id?.slice(0, 8) ?? ""}).`
+							: `Error: ${sendMessage.data.error ?? "unknown"}`}
+					</AlertDescription>
+				</Alert>
+			) : null}
+
+			<div className="flex flex-col gap-2">
+				<Label htmlFor="msg-search">Find recipients</Label>
+				<Input
+					id="msg-search"
+					placeholder="Search users to add as recipients…"
+					value={search}
+					onChange={(e) => setSearch(e.target.value)}
+					className="max-w-md"
+				/>
+				{users.length > 0 ? (
+					<div className="flex flex-wrap gap-2">
+						{users.slice(0, 20).map((user) => (
+							<Button
+								key={user.pk}
+								variant={selectedEmails.has(user.email) ? "default" : "outline"}
+								size="sm"
+								onClick={() => toggleEmail(user.email)}
+							>
+								{user.name || user.username}
+							</Button>
+						))}
+					</div>
+				) : null}
+				{selectedEmails.size > 0 ? (
+					<p className="text-sm text-muted-foreground">
+						{selectedEmails.size} recipient
+						{selectedEmails.size === 1 ? "" : "s"} selected.
+					</p>
+				) : null}
+			</div>
+
+			<div className="flex flex-col gap-2">
+				<Label htmlFor="msg-subject">Subject</Label>
+				<Input
+					id="msg-subject"
+					value={subject}
+					onChange={(e) => setSubject(e.target.value)}
+				/>
+			</div>
+
+			<div className="flex flex-col gap-2">
+				<Label htmlFor="msg-body">Message (HTML)</Label>
+				<Textarea
+					id="msg-body"
+					rows={8}
+					value={htmlBody}
+					onChange={(e) => setHtmlBody(e.target.value)}
+					className="font-mono text-xs"
+				/>
+			</div>
+
+			<div>
+				<Button onClick={handleSend} disabled={!canSend}>
+					{sendMessage.isPending ? "Sending…" : "Send message"}
+				</Button>
+			</div>
+		</div>
+	);
+}

frontend/src/pages/service-tabs/MetricsTab.tsx

@@ -0,0 +1,117 @@
+/**
+ * Prometheus Metrics tab (spec R2.4, R8.2).
+ *
+ * Lifts the Prometheus status + targets content from the old cross-service
+ * ObservabilityPage into an instance-scoped tab. Shows service health and
+ * the Node Exporter scrape-targets list.
+ *
+ * The hooks (usePrometheusStatus, usePrometheusTargets) are global /
+ * first-configured for now. Wiring `instance.id` is a follow-up.
+ */
+import { Radio } from "lucide-react";
+import {
+	usePrometheusStatus,
+	usePrometheusTargets,
+} from "../../hooks/useObservability";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Skeleton } from "@/components/ui/skeleton";
+import type { PrometheusTarget, ServiceInstance } from "../../types";
+
+function TargetsTable({ targets }: { targets: PrometheusTarget[] }) {
+	return (
+		<div className="space-y-3">
+			{targets.map((target, idx) => (
+				<div key={idx} className="rounded-lg border p-3">
+					<div className="font-mono text-sm">{target.targets.join(", ")}</div>
+					{target.labels && Object.keys(target.labels).length > 0 && (
+						<div className="mt-2 flex flex-wrap gap-1">
+							{Object.entries(target.labels).map(([key, value]) => (
+								<Badge key={key} variant="outline" className="text-[10px]">
+									{key}: {value}
+								</Badge>
+							))}
+						</div>
+					)}
+				</div>
+			))}
+		</div>
+	);
+}
+
+export function MetricsTab({ instance }: { instance: ServiceInstance }) {
+	// Global / first-configured hooks for now; instance.id scoping is a
+	// follow-up (see file docstring).
+	void instance;
+
+	const {
+		data: status,
+		isLoading: statusLoading,
+		error: statusError,
+	} = usePrometheusStatus();
+	const {
+		data: targets,
+		isLoading: targetsLoading,
+		error: targetsError,
+	} = usePrometheusTargets();
+
+	const statusDetail = status?.up
+		? status.version
+			? `version ${status.version}`
+			: "reachable"
+		: statusLoading
+			? "checking…"
+			: "unreachable";
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-center gap-2 text-sm text-muted-foreground">
+				<Radio className="h-4 w-4" />
+				Prometheus {statusDetail}
+			</div>
+
+			{statusError && (
+				<Alert variant="destructive">
+					<AlertTitle>Failed to reach Prometheus</AlertTitle>
+					<AlertDescription>{statusError.message}</AlertDescription>
+				</Alert>
+			)}
+
+			<Card>
+				<CardHeader>
+					<CardTitle className="flex items-center gap-2">
+						<Radio className="h-4 w-4" />
+						Node Exporter Targets ({targets?.length ?? 0})
+					</CardTitle>
+				</CardHeader>
+				<CardContent>
+					{targetsLoading ? (
+						<div className="space-y-2">
+							<Skeleton className="h-16 w-full" />
+							<Skeleton className="h-16 w-full" />
+						</div>
+					) : !targets || targets.length === 0 ? (
+						<div className="flex h-full min-h-[160px] flex-col items-center justify-center gap-2 rounded-md border p-6 text-center">
+							<Radio className="h-8 w-8 text-muted-foreground" />
+							<div className="font-medium">No Node Exporter targets</div>
+							<div className="max-w-md text-sm text-muted-foreground">
+								Enable Node Exporter on an SSH machine in Settings to populate
+								Prometheus scrape targets.
+							</div>
+						</div>
+					) : (
+						<TargetsTable targets={targets} />
+					)}
+				</CardContent>
+			</Card>
+
+			{targetsError && (
+				<Alert variant="destructive">
+					<AlertTitle>Failed to load targets</AlertTitle>
+					<AlertDescription>{targetsError.message}</AlertDescription>
+				</Alert>
+			)}
+		</div>
+	);
+}

frontend/src/pages/service-tabs/OverviewTab.tsx

@@ -0,0 +1,91 @@
+/**
+ * Configurable per-service Overview tab.
+ *
+ * Each service instance manages its own set of widgets on this tab. The
+ * widget system is reused from the main Dashboard: widget instances with
+ * a `service_id` matching this instance are fetched and rendered in a
+ * responsive grid. An edit button opens the WidgetConfigDialog (same one
+ * the Dashboard uses) for add/remove/reorder/enable/disable.
+ */
+import { useMemo, useState } from "react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
+import { Settings2 } from "lucide-react";
+import { useWidgetInstances } from "../../hooks/useWidgets";
+import { WidgetInstanceCard } from "../../components/WidgetInstance";
+import { WidgetConfigDialog } from "../../components/WidgetConfigDialog";
+import type { ServiceInstance } from "../../types";
+
+export function OverviewTab({ instance }: { instance: ServiceInstance }) {
+	const { data: widgets = [] } = useWidgetInstances(instance.id);
+	const [configOpen, setConfigOpen] = useState(false);
+	const [editWidgetId, setEditWidgetId] = useState<string | undefined>();
+
+	const visibleWidgets = useMemo(
+		() =>
+			widgets
+				.filter((w) => w.enabled)
+				.sort((a, b) => a.sort_order - b.sort_order),
+		[widgets],
+	);
+
+	return (
+		<div className="flex flex-col gap-4">
+			<div className="flex items-center justify-between">
+				<h3 className="text-sm font-semibold text-muted-foreground">
+					{instance.name} overview
+				</h3>
+				<Button
+					variant="outline"
+					size="sm"
+					className="mobile-touch-target"
+					onClick={() => setConfigOpen(true)}
+				>
+					<Settings2 className="size-4" />
+					Edit widgets
+				</Button>
+			</div>
+
+			{visibleWidgets.length > 0 ? (
+				<div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+					{visibleWidgets.map((widget) => (
+						<WidgetInstanceCard
+							key={widget.id}
+							widget={widget}
+							onEdit={(id) => {
+								setEditWidgetId(id);
+								setConfigOpen(true);
+							}}
+						/>
+					))}
+				</div>
+			) : (
+				<Alert>
+					<AlertDescription className="flex flex-col gap-3">
+						<span>
+							No widgets on this overview yet. Add widgets to show key metrics
+							and information for {instance.name}.
+						</span>
+						<Button
+							size="sm"
+							className="w-fit mobile-touch-target"
+							onClick={() => setConfigOpen(true)}
+						>
+							Add widgets
+						</Button>
+					</AlertDescription>
+				</Alert>
+			)}
+
+			<WidgetConfigDialog
+				open={configOpen}
+				onClose={() => {
+					setConfigOpen(false);
+					setEditWidgetId(undefined);
+				}}
+				serviceId={instance.id}
+				editWidgetId={editWidgetId}
+			/>
+		</div>
+	);
+}

frontend/src/pages/service-tabs/RequestsTab.tsx

@@ -0,0 +1,64 @@
+/**
+ * RequestsTab — Jellyseerr request-management surface on the Jellyfin page.
+ *
+ * Jellyseerr was absorbed into Jellyfin config (jellyseerr_url +
+ * jellyseerr_api_key) in Slice 1. This tab reads those config fields. When
+ * configured, it shows the URL and a placeholder (no requests backend endpoint
+ * exists yet — building one is out of scope for this slice). When not
+ * configured, it shows an empty-state CTA directing the user to add the fields
+ * to the Jellyfin config.
+ */
+import type { ServiceInstance } from "../../types";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { ExternalLink } from "lucide-react";
+
+export function RequestsTab({ instance }: { instance: ServiceInstance }) {
+	const jellyseerrUrl = String(
+		(instance.config as Record<string, unknown>).jellyseerr_url ?? "",
+	).trim();
+	const jellyseerrApiKey = String(
+		(instance.config as Record<string, unknown>).jellyseerr_api_key ?? "",
+	).trim();
+
+	if (!jellyseerrUrl || !jellyseerrApiKey) {
+		return (
+			<Alert>
+				<AlertDescription>
+					Jellyseerr is not configured for this Jellyfin instance. Add
+					<code className="mx-1 rounded bg-muted px-1 py-0.5 text-xs">
+						jellyseerr_url
+					</code>
+					and
+					<code className="mx-1 rounded bg-muted px-1 py-0.5 text-xs">
+						jellyseerr_api_key
+					</code>
+					to the Jellyfin config (Config tab) to enable request management.
+				</AlertDescription>
+			</Alert>
+		);
+	}
+
+	return (
+		<div className="flex flex-col gap-4">
+			<div className="flex items-center gap-2">
+				<h3 className="text-sm font-semibold">Jellyseerr</h3>
+				<a
+					href={jellyseerrUrl}
+					target="_blank"
+					rel="noopener noreferrer"
+					className="inline-flex items-center gap-1 text-sm text-primary hover:underline"
+				>
+					{jellyseerrUrl}
+					<ExternalLink className="size-3.5" />
+				</a>
+			</div>
+			<Alert>
+				<AlertDescription>
+					Jellyseerr is configured. The requests view will show pending and
+					recently fulfilled media requests. (This surface is under
+					development.)
+				</AlertDescription>
+			</Alert>
+		</div>
+	);
+}

frontend/src/pages/service-tabs/UsersTab.tsx

@@ -0,0 +1,136 @@
+/** UsersTab — Authentik user directory for the Authentik service page. */
+import { useState } from "react";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table";
+import type { ServiceInstance } from "../../types";
+import { useAuthentikUsers } from "../../hooks/useAuthentik";
+
+const PAGE_SIZE = 25;
+
+export function UsersTab({ instance }: { instance: ServiceInstance }) {
+	const [search, setSearch] = useState("");
+	const [page, setPage] = useState(1);
+	const [committedSearch, setCommittedSearch] = useState("");
+
+	const { data, isLoading } = useAuthentikUsers(instance.id, {
+		search: committedSearch,
+		page,
+		page_size: PAGE_SIZE,
+	});
+
+	const error = data?.error;
+	const users = data?.items ?? [];
+	const total = data?.total ?? 0;
+	const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE));
+
+	function handleSearch() {
+		setPage(1);
+		setCommittedSearch(search);
+	}
+
+	return (
+		<div className="flex flex-col gap-3">
+			{error ? (
+				<Alert variant="destructive">
+					<AlertDescription>{error}</AlertDescription>
+				</Alert>
+			) : null}
+
+			<div className="flex items-center gap-2">
+				<Input
+					placeholder="Search users…"
+					value={search}
+					onChange={(e) => setSearch(e.target.value)}
+					onKeyDown={(e) => {
+						if (e.key === "Enter") handleSearch();
+					}}
+					className="max-w-xs"
+				/>
+				<Button variant="outline" onClick={handleSearch}>
+					Search
+				</Button>
+			</div>
+
+			<div className="rounded-lg border">
+				<Table>
+					<TableHeader>
+						<TableRow>
+							<TableHead>Name</TableHead>
+							<TableHead>Username</TableHead>
+							<TableHead>Email</TableHead>
+							<TableHead className="w-24">Status</TableHead>
+						</TableRow>
+					</TableHeader>
+					<TableBody>
+						{isLoading && users.length === 0 ? (
+							<TableRow>
+								<TableCell colSpan={4} className="text-muted-foreground">
+									Loading…
+								</TableCell>
+							</TableRow>
+						) : users.length === 0 ? (
+							<TableRow>
+								<TableCell colSpan={4} className="text-muted-foreground">
+									No users found.
+								</TableCell>
+							</TableRow>
+						) : (
+							users.map((user) => (
+								<TableRow key={user.pk}>
+									<TableCell className="font-medium">
+										{user.name || "—"}
+									</TableCell>
+									<TableCell>{user.username}</TableCell>
+									<TableCell className="text-muted-foreground">
+										{user.email || "—"}
+									</TableCell>
+									<TableCell>
+										<Badge variant={user.is_active ? "default" : "secondary"}>
+											{user.is_active ? "Active" : "Inactive"}
+										</Badge>
+									</TableCell>
+								</TableRow>
+							))
+						)}
+					</TableBody>
+				</Table>
+			</div>
+
+			{total > 0 ? (
+				<div className="flex items-center justify-between text-sm text-muted-foreground">
+					<span>
+						{total} user{total === 1 ? "" : "s"} · Page {page} of {totalPages}
+					</span>
+					<div className="flex gap-1">
+						<Button
+							variant="outline"
+							size="sm"
+							onClick={() => setPage((p) => Math.max(1, p - 1))}
+							disabled={page <= 1}
+						>
+							Previous
+						</Button>
+						<Button
+							variant="outline"
+							size="sm"
+							onClick={() => setPage((p) => Math.min(totalPages, p + 1))}
+							disabled={page >= totalPages}
+						>
+							Next
+						</Button>
+					</div>
+				</div>
+			) : null}
+		</div>
+	);
+}

frontend/src/pages/service-tabs/__tests__/ActionsTab.test.tsx

@@ -0,0 +1,59 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
+import { ActionsTab } from "../ActionsTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "ssh-1",
+	service_type: "ssh_tasks",
+	name: "Storage Server",
+	config: {},
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useSettings", () => ({
+	useTasks: () => ({
+		data: [
+			{
+				id: "t1",
+				name: "Disk usage",
+				task_type: "shell",
+				content: "df -h",
+				enabled: true,
+				default_service_id: "",
+				notes: "",
+			},
+		],
+	}),
+	useTaskRuns: () => ({ data: { items: [] } }),
+	useSaveTask: () => ({ mutateAsync: vi.fn(), isPending: false }),
+	useDeleteTask: () => ({ mutate: vi.fn(), isPending: false }),
+	useRunTask: () => ({ mutateAsync: vi.fn(), isPending: false }),
+}));
+
+function renderTab() {
+	return render(
+		<MemoryRouter>
+			<ActionsTab instance={instance} />
+		</MemoryRouter>,
+	);
+}
+
+describe("ActionsTab", () => {
+	it("renders the saved-actions rail and task detail", () => {
+		renderTab();
+		expect(screen.getByText("Saved actions")).toBeInTheDocument();
+		expect(screen.getByText("Disk usage")).toBeInTheDocument();
+	});
+
+	it("renders the Add action button", () => {
+		renderTab();
+		expect(
+			screen.getByRole("button", { name: "Add action" }),
+		).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/AlertsTab.test.tsx

@@ -0,0 +1,70 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { AlertsTab } from "../AlertsTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "am-1",
+	service_type: "alertmanager",
+	name: "Main Alertmanager",
+	config: { base_url: "https://am.example.com", timeout_seconds: 5 },
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useObservability", () => ({
+	useAlertmanagerAlerts: () => ({
+		data: {
+			total: 2,
+			by_severity: { critical: 1, warning: 1 },
+			alerts: [
+				{
+					name: "DiskFull",
+					severity: "critical",
+					category: "disk",
+					job_name: "node",
+					summary: "Disk is almost full",
+					description: "Disk usage above 90%",
+					active_since: "2026-06-26T10:00:00Z",
+					state: "firing",
+					labels: { instance: "node1" },
+				},
+				{
+					name: "HighCpu",
+					severity: "warning",
+					category: "cpu",
+					job_name: "node",
+					summary: "High CPU usage",
+					description: "",
+					active_since: "2026-06-26T09:00:00Z",
+					state: "firing",
+					labels: {},
+				},
+			],
+		},
+		isLoading: false,
+		error: null,
+	}),
+	useAlertmanagerStatus: () => ({
+		data: { up: true, version: "0.27.0", uptime: "", name: "", peers: [] },
+		isLoading: false,
+		error: null,
+	}),
+}));
+
+describe("AlertsTab", () => {
+	it("renders the alert count and alert names", () => {
+		render(<AlertsTab instance={instance} />);
+		expect(screen.getByText(/Active Alerts \(2\)/)).toBeInTheDocument();
+		expect(screen.getByText("DiskFull")).toBeInTheDocument();
+		expect(screen.getByText("HighCpu")).toBeInTheDocument();
+	});
+
+	it("renders severity badges", () => {
+		render(<AlertsTab instance={instance} />);
+		expect(screen.getByText("critical")).toBeInTheDocument();
+		expect(screen.getByText("warning")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/FilesTab.test.tsx

@@ -0,0 +1,63 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
+import { FilesTab } from "../FilesTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "ssh-1",
+	service_type: "ssh_tasks",
+	name: "Storage Server",
+	config: {},
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useFiles", () => ({
+	useDirectoryListing: () => ({
+		data: {
+			count: 2,
+			entries: [
+				{ name: "movies", type: "d", size: 0, mtime: 1700000000 },
+				{ name: "video.mkv", type: "f", size: 1024, mtime: 1700000000 },
+			],
+		},
+		isLoading: false,
+		error: null,
+		refetch: vi.fn(),
+	}),
+	useFfprobe: () => ({ data: undefined, isLoading: false, error: null }),
+	useJobTemplates: () => ({ data: [] }),
+	useRunJob: () => ({ mutate: vi.fn(), isPending: false, data: undefined }),
+}));
+
+vi.mock("../../../hooks/usePersistentState", () => ({
+	usePersistentState: vi.fn((_key: string, initial: () => unknown) => [
+		initial(),
+		vi.fn(),
+	]),
+}));
+
+function renderTab(path = "/services/ssh_tasks/ssh-1") {
+	return render(
+		<MemoryRouter initialEntries={[path]}>
+			<FilesTab instance={instance} />
+		</MemoryRouter>,
+	);
+}
+
+describe("FilesTab", () => {
+	it("renders the directory listing with instance-scoped hooks", () => {
+		renderTab();
+		expect(screen.getByText("movies")).toBeInTheDocument();
+		expect(screen.getByText("video.mkv")).toBeInTheDocument();
+	});
+
+	it("renders the path bar and browser section", () => {
+		renderTab();
+		expect(screen.getByText("Browser")).toBeInTheDocument();
+		expect(screen.getByLabelText("Remote path")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/JobsTab.test.tsx

@@ -0,0 +1,58 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { JobsTab } from "../JobsTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "bkp-1",
+	service_type: "backups",
+	name: "Main Backups",
+	config: { ingestion_label: "default" },
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useBackups", () => ({
+	useBackupJobs: () => ({
+		data: [
+			{
+				id: "job-1",
+				name: "nightly",
+				source: "/data",
+				target: "s3://bucket",
+				schedule_interval_seconds: 86400,
+				created_at: 1_700_000_000,
+			},
+		],
+		isLoading: false,
+	}),
+	useBackupRuns: () => ({
+		data: [],
+		isLoading: false,
+	}),
+	useBackupAlerts: () => ({
+		data: [],
+		isLoading: false,
+	}),
+	useAcknowledgeAlert: () => ({ mutate: vi.fn() }),
+}));
+
+function renderTab() {
+	return render(<JobsTab instance={instance} />);
+}
+
+describe("JobsTab", () => {
+	it("renders the Jobs, Runs, and Alerts sub-tabs", () => {
+		renderTab();
+		expect(screen.getByRole("tab", { name: "Jobs" })).toBeInTheDocument();
+		expect(screen.getByRole("tab", { name: "Runs" })).toBeInTheDocument();
+		expect(screen.getByRole("tab", { name: /Alerts/ })).toBeInTheDocument();
+	});
+
+	it("renders the backup job name in the Jobs tab", () => {
+		renderTab();
+		expect(screen.getByText("nightly")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/LinksTab.test.tsx

@@ -0,0 +1,58 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { LinksTab } from "../LinksTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "graf-1",
+	service_type: "grafana",
+	name: "Main Grafana",
+	config: { base_url: "https://grafana.example.com", timeout_seconds: 5 },
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useObservability", () => ({
+	useGrafanaStatus: () => ({
+		data: {
+			up: true,
+			version: "11.0.0",
+			service_id: "graf-1",
+			name: "Main Grafana",
+		},
+		isLoading: false,
+		error: null,
+	}),
+	useMonitoringMachines: () => ({
+		data: [
+			{
+				id: "m1",
+				name: "storage",
+				mode: "ssh",
+				host: "10.0.0.5",
+				enabled: true,
+				services: [],
+				port: 22,
+				username: "admin",
+			},
+		],
+		isLoading: false,
+	}),
+}));
+
+describe("LinksTab", () => {
+	it("renders the Grafana version and machine dashboard links", () => {
+		render(<LinksTab instance={instance} />);
+		expect(screen.getByText(/version 11\.0\.0/)).toBeInTheDocument();
+		expect(screen.getByText(/storage metrics/)).toBeInTheDocument();
+		expect(screen.getByText(/storage logs/)).toBeInTheDocument();
+	});
+
+	it("renders open-in-grafana link buttons", () => {
+		render(<LinksTab instance={instance} />);
+		const links = screen.getAllByText("Open in Grafana");
+		expect(links).toHaveLength(2);
+	});
+});

frontend/src/pages/service-tabs/__tests__/MediaTab.test.tsx

@@ -0,0 +1,82 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MemoryRouter } from "react-router-dom";
+import { MediaTab } from "../MediaTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "jellyfin-1",
+	service_type: "jellyfin",
+	name: "Main Jellyfin",
+	config: { base_url: "https://jf.example.com", user_id: "u1" },
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useMedia", () => ({
+	useMediaStatus: () => ({
+		data: { exists: true, item_count: 42, updated_at_label: "today" },
+	}),
+	useMediaQuery: () => ({ data: { items: [], total: 0 }, isLoading: false }),
+	useBuildIndex: () => ({ mutate: vi.fn(), isPending: false }),
+	useStopBuildIndex: () => ({ mutate: vi.fn(), isPending: false }),
+	useForceStopBuildIndex: () => ({ mutate: vi.fn(), isPending: false }),
+}));
+
+vi.mock("../../../hooks/useDashboard", () => ({
+	useCounts: () => ({
+		data: { movies: 10, series: 5, episodes: 30 },
+	}),
+	useLibraries: () => ({ data: [{ id: "lib1" }] }),
+}));
+
+vi.mock("../../../hooks/useServices", () => ({
+	useServiceInstances: () => ({ data: [] }),
+}));
+
+vi.mock("../../../hooks/usePersistentState", () => ({
+	usePersistentState: () => [
+		{
+			search: "",
+			types: "Movie,Episode",
+			hdrFilter: "All",
+			sortKey: "title",
+			sortOrder: "Ascending",
+			offset: 0,
+			pageSize: 100,
+			columnVisibility: {},
+		},
+		vi.fn(),
+	],
+}));
+
+function renderTab() {
+	return render(
+		<MemoryRouter>
+			<MediaTab instance={instance} />
+		</MemoryRouter>,
+	);
+}
+
+describe("MediaTab", () => {
+	it("renders index status and build controls with instance-scoped data", () => {
+		renderTab();
+		expect(screen.getByText(/42 items/)).toBeInTheDocument();
+		expect(
+			screen.getByRole("button", { name: /Build index/i }),
+		).toBeInTheDocument();
+	});
+
+	it("renders library counts", () => {
+		renderTab();
+		expect(screen.getByText(/10 movies/)).toBeInTheDocument();
+		expect(screen.getByText(/5 series/)).toBeInTheDocument();
+	});
+
+	it("renders the filter card with search input", () => {
+		renderTab();
+		expect(screen.getByLabelText("Search")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/MessagingTab.test.tsx

@@ -0,0 +1,55 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MessagingTab } from "../MessagingTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "auth-1",
+	service_type: "authentik",
+	name: "Main Authentik",
+	config: { base_url: "https://auth.example.com", timeout_seconds: 10 },
+	secrets_set: { api_token: true },
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useAuthentik", () => ({
+	useAuthentikUsers: vi.fn(() => ({
+		data: {
+			items: [
+				{
+					pk: 1,
+					username: "alice",
+					name: "Alice",
+					email: "alice@example.com",
+					is_active: true,
+				},
+			],
+			total: 1,
+			page: 1,
+			page_size: 100,
+		},
+	})),
+	useSendAuthentikMessage: vi.fn(() => ({
+		mutate: vi.fn(),
+		isPending: false,
+		data: undefined,
+	})),
+}));
+
+describe("MessagingTab", () => {
+	it("renders the compose form (subject, body, send)", () => {
+		render(<MessagingTab instance={instance} />);
+		expect(screen.getByLabelText("Subject")).toBeInTheDocument();
+		expect(screen.getByLabelText("Message (HTML)")).toBeInTheDocument();
+		expect(
+			screen.getByRole("button", { name: "Send message" }),
+		).toBeInTheDocument();
+	});
+
+	it("renders recipient toggle buttons from the directory", () => {
+		render(<MessagingTab instance={instance} />);
+		expect(screen.getByText("Alice")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/MetricsTab.test.tsx

@@ -0,0 +1,51 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { MetricsTab } from "../MetricsTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "prom-1",
+	service_type: "prometheus",
+	name: "Main Prometheus",
+	config: { base_url: "https://prom.example.com", timeout_seconds: 10 },
+	secrets_set: {},
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useObservability", () => ({
+	usePrometheusStatus: () => ({
+		data: {
+			up: true,
+			version: "2.52.0",
+			service_id: "prom-1",
+			name: "Main Prometheus",
+		},
+		isLoading: false,
+		error: null,
+	}),
+	usePrometheusTargets: () => ({
+		data: [
+			{
+				targets: ["10.0.0.5:9100"],
+				labels: { instance: "storage", job: "node_exporter" },
+			},
+		],
+		isLoading: false,
+		error: null,
+	}),
+}));
+
+describe("MetricsTab", () => {
+	it("renders the Prometheus version and target list", () => {
+		render(<MetricsTab instance={instance} />);
+		expect(screen.getByText(/version 2\.52\.0/)).toBeInTheDocument();
+		expect(screen.getByText("10.0.0.5:9100")).toBeInTheDocument();
+	});
+
+	it("renders the target count in the heading", () => {
+		render(<MetricsTab instance={instance} />);
+		expect(screen.getByText(/Node Exporter Targets \(1\)/)).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/OverviewTab.test.tsx

@@ -0,0 +1,88 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { OverviewTab } from "../OverviewTab";
+import type { ServiceInstance } from "../../../types";
+
+// Default mock returns an empty list; individual tests override via
+// `vi.mocked()` to return widget data.
+vi.mock("../../../hooks/useWidgets", () => ({
+	useWidgetInstances: vi.fn(() => ({ data: [] })),
+}));
+
+vi.mock("../../../components/WidgetInstance", () => ({
+	WidgetInstanceCard: ({ widget }: { widget: { title: string } }) => (
+		<div data-testid="widget-card">{widget.title}</div>
+	),
+}));
+
+vi.mock("../../../components/WidgetConfigDialog", () => ({
+	WidgetConfigDialog: ({ open }: { open: boolean }) =>
+		open ? <div data-testid="config-dialog" /> : null,
+}));
+
+const { useWidgetInstances } = await import("../../../hooks/useWidgets");
+
+const instance: ServiceInstance = {
+	id: "svc-1",
+	service_type: "jellyfin",
+	name: "Main Jellyfin",
+	config: {},
+	secrets_set: {},
+	enabled: true,
+	created_at: 0,
+	updated_at: 0,
+};
+
+function mockWidgets(
+	widgets: { id: string; title: string; enabled: boolean }[],
+) {
+	vi.mocked(useWidgetInstances).mockReturnValue({
+		data: widgets.map((w, i) => ({
+			id: w.id,
+			service_id: "svc-1",
+			widget_kind: "activity",
+			title: w.title,
+			config: {},
+			enabled: w.enabled,
+			sort_order: i,
+			created_at: 0,
+			updated_at: 0,
+		})),
+	} as never);
+}
+
+describe("OverviewTab", () => {
+	it("renders enabled widgets in a grid and hides disabled ones", () => {
+		mockWidgets([
+			{ id: "w1", title: "Live Sessions", enabled: true },
+			{ id: "w2", title: "Disabled Widget", enabled: false },
+		]);
+		render(<OverviewTab instance={instance} />);
+		const cards = screen.getAllByTestId("widget-card");
+		expect(cards).toHaveLength(1);
+		expect(screen.getByText("Live Sessions")).toBeInTheDocument();
+		expect(screen.queryByText("Disabled Widget")).not.toBeInTheDocument();
+	});
+
+	it("shows an empty state with an add button when no widgets exist", () => {
+		mockWidgets([]);
+		render(<OverviewTab instance={instance} />);
+		expect(
+			screen.getByText(/No widgets on this overview/i),
+		).toBeInTheDocument();
+		expect(
+			screen.getByRole("button", { name: /Add widgets/i }),
+		).toBeInTheDocument();
+	});
+
+	it("opens the config dialog when Edit widgets is clicked", async () => {
+		mockWidgets([{ id: "w1", title: "Live", enabled: true }]);
+		render(<OverviewTab instance={instance} />);
+		expect(screen.queryByTestId("config-dialog")).not.toBeInTheDocument();
+		await userEvent.click(
+			screen.getByRole("button", { name: /Edit widgets/i }),
+		);
+		expect(screen.getByTestId("config-dialog")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/RequestsTab.test.tsx

@@ -0,0 +1,59 @@
+import { describe, it, expect } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { RequestsTab } from "../RequestsTab";
+import type { ServiceInstance } from "../../../types";
+
+function makeInstance(config: Record<string, unknown>): ServiceInstance {
+	return {
+		id: "jellyfin-1",
+		service_type: "jellyfin",
+		name: "Main Jellyfin",
+		config,
+		secrets_set: {},
+		enabled: true,
+		created_at: 1_700_000_000,
+		updated_at: 1_700_000_000,
+	};
+}
+
+describe("RequestsTab", () => {
+	it("shows empty-state CTA when Jellyseerr is not configured", () => {
+		render(
+			<RequestsTab
+				instance={makeInstance({
+					base_url: "https://jf.example.com",
+					user_id: "u1",
+				})}
+			/>,
+		);
+		expect(screen.getByText(/not configured/i)).toBeInTheDocument();
+		expect(screen.getByText(/jellyseerr_url/i)).toBeInTheDocument();
+	});
+
+	it("shows the configured Jellyseerr URL when both fields are set", () => {
+		render(
+			<RequestsTab
+				instance={makeInstance({
+					base_url: "https://jf.example.com",
+					jellyseerr_url: "https://requests.example.com",
+					jellyseerr_api_key: "secret-key",
+				})}
+			/>,
+		);
+		expect(
+			screen.getByText("https://requests.example.com"),
+		).toBeInTheDocument();
+		expect(screen.queryByText(/not configured/i)).not.toBeInTheDocument();
+	});
+
+	it("shows empty-state when only URL is set (missing api_key)", () => {
+		render(
+			<RequestsTab
+				instance={makeInstance({
+					jellyseerr_url: "https://requests.example.com",
+				})}
+			/>,
+		);
+		expect(screen.getByText(/not configured/i)).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/__tests__/UsersTab.test.tsx

@@ -0,0 +1,61 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { UsersTab } from "../UsersTab";
+import type { ServiceInstance } from "../../../types";
+
+const instance: ServiceInstance = {
+	id: "auth-1",
+	service_type: "authentik",
+	name: "Main Authentik",
+	config: { base_url: "https://auth.example.com", timeout_seconds: 10 },
+	secrets_set: { api_token: true },
+	enabled: true,
+	created_at: 1_700_000_000,
+	updated_at: 1_700_000_000,
+};
+
+vi.mock("../../../hooks/useAuthentik", () => ({
+	useAuthentikUsers: vi.fn(() => ({
+		data: {
+			items: [
+				{
+					pk: 1,
+					username: "alice",
+					name: "Alice",
+					email: "alice@example.com",
+					is_active: true,
+				},
+				{
+					pk: 2,
+					username: "bob",
+					name: "Bob",
+					email: "bob@example.com",
+					is_active: false,
+				},
+			],
+			total: 2,
+			page: 1,
+			page_size: 25,
+		},
+		isLoading: false,
+	})),
+}));
+
+describe("UsersTab", () => {
+	it("renders the directory table with users", () => {
+		render(<UsersTab instance={instance} />);
+		expect(screen.getByText("Alice")).toBeInTheDocument();
+		expect(screen.getByText("bob")).toBeInTheDocument();
+		expect(screen.getByText("alice@example.com")).toBeInTheDocument();
+		expect(screen.getByText("Active")).toBeInTheDocument();
+		expect(screen.getByText("Inactive")).toBeInTheDocument();
+	});
+
+	it("renders search input and pagination", () => {
+		render(<UsersTab instance={instance} />);
+		expect(screen.getByPlaceholderText("Search users…")).toBeInTheDocument();
+		expect(screen.getByText(/2 users/)).toBeInTheDocument();
+		expect(screen.getByText("Previous")).toBeInTheDocument();
+		expect(screen.getByText("Next")).toBeInTheDocument();
+	});
+});

frontend/src/pages/service-tabs/index.ts

@@ -0,0 +1,66 @@
+/**
+ * Per-type content-tab descriptors for the service page skeleton.
+ *
+ * Each entry names a tab and its component. The service page renders
+ * `[Overview, ...contentTabs(type), Widgets, Config]`.
+ */
+import type { ComponentType } from "react";
+import type { ServiceInstance } from "../../types";
+import { OverviewTab } from "./OverviewTab";
+import { AlertsTab } from "./AlertsTab";
+import { LinksTab } from "./LinksTab";
+import { MetricsTab } from "./MetricsTab";
+import { MediaTab } from "./MediaTab";
+import { RequestsTab } from "./RequestsTab";
+import { FilesTab } from "./FilesTab";
+import { ActionsTab } from "./ActionsTab";
+import { JobsTab } from "./JobsTab";
+import { UsersTab } from "./UsersTab";
+import { MessagingTab } from "./MessagingTab";
+
+export type ServiceTabComponent = ComponentType<{ instance: ServiceInstance }>;
+
+export interface ContentTab {
+	label: string;
+	Component: ServiceTabComponent;
+}
+
+/** Overview tab (shared across all service types). */
+export const OVERVIEW_TAB: ContentTab = {
+	label: "Overview",
+	Component: OverviewTab,
+};
+
+/**
+ * Returns the type-specific content tabs for a service type.
+ * Types with no operational content return `[]` (only Overview + Widgets + Config).
+ */
+export function serviceContentTabs(serviceType: string): ContentTab[] {
+	switch (serviceType) {
+		case "jellyfin":
+			return [
+				{ label: "Media", Component: MediaTab },
+				{ label: "Requests", Component: RequestsTab },
+			];
+		case "ssh_tasks":
+			return [
+				{ label: "Files", Component: FilesTab },
+				{ label: "Actions", Component: ActionsTab },
+			];
+		case "backups":
+			return [{ label: "Jobs", Component: JobsTab }];
+		case "authentik":
+			return [
+				{ label: "Users", Component: UsersTab },
+				{ label: "Messaging", Component: MessagingTab },
+			];
+		case "alertmanager":
+			return [{ label: "Alerts", Component: AlertsTab }];
+		case "grafana":
+			return [{ label: "Links", Component: LinksTab }];
+		case "prometheus":
+			return [{ label: "Metrics", Component: MetricsTab }];
+		default:
+			return [];
+	}
+}

frontend/src/widgets/GrafanaChartWidget.tsx

@@ -0,0 +1,120 @@
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Skeleton } from "@/components/ui/skeleton";
+import { SectionCard } from "../components/SectionCard";
+import { useWidgetData } from "../hooks/useWidgets";
+import type { WidgetInstance } from "../types";
+import {
+	LineChart,
+	Line,
+	XAxis,
+	YAxis,
+	CartesianGrid,
+	Tooltip,
+	ResponsiveContainer,
+} from "recharts";
+
+interface Props {
+	widget: WidgetInstance;
+	refreshIntervalMs: number;
+	description?: string;
+}
+
+interface SeriesPoint {
+	t: number;
+	v: number | null;
+}
+
+interface ChartSeries {
+	label: string;
+	points: SeriesPoint[];
+}
+
+/** Merge multiple time-series into a single recharts-friendly array. */
+function mergeSeries(series: ChartSeries[]): Record<string, unknown>[] {
+	const map = new Map<number, Record<string, unknown>>();
+	for (const s of series) {
+		for (const p of s.points) {
+			const existing = map.get(p.t) ?? { time: p.t };
+			existing[s.label] = p.v;
+			map.set(p.t, existing);
+		}
+	}
+	return [...map.values()].sort(
+		(a, b) => (a.time as number) - (b.time as number),
+	);
+}
+
+function formatTime(ms: number): string {
+	return new Date(ms).toLocaleTimeString([], {
+		hour: "2-digit",
+		minute: "2-digit",
+	});
+}
+
+const CHART_COLORS = [
+	"var(--color-chart-1)",
+	"var(--color-chart-2)",
+	"var(--color-chart-3)",
+	"var(--color-chart-4)",
+	"var(--color-chart-5)",
+];
+
+export function GrafanaChartWidget({
+	widget,
+	refreshIntervalMs,
+	description,
+}: Props) {
+	const { data, isLoading } = useWidgetData(widget.id, refreshIntervalMs);
+	const series = data?.data?.series as ChartSeries[] | undefined;
+
+	return (
+		<SectionCard title={widget.title} description={description}>
+			{isLoading && !data ? (
+				<Skeleton className="h-[300px] w-full" />
+			) : data?.error ? (
+				<Alert variant="destructive">
+					<AlertDescription>{data.error}</AlertDescription>
+				</Alert>
+			) : series && series.length > 0 ? (
+				<ResponsiveContainer width="100%" height={300}>
+					<LineChart data={mergeSeries(series)}>
+						<CartesianGrid strokeDasharray="3 3" className="stroke-muted" />
+						<XAxis
+							dataKey="time"
+							tickFormatter={formatTime}
+							tick={{ fontSize: 11 }}
+							className="fill-muted-foreground"
+						/>
+						<YAxis tick={{ fontSize: 11 }} className="fill-muted-foreground" />
+						<Tooltip
+							labelFormatter={(label) => formatTime(Number(label))}
+							contentStyle={{
+								backgroundColor: "hsl(var(--popover))",
+								border: "1px solid hsl(var(--border))",
+								borderRadius: "0.5rem",
+								color: "hsl(var(--popover-foreground))",
+							}}
+						/>
+						{series.map((s, i) => (
+							<Line
+								key={s.label}
+								type="monotone"
+								dataKey={s.label}
+								stroke={CHART_COLORS[i % CHART_COLORS.length]}
+								dot={false}
+								strokeWidth={2}
+								connectNulls
+							/>
+						))}
+					</LineChart>
+				</ResponsiveContainer>
+			) : (
+				<Alert>
+					<AlertDescription>
+						No data. Check your query and datasource_uid in the widget config.
+					</AlertDescription>
+				</Alert>
+			)}
+		</SectionCard>
+	);
+}

frontend/src/widgets/JellyfinNowPlayingWidget.tsx

@@ -0,0 +1,41 @@
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import { Skeleton } from "@/components/ui/skeleton";
+import { SessionActivityPanel } from "../components/SessionActivityPanel";
+import { SectionCard } from "../components/SectionCard";
+import { useWidgetData } from "../hooks/useWidgets";
+import type { NowPlayingSession, WidgetInstance } from "../types";
+
+interface Props {
+	widget: WidgetInstance;
+	refreshIntervalMs: number;
+	description?: string;
+}
+
+export function JellyfinNowPlayingWidget({
+	widget,
+	refreshIntervalMs,
+	description,
+}: Props) {
+	const { data, isLoading } = useWidgetData(widget.id, refreshIntervalMs);
+	const sessions = data?.data?.sessions as NowPlayingSession[] | undefined;
+
+	return (
+		<SectionCard title={widget.title} description={description}>
+			{isLoading && !data ? (
+				<div className="flex flex-col gap-2">
+					<Skeleton className="h-4 w-3/4" />
+					<Skeleton className="h-4 w-1/2" />
+				</div>
+			) : data?.error ? (
+				<Alert variant="destructive">
+					<AlertDescription>{data.error}</AlertDescription>
+				</Alert>
+			) : Array.isArray(sessions) ? (
+				<SessionActivityPanel
+					sessions={sessions}
+					emptyMessage="No one is playing right now."
+				/>
+			) : null}
+		</SectionCard>
+	);
+}

frontend/src/widgets/__tests__/GrafanaChartWidget.test.tsx

@@ -0,0 +1,61 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { GrafanaChartWidget } from "../GrafanaChartWidget";
+import type { WidgetInstance } from "../../types";
+import * as useWidgets from "../../hooks/useWidgets";
+
+vi.mock("../../hooks/useWidgets", () => ({
+	useWidgetData: vi.fn(),
+}));
+
+const widget: WidgetInstance = {
+	id: "w1",
+	service_id: "s1",
+	widget_kind: "chart",
+	title: "CPU Usage",
+	config: {},
+	enabled: true,
+	sort_order: 0,
+	created_at: 0,
+	updated_at: 0,
+};
+
+function mockData(data: unknown, error?: string) {
+	vi.mocked(useWidgets.useWidgetData).mockReturnValue({
+		data: error
+			? { widget_id: "w1", error, fetched_at: 0 }
+			: { widget_id: "w1", data, fetched_at: 0 },
+		isLoading: false,
+	} as unknown as ReturnType<typeof useWidgets.useWidgetData>);
+}
+
+describe("GrafanaChartWidget", () => {
+	it("renders a chart with series data", () => {
+		mockData({
+			series: [
+				{
+					label: "cpu",
+					points: [
+						{ t: 1000, v: 0.5 },
+						{ t: 2000, v: 0.8 },
+					],
+				},
+			],
+		});
+		render(<GrafanaChartWidget widget={widget} refreshIntervalMs={60000} />);
+		// recharts renders an SVG; the title from SectionCard should be present.
+		expect(screen.getByText("CPU Usage")).toBeInTheDocument();
+	});
+
+	it("shows error Alert on error", () => {
+		mockData(null, "Grafana api_key is required for chart queries");
+		render(<GrafanaChartWidget widget={widget} refreshIntervalMs={60000} />);
+		expect(screen.getByText(/api_key is required/i)).toBeInTheDocument();
+	});
+
+	it("shows empty state when no series", () => {
+		mockData({ series: [] });
+		render(<GrafanaChartWidget widget={widget} refreshIntervalMs={60000} />);
+		expect(screen.getByText(/No data/i)).toBeInTheDocument();
+	});
+});