test: wait for grid reconciliation between drags

* test(navidrome): hoist album fixture helper

* test(navidrome): address coderabbit cleanup feedback

.cursor/rules/mantine-datatable-migration.mdc

@@ -0,0 +1,622 @@
+# Migrating Tables from mantine-react-table to mantine-datatable
+
+This document captures every pattern, fix, and decision from the downloads widget rework (PR #6430). Use it as a playbook when porting other tables.
+
+## Migration Candidates
+
+Current `mantine-react-table` consumers that could be migrated:
+
+**Widgets (in `packages/widgets/`):**
+- `docker/component.tsx` — Docker container table
+- `media-server/component.tsx` — Media server sessions
+
+**Admin pages (in `apps/nextjs/src/app/[locale]/manage/`):**
+- `tools/docker/docker-table.tsx`
+- `tools/tasks/_components/tasks-table.tsx`
+- `tools/api/components/api-keys.tsx`
+- `users/_components/user-list.tsx`
+- `users/invites/_components/invite-list.tsx`
+- `tools/kubernetes/` — 8 Kubernetes resource tables
+
+**Modals:**
+- `packages/modals-collection/src/search-engines/request-media-modal.tsx`
+
+**Shared hook to remove once all migrated:**
+- `packages/ui/src/hooks/use-translated-mantine-react-table.ts`
+
+---
+
+## 1. Core Migration: mantine-react-table → mantine-datatable
+
+### Import changes
+
+```typescript
+// BEFORE
+import { MantineReactTable, useMantineReactTable } from "mantine-react-table";
+import type { MRT_ColumnDef } from "mantine-react-table";
+
+// AFTER
+import { DataTable, useDataTableColumns } from "mantine-datatable";
+import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable";
+```
+
+### Column definition shape
+
+```typescript
+// BEFORE (MRT)
+const columns: MRT_ColumnDef<MyRow>[] = [
+  {
+    accessorKey: "name",
+    header: "Name",
+    size: 200,
+    enableSorting: true,
+    Cell: ({ row }) => <Text>{row.original.name}</Text>,
+  },
+];
+
+// AFTER (mantine-datatable)
+const columns: DataTableColumn<MyRow>[] = [
+  {
+    accessor: "name",           // not accessorKey
+    title: "Name",              // not header
+    width: 200,                 // not size
+    sortable: true,             // not enableSorting
+    render: (record) => <Text>{record.name}</Text>,  // not Cell
+  },
+];
+```
+
+Key differences:
+- `accessorKey` → `accessor`
+- `header` → `title`
+- `size` → `width`
+- `Cell: ({ row }) =>` → `render: (record) =>`
+- `enableSorting` → `sortable`
+- `enableColumnActions` → does not exist (no column action menus)
+- `mantineTableBodyCellProps` → `cellsStyle` in `defaultColumnProps`
+
+### Table component
+
+```typescript
+// BEFORE
+const table = useTranslatedMantineReactTable({ columns, data, ... });
+return <MantineReactTable table={table} />;
+
+// AFTER
+return (
+  <DataTable
+    records={data}
+    columns={columns}
+    sortStatus={sortStatus}
+    onSortStatusChange={setSortStatus}
+    ...
+  />
+);
+```
+
+### Sorting is manual
+
+mantine-datatable does NOT sort for you. You must sort the data yourself:
+
+```typescript
+const [sortStatus, setSortStatus] = useState<DataTableSortStatus<MyRow>>({
+  columnAccessor: "name",
+  direction: "asc",
+});
+
+const sortedData = useMemo(() => {
+  const mult = sortStatus.direction === "desc" ? -1 : 1;
+  return [...data].toSorted((a, b) => {
+    const aVal = a[sortStatus.columnAccessor];
+    const bVal = b[sortStatus.columnAccessor];
+    if (typeof aVal === "string") return aVal.localeCompare(bVal as string) * mult;
+    return ((aVal as number) - (bVal as number)) * mult;
+  });
+}, [data, sortStatus]);
+
+// Pass sortedData to records, not data
+<DataTable records={sortedData} sortStatus={sortStatus} onSortStatusChange={setSortStatus} />
+```
+
+---
+
+## 2. Making Tables Transparent (Widget Context)
+
+Widgets sit inside board cards that have user-controlled opacity. The table must be fully transparent so the card background shows through. mantine-datatable defaults to `var(--mantine-color-body)` which is opaque.
+
+Create a CSS file alongside the component:
+
+```css
+/* styles.css */
+.my-table,
+.my-table .mantine-datatable-table,
+.my-table .mantine-datatable-table thead,
+.my-table .mantine-datatable-table tbody,
+.my-table .mantine-datatable-table tfoot,
+.my-table th,
+.my-table td {
+  background-color: transparent !important;
+}
+
+.my-table .mantine-datatable-table tr {
+  background-color: transparent;
+}
+
+/* Hover: translucent instead of opaque */
+.my-table .mantine-datatable-table tbody tr:hover {
+  background-color: color-mix(in srgb, var(--mantine-color-default-hover) 40%, transparent) !important;
+}
+
+/* Headers: frosted glass effect */
+.my-table th {
+  white-space: nowrap;
+  background-color: color-mix(in srgb, var(--mantine-color-body) 60%, transparent) !important;
+  backdrop-filter: blur(8px);
+}
+
+/* Cell overflow */
+.my-table td {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* Hide sort icon until hover */
+.my-table .mantine-datatable-header-cell-sortable-icon {
+  opacity: 0;
+  transition: opacity 150ms;
+}
+.my-table th:hover .mantine-datatable-header-cell-sortable-icon {
+  opacity: 1;
+}
+
+/* Row expansion area */
+.my-table .mantine-datatable-row-expansion-cell {
+  background-color: color-mix(in srgb, var(--mantine-color-body) 40%, transparent) !important;
+}
+```
+
+Import it: `import "./styles.css";` and apply via `className="my-table"`.
+
+---
+
+## 3. Responsive Column Visibility
+
+Use a lookup table of width breakpoints instead of media queries. The widget receives `width` as a prop.
+
+```typescript
+interface SizeConfig {
+  fontSize: "xs" | "sm";
+  iconSize: number;
+  cellPadding: number;
+  showSpeedColumns: boolean;
+  showTimeColumn: boolean;
+  showStateColumn: boolean;
+}
+
+const SIZE_BREAKPOINTS: { maxWidth: number; config: SizeConfig }[] = [
+  { maxWidth: 300, config: { fontSize: "xs", iconSize: 12, cellPadding: 2, showSpeedColumns: false, showTimeColumn: false, showStateColumn: false } },
+  { maxWidth: 500, config: { fontSize: "xs", iconSize: 14, cellPadding: 4, showSpeedColumns: false, showTimeColumn: true, showStateColumn: false } },
+];
+
+const DEFAULT_SIZE_CONFIG: SizeConfig = { fontSize: "sm", iconSize: 14, cellPadding: 4, showSpeedColumns: true, showTimeColumn: true, showStateColumn: true };
+
+function getSizeConfig(width: number): SizeConfig {
+  for (const { maxWidth, config } of SIZE_BREAKPOINTS) {
+    if (width < maxWidth) return config;
+  }
+  return DEFAULT_SIZE_CONFIG;
+}
+
+// Usage: memoize it
+const size = useMemo(() => getSizeConfig(width), [width]);
+```
+
+Then use a visibility check lookup table for columns:
+
+```typescript
+const columnVisibilityChecks: Partial<Record<string, (ctx: ColumnContext) => boolean>> = {
+  upSpeed: (ctx) => ctx.hasTorrents && ctx.size.showSpeedColumns,
+  downSpeed: (ctx) => ctx.size.showSpeedColumns,
+  time: (ctx) => ctx.size.showTimeColumn,
+  state: (ctx) => ctx.size.showStateColumn,
+};
+
+function shouldIncludeColumn(accessor: string, ctx: ColumnContext): boolean {
+  if (!ctx.optionsColumnSet.has(accessor)) return false;
+  const check = columnVisibilityChecks[accessor];
+  if (check && !check(ctx)) return false;
+  return true;
+}
+```
+
+---
+
+## 4. Column Persistence (Drag/Resize → Server)
+
+`useDataTableColumns` stores column order and widths in localStorage by default. For widgets, this must persist server-side so it works across devices.
+
+### Hidden widget options
+
+In `index.ts`, add hidden text options:
+
+```typescript
+columnOrder: factory.text({ defaultValue: "" }),
+columnWidths: factory.text({ defaultValue: "" }),
+```
+
+With visibility override:
+
+```typescript
+{
+  columnOrder: { shouldHide: () => true },
+  columnWidths: { shouldHide: () => true },
+}
+```
+
+### Translation keys required
+
+Even hidden options need translation keys or the translation test fails:
+
+```json
+"widget.mywidget.option.columnOrder.label": "Column order",
+"widget.mywidget.option.columnWidths.label": "Column widths"
+```
+
+### Old-import mappings
+
+Add to `packages/old-import/src/widgets/options.ts`:
+
+```typescript
+columnOrder: () => undefined,
+columnWidths: () => undefined,
+```
+
+### Dynamic storeKey
+
+Use a key that includes `itemId` and sorted column names. This prevents cross-widget localStorage bleeding:
+
+```typescript
+const storeKey = `mytable-${itemId ?? "preview"}-${[...options.columns].toSorted().join(",")}`;
+```
+
+### Hydration from server → localStorage
+
+On mount, seed `useDataTableColumns` with server-persisted values. Use a `hydrated` ref to prevent the persist effect from immediately writing defaults back:
+
+```typescript
+const { effectiveColumns, columnsOrder, columnsWidth, setColumnsOrder, setMultipleColumnWidths } =
+  useDataTableColumns<MyRow>({ key: storeKey, columns });
+
+const lastStoreKey = useRef(storeKey);
+const hydrated = useRef(false);
+
+useEffect(() => {
+  if (lastStoreKey.current !== storeKey) {
+    lastStoreKey.current = storeKey;
+    hydrated.current = false;
+  }
+  if (hydrated.current) return;
+  if (savedOrder.length > 0) setColumnsOrder(savedOrder);
+  if (Object.keys(savedWidths).length > 0) {
+    setMultipleColumnWidths(
+      Object.entries(savedWidths).map(([accessor, w]) => ({ accessor, width: w })),
+    );
+  }
+  requestAnimationFrame(() => { hydrated.current = true; });
+}, [storeKey, savedOrder, savedWidths, setColumnsOrder, setMultipleColumnWidths]);
+```
+
+### Persist localStorage → server
+
+Watch for changes and write back:
+
+```typescript
+const prevOrder = useRef(columnsOrder);
+const prevWidths = useRef(columnsWidth);
+
+useEffect(() => {
+  if (!hydrated.current) return;
+  const orderChanged = JSON.stringify(columnsOrder) !== JSON.stringify(prevOrder.current);
+  const widthsChanged = JSON.stringify(columnsWidth) !== JSON.stringify(prevWidths.current);
+  prevOrder.current = columnsOrder;
+  prevWidths.current = columnsWidth;
+
+  if (!orderChanged && !widthsChanged) return;
+
+  if (orderChanged) persistOption({ columnOrder: JSON.stringify(columnsOrder) });
+  if (widthsChanged) {
+    const widthMap: Record<string, number> = {};
+    for (const entry of columnsWidth) {
+      const key = Object.keys(entry)[0];
+      if (!key) continue;
+      const w = entry[key as keyof typeof entry];
+      if (typeof w === "number") widthMap[key] = w;
+      else if (typeof w === "string" && w.endsWith("px")) widthMap[key] = parseInt(w, 10);
+    }
+    persistOption({ columnWidths: JSON.stringify(widthMap) });
+  }
+}, [columnsOrder, columnsWidth, persistOption]);
+```
+
+The `persistOption` helper calls both `setOptions` (local state) and `saveItemOptions` (server mutation).
+
+---
+
+## 5. Context Menu (Right-Click)
+
+Do NOT install `mantine-contextmenu`. Use Mantine's `Menu` + `Portal` directly:
+
+```typescript
+interface ContextMenuState {
+  x: number;
+  y: number;
+  item: MyRow;
+}
+
+const [contextMenu, setContextMenu] = useState<ContextMenuState | null>(null);
+
+const handleContextMenu = useCallback(
+  ({ record, event }: { record: MyRow; event: React.MouseEvent }) => {
+    event.preventDefault();
+    setContextMenu({ x: event.clientX, y: event.clientY, item: record });
+  },
+  [],
+);
+
+// On DataTable:
+<DataTable onRowContextMenu={handleContextMenu} />
+
+// Render:
+{contextMenu && <RowContextMenu state={contextMenu} onClose={closeContextMenu} />}
+```
+
+The menu component uses `Portal` for correct z-index:
+
+```tsx
+function RowContextMenu({ state, onClose }: { state: ContextMenuState; onClose: () => void }) {
+  return (
+    <Portal>
+      <Menu opened onClose={onClose} closeOnItemClick={false} position="right-start" offset={0}>
+        <Menu.Target>
+          <Box style={{ position: "fixed", left: state.x, top: state.y, width: 0, height: 0 }} />
+        </Menu.Target>
+        <Menu.Dropdown>
+          <Menu.Item onClick={() => { /* action */ onClose(); }}>Action</Menu.Item>
+        </Menu.Dropdown>
+      </Menu>
+    </Portal>
+  );
+}
+```
+
+**Key fix:** Use `closeOnItemClick={false}` if any menu item needs a two-step confirmation (like delete → confirm). Close the menu on scroll: `onScroll={() => { if (contextMenu) closeContextMenu(); }}`.
+
+---
+
+## 6. Row Expansion
+
+```typescript
+<DataTable
+  rowExpansion={{
+    trigger: "click",
+    allowMultiple: true,
+    collapseProps: {
+      transitionDuration: 200,
+      animateOpacity: true,
+      transitionTimingFunction: "ease-out",
+    },
+    content: ({ record, collapse }) => <ExpandedRow item={record} collapse={collapse} />,
+  }}
+/>
+```
+
+**Critical:** Do NOT set `onRowClick` when using `rowExpansion` with `trigger: "click"`. They conflict and the expansion won't work.
+
+---
+
+## 7. Common Pitfalls & Fixes
+
+### Status indicator dots
+
+Don't use `<Badge variant="dot" />` without children — it renders a pill with empty space. Use a plain `Box`:
+
+```tsx
+<Box
+  w={8}
+  h={8}
+  style={{
+    borderRadius: "50%",
+    backgroundColor: `var(--mantine-color-${color}-filled)`,
+    flexShrink: 0,
+  }}
+/>
+```
+
+### Tooltip overflow on long text columns
+
+When a column has `ellipsis: true`, the tooltip target element can still extend beyond the cell bounds if inner elements don't clip. Fix:
+
+```tsx
+<Tooltip position="bottom-start" ...>
+  <Group style={{ overflow: "hidden" }}>
+    ...
+  </Group>
+</Tooltip>
+```
+
+Use `position="bottom-start"` instead of `position="right"` so the tooltip never escapes the widget horizontally.
+
+### Dark mode tooltips
+
+Mantine tooltips default to the theme's tooltip color which may be white in light mode and stay white in dark mode. Always set `color="dark"` on informational tooltips inside widgets.
+
+### Division by zero
+
+Guard all ratio calculations:
+
+```typescript
+if (item.size > 0) ratio = item.sent / item.size;
+if (totalDown > 0) ratio = totalUp / totalDown;
+```
+
+### Composite idAccessor
+
+When rows can come from multiple integrations, IDs may collide. Use a composite key:
+
+```typescript
+idAccessor={(record) => `${record.integration.id}:${record.id}`}
+```
+
+### JSON option parsing
+
+Always wrap in try/catch:
+
+```typescript
+function parseJsonOption<T>(value: string | undefined, fallback: T): T {
+  if (!value) return fallback;
+  try { return JSON.parse(value) as T; }
+  catch { return fallback; }
+}
+```
+
+### Clipboard API
+
+`navigator.clipboard.writeText()` can throw in non-HTTPS contexts. Always catch:
+
+```typescript
+void navigator.clipboard.writeText(text).catch(() => {});
+```
+
+### Sync sortStatus with widget options
+
+If the widget has configurable default sort, sync it:
+
+```typescript
+useEffect(() => {
+  setSortStatus({ columnAccessor: options.defaultSort, direction: defaultSortDirection });
+}, [options.defaultSort, defaultSortDirection]);
+```
+
+---
+
+## 8. Accessibility
+
+- All `ActionIcon` components need `aria-label`
+- Filter toggles (client badges, status badges) need `aria-pressed={isActive}`
+- `textSelectionDisabled` on DataTable prevents accidental text selection during drag/resize
+
+---
+
+## 9. Error Handling
+
+- Every mutation needs an `onError` callback with `showErrorNotification`
+- The `saveItemOptions` mutation (column persistence) also needs `onError`
+- Check `isError` on the main query and show a fallback UI
+- Use a shared `mutationOptions` object to avoid repeating `onSettled`/`onError`:
+
+```typescript
+const mutationOptions = {
+  onSettled: () => void utils.myQuery.invalidate(),
+  onError: () => showErrorNotification({ title: t("errors.actionFailed"), message: t("errors.actionFailedMessage") }),
+};
+```
+
+---
+
+## 10. i18n
+
+- No hardcoded strings. Every user-visible string goes through `useScopedI18n`
+- Column titles: `t("items.{accessor}.columnTitle")`
+- Detail labels: `t("items.{accessor}.detailsTitle")`
+- States: `t("states.{state}")`
+- Actions: `t("actions.{action}")`
+- Errors: `t("errors.{errorKey}")`
+- Hidden options still need `.label` translation keys
+
+---
+
+## 11. Edit Mode
+
+Disable pointer events on the table during edit mode to prevent conflicts with the board's drag-and-drop:
+
+```typescript
+let tablePointerEvents: React.CSSProperties["pointerEvents"];
+if (isEditMode) tablePointerEvents = "none";
+
+let rowContextMenuHandler = handleContextMenu;
+if (isEditMode) rowContextMenuHandler = undefined;
+
+<DataTable style={{ pointerEvents: tablePointerEvents }} />
+```
+
+---
+
+## 12. DataTable Props Reference (Commonly Used)
+
+```typescript
+<DataTable
+  records={sortedData}
+  columns={effectiveColumns}
+  storeColumnsKey={storeKey}
+  withTableBorder={false}
+  borderRadius={0}
+  highlightOnHover
+  striped="odd"
+  stripedColor={{ dark: "dark.7", light: "gray.0" }}
+  highlightOnHoverColor={{ dark: "dark.5", light: "gray.1" }}
+  verticalAlign="center"
+  fetching={isFetching && data.length === 0}
+  loaderBackgroundBlur={2}
+  fz={size.fontSize}
+  textSelectionDisabled
+  sortStatus={sortStatus}
+  onSortStatusChange={setSortStatus}
+  noRecordsText={t("errors.noItems")}
+  idAccessor={(record) => record.uniqueKey}
+  height="100%"
+  className="my-table"
+  defaultColumnProps={{
+    noWrap: true,
+    draggable: true,
+    resizable: true,
+    cellsStyle: () => ({ padding: `${size.cellPadding}px 8px` }),
+  }}
+  scrollAreaProps={{ type: "auto", scrollbarSize: 6 }}
+  rowBackgroundColor={(record) => conditionalBgMap[record.state]}
+  onRowContextMenu={handleContextMenu}
+  rowExpansion={{ ... }}
+  onScroll={() => { if (contextMenu) closeContextMenu(); }}
+/>
+```
+
+---
+
+## 13. Layout Stability
+
+- Don't use `table-layout: fixed` — it fights mantine-datatable's resize logic
+- Give non-name columns explicit `width` values so only the name column flexes
+- Use `ellipsis: true` on the name column — it handles `text-overflow: ellipsis` internally
+- Names should truncate at the cell boundary, not a character count, so the layout is stable regardless of content length
+- `flexShrink: 0` on badges/icons prevents them from being squeezed by long names
+
+---
+
+## 14. Checklist for Each Migration
+
+1. Replace imports (`mantine-react-table` → `mantine-datatable`)
+2. Convert column definitions (`accessorKey` → `accessor`, `header` → `title`, `Cell` → `render`, etc.)
+3. Implement manual sorting with `useState` + `useMemo`
+4. Add CSS file for transparent backgrounds (if widget context)
+5. Add responsive column visibility (if widget context)
+6. Add hidden options + hydration logic (if column persistence needed)
+7. Add old-import mappings for new options
+8. Add translation keys (including hidden option labels)
+9. Add context menu if row actions exist
+10. Add row expansion if detail view exists
+11. Add error handling on all mutations
+12. Add accessibility attributes
+13. Test at multiple widget widths
+14. Update docs in `apps/docs/docs/widgets/` if applicable
+15. Run `pnpm turbo typecheck` — catches old-import mismatches
+16. Run translation spec — catches missing keys

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,6 +33,8 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
+        - 1.72.0
+        - 1.71.0
         - 1.70.0
         - 1.69.2
         - 1.69.0

.github/renovate.json5

@@ -1,6 +1,6 @@
 {
   $schema: "https://docs.renovatebot.com/renovate-schema.json",
-  extends: ["config:recommended"],
+  extends: ["config:recommended", ":dependencyDashboardApproval"],
   packageRules: [
     {
       matchPackageNames: ["^@homarr/"],
@@ -47,7 +47,7 @@
   rangeStrategy: "bump",
   automerge: false,
   baseBranchPatterns: ["dev"],
-  dependencyDashboard: false,
+  dependencyDashboard: true,
   // prevent special characters in branch names (otherwise git errors occur on windows)
   branchNameStrict: true,
 }

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
       TURBO_PLATFORM: linux/amd64
     steps:
       - uses: actions/checkout@v7
-        if: '!env.ACT'
+        if: "!env.ACT"
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -81,9 +81,6 @@ jobs:
       - name: Copy environment defaults
         run: cp .env.example .env
 
-      - name: Check formatting in affected workspaces
-        run: pnpm turbo run format --affected --continue -- --check
-
       - name: Lint, typecheck, and build affected workspaces
         run: pnpm turbo run lint typecheck build --affected --continue=dependencies-successful
 
@@ -93,12 +90,8 @@ jobs:
       - name: Run unit tests
         run: pnpm test
 
-      - name: Report coverage
-        if: always() && !env.ACT
-        uses: davelosert/vitest-coverage-report-action@v2
-
   container:
-    name: Container, E2E, and memory
+    name: Container and E2E
     needs: fast-gate
     if: |
       github.event_name == 'merge_group' ||
@@ -111,7 +104,7 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v7
-        if: '!env.ACT'
+        if: "!env.ACT"
         with:
           persist-credentials: false
           ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || '' }}
@@ -120,11 +113,11 @@ jobs:
         uses: ./tooling/github/setup
 
       - name: Set up Docker Buildx
-        if: '!env.ACT'
+        if: "!env.ACT"
         uses: docker/setup-buildx-action@v4
 
       - name: Build container once
-        if: '!env.ACT'
+        if: "!env.ACT"
         uses: docker/build-push-action@v7
         with:
           context: .
@@ -165,7 +158,7 @@ jobs:
             --tag homarr-ci --tag homarr-e2e "${secret_args[@]}" .
 
       - name: Cache Playwright browsers
-        if: '!env.ACT'
+        if: "!env.ACT"
         id: playwright-cache
         uses: actions/cache@v6
         with:
@@ -191,82 +184,6 @@ jobs:
           path: e2e/test-results/
           retention-days: 7
 
-      - name: Run memory regression test
-        env:
-          CONTAINER_NAME: homarr-mem-${{ github.run_id }}-${{ github.run_attempt }}
-          SECRET_ENCRYPTION_KEY: 0000000000000000000000000000000000000000000000000000000000000000
-        run: |
-          docker run -d --name "$CONTAINER_NAME" -p 127.0.0.1::7575 \
-            -e NO_EXTERNAL_CONNECTION=true \
-            -e SECRET_ENCRYPTION_KEY="$SECRET_ENCRYPTION_KEY" \
-            homarr-ci
-          PORT=$(docker port "$CONTAINER_NAME" 7575/tcp | sed 's/.*://')
-          [[ "$PORT" =~ ^[0-9]+$ ]] || { echo "ERROR: invalid port mapping: '$PORT'"; exit 1; }
-          URL="http://127.0.0.1:${PORT}"
-
-          healthy=false
-          for i in $(seq 1 30); do
-            if curl -sf "$URL/api/health/ready" >/dev/null 2>&1; then
-              echo "Container healthy after $((i * 2))s"
-              healthy=true
-              break
-            fi
-            sleep 2
-          done
-
-          if [ "$healthy" != "true" ]; then
-            echo "ERROR: Container never became healthy"
-            docker logs "$CONTAINER_NAME" --tail 100
-            exit 1
-          fi
-
-          warmup_ok=0
-          for _ in $(seq 1 5); do
-            curl -sf "$URL/" >/dev/null 2>&1 && warmup_ok=$((warmup_ok + 1))
-            sleep 2
-          done
-          if [ "$warmup_ok" -eq 0 ]; then
-            echo "ERROR: All warmup requests failed"
-            docker logs "$CONTAINER_NAME" --tail 50
-            exit 1
-          fi
-
-          docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" | grep -qx true || {
-            echo "ERROR: Container died before memory measurement"
-            docker logs "$CONTAINER_NAME" --tail 100
-            exit 1
-          }
-
-          RAW_MEMORY=$(docker stats --no-stream --format '{{.MemUsage}}' "$CONTAINER_NAME" | sed 's| /.*||')
-          MEMORY_MB=$(echo "$RAW_MEMORY" | awk '
-            /GiB/ { gsub(/GiB/, ""); print $1 * 1024; next }
-            /MiB/ { gsub(/MiB/, ""); print $1; next }
-            /KiB/ { gsub(/KiB/, ""); print $1 / 1024; next }
-            { print $1 / 1048576 }
-          ')
-
-          echo "Memory usage: ${MEMORY_MB} MB (${RAW_MEMORY})"
-          [[ "$MEMORY_MB" =~ ^[0-9]+(\.[0-9]+)?$ ]] || {
-            echo "ERROR: non-numeric memory value: '$MEMORY_MB' (raw: '$RAW_MEMORY')"
-            docker logs "$CONTAINER_NAME" --tail 100
-            exit 1
-          }
-          if awk "BEGIN { exit !($MEMORY_MB < 50) }"; then
-            echo "ERROR: Memory suspiciously low (${MEMORY_MB} MB) — container may have crashed"
-            docker logs "$CONTAINER_NAME" --tail 100
-            exit 1
-          elif awk "BEGIN { exit !($MEMORY_MB > 700) }"; then
-            echo "ERROR: Memory usage ${MEMORY_MB} MB exceeds 700 MB"
-            docker logs "$CONTAINER_NAME" --tail 100
-            exit 1
-          fi
-
-      - name: Clean up memory test container
-        if: always()
-        env:
-          CONTAINER_NAME: homarr-mem-${{ github.run_id }}-${{ github.run_attempt }}
-        run: docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
-
       - name: Determine preview tag
         id: preview
         if: |
@@ -316,7 +233,7 @@ jobs:
         run: test -n "$PR_NUMBER" || { echo "pr_number is required for cleanup"; exit 1; }
 
       - name: Delete GHCR package version
-        if: '!env.ACT'
+        if: "!env.ACT"
         uses: actions/github-script@v8
         with:
           script: |

AUDIT.md

@@ -1,535 +0,0 @@
-# Custom Widgets Architecture Audit and North Star
-
-> Status: implemented in the current working tree; baseline retained below for traceability
-> Evidence snapshot: `c5703e7e5` on PR #6304
-> Scope: built-in custom-widget displays, Custom JSX, network execution, authoring, preview, import/export, AI prompts, and MCP tools
-
-## Implementation outcome
-
-The migration described by this audit is implemented. `@homarr/custom-widgets` now owns the domain through explicit `core`, `jsx`, `runtime`, `server`, and `workbench` exports. API, Widgets, and Next.js retain only authorization, persistence, transport, board registration, navigation, and localized adapter concerns.
-
-Key outcomes:
-
-- One typed configuration and display-descriptor model drives schemas, defaults, form hydration, serialization, import/export, preview, examples, diagnostics, generated references, and AI prompts.
-- Display-data extraction moved out of API and Widgets into the domain package; the former API-to-Widgets re-export chain no longer exists.
-- The interpreter, shared security policy, registry, wrappers, named-request runtime, hardened executor, preview sessions, rate limits, and workbench UI have focused package-owned modules and tests.
-- Runtime and workbench network behavior is injected through typed ports. The domain package has no dependency on API, Widgets, Next.js routes, notification infrastructure, or modal infrastructure.
-- Public tRPC and MCP procedures are characterized, v2 and v3 import envelopes remain accepted, display-only v1 remains covered, and MCP offers iterative schema, validation, template read/write/patch, create/import/update, preview query, simulation, and journal tools.
-- The AI prompt uses a multiline two-block authoring bundle, documents the `SubFetch` render-child contract, and is generated from the canonical registry and tested examples.
-- Architecture enforcement currently scans 110 production modules for dependency direction, cycles, file budgets, dynamic loading, and untranslated JSX literals. Generated-reference drift and every Mantine export classification are test-enforced.
-- The latest production build measured the largest Custom JSX route payload at 99,852 gzip bytes across two chunks, below the 768 KiB budget.
-
-Focused verification is green: 278 package tests, 35 API/MCP tests, 52 Widgets renderer tests, 7 E2E tests, affected typecheck, affected lint, docs build, production Next.js build, architecture checks, generated drift, and the bundle budget. The root `pnpm test` command is presently blocked on this workstation by unrelated Docker-backed integration suites timing out while the shared Docker daemon is under external load; no Custom Widget test failed in those runs.
-
-## Executive summary
-
-The feature has a strong security direction and a capable authoring experience, but its implementation has outgrown its current ownership model. PR #6304 changes 56 files with 13,206 additions. The primary feature directories contain 10,437 lines, spread across `@homarr/widgets`, `@homarr/api`, `@homarr/definitions`, `@homarr/validation`, and the Next.js management route.
-
-The main problem is not the absolute line count. It is that domain policy, transport, persistence, rendering, form state, compatibility, and documentation generation are interleaved across package boundaries. A change to one display type can require synchronized edits in schemas, form defaults, import conversion, preview extraction, runtime rendering, documentation, and AI instructions. Several of those paths use untyped records, duplicated conversion logic, or direct API dependencies.
-
-The north star is a single `@homarr/custom-widgets` domain package with explicit `core`, `jsx`, `runtime`, `server`, and `workbench` entry points. Existing applications and packages become thin adapters. The extraction must preserve public APIs, import formats, permission behavior, and the current UI while improving internal cohesion.
-
-This audit does not authorize a big-bang rewrite. The migration should be a sequence of behavior-preserving PRs, beginning with characterization tests and ending with enforced dependency and complexity budgets.
-
-## Measured baseline
-
-### Change footprint
-
-| Measure                         | Current value |
-| ------------------------------- | ------------: |
-| PR files changed                |            56 |
-| PR additions                    |        13,206 |
-| PR deletions                    |         1,385 |
-| Primary feature-directory lines |        10,437 |
-
-Generated component-reference JSON accounts for 2,491 added lines and is not treated as source complexity.
-
-### Largest production files
-
-| File                                                                            | Lines | Responsibilities currently combined                                                                                                                                                   |
-| ------------------------------------------------------------------------------- | ----: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-form.tsx`    | 1,911 | Schema refinement, defaults, server-error mapping, form conversion, submission, preview state, focus management, display picker, connection fields, and every display-specific editor |
-| `packages/api/src/router/custom-widget/custom-widget-router.ts`                 |   978 | CRUD, import/export, template patching, MCP descriptions, preview sessions, preview execution, journals, and action simulation/execution                                              |
-| `packages/widgets/src/custom-api/safe-jsx-interpreter.tsx`                      |   944 | AST model, parsing, environments, budgets, sanitization, expression evaluation, safe methods, callbacks, and React rendering                                                          |
-| `apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-preview.tsx` |   834 | Preview orchestration, error boundary, tabs, response tree, diagnostics, request journal, sample data, and renderer selection                                                         |
-| `packages/widgets/src/custom-api/jsx-whitelist.ts`                              |   775 | Mantine imports, wrappers, icon mapping, runtime component map, registry filtering, data sanitization, and safe bindings                                                              |
-| `packages/widgets/src/custom-api/jsx-sub-fetch.tsx`                             |   599 | Query rendering, render props, path display, action execution, buttons, toggles, refresh, notifications, and confirmations                                                            |
-
-These files exceed the proposed 300-line production-module target. The interpreter is a reasonable candidate for a documented 400-line exception after its independent policies, evaluators, and renderer are extracted.
-
-### Current ownership
-
-```mermaid
-flowchart LR
-  D["@homarr/definitions<br/>registry and examples"]
-  V["@homarr/validation<br/>schemas and AST diagnostics"]
-  W["@homarr/widgets<br/>renderers and interpreter"]
-  A["@homarr/api<br/>CRUD, permissions, execution and MCP"]
-  N["Next.js route<br/>workbench, preview and prompt"]
-  X["Docs<br/>generated reference and guides"]
-
-  N --> A
-  N --> V
-  N --> D
-  N --> W
-  W --> A
-  W --> D
-  A --> V
-  X --> D
-```
-
-The `@homarr/widgets → @homarr/api` edge is particularly costly. Runtime request components call the generated tRPC client directly, so moving the domain into a package that is also consumed by the API would create a dependency cycle unless request execution is inverted behind a typed port.
-
-## What is working well
-
-- Custom JSX v2 replaces raw runtime URLs and methods with named, typed requests.
-- Board permissions, network scope, DNS validation, redirect policy, response limits, caching, concurrency, and action rules are server-enforced.
-- The safe interpreter no longer treats an upstream JSX parser as a sandbox.
-- Component metadata drives runtime classification, editor completion, docs generation, and part of the AI prompt.
-- The workbench supports multiline JSX, diagnostics, real preview sizes, response inspection, request journals, import review, undo/redo, and paste-to-import.
-- MCP exposes schema, validation, preview, journal, template read/write/patch, import, and update workflows without exposing stored secrets.
-- Shared examples cover simple metrics, nested queries, charts, actions, and richer interactive layouts.
-
-The migration must preserve these capabilities. Package extraction is not a reason to weaken the security boundary or remove authoring features.
-
-## Findings
-
-### P1 — Domain ownership is fragmented
-
-Custom-widget behavior is implemented in five packages/applications. None of them is the clear source of truth for the complete lifecycle. `@homarr/definitions` owns component metadata and examples, `@homarr/validation` owns schemas and template diagnostics, `@homarr/widgets` owns runtime evaluation, `@homarr/api` owns network and persistence flows, and Next.js owns authoring transformations.
-
-Impact:
-
-- Maintainers must search unrelated packages to understand one behavior.
-- Changes have a large synchronization surface and can drift silently.
-- The domain cannot be tested or reused as a coherent unit.
-- Package names describe infrastructure location rather than feature ownership.
-
-### P1 — Giant modules mix unrelated reasons to change
-
-The largest files are not merely long; they combine policy, orchestration, state, and presentation. The form contains all display editors. The router contains every management and preview procedure. The interpreter contains parsing through React emission. The request component file contains both query and mutation interaction models.
-
-Impact:
-
-- Reviews are broad and regression-prone.
-- Unit-test seams are difficult to identify.
-- Merge conflicts concentrate in a small number of files.
-- Small feature changes require understanding thousands of lines of adjacent behavior.
-
-### P1 — Runtime code depends directly on the API client
-
-`packages/widgets/src/custom-api/component.tsx` and `jsx-sub-fetch.tsx` import `@homarr/api/client`. They also directly invoke notifications and confirmation modals.
-
-Impact:
-
-- The renderer cannot be used or tested without application infrastructure.
-- A future `@homarr/custom-widgets` package would cycle with `@homarr/api` if both retained these imports.
-- Preview and board runtime cannot share the same renderer through different request implementations without branching inside the components.
-
-Required direction: a runtime provider must receive typed query, action, confirmation, notification, and invalidation ports. The board and preview layers supply adapters.
-
-### P1 — Configuration transformations are duplicated
-
-Create defaults and builders live in the form, edit hydration lives in the edit page, and import hydration lives in `_custom-widget-import-utils.ts`. These paths independently translate between stored display configs and form values. They rely on display-type switches, record casts, and JSON text fields such as the request manifest.
-
-Impact:
-
-- Create, edit, paste replacement, import, export, and MCP can disagree.
-- Adding a field requires updating multiple transforms.
-- Round trips are difficult to prove lossless.
-
-Required direction: each display type supplies one typed descriptor containing schema, defaults, `toForm`, `fromForm`, preview projection, and migration behavior.
-
-### P1 — Type safety degrades at domain boundaries
-
-`Record<string, unknown>`, `as never`, and `as unknown as` are frequent in form conversion, display extraction, preview state, imports, registry wrappers, and API parsing. Some casts are necessary at the interpreter/React boundary, but most domain-level casts indicate missing discriminated unions or validated adapters.
-
-Impact:
-
-- Invalid combinations survive until runtime.
-- Refactors do not receive complete compiler guidance.
-- Server and client transformations can diverge while continuing to compile.
-
-Required direction: parse unknown values once at ingress and use typed domain objects afterward. Unsafe casts must be isolated to named boundary modules and justified by tests.
-
-### P1 — Security policy is represented more than once
-
-The template validator and interpreter both parse JSX and maintain concepts such as blocked properties, blocked props, AST depth, and operation limits. Runtime component filtering adds another policy layer.
-
-The analyzer and interpreter have different jobs, so they should not be collapsed into one evaluator. They must, however, consume one immutable policy definition and shared AST normalization utilities.
-
-Impact:
-
-- A property can be rejected by one layer and missed by another.
-- Security changes require parallel edits and duplicate tests.
-- Diagnostics can describe behavior that differs from runtime enforcement.
-
-### P1 — The API router combines transport and application behavior
-
-The router owns tRPC metadata, Zod inputs, database writes, encryption, import/export, template revisions, preview execution, rate-limit acquisition, journal recording, and MCP documentation.
-
-Impact:
-
-- Domain logic is only testable through tRPC context setup.
-- MCP and browser endpoints can accidentally implement different workflows.
-- Framework-specific `TRPCError` values leak into lower-level executor and manifest code.
-
-Required direction: tRPC procedures authorize, load persistence models, call a domain service, and map domain errors. They do not implement request rendering, template patching, preview execution, or import conversion inline.
-
-### P2 — Metadata generation is only partially centralized
-
-The component registry and examples are shared, but runtime maps, wrappers, safe bindings, display-type metadata, AI prompt prose, form choices, and some docs remain separately assembled. The AI prompt is built inside a client button component.
-
-Impact:
-
-- Agent instructions can drift from validation and runtime behavior.
-- Prompt generation requires UI and network context.
-- Display types lack the same single-registry guarantee as JSX components.
-
-Required direction: prompt generation is a pure function in `core`, using the schema, display descriptors, component registry, and tested fixtures. The UI only fetches context and copies the result.
-
-### P2 — Compatibility behavior is mixed into primary flows
-
-V1 detection, migration warnings, legacy network diagnostics, v2 imports, v3 exports, and fallback display parsing are embedded beside current authoring/runtime logic.
-
-Impact:
-
-- Happy paths are harder to read.
-- Legacy behavior can accidentally influence v2 code.
-- Compatibility retirement has no obvious deletion boundary.
-
-Required direction: version detection and migrations live under `core/migrations`. Runtime and workbench receive a normalized current model plus explicit review state.
-
-### P2 — Test topology does not mirror the architecture
-
-Interpreter coverage is substantial, and request-executor/router tests exist, but tests are colocated under their current infrastructure owners instead of a feature package. A focused renderer run passed 52 tests during review, while the selected API suites failed before collecting tests because the root Vitest client environment rejected server-only environment access.
-
-Impact:
-
-- The complete feature cannot be verified with one package command.
-- Server test failures can be configuration failures rather than behavioral failures.
-- Form conversion and workbench orchestration have limited direct characterization coverage relative to their size.
-
-Required direction: the package owns focused test projects or environment-specific configs for core, DOM runtime/workbench, and Node server tests. API adapter tests remain in `@homarr/api`.
-
-### P2 — A small amount of user-facing copy bypasses translation
-
-Examples found during the snapshot include the raw-response tooltip and a default empty template message. Dynamic translation keys also require repeated `as never` casts, reducing translation-key safety.
-
-Impact:
-
-- Locale completeness gates are unreliable.
-- Refactoring copy is harder than changing typed translation keys.
-
-Required direction: all package UI receives a typed message catalog or uses typed scoped translations. No visible fallback literals are allowed in production components.
-
-## North-star package
-
-```text
-packages/custom-widgets/
-├── src/core/
-│   ├── config/          # discriminated display configurations and form models
-│   ├── displays/        # typed display descriptors and built-in display metadata
-│   ├── import/          # v2/v3 parsing, export, review, and authoring bundles
-│   ├── migrations/      # v1 detection, normalization, and review requirements
-│   ├── prompts/         # pure AI prompt generation
-│   └── examples/        # typed fixtures shared by tests, docs, editor, and prompts
-├── src/jsx/
-│   ├── ast/             # parser adapter, AST types, traversal, and normalization
-│   ├── policy/          # blocked properties, props, URLs, and budgets
-│   ├── analyzer/        # authoring diagnostics
-│   ├── interpreter/     # expression and collection evaluation
-│   ├── registry/        # component descriptors, wrappers, and export classification
-│   └── bindings/        # branded safe helpers and sanitized data
-├── src/runtime/
-│   ├── displays/        # built-in renderers
-│   ├── jsx/             # Custom JSX renderer and error containment
-│   ├── requests/        # SubFetch, actions, toggles, refresh, and state handling
-│   └── provider/        # injected runtime capabilities
-├── src/server/
-│   ├── network/         # hardened executor and destination policy
-│   ├── requests/        # manifest resolution and parameter substitution
-│   ├── limits/          # rate and concurrency limits
-│   └── preview/         # sessions, simulation, and journals
-└── src/workbench/
-    ├── form/            # shared state and connection/display sections
-    ├── editor/          # CodeMirror and registry-driven diagnostics
-    ├── preview/         # widget, response, journal, and diagnostic views
-    └── import/          # clipboard parsing and review UI
-```
-
-Public exports are explicit:
-
-```json
-{
-  "exports": {
-    "./core": "./src/core/index.ts",
-    "./jsx": "./src/jsx/index.ts",
-    "./runtime": "./src/runtime/index.ts",
-    "./server": "./src/server/index.ts",
-    "./workbench": "./src/workbench/index.ts"
-  }
-}
-```
-
-There is no broad root barrel. Internal folders cannot be imported by consumers.
-
-### Dependency rules
-
-```mermaid
-flowchart LR
-  C["custom-widgets/core"]
-  J["custom-widgets/jsx"]
-  R["custom-widgets/runtime"]
-  S["custom-widgets/server"]
-  B["custom-widgets/workbench"]
-  API["@homarr/api adapter"]
-  W["@homarr/widgets adapter"]
-  N["Next.js route adapter"]
-  DOC["Docs generator"]
-
-  J --> C
-  R --> C
-  R --> J
-  S --> C
-  B --> C
-  B --> R
-  API --> C
-  API --> S
-  W --> C
-  W --> R
-  N --> C
-  N --> B
-  DOC --> C
-  DOC --> J
-```
-
-Hard rules:
-
-1. `@homarr/custom-widgets` never imports `@homarr/api`, `@homarr/widgets`, or Next.js route modules.
-2. `core` has no React, Mantine, tRPC, database, Redis, or browser dependency.
-3. `jsx` has no API, persistence, Redis, notification, or modal dependency.
-4. `runtime` performs no direct tRPC calls. It consumes `CustomWidgetRuntimePort`.
-5. `workbench` performs no direct tRPC calls. It consumes `CustomWidgetWorkbenchPort` callbacks.
-6. `server` has no tRPC or database-query dependency. API adapters load authorized records and map errors.
-7. Cross-entry imports follow the arrows above; reverse imports fail CI.
-
-### Runtime ports
-
-The exact transport remains owned by adapters. The domain contract should cover behavior rather than tRPC details:
-
-```ts
-interface CustomWidgetRuntimePort {
-  getData(input: { itemId: string; signal?: AbortSignal }): Promise<CustomWidgetRequestResult>;
-  query(input: NamedRequestInvocation & { signal?: AbortSignal }): Promise<CustomWidgetRequestResult>;
-  action(input: NamedRequestInvocation & { confirmed?: boolean }): Promise<CustomWidgetRequestResult>;
-  confirm(input: ActionConfirmation): Promise<boolean>;
-  notify(input: RuntimeNotification): void;
-  invalidate(input: RuntimeInvalidation): Promise<void>;
-}
-```
-
-Board runtime and preview runtime implement the same port. Preview simulation is an adapter capability, not a conditional tRPC import inside `ActionButton`.
-
-### Display descriptors
-
-Every display type is represented once:
-
-```ts
-interface CustomWidgetDisplayDescriptor<TConfig, TForm> {
-  type: CustomWidgetDisplayType;
-  configSchema: ZodType<TConfig>;
-  formSchema: ZodType<TForm>;
-  createDefault(): TConfig;
-  toForm(config: TConfig): TForm;
-  fromForm(form: TForm): TConfig;
-  migrate(input: unknown): DisplayMigrationResult<TConfig>;
-  extract(response: unknown, config: TConfig): DisplayModel;
-  capabilities(config: TConfig): CustomWidgetCapability[];
-}
-```
-
-UI fields and renderer components may be registered in runtime/workbench companion maps keyed by the same typed display identifier. Domain descriptors remain serializable and framework-independent.
-
-## Developer-experience north star
-
-### Maintainers
-
-- Start at `packages/custom-widgets` for every feature behavior.
-- Find one module per concept and one descriptor per display type.
-- Add a display type without editing central switches in multiple packages.
-- Run one package command for core, DOM, and server tests.
-- Receive compile-time failures when a configuration field is not handled by forms, preview, migration, or export.
-- Review PRs that move one domain boundary at a time.
-
-### Administrators and template authors
-
-- Preserve the current continuous form and live workbench.
-- Keep preview usable before a live response exists through schema-valid defaults and editable sample data.
-- Keep diagnostics actionable, localized, clickable, and consistent with runtime policy.
-- Keep imports reviewable and secrets excluded.
-- Keep query and action capabilities visible without noisy permanent warnings.
-
-### AI agents
-
-- Obtain schema, registry, limits, examples, and prompt rules from the same typed sources.
-- Use readable multiline templates through authoring bundles and line-based template tools.
-- Validate, preview, inspect journals, patch, and revalidate without rewriting unrelated configuration.
-- Receive stable machine-actionable issue codes in addition to localized or human-readable messages.
-- Never need to infer runtime behavior from UI-only prompt strings.
-
-## Fragmentation rules
-
-- Production modules target at most 300 lines, excluding generated files, fixtures, and type-only declarations.
-- Algorithmic modules can reach 400 lines only with a file-level rationale and focused tests.
-- A module has one primary reason to change; moving lines without separating policy from orchestration does not satisfy the target.
-- React components do not contain schema definitions or persistence transforms.
-- Routers do not contain reusable domain algorithms.
-- Domain functions do not throw framework-specific errors.
-- Unknown input is validated once. Parsed values are not carried as `Record<string, unknown>` through internal layers.
-- Compatibility code lives in versioned migration modules and has explicit removal criteria.
-- Generated artifacts are reproducible and checked for drift, but excluded from line budgets.
-
-## Migration roadmap
-
-### PR 1 — Characterize contracts
-
-- Add round-trip tests for every display descriptor: default → form → config, stored config → form → config, and import → export.
-- Add fixtures for v1 display-only, v1 network-review-required, v2 import, and v3 export.
-- Add prompt snapshots sourced from the component registry and examples.
-- Split Node and DOM Vitest projects so server suites collect and run reliably.
-- Record bundle and render baselines before moving modules.
-
-Gate: all existing behavior is represented by tests, with no production moves yet.
-
-### PR 2 — Establish `core`
-
-- Create `@homarr/custom-widgets` and explicit exports.
-- Move custom-widget schemas, typed configs, display descriptors, examples, import/export, migration, capability analysis, and prompt generation into `core`.
-- Replace form/edit/import conversion duplication with descriptor calls.
-- Temporarily re-export legacy imports from definitions and validation to keep consumers stable.
-
-Gate: create, edit, import, export, MCP validation, and AI prompt generation use the same domain contracts.
-
-### PR 3 — Extract JSX policy and interpreter
-
-- Move AST types, parser adapter, shared security policy, analyzer, evaluator, budgets, bindings, and registry into `jsx`.
-- Separate evaluator modules by expression family and React emission.
-- Generate diagnostics and runtime enforcement from the same policy constants.
-- Keep the Mantine export-classification CI check.
-
-Gate: the security suite passes unchanged, analyzer/runtime policy drift tests pass, and no consumer imports JSX internals.
-
-### PR 4 — Extract runtime
-
-- Move built-in renderers, Custom JSX display, SubFetch, actions, toggles, refresh, and error containment into `runtime`.
-- Introduce the runtime port and adapters for board and preview contexts.
-- Remove direct imports of the API client, modals, and notifications from domain components.
-- Split request components into query, action, toggle, refresh, feedback, and shared-state modules.
-
-Gate: board rendering and workbench preview use the same runtime components through different adapters; actions retain confirmation, rollback, invalidation, and permission behavior.
-
-### PR 5 — Extract server services
-
-- Move executor, manifests, network policy, limits, caching/single-flight, and preview-session logic into `server`.
-- Replace `TRPCError` below the adapter with typed domain errors.
-- Split API procedures into management, templates, preview, and runtime routers that delegate to package services.
-- Keep authorization, database lookup, encryption, and tRPC/MCP metadata in `@homarr/api`.
-
-Gate: browser and MCP flows call the same services; request security tests run as Node package tests; public procedure names and inputs remain compatible.
-
-### PR 6 — Extract and fragment workbench
-
-- Move reusable editor, preview, response tree, import review, connection section, display picker, and display-specific fields into `workbench`.
-- Introduce a workbench port for validate, preview, query, simulate action, journal, and save callbacks.
-- Keep Next.js pages responsible only for routing, loading initial data, and constructing adapters.
-- Replace the monolithic form with small sections and descriptor-driven display fields while preserving the continuous form, two-pane scrolling, autofocus, and mobile modes.
-
-Gate: no workbench source file exceeds the agreed budget, and create/edit/paste replacement share one state model.
-
-### PR 7 — Remove scaffolding and enforce boundaries
-
-- Remove compatibility re-exports and old implementations after all consumers move.
-- Add CI checks for forbidden imports, dependency cycles, source-size budgets, untranslated literals, generated-artifact drift, component classification, and custom-JSX chunk size.
-- Update contributor and architecture documentation with package entry points and extension recipes.
-
-Gate: old ownership paths contain only thin adapters or are deleted.
-
-## Verification strategy
-
-### Core
-
-- Every display descriptor accepts valid data and rejects mismatched configuration.
-- All create/edit/import/export transformations are lossless where expected.
-- V1/v2/v3 compatibility and review states are deterministic.
-- Prompt output, authoring bundles, fixtures, docs data, and completion data are generated from shared sources.
-
-### JSX
-
-- Computed and Unicode-obfuscated reflective access remains blocked.
-- Analyzer and interpreter share property, prop, URL, and budget policy.
-- Own-property resolution, branded calls, callback accounting, and node/operation limits remain enforced.
-- Every upstream Mantine export is classified and every enabled runtime component resolves.
-
-### Runtime and workbench
-
-- Query cancellation, stale results, retries, render children, action locks, DELETE confirmation, toggle rollback, and invalidation behave identically in preview and boards.
-- Error boundaries isolate template and display failures.
-- Empty, sample, stale, loading, failure, and success states are localized and accessible.
-- Keyboard, focus, responsive, reduced-motion, and narrow-widget behavior remain covered.
-
-### Server and adapters
-
-- Board IDOR, permission levels, anonymous actions, named-request kinds, substitutions, DNS classes, redirects, headers, response limits, caching, and rate limits remain covered.
-- Server tests run under an explicit Node environment rather than failing during client-environment initialization.
-- MCP schemas and descriptions remain discoverable, stable, and absent from unsafe runtime procedures.
-
-### Required commands
-
-At the end of the migration, the package and repository must pass:
-
-```sh
-pnpm --filter @homarr/custom-widgets test
-pnpm test
-pnpm test:e2e
-pnpm turbo typecheck --affected
-pnpm turbo lint --affected
-pnpm turbo build --filter=@homarr/docs
-pnpm check:custom-widget-bundle # after the Next.js production build
-```
-
-CI additionally checks dependency direction, cycles, file budgets, generated references, translations, and client bundle size.
-
-## Completion criteria
-
-- `@homarr/custom-widgets` owns every reusable custom-widget domain behavior.
-- No circular dependencies exist.
-- The package does not import `@homarr/api`, `@homarr/widgets`, or Next.js route modules.
-- Runtime and workbench networking uses injected typed ports.
-- One typed descriptor is the source of truth for each display type.
-- One shared JSX policy drives authoring diagnostics and runtime enforcement.
-- Create, edit, import, export, preview, MCP, and board runtime use the same typed transformations.
-- Public tRPC/MCP names, import formats, stored configuration, and permission behavior remain compatible.
-- V1 display-only migration and network-review states remain tested.
-- Production modules satisfy the 300/400-line budgets.
-- No untranslated user-facing strings remain.
-- Core, JSX, runtime, server, workbench, integration, E2E, accessibility, docs, and bundle checks pass.
-- A maintainer can locate a custom-widget behavior from the package structure without searching unrelated packages.
-
-## Explicit non-goals
-
-- Replacing Mantine or Homarr's visual language.
-- Allowing arbitrary cross-origin requests.
-- Replacing named requests with general JavaScript execution.
-- Changing stored secrets or exposing them through export or MCP.
-- Redesigning the current management UX during the package extraction.
-- Removing compatibility formats before migration and review flows are proven.
-
-## Decision record
-
-- The package owns all Custom Widget behavior, not only Custom JSX.
-- Security and correctness are hard constraints.
-- Maintainer simplicity is the primary tie-breaker after those constraints.
-- Current user and agent workflows are preserved during extraction.
-- Generated artifacts do not count toward source-size budgets.
-- Migration occurs through reviewable, behavior-preserving PRs rather than a single rewrite.

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.73.0](https://github.com/homarr-labs/homarr/compare/v1.72.0...v1.73.0) (2026-07-31)
+
+## [1.72.0](https://github.com/homarr-labs/homarr/compare/v1.71.0...v1.72.0) (2026-07-24)
+
+## [1.71.0](https://github.com/homarr-labs/homarr/compare/v1.70.0...v1.71.0) (2026-07-17)
+
 ## [1.70.0](https://github.com/homarr-labs/homarr/compare/v1.69.2...v1.70.0) (2026-07-10)
 
 ## [1.69.2](https://github.com/homarr-labs/homarr/compare/v1.69.1...v1.69.2) (2026-07-06)

PRODUCT.md

@@ -0,0 +1,29 @@
+# Product
+
+## Users
+
+Homarr serves people and teams who run self-hosted applications and want one dependable dashboard for launching apps, monitoring services, and viewing live operational data. They use it across wall displays, desktops, tablets, and smaller devices, often returning to the same board many times per day.
+
+## Product Purpose
+
+Homarr makes self-hosted services easy to find, understand, and operate without hand-editing configuration files. A successful board loads immediately, stays visually stable, keeps widgets legible across screen sizes, and makes editing feel direct and forgiving.
+
+## Brand Personality
+
+Fast, capable, and approachable. Homarr should feel like a mature productivity tool: dense when useful, calm in view mode, and explicit about state during editing.
+
+## Anti-references
+
+Avoid cramped tile spacing, undersized text, layout shifts, decorative motion, hidden drag targets, modal-heavy positioning controls, and dashboards that require users to understand grid internals. Editing must not make the read-only experience heavier or slower.
+
+## Design Principles
+
+- Preserve the board: viewing is the primary workflow and must render before editor code is needed.
+- Make spatial actions direct: moving, resizing, nesting, and using fixed sidebars should happen on the canvas with immediate feedback.
+- Keep content predictable: fixed logical tile sizes preserve widget composition, typography, and controls at every viewport.
+- Recover gracefully: collision handling, reflow, loading states, and persistence failures must never lose or obscure content.
+- Use familiar controls: Mantine patterns, clear labels, keyboard support, and visible focus states take priority over novel decoration.
+
+## Accessibility & Inclusion
+
+Target WCAG 2.2 AA. Maintain keyboard equivalents for drag and resize operations, useful landmarks and announcements, sufficient contrast, readable control sizes, reduced-motion support, and horizontal scrolling before scaling content below an accessible minimum.

apps/docs/.oxlintrc.json

@@ -23,9 +23,6 @@
     "react-hooks/exhaustive-deps": "warn",
     "eslint/no-unused-expressions": "warn"
   },
-  "options": {
-    "reportUnusedDisableDirectives": "off"
-  },
   "ignorePatterns": ["**/*.config.js", "**/*.config.mjs", "**/*.cjs", ".docusaurus/**", "build/**"],
   "settings": {
     "react": { "version": "19" }

apps/docs/docs/advanced/environment-variables/index.mdx

@@ -55,9 +55,9 @@ A random secret can be generated by using the following command: `openssl rand -
 
 | Environment Variable     | Description | Possible values | Default |
 | ------------------------ | ----------- | --------------- | ------- |
-| ``DOCKER_HOSTNAMES``          | Comma seperated list of hostnames to connect to | For example `localhost,docker.example.com` | - |
-| ``DOCKER_PORTS``             | Comma seperated list of ports to connect to | For example `2375,2376` | - |
-| ``DOCKER_SOCKET_PATHS``             | Comma seperated list of paths to sockets | For example `/var/run/docker.sock,/run/user/1000/podman/podman.sock` | - |
+| ``DOCKER_HOSTNAMES``          | Comma-separated list of hostnames to connect to | For example `localhost,docker.example.com` | - |
+| ``DOCKER_PORTS``             | Comma-separated list of ports to connect to | For example `2375,2376` | - |
+| ``DOCKER_SOCKET_PATHS``             | Comma-separated list of mounted Docker-compatible socket paths. See the [Docker and Podman integration guide](/docs/integrations/docker) | For example `/var/run/docker.sock,/var/run/podman.sock` | - |
 
 ## Database
 | Environment Variable     | Description | Possible values | Default |

apps/docs/docs/advanced/single-sign-on/index.mdx

@@ -127,6 +127,8 @@ Homarr supports multiple authentication options, from internal userbase (credent
 
     If you'd rather manage group memberships for OIDC users locally (instead of via the IdP), set `AUTH_OIDC_GROUPS_LOCAL_MANAGEMENT=true`. While enabled, Homarr stops syncing OIDC users' group memberships from the groups claim, and admins can add/remove OIDC users on a group's members page. If you turn this back to `false`, the next login of each user resumes the regular sync and reconciles their groups with the IdP's claim again, which may remove memberships that were added manually while local management was enabled.
 
+    To let an existing credentials user also sign in with OIDC, set `AUTH_OIDC_ENABLE_DANGEROUS_CREDENTIALS_LINKING=true`. On the first OIDC sign-in, Homarr links a credentials user with the same email address instead of creating a second user. The user keeps their password login, local username and profile, groups, permissions, boards, settings, and API keys. OIDC profile and group claims do not overwrite the credentials-owned data. Homarr requires the OIDC profile to contain `email_verified: true` while this option is enabled. Only enable this when your OIDC provider verifies email addresses, because a matching email could otherwise be used to take over an existing account.
+
     <details>
       <summary>
         Example Setup
@@ -204,6 +206,7 @@ Homarr supports multiple authentication options, from internal userbase (credent
     | ``AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE`` | Overwrite name attribute. By default it will use preferred_username if it does not contain a `@` and otherwise name. | ---          |
     | ``AUTH_OIDC_FORCE_USERINFO`` | Force userinfo endpoint to be used for user information.    | false         |
     | ``AUTH_OIDC_ENABLE_DANGEROUS_ACCOUNT_LINKING`` | Enable account linking for OIDC provider. This will link the OIDC accounts by email. Be sure that you have verified emails to prevent stealing accounts. | false |
+    | ``AUTH_OIDC_ENABLE_DANGEROUS_CREDENTIALS_LINKING`` | Link an OIDC identity to an existing credentials user with the same email. The credentials login and existing user data are preserved. Requires the OIDC profile to contain `email_verified: true`. | false |
     | ``AUTH_OIDC_TOKEN_ENDPOINT_AUTH_METHOD`` | Override method for the token endpoint authentication. Supported values are `client_secret_basic`, `client_secret_post`, `client_secret_jwt` and `none`. | client_secret_basic |
 
     ### Permission System

apps/docs/docs/community/faq.mdx

@@ -5,47 +5,43 @@ tags:
   - Help
 ---
 
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 ### Can I install Homarr on a Raspberry Pi?
-
 Yes, Homarr is compatible with the architecture of the Raspberry Pi. Have a look in our <a href="/docs/category/installation-1">installation guide</a> on how to do so.
 
 ### I have a suggestion / idea for improvement or want to report a bug
-
 You can report issues, suggestions, or ideas for improvements <a href="https://github.com/homarr-labs/homarr/issues/new/choose">here</a>.
 
 ### Can I use my own custom icons for apps?
-
 Yes, check out our guide on <a href="/docs/advanced/customizations/icons">how to add your custom icons</a>.
 
 ### Some of my online icons are not working (anymore)
-
 It seems the `cdn.jsdelivr.net` database of icon sometimes appear in the lists for DNS-Holes (PiHole, AdGuard Home...). <br />
 So make sure to manually whitelist this address.
 
 ### Can I add my own widgets? Do I need programming skills?
+We have decided, not to support custom widgets, until Homarr is in a stable and highly polished state.
+Enabling users to write their own widgets is easy at the first glance, but there are some major issues with it:
 
-Yes. Administrators can create [Custom Widgets](/docs/management/custom-widgets) that read an HTTP API and render the response with a built-in display type. These display types require no programming.
+- There are mainly two options for adding plugins or custom widgets to Homarr. The first option is, to allow and inject custom code in Homarr. Apps like Nextcloud can do this easily, because they use the Runtime to render all components of the application (In reality, the process is still a bit more complicated). In contrast, Homarr is using Next.js - a framework that needs to be compiled in production. That means, that each time you would modify a custom widget or plugin, the app would have to be restarted. There are options to avoid this, but they are quite flakey and bring disadvantages in our experience. The second option is, to write widgets declaratively instead of imperatively. This way, we would be able to render and modify widgets without any restarting at all. However, we'd have to write our own interpreter for said declarative schema. This is totally possible, but requires a lot of planning and architecture design to function properly. The required work to implement either option is therefore quite substantial.
+- Custom widgets would need to be able to request data, so they work properly. We use tRPC for this. Many APIs use different formats and we'd have to convert and read those.
+- Using custom widgets, one could easily create harmful widgets, leak your personal data (potentially including your tokens) and trick your users. A proper implementation (eg. official plugin store, where we can ban harmful widgets from) would resolve this problem to a certain extent, but again requires additional work and time to be put in.
 
-Custom JSX is available when you need a more specific layout or an interactive control. It uses a restricted declarative JSX interpreter with a classified Mantine component set. Network operations are declared as named, same-origin requests and are checked against board permissions on the server. It does not execute arbitrary JavaScript or expose browser `fetch`.
-
-You should be comfortable reading JSON and JSX to author complex templates. The management workbench includes examples, diagnostics, a component reference, API response inspection, and a prompt you can copy into an AI assistant. Always review imported templates and request capabilities before saving them.
+If you still want to add a widget, please consider to contribute it directly to Homarr. For that, basic programming skills are required. Our [Developer Guides](/docs/advanced/development/getting-started) explain this even more detailed.
 
 ### Is it secure to expose Homarr to the web?
 
-Yes, since v0.14.0, we are confident that Homarr is secure enough to be exposed to the web.
+Yes, since v0.14.0, we are confident that Homarr is secure enough to be exposed to the web. 
 Make sure to enable the "allow anonymous access" [option in the settings](/docs/management/boards#access-control), if you want to allow people without an account to be able to see your dashboard (not edit)
 
 ### How do I open the console / log?
-
 There are two different sources of information:
-
 - console: This is your client (browser). It can tell us, if there is an issue on the client (crash, bug, ...).
 - log: This is your server. It will tell us, if there are issues with connections for the integrations, crashes and errors.
 
-Both variants _can_ contain personal data. It's recommended, that you don't post them publicly or remove personal data from it.
+Both variants *can* contain personal data. It's recommended, that you don't post them publicly or remove personal data from it.
 
 <Tabs>
   <TabItem value="apple" label="Read console" default>
@@ -53,45 +49,39 @@ Both variants _can_ contain personal data. It's recommended, that you don't post
 > Note: This will not work on most mobile browsers.
 
 Open your browser and ensure, that Homarr is your current tab.
-Press `CTRL` + `SHIFT` + `I` on your keyboard. If this shortcut doesn't work, please use one of the alternatives: https://developer.chrome.com/docs/devtools/open/.
-Click on `Console` in the new window, that opened. There, you should see white, orange and sometimes red messages. You can use the Windows Snip & Sketch tool (or your respective tool on Linux / MacOS) to screenshot those messages.
+Press ``CTRL`` + ``SHIFT`` + ``I`` on your keyboard. If this shortcut doesn't work, please use one of the alternatives: https://developer.chrome.com/docs/devtools/open/.
+Click on ``Console`` in the new window, that opened. There, you should see white, orange and sometimes red messages. You can use the Windows Snip & Sketch tool (or your respective tool on Linux / MacOS) to screenshot those messages.
 
 > Please never execute any commands in the console. Scammers are using the console to let you execute harmful commands. If you want to resolve an issue in Homarr, **you'll never have to execute any commands here**
 
   </TabItem>
   <TabItem value="orange" label="Read log">
 
-This depends on your installation method. If you use Unraid, you can simply click on the App and on `Log`. If you have a bare Docker install, use `docker container logs homarr`. If you used a different name than `homarr` for your container, you need to replace said argument. Here is some additional information about the command: https://geekflare.com/check-docker-logs/.
+This depends on your installation method. If you use Unraid, you can simply click on the App and on ``Log``. If you have a bare Docker install, use ``docker container logs homarr``. If you used a different name than ``homarr`` for your container, you need to replace said argument. Here is some additional information about the command: https://geekflare.com/check-docker-logs/.
 
   </TabItem>
 </Tabs>
 
 ### How do I post logs?
-
 Please check [the section above](#how-do-i-open-the-console--log), on how to obtain logs. Logs should always be posted to https://pastebin.com/ or https://rentry.co/.
 
 ### Can I use Homarr at my company?
-
 Yes, you can! But please consider a donation, if our work has been useful to you.
 
 ### I think I found a bug. What can I do?
-
 If you think, that you found a bug, please create an issue <a href="https://github.com/homarr-labs/homarr/issues/new/choose">here</a>.
 
 ### Why can't I use my custom icons?
-
 You need to restart the Homarr Docker container after adding icons.
 
 ### Why can't homarr see/ping containers running locally behind GluetunVPN?
-
 This is because GluetunVPN, and many other docker VPN services, secure their VPN connections with strict firewalls. These firewalls often block access to local containers, even on the same docker network. The workaround for <a href="https://github.com/qdm12/gluetun-wiki/blob/main/setup/options/firewall.md">GluetunVPN</a> is to add "- FIREWALL_OUTBOUND_SUBNETS=192.168.1.0/24" into the environmental variables of the docker compose file. If you are using a firewall on your system, you will need to add a rule that allows requests from ip's in the range of 192.168.xxx.xxx . If you are using UFW the command would be "sudo ufw allow from 192.168.0.0/16".
 Tip: If you are running your torrent client behind a VPN, and running Sonarr (or something similar) normally, make sure to open your torrent client's port in your firewall. If you don't, Sonarr will not be able to see it. Furthermore, use your machines IP (192.168.x.x) rather then 127.0.0.1 or localhost.
 
 ### Can I get in touch with you?
-
 Yes, go <a href="/docs/community/get-in-touch">here</a> to get with us in touch.
 
-<hr />
+<hr/>
 
 :::tip
 

apps/docs/docs/getting-started/after-the-installation.mdx

@@ -54,11 +54,7 @@ You must choose a username and password (both can later be changed).
 We enforce strict password requirements when you enter your password to protect your instance if you accidentally
 expose it to the internet.
 
-<img
-  src={imageStartFromScratchStepAdminUser}
-  alt={"Screenshot form to create admin user"}
-  width={300}
-/>
+<img src={imageStartFromScratchStepAdminUser} alt={"Screenshot form to create admin user"} width={300} />
 
 If you selected external providers (such as LDAP or OIDC), you'll be prompted to create an admin group.
 This group will be used to synchronize users from your provider to Homarr.
@@ -116,22 +112,14 @@ The onboarding can no longer be started again.
 From here you can click on one of the provided links to continue your journey.
 We recommend you to continue with the section [creating your first board on this page](#creating-your-first-board).
 
-<img
-  src={imageStartFromScratchStepFinish}
-  alt={"Screenshot of the finish onboarding process with links"}
-  width={300}
-/>
+<img src={imageStartFromScratchStepFinish} alt={"Screenshot of the finish onboarding process with links"} width={300} />
 
 ### Importing a ZIP from version before 1.0.0
 
 This is recommended when you used Homarr before and want to re-import your data.
 It is important that you first migrate correctly using [the list of breaking changes for 1.0](/blog/2024/09/23/version-1.0).
 
-<img
-  src={manageExportOldHomarr}
-  alt="Export from old Homarr"
-  style={{ maxWidth: 500 }}
-/>
+<img src={manageExportOldHomarr} alt="Export from old Homarr" style={{ maxWidth: 500 }} />
 
 **How to export and import data**
 
@@ -149,7 +137,8 @@ It is important that you first migrate correctly using [the list of breaking cha
 ## Creating your first board
 
 In Homarr, you organize your apps and widgets on boards.
-Boards can be organized using the interactive drag and drop.
+Boards use fixed-size tiles so the same widget keeps the same proportions on every screen.
+Drag, resize, and section controls are available in edit mode.
 Let's create your first board by navigating here: `Manage` > `Boards` > `New board`:
 ![](./img/manage-create-board-button.png)
 
@@ -197,38 +186,23 @@ Here you have the following options in the header:
 
 When entering the edit mode, you'll get some additional buttons to work with:
 
-<img
-  src={manageBoardHeaderEditMode}
-  alt={"Screenshot of buttons in the edit mode"}
-  width={200}
-/>
+<img src={manageBoardHeaderEditMode} alt={"Screenshot of buttons in the edit mode"} width={200} />
 
 - **Add item**: Click this button to add new elements to your page.
-- **Exit edit mode**: Click this btuton to save your changes and exit edit mode.
+- **Exit edit mode**: Click this button to save your changes and exit edit mode.
 
 To continue, click the option "New Item":
 
-<img
-  src={manageBoardHeaderAddItem}
-  alt={"Screenshot of the add item menu"}
-  width={200}
-/>
+<img src={manageBoardHeaderAddItem} alt={"Screenshot of the add item menu"} width={200} />
 
 Next, you can choose what item you'd like to add.
 We will discuss the other options in the following sections - for now choose "App" to continue.
 
-<img
-  src={manageBoardHeaderChooseItem}
-  alt={"Screenshot of choosing the app item in the modal"}
-  width={300}
-/>
+<img src={manageBoardHeaderChooseItem} alt={"Screenshot of choosing the app item in the modal"} width={300} />
 
 As soon as you chose the app, the modal will close and you'll get the following item on your board:
 
-<img
-  src={manageBoardNoApp}
-  alt="Screenshot of the No app element on the board"
-/>
+<img src={manageBoardNoApp} alt="Screenshot of the No app element on the board" />
 
 This is expected, because you haven't told Homarr what app it should show in this item.
 To configure this, click on the small 3 dots at the top of the item in the edit mode and choose "Edit item" in the menu.
@@ -240,21 +214,28 @@ In the modal you can edit the app that you want to display:
 ![](./img/manage-board-choose-app.png)
 
 As soon as you save your changes, the tile on the board will refresh and display your app.
-Using the small bidirectional arrow at the bottom right you can resize the element.
-Start pressing with your mouse button down, move your mouse to resize and release your finger as soon your you're happy with the size.
+Use the resize handle at the bottom right to resize the tile.
+Press and hold the handle, move the pointer, and release it when the tile has the size you want.
 
 ![](./img/resize-item.gif)
 
-To move your item to a different position on the board, simply hold the mouse button anywhere on the item and move with the mouse to the desired position.
-As soon as you release your finger, the item will snap in place in the grid.
+To move a tile in edit mode, press and hold its content, move it to the desired position, and release it.
+Widget content is disabled while editing so its controls do not intercept the drag; use the tile's settings button for edit actions.
+The tile snaps to the grid. Equally-sized tiles swap when one is dropped into the other's slot, while other neighboring tiles move out of the way automatically.
 
 ![](./img/move-item.gif)
 
+Every `1 × 1` tile has a logical content size of `200 × 200` pixels.
+Larger tiles use multiples of that fixed unit, with a consistent gap between cells.
+Homarr scales the complete board uniformly, like zooming a page.
+It stops shrinking at 75% and lets you scroll horizontally instead of making text and controls too small.
+It does not squeeze or reflow the content of individual widgets, so a widget keeps the same design and proportions across screen sizes.
+
 :::note
 
-You cannot move items freely on the vertical axis.
-We always align all items to the top of the page to simply organization.
-To move items to the bottom, you must add more items or resize items.
+Viewing a board initially uses the lightweight, non-interactive layout.
+For users with edit access, Homarr prepares drag-and-drop and resize controls in the background after the board becomes interactive.
+If you enter edit mode before that finishes, the existing board stays visible until the editor is ready.
 
 :::
 
@@ -265,8 +246,10 @@ This helps you to explore the capabilities of Homarr before you build your board
 
 :::
 
-Users on touch or mobile devices may not be able to drag and drop or move items.
-They can use the "Move / resize item" option in the edit menu of items instead:
+Keyboard users can focus a tile, press Enter or Space, then use arrow keys to move and Shift plus arrow keys to resize.
+Press Escape to stop.
+For precise numeric controls or touch input, choose **Move / resize item** from the tile's edit menu.
+The dialog can also move the tile to another section or fixed sidebar:
 
 ![](./img/manage-board-move-resize-item-menu.png)
 
@@ -338,43 +321,39 @@ As with every change, don't forget to save your changes using the exit edit mode
 
 ![](./img/exit-edit-mode.png)
 
-## Grouping your items
+## Organizing items with sections
 
-As the last step, let's organize your freshly created items using two different options.
-You can choose either or both of them on your boards.
+Sections are resizable containers for apps, widgets, and other sections.
+The same section works on the main canvas and inside a fixed sidebar.
+Each section can configure:
 
-### Using dynamic sections
-
-Dynamic sections are a simple, resizable visual group to group items.
+- Show or hide its label.
+- Allow or disable collapsing.
+- Show or hide **Open all in new tabs**.
+- Change its border color and custom CSS classes.
 
 ![](./img/create-dynamic-section.png)
 
-After adding a dynamic section, you can simply drag and drop items into the section:
+After adding a section, drag and resize it like any other tile, then drag items into it:
 
 ![](./img/dynamic-section.gif)
 
-### Using categories
+### Labeled and collapsible sections
 
-Categories are more advanced and complicated than dynamic sections.
-To create a category, open the add item modal and choose "new category":
+Open the add-content menu and choose **New section**.
+Use its settings menu to add a label and enable the behavior you want.
+In edit mode, move items into or out of the section directly.
+In view mode, each user can collapse eligible sections without changing the saved board layout.
+If **Open all in new tabs** is enabled, the section menu can open every app link it contains.
 
-![](./img/add-category.png)
+### Fixed sidebars
 
-Every category must have a name. After you click "Add category", you will get a new item on your board:
+Open the board's **Layout** settings to enable the left or right sidebar for each responsive layout.
+Choose one, two, or three columns with the slider and use the preview to check the remaining canvas width.
+The sidebar reserves those columns from the dashboard, so Homarr moves canvas items into the next available positions.
+Sidebar content stays visible while the page scrolls and remains editable.
 
-![](./img/category.gif)
-
-You can drag and drop items in to this category in the edit mode.
-Categories will have a big space before and after them in the edit mode to
-enable you to drag and drop items outside the category.
-You can also collapse or open categories in edit mode to facilitate your editing process.
-
-:::note
-
-A current limitation of categories is, that they will always have a width of 100%.
-You cannot reduce their horizontal width.
-
-:::
+Existing categories become sections automatically, and category rails become fixed sidebars.
 
 ## Guided tours
 

apps/docs/docs/getting-started/installation/helm.md

@@ -2,9 +2,9 @@
 
 <img src="https://raw.githubusercontent.com/homarr-labs/charts/refs/heads/main/charts/homarr/icon.svg" align="right" width="92" alt="homarr logo">
 
-![Version: 8.22.0](https://img.shields.io/badge/Version-8.22.0-informational?style=flat)
+![Version: 8.24.0](https://img.shields.io/badge/Version-8.24.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: v1.70.0](https://img.shields.io/badge/AppVersion-v1.70.0-informational?style=flat)
+![AppVersion: v1.72.0](https://img.shields.io/badge/AppVersion-v1.72.0-informational?style=flat)
 
 A Helm chart to deploy homarr for Kubernetes
 
@@ -259,7 +259,7 @@ httproute:
             value: /
       backendRefs:
         - name: homarr
-          port: 8080
+          port: 7575
 ````
 </details>
 
@@ -419,17 +419,17 @@ All available values are listed on the [artifacthub](https://artifacthub.io/pack
 | envSecrets.dbEncryption.key | string | `"db-encryption-key"` | Secret key for SECRET_ENCRYPTION_KEY can be generated with `openssl rand -hex 32` |
 | fullnameOverride | string | `""` | Overrides chart's fullname |
 | hostAliases | list | `[]` | Add static entries to /etc/hosts in the Pod. This is useful in the following cases: - You are running in a dual-stack cluster (IPv4 + IPv6) and want to force usage of IPv4 for specific hostnames - Your application is having DNS resolution issues or IPv6 preference issues - You need to override or simulate DNS entries without changing global DNS - You are running in an air-gapped or isolated environment without external DNS Example: hostAliases:   - ip: "192.168.1.10"     hostnames:       - "example.com"       - "example.internal" |
-| httproute | object | `{"enabled":false,"hostnames":["chart-example.local"],"parentRefs":[{"name":"my-gateway","namespace":"default"}],"rules":[{"backendRefs":[{"name":"homarr","port":8080}],"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]}` | Gateway API HTTPRoute configuration |
+| httproute | object | `{"enabled":false,"hostnames":["chart-example.local"],"parentRefs":[{"name":"my-gateway","namespace":"default"}],"rules":[{"backendRefs":[{"name":"homarr","port":7575}],"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]}` | Gateway API HTTPRoute configuration |
 | httproute.enabled | bool | `false` | Enable HTTPRoute |
 | httproute.hostnames | list | `["chart-example.local"]` | Hostnames this route matches (similar to ingress.hosts.host) |
 | httproute.parentRefs | list | `[{"name":"my-gateway","namespace":"default"}]` | References to the parent Gateway(s) this route attaches to. Each item must include at least a `name`, and optionally a `namespace`. |
-| httproute.rules | list | `[{"backendRefs":[{"name":"homarr","port":8080}],"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]` | List of routing rules. Each rule can include: - matches: path/header/query matching - filters: optional transformations (redirects, header modifications, etc.) - backendRefs: one or more Kubernetes Services to forward traffic to |
+| httproute.rules | list | `[{"backendRefs":[{"name":"homarr","port":7575}],"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]` | List of routing rules. Each rule can include: - matches: path/header/query matching - filters: optional transformations (redirects, header modifications, etc.) - backendRefs: one or more Kubernetes Services to forward traffic to |
 | httproute.rules[0].filters | list | `[]` | Optional filters for this rule (default: empty) |
 | httproute.rules[0].matches[0].path.type | string | `"PathPrefix"` | Path match type. One of: Exact, PathPrefix, RegularExpression |
 | httproute.rules[0].matches[0].path.value | string | `"/"` | Path value to match |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.repository | string | `"ghcr.io/homarr-labs/homarr"` | Image repository |
-| image.tag | string | `"v1.70.0"` | Overrides the image tag whose default is the chart appVersion |
+| image.tag | string | `"v1.72.0"` | Overrides the image tag whose default is the chart appVersion |
 | imagePullSecrets | list | `[]` | Secrets for Docker registry |
 | ingress.annotations | object | `{}` | Ingress annotations |
 | ingress.enabled | bool | `false` | Enable ingress |

apps/docs/docs/integrations/docker/index.mdx

@@ -55,6 +55,74 @@ services:
 With docker run, add this parameter: `-v /var/run/docker.sock:/var/run/docker.sock`.
 In Windows, you'll need to adjust the slashes: `-v //var/run/docker.sock:/var/run/docker.sock`
 
+### Using Podman
+
+On Linux, Homarr can connect to Podman's [Docker-compatible API](https://docs.podman.io/en/latest/markdown/podman-system-service.1.html).
+The Podman API socket must be running and mounted into the Homarr container.
+The socket grants full access to Podman, including arbitrary code execution as the user running the API, so only mount it into trusted containers.
+
+For rootless Podman, enable the socket for the user that runs Homarr:
+
+```bash
+systemctl --user enable --now podman.socket
+```
+
+The rootless socket is located at `$XDG_RUNTIME_DIR/podman/podman.sock` (usually `/run/user/<uid>/podman/podman.sock`).
+You can confirm the path with:
+
+```bash
+podman info --format '{{.Host.RemoteSocket.Path}}'
+```
+
+Mount that socket into the Homarr container and point `DOCKER_SOCKET_PATHS` to its path **inside** the container:
+
+```yaml
+services:
+  homarr:
+    container_name: homarr
+    image: ghcr.io/homarr-labs/homarr:latest
+    restart: unless-stopped
+    volumes:
+      - ${XDG_RUNTIME_DIR}/podman/podman.sock:/var/run/podman.sock
+      - ./homarr/appdata:/appdata
+    environment:
+      SECRET_ENCRYPTION_KEY: your_64_character_hex_string
+      DOCKER_SOCKET_PATHS: /var/run/podman.sock
+    ports:
+      - "7575:7575"
+```
+
+Start Homarr with `podman compose up -d`.
+Run the compose project as the same user that owns the rootless Podman socket so `$XDG_RUNTIME_DIR` resolves to the correct path.
+To keep the user socket available after logout and across reboots, enable lingering with `loginctl enable-linger <user>`.
+
+For rootful Podman, enable the system socket with `sudo systemctl enable --now podman.socket`.
+Its default path is `/run/podman/podman.sock`; mount that path instead and start Homarr with `sudo podman compose up -d`.
+
+:::note SELinux
+On systems with SELinux enabled, Podman's documentation recommends disabling label separation for a container that accesses the API socket.
+Add the following to the Homarr service:
+
+```yaml
+security_opt:
+  - label=disable
+```
+
+:::
+
+You can connect Homarr to multiple Docker-compatible sockets by mounting each socket and listing their in-container paths, separated by commas:
+
+```yaml
+services:
+  homarr:
+    image: ghcr.io/homarr-labs/homarr:latest
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ${XDG_RUNTIME_DIR}/podman/podman.sock:/var/run/podman.sock
+    environment:
+      DOCKER_SOCKET_PATHS: /var/run/docker.sock,/var/run/podman.sock
+```
+
 ### Managing your Docker containers within Homarr
 Homarr allows you to interact with Docker containers running on your system.
 Each container row has an action menu with the following options:

apps/docs/docs/integrations/immich/index.mdx

@@ -50,12 +50,11 @@ import { immichServerStatsWidget } from '../../widgets/immich-server-stats';
     <code>user.read</code>,{" "}
     <code>user.update</code>,{" "}
     <code>asset.read</code>,{" "}
+    <code>asset.view</code>,{" "}
     <code>asset.download</code>,{" "}
     <code>asset.statistics</code>,{" "}
     <code>server.statistics</code>,{" "}
     <code>server.about</code>.
-    <br />
-    Additional permissions may be required depending on your Immich version. If you encounter authorization errors, grant any missing permissions requested by the server.
   </span>
 
 ),

apps/docs/docs/integrations/navidrome/index.mdx

@@ -10,19 +10,21 @@ import { AddingIntegration } from '@site/src/components/integrations/adding';
 import { IntegrationSecrets } from '@site/src/components/integrations/secrets';
 import { navidromeIntegration } from '.';
 import { audioStatsWidget } from '@site/docs/widgets/audio-stats';
+import { mediaServerWidget } from '@site/docs/widgets/media-server';
 
 
 <IntegrationHeader
     integration={navidromeIntegration}
-    categories={['Media']}
+    categories={['Media', 'Media server']}
 />
 
-Navidrome provides music library statistics including artist, album, and song counts, as well as now playing information via the Subsonic API.
+Navidrome provides music library statistics including artist, album, and song counts, as well as now playing audio streams via the Subsonic API.
 
 ### Widgets & Capabilities
 <IntegrationCapabilites
     items={[
         { widget: audioStatsWidget },
+        { widget: mediaServerWidget },
     ]}
 />
 

apps/docs/docs/management/api/index.mdx

@@ -83,3 +83,10 @@ The OpenAPI and MCP APIs include board management endpoints for common automatio
 - Configure global board defaults such as public home boards and status behavior
 
 Use the interactive API reference to inspect the exact request body for each endpoint under the `boards` and `settings` tags.
+
+### Saving dashboard layouts
+
+The dashboard editor saves item positions and sections as one board update.
+Canvas height follows its content automatically and does not require a separate API setting.
+Responsive layouts store optional left and right gutter widths from zero to three columns.
+Gutter columns are reserved from the layout's total column count, and changing them reflows affected items.

apps/docs/docs/management/boards/index.mdx

@@ -9,11 +9,11 @@ tags:
   - Layout
 ---
 
-import iconColorImage from './img/icon-color.png'
-import itemRadiusImage from './img/item-radius.png'
-import layoutLargeImage from './img/layout-large.png'
-import layoutMediumImage from './img/layout-medium.png'
-import layoutSmallImage from './img/layout-small.png'
+import iconColorImage from "./img/icon-color.png";
+import itemRadiusImage from "./img/item-radius.png";
+import layoutLargeImage from "./img/layout-large.png";
+import layoutMediumImage from "./img/layout-medium.png";
+import layoutSmallImage from "./img/layout-small.png";
 
 Each dashboard is called a "board".
 You can create as many boards as you want.
@@ -24,24 +24,30 @@ Other boards can be viewed by direct links (e.g. my-homarr.com/board/smart-home)
 Names of boards must be unique because this will be used in the URL to load the desired board.
 
 ## Create a new board
+
 When creating a board, the availability of the board name will be checked for you.
 
 ![](./img/create-board-modal.png)
 
 ### Name
+
 The name must not include any special characters and must be at least one character long.
 Underscores and hyphen-minus are allowed.
 
 ### Column count
-Homarr has a complex drag and drop system that can be used from the browser.
-The column count defines how many horizontal columns are available to drag and drop elements to.
+
+The column count defines how many fixed-width cells are available in each row.
+One cell contains a `200 × 200` logical-pixel tile.
+Homarr scales the whole board uniformly instead of changing widget proportions, with horizontal scrolling when further shrinking would make controls too small.
 
 ### Public
+
 This will enable public access for everyone - regardless of whether they are logged in or not.
-This can be really useful if you want to have public boards in your company or for family and fiends.
+This can be really useful if you want to have public boards in your company or for family and friends.
 Modifications for public boards must be allowed explicitly using user groups and their permissions.
 
 ## Board settings
+
 You navigate to the board settings by clicking on these three dots:
 
 ![](./img/navigate-to-settings.png)
@@ -51,7 +57,9 @@ Alternatively, you can also navigate from the board page itself using the cog ic
 ![](./img/navigate-to-settings-2.png)
 
 ### General
+
 #### Page title
+
 This is the title that will be visible at the top left in the navigation bar:
 
 ![](./img/page-title.png)
@@ -59,6 +67,7 @@ This is the title that will be visible at the top left in the navigation bar:
 This field is optional and Homarr will fall back to "Homarr" if nothing is set.
 
 #### Meta title
+
 This is the secondary title of the page that is not directly visible in the page itself.
 Browser will use it to set the title of tabs:
 
@@ -67,78 +76,156 @@ Browser will use it to set the title of tabs:
 Homarr will fall back to the board name and a suffix if nothing is set.
 
 #### Logo image URL
+
 This is the URL that is used for the image at the top left.
 Homarr will fall back to the Homarr logo if nothing is set.
 
 #### Favicon image URL
+
 This is the URL that is used for the favicon in the tab title.
 Homarr will fall back to the Homarr logo if nothing is set.
 
 ### Layout
 
-In this section you can configure the different responsive layouts. Depending on your screens width the layout will change.
+In this section you can configure the different responsive layouts.
+Homarr selects a layout from the screen width, then scales its complete fixed-size canvas uniformly.
 
 ![](./img/layout-settings.png)
 
-On each element the position and size of items can be changed seperately.
+Every `1 × 1` tile has a `200 × 200` logical-pixel content area.
+The `24` logical-pixel gap between tiles is separate from that size.
+A `2 × 1` tile therefore contains two fixed cell widths plus the gap between them.
+Widgets see their logical size, while the board's visual scale makes the complete layout larger or smaller.
+When fitting below 100%, Homarr keeps widget typography and control density at their normal readable size.
+On larger canvases, the complete board grows together like browser zoom.
+The scale never drops below 75%; on narrower screens the canvas scrolls horizontally instead of shrinking controls below an accessible size.
+
+The position and size of every item can be changed separately in each responsive layout.
 When adding a new layout the position and sizes will automatically be generated depending on the column count.
-When adding a new item / dynamic section that will always be 1x1 on each layout and placed on the first available position.
+New items use their widget's default grid size, while a new inline section starts at a useful `4 × 3` size when the layout has enough columns.
+Both are placed in the first available position.
+
+Moving content downward in edit mode extends the canvas automatically, while view mode trims it back to the content.
+Nested sections keep their own resizable bounds.
 
 #### Name
 
-The name of the layout can be choosen freely. It is only used for the management and will not be visible on the board.
+The name of the layout can be chosen freely. It is only used for management and will not be visible on the board.
 
 #### Column count
 
-Amount of columns for this layout. Defines how many items can be placed in a row. When changed it will automatically adjust the position and size of the items.
+Total number of columns for this layout.
+When changed, Homarr moves items into the next available positions without overlap.
+
+#### Fixed sidebars
+
+Each responsive layout can enable a fixed left sidebar, a fixed right sidebar, or both.
+Set a sidebar width to zero to disable it for that layout.
+Choose a width from one to three columns with the three-step slider.
+The preview shows how much space remains for the main canvas.
+
+Sidebar columns are reserved from the layout's total column count.
+For example, a 12-column layout with a two-column left sidebar leaves ten columns for the canvas.
+Enabling or widening a sidebar reflows canvas items into the remaining columns.
+Disabling a sidebar moves its contents back into the next available canvas positions.
+
+Sidebars remain visible while the page scrolls.
+Apps, widgets, and sections inside them still use the same fixed `200 × 200` cells and can be rearranged in edit mode.
 
 #### Breakpoint
 
-Minimum width of the screen where the layout will be used. 
-Once the minmum of the next layout is reached the layout will change.
+Minimum width of the screen where the layout will be used.
+Once the minimum of the next layout is reached, the layout will change.
+
+#### View and edit modes
+
+View mode renders a static board without executing the drag-and-drop editor.
+After the board is interactive, Homarr prepares the editor in the background for users who can modify it.
+Entering edit mode keeps the static board visible until that preparation finishes, then enables collision-aware movement and resizing without changing the board geometry.
+Widget content is inert in edit mode, so dragging anywhere on the content moves the tile instead of activating the widget; the visible grip and tile outline indicate the active move surface, while the tile's settings button remains available.
+Dropping a tile into another tile's exact slot swaps their positions when both resulting placements fit without overlapping other content.
+For other collisions, or when a tile grows into occupied space, nearby tiles are compacted out of the way.
+The visible corner controls provide a 44-pixel resize target, and edge controls appear on hover for horizontal or vertical resizing.
+Resize handles stop at the tile's minimum allowed size while the pointer is still moving.
+Exit edit mode to save the resulting positions.
+
+Keyboard users can focus a tile, press Enter or Space, then use arrow keys to move and Shift plus arrow keys to resize.
+Press Escape to stop.
+The **Move / resize item** action in the edit menu remains available for precise numeric or touch input.
 
 #### Preview
 
-<img src={layoutSmallImage}  height={256} />
-<img src={layoutMediumImage}  height={256} />
-<img src={layoutLargeImage}  height={256} />
+<img src={layoutSmallImage} height={256} />
+<img src={layoutMediumImage} height={256} />
+<img src={layoutLargeImage} height={256} />
+
+### Sections and sidebars
+
+Sections can contain apps, widgets, and nested sections.
+Every section uses the same model whether it is on the canvas or inside a sidebar.
+Sections can be moved and resized directly in edit mode.
+Expanding it creates space for its contents and pushes following items out of the way; collapsing it compacts the board.
+
+Each section can configure:
+
+- Whether its label is visible.
+- Whether users may collapse it.
+- Whether its menu shows **Open all in new tabs**.
+- Its label, border color, and custom CSS classes.
+
+Existing categories and dynamic sections are converted into this unified section model.
+Existing category rails become board sidebars automatically.
 
 ### Background
+
 #### Background image URL
+
 Homarr can display a background image behind apps and widgets.
 This URL can be used to define what image should be shown.
 
 #### Background image attachment
+
 This defines whether the background should move when the user scrolls.
 
 #### Background image size
+
 This defines whether the background should cover the entire page (and possibly be cropped) or never be cropped but may not cover the entire page.
 
 #### Background image repeat
+
 This defines whether the background should be repeated if it cannot cover the entire page.
 This option can be useful if you have patterns that can be repeated easily (e.g. patterns):
 
 ![](./img/background-repeat.png)
 
 ### Appearance
+
 #### Primary color
+
 Color that can be chosen freely to give accents to active elements.
+
 #### Secondary color
+
 Color that can be chosen freely to give accents.
+
 #### Opacity
+
 Opacity of the colors.
+
 #### Icon color
+
 Change the color of your bookmark / app icons.
 
-<img src={iconColorImage}  height={100} />
+<img src={iconColorImage} height={100} />
 
 #### Item radius
+
 Change the radius of your items / categories.
 
-<img src={itemRadiusImage}  height={100} />
-
+<img src={itemRadiusImage} height={100} />
 
 ### Custom CSS
+
 This is the field where you can enter custom CSS.
 The styling will only be applied on the respective board page.
 
@@ -147,14 +234,16 @@ The styling will only be applied on the respective board page.
 ### Behaviour
 
 #### Disable app status
+
 This will disable the status check for apps.
 
 ### Access control
+
 With the access control, you can permit a single user or a group to your board.
 The users and groups can have one of these three levels of access:
 
 | **Permission Level** | View board | Edit mode | Settings | Danger zone (eg. delete) |
-|----------------------|------------|-----------|----------|--------------------------|
+| -------------------- | ---------- | --------- | -------- | ------------------------ |
 | View board           | X          |           |          |                          |
 | Modify board         | X          | X         | X        |                          |
 | Full access          | X          | X         | X        | X                        |
@@ -173,18 +262,23 @@ After editing permissions, the save button below the table must be pressed.
 Otherwise, all changes will be discarded.
 
 ### Danger zone
+
 #### Rename
+
 Renaming a board will break all existing links to it permanently with no redirect.
 
 #### Board visibility
+
 By default, boards will be private. This means only authenticated users that are authorized have access.
 Making a board public will expose it to everyone - including unauthenticated users.
 
 #### Delete
+
 This will permanently delete the board.
 This action is irreversible and cannot be undone.
 
 ## Delete boards
+
 The deletion of boards is permanent and cannot be undone.
 There are two ways to delete a board:
 
@@ -196,7 +290,7 @@ Both actions will execute the same deletion process.
 ## Duplicate boards
 
 :::note
-Duplicating a board will not copy the users and groups that have access to the board 
+Duplicating a board will not copy the users and groups that have access to the board
 nor the integrations the user does not have access to.
 :::
 
@@ -206,47 +300,51 @@ You can duplicate a board by clicking on the three dots in the list of boards an
 ![](./img/duplicate-board-modal.png)
 
 ## Setting boards as your home board
+
 The home board is the dashboard, that will be shown at the root path of Homarr or if no board name was passed in the URL.
 All the following paths will lead to the home board:
-- ``my-homarr.com``
-- ``my-homarr.com/boards``
+
+- `my-homarr.com`
+- `my-homarr.com/boards`
 
 Your home board will have a special small badge at the top right in the list of boards:
 
 ![](./img/home-board-flag.png)
 
 ### For yourself
+
 To set the home board yourself, the easiest option is to set it directly in the list of boards:
 
 ![](./img/set-as-home-board-menu.png)
 
 Alternatively, you can also define it via your user profile:
+
 1. Click on your user profile at the top right
-2. Click on ``Your preferences``
-3. Change the home board in the ``home board`` dropdown and click on ``Save``.
+2. Click on `Your preferences`
+3. Change the home board in the `home board` dropdown and click on `Save`.
 
 ### For other users
 
-1. Navigate to the users: ``Management`` > ``Users`` > ``Manage``
+1. Navigate to the users: `Management` > `Users` > `Manage`
 2. Click on the username of the user that you want to adjust
-3. Select the desired home board via the dropdown and click on ``Save`` \
-![](./img/set-home-board-other-user.png)
+3. Select the desired home board via the dropdown and click on `Save` \
+   ![](./img/set-home-board-other-user.png)
 
 ### For user groups
 
-1. Navigate to the user groups: ``Management`` > ``Users`` > ``Groups`` > ``Manage``
-2. Go to tab ``Settings``
-3. Select the desired home board via the dropdown and click on ``Save`` \
-![](./img/set-home-board-user-group.png)
+1. Navigate to the user groups: `Management` > `Users` > `Groups` > `Manage`
+2. Go to tab `Settings`
+3. Select the desired home board via the dropdown and click on `Save` \
+   ![](./img/set-home-board-user-group.png)
 
 ### For whole server
 
 You can also set a global home board that will be used for all users that have not set a home board themselves.
 It will also be used for anonymous users.
 
-1. Navigate to the settings: ``Management`` > ``Settings`` > ``Boards``
-2. Select the desired home board via the dropdown and click on ``Save`` \
-![](./img/set-home-board-global.png)
+1. Navigate to the settings: `Management` > `Settings` > `Boards`
+2. Select the desired home board via the dropdown and click on `Save` \
+   ![](./img/set-home-board-global.png)
 
 :::note
 For the global home board you can only select boards that are public.
@@ -255,4 +353,4 @@ For the global home board you can only select boards that are public.
 ### Mobile home board
 
 Same as the home board, you can also set a mobile home board.
-It will be used for devices that are detected as mobile devices. (Using User-Agent header)
+It will be used for devices that are detected as mobile devices. (Using User-Agent header)

apps/docs/docs/management/custom-widgets/agent-authoring.mdx

@@ -1,26 +0,0 @@
----
-sidebar_label: AI and MCP authoring
----
-
-# AI and MCP authoring
-
-Homarr exposes an iterative, validation-first workflow to authenticated administrators. Agents should continue until validation, preview, and diagnostics are clean; they must not invent inline network access.
-
-## Recommended loop
-
-1. Read `customWidget_schema` and the generated component/capability reference.
-2. Read an existing definition with `customWidget_byId`, or create a v3 draft.
-3. Call `customWidget_validate`; fix every issue using its exact path.
-4. Call `customWidget_preview` for the base GET and retain the preview session ID.
-5. Test each named query with `customWidget_previewQuery`.
-6. Dry-run every action with `customWidget_simulatePreviewAction`.
-7. Inspect `customWidget_previewJournal` for status, duration, and method coverage.
-8. Revalidate, then call import/create or a focused update/patch operation.
-
-Stored secret values are never readable. Omitting secrets during an update preserves them. MCP actions are simulation-only; enabling live preview actions remains a browser-only administrator decision.
-
-## Template format
-
-Use multiline JSX when reading or patching templates. Prefer focused template read/write/patch tools over rewriting an escaped one-line JSON string. When a complete portable artifact is needed, use the authoring bundle placeholder plus a separate fenced JSX block.
-
-The AI prompt is generated from the same registry, examples, request rules, and limits as the validator. Agents should still trust validation output over prompt memory because the installed Homarr version is authoritative.

apps/docs/docs/management/custom-widgets/architecture.mdx

@@ -1,29 +0,0 @@
----
-sidebar_label: Maintainer architecture
----
-
-# Maintainer architecture
-
-Reusable Custom Widget behavior belongs to `@homarr/custom-widgets`:
-
-- `core` owns schemas, descriptors, migrations, import/export, examples, diagnostics metadata, and prompt generation.
-- `jsx` owns AST parsing, shared policy, interpreter, bindings, registry, wrappers, and analysis.
-- `runtime` owns renderers and named-request controls through injected ports.
-- `server` owns manifests, network execution, caching, limits, preview sessions, and typed domain errors.
-- `workbench` owns form contracts, editor analysis, preview UI, response tree, and import review through injected ports.
-
-The API package retains persistence and board authorization adapters. Widgets retain board registration and runtime transport wiring. Next.js routes retain navigation and shells. The domain package must never import API, widgets, or route modules.
-
-## Add a display type
-
-Extend the typed descriptor and discriminated schema, defaults/hydration/serialization, renderer, workbench section, preview, import round-trip fixtures, docs, and translations. Create, edit, import, export, MCP, and preview must all use the same transform.
-
-## Add a JSX component
-
-Classify the upstream export, document safety mode and supported props, add a wrapper if behavior needs constraining, and update registry tests. CI fails when a Mantine upgrade introduces an unclassified export.
-
-## Change networking
-
-Implement policy below the framework-neutral server boundary and expose infrastructure through a typed port. Add tests for permissions, typed substitution, DNS classes, redirects, headers, timeouts, limits, redaction, cache behavior, and action non-retry semantics before wiring the tRPC adapter.
-
-Production files target 300 lines. Algorithmic AST/network modules may use a documented 400-line ceiling. Dependency-boundary, cycle, file-size, translation, generated-artifact, component-classification, focused unit, integration, E2E, accessibility, and docs-build gates protect the architecture. After a Next.js production build, `pnpm check:custom-widget-bundle` also enforces a 768 KiB gzip ceiling across the client chunks referenced by Custom JSX.

apps/docs/docs/management/custom-widgets/authoring.mdx

@@ -1,36 +0,0 @@
----
-sidebar_label: Authoring workbench
----
-
-# Authoring workbench
-
-The Custom Widget form is a continuous workflow: choose a display, configure the HTTP connection, configure the display, then test it in the adjacent preview. Each section stays visible so you can revisit earlier choices without losing context.
-
-## Choose a display
-
-The display grid is the first product decision. Built-in displays are best for common metrics, tables, statuses, and actions. Choose Custom JSX when the layout needs multiple Mantine components, conditional presentation, charts, dates, or named requests.
-
-Changing display type preserves shared connection fields and initializes safe display defaults. A Custom JSX template is never blank; new and migrated forms receive the tested starter fixture.
-
-## Test and preview
-
-The preview has four tabs:
-
-- **Widget** renders at compact, standard, or wide board-like sizes.
-- **Response** uses a tree to inspect data, copy paths, and insert paths into JSX. The external-response action opens a temporary local blob and never publishes the response.
-- **Request** shows the redacted base request, named capabilities, status, duration, and preview journal.
-- **Diagnostics** shows template size, named requests, network scope, and blocking or advisory issues.
-
-Only GET base requests run automatically. Preview actions are simulated until an administrator explicitly enables live actions for the five-minute preview session. DELETE still requires confirmation.
-
-## Keyboard and clipboard
-
-The JSX and JSON editors support native Ctrl/Cmd+Z and redo, plus visible toolbar controls. Cursor position, character count, and the 50,000-character limit remain visible.
-
-On the list page, paste a complete v3 export with Ctrl+V or Command+V to import it as new. On an edit page, pasting opens a replacement review. Nothing is applied before the origin, methods, credential inheritance, and permissions are shown.
-
-For AI output, prefer the authoring bundle format: a JSON block containing `"template": "__HOMARR_TEMPLATE__"`, followed by a JSX block. This keeps multiline JSX readable and avoids JSON escape errors.
-
-## Save behavior
-
-Errors block save; warnings do not. Server validation runs again on every create or update. Leaving with dirty changes triggers protection. Secrets omitted during edit remain unchanged, and secrets are never exported.

apps/docs/docs/management/custom-widgets/custom-jsx.mdx

@@ -1,49 +0,0 @@
----
-sidebar_label: Custom JSX language
----
-
-# Custom JSX language
-
-Custom JSX is a declarative expression language, not browser JavaScript. Homarr parses an explicit AST subset and emits React elements from a classified component registry. Templates cannot access browser globals, native prototypes, constructors, refs, portals, raw event handlers, or direct `fetch`.
-
-## Data and rendering
-
-The base GET response is available as `data`. Safe member access, conditionals, arrays, object literals, and interpreter-created collection callbacks can compose displays:
-
-```jsx
-<Stack gap="xs">
-  {data.services
-    .filter((service) => service.visible)
-    .map((service) => (
-      <Group key={service.id} justify="space-between">
-        <Text>{service.name}</Text>
-        <Badge color={service.online ? "green" : "red"}>{service.status}</Badge>
-      </Group>
-    ))}
-</Stack>
-```
-
-Properties are resolved own-only. Reflective names such as `constructor`, `prototype`, `__proto__`, `caller`, `callee`, `arguments`, `bind`, `call`, and `apply` are rejected even when computed or Unicode escaped.
-
-## Components and props
-
-Every Mantine export is classified as allowed, wrapped, or denied. The [generated component reference](./#component-reference) is authoritative. Props are allowlisted per component; unsupported props produce warnings and are ignored. Polymorphic roots, unsafe URLs, portals, positioning escapes, refs, and function props are stripped.
-
-`SubData` is a convenience for simple response paths. Prefer the render-child pattern for rich nested results:
-
-```jsx
-<SubFetch requestId="detail" params={{ id: data.selectedId }}>
-  {(detail, meta) => (
-    <Stack>
-      <Title>{detail.name}</Title>
-      <Text>HTTP {meta.status}</Text>
-    </Stack>
-  )}
-</SubFetch>
-```
-
-## Safe helpers and budgets
-
-Bindings include restricted conversion, string, array, object, JSON, math, URI, and pure date helpers. Native `Date` objects and native prototypes are not exposed.
-
-Templates are limited to 50,000 characters, 10,000 rendered nodes, and explicit AST-depth, operation, collection, and string budgets. Budget errors stop only the Custom JSX renderer and are contained by its error boundary.

apps/docs/docs/management/custom-widgets/extension-recipes.mdx

@@ -1,66 +0,0 @@
----
-sidebar_label: Extension recipes
----
-
-# Custom Widget extension recipes
-
-These recipes keep every authoring and runtime path on the same typed source of truth. Run `pnpm check:custom-widgets` after each structural change and add focused package tests before changing an adapter.
-
-## Add a built-in display type
-
-1. Add the discriminated configuration schema in `@homarr/custom-widgets/core`.
-2. Add one descriptor with its icon, category, localized metadata keys, defaults, hydration, serialization, and validation.
-3. Add the renderer to the runtime display map. It must consume normalized display data and injected actions only.
-4. Add a bounded workbench section that edits the descriptor-owned form fields.
-5. Add one fixture and assert create, edit, v2/v3 import, export, MCP, and preview round trips against it.
-6. Add translation keys and update the display table in the user guide.
-
-Do not add route-specific conversion code. `buildDisplayFormValues` and `buildDisplayConfigFromFormValues` are the only form conversion boundary.
-
-## Add or update a JSX component
-
-1. Classify the Mantine export as `allowed`, `wrapped`, or `denied` in the component registry. Denied entries require a reason.
-2. Declare supported props and subcomponents. Function props, refs, portals, polymorphic roots, and unsafe positioning stay denied unless a wrapper removes the unsafe behavior.
-3. Implement wrappers in the JSX package and register them through the package runtime-component factory.
-4. Add analyzer and renderer tests for accepted props, stripped props, reflective-property attacks, and the rendered-node budget.
-5. Regenerate the docs reference and verify the editor completion and AI prompt include the same entry.
-
-The component-classification test must pass against the locked Mantine version. Never expose an upstream namespace or native prototype as a shortcut.
-
-## Add a named-request capability
-
-1. Extend the request schema and manifest renderer in `core` and `server` without accepting a raw runtime URL, method, header, or body.
-2. Enforce permission, network scope, redirect, DNS, header, body, response, concurrency, and rate policies in the framework-neutral server service.
-3. Expose infrastructure through a typed server port. Translate domain errors only in the API adapter.
-4. Add the control to runtime through the injected request port. Queries use query semantics; actions require a gesture and use mutation semantics.
-5. Add preview simulation and redacted-journal coverage. Live actions remain an explicit administrator-only browser choice.
-6. Update MCP validation and simulation tools without exposing stored secrets or unrestricted action execution.
-
-Tests must prove actions are never mounted automatically, polled, retried, cached, or redirected. DELETE must retain full permission and confirmation.
-
-## Add a workbench feature
-
-1. Put reusable state, analysis, or presentation in `@homarr/custom-widgets/workbench`.
-2. Receive localized messages and typed callbacks as props. The package cannot import the tRPC client, Next.js navigation, notifications, or Homarr widget adapters.
-3. Keep the Next.js component as a transport and page-shell adapter.
-4. Cover keyboard operation, focus order, reduced motion, 320/768/desktop layouts, dirty-state behavior, and error-boundary recovery.
-5. Keep each production module below 300 lines and preserve the continuous two-pane form behavior.
-
-## Change examples or AI authoring
-
-Examples live as typed shared fixtures. Tests, snippets, documentation data, and the AI prompt consume those fixtures. AI output uses an authoring bundle: a JSON block with `__HOMARR_TEMPLATE__`, followed by a readable multiline JSX block. Do not require agents to escape an entire template into one JSON string.
-
-After changing a fixture, validate every example, render it, regenerate the component reference, and run the prompt snapshot tests. MCP agents must be able to read a widget, patch template lines with a revision, validate, preview named queries, simulate actions, inspect the journal, and update the definition without receiving secret values.
-
-## Required checks
-
-```bash
-pnpm check:custom-widgets
-pnpm test
-pnpm test:e2e
-pnpm turbo typecheck --affected
-pnpm turbo lint --affected
-pnpm turbo build --filter=@homarr/docs
-```
-
-Also run the component-classification, generated-reference drift, bundle-budget, accessibility, and focused package/API suites configured by the repository. A change is incomplete if any create, edit, import, export, MCP, preview, or board-runtime path uses a separate transform.

apps/docs/docs/management/custom-widgets/index.mdx

@@ -6,199 +6,203 @@ tags:
   - JSX
 ---
 
-import { CustomJsxComponentReference } from "@site/src/components/custom-jsx-component-reference";
-
 # Custom Widgets
 
-Custom widgets connect a dashboard item to an HTTP API without compiling a new Homarr widget. Administrators choose the endpoint and authentication, then use a built-in display type or a Custom JSX template to render the response.
+:::warning
 
-## Guides
-
-- [Authoring workbench](./authoring): create, edit, preview, paste, undo, import, and export.
-- [Custom JSX language](./custom-jsx): supported syntax, components, bindings, diagnostics, and limits.
-- [Named requests and security](./requests-and-security): permissions, network scopes, request manifests, and server protections.
-- [AI and MCP authoring](./agent-authoring): an iterative agent workflow that validates and previews before saving.
-- [Compatibility and migration](./migration): v1/v2 JSX and v2/v3 import behavior.
-- [Troubleshooting](./troubleshooting): common editor, preview, permission, and networking failures.
-- [Maintainer architecture](./architecture): package boundaries, extension points, and required tests.
-- [Extension recipes](./extension-recipes): step-by-step changes for displays, JSX components, requests, and workbench features.
-
-:::caution
-
-A custom widget can expose data or perform actions with the credentials configured for it. Import definitions only from sources you trust and review every network capability before using the widget on a shared board.
+Custom widgets are a new feature. Share feedback, ask questions, and discuss ideas in our [GitHub Discussions](https://github.com/homarr-labs/homarr/discussions/categories/custom-widgets).
 
 :::
 
-## Create a widget
+Custom widgets allow you to fetch data from any HTTP API and display it on your Homarr dashboard. You define the API endpoint, authentication, and how the response should be rendered - no code compilation or server restart required.
 
-Open **Management → Custom Widgets**, select **Add**, and configure:
+## Creating a Custom Widget
 
-- **Name, description, and icon**: identify the widget in management and the widget picker.
-- **URL**: the full HTTP or HTTPS base endpoint.
-- **Authentication**: none, bearer token, basic authentication, API-key header, or API-key query parameter.
-- **Display type**: a built-in renderer or Custom JSX.
+To create a custom widget, navigate to the **Custom Widgets** section in the management sidebar and click the **Add** button. Fill in the configuration:
 
-Use **Test** to run the current GET request. The preview workbench separates the rendered widget, sanitized response tree, redacted request journal, and diagnostics. It marks sample data as stale whenever the connection or display configuration changes after a test.
+- **Name** - Display name shown in the widget picker and on the dashboard
+- **Description** - Optional description shown in tooltips and management UI
+- **Icon URL** - Optional URL to an icon image for the widget
+- **URL** - The API endpoint to fetch data from (must include protocol, e.g. `https://api.example.com/stats`)
+- **Authentication** - How the API request is authenticated:
+  - `none` - Public APIs with no authentication
+  - `bearer` - Bearer token authentication
+  - `basic` - HTTP Basic auth (username + password)
+  - `apiKeyHeader` - API key sent as a custom HTTP header
+  - `apiKeyQuery` - API key sent as a query parameter
+- **Header Name** - Custom header or query parameter name for API key auth (e.g. `X-API-Key`)
+- **HTTP Method** - `GET`, `POST`, `PUT`, `PATCH`, or `DELETE`
+- **Request Body** - JSON string body for `POST`/`PUT`/`PATCH` requests
+- **Display Type** - How the API response is rendered (see below)
 
-Testing creates a five-minute, administrator-bound preview session for unsaved named queries. Action controls are simulated by default. An administrator can explicitly enable live actions for that session; DELETE still requires confirmation.
+## Display Types
 
-## Display types
+| Display Type         | Description                                          | Best For                                 |
+| -------------------- | ---------------------------------------------------- | ---------------------------------------- |
+| **Single Value**     | Extracts a single value with a label and unit        | Metrics: temperature, uptime, user count |
+| **Key Value**        | Multiple labeled key-value pairs with optional units | System stats: CPU, memory, disk          |
+| **Table**            | API array data rendered as a sortable table          | Lists of items with columns              |
+| **Stat Grid**        | Labeled values in colored stat cards                 | Counts: movies, series, albums           |
+| **Progress Bars**    | Values as progress bars with percentages             | Usage: disk, quota, capacity             |
+| **Status Indicator** | Green/red status dots for health checks              | Service monitoring                       |
+| **Count Grid**       | Simple counts in a grid (no colors)                  | Library counts                           |
+| **Raw**              | Pretty-prints the raw JSON response                  | Debugging                                |
+| **Action Button**    | Clickable button executing the API request           | Triggers: restart, clear cache           |
+| **Custom JSX**       | Custom JSX template with Mantine v9 components       | Full layout control                      |
 
-| Display type     | Use it for                                                |
-| ---------------- | --------------------------------------------------------- |
-| Single Value     | One metric with a label and unit                          |
-| Key Value        | Several labeled values                                    |
-| Table            | Arrays of records                                         |
-| Stat Grid        | Compact colored metrics                                   |
-| Progress Bars    | Capacity, quota, and completion                           |
-| Status Indicator | Health and availability                                   |
-| Count Grid       | Compact counters                                          |
-| Raw              | Sanitized JSON inspection                                 |
-| Action Button    | One explicit API action                                   |
-| Custom JSX       | A declarative Mantine layout with optional named requests |
+### AI-Powered JSX Generation
 
-## Custom JSX workbench
+When editing or creating a custom widget with the **Custom JSX** display type, you'll find a **Copy Prompt** button. Clicking it copies a pre-formatted prompt describing your widget's name, API endpoint, and available Mantine components. Paste this into your preferred AI assistant (ChatGPT, Claude, Copilot, etc.) to generate a JSX template tailored to your data.
 
-The JSX editor provides syntax highlighting, formatting, undo/redo buttons and Ctrl/Cmd+Z shortcuts, a searchable component reference, character and cursor status, and diagnostics. Errors block saving; warnings identify behavior that still receives server-side validation. Templates can contain up to 50,000 characters and render up to 10,000 nodes.
-
-The template reads the base GET response from `data`:
-
-```jsx
-<Stack gap="xs" p="sm">
-  <Text fw={600}>{data.name}</Text>
-  <Badge color={data.online ? "green" : "red"}>{data.status}</Badge>
-</Stack>
-```
-
-The **Copy AI prompt** action is available on desktop and mobile. Its prompt, component list, and examples are generated from the same metadata used by the renderer, so the reference stays aligned with the installed Homarr version.
-
-### JSX API versions
-
-- **Version 2** is the default. Network access is declared in a named-request manifest and enforced by the server.
-- **Version 1** remains available for display-only templates. Inline network components are disabled until the definition is reviewed and migrated.
-
-Definitions without `jsxApiVersion` are treated as version 1. Display-only templates can be migrated by selecting version 2 and saving an empty request list.
-
-## Named requests
-
-Version 2 templates never choose an arbitrary URL, method, header, or body at runtime. An administrator declares each allowed operation once, and the template references its `requestId` with typed parameters.
+<details>
+<summary>Example: Pokédex widget using Custom JSX</summary>
 
 ```json
 {
-  "type": "customJsx",
-  "jsxApiVersion": 2,
-  "networkScope": "public",
-  "template": "<SubFetch requestId=\"service-detail\" params={{ id: data.id }}><SubData path=\"status\" as=\"Badge\" /></SubFetch>",
-  "requests": [
-    {
-      "id": "service-detail",
-      "kind": "query",
-      "method": "GET",
-      "pathTemplate": "/api/services/{id}",
-      "parameters": { "id": "string" },
-      "auth": "inherit",
-      "minimumBoardPermission": "view",
-      "cacheTtlSeconds": 30
-    }
-  ]
-}
-```
-
-Path placeholders use `{parameter}` and are URL-encoded by the server. JSON body placeholders use `{ "$param": "parameter" }` and preserve the declared string, number, or boolean type.
-
-`SubData` remains available for simple paths. For richer nested output, pass an interpreter-created render child; it receives the response data and safe status metadata:
-
-```jsx
-<SubFetch requestId="service-detail" params={{ id: data.id }}>
-  {(detail, meta) => (
-    <Stack gap="xs">
-      <Badge color={detail.online ? "green" : "red"}>{detail.status}</Badge>
-      <Text size="xs">HTTP {meta.status}</Text>
-    </Stack>
-  )}
-</SubFetch>
-```
-
-| Component       | Request kind | Behavior                                                      |
-| --------------- | ------------ | ------------------------------------------------------------- |
-| `SubFetch`      | `query`      | Loads a named GET request automatically or manually           |
-| `ActionButton`  | `action`     | Runs a named POST, PUT, PATCH, or DELETE after a user gesture |
-| `ToggleSwitch`  | `action`     | Passes declared on/off parameters and rolls back on failure   |
-| `RefreshButton` | None         | Refreshes the parent GET response                             |
-
-Queries require board **view** permission. POST, PUT, and PATCH actions require **modify** by default. DELETE requires **full** permission and confirmation. Allowing viewers to execute a non-DELETE action requires explicit administrator approval. Anonymous viewers cannot execute actions.
-
-### Network scopes
-
-| Scope      | Allowed destinations                                         |
-| ---------- | ------------------------------------------------------------ |
-| `public`   | Public IP addresses only                                     |
-| `private`  | Public addresses plus RFC1918 and IPv6 ULA private addresses |
-| `loopback` | Public, private, and loopback addresses                      |
-
-Link-local, cloud-metadata, unspecified, multicast, documentation, carrier-grade NAT, and IPv4-mapped bypass addresses remain blocked in every scope.
-
-### Example with a named query
-
-The editor and AI prompt include a shared Pokédex fixture that loads details only for the visible page. Its named request is equivalent to:
-
-```json
-{
-  "id": "pokemon-detail",
-  "kind": "query",
+  "$schema": "homarr-custom-widget-v2",
+  "name": "Pokédex",
+  "description": "Browseable Pokémon list",
+  "iconUrl": "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/items/poke-ball.png",
+  "url": "https://pokeapi.co/api/v2/pokemon?limit=75",
+  "authType": "none",
   "method": "GET",
-  "pathTemplate": "/api/v2/pokemon/{name}",
-  "parameters": { "name": "string" },
-  "auth": "none",
-  "minimumBoardPermission": "view",
-  "cacheTtlSeconds": 300
+  "displayType": "customJsx",
+  "displayConfig": {
+    "type": "customJsx",
+    "template": "<Stack gap=\"md\" p=\"xs\">\n  <Card withBorder radius=\"xl\" p=\"md\" shadow=\"md\">\n    <Group justify=\"space-between\">\n      <Title order={3}>Pokédex</Title>\n    </Group>\n  </Card>\n  <PaginatedList pageSize={12}>\n    <Grid gutter=\"sm\">\n      {data.results.map((pokemon, i) =>\n        <Grid.Col span={1.5}>\n          <Anchor href={pokemon.url} target=\"_blank\" underline=\"never\">\n            <Card withBorder radius=\"xl\" p=\"xs\" shadow=\"md\">\n              <Stack gap=\"sm\" align=\"center\">\n                <Group justify=\"space-between\" style={{ width: \"100%\" }}>\n                  <Badge size=\"sm\" color=\"red\">#{i + 1}</Badge>\n                  <Text fw={800} tt=\"capitalize\">{pokemon.name}</Text>\n                </Group>\n                <Avatar\n                  src={\"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/\" + (i + 1) + \".png\"}\n                  size={92}\n                  radius=\"xl\"\n                />\n              </Stack>\n            </Card>\n          </Anchor>\n        </Grid.Col>\n      )}\n    </Grid>\n  </PaginatedList>\n</Stack>"
+  }
 }
 ```
 
-## Agent authoring through MCP
+</details>
 
-Administrators can use Homarr's MCP server to iterate on custom widgets without bypassing validation or network controls. A typical agent workflow is:
+## Importing and Exporting
 
-1. Call `customWidget_schema` to inspect the current import format.
-2. Generate a complete `homarr-custom-widget-v3` draft.
-3. Call `customWidget_validate` and correct every returned issue.
-4. Call `customWidget_preview` to test the base GET request through Homarr's hardened executor.
-5. Use `customWidget_previewQuery` for named queries and `customWidget_simulatePreviewAction` to verify action parameters without sending mutations.
-6. Inspect `customWidget_previewJournal`, then validate again.
-7. Call `customWidget_import`, or read an existing widget with `customWidget_byId` and apply a focused `customWidget_update`.
+Custom widgets can be exported and imported as JSON files. To export, select the widget in the list and click the export button. To import, click the import button and paste the JSON. Secrets (API keys, passwords) are never included in exports and must be configured after import.
 
-MCP preview actions are simulation-only. Enabling live preview actions remains an explicit administrator choice in the browser workbench. Stored secret values are never returned by MCP; omit `secrets` when updating an existing widget to preserve them.
+The import format uses `"$schema": "homarr-custom-widget-v2"` to identify the widget version.
 
-## Component reference
+## Available Mantine Components for Custom JSX
 
-Custom JSX exposes a classified subset of Mantine Core, Charts, Dates, and Homarr components. Allowed components render directly. Wrapped components receive safe props or read-only behavior. Denied components remain in the registry so dependency upgrades cannot silently expand the template surface.
+When using the `customJsx` display type, your template has access to a whitelist of [Mantine v9](https://mantine.dev) components. Unrecognized components, event handlers, and dangerous tags are stripped for security.
 
-<CustomJsxComponentReference />
+### Layout
 
-This table and the searchable component list in the editor are generated from Homarr's runtime registry.
+| Component           | Doc                                           |
+| ------------------- | --------------------------------------------- |
+| `Stack`             | [docs](https://mantine.dev/core/stack)        |
+| `Group`             | [docs](https://mantine.dev/core/group)        |
+| `Flex`              | [docs](https://mantine.dev/core/flex)         |
+| `Grid` / `Grid.Col` | [docs](https://mantine.dev/core/grid)         |
+| `SimpleGrid`        | [docs](https://mantine.dev/core/simple-grid)  |
+| `Center`            | [docs](https://mantine.dev/core/center)       |
+| `Container`         | [docs](https://mantine.dev/core/container)    |
+| `Space`             | [docs](https://mantine.dev/core/space)        |
+| `AspectRatio`       | [docs](https://mantine.dev/core/aspect-ratio) |
 
-Component props are filtered. Polymorphic roots, portals, refs, unsafe positioning, raw event handlers, and `dangerouslySetInnerHTML` are not exposed. Direct browser globals and direct `fetch` calls are unavailable, while ordinary text containing the word “fetch” is valid.
+### Typography & Content
 
-Safe bindings include conversion helpers, a restricted `Math` and `JSON` surface, object and array helpers, URI encoding helpers, and pure date formatting helpers. Collection callbacks and rendered output are subject to interpreter budgets.
+| Component         | Doc                                               |
+| ----------------- | ------------------------------------------------- |
+| `Text`            | [docs](https://mantine.dev/core/text)             |
+| `Title`           | [docs](https://mantine.dev/core/title)            |
+| `Code`            | [docs](https://mantine.dev/core/code)             |
+| `Highlight`       | [docs](https://mantine.dev/core/highlight)        |
+| `Mark`            | [docs](https://mantine.dev/core/mark)             |
+| `Kbd`             | [docs](https://mantine.dev/core/kbd)              |
+| `Blockquote`      | [docs](https://mantine.dev/core/blockquote)       |
+| `Anchor`          | [docs](https://mantine.dev/core/anchor)           |
+| `NumberFormatter` | [docs](https://mantine.dev/core/number-formatter) |
 
-## HTTP protections and limits
+### Data Display
 
-All base, preview, query, and action requests use the same server executor:
+| Component                 | Doc                                               |
+| ------------------------- | ------------------------------------------------- |
+| `Badge`                   | [docs](https://mantine.dev/core/badge)            |
+| `Card` / `Card.Section`   | [docs](https://mantine.dev/core/card)             |
+| `Paper`                   | [docs](https://mantine.dev/core/paper)            |
+| `Alert`                   | [docs](https://mantine.dev/core/alert)            |
+| `ThemeIcon`               | [docs](https://mantine.dev/core/theme-icon)       |
+| `ColorSwatch`             | [docs](https://mantine.dev/core/color-swatch)     |
+| `Avatar` / `Avatar.Group` | [docs](https://mantine.dev/core/avatar)           |
+| `Image`                   | [docs](https://mantine.dev/core/image)            |
+| `BackgroundImage`         | [docs](https://mantine.dev/core/background-image) |
+| `Indicator`               | [docs](https://mantine.dev/core/indicator)        |
+| `Pill`                    | [docs](https://mantine.dev/core/pill)             |
+| `Spoiler`                 | [docs](https://mantine.dev/core/spoiler)          |
 
-- Only HTTP and HTTPS are accepted. URL credentials and fragments are rejected.
-- Named paths must stay on the base endpoint origin.
-- DNS results are validated against the selected network scope and pinned for the request.
-- Queries can follow up to three revalidated same-origin redirects. Actions do not follow redirects.
-- Authorization, cookie, host, forwarding, proxy, content-length, and hop-by-hop headers cannot be supplied by a template.
-- Request bodies are limited to 10 KiB. Decompressed responses are limited to 1 MiB, 32 JSON levels, and 50,000 JSON nodes.
-- GET requests can be cached and deduplicated. Actions are never cached, polled, or retried automatically.
+### Tables
 
-## Import and export
+| Component                               | Doc                                    |
+| --------------------------------------- | -------------------------------------- |
+| `Table` / `Table.Thead` / `Table.Tbody` | [docs](https://mantine.dev/core/table) |
+| `Table.Tr` / `Table.Th` / `Table.Td`    | [docs](https://mantine.dev/core/table) |
 
-New exports use `"$schema": "homarr-custom-widget-v3"`. Version 2 imports remain accepted. Secrets are never exported and must be entered again after import.
+### Lists
 
-Review the base origin, network scope, named request methods, inherited authentication, and required permissions before saving an imported widget. A version 1 template that contains inline network components stays disabled until it is converted to named requests.
+| Component                    | Doc                                       |
+| ---------------------------- | ----------------------------------------- |
+| `List` / `List.Item`         | [docs](https://mantine.dev/core/list)     |
+| `Timeline` / `Timeline.Item` | [docs](https://mantine.dev/core/timeline) |
 
-AI-generated Custom JSX can also be pasted as a Homarr authoring bundle: one fenced JSON block with `"template": "__HOMARR_TEMPLATE__"`, followed by one fenced JSX block containing the readable multiline template. Homarr combines the blocks before validation, avoiding JSON newline and quote escaping. Raw JSON imports remain supported.
+### Feedback & Loading
 
-On the custom-widget list, paste a complete export with Ctrl+V or Command+V to open the import review and create it as a new definition. On an edit page, the same shortcut opens a replacement review and fills the existing form after confirmation. Pasted definitions never include secrets.
+| Component                       | Doc                                            |
+| ------------------------------- | ---------------------------------------------- |
+| `Progress` / `Progress.Section` | [docs](https://mantine.dev/core/progress)      |
+| `RingProgress`                  | [docs](https://mantine.dev/core/ring-progress) |
+| `Skeleton`                      | [docs](https://mantine.dev/core/skeleton)      |
+| `Loader`                        | [docs](https://mantine.dev/core/loader)        |
+
+### Navigation & Overlay
+
+| Component                                                                | Doc                                          |
+| ------------------------------------------------------------------------ | -------------------------------------------- |
+| `TabsContainer` / `TabPanel`                                             | Custom interactive component                 |
+| `Accordion` / `Accordion.Item` / `Accordion.Control` / `Accordion.Panel` | [docs](https://mantine.dev/core/accordion)   |
+| `ScrollArea`                                                             | [docs](https://mantine.dev/core/scroll-area) |
+| `Tooltip`                                                                | [docs](https://mantine.dev/core/tooltip)     |
+
+### Charts
+
+| Component        | Doc                                                 |
+| ---------------- | --------------------------------------------------- |
+| `AreaChart`      | [docs](https://mantine.dev/charts/area-chart)       |
+| `BarChart`       | [docs](https://mantine.dev/charts/bar-chart)        |
+| `LineChart`      | [docs](https://mantine.dev/charts/line-chart)       |
+| `DonutChart`     | [docs](https://mantine.dev/charts/donut-chart)      |
+| `PieChart`       | [docs](https://mantine.dev/charts/pie-chart)        |
+| `RadarChart`     | [docs](https://mantine.dev/charts/radar-chart)      |
+| `RadialBarChart` | [docs](https://mantine.dev/charts/radial-bar-chart) |
+| `Sparkline`      | [docs](https://mantine.dev/charts/sparkline)        |
+
+### Interactive Components
+
+| Component       | Description                              |
+| --------------- | ---------------------------------------- |
+| `PaginatedList` | Client-side pagination wrapper           |
+| `Collapsible`   | Expandable/collapsible section           |
+| `StatBar`       | Horizontal stat bar                      |
+| `TypeBadge`     | Type-styled badge                        |
+| `Divider`       | [docs](https://mantine.dev/core/divider) |
+
+## Template Bindings
+
+Your template receives:
+
+- `data` - The sanitized API response object. Access fields via `data.fieldName` or `data.results[0].name`.
+- `String(v)` - Type-safe string conversion
+- `Number(v)` - Type-safe number conversion
+- `Boolean(v)` - Type-safe boolean conversion
+- `Math` - Safe subset: `round`, `floor`, `ceil`, `abs`, `min`, `max`, `pow`, `sqrt`, `PI`
+- `JSON.stringify(v)` - JSON serialization
+- `Array.isArray(v)` - Array type check
+- `Object.keys(v)`, `Object.values(v)`, `Object.entries(v)` - Object utilities
+
+## Security Constraints
+
+- Event handlers (`onClick`, `onChange`, etc.) are stripped
+- Dangerous HTML attributes (`dangerouslySetInnerHTML`) are stripped
+- `script`, `iframe`, `object`, `embed`, `form`, `style`, `link`, `meta`, `base` tags are forbidden
+- Template strings containing `eval`, `Function`, `import`, `require`, `globalThis`, `window`, `document`, `fetch` are rejected
+- Anchor `href` attributes are validated to only allow `https://`, relative (`/`), and hash (`#`) URLs

apps/docs/docs/management/custom-widgets/migration.mdx

@@ -1,19 +0,0 @@
----
-sidebar_label: Compatibility and migration
----
-
-# Compatibility and migration
-
-Homarr preserves existing display definitions while moving network-enabled Custom JSX to the named-request model.
-
-## JSX API versions
-
-Missing `jsxApiVersion` means v1. Display-only v1 templates can be opened and saved as v2 with an empty request manifest. Inline `url`, `method`, `headers`, and body props are inert in v2.
-
-Static v1 network components can be converted by creating a named request and replacing inline capability props with `requestId` and typed `params`. Dynamic target construction requires an administrator to design an explicit path template and parameter list. Existing non-GET base definitions stop polling and show a network-review state.
-
-## Import versions
-
-Exports use `homarr-custom-widget-v3`; v2 imports remain accepted. Import migration normalizes display configuration, preserves v1 semantics, and never imports secret values. The review screen must be accepted before persistence.
-
-Test migration with the same base response and compare rendered output, query results, action simulation, permissions, and journal entries before enabling the migrated definition on shared boards.

apps/docs/docs/management/custom-widgets/requests-and-security.mdx

@@ -1,32 +0,0 @@
----
-sidebar_label: Requests and security
----
-
-# Named requests and security
-
-Custom JSX v2 uses a saved request manifest. Runtime components pass only a `requestId` and declared primitive parameters; they cannot change the URL, method, headers, authentication, or body shape.
-
-## Capability kinds
-
-`SubFetch` references a GET `query`. `ActionButton` and `ToggleSwitch` reference a POST, PUT, PATCH, or DELETE `action`. Base data is GET-only. Actions require an explicit gesture and are never polled, cached, retried automatically, or run on mount.
-
-Default board permissions are view for queries, modify for POST/PUT/PATCH, and full for DELETE. Viewer actions require explicit high-risk approval; anonymous users cannot execute actions. DELETE always requires confirmation.
-
-## Parameter substitution
-
-Path placeholders use `{name}` and are URL-encoded by the server. Runtime parameters must exactly match all declared names and types. JSON bodies substitute `{ "$param": "name" }` recursively and preserve string, number, or boolean types.
-
-## Network boundary
-
-Named paths stay on the base URL origin. HTTP and HTTPS are accepted; URL credentials and fragments are rejected. DNS answers are classified and pinned. Public, private, and loopback scopes progressively allow destinations, but link-local, metadata, unspecified, multicast, documentation, carrier-grade NAT, and IPv4-mapped addresses are always blocked.
-
-Queries may follow three revalidated same-origin redirects. Actions do not follow redirects. Credentials never cross origins. Reserved authentication, cookie, host, forwarding, proxy, content-length, security, and hop-by-hop headers cannot be declared.
-
-## Limits
-
-- Request body: 10 KiB UTF-8.
-- Decompressed response: 1 MiB, 32 JSON levels, 50,000 JSON nodes.
-- Per user/item: 60 queries, 10 actions, and 3 deletes per minute.
-- Concurrency: 4 per user/item and 8 per definition.
-
-Successful GETs can use manifest cache TTLs and single-flight deduplication. Logs contain redacted origin/method/error metadata, never secrets, request bodies, or query values.

apps/docs/docs/management/custom-widgets/troubleshooting.mdx

@@ -1,33 +0,0 @@
----
-sidebar_label: Troubleshooting
----
-
-# Troubleshooting
-
-## The preview says the template is required
-
-New Custom JSX forms always include the starter fixture. If an imported definition has an empty template, reopen its import review; malformed imports must be corrected rather than previewed as JSX.
-
-## A prop is ignored
-
-The diagnostics name the component and prop. Check the generated component reference. Unsupported props are intentionally removed; use a supported layout primitive or wrapper prop instead of polymorphic, portal, ref, positioning, or raw handler props.
-
-## A request does not run
-
-Confirm that the component kind matches the manifest: `SubFetch` needs a query; action controls need an action. Parameter names and primitive types must match exactly. Base requests and queries require GET. Actions only run from a gesture, and edit mode disables controls.
-
-## Network scope errors
-
-Resolve the hostname from the Homarr server environment. Select private or loopback scope only when required and understood. Link-local and metadata destinations cannot be enabled by any scope. Redirects must remain on the base origin.
-
-## Permission errors
-
-The placed board item is the authorization anchor. A definition ID alone cannot authorize credential use. Verify board view/modify/full access, explicit viewer-action approval, and that the caller is not anonymous.
-
-## Stale or failed preview data
-
-Connection, authentication, body, method, secret, or manifest changes mark samples stale. Run the GET test again. Background query failures keep prior content visible and offer retry; actions roll toggles back and show error feedback.
-
-## Import paste is ignored
-
-Paste a complete v2/v3 JSON export or authoring bundle while the list or edit page is focused. Ordinary text and partial JSON are ignored so normal typing is not intercepted.

apps/docs/docs/management/mcp.mdx

@@ -73,7 +73,13 @@ Replace `<your-api-key>` with your actual API key. Never commit API keys to vers
   "mcpServers": {
     "homarr": {
       "command": "npx",
-      "args": ["-y", "mcp-remote", "https://your-homarr-instance.com/api/mcp/mcp", "--header", "ApiKey:<your-api-key>"]
+      "args": [
+        "-y",
+        "mcp-remote",
+        "https://your-homarr-instance.com/api/mcp/mcp",
+        "--header",
+        "ApiKey:<your-api-key>"
+      ]
     }
   }
 }
@@ -120,26 +126,25 @@ curl -s -X POST \
 
 Homarr exposes 50+ tools organized by namespace. Each tool is either a **query** (GET, read-only) or **mutation** (POST, write action).
 
-| Namespace          | Example Tools                                             | Type       |
-| ------------------ | --------------------------------------------------------- | ---------- |
-| `app`              | List all apps, get app by ID, create/update/delete app    | GET + POST |
-| `apiKeys`          | List API keys                                             | GET        |
-| `beszel`           | Systems status, alerts, historical system metrics         | GET        |
-| `board`            | List boards, get board by ID, create/update/delete board  | GET + POST |
-| `docker`           | List containers, inspect container, start/stop/restart    | GET + POST |
-| `icon`             | Search icons                                              | GET        |
-| `info`             | Server health, version info                               | GET        |
-| `integration`      | List integrations, test connection, delete integration    | GET + POST |
-| `invite`           | List invitations, delete invite                           | GET + POST |
-| `calendar`         | Calendar events from media servers                        | GET        |
-| `customWidget`     | Validate, preview, create, and iteratively update widgets | GET + POST |
-| `dnsHole`          | DNS hole summary, toggle blocking                         | GET + POST |
-| `downloads`        | Active downloads, pause/resume/delete                     | GET + POST |
-| `healthMonitoring` | Resource usage stats                                      | GET        |
-| `patchmon`         | Host patch and security update statistics                 | GET        |
-| `mediaRequests`    | Approve/decline media requests                            | GET + POST |
-| `mediaServer`      | Media server sessions and stats                           | GET        |
-| `smartHome`        | Execute automations, device states                        | GET + POST |
+| Namespace          | Example Tools                                            | Type       |
+| ------------------ | -------------------------------------------------------- | ---------- |
+| `app`              | List all apps, get app by ID, create/update/delete app   | GET + POST |
+| `apiKeys`          | List API keys                                            | GET        |
+| `beszel`           | Systems status, alerts, historical system metrics        | GET        |
+| `board`            | List boards, get board by ID, create/update/delete board | GET + POST |
+| `docker`           | List containers, inspect container, start/stop/restart   | GET + POST |
+| `icon`             | Search icons                                             | GET        |
+| `info`             | Server health, version info                              | GET        |
+| `integration`      | List integrations, test connection, delete integration   | GET + POST |
+| `invite`           | List invitations, delete invite                          | GET + POST |
+| `calendar`         | Calendar events from media servers                       | GET        |
+| `dnsHole`          | DNS hole summary, toggle blocking                        | GET + POST |
+| `downloads`        | Active downloads, pause/resume/delete                    | GET + POST |
+| `healthMonitoring` | Resource usage stats                                     | GET        |
+| `patchmon`         | Host patch and security update statistics                | GET        |
+| `mediaRequests`    | Approve/decline media requests                           | GET + POST |
+| `mediaServer`      | Media server sessions and stats                          | GET        |
+| `smartHome`        | Execute automations, device states                       | GET + POST |
 
 The tools table on the MCP tab is dynamically generated - it always reflects the latest available procedures from your Homarr instance.
 
@@ -149,8 +154,6 @@ The tools table on the MCP tab is dynamically generated - it always reflects the
 - Tools inherit the permissions of the API key's owner
 - OAuth endpoints are rate-limited to prevent abuse
 - Tool execution errors are contained - a failing tool call does not crash the MCP server
-- Custom-widget MCP actions are simulation-only; live preview actions must be enabled explicitly in the browser workbench
-- Custom-widget secret values are never returned through MCP
 - All communication uses HTTPS (configure HTTP → HTTPS redirects on your reverse proxy)
 
 ## Use Cases
@@ -162,58 +165,3 @@ The tools table on the MCP tab is dynamically generated - it always reflects the
 - **"How many users are on my Homarr instance?"** - AI lists all users (admin only)
 - **"Toggle Pi-hole blocking for 5 minutes"** - AI interacts with DNS controls
 - **"How are my servers doing?"** - AI fetches Beszel system stats including CPU, memory, disk, and alerts
-- **"Build and refine a custom widget for this API"** - AI validates the draft, tests GET data and named queries, simulates actions, and creates or updates the widget
-
-## Custom Widget Workflow for AI Agents
-
-AI agents can create and iterate on custom widgets using these tools in sequence.
-
-:::tip Editing an existing widget?
-Skip to step 5. Use `customWidget_byId` to fetch it and `customWidget_readTemplate` / `customWidget_writeTemplate` to edit its template directly.
-:::
-
-### 1. Get the schema
-
-Call `customWidget_schema` to receive the JSON Schema for the `homarr-custom-widget-v3` format. This tells the agent what fields are required and their types.
-
-### 2. Draft and validate
-
-Build a widget JSON object and call `customWidget_validate` with it. The tool returns structured issues (path + message) so the agent can fix and re-validate until the draft is clean.
-
-### 3. Create the widget
-
-Call `customWidget_import` with the validated `homarr-custom-widget-v3` draft. This returns the new widget `id`. Use `customWidget_create` only when you intentionally need its lower-level creation input, including secret fields.
-
-### 4. Test with real data
-
-Call `customWidget_preview` with the widget's connection info. This makes a real GET request through Homarr's hardened executor and returns the sanitized response plus a preview session ID.
-
-For Custom JSX v2 widgets with named requests, use `customWidget_previewQuery` to test each named GET query, and `customWidget_simulatePreviewAction` to dry-run actions without network calls.
-
-### 5. Iterate on the template
-
-Use `customWidget_readTemplate` to get the current JSX template as plain text, then `customWidget_writeTemplate` to push updates. The write tool accepts either:
-
-- `template` — a single string (newlines as `\n`)
-- `templateLines` — an array of strings (joined with newlines server-side, avoids `\n` escaping)
-
-Both options validate the template AST before saving. This avoids re-sending the full widget JSON for template-only edits.
-
-For small changes, prefer `customWidget_patchTemplate`. Pass the `revision` returned by `customWidget_readTemplate` and one or more line edits. Homarr rejects stale revisions, applies all edits atomically, and validates the complete template against its named request manifest before saving.
-
-### 6. Update non-template fields
-
-Call `customWidget_byId` to get the full widget, modify fields, and call `customWidget_update` with only the changed fields.
-
-### Available components in templates
-
-Custom JSX templates support 100+ Mantine components plus:
-
-- `<TablerIcon name="server" size={20} color="blue" />` — 100+ curated Tabler icons by kebab-case name (e.g. `"player-play"`, `"alert-triangle"`)
-- `<SubFetch>` / `<ActionButton>` / `<ToggleSwitch>` — network-capable components for named requests
-- Array methods: `map`, `filter`, `find`, `findIndex`, `some`, `every`, `reduce`, `sort`, `slice`, `flat`, `reverse`, `at`, `pop`, `join`, `includes`, `indexOf` (note: `pop` returns last element without mutating)
-- String methods: `toUpperCase`, `toLowerCase`, `trim`, `trimStart`, `trimEnd`, `slice`, `substring`, `includes`, `startsWith`, `endsWith`, `split`, `replace`, `replaceAll`, `repeat`, `padStart`, `padEnd`, `charAt`, `indexOf`, `lastIndexOf`
-
-:::note
-All `customWidget_*` tools require admin-level API key permissions. The preview executor enforces rate limits (60 queries/min, 10 actions/min).
-:::

apps/docs/docs/widgets/audio-stats/index.mdx

@@ -1,43 +1,45 @@
 ---
-title: 'Audio Stats'
-description: 'Displays library statistics from Navidrome or Audiobookshelf, adapting its display based on the linked integration.'
+title: "Audio Stats"
+description: "Displays media and listening statistics from Navidrome or Audiobookshelf, adapting its display based on the linked integration."
 hide_title: true
 ---
 
-import { WidgetHeader } from '@site/src/components/widgets/header';
-import { AddingWidget } from '@site/src/components/widgets/adding';
-import { WidgetConfig } from '@site/src/components/widgets/configuration';
-import { WidgetIntegrations } from '@site/src/components/widgets/integrations';
-import { audioStatsWidget } from '.';
-import { navidromeIntegration } from '@site/docs/integrations/navidrome';
-import { audiobookshelfIntegration } from '@site/docs/integrations/audiobookshelf';
+import { WidgetHeader } from "@site/src/components/widgets/header";
+import { AddingWidget } from "@site/src/components/widgets/adding";
+import { WidgetConfig } from "@site/src/components/widgets/configuration";
+import { WidgetIntegrations } from "@site/src/components/widgets/integrations";
+import { audioStatsWidget } from ".";
+import { navidromeIntegration } from "@site/docs/integrations/navidrome";
+import { audiobookshelfIntegration } from "@site/docs/integrations/audiobookshelf";
 
-
-<WidgetHeader
-  widget={audioStatsWidget}
-  categories={['Media']}
-/>
+<WidgetHeader widget={audioStatsWidget} categories={["Media"]} />
 
 This widget adapts its display based on the linked integration:
 
-- **Navidrome**: Shows artist, album, and song counts, plus a now playing section with active streams
+- **Navidrome**: Shows artist, album, and song counts
 - **Audiobookshelf**: Shows library count, audiobook/podcast totals, listening time, and active sessions
 
 Only options relevant to your linked integration are shown in the configuration panel.
 
 ### Supported Integrations
 
-<WidgetIntegrations items={[{
-  integration: navidromeIntegration,
-  note: "Displays music library stats and now playing"
-}, {
-  integration: audiobookshelfIntegration,
-  note: "Displays audiobook/podcast library stats and listening time"
-}]} />
+<WidgetIntegrations
+  items={[
+    {
+      integration: navidromeIntegration,
+      note: "Displays music library statistics",
+    },
+    {
+      integration: audiobookshelfIntegration,
+      note: "Displays audiobook/podcast library stats and listening time",
+    },
+  ]}
+/>
 
 ### Adding the widget
 
 <AddingWidget />
 
 ### Configuration
+
 <WidgetConfig configuration={audioStatsWidget.configuration} />

apps/docs/docs/widgets/audio-stats/index.ts

@@ -27,24 +27,6 @@ export const audioStatsWidget: WidgetDefinition = {
         values: { type: "boolean" },
         defaultValue: "yes",
       },
-      {
-        name: "Show now playing",
-        description: "Displays currently playing tracks (Navidrome only)",
-        values: { type: "boolean" },
-        defaultValue: "yes",
-      },
-      {
-        name: "Show now playing list",
-        description: "Displays a detailed list of now playing tracks (Navidrome only)",
-        values: { type: "boolean" },
-        defaultValue: "yes",
-      },
-      {
-        name: "Max now playing items",
-        description: "Maximum number of now playing tracks to display (Navidrome only)",
-        values: "Number (1-5)",
-        defaultValue: "3",
-      },
       {
         name: "Show library count",
         description: "Displays the number of libraries (Audiobookshelf only)",

apps/docs/docs/widgets/beszel-system-stats/index.mdx

@@ -15,7 +15,7 @@ import beszelSystemStats from "./img/beszel-system-stats.png";
 
 <WidgetHeader widget={beszelSystemStatsWidget} categories={["System Monitoring", "Charts"]} />
 
-This widget displays time-series charts for a selected Beszel system, including CPU, memory, disk, network, and Docker container metrics. The Disk Usage chart combines the root disk and every extra filesystem reported by Beszel. You can use the realtime Live view or select a historical period ranging from 1 hour to 30 days. If the live stream drops, the widget now shows the connection failure state immediately and can switch back to historical data.
+This widget displays time-series charts for a selected Beszel system, including CPU, memory, disk, network, and Docker container metrics. The Disk Usage chart combines the root disk and every extra filesystem reported by Beszel. You can use the realtime Live view or select a historical period ranging from 1 hour to 30 days. Live view keeps a one-minute window and pauses while the browser tab is hidden. If the live stream drops, the widget now shows the connection failure state immediately and can switch back to historical data.
 
 ### Screenshots
 

apps/docs/docs/widgets/custom-api/index.mdx

@@ -1,39 +1,29 @@
 ---
-title: "Custom API"
-description: "Displays data from an administrator-defined HTTP API using built-in renderers or safe Custom JSX."
+title: 'Custom API'
+description: 'Displays data from a custom API endpoint using configurable display types and optional JSX templates.'
 hide_title: true
 ---
 
-import { WidgetHeader } from "@site/src/components/widgets/header";
-import { AddingWidget } from "@site/src/components/widgets/adding";
-import { customApiWidget } from ".";
+import { WidgetHeader } from '@site/src/components/widgets/header';
+import { AddingWidget } from '@site/src/components/widgets/adding';
+import { customApiWidget } from '.';
 
-<WidgetHeader widget={customApiWidget} categories={["Custom", "API"]} />
 
-The Custom API widget displays an API definition created by an administrator in [Management → Custom Widgets](/docs/management/custom-widgets). A definition owns the endpoint, credentials, display configuration, and any named network capabilities used by Custom JSX.
+<WidgetHeader
+  widget={customApiWidget}
+  categories={['Custom', 'API']}
+/>
 
-### Add the widget
+This widget fetches data from a custom API endpoint defined in [Custom Widgets management](/docs/management/custom-widgets) and renders it using configurable display types.
+
+Custom API widgets are created and configured through the admin management page. Each widget definition specifies the API endpoint, authentication, display type, and refresh interval.
+
+See the [Custom Widgets documentation](/docs/management/custom-widgets) for full details on creating and configuring custom widgets.
+
+### Adding the widget
 
 <AddingWidget />
 
-Choose a custom-widget definition and a refresh interval. The board item stores only the selected definition and display options; credentials remain server-side.
-
 :::note
-
-A definition must be enabled and available to the board before it appears in the widget picker.
-
+Custom API widgets must first be created in **Management → Custom Widgets** before they appear in the widget picker.
 :::
-
-### Permissions and actions
-
-The base response and named query requests require permission to view the board. Named POST, PUT, and PATCH actions require permission to modify the board by default. DELETE requires full board permission and a confirmation. Anonymous viewers cannot execute actions.
-
-Interactive controls are disabled while the board is in edit mode. Actions run only after an explicit user gesture and are never triggered by mounting, refresh polling, or automatic retries. Authoring previews simulate actions unless an administrator explicitly enables live actions for the short-lived preview session.
-
-### Refresh behavior
-
-The refresh interval applies to the base GET response. A Custom JSX query can declare its own cache duration and can be refreshed manually. Named actions can invalidate the parent response or related named queries after they succeed.
-
-If the definition needs a non-GET base request, migrate it to a GET base response plus a named action. Existing non-GET Custom JSX definitions require review before network access is enabled.
-
-See [Custom Widgets management](/docs/management/custom-widgets) for the editor, display types, named-request manifest, network scopes, security limits, and migration guidance.

apps/docs/docs/widgets/downloads/index.mdx

@@ -4,6 +4,7 @@ description: 'Allows you to view and manage your Downloads from both Torrent and
 hide_title: true
 ---
 
+import { aria2Integration } from '@site/docs/integrations/aria2';
 import { delugeIntegration } from '@site/docs/integrations/deluge';
 import { nzbgetIntegration } from '@site/docs/integrations/nzbget';
 import { qBittorentIntegration } from '@site/docs/integrations/q-bittorent';
@@ -14,9 +15,6 @@ import { AddingWidget } from '@site/src/components/widgets/adding';
 import { WidgetConfig } from '@site/src/components/widgets/configuration';
 import { WidgetHeader } from '@site/src/components/widgets/header';
 import { WidgetIntegrations } from '@site/src/components/widgets/integrations';
-import { IconAd } from "@tabler/icons-react";
-import TabItem from '@theme/TabItem';
-import Tabs from '@theme/Tabs';
 import { downloadsWidget } from '.';
 
 
@@ -25,16 +23,37 @@ import { downloadsWidget } from '.';
   categories={['Torrent client', 'Usenet client', 'Downloads']}
 />
 
-This widget displays a list of torrents or usenet-articles that are currently being downloaded, along with their progress and other relevant information.
+This widget displays a list of torrents or usenet-articles that are currently being downloaded, along with their progress and other relevant information. It supports 7 download client integrations and provides a rich, responsive table interface.
 
 ### Screenshots
 
 import downloadsCard from './img/screenshot.png';
+import contextMenuImg from './img/context-menu.png';
 
 <div>
-    <img src={downloadsCard} alt="downloads" width={128 * 4} />
+    <img src={downloadsCard} alt="Downloads widget showing torrent and usenet items" width={128 * 4} />
 </div>
 
+#### Right-click context menu
+
+<div>
+    <img src={contextMenuImg} alt="Downloads widget context menu with pause, delete, and copy actions" width={128 * 4} />
+</div>
+
+### Features
+
+- **Responsive table** — columns automatically adapt to widget width, hiding less important columns at smaller sizes
+- **Sortable columns** — click any column header to sort ascending/descending
+- **Column customization** — choose which columns to display via the widget options panel
+- **Right-click context menu** — pause, resume, delete downloads, or copy download names directly from the context menu
+- **Row expansion** — click any row to see full details inline without opening a separate modal
+- **Hover tooltips** — hover a download name to see size, speeds, ETA, ratio, and category
+- **Global stats bar** — toggle a summary bar showing queue progress, total size, speeds, ratio, and per-state counts
+- **Client filtering** — filter downloads by integration or status using the footer filter panel
+- **Global controls** — pause/resume all downloads across all clients from the footer bar
+- **Status indicators** — color-coded badges show download state at a glance
+- **Speed overview** — total download and upload speeds displayed in the footer
+
 ### Supported Integrations
 
 <WidgetIntegrations items={[{
@@ -52,16 +71,23 @@ import downloadsCard from './img/screenshot.png';
 }, {
   integration: qBittorentIntegration,
   note: "Torrent client"
+}, {
+  integration: aria2Integration,
+  note: "Multi-protocol download client"
 }, {
   integration: slskdIntegration,
-  note: "Soulseek client"
+  note: "Soulseek client (read-only)"
 }]} />
 
 ### Interactions
 
-- Pause / Resume one download by clicking on the according icon.
-- Delete one download by clicking on the trash icon. (Can also delete the files)
-- Pause / Resume all downloads by using the bottom button.
+- **Right-click** any download to open a context menu with pause/resume, delete, and copy actions
+- **Click** any row to expand it and see full download details inline
+- **Hover** a download name for a quick stats tooltip
+- **Stats toggle** — show or hide the global stats bar from the footer
+- **Pause / Resume** all downloads using the footer controls
+- **Filter** by integration or status using the filter button in the footer
+- **Sort** by clicking column headers (with persistent sort direction)
 
 ### Adding the widget
 

apps/docs/docs/widgets/downloads/index.ts

@@ -2,26 +2,23 @@ import { WidgetDefinition } from "@site/src/types";
 import { IconDownload } from "@tabler/icons-react";
 
 const columnsList = [
-  "id",
-  "actions",
-  "added",
-  "category",
-  "downSpeed",
-  "index",
-  "integration",
   "name",
   "progress",
+  "size",
+  "downSpeed",
+  "upSpeed",
+  "time",
+  "state",
+  "added",
   "ratio",
   "received",
   "sent",
-  "size",
-  "state",
-  "time",
+  "category",
+  "integration",
+  "index",
   "type",
-  "upSpeed",
 ];
-const sortingExclusion = ["actions", "id", "state"];
-const columnsSort = columnsList.filter((column) => !sortingExclusion.some((exclusion) => exclusion === column));
+const sortColumns = columnsList.filter((c) => !["state", "category", "integration"].includes(c));
 
 export const downloadsWidget: WidgetDefinition = {
   icon: IconDownload,
@@ -32,25 +29,20 @@ export const downloadsWidget: WidgetDefinition = {
     items: [
       {
         name: "Columns to show",
-        description: "Select the columns you want to display in the widget.",
+        description:
+          "Select the columns you want to display in the widget. Columns automatically hide/show based on widget width.",
         values: `List of columns: ${columnsList.join(", ")}`,
-        defaultValue: ["integration", "name", "progress", "time", "actions"].join(", "),
+        defaultValue: ["name", "progress", "downSpeed", "time", "state"].join(", "),
       },
       {
-        name: "Enable items sorting",
-        description: "Enables the sorting in the table.",
-        values: { type: "boolean" },
-        defaultValue: "no",
-      },
-      {
-        name: "Column used for sorting by default",
-        description: "By default it will sort by this column.",
-        defaultValue: "type",
-        values: `List of columns: ${columnsSort.join(", ")}`,
+        name: "Default sort column",
+        description: "The column used for initial sorting when the widget loads.",
+        defaultValue: "progress",
+        values: `List of columns: ${sortColumns.join(", ")}`,
       },
       {
         name: "Invert sorting",
-        description: "This will invert the sorting order of the table.",
+        description: "This will invert the default sorting order.",
         values: { type: "boolean" },
         defaultValue: "no",
       },
@@ -76,13 +68,13 @@ export const downloadsWidget: WidgetDefinition = {
         name: "Hide completed torrent under this threshold (in kiB/s)",
         description:
           "This will hide completed torrent entries that have a download speed below the specified threshold.",
-        values: "Any number above 1, 0 to disable",
+        values: "Any number above 0, 0 to disable",
         defaultValue: "0",
       },
       {
-        name: "Categories/names to filter",
-        description: "You can filter the items by categories or names. Use a comma to separate multiple values.",
-        values: "Comma-separated list of categories or names",
+        name: "Categories/labels to filter",
+        description: "You can filter the items by categories or labels. Use a comma to separate multiple values.",
+        values: "Comma-separated list of categories or labels",
         defaultValue: "-",
       },
       {
@@ -94,13 +86,13 @@ export const downloadsWidget: WidgetDefinition = {
       },
       {
         name: "Use filter to calculate Ratio",
-        description: "This will use the filter to calculate the ratio of items shown in the widget.",
+        description: "This will use the category filter when calculating the global torrent ratio.",
         values: { type: "boolean" },
         defaultValue: "yes",
       },
       {
         name: "Limit items per integration",
-        description: "This will limit the number of items shown per integration, not globally",
+        description: "This will limit the number of items shown per integration, not globally.",
         values: "Any number above 1",
         defaultValue: "50",
       },

apps/docs/docs/widgets/immich-album-carousel/index.mdx

@@ -1,6 +1,6 @@
 ---
 title: 'Immich Album Carousel'
-description: 'Shows a slideshow of your album pictures from Immich'
+description: 'Shows a slideshow of pictures from an Immich album or your full library'
 hide_title: true
 ---
 
@@ -37,4 +37,3 @@ import screen from './img/screen.png';
 
 ### Configuration
 <WidgetConfig configuration={immichAlbumCarouselWidget.configuration} />
-

apps/docs/docs/widgets/immich-album-carousel/index.ts

@@ -4,15 +4,16 @@ import { IconPhoto } from "@tabler/icons-react";
 export const immichAlbumCarouselWidget: WidgetDefinition = {
   icon: IconPhoto,
   name: "Immich Album",
-  description: "Shows a slideshow of your album pictures from Immich",
+  description: "Shows a slideshow of pictures from an Immich album or your full library",
   path: "../../widgets/immich-album-carousel",
   configuration: {
     items: [
       {
         name: "Album",
-        description: "Select the Immich album to show in the slideshow.",
+        description:
+          "Select an Immich album or All photos. An empty selection also shows random photos from your full library.",
         values: { type: "string" },
-        defaultValue: "",
+        defaultValue: "All photos",
       },
       {
         name: "Interval in seconds",

apps/docs/docs/widgets/media-request-list/index.mdx

@@ -1,41 +1,44 @@
 ---
-title: 'Media Request List'
-description: 'See a list of all media requests from your integration'
+title: "Media Request List"
+description: "See a list of all media requests from your integration"
 hide_title: true
 ---
 
-import { WidgetHeader } from '@site/src/components/widgets/header';
-import { AddingWidget } from '@site/src/components/widgets/adding';
-import { WidgetConfig } from '@site/src/components/widgets/configuration';
-import { WidgetIntegrations } from '@site/src/components/widgets/integrations';
+import { WidgetHeader } from "@site/src/components/widgets/header";
+import { AddingWidget } from "@site/src/components/widgets/adding";
+import { WidgetConfig } from "@site/src/components/widgets/configuration";
+import { WidgetIntegrations } from "@site/src/components/widgets/integrations";
 import { IconAd } from "@tabler/icons-react";
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-import { mediaRequestListWidget } from '.';
-import { jellyseerrIntegration } from '@site/docs/integrations/jellyseerr';
-import { overseerrIntegration } from '@site/docs/integrations/overseerr';
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+import { mediaRequestListWidget } from ".";
+import { jellyseerrIntegration } from "@site/docs/integrations/jellyseerr";
+import { overseerrIntegration } from "@site/docs/integrations/overseerr";
 
-
-<WidgetHeader
-  widget={mediaRequestListWidget}
-  categories={['Media requests']}
-/>
+<WidgetHeader widget={mediaRequestListWidget} categories={["Media requests"]} />
 
 Provides a list of all open and recently closed requests. It also provides the functionality to approve or reject requests.
 
+You can limit the list to specific request statuses (for example, only show `pending`) and restrict it to requests created within the last N days.
+
 ### Screenshots
 
-import mediaRequestList from './img/list.png';
+import mediaRequestList from "./img/list.png";
 
 <img src={mediaRequestList} alt="media-request-list" width={256} height={256} />
 
 ### Supported Integrations
 
-<WidgetIntegrations items={[{
-  integration: jellyseerrIntegration,
-}, {
-  integration: overseerrIntegration,
-}]} />
+<WidgetIntegrations
+  items={[
+    {
+      integration: jellyseerrIntegration,
+    },
+    {
+      integration: overseerrIntegration,
+    },
+  ]}
+/>
 
 ### Interactions
 
@@ -47,4 +50,5 @@ import mediaRequestList from './img/list.png';
 <AddingWidget />
 
 ### Configuration
+
 <WidgetConfig configuration={mediaRequestListWidget.configuration} />

apps/docs/docs/widgets/media-request-list/index.ts

@@ -14,6 +14,18 @@ export const mediaRequestListWidget: WidgetDefinition = {
         values: { type: "boolean" },
         defaultValue: "yes",
       },
+      {
+        name: "Statuses to show",
+        description: "Only requests with these statuses will be shown. Defaults to all statuses.",
+        values: "List of: 'pending', 'approved', 'declined', 'failed', 'completed'",
+        defaultValue: "All statuses",
+      },
+      {
+        name: "Show only recent requests",
+        description: "Limit to requests created within this many days. Set to 0 to disable the time filter.",
+        values: "0-365",
+        defaultValue: "0",
+      },
     ],
   },
 };

apps/docs/docs/widgets/media-server/index.mdx

@@ -14,6 +14,7 @@ import TabItem from '@theme/TabItem';
 import { mediaServerWidget } from '.';
 import { embyIntegration } from '@site/docs/integrations/emby';
 import { jellyfinIntegration } from '@site/docs/integrations/jellyfin';
+import { navidromeIntegration } from '@site/docs/integrations/navidrome';
 import { plexIntegration } from '@site/docs/integrations/plex';
 
 
@@ -39,6 +40,9 @@ import mediaTable from './img/table.png';
   integration: embyIntegration,
 }, {
   integration: jellyfinIntegration,
+}, {
+  integration: navidromeIntegration,
+  note: "Will always show only currently playing audio streams, not all active sessions."
 }, {
   integration: plexIntegration,
   note: "Will always show only currently playing streams, not all active sessions."
@@ -50,4 +54,3 @@ import mediaTable from './img/table.png';
 
 ### Configuration
 <WidgetConfig configuration={mediaServerWidget.configuration} />
-

apps/docs/docs/widgets/media-server/index.ts

@@ -10,7 +10,7 @@ export const mediaServerWidget: WidgetDefinition = {
     items: [
       {
         name: "Show only currently playing",
-        description: "Disabling this will not work for plex.",
+        description: "Plex and Navidrome always show only currently playing streams.",
         values: { type: "boolean" },
         defaultValue: "yes",
       },

apps/docs/src/components/custom-jsx-component-reference.tsx

@@ -1,66 +0,0 @@
-import React from "react";
-
-import customJsxComponentRegistry from "../generated/custom-jsx-components.json";
-
-const enabledComponents = customJsxComponentRegistry.filter((component) => component.safety !== "denied");
-const deniedComponents = customJsxComponentRegistry.filter((component) => component.safety === "denied");
-const categories = [...new Set(enabledComponents.map((component) => component.category))];
-
-export function CustomJsxComponentReference() {
-  return (
-    <>
-      <h3>Enabled and wrapped components</h3>
-      <table>
-        <thead>
-          <tr>
-            <th>Category</th>
-            <th>Components</th>
-          </tr>
-        </thead>
-        <tbody>
-          {categories.map((category) => (
-            <tr key={category}>
-              <td>
-                <code>{category}</code>
-              </td>
-              <td>
-                {enabledComponents
-                  .filter((component) => component.category === category)
-                  .map((component) => (
-                    <span key={component.name} style={{ display: "inline-block", margin: "0 0.5rem 0.35rem 0" }}>
-                      <a href={component.documentationUrl}>
-                        <code>{component.name}</code>
-                      </a>
-                      {component.safety === "wrapped" && <small> (wrapped)</small>}
-                    </span>
-                  ))}
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-
-      <h3>Denied components</h3>
-      <table>
-        <thead>
-          <tr>
-            <th>Component</th>
-            <th>Reason</th>
-          </tr>
-        </thead>
-        <tbody>
-          {deniedComponents.map((component) => (
-            <tr key={component.name}>
-              <td>
-                <a href={component.documentationUrl} aria-label={component.name}>
-                  <code>{component.name}</code>
-                </a>
-              </td>
-              <td>{component.reason}</td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </>
-  );
-}

apps/nextjs/next.config.ts

@@ -68,6 +68,10 @@ const nextConfig: NextConfig = {
       {
         source: "/(.*)", // Apply CSP to all routes
         headers: [
+          {
+            key: "Accept-CH",
+            value: "Sec-CH-Viewport-Width",
+          },
           {
             key: "Content-Security-Policy",
             // worker-src / media-src with blob: is necessary for video.js, see https://github.com/homarr-labs/homarr/issues/3912 and https://stackoverflow.com/questions/65792855/problem-with-video-js-and-content-security-policy-csp

apps/nextjs/package.json

@@ -14,12 +14,6 @@
     "with-env": "dotenv -e ../../.env --"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "catalog:",
-    "@codemirror/commands": "catalog:",
-    "@codemirror/lang-javascript": "catalog:",
-    "@codemirror/lang-json": "catalog:",
-    "@codemirror/lint": "catalog:",
-    "@codemirror/view": "catalog:",
     "@dnd-kit/core": "catalog:",
     "@dnd-kit/modifiers": "catalog:",
     "@dnd-kit/sortable": "catalog:",
@@ -32,13 +26,11 @@
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
-    "@homarr/custom-widgets": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/definitions": "workspace:^0.1.0",
     "@homarr/docker": "workspace:^0.1.0",
     "@homarr/form": "workspace:^0.1.0",
     "@homarr/forms-collection": "workspace:^0.1.0",
-    "@homarr/gridstack": "catalog:",
     "@homarr/icons": "workspace:^0.1.0",
     "@homarr/image-proxy": "workspace:^0.1.0",
     "@homarr/integrations": "workspace:^0.1.0",
@@ -75,7 +67,6 @@
     "@trpc/next": "catalog:",
     "@trpc/react-query": "catalog:",
     "@trpc/server": "catalog:",
-    "@uiw/react-codemirror": "catalog:",
     "@xterm/addon-canvas": "catalog:",
     "@xterm/addon-fit": "catalog:",
     "@xterm/xterm": "catalog:",
@@ -89,6 +80,7 @@
     "drizzle-orm": "catalog:",
     "flag-icons": "catalog:",
     "glob": "catalog:",
+    "gridstack": "catalog:",
     "isomorphic-dompurify": "catalog:",
     "jotai": "catalog:",
     "jszip": "catalog:",

apps/nextjs/src/app/[locale]/boards/(content)/(home)/_definition.ts

@@ -1,9 +1,13 @@
+import { cache } from "react";
+
 import { api } from "@homarr/api/server";
 
 import { createBoardContentPage } from "../_creator";
 
+const getHomeBoardCachedAsync = cache(async () => await api.board.getHomeBoard());
+
 export default createBoardContentPage<{ locale: string }>({
   async getInitialBoardAsync() {
-    return await api.board.getHomeBoard();
+    return await getHomeBoardCachedAsync();
   },
 });

apps/nextjs/src/app/[locale]/boards/(content)/[name]/(board)/_definition.tsx

@@ -1,9 +1,13 @@
+import { cache } from "react";
+
 import { api } from "@homarr/api/server";
 
 import { createBoardContentPage } from "../../_creator";
 
+const getBoardByNameCachedAsync = cache(async (name: string) => await api.board.getBoardByName({ name }));
+
 export default createBoardContentPage<{ locale: string; name: string }>({
   async getInitialBoardAsync({ name }) {
-    return await api.board.getBoardByName({ name });
+    return await getBoardByNameCachedAsync(name);
   },
 });

apps/nextjs/src/app/[locale]/boards/(content)/_client.module.css

@@ -0,0 +1,20 @@
+.columns {
+  display: grid;
+  align-items: start;
+  gap: 24px;
+}
+
+.lane {
+  min-width: 0;
+}
+
+.gutter {
+  position: sticky;
+  top: 0;
+  align-self: start;
+  max-height: calc(100dvh - var(--app-shell-header-offset, 0px) - var(--mantine-spacing-md));
+  overflow-y: auto;
+  overscroll-behavior: contain;
+  scrollbar-gutter: stable;
+  transform: translateY(var(--board-gutter-sticky-offset, 0px));
+}

apps/nextjs/src/app/[locale]/boards/(content)/_client.tsx

@@ -1,33 +1,168 @@
 "use client";
 
-import { Box, Stack } from "@mantine/core";
+import { useEffect, useRef } from "react";
+import { Box } from "@mantine/core";
 
-import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
+import { useCurrentLayout, useInitialViewportWidth, useRequiredBoard } from "@homarr/boards/context";
+import { useScopedI18n } from "@homarr/translation/client";
 
-import { BoardCategorySection } from "~/components/board/sections/category-section";
+import {
+  getBoardLaneColumnCount,
+  getInitialBoardLogicalHeight,
+  getLogicalTrackSize,
+  LOGICAL_GRID_GAP,
+  getRootSectionForLane,
+} from "~/components/board/layout";
+import { ScaledBoardCanvas } from "~/components/board/layout/scaled-board-canvas";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
+import { BoardGridPortalHost } from "~/components/board/sections/grid/grid-portal-host";
+import { BoardSectionCollapseProvider } from "~/components/board/sections/section-collapse";
 import { BoardBackgroundVideo } from "~/components/layout/background";
+import classes from "./_client.module.css";
+
+const APP_SHELL_INLINE_PADDING = 32;
+
+const useFixedBoardGutters = () => {
+  const columnsRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const columns = columnsRef.current;
+    if (!columns) return;
+
+    let frame = 0;
+    const update = () => {
+      frame = 0;
+      const columnsRect = columns.getBoundingClientRect();
+      const headerBottom = document.querySelector("header")?.getBoundingClientRect().bottom ?? 0;
+      const stickyTop = Math.max(0, headerBottom + 16);
+
+      for (const gutter of columns.querySelectorAll<HTMLElement>("[data-board-gutter]")) {
+        const rect = gutter.getBoundingClientRect();
+        if (gutter.offsetWidth <= 0) continue;
+
+        const effectiveScale = rect.width / gutter.offsetWidth;
+        if (!Number.isFinite(effectiveScale) || effectiveScale <= 0) continue;
+
+        const previousOffset = Number(gutter.dataset.stickyOffset ?? 0);
+        const uncorrectedTop = rect.top - previousOffset * effectiveScale;
+        const maximumTop = columnsRect.bottom - rect.height;
+        const targetTop = Math.min(stickyTop, maximumTop);
+        const nextOffset = Math.max(0, targetTop - uncorrectedTop) / effectiveScale;
+
+        gutter.dataset.stickyOffset = String(nextOffset);
+        gutter.style.setProperty("--board-gutter-sticky-offset", `${nextOffset}px`);
+      }
+    };
+    const scheduleUpdate = () => {
+      if (frame !== 0) return;
+      frame = window.requestAnimationFrame(update);
+    };
+
+    const resizeObserver = new ResizeObserver(scheduleUpdate);
+    resizeObserver.observe(columns);
+    document.addEventListener("scroll", scheduleUpdate, { capture: true, passive: true });
+    window.addEventListener("resize", scheduleUpdate, { passive: true });
+    scheduleUpdate();
+
+    return () => {
+      window.cancelAnimationFrame(frame);
+      resizeObserver.disconnect();
+      document.removeEventListener("scroll", scheduleUpdate, { capture: true });
+      window.removeEventListener("resize", scheduleUpdate);
+    };
+  }, []);
+
+  return columnsRef;
+};
 
 export const ClientBoard = () => {
   const board = useRequiredBoard();
+  const t = useScopedI18n("board.landmark");
   const currentLayoutId = useCurrentLayout();
+  const initialViewportWidth = useInitialViewportWidth();
+  const columnsRef = useFixedBoardGutters();
+  const currentLayout = board.layouts.find((layout) => layout.id === currentLayoutId) ?? board.layouts.at(0);
+  if (!currentLayout) throw new Error("Expected the board to contain a layout");
 
-  const fullWidthSortedSections = board.sections
-    .filter((section) => section.kind === "empty" || section.kind === "category")
-    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset);
+  const mainSection = getRootSectionForLane(board, "main");
+  const leftSection = getRootSectionForLane(board, "left");
+  const rightSection = getRootSectionForLane(board, "right");
+  if (!mainSection) throw new Error("Expected the board to contain a main canvas section");
+
+  const leftColumnCount = getBoardLaneColumnCount(currentLayout, "left");
+  const mainColumnCount = getBoardLaneColumnCount(currentLayout, "main");
+  const rightColumnCount = getBoardLaneColumnCount(currentLayout, "right");
+  const laneWidths = [leftColumnCount, mainColumnCount, rightColumnCount]
+    .filter((columnCount) => columnCount > 0)
+    .map(getLogicalTrackSize);
+  const logicalWidth =
+    laneWidths.reduce((total, width) => total + width, 0) + (laneWidths.length - 1) * LOGICAL_GRID_GAP;
+  const initialLogicalHeight = getInitialBoardLogicalHeight(board, currentLayoutId);
+  const initialAvailableWidth = Math.max(1, initialViewportWidth - APP_SHELL_INLINE_PADDING);
+  const gridTemplateColumns = [
+    leftColumnCount > 0 ? `${getLogicalTrackSize(leftColumnCount)}px` : null,
+    `${getLogicalTrackSize(mainColumnCount)}px`,
+    rightColumnCount > 0 ? `${getLogicalTrackSize(rightColumnCount)}px` : null,
+  ]
+    .filter((value) => value !== null)
+    .join(" ");
 
   return (
     <Box h="100%" pos="relative">
       <BoardBackgroundVideo />
-      <Stack h="100%">
-        {fullWidthSortedSections.map((section) =>
-          section.kind === "empty" ? (
-            <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
-          ) : (
-            <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />
-          ),
-        )}
-      </Stack>
+      <BoardSectionCollapseProvider>
+        <BoardGridPortalHost>
+          <ScaledBoardCanvas
+            logicalWidth={logicalWidth}
+            initialLogicalHeight={initialLogicalHeight}
+            initialAvailableWidth={initialAvailableWidth}
+            label={board.name}
+          >
+            <div ref={columnsRef} className={classes.columns} style={{ gridTemplateColumns }}>
+              {leftColumnCount > 0 && leftSection && (
+                <aside
+                  className={`${classes.lane} ${classes.gutter}`}
+                  aria-label={t("leftRail")}
+                  data-board-gutter="left"
+                >
+                  <BoardEmptySection
+                    key={`${currentLayoutId}-${leftSection.id}`}
+                    section={leftSection}
+                    columnCount={leftColumnCount}
+                    requestedRowCount={0}
+                    railPlacement="left"
+                  />
+                </aside>
+              )}
+
+              <section className={classes.lane} aria-label={t("canvas")}>
+                <BoardEmptySection
+                  key={`${currentLayoutId}-${mainSection.id}`}
+                  section={mainSection}
+                  columnCount={mainColumnCount}
+                  requestedRowCount={0}
+                />
+              </section>
+
+              {rightColumnCount > 0 && rightSection && (
+                <aside
+                  className={`${classes.lane} ${classes.gutter}`}
+                  aria-label={t("rightRail")}
+                  data-board-gutter="right"
+                >
+                  <BoardEmptySection
+                    key={`${currentLayoutId}-${rightSection.id}`}
+                    section={rightSection}
+                    columnCount={rightColumnCount}
+                    requestedRowCount={0}
+                    railPlacement="right"
+                  />
+                </aside>
+              )}
+            </div>
+          </ScaledBoardCanvas>
+        </BoardGridPortalHost>
+      </BoardSectionCollapseProvider>
     </Box>
   );
 };

apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx

@@ -2,15 +2,11 @@ import type { Metadata } from "next";
 import { Suspense } from "react";
 import { TRPCError } from "@trpc/server";
 
-// Placed here because gridstack styles are used for board content
-import "~/styles/gridstack.scss";
-
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import type { PersistedClient } from "@tanstack/react-query-persist-client";
 import superjson from "superjson";
 import { queryCacheBuster } from "@homarr/api/query-cache";
 import { getQueryClient } from "@homarr/api/server";
-import { IntegrationProvider } from "@homarr/auth/client";
 import { auth } from "@homarr/auth/next";
 import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
 import { isNullOrWhitespace } from "@homarr/common";
@@ -25,8 +21,9 @@ import { createMetaTitle } from "~/metadata";
 import { env } from "~/env";
 import { createBoardLayout } from "../_layout-creator";
 import type { Board, Item } from "../_types";
-import { DynamicClientBoard } from "./_dynamic-client";
+import { ClientBoard } from "./_client";
 import { BoardContentHeaderActions } from "./_header-actions";
+import { BoardIntegrationProvider } from "./_integration-provider";
 
 const logger = createLogger({ module: "createBoardContentPage" });
 
@@ -85,9 +82,9 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
             <QueryCacheHydration userId={userId} boardId={board.id} />
           </Suspense>
           <HydrationBoundary state={dehydrate(queryClient)}>
-            <IntegrationProvider integrations={integrations}>
-              <DynamicClientBoard />
-            </IntegrationProvider>
+            <BoardIntegrationProvider initialIntegrations={integrations}>
+              <ClientBoard />
+            </BoardIntegrationProvider>
           </HydrationBoundary>
         </>
       );

apps/nextjs/src/app/[locale]/boards/(content)/_dynamic-client.tsx

@@ -1,7 +0,0 @@
-"use client";
-
-import dynamic from "next/dynamic";
-
-export const DynamicClientBoard = dynamic(() => import("./_client").then((mod) => mod.ClientBoard), {
-  ssr: false,
-});

apps/nextjs/src/app/[locale]/boards/(content)/_edit-actions.tsx

@@ -0,0 +1,77 @@
+"use client";
+
+import { Group, Menu } from "@mantine/core";
+import { IconBox, IconChevronDown, IconLayoutGridAdd, IconPlug, IconPlus, IconResize } from "@tabler/icons-react";
+
+import { useSession } from "@homarr/auth/client";
+import { useModalAction } from "@homarr/modals";
+import { AppSelectModal } from "@homarr/modals-collection";
+import { useI18n } from "@homarr/translation/client";
+
+import { useItemActions } from "~/components/board/items/item-actions";
+import { ItemSelectModal } from "~/components/board/items/item-select-modal";
+import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
+import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
+import { HeaderButton } from "~/components/layout/header/button";
+
+export default function BoardEditActions() {
+  return <AddMenu />;
+}
+
+const AddMenu = () => {
+  const { data: session } = useSession();
+  const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
+  const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
+  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
+  const { addDynamicSection } = useDynamicSectionActions();
+  const { createItem } = useItemActions();
+  const t = useI18n();
+
+  const handleSelectItem = () => {
+    openItemSelectModal();
+  };
+
+  const handleSelectApp = () => {
+    openAppSelectModal({
+      onSelect: (app) => {
+        createItem({
+          kind: "app",
+          options: { appId: app.id },
+        });
+      },
+      withCreate: session?.user.permissions.includes("app-create") ?? false,
+    });
+  };
+
+  const handleAddIntegration = () => {
+    openIntegrationSelectModal({});
+  };
+
+  return (
+    <Menu position="bottom-end">
+      <Menu.Target>
+        <HeaderButton w="auto" px={4} aria-label={t("board.action.addContent")}>
+          <Group gap={4} wrap="nowrap">
+            <IconPlus stroke={1.5} />
+            <IconChevronDown color="gray" size={16} />
+          </Group>
+        </HeaderButton>
+      </Menu.Target>
+      <Menu.Dropdown style={{ transform: "translate(-3px, 0)" }}>
+        <Menu.Item leftSection={<IconResize size={20} />} onClick={handleSelectItem}>
+          {t("item.action.create")}
+        </Menu.Item>
+        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectApp}>
+          {t("app.action.add")}
+        </Menu.Item>
+        <Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
+          {t("integration.action.create")}
+        </Menu.Item>
+        <Menu.Divider />
+        <Menu.Item leftSection={<IconLayoutGridAdd size={20} />} onClick={addDynamicSection}>
+          {t("section.dynamic.action.create")}
+        </Menu.Item>
+      </Menu.Dropdown>
+    </Menu>
+  );
+};

apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx

@@ -1,49 +1,50 @@
 "use client";
 
-import { useCallback, useEffect } from "react";
+import { startTransition, useCallback, useEffect, useState } from "react";
+import dynamic from "next/dynamic";
 import { useRouter } from "next/navigation";
 import { OnboardingTour } from "@gfazioli/mantine-onboarding-tour";
-import { Box, Group, Menu, ScrollArea } from "@mantine/core";
+import { Box, Menu, ScrollArea } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
-import {
-  IconBox,
-  IconBoxAlignTop,
-  IconChevronDown,
-  IconLayoutBoard,
-  IconPencil,
-  IconPencilOff,
-  IconPlug,
-  IconPlus,
-  IconReplace,
-  IconResize,
-  IconSettings,
-} from "@tabler/icons-react";
+import { IconLayoutBoard, IconPencil, IconPencilOff, IconReplace, IconSettings } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
-import { useSession } from "@homarr/auth/client";
 import { useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { env } from "@homarr/common/env";
 import { hotkeys } from "@homarr/definitions";
-import { useConfirmModal, useModalAction } from "@homarr/modals";
-import { AppSelectModal } from "@homarr/modals-collection";
+import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { Link } from "@homarr/ui";
 
-import { useItemActions } from "~/components/board/items/item-actions";
-import { ItemSelectModal } from "~/components/board/items/item-select-modal";
 import { useBoardPermissions } from "~/components/board/permissions/client";
-import { useCategoryActions } from "~/components/board/sections/category/category-actions";
-import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
-import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
-import { IntegrationSelectModal } from "~/components/integration/integration-select-modal";
+import { loadGridEditorAsync, scheduleGridEditorWarmup } from "~/components/board/sections/grid/grid-editor-loader";
 import { HeaderButton } from "~/components/layout/header/button";
+import type * as EditActionsModule from "./_edit-actions";
+
+let editActionsModulePromise: Promise<typeof EditActionsModule> | undefined;
+const loadEditActionsAsync = () => {
+  editActionsModulePromise ??= import("./_edit-actions").catch((error: unknown) => {
+    editActionsModulePromise = undefined;
+    throw error;
+  });
+  return editActionsModulePromise;
+};
+const loadBoardEditorAsync = async () =>
+  await Promise.all([
+    loadGridEditorAsync(),
+    loadEditActionsAsync(),
+    import("~/components/board/items/item-menu"),
+    import("~/components/board/sections/dynamic/dynamic-menu"),
+  ]);
+const BoardEditActions = dynamic(loadEditActionsAsync, { ssr: false });
 
 export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode] = useEditMode();
   const board = useRequiredBoard();
+  const t = useI18n();
   const { hasChangeAccess } = useBoardPermissions(board);
 
   if (!hasChangeAccess) {
@@ -52,13 +53,13 @@ export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: bool
 
   return (
     <>
-      {isEditMode && <AddMenu />}
+      {isEditMode && <BoardEditActions />}
 
       <EditModeMenu demoReadOnly={demoReadOnly} />
 
       {!demoReadOnly && (
         <OnboardingTour.Target id="board-settings">
-          <HeaderButton href={`/boards/${board.name}/settings`}>
+          <HeaderButton href={`/boards/${board.name}/settings`} aria-label={t("board.action.settings")}>
             <IconSettings stroke={1.5} />
           </HeaderButton>
         </OnboardingTour.Target>
@@ -69,96 +70,10 @@ export const BoardContentHeaderActions = ({ demoReadOnly }: { demoReadOnly: bool
   );
 };
 
-const AddMenu = () => {
-  const { data: session } = useSession();
-  const { openModal: openCategoryEditModal } = useModalAction(CategoryEditModal);
-  const { openModal: openItemSelectModal } = useModalAction(ItemSelectModal);
-  const { openModal: openAppSelectModal } = useModalAction(AppSelectModal);
-  const { openModal: openIntegrationSelectModal } = useModalAction(IntegrationSelectModal);
-  const { addCategoryToEnd } = useCategoryActions();
-  const { addDynamicSection } = useDynamicSectionActions();
-  const { createItem } = useItemActions();
-  const t = useI18n();
-
-  const handleAddCategory = useCallback(
-    () =>
-      openCategoryEditModal(
-        {
-          category: {
-            id: "new",
-            name: "",
-          },
-          onSuccess({ name }) {
-            addCategoryToEnd({ name });
-          },
-          submitLabel: t("section.category.create.submit"),
-        },
-        {
-          title: (t) => t("section.category.create.title"),
-        },
-      ),
-    [addCategoryToEnd, openCategoryEditModal, t],
-  );
-
-  const handleSelectItem = useCallback(() => {
-    openItemSelectModal();
-  }, [openItemSelectModal]);
-
-  const handleSelectApp = useCallback(() => {
-    openAppSelectModal({
-      onSelect: (app) => {
-        createItem({
-          kind: "app",
-          options: { appId: app.id },
-        });
-      },
-      withCreate: session?.user.permissions.includes("app-create") ?? false,
-    });
-  }, [openAppSelectModal, createItem]);
-
-  const handleAddIntegration = useCallback(() => {
-    openIntegrationSelectModal({});
-  }, [openIntegrationSelectModal]);
-
-  return (
-    <Menu position="bottom-end">
-      <Menu.Target>
-        <HeaderButton w="auto" px={4}>
-          <Group gap={4} wrap="nowrap">
-            <IconPlus stroke={1.5} />
-            <IconChevronDown color="gray" size={16} />
-          </Group>
-        </HeaderButton>
-      </Menu.Target>
-      <Menu.Dropdown style={{ transform: "translate(-3px, 0)" }}>
-        <Menu.Item leftSection={<IconResize size={20} />} onClick={handleSelectItem}>
-          {t("item.action.create")}
-        </Menu.Item>
-
-        <Menu.Item leftSection={<IconBox size={20} />} onClick={handleSelectApp}>
-          {t("app.action.add")}
-        </Menu.Item>
-
-        <Menu.Item leftSection={<IconPlug size={20} />} onClick={handleAddIntegration}>
-          {t("integration.action.create")}
-        </Menu.Item>
-
-        <Menu.Divider />
-
-        <Menu.Item leftSection={<IconBoxAlignTop size={20} />} onClick={handleAddCategory}>
-          {t("section.category.action.create")}
-        </Menu.Item>
-
-        <Menu.Item leftSection={<IconResize size={20} />} onClick={addDynamicSection}>
-          {t("section.dynamic.action.create")}
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};
-
 const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
   const [isEditMode, { open, close }] = useEditMode();
+  const [editorLoadState, setEditorLoadState] = useState<"scheduled" | "loading" | "ready" | "error">("scheduled");
+  const [isEnteringEditMode, setIsEnteringEditMode] = useState(false);
   const board = useRequiredBoard();
   const utils = clientApi.useUtils();
   const t = useScopedI18n("board.action.edit");
@@ -185,20 +100,73 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
     close();
   }, [utils, board.name, close]);
 
-  const toggle = useCallback(() => {
+  const prepareEditorAsync = useCallback(async () => {
+    if (editorLoadState === "ready") return;
+
+    setEditorLoadState("loading");
+    try {
+      await loadBoardEditorAsync();
+      setEditorLoadState("ready");
+    } catch {
+      setEditorLoadState("error");
+      throw new Error("Unable to load the board editor");
+    }
+  }, [editorLoadState]);
+
+  useEffect(() => {
+    return scheduleGridEditorWarmup(async () => {
+      setEditorLoadState("loading");
+      try {
+        await loadBoardEditorAsync();
+        setEditorLoadState("ready");
+      } catch {
+        setEditorLoadState("error");
+      }
+    });
+  }, []);
+
+  const prewarmEditor = useCallback(() => {
+    void prepareEditorAsync().catch(() => {
+      // A click or hotkey retries and reports the error.
+    });
+  }, [prepareEditorAsync]);
+
+  const toggle = useCallback(async () => {
     if (isEditMode) {
       if (demoReadOnly) return discardDemoChanges();
       return saveBoard(board);
     }
-    open();
-  }, [board, isEditMode, demoReadOnly, saveBoard, open, discardDemoChanges]);
 
-  useHotkeys([[hotkeys.toggleBoardEdit, toggle]]);
+    setIsEnteringEditMode(true);
+    try {
+      await prepareEditorAsync();
+      startTransition(open);
+    } catch {
+      showErrorNotification({
+        title: t("notification.loadError.title"),
+        message: t("notification.loadError.message"),
+      });
+    } finally {
+      setIsEnteringEditMode(false);
+    }
+  }, [board, demoReadOnly, discardDemoChanges, isEditMode, open, prepareEditorAsync, saveBoard, t]);
+
+  useHotkeys([[hotkeys.toggleBoardEdit, () => void toggle()]]);
   usePreventLeaveWithDirty(isEditMode);
 
   return (
     <OnboardingTour.Target id="board-edit-mode">
-      <HeaderButton onClick={toggle} loading={isPending}>
+      <HeaderButton
+        onClick={() => void toggle()}
+        onFocus={prewarmEditor}
+        onPointerEnter={prewarmEditor}
+        loading={isPending || isEnteringEditMode}
+        data-testid="board-edit-mode-toggle"
+        data-board-editor-preload-state={editorLoadState}
+        aria-busy={isPending || isEnteringEditMode}
+        aria-label={isEditMode ? (demoReadOnly ? t("exit") : t("save")) : t("enter")}
+        aria-pressed={isEditMode}
+      >
         {isEditMode ? <IconPencilOff stroke={1.5} /> : <IconPencil stroke={1.5} />}
       </HeaderButton>
     </OnboardingTour.Target>
@@ -207,13 +175,14 @@ const EditModeMenu = ({ demoReadOnly }: { demoReadOnly: boolean }) => {
 
 const SelectBoardsMenu = () => {
   const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
+  const t = useI18n();
 
   return (
     <OnboardingTour.Target id="board-switcher">
       <Box>
         <Menu position="bottom-end">
           <Menu.Target>
-            <HeaderButton w="auto" px={4}>
+            <HeaderButton w="auto" px={4} aria-label={t("board.action.switch")}>
               <IconReplace stroke={1.5} />
             </HeaderButton>
           </Menu.Target>
@@ -294,5 +263,5 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
       window.removeEventListener("popstate", handlePopState);
       window.removeEventListener("beforeunload", handleBeforeUnload);
     };
-  }, [isDirty]);
+  }, [isDirty, openConfirmModal, router, t]);
 };

apps/nextjs/src/app/[locale]/boards/(content)/_integration-provider.spec.ts

@@ -0,0 +1,54 @@
+import { createElement, act } from "react";
+import { createRoot } from "react-dom/client";
+import type { Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+
+import { BoardIntegrationProvider } from "./_integration-provider";
+
+const mocks = vi.hoisted(() => ({
+  providedIntegrations: undefined as unknown,
+}));
+
+vi.mock("@homarr/auth/client", async () => {
+  const React = await import("react");
+
+  return {
+    IntegrationProvider: ({ children, integrations }: { children: React.ReactNode; integrations: unknown }) => {
+      mocks.providedIntegrations = integrations;
+      return React.createElement(React.Fragment, null, children);
+    },
+  };
+});
+
+describe("board integration provider", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    container = document.createElement("div");
+    document.body.append(container);
+    root = createRoot(container);
+    mocks.providedIntegrations = undefined;
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+  });
+
+  test("provides the permission-filtered server result without a second client query", () => {
+    const initialIntegrations = [{ id: "initial" }];
+
+    act(() => {
+      root.render(
+        createElement(
+          BoardIntegrationProvider,
+          { initialIntegrations: initialIntegrations as never },
+          createElement("span", null, "board"),
+        ),
+      );
+    });
+
+    expect(mocks.providedIntegrations).toBe(initialIntegrations);
+  });
+});

apps/nextjs/src/app/[locale]/boards/(content)/_integration-provider.tsx

@@ -0,0 +1,14 @@
+"use client";
+
+import type { PropsWithChildren } from "react";
+
+import type { RouterOutputs } from "@homarr/api";
+import { IntegrationProvider } from "@homarr/auth/client";
+
+interface Props {
+  initialIntegrations: RouterOutputs["integration"]["all"];
+}
+
+export const BoardIntegrationProvider = ({ initialIntegrations, children }: PropsWithChildren<Props>) => {
+  return <IntegrationProvider integrations={initialIntegrations}>{children}</IntegrationProvider>;
+};

apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.module.css

@@ -0,0 +1,47 @@
+.gutterSettings {
+  background: color-mix(in srgb, var(--mantine-color-default) 55%, transparent);
+}
+
+.gutterPreview {
+  display: grid;
+  gap: 6px;
+  width: 100%;
+  min-height: 112px;
+  padding: 8px;
+  overflow: hidden;
+  background: var(--mantine-color-body);
+  border: 1px solid var(--mantine-color-default-border);
+  border-radius: var(--mantine-radius-md);
+  transition: grid-template-columns 180ms ease-out;
+}
+
+.previewCanvas {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 6px;
+  min-width: 0;
+}
+
+.previewCanvas > div,
+.previewGutter {
+  background: var(--mantine-color-default);
+  border-radius: var(--mantine-radius-sm);
+}
+
+.previewCanvas > div:nth-child(1) {
+  grid-row: span 2;
+}
+
+.previewCanvas > div:nth-child(4) {
+  grid-column: span 2;
+}
+
+.previewGutter {
+  min-width: 12px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .gutterPreview {
+    transition: none;
+  }
+}

apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx

@@ -1,6 +1,20 @@
 "use client";
 
-import { Button, Fieldset, Grid, Group, Input, NumberInput, Slider, Stack, Text, TextInput } from "@mantine/core";
+import {
+  Box,
+  Button,
+  Fieldset,
+  Grid,
+  Group,
+  Input,
+  NumberInput,
+  Paper,
+  Slider,
+  Stack,
+  Switch,
+  Text,
+  TextInput,
+} from "@mantine/core";
 
 import { clientApi } from "@homarr/api/client";
 import { createId } from "@homarr/common";
@@ -9,6 +23,9 @@ import { useI18n } from "@homarr/translation/client";
 import { boardSaveLayoutsSchema } from "@homarr/validation/board";
 
 import type { Board } from "../../_types";
+import classes from "./_layout.module.css";
+
+const layoutSettingsSchema = boardSaveLayoutsSchema.omit({ id: true });
 
 interface Props {
   board: Board;
@@ -22,7 +39,7 @@ export const LayoutSettingsContent = ({ board }: Props) => {
       void utils.board.getHomeBoard.invalidate();
     },
   });
-  const form = useZodForm(boardSaveLayoutsSchema.omit({ id: true }).required(), {
+  const form = useZodForm(layoutSettingsSchema, {
     initialValues: {
       layouts: board.layouts,
     },
@@ -33,7 +50,7 @@ export const LayoutSettingsContent = ({ board }: Props) => {
       onSubmit={form.onSubmit((values) => {
         saveLayouts({
           id: board.id,
-          ...values,
+          layouts: values.layouts,
         });
       })}
     >
@@ -51,6 +68,8 @@ export const LayoutSettingsContent = ({ board }: Props) => {
                       id: createId(),
                       name: "",
                       columnCount: 10,
+                      leftGutterColumnCount: 0,
+                      rightGutterColumnCount: 0,
                       breakpoint: 0,
                     },
                   ],
@@ -70,7 +89,21 @@ export const LayoutSettingsContent = ({ board }: Props) => {
 
                 <Grid.Col span={{ sm: 12, md: 6 }}>
                   <Input.Wrapper label={t("layout.field.columnCount.label")}>
-                    <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps(`layouts.${index}.columnCount`)} />
+                    <Slider
+                      mt="xs"
+                      min={1}
+                      max={24}
+                      step={1}
+                      value={layout.columnCount}
+                      thumbLabel={t("layout.field.columnCount.label")}
+                      onChange={(columnCount) => {
+                        const left = Math.min(layout.leftGutterColumnCount, Math.max(0, columnCount - 1));
+                        const right = Math.min(layout.rightGutterColumnCount, Math.max(0, columnCount - left - 1));
+                        form.setFieldValue(`layouts.${index}.columnCount`, columnCount);
+                        form.setFieldValue(`layouts.${index}.leftGutterColumnCount`, left);
+                        form.setFieldValue(`layouts.${index}.rightGutterColumnCount`, right);
+                      }}
+                    />
                   </Input.Wrapper>
                 </Grid.Col>
 
@@ -81,6 +114,15 @@ export const LayoutSettingsContent = ({ board }: Props) => {
                     description={t("layout.field.breakpoint.description")}
                   />
                 </Grid.Col>
+                <Grid.Col span={12}>
+                  <GutterSettings
+                    left={layout.leftGutterColumnCount}
+                    right={layout.rightGutterColumnCount}
+                    columnCount={layout.columnCount}
+                    onLeftChange={(value) => form.setFieldValue(`layouts.${index}.leftGutterColumnCount`, value)}
+                    onRightChange={(value) => form.setFieldValue(`layouts.${index}.rightGutterColumnCount`, value)}
+                  />
+                </Grid.Col>
               </Grid>
               {form.values.layouts.length >= 2 && (
                 <Group justify="end">
@@ -113,3 +155,123 @@ export const LayoutSettingsContent = ({ board }: Props) => {
     </form>
   );
 };
+
+interface GutterSettingsProps {
+  left: number;
+  right: number;
+  columnCount: number;
+  onLeftChange: (value: number) => void;
+  onRightChange: (value: number) => void;
+}
+
+const gutterMarks = [
+  { value: 1, label: "1" },
+  { value: 2, label: "2" },
+  { value: 3, label: "3" },
+];
+
+const GutterSettings = ({ left, right, columnCount, onLeftChange, onRightChange }: GutterSettingsProps) => {
+  const t = useI18n();
+  const maxGutterWidth = Math.min(3, Math.max(1, columnCount - 1));
+
+  return (
+    <Paper className={classes.gutterSettings} p="md">
+      <Stack gap="md">
+        <Box>
+          <Text fw={600}>{t("layout.field.gutters.label")}</Text>
+          <Text size="sm" c="dimmed">
+            {t("layout.field.gutters.description")}
+          </Text>
+        </Box>
+
+        <GutterPreview left={left} right={right} columnCount={columnCount} />
+
+        <Grid>
+          <Grid.Col span={{ base: 12, md: 6 }}>
+            <GutterControl
+              side="left"
+              value={left}
+              max={Math.min(maxGutterWidth, columnCount - right - 1)}
+              onChange={onLeftChange}
+            />
+          </Grid.Col>
+          <Grid.Col span={{ base: 12, md: 6 }}>
+            <GutterControl
+              side="right"
+              value={right}
+              max={Math.min(maxGutterWidth, columnCount - left - 1)}
+              onChange={onRightChange}
+            />
+          </Grid.Col>
+        </Grid>
+      </Stack>
+    </Paper>
+  );
+};
+
+const GutterControl = ({
+  side,
+  value,
+  max,
+  onChange,
+}: {
+  side: "left" | "right";
+  value: number;
+  max: number;
+  onChange: (value: number) => void;
+}) => {
+  const t = useI18n();
+  const enabled = value > 0;
+
+  return (
+    <Stack gap="sm">
+      <Switch
+        checked={enabled}
+        disabled={max < 1}
+        onChange={(event) => onChange(event.currentTarget.checked ? Math.min(2, max) : 0)}
+        label={t(`layout.field.gutters.${side}.label`)}
+        description={t(`layout.field.gutters.${side}.description`)}
+      />
+      {enabled && (
+        <Input.Wrapper label={t("layout.field.gutters.width.label")}>
+          <Slider
+            mt="xs"
+            min={1}
+            max={max}
+            value={Math.min(value, max)}
+            marks={gutterMarks.filter((mark) => mark.value <= max)}
+            restrictToMarks
+            thumbLabel={t(`layout.field.gutters.${side}.thumbLabel`)}
+            onChange={(nextValue) => onChange(Math.min(nextValue, max))}
+          />
+        </Input.Wrapper>
+      )}
+    </Stack>
+  );
+};
+
+const GutterPreview = ({ left, right, columnCount }: { left: number; right: number; columnCount: number }) => {
+  const t = useI18n();
+  const safeColumnCount = Math.max(1, columnCount);
+  const main = Math.max(1, safeColumnCount - left - right);
+  const tracks = [left > 0 ? `${left}fr` : null, `${main}fr`, right > 0 ? `${right}fr` : null]
+    .filter((track) => track !== null)
+    .join(" ");
+
+  return (
+    <Box
+      className={classes.gutterPreview}
+      aria-label={t("layout.field.gutters.preview.label")}
+      style={{ gridTemplateColumns: tracks }}
+    >
+      {left > 0 && <Box className={classes.previewGutter} data-side="left" />}
+      <Box className={classes.previewCanvas}>
+        <Box />
+        <Box />
+        <Box />
+        <Box />
+      </Box>
+      {right > 0 && <Box className={classes.previewGutter} data-side="right" />}
+    </Box>
+  );
+};

apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx

@@ -1,4 +1,5 @@
 import type { JSX, PropsWithChildren } from "react";
+import { cookies, headers } from "next/headers";
 import { notFound, redirect } from "next/navigation";
 import { AppShellMain } from "@mantine/core";
 import { TRPCError } from "@trpc/server";
@@ -6,6 +7,7 @@ import { TRPCError } from "@trpc/server";
 import { auth } from "@homarr/auth/next";
 import { BoardProvider } from "@homarr/boards/context";
 import { EditModeProvider } from "@homarr/boards/edit-mode";
+import { boardViewportWidthCookieName, getLayoutIdForViewportWidth } from "@homarr/boards/layout-selection";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 
 import { MainHeader } from "~/components/layout/header";
@@ -62,9 +64,15 @@ export const createBoardLayout = <TParams extends Params>({
       throw error;
     });
     const colorScheme = await getCurrentColorSchemeAsync();
+    const initialViewportWidth = await getInitialViewportWidthAsync();
+    const initialLayoutId = getLayoutIdForViewportWidth(initialBoard.layouts, initialViewportWidth);
 
     return (
-      <BoardProvider initialBoard={initialBoard}>
+      <BoardProvider
+        initialBoard={initialBoard}
+        initialLayoutId={initialLayoutId}
+        initialViewportWidth={initialViewportWidth}
+      >
         <BoardReadyProvider>
           <EditModeProvider>
             <BoardMantineProvider defaultColorScheme={colorScheme}>
@@ -88,3 +96,22 @@ export const createBoardLayout = <TParams extends Params>({
 
   return Layout;
 };
+
+const getInitialViewportWidthAsync = async () => {
+  const cookieValue = (await cookies()).get(boardViewportWidthCookieName)?.value;
+  const cookieWidth = Number(cookieValue);
+  if (Number.isInteger(cookieWidth) && cookieWidth >= 200 && cookieWidth <= 10_000) {
+    return cookieWidth;
+  }
+
+  const requestHeaders = await headers();
+  const clientHintWidth = Number(requestHeaders.get("sec-ch-viewport-width"));
+  if (Number.isInteger(clientHintWidth) && clientHintWidth >= 200 && clientHintWidth <= 10_000) {
+    return clientHintWidth;
+  }
+
+  const userAgent = requestHeaders.get("user-agent") ?? "";
+  if (/iPad|Tablet|PlayBook|Silk/i.test(userAgent)) return 1024;
+  if (/Mobi|Android|iPhone|iPod|IEMobile|Opera Mini/i.test(userAgent)) return 390;
+  return 1440;
+};

apps/nextjs/src/app/[locale]/layout.tsx

@@ -30,6 +30,7 @@ import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-transla
 
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
 import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
+import { ViewportHint } from "~/components/layout/viewport-hint";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
 import { JotaiProvider } from "./_client-providers/jotai";
@@ -144,6 +145,7 @@ export default async function Layout(props: {
       </head>
       <body className={[fontSans.className, fontSans.variable].join(" ")} suppressHydrationWarning>
         <Analytics enabled={serverSettings.analytics.enableGeneral} />
+        <ViewportHint />
         <StackedProvider>
           <Notifications pauseResetOnHover="notification" />
           <ServiceWorkerRegistration />

apps/nextjs/src/app/[locale]/manage/apps/edit/[id]/page.tsx

@@ -16,7 +16,10 @@ export default async function AppEditPage(props: AppEditPageProps) {
   const params = await props.params;
   const session = await auth();
 
-  if (!session?.user.permissions.includes("app-modify-all")) {
+  if (
+    !session?.user.permissions.includes("board-modify-all") ||
+    !session?.user.permissions.includes("app-modify-all")
+  ) {
     notFound();
   }
   const app = await api.app.byId({ id: params.id });

apps/nextjs/src/app/[locale]/manage/apps/new/page.tsx

@@ -10,7 +10,7 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 export default async function AppNewPage() {
   const session = await auth();
 
-  if (!session?.user.permissions.includes("app-create")) {
+  if (!session?.user.permissions.includes("board-modify-all") || !session?.user.permissions.includes("app-create")) {
     notFound();
   }
 

apps/nextjs/src/app/[locale]/manage/apps/page.tsx

@@ -1,5 +1,5 @@
 import { Fragment } from "react";
-import { redirect } from "next/navigation";
+import { notFound, redirect } from "next/navigation";
 import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
 import { IconBox, IconPencil } from "@tabler/icons-react";
 import { z } from "zod/v4";
@@ -33,6 +33,9 @@ export default async function AppsPage(props: AppsPageProps) {
   if (!session) {
     redirect("/auth/login");
   }
+  if (!session.user.permissions.includes("board-modify-all")) {
+    notFound();
+  }
 
   const searchParams = searchParamsSchema.parse(await props.searchParams);
 

apps/nextjs/src/app/[locale]/manage/custom-widgets/_beta-banner.tsx

@@ -1,21 +1,18 @@
-"use client";
-
 import { Alert, Anchor, Text } from "@mantine/core";
 import { IconFlask } from "@tabler/icons-react";
-import { useScopedI18n } from "@homarr/translation/client";
 
 const FEEDBACK_URL = "https://github.com/homarr-labs/homarr/discussions/categories/custom-widgets";
 
 export function CustomWidgetBetaBanner() {
-  const t = useScopedI18n("customWidget.betaBanner");
   return (
-    <Alert variant="light" color="yellow" title={t("title")} icon={<IconFlask />}>
+    <Alert variant="light" color="yellow" title="Custom Widgets are in Beta" icon={<IconFlask />}>
       <Text size="sm">
-        {t("description")}{" "}
+        This feature is experimental and will probably change a lot in the future. If you encounter bugs, wish it did
+        more, or find something confusing, then please complain to us as much as possible! Only feedback posted on the{" "}
         <Anchor href={FEEDBACK_URL} target="_blank" fw={600}>
-          {t("link")}
+          official discussion thread
         </Anchor>{" "}
-        {t("closing")}
+        will be taken into account. Happy Hacking!
       </Text>
     </Alert>
   );

apps/nextjs/src/app/[locale]/manage/custom-widgets/_code-editor-diagnostics.tsx

@@ -1,51 +0,0 @@
-import type { EditorView } from "@codemirror/view";
-import { Alert, Stack, Text, UnstyledButton } from "@mantine/core";
-import { IconAlertTriangle } from "@tabler/icons-react";
-
-import type { EditorDiagnostic } from "@homarr/custom-widgets/workbench";
-
-import classes from "./_code-editor.module.css";
-
-interface CodeEditorDiagnosticsProps {
-  diagnostics: EditorDiagnostic[];
-  editorView: EditorView | null;
-  title: string;
-  formatDiagnostic: (diagnostic: EditorDiagnostic) => string;
-}
-
-export function CodeEditorDiagnostics({
-  diagnostics,
-  editorView,
-  title,
-  formatDiagnostic,
-}: CodeEditorDiagnosticsProps) {
-  if (diagnostics.length === 0) return null;
-  return (
-    <Stack component="ul" gap={6} mt="xs" pl={0} style={{ listStyle: "none" }} aria-label={title}>
-      {diagnostics.map((diagnostic, index) => (
-        <li key={`${diagnostic.code}-${diagnostic.line ?? 0}-${index}`}>
-          <UnstyledButton
-            type="button"
-            w="100%"
-            className={classes.diagnosticButton}
-            onClick={() => {
-              if (!editorView || diagnostic.index === undefined) return;
-              const anchor = Math.min(diagnostic.index, editorView.state.doc.length);
-              editorView.dispatch({ selection: { anchor }, scrollIntoView: true });
-              editorView.focus();
-            }}
-          >
-            <Alert
-              color={diagnostic.severity === "error" ? "red" : "yellow"}
-              variant="light"
-              p="xs"
-              icon={<IconAlertTriangle size={15} />}
-            >
-              <Text size="xs">{formatDiagnostic(diagnostic)}</Text>
-            </Alert>
-          </UnstyledButton>
-        </li>
-      ))}
-    </Stack>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_code-editor.module.css

@@ -1,80 +0,0 @@
-.root {
-  margin-top: 4px;
-  border: 1px solid light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4));
-  border-radius: var(--mantine-radius-sm);
-  background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7));
-  overflow: hidden;
-}
-
-.root:focus-within {
-  border-color: var(--mantine-primary-color-filled);
-  outline: 2px solid color-mix(in srgb, var(--mantine-primary-color-filled) 20%, transparent);
-  outline-offset: 1px;
-}
-
-.toolbar,
-.footer {
-  padding: 7px 10px;
-  background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-8));
-}
-
-.toolbar {
-  border-bottom: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
-}
-
-.footer {
-  border-top: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
-}
-
-.viewport {
-  max-height: min(62vh, 680px);
-  overflow: auto;
-}
-
-.viewport :global(.cm-editor) {
-  background: light-dark(var(--mantine-color-white), var(--mantine-color-dark-7));
-  color: light-dark(var(--mantine-color-black), var(--mantine-color-gray-0));
-  font-family: "Fira Code", "SFMono-Regular", Consolas, monospace;
-  font-size: 12px;
-}
-
-.viewport :global(.cm-editor.cm-focused) {
-  outline: none;
-}
-
-.viewport :global(.cm-scroller) {
-  line-height: 1.65;
-  overflow: auto;
-}
-
-.viewport :global(.cm-gutters) {
-  background: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-8));
-  border-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
-}
-
-.diagnosticButton {
-  min-height: 44px;
-  border-radius: var(--mantine-radius-sm);
-}
-
-.diagnosticButton:focus-visible {
-  outline: 2px solid var(--mantine-primary-color-filled);
-  outline-offset: 2px;
-}
-
-@media (max-width: 48em) {
-  .viewport {
-    max-height: 52vh;
-  }
-
-  .toolbar,
-  .footer {
-    align-items: flex-start;
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .root {
-    scroll-behavior: auto;
-  }
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_code-editor.tsx

@@ -1,271 +0,0 @@
-"use client";
-
-import { useMemo, useState } from "react";
-import dynamic from "next/dynamic";
-import { autocompletion } from "@codemirror/autocomplete";
-import type { CompletionSource } from "@codemirror/autocomplete";
-import { redo, redoDepth, undo, undoDepth } from "@codemirror/commands";
-import { javascript } from "@codemirror/lang-javascript";
-import { json } from "@codemirror/lang-json";
-import { linter } from "@codemirror/lint";
-import { EditorView } from "@codemirror/view";
-import { Badge, Button, Group, Input, Loader, Text, useComputedColorScheme } from "@mantine/core";
-import { IconArrowBackUp, IconArrowForwardUp, IconCheck, IconCode, IconFileCode, IconWand } from "@tabler/icons-react";
-import { enabledCustomJsxComponents } from "@homarr/custom-widgets/core";
-import { ComponentReference } from "@homarr/custom-widgets/workbench";
-import type { EditorDiagnostic } from "@homarr/custom-widgets/workbench";
-import { useScopedI18n } from "@homarr/translation/client";
-
-import { CodeEditorDiagnostics } from "./_code-editor-diagnostics";
-import classes from "./_code-editor.module.css";
-
-const Editor = dynamic(() => import("@uiw/react-codemirror").then((module) => module.default), {
-  ssr: false,
-  loading: () => (
-    <Group justify="center" p="xl">
-      <Loader size="sm" />
-    </Group>
-  ),
-});
-
-const customJsxCompletionSource: CompletionSource = (context) => {
-  const word = context.matchBefore(/[A-Z][\w.]*/u);
-  if (!word && !context.explicit) return null;
-  return {
-    from: word?.from ?? context.pos,
-    options: enabledCustomJsxComponents.map((component) => ({
-      label: component.name,
-      type: "class",
-      detail: `${component.category} · ${component.safety}`,
-    })),
-  };
-};
-
-interface CodeEditorProps {
-  id: string;
-  value: string;
-  onChange: (value: string) => void;
-  label: string;
-  description?: string;
-  placeholder?: string;
-  language: "jsx" | "json";
-  diagnostics?: EditorDiagnostic[];
-  error?: React.ReactNode;
-  required?: boolean;
-  maxLength?: number;
-  starter?: string;
-}
-
-export function CodeEditor({
-  id,
-  value,
-  onChange,
-  label,
-  description,
-  placeholder,
-  language,
-  diagnostics = [],
-  error,
-  required,
-  maxLength,
-  starter,
-}: CodeEditorProps) {
-  const t = useScopedI18n("customWidget.editor");
-  const [cursor, setCursor] = useState({ line: 1, column: 1 });
-  const [editorView, setEditorView] = useState<EditorView | null>(null);
-  const [historyDepth, setHistoryDepth] = useState({ undo: 0, redo: 0 });
-  const colorScheme = useComputedColorScheme("light");
-  const extensions = useMemo(() => {
-    const diagnosticsExtension = linter((view) =>
-      diagnostics.map((diagnostic) => {
-        const from = Math.min(diagnostic.index ?? 0, view.state.doc.length);
-        return {
-          from,
-          to: Math.min(from + 1, view.state.doc.length),
-          severity: diagnostic.severity,
-          message: t(`diagnostics.${diagnostic.code}` as never, { value: diagnostic.value ?? "" } as never),
-        };
-      }),
-    );
-    const accessibilityExtension = EditorView.contentAttributes.of({
-      id,
-      "aria-label": label,
-    });
-    return language === "jsx"
-      ? [
-          javascript({ jsx: true }),
-          autocompletion({ override: [customJsxCompletionSource] }),
-          diagnosticsExtension,
-          accessibilityExtension,
-        ]
-      : [json(), diagnosticsExtension, accessibilityExtension];
-  }, [diagnostics, id, label, language, t]);
-  const errorCount = diagnostics.filter((diagnostic) => diagnostic.severity === "error").length;
-  const warningCount = diagnostics.length - errorCount;
-
-  const formattedValue = useMemo(() => {
-    if (language === "json") {
-      try {
-        return `${JSON.stringify(JSON.parse(value) as unknown, null, 2)}\n`;
-      } catch {
-        return value;
-      }
-    }
-    return value
-      .replace(/\r\n?/gu, "\n")
-      .split("\n")
-      .map((line) => line.trimEnd())
-      .join("\n")
-      .trim();
-  }, [language, value]);
-
-  return (
-    <Input.Wrapper
-      label={label}
-      description={description}
-      error={error}
-      required={required}
-      labelProps={{ htmlFor: id }}
-      inputWrapperOrder={["label", "description", "input", "error"]}
-    >
-      <div className={classes.root}>
-        <Group className={classes.toolbar} justify="space-between" gap="xs" wrap="wrap">
-          <Group gap={6}>
-            <IconCode size={16} aria-hidden />
-            <Text size="xs" fw={600}>
-              {language === "jsx" ? t("language.jsx") : t("language.json")}
-            </Text>
-          </Group>
-          <Group gap={6}>
-            <Button
-              type="button"
-              size="compact-xs"
-              variant="subtle"
-              leftSection={<IconArrowBackUp size={14} />}
-              onClick={() => editorView && undo(editorView)}
-              disabled={!editorView || historyDepth.undo === 0}
-            >
-              {t("action.undo")}
-            </Button>
-            <Button
-              type="button"
-              size="compact-xs"
-              variant="subtle"
-              leftSection={<IconArrowForwardUp size={14} />}
-              onClick={() => editorView && redo(editorView)}
-              disabled={!editorView || historyDepth.redo === 0}
-            >
-              {t("action.redo")}
-            </Button>
-            {language === "jsx" && (
-              <ComponentReference
-                messages={{
-                  action: t("action.components"),
-                  search: t("componentReference.search"),
-                  empty: t("componentReference.empty"),
-                  count: (count) => t("componentReference.count", { count }),
-                }}
-              />
-            )}
-            {starter && value.trim().length === 0 && (
-              <Button
-                type="button"
-                size="compact-xs"
-                variant="subtle"
-                leftSection={<IconFileCode size={14} />}
-                onClick={() => onChange(starter)}
-              >
-                {t("action.insertStarter")}
-              </Button>
-            )}
-            <Button
-              type="button"
-              size="compact-xs"
-              variant="subtle"
-              leftSection={<IconWand size={14} />}
-              onClick={() => onChange(formattedValue)}
-              disabled={formattedValue === value}
-            >
-              {t("action.format")}
-            </Button>
-          </Group>
-        </Group>
-
-        <div className={classes.viewport}>
-          <Editor
-            id={`${id}-root`}
-            value={value}
-            onChange={onChange}
-            placeholder={placeholder}
-            extensions={extensions}
-            theme={colorScheme}
-            height={language === "jsx" ? "320px" : "220px"}
-            basicSetup={{
-              autocompletion: language !== "jsx",
-              bracketMatching: true,
-              closeBrackets: true,
-              foldGutter: true,
-              history: true,
-              highlightActiveLine: true,
-              highlightActiveLineGutter: true,
-              indentOnInput: true,
-              lineNumbers: true,
-            }}
-            onCreateEditor={setEditorView}
-            onUpdate={(update) => {
-              if (!update.selectionSet && !update.docChanged) return;
-              const head = update.state.selection.main.head;
-              const line = update.state.doc.lineAt(head);
-              setCursor({ line: line.number, column: head - line.from + 1 });
-              setHistoryDepth({ undo: undoDepth(update.state), redo: redoDepth(update.state) });
-            }}
-          />
-        </div>
-
-        <Group className={classes.footer} justify="space-between" gap="xs">
-          <Group gap={6}>
-            {errorCount > 0 ? (
-              <Badge size="xs" color="red" variant="light">
-                {t("status.errors", { count: errorCount })}
-              </Badge>
-            ) : warningCount > 0 ? (
-              <Badge size="xs" color="yellow" variant="light">
-                {t("status.warnings", { count: warningCount })}
-              </Badge>
-            ) : (
-              <Group gap={4}>
-                <IconCheck size={13} color="var(--mantine-color-green-6)" aria-hidden />
-                <Text size="xs" c="dimmed">
-                  {t("status.ready")}
-                </Text>
-              </Group>
-            )}
-            <Text size="xs" c="dimmed">
-              {t("status.position", cursor)}
-            </Text>
-          </Group>
-          <Text
-            size="xs"
-            c={maxLength && value.length > maxLength * 0.95 ? (value.length > maxLength ? "red" : "orange") : "dimmed"}
-          >
-            {maxLength
-              ? t("status.charactersWithLimit", { count: value.length, limit: maxLength })
-              : t("status.characters", { count: value.length })}
-          </Text>
-        </Group>
-      </div>
-
-      <CodeEditorDiagnostics
-        diagnostics={diagnostics}
-        editorView={editorView}
-        title={t("diagnostics.title")}
-        formatDiagnostic={(diagnostic) =>
-          `${diagnostic.line ? `${t("diagnostics.line", { line: diagnostic.line })}: ` : ""}${t(
-            `diagnostics.${diagnostic.code}` as never,
-            { value: diagnostic.value ?? "" } as never,
-          )}`
-        }
-      />
-    </Input.Wrapper>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_copy-ai-prompt-button.tsx

@@ -5,10 +5,289 @@ import { useDisclosure } from "@mantine/hooks";
 import { IconCopy, IconSparkles } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
-import { buildCustomWidgetAiPrompt } from "@homarr/custom-widgets/core";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 
+const PROMPT_HEADER = `You are helping configure a Homarr custom widget. Homarr is a self-hosted dashboard that can display data from any API endpoint as a widget.
+
+## Your Task
+Generate a valid JSON configuration for a Homarr custom widget based on the user's description and the API response below. If you need clarification, ask specific questions.
+
+## Output Format
+- Output the JSON inside a \`\`\`json code block for syntax highlighting. If \`\`\`json is not supported, use a generic \`\`\` code block instead.
+- Do NOT include any text before or after the JSON block unless you have clarifying questions.
+- If your environment supports structured/JSON output mode, use it.
+
+## JSON Schema
+The output must conform to this JSON Schema:
+
+`;
+
+const PROMPT_RULES = `
+
+## Key Rules
+- The \`displayConfig.type\` field MUST match the \`displayType\` field exactly
+- All \`jsonPath\` fields use JSONPath syntax (e.g. \`$.data.count\`, \`$.items[*].name\`)
+- The \`$schema\` field should be \`"homarr-custom-widget-v2"\`
+- Do NOT include secrets/passwords in the output — those are configured separately in the UI
+- \`url\` must be a full URL including protocol (e.g. \`https://...\`)
+- For arrays of items, inspect the API response to find the correct paths
+
+## Display Type Guide
+- \`singleValue\`: Show one prominent number/text (e.g. total count, status)
+- \`keyValue\`: Show labeled pairs like "CPU: 45%" — use \`mappings\` array
+- \`table\`: Show tabular data from an array — needs \`tablePath\` for the array and \`columns\` for headers
+- \`statGrid\`: Grid of stat cards with optional colors — great for dashboards (e.g. "Movies: 38, Series: 63")
+- \`progressBars\`: Visual progress bars with value/max — for storage, quotas, etc.
+- \`statusIndicator\`: Green/red dots based on value matching — for service health checks
+- \`countGrid\`: Simple grid of counts — like statGrid but simpler, no colors
+- \`raw\`: Raw JSON display — for debugging or complex data
+- \`actionButton\`: A button that triggers the API call on click — for POST/PUT actions
+- \`customJsx\`: Custom JSX layout using whitelisted Mantine components — full creative control over presentation. Set \`displayConfig.template\` to a JSX string. Access API data via \`{data.fieldName}\` bindings (e.g. \`{data.name}\`, \`{data.items[0].title}\`).
+
+## Custom JSX (\`customJsx\`) — Available Mantine Components
+When using \`customJsx\`, the template supports whitelisted Mantine UI components. These are React components from the Mantine v9 library. Use their props as documented below.
+
+### Layout Components
+- **Stack** — Vertical flex container. Props: \`gap\` (xs|sm|md|lg|xl or number), \`align\` (stretch|center|flex-start|flex-end), \`justify\`
+- **Group** — Horizontal flex container. Props: \`gap\`, \`justify\` (flex-start|center|space-between|space-around|flex-end), \`wrap\` (wrap|nowrap), \`grow\` (boolean)
+- **Flex** — Generic flex container. Props: \`direction\` (row|column), \`gap\`, \`align\`, \`justify\`, \`wrap\`
+- **Grid** + **Grid.Col** — CSS grid layout. Grid props: \`gutter\` (gap). Grid.Col props: \`span\` (1-12 or "auto"), \`offset\`
+- **SimpleGrid** — Auto-column grid. Props: \`cols\` (number), \`spacing\`, \`verticalSpacing\`
+- **Center** — Centers content. Props: \`inline\` (boolean)
+- **Space** — Empty spacing. Props: \`h\` (height), \`w\` (width)
+- **Container** — Max-width wrapper. Props: \`size\` (xs|sm|md|lg|xl), \`fluid\` (boolean)
+- **AspectRatio** — Maintains aspect ratio. Props: \`ratio\` (number, e.g. 16/9)
+
+### Typography Components
+- **Text** — Body text. Props: \`size\` (xs|sm|md|lg|xl), \`fw\` (font-weight number, e.g. 700), \`c\` (color: "dimmed"|"red"|"blue"|...), \`ta\` (text-align), \`tt\` (text-transform: "capitalize"|"uppercase"|"lowercase"), \`td\` (text-decoration), \`lineClamp\` (number), \`truncate\` (boolean), \`span\` (renders as span)
+- **Title** — Heading. Props: \`order\` (1-6, maps to h1-h6), \`size\`, \`c\`, \`ta\`, \`tt\`
+- **Code** — Inline code. Props: \`color\`, \`block\` (boolean for code block)
+- **Highlight** — Text with highlighted substring. Props: \`highlight\` (string or string[])
+- **Mark** — Highlighted text background. Props: \`color\`
+- **Kbd** — Keyboard key display
+- **Blockquote** — Styled quote. Props: \`color\`, \`cite\`, \`icon\`
+- **Anchor** — Link. Props: \`href\`, \`target\`, \`underline\` ("always"|"hover"|"never")
+- **NumberFormatter** — Formatted number display. Props: \`value\` (number), \`prefix\` (e.g. "$"), \`suffix\` (e.g. "%"), \`thousandSeparator\` (boolean or string), \`decimalScale\` (number)
+
+### Data Display Components
+- **Badge** — Label badge. Props: \`color\`, \`variant\` (filled|light|outline|dot|default), \`size\` (xs|sm|md|lg|xl), \`radius\`, \`tt\`
+- **Card** + **Card.Section** — Content card. Card props: \`shadow\` (xs|sm|md|lg|xl), \`padding\`/\`p\`, \`radius\`, \`withBorder\` (boolean). Card.Section props: \`withBorder\`, \`inheritPadding\`
+- **Paper** — Surface container. Props: \`shadow\`, \`p\`, \`radius\`, \`withBorder\`
+- **Alert** — Notification box. Props: \`color\`, \`variant\` (filled|light|outline), \`title\`, \`icon\`
+- **ThemeIcon** — Icon container. Props: \`color\`, \`variant\`, \`size\`, \`radius\`
+- **ColorSwatch** — Color preview. Props: \`color\` (CSS color string)
+- **Table** + **Table.Thead**, **Table.Tbody**, **Table.Tr**, **Table.Th**, **Table.Td** — HTML table. Table props: \`striped\` (boolean), \`withTableBorder\`, \`withColumnBorders\`, \`highlightOnHover\`
+- **List** + **List.Item** — Ordered/unordered list. List props: \`type\` ("ordered"|"unordered"), \`icon\`, \`spacing\`
+- **Timeline** + **Timeline.Item** — Vertical timeline. Timeline props: \`active\` (number), \`bulletSize\`. Item props: \`title\`, \`bullet\`
+- **Accordion** + **.Item** + **.Control** + **.Panel** — Collapsible sections. Item props: \`value\` (string). Control: clickable header. Panel: content.
+- **Indicator** — Dot indicator on content. Props: \`color\`, \`position\`, \`size\`, \`label\`, \`processing\` (boolean)
+- **Pill** — Removable tag. Props: \`size\`, \`withRemoveButton\`
+- **Spoiler** — Show more/less. Props: \`maxHeight\` (number), \`showLabel\`, \`hideLabel\`
+
+### Feedback Components
+- **Progress** + **Progress.Section** — Progress bar. Progress props: \`value\` (0-100), \`color\`, \`size\`, \`radius\`, \`striped\`, \`animated\`. Section props: \`value\`, \`color\`
+- **RingProgress** — Circular progress. Props: \`sections\` (array of {value, color}), \`size\`, \`thickness\`, \`label\` (ReactNode)
+- **Skeleton** — Loading placeholder. Props: \`height\`, \`width\`, \`radius\`, \`visible\` (boolean)
+- **Loader** — Spinner. Props: \`size\`, \`color\`, \`type\` (oval|bars|dots)
+
+### Media Components
+- **Image** — Responsive image. Props: \`src\`, \`alt\`, \`w\` (width), \`h\` (height), \`radius\`, \`fit\` (cover|contain|fill)
+- **Avatar** + **Avatar.Group** — User avatar. Props: \`src\`, \`alt\`, \`size\` (xs|sm|md|lg|xl or number), \`radius\` (sm|xl), \`color\`
+- **BackgroundImage** — Background image container. Props: \`src\`, \`radius\`
+- **Tooltip** — Hover tooltip. Props: \`label\` (string), \`position\` (top|bottom|left|right), \`withArrow\`
+- **Divider** — Horizontal/vertical rule. Props: \`orientation\` (horizontal|vertical), \`label\`, \`labelPosition\`, \`size\`
+- **ScrollArea** — Scrollable container. Props: \`h\` (height), \`type\` (auto|always|scroll|hover)
+
+### Charts (@mantine/charts)
+- **AreaChart**, **BarChart**, **LineChart** — Props: \`data\` (array of objects), \`dataKey\` (x-axis key), \`series\` (array of {name, color}), \`h\` (height), \`curveType\` (for Area/Line)
+- **DonutChart**, **PieChart** — Props: \`data\` (array of {name, value, color}), \`h\`, \`withLabels\`, \`withLabelsLine\`
+- **RadarChart** — Props: \`data\`, \`dataKey\`, \`series\`
+- **RadialBarChart** — Props: \`data\` (array of {name, value, color}), \`h\`
+- **Sparkline** — Props: \`data\` (flat number array), \`h\`, \`w\`, \`color\`, \`curveType\`
+
+### Common Prop Patterns
+- **Spacing/sizing:** Most components accept \`p\` (padding), \`m\` (margin), \`px\`/\`py\`/\`mx\`/\`my\`/\`pt\`/\`pb\`/\`pl\`/\`pr\`/\`mt\`/\`mb\`/\`ml\`/\`mr\` with values xs|sm|md|lg|xl or numbers
+- **Colors:** Use Mantine color names: "red", "blue", "green", "orange", "violet", "pink", "cyan", "grape", "teal", "yellow", "lime", "indigo", "gray", "dark". Add shade suffix: "red.6", "blue.4"
+- **Styles:** Use \`style={{...}}\` for inline CSS. E.g. \`style={{flex: 1, minWidth: 0}}\`
+- **Conditional rendering:** Use ternaries: \`{condition ? <Text>Yes</Text> : <Text>No</Text>}\`
+- **Responsive:** Most size/spacing props accept object: \`{{ base: "sm", md: "lg" }}\`
+
+### Interactive Components (built-in, state-managed)
+These components manage their own internal state — they provide interactivity without event handlers:
+
+**PaginatedList** — Paginates its children with prev/next buttons.
+Props: \`pageSize\` (number, default 6)
+Usage: Wrap a \`.map()\` expression to paginate results.
+\`\`\`jsx
+<PaginatedList pageSize={8}>
+  {data.results.map(item =>
+    <Card withBorder p="xs" mb="xs">
+      <Text>{item.name}</Text>
+    </Card>
+  )}
+</PaginatedList>
+\`\`\`
+
+**TabsContainer + TabPanel** — Tabbed interface with automatic tab switching.
+TabsContainer props: \`defaultTab\` (string, optional — defaults to first tab)
+TabPanel props: \`value\` (string, required — unique tab ID), \`label\` (string, optional — tab display text)
+\`\`\`jsx
+<TabsContainer defaultTab="overview">
+  <TabPanel value="overview" label="Overview">
+    <Text>{data.description}</Text>
+  </TabPanel>
+  <TabPanel value="stats" label="Statistics">
+    <Text>Total: {data.count}</Text>
+  </TabPanel>
+</TabsContainer>
+\`\`\`
+
+**Collapsible** — Expandable/collapsible section with a title.
+Props: \`title\` (string, required), \`defaultOpen\` (boolean, default false)
+\`\`\`jsx
+<Collapsible title="Details" defaultOpen={true}>
+  <Text>{data.details}</Text>
+</Collapsible>
+\`\`\`
+
+**StatBar** — A horizontal stat bar with label/value (great for RPG-style stats, progress).
+Props: \`value\` (number), \`max\` (number, default 100), \`label\` (string), \`color\` (Mantine color)
+\`\`\`jsx
+<StatBar label="HP" value={45} max={100} color="red" />
+<StatBar label="ATK" value={80} max={255} color="orange" />
+\`\`\`
+
+**TypeBadge** — A colored badge that maps common type names to colors (normal, fire, water, electric, grass, ice, fighting, poison, ground, flying, psychic, bug, rock, ghost, dragon, dark, steel, fairy).
+Props: \`type\` (string), \`size\` (xs|sm|md|lg|xl, default sm)
+\`\`\`jsx
+<Group gap="xs">
+  <TypeBadge type="fire" />
+  <TypeBadge type="flying" />
+</Group>
+\`\`\`
+
+**Available bindings in templates:**
+- \`data\` — the full API response JSON object
+- \`String(v)\`, \`Number(v)\`, \`Boolean(v)\` — type coercion helpers
+- \`Math.round\`, \`Math.floor\`, \`Math.ceil\`, \`Math.abs\`, \`Math.min\`, \`Math.max\`, \`Math.pow\`, \`Math.sqrt\`, \`Math.PI\`
+- \`JSON.stringify(v)\`, \`Array.isArray(v)\`, \`Object.keys(v)\`, \`Object.values(v)\`, \`Object.entries(v)\`
+- Expression arrows for \`.map()\`, \`.filter()\`, \`.slice()\` — e.g. \`{data.items.map(item => <Text>{item.name}</Text>)}\`
+- Ternaries for conditionals — e.g. \`{data.count > 0 ? "active" : "idle"}\`
+
+**FORBIDDEN keywords (template will be rejected):** constructor, __proto__, eval, Function, import, require, globalThis, window, document, fetch
+
+**Chart data formats:**
+- BarChart/LineChart/AreaChart: \`data={data.items}\` + \`dataKey="month"\` (x-axis key) + \`series={[{ name: "count", color: "blue" }]}\` where series \`name\` matches a numeric key in each data row
+- DonutChart/PieChart: \`data={data.items}\` where each item is \`{ name: "Label", value: 42, color: "blue" }\` — NO dataKey or series
+- Sparkline: \`data={[1,2,3]}\` — flat number array
+- NumberFormatter: \`<NumberFormatter value={data.price} thousandSeparator prefix="$" />\`
+
+### Full Pokémon Card Example (demonstrating TypeBadge, StatBar, TabsContainer, Collapsible)
+API: \`https://pokeapi.co/api/v2/pokemon/charizard\`
+\`\`\`jsx
+<Stack gap="sm" p="xs">
+  <Group wrap="nowrap">
+    <Avatar src={data.sprites.front_default} size={80} radius="sm" />
+    <Stack gap={4} style={{flex: 1}}>
+      <Title order={3} tt="capitalize">{data.name}</Title>
+      <Text size="xs" c="dimmed">#{String(data.id).padStart(3, "0")}</Text>
+      <Group gap="xs">
+        {data.types.map(t => <TypeBadge type={t.type.name} />)}
+      </Group>
+    </Stack>
+  </Group>
+  <TabsContainer defaultTab="stats">
+    <TabPanel value="stats" label="Stats">
+      <Stack gap="xs" pt="xs">
+        {data.stats.map(s =>
+          <StatBar label={s.stat.name} value={s.base_stat} max={255} color={s.base_stat > 100 ? "green" : "red"} />
+        )}
+      </Stack>
+    </TabPanel>
+    <TabPanel value="abilities" label="Abilities">
+      <Stack gap="xs" pt="xs">
+        {data.abilities.map(a =>
+          <Badge variant={a.is_hidden ? "outline" : "filled"} tt="capitalize">
+            {a.ability.name}{a.is_hidden ? " (hidden)" : ""}
+          </Badge>
+        )}
+      </Stack>
+    </TabPanel>
+    <TabPanel value="moves" label="Moves">
+      <Collapsible title="Move list">
+        <Group gap="xs" pt="xs">
+          {data.moves.slice(0, 20).map(m =>
+            <Badge size="xs" variant="light" tt="capitalize">{m.move.name}</Badge>
+          )}
+        </Group>
+      </Collapsible>
+    </TabPanel>
+  </TabsContainer>
+</Stack>
+\`\`\`
+
+### Paginated List Example
+API: \`https://pokeapi.co/api/v2/pokemon?limit=50\`
+\`\`\`jsx
+<Stack gap="sm" p="xs">
+  <Group justify="space-between">
+    <Title order={3}>Pokédex</Title>
+    <Badge size="lg" color="red">{data.count} Pokémon</Badge>
+  </Group>
+  <PaginatedList pageSize={10}>
+    {data.results.map((pokemon, i) =>
+      <Card withBorder p="xs" mb="xs">
+        <Group wrap="nowrap">
+          <Avatar
+            src={"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + String(i + 1) + ".png"}
+            size="lg"
+            radius="sm"
+          />
+          <Stack gap={0} style={{ flex: 1 }}>
+            <Text fw={700} tt="capitalize">{pokemon.name}</Text>
+            <Text size="xs" c="dimmed">#{String(i + 1)}</Text>
+          </Stack>
+        </Group>
+      </Card>
+    )}
+  </PaginatedList>
+</Stack>
+\`\`\`
+
+## API Response
+`;
+
+const PROMPT_NO_RESPONSE = `Paste the raw JSON response from your API endpoint below:
+
+\`\`\`json
+PASTE_YOUR_API_RESPONSE_HERE
+\`\`\`
+`;
+
+const PROMPT_FOOTER = `
+## Your Request
+Describe what you want the widget to show:
+
+`;
+
+function buildAiPrompt(
+  jsonSchema: unknown,
+  rawResponse?: string | null,
+  currentConfig?: Record<string, unknown> | null,
+) {
+  const schemaStr = JSON.stringify(jsonSchema, null, 2);
+  const responseSection = rawResponse
+    ? `The API returned the following JSON:\n\n\`\`\`json\n${rawResponse}\n\`\`\`\n`
+    : PROMPT_NO_RESPONSE;
+
+  const configSection = currentConfig
+    ? `\n## Current Widget Configuration\nThe widget is currently configured as follows. Use this as a starting point and modify based on the user's request:\n\n\`\`\`json\n${JSON.stringify(currentConfig, null, 2)}\n\`\`\`\n`
+    : "";
+
+  return PROMPT_HEADER + schemaStr + PROMPT_RULES + responseSection + configSection + PROMPT_FOOTER;
+}
+
 interface CopyAiPromptButtonProps {
   rawResponse?: string | null;
   currentConfig?: Record<string, unknown> | null;
@@ -21,8 +300,9 @@ export const CopyAiPromptButton = ({ rawResponse, currentConfig }: CopyAiPromptB
 
   const handleCopy = async () => {
     if (!schema) return;
+    const prompt = buildAiPrompt(schema, rawResponse, currentConfig);
     try {
-      await navigator.clipboard.writeText(buildCustomWidgetAiPrompt(schema, rawResponse, currentConfig));
+      await navigator.clipboard.writeText(prompt);
       close();
       showSuccessNotification({ title: t("action.copyAiPrompt"), message: t("notification.aiPromptCopied") });
     } catch {
@@ -34,7 +314,6 @@ export const CopyAiPromptButton = ({ rawResponse, currentConfig }: CopyAiPromptB
     <Popover opened={opened} onClose={close} width={320} position="bottom" shadow="md" withinPortal>
       <Popover.Target>
         <Button
-          type="button"
           variant="light"
           leftSection={<IconSparkles size={16} />}
           onClick={open}
@@ -54,7 +333,7 @@ export const CopyAiPromptButton = ({ rawResponse, currentConfig }: CopyAiPromptB
               {t("notification.aiPromptNoResponse")}
             </Text>
           )}
-          <Button type="button" leftSection={<IconCopy size={16} />} onClick={() => void handleCopy()} fullWidth>
+          <Button leftSection={<IconCopy size={16} />} onClick={() => void handleCopy()} fullWidth>
             {t("notification.aiPromptCopy")}
           </Button>
         </Stack>

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-actions.tsx

@@ -1,14 +1,19 @@
 "use client";
 
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useRef } from "react";
 import { ActionIcon, Menu } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import { IconCopy, IconDots, IconDownload, IconTrash, IconUpload } from "@tabler/icons-react";
+import {
+  IconCopy,
+  IconDots,
+  IconDownload,
+  IconToggleLeft,
+  IconToggleRight,
+  IconTrash,
+  IconUpload,
+} from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import { getImportReview, parseCustomWidgetClipboard } from "@homarr/custom-widgets/core";
-import { ImportReviewDialog } from "@homarr/custom-widgets/workbench";
 import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
@@ -28,8 +33,28 @@ export const CustomWidgetRowActions = ({ widget }: { widget: WidgetRef }) => {
   const { openConfirmModal } = useConfirmModal();
   const deleteMutation = clientApi.customWidget.delete.useMutation();
   const duplicateMutation = clientApi.customWidget.duplicate.useMutation();
+  const toggleEnabledMutation = clientApi.customWidget.toggleEnabled.useMutation();
   const utils = clientApi.useUtils();
 
+  const handleToggleEnabled = () => {
+    toggleEnabledMutation.mutate(
+      { id: widget.id, enabled: !widget.enabled },
+      {
+        onSuccess: () => {
+          void utils.customWidget.all.invalidate();
+          void utils.widget.customApi.getData.invalidate({ definitionId: widget.id });
+          void revalidatePathActionAsync("/manage/custom-widgets");
+        },
+        onError: () => {
+          showErrorNotification({
+            title: widget.enabled ? t("action.disable") : t("action.enable"),
+            message: t("notification.toggleError"),
+          });
+        },
+      },
+    );
+  };
+
   const handleExport = async () => {
     try {
       const data = await utils.customWidget.export.fetch({ id: widget.id });
@@ -78,7 +103,7 @@ export const CustomWidgetRowActions = ({ widget }: { widget: WidgetRef }) => {
                 message: t("notification.deleted", { name: widget.name }),
               });
               void utils.customWidget.all.invalidate();
-              void utils.widget.customApi.getData.invalidate();
+              void utils.widget.customApi.getData.invalidate({ definitionId: widget.id });
               void revalidatePathActionAsync("/manage/custom-widgets");
             },
             onError: () => {
@@ -98,6 +123,14 @@ export const CustomWidgetRowActions = ({ widget }: { widget: WidgetRef }) => {
         </ActionIcon>
       </Menu.Target>
       <Menu.Dropdown>
+        <Menu.Item
+          onClick={handleToggleEnabled}
+          leftSection={widget.enabled ? <IconToggleLeft {...iconProps} /> : <IconToggleRight {...iconProps} />}
+          disabled={toggleEnabledMutation.isPending}
+        >
+          {widget.enabled ? t("action.disable") : t("action.enable")}
+        </Menu.Item>
+        <Menu.Divider />
         <Menu.Item
           onClick={handleDuplicate}
           leftSection={<IconCopy {...iconProps} />}
@@ -125,13 +158,9 @@ export const CustomWidgetRowActions = ({ widget }: { widget: WidgetRef }) => {
 export const ImportCustomWidgetButton = () => {
   const t = useScopedI18n("customWidget");
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const [pendingImport, setPendingImport] = useState<Record<string, unknown> | null>(null);
-  const [reviewOpened, { open: openReview, close: closeReview }] = useDisclosure(false);
   const utils = clientApi.useUtils();
   const importMutation = clientApi.customWidget.import.useMutation({
     onSuccess: () => {
-      closeReview();
-      setPendingImport(null);
       showSuccessNotification({ title: t("action.import"), message: t("notification.imported") });
       void utils.customWidget.all.invalidate();
       void revalidatePathActionAsync("/manage/custom-widgets");
@@ -140,45 +169,23 @@ export const ImportCustomWidgetButton = () => {
       showErrorNotification({ title: t("action.import"), message: t("notification.importError") });
     },
   });
-  const review = useMemo(() => getImportReview(pendingImport), [pendingImport]);
-  const queueImport = useCallback(
-    (value: Record<string, unknown>) => {
-      setPendingImport(value);
-      openReview();
-    },
-    [openReview],
-  );
-
-  useEffect(() => {
-    const handlePaste = (event: ClipboardEvent) => {
-      const target = event.target as HTMLElement | null;
-      if (target?.matches("input, textarea, [contenteditable='true']")) return;
-      const widget = parseCustomWidgetClipboard(event.clipboardData?.getData("text/plain") ?? "");
-      if (!widget) return;
-      event.preventDefault();
-      queueImport(widget);
-    };
-    window.addEventListener("paste", handlePaste);
-    return () => window.removeEventListener("paste", handlePaste);
-  }, [queueImport]);
 
   const handleImport = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
     if (!file) return;
 
     const reader = new FileReader();
-    reader.addEventListener("load", (e) => {
+    reader.onload = (e) => {
       try {
-        const widget = parseCustomWidgetClipboard(e.target?.result as string);
-        if (!widget) throw new Error("Invalid import");
-        queueImport(widget);
+        const json = JSON.parse(e.target?.result as string);
+        importMutation.mutate(json);
       } catch {
         showErrorNotification({ title: t("action.import"), message: t("notification.importError") });
       }
-    });
-    reader.addEventListener("error", () => {
+    };
+    reader.onerror = () => {
       showErrorNotification({ title: t("action.import"), message: t("notification.importError") });
-    });
+    };
     reader.readAsText(file);
     event.target.value = "";
   };
@@ -190,39 +197,16 @@ export const ImportCustomWidgetButton = () => {
         leftSection={<IconUpload size={16} />}
         onClick={() => fileInputRef.current?.click()}
         loading={importMutation.isPending}
-        title={t("action.pasteImportHint")}
       >
         {t("action.import")}
       </MobileAffixButton>
       <input
         ref={fileInputRef}
         type="file"
-        accept=".json,.md,text/markdown,application/json"
+        accept=".json"
         hidden
         onChange={handleImport}
-        aria-label={t("importReview.fileLabel")}
-      />
-      <ImportReviewDialog
-        opened={reviewOpened}
-        review={review}
-        pending={importMutation.isPending}
-        onClose={closeReview}
-        onConfirm={() => pendingImport && importMutation.mutate(pendingImport as never)}
-        messages={{
-          title: t("importReview.title"),
-          description: t("importReview.description"),
-          name: t("importReview.name"),
-          origin: t("importReview.origin"),
-          authentication: t("importReview.authentication"),
-          networkScope: t("importReview.networkScope"),
-          methods: t("importReview.methods"),
-          permissions: t("importReview.permissions"),
-          actionWarningTitle: t("importReview.actionWarning.title"),
-          actionWarningDescription: t("importReview.actionWarning.description"),
-          cancel: t("importReview.cancel"),
-          confirm: t("importReview.confirm"),
-          permission: (permission) => t(`preview.request.permission.${permission}` as never),
-        }}
+        aria-label="Import custom widget"
       />
     </>
   );

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-form-errors.ts

@@ -1,42 +0,0 @@
-const serverToFormFieldMap: Record<string, Record<string, string>> = {
-  statGrid: { items: "statGridItems" },
-  countGrid: { items: "countGridItems" },
-  statusIndicator: { items: "statusItems" },
-  progressBars: { bars: "progressBars" },
-  keyValue: { mappings: "mappings" },
-  table: { columns: "columns", tablePath: "tablePath" },
-  singleValue: { jsonPath: "jsonPath", label: "label", unit: "unit" },
-  raw: { jsonPath: "rawJsonPath" },
-  actionButton: { buttonLabel: "buttonLabel" },
-  customJsx: { template: "template", requests: "requestManifest", networkScope: "networkScope" },
-};
-
-export function extractServerErrors(error: unknown, displayType: string): Record<string, string> {
-  const errors: Record<string, string> = {};
-  const trpcError = error as {
-    data?: { zodError?: { fieldErrors?: Record<string, string[]> } };
-    message?: string;
-  };
-  if (trpcError.data?.zodError?.fieldErrors) {
-    for (const [field, messages] of Object.entries(trpcError.data.zodError.fieldErrors)) {
-      if (messages?.[0]) errors[field] = messages[0];
-    }
-    return errors;
-  }
-  try {
-    const issues = JSON.parse(trpcError.message ?? "[]") as Array<{ path: (string | number)[]; message: string }>;
-    const fieldMap = serverToFormFieldMap[displayType] ?? {};
-    for (const issue of issues) {
-      const path = [...issue.path];
-      if (path[0] === "displayConfig") {
-        path.shift();
-        const serverField = String(path[0]);
-        path[0] = fieldMap[serverField] ?? serverField;
-      }
-      errors[path.join(".")] = issue.message;
-    }
-  } catch {
-    // Non-validation server errors are handled by the caller's notification.
-  }
-  return errors;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-form-sections.tsx

@@ -1,238 +0,0 @@
-import type { RefObject } from "react";
-import {
-  Button,
-  Fieldset,
-  Group,
-  PasswordInput,
-  SegmentedControl,
-  Select,
-  Stack,
-  Text,
-  TextInput,
-  Textarea,
-  ThemeIcon,
-} from "@mantine/core";
-import { IconCode, IconLayoutGrid, IconPlayerPlay } from "@tabler/icons-react";
-import { IconPicker } from "@homarr/forms-collection";
-import { CUSTOM_JSX_STARTER } from "@homarr/custom-widgets/core";
-import {
-  CUSTOM_WIDGET_AUTH_SECRET_FIELDS,
-  CUSTOM_WIDGET_AUTH_USES_HEADER_NAME,
-} from "@homarr/custom-widgets/workbench";
-
-import type { DisplayFieldsProps } from "./_display-field-types";
-import { DISPLAY_TYPE_ICONS, DisplayTypeFields, DisplayTypePicker } from "./_display-type-fields";
-import classes from "./_custom-widget-form.module.css";
-
-interface SharedSectionProps extends DisplayFieldsProps {
-  sectionRef: RefObject<HTMLElement | null>;
-}
-
-interface FormatSectionProps extends SharedSectionProps {
-  onContinue: () => void;
-}
-
-export function FormatSection({ form, t, sectionRef, onContinue }: FormatSectionProps) {
-  return (
-    <section ref={sectionRef} className={classes.formSection} tabIndex={-1}>
-      <ThemeIcon className={classes.sectionMarker} variant="filled" size={40} radius="xl">
-        <IconLayoutGrid size={20} />
-      </ThemeIcon>
-      <Stack gap="xl">
-        <SectionHeading label={t("steps.format.label")} description={t("steps.format.description")} />
-        <Fieldset legend={t("fieldset.general")}>
-          <Stack gap="sm">
-            <TextInput label={t("field.name")} required {...form.getInputProps("name")} />
-            <Textarea label={t("field.description")} {...form.getInputProps("description")} />
-            <IconPicker withAsterisk={false} {...form.getInputProps("iconUrl")} />
-          </Stack>
-        </Fieldset>
-        <Fieldset legend={t("field.displayType")}>
-          <Stack gap="sm">
-            <Text size="sm" c="dimmed">
-              {t("steps.format.help")}
-            </Text>
-            <DisplayTypePicker
-              value={form.values.displayType}
-              onChange={(value) => {
-                form.setFieldValue("displayType", value);
-                if (value === "customJsx" && !form.values.template.trim())
-                  form.setFieldValue("template", CUSTOM_JSX_STARTER);
-              }}
-              t={t}
-            />
-          </Stack>
-        </Fieldset>
-        <ContinueButton label={t("steps.continueTo", { step: t("steps.connection.label") })} onClick={onContinue} />
-      </Stack>
-    </section>
-  );
-}
-
-interface ConnectionSectionProps extends SharedSectionProps {
-  isTesting: boolean;
-  onTest: () => void;
-  onContinue: () => void;
-}
-
-export function ConnectionSection({ form, t, sectionRef, isTesting, onTest, onContinue }: ConnectionSectionProps) {
-  const secretFields = CUSTOM_WIDGET_AUTH_SECRET_FIELDS[form.values.authType] ?? [];
-  const authTypeOptions = ["none", "bearer", "basic", "apiKeyHeader", "apiKeyQuery"].map((value) => ({
-    value,
-    label: t(`authType.${value}` as never),
-  }));
-  const handleAuthTypeChange = (value: string) => {
-    form.setFieldValue("authType", value);
-    form.setFieldValue(
-      "secrets",
-      (CUSTOM_WIDGET_AUTH_SECRET_FIELDS[value] ?? []).map((field) => ({
-        kind: field.kind,
-        value: form.values.secrets.find((secret) => secret.kind === field.kind)?.value ?? "",
-      })),
-    );
-  };
-  return (
-    <section ref={sectionRef} className={classes.formSection} tabIndex={-1}>
-      <ThemeIcon className={classes.sectionMarker} variant="light" size={40} radius="xl">
-        <IconPlayerPlay size={20} />
-      </ThemeIcon>
-      <Stack gap="xl">
-        <SectionHeading label={t("steps.connection.label")} description={t("steps.connection.description")} />
-        <Fieldset legend={t("fieldset.connection")}>
-          <Stack gap="sm">
-            <Group align="end" wrap="wrap" gap="xs">
-              <Select
-                label={t("field.method")}
-                data={["GET", "POST", "PUT", "DELETE", "PATCH"].map((value) => ({
-                  value,
-                  label: t(`method.${value}` as never),
-                }))}
-                w={110}
-                {...form.getInputProps("method")}
-                allowDeselect={false}
-                disabled={form.values.displayType === "customJsx" && form.values.jsxApiVersion === "2"}
-              />
-              <TextInput
-                label={t("field.url")}
-                required
-                placeholder={t("placeholder.url")}
-                style={{ flex: "1 1 260px" }}
-                {...form.getInputProps("url")}
-              />
-              <Button
-                type="button"
-                size="sm"
-                variant="light"
-                leftSection={<IconPlayerPlay size={16} />}
-                onClick={onTest}
-                loading={isTesting}
-                disabled={!form.values.url || form.values.method !== "GET"}
-              >
-                {t("preview.test")}
-              </Button>
-            </Group>
-            <div>
-              <Text size="sm" fw={500} mb={4}>
-                {t("field.authType")}
-              </Text>
-              <Select
-                hiddenFrom="sm"
-                value={form.values.authType}
-                data={authTypeOptions}
-                onChange={(value) => handleAuthTypeChange(value ?? "none")}
-                allowDeselect={false}
-                aria-label={t("field.authType")}
-              />
-              <SegmentedControl
-                visibleFrom="sm"
-                fullWidth
-                value={form.values.authType}
-                data={authTypeOptions}
-                onChange={handleAuthTypeChange}
-              />
-            </div>
-            {CUSTOM_WIDGET_AUTH_USES_HEADER_NAME[form.values.authType] && (
-              <TextInput
-                label={t("field.headerName")}
-                placeholder={t("placeholder.headerName")}
-                {...form.getInputProps("headerName")}
-              />
-            )}
-            {secretFields.map((field) => {
-              const index = form.values.secrets.findIndex((secret) => secret.kind === field.kind);
-              const secret = form.values.secrets[index];
-              if (index === -1 || !secret) return null;
-              const props = {
-                label: t(`secret.${field.labelKey}` as never),
-                placeholder: secret.hasValue && !secret.value ? t("secret.savedPlaceholder" as never) : undefined,
-                ...form.getInputProps(`secrets.${index}.value`),
-              };
-              return field.isPassword ? (
-                <PasswordInput key={field.kind} {...props} />
-              ) : (
-                <TextInput key={field.kind} {...props} />
-              );
-            })}
-            {form.values.method !== "GET" && (
-              <Textarea label={t("field.requestBody")} minRows={3} {...form.getInputProps("requestBody")} />
-            )}
-          </Stack>
-        </Fieldset>
-        <ContinueButton label={t("steps.continueTo", { step: t("steps.configure.label") })} onClick={onContinue} />
-      </Stack>
-    </section>
-  );
-}
-
-export function ConfigureSection({ form, t, previewJson, sectionRef }: SharedSectionProps) {
-  const SelectedIcon = DISPLAY_TYPE_ICONS[form.values.displayType as keyof typeof DISPLAY_TYPE_ICONS];
-  return (
-    <section ref={sectionRef} className={classes.formSection} tabIndex={-1}>
-      <ThemeIcon className={classes.sectionMarker} variant="light" size={40} radius="xl">
-        <IconCode size={20} />
-      </ThemeIcon>
-      <Stack gap="xl">
-        <SectionHeading label={t("steps.configure.label")} description={t("steps.configure.description")} />
-        <Fieldset legend={t("fieldset.display")}>
-          <Stack gap="sm">
-            <Group gap="xs">
-              <ThemeIcon variant="light" size="lg">
-                {SelectedIcon ? <SelectedIcon size={20} /> : null}
-              </ThemeIcon>
-              <div>
-                <Text fw={600}>{t(`displayType.${form.values.displayType}` as never)}</Text>
-                <Text size="xs" c="dimmed">
-                  {t(`displayTypeDescription.${form.values.displayType}` as never)}
-                </Text>
-              </div>
-            </Group>
-            <DisplayTypeFields form={form} t={t} previewJson={previewJson} />
-          </Stack>
-        </Fieldset>
-      </Stack>
-    </section>
-  );
-}
-
-function SectionHeading({ label, description }: { label: string; description: string }) {
-  return (
-    <div>
-      <Text fw={700} size="lg">
-        {label}
-      </Text>
-      <Text size="sm" c="dimmed">
-        {description}
-      </Text>
-    </div>
-  );
-}
-
-function ContinueButton({ label, onClick }: { label: string; onClick: () => void }) {
-  return (
-    <Group justify="flex-end">
-      <Button type="button" variant="light" size="md" onClick={onClick}>
-        {label}
-      </Button>
-    </Group>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-form.module.css

@@ -1,151 +0,0 @@
-.form {
-  min-width: 0;
-}
-
-.workbench {
-  display: grid;
-  gap: var(--mantine-spacing-xl);
-  align-items: start;
-}
-
-.paneSwitcher {
-  position: sticky;
-  top: var(--mantine-spacing-xs);
-  z-index: 10;
-  margin-bottom: var(--mantine-spacing-lg);
-  background: var(--mantine-color-body);
-}
-
-@media (max-width: 74.9375em) {
-  .workbench[data-mobile-pane="configure"] .previewPane,
-  .workbench[data-mobile-pane="preview"] .configuration {
-    display: none;
-  }
-}
-
-.configuration,
-.previewPane {
-  min-width: 0;
-}
-
-.previewPane {
-  display: flex;
-  flex-direction: column;
-  gap: var(--mantine-spacing-md);
-}
-
-.actionBar {
-  position: sticky;
-  bottom: var(--mantine-spacing-sm);
-  z-index: 10;
-  background: var(--mantine-color-body);
-}
-
-.mobileSaveBar {
-  position: sticky;
-  bottom: var(--mantine-spacing-sm);
-  z-index: 10;
-  background: var(--mantine-color-body);
-}
-
-.formFlow {
-  --flow-marker-size: 2.5rem;
-}
-
-.formSection {
-  position: relative;
-  padding: 0 0 var(--mantine-spacing-xl) calc(var(--flow-marker-size) + var(--mantine-spacing-lg));
-  scroll-margin-top: 5rem;
-  outline: none;
-}
-
-.formSection:not(:last-child)::before {
-  position: absolute;
-  top: var(--flow-marker-size);
-  bottom: 0;
-  left: calc(var(--flow-marker-size) / 2);
-  width: 1px;
-  background: var(--mantine-color-default-border);
-  content: "";
-}
-
-.formSection:focus-visible {
-  border-radius: var(--mantine-radius-md);
-  outline: 2px solid var(--mantine-primary-color-filled);
-  outline-offset: 4px;
-}
-
-.sectionMarker {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1;
-}
-
-.displayTypeOption {
-  display: flex;
-  align-items: flex-start;
-  gap: var(--mantine-spacing-sm);
-  min-height: 7rem;
-  padding: var(--mantine-spacing-md);
-  border: 1px solid var(--mantine-color-default-border);
-  border-radius: var(--mantine-radius-md);
-  background: var(--mantine-color-body);
-  transition:
-    border-color 160ms ease,
-    background-color 160ms ease;
-}
-
-.displayTypeOption:hover {
-  background: var(--mantine-color-default-hover);
-}
-
-.displayTypeOption[data-selected] {
-  border-color: var(--mantine-primary-color-filled);
-  background: var(--mantine-primary-color-light);
-}
-
-.displayTypeOption:focus-visible {
-  outline: 2px solid var(--mantine-primary-color-filled);
-  outline-offset: 2px;
-}
-
-.displayTypeCopy {
-  min-width: 0;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .displayTypeOption {
-    transition: none;
-  }
-}
-
-@media (min-width: 75em) {
-  .paneSwitcher {
-    display: none;
-  }
-
-  .mobileSaveBar {
-    display: none;
-  }
-
-  .workbench {
-    grid-template-columns: 1fr 1fr;
-  }
-
-  .previewPane {
-    position: sticky;
-    top: 5rem;
-  }
-
-  .actionBar {
-    top: 5rem;
-    bottom: auto;
-  }
-}
-
-@media (min-width: 100em) {
-  .workbench {
-    grid-template-columns: 0.9fr 1.1fr;
-  }
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-list.tsx

@@ -1,12 +1,9 @@
 "use client";
 
-import { ActionIcon, Avatar, Badge, Card, Group, Stack, Switch, Text, Tooltip } from "@mantine/core";
+import { ActionIcon, Avatar, Badge, Group, Stack, Table, Text } from "@mantine/core";
 import { IconApi, IconPencil } from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { showErrorNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 import { Link } from "@homarr/ui";
 
@@ -26,6 +23,8 @@ const displayTypeBadgeColors: Record<string, string> = {
   customJsx: "pink",
 };
 
+const iconProps = { size: 16, stroke: 1.5 };
+
 interface CustomWidgetListProps {
   definitions: RouterOutputs["customWidget"]["all"];
 }
@@ -44,99 +43,59 @@ export const CustomWidgetList = ({ definitions }: CustomWidgetListProps) => {
   }
 
   return (
-    <Stack gap="sm">
-      {definitions.map((def) => (
-        <CustomWidgetCard key={def.id} widget={def} />
-      ))}
+    <Stack gap="md">
+      <Table striped highlightOnHover withTableBorder>
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>{t("table.name")}</Table.Th>
+            <Table.Th>{t("table.url")}</Table.Th>
+            <Table.Th>{t("table.display")}</Table.Th>
+            <Table.Th w={90} />
+          </Table.Tr>
+        </Table.Thead>
+        <Table.Tbody>
+          {definitions.map((def) => (
+            <Table.Tr key={def.id} style={{ opacity: def.enabled ? undefined : 0.5 }}>
+              <Table.Td>
+                <Group gap="xs" wrap="nowrap">
+                  {def.iconUrl ? (
+                    <Avatar size={20} radius="sm" src={def.iconUrl} styles={{ image: { objectFit: "contain" } }} />
+                  ) : (
+                    <IconApi size={16} />
+                  )}
+                  <Text size="sm" fw={500} lineClamp={1} c={def.enabled ? undefined : "dimmed"} style={{ minWidth: 0 }}>
+                    {def.name}
+                  </Text>
+                </Group>
+              </Table.Td>
+              <Table.Td>
+                <Text size="sm" c="dimmed" lineClamp={1}>
+                  {def.url}
+                </Text>
+              </Table.Td>
+              <Table.Td>
+                <Badge color={displayTypeBadgeColors[def.displayType] ?? "gray"} size="sm">
+                  {t(`displayType.${def.displayType}` as never)}
+                </Badge>
+              </Table.Td>
+              <Table.Td>
+                <Group gap={4} justify="flex-end" wrap="nowrap">
+                  <ActionIcon
+                    component={Link}
+                    href={`/manage/custom-widgets/edit/${def.id}`}
+                    variant="filled"
+                    color="red"
+                    aria-label={t("action.edit")}
+                  >
+                    <IconPencil {...iconProps} />
+                  </ActionIcon>
+                  <CustomWidgetRowActions widget={{ id: def.id, name: def.name, enabled: def.enabled }} />
+                </Group>
+              </Table.Td>
+            </Table.Tr>
+          ))}
+        </Table.Tbody>
+      </Table>
     </Stack>
   );
 };
-
-type WidgetDef = RouterOutputs["customWidget"]["all"][number];
-
-function CustomWidgetCard({ widget }: { widget: WidgetDef }) {
-  const t = useScopedI18n("customWidget");
-  const toggleMutation = clientApi.customWidget.toggleEnabled.useMutation();
-  const utils = clientApi.useUtils();
-
-  const handleToggle = () => {
-    toggleMutation.mutate(
-      { id: widget.id, enabled: !widget.enabled },
-      {
-        onSuccess: () => {
-          void utils.customWidget.all.invalidate();
-          void utils.widget.customApi.getData.invalidate();
-          void revalidatePathActionAsync("/manage/custom-widgets");
-        },
-        onError: () => {
-          showErrorNotification({
-            title: widget.enabled ? t("action.disable") : t("action.enable"),
-            message: t("notification.toggleError"),
-          });
-        },
-      },
-    );
-  };
-
-  return (
-    <Card
-      padding="sm"
-      style={{
-        opacity: widget.enabled ? 1 : 0.55,
-        transition: "opacity 150ms ease",
-      }}
-    >
-      <Group justify="space-between" wrap="nowrap" gap="md">
-        <Group wrap="nowrap" gap="sm" style={{ flex: 1, minWidth: 0 }}>
-          {widget.iconUrl ? (
-            <Avatar size={36} radius="sm" src={widget.iconUrl} styles={{ image: { objectFit: "contain" } }} />
-          ) : (
-            <Avatar size={36} radius="sm" color="red">
-              <IconApi size={18} />
-            </Avatar>
-          )}
-          <Stack gap={2} style={{ minWidth: 0, flex: 1 }}>
-            <Text size="sm" fw={600} lineClamp={1} style={{ minWidth: 0 }}>
-              {widget.name}
-            </Text>
-            {widget.url && (
-              <Text size="xs" c="dimmed" ff="monospace" lineClamp={1} style={{ wordBreak: "break-all", minWidth: 0 }}>
-                {widget.url}
-              </Text>
-            )}
-          </Stack>
-          <Badge
-            color={displayTypeBadgeColors[widget.displayType] ?? "gray"}
-            size="sm"
-            variant="light"
-            style={{ flexShrink: 0 }}
-          >
-            {t(`displayType.${widget.displayType}` as never)}
-          </Badge>
-        </Group>
-
-        <Group gap="xs" wrap="nowrap" style={{ flexShrink: 0 }}>
-          <Tooltip label={widget.enabled ? t("action.disable") : t("action.enable")}>
-            <Switch
-              size="sm"
-              checked={widget.enabled}
-              onChange={handleToggle}
-              disabled={toggleMutation.isPending}
-              aria-label={widget.enabled ? t("action.disable") : t("action.enable")}
-            />
-          </Tooltip>
-          <ActionIcon
-            component={Link}
-            href={`/manage/custom-widgets/edit/${widget.id}`}
-            variant="subtle"
-            color="gray"
-            aria-label={t("action.edit")}
-          >
-            <IconPencil size={16} stroke={1.5} />
-          </ActionIcon>
-          <CustomWidgetRowActions widget={{ id: widget.id, name: widget.name, enabled: widget.enabled }} />
-        </Group>
-      </Group>
-    </Card>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_custom-widget-preview.tsx

@@ -1,42 +1,23 @@
 "use client";
 
-import { useMemo, useState } from "react";
-import { Card, Stack, Tabs } from "@mantine/core";
+import { useMemo } from "react";
+import { Alert, Badge, Button, Card, Center, Code, Group, Loader, ScrollArea, Stack, Text, Title } from "@mantine/core";
+import { IconAlertTriangle, IconExternalLink, IconPlayerPlay } from "@tabler/icons-react";
 
-import { clientApi } from "@homarr/api/client";
-import type {
-  CustomWidgetAuthType,
-  CustomWidgetDisplayType,
-  CustomWidgetMethod,
-  CustomWidgetSecretKind,
-  DisplayConfig,
-} from "@homarr/custom-widgets/core";
-import { extractDisplayData } from "@homarr/custom-widgets/core";
-import {
-  analyzeJsxTemplate,
-  getPreviewLegacyMethods,
-  getPreviewNamedRequests,
-  PreviewDiagnosticsPanel,
-  PreviewErrorBoundary,
-  PreviewHeader,
-  PreviewRequestPanel,
-  PreviewResponsePanel,
-  redactPreviewUrl,
-} from "@homarr/custom-widgets/workbench";
-import { CUSTOM_JSX_METHOD_COLORS } from "@homarr/widgets/custom-api/custom-jsx-display";
 import { useScopedI18n } from "@homarr/translation/client";
+import { extractDisplayData } from "@homarr/widgets/custom-api/extract-display-data";
 
-import { PreviewWidgetPanel } from "./_preview-widget-panel";
+import { displayComponents } from "@homarr/widgets/custom-api/component";
 
-export interface PreviewInput {
+interface PreviewInput {
   url: string;
-  method: CustomWidgetMethod;
-  authType: CustomWidgetAuthType;
+  method: string;
+  authType: string;
   headerName?: string;
   requestBody?: string;
-  displayType: CustomWidgetDisplayType;
-  displayConfig: DisplayConfig;
-  secrets: Array<{ kind: CustomWidgetSecretKind; value: string }>;
+  displayType: string;
+  displayConfig: Record<string, unknown>;
+  secrets: Array<{ kind: string; value: string }>;
   definitionId?: string;
 }
 
@@ -45,7 +26,6 @@ export interface PreviewFetchResult {
   error?: string;
   responseInfo: { status: number; statusText: string } | null;
   rawResponse: string | null;
-  previewSession?: { id: string; expiresAt: number; liveActions: boolean } | null;
 }
 
 interface CustomWidgetPreviewProps {
@@ -55,223 +35,146 @@ interface CustomWidgetPreviewProps {
   cachedJson: unknown;
   onTest: () => void;
   isTesting: boolean;
-  isSampleStale?: boolean;
   testError?: string | null;
-  onInsertDataPath?: (path: string) => void;
-  onSetPreviewLiveActions?: (enabled: boolean) => void;
-  isUpdatingPreviewActions?: boolean;
-  onSampleDataChange?: (value: unknown) => void;
 }
 
-const methodColor = (method: string) => CUSTOM_JSX_METHOD_COLORS[method] ?? "gray";
-
-export function CustomWidgetPreview(props: CustomWidgetPreviewProps) {
-  const t = useScopedI18n("customWidget.preview");
-  return (
-    <PreviewErrorBoundary
-      title={t("errorBoundary.title")}
-      description={t("errorBoundary.description")}
-      retryLabel={t("errorBoundary.retry")}
-    >
-      <CustomWidgetPreviewContent {...props} />
-    </PreviewErrorBoundary>
-  );
-}
-
-function CustomWidgetPreviewContent({
+export function CustomWidgetPreview({
   getFormValues,
   formValues,
   fetchResult,
   cachedJson,
   onTest,
   isTesting,
-  isSampleStale = false,
   testError,
-  onInsertDataPath,
-  onSetPreviewLiveActions,
-  isUpdatingPreviewActions = false,
-  onSampleDataChange,
 }: CustomWidgetPreviewProps) {
   const t = useScopedI18n("customWidget");
-  const editorT = useScopedI18n("customWidget.editor");
-  const [previewSize, setPreviewSize] = useState("standard");
-  const displayConfig = formValues.displayConfig as DisplayConfig & Record<string, unknown>;
-  const previewSessionId = fetchResult?.previewSession?.id ?? "";
-  const journalQuery = clientApi.customWidget.previewJournal.useQuery(
-    { sessionId: previewSessionId },
-    { enabled: previewSessionId.length > 0, retry: false, refetchInterval: 1_000 },
-  );
 
   const displayData = useMemo((): Record<string, unknown> | null => {
-    const { displayType } = formValues;
+    const { displayType, displayConfig } = formValues;
     if (displayType === "actionButton") {
       return extractDisplayData(null, displayType, displayConfig) as Record<string, unknown>;
     }
     if (!fetchResult?.success || cachedJson == null) return null;
-    const extracted = extractDisplayData(cachedJson, displayType, displayConfig) as Record<string, unknown>;
-    return displayType === "customJsx" && fetchResult.previewSession
-      ? {
-          ...extracted,
-          previewSessionId: fetchResult.previewSession.id,
-          previewLiveActions: fetchResult.previewSession.liveActions,
-        }
-      : extracted;
-  }, [fetchResult, cachedJson, formValues, displayConfig]);
-
-  const namedRequests = useMemo(() => getPreviewNamedRequests(displayConfig), [displayConfig]);
-  const httpMethods = useMemo(() => {
-    if (formValues.displayType !== "customJsx") return [];
-    if (namedRequests.length > 0) return [...new Set(namedRequests.map((request) => request.method))];
-    return getPreviewLegacyMethods((displayConfig.template as string) ?? "");
-  }, [formValues.displayType, displayConfig.template, namedRequests]);
-  const hasNamedActions = namedRequests.some((request) => request.kind === "action");
-  const templateDiagnostics = useMemo(
-    () =>
-      formValues.displayType === "customJsx"
-        ? analyzeJsxTemplate((displayConfig.template as string) ?? "", {
-            apiVersion: displayConfig.jsxApiVersion === 2 ? 2 : 1,
-            requestIds: namedRequests.map((request) => request.id),
-          })
-        : [],
-    [displayConfig, formValues.displayType, namedRequests],
-  );
+    return extractDisplayData(cachedJson, displayType, displayConfig) as Record<string, unknown>;
+  }, [fetchResult?.success, cachedJson, formValues]);
 
   const handleTest = () => {
     const values = getFormValues();
-    if (!values.url || values.method !== "GET") return;
+    if (!values.url) return;
     onTest();
   };
 
   return (
-    <Card withBorder p="lg">
-      <Stack gap="md">
-        <PreviewHeader
-          method={formValues.method}
-          url={formValues.url}
-          methods={httpMethods}
-          hasNamedActions={hasNamedActions}
-          hasPreviewSession={Boolean(fetchResult?.previewSession)}
-          liveActions={fetchResult?.previewSession?.liveActions ?? false}
-          isUpdatingLiveActions={isUpdatingPreviewActions}
-          isTesting={isTesting}
-          isSampleStale={isSampleStale}
-          testError={testError}
-          responseError={fetchResult?.success === false ? fetchResult.error : undefined}
-          responseStatus={fetchResult?.success === false ? fetchResult.responseInfo : undefined}
-          onTest={handleTest}
-          onSetLiveActions={onSetPreviewLiveActions}
-          methodColor={methodColor}
-          messages={{
-            title: t("preview.title"),
-            interactive: t("preview.capabilities.interactive"),
-            capabilitiesTitle: t("preview.capabilities.title"),
-            capabilitiesDescription: t("preview.capabilities.description"),
-            liveActions: t("preview.capabilities.liveActions"),
-            liveActionsDescription: t("preview.capabilities.liveActionsDescription"),
-            runTestFirst: t("preview.capabilities.runTestFirst"),
-            simulated: t("preview.capabilities.simulated"),
-            test: t("preview.test"),
-            mutationDisabled: t("preview.mutationDisabled"),
-            staleTitle: t("preview.stale.title"),
-            staleDescription: t("preview.stale.description"),
-          }}
-        />
+    <Card withBorder shadow="sm" p="md">
+      <Stack gap="sm">
+        <Group justify="space-between" align="center">
+          <Title order={5}>{t("preview.title")}</Title>
+          <Button
+            size="xs"
+            variant="light"
+            leftSection={isTesting ? <Loader size={14} /> : <IconPlayerPlay size={14} />}
+            onClick={handleTest}
+            loading={isTesting}
+          >
+            {t("preview.test")}
+          </Button>
+        </Group>
 
-        <Tabs defaultValue="widget" keepMounted={false}>
-          <Tabs.List grow>
-            <Tabs.Tab value="widget">{t("preview.tab.widget")}</Tabs.Tab>
-            <Tabs.Tab value="response">{t("preview.tab.response")}</Tabs.Tab>
-            <Tabs.Tab value="request">{t("preview.tab.request")}</Tabs.Tab>
-            <Tabs.Tab value="diagnostics">{t("preview.tab.diagnostics")}</Tabs.Tab>
-          </Tabs.List>
+        {testError && (
+          <Alert color="red" icon={<IconAlertTriangle size={16} />} p="xs">
+            <Text size="xs">{testError}</Text>
+          </Alert>
+        )}
 
-          <Tabs.Panel value="widget" pt="sm">
-            <PreviewWidgetPanel
-              data={displayData}
-              displayType={formValues.displayType}
-              success={fetchResult?.success ?? false}
-              responseInfo={fetchResult?.responseInfo ?? null}
-              previewSize={previewSize}
-              onPreviewSizeChange={setPreviewSize}
-            />
-          </Tabs.Panel>
+        {fetchResult && !fetchResult.success && (
+          <Alert color="red" icon={<IconAlertTriangle size={16} />} p="xs">
+            <Text size="xs" fw={500}>
+              {fetchResult.error}
+            </Text>
+            {fetchResult.responseInfo && (
+              <Badge size="xs" color="red" variant="light" mt={4}>
+                {fetchResult.responseInfo.status} {fetchResult.responseInfo.statusText}
+              </Badge>
+            )}
+          </Alert>
+        )}
 
-          <Tabs.Panel value="response" pt="sm">
-            <PreviewResponsePanel
-              value={cachedJson}
-              rawResponse={fetchResult?.rawResponse}
-              onInsertDataPath={onInsertDataPath}
-              onSampleDataChange={onSampleDataChange}
-              messages={{
-                empty: t("preview.response.empty"),
-                sampleHint: t("preview.response.sampleHint"),
-                editSample: t("preview.response.editSample"),
-                addSample: t("preview.response.addSample"),
-                copied: t("preview.response.copied"),
-                copy: t("preview.response.copy"),
-                sampleLabel: t("preview.response.sampleLabel"),
-                sampleDescription: t("preview.response.sampleDescription"),
-                invalidSample: t("preview.response.invalidSample"),
-                cancelSample: t("preview.response.cancelSample"),
-                applySample: t("preview.response.applySample"),
-                copyPath: t("preview.response.copyPath"),
-                pathCopied: t("preview.response.pathCopied"),
-                insertPath: t("preview.response.insertPath"),
-                openRaw: t("preview.rawResponse"),
-              }}
-            />
-          </Tabs.Panel>
+        {displayData && (formValues.displayType === "actionButton" || fetchResult?.success) && (
+          <Stack gap="xs">
+            {fetchResult?.success && (
+              <Group gap="xs">
+                <Badge size="xs" color="green" variant="light">
+                  {fetchResult.responseInfo?.status} {fetchResult.responseInfo?.statusText}
+                </Badge>
+              </Group>
+            )}
 
-          <Tabs.Panel value="request" pt="sm">
-            <PreviewRequestPanel
-              method={formValues.method}
-              authentication={formValues.authType}
-              endpoint={redactPreviewUrl(formValues.url)}
-              status={fetchResult?.responseInfo?.status}
-              namedRequests={namedRequests}
-              journal={journalQuery.data}
-              methodColor={methodColor}
-              messages={{
-                method: t("preview.request.method"),
-                authentication: t("preview.request.authentication"),
-                endpoint: t("preview.request.endpoint"),
-                status: t("preview.request.status"),
-                notRun: t("preview.request.notRun"),
-                named: t("preview.request.named", { count: namedRequests.length }),
-                journal: t("preview.request.journal"),
-                journalEmpty: t("preview.request.journalEmpty"),
-                simulated: t("preview.request.simulated"),
-                redacted: t("preview.request.redacted"),
-                permission: (permission) => t(`preview.request.permission.${permission}` as never),
-                duration: (duration) => t("preview.request.duration", { duration }),
-              }}
-            />
-          </Tabs.Panel>
+            <Card withBorder p="xs" bg="var(--mantine-color-dark-7)" mah={320} style={{ overflow: "auto" }}>
+              <PreviewDisplay data={displayData} />
+            </Card>
 
-          <Tabs.Panel value="diagnostics" pt="sm">
-            <PreviewDiagnosticsPanel
-              templateLength={(displayConfig.template as string | undefined)?.length ?? 0}
-              namedRequestCount={namedRequests.length}
-              methods={httpMethods.join(", ") || "GET"}
-              networkScope={(displayConfig.networkScope as string | undefined) ?? t("preview.diagnostics.legacy")}
-              diagnostics={templateDiagnostics}
-              messages={{
-                templateSize: t("preview.diagnostics.templateSize"),
-                characters: (count) => t("preview.diagnostics.characters", { count }),
-                namedRequests: t("preview.diagnostics.namedRequests"),
-                methods: t("preview.diagnostics.methods"),
-                networkScope: t("preview.diagnostics.networkScope"),
-                ready: t("preview.diagnostics.ready"),
-                diagnostic: (diagnostic) =>
-                  `${diagnostic.line ? `${editorT("diagnostics.line", { line: diagnostic.line })}: ` : ""}${editorT(
-                    `diagnostics.${diagnostic.code}` as never,
-                    { value: diagnostic.value ?? "" } as never,
-                  )}`,
-              }}
-            />
-          </Tabs.Panel>
-        </Tabs>
+            {fetchResult?.success && fetchResult.rawResponse && (
+              <Button
+                size="xs"
+                variant="subtle"
+                leftSection={<IconExternalLink size={14} />}
+                onClick={() => {
+                  const blob = new Blob([fetchResult.rawResponse ?? ""], {
+                    type: "application/json",
+                  });
+                  const blobUrl = URL.createObjectURL(blob);
+                  window.open(blobUrl);
+                  setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000);
+                }}
+              >
+                {t("preview.rawResponse")}
+              </Button>
+            )}
+          </Stack>
+        )}
+
+        {!displayData && !testError && !isTesting && (
+          <Text size="xs" c="dimmed" ta="center">
+            {t("preview.hint")}
+          </Text>
+        )}
       </Stack>
     </Card>
   );
 }
+
+function PreviewDisplay({ data }: { data: unknown }) {
+  const typed = data as Record<string, unknown>;
+  if (!typed || typeof typed !== "object") {
+    return (
+      <Text size="xs" c="dimmed">
+        No data
+      </Text>
+    );
+  }
+
+  const dataType = typed.type as string | undefined;
+
+  if (dataType === "actionButton") {
+    return (
+      <Center p="sm">
+        <Button size="sm" color={(typed.buttonColor as string) ?? "blue"} disabled>
+          {(typed.buttonLabel as string) ?? "Execute"}
+        </Button>
+      </Center>
+    );
+  }
+
+  const Component = dataType ? displayComponents[dataType] : undefined;
+  if (Component) {
+    return <Component data={typed} />;
+  }
+
+  return (
+    <ScrollArea h={100}>
+      <Code block style={{ fontSize: 11 }}>
+        {JSON.stringify(data, null, 2)}
+      </Code>
+    </ScrollArea>
+  );
+}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-field-shared.ts

@@ -1,39 +0,0 @@
-export const listItemDefaults = {
-  mapping: { label: "", jsonPath: "$", unit: "" },
-  column: { header: "", jsonPath: "$" },
-  statGridItem: { label: "", jsonPath: "$", unit: "", color: "blue" },
-  progressBar: { label: "", valuePath: "$", maxPath: "", unit: "", color: "blue" },
-  statusItem: { label: "", jsonPath: "$", goodValues: "online,true" },
-  countGridItem: { label: "", jsonPath: "$", unit: "" },
-} as const;
-
-export function cloneLast<T extends Record<string, unknown>>(items: T[], fallback: T): T {
-  return { ...(items.at(-1) ?? fallback) };
-}
-
-export const MANTINE_COLORS = [
-  "blue",
-  "teal",
-  "green",
-  "red",
-  "orange",
-  "yellow",
-  "violet",
-  "pink",
-  "cyan",
-  "grape",
-  "indigo",
-  "lime",
-] as const;
-export const REQUEST_MANIFEST_STARTER = `[
-  {
-    "id": "details",
-    "kind": "query",
-    "method": "GET",
-    "pathTemplate": "/api/details/{id}",
-    "parameters": { "id": "string" },
-    "auth": "inherit",
-    "minimumBoardPermission": "view",
-    "cacheTtlSeconds": 30
-  }
-]`;

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-field-types.ts

@@ -1,12 +0,0 @@
-import type { useZodForm } from "@homarr/form";
-import type { useScopedI18n } from "@homarr/translation/client";
-import type { customWidgetFormSchema } from "@homarr/custom-widgets/workbench";
-
-export type CustomWidgetFormInstance = ReturnType<typeof useZodForm<typeof customWidgetFormSchema>>;
-export type CustomWidgetTranslator = ReturnType<typeof useScopedI18n<"customWidget">>;
-
-export interface DisplayFieldsProps {
-  form: CustomWidgetFormInstance;
-  t: CustomWidgetTranslator;
-  previewJson: unknown;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-fields-basic.tsx

@@ -1,178 +0,0 @@
-import { ActionIcon, Box, Button, Group, NumberInput, Select, Stack, Switch, Text, TextInput } from "@mantine/core";
-import { IconPlus, IconTrash } from "@tabler/icons-react";
-import { JsonPathTreePicker } from "@homarr/widgets/_inputs/json-path-tree-picker";
-import { cloneLast, listItemDefaults } from "./_display-field-shared";
-import type { DisplayFieldsProps } from "./_display-field-types";
-
-export function BasicDisplayFields({ form, t, previewJson }: DisplayFieldsProps) {
-  const dt = form.values.displayType;
-
-  if (dt === "singleValue") {
-    return (
-      <>
-        <JsonPathTreePicker
-          json={previewJson}
-          label={t("field.jsonPath")}
-          description={t("field.jsonPathHint")}
-          required
-          placeholder={t("placeholder.jsonPath")}
-          {...form.getInputProps("jsonPath")}
-        />
-        <TextInput
-          label={t("field.label")}
-          placeholder={t("placeholder.exampleLabel")}
-          {...form.getInputProps("label")}
-        />
-        <TextInput label={t("field.unit")} placeholder={t("placeholder.exampleUnit")} {...form.getInputProps("unit")} />
-        <Group grow>
-          <Select
-            label={t("field.valueSize")}
-            data={["sm", "md", "lg", "xl"].map((v) => ({
-              value: v,
-              label: t(`sizeOption.${v}` as never),
-            }))}
-            {...form.getInputProps("valueSize")}
-            allowDeselect={false}
-          />
-          <Select
-            label={t("field.labelPosition")}
-            data={["above", "below"].map((v) => ({
-              value: v,
-              label: t(`labelPositionOption.${v}` as never),
-            }))}
-            {...form.getInputProps("labelPosition")}
-            allowDeselect={false}
-          />
-        </Group>
-      </>
-    );
-  }
-
-  if (dt === "keyValue") {
-    return (
-      <Stack gap="xs">
-        <Group grow>
-          <Select
-            label={t("field.kvLayout")}
-            data={["list", "grid"].map((v) => ({
-              value: v,
-              label: t(`layoutOption.${v}` as never),
-            }))}
-            {...form.getInputProps("kvLayout")}
-            allowDeselect={false}
-          />
-          {form.values.kvLayout === "grid" && (
-            <NumberInput label={t("field.gridColumns")} min={1} max={3} {...form.getInputProps("kvColumns")} />
-          )}
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.mappings")}
-        </Text>
-        {form.values.mappings.map((_m, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.label")}
-              placeholder={t("placeholder.exampleLabelShort")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`mappings.${i}.label`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.jsonPath")}
-                placeholder={t("placeholder.jsonPath")}
-                {...form.getInputProps(`mappings.${i}.jsonPath`)}
-              />
-            </Box>
-            <TextInput
-              label={t("field.unit")}
-              placeholder={t("placeholder.exampleUnit")}
-              style={{ width: 80 }}
-              {...form.getInputProps(`mappings.${i}.unit`)}
-            />
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("mappings", i)}
-              disabled={form.values.mappings.length <= 1}
-              aria-label={t("action.removeMapping")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() => form.insertListItem("mappings", cloneLast(form.values.mappings, listItemDefaults.mapping))}
-        >
-          {t("action.addMapping")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  if (dt === "table") {
-    return (
-      <Stack gap="xs">
-        <JsonPathTreePicker
-          json={previewJson}
-          label={t("field.tablePath")}
-          description={t("field.tablePathHint")}
-          required
-          placeholder={t("placeholder.tablePath")}
-          {...form.getInputProps("tablePath")}
-        />
-        <Group grow>
-          <Switch label={t("field.striped")} {...form.getInputProps("striped", { type: "checkbox" })} />
-          <Switch label={t("field.compact")} {...form.getInputProps("compact", { type: "checkbox" })} />
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.columns")}
-        </Text>
-        {form.values.columns.map((_col, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.header")}
-              placeholder={t("placeholder.exampleHeader")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`columns.${i}.header`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.jsonPath")}
-                placeholder={t("placeholder.columnJsonPath")}
-                {...form.getInputProps(`columns.${i}.jsonPath`)}
-              />
-            </Box>
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("columns", i)}
-              disabled={form.values.columns.length <= 1}
-              aria-label={t("action.removeColumn")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() => form.insertListItem("columns", cloneLast(form.values.columns, listItemDefaults.column))}
-        >
-          {t("action.addColumn")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  return null;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-fields-jsx.tsx

@@ -1,97 +0,0 @@
-import { Alert, SegmentedControl, Select, Stack, Text } from "@mantine/core";
-import { IconAlertTriangle } from "@tabler/icons-react";
-import { CUSTOM_JSX_STARTER } from "@homarr/custom-widgets/core";
-import {
-  analyzeJsxTemplate,
-  analyzeRequestManifest,
-  CUSTOM_JSX_TEMPLATE_LIMIT,
-  parseRequestManifest,
-} from "@homarr/custom-widgets/workbench";
-import { CodeEditor } from "./_code-editor";
-import { REQUEST_MANIFEST_STARTER } from "./_display-field-shared";
-import type { DisplayFieldsProps } from "./_display-field-types";
-
-export function CustomJsxDisplayFields({ form, t }: DisplayFieldsProps) {
-  const dt = form.values.displayType;
-
-  if (dt === "customJsx") {
-    const parsedRequests = parseRequestManifest(form.values.requestManifest);
-    const requestIds = parsedRequests
-      .map((request) => (request && typeof request === "object" && "id" in request ? request.id : null))
-      .filter((id): id is string => typeof id === "string");
-    const templateDiagnostics = analyzeJsxTemplate(form.values.template, {
-      apiVersion: form.values.jsxApiVersion === "2" ? 2 : 1,
-      requestIds,
-    });
-    const manifestDiagnostics =
-      form.values.jsxApiVersion === "2" ? analyzeRequestManifest(form.values.requestManifest) : [];
-
-    return (
-      <Stack gap="md">
-        <div>
-          <Text size="sm" fw={500} mb={4}>
-            {t("field.jsxApiVersion.label")}
-          </Text>
-          <SegmentedControl
-            fullWidth
-            value={form.values.jsxApiVersion}
-            onChange={(value) => form.setFieldValue("jsxApiVersion", value)}
-            data={[
-              { value: "2", label: t("field.jsxApiVersion.v2") },
-              { value: "1", label: t("field.jsxApiVersion.v1") },
-            ]}
-          />
-        </div>
-
-        {form.values.jsxApiVersion === "1" ? (
-          <Alert color="yellow" variant="light" icon={<IconAlertTriangle size={16} />}>
-            <Text size="sm">{t("field.jsxApiVersion.legacyWarning")}</Text>
-          </Alert>
-        ) : (
-          <Stack gap="sm">
-            <Select
-              label={t("field.networkScope.label")}
-              description={t(`field.networkScope.description.${form.values.networkScope}` as never)}
-              value={form.values.networkScope}
-              onChange={(value) => form.setFieldValue("networkScope", value ?? "public")}
-              data={(["public", "private", "loopback"] as const).map((value) => ({
-                value,
-                label: t(`field.networkScope.option.${value}` as never),
-              }))}
-              allowDeselect={false}
-            />
-            <CodeEditor
-              id="custom-widget-request-manifest"
-              language="json"
-              label={t("field.requestManifest.label")}
-              description={t("field.requestManifest.description")}
-              value={form.values.requestManifest}
-              onChange={(value) => form.setFieldValue("requestManifest", value)}
-              placeholder={REQUEST_MANIFEST_STARTER}
-              starter={REQUEST_MANIFEST_STARTER}
-              diagnostics={manifestDiagnostics}
-              error={form.errors.requestManifest ? t("field.requestManifest.invalid") : undefined}
-            />
-          </Stack>
-        )}
-
-        <CodeEditor
-          id="custom-widget-jsx-template"
-          language="jsx"
-          label={t("field.template.label")}
-          description={t("field.template.description")}
-          value={form.values.template}
-          onChange={(value) => form.setFieldValue("template", value)}
-          placeholder={CUSTOM_JSX_STARTER}
-          starter={CUSTOM_JSX_STARTER}
-          diagnostics={templateDiagnostics}
-          error={form.errors.template}
-          required
-          maxLength={CUSTOM_JSX_TEMPLATE_LIMIT}
-        />
-      </Stack>
-    );
-  }
-
-  return null;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-fields-metric.tsx

@@ -1,167 +0,0 @@
-import { ActionIcon, Box, Button, Group, Select, Stack, Switch, Text, TextInput, NumberInput } from "@mantine/core";
-import { IconPlus, IconTrash } from "@tabler/icons-react";
-import { JsonPathTreePicker } from "@homarr/widgets/_inputs/json-path-tree-picker";
-import { cloneLast, listItemDefaults, MANTINE_COLORS } from "./_display-field-shared";
-import type { DisplayFieldsProps } from "./_display-field-types";
-
-export function MetricDisplayFields({ form, t, previewJson }: DisplayFieldsProps) {
-  const dt = form.values.displayType;
-
-  if (dt === "statGrid") {
-    return (
-      <Stack gap="xs">
-        <Group grow>
-          <NumberInput label={t("field.gridColumns")} min={1} max={4} {...form.getInputProps("statGridColumns")} />
-          <Select
-            label={t("field.cardStyle")}
-            data={["filled", "outline", "subtle"].map((v) => ({
-              value: v,
-              label: t(`cardStyleOption.${v}` as never),
-            }))}
-            {...form.getInputProps("cardStyle")}
-            allowDeselect={false}
-          />
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.items")}
-        </Text>
-        {form.values.statGridItems.map((_item, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.label")}
-              placeholder={t("placeholder.exampleLabelShort")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`statGridItems.${i}.label`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.jsonPath")}
-                placeholder={t("placeholder.jsonPath")}
-                {...form.getInputProps(`statGridItems.${i}.jsonPath`)}
-              />
-            </Box>
-            <TextInput
-              label={t("field.unit")}
-              placeholder={t("placeholder.exampleUnit")}
-              style={{ width: 80 }}
-              {...form.getInputProps(`statGridItems.${i}.unit`)}
-            />
-            <Select
-              label={t("field.color")}
-              data={MANTINE_COLORS.map((c) => ({ value: c, label: c }))}
-              style={{ width: 100 }}
-              {...form.getInputProps(`statGridItems.${i}.color`)}
-              allowDeselect={false}
-            />
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("statGridItems", i)}
-              disabled={form.values.statGridItems.length <= 1}
-              aria-label={t("action.removeItem")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() =>
-            form.insertListItem("statGridItems", cloneLast(form.values.statGridItems, listItemDefaults.statGridItem))
-          }
-        >
-          {t("action.addItem")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  if (dt === "progressBars") {
-    return (
-      <Stack gap="xs">
-        <Group grow>
-          <Switch label={t("field.showPercentage")} {...form.getInputProps("showPercentage", { type: "checkbox" })} />
-          <Select
-            label={t("field.barSize")}
-            data={["sm", "md", "lg"].map((v) => ({
-              value: v,
-              label: t(`sizeOption.${v}` as never),
-            }))}
-            {...form.getInputProps("barSize")}
-            allowDeselect={false}
-          />
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.bars")}
-        </Text>
-        {form.values.progressBars.map((_bar, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.label")}
-              placeholder={t("placeholder.exampleLabelShort")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`progressBars.${i}.label`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.valuePath")}
-                placeholder={t("placeholder.valuePath")}
-                {...form.getInputProps(`progressBars.${i}.valuePath`)}
-              />
-            </Box>
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.maxPath")}
-                placeholder={t("placeholder.maxPath")}
-                {...form.getInputProps(`progressBars.${i}.maxPath`)}
-              />
-            </Box>
-            <TextInput
-              label={t("field.unit")}
-              placeholder={t("placeholder.exampleUnit")}
-              style={{ width: 60 }}
-              {...form.getInputProps(`progressBars.${i}.unit`)}
-            />
-            <Select
-              label={t("field.color")}
-              data={MANTINE_COLORS.map((c) => ({ value: c, label: c }))}
-              style={{ width: 100 }}
-              {...form.getInputProps(`progressBars.${i}.color`)}
-              allowDeselect={false}
-            />
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("progressBars", i)}
-              disabled={form.values.progressBars.length <= 1}
-              aria-label={t("action.removeItem")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() =>
-            form.insertListItem("progressBars", cloneLast(form.values.progressBars, listItemDefaults.progressBar))
-          }
-        >
-          {t("action.addBar")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  return null;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-fields-status.tsx

@@ -1,198 +0,0 @@
-import { ActionIcon, Box, Button, Group, NumberInput, Select, Stack, Text, TextInput } from "@mantine/core";
-import { IconPlus, IconTrash } from "@tabler/icons-react";
-import { JsonPathTreePicker } from "@homarr/widgets/_inputs/json-path-tree-picker";
-import { cloneLast, listItemDefaults, MANTINE_COLORS } from "./_display-field-shared";
-import type { DisplayFieldsProps } from "./_display-field-types";
-
-export function StatusDisplayFields({ form, t, previewJson }: DisplayFieldsProps) {
-  const dt = form.values.displayType;
-
-  if (dt === "statusIndicator") {
-    return (
-      <Stack gap="xs">
-        <Group grow>
-          <Select
-            label={t("field.kvLayout")}
-            data={["list", "grid"].map((v) => ({
-              value: v,
-              label: t(`layoutOption.${v}` as never),
-            }))}
-            {...form.getInputProps("statusLayout")}
-            allowDeselect={false}
-          />
-          <Select
-            label={t("field.dotSize")}
-            data={["sm", "md", "lg"].map((v) => ({
-              value: v,
-              label: t(`sizeOption.${v}` as never),
-            }))}
-            {...form.getInputProps("dotSize")}
-            allowDeselect={false}
-          />
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.items")}
-        </Text>
-        {form.values.statusItems.map((_item, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.label")}
-              placeholder={t("placeholder.exampleLabelShort")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`statusItems.${i}.label`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.jsonPath")}
-                placeholder={t("placeholder.jsonPath")}
-                {...form.getInputProps(`statusItems.${i}.jsonPath`)}
-              />
-            </Box>
-            <TextInput
-              label={t("field.goodValues")}
-              placeholder={t("placeholder.goodValues")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`statusItems.${i}.goodValues`)}
-            />
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("statusItems", i)}
-              disabled={form.values.statusItems.length <= 1}
-              aria-label={t("action.removeItem")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() =>
-            form.insertListItem("statusItems", cloneLast(form.values.statusItems, listItemDefaults.statusItem))
-          }
-        >
-          {t("action.addItem")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  if (dt === "countGrid") {
-    return (
-      <Stack gap="xs">
-        <Group grow>
-          <NumberInput label={t("field.gridColumns")} min={2} max={4} {...form.getInputProps("countGridColumns")} />
-          <Select
-            label={t("field.valueSize")}
-            data={["sm", "md", "lg"].map((v) => ({
-              value: v,
-              label: t(`sizeOption.${v}` as never),
-            }))}
-            {...form.getInputProps("countValueSize")}
-            allowDeselect={false}
-          />
-        </Group>
-        <Text size="sm" fw={500}>
-          {t("field.items")}
-        </Text>
-        {form.values.countGridItems.map((_item, i) => (
-          <Group key={i} align="end" wrap="nowrap">
-            <TextInput
-              label={t("field.label")}
-              placeholder={t("placeholder.exampleLabelShort")}
-              style={{ flex: 1 }}
-              {...form.getInputProps(`countGridItems.${i}.label`)}
-            />
-            <Box style={{ flex: 1 }}>
-              <JsonPathTreePicker
-                json={previewJson}
-                label={t("field.jsonPath")}
-                placeholder={t("placeholder.jsonPath")}
-                {...form.getInputProps(`countGridItems.${i}.jsonPath`)}
-              />
-            </Box>
-            <TextInput
-              label={t("field.unit")}
-              placeholder={t("placeholder.exampleUnit")}
-              style={{ width: 80 }}
-              {...form.getInputProps(`countGridItems.${i}.unit`)}
-            />
-            <ActionIcon
-              type="button"
-              color="red"
-              variant="subtle"
-              onClick={() => form.removeListItem("countGridItems", i)}
-              disabled={form.values.countGridItems.length <= 1}
-              aria-label={t("action.removeItem")}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        ))}
-        <Button
-          type="button"
-          variant="light"
-          size="xs"
-          leftSection={<IconPlus size={14} />}
-          onClick={() =>
-            form.insertListItem("countGridItems", cloneLast(form.values.countGridItems, listItemDefaults.countGridItem))
-          }
-        >
-          {t("action.addItem")}
-        </Button>
-      </Stack>
-    );
-  }
-
-  if (dt === "raw") {
-    return (
-      <>
-        <JsonPathTreePicker
-          json={previewJson}
-          label={t("field.jsonPath")}
-          description={t("field.jsonPathHint")}
-          placeholder={t("placeholder.jsonPath")}
-          {...form.getInputProps("rawJsonPath")}
-        />
-        <NumberInput
-          label={t("field.maxHeight")}
-          min={50}
-          max={1000}
-          step={50}
-          {...form.getInputProps("rawMaxHeight")}
-        />
-      </>
-    );
-  }
-
-  if (dt === "actionButton") {
-    return (
-      <Stack gap="sm">
-        <TextInput label={t("field.buttonLabel")} required {...form.getInputProps("buttonLabel")} />
-        <Select
-          label={t("field.buttonColor")}
-          data={MANTINE_COLORS.map((c) => ({ value: c, label: c }))}
-          {...form.getInputProps("buttonColor")}
-          allowDeselect={false}
-        />
-        <TextInput
-          label={t("field.confirmText")}
-          description={t("field.confirmTextHint")}
-          {...form.getInputProps("confirmText")}
-        />
-        <TextInput
-          label={t("field.successMessage")}
-          description={t("field.successMessageHint")}
-          {...form.getInputProps("successMessage")}
-        />
-      </Stack>
-    );
-  }
-
-  return null;
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_display-type-fields.tsx

@@ -1,89 +0,0 @@
-import { SimpleGrid, Text, ThemeIcon, UnstyledButton } from "@mantine/core";
-import {
-  Icon123,
-  IconActivityHeartbeat,
-  IconBraces,
-  IconCode,
-  IconHash,
-  IconLayoutGrid,
-  IconListDetails,
-  IconPointer,
-  IconProgress,
-  IconTable,
-} from "@tabler/icons-react";
-import type { useScopedI18n } from "@homarr/translation/client";
-import type { CustomWidgetDisplayType } from "@homarr/custom-widgets/core";
-import { customWidgetDisplayDescriptors } from "@homarr/custom-widgets/core";
-
-import { BasicDisplayFields } from "./_display-fields-basic";
-import { CustomJsxDisplayFields } from "./_display-fields-jsx";
-import { MetricDisplayFields } from "./_display-fields-metric";
-import { StatusDisplayFields } from "./_display-fields-status";
-import type { DisplayFieldsProps } from "./_display-field-types";
-import classes from "./_custom-widget-form.module.css";
-
-export const DISPLAY_TYPE_ICONS = {
-  number: Icon123,
-  keyValue: IconListDetails,
-  table: IconTable,
-  grid: IconLayoutGrid,
-  progress: IconProgress,
-  status: IconActivityHeartbeat,
-  count: IconHash,
-  json: IconBraces,
-  action: IconPointer,
-  code: IconCode,
-} as const;
-
-export function DisplayTypePicker({
-  value,
-  onChange,
-  t,
-}: {
-  value: string;
-  onChange: (value: CustomWidgetDisplayType) => void;
-  t: ReturnType<typeof useScopedI18n<"customWidget">>;
-}) {
-  return (
-    <SimpleGrid cols={{ base: 1, xs: 2 }} spacing="sm">
-      {customWidgetDisplayDescriptors.map((descriptor) => {
-        const displayType = descriptor.type;
-        const Icon = DISPLAY_TYPE_ICONS[descriptor.icon];
-        const selected = value === displayType;
-        return (
-          <UnstyledButton
-            type="button"
-            key={displayType}
-            className={classes.displayTypeOption}
-            data-selected={selected || undefined}
-            onClick={() => onChange(displayType)}
-            aria-pressed={selected}
-          >
-            <ThemeIcon variant={selected ? "filled" : "light"} size={42} radius="md">
-              <Icon size={22} />
-            </ThemeIcon>
-            <div className={classes.displayTypeCopy}>
-              <Text fw={600} size="sm">
-                {t(`displayType.${displayType}` as never)}
-              </Text>
-              <Text size="xs" c="dimmed" lineClamp={3}>
-                {t(`displayTypeDescription.${displayType}` as never)}
-              </Text>
-            </div>
-          </UnstyledButton>
-        );
-      })}
-    </SimpleGrid>
-  );
-}
-
-export function DisplayTypeFields(props: DisplayFieldsProps) {
-  return (
-    <>
-      <BasicDisplayFields {...props} />
-      <MetricDisplayFields {...props} />
-      <StatusDisplayFields {...props} />
-      <CustomJsxDisplayFields {...props} />
-    </>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_preview-widget-panel.tsx

@@ -1,99 +0,0 @@
-"use client";
-
-import { useMemo } from "react";
-import { Badge, Button, Center, Code, Paper, ScrollArea, SegmentedControl, Stack, Text } from "@mantine/core";
-import { IconPlayerPlay } from "@tabler/icons-react";
-
-import { useScopedI18n } from "@homarr/translation/client";
-import { createDisplayComponents } from "@homarr/widgets/custom-api/component";
-
-interface PreviewWidgetPanelProps {
-  data: Record<string, unknown> | null;
-  displayType: string;
-  success: boolean;
-  responseInfo: { status: number; statusText: string } | null;
-  previewSize: string;
-  onPreviewSizeChange: (value: string) => void;
-}
-
-const HEIGHTS: Record<string, number> = { compact: 240, standard: 360, wide: 520 };
-
-export function PreviewWidgetPanel({
-  data,
-  displayType,
-  success,
-  responseInfo,
-  previewSize,
-  onPreviewSizeChange,
-}: PreviewWidgetPanelProps) {
-  const t = useScopedI18n("customWidget");
-  const height = HEIGHTS[previewSize] ?? HEIGHTS.standard;
-  return (
-    <Stack gap="xs">
-      <SegmentedControl
-        size="xs"
-        fullWidth
-        value={previewSize}
-        onChange={onPreviewSizeChange}
-        data={(["compact", "standard", "wide"] as const).map((value) => ({
-          value,
-          label: t(`preview.size.${value}` as never),
-        }))}
-      />
-      {data && (displayType === "actionButton" || success) ? (
-        <>
-          {success && (
-            <Badge
-              size="xs"
-              color={responseInfo ? "green" : "gray"}
-              variant="light"
-              style={{ alignSelf: "flex-start" }}
-            >
-              {responseInfo ? `${responseInfo.status} ${responseInfo.statusText}` : t("preview.response.localSample")}
-            </Badge>
-          )}
-          <Paper withBorder p="xs" h={height} style={{ overflow: "auto" }}>
-            <PreviewDisplay data={data} />
-          </Paper>
-        </>
-      ) : (
-        <Center h={height}>
-          <Stack gap={4} align="center" maw={280}>
-            <IconPlayerPlay size={22} color="var(--mantine-color-dimmed)" />
-            <Text size="sm" fw={500} ta="center">
-              {t("preview.empty.title")}
-            </Text>
-            <Text size="xs" c="dimmed" ta="center">
-              {t("preview.hint")}
-            </Text>
-          </Stack>
-        </Center>
-      )}
-    </Stack>
-  );
-}
-
-function PreviewDisplay({ data }: { data: Record<string, unknown> }) {
-  const t = useScopedI18n("customWidget");
-  const widgetT = useScopedI18n("widget.customApi");
-  const displayComponents = useMemo(() => createDisplayComponents(widgetT("openJson")), [widgetT]);
-  const dataType = data.type as string | undefined;
-  if (dataType === "actionButton") {
-    return (
-      <Center p="sm" h="100%">
-        <Button type="button" size="sm" color={(data.buttonColor as string) ?? "blue"} disabled>
-          {(data.buttonLabel as string) ?? t("preview.execute")}
-        </Button>
-      </Center>
-    );
-  }
-  const Component = dataType ? displayComponents[dataType] : undefined;
-  if (Component) return <Component data={data} />;
-  return (
-    <ScrollArea h="100%">
-      <Code block style={{ fontSize: 11 }}>
-        {JSON.stringify(data, null, 2)}
-      </Code>
-    </ScrollArea>
-  );
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_use-custom-widget-clipboard.tsx

@@ -1,87 +0,0 @@
-"use client";
-
-import { useCallback, useEffect } from "react";
-import { Alert, Badge, Group, Stack, Text } from "@mantine/core";
-import { IconAlertTriangle } from "@tabler/icons-react";
-
-import { buildDisplayFormValues, getImportReview, parseCustomWidgetClipboard } from "@homarr/custom-widgets/core";
-import { CUSTOM_WIDGET_AUTH_SECRET_FIELDS } from "@homarr/custom-widgets/workbench";
-import { useConfirmModal } from "@homarr/modals";
-import { showSuccessNotification } from "@homarr/notifications";
-
-import type { CustomWidgetFormInstance, CustomWidgetTranslator } from "./_display-field-types";
-
-interface UseCustomWidgetClipboardOptions {
-  enabled: boolean;
-  form: CustomWidgetFormInstance;
-  t: CustomWidgetTranslator;
-  onReplace: () => void;
-}
-
-export function useCustomWidgetClipboard({ enabled, form, t, onReplace }: UseCustomWidgetClipboardOptions) {
-  const { openConfirmModal } = useConfirmModal();
-  const queueReplacement = useCallback(
-    (widget: Record<string, unknown>) => {
-      const review = getImportReview(widget);
-      if (!review) return;
-      openConfirmModal({
-        title: t("importReview.replaceTitle"),
-        children: (
-          <Stack gap="sm">
-            <Text size="sm">{t("importReview.replaceDescription", { name: review.name, origin: review.origin })}</Text>
-            <Group gap={6}>
-              {review.methods.map((method) => (
-                <Badge key={method} color={{ DELETE: "red", GET: "blue" }[method] ?? "orange"}>
-                  {method}
-                </Badge>
-              ))}
-            </Group>
-            {review.hasActions && (
-              <Alert color="yellow" icon={<IconAlertTriangle size={16} />}>
-                <Text size="sm">{t("importReview.actionWarning.description")}</Text>
-              </Alert>
-            )}
-          </Stack>
-        ),
-        labels: { confirm: t("importReview.replaceConfirm"), cancel: t("importReview.cancel") },
-        onConfirm: () => {
-          const displayType = String(widget.displayType);
-          const displayConfig = widget.displayConfig as Record<string, unknown>;
-          const authType = typeof widget.authType === "string" ? widget.authType : "none";
-          const secrets = (CUSTOM_WIDGET_AUTH_SECRET_FIELDS[authType] ?? []).map((field) => {
-            const existing = form.values.secrets.find((secret) => secret.kind === field.kind);
-            return { kind: field.kind, value: existing?.value ?? "", hasValue: existing?.hasValue ?? false };
-          });
-          form.setValues({
-            ...form.values,
-            name: String(widget.name),
-            description: typeof widget.description === "string" ? widget.description : "",
-            iconUrl: typeof widget.iconUrl === "string" ? widget.iconUrl : "",
-            url: String(widget.url),
-            authType,
-            headerName: typeof widget.headerName === "string" ? widget.headerName : "",
-            method: typeof widget.method === "string" ? widget.method : "GET",
-            requestBody: typeof widget.requestBody === "string" ? widget.requestBody : "",
-            ...buildDisplayFormValues(displayType, displayConfig),
-            secrets,
-          });
-          onReplace();
-          showSuccessNotification({ title: t("action.import"), message: t("notification.pastedForReplacement") });
-        },
-      });
-    },
-    [form, onReplace, openConfirmModal, t],
-  );
-
-  useEffect(() => {
-    if (!enabled) return;
-    const handlePaste = (event: ClipboardEvent) => {
-      const widget = parseCustomWidgetClipboard(event.clipboardData?.getData("text/plain") ?? "");
-      if (!widget) return;
-      event.preventDefault();
-      queueReplacement(widget);
-    };
-    window.addEventListener("paste", handlePaste);
-    return () => window.removeEventListener("paste", handlePaste);
-  }, [enabled, queueReplacement]);
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/_use-custom-widget-preview.ts

@@ -1,156 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef, useState } from "react";
-
-import { clientApi } from "@homarr/api/client";
-import type {
-  CustomWidgetAuthType,
-  CustomWidgetDisplayType,
-  CustomWidgetMethod,
-  CustomWidgetSecretKind,
-  DisplayConfig,
-} from "@homarr/custom-widgets/core";
-import { buildDisplayConfigFromFormValues } from "@homarr/custom-widgets/core";
-import { showErrorNotification } from "@homarr/notifications";
-
-import type { CustomWidgetFormInstance, CustomWidgetTranslator } from "./_display-field-types";
-import type { PreviewFetchResult, PreviewInput } from "./_custom-widget-preview";
-
-interface UseCustomWidgetPreviewOptions {
-  form: CustomWidgetFormInstance;
-  definitionId?: string;
-  refreshSignal: number;
-  onOpenPreview: () => void;
-  t: CustomWidgetTranslator;
-}
-
-export function useCustomWidgetPreview({
-  form,
-  definitionId,
-  refreshSignal,
-  onOpenPreview,
-  t,
-}: UseCustomWidgetPreviewOptions) {
-  const previewMutation = clientApi.customWidget.preview.useMutation();
-  const liveActionsMutation = clientApi.customWidget.setPreviewLiveActions.useMutation();
-  const [json, setJson] = useState<unknown>(null);
-  const [fetchResult, setFetchResult] = useState<PreviewFetchResult | null>(null);
-  const [lastFingerprint, setLastFingerprint] = useState<string | null>(null);
-  const hasTestedRef = useRef(false);
-
-  const getInput = useCallback((): PreviewInput => {
-    const values = form.values;
-    return {
-      url: values.url,
-      method: values.method as CustomWidgetMethod,
-      authType: values.authType as CustomWidgetAuthType,
-      headerName: values.headerName || undefined,
-      requestBody: values.requestBody || undefined,
-      displayType: values.displayType as CustomWidgetDisplayType,
-      displayConfig: buildDisplayConfigFromFormValues(values) as DisplayConfig,
-      secrets: values.secrets
-        .filter((secret) => secret.value)
-        .map((secret) => ({ kind: secret.kind as CustomWidgetSecretKind, value: secret.value })),
-      definitionId,
-    };
-  }, [definitionId, form.values]);
-
-  const test = useCallback(async () => {
-    const input = getInput();
-    if (!input.url || input.method !== "GET") return;
-    onOpenPreview();
-    setLastFingerprint(JSON.stringify(input));
-    try {
-      const result = await previewMutation.mutateAsync(input);
-      hasTestedRef.current = true;
-      setFetchResult({
-        success: result.success,
-        error: result.success ? undefined : result.error,
-        responseInfo: result.responseInfo,
-        rawResponse: result.rawResponse,
-        previewSession: result.previewSession,
-      });
-      if (!result.success || !result.rawResponse) return setJson(null);
-      try {
-        setJson(JSON.parse(result.rawResponse));
-      } catch {
-        setJson(null);
-      }
-    } catch {
-      setFetchResult({ success: false, error: t("notification.previewError"), responseInfo: null, rawResponse: null });
-      setJson(null);
-    }
-  }, [getInput, onOpenPreview, previewMutation, t]);
-
-  const setLiveActions = useCallback(
-    async (enabled: boolean) => {
-      const sessionId = fetchResult?.previewSession?.id;
-      if (!sessionId) return;
-      try {
-        const previewSession = await liveActionsMutation.mutateAsync({ sessionId, enabled });
-        setFetchResult((current) => (current ? { ...current, previewSession } : current));
-      } catch {
-        showErrorNotification({
-          title: t("preview.capabilities.liveActions"),
-          message: t("notification.previewActionsError"),
-        });
-      }
-    },
-    [fetchResult?.previewSession?.id, liveActionsMutation, t],
-  );
-
-  const testRef = useRef(test);
-  testRef.current = test;
-  const getInputRef = useRef(getInput);
-  getInputRef.current = getInput;
-  const pendingRefreshRef = useRef(false);
-  useEffect(() => {
-    if (refreshSignal <= 0 || !hasTestedRef.current) return;
-    if (previewMutation.isPending) return void (pendingRefreshRef.current = true);
-    if (getInputRef.current().method === "GET") void testRef.current();
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- refreshSignal is the explicit event source
-  }, [refreshSignal]);
-  useEffect(() => {
-    if (previewMutation.isPending || !pendingRefreshRef.current) return;
-    pendingRefreshRef.current = false;
-    if (getInputRef.current().method === "GET" && hasTestedRef.current) void testRef.current();
-  }, [previewMutation.isPending]);
-
-  const input = getInput();
-  const isStale = lastFingerprint !== null && lastFingerprint !== JSON.stringify(input);
-  const insertDataPath = useCallback(
-    (path: string) => {
-      if (form.values.displayType !== "customJsx") return;
-      const template = form.values.template.trimEnd();
-      const snippet = `<Text>{${path}}</Text>`;
-      form.setFieldValue("template", template ? `${template}\n${snippet}` : snippet);
-    },
-    [form],
-  );
-  const setSampleData = useCallback((value: unknown) => {
-    setJson(value);
-    setFetchResult({ success: true, responseInfo: null, rawResponse: JSON.stringify(value, null, 2) });
-    setLastFingerprint(null);
-  }, []);
-  const reset = useCallback(() => {
-    setJson(null);
-    setFetchResult(null);
-    setLastFingerprint(null);
-  }, []);
-
-  return {
-    input,
-    getInput,
-    json,
-    fetchResult,
-    isStale,
-    test,
-    setLiveActions,
-    insertDataPath,
-    setSampleData,
-    reset,
-    isTesting: previewMutation.isPending,
-    testError: previewMutation.error,
-    isUpdatingLiveActions: liveActionsMutation.isPending,
-  };
-}

apps/nextjs/src/app/[locale]/manage/custom-widgets/edit/[id]/page.tsx

@@ -3,7 +3,6 @@ import { Container, Stack, Title } from "@mantine/core";
 
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
-import { buildDisplayFormValues } from "@homarr/custom-widgets/core";
 
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
@@ -29,6 +28,122 @@ function buildInitialSecrets(authType: string, dbSecrets: Array<{ kind: string;
   return result;
 }
 
+function buildDisplayInitialValues(displayType: string, config: Record<string, unknown>) {
+  const base = {
+    displayType,
+    jsonPath: "$",
+    label: "",
+    unit: "",
+    valueSize: "lg",
+    labelPosition: "below",
+    mappings: [{ label: "", jsonPath: "$", unit: "" }],
+    kvLayout: "list",
+    kvColumns: 2,
+    tablePath: "$",
+    columns: [{ header: "", jsonPath: "$" }],
+    striped: true,
+    compact: false,
+    statGridItems: [{ label: "", jsonPath: "$", unit: "", color: "blue" }],
+    statGridColumns: 2,
+    cardStyle: "filled",
+    progressBars: [{ label: "", valuePath: "$", maxPath: "", unit: "", color: "blue" }],
+    showPercentage: true,
+    barSize: "md",
+    statusItems: [{ label: "", jsonPath: "$", goodValues: "online,true" }],
+    statusLayout: "list",
+    dotSize: "md",
+    countGridItems: [{ label: "", jsonPath: "$", unit: "" }],
+    countGridColumns: 2,
+    countValueSize: "md",
+    rawJsonPath: "$",
+    rawMaxHeight: 300,
+    buttonLabel: "Execute",
+    buttonColor: "blue",
+    confirmText: "",
+    successMessage: "",
+    template: "",
+  };
+
+  const typeOverrides: Record<string, () => Record<string, unknown>> = {
+    singleValue: () => ({
+      jsonPath: (config.jsonPath as string) ?? "$",
+      label: (config.label as string) ?? "",
+      unit: (config.unit as string) ?? "",
+      valueSize: (config.valueSize as string) ?? "lg",
+      labelPosition: (config.labelPosition as string) ?? "below",
+    }),
+    keyValue: () => ({
+      mappings: (config.mappings as Array<{ label: string; jsonPath: string; unit: string }>) ?? base.mappings,
+      kvLayout: (config.layout as string) ?? "list",
+      kvColumns: (config.columns as number) ?? 2,
+    }),
+    table: () => ({
+      tablePath: (config.tablePath as string) ?? "$",
+      columns: (config.columns as Array<{ header: string; jsonPath: string }>) ?? base.columns,
+      striped: (config.striped as boolean) ?? true,
+      compact: (config.compact as boolean) ?? false,
+    }),
+    statGrid: () => ({
+      statGridItems: (
+        (config.items as Array<{ label: string; jsonPath: string; unit: string; color?: string }>) ?? []
+      ).map((item) => ({
+        label: item.label,
+        jsonPath: item.jsonPath,
+        unit: item.unit,
+        color: item.color ?? "blue",
+      })),
+      statGridColumns: (config.columns as number) ?? 2,
+      cardStyle: (config.cardStyle as string) ?? "filled",
+    }),
+    progressBars: () => ({
+      progressBars: (
+        (config.bars as Array<{ label: string; valuePath: string; maxPath?: string; unit: string; color?: string }>) ??
+        []
+      ).map((bar) => ({
+        label: bar.label,
+        valuePath: bar.valuePath,
+        maxPath: bar.maxPath ?? "",
+        unit: bar.unit,
+        color: bar.color ?? "blue",
+      })),
+      showPercentage: (config.showPercentage as boolean) ?? true,
+      barSize: (config.barSize as string) ?? "md",
+    }),
+    statusIndicator: () => ({
+      statusItems: ((config.items as Array<{ label: string; jsonPath: string; goodValues: string[] }>) ?? []).map(
+        (item) => ({
+          label: item.label,
+          jsonPath: item.jsonPath,
+          goodValues: item.goodValues.join(", "),
+        }),
+      ),
+      statusLayout: (config.layout as string) ?? "list",
+      dotSize: (config.dotSize as string) ?? "md",
+    }),
+    countGrid: () => ({
+      countGridItems: (config.items as Array<{ label: string; jsonPath: string; unit: string }>) ?? base.countGridItems,
+      countGridColumns: (config.columns as number) ?? 2,
+      countValueSize: (config.valueSize as string) ?? "md",
+    }),
+    raw: () => ({
+      rawJsonPath: (config.jsonPath as string) ?? "$",
+      rawMaxHeight: (config.maxHeight as number) ?? 300,
+    }),
+    actionButton: () => ({
+      buttonLabel: (config.buttonLabel as string) ?? "Execute",
+      buttonColor: (config.buttonColor as string) ?? "blue",
+      confirmText: (config.confirmText as string) ?? "",
+      successMessage: (config.successMessage as string) ?? "",
+    }),
+    customJsx: () => ({
+      template: (config.template as string) ?? "",
+    }),
+  };
+
+  const overrides = typeOverrides[displayType]?.() ?? {};
+  return { ...base, ...overrides };
+}
+
 interface EditCustomWidgetPageProps {
   params: Promise<{ id: string }>;
 }
@@ -43,7 +158,7 @@ export default async function EditCustomWidgetPage(props: EditCustomWidgetPagePr
   const definition = await api.customWidget.byId({ id: params.id }).catch(catchTrpcNotFound);
 
   const displayConfig = definition.displayConfig as Record<string, unknown>;
-  const displayValues = buildDisplayFormValues(definition.displayType, displayConfig);
+  const displayValues = buildDisplayInitialValues(definition.displayType, displayConfig);
 
   return (
     <>

apps/nextjs/src/app/[locale]/manage/layout.tsx

@@ -61,7 +61,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       icon: IconBox,
       href: "/manage/apps",
       label: t("items.apps"),
-      hidden: !session,
+      hidden: !session?.user.permissions.includes("app-create"),
       iconProps: {
         strokeWidth: 2.5,
       },
@@ -71,20 +71,20 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       icon: IconAffiliateFilled,
       href: "/manage/integrations",
       label: t("items.integrations"),
-      hidden: !session,
+      hidden: !session?.user.permissions.includes("integration-create"),
       "data-onboarding-tour-id": "manage-integrations",
     },
     {
       icon: IconApi,
       href: "/manage/custom-widgets",
       label: t("items.customWidgets"),
-      hidden: !session,
+      hidden: !session?.user.permissions.includes("admin"),
     },
     {
       icon: IconSearch,
       href: "/manage/search-engines",
       label: t("items.searchEngies"),
-      hidden: !session,
+      hidden: !session?.user.permissions.includes("search-engine-create"),
       iconProps: {
         strokeWidth: 2.5,
       },
@@ -94,7 +94,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       icon: IconPhotoFilled,
       href: "/manage/medias",
       label: t("items.medias"),
-      hidden: !session,
+      hidden: !session?.user.permissions.includes("media-upload"),
       "data-onboarding-tour-id": "manage-medias",
     },
     {

apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx

@@ -193,6 +193,10 @@ export function DockerTable({ initialData }: DockerTableProps) {
     positionToolbarAlertBanner: "top",
     enableTableFooter: false,
     enableBottomToolbar: false,
+    // MRT's built-in full-screen mode does not stretch the table to fill the
+    // viewport, so with few containers it renders as a thin strip (#6230). Disable
+    // it, matching the other management tables (users, invites).
+    enableFullScreenToggle: false,
     positionGlobalFilter: "right",
     mantineSearchTextInputProps: {
       placeholder: tDocker("table.search", { count: String(containers.length) }),

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_general-settings-form.tsx

@@ -31,6 +31,7 @@ import {
   userChangeHomeBoardsSchema,
   userChangeSearchPreferencesSchema,
   userEditProfileSchema,
+  userEnableRightClickOnWidgetsSchema,
   userFirstDayOfWeekSchema,
   userPingIconsEnabledSchema,
 } from "@homarr/validation/user";
@@ -51,6 +52,7 @@ const userGeneralSettingsSchema = z.object({
   ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
   firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
   pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
+  enableRightClickOnWidgets: userEnableRightClickOnWidgetsSchema.shape.enableRightClickOnWidgets,
 });
 
 type FormValues = z.infer<typeof userGeneralSettingsSchema>;
@@ -78,6 +80,7 @@ const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues
   ddgBangsEnabled: user.ddgBangs,
   firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
   pingIconsEnabled: user.pingIconsEnabled,
+  enableRightClickOnWidgets: user.enableRightClickOnWidgets,
 });
 
 export const UserGeneralSettingsForm = ({
@@ -95,6 +98,7 @@ export const UserGeneralSettingsForm = ({
   const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
   const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
   const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
+  const changeEnableRightClickOnWidgetsMutation = clientApi.user.changeEnableRightClickOnWidgets.useMutation();
 
   const initialValues = buildInitialValues(user);
   const initialValuesRef = useRef(initialValues);
@@ -114,6 +118,7 @@ export const UserGeneralSettingsForm = ({
     changeSearchPreferencesMutation,
     changeFirstDayOfWeekMutation,
     changePingIconsEnabledMutation,
+    changeEnableRightClickOnWidgetsMutation,
   ];
   const isPending = mutations.some((m) => m.isPending);
 
@@ -169,6 +174,14 @@ export const UserGeneralSettingsForm = ({
         action: () =>
           changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
       },
+      {
+        when: changed("enableRightClickOnWidgets"),
+        action: () =>
+          changeEnableRightClickOnWidgetsMutation.mutateAsync({
+            id: user.id,
+            enableRightClickOnWidgets: parsed.data.enableRightClickOnWidgets,
+          }),
+      },
     ];
 
     const promises = saveActions.filter((s) => s.when).map((s) => s.action());
@@ -305,6 +318,11 @@ export const UserGeneralSettingsForm = ({
                 label={t("user.field.pingIconsEnabled.label")}
                 {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
               />
+              <Switch
+                label={t("user.field.enableRightClickOnWidgets.label")}
+                description={t("user.field.enableRightClickOnWidgets.description")}
+                {...form.getInputProps("enableRightClickOnWidgets", { type: "checkbox" })}
+              />
             </Stack>
           </Card>
         </SimpleGrid>

apps/nextjs/src/app/api/image-proxy/[id]/route.ts

@@ -1,19 +1,25 @@
-import { notFound } from "next/navigation";
-
 import { ImageProxy } from "@homarr/image-proxy";
 
 export const GET = async (_request: Request, props: { params: Promise<{ id: string }> }) => {
   const { id } = await props.params;
 
   const imageProxy = new ImageProxy();
-  const image = await imageProxy.forwardImageAsync(id);
-  if (!image) {
-    notFound();
+  const result = await imageProxy.forwardImageAsync(id);
+
+  if ("error" in result) {
+    const status = result.error === "upstream-error" ? result.statusCode : result.error === "fetch-error" ? 502 : 404;
+    return new Response(null, {
+      status,
+      headers: {
+        "X-Homarr-Image-Proxy-Error": result.error,
+      },
+    });
   }
 
-  return new Response(image, {
+  return new Response(result.image, {
     headers: {
       "Cache-Control": "public, max-age=3600, immutable", // Cache for 1 hour
+      ...(result.contentType ? { "Content-Type": result.contentType } : {}),
     },
   });
 };

apps/nextjs/src/components/board/items/actions/create-item.ts

@@ -1,10 +1,12 @@
 import { getBoardLayouts } from "@homarr/boards/context";
 import { createId } from "@homarr/common";
 import type { Modify } from "@homarr/common/types";
+import { getRootSectionLane } from "@homarr/definitions";
 import type { WidgetKind } from "@homarr/definitions";
 import { widgetDefaultSizes } from "@homarr/definitions";
 
 import type { Board, EmptySection, Item, ItemLayout } from "~/app/[locale]/boards/_types";
+import { getBoardLaneColumnCount } from "~/components/board/layout";
 import { getFirstEmptyPosition } from "./empty-position";
 import { getSectionElements } from "./section-elements";
 
@@ -19,17 +21,21 @@ export const createItemCallback =
   ({ id, kind, options = {}, integrationIds = [] }: CreateItemInput) =>
   (previous: Board): Board => {
     const firstSection = previous.sections
-      .filter((section): section is EmptySection => section.kind === "empty")
+      .filter(
+        (section): section is EmptySection =>
+          section.kind === "empty" && getRootSectionLane(section.xOffset) === "main",
+      )
       .toSorted((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
       .at(0);
 
     if (!firstSection) return previous;
 
+    const itemLayouts = createItemLayouts(previous, firstSection, kind);
     const widget = {
       id: id ?? createId(),
       kind,
       options,
-      layouts: createItemLayouts(previous, firstSection, kind),
+      layouts: itemLayouts,
       integrationIds,
       advancedOptions: {
         title: null,
@@ -60,9 +66,14 @@ const createItemLayouts = (board: Board, currentSection: EmptySection, kind: Wid
   return layouts.map((layoutId) => {
     const boardLayout = board.layouts.find((layout) => layout.id === layoutId);
     const elements = getSectionElements(board, { sectionId: currentSection.id, layoutId });
+    const columnCount = boardLayout ? getBoardLaneColumnCount(boardLayout, "main") : itemSize.width;
+    const size = {
+      width: Math.min(itemSize.width, columnCount),
+      height: itemSize.height,
+    };
 
     const emptyPosition = boardLayout
-      ? getFirstEmptyPosition(elements, boardLayout.columnCount, 9999, itemSize)
+      ? getFirstEmptyPosition(elements, columnCount, undefined, size)
       : { xOffset: 0, yOffset: 0 };
 
     if (!emptyPosition) {
@@ -70,8 +81,8 @@ const createItemLayouts = (board: Board, currentSection: EmptySection, kind: Wid
     }
 
     return {
-      width: itemSize.width,
-      height: itemSize.height,
+      width: size.width,
+      height: size.height,
       ...emptyPosition,
       sectionId: currentSection.id,
       layoutId,

apps/nextjs/src/components/board/items/actions/duplicate-item.ts

@@ -1,6 +1,8 @@
 import { createId } from "@homarr/common";
+import { getRootSectionLane } from "@homarr/definitions";
 
 import type { Board, EmptySection, ItemLayout, Section } from "~/app/[locale]/boards/_types";
+import { getBoardLaneColumnCount } from "~/components/board/layout";
 import { getFirstEmptyPosition } from "./empty-position";
 import { getSectionElements } from "./section-elements";
 
@@ -15,16 +17,17 @@ export const duplicateItemCallback =
     if (!itemToDuplicate) return previous;
 
     const clonedItem = structuredClone(itemToDuplicate);
+    const clonedLayouts = clonedItem.layouts.map((layout) => ({
+      ...layout,
+      ...getNextPosition(previous, layout),
+    }));
 
     return {
       ...previous,
       items: previous.items.concat({
         ...clonedItem,
         id: createId(),
-        layouts: clonedItem.layouts.map((layout) => ({
-          ...layout,
-          ...getNextPosition(previous, layout),
-        })),
+        layouts: clonedLayouts,
       }),
     };
   };
@@ -42,8 +45,10 @@ const getNextPosition = (board: Board, layout: ItemLayout): { xOffset: number; y
   }
 
   const firstSection = board.sections
-    .filter((section): section is EmptySection => section.kind === "empty")
-    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
+    .filter(
+      (section): section is EmptySection => section.kind === "empty" && getRootSectionLane(section.xOffset) === "main",
+    )
+    .toSorted((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
     .at(0);
 
   if (!firstSection) {
@@ -67,18 +72,24 @@ const getEmptySectionPosition = (
   layout: ItemLayout,
   section: Section,
 ): { xOffset: number; yOffset: number } | undefined => {
-  const boardLayout = board.layouts.find((boardLayout) => boardLayout.id === layout.layoutId);
+  const boardLayout = board.layouts.find((candidate) => candidate.id === layout.layoutId);
   if (!boardLayout) return;
 
-  const sectionElements = getSectionElements(board, { sectionId: layout.sectionId, layoutId: layout.layoutId });
+  const sectionElements = getSectionElements(board, { sectionId: section.id, layoutId: layout.layoutId });
   if (section.kind !== "dynamic") {
-    return getFirstEmptyPosition(sectionElements, boardLayout.columnCount, undefined, {
+    const columnCount =
+      section.kind === "empty"
+        ? getBoardLaneColumnCount(boardLayout, getRootSectionLane(section.xOffset))
+        : boardLayout.columnCount;
+
+    const size = {
       width: layout.width,
       height: layout.height,
-    });
+    };
+    return getFirstEmptyPosition(sectionElements, columnCount, undefined, size);
   }
 
-  const sectionLayout = section.layouts.find((sectionLayout) => sectionLayout.layoutId === layout.layoutId);
+  const sectionLayout = section.layouts.find((candidate) => candidate.layoutId === layout.layoutId);
   if (!sectionLayout) return;
 
   return getFirstEmptyPosition(sectionElements, sectionLayout.width, sectionLayout.height, {

apps/nextjs/src/components/board/items/actions/empty-position.ts

@@ -7,7 +7,7 @@ export const getFirstEmptyPosition = (
   size: { width: number; height: number } = { width: 1, height: 1 },
 ) => {
   for (let yOffset = 0; yOffset < rowCount + 1 - size.height; yOffset++) {
-    for (let xOffset = 0; xOffset < columnCount; xOffset++) {
+    for (let xOffset = 0; xOffset < columnCount + 1 - size.width; xOffset++) {
       const isOccupied = elements.some(
         (element) =>
           element.yOffset < yOffset + size.height &&

apps/nextjs/src/components/board/items/actions/test/create-item.spec.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 
 import * as boardContext from "@homarr/boards/context";
 
@@ -10,6 +10,10 @@ import { ItemMockBuilder } from "./mocks/item-mock";
 import { LayoutMockBuilder } from "./mocks/layout-mock";
 
 describe("item actions create-item", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   test("should add it to first section", () => {
     // Arrange
     const itemKind = "clock";
@@ -52,7 +56,7 @@ describe("item actions create-item", () => {
         ],
       }),
     );
-    expect(emptyPositionSpy).toHaveBeenCalledWith([], layout.columnCount, 9999, { height: 1, width: 1 });
+    expect(emptyPositionSpy).toHaveBeenCalledWith([], layout.columnCount, undefined, { height: 1, width: 1 });
   });
   test("should correctly pass dynamic section and items to getFirstEmptyPosition", () => {
     // Arrange
@@ -94,8 +98,10 @@ describe("item actions create-item", () => {
 
     // Assert
     expect(result.items.length).toBe(3);
-    const item = result.items.find((item) => item.id !== itemInFirstSection.id && item.id !== otherItem.id);
-    expect(item).toEqual(
+    const createdItem = result.items.find(
+      (candidate) => candidate.id !== itemInFirstSection.id && candidate.id !== otherItem.id,
+    );
+    expect(createdItem).toEqual(
       expect.objectContaining({
         kind: itemKind,
         layouts: [{ ...emptyPosition, height: 1, width: 1, sectionId: firstSectionId, layoutId }],
@@ -104,8 +110,35 @@ describe("item actions create-item", () => {
     expect(spy).toHaveBeenCalledWith(
       [expect.objectContaining(itemAndSectionPosition), expect.objectContaining(itemAndSectionPosition)],
       layout.columnCount,
-      9999,
+      undefined,
       { height: 1, width: 1 },
     );
   });
+
+  test("clamps wide defaults and places below a full automatic canvas", () => {
+    const board = new BoardMockBuilder().addEmptySection({ id: "canvas", yOffset: 0 }).build();
+    const layout = board.layouts[0];
+    if (!layout) throw new Error("Expected a board layout");
+    layout.id = "layout";
+    layout.columnCount = 1;
+    board.items.push(
+      new ItemMockBuilder({ id: "existing" })
+        .addLayout({ layoutId: layout.id, sectionId: "canvas", width: 1, height: 1 })
+        .build(),
+    );
+
+    const result = createItemCallback({ id: "created", kind: "mediaMissing" })(board);
+    const created = result.items.find((item) => item.id === "created");
+
+    expect(created?.layouts).toEqual([
+      expect.objectContaining({
+        layoutId: layout.id,
+        sectionId: "canvas",
+        width: 1,
+        height: 3,
+        xOffset: 0,
+        yOffset: 1,
+      }),
+    ]);
+  });
 });

apps/nextjs/src/components/board/items/actions/test/duplicate-item.spec.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test, vi } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 
 import { duplicateItemCallback } from "../duplicate-item";
 import * as emptyPositionModule from "../empty-position";
@@ -7,6 +7,10 @@ import { ItemMockBuilder } from "./mocks/item-mock";
 import { LayoutMockBuilder } from "./mocks/layout-mock";
 
 describe("item actions duplicate-item", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   test("should copy it in the same section", () => {
     // Arrange
     const itemKind = "minecraftServerStatus";
@@ -61,4 +65,28 @@ describe("item actions duplicate-item", () => {
       }),
     );
   });
+
+  test("uses the next automatic canvas row when it is the first available space", () => {
+    const board = new BoardMockBuilder().addEmptySection({ id: "canvas", yOffset: 0 }).build();
+    const layout = board.layouts[0];
+    if (!layout) throw new Error("Expected a board layout");
+    layout.id = "layout";
+    layout.columnCount = 1;
+    const currentItem = new ItemMockBuilder({ id: "source" })
+      .addLayout({ layoutId: layout.id, sectionId: "canvas", width: 1, height: 1 })
+      .build();
+    board.items.push(currentItem);
+
+    const result = duplicateItemCallback({ itemId: currentItem.id })(board);
+    const duplicated = result.items.find((item) => item.id !== currentItem.id);
+
+    expect(duplicated?.layouts[0]).toEqual(
+      expect.objectContaining({
+        layoutId: layout.id,
+        sectionId: "canvas",
+        xOffset: 0,
+        yOffset: 1,
+      }),
+    );
+  });
 });

apps/nextjs/src/components/board/items/actions/test/item-move-targets.spec.ts

@@ -0,0 +1,123 @@
+import { describe, expect, test } from "vitest";
+
+import { getMoveTargets } from "../../item-move-modal";
+import { BoardMockBuilder } from "./mocks/board-mock";
+import { DynamicSectionMockBuilder } from "./mocks/dynamic-section-mock";
+import { EmptySectionMockBuilder } from "./mocks/empty-section-mock";
+import { ItemMockBuilder } from "./mocks/item-mock";
+
+describe("item move targets", () => {
+  test("offers the canvas, enabled gutters, and nested sections", () => {
+    const board = new BoardMockBuilder().build();
+    const layout = board.layouts[0];
+    if (!layout) throw new Error("Expected the board mock to contain a layout");
+    layout.id = "layout";
+    layout.columnCount = 6;
+    layout.leftGutterColumnCount = 1;
+    layout.rightGutterColumnCount = 1;
+
+    board.sections.push(
+      new EmptySectionMockBuilder({ id: "canvas", xOffset: 0 }).build(),
+      new EmptySectionMockBuilder({ id: "left-gutter", xOffset: -1 }).build(),
+      new EmptySectionMockBuilder({ id: "right-gutter", xOffset: 1 }).build(),
+      new DynamicSectionMockBuilder({
+        id: "dynamic",
+        options: {
+          title: "",
+          customCssClasses: [],
+          borderColor: "",
+          showLabel: true,
+          collapsible: false,
+          showOpenAll: false,
+        },
+      })
+        .addLayout({
+          layoutId: layout.id,
+          parentSectionId: "canvas",
+          width: 2,
+          height: 2,
+        })
+        .build(),
+    );
+
+    const targets = getMoveTargets(
+      board,
+      layout.id,
+      {
+        id: "weather",
+        type: "item",
+        xOffset: 0,
+        yOffset: 0,
+        width: 1,
+        height: 1,
+      },
+      {
+        canvas: "Dashboard canvas",
+        dynamicSection: "New section",
+        leftRail: "Left dashboard rail",
+        rightRail: "Right dashboard rail",
+        numbered: (name, index) => `${name}, destination ${index}`,
+        located: (name, location, index) => `${name}, ${location}, destination ${index}`,
+      },
+    );
+
+    expect(targets.map((target) => target.label)).toEqual([
+      "Dashboard canvas, destination 1",
+      "Left dashboard rail, destination 2",
+      "Right dashboard rail, destination 3",
+      "New section, destination 4",
+    ]);
+    expect(new Set(targets.map((target) => target.label))).toHaveLength(targets.length);
+  });
+
+  test("does not offer canvases that are narrower than a nested section's contents", () => {
+    const board = new BoardMockBuilder().build();
+    const layout = board.layouts[0];
+    if (!layout) throw new Error("Expected the board mock to contain a layout");
+    layout.id = "layout";
+    layout.columnCount = 5;
+    layout.leftGutterColumnCount = 2;
+
+    const section = new DynamicSectionMockBuilder({ id: "source" })
+      .addLayout({
+        layoutId: layout.id,
+        parentSectionId: "canvas",
+        width: 4,
+        height: 2,
+      })
+      .build();
+    board.sections.push(
+      new EmptySectionMockBuilder({ id: "canvas" }).build(),
+      new EmptySectionMockBuilder({ id: "left-gutter", xOffset: -1 }).build(),
+      section,
+    );
+    board.items.push(
+      new ItemMockBuilder({ id: "nested" })
+        .addLayout({
+          layoutId: layout.id,
+          sectionId: section.id,
+          xOffset: 2,
+          width: 2,
+        })
+        .build(),
+    );
+
+    const sourceLayout = section.layouts[0];
+    if (!sourceLayout) throw new Error("Expected the source section to contain a layout");
+    const targets = getMoveTargets(
+      board,
+      layout.id,
+      { ...sourceLayout, id: section.id, type: "section" },
+      {
+        canvas: "Canvas",
+        dynamicSection: "Section",
+        leftRail: "Left",
+        rightRail: "Right",
+        numbered: (name, index) => `${name} ${index}`,
+        located: (name, location, index) => `${name} ${location} ${index}`,
+      },
+    );
+
+    expect(targets).toEqual([]);
+  });
+});

apps/nextjs/src/components/board/items/actions/test/mocks/board-mock.ts

@@ -45,6 +45,8 @@ export class BoardMockBuilder {
           id: createId(),
           name: "Base",
           columnCount: 12,
+          leftGutterColumnCount: 0,
+          rightGutterColumnCount: 0,
           breakpoint: 0,
         },
       ],

apps/nextjs/src/components/board/items/actions/test/mocks/category-section-mock.ts

@@ -1,23 +0,0 @@
-import { createId } from "@homarr/common";
-
-import type { CategorySection } from "~/app/[locale]/boards/_types";
-
-export class CategorySectionMockBuilder {
-  private readonly section: CategorySection;
-
-  constructor(section?: Partial<CategorySection>) {
-    this.section = {
-      id: createId(),
-      kind: "category",
-      xOffset: 0,
-      yOffset: 0,
-      name: "Category",
-      collapsed: false,
-      ...section,
-    } satisfies CategorySection;
-  }
-
-  public build(): CategorySection {
-    return this.section;
-  }
-}

apps/nextjs/src/components/board/items/actions/test/mocks/dynamic-section-mock.ts

@@ -1,21 +1,23 @@
 import { createId } from "@homarr/common";
+import { dynamicSectionOptionsSchema } from "@homarr/validation/shared";
 
 import type { DynamicSection } from "~/app/[locale]/boards/_types";
 
+type DynamicSectionMock = Omit<Partial<DynamicSection>, "options"> & {
+  options?: Partial<DynamicSection["options"]>;
+};
+
 export class DynamicSectionMockBuilder {
   private readonly section: DynamicSection;
 
-  constructor(section?: Partial<DynamicSection>) {
+  constructor(section?: DynamicSectionMock) {
     this.section = {
       id: createId(),
       kind: "dynamic",
-      options: {
-        title: "",
-        borderColor: "",
-        customCssClasses: [],
-      },
       layouts: [],
       ...section,
+      collapsed: section?.collapsed ?? false,
+      options: dynamicSectionOptionsSchema.parse(section?.options),
     } satisfies DynamicSection;
   }
 

apps/nextjs/src/components/board/items/actions/test/mocks/layout-mock.ts

@@ -10,6 +10,8 @@ export class LayoutMockBuilder {
       id: createId(),
       name: "Base",
       columnCount: 12,
+      leftGutterColumnCount: 0,
+      rightGutterColumnCount: 0,
       breakpoint: 0,
       ...layout,
     } satisfies Board["layouts"][0];